From a475a16d03061210e6456838fd98786812c56771 Mon Sep 17 00:00:00 2001
From: Paul Kuberry <pakuber@sandia.gov>
Date: Thu, 23 Sep 2021 07:51:21 -0600
Subject: [PATCH 01/40] Switch compressed row radius neighbor search to use
 ArborX

---
 CMakeLists.txt                    |   2 +
 pycompadre/pycompadre.cpp         |   2 -
 src/CMakeLists.txt                |   2 +
 src/Compadre_PointCloudSearch.hpp | 947 ++++++++++++++----------------
 4 files changed, 440 insertions(+), 513 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 196145439..78c2e58cf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -351,6 +351,8 @@ else() # Raw CMake Project
     set(Compadre_EXT_DEPS Kokkos KokkosKernels)
   endif()
 
+  option(ARBORX_ENABLE_MPI "" "${Compadre_USE_MPI}")
+  add_subdirectory(arborx)
 
 
   #MPI (Not really needed, only used so that if a kokkos-tool was built with MPI, it won't segfault)
diff --git a/pycompadre/pycompadre.cpp b/pycompadre/pycompadre.cpp
index 8c448a694..d2fbfb013 100644
--- a/pycompadre/pycompadre.cpp
+++ b/pycompadre/pycompadre.cpp
@@ -35,8 +35,6 @@ class ParticleHelper {
     Compadre::GMLS* gmls_object;
     Compadre::NeighborLists<int_1d_view_type_in_gmls>* nl;
 
-    typedef nanoflann::KDTreeSingleIndexAdaptor<nanoflann::L2_Simple_Adaptor<double, Compadre::PointCloudSearch<double_2d_view_type> >, 
-            Compadre::PointCloudSearch<double_2d_view_type>, 3> tree_type;
     std::shared_ptr<Compadre::PointCloudSearch<double_2d_view_type> > point_cloud_search;
 
     double_2d_view_type _source_coords;
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 93aac5f7c..03102ae3b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -55,6 +55,8 @@ elseif (KOKKOSKERNELS_BUILT_FOR_USER) # Kokkos-Kernels built for user by this pr
   target_link_libraries(compadre PUBLIC Kokkos::kokkoskernels)
 endif()
 
+target_link_libraries(compadre PUBLIC ArborX::ArborX)
+
 # link to MPI
 if (Compadre_USE_MPI)
   if (MPI_CXX_INCLUDE_PATH)
diff --git a/src/Compadre_PointCloudSearch.hpp b/src/Compadre_PointCloudSearch.hpp
index 9d6f85448..db809c0c9 100644
--- a/src/Compadre_PointCloudSearch.hpp
+++ b/src/Compadre_PointCloudSearch.hpp
@@ -3,124 +3,13 @@
 
 #include "Compadre_Typedefs.hpp"
 #include "Compadre_NeighborLists.hpp"
-#include "nanoflann.hpp"
 #include <Kokkos_Core.hpp>
-#include <memory>
+#include <ArborX_LinearBVH.hpp>
 
-namespace Compadre {
-
-//class sort_indices
-//{
-//   private:
-//     double* mparr;
-//   public:
-//     sort_indices(double* parr) : mparr(parr) {}
-//     bool operator()(int i, int j) const { return mparr[i]<mparr[j]; }
-//};
-
-//! Custom RadiusResultSet for nanoflann that uses pre-allocated space for indices and radii
-//! instead of using std::vec for std::pairs
-template <typename _DistanceType, typename _IndexType = size_t>
-class RadiusResultSet {
-
-  public:
-
-    typedef _DistanceType DistanceType;
-    typedef _IndexType IndexType;
-
-    const DistanceType radius;
-    IndexType count;
-    DistanceType* r_dist;
-    IndexType* i_dist;
-    const IndexType max_size;
-
-    RadiusResultSet(
-        DistanceType radius_,
-        DistanceType* r_dist_, IndexType* i_dist_, const IndexType max_size_)
-        : radius(radius_), count(0), r_dist(r_dist_), i_dist(i_dist_), max_size(max_size_) {
-        init();
-    }
-
-    void init() {}
-
-    void clear() { count = 0; }
-
-    size_t size() const { return count; }
-
-    bool full() const { return true; }
-
-    bool addPoint(DistanceType dist, IndexType index) {
-
-        if (dist < radius) {
-            // would throw an exception here if count>=max_size, but this code is 
-            // called inside of a parallel region so only an abort is possible, 
-            // but this situation is recoverable 
-            //
-            // instead, we increase count, but there is nowhere to store neighbors
-            // since we are working with pre-allocated space
-            // this will be discovered after returning from the search by comparing
-            // the count against the pre-allocate space dimensions
-            if (count<max_size) {
-                i_dist[count] = index;
-                r_dist[count] = dist;
-            }
-            count++;
-        }
-        return true;
-
-    }
-
-    DistanceType worstDist() const { return radius; }
-
-    std::pair<IndexType, DistanceType> worst_item() const {
-        // just to verify this isn't ever called
-        compadre_kernel_assert_release(false && "worst_item() should not be called.");
-    }
-
-    void sort() { 
-        // puts closest neighbor as the first entry in the neighbor list
-        // leaves the rest unsorted
- 
-        if (count > 0) {
-
-            // alternate sort for every entry, not currently being used
-            //int indices[count];
-            //for (int i=0; i<count; ++i) {
-            //    indices[i] = i;
-            //}
-            //std::sort(indices, indices+count, sort_indices(r_dist));
-            //std::vector<IndexType> tmp_indices(count);
-            //std::vector<DistanceType> tmp_r(count);
-            //for (int i=0; i<count; ++i) {
-            //    tmp_indices[i] = i_dist[indices[i]];
-            //    tmp_r[i] = r_dist[indices[i]];
-            //}
-            //for (int i=0; i<count; ++i) {
-            //    i_dist[i] = tmp_indices[i];
-            //    r_dist[i] = tmp_r[i];
-            //}
-            IndexType loop_max = (count < max_size) ? count : max_size;
-
-            DistanceType best_distance = std::numeric_limits<DistanceType>::max();
-            IndexType best_distance_index = 0;
-            int best_index = -1;
-            for (IndexType i=0; i<loop_max; ++i) {
-                if (r_dist[i] < best_distance) {
-                    best_distance = r_dist[i];
-                    best_distance_index = i_dist[i];
-                    best_index = i;
-                }
-            }
-
-            if (best_index != 0) {
-                auto tmp_ind = i_dist[0];
-                i_dist[0] = best_distance_index;
-                i_dist[best_index] = tmp_ind;
-            }
-        }
-    }
-};
+template <typename memory_space>
+using BVH = ArborX::BoundingVolumeHierarchy<memory_space>;
 
+namespace Compadre {
 
 //!  PointCloudSearch generates neighbor lists and window sizes for each target site
 /*!
@@ -142,15 +31,6 @@ class RadiusResultSet {
 template <typename view_type>
 class PointCloudSearch {
 
-    public:
-
-        typedef nanoflann::KDTreeSingleIndexAdaptor<nanoflann::L2_Simple_Adaptor<double, PointCloudSearch<view_type> >, 
-                PointCloudSearch<view_type>, 1> tree_type_1d;
-        typedef nanoflann::KDTreeSingleIndexAdaptor<nanoflann::L2_Simple_Adaptor<double, PointCloudSearch<view_type> >, 
-                PointCloudSearch<view_type>, 2> tree_type_2d;
-        typedef nanoflann::KDTreeSingleIndexAdaptor<nanoflann::L2_Simple_Adaptor<double, PointCloudSearch<view_type> >, 
-                PointCloudSearch<view_type>, 3> tree_type_3d;
-
     protected:
 
         //! source site coordinates
@@ -158,9 +38,7 @@ class PointCloudSearch {
         local_index_type _dim;
         local_index_type _max_leaf;
 
-        std::shared_ptr<tree_type_1d> _tree_1d;
-        std::shared_ptr<tree_type_2d> _tree_2d;
-        std::shared_ptr<tree_type_3d> _tree_3d;
+        BVH<device_memory_space> _tree;
 
     public:
 
@@ -171,6 +49,23 @@ class PointCloudSearch {
                   _max_leaf((max_leaf < 0) ? 10 : max_leaf) {
             compadre_assert_release((Kokkos::SpaceAccessibility<host_execution_space, typename view_type::memory_space>::accessible==1)
                     && "Views passed to PointCloudSearch at construction should be accessible from the host.");
+
+            { //TODO: Add check here to see if _tree is populated
+                // if not, populate
+                Kokkos::View<ArborX::Point *> cloud("point_cloud", _src_pts_view.extent(0));
+                Kokkos::parallel_for(_src_pts_view.extent(0), KOKKOS_LAMBDA(int i) {
+                  if (_dim==1) {
+                      cloud(i) = {{_src_pts_view(i,0),0,0}};
+                  }
+                  if (_dim==2) {
+                      cloud(i) = {{_src_pts_view(i,0),_src_pts_view(i,1),0}};
+                  }
+                  if (_dim==3) {
+                      cloud(i) = {{_src_pts_view(i,0),_src_pts_view(i,1),_src_pts_view(i,2)}};
+                  }
+                });
+                _tree = BVH<device_memory_space>(device_execution_space(), cloud);
+            }
         };
     
         ~PointCloudSearch() {};
@@ -204,19 +99,31 @@ class PointCloudSearch {
 
         }
 
-        void generateKDTree() {
-            if (_dim==1) {
-                _tree_1d = std::make_shared<tree_type_1d>(1, *this, nanoflann::KDTreeSingleIndexAdaptorParams(_max_leaf));
-                _tree_1d->buildIndex();
-            } else if (_dim==2) {
-                _tree_2d = std::make_shared<tree_type_2d>(2, *this, nanoflann::KDTreeSingleIndexAdaptorParams(_max_leaf));
-                _tree_2d->buildIndex();
-            } else if (_dim==3) {
-                _tree_3d = std::make_shared<tree_type_3d>(3, *this, nanoflann::KDTreeSingleIndexAdaptorParams(_max_leaf));
-                _tree_3d->buildIndex();
+        //! Returns the distance between a point and a source site, given its index
+        inline double kdtreeDistance(const double* queryPt, const int idx) const {
+
+            double distance = 0;
+            for (int i=0; i<_dim; ++i) {
+                distance += (_src_pts_view(idx,i)-queryPt[i])*(_src_pts_view(idx,i)-queryPt[i]);
             }
+            return std::sqrt(distance);
+
         }
 
+        //void generateKDTree() {
+            //if (_dim==1) {
+            //    //_tree_1d = std::make_shared<tree_type_1d>(1, *this, nanoflann::KDTreeSingleIndexAdaptorParams(_max_leaf));
+            //    //_tree_1d->buildIndex();
+            //    _tree_1d = std::make_shared<BVH>();//(1, *this, nanoflann::KDTreeSingleIndexAdaptorParams(_max_leaf));
+            //} else if (_dim==2) {
+            //    _tree_2d = std::make_shared<BVH>();//std::make_shared<tree_type_2d>(2, *this, nanoflann::KDTreeSingleIndexAdaptorParams(_max_leaf));
+            //    _tree_2d->buildIndex();
+            //} else if (_dim==3) {
+            //    _tree_3d = std::make_shared<BVH>();//std::make_shared<tree_type_3d>(3, *this, nanoflann::KDTreeSingleIndexAdaptorParams(_max_leaf));
+            //    //_tree_3d->buildIndex();
+            //}
+        //}
+
         /*! \brief Generates neighbor lists of 2D view by performing a radius search 
             where the radius to be searched is in the epsilons view.
             If uniform_radius is given, then this overrides the epsilons view radii sizes.
@@ -233,121 +140,124 @@ class PointCloudSearch {
                 neighbor_lists_view_type neighbor_lists, epsilons_view_type epsilons, 
                 const double uniform_radius = 0.0, double max_search_radius = 0.0) {
 
-            // function does not populate epsilons, they must be prepopulated
+            //// function does not populate epsilons, they must be prepopulated
 
-            compadre_assert_release((Kokkos::SpaceAccessibility<host_execution_space, typename trg_view_type::memory_space>::accessible==1) &&
-                    "Target coordinates view passed to generate2DNeighborListsFromRadiusSearch should be accessible from the host.");
-            compadre_assert_release((((int)trg_pts_view.extent(1))>=_dim) &&
-                    "Target coordinates view passed to generate2DNeighborListsFromRadiusSearch must have \
-                    second dimension as large as _dim.");
-            compadre_assert_release((Kokkos::SpaceAccessibility<host_execution_space, typename neighbor_lists_view_type::memory_space>::accessible==1) &&
-                    "Views passed to generate2DNeighborListsFromRadiusSearch should be accessible from the host.");
-            compadre_assert_release((Kokkos::SpaceAccessibility<host_execution_space, typename epsilons_view_type::memory_space>::accessible==1) &&
-                    "Views passed to generate2DNeighborListsFromRadiusSearch should be accessible from the host.");
+            //compadre_assert_release((Kokkos::SpaceAccessibility<host_execution_space, typename trg_view_type::memory_space>::accessible==1) &&
+            //        "Target coordinates view passed to generate2DNeighborListsFromRadiusSearch should be accessible from the host.");
+            //compadre_assert_release((((int)trg_pts_view.extent(1))>=_dim) &&
+            //        "Target coordinates view passed to generate2DNeighborListsFromRadiusSearch must have \
+            //        second dimension as large as _dim.");
+            //compadre_assert_release((Kokkos::SpaceAccessibility<host_execution_space, typename neighbor_lists_view_type::memory_space>::accessible==1) &&
+            //        "Views passed to generate2DNeighborListsFromRadiusSearch should be accessible from the host.");
+            //compadre_assert_release((Kokkos::SpaceAccessibility<host_execution_space, typename epsilons_view_type::memory_space>::accessible==1) &&
+            //        "Views passed to generate2DNeighborListsFromRadiusSearch should be accessible from the host.");
 
-            // loop size
-            const int num_target_sites = trg_pts_view.extent(0);
+            //// loop size
+            //const int num_target_sites = trg_pts_view.extent(0);
 
-            if ((!_tree_1d && _dim==1) || (!_tree_2d && _dim==2) || (!_tree_3d && _dim==3)) {
-                this->generateKDTree();
-            }
+            ////if ((!_tree_1d && _dim==1) || (!_tree_2d && _dim==2) || (!_tree_3d && _dim==3)) {
+            ////    this->generateKDTree();
+            ////}
 
-            // check neighbor lists and epsilons view sizes
-            compadre_assert_release((neighbor_lists.extent(0)==(size_t)num_target_sites 
-                        && neighbor_lists.extent(1)>=1)
-                        && "neighbor lists View does not have large enough dimensions");
-            compadre_assert_release((neighbor_lists_view_type::rank==2) && "neighbor_lists must be a 2D Kokkos view.");
+            //// check neighbor lists and epsilons view sizes
+            //compadre_assert_release((neighbor_lists.extent(0)==(size_t)num_target_sites 
+            //            && neighbor_lists.extent(1)>=1)
+            //            && "neighbor lists View does not have large enough dimensions");
+            //compadre_assert_release((neighbor_lists_view_type::rank==2) && "neighbor_lists must be a 2D Kokkos view.");
 
-            compadre_assert_release((epsilons.extent(0)==(size_t)num_target_sites)
-                        && "epsilons View does not have the correct dimension");
+            //compadre_assert_release((epsilons.extent(0)==(size_t)num_target_sites)
+            //            && "epsilons View does not have the correct dimension");
 
-            typedef Kokkos::View<double*, Kokkos::HostSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> > 
-                    scratch_double_view;
+            //typedef Kokkos::View<double*, Kokkos::HostSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> > 
+            //        scratch_double_view;
 
-            typedef Kokkos::View<size_t*, Kokkos::HostSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> > 
-                    scratch_int_view;
+            //typedef Kokkos::View<size_t*, Kokkos::HostSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> > 
+            //        scratch_int_view;
 
-            // determine scratch space size needed
-            int team_scratch_size = 0;
-            team_scratch_size += scratch_double_view::shmem_size(neighbor_lists.extent(1)); // distances
-            team_scratch_size += scratch_int_view::shmem_size(neighbor_lists.extent(1)); // indices
-            team_scratch_size += scratch_double_view::shmem_size(_dim); // target coordinate
-
-            // maximum number of neighbors found over all target sites' neighborhoods
-            size_t max_num_neighbors = 0;
-            // part 2. do radius search using window size from knn search
-            // each row of neighbor lists is a neighbor list for the target site corresponding to that row
-            Kokkos::parallel_reduce("radius search", host_team_policy(num_target_sites, Kokkos::AUTO)
-                    .set_scratch_size(0 /*shared memory level*/, Kokkos::PerTeam(team_scratch_size)), 
-                    KOKKOS_LAMBDA(const host_member_type& teamMember, size_t& t_max_num_neighbors) {
+            //// determine scratch space size needed
+            //int team_scratch_size = 0;
+            //team_scratch_size += scratch_double_view::shmem_size(neighbor_lists.extent(1)); // distances
+            //team_scratch_size += scratch_int_view::shmem_size(neighbor_lists.extent(1)); // indices
+            //team_scratch_size += scratch_double_view::shmem_size(_dim); // target coordinate
 
-                // make unmanaged scratch views
-                scratch_double_view neighbor_distances(teamMember.team_scratch(0 /*shared memory*/), neighbor_lists.extent(1));
-                scratch_int_view neighbor_indices(teamMember.team_scratch(0 /*shared memory*/), neighbor_lists.extent(1));
-                scratch_double_view this_target_coord(teamMember.team_scratch(0 /*shared memory*/), _dim);
+            //// maximum number of neighbors found over all target sites' neighborhoods
+            //size_t max_num_neighbors = 0;
+            //// part 2. do radius search using window size from knn search
+            //// each row of neighbor lists is a neighbor list for the target site corresponding to that row
+            //Kokkos::parallel_reduce("radius search", host_team_policy(num_target_sites, Kokkos::AUTO)
+            //        .set_scratch_size(0 /*shared memory level*/, Kokkos::PerTeam(team_scratch_size)), 
+            //        KOKKOS_LAMBDA(const host_member_type& teamMember, size_t& t_max_num_neighbors) {
 
-                size_t neighbors_found = 0;
+            //    // make unmanaged scratch views
+            //    scratch_double_view neighbor_distances(teamMember.team_scratch(0 /*shared memory*/), neighbor_lists.extent(1));
+            //    scratch_int_view neighbor_indices(teamMember.team_scratch(0 /*shared memory*/), neighbor_lists.extent(1));
+            //    scratch_double_view this_target_coord(teamMember.team_scratch(0 /*shared memory*/), _dim);
 
-                const int i = teamMember.league_rank();
+            //    size_t neighbors_found = 0;
 
-                // set epsilons if radius is specified
-                if (uniform_radius > 0) epsilons(i) = uniform_radius;
+            //    const int i = teamMember.league_rank();
 
-                // needs furthest neighbor's distance for next portion
-                compadre_kernel_assert_release((epsilons(i)<=max_search_radius || max_search_radius==0) && "max_search_radius given (generally derived from the size of a halo region), and search radius needed would exceed this max_search_radius.");
+            //    // set epsilons if radius is specified
+            //    if (uniform_radius > 0) epsilons(i) = uniform_radius;
 
-                Kokkos::parallel_for(Kokkos::TeamThreadRange(teamMember, neighbor_lists.extent(1)), [&](const int j) { 
-                    neighbor_indices(j) = 0;
-                    neighbor_distances(j) = -1.0;
-                });
-                teamMember.team_barrier();
+            //    // needs furthest neighbor's distance for next portion
+            //    compadre_kernel_assert_release((epsilons(i)<=max_search_radius || max_search_radius==0) && "max_search_radius given (generally derived from the size of a halo region), and search radius needed would exceed this max_search_radius.");
 
-                Kokkos::single(Kokkos::PerTeam(teamMember), [&] () {
-                    // target_coords is LayoutLeft on device and its HostMirror, so giving a pointer to 
-                    // this data would lead to a wrong result if the device is a GPU
+            //    Kokkos::parallel_for(Kokkos::TeamThreadRange(teamMember, neighbor_lists.extent(1)), [&](const int j) { 
+            //        neighbor_indices(j) = 0;
+            //        neighbor_distances(j) = -1.0;
+            //    });
+            //    teamMember.team_barrier();
 
-                    for (int j=0; j<_dim; ++j) {
-                        this_target_coord(j) = trg_pts_view(i,j);
-                    }
+            //    Kokkos::single(Kokkos::PerTeam(teamMember), [&] () {
+            //        // target_coords is LayoutLeft on device and its HostMirror, so giving a pointer to 
+            //        // this data would lead to a wrong result if the device is a GPU
 
-                    nanoflann::SearchParams sp; // default parameters
-                    Compadre::RadiusResultSet<double> rrs(epsilons(i)*epsilons(i), neighbor_distances.data(), neighbor_indices.data(), neighbor_lists.extent(1));
-                    if (_dim==1) {
-                        neighbors_found = _tree_1d->template radiusSearchCustomCallback<Compadre::RadiusResultSet<double> >(this_target_coord.data(), rrs, sp) ;
-                    } else if (_dim==2) {
-                        neighbors_found = _tree_2d->template radiusSearchCustomCallback<Compadre::RadiusResultSet<double> >(this_target_coord.data(), rrs, sp) ;
-                    } else if (_dim==3) {
-                        neighbors_found = _tree_3d->template radiusSearchCustomCallback<Compadre::RadiusResultSet<double> >(this_target_coord.data(), rrs, sp) ;
-                    }
+            //        for (int j=0; j<_dim; ++j) {
+            //            this_target_coord(j) = trg_pts_view(i,j);
+            //        }
 
-                    t_max_num_neighbors = (neighbors_found > t_max_num_neighbors) ? neighbors_found : t_max_num_neighbors;
-            
-                    // the number of neighbors is stored in column zero of the neighbor lists 2D array
-                    neighbor_lists(i,0) = neighbors_found;
+            //        nanoflann::SearchParams sp; // default parameters
+            //        Compadre::RadiusResultSet<double> rrs(epsilons(i)*epsilons(i), neighbor_distances.data(), neighbor_indices.data(), neighbor_lists.extent(1));
+            //        if (_dim==1) {
+            //            neighbors_found = _tree_1d->template radiusSearchCustomCallback<Compadre::RadiusResultSet<double> >(this_target_coord.data(), rrs, sp) ;
 
-                    // epsilons already scaled and then set by search radius
-                });
-                teamMember.team_barrier();
-
-                // loop_bound so that we don't write into memory we don't have allocated
-                int loop_bound = (neighbors_found < neighbor_lists.extent(1)-1) ? neighbors_found : neighbor_lists.extent(1)-1;
-                // loop over each neighbor index and fill with a value
-                if (!is_dry_run) {
-                    Kokkos::parallel_for(Kokkos::TeamThreadRange(teamMember, loop_bound), [&](const int j) {
-                        // cast to an whatever data type the 2D array of neighbor lists is using
-                        neighbor_lists(i,j+1) = static_cast<typename std::remove_pointer<typename std::remove_pointer<typename neighbor_lists_view_type::data_type>::type>::type>(neighbor_indices(j));
-                    });
-                    teamMember.team_barrier();
-                }
+            //        } else if (_dim==2) {
+            //            neighbors_found = _tree_2d->template radiusSearchCustomCallback<Compadre::RadiusResultSet<double> >(this_target_coord.data(), rrs, sp) ;
 
-            }, Kokkos::Max<size_t>(max_num_neighbors) );
-            Kokkos::fence();
+            //        } else if (_dim==3) {
+            //            neighbors_found = _tree_3d->template radiusSearchCustomCallback<Compadre::RadiusResultSet<double> >(this_target_coord.data(), rrs, sp) ;
 
-            // check if max_num_neighbors will fit onto pre-allocated space
-            compadre_assert_release((neighbor_lists.extent(1) >= (max_num_neighbors+1) || is_dry_run) 
-                    && "neighbor_lists does not contain enough columns for the maximum number of neighbors needing to be stored.");
+            //        }
 
-            return max_num_neighbors;
+            //        t_max_num_neighbors = (neighbors_found > t_max_num_neighbors) ? neighbors_found : t_max_num_neighbors;
+            //
+            //        // the number of neighbors is stored in column zero of the neighbor lists 2D array
+            //        neighbor_lists(i,0) = neighbors_found;
+
+            //        // epsilons already scaled and then set by search radius
+            //    });
+            //    teamMember.team_barrier();
+
+            //    // loop_bound so that we don't write into memory we don't have allocated
+            //    int loop_bound = (neighbors_found < neighbor_lists.extent(1)-1) ? neighbors_found : neighbor_lists.extent(1)-1;
+            //    // loop over each neighbor index and fill with a value
+            //    if (!is_dry_run) {
+            //        Kokkos::parallel_for(Kokkos::TeamThreadRange(teamMember, loop_bound), [&](const int j) {
+            //            // cast to an whatever data type the 2D array of neighbor lists is using
+            //            neighbor_lists(i,j+1) = static_cast<typename std::remove_pointer<typename std::remove_pointer<typename neighbor_lists_view_type::data_type>::type>::type>(neighbor_indices(j));
+            //        });
+            //        teamMember.team_barrier();
+            //    }
+
+            //}, Kokkos::Max<size_t>(max_num_neighbors) );
+            //Kokkos::fence();
+
+            //// check if max_num_neighbors will fit onto pre-allocated space
+            //compadre_assert_release((neighbor_lists.extent(1) >= (max_num_neighbors+1) || is_dry_run) 
+            //        && "neighbor_lists does not contain enough columns for the maximum number of neighbors needing to be stored.");
+
+            return 0;//max_num_neighbors;
         }
 
         /*! \brief Generates compressed row neighbor lists by performing a radius search 
@@ -382,14 +292,68 @@ class PointCloudSearch {
             // loop size
             const int num_target_sites = trg_pts_view.extent(0);
 
-            if ((!_tree_1d && _dim==1) || (!_tree_2d && _dim==2) || (!_tree_3d && _dim==3)) {
-                this->generateKDTree();
-            }
-
             compadre_assert_release((number_of_neighbors_list.extent(0)==(size_t)num_target_sites)
                         && "number_of_neighbors_list or neighbor lists View does not have large enough dimensions");
             compadre_assert_release((neighbor_lists_view_type::rank==1) && "neighbor_lists must be a 1D Kokkos view.");
 
+            compadre_assert_release((epsilons.extent(0)==(size_t)num_target_sites)
+                        && "epsilons View does not have the correct dimension");
+
+            typedef Kokkos::View<double*, Kokkos::HostSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> > 
+                    scratch_double_view;
+
+            // build target points into a cloud of sphere with radius given as epsilons(i)
+            Kokkos::View<ArborX::Sphere *> cloud("trg_point_cloud", trg_pts_view.extent(0));
+            Kokkos::parallel_for(num_target_sites, KOKKOS_LAMBDA(int i) {
+                compadre_kernel_assert_release((epsilons(i)<=max_search_radius || max_search_radius==0) && "max_search_radius given (generally derived from the size of a halo region), and search radius needed would exceed this max_search_radius.");
+                if (uniform_radius > 0) epsilons(i) = uniform_radius;
+                if (_dim==1) {
+                    cloud(i) = {{{trg_pts_view(i,0),0,0}}, epsilons(i)};
+                }
+                if (_dim==2) {
+                    cloud(i) = {{{trg_pts_view(i,0),trg_pts_view(i,1),0}}, epsilons(i)};
+                }
+                if (_dim==3) {
+                    cloud(i) = {{{trg_pts_view(i,0),trg_pts_view(i,1),trg_pts_view(i,2)}}, epsilons(i)};
+                }
+            });
+            Kokkos::fence();
+
+            // build queries
+            Kokkos::View<ArborX::Intersects<ArborX::Sphere> *, device_memory_space> 
+                queries("queries", num_target_sites);
+            Kokkos::parallel_for(Kokkos::RangePolicy<device_execution_space>(0, num_target_sites),
+            KOKKOS_LAMBDA(int i) {
+                queries(i) = ArborX::intersects(cloud(i));
+            });
+            Kokkos::fence();
+
+            // perform tree search
+            Kokkos::View<int *, device_memory_space> values("values", 0);
+            Kokkos::View<int *, device_memory_space> offsets("offsets", 0);
+            _tree.query(device_execution_space(), queries, values, offsets);
+
+
+            // set number of neighbors list (how many neighbors for each target site) based
+            // on results on tree query
+            Kokkos::parallel_for(Kokkos::RangePolicy<device_execution_space>(0, num_target_sites),
+            KOKKOS_LAMBDA(int i) {
+                size_t neighbors_found_for_target_i = 0;
+                if (i==num_target_sites-1) {
+                    neighbors_found_for_target_i = values.extent(0) - offsets(i);
+                } else {
+                    neighbors_found_for_target_i = offsets(i+1) - offsets(i);
+                }
+                if (is_dry_run || uniform_radius!=0.0) {
+                    number_of_neighbors_list(i) = neighbors_found_for_target_i;
+                } else {
+                    compadre_kernel_assert_debug((neighbors_found==(size_t)number_of_neighbors_list(i)) 
+                            && "Number of neighbors found changed since dry-run.");
+                }
+            });
+            Kokkos::fence();
+
+            // build a row offsets object (only if not a dry run)
             typedef Kokkos::View<global_index_type*, typename neighbor_lists_view_type::array_layout,
                     typename neighbor_lists_view_type::memory_space, typename neighbor_lists_view_type::memory_traits> row_offsets_view_type;
             row_offsets_view_type row_offsets;
@@ -405,92 +369,53 @@ class PointCloudSearch {
                 Kokkos::fence();
             }
 
-            compadre_assert_release((epsilons.extent(0)==(size_t)num_target_sites)
-                        && "epsilons View does not have the correct dimension");
-
-            typedef Kokkos::View<double*, Kokkos::HostSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> > 
-                    scratch_double_view;
-
-            typedef Kokkos::View<size_t*, Kokkos::HostSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> > 
-                    scratch_int_view;
-
-            // determine scratch space size needed
+            // sort to put closest neighbor first (other neighbors are not affected)
             int team_scratch_size = 0;
-            team_scratch_size += scratch_double_view::shmem_size(max_neighbor_list_row_storage_size); // distances
-            team_scratch_size += scratch_int_view::shmem_size(max_neighbor_list_row_storage_size); // indices
-            team_scratch_size += scratch_double_view::shmem_size(_dim); // target coordinate
-
-            // part 2. do radius search using window size from knn search
-            // each row of neighbor lists is a neighbor list for the target site corresponding to that row
+            team_scratch_size += scratch_double_view::shmem_size(trg_pts_view.extent(1)); // distances
             Kokkos::parallel_for("radius search", host_team_policy(num_target_sites, Kokkos::AUTO)
                     .set_scratch_size(0 /*shared memory level*/, Kokkos::PerTeam(team_scratch_size)), 
                     KOKKOS_LAMBDA(const host_member_type& teamMember) {
 
-                // make unmanaged scratch views
-                scratch_double_view neighbor_distances(teamMember.team_scratch(0 /*shared memory*/), max_neighbor_list_row_storage_size);
-                scratch_int_view neighbor_indices(teamMember.team_scratch(0 /*shared memory*/), max_neighbor_list_row_storage_size);
-                scratch_double_view this_target_coord(teamMember.team_scratch(0 /*shared memory*/), _dim);
-
-                size_t neighbors_found = 0;
-
                 const int i = teamMember.league_rank();
 
-                // set epsilons if radius is specified
-                if (uniform_radius > 0) epsilons(i) = uniform_radius;
-
-                // needs furthest neighbor's distance for next portion
-                compadre_kernel_assert_release((epsilons(i)<=max_search_radius || max_search_radius==0) && "max_search_radius given (generally derived from the size of a halo region), and search radius needed would exceed this max_search_radius.");
-
-                Kokkos::parallel_for(Kokkos::TeamThreadRange(teamMember, max_neighbor_list_row_storage_size), [&](const int j) { 
-                    neighbor_indices(j) = 0;
-                    neighbor_distances(j) = -1.0;
-                });
-                teamMember.team_barrier();
-
-                Kokkos::single(Kokkos::PerTeam(teamMember), [&] () {
-                    // target_coords is LayoutLeft on device and its HostMirror, so giving a pointer to 
-                    // this data would lead to a wrong result if the device is a GPU
-
-                    for (int j=0; j<_dim; ++j) {
-                        this_target_coord(j) = trg_pts_view(i,j);
-                    }
+                // make unmanaged scratch views
+                scratch_double_view trg_pt(teamMember.team_scratch(0 /*shared memory*/), trg_pts_view.extent(1));
+                for (int j=0; j<trg_pts_view.extent(1); ++j) {
+                    trg_pt(j) = trg_pts_view(i,j);
+                }
 
-                    nanoflann::SearchParams sp; // default parameters
-                    Compadre::RadiusResultSet<double> rrs(epsilons(i)*epsilons(i), neighbor_distances.data(), neighbor_indices.data(), max_neighbor_list_row_storage_size);
-                    if (_dim==1) {
-                        neighbors_found = _tree_1d->template radiusSearchCustomCallback<Compadre::RadiusResultSet<double> >(this_target_coord.data(), rrs, sp) ;
-                    } else if (_dim==2) {
-                        neighbors_found = _tree_2d->template radiusSearchCustomCallback<Compadre::RadiusResultSet<double> >(this_target_coord.data(), rrs, sp) ;
-                    } else if (_dim==3) {
-                        neighbors_found = _tree_3d->template radiusSearchCustomCallback<Compadre::RadiusResultSet<double> >(this_target_coord.data(), rrs, sp) ;
-                    }
-            
-                    // we check that neighbors found doesn't differ from dry-run or we store neighbors_found
-                    // no check that neighbors found stay the same if uniform_radius specified (!=0)
-                    if (is_dry_run || uniform_radius!=0.0) {
-                        number_of_neighbors_list(i) = neighbors_found;
-                    } else {
-                        compadre_kernel_assert_debug((neighbors_found==(size_t)number_of_neighbors_list(i)) 
-                                && "Number of neighbors found changed since dry-run.");
+                // find swap index
+                int min_distance_ind = 0;
+                double first_neighbor_distance = kdtreeDistance(trg_pt.data(), values(offsets(i)));
+                for (int j=1; j<number_of_neighbors_list(i); ++j) {
+                    // distance to neighbor
+                    double neighbor_distance = kdtreeDistance(trg_pt.data(), values(offsets(i)+j));
+                    if (neighbor_distance < first_neighbor_distance) {
+                        first_neighbor_distance = neighbor_distance;
+                        min_distance_ind = j;
                     }
-
-                    // epsilons already scaled and then set by search radius
-                });
-                teamMember.team_barrier();
-
-                // loop_bound so that we don't write into memory we don't have allocated
-                int loop_bound = neighbors_found;
-                // loop over each neighbor index and fill with a value
-                if (!is_dry_run) {
-                    Kokkos::parallel_for(Kokkos::TeamThreadRange(teamMember, loop_bound), [&](const int j) {
-                        // cast to an whatever data type the 2D array of neighbor lists is using
-                        neighbor_lists(row_offsets(i)+j) = static_cast<typename std::remove_pointer<typename std::remove_pointer<typename neighbor_lists_view_type::data_type>::type>::type>(neighbor_indices(j));
-                    });
-                    teamMember.team_barrier();
                 }
+                // do the swap
+                if (min_distance_ind != 0) {
+                    int tmp = values(offsets(i));
+                    values(offsets(i)) = values(offsets(i)+min_distance_ind);
+                    values(offsets(i)+min_distance_ind) = tmp;
 
+                }
             });
             Kokkos::fence();
+
+            // copy neighbor list values over from tree query
+            if (!is_dry_run) {
+                Kokkos::parallel_for(Kokkos::RangePolicy<device_execution_space>(0, num_target_sites),
+                KOKKOS_LAMBDA(int i) {
+                    for (int j=0; j<number_of_neighbors_list(i); ++j) {
+                        neighbor_lists(row_offsets(i)+j) = values(offsets(i)+j);
+                    }
+                });
+                Kokkos::fence();
+            }
+
             auto nla = CreateNeighborLists(number_of_neighbors_list);
             return nla.getTotalNeighborsOverAllListsHost();
         }
@@ -527,114 +452,114 @@ class PointCloudSearch {
             // loop size
             const int num_target_sites = trg_pts_view.extent(0);
 
-            if ((!_tree_1d && _dim==1) || (!_tree_2d && _dim==2) || (!_tree_3d && _dim==3)) {
-                this->generateKDTree();
-            }
-            Kokkos::fence();
-
-            compadre_assert_release((num_target_sites==0 || // sizes don't matter when there are no targets
-                    (neighbor_lists.extent(0)==(size_t)num_target_sites 
-                        && neighbor_lists.extent(1)>=(size_t)(neighbors_needed+1)))
-                        && "neighbor lists View does not have large enough dimensions");
-            compadre_assert_release((neighbor_lists_view_type::rank==2) && "neighbor_lists must be a 2D Kokkos view.");
-
-            compadre_assert_release((epsilons.extent(0)==(size_t)num_target_sites)
-                        && "epsilons View does not have the correct dimension");
-
-            typedef Kokkos::View<double*, Kokkos::HostSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> > 
-                    scratch_double_view;
-
-            typedef Kokkos::View<size_t*, Kokkos::HostSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> > 
-                    scratch_int_view;
-
-            // determine scratch space size needed
-            int team_scratch_size = 0;
-            team_scratch_size += scratch_double_view::shmem_size(neighbor_lists.extent(1)); // distances
-            team_scratch_size += scratch_int_view::shmem_size(neighbor_lists.extent(1)); // indices
-            team_scratch_size += scratch_double_view::shmem_size(_dim); // target coordinate
-
-            // minimum number of neighbors found over all target sites' neighborhoods
-            size_t min_num_neighbors = 0;
+            //if ((!_tree_1d && _dim==1) || (!_tree_2d && _dim==2) || (!_tree_3d && _dim==3)) {
+            //    this->generateKDTree();
+            //}
+            //Kokkos::fence();
+
+            //compadre_assert_release((num_target_sites==0 || // sizes don't matter when there are no targets
+            //        (neighbor_lists.extent(0)==(size_t)num_target_sites 
+            //            && neighbor_lists.extent(1)>=(size_t)(neighbors_needed+1)))
+            //            && "neighbor lists View does not have large enough dimensions");
+            //compadre_assert_release((neighbor_lists_view_type::rank==2) && "neighbor_lists must be a 2D Kokkos view.");
+
+            //compadre_assert_release((epsilons.extent(0)==(size_t)num_target_sites)
+            //            && "epsilons View does not have the correct dimension");
+
+            //typedef Kokkos::View<double*, Kokkos::HostSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> > 
+            //        scratch_double_view;
+
+            //typedef Kokkos::View<size_t*, Kokkos::HostSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> > 
+            //        scratch_int_view;
+
+            //// determine scratch space size needed
+            //int team_scratch_size = 0;
+            //team_scratch_size += scratch_double_view::shmem_size(neighbor_lists.extent(1)); // distances
+            //team_scratch_size += scratch_int_view::shmem_size(neighbor_lists.extent(1)); // indices
+            //team_scratch_size += scratch_double_view::shmem_size(_dim); // target coordinate
+
+            //// minimum number of neighbors found over all target sites' neighborhoods
+            //size_t min_num_neighbors = 0;
+            ////
+            //// part 1. do knn search for neighbors needed for unisolvency
+            //// each row of neighbor lists is a neighbor list for the target site corresponding to that row
+            ////
+            //// as long as neighbor_lists can hold the number of neighbors_needed, we don't need to check
+            //// that the maximum number of neighbors will fit into neighbor_lists
+            ////
+            //Kokkos::parallel_reduce("knn search", host_team_policy(num_target_sites, Kokkos::AUTO)
+            //        .set_scratch_size(0 /*shared memory level*/, Kokkos::PerTeam(team_scratch_size)), 
+            //        KOKKOS_LAMBDA(const host_member_type& teamMember, size_t& t_min_num_neighbors) {
+
+            //    // make unmanaged scratch views
+            //    scratch_double_view neighbor_distances(teamMember.team_scratch(0 /*shared memory*/), neighbor_lists.extent(1));
+            //    scratch_int_view neighbor_indices(teamMember.team_scratch(0 /*shared memory*/), neighbor_lists.extent(1));
+            //    scratch_double_view this_target_coord(teamMember.team_scratch(0 /*shared memory*/), _dim);
+
+            //    size_t neighbors_found = 0;
+
+            //    const int i = teamMember.league_rank();
+
+            //    Kokkos::parallel_for(Kokkos::TeamThreadRange(teamMember, neighbor_lists.extent(1)), [=](const int j) {
+            //        neighbor_indices(j) = 0;
+            //        neighbor_distances(j) = -1.0;
+            //    });
             //
-            // part 1. do knn search for neighbors needed for unisolvency
-            // each row of neighbor lists is a neighbor list for the target site corresponding to that row
+            //    teamMember.team_barrier();
+            //    Kokkos::single(Kokkos::PerTeam(teamMember), [&] () {
+            //        // target_coords is LayoutLeft on device and its HostMirror, so giving a pointer to 
+            //        // this data would lead to a wrong result if the device is a GPU
+
+            //        for (int j=0; j<_dim; ++j) { 
+            //            this_target_coord(j) = trg_pts_view(i,j);
+            //        }
+
+            //        if (_dim==1) {
+            //            neighbors_found = _tree_1d->knnSearch(this_target_coord.data(), neighbors_needed, 
+            //                    neighbor_indices.data(), neighbor_distances.data()) ;
+            //        } else if (_dim==2) {
+            //            neighbors_found = _tree_2d->knnSearch(this_target_coord.data(), neighbors_needed, 
+            //                    neighbor_indices.data(), neighbor_distances.data()) ;
+            //        } else if (_dim==3) {
+            //            neighbors_found = _tree_3d->knnSearch(this_target_coord.data(), neighbors_needed, 
+            //                    neighbor_indices.data(), neighbor_distances.data()) ;
+            //        }
+
+            //        // get minimum number of neighbors found over all target sites' neighborhoods
+            //        t_min_num_neighbors = (neighbors_found < t_min_num_neighbors) ? neighbors_found : t_min_num_neighbors;
             //
-            // as long as neighbor_lists can hold the number of neighbors_needed, we don't need to check
-            // that the maximum number of neighbors will fit into neighbor_lists
+            //        // scale by epsilon_multiplier to window from location where the last neighbor was found
+            //        epsilons(i) = (neighbor_distances(neighbors_found-1) > 0) ?
+            //            std::sqrt(neighbor_distances(neighbors_found-1))*epsilon_multiplier : 1e-14*epsilon_multiplier;
+            //        // the only time the second case using 1e-14 is used is when either zero neighbors or exactly one 
+            //        // neighbor (neighbor is target site) is found.  when the follow on radius search is conducted, the one
+            //        // neighbor (target site) will not be found if left at 0, so any positive amount will do, however 1e-14 
+            //        // should is small enough to ensure that other neighbors are not found
+
+            //        // needs furthest neighbor's distance for next portion
+            //        compadre_kernel_assert_release((neighbors_found<neighbor_lists.extent(1) || is_dry_run) 
+            //                && "Neighbors found exceeded storage capacity in neighbor list.");
+            //        compadre_kernel_assert_release((epsilons(i)<=max_search_radius || max_search_radius==0 || is_dry_run) 
+            //                && "max_search_radius given (generally derived from the size of a halo region), \
+            //                    and search radius needed would exceed this max_search_radius.");
+            //        // neighbor_distances stores squared distances from neighbor to target, as returned by nanoflann
+            //    });
+            //}, Kokkos::Min<size_t>(min_num_neighbors) );
+            //Kokkos::fence();
             //
-            Kokkos::parallel_reduce("knn search", host_team_policy(num_target_sites, Kokkos::AUTO)
-                    .set_scratch_size(0 /*shared memory level*/, Kokkos::PerTeam(team_scratch_size)), 
-                    KOKKOS_LAMBDA(const host_member_type& teamMember, size_t& t_min_num_neighbors) {
-
-                // make unmanaged scratch views
-                scratch_double_view neighbor_distances(teamMember.team_scratch(0 /*shared memory*/), neighbor_lists.extent(1));
-                scratch_int_view neighbor_indices(teamMember.team_scratch(0 /*shared memory*/), neighbor_lists.extent(1));
-                scratch_double_view this_target_coord(teamMember.team_scratch(0 /*shared memory*/), _dim);
-
-                size_t neighbors_found = 0;
-
-                const int i = teamMember.league_rank();
-
-                Kokkos::parallel_for(Kokkos::TeamThreadRange(teamMember, neighbor_lists.extent(1)), [=](const int j) {
-                    neighbor_indices(j) = 0;
-                    neighbor_distances(j) = -1.0;
-                });
-            
-                teamMember.team_barrier();
-                Kokkos::single(Kokkos::PerTeam(teamMember), [&] () {
-                    // target_coords is LayoutLeft on device and its HostMirror, so giving a pointer to 
-                    // this data would lead to a wrong result if the device is a GPU
-
-                    for (int j=0; j<_dim; ++j) { 
-                        this_target_coord(j) = trg_pts_view(i,j);
-                    }
+            //// if no target sites, then min_num_neighbors is set to neighbors_needed
+            //// which also avoids min_num_neighbors being improperly set by min reduction
+            //if (num_target_sites==0) min_num_neighbors = neighbors_needed;
 
-                    if (_dim==1) {
-                        neighbors_found = _tree_1d->knnSearch(this_target_coord.data(), neighbors_needed, 
-                                neighbor_indices.data(), neighbor_distances.data()) ;
-                    } else if (_dim==2) {
-                        neighbors_found = _tree_2d->knnSearch(this_target_coord.data(), neighbors_needed, 
-                                neighbor_indices.data(), neighbor_distances.data()) ;
-                    } else if (_dim==3) {
-                        neighbors_found = _tree_3d->knnSearch(this_target_coord.data(), neighbors_needed, 
-                                neighbor_indices.data(), neighbor_distances.data()) ;
-                    }
+            //// Next, check that we found the neighbors_needed number that we require for unisolvency
+            //compadre_assert_release((num_target_sites==0 || (min_num_neighbors>=(size_t)neighbors_needed))
+            //        && "Neighbor search failed to find number of neighbors needed for unisolvency.");
+            //
+            //// call a radius search using values now stored in epsilons
+            //size_t max_num_neighbors = generate2DNeighborListsFromRadiusSearch(is_dry_run, trg_pts_view, neighbor_lists, 
+            //        epsilons, 0.0 /*don't set uniform radius*/, max_search_radius);
 
-                    // get minimum number of neighbors found over all target sites' neighborhoods
-                    t_min_num_neighbors = (neighbors_found < t_min_num_neighbors) ? neighbors_found : t_min_num_neighbors;
-            
-                    // scale by epsilon_multiplier to window from location where the last neighbor was found
-                    epsilons(i) = (neighbor_distances(neighbors_found-1) > 0) ?
-                        std::sqrt(neighbor_distances(neighbors_found-1))*epsilon_multiplier : 1e-14*epsilon_multiplier;
-                    // the only time the second case using 1e-14 is used is when either zero neighbors or exactly one 
-                    // neighbor (neighbor is target site) is found.  when the follow on radius search is conducted, the one
-                    // neighbor (target site) will not be found if left at 0, so any positive amount will do, however 1e-14 
-                    // should is small enough to ensure that other neighbors are not found
-
-                    // needs furthest neighbor's distance for next portion
-                    compadre_kernel_assert_release((neighbors_found<neighbor_lists.extent(1) || is_dry_run) 
-                            && "Neighbors found exceeded storage capacity in neighbor list.");
-                    compadre_kernel_assert_release((epsilons(i)<=max_search_radius || max_search_radius==0 || is_dry_run) 
-                            && "max_search_radius given (generally derived from the size of a halo region), \
-                                and search radius needed would exceed this max_search_radius.");
-                    // neighbor_distances stores squared distances from neighbor to target, as returned by nanoflann
-                });
-            }, Kokkos::Min<size_t>(min_num_neighbors) );
-            Kokkos::fence();
-            
-            // if no target sites, then min_num_neighbors is set to neighbors_needed
-            // which also avoids min_num_neighbors being improperly set by min reduction
-            if (num_target_sites==0) min_num_neighbors = neighbors_needed;
-
-            // Next, check that we found the neighbors_needed number that we require for unisolvency
-            compadre_assert_release((num_target_sites==0 || (min_num_neighbors>=(size_t)neighbors_needed))
-                    && "Neighbor search failed to find number of neighbors needed for unisolvency.");
-            
-            // call a radius search using values now stored in epsilons
-            size_t max_num_neighbors = generate2DNeighborListsFromRadiusSearch(is_dry_run, trg_pts_view, neighbor_lists, 
-                    epsilons, 0.0 /*don't set uniform radius*/, max_search_radius);
-
-            return max_num_neighbors;
+            return 0;//max_num_neighbors;
         }
 
         /*! \brief Generates compressed row neighbor lists by performing a k-nearest neighbor search
@@ -669,114 +594,114 @@ class PointCloudSearch {
             // loop size
             const int num_target_sites = trg_pts_view.extent(0);
 
-            if ((!_tree_1d && _dim==1) || (!_tree_2d && _dim==2) || (!_tree_3d && _dim==3)) {
-                this->generateKDTree();
-            }
-            Kokkos::fence();
-
-            compadre_assert_release((number_of_neighbors_list.extent(0)==(size_t)num_target_sites ) 
-                        && "number_of_neighbors_list or neighbor lists View does not have large enough dimensions");
-            compadre_assert_release((neighbor_lists_view_type::rank==1) && "neighbor_lists must be a 1D Kokkos view.");
-
-            // if dry-run, neighbors_needed, else max over previous dry-run
-            int max_neighbor_list_row_storage_size = neighbors_needed;
-            if (!is_dry_run) {
-                auto nla = CreateNeighborLists(neighbor_lists, number_of_neighbors_list);
-                max_neighbor_list_row_storage_size = nla.getMaxNumNeighbors();
-            }
-
-            compadre_assert_release((epsilons.extent(0)==(size_t)num_target_sites)
-                        && "epsilons View does not have the correct dimension");
-
-            typedef Kokkos::View<double*, Kokkos::HostSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> > 
-                    scratch_double_view;
+            //if ((!_tree_1d && _dim==1) || (!_tree_2d && _dim==2) || (!_tree_3d && _dim==3)) {
+            //    this->generateKDTree();
+            //}
+            //Kokkos::fence();
 
-            typedef Kokkos::View<size_t*, Kokkos::HostSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> > 
-                    scratch_int_view;
+            //compadre_assert_release((number_of_neighbors_list.extent(0)==(size_t)num_target_sites ) 
+            //            && "number_of_neighbors_list or neighbor lists View does not have large enough dimensions");
+            //compadre_assert_release((neighbor_lists_view_type::rank==1) && "neighbor_lists must be a 1D Kokkos view.");
 
-            // determine scratch space size needed
-            int team_scratch_size = 0;
-            team_scratch_size += scratch_double_view::shmem_size(max_neighbor_list_row_storage_size); // distances
-            team_scratch_size += scratch_int_view::shmem_size(max_neighbor_list_row_storage_size); // indices
-            team_scratch_size += scratch_double_view::shmem_size(_dim); // target coordinate
+            //// if dry-run, neighbors_needed, else max over previous dry-run
+            //int max_neighbor_list_row_storage_size = neighbors_needed;
+            //if (!is_dry_run) {
+            //    auto nla = CreateNeighborLists(neighbor_lists, number_of_neighbors_list);
+            //    max_neighbor_list_row_storage_size = nla.getMaxNumNeighbors();
+            //}
 
-            // minimum number of neighbors found over all target sites' neighborhoods
-            size_t min_num_neighbors = 0;
+            //compadre_assert_release((epsilons.extent(0)==(size_t)num_target_sites)
+            //            && "epsilons View does not have the correct dimension");
+
+            //typedef Kokkos::View<double*, Kokkos::HostSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> > 
+            //        scratch_double_view;
+
+            //typedef Kokkos::View<size_t*, Kokkos::HostSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> > 
+            //        scratch_int_view;
+
+            //// determine scratch space size needed
+            //int team_scratch_size = 0;
+            //team_scratch_size += scratch_double_view::shmem_size(max_neighbor_list_row_storage_size); // distances
+            //team_scratch_size += scratch_int_view::shmem_size(max_neighbor_list_row_storage_size); // indices
+            //team_scratch_size += scratch_double_view::shmem_size(_dim); // target coordinate
+
+            //// minimum number of neighbors found over all target sites' neighborhoods
+            //size_t min_num_neighbors = 0;
+            ////
+            //// part 1. do knn search for neighbors needed for unisolvency
+            //// each row of neighbor lists is a neighbor list for the target site corresponding to that row
+            ////
+            //// as long as neighbor_lists can hold the number of neighbors_needed, we don't need to check
+            //// that the maximum number of neighbors will fit into neighbor_lists
+            ////
+            //Kokkos::parallel_reduce("knn search", host_team_policy(num_target_sites, Kokkos::AUTO)
+            //        .set_scratch_size(0 /*shared memory level*/, Kokkos::PerTeam(team_scratch_size)), 
+            //        KOKKOS_LAMBDA(const host_member_type& teamMember, size_t& t_min_num_neighbors) {
+
+            //    // make unmanaged scratch views
+            //    scratch_double_view neighbor_distances(teamMember.team_scratch(0 /*shared memory*/), max_neighbor_list_row_storage_size);
+            //    scratch_int_view neighbor_indices(teamMember.team_scratch(0 /*shared memory*/), max_neighbor_list_row_storage_size);
+            //    scratch_double_view this_target_coord(teamMember.team_scratch(0 /*shared memory*/), _dim);
+
+            //    size_t neighbors_found = 0;
+
+            //    const int i = teamMember.league_rank();
+
+            //    Kokkos::parallel_for(Kokkos::TeamThreadRange(teamMember, max_neighbor_list_row_storage_size), [=](const int j) {
+            //        neighbor_indices(j) = 0;
+            //        neighbor_distances(j) = -1.0;
+            //    });
             //
-            // part 1. do knn search for neighbors needed for unisolvency
-            // each row of neighbor lists is a neighbor list for the target site corresponding to that row
+            //    teamMember.team_barrier();
+            //    Kokkos::single(Kokkos::PerTeam(teamMember), [&] () {
+            //        // target_coords is LayoutLeft on device and its HostMirror, so giving a pointer to 
+            //        // this data would lead to a wrong result if the device is a GPU
+
+            //        for (int j=0; j<_dim; ++j) { 
+            //            this_target_coord(j) = trg_pts_view(i,j);
+            //        }
+
+            //        if (_dim==1) {
+            //            neighbors_found = _tree_1d->knnSearch(this_target_coord.data(), neighbors_needed, 
+            //                    neighbor_indices.data(), neighbor_distances.data()) ;
+            //        } else if (_dim==2) {
+            //            neighbors_found = _tree_2d->knnSearch(this_target_coord.data(), neighbors_needed, 
+            //                    neighbor_indices.data(), neighbor_distances.data()) ;
+            //        } else if (_dim==3) {
+            //            neighbors_found = _tree_3d->knnSearch(this_target_coord.data(), neighbors_needed, 
+            //                    neighbor_indices.data(), neighbor_distances.data()) ;
+            //        }
+
+            //        // get minimum number of neighbors found over all target sites' neighborhoods
+            //        t_min_num_neighbors = (neighbors_found < t_min_num_neighbors) ? neighbors_found : t_min_num_neighbors;
             //
-            // as long as neighbor_lists can hold the number of neighbors_needed, we don't need to check
-            // that the maximum number of neighbors will fit into neighbor_lists
+            //        // scale by epsilon_multiplier to window from location where the last neighbor was found
+            //        epsilons(i) = (neighbor_distances(neighbors_found-1) > 0) ?
+            //            std::sqrt(neighbor_distances(neighbors_found-1))*epsilon_multiplier : 1e-14*epsilon_multiplier;
+            //        // the only time the second case using 1e-14 is used is when either zero neighbors or exactly one 
+            //        // neighbor (neighbor is target site) is found.  when the follow on radius search is conducted, the one
+            //        // neighbor (target site) will not be found if left at 0, so any positive amount will do, however 1e-14 
+            //        // should is small enough to ensure that other neighbors are not found
+
+            //        compadre_kernel_assert_release((epsilons(i)<=max_search_radius || max_search_radius==0 || is_dry_run) 
+            //                && "max_search_radius given (generally derived from the size of a halo region), \
+            //                    and search radius needed would exceed this max_search_radius.");
+            //        // neighbor_distances stores squared distances from neighbor to target, as returned by nanoflann
+            //    });
+            //}, Kokkos::Min<size_t>(min_num_neighbors) );
+            //Kokkos::fence();
             //
-            Kokkos::parallel_reduce("knn search", host_team_policy(num_target_sites, Kokkos::AUTO)
-                    .set_scratch_size(0 /*shared memory level*/, Kokkos::PerTeam(team_scratch_size)), 
-                    KOKKOS_LAMBDA(const host_member_type& teamMember, size_t& t_min_num_neighbors) {
-
-                // make unmanaged scratch views
-                scratch_double_view neighbor_distances(teamMember.team_scratch(0 /*shared memory*/), max_neighbor_list_row_storage_size);
-                scratch_int_view neighbor_indices(teamMember.team_scratch(0 /*shared memory*/), max_neighbor_list_row_storage_size);
-                scratch_double_view this_target_coord(teamMember.team_scratch(0 /*shared memory*/), _dim);
+            //// if no target sites, then min_num_neighbors is set to neighbors_needed
+            //// which also avoids min_num_neighbors being improperly set by min reduction
+            //if (num_target_sites==0) min_num_neighbors = neighbors_needed;
 
-                size_t neighbors_found = 0;
-
-                const int i = teamMember.league_rank();
-
-                Kokkos::parallel_for(Kokkos::TeamThreadRange(teamMember, max_neighbor_list_row_storage_size), [=](const int j) {
-                    neighbor_indices(j) = 0;
-                    neighbor_distances(j) = -1.0;
-                });
-            
-                teamMember.team_barrier();
-                Kokkos::single(Kokkos::PerTeam(teamMember), [&] () {
-                    // target_coords is LayoutLeft on device and its HostMirror, so giving a pointer to 
-                    // this data would lead to a wrong result if the device is a GPU
-
-                    for (int j=0; j<_dim; ++j) { 
-                        this_target_coord(j) = trg_pts_view(i,j);
-                    }
-
-                    if (_dim==1) {
-                        neighbors_found = _tree_1d->knnSearch(this_target_coord.data(), neighbors_needed, 
-                                neighbor_indices.data(), neighbor_distances.data()) ;
-                    } else if (_dim==2) {
-                        neighbors_found = _tree_2d->knnSearch(this_target_coord.data(), neighbors_needed, 
-                                neighbor_indices.data(), neighbor_distances.data()) ;
-                    } else if (_dim==3) {
-                        neighbors_found = _tree_3d->knnSearch(this_target_coord.data(), neighbors_needed, 
-                                neighbor_indices.data(), neighbor_distances.data()) ;
-                    }
-
-                    // get minimum number of neighbors found over all target sites' neighborhoods
-                    t_min_num_neighbors = (neighbors_found < t_min_num_neighbors) ? neighbors_found : t_min_num_neighbors;
-            
-                    // scale by epsilon_multiplier to window from location where the last neighbor was found
-                    epsilons(i) = (neighbor_distances(neighbors_found-1) > 0) ?
-                        std::sqrt(neighbor_distances(neighbors_found-1))*epsilon_multiplier : 1e-14*epsilon_multiplier;
-                    // the only time the second case using 1e-14 is used is when either zero neighbors or exactly one 
-                    // neighbor (neighbor is target site) is found.  when the follow on radius search is conducted, the one
-                    // neighbor (target site) will not be found if left at 0, so any positive amount will do, however 1e-14 
-                    // should is small enough to ensure that other neighbors are not found
-
-                    compadre_kernel_assert_release((epsilons(i)<=max_search_radius || max_search_radius==0 || is_dry_run) 
-                            && "max_search_radius given (generally derived from the size of a halo region), \
-                                and search radius needed would exceed this max_search_radius.");
-                    // neighbor_distances stores squared distances from neighbor to target, as returned by nanoflann
-                });
-            }, Kokkos::Min<size_t>(min_num_neighbors) );
-            Kokkos::fence();
-            
-            // if no target sites, then min_num_neighbors is set to neighbors_needed
-            // which also avoids min_num_neighbors being improperly set by min reduction
-            if (num_target_sites==0) min_num_neighbors = neighbors_needed;
-
-            // Next, check that we found the neighbors_needed number that we require for unisolvency
-            compadre_assert_release((num_target_sites==0 || (min_num_neighbors>=(size_t)neighbors_needed))
-                    && "Neighbor search failed to find number of neighbors needed for unisolvency.");
-            
-            // call a radius search using values now stored in epsilons
-            generateCRNeighborListsFromRadiusSearch(is_dry_run, trg_pts_view, neighbor_lists, 
-                    number_of_neighbors_list, epsilons, 0.0 /*don't set uniform radius*/, max_search_radius);
+            //// Next, check that we found the neighbors_needed number that we require for unisolvency
+            //compadre_assert_release((num_target_sites==0 || (min_num_neighbors>=(size_t)neighbors_needed))
+            //        && "Neighbor search failed to find number of neighbors needed for unisolvency.");
+            //
+            //// call a radius search using values now stored in epsilons
+            //generateCRNeighborListsFromRadiusSearch(is_dry_run, trg_pts_view, neighbor_lists, 
+            //        number_of_neighbors_list, epsilons, 0.0 /*don't set uniform radius*/, max_search_radius);
 
             auto nla = CreateNeighborLists(number_of_neighbors_list);
             return nla.getTotalNeighborsOverAllListsHost();

From 9d6bb957d23c04eab2a2124c41cf87166b2222ff Mon Sep 17 00:00:00 2001
From: Paul Kuberry <pakuber@sandia.gov>
Date: Thu, 23 Sep 2021 07:52:35 -0600
Subject: [PATCH 02/40] Add ArborX to arborx folder at SHA 3ff6ce508f0fee7

---
 arborx/.clang-format                          |  22 +
 arborx/.clang-format-ignore                   |   0
 arborx/.clang-tidy                            | 109 +++
 arborx/.gitattributes                         |   7 +
 arborx/.github/workflows/gitlab-ci.yml        |  21 +
 arborx/.gitignore                             |   4 +
 arborx/.gitlab-ci.yml                         | 147 +++
 arborx/.jenkins                               | 462 +++++++++
 arborx/.mailmap                               |   2 +
 arborx/CMakeLists.txt                         | 171 ++++
 arborx/CONTRIBUTING.md                        |  12 +
 arborx/LICENSE                                |  27 +
 arborx/README.md                              |  57 ++
 arborx/benchmarks/CMakeLists.txt              |   7 +
 arborx/benchmarks/bvh_driver/CMakeLists.txt   |  16 +
 .../bvh_driver/benchmark_registration.hpp     | 441 +++++++++
 arborx/benchmarks/bvh_driver/bvh_driver.cpp   | 295 ++++++
 .../distributed_tree_driver/CMakeLists.txt    |   4 +
 .../distributed_tree_driver.cpp               | 637 ++++++++++++
 .../execution_space_instances/CMakeLists.txt  |   4 +
 .../execution_space_instances_driver.cpp      | 225 +++++
 .../benchmarks/point_clouds/point_clouds.hpp  | 216 ++++
 arborx/cmake/ArborXConfig.cmake.in            |  26 +
 arborx/cmake/ArborXSettings.cmake.in          |   4 +
 arborx/cmake/SetupVersion.cmake               |  30 +
 arborx/docker/.env                            |   2 +
 arborx/docker/Dockerfile                      | 145 +++
 arborx/docker/Dockerfile.hipcc                | 110 +++
 arborx/docker/Dockerfile.pgi                  | 122 +++
 arborx/docker/Dockerfile.sycl                 | 132 +++
 arborx/docker/README.md                       |  18 +
 arborx/docker/docker-compose.yml              |  20 +
 arborx/docs/LICENSE.ECL                       |  36 +
 arborx/docs/logos/arborx_logo_v1.0.png        | Bin 0 -> 79458 bytes
 arborx/docs/logos/arborx_logo_v1.0.svg        | 357 +++++++
 arborx/docs/logos/arborx_logo_v1.0_nobg.png   | Bin 0 -> 81640 bytes
 arborx/examples/CMakeLists.txt                |  20 +
 arborx/examples/access_traits/CMakeLists.txt  |   9 +
 .../example_cuda_access_traits.cpp            |  98 ++
 .../example_host_access_traits.cpp            |  52 +
 arborx/examples/brute_force/CMakeLists.txt    |   3 +
 arborx/examples/brute_force/brute_force.cpp   | 124 +++
 arborx/examples/callback/CMakeLists.txt       |   3 +
 arborx/examples/callback/example_callback.cpp | 145 +++
 .../dbscan/ArborX_DBSCANVerification.hpp      | 320 ++++++
 arborx/examples/dbscan/CMakeLists.txt         |  11 +
 arborx/examples/dbscan/README.md              |  62 ++
 arborx/examples/dbscan/converter.cpp          | 472 +++++++++
 arborx/examples/dbscan/dbscan.cpp             | 504 ++++++++++
 arborx/examples/dbscan/input.txt              |   9 +
 arborx/examples/raytracing/CMakeLists.txt     |   3 +
 .../raytracing/example_raytracing.cpp         | 200 ++++
 .../simple_intersection/CMakeLists.txt        |   3 +
 .../example_intersection.cpp                  | 168 ++++
 arborx/examples/viz/CMakeLists.txt            |   7 +
 arborx/examples/viz/arborx_query_sort.py      | 121 +++
 arborx/examples/viz/leaf_cloud.txt            |  59 ++
 arborx/examples/viz/requirements.txt          |   3 +
 arborx/examples/viz/tree_visualization.cpp    | 182 ++++
 arborx/scripts/benchmark.py                   | 101 ++
 arborx/scripts/benchmark_plot.py              | 199 ++++
 arborx/scripts/check_format_cpp.sh            |  75 ++
 arborx/scripts/docker_cmake                   |  25 +
 arborx/scripts/requirements.txt               |   3 +
 arborx/src/ArborX.hpp                         |  28 +
 arborx/src/ArborX_BruteForce.hpp              | 125 +++
 arborx/src/ArborX_Config.hpp.in               |  20 +
 arborx/src/ArborX_CrsGraphWrapper.hpp         |  46 +
 arborx/src/ArborX_DBSCAN.hpp                  | 502 ++++++++++
 arborx/src/ArborX_DistributedSearchTree.hpp   |  25 +
 arborx/src/ArborX_DistributedTree.hpp         | 225 +++++
 arborx/src/ArborX_LinearBVH.hpp               | 329 +++++++
 arborx/src/ArborX_Version.hpp.in              |  28 +
 arborx/src/details/ArborX_AccessTraits.hpp    | 192 ++++
 arborx/src/details/ArborX_Box.hpp             | 120 +++
 arborx/src/details/ArborX_Callbacks.hpp       | 212 ++++
 .../src/details/ArborX_DetailsAlgorithms.hpp  | 259 +++++
 .../details/ArborX_DetailsBatchedQueries.hpp  | 188 ++++
 .../details/ArborX_DetailsBruteForceImpl.hpp  | 152 +++
 arborx/src/details/ArborX_DetailsConcepts.hpp |  77 ++
 .../src/details/ArborX_DetailsContainers.hpp  | 106 ++
 .../ArborX_DetailsCrsGraphWrapperImpl.hpp     | 475 +++++++++
 .../ArborX_DetailsDistributedTreeImpl.hpp     | 921 ++++++++++++++++++
 .../src/details/ArborX_DetailsDistributor.hpp | 425 ++++++++
 arborx/src/details/ArborX_DetailsFDBSCAN.hpp  | 100 ++
 .../details/ArborX_DetailsFDBSCANDenseBox.hpp | 390 ++++++++
 .../ArborX_DetailsHappyTreeFriends.hpp        |  61 ++
 arborx/src/details/ArborX_DetailsHeap.hpp     | 129 +++
 ...rX_DetailsKokkosExtAccessibilityTraits.hpp |  50 +
 ...rborX_DetailsKokkosExtArithmeticTraits.hpp |  72 ++
 .../ArborX_DetailsKokkosExtMathFunctions.hpp  |  41 +
 ...rborX_DetailsKokkosExtMinMaxOperations.hpp |  36 +
 ...rX_DetailsKokkosExtScopedProfileRegion.hpp |  37 +
 .../src/details/ArborX_DetailsMortonCode.hpp  |  60 ++
 arborx/src/details/ArborX_DetailsNode.hpp     | 119 +++
 .../ArborX_DetailsOperatorFunctionObjects.hpp |  45 +
 .../details/ArborX_DetailsPermutedData.hpp    |  67 ++
 .../details/ArborX_DetailsPriorityQueue.hpp   | 113 +++
 .../src/details/ArborX_DetailsSortUtils.hpp   | 281 ++++++
 arborx/src/details/ArborX_DetailsStack.hpp    |  73 ++
 arborx/src/details/ArborX_DetailsTags.hpp     |  57 ++
 .../ArborX_DetailsTreeConstruction.hpp        | 416 ++++++++
 .../details/ArborX_DetailsTreeTraversal.hpp   | 473 +++++++++
 .../ArborX_DetailsTreeVisualization.hpp       | 242 +++++
 .../src/details/ArborX_DetailsUnionFind.hpp   | 189 ++++
 arborx/src/details/ArborX_DetailsUtils.hpp    | 578 +++++++++++
 arborx/src/details/ArborX_Exception.hpp       |  40 +
 arborx/src/details/ArborX_KDOP.hpp            | 316 ++++++
 arborx/src/details/ArborX_Point.hpp           |  74 ++
 arborx/src/details/ArborX_Predicates.hpp      | 143 +++
 arborx/src/details/ArborX_Ray.hpp             | 286 ++++++
 arborx/src/details/ArborX_Sphere.hpp          |  47 +
 arborx/src/details/ArborX_TraversalPolicy.hpp |  52 +
 arborx/test/ArborXTest_TreeTypeTraits.hpp     |  85 ++
 arborx/test/ArborX_BoostGeometryAdapters.hpp  |  97 ++
 arborx/test/ArborX_BoostRTreeHelpers.hpp      | 337 +++++++
 arborx/test/ArborX_BoostRangeAdapters.hpp     | 135 +++
 arborx/test/ArborX_EnableDeviceTypes.hpp.in   |  21 +
 arborx/test/ArborX_EnableViewComparison.hpp   |  71 ++
 .../test/BoostTest_CUDA_clang_workarounds.hpp |  24 +
 arborx/test/CMakeLists.txt                    | 186 ++++
 arborx/test/Search_UnitTestHelpers.hpp        | 276 ++++++
 .../boost_ext/CompressedStorageComparison.hpp | 110 +++
 .../test/boost_ext/KokkosPairComparison.hpp   |  46 +
 arborx/test/boost_ext/TupleComparison.hpp     |  62 ++
 .../headers_self_contained/CMakeLists.txt     |  15 +
 .../test/headers_self_contained/tstHeader.cpp |  27 +
 arborx/test/tstBoostGeometryAdapters.cpp      | 241 +++++
 arborx/test/tstBoostRangeAdapters.cpp         |  78 ++
 arborx/test/tstCompileOnlyAccessTraits.cpp    |  87 ++
 arborx/test/tstCompileOnlyCallbacks.cpp       | 150 +++
 arborx/test/tstCompileOnlyConcepts.cpp        |  23 +
 arborx/test/tstCompileOnlyMain.cpp            |  12 +
 .../test/tstCompileOnlyTypeRequirements.cpp   |  64 ++
 arborx/test/tstContainerAdaptors.cpp          |  73 ++
 arborx/test/tstDBSCAN.cpp                     | 270 +++++
 arborx/test/tstDetailsAlgorithms.cpp          | 234 +++++
 arborx/test/tstDetailsBatchedQueries.cpp      |  69 ++
 arborx/test/tstDetailsCrsGraphWrapperImpl.cpp |  95 ++
 arborx/test/tstDetailsDistributedTreeImpl.cpp | 418 ++++++++
 arborx/test/tstDetailsTreeConstruction.cpp    | 294 ++++++
 arborx/test/tstDetailsUtils.cpp               | 268 +++++
 arborx/test/tstDistributedTree.cpp            | 693 +++++++++++++
 arborx/test/tstException.cpp                  |  37 +
 arborx/test/tstHeapOperations.cpp             | 208 ++++
 arborx/test/tstKDOP.cpp                       | 143 +++
 arborx/test/tstKokkosToolsAnnotations.cpp     | 249 +++++
 .../tstKokkosToolsDistributedAnnotations.cpp  | 197 ++++
 arborx/test/tstPriorityQueueMiscellaneous.cpp | 144 +++
 arborx/test/tstQueryTreeCallbacks.cpp         | 343 +++++++
 .../test/tstQueryTreeComparisonWithBoost.cpp  | 269 +++++
 arborx/test/tstQueryTreeDegenerate.cpp        | 403 ++++++++
 arborx/test/tstQueryTreeIntersectsKDOP.cpp    |  82 ++
 .../test/tstQueryTreeManufacturedSolution.cpp | 257 +++++
 arborx/test/tstQueryTreeTraversalPolicy.cpp   | 177 ++++
 arborx/test/tstRay.cpp                        | 259 +++++
 arborx/test/tstScopedProfileRegion.cpp        |  97 ++
 arborx/test/tstSequenceContainers.cpp         | 146 +++
 arborx/test/utf_main.cpp                      |  45 +
 159 files changed, 23528 insertions(+)
 create mode 100644 arborx/.clang-format
 create mode 100644 arborx/.clang-format-ignore
 create mode 100644 arborx/.clang-tidy
 create mode 100644 arborx/.gitattributes
 create mode 100644 arborx/.github/workflows/gitlab-ci.yml
 create mode 100644 arborx/.gitignore
 create mode 100644 arborx/.gitlab-ci.yml
 create mode 100644 arborx/.jenkins
 create mode 100644 arborx/.mailmap
 create mode 100644 arborx/CMakeLists.txt
 create mode 100644 arborx/CONTRIBUTING.md
 create mode 100644 arborx/LICENSE
 create mode 100644 arborx/README.md
 create mode 100644 arborx/benchmarks/CMakeLists.txt
 create mode 100644 arborx/benchmarks/bvh_driver/CMakeLists.txt
 create mode 100644 arborx/benchmarks/bvh_driver/benchmark_registration.hpp
 create mode 100644 arborx/benchmarks/bvh_driver/bvh_driver.cpp
 create mode 100644 arborx/benchmarks/distributed_tree_driver/CMakeLists.txt
 create mode 100644 arborx/benchmarks/distributed_tree_driver/distributed_tree_driver.cpp
 create mode 100644 arborx/benchmarks/execution_space_instances/CMakeLists.txt
 create mode 100644 arborx/benchmarks/execution_space_instances/execution_space_instances_driver.cpp
 create mode 100644 arborx/benchmarks/point_clouds/point_clouds.hpp
 create mode 100644 arborx/cmake/ArborXConfig.cmake.in
 create mode 100644 arborx/cmake/ArborXSettings.cmake.in
 create mode 100644 arborx/cmake/SetupVersion.cmake
 create mode 100644 arborx/docker/.env
 create mode 100644 arborx/docker/Dockerfile
 create mode 100644 arborx/docker/Dockerfile.hipcc
 create mode 100644 arborx/docker/Dockerfile.pgi
 create mode 100644 arborx/docker/Dockerfile.sycl
 create mode 100644 arborx/docker/README.md
 create mode 100644 arborx/docker/docker-compose.yml
 create mode 100644 arborx/docs/LICENSE.ECL
 create mode 100644 arborx/docs/logos/arborx_logo_v1.0.png
 create mode 100644 arborx/docs/logos/arborx_logo_v1.0.svg
 create mode 100644 arborx/docs/logos/arborx_logo_v1.0_nobg.png
 create mode 100644 arborx/examples/CMakeLists.txt
 create mode 100644 arborx/examples/access_traits/CMakeLists.txt
 create mode 100644 arborx/examples/access_traits/example_cuda_access_traits.cpp
 create mode 100644 arborx/examples/access_traits/example_host_access_traits.cpp
 create mode 100644 arborx/examples/brute_force/CMakeLists.txt
 create mode 100644 arborx/examples/brute_force/brute_force.cpp
 create mode 100644 arborx/examples/callback/CMakeLists.txt
 create mode 100644 arborx/examples/callback/example_callback.cpp
 create mode 100644 arborx/examples/dbscan/ArborX_DBSCANVerification.hpp
 create mode 100644 arborx/examples/dbscan/CMakeLists.txt
 create mode 100644 arborx/examples/dbscan/README.md
 create mode 100644 arborx/examples/dbscan/converter.cpp
 create mode 100644 arborx/examples/dbscan/dbscan.cpp
 create mode 100644 arborx/examples/dbscan/input.txt
 create mode 100644 arborx/examples/raytracing/CMakeLists.txt
 create mode 100644 arborx/examples/raytracing/example_raytracing.cpp
 create mode 100644 arborx/examples/simple_intersection/CMakeLists.txt
 create mode 100644 arborx/examples/simple_intersection/example_intersection.cpp
 create mode 100644 arborx/examples/viz/CMakeLists.txt
 create mode 100755 arborx/examples/viz/arborx_query_sort.py
 create mode 100644 arborx/examples/viz/leaf_cloud.txt
 create mode 100644 arborx/examples/viz/requirements.txt
 create mode 100644 arborx/examples/viz/tree_visualization.cpp
 create mode 100644 arborx/scripts/benchmark.py
 create mode 100755 arborx/scripts/benchmark_plot.py
 create mode 100755 arborx/scripts/check_format_cpp.sh
 create mode 100644 arborx/scripts/docker_cmake
 create mode 100644 arborx/scripts/requirements.txt
 create mode 100644 arborx/src/ArborX.hpp
 create mode 100644 arborx/src/ArborX_BruteForce.hpp
 create mode 100644 arborx/src/ArborX_Config.hpp.in
 create mode 100644 arborx/src/ArborX_CrsGraphWrapper.hpp
 create mode 100644 arborx/src/ArborX_DBSCAN.hpp
 create mode 100644 arborx/src/ArborX_DistributedSearchTree.hpp
 create mode 100644 arborx/src/ArborX_DistributedTree.hpp
 create mode 100644 arborx/src/ArborX_LinearBVH.hpp
 create mode 100644 arborx/src/ArborX_Version.hpp.in
 create mode 100644 arborx/src/details/ArborX_AccessTraits.hpp
 create mode 100644 arborx/src/details/ArborX_Box.hpp
 create mode 100644 arborx/src/details/ArborX_Callbacks.hpp
 create mode 100644 arborx/src/details/ArborX_DetailsAlgorithms.hpp
 create mode 100644 arborx/src/details/ArborX_DetailsBatchedQueries.hpp
 create mode 100644 arborx/src/details/ArborX_DetailsBruteForceImpl.hpp
 create mode 100644 arborx/src/details/ArborX_DetailsConcepts.hpp
 create mode 100644 arborx/src/details/ArborX_DetailsContainers.hpp
 create mode 100644 arborx/src/details/ArborX_DetailsCrsGraphWrapperImpl.hpp
 create mode 100644 arborx/src/details/ArborX_DetailsDistributedTreeImpl.hpp
 create mode 100644 arborx/src/details/ArborX_DetailsDistributor.hpp
 create mode 100644 arborx/src/details/ArborX_DetailsFDBSCAN.hpp
 create mode 100644 arborx/src/details/ArborX_DetailsFDBSCANDenseBox.hpp
 create mode 100644 arborx/src/details/ArborX_DetailsHappyTreeFriends.hpp
 create mode 100644 arborx/src/details/ArborX_DetailsHeap.hpp
 create mode 100644 arborx/src/details/ArborX_DetailsKokkosExtAccessibilityTraits.hpp
 create mode 100644 arborx/src/details/ArborX_DetailsKokkosExtArithmeticTraits.hpp
 create mode 100644 arborx/src/details/ArborX_DetailsKokkosExtMathFunctions.hpp
 create mode 100644 arborx/src/details/ArborX_DetailsKokkosExtMinMaxOperations.hpp
 create mode 100644 arborx/src/details/ArborX_DetailsKokkosExtScopedProfileRegion.hpp
 create mode 100644 arborx/src/details/ArborX_DetailsMortonCode.hpp
 create mode 100644 arborx/src/details/ArborX_DetailsNode.hpp
 create mode 100644 arborx/src/details/ArborX_DetailsOperatorFunctionObjects.hpp
 create mode 100644 arborx/src/details/ArborX_DetailsPermutedData.hpp
 create mode 100644 arborx/src/details/ArborX_DetailsPriorityQueue.hpp
 create mode 100644 arborx/src/details/ArborX_DetailsSortUtils.hpp
 create mode 100644 arborx/src/details/ArborX_DetailsStack.hpp
 create mode 100644 arborx/src/details/ArborX_DetailsTags.hpp
 create mode 100644 arborx/src/details/ArborX_DetailsTreeConstruction.hpp
 create mode 100644 arborx/src/details/ArborX_DetailsTreeTraversal.hpp
 create mode 100644 arborx/src/details/ArborX_DetailsTreeVisualization.hpp
 create mode 100644 arborx/src/details/ArborX_DetailsUnionFind.hpp
 create mode 100644 arborx/src/details/ArborX_DetailsUtils.hpp
 create mode 100644 arborx/src/details/ArborX_Exception.hpp
 create mode 100644 arborx/src/details/ArborX_KDOP.hpp
 create mode 100644 arborx/src/details/ArborX_Point.hpp
 create mode 100644 arborx/src/details/ArborX_Predicates.hpp
 create mode 100644 arborx/src/details/ArborX_Ray.hpp
 create mode 100644 arborx/src/details/ArborX_Sphere.hpp
 create mode 100644 arborx/src/details/ArborX_TraversalPolicy.hpp
 create mode 100644 arborx/test/ArborXTest_TreeTypeTraits.hpp
 create mode 100644 arborx/test/ArborX_BoostGeometryAdapters.hpp
 create mode 100644 arborx/test/ArborX_BoostRTreeHelpers.hpp
 create mode 100644 arborx/test/ArborX_BoostRangeAdapters.hpp
 create mode 100644 arborx/test/ArborX_EnableDeviceTypes.hpp.in
 create mode 100644 arborx/test/ArborX_EnableViewComparison.hpp
 create mode 100644 arborx/test/BoostTest_CUDA_clang_workarounds.hpp
 create mode 100644 arborx/test/CMakeLists.txt
 create mode 100644 arborx/test/Search_UnitTestHelpers.hpp
 create mode 100644 arborx/test/boost_ext/CompressedStorageComparison.hpp
 create mode 100644 arborx/test/boost_ext/KokkosPairComparison.hpp
 create mode 100644 arborx/test/boost_ext/TupleComparison.hpp
 create mode 100644 arborx/test/headers_self_contained/CMakeLists.txt
 create mode 100644 arborx/test/headers_self_contained/tstHeader.cpp
 create mode 100644 arborx/test/tstBoostGeometryAdapters.cpp
 create mode 100644 arborx/test/tstBoostRangeAdapters.cpp
 create mode 100644 arborx/test/tstCompileOnlyAccessTraits.cpp
 create mode 100644 arborx/test/tstCompileOnlyCallbacks.cpp
 create mode 100644 arborx/test/tstCompileOnlyConcepts.cpp
 create mode 100644 arborx/test/tstCompileOnlyMain.cpp
 create mode 100644 arborx/test/tstCompileOnlyTypeRequirements.cpp
 create mode 100644 arborx/test/tstContainerAdaptors.cpp
 create mode 100644 arborx/test/tstDBSCAN.cpp
 create mode 100644 arborx/test/tstDetailsAlgorithms.cpp
 create mode 100644 arborx/test/tstDetailsBatchedQueries.cpp
 create mode 100644 arborx/test/tstDetailsCrsGraphWrapperImpl.cpp
 create mode 100644 arborx/test/tstDetailsDistributedTreeImpl.cpp
 create mode 100644 arborx/test/tstDetailsTreeConstruction.cpp
 create mode 100644 arborx/test/tstDetailsUtils.cpp
 create mode 100644 arborx/test/tstDistributedTree.cpp
 create mode 100644 arborx/test/tstException.cpp
 create mode 100644 arborx/test/tstHeapOperations.cpp
 create mode 100644 arborx/test/tstKDOP.cpp
 create mode 100644 arborx/test/tstKokkosToolsAnnotations.cpp
 create mode 100644 arborx/test/tstKokkosToolsDistributedAnnotations.cpp
 create mode 100644 arborx/test/tstPriorityQueueMiscellaneous.cpp
 create mode 100644 arborx/test/tstQueryTreeCallbacks.cpp
 create mode 100644 arborx/test/tstQueryTreeComparisonWithBoost.cpp
 create mode 100644 arborx/test/tstQueryTreeDegenerate.cpp
 create mode 100644 arborx/test/tstQueryTreeIntersectsKDOP.cpp
 create mode 100644 arborx/test/tstQueryTreeManufacturedSolution.cpp
 create mode 100644 arborx/test/tstQueryTreeTraversalPolicy.cpp
 create mode 100644 arborx/test/tstRay.cpp
 create mode 100644 arborx/test/tstScopedProfileRegion.cpp
 create mode 100644 arborx/test/tstSequenceContainers.cpp
 create mode 100644 arborx/test/utf_main.cpp

diff --git a/arborx/.clang-format b/arborx/.clang-format
new file mode 100644
index 000000000..a77b42069
--- /dev/null
+++ b/arborx/.clang-format
@@ -0,0 +1,22 @@
+BasedOnStyle:  LLVM
+---
+AlwaysBreakTemplateDeclarations: true
+BreakBeforeBraces: Allman
+BreakConstructorInitializersBeforeComma: true
+IncludeBlocks: Regroup
+Language: Cpp
+IncludeCategories:
+# arborx first
+  - Regex: "ArborX_Config.hpp"
+    Priority: -1
+  - Regex: "ArborX*"
+    Priority: 1
+# Then Kokkos
+  - Regex: "Kokkos*"
+    Priority: 2
+# Then boost
+  - Regex: "boost*"
+    Priority: 3
+# Finally the standard library
+  - Regex: "<[a-z_]+>"
+    Priority: 10
diff --git a/arborx/.clang-format-ignore b/arborx/.clang-format-ignore
new file mode 100644
index 000000000..e69de29bb
diff --git a/arborx/.clang-tidy b/arborx/.clang-tidy
new file mode 100644
index 000000000..ecd9abb7c
--- /dev/null
+++ b/arborx/.clang-tidy
@@ -0,0 +1,109 @@
+---
+Checks:          'clang-diagnostic-*,clang-analyzer-*,-*,performance-*,-performance-inefficient-string-concatenation,mpi-*,modernize-*,-modernize-pass-by-value,-modernize-use-trailing-return-type,-modernize-avoid-c-arrays,readability-*,-readability-braces-around-statements,-readability-named-parameter,-readability-magic-numbers,-readability-uppercase-literal-suffix'
+WarningsAsErrors: ''
+HeaderFilterRegex: '.*'
+AnalyzeTemporaryDtors: false
+FormatStyle:     none
+CheckOptions:    
+  - key:             google-readability-braces-around-statements.ShortStatementLines
+    value:           '1'
+  - key:             google-readability-function-size.StatementThreshold
+    value:           '800'
+  - key:             google-readability-namespace-comments.ShortNamespaceLines
+    value:           '10'
+  - key:             google-readability-namespace-comments.SpacesBeforeComments
+    value:           '2'
+  - key:             modernize-loop-convert.MaxCopySize
+    value:           '16'
+  - key:             modernize-loop-convert.MinConfidence
+    value:           reasonable
+  - key:             modernize-loop-convert.NamingStyle
+    value:           CamelCase
+  - key:             modernize-make-shared.IgnoreMacros
+    value:           '1'
+  - key:             modernize-make-shared.IncludeStyle
+    value:           '0'
+  - key:             modernize-make-shared.MakeSmartPtrFunction
+    value:           'std::make_shared'
+  - key:             modernize-make-shared.MakeSmartPtrFunctionHeader
+    value:           memory
+  - key:             modernize-make-unique.IgnoreMacros
+    value:           '1'
+  - key:             modernize-make-unique.IncludeStyle
+    value:           '0'
+  - key:             modernize-make-unique.MakeSmartPtrFunction
+    value:           'std::make_unique'
+  - key:             modernize-make-unique.MakeSmartPtrFunctionHeader
+    value:           memory
+  - key:             modernize-pass-by-value.IncludeStyle
+    value:           llvm
+  - key:             modernize-raw-string-literal.ReplaceShorterLiterals
+    value:           '0'
+  - key:             modernize-replace-auto-ptr.IncludeStyle
+    value:           llvm
+  - key:             modernize-replace-random-shuffle.IncludeStyle
+    value:           llvm
+  - key:             modernize-use-auto.RemoveStars
+    value:           '0'
+  - key:             modernize-use-default-member-init.IgnoreMacros
+    value:           '1'
+  - key:             modernize-use-default-member-init.UseAssignment
+    value:           '0'
+  - key:             modernize-use-emplace.ContainersWithPushBack
+    value:           '::std::vector;::std::list;::std::deque'
+  - key:             modernize-use-emplace.SmartPointers
+    value:           '::std::shared_ptr;::std::unique_ptr;::std::auto_ptr;::std::weak_ptr'
+  - key:             modernize-use-emplace.TupleMakeFunctions
+    value:           '::std::make_pair;::std::make_tuple'
+  - key:             modernize-use-emplace.TupleTypes
+    value:           '::std::pair;::std::tuple'
+  - key:             modernize-use-equals-default.IgnoreMacros
+    value:           '1'
+  - key:             modernize-use-noexcept.ReplacementString
+    value:           ''
+  - key:             modernize-use-noexcept.UseNoexceptFalse
+    value:           '1'
+  - key:             modernize-use-nullptr.NullMacros
+    value:           'NULL'
+  - key:             modernize-use-transparent-functors.SafeMode
+    value:           '0'
+  - key:             modernize-use-using.IgnoreMacros
+    value:           '1'
+  - key:             performance-faster-string-find.StringLikeClasses
+    value:           'std::basic_string'
+  - key:             performance-for-range-copy.WarnOnAllAutoCopies
+    value:           '0'
+  - key:             performance-inefficient-vector-operation.VectorLikeClasses
+    value:           '::std::vector'
+  - key:             performance-move-const-arg.CheckTriviallyCopyableMove
+    value:           '0'
+  - key:             performance-move-constructor-init.IncludeStyle
+    value:           llvm
+  - key:             performance-type-promotion-in-math-fn.IncludeStyle
+    value:           llvm
+  - key:             performance-unnecessary-value-param.IncludeStyle
+    value:           llvm
+  - key:             readability-function-size.BranchThreshold
+    value:           '4294967295'
+  - key:             readability-function-size.LineThreshold
+    value:           '4294967295'
+  - key:             readability-function-size.NestingThreshold
+    value:           '4294967295'
+  - key:             readability-function-size.ParameterThreshold
+    value:           '4294967295'
+  - key:             readability-function-size.StatementThreshold
+    value:           '800'
+  - key:             readability-identifier-naming.IgnoreFailedSplit
+    value:           '0'
+  - key:             readability-implicit-bool-conversion.AllowIntegerConditions
+    value:           '0'
+  - key:             readability-implicit-bool-conversion.AllowPointerConditions
+    value:           '0'
+  - key:             readability-simplify-boolean-expr.ChainedConditionalAssignment
+    value:           '0'
+  - key:             readability-simplify-boolean-expr.ChainedConditionalReturn
+    value:           '0'
+  - key:             readability-static-accessed-through-instance.NameSpecifierNestingThreshold
+    value:           '3'
+...
+
diff --git a/arborx/.gitattributes b/arborx/.gitattributes
new file mode 100644
index 000000000..d05b3a821
--- /dev/null
+++ b/arborx/.gitattributes
@@ -0,0 +1,7 @@
+docker/ export-ignore
+.clang* export-ignore
+.git* export-ignore
+.jenkins export-ignore
+.mailmap export-ignore
+.travis.yml export-ignore
+*.svg binary
diff --git a/arborx/.github/workflows/gitlab-ci.yml b/arborx/.github/workflows/gitlab-ci.yml
new file mode 100644
index 000000000..5340536cb
--- /dev/null
+++ b/arborx/.github/workflows/gitlab-ci.yml
@@ -0,0 +1,21 @@
+name: Mirror and run GitLab CI
+
+on: [push]
+
+jobs:
+  build:
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: actions/checkout@v1
+    - name: Trigger GitLab CI
+      uses: masterleinad/gitlab-mirror-and-ci-action@master
+      with:
+        args: "https://code.ornl.gov/ecpcitest/alexa/"
+      env:
+        GITLAB_HOSTNAME: "code.ornl.gov"
+        GITLAB_USERNAME: ${{ secrets.GITLAB_USER }}
+        GITLAB_PASSWORD: ${{ secrets.GITLAB_PASSWORD }}
+        GITLAB_PROJECT_ID: "6927"
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        ARTIFACT_JOB_NAME: "CompareResults"
+        ARTIFACT_NAME: "regression"
diff --git a/arborx/.gitignore b/arborx/.gitignore
new file mode 100644
index 000000000..48439bce0
--- /dev/null
+++ b/arborx/.gitignore
@@ -0,0 +1,4 @@
+*~
+*.swp
+.#*
+/build*
diff --git a/arborx/.gitlab-ci.yml b/arborx/.gitlab-ci.yml
new file mode 100644
index 000000000..fcf63137a
--- /dev/null
+++ b/arborx/.gitlab-ci.yml
@@ -0,0 +1,147 @@
+# see https://docs.gitlab.com/ce/ci/yaml/README.html for all available options
+
+variables:
+  SCHEDULER_PARAMETERS: "-J ArborX_CI -W 1:00 -nnodes 1 -P CSC333 -alloc_flags smt1"
+
+stages:
+  - buildDependencies
+  - buildArborX
+  - runBenchmarks
+  - compare
+
+.LoadModules:
+  before_script:
+    - module load gcc/7.4.0 cuda/10.1.243 cmake/3.18.2 git/2.20.1 spectrum-mpi/10.3.1.2-20200121
+
+.BuildBoost:
+  extends: .LoadModules
+  stage: buildDependencies
+  script:
+    - BOOST_VERSION=1.67.0 &&
+      BOOST_VERSION_UNDERSCORE=$(echo "$BOOST_VERSION" | sed -e "s/\./_/g") &&
+      BOOST_URL=https://boostorg.jfrog.io/artifactory/main/release/${BOOST_VERSION}/source &&
+      BOOST_ARCHIVE=boost_${BOOST_VERSION_UNDERSCORE}.tar.bz2 &&
+      wget --quiet ${BOOST_URL}/${BOOST_ARCHIVE} &&
+      mkdir -p boost &&
+      tar -xf ${BOOST_ARCHIVE} -C boost --strip-components=1 &&
+      cd boost &&
+      ./bootstrap.sh --prefix=/ccsopen/proj/csc333/boost.install &&
+      ./b2 -j8 variant=release cxxflags=-w install
+  tags:
+    - nobatch
+
+.BuildBenchmark:
+  extends: .LoadModules
+  stage: buildDependencies
+  script:
+    - git clone https://github.com/google/benchmark.git -b v1.4.1 &&
+      cd benchmark &&
+      git clone https://github.com/google/googletest.git -b release-1.8.1 &&
+      mkdir build && cd build &&
+      cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=g++ -DBENCHMARK_ENABLE_TESTING=OFF -DCMAKE_INSTALL_PREFIX=/ccsopen/proj/csc333/benchmark.install .. &&
+      make && make install
+  tags:
+    - nobatch
+
+.BuildKokkos:
+  extends: .LoadModules
+  stage: buildDependencies
+  script:
+    - git clone --depth=1 --branch 3.1.00 https://github.com/kokkos/kokkos.git &&
+      cd kokkos &&
+      mkdir build &&
+      cd build &&
+      cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/ccsopen/proj/csc333/kokkos.install -DCMAKE_CXX_COMPILER=${CI_PROJECT_DIR}/kokkos/bin/nvcc_wrapper -DCMAKE_CXX_EXTENSIONS=OFF -DKokkos_ENABLE_SERIAL=ON -DKokkos_ENABLE_OPENMP=ON -DKokkos_ENABLE_CUDA=ON -DKokkos_ENABLE_CUDA_LAMBDA=ON -DKokkos_ARCH_POWER9=ON -DKokkos_ARCH_VOLTA70=ON .. &&
+      make &&
+      make install
+  tags:
+    - nobatch
+
+BuildArborXBranch:
+  extends: .LoadModules
+  stage: buildArborX
+  script:
+    - git fetch
+    - export BRANCH_HASH=`git rev-parse HEAD`
+    - git merge origin/master
+    - mkdir build && cd build &&
+      cmake -DCMAKE_PREFIX_PATH="/ccsopen/proj/csc333/kokkos.install;/ccsopen/proj/csc333/benchmark.install;/ccsopen/proj/csc333/boost.install"
+            -DCMAKE_CXX_COMPILER=/ccsopen/proj/csc333/kokkos.install/bin/nvcc_wrapper
+            -DARBORX_ENABLE_MPI=ON
+            -DARBORX_ENABLE_TESTS=OFF
+            -DARBORX_ENABLE_BENCHMARKS=ON
+            -DARBORX_PERFORMANCE_TESTING=ON .. &&
+      make ArborX_BoundingVolumeHierarchy.exe
+    - cp ./benchmarks/bvh_driver/ArborX_BoundingVolumeHierarchy.exe /ccsopen/proj/csc333/ArborX_BoundingVolumeHierarchyBranch${BRANCH_HASH}.exe
+    - echo export BRANCH_HASH=${BRANCH_HASH} > ${CI_PROJECT_DIR}/branch_hash
+  tags:
+    - nobatch
+  artifacts:
+    paths:
+      - ${CI_PROJECT_DIR}/branch_hash
+
+BuildArborXMaster:
+  extends: .LoadModules
+  stage: buildArborX
+  script:
+    - git fetch
+    - export BRANCH_HASH=`git rev-parse HEAD`
+    - git worktree add -f ${CI_PROJECT_DIR}/arborx-master origin/master
+    - cd ${CI_PROJECT_DIR}/arborx-master
+    - mkdir build_master && cd build_master &&
+      cmake -DCMAKE_PREFIX_PATH="/ccsopen/proj/csc333/kokkos.install;/ccsopen/proj/csc333/benchmark.install;/ccsopen/proj/csc333/boost.install"
+            -DCMAKE_CXX_COMPILER=/ccsopen/proj/csc333/kokkos.install/bin/nvcc_wrapper
+            -DARBORX_ENABLE_MPI=ON
+            -DARBORX_ENABLE_TESTS=OFF
+            -DARBORX_ENABLE_BENCHMARKS=ON
+            -DARBORX_PERFORMANCE_TESTING=ON .. &&
+      make ArborX_BoundingVolumeHierarchy.exe
+    - cp ./benchmarks/bvh_driver/ArborX_BoundingVolumeHierarchy.exe /ccsopen/proj/csc333/ArborX_BoundingVolumeHierarchyMaster${BRANCH_HASH}.exe
+  tags:
+    - nobatch
+
+RunBenchmarks:
+  extends: .LoadModules
+  stage: runBenchmarks
+  script:
+    - source ${CI_PROJECT_DIR}/branch_hash
+    - export OMP_PROC_BIND=spread
+    - export OMP_PLACES=threads
+    - export JSRUN_OPTIONS="-n 1 -a 1 -c 42 -g 1 -r 1 -l CPU-CPU -d packed -b packed:42"
+    - export BENCHMARK_OPTIONS="--benchmark_repetitions=15
+                                --exact-spec serial/1000/1000/10/1/0/0/2
+                                --exact-spec serial/10000/10000/10/1/0/0/2
+                                --exact-spec serial/100000/100000/10/1/0/0/2
+                                --exact-spec serial/1000/1000/10/1/0/1/3
+                                --exact-spec serial/10000/10000/10/1/0/1/3
+                                --exact-spec serial/100000/100000/10/1/0/1/3
+                                --exact-spec openmp/1000/1000/10/1/0/0/2
+                                --exact-spec openmp/10000/10000/10/1/0/0/2
+                                --exact-spec openmp/100000/100000/10/1/0/0/2
+                                --exact-spec openmp/1000/1000/10/1/0/1/3
+                                --exact-spec openmp/10000/10000/10/1/0/1/3
+                                --exact-spec openmp/100000/100000/10/1/0/1/3
+                                --exact-spec cuda/10000/10000/10/1/0/0/2
+                                --exact-spec cuda/100000/100000/10/1/0/0/2
+                                --exact-spec cuda/1000000/1000000/10/1/0/0/2
+                                --exact-spec cuda/10000/10000/10/1/0/1/3
+                                --exact-spec cuda/100000/100000/10/1/0/1/3
+                                --exact-spec cuda/1000000/1000000/10/1/0/1/3"
+    - jsrun ${JSRUN_OPTIONS} /ccsopen/proj/csc333/ArborX_BoundingVolumeHierarchyBranch${BRANCH_HASH}.exe ${BENCHMARK_OPTIONS} --benchmark_out_format=json --benchmark_out=/ccsopen/proj/csc333/arborx-branch${BRANCH_HASH}.json
+    - jsrun ${JSRUN_OPTIONS} /ccsopen/proj/csc333/ArborX_BoundingVolumeHierarchyMaster${BRANCH_HASH}.exe ${BENCHMARK_OPTIONS} --benchmark_out_format=json --benchmark_out=/ccsopen/proj/csc333/arborx-master${BRANCH_HASH}.json
+    - rm /ccsopen/proj/csc333/ArborX_BoundingVolumeHierarchyBranch${BRANCH_HASH}.exe /ccsopen/proj/csc333/ArborX_BoundingVolumeHierarchyMaster${BRANCH_HASH}.exe
+  tags:
+    - batch
+
+CompareResults:
+  stage: compare
+  script:
+    - module load python/3.6.6-anaconda3-5.3.0
+    - source ${CI_PROJECT_DIR}/branch_hash
+    - /ccsopen/proj/csc333/tools/compare.py benchmarks /ccsopen/proj/csc333/arborx-master${BRANCH_HASH}.json /ccsopen/proj/csc333/arborx-branch${BRANCH_HASH}.json | grep "median" | tee ${CI_PROJECT_DIR}/regression${CI_PIPELINE_ID}
+    - rm /ccsopen/proj/csc333/arborx-branch${BRANCH_HASH}.json /ccsopen/proj/csc333/arborx-master${BRANCH_HASH}.json
+  tags:
+    - nobatch
+  artifacts:
+    paths:
+      - ${CI_PROJECT_DIR}/regression${CI_PIPELINE_ID}
diff --git a/arborx/.jenkins b/arborx/.jenkins
new file mode 100644
index 000000000..2a0741629
--- /dev/null
+++ b/arborx/.jenkins
@@ -0,0 +1,462 @@
+pipeline {
+    triggers {
+        issueCommentTrigger('.*test this please.*')
+    }
+    agent none
+
+    environment {
+        CCACHE_DIR = '/tmp/ccache'
+        CCACHE_MAXSIZE = '10G'
+        ARBORX_DIR = '/opt/arborx'
+        BENCHMARK_COLOR = 'no'
+        BOOST_TEST_COLOR_OUTPUT = 'no'
+        CTEST_OPTIONS = '--timeout 180 --no-compress-output -T Test --test-output-size-passed=65536 --test-output-size-failed=1048576'
+        OMP_NUM_THREADS = 8
+        OMP_PLACES = 'threads'
+        OMP_PROC_BIND = 'spread'
+    }
+    stages {
+
+        stage("Style") {
+            agent {
+                docker {
+                    // arbitrary image that has clang-format version 7.0
+                    image "dalg24/arborx_base:19.04.0-cuda-9.2"
+                    label 'docker'
+                }
+            }
+            steps {
+                sh './scripts/check_format_cpp.sh'
+            }
+        }
+
+        stage('Build') {
+            parallel {
+                stage('CUDA-9.2-NVCC-CUDA-AWARE-MPI') {
+                    agent {
+                        dockerfile {
+                            filename "Dockerfile"
+                            dir "docker"
+                            additionalBuildArgs '--build-arg BASE=nvidia/cuda:9.2-devel-ubuntu18.04 --build-arg KOKKOS_OPTIONS="-DCMAKE_CXX_EXTENSIONS=OFF -DKokkos_ENABLE_SERIAL=ON -DKokkos_ENABLE_CUDA=ON -DKokkos_ENABLE_CUDA_LAMBDA=ON -DKokkos_ARCH_VOLTA70=ON" --build-arg CUDA_AWARE_MPI=1'
+                            args '-v /tmp/ccache:/tmp/ccache --env NVIDIA_VISIBLE_DEVICES=${NVIDIA_VISIBLE_DEVICES}'
+                            label 'NVIDIA_Tesla_V100-PCIE-32GB && nvidia-docker'
+                        }
+                    }
+                    steps {
+                        sh 'ccache --zero-stats'
+                        sh 'rm -rf build && mkdir -p build'
+                        dir('build') {
+                            sh '''
+                                cmake \
+                                    -D CMAKE_INSTALL_PREFIX=$ARBORX_DIR \
+                                    -D CMAKE_BUILD_TYPE=Debug \
+                                    -D CMAKE_CXX_COMPILER_LAUNCHER=ccache \
+                                    -D CMAKE_CXX_COMPILER=$KOKKOS_DIR/bin/nvcc_wrapper \
+                                    -D CMAKE_CXX_EXTENSIONS=OFF \
+                                    -D CMAKE_CXX_FLAGS="-Wpedantic -Wall -Wextra" \
+                                    -D CMAKE_PREFIX_PATH="$KOKKOS_DIR;$BOOST_DIR;$BENCHMARK_DIR" \
+                                    -D ARBORX_ENABLE_MPI=ON \
+                                    -D MPIEXEC_PREFLAGS="--allow-run-as-root" \
+                                    -D MPIEXEC_MAX_NUMPROCS=4 \
+                                    -D ARBORX_USE_CUDA_AWARE_MPI=ON \
+                                    -D ARBORX_ENABLE_TESTS=ON \
+                                    -D ARBORX_ENABLE_EXAMPLES=ON \
+                                    -D ARBORX_ENABLE_BENCHMARKS=ON \
+                                ..
+                            '''
+                            sh 'make -j8 VERBOSE=1'
+                            sh 'ctest $CTEST_OPTIONS'
+                        }
+                    }
+                    post {
+                        always {
+                            sh 'ccache --show-stats'
+                            xunit reduceLog: false, tools:[CTest(deleteOutputFiles: true, failIfNotNew: true, pattern: 'build/Testing/**/Test.xml', skipNoTestFiles: false, stopProcessingIfError: true)]
+                        }
+                        success {
+                            sh 'cd build && make install'
+                            sh 'rm -rf test_install && mkdir -p test_install'
+                            dir('test_install') {
+                                sh 'cp -r ../examples .'
+                                sh '''
+                                    cmake \
+                                        -D CMAKE_CXX_COMPILER_LAUNCHER=ccache \
+                                        -D CMAKE_CXX_COMPILER=$KOKKOS_DIR/bin/nvcc_wrapper \
+                                        -D CMAKE_CXX_EXTENSIONS=OFF \
+                                        -D CMAKE_PREFIX_PATH="$KOKKOS_DIR;$ARBORX_DIR" \
+                                    examples \
+                                '''
+                                sh 'make VERBOSE=1'
+                                sh 'make test'
+                            }
+                        }
+                    }
+                }
+                stage('CUDA-10.2-NVCC') {
+                    agent {
+                        dockerfile {
+                            filename "Dockerfile"
+                            dir "docker"
+                            additionalBuildArgs '--build-arg BASE=nvidia/cuda:10.2-devel --build-arg KOKKOS_OPTIONS="-DCMAKE_CXX_EXTENSIONS=OFF -DKokkos_ENABLE_SERIAL=ON -DKokkos_ENABLE_OPENMP=ON -DKokkos_ENABLE_CUDA=ON -DKokkos_ENABLE_CUDA_LAMBDA=ON -DKokkos_ARCH_VOLTA70=ON"'
+                            args '-v /tmp/ccache:/tmp/ccache --env NVIDIA_VISIBLE_DEVICES=${NVIDIA_VISIBLE_DEVICES}'
+                            label 'NVIDIA_Tesla_V100-PCIE-32GB && nvidia-docker'
+                        }
+                    }
+                    steps {
+                        sh 'ccache --zero-stats'
+                        sh 'rm -rf build && mkdir -p build'
+                        dir('build') {
+                            sh '''
+                                cmake \
+                                    -D CMAKE_INSTALL_PREFIX=$ARBORX_DIR \
+                                    -D CMAKE_BUILD_TYPE=Debug \
+                                    -D CMAKE_CXX_COMPILER_LAUNCHER=ccache \
+                                    -D CMAKE_CXX_COMPILER=$KOKKOS_DIR/bin/nvcc_wrapper \
+                                    -D CMAKE_CXX_EXTENSIONS=OFF \
+                                    -D CMAKE_CXX_FLAGS="-Wpedantic -Wall -Wextra" \
+                                    -D CMAKE_PREFIX_PATH="$KOKKOS_DIR;$BOOST_DIR;$BENCHMARK_DIR" \
+                                    -D ARBORX_ENABLE_MPI=ON \
+                                    -D MPIEXEC_PREFLAGS="--allow-run-as-root" \
+                                    -D MPIEXEC_MAX_NUMPROCS=4 \
+                                    -D ARBORX_ENABLE_TESTS=ON \
+                                    -D ARBORX_ENABLE_EXAMPLES=ON \
+                                    -D ARBORX_ENABLE_BENCHMARKS=ON \
+                                ..
+                            '''
+                            sh 'make -j8 VERBOSE=1'
+                            sh 'ctest $CTEST_OPTIONS'
+                        }
+                    }
+                    post {
+                        always {
+                            sh 'ccache --show-stats'
+                            xunit reduceLog: false, tools:[CTest(deleteOutputFiles: true, failIfNotNew: true, pattern: 'build/Testing/**/Test.xml', skipNoTestFiles: false, stopProcessingIfError: true)]
+                        }
+                        success {
+                            sh 'cd build && make install'
+                            sh 'rm -rf test_install && mkdir -p test_install'
+                            dir('test_install') {
+                                sh 'cp -r ../examples .'
+                                sh '''
+                                    cmake \
+                                        -D CMAKE_CXX_COMPILER_LAUNCHER=ccache \
+                                        -D CMAKE_CXX_COMPILER=$KOKKOS_DIR/bin/nvcc_wrapper \
+                                        -D CMAKE_CXX_EXTENSIONS=OFF \
+                                        -D CMAKE_PREFIX_PATH="$KOKKOS_DIR;$ARBORX_DIR" \
+                                    examples \
+                                '''
+                                sh 'make VERBOSE=1'
+                                sh 'make test'
+                            }
+                        }
+                    }
+                }
+                stage('CUDA-10.0-Clang') {
+                    agent {
+                        dockerfile {
+                            filename "Dockerfile"
+                            dir "docker"
+                            additionalBuildArgs '--build-arg BASE=nvidia/cuda:10.0-devel-ubuntu18.04 --build-arg KOKKOS_OPTIONS="-DCMAKE_CXX_EXTENSIONS=OFF -DCMAKE_CXX_COMPILER=clang++ -DKokkos_ENABLE_PTHREAD=ON -DKokkos_ENABLE_CUDA=ON -DKokkos_ENABLE_CUDA_LAMBDA=ON -DKokkos_ARCH_VOLTA70=ON"'
+                            args '-v /tmp/ccache:/tmp/ccache --env NVIDIA_VISIBLE_DEVICES=${NVIDIA_VISIBLE_DEVICES}'
+                            label 'NVIDIA_Tesla_V100-PCIE-32GB && nvidia-docker'
+                        }
+                    }
+                    steps {
+                        sh 'ccache --zero-stats'
+                        sh 'rm -rf build && mkdir -p build'
+                        dir('build') {
+                            sh '''
+                                cmake \
+                                    -D CMAKE_INSTALL_PREFIX=$ARBORX_DIR \
+                                    -D CMAKE_BUILD_TYPE=Debug \
+                                    -D CMAKE_CXX_COMPILER_LAUNCHER=ccache \
+                                    -D CMAKE_CXX_COMPILER=clang++ \
+                                    -D CMAKE_CXX_EXTENSIONS=OFF \
+                                    -D CMAKE_CXX_FLAGS="-Wpedantic -Wall -Wextra" \
+                                    -D CMAKE_PREFIX_PATH="$KOKKOS_DIR;$BOOST_DIR;$BENCHMARK_DIR" \
+                                    -D ARBORX_ENABLE_MPI=OFF \
+                                    -D ARBORX_ENABLE_TESTS=ON \
+                                    -D ARBORX_ENABLE_EXAMPLES=ON \
+                                    -D ARBORX_ENABLE_BENCHMARKS=ON \
+                                ..
+                            '''
+                            sh 'make -j8 VERBOSE=1'
+                            sh 'ctest $CTEST_OPTIONS'
+                        }
+                    }
+                    post {
+                        always {
+                            sh 'ccache --show-stats'
+                            xunit reduceLog: false, tools:[CTest(deleteOutputFiles: true, failIfNotNew: true, pattern: 'build/Testing/**/Test.xml', skipNoTestFiles: false, stopProcessingIfError: true)]
+                        }
+                        success {
+                            sh 'cd build && make install'
+                            sh 'rm -rf test_install && mkdir -p test_install'
+                            dir('test_install') {
+                                sh 'cp -r ../examples .'
+                                sh '''
+                                    cmake \
+                                        -D CMAKE_CXX_COMPILER_LAUNCHER=ccache \
+                                        -D CMAKE_CXX_COMPILER=clang++ \
+                                        -D CMAKE_CXX_EXTENSIONS=OFF \
+                                        -D CMAKE_PREFIX_PATH="$KOKKOS_DIR;$ARBORX_DIR" \
+                                    examples \
+                                '''
+                                sh 'make VERBOSE=1'
+                                sh 'make test'
+                            }
+                        }
+                    }
+                }
+
+                stage('Clang') {
+                    agent {
+                        dockerfile {
+                            filename "Dockerfile"
+                            dir "docker"
+                            additionalBuildArgs '--build-arg BASE=ubuntu:18.04 --build-arg KOKKOS_OPTIONS="-DCMAKE_CXX_EXTENSIONS=OFF -DKokkos_ENABLE_OPENMP=ON -DCMAKE_CXX_COMPILER=clang++"'
+                            args '-v /tmp/ccache:/tmp/ccache'
+                            label 'docker'
+                        }
+                    }
+                    steps {
+                        sh 'ccache --zero-stats'
+                        sh 'rm -rf build && mkdir -p build'
+                        dir('build') {
+                            sh '''
+                                cmake \
+                                    -D CMAKE_INSTALL_PREFIX=$ARBORX_DIR \
+                                    -D CMAKE_BUILD_TYPE=Debug \
+                                    -D CMAKE_CXX_COMPILER_LAUNCHER=ccache \
+                                    -D CMAKE_CXX_COMPILER=clang++ \
+                                    -D CMAKE_CXX_EXTENSIONS=OFF \
+                                    -D CMAKE_CXX_FLAGS="-Wpedantic -Wall -Wextra" \
+                                    -D CMAKE_CXX_CLANG_TIDY="$LLVM_DIR/bin/clang-tidy" \
+                                    -D CMAKE_PREFIX_PATH="$KOKKOS_DIR;$BOOST_DIR;$BENCHMARK_DIR" \
+                                    -D ARBORX_ENABLE_MPI=ON \
+                                    -D MPIEXEC_PREFLAGS="--allow-run-as-root" \
+                                    -D MPIEXEC_MAX_NUMPROCS=4 \
+                                    -D ARBORX_ENABLE_TESTS=ON \
+                                    -D ARBORX_ENABLE_EXAMPLES=ON \
+                                    -D ARBORX_ENABLE_BENCHMARKS=ON \
+                                ..
+                            '''
+                            sh 'make -j8 VERBOSE=1'
+                            sh 'ctest $CTEST_OPTIONS'
+                        }
+                    }
+                    post {
+                        always {
+                            sh 'ccache --show-stats'
+                            xunit reduceLog: false, tools:[CTest(deleteOutputFiles: true, failIfNotNew: true, pattern: 'build/Testing/**/Test.xml', skipNoTestFiles: false, stopProcessingIfError: true)]
+                        }
+                        success {
+                            sh 'cd build && make install'
+                            sh 'rm -rf test_install && mkdir -p test_install'
+                            dir('test_install') {
+                                sh 'cp -r ../examples .'
+                                sh '''
+                                    cmake \
+                                        -D CMAKE_CXX_COMPILER_LAUNCHER=ccache \
+                                        -D CMAKE_CXX_COMPILER=clang++ \
+                                        -D CMAKE_CXX_EXTENSIONS=OFF \
+                                        -D CMAKE_PREFIX_PATH="$KOKKOS_DIR;$ARBORX_DIR" \
+                                    examples \
+                                '''
+                                sh 'make VERBOSE=1'
+                                sh 'make test'
+                            }
+                        }
+                    }
+                }
+
+                stage('PGI') {
+                    agent {
+                        dockerfile {
+                            filename "Dockerfile.pgi"
+                            dir "docker"
+                            args '-v /tmp/ccache:/tmp/ccache'
+                            label 'docker'
+                        }
+                    }
+                    steps {
+                        sh 'ccache --zero-stats'
+                        sh 'rm -rf build && mkdir -p build'
+                        dir('build') {
+                            sh '''
+                                cmake \
+                                    -D CMAKE_INSTALL_PREFIX=$ARBORX_DIR \
+                                    -D CMAKE_BUILD_TYPE=Debug \
+                                    -D CMAKE_CXX_COMPILER_LAUNCHER=ccache \
+                                    -D CMAKE_CXX_COMPILER=pgc++ \
+                                    -D CMAKE_CXX_FLAGS="-Minform=inform" \
+                                    -D CMAKE_PREFIX_PATH="$KOKKOS_DIR;$BOOST_DIR;$BENCHMARK_DIR" \
+                                    -D ARBORX_ENABLE_MPI=ON \
+                                    -D MPIEXEC_PREFLAGS="--allow-run-as-root" \
+                                    -D MPIEXEC_MAX_NUMPROCS=4 \
+                                    -D ARBORX_ENABLE_TESTS=ON \
+                                    -D ARBORX_ENABLE_EXAMPLES=ON \
+                                    -D ARBORX_ENABLE_BENCHMARKS=ON \
+                                ..
+                            '''
+                            sh 'make -j8 VERBOSE=1'
+                            sh 'ctest $CTEST_OPTIONS'
+                        }
+                    }
+                    post {
+                        always {
+                            sh 'ccache --show-stats'
+                            xunit reduceLog: false, tools:[CTest(deleteOutputFiles: true, failIfNotNew: true, pattern: 'build/Testing/**/Test.xml', skipNoTestFiles: false, stopProcessingIfError: true)]
+                        }
+                        success {
+                            sh 'cd build && make install'
+                            sh 'rm -rf test_install && mkdir -p test_install'
+                            dir('test_install') {
+                                sh 'cp -r ../examples .'
+                                sh '''
+                                    cmake \
+                                        -D CMAKE_CXX_COMPILER_LAUNCHER=ccache \
+                                        -D CMAKE_CXX_COMPILER=pgc++ \
+                                        -D CMAKE_PREFIX_PATH="$KOKKOS_DIR;$ARBORX_DIR" \
+                                    examples \
+                                '''
+                                sh 'make VERBOSE=1'
+                                sh 'make test'
+                            }
+                        }
+                    }
+                }
+
+                stage('HIP-4.2') {
+                    agent {
+                        dockerfile {
+                            filename "Dockerfile.hipcc"
+                            dir "docker"
+                            additionalBuildArgs '--build-arg BASE=rocm/dev-ubuntu-20.04:4.2 --build-arg KOKKOS_ARCH=${KOKKOS_ARCH}'
+                            args '-v /tmp/ccache.kokkos:/tmp/ccache --device=/dev/kfd --device=/dev/dri --security-opt seccomp=unconfined --group-add video --env HIP_VISIBLE_DEVICES=${HIP_VISIBLE_DEVICES}'
+                            label 'rocm-docker && vega'
+                        }
+                    }
+                    steps {
+                        sh 'ccache --zero-stats'
+                        sh 'rm -rf build && mkdir -p build'
+                        dir('build') {
+                            sh '''
+                                cmake \
+                                    -D CMAKE_INSTALL_PREFIX=$ARBORX_DIR \
+                                    -D CMAKE_BUILD_TYPE=Debug \
+                                    -D CMAKE_CXX_COMPILER=hipcc \
+                                    -D CMAKE_CXX_EXTENSIONS=OFF \
+                                    -D CMAKE_CXX_FLAGS="-DNDEBUG -Wpedantic -Wall -Wextra" \
+                                    -D CMAKE_PREFIX_PATH="$KOKKOS_DIR;$BOOST_DIR;$BENCHMARK_DIR" \
+                                    -D ARBORX_ENABLE_MPI=ON \
+                                    -D MPIEXEC_PREFLAGS="--allow-run-as-root" \
+                                    -D MPIEXEC_MAX_NUMPROCS=4 \
+                                    -D ARBORX_ENABLE_TESTS=ON \
+                                    -D ARBORX_ENABLE_EXAMPLES=ON \
+                                    -D ARBORX_ENABLE_BENCHMARKS=ON \
+                                ..
+                            '''
+                            sh 'make -j8 VERBOSE=1'
+                            sh 'ctest $CTEST_OPTIONS'
+                        }
+                    }
+                    post {
+                        always {
+                            sh 'ccache --show-stats'
+                            xunit reduceLog: false, tools:[CTest(deleteOutputFiles: true, failIfNotNew: true, pattern: 'build/Testing/**/Test.xml', skipNoTestFiles: false, stopProcessingIfError: true)]
+                        }
+                        success {
+                            sh 'cd build && make install'
+                            sh 'rm -rf test_install && mkdir -p test_install'
+                            dir('test_install') {
+                                sh 'cp -r ../examples .'
+                                sh '''
+                                    cmake \
+                                        -D CMAKE_CXX_COMPILER=hipcc \
+                                        -D CMAKE_CXX_EXTENSIONS=OFF \
+                                        -D CMAKE_BUILD_TYPE=RelWithDebInfo \
+                                        -D CMAKE_PREFIX_PATH="$KOKKOS_DIR;$ARBORX_DIR" \
+                                    examples \
+                                '''
+                                sh 'make VERBOSE=1'
+                                sh 'ctest --output-on-failure'
+                            }
+                        }
+                    }
+                }
+
+                stage('SYCL') {
+                    agent {
+                        dockerfile {
+                            filename "Dockerfile.sycl"
+                            dir "docker"
+                            args '-v /tmp/ccache.kokkos:/tmp/ccache'
+                            label 'NVIDIA_Tesla_V100-PCIE-32GB && nvidia-docker'
+                        }
+                    }
+                    steps {
+                        sh 'ccache --zero-stats'
+                        sh 'rm -rf build && mkdir -p build'
+                        dir('build') {
+                            sh '''
+                                cmake \
+                                    -D CMAKE_INSTALL_PREFIX=$ARBORX_DIR \
+                                    -D CMAKE_BUILD_TYPE=Release \
+                                    -D CMAKE_CXX_COMPILER=clang++ \
+                                    -D CMAKE_CXX_EXTENSIONS=OFF \
+                                    -D CMAKE_CXX_FLAGS="-Wpedantic -Wall -Wextra -Wno-unknown-cuda-version -fsycl -fsycl-targets=nvptx64-nvidia-cuda-sycldevice" \
+                                    -D CMAKE_PREFIX_PATH="$KOKKOS_DIR;$BOOST_DIR;$BENCHMARK_DIR;$ONE_DPL_DIR" \
+                                    -D ARBORX_ENABLE_MPI=ON \
+                                    -D MPIEXEC_PREFLAGS="--allow-run-as-root" \
+                                    -D MPIEXEC_MAX_NUMPROCS=4 \
+                                    -D ARBORX_ENABLE_TESTS=ON \
+                                    -D ARBORX_ENABLE_EXAMPLES=ON \
+                                    -D ARBORX_ENABLE_BENCHMARKS=ON \
+                                    -D ARBORX_ENABLE_ONEDPL=ON \
+                                ..
+                            '''
+                            sh 'make -j8 VERBOSE=1'
+                            sh 'ctest $CTEST_OPTIONS'
+                        }
+                    }
+                    post {
+                        always {
+                            sh 'ccache --show-stats'
+                            xunit reduceLog: false, tools:[CTest(deleteOutputFiles: true, failIfNotNew: true, pattern: 'build/Testing/**/Test.xml', skipNoTestFiles: false, stopProcessingIfError: true)]
+                        }
+                        success {
+                            sh 'cd build && make install'
+                            sh 'rm -rf test_install && mkdir -p test_install'
+                            dir('test_install') {
+                                sh 'cp -r ../examples .'
+                                sh '''
+                                    cmake \
+                                        -D CMAKE_BUILD_TYPE=Release \
+                                        -D CMAKE_CXX_COMPILER=clang++ \
+                                        -D CMAKE_CXX_EXTENSIONS=OFF \
+                                        -D CMAKE_PREFIX_PATH="$KOKKOS_DIR;$ARBORX_DIR;$ONE_DPL_DIR" \
+                                    examples \
+                                '''
+                                sh 'make VERBOSE=1'
+                                sh 'make test'
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+    post {
+        always {
+            node('docker') {
+                recordIssues(
+                    enabledForFailure: true,
+                    tools: [cmake(), gcc(), clang(), clangTidy()],
+                    qualityGates: [[threshold: 1, type: 'TOTAL', unstable: true]],
+                    filters: [excludeFile('/usr/local/cuda.*'), excludeCategory('#pragma-messages')]
+                )
+            }
+        }
+    }
+}
diff --git a/arborx/.mailmap b/arborx/.mailmap
new file mode 100644
index 000000000..802d8ebba
--- /dev/null
+++ b/arborx/.mailmap
@@ -0,0 +1,2 @@
+Damien L-G <dalg24@gmail.com>
+Wenjun Ge <gew1@ornl.gov>
diff --git a/arborx/CMakeLists.txt b/arborx/CMakeLists.txt
new file mode 100644
index 000000000..3181f1f93
--- /dev/null
+++ b/arborx/CMakeLists.txt
@@ -0,0 +1,171 @@
+cmake_minimum_required(VERSION 3.16)
+project(ArborX CXX)
+
+#find_package(Kokkos 3.1 REQUIRED)
+if(Kokkos_ENABLE_CUDA)
+  kokkos_check(OPTIONS CUDA_LAMBDA)
+endif()
+
+add_library(ArborX INTERFACE)
+target_link_libraries(ArborX INTERFACE Kokkos::kokkos)
+set_target_properties(ArborX PROPERTIES INTERFACE_COMPILE_FEATURES cxx_std_14)
+# As all executables using ArborX depend on it, depending on record_hash allows
+# updating hash each time executable is rebuilt, including when called from
+# within a subdirectory.
+add_dependencies(ArborX record_hash)
+
+include(CMakeDependentOption)
+cmake_dependent_option(ARBORX_ENABLE_ROCTHRUST "Enable rocThrust support" ON "Kokkos_ENABLE_HIP" OFF)
+if(Kokkos_ENABLE_HIP AND ARBORX_ENABLE_ROCTHRUST)
+  # Require at least rocThrust-2.10.5 (that comes with ROCm 3.9) because
+  # rocPRIM dependency is not set properly in exported configuration for
+  # earlier versions
+  find_package(rocthrust 2.10.5 REQUIRED CONFIG)
+  target_link_libraries(ArborX INTERFACE roc::rocthrust)
+endif()
+
+if(Kokkos_ENABLE_HIP AND NOT ARBORX_ENABLE_ROCTHRUST)
+  message(WARNING "rocThrust is NOT enabled.\nThis will negatively impact performance on AMD GPUs.")
+endif()
+
+cmake_dependent_option(ARBORX_ENABLE_ONEDPL "Enable oneDPL support" ON "Kokkos_ENABLE_SYCL" OFF)
+if(Kokkos_ENABLE_SYCL AND ARBORX_ENABLE_ONEDPL)
+  find_package(oneDPL REQUIRED)
+  target_link_libraries(ArborX INTERFACE oneDPL)
+endif()
+
+# Refer to the alias target in examples and benchmarks so they can be built
+# against an installed ArborX
+add_library(ArborX::ArborX ALIAS ArborX)
+
+option(ARBORX_ENABLE_MPI "Enable MPI support" OFF)
+if(ARBORX_ENABLE_MPI)
+  find_package(MPI REQUIRED)
+  target_link_libraries(ArborX INTERFACE MPI::MPI_CXX)
+endif()
+cmake_dependent_option(ARBORX_USE_CUDA_AWARE_MPI
+                       "Allow using device data in MPI communication"
+                       OFF "ARBORX_ENABLE_MPI" OFF)
+
+target_include_directories(ArborX INTERFACE
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/details>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>
+  $<INSTALL_INTERFACE:include>
+  $<INSTALL_INTERFACE:include/details>
+)
+
+install(TARGETS ArborX
+  EXPORT ArborXTargets
+  ARCHIVE LIBRARY PUBLIC_HEADER
+)
+
+install(EXPORT ArborXTargets
+  NAMESPACE ArborX::
+  DESTINATION lib/cmake/ArborX
+)
+
+set(ARBORX_VERSION_STRING "1.1 (dev)")
+
+# Make sure that the git hash in ArborX_Version.hpp is considered to be always
+# out of date, and thus is updated every recompile.
+add_custom_target(
+  record_hash ALL VERBATIM
+  COMMAND ${CMAKE_COMMAND}
+    -DSOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}
+    -DBINARY_DIR=${CMAKE_CURRENT_BINARY_DIR}
+    -DARBORX_VERSION_STRING=${ARBORX_VERSION_STRING}
+    -P cmake/SetupVersion.cmake
+  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+# Also run the record_hash command during configuration stage to have a visible
+# ArborX_Version.hpp at all times.
+execute_process(
+  COMMAND ${CMAKE_COMMAND}
+    -DSOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}
+    -DBINARY_DIR=${CMAKE_CURRENT_BINARY_DIR}
+    -DARBORX_VERSION_STRING=${ARBORX_VERSION_STRING}
+    -P cmake/SetupVersion.cmake
+  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/ArborX_Config.hpp.in
+               ${CMAKE_CURRENT_BINARY_DIR}/include/ArborX_Config.hpp)
+
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/ArborXSettings.cmake.in
+               ${CMAKE_CURRENT_BINARY_DIR}/ArborXSettings.cmake
+               @ONLY)
+
+include(CMakePackageConfigHelpers)
+configure_package_config_file(cmake/ArborXConfig.cmake.in
+  ${CMAKE_CURRENT_BINARY_DIR}/ArborXConfig.cmake
+  INSTALL_DESTINATION lib/cmake/ArborX
+)
+write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/ArborXConfigVersion.cmake
+  VERSION ${ARBORX_VERSION_STRING}
+  COMPATIBILITY SameMajorVersion
+)
+install(FILES
+  ${CMAKE_CURRENT_BINARY_DIR}/ArborXConfig.cmake
+  ${CMAKE_CURRENT_BINARY_DIR}/ArborXConfigVersion.cmake
+  ${CMAKE_CURRENT_BINARY_DIR}/ArborXSettings.cmake
+  DESTINATION lib/cmake/ArborX )
+
+if(ARBORX_ENABLE_MPI)
+  install(DIRECTORY ${PROJECT_SOURCE_DIR}/src/ DESTINATION include
+          FILES_MATCHING PATTERN "*.hpp")
+else()
+  install(DIRECTORY ${PROJECT_SOURCE_DIR}/src/ DESTINATION include
+          FILES_MATCHING PATTERN "*.hpp"
+          PATTERN "*Distribut*" EXCLUDE)
+endif()
+install(DIRECTORY ${PROJECT_BINARY_DIR}/include/ DESTINATION include
+        FILES_MATCHING PATTERN "*.hpp")
+
+if (NOT CMAKE_BUILD_TYPE)
+  set(default_build_type "RelWithDebInfo")
+  message(STATUS "Setting build type to '${default_build_type}' as none was specified.")
+  set(CMAKE_BUILD_TYPE "${default_build_type}" CACHE STRING
+    "Choose the type of build, options are: Debug, Release, RelWithDebInfo and MinSizeRel."
+    FORCE)
+endif()
+
+option(ARBORX_ENABLE_TESTS "Enable tests" OFF)
+option(ARBORX_ENABLE_EXAMPLES "Enable examples" OFF)
+option(ARBORX_ENABLE_BENCHMARKS "Enable benchmarks" OFF)
+
+if(${ARBORX_ENABLE_TESTS} OR ${ARBORX_ENABLE_EXAMPLES})
+  enable_testing()
+endif()
+
+cmake_dependent_option(ARBORX_ENABLE_HEADER_SELF_CONTAINMENT_TESTS "Enable header self-containment unit tests" ON "ARBORX_ENABLE_TESTS" OFF)
+if(ARBORX_ENABLE_HEADER_SELF_CONTAINMENT_TESTS)
+  # Globbing all the header filenames to test for self-containment and presence of header guards
+  file(GLOB_RECURSE ArborX_HEADERS RELATIVE ${CMAKE_SOURCE_DIR}/src src/*.hpp)
+  # Findout what headers are using macros defined in ArborX_Config.hpp
+  file(STRINGS src/ArborX_Config.hpp.in ArborX_DEFINITIONS REGEX "define ARBORX_")
+  foreach(_definition ${ArborX_DEFINITIONS})
+    string(REGEX REPLACE "(#define |#cmakedefine )" "" _macro ${_definition})
+    list(APPEND ArborX_MACROS ${_macro})
+  endforeach()
+  foreach(_file ${ArborX_HEADERS})
+    foreach(_macro ${ArborX_MACROS})
+      file(STRINGS src/${_file} _includes_mpi REGEX "mpi.h")
+      if(_includes_mpi)
+        list(APPEND ArborX_HEADERS_MUST_ENABLE_MPI ${_file})
+      endif()
+      file(STRINGS src/${_file} _has_macro REGEX "${_macro}")
+      if(_has_macro)
+        list(APPEND ArborX_HEADERS_MUST_INCLUDE_CONFIG_HPP ${_file})
+        continue()
+      endif()
+    endforeach()
+  endforeach()
+endif()
+if(ARBORX_ENABLE_TESTS)
+  add_subdirectory(test)
+endif()
+if(ARBORX_ENABLE_EXAMPLES)
+  add_subdirectory(examples)
+endif()
+if(ARBORX_ENABLE_BENCHMARKS)
+  add_subdirectory(benchmarks)
+endif()
diff --git a/arborx/CONTRIBUTING.md b/arborx/CONTRIBUTING.md
new file mode 100644
index 000000000..ab273435c
--- /dev/null
+++ b/arborx/CONTRIBUTING.md
@@ -0,0 +1,12 @@
+Contributing
+------------
+
+Contributing to ArborX is easy. Just send us a [pull
+request](https://help.github.com/articles/using-pull-requests/). When you send
+your request, make `master` the destination branch on the [ArborX
+repository](https://github.com/ArborX/ArborX). Please allow edits from
+maintainers in the pull request.
+
+Your pull request must pass ArborX's tests. It is also desired that it follows
+the coding style used in ArborX (see
+[wiki](https://github.com/arborx/ArborX/wiki/CodeStyle)).
diff --git a/arborx/LICENSE b/arborx/LICENSE
new file mode 100644
index 000000000..7d80a097f
--- /dev/null
+++ b/arborx/LICENSE
@@ -0,0 +1,27 @@
+BSD 3-Clause License
+
+Copyright 2017-2021 the ArborX authors
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+* Neither the name of the copyright holder nor the names of its
+  contributors may be used to endorse or promote products derived from this
+  software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR 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.
diff --git a/arborx/README.md b/arborx/README.md
new file mode 100644
index 000000000..79f4432e7
--- /dev/null
+++ b/arborx/README.md
@@ -0,0 +1,57 @@
+<img src="docs/logos/arborx_logo_v1.0.png" width="192">
+
+ArborX
+======
+ArborX is an open-source library designed to provide performance portable
+algorithms for geometric search, similarly to nanoflann and Boost Geometry.
+
+Installation
+------------
+The installation instructions can be found [here](https://github.com/arborx/ArborX/wiki/Build).
+
+Using ArborX
+------------
+The interface is described [here](https://github.com/arborx/ArborX/wiki/ArborX%3A%3ABoundingVolumeHierarchy).
+
+Examples
+--------
+Examples can be found in the [examples directory](https://github.com/arborx/ArborX/examples).
+
+Questions, Bug Reporting, and Issue Tracking
+--------------------------------------------
+Questions, bug reporting and issue tracking are provided by GitHub. Please
+report all bugs by creating a new issue with the "bug" tag. You can ask
+questions by creating a new issue with the "question" tag.
+
+Contributing
+------------
+We encourage you to contribute to ArborX! Please check out the
+[guidelines](CONTRIBUTING.md) about how to proceed.
+
+Citing ArborX
+-------------
+If you publish work which mentions ArborX, please cite the following paper:
+
+```BibTeX
+@article{arborx2020,
+  author = {Lebrun-Grandi\'{e}, D. and Prokopenko, A. and Turcksin, B. and Slattery, S. R.},
+  title = {{ArborX}: A Performance Portable Geometric Search Library},
+  year = {2020},
+  issue_date = {December 2020},
+  publisher = {Association for Computing Machinery},
+  address = {New York, NY, USA},
+  volume = {47},
+  number = {1},
+  issn = {0098-3500},
+  url = {https://doi.org/10.1145/3412558},
+  doi = {10.1145/3412558},
+  journal = {ACM Trans. Math. Softw.},
+  month = dec,
+  articleno = {2},
+  numpages = {15}
+}
+```
+
+License
+-------
+ArborX has a [BSD 3-clause open-source license](LICENSE).
diff --git a/arborx/benchmarks/CMakeLists.txt b/arborx/benchmarks/CMakeLists.txt
new file mode 100644
index 000000000..58796651a
--- /dev/null
+++ b/arborx/benchmarks/CMakeLists.txt
@@ -0,0 +1,7 @@
+find_package(Boost 1.56.0 REQUIRED COMPONENTS program_options)
+
+add_subdirectory(bvh_driver)
+add_subdirectory(execution_space_instances)
+if (ARBORX_ENABLE_MPI)
+  add_subdirectory(distributed_tree_driver)
+endif()
diff --git a/arborx/benchmarks/bvh_driver/CMakeLists.txt b/arborx/benchmarks/bvh_driver/CMakeLists.txt
new file mode 100644
index 000000000..2fcd9a43f
--- /dev/null
+++ b/arborx/benchmarks/bvh_driver/CMakeLists.txt
@@ -0,0 +1,16 @@
+set(POINT_CLOUDS_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/benchmarks/point_clouds)
+set(UNIT_TESTS_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/test)
+
+# We require version 1.4.0 or higher but the format used by Google benchmark is
+# wrong and thus, we cannot check the version during the configuration step.
+find_package(benchmark REQUIRED)
+
+find_package(Threads REQUIRED)
+
+add_executable(ArborX_BoundingVolumeHierarchy.exe bvh_driver.cpp)
+target_link_libraries(ArborX_BoundingVolumeHierarchy.exe ArborX::ArborX benchmark::benchmark Boost::program_options Threads::Threads)
+target_include_directories(ArborX_BoundingVolumeHierarchy.exe PRIVATE ${POINT_CLOUDS_INCLUDE_DIR} ${UNIT_TESTS_INCLUDE_DIR})
+add_test(NAME ArborX_BoundingVolumeHierarchy_Benchmark COMMAND ./ArborX_BoundingVolumeHierarchy.exe --buffer=0 --benchmark_color=true)
+if(ARBORX_PERFORMANCE_TESTING)
+  target_compile_definitions(ArborX_BoundingVolumeHierarchy.exe PRIVATE ARBORX_PERFORMANCE_TESTING)
+endif()
diff --git a/arborx/benchmarks/bvh_driver/benchmark_registration.hpp b/arborx/benchmarks/bvh_driver/benchmark_registration.hpp
new file mode 100644
index 000000000..eceb38158
--- /dev/null
+++ b/arborx/benchmarks/bvh_driver/benchmark_registration.hpp
@@ -0,0 +1,441 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#ifndef BENCHMARK_REGISTRATION_HPP
+#define BENCHMARK_REGISTRATION_HPP
+
+#include <ArborX_Point.hpp>
+#include <ArborX_Predicates.hpp>
+
+#include <Kokkos_Core.hpp>
+
+#include <chrono>
+#include <cmath> // cbrt
+
+#include <benchmark/benchmark.h>
+#include <point_clouds.hpp>
+
+struct Spec
+{
+  std::string backends;
+  int n_values;
+  int n_queries;
+  int n_neighbors;
+  bool sort_predicates;
+  int buffer_size;
+  PointCloudType source_point_cloud_type;
+  PointCloudType target_point_cloud_type;
+
+  Spec() = default;
+  Spec(std::string const &spec_string)
+  {
+    std::istringstream ss(spec_string);
+    std::string token;
+
+    // clang-format off
+    getline(ss, token, '/');  backends = token;
+    getline(ss, token, '/');  n_values = std::stoi(token);
+    getline(ss, token, '/');  n_queries = std::stoi(token);
+    getline(ss, token, '/');  n_neighbors = std::stoi(token);
+    getline(ss, token, '/');  sort_predicates = static_cast<bool>(std::stoi(token));
+    getline(ss, token, '/');  buffer_size = std::stoi(token);
+    getline(ss, token, '/');  source_point_cloud_type = static_cast<PointCloudType>(std::stoi(token));
+    getline(ss, token, '/');  target_point_cloud_type = static_cast<PointCloudType>(std::stoi(token));
+    // clang-format on
+
+    if (!(backends == "all" || backends == "serial" || backends == "openmp" ||
+          backends == "threads" || backends == "cuda" || backends == "rtree" ||
+          backends == "hip" || backends == "sycl" ||
+          backends == "openmptarget"))
+      throw std::runtime_error("Backend " + backends + " invalid!");
+  }
+
+  std::string create_label_construction(std::string const &tree_name) const
+  {
+    std::string s = std::string("BM_construction<") + tree_name + ">";
+    for (auto const &var :
+         {n_values, static_cast<int>(source_point_cloud_type)})
+      s += "/" + std::to_string(var);
+    return s;
+  }
+
+  std::string create_label_radius_search(std::string const &tree_name,
+                                         std::string const &flavor = "") const
+  {
+    std::string s = std::string("BM_radius_") +
+                    (flavor.empty() ? "" : flavor + "_") + "search<" +
+                    tree_name + ">";
+    for (auto const &var :
+         {n_values, n_queries, n_neighbors, static_cast<int>(sort_predicates),
+          buffer_size, static_cast<int>(source_point_cloud_type),
+          static_cast<int>(target_point_cloud_type)})
+      s += "/" + std::to_string(var);
+    return s;
+  };
+
+  std::string create_label_knn_search(std::string const &tree_name,
+                                      std::string const &flavor = "") const
+  {
+    std::string s = std::string("BM_knn_") +
+                    (flavor.empty() ? "" : flavor + "_") + "search<" +
+                    tree_name + ">";
+    for (auto const &var :
+         {n_values, n_queries, n_neighbors, static_cast<int>(sort_predicates),
+          static_cast<int>(source_point_cloud_type),
+          static_cast<int>(target_point_cloud_type)})
+      s += "/" + std::to_string(var);
+    return s;
+  };
+};
+
+template <typename DeviceType>
+Kokkos::View<ArborX::Point *, DeviceType>
+constructPoints(int n_values, PointCloudType point_cloud_type)
+{
+  Kokkos::View<ArborX::Point *, DeviceType> random_points(
+      Kokkos::view_alloc(Kokkos::WithoutInitializing, "random_points"),
+      n_values);
+  // Generate random points uniformly distributed within a box.  The edge
+  // length of the box chosen such that object density (here objects will be
+  // boxes 2x2x2 centered around a random point) will remain constant as
+  // problem size is changed.
+  auto const a = std::cbrt(n_values);
+  generatePointCloud(point_cloud_type, a, random_points);
+
+  return random_points;
+}
+
+template <typename DeviceType>
+Kokkos::View<decltype(ArborX::intersects(ArborX::Sphere{})) *, DeviceType>
+makeSpatialQueries(int n_values, int n_queries, int n_neighbors,
+                   PointCloudType target_point_cloud_type)
+{
+  Kokkos::View<ArborX::Point *, DeviceType> random_points(
+      Kokkos::view_alloc(Kokkos::WithoutInitializing, "random_points"),
+      n_queries);
+  auto const a = std::cbrt(n_values);
+  generatePointCloud(target_point_cloud_type, a, random_points);
+
+  Kokkos::View<decltype(ArborX::intersects(ArborX::Sphere{})) *, DeviceType>
+      queries(Kokkos::view_alloc(Kokkos::WithoutInitializing, "queries"),
+              n_queries);
+  // Radius is computed so that the number of results per query for a uniformly
+  // distributed points in a [-a,a]^3 box is approximately n_neighbors.
+  // Calculation: n_values*(4/3*M_PI*r^3)/(2a)^3 = n_neighbors
+  double const r = std::cbrt(static_cast<double>(n_neighbors) * 6. / M_PI);
+  using ExecutionSpace = typename DeviceType::execution_space;
+  Kokkos::parallel_for(
+      "bvh_driver:setup_radius_search_queries",
+      Kokkos::RangePolicy<ExecutionSpace>(0, n_queries), KOKKOS_LAMBDA(int i) {
+        queries(i) = ArborX::intersects(ArborX::Sphere{random_points(i), r});
+      });
+  return queries;
+}
+
+template <typename DeviceType>
+Kokkos::View<ArborX::Nearest<ArborX::Point> *, DeviceType>
+makeNearestQueries(int n_values, int n_queries, int n_neighbors,
+                   PointCloudType target_point_cloud_type)
+{
+  Kokkos::View<ArborX::Point *, DeviceType> random_points(
+      Kokkos::view_alloc(Kokkos::WithoutInitializing, "random_points"),
+      n_queries);
+  auto const a = std::cbrt(n_values);
+  generatePointCloud(target_point_cloud_type, a, random_points);
+
+  Kokkos::View<ArborX::Nearest<ArborX::Point> *, DeviceType> queries(
+      Kokkos::view_alloc(Kokkos::WithoutInitializing, "queries"), n_queries);
+  using ExecutionSpace = typename DeviceType::execution_space;
+  Kokkos::parallel_for(
+      "bvh_driver:setup_knn_search_queries",
+      Kokkos::RangePolicy<ExecutionSpace>(0, n_queries), KOKKOS_LAMBDA(int i) {
+        queries(i) =
+            ArborX::nearest<ArborX::Point>(random_points(i), n_neighbors);
+      });
+  return queries;
+}
+
+template <typename Queries>
+struct QueriesWithIndex
+{
+  Queries _queries;
+};
+
+template <typename Queries>
+struct ArborX::AccessTraits<QueriesWithIndex<Queries>, ArborX::PredicatesTag>
+{
+  using memory_space = typename Queries::memory_space;
+  static size_t size(QueriesWithIndex<Queries> const &q)
+  {
+    return q._queries.extent(0);
+  }
+  static KOKKOS_FUNCTION auto get(QueriesWithIndex<Queries> const &q, size_t i)
+  {
+    return attach(q._queries(i), (int)i);
+  }
+};
+
+template <typename DeviceType>
+struct CountCallback
+{
+  Kokkos::View<int *, DeviceType> count_;
+
+  template <typename Query>
+  KOKKOS_FUNCTION void operator()(Query const &query, int) const
+  {
+    auto const i = ArborX::getData(query);
+    Kokkos::atomic_fetch_add(&count_(i), 1);
+  }
+};
+
+template <typename ExecutionSpace, class TreeType>
+void BM_construction(benchmark::State &state, Spec const &spec)
+{
+  using DeviceType =
+      Kokkos::Device<ExecutionSpace, typename TreeType::memory_space>;
+
+  auto const points =
+      constructPoints<DeviceType>(spec.n_values, spec.source_point_cloud_type);
+
+  ExecutionSpace exec_space;
+
+  for (auto _ : state)
+  {
+    exec_space.fence();
+    auto const start = std::chrono::high_resolution_clock::now();
+
+    TreeType index(exec_space, points);
+
+    exec_space.fence();
+    auto const end = std::chrono::high_resolution_clock::now();
+    std::chrono::duration<double> elapsed_seconds = end - start;
+    state.SetIterationTime(elapsed_seconds.count());
+  }
+  // In Benchmark 1.5.0, it could be rewritten as
+  //   state.counters["rate"] = benchmark::Counter(
+  //     spec.n_values, benchmark::Counter::kIsIterationInvariantRate);
+  // Benchmark 1.4 does not support kIsIterationInvariantRate, however.
+  state.counters["rate"] = benchmark::Counter(
+      spec.n_values * state.iterations(), benchmark::Counter::kIsRate);
+}
+
+template <typename ExecutionSpace, class TreeType>
+void BM_radius_search(benchmark::State &state, Spec const &spec)
+{
+  using DeviceType =
+      Kokkos::Device<ExecutionSpace, typename TreeType::memory_space>;
+
+  ExecutionSpace exec_space;
+
+  TreeType index(exec_space, constructPoints<DeviceType>(
+                                 spec.n_values, spec.source_point_cloud_type));
+  auto const queries = makeSpatialQueries<DeviceType>(
+      spec.n_values, spec.n_queries, spec.n_neighbors,
+      spec.target_point_cloud_type);
+
+  for (auto _ : state)
+  {
+    Kokkos::View<int *, DeviceType> offset("offset", 0);
+    Kokkos::View<int *, DeviceType> indices("indices", 0);
+
+    exec_space.fence();
+    auto const start = std::chrono::high_resolution_clock::now();
+
+    ArborX::query(index, exec_space, queries, indices, offset,
+                  ArborX::Experimental::TraversalPolicy()
+                      .setPredicateSorting(spec.sort_predicates)
+                      .setBufferSize(spec.buffer_size));
+
+    exec_space.fence();
+    auto const end = std::chrono::high_resolution_clock::now();
+    std::chrono::duration<double> elapsed_seconds = end - start;
+    state.SetIterationTime(elapsed_seconds.count());
+  }
+  state.counters["rate"] = benchmark::Counter(
+      spec.n_queries * state.iterations(), benchmark::Counter::kIsRate);
+}
+
+template <typename ExecutionSpace, class TreeType>
+void BM_radius_callback_search(benchmark::State &state, Spec const &spec)
+{
+  using DeviceType =
+      Kokkos::Device<ExecutionSpace, typename TreeType::memory_space>;
+
+  ExecutionSpace exec_space;
+
+  TreeType index(
+      ExecutionSpace{},
+      constructPoints<DeviceType>(spec.n_values, spec.source_point_cloud_type));
+  auto const queries_no_index = makeSpatialQueries<DeviceType>(
+      spec.n_values, spec.n_queries, spec.n_neighbors,
+      spec.target_point_cloud_type);
+  QueriesWithIndex<decltype(queries_no_index)> queries{queries_no_index};
+
+  for (auto _ : state)
+  {
+    Kokkos::View<int *, DeviceType> num_neigh("Testing::num_neigh",
+                                              spec.n_queries);
+    CountCallback<DeviceType> callback{num_neigh};
+
+    exec_space.fence();
+    auto const start = std::chrono::high_resolution_clock::now();
+
+    index.query(exec_space, queries, callback,
+                ArborX::Experimental::TraversalPolicy().setPredicateSorting(
+                    spec.sort_predicates));
+
+    exec_space.fence();
+    auto const end = std::chrono::high_resolution_clock::now();
+    std::chrono::duration<double> elapsed_seconds = end - start;
+    state.SetIterationTime(elapsed_seconds.count());
+  }
+  state.counters["rate"] = benchmark::Counter(
+      spec.n_queries * state.iterations(), benchmark::Counter::kIsRate);
+}
+
+template <typename ExecutionSpace, class TreeType>
+void BM_knn_search(benchmark::State &state, Spec const &spec)
+{
+  using DeviceType =
+      Kokkos::Device<ExecutionSpace, typename TreeType::memory_space>;
+
+  ExecutionSpace exec_space;
+
+  TreeType index(exec_space, constructPoints<DeviceType>(
+                                 spec.n_values, spec.source_point_cloud_type));
+  auto const queries = makeNearestQueries<DeviceType>(
+      spec.n_values, spec.n_queries, spec.n_neighbors,
+      spec.target_point_cloud_type);
+
+  for (auto _ : state)
+  {
+    Kokkos::View<int *, DeviceType> offset("offset", 0);
+    Kokkos::View<int *, DeviceType> indices("indices", 0);
+
+    exec_space.fence();
+    auto const start = std::chrono::high_resolution_clock::now();
+
+    ArborX::query(index, exec_space, queries, indices, offset,
+                  ArborX::Experimental::TraversalPolicy().setPredicateSorting(
+                      spec.sort_predicates));
+
+    exec_space.fence();
+    auto const end = std::chrono::high_resolution_clock::now();
+    std::chrono::duration<double> elapsed_seconds = end - start;
+    state.SetIterationTime(elapsed_seconds.count());
+  }
+  state.counters["rate"] = benchmark::Counter(
+      spec.n_queries * state.iterations(), benchmark::Counter::kIsRate);
+}
+
+template <typename ExecutionSpace, class TreeType>
+void BM_knn_callback_search(benchmark::State &state, Spec const &spec)
+{
+  using DeviceType =
+      Kokkos::Device<ExecutionSpace, typename TreeType::memory_space>;
+
+  ExecutionSpace exec_space;
+
+  TreeType index(exec_space, constructPoints<DeviceType>(
+                                 spec.n_values, spec.source_point_cloud_type));
+  auto const queries_no_index = makeNearestQueries<DeviceType>(
+      spec.n_values, spec.n_queries, spec.n_neighbors,
+      spec.target_point_cloud_type);
+  QueriesWithIndex<decltype(queries_no_index)> queries{queries_no_index};
+
+  for (auto _ : state)
+  {
+    Kokkos::View<int *, DeviceType> num_neigh("Testing::num_neigh",
+                                              spec.n_queries);
+    CountCallback<DeviceType> callback{num_neigh};
+
+    exec_space.fence();
+    auto const start = std::chrono::high_resolution_clock::now();
+
+    index.query(exec_space, queries, callback,
+                ArborX::Experimental::TraversalPolicy().setPredicateSorting(
+                    spec.sort_predicates));
+
+    exec_space.fence();
+    auto const end = std::chrono::high_resolution_clock::now();
+    std::chrono::duration<double> elapsed_seconds = end - start;
+    state.SetIterationTime(elapsed_seconds.count());
+  }
+  state.counters["rate"] = benchmark::Counter(
+      spec.n_queries * state.iterations(), benchmark::Counter::kIsRate);
+}
+
+template <typename ExecutionSpace, typename TreeType>
+void register_benchmark_construction(Spec const &spec,
+                                     std::string const &description)
+{
+  benchmark::RegisterBenchmark(
+      spec.create_label_construction(description).c_str(),
+      [=](benchmark::State &state) {
+        BM_construction<ExecutionSpace, TreeType>(state, spec);
+      })
+      ->UseManualTime()
+      ->Unit(benchmark::kMicrosecond);
+}
+
+template <typename ExecutionSpace, typename TreeType>
+void register_benchmark_spatial_query_no_callback(
+    Spec const &spec, std::string const &description)
+{
+  benchmark::RegisterBenchmark(
+      spec.create_label_radius_search(description).c_str(),
+      [=](benchmark::State &state) {
+        BM_radius_search<ExecutionSpace, TreeType>(state, spec);
+      })
+      ->UseManualTime()
+      ->Unit(benchmark::kMicrosecond);
+}
+
+template <typename ExecutionSpace, typename TreeType>
+void register_benchmark_spatial_query_callback(Spec const &spec,
+                                               std::string const &description)
+{
+  benchmark::RegisterBenchmark(
+      spec.create_label_radius_search(description, "callback").c_str(),
+      [=](benchmark::State &state) {
+        BM_radius_callback_search<ExecutionSpace, TreeType>(state, spec);
+      })
+      ->UseManualTime()
+      ->Unit(benchmark::kMicrosecond);
+}
+
+template <typename ExecutionSpace, typename TreeType>
+void register_benchmark_nearest_query_no_callback(
+    Spec const &spec, std::string const &description)
+{
+  benchmark::RegisterBenchmark(
+      spec.create_label_knn_search(description).c_str(),
+      [=](benchmark::State &state) {
+        BM_knn_search<ExecutionSpace, TreeType>(state, spec);
+      })
+      ->UseManualTime()
+      ->Unit(benchmark::kMicrosecond);
+}
+
+template <typename ExecutionSpace, typename TreeType>
+void register_benchmark_nearest_query_callback(Spec const &spec,
+                                               std::string const &description)
+{
+  benchmark::RegisterBenchmark(
+      spec.create_label_knn_search(description, "callback").c_str(),
+      [=](benchmark::State &state) {
+        BM_knn_callback_search<ExecutionSpace, TreeType>(state, spec);
+      })
+      ->UseManualTime()
+      ->Unit(benchmark::kMicrosecond);
+}
+
+#endif
diff --git a/arborx/benchmarks/bvh_driver/bvh_driver.cpp b/arborx/benchmarks/bvh_driver/bvh_driver.cpp
new file mode 100644
index 000000000..ce29a42dc
--- /dev/null
+++ b/arborx/benchmarks/bvh_driver/bvh_driver.cpp
@@ -0,0 +1,295 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#include <ArborX_BoostRTreeHelpers.hpp>
+#include <ArborX_LinearBVH.hpp>
+#include <ArborX_Version.hpp>
+
+#include <Kokkos_Core.hpp>
+
+#include <boost/program_options.hpp>
+
+#include <cstdlib>
+
+#include "benchmark_registration.hpp"
+
+#ifdef ARBORX_PERFORMANCE_TESTING
+#include <mpi.h>
+#endif
+
+#include <benchmark/benchmark.h>
+
+template <typename ExecutionSpace, typename TreeType>
+struct BenchmarkRegistration
+{
+  BenchmarkRegistration(Spec const &, std::string const &) {}
+};
+
+template <typename ExecutionSpace, typename MemorySpace>
+struct BenchmarkRegistration<ExecutionSpace, ArborX::BVH<MemorySpace>>
+{
+  using TreeType = ArborX::BVH<MemorySpace>;
+  BenchmarkRegistration(Spec const &spec, std::string const &description)
+  {
+    register_benchmark_construction<ExecutionSpace, TreeType>(spec,
+                                                              description);
+    register_benchmark_spatial_query_no_callback<ExecutionSpace, TreeType>(
+        spec, description);
+    register_benchmark_spatial_query_callback<ExecutionSpace, TreeType>(
+        spec, description);
+    register_benchmark_nearest_query_no_callback<ExecutionSpace, TreeType>(
+        spec, description);
+    register_benchmark_nearest_query_callback<ExecutionSpace, TreeType>(
+        spec, description);
+  }
+};
+
+template <typename ExecutionSpace>
+struct BenchmarkRegistration<ExecutionSpace, BoostExt::RTree<ArborX::Point>>
+{
+  using TreeType = BoostExt::RTree<ArborX::Point>;
+  BenchmarkRegistration(Spec const &spec, std::string const &description)
+  {
+    register_benchmark_construction<ExecutionSpace, TreeType>(spec,
+                                                              description);
+    register_benchmark_spatial_query_no_callback<ExecutionSpace, TreeType>(
+        spec, description);
+    register_benchmark_nearest_query_no_callback<ExecutionSpace, TreeType>(
+        spec, description);
+  }
+};
+
+template <typename ExecutionSpace>
+using BVHBenchmarkRegistration =
+    BenchmarkRegistration<ExecutionSpace,
+                          ArborX::BVH<typename ExecutionSpace::memory_space>>;
+void register_bvh_benchmarks(Spec const &spec)
+{
+#ifdef KOKKOS_ENABLE_SERIAL
+  if (spec.backends == "all" || spec.backends == "serial")
+    BVHBenchmarkRegistration<Kokkos::Serial>(spec, "ArborX::BVH<Serial>");
+#else
+  if (spec.backends == "serial")
+    throw std::runtime_error("Serial backend not available!");
+#endif
+
+#ifdef KOKKOS_ENABLE_OPENMP
+  if (spec.backends == "all" || spec.backends == "openmp")
+    BVHBenchmarkRegistration<Kokkos::OpenMP>(spec, "ArborX::BVH<OpenMP>");
+#else
+  if (spec.backends == "openmp")
+    throw std::runtime_error("OpenMP backend not available!");
+#endif
+
+#ifdef KOKKOS_ENABLE_THREADS
+  if (spec.backends == "all" || spec.backends == "threads")
+    BVHBenchmarkRegistration<Kokkos::Threads>(spec, "ArborX::BVH<Threads>");
+#else
+  if (spec.backends == "threads")
+    throw std::runtime_error("Threads backend not available!");
+#endif
+
+#ifdef KOKKOS_ENABLE_CUDA
+  if (spec.backends == "all" || spec.backends == "cuda")
+    BVHBenchmarkRegistration<Kokkos::Cuda>(spec, "ArborX::BVH<Cuda>");
+#else
+  if (spec.backends == "cuda")
+    throw std::runtime_error("CUDA backend not available!");
+#endif
+
+#ifdef KOKKOS_ENABLE_HIP
+  if (spec.backends == "all" || spec.backends == "hip")
+    BVHBenchmarkRegistration<Kokkos::Experimental::HIP>(spec,
+                                                        "ArborX::BVH<HIP>");
+#else
+  if (spec.backends == "hip")
+    throw std::runtime_error("HIP backend not available!");
+#endif
+
+#ifdef KOKKOS_ENABLE_OPENMPTARGET
+  if (spec.backends == "all" || spec.backends == "openmptarget")
+    BVHBenchmarkRegistration<Kokkos::Experimental::OpenMPTarget>(
+        spec, "ArborX::BVH<OpenMPTarget>");
+#else
+  if (spec.backends == "openmptarget")
+    throw std::runtime_error("OpenMPTarget backend not available!");
+#endif
+
+#ifdef KOKKOS_ENABLE_SYCL
+  if (spec.backends == "all" || spec.backends == "sycl")
+    BVHBenchmarkRegistration<Kokkos::Experimental::SYCL>(spec,
+                                                         "ArborX::BVH<SYCL>");
+#else
+  if (spec.backends == "sycl")
+    throw std::runtime_error("SYCL backend not available!");
+#endif
+}
+
+void register_boostrtree_benchmarks(Spec const &spec)
+{
+#ifdef KOKKOS_ENABLE_SERIAL
+  if (spec.backends == "all" || spec.backends == "rtree")
+    BenchmarkRegistration<Kokkos::Serial, BoostExt::RTree<ArborX::Point>>(
+        spec, "BoostRTree");
+#else
+  std::ignore = spec;
+#endif
+}
+
+// NOTE Motivation for this class that stores the argument count and values is
+// I could not figure out how to make the parser consume arguments with
+// Boost.Program_options
+// Benchmark removes its own arguments from the command line arguments. This
+// means, that by virtue of returning references to internal data members in
+// argc() and argv() function, it will necessarily modify the members. It will
+// decrease _argc, and "reduce" _argv data. Hence, we must keep a copy of _argv
+// that is not modified from the outside to release memory in the destructor
+// correctly.
+class CmdLineArgs
+{
+private:
+  int _argc;
+  std::vector<char *> _argv;
+  std::vector<char *> _owner_ptrs;
+
+public:
+  CmdLineArgs(std::vector<std::string> const &args, char const *exe)
+      : _argc(args.size() + 1)
+      , _owner_ptrs{new char[std::strlen(exe) + 1]}
+  {
+    std::strcpy(_owner_ptrs[0], exe);
+    _owner_ptrs.reserve(_argc);
+    for (auto const &s : args)
+    {
+      _owner_ptrs.push_back(new char[s.size() + 1]);
+      std::strcpy(_owner_ptrs.back(), s.c_str());
+    }
+    _argv = _owner_ptrs;
+  }
+
+  ~CmdLineArgs()
+  {
+    for (auto *p : _owner_ptrs)
+    {
+      delete[] p;
+    }
+  }
+
+  int &argc() { return _argc; }
+
+  char **argv() { return _argv.data(); }
+};
+
+int main(int argc, char *argv[])
+{
+#ifdef ARBORX_PERFORMANCE_TESTING
+  MPI_Init(&argc, &argv);
+#endif
+  Kokkos::initialize(argc, argv);
+
+  namespace bpo = boost::program_options;
+  bpo::options_description desc("Allowed options");
+  Spec single_spec;
+  std::string source_pt_cloud;
+  std::string target_pt_cloud;
+  std::vector<std::string> exact_specs;
+  // clang-format off
+    desc.add_options()
+        ( "help", "produce help message" )
+        ( "values", bpo::value<int>(&single_spec.n_values)->default_value(50000), "number of indexable values (source)" )
+        ( "queries", bpo::value<int>(&single_spec.n_queries)->default_value(20000), "number of queries (target)" )
+        ( "predicate-sort", bpo::value<bool>(&single_spec.sort_predicates)->default_value(true), "sort predicates" )
+        ( "neighbors", bpo::value<int>(&single_spec.n_neighbors)->default_value(10), "desired number of results per query" )
+        ( "buffer", bpo::value<int>(&single_spec.buffer_size)->default_value(0), "size for buffer optimization in radius search" )
+        ( "source-point-cloud-type", bpo::value<std::string>(&source_pt_cloud)->default_value("filled_box"), "shape of the source point cloud"  )
+        ( "target-point-cloud-type", bpo::value<std::string>(&target_pt_cloud)->default_value("filled_box"), "shape of the target point cloud"  )
+        ( "exact-spec", bpo::value<std::vector<std::string>>(&exact_specs)->multitoken(), "exact specification (can be specified multiple times for batch)" )
+    ;
+  // clang-format on
+  bpo::variables_map vm;
+  bpo::parsed_options parsed = bpo::command_line_parser(argc, argv)
+                                   .options(desc)
+                                   .allow_unregistered()
+                                   .run();
+  bpo::store(parsed, vm);
+  CmdLineArgs pass_further{
+      bpo::collect_unrecognized(parsed.options, bpo::include_positional),
+      argv[0]};
+  bpo::notify(vm);
+
+  std::cout << "ArborX version: " << ArborX::version() << std::endl;
+  std::cout << "ArborX hash   : " << ArborX::gitCommitHash() << std::endl;
+
+  if (vm.count("help") > 0)
+  {
+    // Full list of options consists of Kokkos + Boost.Program_options +
+    // Google Benchmark and we still need to call benchmark::Initialize() to
+    // get those printed to the standard output.
+    std::cout << desc << "\n";
+    int ac = 2;
+    char *av[] = {(char *)"ignored", (char *)"--help"};
+    // benchmark::Initialize() calls exit(0) when `--help` so register
+    // Kokkos::finalize() to be called on normal program termination.
+    std::atexit(Kokkos::finalize);
+    benchmark::Initialize(&ac, av);
+    return 1;
+  }
+
+  if (vm.count("exact-spec") > 0)
+  {
+    for (std::string option :
+         {"values", "queries", "predicate-sort", "neighbors", "buffer",
+          "source-point-cloud-type", "target-point-cloud-type"})
+    {
+      if (!vm[option].defaulted())
+      {
+        std::cout << "Conflicting options: 'exact-spec' and '" << option
+                  << "', exiting..." << std::endl;
+        return EXIT_FAILURE;
+      }
+    }
+  }
+
+  benchmark::Initialize(&pass_further.argc(), pass_further.argv());
+  // Throw if some of the arguments have not been recognized.
+  std::ignore =
+      bpo::command_line_parser(pass_further.argc(), pass_further.argv())
+          .options(bpo::options_description(""))
+          .run();
+
+  std::vector<Spec> specs;
+  specs.reserve(exact_specs.size());
+  for (auto const &spec_string : exact_specs)
+    specs.emplace_back(spec_string);
+
+  if (vm.count("exact-spec") == 0)
+  {
+    single_spec.backends = "all";
+    single_spec.source_point_cloud_type = to_point_cloud_enum(source_pt_cloud);
+    single_spec.target_point_cloud_type = to_point_cloud_enum(target_pt_cloud);
+    specs.push_back(single_spec);
+  }
+
+  for (auto const &spec : specs)
+  {
+    register_bvh_benchmarks(spec);
+    register_boostrtree_benchmarks(spec);
+  }
+
+  benchmark::RunSpecifiedBenchmarks();
+
+  Kokkos::finalize();
+#ifdef ARBORX_PERFORMANCE_TESTING
+  MPI_Finalize();
+#endif
+
+  return EXIT_SUCCESS;
+}
diff --git a/arborx/benchmarks/distributed_tree_driver/CMakeLists.txt b/arborx/benchmarks/distributed_tree_driver/CMakeLists.txt
new file mode 100644
index 000000000..f0ccc61b8
--- /dev/null
+++ b/arborx/benchmarks/distributed_tree_driver/CMakeLists.txt
@@ -0,0 +1,4 @@
+add_executable(ArborX_DistributedTree_Benchmark.exe distributed_tree_driver.cpp)
+target_link_libraries(ArborX_DistributedTree_Benchmark.exe ArborX::ArborX Boost::program_options)
+target_include_directories(ArborX_DistributedTree_Benchmark.exe PRIVATE ${CMAKE_SOURCE_DIR}/benchmarks/point_clouds)
+add_test(NAME ArborX_DistributedTree_Benchmark COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} ./ArborX_DistributedTree_Benchmark.exe ${MPIEXEC_POSTFLAGS})
diff --git a/arborx/benchmarks/distributed_tree_driver/distributed_tree_driver.cpp b/arborx/benchmarks/distributed_tree_driver/distributed_tree_driver.cpp
new file mode 100644
index 000000000..150b88100
--- /dev/null
+++ b/arborx/benchmarks/distributed_tree_driver/distributed_tree_driver.cpp
@@ -0,0 +1,637 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#include <ArborX_DistributedTree.hpp>
+#include <ArborX_Version.hpp>
+
+#include <Kokkos_Core.hpp>
+
+#include <boost/program_options.hpp>
+
+#include <algorithm>
+#include <chrono>
+#include <cmath> // sqrt, cbrt
+#include <iomanip>
+#include <numeric>
+#include <random>
+#include <utility>
+#include <vector>
+
+#include <mpi.h>
+
+struct HelpPrinted
+{
+};
+
+// The TimeMonitor class can be used to measure for a series of events, i.e. it
+// represents a set of timers of type Timer. It is a poor man's drop-in
+// replacement for Teuchos::TimeMonitor
+class TimeMonitor
+{
+  using container_type = std::vector<std::pair<std::string, double>>;
+  using entry_reference_type = container_type::reference;
+  container_type _data;
+
+public:
+  class Timer
+  {
+    entry_reference_type _entry;
+    bool _started;
+    std::chrono::high_resolution_clock::time_point _tick;
+
+  public:
+    Timer(entry_reference_type ref)
+        : _entry{ref}
+        , _started{false}
+    {
+    }
+    void start()
+    {
+      assert(!_started);
+      _tick = std::chrono::high_resolution_clock::now();
+      _started = true;
+    }
+    void stop()
+    {
+      assert(_started);
+      std::chrono::duration<double> duration =
+          std::chrono::high_resolution_clock::now() - _tick;
+      // NOTE I have put much thought into whether we should use the
+      // operator+= and keep track of how many times the timer was
+      // restarted.  To be honest I have not even looked was the original
+      // TimeMonitor behavior is :)
+      _entry.second = duration.count();
+      _started = false;
+    }
+  };
+  // NOTE Original code had the pointer semantics.  Can change in the future.
+  // The smart pointer is a distraction.  The main problem here is that the
+  // reference stored by the timer is invalidated if the time monitor gets
+  // out of scope.
+  std::unique_ptr<Timer> getNewTimer(std::string name)
+  {
+    // FIXME Consider searching whether there already is an entry with the
+    // same name.
+    _data.emplace_back(std::move(name), 0.);
+    return std::make_unique<Timer>(_data.back());
+  }
+
+  void summarize(MPI_Comm comm, std::ostream &os = std::cout)
+  {
+    int comm_size;
+    MPI_Comm_size(comm, &comm_size);
+    int comm_rank;
+    MPI_Comm_rank(comm, &comm_rank);
+    int n_timers = _data.size();
+
+    os << std::left << std::scientific;
+
+    // Initialize with length of "Timer Name"
+    std::string const timer_name = "Timer Name";
+    std::size_t const max_section_length = std::accumulate(
+        _data.begin(), _data.end(), timer_name.size(),
+        [](std::size_t current_max, entry_reference_type section) {
+          return std::max(current_max, section.first.size());
+        });
+
+    if (comm_size == 1)
+    {
+      std::string const header_without_timer_name = " | GlobalTime";
+      std::stringstream dummy_string_stream;
+      dummy_string_stream << std::setprecision(os.precision())
+                          << std::scientific << " | " << 1.;
+      int const header_width =
+          max_section_length + std::max<int>(header_without_timer_name.size(),
+                                             dummy_string_stream.str().size());
+
+      os << std::string(header_width, '=') << "\n\n";
+      os << "TimeMonitor results over 1 processor\n\n";
+      os << std::setw(max_section_length) << timer_name
+         << header_without_timer_name << '\n';
+      os << std::string(header_width, '-') << '\n';
+      for (int i = 0; i < n_timers; ++i)
+      {
+        os << std::setw(max_section_length) << _data[i].first << " | "
+           << _data[i].second << '\n';
+      }
+      os << std::string(header_width, '=') << '\n';
+      return;
+    }
+    std::vector<double> all_entries(comm_size * n_timers);
+    std::transform(
+        _data.begin(), _data.end(), all_entries.begin() + comm_rank * n_timers,
+        [](std::pair<std::string, double> const &x) { return x.second; });
+    // FIXME No guarantee that all processors have the same timers!
+    MPI_Allgather(MPI_IN_PLACE, 0, MPI_DATATYPE_NULL, all_entries.data(),
+                  n_timers, MPI_DOUBLE, comm);
+    std::string const header_without_timer_name =
+        " | MinOverProcs | MeanOverProcs | MaxOverProcs";
+    if (comm_rank == 0)
+    {
+      os << std::string(max_section_length + header_without_timer_name.size(),
+                        '=')
+         << "\n\n";
+      os << "TimeMonitor results over " << comm_size << " processors\n";
+      os << std::setw(max_section_length) << timer_name
+         << header_without_timer_name << '\n';
+      os << std::string(max_section_length + header_without_timer_name.size(),
+                        '-')
+         << '\n';
+    }
+    std::vector<double> tmp(comm_size);
+    for (int i = 0; i < n_timers; ++i)
+    {
+      for (int j = 0; j < comm_size; ++j)
+      {
+        tmp[j] = all_entries[j * n_timers + i];
+      }
+      auto min = *std::min_element(tmp.begin(), tmp.end());
+      auto max = *std::max_element(tmp.begin(), tmp.end());
+      auto mean = std::accumulate(tmp.begin(), tmp.end(), 0.) / comm_size;
+      if (comm_rank == 0)
+      {
+        os << std::setw(max_section_length) << _data[i].first << " | " << min
+           << " |  " << mean << " | " << max << '\n';
+      }
+    }
+    if (comm_rank == 0)
+    {
+      os << std::string(max_section_length + header_without_timer_name.size(),
+                        '=')
+         << '\n';
+    }
+  }
+};
+
+template <typename DeviceType>
+struct NearestNeighborsSearches
+{
+  Kokkos::View<ArborX::Point *, DeviceType> points;
+  int k;
+};
+template <typename DeviceType>
+struct RadiusSearches
+{
+  Kokkos::View<ArborX::Point *, DeviceType> points;
+  double radius;
+};
+
+template <typename DeviceType>
+struct ArborX::AccessTraits<RadiusSearches<DeviceType>, ArborX::PredicatesTag>
+{
+  using memory_space = typename DeviceType::memory_space;
+  static KOKKOS_FUNCTION std::size_t
+  size(RadiusSearches<DeviceType> const &pred)
+  {
+    return pred.points.extent(0);
+  }
+  static KOKKOS_FUNCTION auto get(RadiusSearches<DeviceType> const &pred,
+                                  std::size_t i)
+  {
+    return ArborX::intersects(ArborX::Sphere{pred.points(i), pred.radius});
+  }
+};
+
+template <typename DeviceType>
+struct ArborX::AccessTraits<NearestNeighborsSearches<DeviceType>,
+                            ArborX::PredicatesTag>
+{
+  using memory_space = typename DeviceType::memory_space;
+  static KOKKOS_FUNCTION std::size_t
+  size(NearestNeighborsSearches<DeviceType> const &pred)
+  {
+    return pred.points.extent(0);
+  }
+  static KOKKOS_FUNCTION auto
+  get(NearestNeighborsSearches<DeviceType> const &pred, std::size_t i)
+  {
+    return ArborX::nearest(pred.points(i), pred.k);
+  }
+};
+
+namespace bpo = boost::program_options;
+
+template <class NO>
+int main_(std::vector<std::string> const &args, const MPI_Comm comm)
+{
+  TimeMonitor time_monitor;
+
+  using DeviceType = typename NO::device_type;
+  using ExecutionSpace = typename DeviceType::execution_space;
+  using MemorySpace = typename DeviceType::memory_space;
+
+  int n_values;
+  int n_queries;
+  int n_neighbors;
+  double shift;
+  int partition_dim;
+  bool perform_knn_search = true;
+  bool perform_radius_search = true;
+  bool shift_queries = false;
+
+  bpo::options_description desc("Allowed options");
+  // clang-format off
+    desc.add_options()
+        ( "help", "produce help message" )
+        ( "values", bpo::value<int>(&n_values)->default_value(20000), "Number of indexable values (source) per MPI rank." )
+        ( "queries", bpo::value<int>(&n_queries)->default_value(5000), "Number of queries (target) per MPI rank." )
+        ( "neighbors", bpo::value<int>(&n_neighbors)->default_value(10), "Desired number of results per query." )
+        ( "shift", bpo::value<double>(&shift)->default_value(1.), "Shift of the point clouds. '0' means the clouds are built "
+	                                                          "at the same place, while '1' places the clouds next to each"
+								  "other. Negative values and values larger than one "
+                                                                  "mean that the clouds are separated." )
+        ( "partition_dim", bpo::value<int>(&partition_dim)->default_value(3), "Number of dimension used by the partitioning of the global "
+                                                                              "point cloud. 1 -> local clouds are aligned on a line, 2 -> "
+                                                                              "local clouds form a board, 3 -> local clouds form a box." )
+        ( "do-not-perform-knn-search", "skip kNN search" )
+        ( "do-not-perform-radius-search", "skip radius search" )
+        ( "shift-queries" , "By default, points are reused for the queries. Enabling this option shrinks the local box queries are created "
+                            "in to a third of its size and moves it to the center of the global box. The result is a huge imbalance for the "
+                            "number of queries that need to be processed by each processor.")
+        ;
+  // clang-format on
+  bpo::variables_map vm;
+  bpo::store(bpo::command_line_parser(args).options(desc).run(), vm);
+  bpo::notify(vm);
+
+  int comm_rank;
+  MPI_Comm_rank(comm, &comm_rank);
+  int comm_size;
+  MPI_Comm_size(comm, &comm_size);
+
+  if (vm.count("help") > 0)
+  {
+    if (comm_rank == 0)
+      std::cout << desc << '\n';
+    throw HelpPrinted();
+  }
+
+  if (vm.count("do-not-perform-knn-search") > 0)
+    perform_knn_search = false;
+  if (vm.count("do-not-perform-radius-search") > 0)
+    perform_radius_search = false;
+  if (vm.count("shift-queries") > 0)
+    shift_queries = true;
+
+  if (comm_rank == 0)
+  {
+    std::cout << std::boolalpha;
+    std::cout << "\nRunning with arguments:\n"
+              << "perform knn search      : " << perform_knn_search << '\n'
+              << "perform radius search   : " << perform_radius_search << '\n'
+              << "#points/MPI process     : " << n_values << '\n'
+              << "#queries/MPI process    : " << n_queries << '\n'
+              << "size of shift           : " << shift << '\n'
+              << "dimension               : " << partition_dim << '\n'
+              << "shift-queries           : " << shift_queries << '\n'
+              << '\n';
+  }
+
+  Kokkos::View<ArborX::Point *, DeviceType> random_values(
+      Kokkos::view_alloc(Kokkos::WithoutInitializing, "Testing::values"),
+      n_values);
+  Kokkos::View<ArborX::Point *, DeviceType> random_queries(
+      Kokkos::view_alloc(Kokkos::WithoutInitializing, "Testing::queries"),
+      n_queries);
+  {
+    double a = 0.;
+    double offset_x = 0.;
+    double offset_y = 0.;
+    double offset_z = 0.;
+    int i_max = 0;
+    // Change the geometry of the problem. In 1D, all the point clouds are
+    // aligned on a line. In 2D, the point clouds create a board and in 3D,
+    // they create a box.
+    switch (partition_dim)
+    {
+    case 1:
+    {
+      i_max = comm_size;
+      offset_x = 2 * shift * comm_rank;
+      a = n_values;
+
+      break;
+    }
+    case 2:
+    {
+      i_max = std::ceil(std::sqrt(comm_size));
+      int i = comm_rank % i_max;
+      int j = comm_rank / i_max;
+      offset_x = 2 * shift * i;
+      offset_y = 2 * shift * j;
+      a = std::sqrt(n_values);
+
+      break;
+    }
+    case 3:
+    {
+      i_max = std::ceil(std::cbrt(comm_size));
+      int j_max = i_max;
+      int i = comm_rank % i_max;
+      int j = (comm_rank / i_max) % j_max;
+      int k = comm_rank / (i_max * j_max);
+      offset_x = 2 * shift * i;
+      offset_y = 2 * shift * j;
+      offset_z = 2 * shift * k;
+      a = std::cbrt(n_values);
+
+      break;
+    }
+    default:
+    {
+      throw std::runtime_error("partition_dim should be 1, 2, or 3");
+    }
+    }
+
+    // Generate random points uniformly distributed within a box.
+    std::uniform_real_distribution<double> distribution(-1., 1.);
+    std::default_random_engine generator;
+    auto random = [&distribution, &generator]() {
+      return distribution(generator);
+    };
+
+    // The boxes in which the points are placed have side length two, centered
+    // around offset_[xyz] and scaled by a.
+    Kokkos::View<ArborX::Point *, DeviceType> random_points(
+        Kokkos::view_alloc(Kokkos::WithoutInitializing, "Testing::points"),
+        std::max(n_values, n_queries));
+    auto random_points_host = Kokkos::create_mirror_view(random_points);
+    for (int i = 0; i < random_points.extent_int(0); ++i)
+      random_points_host(i) = {
+          {a * (offset_x + random()),
+           a * (offset_y + random()) * (partition_dim > 1),
+           a * (offset_z + random()) * (partition_dim > 2)}};
+    Kokkos::deep_copy(random_points, random_points_host);
+
+    Kokkos::deep_copy(
+        random_values,
+        Kokkos::subview(random_points, Kokkos::pair<int, int>(0, n_values)));
+
+    if (!shift_queries)
+    {
+      // By default, random points are "reused" between building the tree and
+      // performing queries.
+      Kokkos::deep_copy(
+          random_queries,
+          Kokkos::subview(random_points, Kokkos::pair<int, int>(0, n_queries)));
+    }
+    else
+    {
+      // For the queries, we shrink the global box by a factor three, and
+      // move it by a third of the global size towards the global center.
+      auto random_queries_host = Kokkos::create_mirror_view(random_queries);
+
+      int const max_offset = 2 * shift * i_max;
+      for (int i = 0; i < n_queries; ++i)
+        random_queries_host(i) = {
+            {a * ((offset_x + random()) / 3 + max_offset / 3),
+             a * ((offset_y + random()) / 3 + max_offset / 3) *
+                 (partition_dim > 1),
+             a * ((offset_z + random()) / 3 + max_offset / 3) *
+                 (partition_dim > 2)}};
+      Kokkos::deep_copy(random_queries, random_queries_host);
+    }
+  }
+
+  Kokkos::View<ArborX::Box *, DeviceType> bounding_boxes(
+      Kokkos::view_alloc(Kokkos::WithoutInitializing,
+                         "Testing::bounding_boxes"),
+      n_values);
+  Kokkos::parallel_for("bvh_driver:construct_bounding_boxes",
+                       Kokkos::RangePolicy<ExecutionSpace>(0, n_values),
+                       KOKKOS_LAMBDA(int i) {
+                         double const x = random_values(i)[0];
+                         double const y = random_values(i)[1];
+                         double const z = random_values(i)[2];
+                         bounding_boxes(i) = {{{x - 1., y - 1., z - 1.}},
+                                              {{x + 1., y + 1., z + 1.}}};
+                       });
+
+  auto construction = time_monitor.getNewTimer("construction");
+  MPI_Barrier(comm);
+  construction->start();
+  ArborX::DistributedTree<MemorySpace> distributed_tree(comm, ExecutionSpace{},
+                                                        bounding_boxes);
+  construction->stop();
+
+  std::ostream &os = std::cout;
+  if (comm_rank == 0)
+    os << "construction done\n";
+
+  using PairIndexRank = Kokkos::pair<int, int>;
+
+  if (perform_knn_search)
+  {
+    Kokkos::View<int *, DeviceType> offsets("Testing::offsets", 0);
+    Kokkos::View<PairIndexRank *, DeviceType> values("Testing::values", 0);
+
+    auto knn = time_monitor.getNewTimer("knn");
+    MPI_Barrier(comm);
+    knn->start();
+    distributed_tree.query(
+        ExecutionSpace{},
+        NearestNeighborsSearches<DeviceType>{random_queries, n_neighbors},
+        values, offsets);
+    knn->stop();
+
+    if (comm_rank == 0)
+      os << "knn done\n";
+  }
+
+  if (perform_radius_search)
+  {
+    // Radius is computed so that the number of results per query for a
+    // uniformly distributed primitives in a [-a,a]^d box is approximately
+    // n_neighbors. The primivites are boxes and not points. Thus, the radius
+    // we would have chosen for the case of point primitives has to be adjusted
+    // to account for box-box interaction. The radius is decreased by an
+    // average of the lengths of a half-edge and a half-diagonal to account for
+    // that (approximately). An exact calculation would require computing
+    // an integral.
+    double r = 0.;
+    switch (partition_dim)
+    {
+    case 1:
+      // Derivation (first term): n_values*(2*r)/(2a) = n_neighbors
+      r = static_cast<double>(n_neighbors) - 1.;
+      break;
+    case 2:
+      // Derivation (first term): n_values*(M_PI*r^2)/(2a)^2 = n_neighbors
+      r = std::sqrt(static_cast<double>(n_neighbors) * 4. / M_PI) -
+          (1. + std::sqrt(2.)) / 2;
+      break;
+    case 3:
+      // Derivation (first term): n_values*(4/3*M_PI*r^3)/(2a)^3 = n_neighbors
+      r = std::cbrt(static_cast<double>(n_neighbors) * 6. / M_PI) -
+          (1. + std::cbrt(3.)) / 2;
+      break;
+    }
+
+    Kokkos::View<int *, DeviceType> offsets("Testing::offsets", 0);
+    Kokkos::View<PairIndexRank *, DeviceType> values("Testing::values", 0);
+
+    auto radius = time_monitor.getNewTimer("radius");
+    MPI_Barrier(comm);
+    radius->start();
+    distributed_tree.query(ExecutionSpace{},
+                           RadiusSearches<DeviceType>{random_queries, r},
+                           values, offsets);
+    radius->stop();
+
+    if (comm_rank == 0)
+      os << "radius done\n";
+  }
+  time_monitor.summarize(comm);
+
+  return 0;
+}
+
+int main(int argc, char *argv[])
+{
+  MPI_Init(&argc, &argv);
+
+  MPI_Comm const comm = MPI_COMM_WORLD;
+  int comm_rank;
+  MPI_Comm_rank(comm, &comm_rank);
+  if (comm_rank == 0)
+  {
+    std::cout << "ArborX version: " << ArborX::version() << std::endl;
+    std::cout << "ArborX hash   : " << ArborX::gitCommitHash() << std::endl;
+  }
+
+  // Strip "--help" and "--kokkos-help" from the flags passed to Kokkos if we
+  // are not on MPI rank 0 to prevent Kokkos from printing the help message
+  // multiply.
+  if (comm_rank != 0)
+  {
+    auto *help_it = std::find_if(argv, argv + argc, [](std::string const &x) {
+      return x == "--help" || x == "--kokkos-help";
+    });
+    if (help_it != argv + argc)
+    {
+      std::swap(*help_it, *(argv + argc - 1));
+      --argc;
+    }
+  }
+  Kokkos::initialize(argc, argv);
+
+  bool success = true;
+
+  try
+  {
+    std::string node;
+    // NOTE Lame trick to get a valid default value
+#if defined(KOKKOS_ENABLE_HIP)
+    node = "hip";
+#elif defined(KOKKOS_ENABLE_CUDA)
+    node = "cuda";
+#elif defined(KOKKOS_ENABLE_OPENMP)
+    node = "openmp";
+#elif defined(KOKKOS_ENABLE_THREADS)
+    node = "threads";
+#elif defined(KOKKOS_ENABLE_SERIAL)
+    node = "serial";
+#endif
+    bpo::options_description desc("Parallel setting:");
+    desc.add_options()("node", bpo::value<std::string>(&node),
+                       "node type (serial | openmp | threads | cuda)");
+    bpo::variables_map vm;
+    bpo::parsed_options parsed = bpo::command_line_parser(argc, argv)
+                                     .options(desc)
+                                     .allow_unregistered()
+                                     .run();
+    bpo::store(parsed, vm);
+    std::vector<std::string> pass_further =
+        bpo::collect_unrecognized(parsed.options, bpo::include_positional);
+    bpo::notify(vm);
+
+    if (comm_rank == 0 && std::find_if(pass_further.begin(), pass_further.end(),
+                                       [](std::string const &x) {
+                                         return x == "--help";
+                                       }) != pass_further.end())
+    {
+      std::cout << desc << '\n';
+    }
+
+    if (node != "serial" && node != "openmp" && node != "cuda" &&
+        node != "threads" && node != "hip")
+      throw std::runtime_error("Unrecognized node type: \"" + node + "\"");
+
+    if (node == "serial")
+    {
+#ifdef KOKKOS_ENABLE_SERIAL
+      using Node = Kokkos::Serial;
+      main_<Node>(pass_further, comm);
+#else
+      throw std::runtime_error("Serial node type is disabled");
+#endif
+    }
+    if (node == "openmp")
+    {
+#ifdef KOKKOS_ENABLE_OPENMP
+      using Node = Kokkos::OpenMP;
+      main_<Node>(pass_further, comm);
+#else
+      throw std::runtime_error("OpenMP node type is disabled");
+#endif
+    }
+    if (node == "threads")
+    {
+#ifdef KOKKOS_ENABLE_THREADS
+      using Node = Kokkos::Threads;
+      main_<Node>(pass_further, comm);
+#else
+      throw std::runtime_error("Threads node type is disabled");
+#endif
+    }
+    if (node == "cuda")
+    {
+#ifdef KOKKOS_ENABLE_CUDA
+      using Node = Kokkos::Device<Kokkos::Cuda, Kokkos::CudaSpace>;
+      main_<Node>(pass_further, comm);
+#else
+      throw std::runtime_error("CUDA node type is disabled");
+#endif
+    }
+    if (node == "hip")
+    {
+#ifdef KOKKOS_ENABLE_HIP
+      using Node = Kokkos::Device<Kokkos::Experimental::HIP,
+                                  Kokkos::Experimental::HIPSpace>;
+      main_<Node>(pass_further, comm);
+#else
+      throw std::runtime_error("HIP node type is disabled");
+#endif
+    }
+  }
+  catch (HelpPrinted const &)
+  {
+    // Do nothing, it was a successful run. Just clean up things below.
+  }
+  catch (std::exception const &e)
+  {
+    std::cerr << "processor " << comm_rank
+              << " caught a std::exception: " << e.what() << '\n';
+    success = false;
+  }
+  catch (...)
+  {
+    std::cerr << "processor " << comm_rank
+              << " caught some kind of exception\n";
+    success = false;
+  }
+
+  Kokkos::finalize();
+
+  MPI_Finalize();
+
+  return (success ? EXIT_SUCCESS : EXIT_FAILURE);
+}
diff --git a/arborx/benchmarks/execution_space_instances/CMakeLists.txt b/arborx/benchmarks/execution_space_instances/CMakeLists.txt
new file mode 100644
index 000000000..2034009d7
--- /dev/null
+++ b/arborx/benchmarks/execution_space_instances/CMakeLists.txt
@@ -0,0 +1,4 @@
+add_executable(ArborX_ExecutionSpaces_Benchmark.exe execution_space_instances_driver.cpp)
+target_link_libraries(ArborX_ExecutionSpaces_Benchmark.exe ArborX::ArborX Boost::program_options)
+target_include_directories(ArborX_ExecutionSpaces_Benchmark.exe PRIVATE ${CMAKE_SOURCE_DIR}/benchmarks/point_clouds)
+add_test(NAME ArborX_ExecutionSpaces_Benchmark COMMAND ./ArborX_ExecutionSpaces_Benchmark.exe)
diff --git a/arborx/benchmarks/execution_space_instances/execution_space_instances_driver.cpp b/arborx/benchmarks/execution_space_instances/execution_space_instances_driver.cpp
new file mode 100644
index 000000000..99ede0097
--- /dev/null
+++ b/arborx/benchmarks/execution_space_instances/execution_space_instances_driver.cpp
@@ -0,0 +1,225 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#include <ArborX_LinearBVH.hpp>
+#include <ArborX_Version.hpp>
+
+#include <Kokkos_Core.hpp>
+
+#include <boost/program_options.hpp>
+
+#include <algorithm>
+#include <chrono>
+#include <cmath> // sqrt, cbrt
+#include <iomanip>
+#include <numeric>
+#include <random>
+#include <utility>
+#include <vector>
+
+template <typename ExecutionSpace>
+class InstanceManager
+{
+public:
+  InstanceManager(int const n_instances) { _instances.resize(n_instances); }
+  const std::vector<ExecutionSpace> &get_instances() const
+  {
+    return _instances;
+  }
+
+private:
+  std::vector<ExecutionSpace> _instances;
+};
+
+#ifdef KOKKOS_ENABLE_CUDA
+template <>
+class InstanceManager<Kokkos::Cuda>
+{
+public:
+  InstanceManager(int const n_instances)
+  {
+    _streams.resize(n_instances);
+    _instances.reserve(n_instances);
+    for (int i = 0; i < n_instances; ++i)
+    {
+      cudaStreamCreate(&_streams[i]);
+      _instances.emplace_back(_streams[i]);
+    }
+  }
+
+  ~InstanceManager()
+  {
+    for (unsigned int i = 0; i < _streams.size(); ++i)
+      cudaStreamDestroy(_streams[i]);
+  }
+
+  const std::vector<Kokkos::Cuda> &get_instances() const { return _instances; }
+
+private:
+  std::vector<Kokkos::Cuda> _instances;
+  std::vector<cudaStream_t> _streams;
+};
+#endif
+
+template <typename MemorySpace>
+struct CountCallback
+{
+  Kokkos::View<int *, MemorySpace> _counts;
+
+  template <typename Query>
+  KOKKOS_FUNCTION void operator()(Query const &query, int) const
+  {
+    auto const i = ArborX::getData(query);
+    Kokkos::atomic_fetch_add(&_counts(i), 1);
+  }
+};
+
+int main(int argc, char *argv[])
+{
+  using ExecutionSpace = Kokkos::DefaultExecutionSpace;
+  using MemorySpace = typename ExecutionSpace::memory_space;
+
+  Kokkos::ScopeGuard guard(argc, argv);
+
+  std::cout << "ArborX version: " << ArborX::version() << std::endl;
+  std::cout << "ArborX hash   : " << ArborX::gitCommitHash() << std::endl;
+
+  namespace bpo = boost::program_options;
+
+  int num_exec_spaces;
+  int num_primitives;
+  int num_problems;
+  int num_predicates;
+
+  bpo::options_description desc("Allowed options");
+  // clang-format off
+    desc.add_options()
+        ( "help", "produce help message" )
+        ( "num-spaces", bpo::value<int>(&num_exec_spaces)->default_value(1), "Number of execution space instances." )
+        ( "num-problems", bpo::value<int>(&num_problems)->default_value(1), "Number of subproblems." )
+        ( "values", bpo::value<int>(&num_primitives)->default_value(20000), "Number of indexable values (source) per subproblem." )
+        ( "queries", bpo::value<int>(&num_predicates)->default_value(5000), "Number of queries (target) per subproblem." )
+        ;
+  // clang-format on
+  bpo::variables_map vm;
+  bpo::store(bpo::command_line_parser(argc, argv).options(desc).run(), vm);
+  bpo::notify(vm);
+
+  float const r = 0.1f;
+  float const shift = 2.f;
+
+  if (vm.count("help") > 0)
+  {
+    std::cout << desc << '\n';
+    return 1;
+  }
+
+  std::cout << std::boolalpha;
+  std::cout << "\nRunning with arguments:"
+            << "\nnumber of execution space instances : " << num_exec_spaces
+            << "\nnumber of problems                  : " << num_problems
+            << "\n#points/problem                     : " << num_primitives
+            << "\n#queries/problem                    : " << num_predicates
+            << '\n';
+
+  // Generate random points uniformly distributed within a box.
+  std::uniform_real_distribution<float> distribution(-1., 1.);
+  std::default_random_engine generator;
+  auto random = [&distribution, &generator]() {
+    return distribution(generator);
+  };
+
+  Kokkos::View<ArborX::Point *, MemorySpace> primitives(
+      Kokkos::view_alloc(Kokkos::WithoutInitializing, "primitives"),
+      num_primitives * num_problems);
+  Kokkos::View<decltype(ArborX::attach(ArborX::intersects(ArborX::Sphere{}),
+                                       int{})) *,
+               MemorySpace>
+      predicates(Kokkos::view_alloc(Kokkos::WithoutInitializing, "predicates"),
+                 num_predicates * num_problems);
+  for (int p = 0; p < num_problems; ++p)
+  {
+    // Points are placed in a box [offset_x-1, offset_x+1] x [-1, 1] x [-1, 1]
+    float offset_x = p * shift;
+
+    Kokkos::View<ArborX::Point *, MemorySpace> points(
+        "points", std::max(num_primitives, num_predicates));
+    auto points_host = Kokkos::create_mirror_view(points);
+    for (int i = 0; i < (int)points.extent(0); ++i)
+      points_host(i) = {offset_x + random(), random(), random()};
+    Kokkos::deep_copy(points, points_host);
+
+    Kokkos::deep_copy(
+        Kokkos::subview(
+            primitives,
+            Kokkos::make_pair(p * num_primitives, (p + 1) * num_primitives)),
+        Kokkos::subview(points, Kokkos::make_pair(0, num_primitives)));
+    Kokkos::parallel_for(
+        "construct_predicates",
+        Kokkos::RangePolicy<ExecutionSpace>(
+            ExecutionSpace{}, p * num_predicates, (p + 1) * num_predicates),
+        KOKKOS_LAMBDA(int i) {
+          predicates(i) =
+              ArborX::attach(ArborX::intersects(ArborX::Sphere{
+                                 points(i - p * num_predicates), r}),
+                             i);
+        });
+  }
+
+  InstanceManager<ExecutionSpace> instance_manager(num_exec_spaces);
+  auto const &instances = instance_manager.get_instances();
+
+  std::vector<ArborX::BVH<MemorySpace>> trees;
+  for (int p = 0; p < num_problems; ++p)
+  {
+    auto const &exec_space = instances[p % num_exec_spaces];
+
+    trees.emplace_back(
+        exec_space, Kokkos::subview(primitives, Kokkos::pair<int, int>(
+                                                    p * num_primitives,
+                                                    (p + 1) * num_primitives)));
+  }
+  ArborX::BVH<MemorySpace> tree(instances[0], primitives);
+
+  Kokkos::View<int *, MemorySpace> counts("counts",
+                                          num_predicates * num_problems);
+
+  Kokkos::fence();
+  Kokkos::Timer query_time;
+  query_time.reset();
+  for (int p = 0; p < num_problems; ++p)
+  {
+    auto const &exec_space = instances[p % num_exec_spaces];
+
+    trees[p].query(
+        exec_space,
+        Kokkos::subview(predicates,
+                        Kokkos::pair<int, int>(p * num_predicates,
+                                               (p + 1) * num_predicates)),
+        CountCallback<MemorySpace>{counts},
+        ArborX::Experimental::TraversalPolicy().setPredicateSorting(false));
+    // ArborX::Experimental::TraversalPolicy().setPredicateSorting(true));
+  }
+  Kokkos::fence();
+  std::cout << "Time multiple(s): " << query_time.seconds() << '\n';
+
+  Kokkos::deep_copy(counts, 0);
+  query_time.reset();
+
+  tree.query(
+      instances[0], predicates, CountCallback<MemorySpace>{counts},
+      ArborX::Experimental::TraversalPolicy().setPredicateSorting(false));
+
+  Kokkos::fence();
+  std::cout << "Time single(s): " << query_time.seconds() << '\n';
+
+  return EXIT_SUCCESS;
+}
diff --git a/arborx/benchmarks/point_clouds/point_clouds.hpp b/arborx/benchmarks/point_clouds/point_clouds.hpp
new file mode 100644
index 000000000..340f25f72
--- /dev/null
+++ b/arborx/benchmarks/point_clouds/point_clouds.hpp
@@ -0,0 +1,216 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#ifndef ARBORX_POINT_CLOUDS_HPP
+#define ARBORX_POINT_CLOUDS_HPP
+
+#include <ArborX_DetailsKokkosExtAccessibilityTraits.hpp>
+#include <ArborX_Exception.hpp>
+#include <ArborX_Point.hpp>
+
+#include <Kokkos_Core.hpp>
+
+#include <fstream>
+#include <random>
+
+enum class PointCloudType
+{
+  filled_box,
+  hollow_box,
+  filled_sphere,
+  hollow_sphere
+};
+
+inline PointCloudType to_point_cloud_enum(std::string const &str)
+{
+  if (str == "filled_box")
+    return PointCloudType::filled_box;
+  if (str == "hollow_box")
+    return PointCloudType::hollow_box;
+  if (str == "filled_sphere")
+    return PointCloudType::filled_sphere;
+  if (str == "hollow_sphere")
+    return PointCloudType::hollow_sphere;
+  throw std::runtime_error(str +
+                           " doesn't correspond to any known PointCloudType!");
+}
+
+template <typename Layout, typename DeviceType>
+void filledBoxCloud(
+    double const half_edge,
+    Kokkos::View<ArborX::Point *, Layout, DeviceType> random_points)
+{
+  static_assert(
+      KokkosExt::is_accessible_from_host<decltype(random_points)>::value,
+      "The View should be accessible on the Host");
+  std::uniform_real_distribution<double> distribution(-half_edge, half_edge);
+  std::default_random_engine generator;
+  auto random = [&distribution, &generator]() {
+    return distribution(generator);
+  };
+  unsigned int const n = random_points.extent(0);
+  for (unsigned int i = 0; i < n; ++i)
+    random_points(i) = {{random(), random(), random()}};
+}
+
+template <typename Layout, typename DeviceType>
+void hollowBoxCloud(
+    double const half_edge,
+    Kokkos::View<ArborX::Point *, Layout, DeviceType> random_points)
+{
+  static_assert(
+      KokkosExt::is_accessible_from_host<decltype(random_points)>::value,
+      "The View should be accessible on the Host");
+  std::uniform_real_distribution<double> distribution(-half_edge, half_edge);
+  std::default_random_engine generator;
+  auto random = [&distribution, &generator]() {
+    return distribution(generator);
+  };
+  unsigned int const n = random_points.extent(0);
+  for (unsigned int i = 0; i < n; ++i)
+  {
+    unsigned int face = i % 6;
+    switch (face)
+    {
+    case 0:
+    {
+      random_points(i) = {{-half_edge, random(), random()}};
+
+      break;
+    }
+    case 1:
+    {
+      random_points(i) = {{half_edge, random(), random()}};
+
+      break;
+    }
+    case 2:
+    {
+      random_points(i) = {{random(), -half_edge, random()}};
+
+      break;
+    }
+    case 3:
+    {
+      random_points(i) = {{random(), half_edge, random()}};
+
+      break;
+    }
+    case 4:
+    {
+      random_points(i) = {{random(), random(), -half_edge}};
+
+      break;
+    }
+    case 5:
+    {
+      random_points(i) = {{random(), random(), half_edge}};
+
+      break;
+    }
+    default:
+    {
+      throw std::runtime_error("Your compiler is broken");
+    }
+    }
+  }
+}
+
+template <typename Layout, typename DeviceType>
+void filledSphereCloud(
+    double const radius,
+    Kokkos::View<ArborX::Point *, Layout, DeviceType> random_points)
+{
+  static_assert(
+      KokkosExt::is_accessible_from_host<decltype(random_points)>::value,
+      "The View should be accessible on the Host");
+  std::default_random_engine generator;
+
+  std::uniform_real_distribution<double> distribution(-radius, radius);
+  auto random = [&distribution, &generator]() {
+    return distribution(generator);
+  };
+
+  unsigned int const n = random_points.extent(0);
+  for (unsigned int i = 0; i < n; ++i)
+  {
+    bool point_accepted = false;
+    while (!point_accepted)
+    {
+      double const x = random();
+      double const y = random();
+      double const z = random();
+
+      // Only accept points that are in the sphere
+      if (std::sqrt(x * x + y * y + z * z) <= radius)
+      {
+        random_points(i) = {{x, y, z}};
+        point_accepted = true;
+      }
+    }
+  }
+}
+
+template <typename Layout, typename DeviceType>
+void hollowSphereCloud(
+    double const radius,
+    Kokkos::View<ArborX::Point *, Layout, DeviceType> random_points)
+{
+  static_assert(
+      KokkosExt::is_accessible_from_host<decltype(random_points)>::value,
+      "The View should be accessible on the Host");
+  std::default_random_engine generator;
+
+  std::uniform_real_distribution<double> distribution(-1., 1.);
+  auto random = [&distribution, &generator]() {
+    return distribution(generator);
+  };
+
+  unsigned int const n = random_points.extent(0);
+  for (unsigned int i = 0; i < n; ++i)
+  {
+    double const x = random();
+    double const y = random();
+    double const z = random();
+    double const norm = std::sqrt(x * x + y * y + z * z);
+
+    random_points(i) = {
+        {radius * x / norm, radius * y / norm, radius * z / norm}};
+  }
+}
+
+template <typename DeviceType>
+void generatePointCloud(PointCloudType const point_cloud_type,
+                        double const length,
+                        Kokkos::View<ArborX::Point *, DeviceType> random_points)
+{
+  auto random_points_host = Kokkos::create_mirror_view(random_points);
+  switch (point_cloud_type)
+  {
+  case PointCloudType::filled_box:
+    filledBoxCloud(length, random_points_host);
+    break;
+  case PointCloudType::hollow_box:
+    hollowBoxCloud(length, random_points_host);
+    break;
+  case PointCloudType::filled_sphere:
+    filledSphereCloud(length, random_points_host);
+    break;
+  case PointCloudType::hollow_sphere:
+    hollowSphereCloud(length, random_points_host);
+    break;
+  default:
+    throw ArborX::SearchException("not implemented");
+  }
+  Kokkos::deep_copy(random_points, random_points_host);
+}
+
+#endif
diff --git a/arborx/cmake/ArborXConfig.cmake.in b/arborx/cmake/ArborXConfig.cmake.in
new file mode 100644
index 000000000..3702eecdc
--- /dev/null
+++ b/arborx/cmake/ArborXConfig.cmake.in
@@ -0,0 +1,26 @@
+@PACKAGE_INIT@
+
+set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR} ${CMAKE_MODULE_PATH})
+
+include(CMakeFindDependencyMacro)
+
+find_package(Kokkos QUIET)
+if(NOT Kokkos_FOUND)
+  # If Kokkos was not found, try to use Kokkos used when building ArborX
+  set(Kokkos_DIR @Kokkos_DIR@)
+  find_dependency(Kokkos)
+endif()
+
+include("${CMAKE_CURRENT_LIST_DIR}/ArborXSettings.cmake")
+if(Kokkos_ENABLE_HIP AND ARBORX_ENABLE_ROCTHRUST)
+  find_dependency(rocthrust)
+endif()
+if(Kokkos_ENABLE_SYCL AND ARBORX_ENABLE_ONEDPL)
+  find_dependency(oneDPL)
+endif()
+if(ARBORX_ENABLE_MPI)
+  find_dependency(MPI)
+endif()
+
+include("${CMAKE_CURRENT_LIST_DIR}/ArborXTargets.cmake")
+check_required_components(ArborX)
diff --git a/arborx/cmake/ArborXSettings.cmake.in b/arborx/cmake/ArborXSettings.cmake.in
new file mode 100644
index 000000000..6a706358f
--- /dev/null
+++ b/arborx/cmake/ArborXSettings.cmake.in
@@ -0,0 +1,4 @@
+set(ARBORX_ENABLE_ROCTHRUST @ARBORX_ENABLE_ROCTHRUST@)
+set(ARBORX_ENABLE_ONEDPL @ARBORX_ENABLE_ONEDPL@)
+set(ARBORX_ENABLE_MPI @ARBORX_ENABLE_MPI@)
+set(ARBORX_USE_CUDA_AWARE_MPI @ARBORX_USE_CUDA_AWARE_MPI@)
diff --git a/arborx/cmake/SetupVersion.cmake b/arborx/cmake/SetupVersion.cmake
new file mode 100644
index 000000000..248813a46
--- /dev/null
+++ b/arborx/cmake/SetupVersion.cmake
@@ -0,0 +1,30 @@
+##/****************************************************************************
+## * Copyright (c) 2017-2021 by the ArborX authors                            *
+## * All rights reserved.                                                     *
+## *                                                                          *
+## * This file is part of the ArborX library. ArborX is                       *
+## * distributed under a BSD 3-clause license. For the licensing terms see    *
+## * the LICENSE file in the top-level directory.                             *
+## *                                                                          *
+## * SPDX-License-Identifier: BSD-3-Clause                                    *
+## ****************************************************************************/
+
+# This CMake script makes sure to store the current git hash in
+# ArborX_Version.hpp each time we recompile. It is important that this script
+# is called by through a target created by add_custom_target so that it is
+# always considered to be out-of-date.
+
+SET(ARBORX_GIT_COMMIT_HASH "No hash available")
+
+IF(EXISTS ${SOURCE_DIR}/.git)
+  FIND_PACKAGE(Git QUIET)
+  IF(GIT_FOUND)
+    EXECUTE_PROCESS(
+      COMMAND          ${GIT_EXECUTABLE} log --pretty=format:%h -n 1
+      OUTPUT_VARIABLE  ARBORX_GIT_COMMIT_HASH)
+    ENDIF()
+ENDIF()
+MESSAGE(STATUS "ArborX hash = '${ARBORX_GIT_COMMIT_HASH}'")
+
+configure_file(${SOURCE_DIR}/src/ArborX_Version.hpp.in
+               ${BINARY_DIR}/include/ArborX_Version.hpp)
diff --git a/arborx/docker/.env b/arborx/docker/.env
new file mode 100644
index 000000000..c4798d0a6
--- /dev/null
+++ b/arborx/docker/.env
@@ -0,0 +1,2 @@
+CONTAINER_ARBORX_DIR=/scratch
+CONTAINER_CCACHE_DIR=/tmp/ccache
diff --git a/arborx/docker/Dockerfile b/arborx/docker/Dockerfile
new file mode 100644
index 000000000..9861c9ff6
--- /dev/null
+++ b/arborx/docker/Dockerfile
@@ -0,0 +1,145 @@
+ARG BASE=nvidia/cuda:10.1-devel
+FROM $BASE
+
+ARG NPROCS=4
+
+RUN apt-get update && apt-get install -y \
+        build-essential \
+        bc \
+        curl \
+        git \
+        wget \
+        jq \
+        vim \
+        lcov \
+        ccache \
+        gdb \
+        ninja-build \
+        libbz2-dev \
+        libicu-dev \
+        python-dev \
+        autotools-dev \
+        && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*
+
+RUN KEYDUMP_URL=https://cloud.cees.ornl.gov/download && \
+    KEYDUMP_FILE=keydump && \
+    wget --quiet ${KEYDUMP_URL}/${KEYDUMP_FILE} && \
+    wget --quiet ${KEYDUMP_URL}/${KEYDUMP_FILE}.sig && \
+    gpg --import ${KEYDUMP_FILE} && \
+    gpg --verify ${KEYDUMP_FILE}.sig ${KEYDUMP_FILE} && \
+    rm ${KEYDUMP_FILE}*
+
+# Install CMake
+ENV CMAKE_DIR=/opt/cmake
+RUN CMAKE_VERSION=3.16.9 && \
+    CMAKE_KEY=2D2CEF1034921684 && \
+    CMAKE_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION} && \
+    CMAKE_SCRIPT=cmake-${CMAKE_VERSION}-Linux-x86_64.sh && \
+    CMAKE_SHA256=cmake-${CMAKE_VERSION}-SHA-256.txt && \
+    wget --quiet ${CMAKE_URL}/${CMAKE_SHA256} && \
+    wget --quiet ${CMAKE_URL}/${CMAKE_SHA256}.asc && \
+    wget --quiet ${CMAKE_URL}/${CMAKE_SCRIPT} && \
+    gpg --verify ${CMAKE_SHA256}.asc ${CMAKE_SHA256} && \
+    grep ${CMAKE_SCRIPT} ${CMAKE_SHA256} | sha256sum --check && \
+    mkdir -p ${CMAKE_DIR} && \
+    sh ${CMAKE_SCRIPT} --skip-license --prefix=${CMAKE_DIR} && \
+    rm cmake*
+ENV PATH=${CMAKE_DIR}/bin:$PATH
+
+# Install Clang/LLVM
+ENV LLVM_DIR=/opt/llvm
+RUN LLVM_VERSION=10.0.0 && \
+    LLVM_KEY="86419D8A 345AD05D" && \
+    LLVM_URL=https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/clang+llvm-${LLVM_VERSION}-x86_64-linux-gnu-ubuntu-18.04.tar.xz && \
+    LLVM_ARCHIVE=llvm-${LLVM_VERSION}.tar.xz && \
+    SCRATCH_DIR=/scratch && mkdir -p ${SCRATCH_DIR} && cd ${SCRATCH_DIR} && \
+    wget --quiet ${LLVM_URL} --output-document=${LLVM_ARCHIVE} && \
+    wget --quiet ${LLVM_URL}.sig --output-document=${LLVM_ARCHIVE}.sig && \
+    gpg --verify ${LLVM_ARCHIVE}.sig ${LLVM_ARCHIVE} && \
+    mkdir -p ${LLVM_DIR} && \
+    tar -xvf ${LLVM_ARCHIVE} -C ${LLVM_DIR} --strip-components=1 && \
+    echo "${LLVM_DIR}/lib" > /etc/ld.so.conf.d/llvm.conf && ldconfig && \
+    rm -rf ${SCRATCH_DIR}
+ENV PATH=${LLVM_DIR}/bin:$PATH
+
+# Install OpenMPI
+ARG CUDA_AWARE_MPI
+ENV OPENMPI_DIR=/opt/openmpi
+RUN OPENMPI_VERSION=4.0.3 && \
+    OPENMPI_VERSION_SHORT=$(echo "$OPENMPI_VERSION" | cut -d. -f1,2) && \
+    OPENMPI_SHA1=d958454e32da2c86dd32b7d557cf9a401f0a08d3 && \
+    OPENMPI_URL=https://download.open-mpi.org/release/open-mpi/v${OPENMPI_VERSION_SHORT}/openmpi-${OPENMPI_VERSION}.tar.bz2 && \
+    OPENMPI_ARCHIVE=openmpi-${OPENMPI_VERSION}.tar.bz2 && \
+    CUDA_OPTIONS=${CUDA_AWARE_MPI:+--with-cuda} && \
+    SCRATCH_DIR=/scratch && mkdir -p ${SCRATCH_DIR} && cd ${SCRATCH_DIR} && \
+    wget --quiet ${OPENMPI_URL} --output-document=${OPENMPI_ARCHIVE} && \
+    echo "${OPENMPI_SHA1} ${OPENMPI_ARCHIVE}" | sha1sum -c && \
+    mkdir -p openmpi && \
+    tar -xf ${OPENMPI_ARCHIVE} -C openmpi --strip-components=1 && \
+    mkdir -p build && cd build && \
+    ../openmpi/configure --prefix=${OPENMPI_DIR} ${CUDA_OPTIONS} CFLAGS=-w && \
+    make -j${NPROCS} install && \
+    rm -rf ${SCRATCH_DIR}
+ENV PATH=${OPENMPI_DIR}/bin:$PATH
+
+# Install Boost
+ENV BOOST_DIR=/opt/boost
+RUN BOOST_VERSION=1.75.0 && \
+    BOOST_VERSION_UNDERSCORE=$(echo "$BOOST_VERSION" | sed -e "s/\./_/g") && \
+    BOOST_KEY=379CE192D401AB61 && \
+    BOOST_URL=https://boostorg.jfrog.io/artifactory/main/release/${BOOST_VERSION}/source && \
+    BOOST_ARCHIVE=boost_${BOOST_VERSION_UNDERSCORE}.tar.bz2 && \
+    SCRATCH_DIR=/scratch && mkdir -p ${SCRATCH_DIR} && cd ${SCRATCH_DIR} && \
+    wget --quiet ${BOOST_URL}/${BOOST_ARCHIVE} && \
+    wget --quiet ${BOOST_URL}/${BOOST_ARCHIVE}.asc && \
+    wget --quiet ${BOOST_URL}/${BOOST_ARCHIVE}.json && \
+    wget --quiet ${BOOST_URL}/${BOOST_ARCHIVE}.json.asc && \
+    gpg --verify ${BOOST_ARCHIVE}.json.asc ${BOOST_ARCHIVE}.json && \
+    gpg --verify ${BOOST_ARCHIVE}.asc ${BOOST_ARCHIVE} && \
+    cat ${BOOST_ARCHIVE}.json | jq -r '. | .sha256 + "  " + .file' | sha256sum --check && \
+    mkdir -p boost && \
+    tar -xf ${BOOST_ARCHIVE} -C boost --strip-components=1 && \
+    cd boost && \
+    CXXFLAGS="-w" ./bootstrap.sh \
+        --prefix=${BOOST_DIR} \
+        && \
+    echo "using mpi ;" >> project-config.jam && \
+    ./b2 -j${NPROCS} \
+        hardcode-dll-paths=true dll-path=${BOOST_DIR}/lib \
+        link=shared \
+        variant=release \
+        cxxflags=-w \
+        install \
+        && \
+    rm -rf ${SCRATCH_DIR}
+
+# Install Google Benchmark support library
+ENV BENCHMARK_DIR=/opt/benchmark
+RUN SCRATCH_DIR=/scratch && mkdir -p ${SCRATCH_DIR} && cd ${SCRATCH_DIR} && \
+    git clone https://github.com/google/benchmark.git -b v1.4.1 && \
+    cd benchmark && \
+    mkdir build && cd build && \
+    cmake -D CMAKE_BUILD_TYPE=Release -D CMAKE_INSTALL_PREFIX=${BENCHMARK_DIR} -D BENCHMARK_ENABLE_TESTING=OFF .. && \
+    make -j${NPROCS} && make install && \
+    rm -rf ${SCRATCH_DIR}
+
+# Workaround for Kokkos to find libcudart
+ENV LD_LIBRARY_PATH=/usr/local/cuda/targets/x86_64-linux/lib:${LD_LIBRARY_PATH}
+
+# Install Kokkos
+ARG KOKKOS_VERSION=3.1.00
+ARG KOKKOS_OPTIONS="-DKokkos_ENABLE_SERIAL=ON -DKokkos_ENABLE_OPENMP=ON -DKokkos_ENABLE_CUDA=ON -DKokkos_ENABLE_CUDA_LAMBDA=ON"
+ENV KOKKOS_DIR=/opt/kokkos
+RUN KOKKOS_URL=https://github.com/kokkos/kokkos/archive/${KOKKOS_VERSION}.tar.gz && \
+    KOKKOS_ARCHIVE=kokkos-${KOKKOS_HASH}.tar.gz && \
+    SCRATCH_DIR=/scratch && mkdir -p ${SCRATCH_DIR} && cd ${SCRATCH_DIR} && \
+    wget --quiet ${KOKKOS_URL} --output-document=${KOKKOS_ARCHIVE} && \
+    mkdir -p kokkos && \
+    tar -xf ${KOKKOS_ARCHIVE} -C kokkos --strip-components=1 && \
+    cd kokkos && \
+    mkdir -p build && cd build && \
+    cmake -D CMAKE_BUILD_TYPE=Release -D CMAKE_INSTALL_PREFIX=${KOKKOS_DIR} -D CMAKE_CXX_COMPILER=/scratch/kokkos/bin/nvcc_wrapper ${KOKKOS_OPTIONS} .. && \
+    make -j${NPROCS} install && \
+    rm -rf ${SCRATCH_DIR}
diff --git a/arborx/docker/Dockerfile.hipcc b/arborx/docker/Dockerfile.hipcc
new file mode 100644
index 000000000..2d22a448c
--- /dev/null
+++ b/arborx/docker/Dockerfile.hipcc
@@ -0,0 +1,110 @@
+ARG BASE=rocm/dev-ubuntu-20.04:4.2
+FROM $BASE
+
+ARG NPROCS=4
+
+RUN apt-get update && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -yq \
+        build-essential \
+        bc \
+        curl \
+        git \
+        kmod \
+        wget \
+        jq \
+        vim \
+        gdb \
+        ccache \
+        libbz2-dev \
+        libicu-dev \
+        python-dev \
+        autotools-dev \
+        libopenmpi-dev \
+        rocthrust \
+        && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV PATH=/opt/rocm/bin:$PATH
+
+RUN KEYDUMP_URL=https://cloud.cees.ornl.gov/download && \
+    KEYDUMP_FILE=keydump && \
+    wget --quiet ${KEYDUMP_URL}/${KEYDUMP_FILE} && \
+    wget --quiet ${KEYDUMP_URL}/${KEYDUMP_FILE}.sig && \
+    gpg --import ${KEYDUMP_FILE} && \
+    gpg --verify ${KEYDUMP_FILE}.sig ${KEYDUMP_FILE} && \
+    rm ${KEYDUMP_FILE}*
+
+# Install CMake
+ENV CMAKE_DIR=/opt/cmake
+RUN CMAKE_VERSION=3.18.5 && \
+    CMAKE_KEY=2D2CEF1034921684 && \
+    CMAKE_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION} && \
+    CMAKE_SCRIPT=cmake-${CMAKE_VERSION}-Linux-x86_64.sh && \
+    CMAKE_SHA256=cmake-${CMAKE_VERSION}-SHA-256.txt && \
+    wget --quiet ${CMAKE_URL}/${CMAKE_SHA256} && \
+    wget --quiet ${CMAKE_URL}/${CMAKE_SHA256}.asc && \
+    wget --quiet ${CMAKE_URL}/${CMAKE_SCRIPT} && \
+    gpg --verify ${CMAKE_SHA256}.asc ${CMAKE_SHA256} && \
+    grep ${CMAKE_SCRIPT} ${CMAKE_SHA256} | sha256sum --check && \
+    mkdir -p ${CMAKE_DIR} && \
+    sh ${CMAKE_SCRIPT} --skip-license --prefix=${CMAKE_DIR} && \
+    rm cmake*
+ENV PATH=${CMAKE_DIR}/bin:$PATH
+
+# Install Boost
+ENV BOOST_DIR=/opt/boost
+RUN BOOST_VERSION=1.72.0 && \
+    BOOST_VERSION_UNDERSCORE=$(echo "$BOOST_VERSION" | sed -e "s/\./_/g") && \
+    BOOST_KEY=379CE192D401AB61 && \
+    BOOST_URL=https://boostorg.jfrog.io/artifactory/main/release/${BOOST_VERSION}/source && \
+    BOOST_ARCHIVE=boost_${BOOST_VERSION_UNDERSCORE}.tar.bz2 && \
+    SCRATCH_DIR=/scratch && mkdir -p ${SCRATCH_DIR} && cd ${SCRATCH_DIR} && \
+    wget --quiet ${BOOST_URL}/${BOOST_ARCHIVE} && \
+    wget --quiet ${BOOST_URL}/${BOOST_ARCHIVE}.asc && \
+    wget --quiet ${BOOST_URL}/${BOOST_ARCHIVE}.json && \
+    wget --quiet ${BOOST_URL}/${BOOST_ARCHIVE}.json.asc && \
+    gpg --verify ${BOOST_ARCHIVE}.json.asc ${BOOST_ARCHIVE}.json && \
+    gpg --verify ${BOOST_ARCHIVE}.asc ${BOOST_ARCHIVE} && \
+    cat ${BOOST_ARCHIVE}.json | jq -r '. | .sha256 + "  " + .file' | sha256sum --check && \
+    mkdir -p boost && \
+    tar -xf ${BOOST_ARCHIVE} -C boost --strip-components=1 && \
+    cd boost && \
+    CXXFLAGS="-w" ./bootstrap.sh \
+        --prefix=${BOOST_DIR} \
+        && \
+    ./b2 -j${NPROCS} \
+        hardcode-dll-paths=true dll-path=${BOOST_DIR}/lib \
+        link=shared \
+        variant=release \
+        cxxflags=-w \
+        install \
+        && \
+    rm -rf ${SCRATCH_DIR}
+
+# Install Google Benchmark support library
+ENV BENCHMARK_DIR=/opt/benchmark
+RUN SCRATCH_DIR=/scratch && mkdir -p ${SCRATCH_DIR} && cd ${SCRATCH_DIR} && \
+    git clone https://github.com/google/benchmark.git -b v1.5.0 && \
+    cd benchmark && \
+    mkdir build && cd build && \
+    cmake -D CMAKE_BUILD_TYPE=Release -D CMAKE_INSTALL_PREFIX=${BENCHMARK_DIR} -D BENCHMARK_ENABLE_TESTING=OFF .. && \
+    make -j${NPROCS} && make install && \
+    rm -rf ${SCRATCH_DIR}
+
+# Install Kokkos
+ARG KOKKOS_VERSION=3.3.01
+ARG KOKKOS_ARCH=Kokkos_ARCH_VEGA906
+ARG KOKKOS_OPTIONS="-DKokkos_ENABLE_HIP=ON -D${KOKKOS_ARCH}=ON"
+ENV KOKKOS_DIR=/opt/kokkos
+RUN KOKKOS_URL=https://github.com/kokkos/kokkos/archive/${KOKKOS_VERSION}.tar.gz && \
+    KOKKOS_ARCHIVE=kokkos-${KOKKOS_HASH}.tar.gz && \
+    SCRATCH_DIR=/scratch && mkdir -p ${SCRATCH_DIR} && cd ${SCRATCH_DIR} && \
+    wget --quiet ${KOKKOS_URL} --output-document=${KOKKOS_ARCHIVE} && \
+    mkdir -p kokkos && \
+    tar -xf ${KOKKOS_ARCHIVE} -C kokkos --strip-components=1 && \
+    cd kokkos && \
+    mkdir -p build && cd build && \
+    cmake -D CMAKE_BUILD_TYPE=Release -D CMAKE_INSTALL_PREFIX=${KOKKOS_DIR} -D CMAKE_CXX_COMPILER=hipcc ${KOKKOS_OPTIONS} .. && \
+    make -j${NPROCS} install && \
+    rm -rf ${SCRATCH_DIR}
diff --git a/arborx/docker/Dockerfile.pgi b/arborx/docker/Dockerfile.pgi
new file mode 100644
index 000000000..4b3025489
--- /dev/null
+++ b/arborx/docker/Dockerfile.pgi
@@ -0,0 +1,122 @@
+# Installing PGI needs to be done interactively to accept the license. The
+# installation of the compiler and MPI is done using the default options.
+# During the installation the PGI compiler, multiple versions of the CUDA
+# toolkit are gettin installed. This unnecessarily increases the size of 
+# the image, so before the image is created all but the latest CUDA toolkit 
+# are removed from the container. The image is built using the ubuntu:18.04 image and
+# the compiler is downloaded from https://www.pgroup.com/products/community.html
+FROM rombur/pgi:19.04
+
+ARG NPROCS=8
+ARG DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update && apt-get install -y \
+        build-essential \
+        bc \
+        curl \
+        git \
+        wget \
+        jq \
+        ccache \
+        ninja-build \
+        libbz2-dev \
+        libicu-dev \
+        autotools-dev \
+        environment-modules \
+        tcl \
+        && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*
+
+RUN KEYDUMP_URL=https://cloud.cees.ornl.gov/download && \
+    KEYDUMP_FILE=keydump && \
+    wget --quiet ${KEYDUMP_URL}/${KEYDUMP_FILE} && \
+    wget --quiet ${KEYDUMP_URL}/${KEYDUMP_FILE}.sig && \
+    gpg --import ${KEYDUMP_FILE} && \
+    gpg --verify ${KEYDUMP_FILE}.sig ${KEYDUMP_FILE} && \
+    rm ${KEYDUMP_FILE}*
+
+# Install CMake
+ENV CMAKE_DIR=/opt/cmake
+RUN CMAKE_VERSION=3.16.9 && \
+    CMAKE_KEY=2D2CEF1034921684 && \
+    CMAKE_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION} && \
+    CMAKE_SCRIPT=cmake-${CMAKE_VERSION}-Linux-x86_64.sh && \
+    CMAKE_SHA256=cmake-${CMAKE_VERSION}-SHA-256.txt && \
+    wget --quiet ${CMAKE_URL}/${CMAKE_SHA256} && \
+    wget --quiet ${CMAKE_URL}/${CMAKE_SHA256}.asc && \
+    wget --quiet ${CMAKE_URL}/${CMAKE_SCRIPT} && \
+    gpg --verify ${CMAKE_SHA256}.asc ${CMAKE_SHA256} && \
+    grep ${CMAKE_SCRIPT} ${CMAKE_SHA256} | sha256sum --check && \
+    mkdir -p ${CMAKE_DIR} && \
+    sh ${CMAKE_SCRIPT} --skip-license --prefix=${CMAKE_DIR} && \
+    rm cmake*
+ENV PATH=${CMAKE_DIR}/bin:$PATH
+
+# Install Boost
+ENV BOOST_DIR=/opt/boost
+RUN BOOST_VERSION=1.71.0 && \
+    BOOST_VERSION_UNDERSCORE=$(echo "$BOOST_VERSION" | sed -e "s/\./_/g") && \
+    BOOST_KEY=379CE192D401AB61 && \
+    BOOST_URL=https://boostorg.jfrog.io/artifactory/main/release/${BOOST_VERSION}/source && \
+    BOOST_ARCHIVE=boost_${BOOST_VERSION_UNDERSCORE}.tar.bz2 && \
+    SCRATCH_DIR=/scratch && mkdir -p ${SCRATCH_DIR} && cd ${SCRATCH_DIR} && \
+    wget --quiet ${BOOST_URL}/${BOOST_ARCHIVE} && \
+    wget --quiet ${BOOST_URL}/${BOOST_ARCHIVE}.asc && \
+    wget --quiet ${BOOST_URL}/${BOOST_ARCHIVE}.json && \
+    wget --quiet ${BOOST_URL}/${BOOST_ARCHIVE}.json.asc && \
+    gpg --verify ${BOOST_ARCHIVE}.json.asc ${BOOST_ARCHIVE}.json && \
+    gpg --verify ${BOOST_ARCHIVE}.asc ${BOOST_ARCHIVE} && \
+    cat ${BOOST_ARCHIVE}.json | jq -r '. | .sha256 + "  " + .file' | sha256sum --check && \
+    mkdir -p boost && \
+    tar -xf ${BOOST_ARCHIVE} -C boost --strip-components=1 && \
+    cd boost && \
+    CXXFLAGS="-w" ./bootstrap.sh \
+        --prefix=${BOOST_DIR} \
+        && \
+    echo "using mpi ;" >> project-config.jam && \
+    ./b2 -j${NPROCS} \
+        hardcode-dll-paths=true dll-path=${BOOST_DIR}/lib \
+        link=shared \
+        variant=release \
+        cxxflags=-w \
+        install \
+        && \
+    rm -rf ${SCRATCH_DIR}
+
+# Install Google Benchmark support library
+ENV BENCHMARK_DIR=/opt/benchmark
+RUN SCRATCH_DIR=/scratch && mkdir -p ${SCRATCH_DIR} && cd ${SCRATCH_DIR} && \
+    git clone https://github.com/google/benchmark.git -b v1.4.1 && \
+    cd benchmark && \
+    mkdir build && cd build && \
+    cmake -D CMAKE_BUILD_TYPE=Release -D CMAKE_INSTALL_PREFIX=${BENCHMARK_DIR} -D BENCHMARK_ENABLE_TESTING=OFF .. && \
+    make -j${NPROCS} && make install && \
+    rm -rf ${SCRATCH_DIR}
+
+# Install Kokkos
+ARG KOKKOS_VERSION=3.1.00
+ARG KOKKOS_OPTIONS="-DKokkos_ENABLE_SERIAL=ON -DKokkos_ENABLE_OPENMP=ON -DKokkos_ENABLE_DEPRECATED_CODE=OFF -DKokkos_ENABLE_PROFILING=OFF -DKokkos_ENABLE_LIBDL=OFF"
+ENV KOKKOS_DIR=/opt/kokkos
+RUN KOKKOS_URL=https://github.com/kokkos/kokkos/archive/${KOKKOS_VERSION}.tar.gz && \
+    KOKKOS_ARCHIVE=kokkos-${KOKKOS_HASH}.tar.gz && \
+    SCRATCH_DIR=/scratch && mkdir -p ${SCRATCH_DIR} && cd ${SCRATCH_DIR} && \
+    wget --quiet ${KOKKOS_URL} --output-document=${KOKKOS_ARCHIVE} && \
+    mkdir -p kokkos && \
+    tar -xf ${KOKKOS_ARCHIVE} -C kokkos --strip-components=1 && \
+    cd kokkos && \
+    mkdir -p build && cd build && \
+    cmake -D CMAKE_BUILD_TYPE=Release -D CMAKE_INSTALL_PREFIX=${KOKKOS_DIR} -D CMAKE_CXX_COMPILER=/opt/pgi/linux86-64-llvm/19.4/bin/pgc++ ${KOKKOS_OPTIONS} .. && \
+    make -j${NPROCS} install && \
+    rm -rf ${SCRATCH_DIR}
+
+# Set the different paths
+ENV PGI_VERSION=19.4
+ENV LD_LIBRARY_PATH=/opt/pgi/linux86-64-llvm/2019/mpi/openmpi-3.1.3/lib:/opt/pgi/linux86-64-llvm/${PGI_VERSION}/lib:$LD_LIBRARY_PATH
+ENV CXX=/opt/pgi/linux86-64-llvm/${PGI_VERSION}/bin/pgc++
+ENV F90=/opt/pgi/linux86-64-llvm/${PGI_VERSION}/bin/pgf90
+ENV PGI=/opt/pgi
+ENV FC=/opt/pgi/linux86-64-llvm/${PGI_VERSION}/bin/pgfortran
+ENV F77=/opt/pgi/linux86-64-llvm/${PGI_VERSION}/bin/pgf77
+ENV PATH=/opt/pgi/linux86-64-llvm/2019/mpi/openmpi-3.1.3/bin:/opt/pgi/linux86-64-llvm/${PGI_VERSION}/bin:/trash:/opt/cmake/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+ENV CC=/opt/pgi/linux86-64-llvm/${PGI_VERSION}/bin/pgcc
diff --git a/arborx/docker/Dockerfile.sycl b/arborx/docker/Dockerfile.sycl
new file mode 100644
index 000000000..76668985f
--- /dev/null
+++ b/arborx/docker/Dockerfile.sycl
@@ -0,0 +1,132 @@
+ARG BASE=nvidia/cuda:10.2-devel
+FROM $BASE
+
+ARG NPROCS=4
+
+RUN apt-get update && apt-get install -y \
+        bc \
+        wget \
+        ccache \
+        ninja-build \
+        python3 \
+        git \
+        vim \
+        jq \
+        libopenmpi-dev \
+        && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*
+
+RUN KEYDUMP_URL=https://cloud.cees.ornl.gov/download && \
+    KEYDUMP_FILE=keydump && \
+    wget --quiet ${KEYDUMP_URL}/${KEYDUMP_FILE} && \
+    wget --quiet ${KEYDUMP_URL}/${KEYDUMP_FILE}.sig && \
+    gpg --import ${KEYDUMP_FILE} && \
+    gpg --verify ${KEYDUMP_FILE}.sig ${KEYDUMP_FILE} && \
+    rm ${KEYDUMP_FILE}*
+
+ARG CMAKE_VERSION=3.19.0
+ENV CMAKE_DIR=/opt/cmake
+RUN CMAKE_KEY=2D2CEF1034921684 && \
+    CMAKE_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION} && \
+    CMAKE_SCRIPT=cmake-${CMAKE_VERSION}-Linux-x86_64.sh && \
+    CMAKE_SHA256=cmake-${CMAKE_VERSION}-SHA-256.txt && \
+    wget --quiet ${CMAKE_URL}/${CMAKE_SHA256} && \
+    wget --quiet ${CMAKE_URL}/${CMAKE_SHA256}.asc && \
+    wget --quiet ${CMAKE_URL}/${CMAKE_SCRIPT} && \
+    gpg --verify ${CMAKE_SHA256}.asc ${CMAKE_SHA256} && \
+    grep ${CMAKE_SCRIPT} ${CMAKE_SHA256} | sha256sum --check && \
+    mkdir -p ${CMAKE_DIR} && \
+    sh ${CMAKE_SCRIPT} --skip-license --prefix=${CMAKE_DIR} && \
+    rm cmake*
+ENV PATH=${CMAKE_DIR}/bin:$PATH
+
+ENV SYCL_DIR=/opt/sycl
+RUN SYCL_VERSION=20210311 && \
+    SYCL_URL=https://github.com/intel/llvm/archive/sycl-nightly && \
+    SYCL_ARCHIVE=${SYCL_VERSION}.tar.gz && \
+    SCRATCH_DIR=/scratch && mkdir -p ${SCRATCH_DIR} && cd ${SCRATCH_DIR} && \
+    wget --quiet ${SYCL_URL}/${SYCL_ARCHIVE} && \
+    mkdir llvm && \
+    tar -xf ${SYCL_ARCHIVE} -C llvm --strip-components=1 && \
+    cd llvm && \
+    python3 buildbot/configure.py --cuda && \
+    python3 buildbot/compile.py && \
+    mkdir -p ${SYCL_DIR} && \
+    mv ${SCRATCH_DIR}/llvm/build/install/* ${SYCL_DIR} && \
+    echo "${SYCL_DIR}/lib" > /etc/ld.so.conf.d/sycl.conf && ldconfig && \
+    rm -rf ${SCRATCH_DIR}
+ENV PATH=${SYCL_DIR}/bin:$PATH
+
+# Install oneDPL
+ENV ONE_DPL_DIR=/opt/onedpl
+RUN ONE_DPL_VERSION=oneDPL-2021.3.0-release && \
+    ONE_DPL_URL=https://github.com/oneapi-src/oneDPL/archive && \
+    ONE_DPL_ARCHIVE=${ONE_DPL_VERSION}.tar.gz && \
+    SCRATCH_DIR=/scratch && mkdir -p ${SCRATCH_DIR} && cd ${SCRATCH_DIR} && \
+    wget --quiet ${ONE_DPL_URL}/${ONE_DPL_ARCHIVE} && \
+    mkdir onedpl && \
+    tar -xf ${ONE_DPL_ARCHIVE} -C onedpl --strip-components=1 && cd onedpl && \
+    echo 'install(CODE "set(OUTPUT_DIR \"${CMAKE_INSTALL_PREFIX}/lib/cmake/oneDPL\")")' >> CMakeLists.txt && \
+    echo 'install(SCRIPT cmake/scripts/generate_config.cmake)' >> CMakeLists.txt && \
+    echo 'install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include DESTINATION linux)' >> CMakeLists.txt && \
+    mkdir build && cd build && \
+    cmake -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_CXX_FLAGS="-w" -DCMAKE_INSTALL_PREFIX=${ONE_DPL_DIR} -DCMAKE_SKIP_INSTALL_ALL_DEPENDENCY=TRUE -DONEDPL_BACKEND="dpcpp_only" .. && \
+    make -j${NPROCS} install && \
+    rm -rf ${SCRATCH_DIR}
+
+# Install Boost
+ENV BOOST_DIR=/opt/boost
+RUN BOOST_VERSION=1.72.0 && \
+    BOOST_VERSION_UNDERSCORE=$(echo "$BOOST_VERSION" | sed -e "s/\./_/g") && \
+    BOOST_KEY=379CE192D401AB61 && \
+    BOOST_URL=https://boostorg.jfrog.io/artifactory/main/release/${BOOST_VERSION}/source && \
+    BOOST_ARCHIVE=boost_${BOOST_VERSION_UNDERSCORE}.tar.bz2 && \
+    SCRATCH_DIR=/scratch && mkdir -p ${SCRATCH_DIR} && cd ${SCRATCH_DIR} && \
+    wget --quiet ${BOOST_URL}/${BOOST_ARCHIVE} && \
+    wget --quiet ${BOOST_URL}/${BOOST_ARCHIVE}.asc && \
+    wget --quiet ${BOOST_URL}/${BOOST_ARCHIVE}.json && \
+    wget --quiet ${BOOST_URL}/${BOOST_ARCHIVE}.json.asc && \
+    gpg --verify ${BOOST_ARCHIVE}.json.asc ${BOOST_ARCHIVE}.json && \
+    gpg --verify ${BOOST_ARCHIVE}.asc ${BOOST_ARCHIVE} && \
+    cat ${BOOST_ARCHIVE}.json | jq -r '. | .sha256 + "  " + .file' | sha256sum --check && \
+    mkdir -p boost && \
+    tar -xf ${BOOST_ARCHIVE} -C boost --strip-components=1 && \
+    cd boost && \
+    CXXFLAGS="-w" ./bootstrap.sh \
+        --prefix=${BOOST_DIR} \
+        && \
+    ./b2 -j${NPROCS} \
+        hardcode-dll-paths=true dll-path=${BOOST_DIR}/lib \
+        link=shared \
+        variant=release \
+        cxxflags=-w \
+        install \
+        && \
+    rm -rf ${SCRATCH_DIR}
+
+# Install Google Benchmark support library
+ENV BENCHMARK_DIR=/opt/benchmark
+RUN SCRATCH_DIR=/scratch && mkdir -p ${SCRATCH_DIR} && cd ${SCRATCH_DIR} && \
+    git clone https://github.com/google/benchmark.git -b v1.5.0 && \
+    cd benchmark && \
+    mkdir build && cd build && \
+    cmake -D CMAKE_BUILD_TYPE=Release -D CMAKE_INSTALL_PREFIX=${BENCHMARK_DIR} -D BENCHMARK_ENABLE_TESTING=OFF .. && \
+    make -j${NPROCS} && make install && \
+    rm -rf ${SCRATCH_DIR}
+
+# Install Kokkos
+ARG KOKKOS_VERSION=3.4.00
+ARG KOKKOS_OPTIONS="-DKokkos_ENABLE_SYCL=ON -DCMAKE_CXX_FLAGS=-Wno-unknown-cuda-version -DKokkos_ENABLE_UNSUPPORTED_ARCHS=ON -DKokkos_ARCH_VOLTA70=ON -DCMAKE_CXX_STANDARD=17"
+ENV KOKKOS_DIR=/opt/kokkos
+RUN KOKKOS_URL=https://github.com/kokkos/kokkos/archive/${KOKKOS_VERSION}.tar.gz && \
+    KOKKOS_ARCHIVE=kokkos-${KOKKOS_HASH}.tar.gz && \
+    SCRATCH_DIR=/scratch && mkdir -p ${SCRATCH_DIR} && cd ${SCRATCH_DIR} && \
+    wget --quiet ${KOKKOS_URL} --output-document=${KOKKOS_ARCHIVE} && \
+    mkdir -p kokkos && \
+    tar -xf ${KOKKOS_ARCHIVE} -C kokkos --strip-components=1 && \
+    cd kokkos && \
+    mkdir -p build && cd build && \
+    cmake -D CMAKE_BUILD_TYPE=Release -D CMAKE_INSTALL_PREFIX=${KOKKOS_DIR} -D CMAKE_CXX_COMPILER=clang++ ${KOKKOS_OPTIONS} .. && \
+    make -j${NPROCS} install && \
+    rm -rf ${SCRATCH_DIR}
diff --git a/arborx/docker/README.md b/arborx/docker/README.md
new file mode 100644
index 000000000..66b82173c
--- /dev/null
+++ b/arborx/docker/README.md
@@ -0,0 +1,18 @@
+Consider setting the `COMPOSE_PROJECT_NAME` environment variable or providing it
+in the environment file.  Its value will be prepended along with the service
+name to the container on start up.
+
+
+You may use multiple compose files to customize your container.  For instance, you
+could reproduce the configuration from one of the automated builds by providing
+the following a `docker-compose.override.yml` file:
+```
+version: '3'
+services:
+  arborx_dev:
+    build:
+      args:
+        - BASE=nvidia/cuda:10.1-devel
+        - KOKKOS_VERSION=2.8.00
+        - KOKKOS_OPTIONS=--cxxstandard=c++14 --with-serial --with-openmp --with-options=disable_deprecated_code --with-cuda --with-cuda-options=enable_lambda --arch=SNB,Volta70
+```
diff --git a/arborx/docker/docker-compose.yml b/arborx/docker/docker-compose.yml
new file mode 100644
index 000000000..3487fb773
--- /dev/null
+++ b/arborx/docker/docker-compose.yml
@@ -0,0 +1,20 @@
+version: '3'
+services:
+  arborx_dev:
+    build:
+      context: .
+    volumes:
+      - ..:${CONTAINER_ARBORX_DIR}
+      - ccache_dir:${CONTAINER_CCACHE_DIR}
+    working_dir: ${CONTAINER_ARBORX_DIR}
+    environment:
+      - TERM=xterm
+      - ARBORX_DIR=${CONTAINER_ARBORX_DIR}
+      - CCACHE_DIR=${CONTAINER_CCACHE_DIR}
+      - CCACHE_MAXSIZE=10G
+    command: tail -f /dev/null
+    security_opt:
+      - seccomp:unconfined
+    network_mode: host
+volumes:
+  ccache_dir:
diff --git a/arborx/docs/LICENSE.ECL b/arborx/docs/LICENSE.ECL
new file mode 100644
index 000000000..82de69c15
--- /dev/null
+++ b/arborx/docs/LICENSE.ECL
@@ -0,0 +1,36 @@
+/*
+ECL-CC code: ECL-CC is a connected components algorithm. The CUDA
+implementation thereof is very fast. It operates on graphs stored in
+binary CSR format.
+
+Copyright (c) 2017, Texas State University. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted for academic, research, experimental, or personal use provided
+that the following conditions are met:
+
+   * Redistributions of source code must retain the above copyright notice,
+     this list of conditions, and the following disclaimer.
+   * Redistributions in binary form must reproduce the above copyright notice,
+     this list of conditions, and the following disclaimer in the documentation
+     and/or other materials provided with the distribution.
+   * Neither the name of Texas State University nor the names of its
+     contributors may be used to endorse or promote products derived from this
+     software without specific prior written permission.
+
+For all other uses, please contact the Office for Commercialization and Industry
+Relations at Texas State University <http://www.txstate.edu/ocir/>.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR 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.
+
+Authors: Jayadharini Jaiganesh and Martin Burtscher
+*/
diff --git a/arborx/docs/logos/arborx_logo_v1.0.png b/arborx/docs/logos/arborx_logo_v1.0.png
new file mode 100644
index 0000000000000000000000000000000000000000..d52b1c3f80f4495fe16ae5e924bf5c2dc19f7925
GIT binary patch
literal 79458
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%0A!Yz6b*THf_m-0<@
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%0A%*o#vfqB1&{LTB_E5rgs*=9vE(mcJBe5I
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
U9;;Ys#lmN(YpO%ka=!b205R3q4FCWD

literal 0
HcmV?d00001

diff --git a/arborx/docs/logos/arborx_logo_v1.0.svg b/arborx/docs/logos/arborx_logo_v1.0.svg
new file mode 100644
index 000000000..5c94a0b19
--- /dev/null
+++ b/arborx/docs/logos/arborx_logo_v1.0.svg
@@ -0,0 +1,357 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
+ "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
+ width="2419.000000pt" height="2418.000000pt" viewBox="0 0 2419.000000 2418.000000"
+ preserveAspectRatio="xMidYMid meet">
+
+<g transform="translate(0.000000,2418.000000) scale(0.100000,-0.100000)"
+fill="#000000" stroke="none">
+<path d="M12924 23843 c-61 -106 -168 -197 -334 -286 -161 -86 -287 -112 -640
+-132 -158 -9 -293 -21 -335 -31 -122 -29 -306 -132 -375 -210 -53 -61 -107
+-198 -186 -478 -61 -214 -96 -287 -170 -360 -84 -82 -154 -113 -284 -127 -135
+-14 -224 -6 -429 36 -284 60 -339 83 -406 175 -44 60 -54 108 -55 260 0 108 4
+143 31 250 17 69 32 155 33 192 1 63 -2 73 -62 191 -69 137 -117 198 -205 263
+-64 47 -93 57 -319 108 l-156 36 -79 -29 c-64 -24 -73 -30 -53 -34 14 -3 89
+-17 166 -31 224 -41 269 -58 331 -123 105 -109 161 -280 119 -357 -40 -73
+-107 -90 -316 -80 -124 5 -153 4 -205 -12 l-60 -18 83 -8 c107 -9 298 -45 331
+-63 36 -18 75 -62 100 -112 36 -72 30 -115 -56 -427 -31 -115 -35 -139 -31
+-211 9 -130 54 -208 226 -387 92 -96 150 -131 349 -212 314 -129 472 -176 664
+-200 236 -29 395 -93 504 -201 79 -78 265 -328 304 -408 37 -75 57 -153 71
+-272 23 -206 7 -299 -83 -469 -52 -99 -89 -137 -175 -180 -128 -65 -295 -96
+-411 -77 -109 18 -122 42 -122 224 0 117 -3 138 -31 226 -37 117 -62 166 -124
+251 -82 112 -162 187 -254 240 -101 58 -291 144 -364 165 -73 21 -290 53 -438
+64 -182 14 -201 27 -227 166 -23 118 -21 117 -47 40 -23 -64 -24 -76 -14 -145
+20 -138 12 -126 98 -154 42 -13 117 -30 166 -36 166 -21 320 -88 486 -210 132
+-98 165 -148 176 -268 6 -61 4 -75 -16 -110 -26 -47 -90 -97 -180 -142 -212
+-106 -302 -106 -532 0 -125 58 -245 90 -343 90 -186 0 -321 36 -379 100 -91
+100 -166 339 -166 524 0 95 -23 180 -65 241 -19 28 -78 88 -132 135 -54 47
+-180 156 -279 243 -118 102 -186 168 -195 189 -9 21 -14 72 -14 143 0 103 2
+113 30 163 42 76 118 141 234 200 154 78 153 77 212 226 59 148 116 266 152
+313 35 48 151 140 193 153 45 15 127 8 211 -18 50 -16 63 -17 67 -6 3 8 -31
+32 -99 68 -113 61 -208 84 -292 71 -54 -8 -244 -91 -304 -132 -36 -25 -56 -52
+-104 -144 -69 -129 -81 -139 -245 -200 -85 -32 -86 -32 -330 -39 -267 -6 -295
+-12 -346 -67 -65 -70 -83 -159 -49 -253 9 -25 51 -110 95 -190 92 -170 105
+-212 97 -322 -4 -68 -10 -88 -34 -122 -69 -97 -147 -118 -639 -171 -449 -47
+-542 -52 -624 -30 -112 29 -133 47 -230 190 -81 120 -93 132 -144 158 -31 15
+-59 27 -61 27 -3 0 13 -23 36 -52 84 -107 113 -210 73 -266 -20 -29 -87 -29
+-203 -2 -161 39 -242 94 -403 274 -71 80 -52 26 48 -134 57 -91 112 -172 123
+-181 10 -8 80 -50 156 -93 136 -78 136 -78 278 -103 127 -22 177 -25 472 -29
+203 -3 341 -9 358 -16 36 -14 67 -54 67 -85 0 -14 -7 -40 -16 -59 -18 -38 -38
+-46 -174 -65 -74 -10 -92 -16 -137 -51 -44 -32 -53 -44 -53 -69 0 -39 21 -34
+32 8 12 45 46 54 263 62 204 8 242 17 291 73 24 27 44 90 44 140 0 58 26 72
+140 76 117 4 297 -12 342 -31 56 -24 157 -107 217 -178 46 -55 74 -106 136
+-242 185 -409 328 -676 402 -753 21 -22 117 -89 212 -149 190 -118 282 -187
+318 -238 41 -58 57 -161 57 -377 1 -192 1 -196 -26 -253 -38 -82 -81 -132
+-133 -157 -65 -32 -192 -52 -340 -53 -147 -2 -152 -1 -420 105 -82 32 -197 77
+-255 100 -136 53 -238 106 -256 133 -8 12 -18 42 -23 68 -9 49 -44 99 -135
+195 -62 66 -101 86 -386 200 -526 211 -776 360 -866 516 -40 70 -50 79 -237
+222 l-138 106 -46 -9 -46 -8 69 -51 c82 -62 147 -131 230 -245 109 -150 254
+-418 254 -470 0 -14 -9 -38 -21 -53 -19 -24 -26 -26 -104 -26 -45 0 -198 -7
+-339 -15 l-256 -16 -96 -75 c-106 -82 -136 -98 -239 -121 -38 -9 -74 -20 -78
+-23 -11 -10 150 -60 189 -60 48 0 93 19 176 76 83 57 120 67 238 68 52 0 76
+-5 117 -27 160 -83 390 -97 683 -41 96 18 255 19 306 1 21 -7 112 -61 201
+-119 137 -90 165 -112 178 -144 50 -119 21 -173 -111 -205 -86 -21 -134 -70
+-149 -152 -14 -74 -109 -118 -307 -141 -251 -31 -589 -58 -631 -52 -39 6 -52
+16 -116 87 -91 99 -133 123 -221 122 -86 0 -125 -19 -200 -92 -46 -46 -74 -64
+-113 -76 -117 -35 -186 -16 -401 110 -178 104 -214 118 -273 104 -44 -9 -66
+-33 -101 -109 -21 -44 -27 -77 -31 -160 -6 -96 -11 -117 -60 -246 -45 -120
+-53 -148 -46 -180 6 -35 8 -36 18 -19 6 11 53 97 103 190 l92 170 77 3 c96 4
+134 -12 323 -139 l137 -91 190 5 c104 2 206 10 225 16 63 21 245 25 393 7 163
+-19 287 -13 707 35 697 78 705 79 965 79 138 0 279 5 315 9 36 5 119 17 185
+27 155 22 230 13 350 -44 118 -57 293 -106 380 -106 88 -1 147 25 271 119 107
+82 154 104 217 105 74 0 136 -38 262 -161 l111 -108 84 39 c111 52 156 53 264
+5 l80 -34 65 19 c265 80 424 93 711 59 137 -16 253 -23 390 -23 l195 -1 95 47
+c52 26 135 71 185 100 l89 53 91 0 c79 -1 99 -4 163 -33 93 -40 165 -54 503
+-97 l275 -34 1045 -7 1044 -6 700 38 c769 41 1170 49 1292 25 64 -12 97 -12
+290 5 210 18 289 19 803 13 137 -2 230 3 357 18 154 19 178 25 234 54 34 18
+78 52 97 76 34 40 40 43 84 43 33 0 66 -9 100 -26 28 -14 94 -38 147 -52 l96
+-27 375 1 c356 1 378 2 434 22 97 35 119 59 191 205 36 72 65 134 65 138 0 5
+-64 -23 -142 -61 -234 -115 -236 -115 -493 -115 -170 0 -238 4 -300 18 -161
+34 -171 39 -331 192 l-147 139 -106 0 -106 0 -305 -151 c-318 -158 -360 -174
+-599 -224 -86 -18 -123 -21 -204 -15 -245 16 -617 77 -802 131 -31 9 -75 35
+-115 67 l-65 53 580 5 579 5 416 445 415 445 1204 0 1204 0 241 424 242 425
+79 1 c89 1 139 20 194 76 56 55 76 105 76 189 0 84 -20 134 -76 189 -55 56
+-105 76 -189 76 -84 0 -134 -20 -189 -76 -56 -55 -76 -105 -76 -189 0 -73 12
+-108 56 -171 10 -13 -31 -90 -213 -410 l-225 -394 -1190 4 -1190 3 -419 -450
+-419 -451 -592 0 -592 -1 -15 22 c-9 12 -16 26 -16 30 0 5 254 8 564 8 l564 0
+433 455 434 456 1130 -6 1130 -6 130 221 130 222 66 1 c78 2 133 33 176 99 24
+35 28 52 28 108 0 56 -4 73 -28 108 -15 23 -46 54 -69 69 -35 24 -52 28 -108
+28 -56 0 -73 -4 -108 -28 -108 -71 -133 -201 -58 -300 l33 -43 -120 -203 -121
+-203 -1121 7 -1120 7 -435 -455 -435 -456 -576 -1 c-559 0 -576 1 -594 20 -32
+36 -113 45 -370 43 -132 -1 -289 -6 -350 -11 -98 -8 -119 -13 -195 -49 -47
+-22 -161 -89 -255 -147 -197 -124 -244 -141 -356 -133 -207 16 -282 97 -280
+302 0 51 5 105 11 120 17 43 68 109 100 128 16 10 114 33 217 53 173 31 203
+34 369 33 140 0 188 3 210 14 44 22 171 50 228 50 35 0 69 -8 106 -26 61 -29
+106 -33 175 -15 36 10 56 25 102 78 32 36 158 173 280 306 l223 241 1336 6
+c736 4 1555 7 1821 7 l483 0 100 134 99 134 38 -20 c84 -43 201 -6 260 84 24
+35 28 52 28 108 0 56 -4 73 -28 108 -15 23 -46 54 -69 69 -35 24 -52 28 -108
+28 -56 0 -73 -4 -108 -28 -86 -57 -124 -165 -88 -251 9 -21 13 -43 9 -50 -4
+-6 -45 -62 -91 -123 l-84 -113 -498 0 c-273 0 -1066 -3 -1761 -6 l-1264 -7 29
+32 30 31 1692 0 1693 0 94 116 95 116 7 121 8 122 83 91 84 91 47 -23 c109
+-56 241 -6 294 111 63 137 -48 305 -201 305 -147 0 -261 -162 -206 -294 l14
+-33 -98 -107 -98 -107 -7 -123 -7 -123 -72 -91 -71 -91 -1639 -1 -1640 0 35
+36 34 36 366 -7 366 -7 211 315 212 316 0 233 0 234 326 416 326 416 36 -10
+c112 -31 245 33 305 146 31 58 31 174 0 232 -28 53 -74 99 -127 127 -58 31
+-174 31 -232 0 -53 -28 -99 -74 -127 -127 -33 -63 -31 -175 5 -239 l27 -48
+-339 -432 -340 -432 0 -237 0 -237 -177 -266 -178 -266 -361 7 -361 6 -198
+-213 c-109 -118 -280 -302 -379 -409 -314 -338 -309 -334 -340 -326 -15 4 -49
+26 -74 51 l-47 43 -115 -15 c-188 -24 -434 1 -472 47 -9 12 -20 41 -24 65 -7
+51 -1 65 92 213 33 53 82 134 108 179 26 46 69 106 94 134 l46 51 330 -7 331
+-7 284 293 c157 162 317 327 357 368 l72 74 41 -17 c109 -43 231 8 282 119 49
+106 -4 235 -116 286 -176 81 -365 -112 -285 -290 l20 -43 -92 -97 c-50 -53
+-204 -212 -342 -354 l-251 -259 -306 7 -307 7 -22 -22 c-12 -12 -47 -33 -78
+-47 -74 -32 -83 -41 -153 -145 -67 -98 -117 -149 -230 -230 -131 -93 -174
+-111 -293 -116 -130 -5 -195 16 -255 84 -55 63 -75 127 -69 223 6 111 42 181
+159 313 52 59 110 133 129 165 34 56 35 60 35 163 0 68 5 114 13 130 9 16 -2
+9 -31 -21 -33 -33 -47 -57 -52 -87 -10 -58 -35 -75 -189 -123 -72 -22 -153
+-47 -181 -56 -39 -13 -70 -36 -141 -104 -90 -87 -133 -111 -163 -92 -30 19
+-51 59 -53 101 l-1 44 344 345 344 345 455 -6 c250 -3 667 -9 926 -12 l470 -6
+195 205 194 205 263 1 c242 1 263 0 268 -16 28 -88 75 -147 147 -185 59 -32
+175 -32 233 -1 53 28 99 74 127 127 31 58 31 174 0 232 -100 189 -356 205
+-467 30 l-29 -46 -297 0 -298 0 -188 -197 c-103 -109 -191 -202 -194 -206 -4
+-5 -425 -3 -935 3 l-929 11 -217 -217 c-120 -120 -220 -216 -222 -214 -2 3
+-13 31 -24 62 l-20 57 201 192 201 191 845 -6 845 -7 319 301 319 300 137 0
+c75 0 299 -3 498 -7 l360 -6 6 -32 c10 -50 59 -110 111 -135 92 -45 201 -6
+253 90 48 91 10 205 -88 258 -88 47 -202 11 -252 -79 l-23 -41 -515 7 -515 6
+-319 -301 -319 -300 -55 0 c-32 0 -52 4 -46 9 5 4 171 156 368 336 l360 327
+416 -7 417 -7 23 37 c18 29 27 35 44 30 61 -19 121 -17 166 7 134 72 145 245
+22 332 -161 113 -371 -73 -278 -247 25 -46 25 -49 9 -74 l-17 -25 -415 6 -416
+7 -400 -366 -399 -367 -746 7 -745 6 -198 -191 c-108 -105 -201 -189 -206
+-186 -5 3 -17 35 -26 71 -34 124 -3 241 83 315 l47 40 367 0 367 0 278 289
+278 290 161 0 162 1 283 277 c156 152 363 355 460 450 l176 174 52 -17 c124
+-40 259 18 324 140 31 58 31 174 0 232 -28 53 -74 99 -127 127 -32 17 -58 22
+-116 22 -58 0 -84 -5 -116 -22 -53 -28 -99 -74 -127 -127 -28 -53 -31 -174 -5
+-222 l17 -32 -438 -431 -439 -431 -160 0 -161 0 -278 -289 -278 -290 -277 0
+-278 -1 37 55 38 56 215 -7 215 -7 300 307 300 306 40 -15 c136 -49 290 37
+327 183 l10 42 88 0 88 0 261 273 261 272 0 136 0 136 43 17 c187 71 194 324
+12 407 -173 80 -366 -112 -286 -286 22 -50 75 -101 118 -117 l33 -12 0 -126
+-1 -125 -236 -245 -236 -245 -77 -3 -77 -3 -18 40 c-22 50 -67 96 -119 124
+-57 30 -165 30 -221 0 -140 -74 -185 -241 -100 -368 l26 -37 -279 -286 -279
+-287 -59 -3 c-33 -2 -160 2 -284 8 l-225 11 -45 -50 c-54 -60 -114 -101 -147
+-101 -59 0 -132 67 -139 126 -9 76 42 139 507 627 151 158 297 320 326 360
+153 212 244 495 198 617 l-13 35 -12 -30 c-6 -16 -25 -68 -42 -115 -37 -105
+-58 -145 -119 -237 -116 -172 -184 -228 -323 -268 -109 -32 -251 -1 -298 65
+-31 44 -50 141 -58 300 -4 85 -9 156 -9 157 -1 2 -23 28 -51 58 -27 30 -50 60
+-50 67 0 30 -44 168 -51 161 -4 -4 -13 -37 -18 -73 -10 -58 -8 -72 16 -145 17
+-53 26 -103 26 -150 1 -94 -40 -287 -124 -585 -54 -188 -73 -275 -84 -375 -23
+-204 -33 -232 -140 -405 -127 -207 -145 -267 -145 -484 0 -88 -5 -177 -10
+-197 -17 -62 -78 -120 -186 -176 -119 -61 -162 -71 -347 -79 -154 -7 -238 6
+-325 47 -41 20 -72 60 -72 95 0 9 22 42 49 74 45 54 49 65 65 152 27 147 77
+348 101 403 12 28 36 64 52 80 17 17 110 71 208 120 191 97 189 96 226 203 26
+75 25 76 -22 4 -22 -34 -55 -70 -72 -78 -26 -14 -133 -54 -144 -54 -1 0 -3 65
+-3 145 l0 144 138 104 c75 57 142 106 148 110 7 4 32 -2 55 -13 110 -49 238 1
+290 115 63 137 -48 305 -201 305 -150 0 -261 -162 -204 -298 14 -35 14 -38 -4
+-52 -10 -8 -83 -63 -160 -123 l-142 -107 0 -174 0 -173 -42 -7 c-98 -16 -143
+-64 -293 -316 -100 -167 -186 -240 -286 -240 -44 0 -64 6 -102 29 -61 39 -126
+107 -133 140 -12 57 -78 281 -106 358 -16 46 -33 120 -39 165 -17 128 6 516
+37 643 29 120 94 219 167 256 60 31 214 46 326 32 105 -13 141 -30 171 -78
+l22 -35 130 0 c116 0 135 2 165 21 19 12 32 23 30 26 -3 2 -31 0 -63 -6 -99
+-19 -151 -15 -180 14 -32 32 -64 101 -64 142 0 26 12 42 75 101 58 54 92 77
+153 102 149 61 186 81 283 150 137 98 183 165 195 287 6 53 4 60 -19 81 l-24
+23 -29 -48z m3295 -100 c85 -63 75 -186 -20 -236 -92 -49 -208 33 -195 137 12
+104 133 159 215 99z m390 -391 c58 -43 64 -140 12 -193 -76 -75 -204 -30 -217
+77 -14 110 115 183 205 116z m-3470 -529 c85 -63 75 -186 -20 -236 -92 -49
+-208 33 -195 137 12 104 133 159 215 99z m2122 -50 c48 -9 115 -80 124 -130
+11 -67 -3 -112 -50 -159 -73 -72 -168 -72 -241 1 -72 73 -72 168 1 241 51 50
+92 62 166 47z m3298 -201 c58 -43 64 -140 12 -193 -76 -75 -204 -30 -217 77
+-14 110 115 183 205 116z m-1031 -82 c40 -25 72 -75 72 -115 0 -63 -72 -135
+-135 -135 -63 0 -135 72 -135 135 0 63 72 135 135 135 17 0 45 -9 63 -20z
+m250 -370 c40 -25 72 -75 72 -115 0 -63 -72 -135 -135 -135 -63 0 -135 72
+-135 135 0 63 72 135 135 135 17 0 45 -9 63 -20z m-329 -378 c58 -43 64 -140
+12 -193 -76 -75 -204 -30 -217 77 -14 110 115 183 205 116z m-670 -459 c85
+-63 75 -186 -20 -236 -92 -49 -208 33 -195 137 12 104 133 159 215 99z m3605
+-177 c93 -39 112 -165 35 -230 -61 -52 -141 -43 -194 21 -57 68 -35 164 46
+205 41 22 69 22 113 4z m935 -274 c58 -43 64 -140 12 -193 -76 -75 -204 -30
+-217 77 -14 110 115 183 205 116z m-520 -250 c38 -20 71 -73 71 -112 0 -62
+-68 -130 -130 -130 -62 0 -130 68 -130 130 0 39 33 92 71 112 18 10 45 18 59
+18 14 0 41 -8 59 -18z m-480 -10 c38 -20 71 -73 71 -112 0 -39 -33 -92 -71
+-112 -18 -10 -45 -18 -59 -18 -14 0 -41 8 -59 18 -38 20 -71 73 -71 112 0 62
+68 130 130 130 14 0 41 -8 59 -18z"/>
+<path d="M13245 17516 c-243 -55 -410 -211 -487 -456 -22 -71 -23 -90 -23
+-335 0 -241 2 -266 23 -340 50 -173 168 -318 323 -394 128 -63 181 -71 501
+-71 162 0 299 5 330 11 133 27 219 72 317 164 78 74 131 159 169 270 26 79 27
+82 27 360 0 276 -1 281 -27 358 -36 108 -96 204 -168 271 -76 70 -142 108
+-245 143 -79 27 -84 27 -380 30 -223 2 -315 -1 -360 -11z m703 -310 c73 -34
+124 -86 161 -165 l26 -56 0 -260 0 -260 -33 -67 c-53 -109 -139 -168 -271
+-189 -92 -14 -508 -6 -566 10 -60 18 -146 81 -182 135 -54 79 -58 107 -58 376
+l0 245 27 58 c46 98 94 145 186 183 56 24 62 24 352 21 l295 -2 63 -29z"/>
+<path d="M5705 17500 c-302 -45 -535 -244 -624 -533 -32 -104 -41 -248 -41
+-654 l0 -373 145 0 145 0 0 190 0 190 500 0 500 0 0 -190 0 -190 145 0 145 0
+0 708 c0 479 -4 720 -11 747 -6 22 -21 51 -32 64 -45 50 -60 51 -454 50 -202
+-1 -390 -5 -418 -9z m625 -585 l0 -305 -500 0 -500 0 0 89 c0 165 39 279 129
+374 61 65 125 101 223 127 63 16 111 19 361 19 l287 1 0 -305z"/>
+<path d="M7767 17500 c-38 -12 -55 -27 -78 -71 -18 -37 -19 -67 -19 -764 l0
+-725 145 0 145 0 0 643 0 642 482 -3 c325 -2 486 -6 495 -14 20 -16 18 -277
+-3 -326 -19 -47 -58 -88 -109 -115 -39 -21 -53 -22 -397 -25 l-358 -3 0 -144
+0 -145 104 0 104 0 293 -255 294 -254 218 -1 c120 0 216 3 213 8 -2 4 -132
+117 -289 252 l-284 245 41 8 c153 29 259 80 337 164 106 114 139 217 139 439
+0 123 -4 164 -20 215 -29 92 -80 155 -164 198 l-69 36 -596 2 c-328 1 -609 -2
+-624 -7z"/>
+<path d="M10321 17492 c-19 -9 -44 -30 -55 -45 -21 -28 -21 -38 -24 -715 -2
+-672 -2 -688 18 -720 11 -18 34 -41 52 -52 32 -20 47 -20 643 -18 l610 3 68
+38 c123 69 173 172 171 352 -1 170 -55 299 -164 397 l-59 53 38 77 c48 98 65
+189 59 311 -5 86 -8 101 -42 161 -44 79 -102 125 -194 155 -60 20 -84 21 -575
+21 -468 0 -515 -2 -546 -18z m1059 -287 c9 -10 11 -42 8 -102 -5 -107 -31
+-157 -105 -200 l-48 -28 -297 -3 -298 -3 0 -145 0 -144 348 0 c342 0 348 -1
+397 -24 60 -27 110 -81 124 -133 15 -52 14 -166 -1 -181 -9 -9 -133 -12 -495
+-12 l-483 0 0 495 0 495 419 0 c360 0 420 -2 431 -15z"/>
+<path d="M15520 17492 c-19 -9 -45 -32 -57 -51 l-23 -34 0 -733 0 -734 140 0
+140 0 0 643 0 642 487 -3 c333 -2 491 -6 500 -14 16 -13 18 -254 2 -312 -14
+-51 -85 -120 -146 -140 -39 -13 -101 -16 -385 -16 l-338 0 0 -145 0 -145 103
+0 102 -1 295 -254 295 -255 220 0 c175 1 217 3 204 13 -8 7 -140 120 -293 252
+l-277 239 83 18 c174 37 309 133 375 268 47 96 56 147 56 330 1 135 -2 174
+-17 215 -29 79 -76 143 -129 176 -94 58 -107 59 -732 59 -523 0 -573 -1 -605
+-18z"/>
+<path d="M17867 17488 c11 -13 154 -180 318 -373 164 -192 307 -359 317 -371
+19 -21 17 -23 -312 -408 -181 -213 -330 -390 -330 -392 0 -2 85 -4 189 -4
+l188 0 234 274 c129 151 237 275 240 275 3 1 112 -123 243 -274 l237 -275 190
+0 c182 0 190 1 177 18 -7 10 -155 184 -328 386 -173 202 -314 373 -314 380 1
+10 310 375 612 724 l54 62 -194 0 -194 0 -239 -279 c-170 -199 -243 -277 -251
+-270 -6 5 -115 131 -240 279 l-229 269 -194 1 -194 0 20 -22z"/>
+<path d="M15770 15419 c-50 -20 -398 -110 -515 -133 -92 -19 -169 -26 -330
+-30 -268 -9 -428 -22 -537 -47 -124 -27 -356 -25 -734 6 -388 33 -809 87 -832
+109 -16 13 -42 12 -267 -15 -330 -39 -485 -44 -784 -25 l-245 15 -91 -88
+c-102 -99 -197 -154 -301 -173 l-62 -11 -108 51 c-208 98 -292 97 -410 -3 -64
+-55 -73 -59 -204 -79 -153 -24 -182 -12 -293 122 -89 106 -94 108 -214 93 -53
+-7 -106 -16 -118 -21 -13 -5 -49 -61 -100 -155 -56 -103 -89 -153 -109 -166
+l-30 -18 -33 39 c-51 59 -89 68 -308 74 -150 4 -206 9 -265 25 -41 12 -105 28
+-143 36 l-67 15 -181 -111 -180 -111 -132 22 c-257 42 -393 72 -529 116 -83
+26 -173 48 -230 54 -51 6 -128 15 -170 20 -45 6 -115 24 -170 46 -180 70 -184
+70 -453 -16 l-160 -51 -175 26 c-262 38 -432 55 -555 55 -163 0 -383 17 -440
+34 -112 33 -219 46 -375 46 -86 0 -182 -4 -211 -10 -30 -5 -106 -36 -172 -69
+l-118 -60 -71 25 c-69 23 -71 23 -97 5 -53 -38 -151 -81 -183 -81 -45 0 -94
+32 -102 67 -15 62 -31 85 -108 144 -66 51 -79 58 -73 38 19 -58 26 -102 35
+-224 5 -71 14 -146 21 -165 24 -71 94 -123 213 -159 115 -35 178 -25 291 49
+67 43 152 83 211 99 21 5 127 17 236 26 l196 15 79 -32 78 -32 315 -7 c345 -7
+334 -5 605 -89 55 -17 165 -39 244 -50 l143 -20 142 -74 c163 -87 193 -94 426
+-102 l155 -6 235 55 c313 74 349 80 450 72 362 -28 642 -58 703 -76 62 -18 78
+-19 180 -9 62 5 193 15 292 20 249 13 341 2 582 -70 143 -42 211 -74 261 -123
+l43 -42 28 31 c16 18 39 63 51 100 13 38 31 87 41 110 l17 41 119 7 120 6 99
+-36 c144 -52 355 -104 423 -104 68 0 124 18 293 94 177 79 238 94 329 78 134
+-23 260 -100 328 -200 91 -135 151 -280 181 -443 11 -63 30 -147 41 -187 l19
+-72 -71 -90 -70 -90 16 -136 c15 -133 15 -136 -5 -164 -14 -20 -20 -44 -20
+-83 0 -44 -7 -70 -36 -124 -69 -133 -150 -182 -281 -170 -102 10 -112 18 -147
+124 -17 50 -33 94 -36 96 -3 3 -59 -1 -125 -9 -247 -29 -520 -54 -589 -54
+-152 0 -719 99 -826 145 -30 12 -121 50 -203 84 l-147 62 -167 -7 -167 -7 -80
+-58 c-174 -123 -432 -255 -546 -278 -89 -18 -429 -31 -825 -31 l-371 0 -149
+31 c-113 23 -186 32 -295 36 -160 5 -157 6 -520 -97 -104 -30 -172 -43 -241
+-47 -89 -5 -100 -4 -153 20 -91 42 -218 130 -299 206 -78 74 -141 110 -193
+111 l-32 0 -6 -92 c-3 -51 -8 -109 -12 -128 -5 -29 11 -76 92 -275 53 -132
+100 -243 104 -248 3 -4 62 -16 131 -27 371 -61 503 -141 540 -328 17 -90 7
+-181 -25 -236 -22 -38 -39 -52 -99 -80 -83 -40 -164 -54 -363 -63 l-132 -6 10
+-31 c15 -44 21 -50 96 -94 64 -37 73 -39 195 -50 127 -11 128 -11 216 -61 49
+-28 97 -51 107 -51 11 0 50 7 87 15 57 12 82 24 142 70 l73 56 254 -137 c414
+-224 659 -363 723 -410 33 -25 87 -65 120 -90 33 -25 96 -63 140 -85 l80 -40
+137 7 137 7 33 -35 c18 -19 40 -45 48 -58 l16 -23 59 18 c77 22 137 53 211
+109 73 55 101 66 162 66 90 0 118 -14 148 -75 29 -61 28 -86 -8 -182 -23 -62
+-87 -132 -171 -188 l-57 -38 -133 6 c-151 7 -486 41 -567 58 -32 6 -95 34
+-150 65 -52 30 -108 56 -125 58 -16 3 -116 7 -222 10 -183 5 -192 5 -198 -14
+-3 -10 -19 -30 -35 -43 -23 -20 -65 -32 -227 -62 -406 -77 -447 -88 -610 -159
+-99 -44 -174 -71 -215 -76 -104 -16 -369 -12 -417 5 -23 8 -130 68 -239 134
+-151 91 -240 137 -380 195 l-182 76 -75 -52 c-41 -29 -75 -55 -75 -58 0 -4 71
+-41 158 -82 l158 -75 109 -154 c60 -85 132 -176 160 -204 64 -62 177 -130 323
+-196 178 -79 200 -82 467 -76 l230 6 170 59 c265 93 327 106 466 99 64 -4 151
+-12 194 -18 87 -13 123 -37 163 -107 l23 -41 -43 -29 c-80 -55 -233 -145 -303
+-179 l-70 -33 189 6 188 7 117 84 c141 102 213 138 311 159 130 28 173 18 365
+-80 91 -47 198 -95 237 -107 87 -27 137 -23 338 26 214 52 288 47 351 -22 37
+-39 47 -61 64 -144 9 -40 23 -81 32 -91 29 -32 201 -68 257 -54 13 3 47 34 75
+70 56 70 131 126 168 126 49 0 150 -63 236 -147 98 -96 138 -205 141 -383 1
+-84 -2 -99 -21 -126 -40 -56 -81 -68 -213 -61 -63 4 -173 13 -244 22 l-129 15
+-174 -56 c-202 -64 -330 -112 -339 -125 -10 -17 15 -36 72 -54 57 -18 78 -39
+92 -91 14 -49 5 -63 -51 -78 -63 -18 -210 -36 -292 -36 -65 0 -292 34 -505 75
+-242 47 -359 81 -510 148 -185 82 -360 151 -439 173 -71 20 -75 19 -230 -51
+-56 -26 -122 -50 -145 -52 -29 -3 -115 14 -296 60 -254 64 -256 65 -460 75
+-112 6 -206 10 -207 8 -1 -1 44 -23 100 -48 67 -30 141 -54 213 -68 194 -39
+262 -78 284 -161 15 -55 7 -154 -18 -236 l-20 -63 83 0 c169 0 311 22 408 65
+23 10 22 -11 -4 -111 -12 -48 -35 -102 -59 -139 -21 -33 -50 -85 -64 -115 -37
+-81 -61 -260 -36 -260 6 0 49 10 96 21 70 18 95 30 136 65 96 82 121 89 298
+87 182 -1 295 -20 353 -59 22 -14 83 -66 136 -114 l97 -87 69 15 c76 17 313
+23 378 9 24 -5 59 -27 96 -60 113 -101 283 -190 441 -232 87 -22 93 -30 74
+-91 -14 -48 -17 -52 -52 -58 -20 -3 -50 -6 -65 -6 -26 0 -28 -3 -25 -32 3 -29
+14 -40 88 -90 130 -88 219 -119 365 -128 181 -11 258 -37 270 -90 5 -23 13
+-30 38 -35 18 -3 156 -23 307 -46 151 -22 331 -51 400 -65 68 -14 135 -22 147
+-19 13 3 23 2 23 -2 0 -10 -75 -191 -81 -198 -3 -2 -72 -18 -154 -36 -236 -49
+-301 -76 -443 -181 l-54 -40 6 -46 c3 -26 12 -52 19 -59 26 -26 251 -134 268
+-130 25 7 25 -17 -1 -43 -17 -17 -33 -20 -107 -20 -313 0 -505 -89 -850 -393
+-109 -96 -176 -163 -309 -309 -33 -37 -74 -68 -120 -91 -115 -58 -118 -62
+-110 -140 l8 -68 66 -31 c83 -39 127 -39 242 -3 163 52 249 104 410 250 163
+147 488 335 614 355 113 18 424 30 537 21 92 -8 387 -71 418 -90 20 -13 -65
+-239 -103 -270 -8 -7 -61 -17 -118 -23 l-103 -10 -93 36 -93 36 -54 -27 c-30
+-15 -55 -30 -55 -33 0 -4 15 -14 34 -22 18 -9 49 -30 67 -46 19 -16 58 -37 86
+-46 62 -21 104 -65 133 -144 37 -99 22 -177 -42 -225 -48 -35 -61 -38 -205
+-46 -73 -4 -135 -10 -139 -13 -14 -14 -64 -266 -64 -323 l0 -60 77 -73 c87
+-82 84 -82 98 21 l6 48 180 -7 180 -7 70 69 69 68 0 -111 0 -111 -82 -27 c-50
+-17 -94 -38 -112 -55 l-28 -28 127 -7 c119 -7 374 -2 631 11 l111 6 37 -32
+c48 -43 69 -85 63 -125 -3 -17 -24 -71 -47 -118 -34 -69 -44 -104 -51 -167 -7
+-78 -11 -86 -105 -248 -53 -92 -104 -175 -113 -186 -20 -23 -224 -195 -306
+-258 -33 -25 -78 -54 -100 -66 -53 -27 -81 -58 -100 -111 -20 -57 -19 -79 5
+-143 48 -130 102 -150 211 -81 146 92 326 162 439 170 61 4 67 3 103 -27 32
+-27 37 -37 37 -74 0 -50 -36 -111 -110 -190 -47 -50 -49 -54 -56 -129 l-7 -77
+73 0 c72 0 75 1 236 85 l163 85 44 -62 c73 -102 158 -248 194 -330 44 -102 45
+-158 2 -216 -17 -23 -34 -42 -38 -42 -3 0 -28 -20 -54 -43 -43 -40 -47 -48
+-47 -88 1 -66 32 -124 115 -210 41 -43 77 -89 80 -102 4 -13 -1 -165 -10 -337
+-16 -305 -15 -368 11 -527 5 -35 18 -40 83 -27 l31 6 -22 30 -21 30 66 66 65
+67 76 241 76 241 -25 96 c-13 53 -32 147 -41 209 -32 219 -4 301 164 468 132
+132 172 154 258 147 44 -3 77 -13 111 -32 116 -67 124 -70 213 -70 98 1 143
+18 181 68 21 28 24 42 24 122 0 52 5 99 12 111 13 23 75 80 112 105 23 15 24
+20 24 120 0 107 -11 146 -52 193 -36 41 -58 44 -381 55 l-314 11 -66 36 c-36
+20 -68 39 -72 43 -4 3 -14 72 -23 151 -8 80 -18 162 -21 182 -5 36 -4 37 45
+62 l50 26 88 -21 c48 -11 114 -20 146 -20 71 0 194 35 232 65 l27 22 -16 71
+c-13 60 -26 85 -84 161 -74 99 -132 206 -132 244 0 14 7 48 16 78 21 70 91
+139 206 203 147 82 211 100 375 105 175 5 355 -11 425 -39 41 -16 94 -23 235
+-32 163 -9 194 -9 276 7 51 10 99 21 106 25 11 7 23 63 66 298 5 29 0 36 -84
+107 l-89 76 -52 -10 c-152 -29 -264 2 -415 112 -60 44 -67 52 -50 59 11 4 47
+17 79 30 32 12 99 51 148 87 112 80 154 98 246 107 39 4 74 10 77 15 6 10
+-236 125 -305 144 -72 21 -274 51 -475 71 -188 19 -419 57 -525 86 -141 38
+-301 156 -315 232 -4 20 -4 50 0 67 9 40 81 116 119 126 18 4 75 -1 145 -14
+379 -69 548 -66 711 16 48 24 59 35 90 94 19 37 46 73 61 82 43 25 251 57 379
+57 122 1 430 -38 529 -67 30 -9 80 -28 110 -44 139 -69 311 -119 311 -90 0 16
+-66 84 -125 130 -29 23 -117 75 -194 116 -78 41 -202 111 -277 155 -247 147
+-290 158 -464 114 -183 -45 -281 -44 -325 5 -30 33 -11 56 78 92 45 18 109 47
+142 63 52 26 60 34 63 62 6 57 -67 161 -138 198 -63 32 -109 30 -216 -10 -121
+-47 -191 -54 -270 -29 -67 21 -68 21 58 29 l97 7 12 36 c49 153 94 223 174
+267 109 61 336 153 480 194 308 88 358 110 523 220 144 96 152 103 162 143 25
+99 84 278 112 338 35 79 81 127 173 185 147 92 237 124 550 193 l120 27 485 0
+c448 0 488 1 513 18 36 23 34 39 -8 76 -63 55 -78 58 -260 64 -200 5 -257 19
+-304 72 -28 32 -31 42 -31 99 0 71 7 80 99 135 30 18 44 36 55 66 22 65 13 70
+-90 56 -87 -12 -90 -13 -144 -65 -83 -79 -87 -81 -230 -79 -69 1 -149 4 -178
+8 -49 6 -54 9 -73 48 -36 71 -87 134 -121 148 -46 19 -212 17 -259 -3 -19 -9
+-71 -47 -115 -85 -113 -100 -130 -107 -234 -100 -118 9 -267 35 -316 57 -28
+12 -59 40 -96 86 -118 148 -148 234 -155 445 -5 125 -2 157 16 228 35 139 74
+181 168 181 26 0 125 -11 218 -25 362 -53 627 -21 739 89 30 29 51 62 70 112
+38 102 67 125 189 150 93 20 490 30 569 16 31 -6 105 -33 165 -61 181 -82 225
+-95 338 -95 176 -1 276 49 460 231 155 154 200 178 330 177 141 0 164 -15 370
+-235 88 -93 151 -141 229 -173 48 -19 75 -21 436 -24 212 -2 458 -1 547 3
+l162 7 -98 111 c-78 89 -104 113 -132 119 -19 3 -104 19 -189 33 -182 32 -302
+64 -385 105 -114 55 -384 302 -602 552 -103 117 -225 216 -332 270 -58 28 -78
+33 -166 36 -55 2 -183 -3 -283 -12 -317 -28 -346 -22 -394 73 -37 72 -45 80
+-103 107 -71 34 -95 31 -123 -12 -54 -83 -192 -84 -242 -2 -36 59 -36 90 1
+155 91 160 286 438 345 494 52 48 103 83 337 233 764 490 1178 722 1377 772
+211 54 378 75 680 85 360 11 412 18 515 69 91 45 357 212 363 228 1 5 -39 45
+-90 89 l-94 80 -144 6 c-179 7 -222 19 -330 97 -127 92 -176 98 -341 41 -46
+-16 -124 -43 -172 -60 -82 -29 -99 -31 -220 -31 -247 1 -317 37 -317 162 0 66
+36 133 107 200 58 54 105 70 338 121 143 30 160 32 365 32 l215 0 68 48 c60
+43 96 82 84 93 -2 2 -140 22 -307 44 l-303 40 -221 -31 c-685 -93 -1165 -182
+-1352 -249 -309 -111 -723 -237 -1002 -306 -208 -50 -261 -73 -352 -149 l-78
+-65 -122 -25 c-68 -14 -125 -25 -127 -25 -2 0 -1 49 3 109 l7 109 -62 31 -61
+31 -119 -75 c-291 -184 -447 -304 -617 -472 -119 -118 -279 -253 -379 -319
+-60 -40 -147 -64 -228 -64 l-60 0 5 43 c3 23 24 83 48 134 l42 92 -7 84 c-6
+79 -9 87 -40 117 l-34 33 -68 -48 c-171 -121 -339 -271 -372 -333 -6 -12 -30
+-75 -52 -140 -22 -64 -47 -127 -54 -138 -8 -12 -43 -42 -80 -68 l-65 -47 -39
+30 c-75 60 -207 209 -253 287 -26 44 -58 113 -72 155 -45 135 -71 410 -82 879
+l-6 275 36 213 36 212 -19 77 c-11 42 -18 80 -16 83 2 4 55 47 117 97 l113 89
+58 -42 c31 -23 86 -52 122 -64 91 -30 157 -29 254 6 l80 28 259 -27 c247 -27
+262 -27 299 -12 184 80 296 97 536 85 l168 -10 52 41 c28 22 78 54 111 71 68
+34 77 34 281 -8 180 -37 329 -78 435 -119 160 -62 426 -125 531 -125 39 0 56
+7 100 40 65 49 44 48 425 15 l291 -26 50 31 c64 40 206 90 256 90 21 0 99 -9
+174 -21 88 -14 154 -19 188 -14 73 9 156 51 252 128 85 67 127 86 248 112 99
+21 135 19 309 -15 l153 -30 109 51 c60 28 159 72 219 97 l110 47 115 -1 c117
+-1 265 -22 340 -49 52 -18 143 -10 435 40 l201 34 94 -29 c92 -29 96 -30 133
+-14 20 10 37 20 37 24 0 8 -98 50 -180 78 -33 11 -115 17 -305 22 -271 8 -288
+10 -565 75 -96 22 -163 27 -765 55 -620 29 -664 30 -737 15 -120 -24 -199 -51
+-252 -87 -124 -83 -114 -80 -201 -74 -44 3 -148 17 -232 31 l-152 25 -218 -46
+c-484 -100 -587 -109 -783 -65 -134 30 -193 57 -282 128 -91 72 -142 100 -259
+143 -88 33 -92 33 -129 19z"/>
+</g>
+</svg>
diff --git a/arborx/docs/logos/arborx_logo_v1.0_nobg.png b/arborx/docs/logos/arborx_logo_v1.0_nobg.png
new file mode 100644
index 0000000000000000000000000000000000000000..7769f01366736943aa400145cecca0622cbfb187
GIT binary patch
literal 81640
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

literal 0
HcmV?d00001

diff --git a/arborx/examples/CMakeLists.txt b/arborx/examples/CMakeLists.txt
new file mode 100644
index 000000000..211aece82
--- /dev/null
+++ b/arborx/examples/CMakeLists.txt
@@ -0,0 +1,20 @@
+if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
+  cmake_minimum_required(VERSION 3.12)
+  project(ArborXExamples CXX)
+  find_package(ArborX 1.1 REQUIRED)
+  enable_testing()
+endif()
+
+add_subdirectory(access_traits)
+
+add_subdirectory(callback)
+
+add_subdirectory(simple_intersection)
+
+find_package(Boost COMPONENTS program_options)
+if(Boost_FOUND)
+  add_subdirectory(viz)
+  add_subdirectory(dbscan)
+  add_subdirectory(raytracing)
+  add_subdirectory(brute_force)
+endif()
diff --git a/arborx/examples/access_traits/CMakeLists.txt b/arborx/examples/access_traits/CMakeLists.txt
new file mode 100644
index 000000000..2a36771cd
--- /dev/null
+++ b/arborx/examples/access_traits/CMakeLists.txt
@@ -0,0 +1,9 @@
+if(Kokkos_ENABLE_CUDA)
+  add_executable(ArborX_CudaAccessTraits.exe example_cuda_access_traits.cpp)
+  target_link_libraries(ArborX_CudaAccessTraits.exe ArborX::ArborX)
+  add_test(NAME ArborX_CudaAccessTraits_Example COMMAND ./ArborX_CudaAccessTraits.exe)
+else()
+  add_executable(ArborX_HostAccessTraits.exe example_host_access_traits.cpp)
+  target_link_libraries(ArborX_HostAccessTraits.exe ArborX::ArborX)
+  add_test(NAME ArborX_HostAccessTraits_Example COMMAND ./ArborX_HostAccessTraits.exe)
+endif()
diff --git a/arborx/examples/access_traits/example_cuda_access_traits.cpp b/arborx/examples/access_traits/example_cuda_access_traits.cpp
new file mode 100644
index 000000000..3f67dff22
--- /dev/null
+++ b/arborx/examples/access_traits/example_cuda_access_traits.cpp
@@ -0,0 +1,98 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#include <ArborX.hpp>
+
+#include <Kokkos_Core.hpp>
+
+#include <array>
+#include <iostream>
+#include <numeric>
+
+struct PointCloud
+{
+  float *d_x;
+  float *d_y;
+  float *d_z;
+  int N;
+};
+
+struct Spheres
+{
+  float *d_x;
+  float *d_y;
+  float *d_z;
+  float *d_r;
+  int N;
+};
+
+template <>
+struct ArborX::AccessTraits<PointCloud, ArborX::PrimitivesTag>
+{
+  static KOKKOS_FUNCTION std::size_t size(PointCloud const &cloud)
+  {
+    return cloud.N;
+  }
+  static KOKKOS_FUNCTION ArborX::Point get(PointCloud const &cloud,
+                                           std::size_t i)
+  {
+    return {{cloud.d_x[i], cloud.d_y[i], cloud.d_z[i]}};
+  }
+  using memory_space = Kokkos::CudaSpace;
+};
+
+template <>
+struct ArborX::AccessTraits<Spheres, ArborX::PredicatesTag>
+{
+  static KOKKOS_FUNCTION std::size_t size(Spheres const &d) { return d.N; }
+  static KOKKOS_FUNCTION auto get(Spheres const &d, std::size_t i)
+  {
+    return ArborX::intersects(
+        ArborX::Sphere{{{d.d_x[i], d.d_y[i], d.d_z[i]}}, d.d_r[i]});
+  }
+  using memory_space = Kokkos::CudaSpace;
+};
+
+int main(int argc, char *argv[])
+{
+  Kokkos::ScopeGuard guard(argc, argv);
+
+  constexpr std::size_t N = 10;
+  std::array<float, N> a;
+
+  float *d_a;
+  cudaMalloc(&d_a, sizeof(a));
+
+  std::iota(std::begin(a), std::end(a), 1.0);
+
+  cudaStream_t stream;
+  cudaStreamCreate(&stream);
+  cudaMemcpyAsync(d_a, a.data(), sizeof(a), cudaMemcpyHostToDevice, stream);
+
+  Kokkos::Cuda cuda{stream};
+  ArborX::BVH<Kokkos::CudaSpace> bvh{cuda, PointCloud{d_a, d_a, d_a, N}};
+
+  Kokkos::View<int *, Kokkos::CudaSpace> indices("indices", 0);
+  Kokkos::View<int *, Kokkos::CudaSpace> offset("offset", 0);
+  ArborX::query(bvh, cuda, Spheres{d_a, d_a, d_a, d_a, N}, indices, offset);
+
+  Kokkos::parallel_for(Kokkos::RangePolicy<Kokkos::Cuda>(cuda, 0, N),
+                       KOKKOS_LAMBDA(int i) {
+                         for (int j = offset(i); j < offset(i + 1); ++j)
+                         {
+                           printf("%i %i\n", i, indices(j));
+                         }
+                       });
+
+  cudaStreamDestroy(stream);
+
+  return 0;
+}
diff --git a/arborx/examples/access_traits/example_host_access_traits.cpp b/arborx/examples/access_traits/example_host_access_traits.cpp
new file mode 100644
index 000000000..b2a1eb06b
--- /dev/null
+++ b/arborx/examples/access_traits/example_host_access_traits.cpp
@@ -0,0 +1,52 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#include <ArborX.hpp>
+
+#include <Kokkos_Core.hpp>
+
+#include <iostream>
+#include <random>
+#include <vector>
+
+template <typename T, typename Tag>
+struct ArborX::AccessTraits<std::vector<T>, Tag>
+{
+  static std::size_t size(std::vector<T> const &v) { return v.size(); }
+  static T const &get(std::vector<T> const &v, std::size_t i) { return v[i]; }
+  using memory_space = Kokkos::HostSpace;
+};
+
+int main(int argc, char *argv[])
+{
+  Kokkos::ScopeGuard guard(argc, argv);
+
+  std::vector<ArborX::Point> points;
+  // Fill vector with random points in [-1, 1]^3
+  std::uniform_real_distribution<float> dis{-1., 1.};
+  std::default_random_engine gen;
+  auto rd = [&]() { return dis(gen); };
+  std::generate_n(std::back_inserter(points), 100, [&]() {
+    return ArborX::Point{rd(), rd(), rd()};
+  });
+
+  // Pass directly the vector of points to use the access traits defined above
+  ArborX::BVH<Kokkos::HostSpace> bvh{Kokkos::DefaultHostExecutionSpace{},
+                                     points};
+
+  // As a supported alternative, wrap the vector in an unmanaged View
+  bvh = ArborX::BVH<Kokkos::HostSpace>{
+      Kokkos::DefaultHostExecutionSpace{},
+      Kokkos::View<ArborX::Point *, Kokkos::HostSpace, Kokkos::MemoryUnmanaged>{
+          points.data(), points.size()}};
+
+  return 0;
+}
diff --git a/arborx/examples/brute_force/CMakeLists.txt b/arborx/examples/brute_force/CMakeLists.txt
new file mode 100644
index 000000000..c2ab407e6
--- /dev/null
+++ b/arborx/examples/brute_force/CMakeLists.txt
@@ -0,0 +1,3 @@
+add_executable(ArborX_BruteForce.exe brute_force.cpp)
+target_link_libraries(ArborX_BruteForce.exe ArborX::ArborX Boost::program_options)
+add_test(NAME ArborX_BruteForce_Example COMMAND ./ArborX_BruteForce.exe)
diff --git a/arborx/examples/brute_force/brute_force.cpp b/arborx/examples/brute_force/brute_force.cpp
new file mode 100644
index 000000000..1b03d2d1f
--- /dev/null
+++ b/arborx/examples/brute_force/brute_force.cpp
@@ -0,0 +1,124 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#include <ArborX_BruteForce.hpp>
+#include <ArborX_LinearBVH.hpp>
+
+#include <Kokkos_Core.hpp>
+
+#include <boost/program_options.hpp>
+
+struct Dummy
+{
+  int count;
+};
+
+using ExecutionSpace = Kokkos::DefaultExecutionSpace;
+using MemorySpace = ExecutionSpace::memory_space;
+
+template <>
+struct ArborX::AccessTraits<Dummy, ArborX::PrimitivesTag>
+{
+  using memory_space = MemorySpace;
+  using size_type = typename MemorySpace::size_type;
+  static KOKKOS_FUNCTION size_type size(Dummy const &d) { return d.count; }
+  static KOKKOS_FUNCTION Point get(Dummy const &, size_type i)
+  {
+    return {{(float)i, (float)i, (float)i}};
+  }
+};
+
+template <>
+struct ArborX::AccessTraits<Dummy, ArborX::PredicatesTag>
+{
+  using memory_space = MemorySpace;
+  using size_type = typename MemorySpace::size_type;
+  static KOKKOS_FUNCTION size_type size(Dummy const &d) { return d.count; }
+  static KOKKOS_FUNCTION auto get(Dummy const &, size_type i)
+  {
+    return attach(
+        intersects(Sphere{{{(float)i, (float)i, (float)i}}, (float)i}), i);
+  }
+};
+
+int main(int argc, char *argv[])
+{
+  Kokkos::ScopeGuard guard(argc, argv);
+
+  int nqueries;
+  int nprimitives;
+  int nrepeats;
+  namespace bpo = boost::program_options;
+  bpo::options_description desc("Allowed options");
+  // clang-format off
+  desc.add_options()
+      ( "help", "help message" )
+      ( "predicates", bpo::value<int>(&nqueries)->default_value(5), "number of predicates" )
+      ( "primitives", bpo::value<int>(&nprimitives)->default_value(5), "number of primitives" )
+      ( "iterations", bpo::value<int>(&nrepeats)->default_value(1), "number of iterations" )
+      ;
+  // clang-format on
+  bpo::variables_map vm;
+  bpo::store(bpo::command_line_parser(argc, argv).options(desc).run(), vm);
+  bpo::notify(vm);
+
+  if (vm.count("help") > 0)
+  {
+    std::cout << desc << '\n';
+    return 1;
+  }
+  printf("Primitives: %d\n", nprimitives);
+  printf("Predicates: %d\n", nqueries);
+  printf("Iterations: %d\n", nrepeats);
+
+  ARBORX_ASSERT(nprimitives > 0);
+  ARBORX_ASSERT(nqueries > 0);
+
+  ExecutionSpace space{};
+  Dummy primitives{nprimitives};
+  Dummy predicates{nqueries};
+
+  for (int i = 0; i < nrepeats; i++)
+  {
+    unsigned int out_count;
+    {
+      Kokkos::Timer timer;
+      ArborX::BoundingVolumeHierarchy<MemorySpace> bvh{space, primitives};
+
+      Kokkos::View<int *, ExecutionSpace> indices("indices_ref", 0);
+      Kokkos::View<int *, ExecutionSpace> offset("offset_ref", 0);
+      bvh.query(space, predicates, indices, offset);
+
+      space.fence();
+      double time = timer.seconds();
+      if (i == 0)
+        printf("Collisions: %.5f\n",
+               (float)(indices.extent(0)) / (nprimitives * nqueries));
+      printf("Time BVH: %lf\n", time);
+      out_count = indices.extent(0);
+    }
+
+    {
+      Kokkos::Timer timer;
+      ArborX::BruteForce<MemorySpace> brute{space, primitives};
+
+      Kokkos::View<int *, ExecutionSpace> indices("indices", 0);
+      Kokkos::View<int *, ExecutionSpace> offset("offset", 0);
+      brute.query(space, predicates, indices, offset);
+
+      space.fence();
+      double time = timer.seconds();
+      printf("Time BF: %lf\n", time);
+      ARBORX_ASSERT(out_count == indices.extent(0));
+    }
+  }
+  return 0;
+}
diff --git a/arborx/examples/callback/CMakeLists.txt b/arborx/examples/callback/CMakeLists.txt
new file mode 100644
index 000000000..c0338142f
--- /dev/null
+++ b/arborx/examples/callback/CMakeLists.txt
@@ -0,0 +1,3 @@
+add_executable(ArborX_Callback.exe example_callback.cpp)
+target_link_libraries(ArborX_Callback.exe ArborX::ArborX)
+add_test(NAME ArborX_Callback_Example COMMAND ./ArborX_Callback.exe)
diff --git a/arborx/examples/callback/example_callback.cpp b/arborx/examples/callback/example_callback.cpp
new file mode 100644
index 000000000..2bd3234cb
--- /dev/null
+++ b/arborx/examples/callback/example_callback.cpp
@@ -0,0 +1,145 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#include <ArborX.hpp>
+
+#include <Kokkos_Core.hpp>
+
+#include <iostream>
+#include <random>
+#include <vector>
+
+using ExecutionSpace = Kokkos::DefaultExecutionSpace;
+using MemorySpace = ExecutionSpace::memory_space;
+
+struct FirstOctant
+{
+};
+
+struct NearestToOrigin
+{
+  int k;
+};
+
+template <>
+struct ArborX::AccessTraits<FirstOctant, ArborX::PredicatesTag>
+{
+  static KOKKOS_FUNCTION std::size_t size(FirstOctant) { return 1; }
+  static KOKKOS_FUNCTION auto get(FirstOctant, std::size_t)
+  {
+    return ArborX::intersects(ArborX::Box{{{0, 0, 0}}, {{1, 1, 1}}});
+  }
+  using memory_space = MemorySpace;
+};
+
+template <>
+struct ArborX::AccessTraits<NearestToOrigin, ArborX::PredicatesTag>
+{
+  static KOKKOS_FUNCTION std::size_t size(NearestToOrigin) { return 1; }
+  static KOKKOS_FUNCTION auto get(NearestToOrigin d, std::size_t)
+  {
+    return ArborX::nearest(ArborX::Point{0, 0, 0}, d.k);
+  }
+  using memory_space = MemorySpace;
+};
+
+struct PrintfCallback
+{
+  template <typename Predicate, typename OutputFunctor>
+  KOKKOS_FUNCTION void operator()(Predicate, int primitive,
+                                  OutputFunctor const &out) const
+  {
+#ifndef __SYCL_DEVICE_ONLY__
+    printf("Found %d from functor\n", primitive);
+#endif
+    out(primitive);
+  }
+};
+
+int main(int argc, char *argv[])
+{
+  Kokkos::ScopeGuard guard(argc, argv);
+
+  int const n = 100;
+  std::vector<ArborX::Point> points;
+  // Fill vector with random points in [-1, 1]^3
+  std::uniform_real_distribution<float> dis{-1., 1.};
+  std::default_random_engine gen;
+  auto rd = [&]() { return dis(gen); };
+  std::generate_n(std::back_inserter(points), n, [&]() {
+    return ArborX::Point{rd(), rd(), rd()};
+  });
+
+  ArborX::BVH<MemorySpace> bvh{
+      ExecutionSpace{},
+      Kokkos::create_mirror_view_and_copy(
+          MemorySpace{},
+          Kokkos::View<ArborX::Point *, Kokkos::HostSpace,
+                       Kokkos::MemoryUnmanaged>(points.data(), points.size()))};
+
+  {
+    Kokkos::View<int *, MemorySpace> values("values", 0);
+    Kokkos::View<int *, MemorySpace> offsets("offsets", 0);
+    ArborX::query(bvh, ExecutionSpace{}, FirstOctant{}, PrintfCallback{},
+                  values, offsets);
+#ifndef __NVCC__
+    ArborX::query(bvh, ExecutionSpace{}, FirstOctant{},
+                  KOKKOS_LAMBDA(auto /*predicate*/, int primitive,
+                                auto /*output_functor*/) {
+#ifndef __SYCL_DEVICE_ONLY__
+                    printf("Found %d from generic lambda\n", primitive);
+#else
+                    (void)primitive;
+#endif
+                  },
+                  values, offsets);
+#endif
+  }
+
+  {
+    int const k = 10;
+    Kokkos::View<int *, MemorySpace> values("values", 0);
+    Kokkos::View<int *, MemorySpace> offsets("offsets", 0);
+    ArborX::query(bvh, ExecutionSpace{}, NearestToOrigin{k}, PrintfCallback{},
+                  values, offsets);
+#ifndef __NVCC__
+    ArborX::query(bvh, ExecutionSpace{}, NearestToOrigin{k},
+                  KOKKOS_LAMBDA(auto /*predicate*/, int primitive,
+                                auto /*output_functor*/) {
+#ifndef __SYCL_DEVICE_ONLY__
+                    printf("Found %d from generic lambda\n", primitive);
+#else
+                    (void)primitive;
+#endif
+                  },
+                  values, offsets);
+#endif
+  }
+
+  {
+    // EXPERIMENTAL
+    Kokkos::View<int, ExecutionSpace, Kokkos::MemoryTraits<Kokkos::Atomic>> c(
+        "counter");
+
+#ifndef __NVCC__
+    bvh.query(ExecutionSpace{}, FirstOctant{},
+              KOKKOS_LAMBDA(auto /*predicate*/, int j) {
+#ifndef __SYCL_DEVICE_ONLY__
+                printf("%d %d %d\n", ++c(), -1, j);
+#else
+                (void)j;
+#endif
+              });
+#endif
+  }
+
+  return 0;
+}
diff --git a/arborx/examples/dbscan/ArborX_DBSCANVerification.hpp b/arborx/examples/dbscan/ArborX_DBSCANVerification.hpp
new file mode 100644
index 000000000..d8f8e1437
--- /dev/null
+++ b/arborx/examples/dbscan/ArborX_DBSCANVerification.hpp
@@ -0,0 +1,320 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#ifndef ARBORX_DETAILSDBSCANVERIFICATION_HPP
+#define ARBORX_DETAILSDBSCANVERIFICATION_HPP
+
+#include <ArborX_DetailsUtils.hpp>
+#include <ArborX_LinearBVH.hpp>
+
+#include <Kokkos_View.hpp>
+
+#include <set>
+#include <stack>
+
+namespace ArborX
+{
+namespace Details
+{
+
+// Check that core points have nonnegative indices
+template <typename ExecutionSpace, typename IndicesView, typename OffsetView,
+          typename LabelsView>
+bool verifyCorePointsNonnegativeIndex(ExecutionSpace const &exec_space,
+                                      IndicesView /*indices*/,
+                                      OffsetView offset, LabelsView labels,
+                                      int core_min_size)
+{
+  int n = labels.size();
+
+  int num_incorrect = 0;
+  Kokkos::parallel_reduce(
+      "ArborX::DBSCAN::verify_core_points_nonnegative",
+      Kokkos::RangePolicy<ExecutionSpace>(exec_space, 0, n),
+      KOKKOS_LAMBDA(int i, int &update) {
+        bool self_is_core_point = (offset(i + 1) - offset(i) >= core_min_size);
+        if (self_is_core_point && labels(i) < 0)
+        {
+#ifndef __SYCL_DEVICE_ONLY__
+          printf("Core point is marked as noise: %d [%d]\n", i, labels(i));
+#endif
+          update++;
+        }
+      },
+      num_incorrect);
+  return (num_incorrect == 0);
+}
+
+// Check that connected core points have same cluster indices
+template <typename ExecutionSpace, typename IndicesView, typename OffsetView,
+          typename LabelsView>
+bool verifyConnectedCorePointsShareIndex(ExecutionSpace const &exec_space,
+                                         IndicesView indices, OffsetView offset,
+                                         LabelsView labels, int core_min_size)
+{
+  int n = labels.size();
+
+  int num_incorrect = 0;
+  Kokkos::parallel_reduce(
+      "ArborX::DBSCAN::verify_connected_core_points",
+      Kokkos::RangePolicy<ExecutionSpace>(exec_space, 0, n),
+      KOKKOS_LAMBDA(int i, int &update) {
+        bool self_is_core_point = (offset(i + 1) - offset(i) >= core_min_size);
+        if (self_is_core_point)
+        {
+          for (int jj = offset(i); jj < offset(i + 1); ++jj)
+          {
+            int j = indices(jj);
+            bool neigh_is_core_point =
+                (offset(j + 1) - offset(j) >= core_min_size);
+
+            if (neigh_is_core_point && labels(i) != labels(j))
+            {
+#ifndef __SYCL_DEVICE_ONLY__
+              printf("Connected cores do not belong to the same cluster: "
+                     "%d [%d] -> %d [%d]\n",
+                     i, labels(i), j, labels(j));
+#endif
+              update++;
+            }
+          }
+        }
+      },
+      num_incorrect);
+  return (num_incorrect == 0);
+}
+
+// Check that border points share index with at least one core point, and
+// that noise points have index -1
+template <typename ExecutionSpace, typename IndicesView, typename OffsetView,
+          typename LabelsView>
+bool verifyBorderAndNoisePoints(ExecutionSpace const &exec_space,
+                                IndicesView indices, OffsetView offset,
+                                LabelsView labels, int core_min_size)
+{
+  int n = labels.size();
+
+  int num_incorrect = 0;
+  Kokkos::parallel_reduce(
+      "ArborX::DBSCAN::verify_connected_border_points",
+      Kokkos::RangePolicy<ExecutionSpace>(exec_space, 0, n),
+      KOKKOS_LAMBDA(int i, int &update) {
+        bool self_is_core_point = (offset(i + 1) - offset(i) >= core_min_size);
+        if (!self_is_core_point)
+        {
+          bool is_border = false;
+          bool have_shared_core = false;
+          for (int jj = offset(i); jj < offset(i + 1); ++jj)
+          {
+            int j = indices(jj);
+            bool neigh_is_core_point =
+                (offset(j + 1) - offset(j) >= core_min_size);
+
+            if (neigh_is_core_point)
+            {
+              is_border = true;
+              if (labels(i) == labels(j))
+              {
+                have_shared_core = true;
+                break;
+              }
+            }
+          }
+
+          // Border point must be connected to a core point
+          if (is_border && !have_shared_core)
+          {
+#ifndef __SYCL_DEVICE_ONLY__
+            printf("Border point does not belong to a cluster: %d [%d]\n", i,
+                   labels(i));
+#endif
+            update++;
+          }
+          // Noise points must have index -1
+          if (!is_border && labels(i) != -1)
+          {
+#ifndef __SYCL_DEVICE_ONLY__
+            printf("Noise point does not have index -1: %d [%d]\n", i,
+                   labels(i));
+#endif
+            update++;
+          }
+        }
+      },
+      num_incorrect);
+  return (num_incorrect == 0);
+}
+
+// Check that cluster indices are unique
+template <typename ExecutionSpace, typename IndicesView, typename OffsetView,
+          typename LabelsView>
+bool verifyClustersAreUnique(ExecutionSpace const &exec_space,
+                             IndicesView indices, OffsetView offset,
+                             LabelsView labels, int core_min_size)
+{
+  int n = labels.size();
+
+  // FIXME we don't want to modify the labels view in this check. What we
+  // want here is to create a view on the host, and deep_copy into it.
+  // create_mirror_view_and_copy won't work, because it is a no-op if labels
+  // is already on the host.
+  decltype(Kokkos::create_mirror_view(Kokkos::HostSpace{},
+                                      std::declval<LabelsView>()))
+      labels_host(Kokkos::view_alloc(Kokkos::WithoutInitializing,
+                                     "ArborX::DBSCAN::labels_host"),
+                  labels.size());
+  Kokkos::deep_copy(exec_space, labels_host, labels);
+  auto offset_host =
+      Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace{}, offset);
+  auto indices_host =
+      Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace{}, indices);
+
+  auto is_core_point = [&](int i) {
+    return offset_host(i + 1) - offset_host(i) >= core_min_size;
+  };
+
+  // Remove all border points from consideration (noise points are already -1)
+  // The idea is that this way if labels were bridged through a border
+  // point, we will count them as separate labels but with a shared cluster
+  // index, which will fail the unique labels check
+  for (int i = 0; i < n; ++i)
+  {
+    if (!is_core_point(i))
+    {
+      for (int jj = offset_host(i); jj < offset_host(i + 1); ++jj)
+      {
+        int j = indices_host(jj);
+        if (is_core_point(j))
+        {
+          // The point is a border point
+          labels_host(i) = -1;
+          break;
+        }
+      }
+    }
+  }
+
+  // Record all unique cluster indices
+  std::set<int> unique_cluster_indices;
+  for (int i = 0; i < n; ++i)
+    if (labels_host(i) != -1)
+      unique_cluster_indices.insert(labels_host(i));
+  auto num_unique_cluster_indices = unique_cluster_indices.size();
+
+  // Record all cluster indices, assigning a unique index to each (which is
+  // different from the original cluster index). This will only use noise and
+  // core points (see above).
+  unsigned int num_clusters = 0;
+  std::set<int> cluster_sets;
+  for (int i = 0; i < n; ++i)
+  {
+    if (labels_host(i) >= 0)
+    {
+      auto id = labels_host(i);
+      cluster_sets.insert(id);
+      num_clusters++;
+
+      // DFS search
+      std::stack<int> stack;
+      stack.push(i);
+      while (!stack.empty())
+      {
+        auto k = stack.top();
+        stack.pop();
+        if (labels_host(k) >= 0)
+        {
+          labels_host(k) = -1;
+          for (int jj = offset_host(k); jj < offset_host(k + 1); ++jj)
+          {
+            int j = indices_host(jj);
+            if (is_core_point(j) || (labels_host(j) == id))
+              stack.push(j);
+          }
+        }
+      }
+    }
+  }
+  if (cluster_sets.size() != num_unique_cluster_indices)
+  {
+    std::cerr << "Number of components does not match" << std::endl;
+    return false;
+  }
+  if (num_clusters != num_unique_cluster_indices)
+  {
+    std::cerr << "Cluster IDs are not unique" << std::endl;
+    return false;
+  }
+
+  return true;
+}
+
+template <typename ExecutionSpace, typename IndicesView, typename OffsetView,
+          typename LabelsView>
+bool verifyClusters(ExecutionSpace const &exec_space, IndicesView indices,
+                    OffsetView offset, LabelsView labels, int core_min_size)
+{
+  int n = labels.size();
+  if ((int)offset.size() != n + 1 ||
+      ArborX::lastElement(offset) != (int)indices.size())
+    return false;
+
+  using Verify = bool (*)(ExecutionSpace const &, IndicesView, OffsetView,
+                          LabelsView, int);
+
+  for (auto verify : {static_cast<Verify>(verifyCorePointsNonnegativeIndex),
+                      static_cast<Verify>(verifyConnectedCorePointsShareIndex),
+                      static_cast<Verify>(verifyBorderAndNoisePoints),
+                      static_cast<Verify>(verifyClustersAreUnique)})
+  {
+    if (!verify(exec_space, indices, offset, labels, core_min_size))
+      return false;
+  }
+
+  return true;
+}
+
+template <typename ExecutionSpace, typename Primitives, typename LabelsView>
+bool verifyDBSCAN(ExecutionSpace exec_space, Primitives const &primitives,
+                  float eps, int core_min_size, LabelsView const &labels)
+{
+  Kokkos::Profiling::pushRegion("ArborX::DBSCAN::verify");
+
+  static_assert(Kokkos::is_view<LabelsView>{}, "");
+
+  using Access = AccessTraits<Primitives, PrimitivesTag>;
+  using MemorySpace = typename Access::memory_space;
+
+  static_assert(std::is_same<typename LabelsView::value_type, int>{}, "");
+  static_assert(std::is_same<typename LabelsView::memory_space, MemorySpace>{},
+                "");
+
+  ARBORX_ASSERT(eps > 0);
+  ARBORX_ASSERT(core_min_size >= 2);
+
+  ArborX::BVH<MemorySpace> bvh(exec_space, primitives);
+
+  auto const predicates =
+      Details::PrimitivesWithRadius<Primitives>{primitives, eps};
+
+  Kokkos::View<int *, MemorySpace> indices("ArborX::DBSCAN::indices", 0);
+  Kokkos::View<int *, MemorySpace> offset("ArborX::DBSCAN::offset", 0);
+  ArborX::query(bvh, exec_space, predicates, indices, offset);
+
+  auto passed = Details::verifyClusters(exec_space, indices, offset, labels,
+                                        core_min_size);
+  Kokkos::Profiling::popRegion();
+
+  return passed;
+}
+} // namespace Details
+} // namespace ArborX
+
+#endif
diff --git a/arborx/examples/dbscan/CMakeLists.txt b/arborx/examples/dbscan/CMakeLists.txt
new file mode 100644
index 000000000..6449e7261
--- /dev/null
+++ b/arborx/examples/dbscan/CMakeLists.txt
@@ -0,0 +1,11 @@
+add_executable(ArborX_DBSCAN.exe dbscan.cpp)
+target_include_directories(ArborX_DBSCAN.exe PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
+target_link_libraries(ArborX_DBSCAN.exe ArborX::ArborX Boost::program_options)
+
+add_executable(ArborX_DataConverter.exe converter.cpp)
+target_compile_features(ArborX_DataConverter.exe PRIVATE cxx_std_14)
+target_link_libraries(ArborX_DataConverter.exe Boost::program_options)
+
+set(input_file "input.txt")
+add_test(NAME ArborX_DBSCAN_Example COMMAND ./ArborX_DBSCAN.exe --filename=${input_file} --eps=1.4 --verify)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${input_file} ${CMAKE_CURRENT_BINARY_DIR}/${input_file} COPYONLY)
diff --git a/arborx/examples/dbscan/README.md b/arborx/examples/dbscan/README.md
new file mode 100644
index 000000000..683e6a4ce
--- /dev/null
+++ b/arborx/examples/dbscan/README.md
@@ -0,0 +1,62 @@
+# Algorithm
+
+This example considers the DBSCAN algorithm [1]. DBSCAN algorithm computes
+clusters based on two parameters, `min_pts` (number of neighbors required to be
+considered a core point) and `eps` (radius).
+
+An example of an application requiring a solution to such problem is computing
+halos in a cosmology simulation. Here, points correspond to points in the
+universe, `eps` is called linking length, `min_pts = 1` and clusters are called
+halos, or Friends-of-Friends (FoF).
+
+A straightforward approach to compute halos, for example, would have one
+compute the connectivity graph explicitly through ArborX spatial query search,
+and then run a CC algorithm, such as ECL-CC ([2]), on that graph. The
+implemented approach is an improvement over straightforward approach. Instead
+of constructing the graph explicitly, it uses a combination of the callback
+mechanism in ArborX with the `compute1` routine of the CC algorithm in [2] to
+construct CC in a single tree query. A general DBSCAN algorithm is implemented
+in a similar fashion, with a main distinction being that the number of
+neighbors is pre-computed. Thus, it is expected that the `min_pts > 1`
+algorithm is twice slower compared to `min_pts = 1` case.
+
+[1] Ester, Kriegel, Sander, Xu. "A density-based algorithm for discovering
+clusters in large spatial databases with noise". In Proceedings of the Second
+International Conference on Knowledge Discovery and Data Mining, pp. 226-231.
+1996.
+
+[2] Jaiganesh, Burtscher. "A high-performance connected
+components implementation for GPUs." In Proceedings of the 27th International
+Symposium on High-Performance Parallel and Distributed Computing, pp. 92-104.
+2018.
+
+# Input
+
+The example conrols its input through command-line options:
+- `--filename`
+  The data is expected to be provided as an argument to the `--filename`
+  option. The data is in the format `[number of points, X-coordinates,
+  Y-coordinates, Z-coordinates]`.
+- `--binary`
+  Indicator whether the data provided through `--filename` option is text or
+  binary. If the data is binary, it is expected that number of points is an
+  4-byte integer, and each coordinate is a 4-byte floating point number.
+- `--core-min-size`
+  `min_pts` parameter of the DBSCAN algorithm
+- `--eps`
+  `eps` parameter of the DBSCAN algorithm
+- `--cluster-min-size`
+  Further post-processing to filter out clusters under certain size
+- `--verify`
+  Internal check switch to verify clusters. This options is significantly more
+  expected, as it explicitly computes the graph. This may also mean that it
+  will run out of memory on GPU even if the DBSCAN algorithm itself does not.
+
+# Output
+
+The example produces clusters in CSR (compressed sparse storage) format
+consisting of two arrays `(cluster_indices, cluster_offset)`, with indices for
+a cluster `i` being entries
+`cluster_indices(cluster_offset(i):cluster_offset(i+1)`. A simple
+postprocessing step that calculates the sizes and centers of each cluster is
+then performed.
diff --git a/arborx/examples/dbscan/converter.cpp b/arborx/examples/dbscan/converter.cpp
new file mode 100644
index 000000000..53d7f4572
--- /dev/null
+++ b/arborx/examples/dbscan/converter.cpp
@@ -0,0 +1,472 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#include <boost/program_options.hpp>
+
+#include <algorithm>
+#include <cassert>
+#include <cstring>
+#include <fstream>
+#include <iostream>
+#include <iterator>
+#include <sstream>
+#include <stdexcept>
+#include <vector>
+
+class Points
+{
+private:
+  std::vector<std::vector<float>> _data;
+
+public:
+  Points(int dim, int num_points = 0)
+  {
+    _data.resize(dim);
+    for (int i = 0; i < dim; ++i)
+      _data[i].resize(num_points);
+  }
+
+  int dimension() const { return _data.size(); }
+
+  int size() const
+  {
+    assert(dimension() > 0);
+    return _data[0].size();
+  }
+
+  std::vector<float> &operator[](int d)
+  {
+    assert(d < dimension());
+    return _data[d];
+  }
+
+  std::vector<float> const &operator[](int d) const
+  {
+    assert(d < dimension());
+    return _data[d];
+  }
+};
+
+auto loadHACCData(std::string const &filename)
+{
+  std::cout << "Assuming HACC data.\n";
+  std::cout << "Reading in \"" << filename << "\" in binary mode...";
+  std::cout.flush();
+
+  std::ifstream input(filename, std::ifstream::binary);
+  if (!input.good())
+    throw std::runtime_error("Cannot open file");
+
+  int num_points = 0;
+  input.read(reinterpret_cast<char *>(&num_points), sizeof(int));
+
+  Points points(3, num_points);
+  input.read(reinterpret_cast<char *>(points[0].data()),
+             num_points * sizeof(float));
+  input.read(reinterpret_cast<char *>(points[1].data()),
+             num_points * sizeof(float));
+  input.read(reinterpret_cast<char *>(points[2].data()),
+             num_points * sizeof(float));
+  input.close();
+  std::cout << "done\nRead in " << num_points << " points" << std::endl;
+
+  return points;
+}
+
+// Next Generation Simulation (NGSIM) Vehicle Trajectories data reader.
+//
+// NGSIM data consists of vehicle trajectory data collected by NGSIM
+// researchers on three highways in Los Angeles, CA, Emeryville, CA, and
+// Atlanta, GA. The trajectory data have been transcribed for every vehicle
+// from the footage of video cameras using NGVIDEO.
+//
+// The data was used in Mustafa et al "An experimental comparison of GPU
+// techniques for DBSCAN clustering", IEEE International Conference on Big Data,
+// 2019.
+//
+// The data can be found at
+// https://catalog.data.gov/dataset/next-generation-simulation-ngsim-vehicle-trajectories-and-supporting-data
+// (direct link
+// https://data.transportation.gov/api/views/8ect-6jqj/rows.csv?accessType=DOWNLOAD).
+//
+// Among other attributes, each data points has a timestamp, vehicle ID, local
+// orad coordinates, global coordinates, vehicle length, width, velocity and
+// acceleration.
+//
+// The code here is different from the source code for the Mustafa2019 paper.
+// In that codebase, they seem to have a filtered file that only contains the
+// global coordinates and not all the other data fields.
+auto loadNGSIMData(std::string const &filename)
+{
+  std::cout << "Assuming NGSIM data.\n";
+  std::cout << "Reading in \"" << filename << "\" in text mode...";
+  std::cout.flush();
+
+  std::ifstream file(filename);
+  if (!file.good())
+    throw std::runtime_error("Cannot open file");
+
+  std::string thisWord;
+  std::string line;
+
+  Points points(2);
+
+  // ignore first line that contains the descriptions
+  int n_points = 0;
+  getline(file, thisWord);
+  while (file.good())
+  {
+    if (!getline(file, line))
+      break;
+
+    std::stringstream ss(line);
+    // GVehicle_ID,Frame_ID,Total_Frames,Global_Time,Local_X,Local_Y
+    for (int i = 0; i < 6; ++i)
+      getline(ss, thisWord, ',');
+    // Global_X,Global_Y
+    getline(ss, thisWord, ',');
+    float longitude = stof(thisWord);
+    getline(ss, thisWord, ',');
+    float latitude = stof(thisWord);
+    points[0].emplace_back(longitude);
+    points[1].emplace_back(latitude);
+    // v_length,v_Width,v_Class,v_Vel,v_Acc,Lane_ID,O_Zone,D_Zone,Int_ID,Section_ID,Direction,Movement,Preceding,Following,Space_Headway,Time_Headway,Location
+    for (int i = 0; i < 16; ++i)
+      getline(ss, thisWord, ',');
+    getline(ss, thisWord, ',');
+    ++n_points;
+  }
+  std::cout << "done\nRead in " << n_points << " points" << std::endl;
+  return points;
+}
+
+// Taxi Service Trajectory Prediction Challenge data reader.
+//
+// The data consists of the trajectories of 442 taxis running in the city of
+// Porto, Portugal, over the period of one year. This is a dataset with over
+// 1,710,000+ trajectories with 81,000,000+ points in total.
+//
+// The data can be found at
+// https://archive.ics.uci.edu/ml/datasets/Taxi+Service+Trajectory+-+Prediction+Challenge,+ECML+PKDD+2015
+// (direct link
+// https://archive.ics.uci.edu/ml/machine-learning-databases/00339/train.csv.zip).
+//
+// Every data point in this dataset has, besides longitude and latitude values,
+// a unique identifier for each taxi trip, taxi ID, timestamp, and user
+// information.
+auto loadTaxiPortoData(std::string const &filename)
+{
+  std::cout << "Assuming TaxiPorto data.\n";
+  std::cout << "Reading in \"" << filename << "\" in text mode...";
+  std::cout.flush();
+
+  FILE *fp_data = fopen(filename.c_str(), "rb");
+  if (fp_data == nullptr)
+    throw std::runtime_error("Cannot open file");
+  char line[100000];
+
+  // This function reads and segments trajectories in dataset in the following
+  // format: The first line indicates number of variables per point (I'm
+  // ignoring that and assuming 2) The second line indicates total trajectories
+  // in file (I'm ignoring that and observing how many are there by reading
+  // them). All lines that follow contains a trajectory separated by new line.
+  // The first number in the trajectory is the number of points followed by
+  // location points separated by spaces
+
+  std::vector<float> longitudes;
+  std::vector<float> latitudes;
+
+  int lineNo = -1;
+  int wordNo = 0;
+  int lonlatno = 100;
+
+  float thisWord;
+  while (fgets(line, sizeof(line), fp_data) != nullptr)
+  {
+    if (lineNo > -1)
+    {
+      char *pch;
+      char *end_str;
+      wordNo = 0;
+      lonlatno = 0;
+      pch = strtok_r(line, "\"[", &end_str);
+      while (pch != nullptr)
+      {
+        if (wordNo > 0)
+        {
+          char *pch2;
+          char *end_str2;
+
+          pch2 = strtok_r(pch, ",", &end_str2);
+
+          if (strcmp(pch2, "]") < 0 && lonlatno < 255)
+          {
+
+            thisWord = atof(pch2);
+
+            if (thisWord != 0.00000)
+            {
+              if (thisWord > -9 && thisWord < -7)
+              {
+                longitudes.push_back(thisWord);
+                // printf("lon %f",thisWord);
+                pch2 = strtok_r(nullptr, ",", &end_str2);
+                thisWord = atof(pch2);
+                if (thisWord < 42 && thisWord > 40)
+                {
+                  latitudes.push_back(thisWord);
+                  // printf(" lat %f\n",thisWord);
+
+                  lonlatno++;
+                }
+                else
+                {
+                  longitudes.pop_back();
+                }
+              }
+            }
+          }
+        }
+        pch = strtok_r(nullptr, "[", &end_str);
+        wordNo++;
+      }
+      // printf("num lonlat were %d x 2\n",lonlatno);
+    }
+    lineNo++;
+    if (lonlatno <= 0)
+    {
+      lineNo--;
+    }
+
+    // printf("Line %d\n",lineNo);
+  }
+  fclose(fp_data);
+
+  int num_points = longitudes.size();
+  assert(longitudes.size() == latitudes.size());
+
+  Points points(2, num_points);
+  std::copy(longitudes.begin(), longitudes.end(), points[0].begin());
+  std::copy(latitudes.begin(), latitudes.end(), points[1].begin());
+
+  std::cout << "done\nRead in " << num_points << " points" << std::endl;
+
+  return points;
+}
+
+// 3D Road Network data reader.
+//
+// The data consists of more than 400,000 points from the road network of North
+// Jutland in Denmark.
+//
+// The data can be found at
+// https://archive.ics.uci.edu/ml/datasets/3D+Road+Network+(North+Jutland,+Denmark)
+// (direct link
+// https://archive.ics.uci.edu/ml/machine-learning-databases/00246/3D_spatial_network.txt).
+//
+// Each data point contains its ID, longitude, latitude, and altitude.
+auto load3DRoadNetworkData(std::string const &filename)
+{
+  std::cout << "Assuming 3DRoadNetwork data.\n";
+  std::cout << "Reading in \"" << filename << "\" in text mode...";
+  std::cout.flush();
+
+  std::ifstream file(filename);
+  assert(file.good());
+  if (!file.good())
+    throw std::runtime_error("Cannot open file");
+
+  Points points(2);
+
+  std::string thisWord;
+  while (file.good())
+  {
+    getline(file, thisWord, ',');
+    getline(file, thisWord, ',');
+    float longitude = stof(thisWord);
+    getline(file, thisWord, ',');
+    float latitude = stof(thisWord);
+    points[0].emplace_back(longitude);
+    points[1].emplace_back(latitude);
+  }
+  // In Mustafa2019 they discarded the last item read but it's not quite clear
+  // if/why this was necessary.
+  // lon_ptr.pop_back();
+  // lat_ptr.pop_back();
+  std::cout << "done\nRead in " << points.size() << " points" << std::endl;
+
+  return points;
+}
+
+// SW data reader.
+//
+// SW data consists of ionospheric total electron content datasets collected by
+// GPS receivers.
+//
+// Data preprocessing described in Pankratius et al "GPS Data Processing for
+// Scientific Studies of the Earth’s Atmosphere and Near-Space Environment".
+// Springer International Publishing, 2015, pp. 1–12.
+//
+// The data was used in Gowanlock et al "Clustering Throughput Optimization on
+// the GPU", IPDPS, 2017, pp. 832-841.
+//
+// The data is available at
+// ftp://gemini.haystack.mit.edu/pub/informatics/dbscandat.zip
+//
+// The data file is a text file. Each line contains three floating point
+// numbers separated by ','. The fields corespond to longitude, latitude, and
+// total electron content (TEC). The TEC field is unused in the Gowanlock's
+// paper, as according to the author:
+//   because in the application scenario of monitoring space weather, we
+//   typically first selected the data points based on TEC, and then cluster
+//   the positions of the points
+auto loadSWData(std::string const &filename)
+{
+  std::cout << "Assuming SW data.\n";
+  std::cout << "Reading in \"" << filename << "\" in text mode...";
+  std::cout.flush();
+
+  std::ifstream input;
+  input.open(filename);
+  if (!input.good())
+    throw std::runtime_error("Cannot open file");
+
+  Points points(2);
+  while (input.good())
+  {
+    std::string line;
+    if (!std::getline(input, line))
+      break;
+    std::istringstream line_stream(line);
+
+    std::string word;
+    std::getline(line_stream, word, ','); // longitude field
+    float longitude = std::stof(word);
+    std::getline(line_stream, word, ','); // latitude field
+    float latitude = std::stof(word);
+    std::getline(line_stream, word, ','); // TEC field (ignored)
+
+    points[0].emplace_back(longitude);
+    points[1].emplace_back(latitude);
+  }
+  input.close();
+  std::cout << "done\nRead in " << points.size() << " points" << std::endl;
+
+  return points;
+}
+
+// Gaia data reader.
+//
+// Gaia catalog (data release 2) contains 1.69 billion points
+//
+// Scientific Studies of the Earth’s Atmosphere and Near-Space Environment".
+// Springer International Publishing, 2015, pp. 1–12.
+//
+// The data was used in Gowanlock "Hybrid CPU/GPU Clustering in Shared Memory
+// on the Billion Point Scale", 2019
+//
+// The data is available at
+// https://rcdata.nau.edu/gowanlock_lab/datasets/ICS19_data/gaia_dr2_ra_dec_50M.txt.
+//
+// The data file is a text file. Each line contains two floating point
+// numbers separated by ','. The fields corespond to longitude, latitude.
+auto loadGaiaData(std::string const &filename)
+{
+  std::cout << "Assuming Gaia data.\n";
+  std::cout << "Reading in \"" << filename << "\" in text mode...";
+  std::cout.flush();
+
+  std::ifstream input;
+  input.open(filename);
+  if (!input.good())
+    throw std::runtime_error("Cannot open file");
+
+  Points points(2);
+  while (input.good())
+  {
+    std::string line;
+    if (!std::getline(input, line))
+      break;
+    std::istringstream line_stream(line);
+
+    std::string word;
+    std::getline(line_stream, word, ','); // longitude field
+    float longitude = std::stof(word);
+    std::getline(line_stream, word, ','); // latitude field
+    float latitude = std::stof(word);
+
+    points[0].emplace_back(longitude);
+    points[1].emplace_back(latitude);
+  }
+  input.close();
+  std::cout << "done\nRead in " << points.size() << " points" << std::endl;
+
+  return points;
+}
+
+auto loadData(std::string const &filename, std::string const &reader_type)
+{
+  if (reader_type == "hacc")
+    return loadHACCData(filename);
+  if (reader_type == "ngsim")
+    return loadNGSIMData(filename);
+  if (reader_type == "taxiporto")
+    return loadTaxiPortoData(filename);
+  if (reader_type == "3droad")
+    return load3DRoadNetworkData(filename);
+  if (reader_type == "sw")
+    return loadSWData(filename);
+  if (reader_type == "gaia")
+    return loadGaiaData(filename);
+
+  throw std::runtime_error("Unknown reader type: \"" + reader_type + "\"");
+}
+
+int main(int argc, char *argv[])
+{
+  namespace bpo = boost::program_options;
+
+  std::string input_file;
+  std::string output_file;
+  std::string reader;
+
+  bpo::options_description desc("Allowed options");
+  // clang-format off
+    desc.add_options()
+        ( "help", "help message" )
+        ( "input", bpo::value<std::string>(&input_file), "file containing data" )
+        ( "output", bpo::value<std::string>(&output_file), "file to contain the results" )
+        ( "reader", bpo::value<std::string>(&reader), "reader type" )
+        ;
+  // clang-format on
+  bpo::variables_map vm;
+  bpo::store(bpo::command_line_parser(argc, argv).options(desc).run(), vm);
+  bpo::notify(vm);
+
+  if (vm.count("help") > 0)
+  {
+    std::cout << desc << '\n';
+    return 1;
+  }
+
+  auto points = loadData(input_file, reader);
+  int n = points.size();
+  int dim = points.dimension();
+
+  std::ofstream out(output_file, std::ofstream::binary);
+  out.write((char *)&n, sizeof(int));
+  out.write((char *)&dim, sizeof(int));
+  for (int i = 0; i < n; ++i)
+    for (int d = 0; d < dim; ++d)
+      out.write((char *)(&points[d][i]), sizeof(float));
+
+  return EXIT_SUCCESS;
+}
diff --git a/arborx/examples/dbscan/dbscan.cpp b/arborx/examples/dbscan/dbscan.cpp
new file mode 100644
index 000000000..a79e5bba2
--- /dev/null
+++ b/arborx/examples/dbscan/dbscan.cpp
@@ -0,0 +1,504 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#include <ArborX_DBSCAN.hpp>
+#include <ArborX_DBSCANVerification.hpp>
+#include <ArborX_DetailsHeap.hpp>
+#include <ArborX_DetailsOperatorFunctionObjects.hpp> // Less
+#include <ArborX_Version.hpp>
+
+#include <Kokkos_Core.hpp>
+
+#include <boost/program_options.hpp>
+
+#include <fstream>
+
+std::vector<ArborX::Point> loadData(std::string const &filename,
+                                    bool binary = true, int max_num_points = -1)
+{
+  std::cout << "Reading in \"" << filename << "\" in "
+            << (binary ? "binary" : "text") << " mode...";
+  std::cout.flush();
+
+  std::ifstream input;
+  if (!binary)
+    input.open(filename);
+  else
+    input.open(filename, std::ifstream::binary);
+  ARBORX_ASSERT(input.good());
+
+  std::vector<ArborX::Point> v;
+
+  int num_points = 0;
+  int dim = 0;
+  if (!binary)
+  {
+    input >> num_points;
+    input >> dim;
+  }
+  else
+  {
+    input.read(reinterpret_cast<char *>(&num_points), sizeof(int));
+    input.read(reinterpret_cast<char *>(&dim), sizeof(int));
+  }
+
+  // For now, only allow reading in 2D or 3D data. Will relax in the future.
+  ARBORX_ASSERT(dim == 2 || dim == 3);
+
+  if (max_num_points > 0 && max_num_points < num_points)
+    num_points = max_num_points;
+
+  if (!binary)
+  {
+    v.reserve(num_points);
+
+    auto it = std::istream_iterator<float>(input);
+    auto read_point = [&it, dim]() {
+      float xyz[3] = {0.f, 0.f, 0.f};
+      for (int i = 0; i < dim; ++i)
+        xyz[i] = *it++;
+      return ArborX::Point{xyz[0], xyz[1], xyz[2]};
+    };
+    std::generate_n(std::back_inserter(v), num_points, read_point);
+  }
+  else
+  {
+    v.resize(num_points);
+
+    if (dim == 3)
+    {
+      // Can directly read into ArborX::Point
+      input.read(reinterpret_cast<char *>(v.data()),
+                 num_points * sizeof(ArborX::Point));
+    }
+    else
+    {
+      std::vector<float> aux(num_points * dim);
+      input.read(reinterpret_cast<char *>(aux.data()),
+                 aux.size() * sizeof(float));
+
+      for (int i = 0; i < num_points; ++i)
+      {
+        ArborX::Point p{0.f, 0.f, 0.f};
+        for (int d = 0; d < dim; ++d)
+          p[d] = aux[i * dim + d];
+        v[i] = p;
+      }
+    }
+  }
+  input.close();
+  std::cout << "done\nRead in " << num_points << " " << dim << "D points"
+            << std::endl;
+
+  return v;
+}
+
+std::vector<ArborX::Point> sampleData(std::vector<ArborX::Point> const &data,
+                                      int num_samples)
+{
+  std::vector<ArborX::Point> sampled_data(num_samples);
+
+  // Knuth algorithm
+  auto const N = (int)data.size();
+  auto const M = num_samples;
+  for (int in = 0, im = 0; in < N && im < M; ++in)
+  {
+    int rn = N - in;
+    int rm = M - im;
+    if (rand() % rn < rm)
+      sampled_data[im++] = data[in];
+  }
+  return sampled_data;
+}
+
+template <typename MemorySpace>
+void writeLabelsData(std::string const &filename,
+                     Kokkos::View<int *, MemorySpace> labels)
+{
+  std::ofstream out(filename, std::ofstream::binary);
+  ARBORX_ASSERT(out.good());
+
+  auto labels_host =
+      Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace{}, labels);
+
+  int n = labels_host.size();
+  out.write((char *)&n, sizeof(int));
+  out.write((char *)labels_host.data(), sizeof(int) * n);
+}
+
+template <typename... P, typename T>
+auto vec2view(std::vector<T> const &in, std::string const &label = "")
+{
+  Kokkos::View<T *, P...> out(
+      Kokkos::view_alloc(label, Kokkos::WithoutInitializing), in.size());
+  Kokkos::deep_copy(out, Kokkos::View<T const *, Kokkos::HostSpace,
+                                      Kokkos::MemoryTraits<Kokkos::Unmanaged>>{
+                             in.data(), in.size()});
+  return out;
+}
+
+template <typename ExecutionSpace, typename LabelsView,
+          typename ClusterIndicesView, typename ClusterOffsetView>
+void sortAndFilterClusters(ExecutionSpace const &exec_space,
+                           LabelsView const &labels,
+                           ClusterIndicesView &cluster_indices,
+                           ClusterOffsetView &cluster_offset,
+                           int cluster_min_size = 1)
+{
+  Kokkos::Profiling::pushRegion("ArborX::DBSCAN::sortAndFilterClusters");
+
+  static_assert(Kokkos::is_view<LabelsView>{}, "");
+  static_assert(Kokkos::is_view<ClusterIndicesView>{}, "");
+  static_assert(Kokkos::is_view<ClusterOffsetView>{}, "");
+
+  using MemorySpace = typename LabelsView::memory_space;
+
+  static_assert(std::is_same<typename LabelsView::value_type, int>{}, "");
+  static_assert(std::is_same<typename ClusterIndicesView::value_type, int>{},
+                "");
+  static_assert(std::is_same<typename ClusterOffsetView::value_type, int>{},
+                "");
+
+  static_assert(std::is_same<typename LabelsView::memory_space, MemorySpace>{},
+                "");
+  static_assert(
+      std::is_same<typename ClusterIndicesView::memory_space, MemorySpace>{},
+      "");
+  static_assert(
+      std::is_same<typename ClusterOffsetView::memory_space, MemorySpace>{},
+      "");
+
+  ARBORX_ASSERT(cluster_min_size >= 1);
+
+  int const n = labels.extent_int(0);
+
+  Kokkos::View<int *, MemorySpace> cluster_sizes(
+      "ArborX::DBSCAN::cluster_sizes", n);
+  Kokkos::parallel_for("ArborX::DBSCAN::compute_cluster_sizes",
+                       Kokkos::RangePolicy<ExecutionSpace>(exec_space, 0, n),
+                       KOKKOS_LAMBDA(int const i) {
+                         // Ignore noise points
+                         if (labels(i) < 0)
+                           return;
+
+                         Kokkos::atomic_fetch_add(&cluster_sizes(labels(i)), 1);
+                       });
+
+  // This kernel serves dual purpose:
+  // - it constructs an offset array through exclusive prefix sum, with a
+  //   caveat that small clusters (of size < cluster_min_size) are filtered out
+  // - it creates a mapping from a cluster index into the cluster's position in
+  //   the offset array
+  // We reuse the cluster_sizes array for the second, creating a new alias for
+  // it for clarity.
+  auto &map_cluster_to_offset_position = cluster_sizes;
+  int constexpr IGNORED_CLUSTER = -1;
+  int num_clusters;
+  ArborX::reallocWithoutInitializing(cluster_offset, n + 1);
+  Kokkos::parallel_scan(
+      "ArborX::DBSCAN::compute_cluster_offset_with_filter",
+      Kokkos::RangePolicy<ExecutionSpace>(exec_space, 0, n),
+      KOKKOS_LAMBDA(int const i, int &update, bool final_pass) {
+        bool is_cluster_too_small = (cluster_sizes(i) < cluster_min_size);
+        if (!is_cluster_too_small)
+        {
+          if (final_pass)
+          {
+            cluster_offset(update) = cluster_sizes(i);
+            map_cluster_to_offset_position(i) = update;
+          }
+          ++update;
+        }
+        else
+        {
+          if (final_pass)
+            map_cluster_to_offset_position(i) = IGNORED_CLUSTER;
+        }
+      },
+      num_clusters);
+  Kokkos::resize(Kokkos::WithoutInitializing, cluster_offset, num_clusters + 1);
+  ArborX::exclusivePrefixSum(exec_space, cluster_offset);
+
+  auto cluster_starts = ArborX::clone(exec_space, cluster_offset);
+  ArborX::reallocWithoutInitializing(cluster_indices,
+                                     ArborX::lastElement(cluster_offset));
+  Kokkos::parallel_for("ArborX::DBSCAN::compute_cluster_indices",
+                       Kokkos::RangePolicy<ExecutionSpace>(exec_space, 0, n),
+                       KOKKOS_LAMBDA(int const i) {
+                         // Ignore noise points
+                         if (labels(i) < 0)
+                           return;
+
+                         auto offset_pos =
+                             map_cluster_to_offset_position(labels(i));
+                         if (offset_pos != IGNORED_CLUSTER)
+                         {
+                           auto position = Kokkos::atomic_fetch_add(
+                               &cluster_starts(offset_pos), 1);
+                           cluster_indices(position) = i;
+                         }
+                       });
+
+  Kokkos::Profiling::popRegion();
+}
+
+template <typename ExecutionSpace, typename Primitives,
+          typename ClusterIndicesView, typename ClusterOffsetView>
+void printClusterSizesAndCenters(ExecutionSpace const &exec_space,
+                                 Primitives const &primitives,
+                                 ClusterIndicesView &cluster_indices,
+                                 ClusterOffsetView &cluster_offset)
+{
+  auto const num_clusters = static_cast<int>(cluster_offset.size()) - 1;
+
+  using MemorySpace = typename ClusterIndicesView::memory_space;
+
+  Kokkos::View<ArborX::Point *, MemorySpace> cluster_centers(
+      Kokkos::view_alloc(Kokkos::WithoutInitializing, "Testing::centers"),
+      num_clusters);
+  Kokkos::parallel_for(
+      "Testing::compute_centers",
+      Kokkos::RangePolicy<ExecutionSpace>(exec_space, 0, num_clusters),
+      KOKKOS_LAMBDA(int const i) {
+        // The only reason we sort indices here is for reproducibility.
+        // Current DBSCAN algorithm does not guarantee that the indices
+        // corresponding to the same cluster are going to appear in the same
+        // order from run to run. Using sorted indices, we explicitly
+        // guarantee the same summation order when computing cluster centers.
+
+        auto *cluster_start = cluster_indices.data() + cluster_offset(i);
+        auto cluster_size = cluster_offset(i + 1) - cluster_offset(i);
+
+        // Sort cluster indices in ascending order. This uses heap for
+        // sorting, only because there is no other convenient utility that
+        // could sort within a kernel.
+        ArborX::Details::makeHeap(cluster_start, cluster_start + cluster_size,
+                                  ArborX::Details::Less<int>());
+        ArborX::Details::sortHeap(cluster_start, cluster_start + cluster_size,
+                                  ArborX::Details::Less<int>());
+
+        // Compute cluster centers
+        ArborX::Point cluster_center{0.f, 0.f, 0.f};
+        for (int j = cluster_offset(i); j < cluster_offset(i + 1); j++)
+        {
+          auto const &cluster_point = primitives(cluster_indices(j));
+          // NOTE The explicit casts below are intended to silence warnings
+          // about narrowing conversion from 'int' to 'float'. A potential
+          // accuracy issue here is that 'float' can represent all integer
+          // values in the range [-2^23, 2^23] but 'int' can actually represent
+          // values in the range [-2^31, 2^31-1]. However, we ignore it for
+          // now.
+          cluster_center[0] +=
+              cluster_point[0] / static_cast<float>(cluster_size);
+          cluster_center[1] +=
+              cluster_point[1] / static_cast<float>(cluster_size);
+          cluster_center[2] +=
+              cluster_point[2] / static_cast<float>(cluster_size);
+        }
+        cluster_centers(i) = cluster_center;
+      });
+
+  auto cluster_offset_host =
+      Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace{}, cluster_offset);
+  auto cluster_centers_host =
+      Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace{}, cluster_centers);
+  for (int i = 0; i < num_clusters; i++)
+  {
+    int cluster_size = cluster_offset_host(i + 1) - cluster_offset_host(i);
+
+    // This is HACC specific filtering. It is only interested in the clusters
+    // with centers in [0,64]^3 domain.
+    auto const &cluster_center = cluster_centers_host(i);
+    if (cluster_center[0] >= 0 && cluster_center[1] >= 0 &&
+        cluster_center[2] >= 0 && cluster_center[0] < 64 &&
+        cluster_center[1] < 64 && cluster_center[2] < 64)
+    {
+      printf("%d %e %e %e\n", cluster_size, cluster_center[0],
+             cluster_center[1], cluster_center[2]);
+    }
+  }
+}
+
+namespace ArborX
+{
+namespace DBSCAN
+{
+// This function is required for Boost program_options to be able to use the
+// Implementation enum.
+std::istream &operator>>(std::istream &in, Implementation &implementation)
+{
+  std::string impl_string;
+  in >> impl_string;
+
+  if (impl_string == "fdbscan")
+    implementation = ArborX::DBSCAN::Implementation::FDBSCAN;
+  else if (impl_string == "fdbscan-densebox")
+    implementation = ArborX::DBSCAN::Implementation::FDBSCAN_DenseBox;
+  else
+    in.setstate(std::ios_base::failbit);
+
+  return in;
+}
+
+// This function is required for Boost program_options to use Implementation
+// enum as the default_value().
+std::ostream &operator<<(std::ostream &out,
+                         Implementation const &implementation)
+{
+  switch (implementation)
+  {
+  case ArborX::DBSCAN::Implementation::FDBSCAN:
+    out << "fdbscan";
+    break;
+  case ArborX::DBSCAN::Implementation::FDBSCAN_DenseBox:
+    out << "fdbscan-densebox";
+    break;
+  }
+  return out;
+}
+} // namespace DBSCAN
+} // namespace ArborX
+
+int main(int argc, char *argv[])
+{
+  using ExecutionSpace = Kokkos::DefaultExecutionSpace;
+  using MemorySpace = typename ExecutionSpace::memory_space;
+
+  Kokkos::ScopeGuard guard(argc, argv);
+
+  std::cout << "ArborX version    : " << ArborX::version() << std::endl;
+  std::cout << "ArborX hash       : " << ArborX::gitCommitHash() << std::endl;
+
+  namespace bpo = boost::program_options;
+  using ArborX::DBSCAN::Implementation;
+
+  std::string filename;
+  bool binary;
+  bool verify;
+  bool print_dbscan_timers;
+  bool print_sizes_centers;
+  float eps;
+  int cluster_min_size;
+  int core_min_size;
+  int max_num_points;
+  int num_samples;
+  std::string filename_labels;
+  Implementation implementation;
+
+  bpo::options_description desc("Allowed options");
+  // clang-format off
+  desc.add_options()
+      ( "help", "help message" )
+      ( "filename", bpo::value<std::string>(&filename), "filename containing data" )
+      ( "binary", bpo::bool_switch(&binary)->default_value(false), "binary file indicator")
+      ( "max-num-points", bpo::value<int>(&max_num_points)->default_value(-1), "max number of points to read in")
+      ( "eps", bpo::value<float>(&eps), "DBSCAN eps" )
+      ( "cluster-min-size", bpo::value<int>(&cluster_min_size)->default_value(1), "minimum cluster size")
+      ( "core-min-size", bpo::value<int>(&core_min_size)->default_value(2), "DBSCAN min_pts")
+      ( "verify", bpo::bool_switch(&verify)->default_value(false), "verify connected components")
+      ( "samples", bpo::value<int>(&num_samples)->default_value(-1), "number of samples" )
+      ( "labels", bpo::value<std::string>(&filename_labels)->default_value(""), "clutering results output" )
+      ( "print-dbscan-timers", bpo::bool_switch(&print_dbscan_timers)->default_value(false), "print dbscan timers")
+      ( "output-sizes-and-centers", bpo::bool_switch(&print_sizes_centers)->default_value(false), "print cluster sizes and centers")
+      ( "impl", bpo::value<Implementation>(&implementation)->default_value(Implementation::FDBSCAN), R"(implementation ("fdbscan" or "fdbscan-densebox"))")
+      ;
+  // clang-format on
+  bpo::variables_map vm;
+  bpo::store(bpo::command_line_parser(argc, argv).options(desc).run(), vm);
+  bpo::notify(vm);
+
+  if (vm.count("help") > 0)
+  {
+    std::cout << desc << '\n';
+    return 1;
+  }
+
+  std::stringstream ss;
+  ss << implementation;
+
+  // Print out the runtime parameters
+  printf("eps               : %f\n", eps);
+  printf("minpts            : %d\n", core_min_size);
+  printf("cluster min size  : %d\n", cluster_min_size);
+  printf("filename          : %s [%s, max_pts = %d]\n", filename.c_str(),
+         (binary ? "binary" : "text"), max_num_points);
+  printf("filename [labels] : %s [binary]\n", filename_labels.c_str());
+  printf("implementation    : %s\n", ss.str().c_str());
+  printf("samples           : %d\n", num_samples);
+  printf("verify            : %s\n", (verify ? "true" : "false"));
+  printf("print timers      : %s\n", (print_dbscan_timers ? "true" : "false"));
+  printf("output centers    : %s\n", (print_sizes_centers ? "true" : "false"));
+
+  // read in data
+  std::vector<ArborX::Point> data = loadData(filename, binary, max_num_points);
+  if (num_samples > 0 && num_samples < (int)data.size())
+    data = sampleData(data, num_samples);
+  auto const primitives = vec2view<MemorySpace>(data, "primitives");
+
+  ExecutionSpace exec_space;
+
+  Kokkos::Timer timer_total;
+  Kokkos::Timer timer;
+  std::map<std::string, double> elapsed;
+
+  bool const verbose = print_dbscan_timers;
+  auto timer_start = [&exec_space, verbose](Kokkos::Timer &timer) {
+    if (verbose)
+      exec_space.fence();
+    timer.reset();
+  };
+  auto timer_seconds = [&exec_space, verbose](Kokkos::Timer const &timer) {
+    if (verbose)
+      exec_space.fence();
+    return timer.seconds();
+  };
+
+  timer_start(timer_total);
+
+  auto labels = ArborX::dbscan(exec_space, primitives, eps, core_min_size,
+                               ArborX::DBSCAN::Parameters()
+                                   .setPrintTimers(print_dbscan_timers)
+                                   .setImplementation(implementation));
+
+  timer_start(timer);
+  Kokkos::View<int *, MemorySpace> cluster_indices("Testing::cluster_indices",
+                                                   0);
+  Kokkos::View<int *, MemorySpace> cluster_offset("Testing::cluster_offset", 0);
+  sortAndFilterClusters(exec_space, labels, cluster_indices, cluster_offset,
+                        cluster_min_size);
+  elapsed["cluster"] = timer_seconds(timer);
+  elapsed["total"] = timer_seconds(timer_total);
+
+  printf("-- postprocess      : %10.3f\n", elapsed["cluster"]);
+  printf("total time          : %10.3f\n", elapsed["total"]);
+
+  int num_clusters = cluster_offset.size() - 1;
+  int num_cluster_points = cluster_indices.size();
+  printf("\n#clusters       : %d\n", num_clusters);
+  printf("#cluster points : %d [%.2f%%]\n", num_cluster_points,
+         (100.f * num_cluster_points / data.size()));
+
+  if (verify)
+  {
+    auto passed = ArborX::Details::verifyDBSCAN(exec_space, primitives, eps,
+                                                core_min_size, labels);
+    printf("Verification %s\n", (passed ? "passed" : "failed"));
+  }
+
+  if (!filename_labels.empty())
+    writeLabelsData(filename_labels, labels);
+
+  if (print_sizes_centers)
+    printClusterSizesAndCenters(exec_space, primitives, cluster_indices,
+                                cluster_offset);
+
+  return EXIT_SUCCESS;
+}
diff --git a/arborx/examples/dbscan/input.txt b/arborx/examples/dbscan/input.txt
new file mode 100644
index 000000000..f04abedd9
--- /dev/null
+++ b/arborx/examples/dbscan/input.txt
@@ -0,0 +1,9 @@
+8 2
+3 2
+0 0
+0 1
+1 1
+1 0
+2 2
+2 3
+3 3
diff --git a/arborx/examples/raytracing/CMakeLists.txt b/arborx/examples/raytracing/CMakeLists.txt
new file mode 100644
index 000000000..27e6e6ce0
--- /dev/null
+++ b/arborx/examples/raytracing/CMakeLists.txt
@@ -0,0 +1,3 @@
+add_executable(ArborX_RayTracing.exe example_raytracing.cpp)
+target_link_libraries(ArborX_RayTracing.exe ArborX::ArborX Boost::program_options)
+add_test(NAME ArborX_RayTracing_Example COMMAND ./ArborX_RayTracing.exe --spheres=1000 --rays=50000 --L=200.0)
diff --git a/arborx/examples/raytracing/example_raytracing.cpp b/arborx/examples/raytracing/example_raytracing.cpp
new file mode 100644
index 000000000..e435d5f32
--- /dev/null
+++ b/arborx/examples/raytracing/example_raytracing.cpp
@@ -0,0 +1,200 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#include <ArborX.hpp>
+#include <ArborX_Ray.hpp>
+#include <ArborX_Version.hpp>
+
+#include <Kokkos_Core.hpp>
+
+#include <boost/program_options.hpp>
+
+#include <iostream>
+#include <random>
+
+template <typename MemorySpace>
+struct SpheresToBoxes
+{
+  Kokkos::View<ArborX::Sphere *, MemorySpace> _spheres;
+};
+
+template <typename MemorySpace>
+struct ArborX::AccessTraits<SpheresToBoxes<MemorySpace>, ArborX::PrimitivesTag>
+{
+  using memory_space = MemorySpace;
+
+  KOKKOS_FUNCTION static std::size_t
+  size(const SpheresToBoxes<MemorySpace> &stob)
+  {
+    return stob._spheres.extent(0);
+  }
+  KOKKOS_FUNCTION static ArborX::Box
+  get(SpheresToBoxes<MemorySpace> const &stobs, std::size_t const i)
+  {
+    auto const &sphere = stobs._spheres(i);
+    auto const &c = sphere.centroid();
+    auto const r = sphere.radius();
+    return {{c[0] - r, c[1] - r, c[2] - r}, {c[0] + r, c[1] + r, c[2] + r}};
+  }
+};
+
+template <typename MemorySpace>
+struct Rays
+{
+  Kokkos::View<ArborX::Experimental::Ray *, MemorySpace> _rays;
+};
+
+template <typename MemorySpace>
+struct ArborX::AccessTraits<Rays<MemorySpace>, ArborX::PredicatesTag>
+{
+  using memory_space = MemorySpace;
+
+  KOKKOS_FUNCTION static std::size_t size(const Rays<MemorySpace> &rays)
+  {
+    return rays._rays.extent(0);
+  }
+  KOKKOS_FUNCTION static auto get(Rays<MemorySpace> const &rays, std::size_t i)
+  {
+    return attach(intersects(rays._rays(i)), (int)i);
+  }
+};
+
+template <typename MemorySpace>
+struct AccumRaySphereInterDist
+{
+  Kokkos::View<ArborX::Sphere *, MemorySpace> _spheres;
+  Kokkos::View<float *, MemorySpace> _accumulator;
+
+  template <typename Predicate>
+  KOKKOS_FUNCTION void operator()(Predicate const &predicate,
+                                  int const primitive_index) const
+  {
+    auto const &ray = ArborX::getGeometry(predicate);
+    auto const &sphere = _spheres(primitive_index);
+
+    float const length = overlapDistance(ray, sphere);
+    int const i = getData(predicate);
+
+    Kokkos::atomic_fetch_add(&_accumulator(i), length);
+  }
+};
+
+int main(int argc, char *argv[])
+{
+  using ExecutionSpace = Kokkos::DefaultExecutionSpace;
+  using MemorySpace = ExecutionSpace::memory_space;
+
+  Kokkos::ScopeGuard guard(argc, argv);
+
+  namespace bpo = boost::program_options;
+
+  int num_spheres;
+  int num_rays;
+  float L;
+
+  bpo::options_description desc("Allowed options");
+  // clang-format off
+  desc.add_options()
+    ( "help", "help message" )
+    ("spheres", bpo::value<int>(&num_spheres)->default_value(100), "number of spheres")
+    ("rays", bpo::value<int>(&num_rays)->default_value(10000), "number of rays")
+    ("L", bpo::value<float>(&L)->default_value(100.0), "size of the domain")
+    ;
+  // clang-format on
+  bpo::variables_map vm;
+  bpo::store(bpo::command_line_parser(argc, argv).options(desc).run(), vm);
+  bpo::notify(vm);
+
+  if (vm.count("help") > 0)
+  {
+    std::cout << desc << '\n';
+    return 1;
+  }
+
+  std::cout << "ArborX version: " << ArborX::version() << std::endl;
+  std::cout << "ArborX hash   : " << ArborX::gitCommitHash() << std::endl;
+
+  std::uniform_real_distribution<float> uniform{0.0, 1.0};
+  std::default_random_engine gen;
+  auto rand_uniform = [&]() { return uniform(gen); };
+
+  // Random parameters for Gaussian distribution of radii
+  const float mu_R = 1.0;
+  const float sigma_R = mu_R / 3.0;
+
+  std::normal_distribution<> normal{mu_R, sigma_R};
+  auto rand_normal = [&]() { return std::max(normal(gen), 0.0); };
+
+  // Construct spheres
+  //
+  // The centers of spheres are uniformly sampling the domain. The radii of
+  // spheres have Gaussian (mu_R, sigma_R) sampling.
+  Kokkos::View<ArborX::Sphere *, MemorySpace> spheres(
+      Kokkos::view_alloc(Kokkos::WithoutInitializing, "spheres"), num_spheres);
+  auto spheres_host = Kokkos::create_mirror_view(spheres);
+  for (int i = 0; i < num_spheres; ++i)
+  {
+    spheres_host(i) = {
+        {rand_uniform() * L, rand_uniform() * L, rand_uniform() * L},
+        rand_normal()};
+  }
+  Kokkos::deep_copy(spheres, spheres_host);
+
+  // Construct rays
+  //
+  // The origins of rays are uniformly sampling the bottom surface of the
+  // domain. The direction vectors are uniformly sampling of a cosine-weighted
+  // hemisphere, It requires expressing the direction vector in the spherical
+  // coordinates as:
+  //    {sinpolar * cosazimuth, sinpolar * sinazimuth, cospolar}
+  // A detailed description can be found in the slides here (slide 47):
+  // https://cg.informatik.uni-freiburg.de/course_notes/graphics2_08_renderingEquation.pdf
+  Kokkos::View<ArborX::Experimental::Ray *, MemorySpace> rays(
+      Kokkos::view_alloc(Kokkos::WithoutInitializing, "rays"), num_rays);
+  auto rays_host = Kokkos::create_mirror_view(rays);
+
+  for (int i = 0; i < num_rays; ++i)
+  {
+    float xi_1 = rand_uniform();
+    float xi_2 = rand_uniform();
+
+    rays_host(i) = {ArborX::Point{rand_uniform() * L, rand_uniform() * L, 0.f},
+                    ArborX::Experimental::Vector{
+                        float(std::cos(2 * M_PI * xi_2) * std::sqrt(xi_1)),
+                        float(std::sin(2 * M_PI * xi_2) * std::sqrt(xi_1)),
+                        std::sqrt(1.f - xi_1)}};
+  }
+  Kokkos::deep_copy(rays, rays_host);
+
+  Kokkos::Timer timer;
+
+  ExecutionSpace exec_space{};
+
+  exec_space.fence();
+  timer.reset();
+  ArborX::BVH<MemorySpace> bvh{exec_space,
+                               SpheresToBoxes<MemorySpace>{spheres}};
+
+  Kokkos::View<float *, MemorySpace> accumulator("accumulator", num_rays);
+  bvh.query(exec_space, Rays<MemorySpace>{rays},
+            AccumRaySphereInterDist<MemorySpace>{spheres, accumulator});
+  exec_space.fence();
+  auto time = timer.seconds();
+
+  auto accumulator_avg =
+      ArborX::accumulate(exec_space, accumulator, 0.f) / num_rays;
+
+  printf("time          : %.3f   [%.3fM ray/sec]\n", time,
+         num_rays / (1000000 * time));
+  printf("ray avg       : %.3f\n", accumulator_avg);
+
+  return EXIT_SUCCESS;
+}
diff --git a/arborx/examples/simple_intersection/CMakeLists.txt b/arborx/examples/simple_intersection/CMakeLists.txt
new file mode 100644
index 000000000..5b76eee46
--- /dev/null
+++ b/arborx/examples/simple_intersection/CMakeLists.txt
@@ -0,0 +1,3 @@
+add_executable(ArborX_Intersection.exe example_intersection.cpp)
+target_link_libraries(ArborX_Intersection.exe ArborX::ArborX)
+add_test(NAME ArborX_Intersection_Example COMMAND ./ArborX_Intersection.exe)
diff --git a/arborx/examples/simple_intersection/example_intersection.cpp b/arborx/examples/simple_intersection/example_intersection.cpp
new file mode 100644
index 000000000..e30aad98b
--- /dev/null
+++ b/arborx/examples/simple_intersection/example_intersection.cpp
@@ -0,0 +1,168 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#include <ArborX.hpp>
+
+#include <Kokkos_Core.hpp>
+
+// Perform intersection queries using the same objects for the queries as the
+// objects used in BVH construction that are located on a regular spaced
+// three-dimensional grid.
+// Each box will only intersect with itself.
+//
+// i-2  i-1  i  i+1
+//
+//  o    o   o   o   j+1
+//          ---
+//  o    o | x | o   j
+//          ---
+//  o    o   o   o   j-1
+//
+//  o    o   o   o   j-2
+//
+
+template <typename DeviceType>
+class Boxes
+{
+public:
+  // Create non-intersecting boxes on a 3D cartesian grid
+  // used both for queries and predicates.
+  Boxes(typename DeviceType::execution_space const &execution_space)
+  {
+    float Lx = 100.0;
+    float Ly = 100.0;
+    float Lz = 100.0;
+    int nx = 11;
+    int ny = 11;
+    int nz = 11;
+    int n = nx * ny * nz;
+    float hx = Lx / (nx - 1);
+    float hy = Ly / (ny - 1);
+    float hz = Lz / (nz - 1);
+
+    auto index = [nx, ny](int i, int j, int k) {
+      return i + j * nx + k * (nx * ny);
+    };
+
+    _boxes = Kokkos::View<ArborX::Box *, typename DeviceType::memory_space>(
+        Kokkos::view_alloc(Kokkos::WithoutInitializing, "boxes"), n);
+    auto boxes_host = Kokkos::create_mirror_view(_boxes);
+
+    for (int i = 0; i < nx; ++i)
+      for (int j = 0; j < ny; ++j)
+        for (int k = 0; k < nz; ++k)
+        {
+          ArborX::Point p_lower{
+              {(i - .25) * hx, (j - .25) * hy, (k - .25) * hz}};
+          ArborX::Point p_upper{
+              {(i + .25) * hx, (j + .25) * hy, (k + .25) * hz}};
+          boxes_host[index(i, j, k)] = {p_lower, p_upper};
+        }
+    Kokkos::deep_copy(execution_space, _boxes, boxes_host);
+  }
+
+  // Return the number of boxes.
+  KOKKOS_FUNCTION int size() const { return _boxes.size(); }
+
+  // Return the box with index i.
+  KOKKOS_FUNCTION const ArborX::Box &get_box(int i) const { return _boxes(i); }
+
+private:
+  Kokkos::View<ArborX::Box *, typename DeviceType::memory_space> _boxes;
+};
+
+// For creating the bounding volume hierarchy given a Boxes object, we
+// need to define the memory space, how to get the total number of objects,
+// and how to access a specific box. Since there are corresponding functions in
+// the Boxes class, we just resort to them.
+template <typename DeviceType>
+struct ArborX::AccessTraits<Boxes<DeviceType>, ArborX::PrimitivesTag>
+{
+  using memory_space = typename DeviceType::memory_space;
+  static KOKKOS_FUNCTION int size(Boxes<DeviceType> const &boxes)
+  {
+    return boxes.size();
+  }
+  static KOKKOS_FUNCTION auto get(Boxes<DeviceType> const &boxes, int i)
+  {
+    return boxes.get_box(i);
+  }
+};
+
+// For performing the queries given a Boxes object, we need to define memory
+// space, how to get the total number of queries, and what the query with index
+// i should look like. Since we are using self-intersection (which boxes
+// intersect with the given one), the functions here very much look like the
+// ones in ArborX::AccessTraits<Boxes<DeviceType>, ArborX::PrimitivesTag>.
+template <typename DeviceType>
+struct ArborX::AccessTraits<Boxes<DeviceType>, ArborX::PredicatesTag>
+{
+  using memory_space = typename DeviceType::memory_space;
+  static KOKKOS_FUNCTION int size(Boxes<DeviceType> const &boxes)
+  {
+    return boxes.size();
+  }
+  static KOKKOS_FUNCTION auto get(Boxes<DeviceType> const &boxes, int i)
+  {
+    return intersects(boxes.get_box(i));
+  }
+};
+
+// Now that we have encapsulated the objects and queries to be used within the
+// Boxes class, we can continue with performing the actual search.
+int main()
+{
+  Kokkos::initialize();
+  {
+    using ExecutionSpace = Kokkos::DefaultExecutionSpace;
+    using MemorySpace = typename ExecutionSpace::memory_space;
+    using DeviceType = Kokkos::Device<ExecutionSpace, MemorySpace>;
+    ExecutionSpace execution_space;
+
+    std::cout << "Create grid with bounding boxes" << '\n';
+    Boxes<DeviceType> boxes(execution_space);
+    std::cout << "Bounding boxes set up." << '\n';
+
+    std::cout << "Creating BVH tree." << '\n';
+    ArborX::BVH<MemorySpace> const tree(execution_space, boxes);
+    std::cout << "BVH tree set up." << '\n';
+
+    std::cout << "Starting the queries." << '\n';
+    // The query will resize indices and offsets accordingly
+    Kokkos::View<int *, MemorySpace> indices("indices", 0);
+    Kokkos::View<int *, MemorySpace> offsets("offsets", 0);
+
+    ArborX::query(tree, execution_space, boxes, indices, offsets);
+    std::cout << "Queries done." << '\n';
+
+    std::cout << "Starting checking results." << '\n';
+    auto offsets_host =
+        Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace{}, offsets);
+    auto indices_host =
+        Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace{}, indices);
+
+    unsigned int const n = boxes.size();
+    if (offsets_host.size() != n + 1)
+      Kokkos::abort("Wrong dimensions for the offsets View!\n");
+    for (int i = 0; i < static_cast<int>(n + 1); ++i)
+      if (offsets_host(i) != i)
+        Kokkos::abort("Wrong entry in the offsets View!\n");
+
+    if (indices_host.size() != n)
+      Kokkos::abort("Wrong dimensions for the indices View!\n");
+    for (int i = 0; i < static_cast<int>(n); ++i)
+      if (indices_host(i) != i)
+        Kokkos::abort("Wrong entry in the indices View!\n");
+    std::cout << "Checking results successful." << '\n';
+  }
+
+  Kokkos::finalize();
+}
diff --git a/arborx/examples/viz/CMakeLists.txt b/arborx/examples/viz/CMakeLists.txt
new file mode 100644
index 000000000..0c637903f
--- /dev/null
+++ b/arborx/examples/viz/CMakeLists.txt
@@ -0,0 +1,7 @@
+if(Kokkos_ENABLE_SERIAL)
+  add_executable(ArborX_TreeViz.exe tree_visualization.cpp)
+  target_link_libraries(ArborX_TreeViz.exe ArborX::ArborX Boost::program_options)
+  add_test(NAME ArborX_TreeViz_Example COMMAND ./ArborX_TreeViz.exe)
+  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/leaf_cloud.txt ${CMAKE_CURRENT_BINARY_DIR}/leaf_cloud.txt COPYONLY)
+  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/arborx_query_sort.py ${CMAKE_CURRENT_BINARY_DIR}/arborx_query_sort.py COPYONLY)
+ENDIF()
diff --git a/arborx/examples/viz/arborx_query_sort.py b/arborx/examples/viz/arborx_query_sort.py
new file mode 100755
index 000000000..5ab86b2ba
--- /dev/null
+++ b/arborx/examples/viz/arborx_query_sort.py
@@ -0,0 +1,121 @@
+#!/usr/bin/env python3
+"""arborx_query_sort.py
+
+Usage:
+  arborx_query_sort.py -a ALGO -p PREFIX [-d] [-o OUTPUT_FILE]
+  arborx_query_sort.py (-h | --help)
+
+Options:
+  -h --help                   Show this screen.
+  -a ALGO --algo=ALGO         Query order ['untouched', 'shuffled', 'sorted']
+  -d --display                Display mode
+  -o FILE --output-file=FILE  Output file [default: plot.png]
+  -p PREFIX --prefix=PREFIX   Input file prefix
+"""
+from docopt import docopt
+import subprocess
+import numpy
+import matplotlib.pyplot as plt
+from matplotlib.colors import ListedColormap
+
+
+def read_traversal(filename):
+    nearest_traversal = []
+    replace = {
+        '[internal]': '[style=filled, color=black]',
+        '[leaf]': '[style=filled, color=white]',
+        '[result]': '[style=filled, color=black]',
+    }
+    with open(filename) as fin:
+        def is_commented(line):
+            return line.lstrip(' ').startswith('//')
+
+        def is_edge(line):
+            return line.count('->') > 0
+
+        for line in fin:
+            for old, new in replace.items():
+                line = line.replace(old, new)
+            line = line.rstrip('\n')
+            if line and not is_commented(line) and not is_edge(line):
+                nearest_traversal.append(line)
+    return nearest_traversal
+
+
+def read_tree(filename):
+    tree = []
+    replace = {
+        '[internal]': '[style=filled, color=red]',
+        '[leaf]': '[style=filled, color=green]',
+        '[edge]': '',
+        '[pendant]': '',
+    }
+    with open(filename) as fin:
+        for line in fin:
+            line = line.rstrip('\n')
+            for old, new in replace.items():
+                line = line.replace(old, new)
+            tree.append(line)
+    tree.insert(0, 'digraph g {')
+    tree.insert(1, '    root = i0;')
+    tree.append('}')
+    return tree
+
+
+def append_traversal_to_tree(tree, traversal):
+    for line in traversal:
+        tree.insert(-1, line)
+    return tree
+
+
+if __name__ == '__main__':
+    # Process input
+    options = docopt(__doc__)
+
+    algo = options['--algo']
+    display = options['--display']
+    prefix = options['--prefix']
+    output_file = options['--output-file']
+
+    matrix = {}
+
+    n = int(subprocess.check_output('ls -1 ' + prefix + '*' + algo + '* '
+                                    '| wc -l', shell=True))
+    assert n > 0, 'Could not find any matching files'
+
+    matrix = numpy.zeros((n, n-1))
+    for i in range(n):
+        with open(prefix + '%s_%s_nearest_traversal.dot.m4'
+                  % (algo, i)) as fin:
+            def is_commented(line):
+                return line.lstrip(' ').startswith('//')
+
+            def is_edge(line):
+                return line.count('->') > 0
+
+            count = 0
+            for line in fin:
+                if line and not is_commented(line) and not is_edge(line):
+                    count += 1
+                    line = line.lstrip(' ')
+                    entry = int(line[1:line.find(' ')])
+                    if line[0] is 'i':
+                        matrix[i, entry] = 1
+                    elif line[0] is 'l':
+                        # Uncomment for full matrix with leaves
+                        # matrix[i, n-1 + entry] = 1
+                        continue
+                    else:
+                        raise RuntimeError()
+
+    cmap = ListedColormap(['w', 'r', 'k'])
+
+    plt.matshow(matrix, cmap=cmap)
+    plt.tight_layout()
+
+    if display:
+        plt.show()
+    else:
+        if output_file == "":
+            output_file = algo + '.png'
+        plt.savefig(output_file, bbox_inches='tight')
diff --git a/arborx/examples/viz/leaf_cloud.txt b/arborx/examples/viz/leaf_cloud.txt
new file mode 100644
index 000000000..d2e220d11
--- /dev/null
+++ b/arborx/examples/viz/leaf_cloud.txt
@@ -0,0 +1,59 @@
+58
+0.5 0.1 0
+0.5 0 0
+-0.2 0.4 0
+-0.3 0.4 0
+-0.5 0.6 0
+-0.4 0.6 0
+-0.9 0.8 0
+-2 0.8 0
+-2.4 1 0
+-2.3 1.2 0
+-1.9 1.3 0
+-1.1 1.3 0
+-1.1 1.6 0
+-1.9 1.6 0
+-2.4 1.6 0
+-2.6 1.8 0
+-2.4 2 0
+-2.7 2.3 0
+-2.6 2.5 0
+-1.7 2.3 0
+-1.6 2.5 0
+-1.7 2.7 0
+-2.6 3 0
+-2.5 3.3 0
+-2.1 3.2 0
+-2 3.3 0
+-2.2 3.6 0
+-1.9 3.8 0
+-1.4 3.4 0
+-1.1 3.7 0
+-0.95 3.7 0
+-1 2.9 0
+-0.9 2.7 0
+-0.5 3.3 0
+-0.3 3.5 0
+-0.1 3.4 0
+-0.15 3.2 0
+0.05 3.1 0
+0.2 3.15 0
+0.35 3.1 0
+0.15 2.9 0
+-0.1 2.7 0
+-0.2 2.5 0
+-0.25 2.2 0
+0.25 2.5 0
+0.45 2.5 0
+0.5 2.3 0
+0.1 2 0
+0.2 1.7 0
+0.8 2 0
+1.1 1.9 0
+1.1 1.5 0
+0.1 1.2 0
+-0.5 1 0
+-2.2 1.7 0
+-2.3 2.2 0
+-0.5 2.2 0
+-0 1.7 0
diff --git a/arborx/examples/viz/requirements.txt b/arborx/examples/viz/requirements.txt
new file mode 100644
index 000000000..c45223e74
--- /dev/null
+++ b/arborx/examples/viz/requirements.txt
@@ -0,0 +1,3 @@
+docopt
+matplotlib
+numpy
diff --git a/arborx/examples/viz/tree_visualization.cpp b/arborx/examples/viz/tree_visualization.cpp
new file mode 100644
index 000000000..6f5ca14d5
--- /dev/null
+++ b/arborx/examples/viz/tree_visualization.cpp
@@ -0,0 +1,182 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#include <ArborX_DetailsKokkosExtAccessibilityTraits.hpp>
+#include <ArborX_DetailsTreeVisualization.hpp>
+#include <ArborX_LinearBVH.hpp>
+
+#include <Kokkos_Core.hpp>
+
+#include <boost/program_options.hpp>
+
+#include <algorithm>
+#include <fstream>
+#include <random>
+
+// FIXME: this is a temporary place for loadPointCloud and writePointCloud
+// Right now, only loadPointCloud is being used, and only in this example
+template <typename DeviceType>
+void loadPointCloud(std::string const &filename,
+                    Kokkos::View<ArborX::Point *, DeviceType> &random_points)
+{
+  std::ifstream file(filename);
+  if (file.is_open())
+  {
+    int size = -1;
+    file >> size;
+    ARBORX_ASSERT(size > 0);
+    Kokkos::realloc(random_points, size);
+    auto random_points_host = Kokkos::create_mirror_view(random_points);
+    for (int i = 0; i < size; ++i)
+      for (int j = 0; j < 3; ++j)
+        file >> random_points(i)[j];
+    Kokkos::deep_copy(random_points, random_points_host);
+  }
+  else
+  {
+    throw std::runtime_error("Cannot open file");
+  }
+}
+
+template <typename Layout, typename DeviceType>
+void writePointCloud(
+    Kokkos::View<ArborX::Point *, Layout, DeviceType> random_points,
+    std::string const &filename)
+
+{
+  static_assert(
+      KokkosExt::is_accessible_from_host<decltype(random_points)>::value,
+      "The View should be accessible on the Host");
+  std::ofstream file(filename);
+  if (file.is_open())
+  {
+    unsigned int const n = random_points.extent(0);
+    for (unsigned int i = 0; i < n; ++i)
+      file << random_points(i)[0] << " " << random_points(i)[1] << " "
+           << random_points(i)[2] << "\n";
+    file.close();
+  }
+}
+
+template <typename View>
+void printPointCloud(View points, std::ostream &os)
+{
+  auto const n = points.extent_int(0);
+  for (int i = 0; i < n; ++i)
+    os << "\\node[leaf] at (" << points(i)[0] << "," << points(i)[1]
+       << ") {\\textbullet};\n";
+}
+
+void viz(std::string const &prefix, std::string const &infile, int n_neighbors)
+{
+  using ExecutionSpace = Kokkos::DefaultHostExecutionSpace;
+  using DeviceType = ExecutionSpace::device_type;
+  Kokkos::View<ArborX::Point *, DeviceType> points("points", 0);
+  loadPointCloud(infile, points);
+
+  ArborX::BVH<Kokkos::HostSpace> bvh{ExecutionSpace{}, points};
+
+  using TreeVisualization =
+      typename ArborX::Details::TreeVisualization<DeviceType>;
+  using TikZVisitor = typename TreeVisualization::TikZVisitor;
+  using GraphvizVisitor = typename TreeVisualization::GraphvizVisitor;
+
+  int const n_queries = bvh.size();
+  if (n_neighbors < 0)
+    n_neighbors = bvh.size();
+  Kokkos::View<ArborX::Nearest<ArborX::Point> *, DeviceType> queries("queries",
+                                                                     n_queries);
+  Kokkos::parallel_for(Kokkos::RangePolicy<ExecutionSpace>(0, n_queries),
+                       KOKKOS_LAMBDA(int i) {
+                         queries(i) = ArborX::nearest(points(i), n_neighbors);
+                       });
+
+  auto performQueries = [&bvh, &queries](std::string const &p,
+                                         std::string const &s) {
+    std::ofstream fout;
+    for (int i = 0; i < queries.extent_int(0); ++i)
+    {
+      std::string const fname = p + std::to_string(i) + s;
+      fout.open(fname, std::fstream::out);
+      TreeVisualization::visit(bvh, queries(i), GraphvizVisitor{fout});
+      fout.close();
+    }
+  };
+
+  std::fstream fout;
+
+  // Print the point cloud
+  fout.open(prefix + "points.tex", std::fstream::out);
+  printPointCloud(points, fout);
+  fout.close();
+
+  // Print the bounding volume hierarchy
+  fout.open(prefix + "bounding_volumes.tex", std::fstream::out);
+  TreeVisualization::visitAllIterative(bvh, TikZVisitor{fout});
+  fout.close();
+
+  // Print the entire tree
+  fout.open(prefix + "tree_all_nodes_and_edges.dot.m4", std::fstream::out);
+  TreeVisualization::visitAllIterative(bvh, GraphvizVisitor{fout});
+  fout.close();
+
+  std::string const suffix = "_nearest_traversal.dot.m4";
+  performQueries(prefix + "untouched_", suffix);
+
+  // Shuffle the queries
+  std::random_device rd;
+  std::mt19937 g(rd());
+  std::shuffle(queries.data(), queries.data() + queries.size(), g);
+  performQueries(prefix + "shuffled_", suffix);
+
+  // Sort them
+  auto permute =
+      ArborX::Details::BatchedQueries<DeviceType>::sortQueriesAlongZOrderCurve(
+          ExecutionSpace{}, bvh.bounds(), queries);
+  queries = ArborX::Details::BatchedQueries<DeviceType>::applyPermutation(
+      ExecutionSpace{}, permute, queries);
+  performQueries(prefix + "sorted_", suffix);
+}
+
+int main(int argc, char *argv[])
+{
+  Kokkos::InitArguments args;
+  args.disable_warnings = true;
+  Kokkos::ScopeGuard guard(args);
+
+  std::string prefix;
+  std::string infile;
+  int n_neighbors;
+  boost::program_options::options_description desc("Allowed options");
+  // clang-format off
+    desc.add_options()
+        ( "help", "produce help message" )
+        ( "prefix", boost::program_options::value<std::string> (&prefix)->default_value("viz_"), "set prefix for output files" )
+        ( "infile", boost::program_options::value<std::string> (&infile)->default_value("leaf_cloud.txt"), "set input point cloud file" )
+        ( "neighbors", boost::program_options::value<int> (&n_neighbors)->default_value(5), "set the number of neighbors to search for (negative value means all)" )
+    ;
+  // clang-format on
+
+  boost::program_options::variables_map vm;
+  boost::program_options::store(
+      boost::program_options::parse_command_line(argc, argv, desc), vm);
+  boost::program_options::notify(vm);
+
+  if (vm.count("help") > 0)
+  {
+    std::cout << desc << "\n";
+    return 1;
+  }
+
+  viz(prefix, infile, n_neighbors);
+
+  return 0;
+}
diff --git a/arborx/scripts/benchmark.py b/arborx/scripts/benchmark.py
new file mode 100644
index 000000000..3c4dfc619
--- /dev/null
+++ b/arborx/scripts/benchmark.py
@@ -0,0 +1,101 @@
+#!/usr/bin/env python
+
+import json
+import re
+
+def load_json(filename):
+    with open(filename) as f:
+        try:
+            # Try loading a file using JSON reader
+            data = json.loads(f.read())['benchmarks']
+        except ValueError:
+            # Try loading a file using ASCII reader
+            data = []
+            f.seek(0)   # reset the file as it was messed up above
+            try:
+                for line in f:
+                    # Try to parse only the lines starting with "BM_"
+                    if re.search('^BM_', line) != None:
+                        for timer in ['manual_time', 'manual_time_mean', 'manual_time_median', 'manual_time_stddev']:
+                            m = re.search('(^.*/' + timer + ') .*rate=([0-9.]*)(.*)$', line)
+                            if m != None:
+                                name = m.group(1)
+                                rate = float(m.group(2))
+                                rate_scale = m.group(3)
+                                if rate_scale == 'k/s':
+                                    rate = rate * 1000
+                                elif rate_scale == 'M/s':
+                                    rate = rate * 1000000
+                                else:
+                                    raise Exception('Unknown rate scaling: "' + rate_scale + '"')
+                                data.append({'name' : name, 'rate' : rate})
+                                break
+
+            except RuntimeError as e:
+                raise RuntimeError("Caught an error while parsing on line " + str(lineno) + ": " + e.args[0])
+
+    return data
+
+allowed_geometries = ['filled_box', 'hollow_box']
+allowed_algorithms = ['construction', 'radius_search', 'radius_callback_search', 'knn_search', 'knn_callback_search']
+
+# Geometry is only checked for the source cloud
+# We do not check target cloud geometry as they come in pairs:
+#   filled_box/filled_sphere or hollow_box/hollow_sphere
+def parse_benchmark(json_data, algorithm, implementation, timer_aggregate, geometry, num_radius_passes = 2):
+    if geometry not in allowed_geometries:
+        raise Exception('Unknown geometry: "' + geometry + '"')
+    if algorithm not in allowed_algorithms:
+        raise Exception('Unknown algorithm: "' + algorithm + '"')
+
+    geometries = { 'filled_box' : '0', 'hollow_box' : '1', 'filled_sphere' : '2', 'hollow_sphere' : '3' }
+
+    # Escape () in implementation string
+    implementation = implementation.translate(str.maketrans({"(" : "\(", ")" : "\)", "%" : "\%" }))
+
+    sorted = 1
+
+    # Templates:
+    # BM_construction<ArborX::BVH<_DeviceType_>>/_num_primitives_/_source_point_cloud_type_
+    construction_template = algorithm + '<.*' + implementation + '[^/]*/([^/]*)/' + geometries[geometry] + '/'
+    # BM_knn_search<ArborX::BVH<_DeviceType_>>/_num_primitives_/_num_predicates_/_n_neighbors_/_sort_predicate_/_source_point_cloud_type_/_target_point_cloud_type_
+    knn_template = algorithm + '<.*' + implementation + '[^/]*/([^/]*)/([^/]*)/[^/]*/' + str(sorted) + '/' + geometries[geometry] + '/'
+    # BM_knn_search<ArborX::BVH<_DeviceType_>>/_num_primitives_/_num_predicates_/_n_neighbors_/_sort_predicates_/_buffer_size_/_source_point_cloud_type_/_target_point_cloud_type_
+    # we consider (2P) to be represented by buffer_size = 0
+    radius_template_1P = algorithm + '<.*' + implementation + '[^/]*/([^/]*)/([^/]*)/[^/]*/' + str(sorted) + '/[^0][^/]+/' + geometries[geometry] + '/'
+    radius_template_2P = algorithm + '<.*' + implementation + '[^/]*/([^/]*)/([^/]*)/[^/]*/' + str(sorted) + '/0/' + geometries[geometry] + '/'
+
+    num_primitives = []
+    num_predicates = []
+    rates    = []
+
+    for benchmark in json_data:
+        name = benchmark['name']
+
+        # For Google Benchmark v1.5, one could do
+        #  if benchmark['run_type'] != 'aggregate' or benchmark['aggregate_name'] != timer_aggregate:
+            #  continue
+        if re.search(timer_aggregate, name) == None:
+            continue
+
+        if algorithm == 'construction' and re.search(algorithm, name) != None:
+            m = re.search(construction_template, name)
+            if m != None:
+                num_primitives.append(int(m.group(1)))
+                rates.append(benchmark['rate'])
+
+        elif (algorithm == 'knn_search' or algorithm == 'knn_callback_search') and re.search(algorithm, name) != None:
+            m = re.search(knn_template, name)
+            if m != None:
+                num_primitives.append(int(m.group(1)))
+                num_predicates.append(int(m.group(2)))
+                rates.append(benchmark['rate'])
+
+        elif (algorithm == 'radius_search' or algorithm == 'radius_callback_search') and re.search(algorithm, name) != None:
+            m = re.search(radius_template_2P if num_radius_passes == 2 else radius_template_1P, name)
+            if m != None:
+                num_primitives.append(int(m.group(1)))
+                num_predicates.append(int(m.group(2)))
+                rates.append(benchmark['rate'])
+
+    return num_primitives, num_predicates, rates
diff --git a/arborx/scripts/benchmark_plot.py b/arborx/scripts/benchmark_plot.py
new file mode 100755
index 000000000..3f3dd2140
--- /dev/null
+++ b/arborx/scripts/benchmark_plot.py
@@ -0,0 +1,199 @@
+#!/usr/bin/env python3
+"""benchmark_plot.py
+
+Usage:
+  benchmark_plot.py -a ALGORITHM [-b BACKENDS...] -g GEOMETRY -i INPUT... [-n] [-e] [-t TITLE] [-o OUTPUT_FILE]
+  benchmark_plot.py (-h | --help)
+
+Options:
+  -h --help                         Show this screen.
+  -a ALGORITHM --algo ALGORITHM     Algorithm ['construction', 'radius_search', 'radius_callback_search', 'knn_search', 'knn_callback_search']
+  -b BACKENDS --backends BACKENDS   Backends to parse [default: all]
+  -g GEOMETRY --geometry GEOMETRY   Geometry (source cloud) ['filled_box', 'hollow_box']
+  -i FILE --input-files=FILE        Input file(s) containing benchmark results in JSON format
+  -n --numbers                      Plot numbers [default: False]
+  -e --errors                       Plot error bars [default: False]
+  -o FILE --output-file=FILE        Output file
+  -t TITLE --title=TITLE            Plot title
+"""
+import matplotlib.pyplot as plt
+import numpy as np
+import math
+import re
+from docopt import docopt
+
+from benchmark import load_json, parse_benchmark, allowed_algorithms, allowed_geometries
+
+def find_available_backends(input_jsons):
+    arborx_backend_regex = "[^<]*<ArborX::BVH<([^>]*)>.*"
+
+    backends = set()
+    for input_json in input_jsons:
+        for benchmark in input_json:
+            search_result = re.search(arborx_backend_regex, benchmark['name'])
+            if search_result != None:
+                backends.add(search_result.group(1))
+    backends = list(backends)
+    backends.sort()
+
+    return backends
+
+class NotMatchingValuesAndPredicatesSizesException(Exception):
+    def __init__(self, message, i, backend):
+        super().__init__(message)
+        self.i = i
+        self.backend = backend
+
+def populate_data(input_jsons, backends):
+    all_num_primitives  = []
+    all_rates = []
+    all_errors = []
+
+    for i in range(len(backends)):
+        # For every backend, find all (num_primitives, rate, error) in all input files
+        backend = backends[i]
+
+        backend_num_primitives = []
+        backend_rates = []
+        backend_errors = []
+
+        implementation = 'ArborX::BVH<' + backend + '>'
+        for i in range(len(input_jsons)):
+            file_num_primitives, file_num_predicates, file_rates  = parse_benchmark(input_jsons[i], algorithm, implementation, 'median', geometry)
+            _,                   _,                   file_errors = parse_benchmark(input_jsons[i], algorithm, implementation, 'stddev', geometry)
+            if algorithm != 'construction' and file_num_primitives != file_num_predicates:
+                raise NotMatchingValuesAndPredicatesSizesException("", i, backend)
+
+            backend_num_primitives = backend_num_primitives +  file_num_primitives
+            backend_rates = backend_rates + file_rates
+            backend_errors = backend_errors + file_errors
+
+        all_num_primitives.append(backend_num_primitives)
+        all_rates.append(backend_rates)
+        all_errors.append(backend_errors)
+
+    num_unique_primitives = []
+    for i in range(len(all_num_primitives)):
+        num_unique_primitives = num_unique_primitives + all_num_primitives[i]
+    num_unique_primitives = list(set(num_unique_primitives))
+    num_unique_primitives.sort()
+
+    return num_unique_primitives, all_num_primitives, all_rates, all_errors,
+
+def backends_comparison_rate_figure(input_files, algorithm, geometry, backends, plot_numbers = False, plot_errors = True):
+    # Read in files to produce JSON
+    input_jsons = []
+    for input_file in input_files:
+        input_jsons.append(load_json(input_file))
+
+    # Phase 0: parse backends
+    backends = backends
+    if backends[0] == "all":
+        # Figure out a list of available backends by populating a set by
+        # searching a regular expression in all input files
+        backends = find_available_backends(input_jsons)
+
+    # Phase 1: data setup
+    try:
+        num_unique_primitives, all_num_primitives, all_rates, all_errors = populate_data(input_jsons, backends)
+    except NotMatchingValuesAndPredicatesSizesException as e:
+        raise Exception('The number of predicates does not match the number of primitives for "' + e.backend + '" in "' +  input_files[e.i] + "'")
+    n_unique = len(num_unique_primitives)
+
+    # If the same data point (algorithm, backend, num_sources) is present in
+    # multiple files, choose only the last one for plotting
+    y_scaling = 10**6
+    rates = np.zeros([len(backends), n_unique])
+    errors = np.zeros([len(backends), 2, n_unique])
+    for i in range(0, len(backends)):
+        for j in range(0, len(all_num_primitives[i])):
+            index = num_unique_primitives.index(all_num_primitives[i][j])
+            rates[i, index] = all_rates[i][j]/y_scaling
+            errors[i, 0, index] = 1 - all_errors[i][j]/all_rates[i][j]
+            errors[i, 1, index] = 1 + all_errors[i][j]/all_rates[i][j]
+
+    # Phase 2: plot generation
+    plt.figure(figsize=(max(n_unique, 6), 5))
+
+    ax = plt.subplot(111)
+    patterns = ('/', 'x', '\\', '.', 'o', 'O')
+
+    def autolabel(rects):
+        """Attach a text label above each bar in *rects*, displaying its height."""
+        for rect in rects:
+            height = round(rect.get_height(),1)
+            ax.annotate('{}'.format(height),
+                        xy=(rect.get_x() + rect.get_width() / 2, rect.get_height()),
+                        xytext=(0, 3),  # 3 points vertical offset
+                        textcoords="offset points",
+                        ha='center', va='bottom',
+                        fontsize=18)
+
+    # Create TeX-style label
+    def primitive_label(n):
+        e = math.floor(math.log(n + 1, 10))
+        r = math.floor(n/10**e)
+        return (str(r) + '$\cdot $' if r > 1 else '') +  '$10^' + str(e) + '$'
+
+    width = 0.6
+    scale = 1/len(backends)
+    for i in range(0, len(backends)):
+        barplot = ax.bar(np.arange(n_unique) + scale*(i-.5*(len(backends)-1)) * width,
+                         width=scale*width*np.ones(n_unique), height=rates[i, :],
+                         yerr=(errors[i, :] if plot_errors == True else None),
+                         capsize=5, hatch=patterns[i % len(patterns)],
+                         edgecolor='k',
+                         error_kw=dict(ecolor='gray', lw=2, capsize=5, capthick=2),
+                         label=backends[i])
+
+        if plot_numbers:
+            autolabel(barplot)
+
+    ax.legend(loc='upper left', fontsize=20)
+
+    ax.set_xlabel('Number of indexed objects', fontsize=20)
+    plt.xticks(fontsize=18)
+    ax.set_xticks(np.arange(n_unique))
+    ax.set_xticklabels([primitive_label(size) for size in num_unique_primitives])
+    ax.tick_params(axis='x', which='major', bottom='off', top='off')
+    ax.set_xlim([-0.5, n_unique - 0.5])
+
+    ax.set_ylabel('Rate (million queries/second)', fontsize=20)
+    plt.yticks(fontsize=18)
+    ax.yaxis.grid('on')
+    ax.set_ylim([0, 1.1*ax.get_ylim()[1]])
+
+if __name__ == '__main__':
+
+    # Process input
+    options = docopt(__doc__)
+
+    algorithm = options['--algo']
+    backends = options['--backends']
+    geometry = options['--geometry']
+    input_files = options['--input-files']
+    output_file = options['--output-file']
+    plot_numbers = options['--numbers']
+    plot_errors = options['--errors']
+    plot_title = options['--title']
+
+    # Check input
+    if geometry not in allowed_geometries:
+        raise Exception('Unknown geometry: "' + geometry + '". Allowed values are ' + str(allowed_geometries))
+
+    if algorithm not in allowed_algorithms:
+        raise Exception('Unknown algorithm: "' + algorithm + '". Allowed values are ' + str(allowed_algorithms))
+
+    backends_comparison_rate_figure(input_files, algorithm=algorithm, geometry=geometry,
+        backends=backends, plot_numbers=plot_numbers, plot_errors=plot_errors)
+
+    if plot_title != None:
+        plt.title(plot_title, fontsize=18)
+    else:
+        plt.title(algorithm, fontsize=18)
+
+    plt.tight_layout()
+    if output_file:
+        plt.savefig(output_file, bbox_inches='tight', dpi=600)
+    else:
+        plt.show()
diff --git a/arborx/scripts/check_format_cpp.sh b/arborx/scripts/check_format_cpp.sh
new file mode 100755
index 000000000..f96e8027d
--- /dev/null
+++ b/arborx/scripts/check_format_cpp.sh
@@ -0,0 +1,75 @@
+#!/usr/bin/env bash
+
+clang_format_executable=${CLANG_FORMAT_EXE:-clang-format}
+
+this_program=$(basename "$0")
+usage="Usage:
+  $this_program [options] -- check format of the C++ source files
+
+Options:
+    -h --help         Print help and exit
+    -q --quiet        Quiet mode (do not print the diff)
+    -p --apply-patch  Apply diff patch to the source files"
+
+verbose=1
+apply_patch=0
+
+#echo "Arguments: $# $@"
+
+while [ $# -gt 0 ]
+do
+  case $1 in
+  -p|--apply-patch)
+      apply_patch=1
+      ;;
+  -q|--quiet)
+      verbose=0
+      ;;
+  -h|--help)
+      echo "$usage"
+      exit 0
+      ;;
+  *)
+      echo "$this_program: Unknown argument '$1'. See '$this_program --help'."
+      exit -1
+      ;;
+  esac
+
+  shift
+done
+
+# stop right here if clang-format does not exist in $PATH
+command -v $clang_format_executable >/dev/null 2>&1 || { echo >&2 "clang-format executable '$clang_format_executable' not found.  Aborting."; exit 1; }
+
+# shamelessy redirecting everything to /dev/null in quiet mode
+if [ $verbose -eq 0 ]; then
+    exec &>/dev/null
+fi
+
+cpp_source_files=$(git ls-files | grep -E "\.hpp$|\.cpp$|\.h$|\.c$" | grep -v -f .clang-format-ignore)
+
+unformatted_files=()
+for file in $cpp_source_files; do
+    diff -u \
+        <(cat $file) \
+        --label a/$file \
+        <($clang_format_executable $file) \
+        --label b/$file >&1
+    if [ $? -eq 1 ]; then
+        unformatted_files+=($file)
+    fi
+done
+
+n_unformatted_files=${#unformatted_files[@]}
+if [ $n_unformatted_files -ne 0 ]; then
+    echo "${#unformatted_files[@]} file(s) not formatted properly:"
+    for file in ${unformatted_files[@]}; do
+        echo "    $file"
+        if [ $apply_patch -eq 1 ]; then
+            $clang_format_executable -i $file
+        fi
+    done
+else
+    echo "OK"
+fi
+exit $n_unformatted_files
diff --git a/arborx/scripts/docker_cmake b/arborx/scripts/docker_cmake
new file mode 100644
index 000000000..2c1c27604
--- /dev/null
+++ b/arborx/scripts/docker_cmake
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+EXTRA_ARGS=("$@")
+
+rm -f  CMakeCache.txt
+rm -rf CMakeFiles/
+
+ARGS=(
+    -D CMAKE_BUILD_TYPE=Debug
+    -D BUILD_SHARED_LIBS=ON
+
+    ### TPLs
+    -D CMAKE_PREFIX_PATH="$KOKKOS_DIR;$BENCHMARK_DIR;$BOOST_DIR"
+    -D ARBORX_ENABLE_MPI=ON
+
+    ### COMPILERS AND FLAGS ###
+    -D CMAKE_CXX_COMPILER_LAUNCHER=ccache
+    -D CMAKE_CXX_COMPILER="$KOKKOS_DIR/bin/nvcc_wrapper"
+    -D CMAKE_CXX_FLAGS="-Wall -Wextra -Wpedantic"
+
+    ### MISC ###
+    -D MPIEXEC_PREFLAGS="--allow-run-as-root"
+)
+
+cmake "${ARGS[@]}" "${EXTRA_ARGS[@]}" "${ARBORX_DIR}"
diff --git a/arborx/scripts/requirements.txt b/arborx/scripts/requirements.txt
new file mode 100644
index 000000000..c45223e74
--- /dev/null
+++ b/arborx/scripts/requirements.txt
@@ -0,0 +1,3 @@
+docopt
+matplotlib
+numpy
diff --git a/arborx/src/ArborX.hpp b/arborx/src/ArborX.hpp
new file mode 100644
index 000000000..05e7b22ba
--- /dev/null
+++ b/arborx/src/ArborX.hpp
@@ -0,0 +1,28 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#ifndef ARBORX_HPP
+#define ARBORX_HPP
+
+#include <ArborX_Config.hpp>
+
+#include <ArborX_Box.hpp>
+#ifdef ARBORX_ENABLE_MPI
+#include <ArborX_DistributedTree.hpp>
+#endif
+#include <ArborX_CrsGraphWrapper.hpp>
+#include <ArborX_Exception.hpp>
+#include <ArborX_LinearBVH.hpp>
+#include <ArborX_Point.hpp>
+#include <ArborX_Predicates.hpp>
+#include <ArborX_Sphere.hpp>
+
+#endif
diff --git a/arborx/src/ArborX_BruteForce.hpp b/arborx/src/ArborX_BruteForce.hpp
new file mode 100644
index 000000000..5d595c4d2
--- /dev/null
+++ b/arborx/src/ArborX_BruteForce.hpp
@@ -0,0 +1,125 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#ifndef ARBORX_BRUTE_FORCE_HPP
+#define ARBORX_BRUTE_FORCE_HPP
+
+#include <ArborX_AccessTraits.hpp>
+#include <ArborX_Box.hpp>
+#include <ArborX_CrsGraphWrapper.hpp>
+#include <ArborX_DetailsBruteForceImpl.hpp>
+#include <ArborX_DetailsKokkosExtAccessibilityTraits.hpp>
+
+#include <Kokkos_Core.hpp>
+
+namespace ArborX
+{
+
+template <typename MemorySpace>
+class BruteForce
+{
+public:
+  using memory_space = MemorySpace;
+  static_assert(Kokkos::is_memory_space<MemorySpace>::value, "");
+  using size_type = typename MemorySpace::size_type;
+  using bounding_volume_type = Box;
+
+  BruteForce() = default;
+
+  template <typename ExecutionSpace, typename Primitives>
+  BruteForce(ExecutionSpace const &space, Primitives const &primitives);
+
+  KOKKOS_FUNCTION
+  size_type size() const noexcept { return _size; }
+
+  KOKKOS_FUNCTION
+  bool empty() const noexcept { return size() == 0; }
+
+  KOKKOS_FUNCTION
+  bounding_volume_type bounds() const noexcept { return _bounds; }
+
+  template <typename ExecutionSpace, typename Predicates, typename Callback,
+            typename Ignore = int>
+  void query(ExecutionSpace const &space, Predicates const &predicates,
+             Callback const &callback, Ignore = Ignore()) const;
+
+  template <typename ExecutionSpace, typename Predicates,
+            typename CallbackOrView, typename View, typename... Args>
+  std::enable_if_t<Kokkos::is_view<std::decay_t<View>>{}>
+  query(ExecutionSpace const &space, Predicates const &predicates,
+        CallbackOrView &&callback_or_view, View &&view, Args &&... args) const
+  {
+    ArborX::query(*this, space, predicates,
+                  std::forward<CallbackOrView>(callback_or_view),
+                  std::forward<View>(view), std::forward<Args>(args)...);
+  }
+
+private:
+  size_type _size;
+  bounding_volume_type _bounds;
+  Kokkos::View<bounding_volume_type *, memory_space> _bounding_volumes;
+};
+
+template <typename MemorySpace>
+template <typename ExecutionSpace, typename Primitives>
+BruteForce<MemorySpace>::BruteForce(ExecutionSpace const &space,
+                                    Primitives const &primitives)
+    : _size(AccessTraits<Primitives, PrimitivesTag>::size(primitives))
+    , _bounding_volumes(
+          Kokkos::view_alloc(Kokkos::WithoutInitializing,
+                             "ArborX::BruteForce::bounding_volumes"),
+          _size)
+{
+  static_assert(
+      KokkosExt::is_accessible_from<MemorySpace, ExecutionSpace>::value, "");
+  Details::check_valid_access_traits(PrimitivesTag{}, primitives);
+  using Access = AccessTraits<Primitives, PrimitivesTag>;
+  static_assert(KokkosExt::is_accessible_from<typename Access::memory_space,
+                                              ExecutionSpace>::value,
+                "Primitives must be accessible from the execution space");
+
+  Kokkos::Profiling::pushRegion("ArborX::BruteForce::BruteForce");
+
+  Details::BruteForceImpl::initializeBoundingVolumesAndReduceBoundsOfTheScene(
+      space, primitives, _bounding_volumes, _bounds);
+
+  Kokkos::Profiling::popRegion();
+}
+
+template <typename MemorySpace>
+template <typename ExecutionSpace, typename Predicates, typename Callback,
+          typename Ignore>
+void BruteForce<MemorySpace>::query(ExecutionSpace const &space,
+                                    Predicates const &predicates,
+                                    Callback const &callback, Ignore) const
+{
+  static_assert(
+      KokkosExt::is_accessible_from<MemorySpace, ExecutionSpace>::value, "");
+  Details::check_valid_access_traits(PredicatesTag{}, predicates);
+  using Access = AccessTraits<Predicates, PredicatesTag>;
+  static_assert(KokkosExt::is_accessible_from<typename Access::memory_space,
+                                              ExecutionSpace>::value,
+                "Predicates must be accessible from the execution space");
+  using Tag = typename Details::AccessTraitsHelper<Access>::tag;
+  static_assert(std::is_same<Tag, Details::SpatialPredicateTag>{},
+                "nearest query not implemented yet");
+
+  Kokkos::Profiling::pushRegion("ArborX::BruteForce::query::spatial");
+
+  Details::BruteForceImpl::query(space, _bounding_volumes, predicates,
+                                 callback);
+
+  Kokkos::Profiling::popRegion();
+}
+
+} // namespace ArborX
+
+#endif
diff --git a/arborx/src/ArborX_Config.hpp.in b/arborx/src/ArborX_Config.hpp.in
new file mode 100644
index 000000000..bdb1c0d79
--- /dev/null
+++ b/arborx/src/ArborX_Config.hpp.in
@@ -0,0 +1,20 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#ifndef ARBORX_CONFIG_HPP
+#define ARBORX_CONFIG_HPP
+
+#cmakedefine ARBORX_ENABLE_ROCTHRUST
+#cmakedefine ARBORX_ENABLE_ONEDPL
+#cmakedefine ARBORX_ENABLE_MPI
+#cmakedefine ARBORX_USE_CUDA_AWARE_MPI
+
+#endif
diff --git a/arborx/src/ArborX_CrsGraphWrapper.hpp b/arborx/src/ArborX_CrsGraphWrapper.hpp
new file mode 100644
index 000000000..b3dac1428
--- /dev/null
+++ b/arborx/src/ArborX_CrsGraphWrapper.hpp
@@ -0,0 +1,46 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#ifndef ARBORX_CRS_GRAPH_WRAPPER_HPP
+#define ARBORX_CRS_GRAPH_WRAPPER_HPP
+
+#include "ArborX_DetailsCrsGraphWrapperImpl.hpp"
+
+namespace ArborX
+{
+
+template <typename Tree, typename ExecutionSpace, typename Predicates,
+          typename CallbackOrView, typename View, typename... Args>
+inline void query(Tree const &tree, ExecutionSpace const &space,
+                  Predicates const &predicates,
+                  CallbackOrView &&callback_or_view, View &&view,
+                  Args &&... args)
+{
+  Kokkos::Profiling::pushRegion("ArborX::query");
+
+  Details::CrsGraphWrapperImpl::
+      check_valid_callback_if_first_argument_is_not_a_view(callback_or_view,
+                                                           predicates, view);
+
+  using Access = AccessTraits<Predicates, Traits::PredicatesTag>;
+  using Tag = typename Details::AccessTraitsHelper<Access>::tag;
+
+  ArborX::Details::CrsGraphWrapperImpl::queryDispatch(
+      Tag{}, tree, space, predicates,
+      std::forward<CallbackOrView>(callback_or_view), std::forward<View>(view),
+      std::forward<Args>(args)...);
+
+  Kokkos::Profiling::popRegion();
+}
+
+} // namespace ArborX
+
+#endif
diff --git a/arborx/src/ArborX_DBSCAN.hpp b/arborx/src/ArborX_DBSCAN.hpp
new file mode 100644
index 000000000..31a4269cd
--- /dev/null
+++ b/arborx/src/ArborX_DBSCAN.hpp
@@ -0,0 +1,502 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#ifndef ARBORX_DBSCAN_HPP
+#define ARBORX_DBSCAN_HPP
+
+#include <ArborX_AccessTraits.hpp>
+#include <ArborX_DetailsFDBSCAN.hpp>
+#include <ArborX_DetailsFDBSCANDenseBox.hpp>
+#include <ArborX_DetailsSortUtils.hpp>
+#include <ArborX_LinearBVH.hpp>
+
+#include <map>
+
+namespace ArborX
+{
+
+namespace Details
+{
+
+// All points are marked as if they were core points minpts = 2 case.
+// Obviously, this is not true. However, in the algorithms it is used only for
+// pairs of points within the distance eps, in which case it is correct.
+struct CCSCorePoints
+{
+  KOKKOS_FUNCTION bool operator()(int) const { return true; }
+};
+
+template <typename MemorySpace>
+struct DBSCANCorePoints
+{
+  Kokkos::View<int *, MemorySpace> _num_neigh;
+  int _core_min_size;
+
+  KOKKOS_FUNCTION bool operator()(int const i) const
+  {
+    return _num_neigh(i) >= _core_min_size;
+  }
+};
+
+template <typename Primitives>
+struct PrimitivesWithRadius
+{
+  Primitives _primitives;
+  double _r;
+};
+
+template <typename Primitives, typename PermuteFilter>
+struct PrimitivesWithRadiusReorderedAndFiltered
+{
+  Primitives _primitives;
+  double _r;
+  PermuteFilter _filter;
+};
+
+// Mixed primitives consist of a set of boxes corresponding to dense cells,
+// followed by boxes corresponding to points in non-dense cells.
+template <typename PointPrimitives, typename DenseCellOffsets,
+          typename CellIndices, typename Permutation>
+struct MixedBoxPrimitives
+{
+  PointPrimitives _point_primitives;
+  Details::CartesianGrid _grid;
+  DenseCellOffsets _dense_cell_offsets;
+  int _num_points_in_dense_cells; // to avoid lastElement() in AccessTraits
+  CellIndices _sorted_cell_indices;
+  Permutation _permute;
+};
+
+} // namespace Details
+
+template <typename Primitives>
+struct AccessTraits<Details::PrimitivesWithRadius<Primitives>, PredicatesTag>
+{
+  using PrimitivesAccess = AccessTraits<Primitives, PrimitivesTag>;
+
+  using memory_space = typename PrimitivesAccess::memory_space;
+  using Predicates = Details::PrimitivesWithRadius<Primitives>;
+
+  static size_t size(Predicates const &w)
+  {
+    return PrimitivesAccess::size(w._primitives);
+  }
+  static KOKKOS_FUNCTION auto get(Predicates const &w, size_t i)
+  {
+    return attach(
+        intersects(Sphere{PrimitivesAccess::get(w._primitives, i), w._r}),
+        (int)i);
+  }
+};
+
+template <typename Primitives, typename PermuteFilter>
+struct AccessTraits<Details::PrimitivesWithRadiusReorderedAndFiltered<
+                        Primitives, PermuteFilter>,
+                    PredicatesTag>
+{
+  using PrimitivesAccess = AccessTraits<Primitives, PrimitivesTag>;
+
+  using memory_space = typename PrimitivesAccess::memory_space;
+  using Predicates =
+      Details::PrimitivesWithRadiusReorderedAndFiltered<Primitives,
+                                                        PermuteFilter>;
+
+  static size_t size(Predicates const &w) { return w._filter.extent(0); }
+  static KOKKOS_FUNCTION auto get(Predicates const &w, size_t i)
+  {
+    int index = w._filter(i);
+    return attach(
+        intersects(Sphere{PrimitivesAccess::get(w._primitives, index), w._r}),
+        (int)index);
+  }
+};
+
+template <typename PointPrimitives, typename MixedOffsets, typename CellIndices,
+          typename Permutation>
+struct AccessTraits<Details::MixedBoxPrimitives<PointPrimitives, MixedOffsets,
+                                                CellIndices, Permutation>,
+                    ArborX::PrimitivesTag>
+{
+  using Primitives = Details::MixedBoxPrimitives<PointPrimitives, MixedOffsets,
+                                                 CellIndices, Permutation>;
+  static KOKKOS_FUNCTION std::size_t size(Primitives const &w)
+  {
+    auto const &dco = w._dense_cell_offsets;
+
+    auto const n = w._permute.size();
+    auto num_dense_primitives = dco.size() - 1;
+    auto num_sparse_primitives = n - w._num_points_in_dense_cells;
+
+    return num_dense_primitives + num_sparse_primitives;
+  }
+  static KOKKOS_FUNCTION ArborX::Box get(Primitives const &w, std::size_t i)
+  {
+    auto const &dco = w._dense_cell_offsets;
+
+    auto num_dense_primitives = dco.size() - 1;
+    if (i < num_dense_primitives)
+    {
+      // For a primitive corresponding to a dense cell, use that cell's box. It
+      // may not be tight around the points inside, but is cheap to compute.
+      auto cell_index = w._sorted_cell_indices(dco(i));
+      return w._grid.cellBox(cell_index);
+    }
+
+    // For a primitive corresponding to a point in a non-dense cell, use that
+    // point. But first, figure out its index, which requires some
+    // computations.
+    using Access = AccessTraits<PointPrimitives, PrimitivesTag>;
+
+    i = (i - num_dense_primitives) + w._num_points_in_dense_cells;
+    Point const &point = Access::get(w._point_primitives, w._permute(i));
+    return {point, point};
+  }
+  using memory_space = typename MixedOffsets::memory_space;
+};
+
+namespace DBSCAN
+{
+
+enum class Implementation
+{
+  FDBSCAN,
+  FDBSCAN_DenseBox
+};
+
+struct Parameters
+{
+  // Print timers to standard output
+  bool _print_timers = false;
+  // Algorithm implementation (FDBSCAN or FDBSCAN-DenseBox)
+  Implementation _implementation = Implementation::FDBSCAN_DenseBox;
+
+  Parameters &setPrintTimers(bool print_timers)
+  {
+    _print_timers = print_timers;
+    return *this;
+  }
+  Parameters &setImplementation(Implementation impl)
+  {
+    _implementation = impl;
+    return *this;
+  }
+};
+} // namespace DBSCAN
+
+template <typename ExecutionSpace, typename Primitives>
+Kokkos::View<int *,
+             typename AccessTraits<Primitives, PrimitivesTag>::memory_space>
+dbscan(ExecutionSpace const &exec_space, Primitives const &primitives,
+       float eps, int core_min_size,
+       DBSCAN::Parameters const &parameters = DBSCAN::Parameters())
+{
+  Kokkos::Profiling::pushRegion("ArborX::DBSCAN");
+
+  using Access = AccessTraits<Primitives, PrimitivesTag>;
+  using MemorySpace = typename Access::memory_space;
+
+  static_assert(
+      KokkosExt::is_accessible_from<MemorySpace, ExecutionSpace>::value,
+      "Primitives must be accessible from the execution space");
+
+  ARBORX_ASSERT(eps > 0);
+  ARBORX_ASSERT(core_min_size >= 2);
+
+  bool const is_special_case = (core_min_size == 2);
+
+  Kokkos::Timer timer;
+  std::map<std::string, double> elapsed;
+
+  bool const verbose = parameters._print_timers;
+  auto timer_start = [&exec_space, verbose](Kokkos::Timer &timer) {
+    if (verbose)
+      exec_space.fence();
+    timer.reset();
+  };
+  auto timer_seconds = [&exec_space, verbose](Kokkos::Timer const &timer) {
+    if (verbose)
+      exec_space.fence();
+    return timer.seconds();
+  };
+
+  int const n = Access::size(primitives);
+
+  Kokkos::View<int *, MemorySpace> num_neigh("ArborX::DBSCAN::num_neighbors",
+                                             0);
+
+  Kokkos::View<int *, MemorySpace> labels(
+      Kokkos::view_alloc(Kokkos::WithoutInitializing, "ArborX::DBSCAN::labels"),
+      n);
+  ArborX::iota(exec_space, labels);
+
+  if (parameters._implementation == DBSCAN::Implementation::FDBSCAN)
+  {
+    // Build the tree
+    timer_start(timer);
+    Kokkos::Profiling::pushRegion("ArborX::DBSCAN::tree_construction");
+    ArborX::BVH<MemorySpace> bvh(exec_space, primitives);
+    Kokkos::Profiling::popRegion();
+    elapsed["construction"] = timer_seconds(timer);
+
+    timer_start(timer);
+    Kokkos::Profiling::pushRegion("ArborX::DBSCAN::clusters");
+    auto const predicates =
+        Details::PrimitivesWithRadius<Primitives>{primitives, eps};
+    if (is_special_case)
+    {
+      // Perform the queries and build clusters through callback
+      using CorePoints = Details::CCSCorePoints;
+      CorePoints core_points;
+      Kokkos::Profiling::pushRegion("ArborX::DBSCAN::clusters::query");
+      bvh.query(exec_space, predicates,
+                Details::FDBSCANCallback<MemorySpace, CorePoints>{labels,
+                                                                  core_points});
+      Kokkos::Profiling::popRegion();
+    }
+    else
+    {
+      // Determine core points
+      Kokkos::Timer timer_local;
+      timer_start(timer_local);
+      Kokkos::Profiling::pushRegion("ArborX::DBSCAN::clusters::num_neigh");
+      Kokkos::resize(num_neigh, n);
+      bvh.query(exec_space, predicates,
+                Details::CountUpToN<MemorySpace>{num_neigh, core_min_size});
+      Kokkos::Profiling::popRegion();
+      elapsed["neigh"] = timer_seconds(timer_local);
+
+      using CorePoints = Details::DBSCANCorePoints<MemorySpace>;
+
+      // Perform the queries and build clusters through callback
+      timer_start(timer_local);
+      Kokkos::Profiling::pushRegion("ArborX::DBSCAN::clusters:query");
+      bvh.query(exec_space, predicates,
+                Details::FDBSCANCallback<MemorySpace, CorePoints>{
+                    labels, CorePoints{num_neigh, core_min_size}});
+      Kokkos::Profiling::popRegion();
+      elapsed["query"] = timer_seconds(timer_local);
+    }
+  }
+  else if (parameters._implementation ==
+           DBSCAN::Implementation::FDBSCAN_DenseBox)
+  {
+    // Find dense boxes
+    timer_start(timer);
+    Kokkos::Profiling::pushRegion("ArborX::DBSCAN::dense_cells");
+    Box bounds;
+    Details::TreeConstruction::calculateBoundingBoxOfTheScene(
+        exec_space, primitives, bounds);
+
+    // The cell length is chosen to be eps/sqrt(dimension), so that any two
+    // points within the same cell are within eps distance of each other.
+    float const h = eps / std::sqrt(3); // 3D (for 2D change to std::sqrt(2))
+    Details::CartesianGrid const grid(bounds, h);
+
+    auto cell_indices =
+        Details::computeCellIndices(exec_space, primitives, grid);
+
+    auto permute = Details::sortObjects(exec_space, cell_indices);
+    auto &sorted_cell_indices = cell_indices; // alias
+
+    int num_nonempty_cells;
+    int num_points_in_dense_cells;
+    {
+      // Reorder indices and permutation so that the dense cells go first
+      auto cell_offsets =
+          Details::computeOffsetsInOrderedView(exec_space, sorted_cell_indices);
+      num_nonempty_cells = cell_offsets.size() - 1;
+
+      num_points_in_dense_cells = Details::reorderDenseAndSparseCells(
+          exec_space, cell_offsets, core_min_size, sorted_cell_indices,
+          permute);
+    }
+    int num_points_in_sparse_cells = n - num_points_in_dense_cells;
+
+    auto dense_sorted_cell_indices = Kokkos::subview(
+        sorted_cell_indices, Kokkos::make_pair(0, num_points_in_dense_cells));
+
+    auto dense_cell_offsets = Details::computeOffsetsInOrderedView(
+        exec_space, dense_sorted_cell_indices);
+    int num_dense_cells = dense_cell_offsets.size() - 1;
+    if (verbose)
+    {
+      printf("h = %e, nx = %zu, ny = %zu, nz = %zu\n", h, grid._nx, grid._ny,
+             grid._nz);
+      printf("#nonempty cells     : %10d\n", num_nonempty_cells);
+      printf("#dense cells        : %10d [%.2f%%]\n", num_dense_cells,
+             (100.f * num_dense_cells) / num_nonempty_cells);
+      printf("#dense cell points  : %10d [%.2f%%]\n", num_points_in_dense_cells,
+             (100.f * num_points_in_dense_cells) / n);
+      printf("#mixed primitives   : %10d\n",
+             num_dense_cells + num_points_in_sparse_cells);
+    }
+
+    Details::unionFindWithinEachDenseCell(exec_space, dense_sorted_cell_indices,
+                                          permute, labels);
+
+    Kokkos::Profiling::popRegion();
+    elapsed["dense_cells"] = timer_seconds(timer);
+
+    // Build the tree
+    timer_start(timer);
+    Kokkos::Profiling::pushRegion("ArborX::DBSCAN::tree_construction");
+    BVH<MemorySpace> bvh(
+        exec_space,
+        Details::MixedBoxPrimitives<Primitives, decltype(dense_cell_offsets),
+                                    decltype(cell_indices), decltype(permute)>{
+            primitives, grid, dense_cell_offsets, num_points_in_dense_cells,
+            sorted_cell_indices, permute});
+
+    Kokkos::Profiling::popRegion();
+    elapsed["construction"] = timer_seconds(timer);
+
+    timer_start(timer);
+    Kokkos::Profiling::pushRegion("ArborX::DBSCAN::clusters");
+
+    if (is_special_case)
+    {
+      // Perform the queries and build clusters through callback
+      using CorePoints = Details::CCSCorePoints;
+      Kokkos::Profiling::pushRegion("ArborX::DBSCAN::clusters::query");
+      auto const predicates =
+          Details::PrimitivesWithRadius<Primitives>{primitives, eps};
+      bvh.query(
+          exec_space, predicates,
+          Details::FDBSCANDenseBoxCallback<MemorySpace, CorePoints, Primitives,
+                                           decltype(dense_cell_offsets),
+                                           decltype(permute)>{
+              labels, CorePoints{}, primitives, dense_cell_offsets, permute,
+              eps});
+      Kokkos::Profiling::popRegion();
+    }
+    else
+    {
+      // Determine core points
+      Kokkos::Timer timer_local;
+      timer_start(timer_local);
+      Kokkos::Profiling::pushRegion("ArborX::DBSCAN::clusters::num_neigh");
+      Kokkos::resize(num_neigh, n);
+      // Set num neighbors for points in dense cells to max, so that they are
+      // automatically core points
+      Kokkos::parallel_for(
+          "ArborX::DBSCAN::mark_dense_cells_core_points",
+          Kokkos::RangePolicy<ExecutionSpace>(exec_space, 0,
+                                              num_points_in_dense_cells),
+          KOKKOS_LAMBDA(int i) { num_neigh(permute(i)) = INT_MAX; });
+      // Count neighbors for points in sparse cells
+      auto sparse_permute = Kokkos::subview(
+          permute, Kokkos::make_pair(num_points_in_dense_cells, n));
+
+      auto const sparse_predicates =
+          Details::PrimitivesWithRadiusReorderedAndFiltered<
+              Primitives, decltype(sparse_permute)>{primitives, eps,
+                                                    sparse_permute};
+      bvh.query(exec_space, sparse_predicates,
+                Details::CountUpToN_DenseBox<MemorySpace, Primitives,
+                                             decltype(dense_cell_offsets),
+                                             decltype(permute)>(
+                    num_neigh, primitives, dense_cell_offsets, permute,
+                    core_min_size, eps, core_min_size));
+      Kokkos::Profiling::popRegion();
+      elapsed["neigh"] = timer_seconds(timer_local);
+
+      using CorePoints = Details::DBSCANCorePoints<MemorySpace>;
+
+      // Perform the queries and build clusters through callback
+      timer_start(timer_local);
+      Kokkos::Profiling::pushRegion("ArborX::DBSCAN::clusters:query");
+      auto const predicates =
+          Details::PrimitivesWithRadius<Primitives>{primitives, eps};
+      bvh.query(
+          exec_space, predicates,
+          Details::FDBSCANDenseBoxCallback<MemorySpace, CorePoints, Primitives,
+                                           decltype(dense_cell_offsets),
+                                           decltype(permute)>{
+              labels, CorePoints{num_neigh, core_min_size}, primitives,
+              dense_cell_offsets, permute, eps});
+      Kokkos::Profiling::popRegion();
+      elapsed["query"] = timer_seconds(timer_local);
+    }
+  }
+
+  // Per [1]:
+  //
+  // ```
+  // The finalization kernel will, ultimately, make all parents
+  // point directly to the representative.
+  // ```
+  Kokkos::View<int *, MemorySpace> cluster_sizes(
+      "ArborX::DBSCAN::cluster_sizes", n);
+  Kokkos::parallel_for("ArborX::DBSCAN::finalize_labels",
+                       Kokkos::RangePolicy<ExecutionSpace>(exec_space, 0, n),
+                       KOKKOS_LAMBDA(int const i) {
+                         // ##### ECL license (see LICENSE.ECL) #####
+                         int next;
+                         int vstat = labels(i);
+                         int const old = vstat;
+                         while (vstat > (next = labels(vstat)))
+                         {
+                           vstat = next;
+                         }
+                         if (vstat != old)
+                           labels(i) = vstat;
+
+                         Kokkos::atomic_fetch_add(&cluster_sizes(labels(i)), 1);
+                       });
+  if (is_special_case)
+  {
+    // Ideally, this kernel would have had the exactly same form as in the
+    // else() clause. But there's no available valid is_core() for use here:
+    // - CCSCorePoints cannot be used as it always returns true, which is OK
+    //   inside the callback, but not here
+    // - DBSCANCorePoints cannot be used either as num_neigh is not initialized
+    //   in the special case.
+    Kokkos::parallel_for("ArborX::DBSCAN::mark_noise",
+                         Kokkos::RangePolicy<ExecutionSpace>(exec_space, 0, n),
+                         KOKKOS_LAMBDA(int const i) {
+                           if (cluster_sizes(labels(i)) == 1)
+                             labels(i) = -1;
+                         });
+  }
+  else
+  {
+    Details::DBSCANCorePoints<MemorySpace> is_core{num_neigh, core_min_size};
+    Kokkos::parallel_for("ArborX::DBSCAN::mark_noise",
+                         Kokkos::RangePolicy<ExecutionSpace>(exec_space, 0, n),
+                         KOKKOS_LAMBDA(int const i) {
+                           if (cluster_sizes(labels(i)) == 1 && !is_core(i))
+                             labels(i) = -1;
+                         });
+  }
+  Kokkos::Profiling::popRegion();
+  elapsed["query+cluster"] = timer_seconds(timer);
+
+  if (verbose)
+  {
+    if (parameters._implementation == DBSCAN::Implementation::FDBSCAN_DenseBox)
+      printf("-- dense cells      : %10.3f\n", elapsed["dense_cells"]);
+    printf("-- construction     : %10.3f\n", elapsed["construction"]);
+    printf("-- query+cluster    : %10.3f\n", elapsed["query+cluster"]);
+    if (!is_special_case)
+    {
+      printf("---- neigh          : %10.3f\n", elapsed["neigh"]);
+      printf("---- query          : %10.3f\n", elapsed["query"]);
+    }
+  }
+
+  Kokkos::Profiling::popRegion();
+
+  return labels;
+}
+
+} // namespace ArborX
+
+#endif
diff --git a/arborx/src/ArborX_DistributedSearchTree.hpp b/arborx/src/ArborX_DistributedSearchTree.hpp
new file mode 100644
index 000000000..d68fa9c30
--- /dev/null
+++ b/arborx/src/ArborX_DistributedSearchTree.hpp
@@ -0,0 +1,25 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#ifndef ARBORX_DISTRIBUTED_SEARCH_TREE_HPP
+#define ARBORX_DISTRIBUTED_SEARCH_TREE_HPP
+
+#include <ArborX_DistributedTree.hpp>
+
+#include <mpi.h>
+
+// clang-format off
+
+_Pragma("message(\"This file is deprecated. Use ArborX_DistributedTree.hpp instead!\")")
+
+// clang-format on
+
+#endif
diff --git a/arborx/src/ArborX_DistributedTree.hpp b/arborx/src/ArborX_DistributedTree.hpp
new file mode 100644
index 000000000..77d4851da
--- /dev/null
+++ b/arborx/src/ArborX_DistributedTree.hpp
@@ -0,0 +1,225 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#ifndef ARBORX_DISTRIBUTED_TREE_HPP
+#define ARBORX_DISTRIBUTED_TREE_HPP
+
+#include <ArborX_Box.hpp>
+#include <ArborX_DetailsDistributedTreeImpl.hpp>
+#include <ArborX_DetailsUtils.hpp> // accumulate
+#include <ArborX_LinearBVH.hpp>
+
+#include <Kokkos_Core.hpp>
+
+#include <memory>
+
+#include <mpi.h>
+
+namespace ArborX
+{
+
+/** \brief Distributed search tree
+ *
+ *  \note query() must be called as collective over all processes in the
+ *  communicator passed to the constructor.
+ */
+template <typename MemorySpace, typename Enable = void>
+class DistributedTree
+{
+public:
+  using memory_space = MemorySpace;
+  static_assert(Kokkos::is_memory_space<MemorySpace>::value, "");
+  using size_type = typename BVH<MemorySpace>::size_type;
+  using bounding_volume_type = typename BVH<MemorySpace>::bounding_volume_type;
+
+  template <typename ExecutionSpace, typename Primitives>
+  DistributedTree(MPI_Comm comm, ExecutionSpace const &space,
+                  Primitives const &primitives);
+
+  /** Returns the smallest axis-aligned box able to contain all the objects
+   *  stored in the tree or an invalid box if the tree is empty.
+   */
+  bounding_volume_type bounds() const noexcept { return _top_tree.bounds(); }
+
+  /** Returns the global number of objects stored in the tree.
+   */
+  size_type size() const noexcept { return _top_tree_size; }
+
+  /** Indicates whether the tree is empty on all processes.
+   */
+  bool empty() const noexcept { return size() == 0; }
+
+  /** \brief Finds object satisfying the passed predicates (e.g. nearest to
+   *  some point or intersecting with some box)
+   *
+   *  This query function performs a batch of spatial or k-nearest neighbors
+   *  searches.  The results give indices of the objects that satisfy
+   *  predicates (as given to the constructor).  They are organized in a
+   *  distributed compressed row storage format.
+   *
+   *  \c indices stores the indices of the objects that satisfy the
+   *  predicates.  \c offset stores the locations in the \c indices view that
+   *  start a predicate, that is, \c queries(q) is satisfied by \c indices(o)
+   *  for <code>objects(q) <= o < objects(q+1)</code> that live on processes
+   *  \c ranks(o) respectively.  Following the usual convention,
+   *  <code>offset(n) = nnz</code>, where \c n is the number of queries that
+   *  were performed and \c nnz is the total number of collisions.
+   *
+   *  \note The views \c indices, \c offset, and \c ranks are passed by
+   *  reference because \c Kokkos::realloc() calls the assignment operator.
+   *
+   *  \param[in] predicates Collection of predicates of the same type.  These
+   *  may be spatial predicates or nearest predicates.
+   *  \param[out] args
+   *     - \c indices Object local indices that satisfy the predicates.
+   *     - \c offset Array of predicate offsets for one-dimensional
+   *       storage.
+   *     - \c ranks Process ranks that own objects.
+   *     - \c distances Computed distances (optional and only for nearest
+   *       predicates).
+   */
+  template <typename ExecutionSpace, typename Predicates, typename... Args>
+  void query(ExecutionSpace const &space, Predicates const &predicates,
+             Args &&... args) const
+  {
+    static_assert(Kokkos::is_execution_space<ExecutionSpace>::value, "");
+    using Access = AccessTraits<Predicates, PredicatesTag>;
+    using Tag = typename Details::AccessTraitsHelper<Access>::tag;
+    using DeviceType = Kokkos::Device<ExecutionSpace, MemorySpace>;
+    Details::DistributedTreeImpl<DeviceType>::queryDispatch(
+        Tag{}, *this, space, predicates, std::forward<Args>(args)...);
+  }
+
+private:
+  template <typename DeviceType>
+  friend struct Details::DistributedTreeImpl;
+  MPI_Comm getComm() const { return *_comm_ptr; }
+  std::shared_ptr<MPI_Comm> _comm_ptr;
+  BVH<MemorySpace> _top_tree;    // replicated
+  BVH<MemorySpace> _bottom_tree; // local
+  size_type _top_tree_size;
+  Kokkos::View<size_type *, MemorySpace> _bottom_tree_sizes;
+};
+
+template <typename MemorySpace, typename Enable>
+template <typename ExecutionSpace, typename Primitives>
+DistributedTree<MemorySpace, Enable>::DistributedTree(
+    MPI_Comm comm, ExecutionSpace const &space, Primitives const &primitives)
+{
+  Kokkos::Profiling::pushRegion("ArborX::DistributedTree::DistributedTree");
+
+  static_assert(Kokkos::is_execution_space<ExecutionSpace>::value, "");
+
+  // Create new context for the library to isolate library's communication from
+  // user's
+  _comm_ptr.reset(
+      // duplicate the communicator and store it in a std::shared_ptr so that
+      // all copies of the distributed tree point to the same object
+      [comm]() {
+        auto p = std::make_unique<MPI_Comm>();
+        MPI_Comm_dup(comm, p.get());
+        return p.release();
+      }(),
+      // custom deleter to mark the communicator object for deallocation
+      [](MPI_Comm *p) {
+        MPI_Comm_free(p);
+        delete p;
+      });
+
+  Kokkos::Profiling::pushRegion("ArborX::DistributedTree::DistributedTree::"
+                                "bottom_tree_construction");
+
+  _bottom_tree = BVH<MemorySpace>(space, primitives);
+
+  Kokkos::Profiling::popRegion();
+  Kokkos::Profiling::pushRegion("ArborX::DistributedTree::DistributedTree::"
+                                "top_tree_construction");
+
+  int comm_rank;
+  MPI_Comm_rank(getComm(), &comm_rank);
+  int comm_size;
+  MPI_Comm_size(getComm(), &comm_size);
+
+  Kokkos::View<Box *, MemorySpace> boxes(
+      Kokkos::view_alloc(Kokkos::WithoutInitializing,
+                         "ArborX::DistributedTree::DistributedTree::"
+                         "rank_bounding_boxes"),
+      comm_size);
+  // FIXME when we move to MPI with CUDA-aware support, we will not need to
+  // copy from the device to the host
+  auto boxes_host = Kokkos::create_mirror_view(boxes);
+  boxes_host(comm_rank) = _bottom_tree.bounds();
+  MPI_Allgather(MPI_IN_PLACE, 0, MPI_DATATYPE_NULL,
+                static_cast<void *>(boxes_host.data()), sizeof(Box), MPI_BYTE,
+                getComm());
+  Kokkos::deep_copy(space, boxes, boxes_host);
+
+  _top_tree = BVH<MemorySpace>{space, boxes};
+
+  Kokkos::Profiling::popRegion();
+  Kokkos::Profiling::pushRegion("ArborX::DistributedTree::DistributedTree::"
+                                "size_calculation");
+
+  _bottom_tree_sizes = Kokkos::View<size_type *, MemorySpace>(
+      Kokkos::view_alloc(Kokkos::WithoutInitializing,
+                         "ArborX::DistributedTree::"
+                         "leave_count_in_local_trees"),
+      comm_size);
+  auto bottom_tree_sizes_host = Kokkos::create_mirror_view(_bottom_tree_sizes);
+  bottom_tree_sizes_host(comm_rank) = _bottom_tree.size();
+  MPI_Allgather(MPI_IN_PLACE, 0, MPI_DATATYPE_NULL,
+                static_cast<void *>(bottom_tree_sizes_host.data()),
+                sizeof(size_type), MPI_BYTE, getComm());
+  Kokkos::deep_copy(space, _bottom_tree_sizes, bottom_tree_sizes_host);
+
+  _top_tree_size = accumulate(space, _bottom_tree_sizes, 0);
+
+  Kokkos::Profiling::popRegion();
+  Kokkos::Profiling::popRegion();
+}
+
+template <typename DeviceType>
+class DistributedTree<DeviceType,
+                      std::enable_if_t<Kokkos::is_device<DeviceType>::value>>
+    : public DistributedTree<typename DeviceType::memory_space>
+{
+public:
+  using device_type = DeviceType;
+
+  // clang-format off
+  template <typename Primitives>
+  [[deprecated("ArborX::DistributedTree templated on a device type is "
+               "deprecated, use it templated on a memory space instead.")]]
+  DistributedTree(MPI_Comm comm, Primitives const &primitives)
+      : DistributedTree<typename DeviceType::memory_space>(
+            comm, typename DeviceType::execution_space{}, primitives)
+  {
+  }
+  // clang-format on
+  template <typename... Args>
+  void query(Args &&... args) const
+  {
+    DistributedTree<typename DeviceType::memory_space>::query(
+        typename DeviceType::execution_space{}, std::forward<Args>(args)...);
+  }
+};
+
+// clang-format off
+
+template <typename MemorySpace, typename Enable = void>
+using DistributedSearchTree [[deprecated("Use DistributedTree instead.")]] =
+    DistributedTree<MemorySpace, Enable>;
+
+// clang-format-on
+
+} // namespace ArborX
+
+#endif
diff --git a/arborx/src/ArborX_LinearBVH.hpp b/arborx/src/ArborX_LinearBVH.hpp
new file mode 100644
index 000000000..5b214927d
--- /dev/null
+++ b/arborx/src/ArborX_LinearBVH.hpp
@@ -0,0 +1,329 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#ifndef ARBORX_LINEAR_BVH_HPP
+#define ARBORX_LINEAR_BVH_HPP
+
+#include <ArborX_AccessTraits.hpp>
+#include <ArborX_Box.hpp>
+#include <ArborX_Callbacks.hpp>
+#include <ArborX_CrsGraphWrapper.hpp>
+#include <ArborX_DetailsBatchedQueries.hpp>
+#include <ArborX_DetailsConcepts.hpp>
+#include <ArborX_DetailsKokkosExtAccessibilityTraits.hpp>
+#include <ArborX_DetailsKokkosExtScopedProfileRegion.hpp>
+#include <ArborX_DetailsNode.hpp>
+#include <ArborX_DetailsPermutedData.hpp>
+#include <ArborX_DetailsSortUtils.hpp>
+#include <ArborX_DetailsTreeConstruction.hpp>
+#include <ArborX_DetailsTreeTraversal.hpp>
+#include <ArborX_TraversalPolicy.hpp>
+
+#include <Kokkos_Core.hpp>
+
+namespace ArborX
+{
+
+namespace Details
+{
+struct HappyTreeFriends;
+} // namespace Details
+
+template <typename MemorySpace, typename BoundingVolume = Box,
+          typename Enable = void>
+class BasicBoundingVolumeHierarchy
+{
+public:
+  using memory_space = MemorySpace;
+  static_assert(Kokkos::is_memory_space<MemorySpace>::value, "");
+  using size_type = typename MemorySpace::size_type;
+  using bounding_volume_type = BoundingVolume;
+
+  BasicBoundingVolumeHierarchy() = default; // build an empty tree
+
+  template <typename ExecutionSpace, typename Primitives>
+  BasicBoundingVolumeHierarchy(ExecutionSpace const &space,
+                               Primitives const &primitives);
+
+  KOKKOS_FUNCTION
+  size_type size() const noexcept { return _size; }
+
+  KOKKOS_FUNCTION
+  bool empty() const noexcept { return size() == 0; }
+
+  KOKKOS_FUNCTION
+  bounding_volume_type bounds() const noexcept { return _bounds; }
+
+  template <typename ExecutionSpace, typename Predicates, typename Callback>
+  void query(ExecutionSpace const &space, Predicates const &predicates,
+             Callback const &callback,
+             Experimental::TraversalPolicy const &policy =
+                 Experimental::TraversalPolicy()) const;
+
+  template <typename ExecutionSpace, typename Predicates,
+            typename CallbackOrView, typename View, typename... Args>
+  std::enable_if_t<Kokkos::is_view<std::decay_t<View>>{}>
+  query(ExecutionSpace const &space, Predicates const &predicates,
+        CallbackOrView &&callback_or_view, View &&view, Args &&... args) const
+  {
+    ArborX::query(*this, space, predicates,
+                  std::forward<CallbackOrView>(callback_or_view),
+                  std::forward<View>(view), std::forward<Args>(args)...);
+  }
+
+private:
+  friend struct Details::HappyTreeFriends;
+
+#if defined(KOKKOS_ENABLE_CUDA) || defined(KOKKOS_ENABLE_HIP)
+  // Ropes based traversal is only used for CUDA, as it was found to be slower
+  // than regular one for Power9 on Summit.  It is also used with HIP.
+  using node_type = std::conditional_t<
+      std::is_same<MemorySpace,
+#if defined(KOKKOS_ENABLE_CUDA)
+                   Kokkos::CudaSpace
+#else
+                   Kokkos::Experimental::HIPSpace
+#endif
+                   >{},
+      Details::NodeWithLeftChildAndRope<bounding_volume_type>,
+      Details::NodeWithTwoChildren<bounding_volume_type>>;
+#else
+  using node_type = Details::NodeWithTwoChildren<bounding_volume_type>;
+#endif
+
+  Kokkos::View<node_type *, MemorySpace> getInternalNodes()
+  {
+    assert(!empty());
+    return Kokkos::subview(_internal_and_leaf_nodes,
+                           std::make_pair(size_type{0}, size() - 1));
+  }
+
+  Kokkos::View<node_type *, MemorySpace> getLeafNodes()
+  {
+    assert(!empty());
+    return Kokkos::subview(_internal_and_leaf_nodes,
+                           std::make_pair(size() - 1, 2 * size() - 1));
+  }
+  Kokkos::View<node_type const *, MemorySpace> getLeafNodes() const
+  {
+    assert(!empty());
+    return Kokkos::subview(_internal_and_leaf_nodes,
+                           std::make_pair(size() - 1, 2 * size() - 1));
+  }
+
+  KOKKOS_FUNCTION
+  node_type const *getRoot() const { return _internal_and_leaf_nodes.data(); }
+
+  KOKKOS_FUNCTION
+  node_type *getRoot() { return _internal_and_leaf_nodes.data(); }
+
+  KOKKOS_FUNCTION
+  node_type const *getNodePtr(int i) const
+  {
+    return &_internal_and_leaf_nodes(i);
+  }
+
+  KOKKOS_FUNCTION
+  bounding_volume_type const &getBoundingVolume(node_type const *node) const
+  {
+    return node->bounding_volume;
+  }
+
+  KOKKOS_FUNCTION
+  bounding_volume_type &getBoundingVolume(node_type *node)
+  {
+    return node->bounding_volume;
+  }
+
+  size_t _size;
+  bounding_volume_type _bounds;
+  Kokkos::View<node_type *, MemorySpace> _internal_and_leaf_nodes;
+};
+
+template <typename DeviceType>
+class BasicBoundingVolumeHierarchy<
+    DeviceType, std::enable_if_t<Kokkos::is_device<DeviceType>::value>>
+    : public BasicBoundingVolumeHierarchy<typename DeviceType::memory_space>
+{
+  using base_type =
+      BasicBoundingVolumeHierarchy<typename DeviceType::memory_space>;
+
+public:
+  using device_type = DeviceType;
+
+  // clang-format off
+  [[deprecated("ArborX::BoundingVolumeHierarchy templated on a device type "
+               "is deprecated, use it templated on a memory space instead.")]]
+  BasicBoundingVolumeHierarchy() = default;
+  template <typename Primitives>
+  [[deprecated("ArborX::BoundingVolumeHierarchy templated on a device type "
+               "is deprecated, use it templated on a memory space instead.")]]
+  BasicBoundingVolumeHierarchy(Primitives const &primitives)
+      : base_type(
+            typename DeviceType::execution_space{}, primitives)
+  {
+  }
+  // clang-format on
+  template <typename FirstArgumentType, typename... Args>
+  std::enable_if_t<!Kokkos::is_execution_space<FirstArgumentType>::value>
+  query(FirstArgumentType &&arg1, Args &&... args) const
+  {
+    base_type::query(typename DeviceType::execution_space{},
+                     std::forward<FirstArgumentType>(arg1),
+                     std::forward<Args>(args)...);
+  }
+
+private:
+  template <typename Tree, typename ExecutionSpace, typename Predicates,
+            typename CallbackOrView, typename View, typename... Args>
+  friend void ArborX::query(Tree const &tree, ExecutionSpace const &space,
+                            Predicates const &predicates,
+                            CallbackOrView &&callback_or_view, View &&view,
+                            Args &&... args);
+
+  template <typename FirstArgumentType, typename... Args>
+  std::enable_if_t<Kokkos::is_execution_space<FirstArgumentType>::value>
+  query(FirstArgumentType const &space, Args &&... args) const
+  {
+    base_type::query(space, std::forward<Args>(args)...);
+  }
+};
+
+template <typename MemorySpace>
+using BoundingVolumeHierarchy = BasicBoundingVolumeHierarchy<MemorySpace>;
+
+template <typename MemorySpace>
+using BVH = BoundingVolumeHierarchy<MemorySpace>;
+
+template <typename MemorySpace, typename BoundingVolume, typename Enable>
+template <typename ExecutionSpace, typename Primitives>
+BasicBoundingVolumeHierarchy<MemorySpace, BoundingVolume, Enable>::
+    BasicBoundingVolumeHierarchy(ExecutionSpace const &space,
+                                 Primitives const &primitives)
+    : _size(AccessTraits<Primitives, PrimitivesTag>::size(primitives))
+    , _internal_and_leaf_nodes(
+          Kokkos::view_alloc(Kokkos::WithoutInitializing,
+                             "ArborX::BVH::internal_and_leaf_nodes"),
+          _size > 0 ? 2 * _size - 1 : 0)
+{
+  KokkosExt::ScopedProfileRegion guard("ArborX::BVH::BVH");
+
+  Details::check_valid_access_traits(PrimitivesTag{}, primitives);
+  using Access = AccessTraits<Primitives, PrimitivesTag>;
+  static_assert(KokkosExt::is_accessible_from<typename Access::memory_space,
+                                              ExecutionSpace>::value,
+                "Primitives must be accessible from the execution space");
+
+  if (empty())
+  {
+    return;
+  }
+
+  Kokkos::Profiling::pushRegion(
+      "ArborX::BVH::BVH::calculate_scene_bounding_box");
+
+  // determine the bounding box of the scene
+  Box bbox{};
+  Details::TreeConstruction::calculateBoundingBoxOfTheScene(space, primitives,
+                                                            bbox);
+
+  Kokkos::Profiling::popRegion();
+
+  if (size() == 1)
+  {
+    Details::TreeConstruction::initializeSingleLeafNode(
+        space, primitives, _internal_and_leaf_nodes);
+    Kokkos::deep_copy(
+        space,
+        Kokkos::View<BoundingVolume, Kokkos::HostSpace,
+                     Kokkos::MemoryUnmanaged>(&_bounds),
+        Kokkos::View<BoundingVolume, MemorySpace, Kokkos::MemoryUnmanaged>(
+            &getBoundingVolume(getRoot())));
+    return;
+  }
+
+  Kokkos::Profiling::pushRegion("ArborX::BVH::BVH::assign_morton_codes");
+
+  // calculate Morton codes of all objects
+  Kokkos::View<unsigned int *, MemorySpace> morton_indices(
+      Kokkos::view_alloc(Kokkos::WithoutInitializing,
+                         "ArborX::BVH::BVH::morton"),
+      size());
+  Details::TreeConstruction::assignMortonCodes(space, primitives,
+                                               morton_indices, bbox);
+
+  Kokkos::Profiling::popRegion();
+  Kokkos::Profiling::pushRegion("ArborX::BVH::BVH::sort_morton_codes");
+
+  // compute the ordering of primitives along Z-order space-filling curve
+  auto permutation_indices = Details::sortObjects(space, morton_indices);
+
+  Kokkos::Profiling::popRegion();
+  Kokkos::Profiling::pushRegion("ArborX::BVH::BVH::generate_hierarchy");
+
+  // generate bounding volume hierarchy
+  Details::TreeConstruction::generateHierarchy(
+      space, primitives, permutation_indices, morton_indices, getLeafNodes(),
+      getInternalNodes());
+
+  Kokkos::deep_copy(
+      space,
+      Kokkos::View<BoundingVolume, Kokkos::HostSpace, Kokkos::MemoryUnmanaged>(
+          &_bounds),
+      Kokkos::View<BoundingVolume, MemorySpace, Kokkos::MemoryUnmanaged>(
+          &getBoundingVolume(getRoot())));
+
+  Kokkos::Profiling::popRegion();
+}
+
+template <typename MemorySpace, typename BoundingVolume, typename Enable>
+template <typename ExecutionSpace, typename Predicates, typename Callback>
+void BasicBoundingVolumeHierarchy<MemorySpace, BoundingVolume, Enable>::query(
+    ExecutionSpace const &space, Predicates const &predicates,
+    Callback const &callback, Experimental::TraversalPolicy const &policy) const
+{
+  Details::check_valid_access_traits(PredicatesTag{}, predicates);
+
+  using Access = AccessTraits<Predicates, Traits::PredicatesTag>;
+  using Tag = typename Details::AccessTraitsHelper<Access>::tag;
+
+  auto profiling_prefix =
+      std::string("ArborX::BVH::query::") +
+      (std::is_same<Tag, Details::SpatialPredicateTag>{} ? "spatial"
+                                                         : "nearest");
+
+  Kokkos::Profiling::pushRegion(profiling_prefix);
+
+  if (policy._sort_predicates)
+  {
+    Kokkos::Profiling::pushRegion(profiling_prefix + "::compute_permutation");
+    using DeviceType = Kokkos::Device<ExecutionSpace, MemorySpace>;
+    auto permute =
+        Details::BatchedQueries<DeviceType>::sortQueriesAlongZOrderCurve(
+            space, static_cast<Box>(bounds()), predicates);
+    Kokkos::Profiling::popRegion();
+
+    using PermutedPredicates =
+        Details::PermutedData<Predicates, decltype(permute)>;
+    Details::traverse(space, *this, PermutedPredicates{predicates, permute},
+                      callback);
+  }
+  else
+  {
+    Details::traverse(space, *this, predicates, callback);
+  }
+
+  Kokkos::Profiling::popRegion();
+}
+
+} // namespace ArborX
+
+#endif
diff --git a/arborx/src/ArborX_Version.hpp.in b/arborx/src/ArborX_Version.hpp.in
new file mode 100644
index 000000000..b37578c81
--- /dev/null
+++ b/arborx/src/ArborX_Version.hpp.in
@@ -0,0 +1,28 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#ifndef ARBORX_VERSION_HPP
+#define ARBORX_VERSION_HPP
+
+#include <ArborX_Config.hpp>
+
+#include <string>
+
+namespace ArborX
+{
+
+inline std::string version() { return "@ARBORX_VERSION_STRING@"; }
+
+inline std::string gitCommitHash() { return "@ARBORX_GIT_COMMIT_HASH@"; }
+
+} // namespace ArborX
+
+#endif
diff --git a/arborx/src/details/ArborX_AccessTraits.hpp b/arborx/src/details/ArborX_AccessTraits.hpp
new file mode 100644
index 000000000..d5dcedfd0
--- /dev/null
+++ b/arborx/src/details/ArborX_AccessTraits.hpp
@@ -0,0 +1,192 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#ifndef ARBORX_ACCESS_TRAITS_HPP
+#define ARBORX_ACCESS_TRAITS_HPP
+
+#include <ArborX_DetailsConcepts.hpp>
+#include <ArborX_DetailsTags.hpp>
+#include <ArborX_Point.hpp>
+#include <ArborX_Predicates.hpp>
+
+#include <Kokkos_Core.hpp>
+
+namespace ArborX
+{
+
+struct PrimitivesTag
+{
+};
+
+struct PredicatesTag
+{
+};
+
+template <typename T, typename Tag, typename Enable = void>
+struct AccessTraits
+{
+  using not_specialized = void; // tag to detect existence of a specialization
+};
+
+template <typename Traits>
+using AccessTraitsNotSpecializedArchetypeAlias =
+    typename Traits::not_specialized;
+
+template <typename View, typename Tag>
+struct AccessTraits<
+    View, Tag, std::enable_if_t<Kokkos::is_view<View>{} && View::rank == 1>>
+{
+  // Returns a const reference
+  KOKKOS_FUNCTION static typename View::const_value_type &get(View const &v,
+                                                              int i)
+  {
+    return v(i);
+  }
+
+  KOKKOS_FUNCTION
+  static typename View::size_type size(View const &v) { return v.extent(0); }
+
+  using memory_space = typename View::memory_space;
+};
+
+template <typename View, typename Tag>
+struct AccessTraits<
+    View, Tag, std::enable_if_t<Kokkos::is_view<View>{} && View::rank == 2>>
+{
+  // Returns by value
+  KOKKOS_FUNCTION static Point get(View const &v, int i)
+  {
+    return {{v(i, 0), v(i, 1), v(i, 2)}};
+  }
+
+  KOKKOS_FUNCTION
+  static typename View::size_type size(View const &v) { return v.extent(0); }
+
+  using memory_space = typename View::memory_space;
+};
+
+namespace Details
+{
+
+// archetypal alias for a 'memory_space' type member in access traits
+template <typename Traits>
+using AccessTraitsMemorySpaceArchetypeAlias = typename Traits::memory_space;
+
+// archetypal expression for 'size()' static member function in access traits
+template <typename Traits>
+using AccessTraitsSizeArchetypeExpression = decltype(
+    Traits::size(std::declval<first_template_parameter_t<Traits> const &>()));
+
+// archetypal expression for 'get()' static member function in access traits
+template <typename Traits>
+using AccessTraitsGetArchetypeExpression = decltype(
+    Traits::get(std::declval<first_template_parameter_t<Traits> const &>(), 0));
+
+template <typename Access>
+struct AccessTraitsHelper
+{
+  // Deduce return type of get()
+  using type =
+      std::decay_t<detected_t<AccessTraitsGetArchetypeExpression, Access>>;
+  using tag = typename Tag<type>::type;
+};
+
+template <typename Predicates>
+void check_valid_access_traits(PredicatesTag, Predicates const &)
+{
+  using Access = AccessTraits<Predicates, PredicatesTag>;
+  static_assert(
+      !is_detected<AccessTraitsNotSpecializedArchetypeAlias, Access>{},
+      "Must specialize 'AccessTraits<Predicates,PredicatesTag>'");
+
+  static_assert(is_detected<AccessTraitsMemorySpaceArchetypeAlias, Access>{},
+                "AccessTraits<Predicates,PredicatesTag> must define "
+                "'memory_space' member type");
+  static_assert(
+      Kokkos::is_memory_space<
+          detected_t<AccessTraitsMemorySpaceArchetypeAlias, Access>>{},
+      "'memory_space' member type must be a valid Kokkos memory space");
+
+  static_assert(is_detected<AccessTraitsSizeArchetypeExpression, Access>{},
+                "AccessTraits<Predicates,PredicatesTag> must define "
+                "'size()' static member function");
+  static_assert(
+      std::is_integral<
+          detected_t<AccessTraitsSizeArchetypeExpression, Access>>{},
+      "size() static member function return type is not an integral type");
+
+  static_assert(is_detected<AccessTraitsGetArchetypeExpression, Access>{},
+                "AccessTraits<Predicates,PredicatesTag> must define "
+                "'get()' static member function");
+
+  using Tag = typename AccessTraitsHelper<Access>::tag;
+  static_assert(std::is_same<Tag, NearestPredicateTag>{} ||
+                    std::is_same<Tag, SpatialPredicateTag>{},
+                "Invalid tag for the predicates");
+}
+
+template <typename Primitives>
+void check_valid_access_traits(PrimitivesTag, Primitives const &)
+{
+  using Access = AccessTraits<Primitives, PrimitivesTag>;
+  static_assert(
+      !is_detected<AccessTraitsNotSpecializedArchetypeAlias, Access>{},
+      "Must specialize 'AccessTraits<Primitives,PrimitivesTag>'");
+
+  static_assert(is_detected<AccessTraitsMemorySpaceArchetypeAlias, Access>{},
+                "AccessTraits<Primitives,PrimitivesTag> must define "
+                "'memory_space' member type");
+  static_assert(
+      Kokkos::is_memory_space<
+          detected_t<AccessTraitsMemorySpaceArchetypeAlias, Access>>{},
+      "'memory_space' member type must be a valid Kokkos memory space");
+
+  static_assert(is_detected<AccessTraitsSizeArchetypeExpression, Access>{},
+                "AccessTraits<Primitives,PrimitivesTag> must define "
+                "'size()' static member function");
+  static_assert(
+      std::is_integral<
+          detected_t<AccessTraitsSizeArchetypeExpression, Access>>{},
+      "size() static member function return type is not an integral type");
+
+  static_assert(is_detected<AccessTraitsGetArchetypeExpression, Access>{},
+                "AccessTraits<Primitives,PrimitivesTag> must define "
+                "'get()' static member function");
+  using T =
+      std::decay_t<detected_t<AccessTraitsGetArchetypeExpression, Access>>;
+  static_assert(std::is_same<T, Point>{} || std::is_same<T, Box>{},
+                "AccessTraits<Primitives,PrimitivesTag>::get() return type "
+                "must decay to Point or to Box");
+}
+
+} // namespace Details
+
+namespace Traits
+{
+using ::ArborX::PredicatesTag;
+using ::ArborX::PrimitivesTag;
+template <typename T, typename Tag, typename Enable = void>
+struct Access
+{
+  using not_specialized = void;
+};
+} // namespace Traits
+template <typename T, typename Tag>
+struct AccessTraits<
+    T, Tag,
+    std::enable_if_t<!Details::is_detected<
+        AccessTraitsNotSpecializedArchetypeAlias, Traits::Access<T, Tag>>{}>>
+    : Traits::Access<T, Tag>
+{
+};
+} // namespace ArborX
+
+#endif
diff --git a/arborx/src/details/ArborX_Box.hpp b/arborx/src/details/ArborX_Box.hpp
new file mode 100644
index 000000000..9c2008822
--- /dev/null
+++ b/arborx/src/details/ArborX_Box.hpp
@@ -0,0 +1,120 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#ifndef ARBORX_BOX_HPP
+#define ARBORX_BOX_HPP
+
+#include <ArborX_DetailsKokkosExtArithmeticTraits.hpp>
+#include <ArborX_DetailsKokkosExtMinMaxOperations.hpp>
+#include <ArborX_Point.hpp>
+
+#include <Kokkos_Macros.hpp>
+
+namespace ArborX
+{
+/**
+ * Axis-Aligned Bounding Box. This is just a thin wrapper around an array of
+ * size 2x spatial dimension with a default constructor to initialize
+ * properly an "empty" box.
+ */
+struct Box
+{
+  KOKKOS_DEFAULTED_FUNCTION
+  constexpr Box() = default;
+
+  KOKKOS_INLINE_FUNCTION
+  constexpr Box(Point const &min_corner, Point const &max_corner)
+      : _min_corner(min_corner)
+      , _max_corner(max_corner)
+  {
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  constexpr Point &minCorner() { return _min_corner; }
+
+  KOKKOS_INLINE_FUNCTION
+  constexpr Point const &minCorner() const { return _min_corner; }
+
+  KOKKOS_INLINE_FUNCTION
+  Point volatile &minCorner() volatile { return _min_corner; }
+
+  KOKKOS_INLINE_FUNCTION
+  Point volatile const &minCorner() volatile const { return _min_corner; }
+
+  KOKKOS_INLINE_FUNCTION
+  constexpr Point &maxCorner() { return _max_corner; }
+
+  KOKKOS_INLINE_FUNCTION
+  constexpr Point const &maxCorner() const { return _max_corner; }
+
+  KOKKOS_INLINE_FUNCTION
+  Point volatile &maxCorner() volatile { return _max_corner; }
+
+  KOKKOS_INLINE_FUNCTION
+  Point volatile const &maxCorner() volatile const { return _max_corner; }
+
+  Point _min_corner = {{KokkosExt::ArithmeticTraits::max<float>::value,
+                        KokkosExt::ArithmeticTraits::max<float>::value,
+                        KokkosExt::ArithmeticTraits::max<float>::value}};
+  Point _max_corner = {{-KokkosExt::ArithmeticTraits::max<float>::value,
+                        -KokkosExt::ArithmeticTraits::max<float>::value,
+                        -KokkosExt::ArithmeticTraits::max<float>::value}};
+
+  KOKKOS_FUNCTION Box &operator+=(Box const &other)
+  {
+    using KokkosExt::max;
+    using KokkosExt::min;
+
+    for (int d = 0; d < 3; ++d)
+    {
+      minCorner()[d] = min(minCorner()[d], other.minCorner()[d]);
+      maxCorner()[d] = max(maxCorner()[d], other.maxCorner()[d]);
+    }
+    return *this;
+  }
+
+  KOKKOS_FUNCTION void operator+=(Box const volatile &other) volatile
+  {
+    using KokkosExt::max;
+    using KokkosExt::min;
+
+    for (int d = 0; d < 3; ++d)
+    {
+      minCorner()[d] = min(minCorner()[d], other.minCorner()[d]);
+      maxCorner()[d] = max(maxCorner()[d], other.maxCorner()[d]);
+    }
+  }
+
+  KOKKOS_FUNCTION Box &operator+=(Point const &point)
+  {
+    using KokkosExt::max;
+    using KokkosExt::min;
+
+    for (int d = 0; d < 3; ++d)
+    {
+      minCorner()[d] = min(minCorner()[d], point[d]);
+      maxCorner()[d] = max(maxCorner()[d], point[d]);
+    }
+    return *this;
+  }
+
+// FIXME Temporary workaround until we clarify requirements on the Kokkos side.
+#if defined(KOKKOS_ENABLE_OPENMPTARGET) || defined(KOKKOS_ENABLE_SYCL)
+private:
+  friend KOKKOS_FUNCTION Box operator+(Box box, Box const &other)
+  {
+    return box += other;
+  }
+#endif
+};
+} // namespace ArborX
+
+#endif
diff --git a/arborx/src/details/ArborX_Callbacks.hpp b/arborx/src/details/ArborX_Callbacks.hpp
new file mode 100644
index 000000000..fae346c34
--- /dev/null
+++ b/arborx/src/details/ArborX_Callbacks.hpp
@@ -0,0 +1,212 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+#ifndef ARBORX_CALLBACKS_HPP
+#define ARBORX_CALLBACKS_HPP
+
+#include <ArborX_AccessTraits.hpp>
+#include <ArborX_DetailsConcepts.hpp>
+
+#include <Kokkos_Macros.hpp>
+
+#include <utility> // declval
+
+namespace ArborX
+{
+
+enum class CallbackTreeTraversalControl
+{
+  early_exit,
+  normal_continuation
+};
+
+namespace Details
+{
+
+struct InlineCallbackTag
+{
+};
+
+struct PostCallbackTag
+{
+};
+
+struct DefaultCallback
+{
+  using tag = InlineCallbackTag;
+  template <typename Query, typename OutputFunctor>
+  KOKKOS_FUNCTION void operator()(Query const &, int index,
+                                  OutputFunctor const &output) const
+  {
+    output(index);
+  }
+};
+
+// archetypal expression for user callbacks
+template <typename Callback, typename Predicate, typename Out>
+using InlineCallbackArchetypeExpression =
+    decltype(std::declval<Callback const &>()(std::declval<Predicate const &>(),
+                                              0, std::declval<Out const &>()));
+
+// legacy nearest predicate archetypal expression for user callbacks
+template <typename Callback, typename Predicate, typename Out>
+using Legacy_NearestPredicateInlineCallbackArchetypeExpression = decltype(
+    std::declval<Callback const &>()(std::declval<Predicate const &>(), 0, 0.f,
+                                     std::declval<Out const &>()));
+
+// archetypal alias for a 'tag' type member in user callbacks
+template <typename Callback>
+using CallbackTagArchetypeAlias = typename Callback::tag;
+
+template <typename Callback>
+struct is_tagged_post_callback
+    : std::is_same<detected_t<CallbackTagArchetypeAlias, Callback>,
+                   PostCallbackTag>::type
+{
+};
+
+// output functor to pass to the callback during detection
+template <typename T>
+struct Sink
+{
+  void operator()(T const &) const {}
+};
+
+template <typename OutputView>
+using OutputFunctorHelper = Sink<typename OutputView::value_type>;
+
+template <class Callback>
+void check_generic_lambda_support(Callback const &)
+{
+#ifdef __NVCC__
+  // Without it would get a segmentation fault and no diagnostic whatsoever
+  static_assert(
+      !__nv_is_extended_host_device_lambda_closure_type(Callback),
+      "__host__ __device__ extended lambdas cannot be generic lambdas");
+#endif
+}
+
+template <typename Callback, typename Predicates, typename OutputView>
+void check_valid_callback(Callback const &callback, Predicates const &,
+                          OutputView const &)
+{
+  check_generic_lambda_support(callback);
+
+  using Access = AccessTraits<Predicates, PredicatesTag>;
+  using PredicateTag = typename AccessTraitsHelper<Access>::tag;
+  using Predicate = typename AccessTraitsHelper<Access>::type;
+
+  static_assert(
+      !(std::is_same<PredicateTag, NearestPredicateTag>{} &&
+        is_detected<Legacy_NearestPredicateInlineCallbackArchetypeExpression,
+                    Callback, Predicate, OutputFunctorHelper<OutputView>>{}),
+      R"error(Callback signature has changed for nearest predicates.
+See https://github.com/arborx/ArborX/pull/366 for more details.
+Sorry!)error");
+
+  static_assert((std::is_same<PredicateTag, SpatialPredicateTag>{} ||
+                 std::is_same<PredicateTag, NearestPredicateTag>{}) &&
+                    is_detected<InlineCallbackArchetypeExpression, Callback,
+                                Predicate, OutputFunctorHelper<OutputView>>{},
+                "Callback 'operator()' does not have the correct signature");
+
+  static_assert(
+      std::is_void<detected_t<InlineCallbackArchetypeExpression, Callback,
+                              Predicate, OutputFunctorHelper<OutputView>>>{},
+      "Callback 'operator()' return type must be void");
+}
+
+// EXPERIMENTAL archetypal expression for user callbacks
+template <typename Callback, typename Predicate, typename Primitive>
+using Experimental_CallbackArchetypeExpression =
+    decltype(std::declval<Callback const &>()(
+        std::declval<Predicate const &>(), std::declval<Primitive const &>()));
+
+// Determine whether the callback returns a hint to exit the tree traversal
+// early.
+template <typename Callback, typename Predicate, typename Primitive>
+struct invoke_callback_and_check_early_exit_helper
+    : std::is_same<CallbackTreeTraversalControl,
+                   detected_t<Experimental_CallbackArchetypeExpression,
+                              Callback, Predicate, Primitive>>::type
+{
+};
+
+// Invoke a callback that may return a hint to interrupt the tree traversal and
+// return true for early exit, or false for normal continuation.
+template <typename Callback, typename Predicate, typename Primitive>
+KOKKOS_INLINE_FUNCTION
+    std::enable_if_t<invoke_callback_and_check_early_exit_helper<
+                         std::decay_t<Callback>, std::decay_t<Predicate>,
+                         std::decay_t<Primitive>>::value,
+                     bool>
+    invoke_callback_and_check_early_exit(Callback &&callback,
+                                         Predicate &&predicate,
+                                         Primitive &&primitive)
+{
+  return ((Callback &&) callback)((Predicate &&) predicate,
+                                  (Primitive &&) primitive) ==
+         CallbackTreeTraversalControl::early_exit;
+}
+
+// Invoke a callback that does not return a hint.  Always return false to
+// signify that the tree traversal should continue normally.
+template <typename Callback, typename Predicate, typename Primitive>
+KOKKOS_INLINE_FUNCTION
+    std::enable_if_t<!invoke_callback_and_check_early_exit_helper<
+                         std::decay_t<Callback>, std::decay_t<Predicate>,
+                         std::decay_t<Primitive>>::value,
+                     bool>
+    invoke_callback_and_check_early_exit(Callback &&callback,
+                                         Predicate &&predicate,
+                                         Primitive &&primitive)
+{
+  ((Callback &&) callback)((Predicate &&) predicate, (Primitive &&) primitive);
+  return false;
+}
+
+template <typename Callback, typename Predicates>
+void check_valid_callback(Callback const &callback, Predicates const &)
+{
+  check_generic_lambda_support(callback);
+
+  using Access = AccessTraits<Predicates, PredicatesTag>;
+  using PredicateTag = typename AccessTraitsHelper<Access>::tag;
+  using Predicate = typename AccessTraitsHelper<Access>::type;
+
+  static_assert((std::is_same<PredicateTag, SpatialPredicateTag>{} ||
+                 std::is_same<PredicateTag, NearestPredicateTag>{}) &&
+                    is_detected<Experimental_CallbackArchetypeExpression,
+                                Callback, Predicate, int>{},
+                "Callback 'operator()' does not have the correct signature");
+
+  static_assert(
+      (std::is_same<PredicateTag, SpatialPredicateTag>{} &&
+       (std::is_same<CallbackTreeTraversalControl,
+                     detected_t<Experimental_CallbackArchetypeExpression,
+                                Callback, Predicate, int>>{} ||
+        std::is_void<detected_t<Experimental_CallbackArchetypeExpression,
+                                Callback, Predicate, int>>{})) ||
+          std::is_same<PredicateTag, NearestPredicateTag>{},
+      "Callback 'operator()' return type must be void or "
+      "ArborX::CallbackTreeTraversalControl");
+
+  static_assert(
+      std::is_same<PredicateTag, SpatialPredicateTag>{} ||
+          (std::is_same<PredicateTag, NearestPredicateTag>{} &&
+           std::is_void<detected_t<Experimental_CallbackArchetypeExpression,
+                                   Callback, Predicate, int>>{}),
+      "Callback 'operator()' return type must be void");
+}
+
+} // namespace Details
+} // namespace ArborX
+
+#endif
diff --git a/arborx/src/details/ArborX_DetailsAlgorithms.hpp b/arborx/src/details/ArborX_DetailsAlgorithms.hpp
new file mode 100644
index 000000000..1290dbed6
--- /dev/null
+++ b/arborx/src/details/ArborX_DetailsAlgorithms.hpp
@@ -0,0 +1,259 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+#ifndef ARBORX_DETAILS_ALGORITHMS_HPP
+#define ARBORX_DETAILS_ALGORITHMS_HPP
+
+#include <ArborX_Box.hpp>
+#include <ArborX_DetailsKokkosExtArithmeticTraits.hpp>
+#include <ArborX_DetailsKokkosExtMathFunctions.hpp> // isFinite
+#include <ArborX_Point.hpp>
+#include <ArborX_Sphere.hpp>
+
+#include <Kokkos_Macros.hpp>
+
+namespace ArborX
+{
+namespace Details
+{
+
+KOKKOS_INLINE_FUNCTION
+constexpr bool equals(Point const &l, Point const &r)
+{
+  for (int d = 0; d < 3; ++d)
+    if (l[d] != r[d])
+      return false;
+  return true;
+}
+
+KOKKOS_INLINE_FUNCTION
+constexpr bool equals(Box const &l, Box const &r)
+{
+  return equals(l.minCorner(), r.minCorner()) &&
+         equals(l.maxCorner(), r.maxCorner());
+}
+
+KOKKOS_INLINE_FUNCTION
+constexpr bool equals(Sphere const &l, Sphere const &r)
+{
+  return equals(l.centroid(), r.centroid()) && l.radius() == r.radius();
+}
+
+KOKKOS_INLINE_FUNCTION
+bool isValid(Point const &p)
+{
+  using KokkosExt::isFinite;
+  for (int d = 0; d < 3; ++d)
+    if (!isFinite(p[d]))
+      return false;
+  return true;
+}
+
+KOKKOS_INLINE_FUNCTION
+bool isValid(Box const &b)
+{
+  using KokkosExt::isFinite;
+  for (int d = 0; d < 3; ++d)
+  {
+    auto const r_d = b.maxCorner()[d] - b.minCorner()[d];
+    if (r_d <= 0 || !isFinite(r_d))
+      return false;
+  }
+  return true;
+}
+
+KOKKOS_INLINE_FUNCTION
+bool isValid(Sphere const &s)
+{
+  using KokkosExt::isFinite;
+  return isValid(s.centroid()) && isFinite(s.radius()) && (s.radius() >= 0.);
+}
+
+// distance point-point
+KOKKOS_INLINE_FUNCTION
+float distance(Point const &a, Point const &b)
+{
+  float distance_squared = 0.0;
+  for (int d = 0; d < 3; ++d)
+  {
+    float tmp = b[d] - a[d];
+    distance_squared += tmp * tmp;
+  }
+  return std::sqrt(distance_squared);
+}
+
+// distance point-box
+KOKKOS_INLINE_FUNCTION
+float distance(Point const &point, Box const &box)
+{
+  Point projected_point;
+  for (int d = 0; d < 3; ++d)
+  {
+    if (point[d] < box.minCorner()[d])
+      projected_point[d] = box.minCorner()[d];
+    else if (point[d] > box.maxCorner()[d])
+      projected_point[d] = box.maxCorner()[d];
+    else
+      projected_point[d] = point[d];
+  }
+  return distance(point, projected_point);
+}
+
+// distance point-sphere
+KOKKOS_INLINE_FUNCTION
+float distance(Point const &point, Sphere const &sphere)
+{
+  using KokkosExt::max;
+  return max(distance(point, sphere.centroid()) - sphere.radius(), 0.f);
+}
+
+// distance box-box
+KOKKOS_INLINE_FUNCTION
+float distance(Box const &box_a, Box const &box_b)
+{
+  float distance_squared = 0.;
+  for (int d = 0; d < 3; ++d)
+  {
+    auto const a_min = box_a.minCorner()[d];
+    auto const a_max = box_a.maxCorner()[d];
+    auto const b_min = box_b.minCorner()[d];
+    auto const b_max = box_b.maxCorner()[d];
+    if (a_min > b_max)
+    {
+      float const delta = a_min - b_max;
+      distance_squared += delta * delta;
+    }
+    else if (b_min > a_max)
+    {
+      float const delta = b_min - a_max;
+      distance_squared += delta * delta;
+    }
+    else
+    {
+      // The boxes overlap on this axis: distance along this axis is zero.
+    }
+  }
+  return std::sqrt(distance_squared);
+}
+
+// distance box-sphere
+KOKKOS_INLINE_FUNCTION
+float distance(Sphere const &sphere, Box const &box)
+{
+  using KokkosExt::max;
+
+  float distance_center_box = distance(sphere.centroid(), box);
+  return max(distance_center_box - sphere.radius(), 0.f);
+}
+
+// expand an axis-aligned bounding box to include a point
+KOKKOS_INLINE_FUNCTION
+void expand(Box &box, Point const &point) { box += point; }
+
+// expand an axis-aligned bounding box to include another box
+// NOTE: Box type is templated here to be able to use expand(box, box) in a
+// Kokkos::parallel_reduce() in which case the arguments must be declared
+// volatile.
+template <typename BOX,
+          typename = typename std::enable_if<std::is_same<
+              typename std::remove_volatile<BOX>::type, Box>::value>::type>
+KOKKOS_INLINE_FUNCTION void expand(BOX &box, BOX const &other)
+{
+  box += other;
+}
+
+// expand an axis-aligned bounding box to include a sphere
+KOKKOS_INLINE_FUNCTION
+void expand(Box &box, Sphere const &sphere)
+{
+  using KokkosExt::max;
+  using KokkosExt::min;
+  for (int d = 0; d < 3; ++d)
+  {
+    box.minCorner()[d] =
+        min(box.minCorner()[d], sphere.centroid()[d] - sphere.radius());
+    box.maxCorner()[d] =
+        max(box.maxCorner()[d], sphere.centroid()[d] + sphere.radius());
+  }
+}
+
+// check if two axis-aligned bounding boxes intersect
+KOKKOS_INLINE_FUNCTION
+constexpr bool intersects(Box const &box, Box const &other)
+{
+  for (int d = 0; d < 3; ++d)
+    if (box.minCorner()[d] > other.maxCorner()[d] ||
+        box.maxCorner()[d] < other.minCorner()[d])
+      return false;
+  return true;
+}
+
+KOKKOS_INLINE_FUNCTION
+constexpr bool intersects(Point const &point, Box const &other)
+{
+  for (int d = 0; d < 3; ++d)
+    if (point[d] > other.maxCorner()[d] || point[d] < other.minCorner()[d])
+      return false;
+  return true;
+}
+
+// check if a sphere intersects with an  axis-aligned bounding box
+KOKKOS_INLINE_FUNCTION
+bool intersects(Sphere const &sphere, Box const &box)
+{
+  return distance(sphere.centroid(), box) <= sphere.radius();
+}
+
+// calculate the centroid of a box
+KOKKOS_INLINE_FUNCTION
+void centroid(Box const &box, Point &c)
+{
+  for (int d = 0; d < 3; ++d)
+    c[d] = (box.minCorner()[d] + box.maxCorner()[d]) / 2;
+}
+
+KOKKOS_INLINE_FUNCTION
+void centroid(Point const &point, Point &c) { c = point; }
+
+KOKKOS_INLINE_FUNCTION
+void centroid(Sphere const &sphere, Point &c) { c = sphere.centroid(); }
+
+KOKKOS_INLINE_FUNCTION
+Point returnCentroid(Point const &point) { return point; }
+
+KOKKOS_INLINE_FUNCTION
+Point returnCentroid(Box const &box)
+{
+  Point c;
+  for (int d = 0; d < 3; ++d)
+    c[d] = (box.minCorner()[d] + box.maxCorner()[d]) / 2;
+  return c;
+}
+
+KOKKOS_INLINE_FUNCTION
+Point returnCentroid(Sphere const &sphere) { return sphere.centroid(); }
+
+// transformation that maps the unit cube into a new axis-aligned box
+// NOTE safe to perform in-place
+KOKKOS_INLINE_FUNCTION
+void translateAndScale(Point const &in, Point &out, Box const &ref)
+{
+  for (int d = 0; d < 3; ++d)
+  {
+    auto const a = ref.minCorner()[d];
+    auto const b = ref.maxCorner()[d];
+    out[d] = (a != b ? (in[d] - a) / (b - a) : 0);
+  }
+}
+
+} // namespace Details
+} // namespace ArborX
+
+#endif
diff --git a/arborx/src/details/ArborX_DetailsBatchedQueries.hpp b/arborx/src/details/ArborX_DetailsBatchedQueries.hpp
new file mode 100644
index 000000000..1080dd9f5
--- /dev/null
+++ b/arborx/src/details/ArborX_DetailsBatchedQueries.hpp
@@ -0,0 +1,188 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#ifndef ARBORX_DETAILS_BATCHED_QUERIES_HPP
+#define ARBORX_DETAILS_BATCHED_QUERIES_HPP
+
+#include <ArborX_AccessTraits.hpp>
+#include <ArborX_Box.hpp>
+#include <ArborX_DetailsAlgorithms.hpp> // returnCentroid, translateAndScale
+#include <ArborX_DetailsMortonCode.hpp> // morton3D
+#include <ArborX_DetailsSortUtils.hpp>  // sortObjects
+#include <ArborX_DetailsUtils.hpp>      // exclusivePrefixSum, lastElement
+
+#include <Kokkos_Core.hpp>
+
+#include <tuple>
+
+namespace ArborX
+{
+
+namespace Details
+{
+template <typename DeviceType>
+struct BatchedQueries
+{
+public:
+  // BatchedQueries defines functions for sorting queries along the Z-order
+  // space-filling curve in order to minimize data divergence.  The goal is
+  // to increase correlation between traversal decisions made by nearby
+  // threads and thereby increase performance.
+  //
+  // NOTE: sortQueriesAlongZOrderCurve() does not actually apply the sorting
+  // order, it returns the permutation indices.  applyPermutation() was added
+  // in that purpose.  reversePermutation() is able to restore the initial
+  // order on the results that are in "compressed row storage" format.  You
+  // may notice it is not used any more in the code that performs the batched
+  // queries.  We found that it was slighly more performant to add a level of
+  // indirection when recording results rather than using that function at
+  // the end.  We decided to keep reversePermutation around for now.
+
+  template <typename ExecutionSpace, typename Predicates>
+  static Kokkos::View<unsigned int *, DeviceType>
+  sortQueriesAlongZOrderCurve(ExecutionSpace const &space,
+                              Box const &scene_bounding_box,
+                              Predicates const &predicates)
+  {
+    using Access = AccessTraits<Predicates, PredicatesTag>;
+    auto const n_queries = Access::size(predicates);
+
+    Kokkos::View<unsigned int *, DeviceType> morton_codes(
+        Kokkos::view_alloc(Kokkos::WithoutInitializing,
+                           "ArborX::BVH::query::morton"),
+        n_queries);
+    Kokkos::parallel_for(
+        "ArborX::BatchedQueries::assign_morton_codes_to_queries",
+        Kokkos::RangePolicy<ExecutionSpace>(space, 0, n_queries),
+        KOKKOS_LAMBDA(int i) {
+          using Details::returnCentroid;
+          Point xyz = returnCentroid(getGeometry(Access::get(predicates, i)));
+          translateAndScale(xyz, xyz, scene_bounding_box);
+          morton_codes(i) = morton3D(xyz[0], xyz[1], xyz[2]);
+        });
+
+    return sortObjects(space, morton_codes);
+  }
+
+  // NOTE  trailing return type seems required :(
+  // error: The enclosing parent function ("applyPermutation") for an extended
+  // __host__ __device__ lambda must not have deduced return type
+  template <typename ExecutionSpace, typename Predicates>
+  static auto
+  applyPermutation(ExecutionSpace const &space,
+                   Kokkos::View<unsigned int const *, DeviceType> permute,
+                   Predicates const &v)
+      -> Kokkos::View<typename AccessTraitsHelper<
+                          AccessTraits<Predicates, PredicatesTag>>::type *,
+                      DeviceType>
+  {
+    using Access = AccessTraits<Predicates, PredicatesTag>;
+    auto const n = Access::size(v);
+    ARBORX_ASSERT(permute.extent(0) == n);
+
+    using T = std::decay_t<decltype(
+        Access::get(std::declval<Predicates const &>(), std::declval<int>()))>;
+    Kokkos::View<T *, DeviceType> w(
+        Kokkos::view_alloc(Kokkos::WithoutInitializing, "predicates"), n);
+    Kokkos::parallel_for(
+        "ArborX::BatchedQueries::permute_entries",
+        Kokkos::RangePolicy<ExecutionSpace>(space, 0, n),
+        KOKKOS_LAMBDA(int i) { w(i) = Access::get(v, permute(i)); });
+
+    return w;
+  }
+
+  template <typename ExecutionSpace, typename Permute, typename Offset>
+  static typename Offset::non_const_type
+  permuteOffset(ExecutionSpace const &space, Permute const &permute,
+                Offset const &offset)
+  {
+    auto const n = permute.extent(0);
+    ARBORX_ASSERT(offset.extent(0) == n + 1);
+
+    auto tmp_offset = cloneWithoutInitializingNorCopying(offset);
+    Kokkos::parallel_for(
+        "ArborX::BatchedQueries::adjacent_difference_and_permutation",
+        Kokkos::RangePolicy<ExecutionSpace>(space, 0, n), KOKKOS_LAMBDA(int i) {
+          tmp_offset(permute(i)) = offset(i + 1) - offset(i);
+        });
+
+    exclusivePrefixSum(space, tmp_offset);
+
+    return tmp_offset;
+  }
+
+  template <typename ExecutionSpace, typename Permute, typename Values,
+            typename Offset, typename Offset2>
+  static typename Values::non_const_type
+  permuteIndices(ExecutionSpace const &space, Permute const &permute,
+                 Values const &indices, Offset const &offset,
+                 Offset2 const &tmp_offset)
+  {
+    auto const n = permute.extent(0);
+
+    ARBORX_ASSERT(offset.extent(0) == n + 1);
+    ARBORX_ASSERT(tmp_offset.extent(0) == n + 1);
+    ARBORX_ASSERT(lastElement(offset) == indices.extent_int(0));
+    ARBORX_ASSERT(lastElement(tmp_offset) == indices.extent_int(0));
+
+    auto tmp_indices = cloneWithoutInitializingNorCopying(indices);
+    Kokkos::parallel_for(
+        "ArborX::BatchedQueries::permute_indices",
+        Kokkos::RangePolicy<ExecutionSpace>(space, 0, n), KOKKOS_LAMBDA(int q) {
+          for (int i = 0; i < offset(q + 1) - offset(q); ++i)
+          {
+            tmp_indices(tmp_offset(permute(q)) + i) = indices(offset(q) + i);
+          }
+        });
+    return tmp_indices;
+  }
+
+  template <typename ExecutionSpace, typename T, typename... P>
+  static std::tuple<Kokkos::View<int *, DeviceType>, Kokkos::View<T *, P...>>
+  reversePermutation(ExecutionSpace const &space,
+                     Kokkos::View<unsigned int const *, DeviceType> permute,
+                     Kokkos::View<int const *, DeviceType> offset,
+                     Kokkos::View<T /*const*/ *, P...> out)
+  {
+    auto const tmp_offset = permuteOffset(space, permute, offset);
+
+    auto const tmp_out =
+        permuteIndices(space, permute, out, offset, tmp_offset);
+    return std::make_tuple(tmp_offset, tmp_out);
+  }
+
+  template <typename ExecutionSpace>
+  static std::tuple<Kokkos::View<int *, DeviceType>,
+                    Kokkos::View<int *, DeviceType>,
+                    Kokkos::View<float *, DeviceType>>
+  reversePermutation(ExecutionSpace const &space,
+                     Kokkos::View<unsigned int const *, DeviceType> permute,
+                     Kokkos::View<int const *, DeviceType> offset,
+                     Kokkos::View<int const *, DeviceType> indices,
+                     Kokkos::View<float const *, DeviceType> distances)
+  {
+    auto const tmp_offset = permuteOffset(permute, offset);
+
+    auto const tmp_indices =
+        permuteIndices(space, permute, indices, offset, tmp_offset);
+
+    auto const tmp_distances =
+        permuteIndices(space, permute, distances, offset, tmp_offset);
+
+    return std::make_tuple(tmp_offset, tmp_indices, tmp_distances);
+  }
+};
+
+} // namespace Details
+} // namespace ArborX
+
+#endif
diff --git a/arborx/src/details/ArborX_DetailsBruteForceImpl.hpp b/arborx/src/details/ArborX_DetailsBruteForceImpl.hpp
new file mode 100644
index 000000000..40371e7f1
--- /dev/null
+++ b/arborx/src/details/ArborX_DetailsBruteForceImpl.hpp
@@ -0,0 +1,152 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#ifndef ARBORX_DETAILS_BRUTE_FORCE_IMPL_HPP
+#define ARBORX_DETAILS_BRUTE_FORCE_IMPL_HPP
+
+#include <ArborX_AccessTraits.hpp>
+#include <ArborX_DetailsAlgorithms.hpp> // expand
+#include <ArborX_DetailsTreeConstruction.hpp> // Kokkos::reduction_identity<ArborX::Box>
+
+#include <Kokkos_Core.hpp>
+
+namespace ArborX
+{
+namespace Details
+{
+struct BruteForceImpl
+{
+  template <class ExecutionSpace, class Primitives, class BoundingVolumes,
+            class Bounds>
+  static void initializeBoundingVolumesAndReduceBoundsOfTheScene(
+      ExecutionSpace const &space, Primitives const &primitives,
+      BoundingVolumes const &bounding_volumes, Bounds &bounds)
+  {
+    using Access = AccessTraits<Primitives, PrimitivesTag>;
+
+    int const n = Access::size(primitives);
+
+    Kokkos::parallel_reduce("ArborX::BruteForce::BruteForce::"
+                            "initialize_bounding_volumes_and_reduce_bounds",
+                            Kokkos::RangePolicy<ExecutionSpace>(space, 0, n),
+                            KOKKOS_LAMBDA(int i, Bounds &update) {
+                              using Details::expand;
+                              Bounds bounding_volume{};
+                              expand(bounding_volume,
+                                     Access::get(primitives, i));
+                              bounding_volumes(i) = bounding_volume;
+                              update += bounding_volume;
+                            },
+                            bounds);
+  }
+
+  template <class ExecutionSpace, class Primitives, class Predicates,
+            class Callback>
+  static void query(ExecutionSpace const &space, Primitives const &primitives,
+                    Predicates const &predicates, Callback const &callback)
+  {
+    using TeamPolicy = Kokkos::TeamPolicy<ExecutionSpace>;
+    using AccessPrimitives = AccessTraits<Primitives, PrimitivesTag>;
+    using AccessPredicates = AccessTraits<Predicates, PredicatesTag>;
+    using PredicateType = typename AccessTraitsHelper<AccessPredicates>::type;
+    using PrimitiveType = typename AccessTraitsHelper<AccessPrimitives>::type;
+
+    int const n_primitives = AccessPrimitives::size(primitives);
+    int const n_predicates = AccessPredicates::size(predicates);
+    int max_scratch_size = TeamPolicy::scratch_size_max(0);
+    // half of the scratch memory used by predicates and half for primitives
+    int const predicates_per_team =
+        max_scratch_size / 2 / sizeof(PredicateType);
+    int const primitives_per_team =
+        max_scratch_size / 2 / sizeof(PrimitiveType);
+    ARBORX_ASSERT(predicates_per_team > 0);
+    ARBORX_ASSERT(primitives_per_team > 0);
+
+    int const n_primitive_tiles =
+        std::ceil((float)n_primitives / primitives_per_team);
+    int const n_predicate_tiles =
+        std::ceil((float)n_predicates / predicates_per_team);
+    int const n_teams = n_primitive_tiles * n_predicate_tiles;
+
+    using ScratchPredicateType =
+        Kokkos::View<PredicateType *,
+                     typename ExecutionSpace::scratch_memory_space,
+                     Kokkos::MemoryTraits<Kokkos::Unmanaged>>;
+    using ScratchPrimitiveType =
+        Kokkos::View<PrimitiveType *,
+                     typename ExecutionSpace::scratch_memory_space,
+                     Kokkos::MemoryTraits<Kokkos::Unmanaged>>;
+    int scratch_size = ScratchPredicateType::shmem_size(predicates_per_team) +
+                       ScratchPrimitiveType::shmem_size(primitives_per_team);
+
+    Kokkos::parallel_for(
+        "ArborX::BruteForce::query::spatial::"
+        "check_all_predicates_against_all_primitives",
+        TeamPolicy(space, n_teams, Kokkos::AUTO, 1)
+            .set_scratch_size(0, Kokkos::PerTeam(scratch_size)),
+        KOKKOS_LAMBDA(typename TeamPolicy::member_type const &teamMember) {
+          // select the tiles of predicates/primitives checked by each team
+          int predicate_start = predicates_per_team *
+                                (teamMember.league_rank() / n_primitive_tiles);
+          int primitive_start = primitives_per_team *
+                                (teamMember.league_rank() % n_primitive_tiles);
+
+          int predicates_in_this_team = KokkosExt::min(
+              predicates_per_team, n_predicates - predicate_start);
+          int primitives_in_this_team = KokkosExt::min(
+              primitives_per_team, n_primitives - primitive_start);
+
+          ScratchPredicateType scratch_predicates(teamMember.team_scratch(0),
+                                                  predicates_per_team);
+          ScratchPrimitiveType scratch_primitives(teamMember.team_scratch(0),
+                                                  primitives_per_team);
+          // rank 0 in each team fills the scratch space with the
+          // predicates / primitives in the tile
+          if (teamMember.team_rank() == 0)
+          {
+            Kokkos::parallel_for(
+                Kokkos::ThreadVectorRange(teamMember, predicates_in_this_team),
+                [&](const int q) {
+                  scratch_predicates(q) =
+                      AccessPredicates::get(predicates, predicate_start + q);
+                });
+            Kokkos::parallel_for(
+                Kokkos::ThreadVectorRange(teamMember, primitives_in_this_team),
+                [&](const int j) {
+                  scratch_primitives(j) =
+                      AccessPrimitives::get(primitives, primitive_start + j);
+                });
+          }
+          teamMember.team_barrier();
+
+          // start threads for every predicate / primitive combination
+          Kokkos::parallel_for(
+              Kokkos::TeamThreadRange(teamMember, primitives_in_this_team),
+              [&](int j) {
+                Kokkos::parallel_for(
+                    Kokkos::ThreadVectorRange(teamMember,
+                                              predicates_in_this_team),
+                    [&](const int q) {
+                      auto const &predicate = scratch_predicates(q);
+                      auto const &primitive = scratch_primitives(j);
+                      if (predicate(primitive))
+                      {
+                        callback(predicate, j + primitive_start);
+                      }
+                    });
+              });
+        });
+  }
+};
+} // namespace Details
+} // namespace ArborX
+
+#endif
diff --git a/arborx/src/details/ArborX_DetailsConcepts.hpp b/arborx/src/details/ArborX_DetailsConcepts.hpp
new file mode 100644
index 000000000..9f294ac8c
--- /dev/null
+++ b/arborx/src/details/ArborX_DetailsConcepts.hpp
@@ -0,0 +1,77 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#ifndef ARBORX_DETAILS_CONCEPTS_HPP
+#define ARBORX_DETAILS_CONCEPTS_HPP
+
+#include <type_traits>
+
+#if !defined(__cpp_lib_void_t)
+namespace std
+{
+template <typename...>
+using void_t = void;
+}
+#endif
+
+#if !defined(DOXYGEN_SHOULD_SKIP_THIS)
+namespace ArborX
+{
+namespace Details
+{
+
+struct not_a_type
+{
+  not_a_type() = delete;
+  ~not_a_type() = delete;
+  not_a_type(not_a_type const &) = delete;
+  void operator=(not_a_type const &) = delete;
+};
+
+// primary template handles all types not supporting the archetypal Op
+template <class, template <class...> class Op, class... Args>
+struct is_detected_impl : std::false_type
+{
+  using type = not_a_type;
+};
+
+// specialization recognizes and handles only types supporting Op
+template <template <class...> class Op, class... Args>
+struct is_detected_impl<std::void_t<Op<Args...>>, Op, Args...> : std::true_type
+{
+  using type = Op<Args...>;
+};
+
+template <template <class...> class Op, class... Args>
+struct is_detected : is_detected_impl<void, Op, Args...>
+{
+};
+
+template <template <class...> class Op, class... Args>
+using detected_t = typename is_detected<Op, Args...>::type;
+
+template <typename T>
+struct first_template_parameter;
+
+template <template <typename...> class E, typename Head, typename... Tail>
+struct first_template_parameter<E<Head, Tail...>>
+{
+  using type = Head;
+};
+
+template <typename T>
+using first_template_parameter_t = typename first_template_parameter<T>::type;
+
+} // namespace Details
+} // namespace ArborX
+#endif // DOXYGEN_SHOULD_SKIP_THIS
+
+#endif
diff --git a/arborx/src/details/ArborX_DetailsContainers.hpp b/arborx/src/details/ArborX_DetailsContainers.hpp
new file mode 100644
index 000000000..c77e10948
--- /dev/null
+++ b/arborx/src/details/ArborX_DetailsContainers.hpp
@@ -0,0 +1,106 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+#ifndef ARBORX_DETAILS_CONTAINERS_HPP
+#define ARBORX_DETAILS_CONTAINERS_HPP
+
+#include <Kokkos_Macros.hpp>
+
+#include <cassert> // assert
+#include <cstddef> // size_t, ptrdiff_t
+#include <utility> // move, forward
+
+namespace ArborX
+{
+namespace Details
+{
+
+// dynamic vector with fixed maximum size
+template <typename T, std::size_t N>
+class StaticVector
+{
+  // clang-format off
+  public:
+    using value_type = T;
+    using size_type = std::size_t;
+    using difference_type = std::ptrdiff_t;
+    using reference = value_type &;
+    using const_reference = value_type const &;
+    using pointer = value_type *;
+    using const_pointer = value_type const *;
+    KOKKOS_DEFAULTED_FUNCTION StaticVector() = default;
+    KOKKOS_INLINE_FUNCTION bool empty() const { return _size == 0; }
+    KOKKOS_INLINE_FUNCTION size_type size() const { return _size; }
+    KOKKOS_INLINE_FUNCTION constexpr size_type maxSize() const { return N; }
+    KOKKOS_INLINE_FUNCTION constexpr size_type capacity() const { return N; }
+    KOKKOS_INLINE_FUNCTION reference operator[]( size_type pos ) { assert(pos < size()); return _data[pos]; }
+    KOKKOS_INLINE_FUNCTION const_reference operator[]( size_type pos ) const { assert(pos < size()); return _data[pos]; }
+    KOKKOS_INLINE_FUNCTION reference back() { assert(size() > 0 ); return _data[_size - 1]; }
+    KOKKOS_INLINE_FUNCTION const_reference back() const { assert(size() > 0); return _data[_size - 1]; }
+    KOKKOS_INLINE_FUNCTION void pushBack(T const &value) { assert(size() < maxSize()); _data[_size++] = value; }
+    KOKKOS_INLINE_FUNCTION void pushBack(T &&value) { assert(size() < maxSize()); _data[_size++] = std::move(value); }
+    template<class... Args>
+    KOKKOS_INLINE_FUNCTION void emplaceBack(Args&&... args) { assert(size() < maxSize()); ::new (static_cast<void*>(_data + _size++)) T(std::forward<Args>(args)...); }
+    KOKKOS_INLINE_FUNCTION void popBack() { assert(size() > 0); _size--; }
+    KOKKOS_INLINE_FUNCTION reference front() { assert(size() > 0); return _data[0]; }
+    KOKKOS_INLINE_FUNCTION const_reference front() const { assert(size() > 0); return _data[0]; }
+    KOKKOS_INLINE_FUNCTION void clear() { _size = 0; }
+    KOKKOS_INLINE_FUNCTION pointer data() { return _data; }
+    KOKKOS_INLINE_FUNCTION constexpr const_pointer data() const { return _data; }
+
+  private:
+    value_type _data[N];
+    size_type _size = 0;
+  // clang-format on
+};
+
+template <typename T>
+class UnmanagedStaticVector
+{
+  // clang-format off
+  public:
+    using value_type = T;
+    using size_type = std::size_t;
+    using difference_type = std::ptrdiff_t;
+    using reference = value_type &;
+    using const_reference = value_type const &;
+    using pointer = value_type *;
+    using const_pointer = value_type const *;
+    KOKKOS_FUNCTION UnmanagedStaticVector( pointer ptr, size_type max_size ) : _ptr(ptr) , _max_size(max_size) { assert(ptr != nullptr); }
+    KOKKOS_INLINE_FUNCTION bool empty() const { return _size == 0; }
+    KOKKOS_INLINE_FUNCTION size_type size() const { return _size; }
+    KOKKOS_INLINE_FUNCTION constexpr size_type maxSize() const { return _max_size; }
+    KOKKOS_INLINE_FUNCTION constexpr size_type capacity() const { return _max_size; }
+    KOKKOS_INLINE_FUNCTION reference operator[]( size_type pos ) { assert(pos < size()); return *(_ptr + pos); }
+    KOKKOS_INLINE_FUNCTION const_reference operator[]( size_type pos ) const { assert(pos < size()); return *(_ptr + pos); }
+    KOKKOS_INLINE_FUNCTION reference back() { assert(size() > 0); return *(_ptr + _size - 1); }
+    KOKKOS_INLINE_FUNCTION const_reference back() const { assert(size() > 0); return *(_ptr + _size - 1); }
+    KOKKOS_INLINE_FUNCTION void pushBack(T const &value) { assert(size() < maxSize()); *(_ptr + _size++) = value; }
+    KOKKOS_INLINE_FUNCTION void pushBack(T &&value) { assert(size() < maxSize()); *(_ptr + _size++) = std::move(value); }
+    template<class... Args>
+    KOKKOS_INLINE_FUNCTION void emplaceBack(Args&&... args) { assert(size() < maxSize()); ::new (static_cast<void*>(_ptr + _size++)) T(std::forward<Args>(args)...); }
+    KOKKOS_INLINE_FUNCTION void popBack() { assert(size() > 0); _size--; }
+    KOKKOS_INLINE_FUNCTION reference front() { assert(size() > 0); return *(_ptr + 0); }
+    KOKKOS_INLINE_FUNCTION const_reference front() const { assert(size() > 0); return *(_ptr + 0); }
+    KOKKOS_INLINE_FUNCTION void clear() { _size = 0; }
+    KOKKOS_INLINE_FUNCTION pointer data() { return _ptr; }
+    KOKKOS_INLINE_FUNCTION const_pointer data() const { return _ptr; }
+
+  private:
+    pointer _ptr = nullptr;
+    size_type const _max_size = 0;
+    size_type _size = 0;
+  // clang-format on
+};
+
+} // namespace Details
+} // namespace ArborX
+
+#endif
diff --git a/arborx/src/details/ArborX_DetailsCrsGraphWrapperImpl.hpp b/arborx/src/details/ArborX_DetailsCrsGraphWrapperImpl.hpp
new file mode 100644
index 000000000..b0e45c404
--- /dev/null
+++ b/arborx/src/details/ArborX_DetailsCrsGraphWrapperImpl.hpp
@@ -0,0 +1,475 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#ifndef ARBORX_DETAIL_CRS_GRAPH_WRAPPER_IMPL_HPP
+#define ARBORX_DETAIL_CRS_GRAPH_WRAPPER_IMPL_HPP
+
+#include <ArborX_AccessTraits.hpp>
+#include <ArborX_Callbacks.hpp>
+#include <ArborX_DetailsBatchedQueries.hpp>
+#include <ArborX_DetailsPermutedData.hpp>
+#include <ArborX_Predicates.hpp>
+#include <ArborX_TraversalPolicy.hpp>
+
+namespace ArborX
+{
+namespace Details
+{
+
+enum BufferStatus
+{
+  PreallocationNone = 0,
+  PreallocationHard = -1,
+  PreallocationSoft = 1
+};
+
+inline BufferStatus toBufferStatus(int buffer_size)
+{
+  if (buffer_size == 0)
+    return BufferStatus::PreallocationNone;
+  if (buffer_size > 0)
+    return BufferStatus::PreallocationSoft;
+  return BufferStatus::PreallocationHard;
+}
+
+struct FirstPassTag
+{
+};
+struct FirstPassNoBufferOptimizationTag
+{
+};
+struct SecondPassTag
+{
+};
+
+template <typename PassTag, typename Predicates, typename Callback,
+          typename OutputView, typename CountView, typename PermutedOffset>
+struct InsertGenerator
+{
+  Callback _callback;
+  OutputView _out;
+  CountView _counts;
+  PermutedOffset _permuted_offset;
+
+  using ValueType = typename OutputView::value_type;
+  using Access = AccessTraits<Predicates, PredicatesTag>;
+  using PredicateType = typename AccessTraitsHelper<Access>::type;
+
+  template <typename U = PassTag,
+            std::enable_if_t<std::is_same<U, FirstPassTag>{}> * = nullptr>
+  KOKKOS_FUNCTION auto operator()(PredicateType const &predicate,
+                                  int primitive_index) const
+  {
+    auto const predicate_index = getData(predicate);
+    auto const &raw_predicate = getPredicate(predicate);
+    // With permutation, we access offset in random manner, and
+    // _offset(permutated_predicate_index+1) may be in a completely different
+    // place. Instead, use pointers to get the correct value for the buffer
+    // size. For this reason, also take a reference for offset.
+    auto const &offset = _permuted_offset(predicate_index);
+    auto const buffer_size = *(&offset + 1) - offset;
+    auto &count = _counts(predicate_index);
+
+    return _callback(raw_predicate, primitive_index,
+                     [&](ValueType const &value) {
+                       int count_old = Kokkos::atomic_fetch_add(&count, 1);
+                       if (count_old < buffer_size)
+                         _out(offset + count_old) = value;
+                     });
+  }
+
+  template <
+      typename U = PassTag,
+      std::enable_if_t<std::is_same<U, FirstPassNoBufferOptimizationTag>{}> * =
+          nullptr>
+  KOKKOS_FUNCTION auto operator()(PredicateType const &predicate,
+                                  int primitive_index) const
+  {
+    auto const predicate_index = getData(predicate);
+    auto const &raw_predicate = getPredicate(predicate);
+
+    auto &count = _counts(predicate_index);
+
+    return _callback(raw_predicate, primitive_index, [&](ValueType const &) {
+      Kokkos::atomic_fetch_add(&count, 1);
+    });
+  }
+
+  template <typename U = PassTag,
+            std::enable_if_t<std::is_same<U, SecondPassTag>{}> * = nullptr>
+  KOKKOS_FUNCTION auto operator()(PredicateType const &predicate,
+                                  int primitive_index) const
+  {
+    auto const predicate_index = getData(predicate);
+    auto const &raw_predicate = getPredicate(predicate);
+
+    // we store offsets in counts, and offset(permute(i)) = counts(i)
+    auto &offset = _counts(predicate_index);
+
+    // TODO: there is a tradeoff here between skipping computation offset +
+    // count, and atomic increment of count. I think atomically incrementing
+    // offset is problematic for OpenMP as you potentially constantly steal
+    // cache lines.
+    return _callback(raw_predicate, primitive_index,
+                     [&](ValueType const &value) {
+                       _out(Kokkos::atomic_fetch_add(&offset, 1)) = value;
+                     });
+  }
+};
+
+namespace CrsGraphWrapperImpl
+{
+
+template <typename ExecutionSpace, typename Tree, typename Predicates,
+          typename Callback, typename OutputView, typename OffsetView,
+          typename PermuteType>
+void queryImpl(ExecutionSpace const &space, Tree const &tree,
+               Predicates const &predicates, Callback const &callback,
+               OutputView &out, OffsetView &offset, PermuteType permute,
+               BufferStatus buffer_status)
+{
+  // pre-condition: offset and out are preallocated. If buffer_size > 0, offset
+  // is pre-initialized
+
+  static_assert(Kokkos::is_execution_space<ExecutionSpace>{}, "");
+
+  using Access = AccessTraits<Predicates, PredicatesTag>;
+  auto const n_queries = Access::size(predicates);
+
+  Kokkos::Profiling::pushRegion("ArborX::CrsGraphWrapper::two_pass");
+
+  using CountView = OffsetView;
+  CountView counts(Kokkos::view_alloc("ArborX::CrsGraphWrapper::counts", space),
+                   n_queries);
+
+  using PermutedPredicates =
+      PermutedData<Predicates, PermuteType, true /*AttachIndices*/>;
+  PermutedPredicates permuted_predicates = {predicates, permute};
+
+  using PermutedOffset = PermutedData<OffsetView, PermuteType>;
+  PermutedOffset permuted_offset = {offset, permute};
+
+  Kokkos::Profiling::pushRegion(
+      "ArborX::CrsGraphWrapper::two_pass::first_pass");
+  bool underflow = false;
+  bool overflow = false;
+  if (buffer_status != BufferStatus::PreallocationNone)
+  {
+    tree.query(
+        space, permuted_predicates,
+        InsertGenerator<FirstPassTag, PermutedPredicates, Callback, OutputView,
+                        CountView, PermutedOffset>{callback, out, counts,
+                                                   permuted_offset},
+        ArborX::Experimental::TraversalPolicy().setPredicateSorting(false));
+
+    // Detecting overflow is a local operation that needs to be done for every
+    // index. We allow individual buffer sizes to differ, so it's not as easy
+    // as computing max counts.
+    int overflow_int = 0;
+    Kokkos::parallel_reduce(
+        "ArborX::CrsGraphWrapper::compute_overflow",
+        Kokkos::RangePolicy<ExecutionSpace>(space, 0, n_queries),
+        KOKKOS_LAMBDA(int i, int &update) {
+          auto const *const offset_ptr = &permuted_offset(i);
+          if (counts(i) > *(offset_ptr + 1) - *offset_ptr)
+            update = 1;
+        },
+        overflow_int);
+    overflow = (overflow_int > 0);
+
+    if (!overflow)
+    {
+      int n_results = 0;
+      Kokkos::parallel_reduce(
+          "ArborX::CrsGraphWrapper::compute_underflow",
+          Kokkos::RangePolicy<ExecutionSpace>(space, 0, n_queries),
+          KOKKOS_LAMBDA(int i, int &update) { update += counts(i); },
+          n_results);
+      underflow = (n_results < out.extent_int(0));
+    }
+  }
+  else
+  {
+    tree.query(
+        space, permuted_predicates,
+        InsertGenerator<FirstPassNoBufferOptimizationTag, PermutedPredicates,
+                        Callback, OutputView, CountView, PermutedOffset>{
+            callback, out, counts, permuted_offset},
+        ArborX::Experimental::TraversalPolicy().setPredicateSorting(false));
+    // This may not be true, but it does not matter. As long as we have
+    // (n_results == 0) check before second pass, this value is not used.
+    // Otherwise, we know it's overflowed as there is no allocation.
+    overflow = true;
+  }
+
+  Kokkos::Profiling::popRegion();
+  Kokkos::Profiling::pushRegion(
+      "ArborX::CrsGraphWrapper::first_pass_postprocess");
+
+  OffsetView preallocated_offset("ArborX::CrsGraphWrapper::offset_copy", 0);
+  if (underflow)
+  {
+    // Store a copy of the original offset. We'll need it for compression.
+    preallocated_offset = clone(space, offset);
+  }
+
+  Kokkos::parallel_for(
+      "ArborX::CrsGraphWrapper::copy_counts_to_offsets",
+      Kokkos::RangePolicy<ExecutionSpace>(space, 0, n_queries),
+      KOKKOS_LAMBDA(int const i) { permuted_offset(i) = counts(i); });
+  exclusivePrefixSum(space, offset);
+
+  int const n_results = lastElement(offset);
+
+  Kokkos::Profiling::popRegion();
+
+  if (n_results == 0)
+  {
+    // Exit early if either no results were found for any of the queries, or
+    // nothing was inserted inside a callback for found results. This check
+    // guarantees that the second pass will not be executed.
+    Kokkos::resize(out, 0);
+    // FIXME: do we need to reset offset if it was preallocated here?
+    Kokkos::Profiling::popRegion();
+    return;
+  }
+
+  if (overflow || buffer_status == BufferStatus::PreallocationNone)
+  {
+    // Not enough (individual) storage for results
+
+    // If it was hard preallocation, we simply throw
+    ARBORX_ASSERT(buffer_status != BufferStatus::PreallocationHard);
+
+    // Otherwise, do the second pass
+    Kokkos::Profiling::pushRegion(
+        "ArborX::CrsGraphWrapper::two_pass:second_pass");
+
+    Kokkos::parallel_for(
+        "ArborX::CrsGraphWrapper::copy_offsets_to_counts",
+        Kokkos::RangePolicy<ExecutionSpace>(space, 0, n_queries),
+        KOKKOS_LAMBDA(int const i) { counts(i) = permuted_offset(i); });
+
+    reallocWithoutInitializing(out, n_results);
+
+    tree.query(
+        space, permuted_predicates,
+        InsertGenerator<SecondPassTag, PermutedPredicates, Callback, OutputView,
+                        CountView, PermutedOffset>{callback, out, counts,
+                                                   permuted_offset},
+        ArborX::Experimental::TraversalPolicy().setPredicateSorting(false));
+
+    Kokkos::Profiling::popRegion();
+  }
+  else if (underflow)
+  {
+    // More than enough storage for results, need compression
+    Kokkos::Profiling::pushRegion(
+        "ArborX::CrsGraphWrapper::two_pass:copy_values");
+
+    OutputView tmp_out(
+        Kokkos::view_alloc(Kokkos::WithoutInitializing, out.label()),
+        n_results);
+
+    Kokkos::parallel_for(
+        "ArborX::CrsGraphWrapper::copy_valid_values",
+        Kokkos::RangePolicy<ExecutionSpace>(space, 0, n_queries),
+        KOKKOS_LAMBDA(int i) {
+          int count = offset(i + 1) - offset(i);
+          for (int j = 0; j < count; ++j)
+          {
+            tmp_out(offset(i) + j) = out(preallocated_offset(i) + j);
+          }
+        });
+    out = tmp_out;
+
+    Kokkos::Profiling::popRegion();
+  }
+  else
+  {
+    // The allocated storage was exactly enough for results, do nothing
+  }
+  Kokkos::Profiling::popRegion();
+}
+
+struct Iota
+{
+  KOKKOS_FUNCTION unsigned int operator()(int const i) const { return i; }
+};
+
+template <typename Tag, typename ExecutionSpace, typename Predicates,
+          typename OffsetView, typename OutView>
+std::enable_if_t<std::is_same<Tag, SpatialPredicateTag>{}>
+allocateAndInitializeStorage(Tag, ExecutionSpace const &space,
+                             Predicates const &predicates, OffsetView &offset,
+                             OutView &out, int buffer_size)
+{
+  using Access = AccessTraits<Predicates, PredicatesTag>;
+
+  auto const n_queries = Access::size(predicates);
+  reallocWithoutInitializing(offset, n_queries + 1);
+
+  buffer_size = std::abs(buffer_size);
+
+  Kokkos::deep_copy(space, offset, buffer_size);
+
+  if (buffer_size != 0)
+  {
+    exclusivePrefixSum(space, offset);
+
+    // Use calculation for the size to avoid calling lastElement(offset) as it
+    // will launch an extra kernel to copy to host.
+    reallocWithoutInitializing(out, n_queries * buffer_size);
+  }
+}
+
+template <typename Tag, typename ExecutionSpace, typename Predicates,
+          typename OffsetView, typename OutView>
+std::enable_if_t<std::is_same<Tag, NearestPredicateTag>{}>
+allocateAndInitializeStorage(Tag, ExecutionSpace const &space,
+                             Predicates const &predicates, OffsetView &offset,
+                             OutView &out, int /*buffer_size*/)
+{
+  using Access = AccessTraits<Predicates, PredicatesTag>;
+
+  auto const n_queries = Access::size(predicates);
+  reallocWithoutInitializing(offset, n_queries + 1);
+
+  Kokkos::parallel_for(
+      "ArborX::CrsGraphWrapper::query::nearest::"
+      "scan_queries_for_numbers_of_nearest_neighbors",
+      Kokkos::RangePolicy<ExecutionSpace>(space, 0, n_queries),
+      KOKKOS_LAMBDA(int i) { offset(i) = getK(Access::get(predicates, i)); });
+  exclusivePrefixSum(space, offset);
+
+  reallocWithoutInitializing(out, lastElement(offset));
+}
+
+// Views are passed by reference here because internally Kokkos::realloc()
+// is called.
+template <typename Tag, typename Tree, typename ExecutionSpace,
+          typename Predicates, typename OutputView, typename OffsetView,
+          typename Callback>
+std::enable_if_t<!is_tagged_post_callback<Callback>{} &&
+                 Kokkos::is_view<OutputView>{} && Kokkos::is_view<OffsetView>{}>
+queryDispatch(Tag, Tree const &tree, ExecutionSpace const &space,
+              Predicates const &predicates, Callback const &callback,
+              OutputView &out, OffsetView &offset,
+              Experimental::TraversalPolicy const &policy =
+                  Experimental::TraversalPolicy())
+{
+  using MemorySpace = typename Tree::memory_space;
+  using DeviceType = Kokkos::Device<ExecutionSpace, MemorySpace>;
+
+  check_valid_callback(callback, predicates, out);
+
+  auto profiling_prefix =
+      std::string("ArborX::CrsGraphWrapper::query::") +
+      (std::is_same<Tag, SpatialPredicateTag>{} ? "spatial" : "nearest");
+
+  Kokkos::Profiling::pushRegion(profiling_prefix);
+
+  Kokkos::Profiling::pushRegion(profiling_prefix + "::init_and_alloc");
+
+  allocateAndInitializeStorage(Tag{}, space, predicates, offset, out,
+                               policy._buffer_size);
+
+  Kokkos::Profiling::popRegion();
+
+  auto buffer_status = (std::is_same<Tag, SpatialPredicateTag>{}
+                            ? toBufferStatus(policy._buffer_size)
+                            : BufferStatus::PreallocationSoft);
+
+  if (policy._sort_predicates)
+  {
+    Kokkos::Profiling::pushRegion(profiling_prefix + "::compute_permutation");
+    auto permute =
+        Details::BatchedQueries<DeviceType>::sortQueriesAlongZOrderCurve(
+            space, static_cast<Box>(tree.bounds()), predicates);
+    Kokkos::Profiling::popRegion();
+
+    queryImpl(space, tree, predicates, callback, out, offset, permute,
+              buffer_status);
+  }
+  else
+  {
+    Iota permute;
+    queryImpl(space, tree, predicates, callback, out, offset, permute,
+              buffer_status);
+  }
+
+  Kokkos::Profiling::popRegion();
+}
+
+template <typename Tag, typename Tree, typename ExecutionSpace,
+          typename Predicates, typename Indices, typename Offset>
+inline std::enable_if_t<Kokkos::is_view<Indices>{} && Kokkos::is_view<Offset>{}>
+queryDispatch(Tag, Tree const &tree, ExecutionSpace const &space,
+              Predicates const &predicates, Indices &indices, Offset &offset,
+              Experimental::TraversalPolicy const &policy =
+                  Experimental::TraversalPolicy())
+{
+  queryDispatch(Tag{}, tree, space, predicates, DefaultCallback{}, indices,
+                offset, policy);
+}
+
+template <typename Tag, typename Tree, typename ExecutionSpace,
+          typename Predicates, typename OutputView, typename OffsetView,
+          typename Callback>
+inline std::enable_if_t<is_tagged_post_callback<Callback>{}>
+queryDispatch(Tag, Tree const &tree, ExecutionSpace const &space,
+              Predicates const &predicates, Callback const &callback,
+              OutputView &out, OffsetView &offset,
+              Experimental::TraversalPolicy const &policy =
+                  Experimental::TraversalPolicy())
+{
+  using MemorySpace = typename Tree::memory_space;
+  Kokkos::View<int *, MemorySpace> indices(
+      "ArborX::CrsGraphWrapper::query::indices", 0);
+  queryDispatch(Tag{}, tree, space, predicates, indices, offset, policy);
+  callback(predicates, offset, indices, out);
+}
+
+template <typename Callback, typename Predicates, typename OutputView>
+std::enable_if_t<!Kokkos::is_view<Callback>{} &&
+                 !is_tagged_post_callback<Callback>{}>
+check_valid_callback_if_first_argument_is_not_a_view(
+    Callback const &callback, Predicates const &predicates,
+    OutputView const &out)
+{
+  check_valid_callback(callback, predicates, out);
+}
+
+template <typename Callback, typename Predicates, typename OutputView>
+std::enable_if_t<!Kokkos::is_view<Callback>{} &&
+                 is_tagged_post_callback<Callback>{}>
+check_valid_callback_if_first_argument_is_not_a_view(Callback const &,
+                                                     Predicates const &,
+                                                     OutputView const &)
+{
+  // TODO
+}
+
+template <typename View, typename Predicates, typename OutputView>
+std::enable_if_t<Kokkos::is_view<View>{}>
+check_valid_callback_if_first_argument_is_not_a_view(View const &,
+                                                     Predicates const &,
+                                                     OutputView const &)
+{
+  // do nothing
+}
+
+} // namespace CrsGraphWrapperImpl
+
+} // namespace Details
+} // namespace ArborX
+
+#endif
diff --git a/arborx/src/details/ArborX_DetailsDistributedTreeImpl.hpp b/arborx/src/details/ArborX_DetailsDistributedTreeImpl.hpp
new file mode 100644
index 000000000..484e765c9
--- /dev/null
+++ b/arborx/src/details/ArborX_DetailsDistributedTreeImpl.hpp
@@ -0,0 +1,921 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+#ifndef ARBORX_DETAILS_DISTRIBUTED_SEARCH_TREE_IMPL_HPP
+#define ARBORX_DETAILS_DISTRIBUTED_SEARCH_TREE_IMPL_HPP
+
+#include <ArborX_Config.hpp>
+
+#include <ArborX_DetailsDistributor.hpp>
+#include <ArborX_DetailsHappyTreeFriends.hpp>
+#include <ArborX_DetailsKokkosExtMinMaxOperations.hpp>
+#include <ArborX_DetailsPriorityQueue.hpp>
+#include <ArborX_DetailsUtils.hpp>
+#include <ArborX_LinearBVH.hpp>
+#include <ArborX_Predicates.hpp>
+
+#include <Kokkos_Core.hpp>
+
+#include <mpi.h>
+
+namespace ArborX
+{
+
+namespace Details
+{
+struct DefaultCallbackWithRank
+{
+  int _rank;
+  template <typename Predicate, typename OutputFunctor>
+  KOKKOS_FUNCTION void operator()(Predicate const &, int primitive_index,
+                                  OutputFunctor const &out) const
+  {
+    out({primitive_index, _rank});
+  }
+};
+
+template <typename DeviceType>
+struct DistributedTreeImpl
+{
+  // spatial queries
+  template <typename DistributedTree, typename ExecutionSpace,
+            typename Predicates, typename IndicesAndRanks, typename Offset>
+  static std::enable_if_t<Kokkos::is_view<IndicesAndRanks>{} &&
+                          Kokkos::is_view<Offset>{}>
+  queryDispatch(SpatialPredicateTag, DistributedTree const &tree,
+                ExecutionSpace const &space, Predicates const &queries,
+                IndicesAndRanks &values, Offset &offset)
+  {
+    int comm_rank;
+    MPI_Comm_rank(tree.getComm(), &comm_rank);
+    queryDispatch(SpatialPredicateTag{}, tree, space, queries,
+                  DefaultCallbackWithRank{comm_rank}, values, offset);
+  }
+
+  // NOTE NVCC did not like having definition of that type within the
+  // queryDispatch function below while using an extended __host__ __device__
+  // lambda
+  struct PairIndexRank
+  {
+    int index;
+    int rank;
+  };
+
+  template <typename DistributedTree, typename ExecutionSpace,
+            typename Predicates, typename Indices, typename Offset,
+            typename Ranks>
+  [[deprecated]] static std::enable_if_t<Kokkos::is_view<Indices>{} &&
+                                         Kokkos::is_view<Offset>{} &&
+                                         Kokkos::is_view<Ranks>{}>
+  queryDispatch(SpatialPredicateTag, DistributedTree const &tree,
+                ExecutionSpace const &space, Predicates const &queries,
+                Indices &indices, Offset &offset, Ranks &ranks)
+  {
+    Kokkos::View<PairIndexRank *, ExecutionSpace> out(
+        "ArborX::DistributedTree::query::spatial::pairs_index_rank", 0);
+    queryDispatch(SpatialPredicateTag{}, tree, space, queries, out, offset);
+    auto const n = out.extent(0);
+    reallocWithoutInitializing(indices, n);
+    reallocWithoutInitializing(ranks, n);
+    Kokkos::parallel_for("ArborX::DistributedTree::query::split_pairs",
+                         Kokkos::RangePolicy<ExecutionSpace>(space, 0, n),
+                         KOKKOS_LAMBDA(int i) {
+                           indices(i) = out(i).index;
+                           ranks(i) = out(i).rank;
+                         });
+  }
+
+  template <typename DistributedTree, typename ExecutionSpace,
+            typename Predicates, typename OutputView, typename OffsetView,
+            typename Callback>
+  static std::enable_if_t<Kokkos::is_view<OutputView>{} &&
+                          Kokkos::is_view<OffsetView>{}>
+  queryDispatch(SpatialPredicateTag, DistributedTree const &tree,
+                ExecutionSpace const &space, Predicates const &queries,
+                Callback const &callback, OutputView &out, OffsetView &offset);
+
+  // nearest neighbors queries
+  template <typename DistributedTree, typename ExecutionSpace,
+            typename Predicates, typename Indices, typename Offset,
+            typename Ranks,
+            typename Distances = Kokkos::View<float *, DeviceType>>
+  static std::enable_if_t<
+      Kokkos::is_view<Indices>{} && Kokkos::is_view<Offset>{} &&
+      Kokkos::is_view<Ranks>{} && Kokkos::is_view<Distances>{}>
+  queryDispatchImpl(NearestPredicateTag, DistributedTree const &tree,
+                    ExecutionSpace const &space, Predicates const &queries,
+                    Indices &indices, Offset &offset, Ranks &ranks,
+                    Distances *distances_ptr = nullptr);
+
+  template <typename DistributedTree, typename ExecutionSpace,
+            typename Predicates, typename Indices, typename Offset,
+            typename Ranks>
+  [[deprecated]] static std::enable_if_t<Kokkos::is_view<Indices>{} &&
+                                         Kokkos::is_view<Offset>{} &&
+                                         Kokkos::is_view<Ranks>{}>
+  queryDispatch(NearestPredicateTag tag, DistributedTree const &tree,
+                ExecutionSpace const &space, Predicates const &queries,
+                Indices &indices, Offset &offset, Ranks &ranks)
+  {
+    queryDispatchImpl(tag, tree, space, queries, indices, offset, ranks);
+  }
+
+  template <typename DistributedTree, typename ExecutionSpace,
+            typename Predicates, typename Indices, typename Offset,
+            typename Ranks, typename Distances>
+  [[deprecated]] static std::enable_if_t<
+      Kokkos::is_view<Indices>{} && Kokkos::is_view<Offset>{} &&
+      Kokkos::is_view<Ranks>{} && Kokkos::is_view<Distances>{}>
+  queryDispatch(NearestPredicateTag tag, DistributedTree const &tree,
+                ExecutionSpace const &space, Predicates const &queries,
+                Indices &indices, Offset &offset, Ranks &ranks,
+                Distances &distances)
+  {
+    queryDispatchImpl(tag, tree, space, queries, indices, offset, ranks,
+                      &distances);
+  }
+
+  template <typename DistributedTree, typename ExecutionSpace,
+            typename Predicates, typename IndicesAndRanks, typename Offset>
+  static std::enable_if_t<Kokkos::is_view<IndicesAndRanks>{} &&
+                          Kokkos::is_view<Offset>{}>
+  queryDispatch(NearestPredicateTag tag, DistributedTree const &tree,
+                ExecutionSpace const &space, Predicates const &queries,
+                IndicesAndRanks &values, Offset &offset)
+  {
+    // FIXME avoid zipping when distributed nearest callbacks become availale
+    Kokkos::View<int *, ExecutionSpace> indices(
+        "ArborX::DistributedTree::query::nearest::indices", 0);
+    Kokkos::View<int *, ExecutionSpace> ranks(
+        "ArborX::DistributedTree::query::nearest::ranks", 0);
+    queryDispatchImpl(tag, tree, space, queries, indices, offset, ranks);
+    auto const n = indices.extent(0);
+    reallocWithoutInitializing(values, n);
+    Kokkos::parallel_for(
+        "ArborX::DistributedTree::query::zip_indices_and_ranks",
+        Kokkos::RangePolicy<ExecutionSpace>(space, 0, n), KOKKOS_LAMBDA(int i) {
+          values(i) = {indices(i), ranks(i)};
+        });
+  }
+
+  template <typename DistributedTree, typename ExecutionSpace,
+            typename Predicates, typename Indices, typename Offset,
+            typename Distances>
+  static void deviseStrategy(ExecutionSpace const &space,
+                             Predicates const &queries,
+                             DistributedTree const &tree, Indices &indices,
+                             Offset &offset, Distances &);
+
+  template <typename DistributedTree, typename ExecutionSpace,
+            typename Predicates, typename Indices, typename Offset,
+            typename Distances>
+  static void reassessStrategy(ExecutionSpace const &space,
+                               Predicates const &queries,
+                               DistributedTree const &tree, Indices &indices,
+                               Offset &offset, Distances &distances);
+
+  template <typename ExecutionSpace, typename Predicates, typename Ranks,
+            typename Query>
+  static void forwardQueries(MPI_Comm comm, ExecutionSpace const &space,
+                             Predicates const &queries,
+                             Kokkos::View<int *, DeviceType> indices,
+                             Kokkos::View<int *, DeviceType> offset,
+                             Kokkos::View<Query *, DeviceType> &fwd_queries,
+                             Kokkos::View<int *, DeviceType> &fwd_ids,
+                             Ranks &fwd_ranks);
+
+  template <typename ExecutionSpace, typename OutputView, typename Ranks,
+            typename Distances = Kokkos::View<float *, DeviceType>>
+  static void communicateResultsBack(MPI_Comm comm, ExecutionSpace const &space,
+                                     OutputView &out,
+                                     Kokkos::View<int *, DeviceType> offset,
+                                     Ranks &ranks,
+                                     Kokkos::View<int *, DeviceType> &ids,
+                                     Distances *distances_ptr = nullptr);
+
+  template <typename ExecutionSpace, typename Predicates, typename Indices,
+            typename Offset, typename Ranks>
+  static void filterResults(ExecutionSpace const &space,
+                            Predicates const &queries,
+                            Kokkos::View<float *, DeviceType> distances,
+                            Indices &indices, Offset &offset, Ranks &ranks);
+
+  template <typename ExecutionSpace, typename View, typename... OtherViews>
+  static void sortResults(ExecutionSpace const &space, View keys,
+                          OtherViews... other_views);
+
+  template <typename ExecutionSpace, typename OffsetView>
+  static void countResults(ExecutionSpace const &space, int n_queries,
+                           Kokkos::View<int *, DeviceType> query_ids,
+                           OffsetView &offset);
+
+  template <typename ExecutionSpace, typename View>
+  static typename std::enable_if<Kokkos::is_view<View>::value>::type
+  sendAcrossNetwork(ExecutionSpace const &space,
+                    Distributor<DeviceType> const &distributor, View exports,
+                    typename View::non_const_type imports);
+};
+
+template <typename DeviceType>
+template <typename ExecutionSpace, typename View>
+typename std::enable_if<Kokkos::is_view<View>::value>::type
+DistributedTreeImpl<DeviceType>::sendAcrossNetwork(
+    ExecutionSpace const &space, Distributor<DeviceType> const &distributor,
+    View exports, typename View::non_const_type imports)
+{
+  Kokkos::Profiling::pushRegion("ArborX::DistributedTree::sendAcrossNetwork");
+
+  ARBORX_ASSERT((exports.extent(0) == distributor.getTotalSendLength()) &&
+                (imports.extent(0) == distributor.getTotalReceiveLength()) &&
+                (exports.extent(1) == imports.extent(1)) &&
+                (exports.extent(2) == imports.extent(2)) &&
+                (exports.extent(3) == imports.extent(3)) &&
+                (exports.extent(4) == imports.extent(4)) &&
+                (exports.extent(5) == imports.extent(5)) &&
+                (exports.extent(6) == imports.extent(6)) &&
+                (exports.extent(7) == imports.extent(7)));
+
+  auto const num_packets = exports.extent(1) * exports.extent(2) *
+                           exports.extent(3) * exports.extent(4) *
+                           exports.extent(5) * exports.extent(6) *
+                           exports.extent(7);
+
+  using NonConstValueType = typename View::non_const_value_type;
+
+#ifndef ARBORX_USE_CUDA_AWARE_MPI
+  using MirrorSpace = typename View::host_mirror_space;
+  MirrorSpace const execution_space;
+#else
+  using MirrorSpace = typename View::device_type;
+  auto const &execution_space = space;
+#endif
+
+  auto imports_layout_right =
+      create_layout_right_mirror_view(execution_space, imports);
+
+  Kokkos::View<NonConstValueType *, MirrorSpace,
+               Kokkos::MemoryTraits<Kokkos::Unmanaged>>
+      import_buffer(imports_layout_right.data(), imports_layout_right.size());
+
+  distributor.doPostsAndWaits(space, exports, num_packets, import_buffer);
+
+  auto tmp_view =
+      Kokkos::create_mirror_view_and_copy(space, imports_layout_right);
+  Kokkos::deep_copy(space, imports, tmp_view);
+
+  Kokkos::Profiling::popRegion();
+}
+
+template <typename DeviceType>
+template <typename DistributedTree, typename ExecutionSpace,
+          typename Predicates, typename Indices, typename Offset,
+          typename Distances>
+void DistributedTreeImpl<DeviceType>::deviseStrategy(
+    ExecutionSpace const &space, Predicates const &queries,
+    DistributedTree const &tree, Indices &indices, Offset &offset, Distances &)
+{
+  Kokkos::Profiling::pushRegion("ArborX::DistributedTree::deviseStrategy");
+
+  auto const &top_tree = tree._top_tree;
+  auto const &bottom_tree_sizes = tree._bottom_tree_sizes;
+
+  // Find the k nearest local trees.
+  query(top_tree, space, queries, indices, offset);
+
+  // Accumulate total leave count in the local trees until it reaches k which
+  // is the number of neighbors queried for.  Stop if local trees get
+  // empty because it means that they are no more leaves and there is no point
+  // on forwarding queries to leafless trees.
+  using Access = AccessTraits<Predicates, PredicatesTag>;
+  auto const n_queries = Access::size(queries);
+  Kokkos::View<int *, DeviceType> new_offset(
+      Kokkos::view_alloc(offset.label(), space), n_queries + 1);
+  Kokkos::parallel_for(
+      "ArborX::DistributedTree::query::"
+      "bottom_trees_with_required_cumulated_leaves_count",
+      Kokkos::RangePolicy<ExecutionSpace>(space, 0, n_queries),
+      KOKKOS_LAMBDA(int i) {
+        int leaves_count = 0;
+        int const n_nearest_neighbors = getK(Access::get(queries, i));
+        for (int j = offset(i); j < offset(i + 1); ++j)
+        {
+          int const bottom_tree_size = bottom_tree_sizes(indices(j));
+          if ((bottom_tree_size == 0) || (leaves_count >= n_nearest_neighbors))
+            break;
+          leaves_count += bottom_tree_size;
+          ++new_offset(i);
+        }
+      });
+
+  exclusivePrefixSum(space, new_offset);
+
+  // Truncate results so that queries will only be forwarded to as many local
+  // trees as necessary to find k neighbors.
+  Kokkos::View<int *, DeviceType> new_indices(
+      Kokkos::view_alloc(indices.label(), space), lastElement(new_offset));
+  Kokkos::parallel_for(
+      "ArborX::DistributedTree::query::truncate_before_forwarding",
+      Kokkos::RangePolicy<ExecutionSpace>(space, 0, n_queries),
+      KOKKOS_LAMBDA(int i) {
+        for (int j = 0; j < new_offset(i + 1) - new_offset(i); ++j)
+          new_indices(new_offset(i) + j) = indices(offset(i) + j);
+      });
+
+  offset = new_offset;
+  indices = new_indices;
+
+  Kokkos::Profiling::popRegion();
+}
+
+template <typename DeviceType>
+template <typename DistributedTree, typename ExecutionSpace,
+          typename Predicates, typename Indices, typename Offset,
+          typename Distances>
+void DistributedTreeImpl<DeviceType>::reassessStrategy(
+    ExecutionSpace const &space, Predicates const &queries,
+    DistributedTree const &tree, Indices &indices, Offset &offset,
+    Distances &distances)
+{
+  Kokkos::Profiling::pushRegion("ArborX::DistributedTree::reassessStrategy");
+
+  auto const &top_tree = tree._top_tree;
+  using Access = AccessTraits<Predicates, PredicatesTag>;
+  auto const n_queries = Access::size(queries);
+
+  // Determine distance to the farthest neighbor found so far.
+  Kokkos::View<float *, DeviceType> farthest_distances(
+      Kokkos::view_alloc(
+          Kokkos::WithoutInitializing,
+          "ArborX::DistributedTree::query::reassessStrategy::distances"),
+      n_queries);
+  // NOTE: in principle distances( j ) are arranged in ascending order for
+  // offset( i ) <= j < offset( i + 1 ) so max() is not necessary.
+  Kokkos::parallel_for(
+      "ArborX::DistributedTree::query::most_distant_neighbor_so_far",
+      Kokkos::RangePolicy<ExecutionSpace>(space, 0, n_queries),
+      KOKKOS_LAMBDA(int i) {
+        using KokkosExt::max;
+        farthest_distances(i) = 0.;
+        for (int j = offset(i); j < offset(i + 1); ++j)
+          farthest_distances(i) = max(farthest_distances(i), distances(j));
+      });
+
+  // Identify what ranks may have leaves that are within that distance.
+  Kokkos::View<decltype(intersects(Sphere{})) *, DeviceType> radius_searches(
+      Kokkos::view_alloc(
+          Kokkos::WithoutInitializing,
+          "ArborX::DistributedTree::query::reassessStrategy::queries"),
+      n_queries);
+  Kokkos::parallel_for(
+      "ArborX::DistributedTree::query::bottom_trees_within_that_distance",
+      Kokkos::RangePolicy<ExecutionSpace>(space, 0, n_queries),
+      KOKKOS_LAMBDA(int i) {
+        radius_searches(i) = intersects(Sphere{
+            getGeometry(Access::get(queries, i)), farthest_distances(i)});
+      });
+
+  query(top_tree, space, radius_searches, indices, offset);
+  // NOTE: in principle, we could perform radius searches on the bottom_tree
+  // rather than nearest queries.
+
+  Kokkos::Profiling::popRegion();
+}
+
+struct PairIndexDistance
+{
+  int index;
+  float distance;
+};
+
+template <typename Tree>
+struct CallbackWithDistance
+{
+  Tree _tree;
+  Kokkos::View<unsigned int *, typename Tree::memory_space> _rev_permute;
+
+  template <typename ExecutionSpace>
+  CallbackWithDistance(ExecutionSpace const &exec_space, Tree const &tree)
+      : _tree(tree)
+  {
+    // NOTE cannot have extended __host__ __device__  lambda in constructor with
+    // NVCC
+    computeReversePermutation(exec_space);
+  }
+
+  template <typename ExecutionSpace>
+  void computeReversePermutation(ExecutionSpace const &exec_space)
+  {
+    auto const n = _tree.size();
+
+    _rev_permute = Kokkos::View<unsigned int *, typename Tree::memory_space>(
+        Kokkos::view_alloc(
+            Kokkos::WithoutInitializing,
+            "ArborX::DistributedTree::query::nearest::reverse_permutation"),
+        n);
+    if (!_tree.empty())
+    {
+      int const leaf_nodes_shift = _tree.size() - 1;
+      auto const &leaf_nodes = HappyTreeFriends::getLeafNodes(_tree);
+      auto const &rev_permute = _rev_permute; // avoid implicit capture of *this
+      Kokkos::parallel_for(
+          "ArborX::DistributedTree::query::nearest::"
+          "compute_reverse_permutation",
+          Kokkos::RangePolicy<ExecutionSpace>(exec_space, 0, n),
+          KOKKOS_LAMBDA(int const i) {
+            rev_permute(leaf_nodes(i).getLeafPermutationIndex()) =
+                i + leaf_nodes_shift;
+          });
+    }
+  }
+
+  template <typename Query, typename OutputFunctor>
+  KOKKOS_FUNCTION void operator()(Query const &query, int index,
+                                  OutputFunctor const &out) const
+  {
+    // TODO: This breaks the abstraction of the distributed Tree not knowing
+    // the details of the local tree. Right now, this is the only way. Will
+    // need to be fixed with a proper callback abstraction.
+    int const leaf_node_index = _rev_permute(index);
+    auto const *leaf_node_ptr =
+        HappyTreeFriends::getNodePtr(_tree, leaf_node_index);
+    auto const &leaf_node_bounding_volume =
+        HappyTreeFriends::getBoundingVolume(_tree, leaf_node_ptr);
+    out({index, distance(getGeometry(query), leaf_node_bounding_volume)});
+  }
+};
+
+template <typename DeviceType>
+template <typename DistributedTree, typename ExecutionSpace,
+          typename Predicates, typename Indices, typename Offset,
+          typename Ranks, typename Distances>
+std::enable_if_t<Kokkos::is_view<Indices>{} && Kokkos::is_view<Offset>{} &&
+                 Kokkos::is_view<Ranks>{} && Kokkos::is_view<Distances>{}>
+DistributedTreeImpl<DeviceType>::queryDispatchImpl(
+    NearestPredicateTag, DistributedTree const &tree,
+    ExecutionSpace const &space, Predicates const &queries, Indices &indices,
+    Offset &offset, Ranks &ranks, Distances *distances_ptr)
+{
+  Kokkos::Profiling::pushRegion("ArborX::DistributedTree::query::nearest");
+
+  auto const &bottom_tree = tree._bottom_tree;
+  auto comm = tree.getComm();
+
+  Distances distances("ArborX::DistributedTree::query::nearest::distances", 0);
+  if (distances_ptr)
+    distances = *distances_ptr;
+
+  // "Strategy" is used to determine what ranks to forward queries to.  In
+  // the 1st pass, the queries are sent to as many ranks as necessary to
+  // guarantee that all k neighbors queried for are found.  In the 2nd pass,
+  // queries are sent again to all ranks that may have a neighbor closer to
+  // the farthest neighbor identified in the 1st pass.
+  //
+  // The current implementation discards the results after the 1st pass and
+  // recompute everything instead of just searching for potential better
+  // neighbors and updating the list.
+
+  // Right now, distance calcuations only work with BVH due to using functions
+  // in DistributedTreeNearestUtils. So, there's no point in replacing this
+  // with decltype.
+  CallbackWithDistance<BVH<typename DeviceType::memory_space>>
+      callback_with_distance(space, bottom_tree);
+
+  // NOTE: compiler would not deduce __range for the braced-init-list but I
+  // got it to work with the static_cast to function pointers.
+  using Strategy =
+      void (*)(ExecutionSpace const &, Predicates const &,
+               DistributedTree const &, Indices &, Offset &, Distances &);
+  for (auto implementStrategy :
+       {static_cast<Strategy>(DistributedTreeImpl<DeviceType>::deviseStrategy),
+        static_cast<Strategy>(
+            DistributedTreeImpl<DeviceType>::reassessStrategy)})
+  {
+    implementStrategy(space, queries, tree, indices, offset, distances);
+
+    {
+      // NOTE_COMM_NEAREST: The communication pattern here for the nearest
+      // search is identical to that of the spatial search (see
+      // NOTE_COMM_SPATIAL). The code differences are:
+      // - no callbacks
+      // - explicit distances
+      // - results filtering
+
+      // Forward queries
+      using Access = AccessTraits<Predicates, PredicatesTag>;
+      using Query = typename AccessTraitsHelper<Access>::type;
+      Kokkos::View<int *, DeviceType> ids(
+          "ArborX::DistributedTree::query::nearest::query_ids", 0);
+      Kokkos::View<Query *, DeviceType> fwd_queries(
+          "ArborX::DistributedTree::query::nearest::fwd_queries", 0);
+      forwardQueries(comm, space, queries, indices, offset, fwd_queries, ids,
+                     ranks);
+
+      // Perform queries that have been received
+      Kokkos::View<PairIndexDistance *, DeviceType> out(
+          "ArborX::DistributedTree::query::pairs_index_distance", 0);
+      query(bottom_tree, space, fwd_queries, callback_with_distance, out,
+            offset);
+
+      // Unzip
+      auto const n = out.extent(0);
+      reallocWithoutInitializing(indices, n);
+      reallocWithoutInitializing(distances, n);
+      Kokkos::parallel_for("ArborX::DistributedTree::query::nearest::split_"
+                           "index_distance_pairs",
+                           Kokkos::RangePolicy<ExecutionSpace>(space, 0, n),
+                           KOKKOS_LAMBDA(int i) {
+                             indices(i) = out(i).index;
+                             distances(i) = out(i).distance;
+                           });
+
+      // Communicate results back
+      communicateResultsBack(comm, space, indices, offset, ranks, ids,
+                             &distances);
+
+      // Merge results
+      Kokkos::Profiling::pushRegion(
+          "ArborX::DistributedTree::nearest::postprocess_results");
+
+      int const n_queries = Access::size(queries);
+      countResults(space, n_queries, ids, offset);
+      sortResults(space, ids, indices, ranks, distances);
+      filterResults(space, queries, distances, indices, offset, ranks);
+
+      Kokkos::Profiling::popRegion();
+    }
+  }
+
+  Kokkos::Profiling::popRegion();
+}
+
+template <typename DeviceType>
+template <typename DistributedTree, typename ExecutionSpace,
+          typename Predicates, typename OutputView, typename OffsetView,
+          typename Callback>
+std::enable_if_t<Kokkos::is_view<OutputView>{} && Kokkos::is_view<OffsetView>{}>
+DistributedTreeImpl<DeviceType>::queryDispatch(
+    SpatialPredicateTag, DistributedTree const &tree,
+    ExecutionSpace const &space, Predicates const &queries,
+    Callback const &callback, OutputView &out, OffsetView &offset)
+{
+  Kokkos::Profiling::pushRegion("ArborX::DistributedTree::query::spatial");
+
+  auto const &top_tree = tree._top_tree;
+  auto const &bottom_tree = tree._bottom_tree;
+  auto comm = tree.getComm();
+
+  Kokkos::View<int *, DeviceType> indices(
+      "ArborX::DistributedTree::query::spatial::indices", 0);
+  Kokkos::View<int *, DeviceType> ranks(
+      "ArborX::DistributedTree::query::spatial::ranks", 0);
+  query(top_tree, space, queries, indices, offset);
+
+  {
+    // NOTE_COMM_SPATIAL: The communication pattern here for the spatial search
+    // is identical to that of the nearest search (see NOTE_COMM_NEAREST). The
+    // code differences are:
+    // - usage of callbacks
+    // - no explicit distances
+    // - no results filtering
+
+    // Forward queries
+    using Access = AccessTraits<Predicates, PredicatesTag>;
+    using Query = typename AccessTraitsHelper<Access>::type;
+    Kokkos::View<int *, DeviceType> ids(
+        "ArborX::DistributedTree::query::spatial::query_ids", 0);
+    Kokkos::View<Query *, DeviceType> fwd_queries(
+        "ArborX::DistributedTree::query::spatial::fwd_queries", 0);
+    forwardQueries(comm, space, queries, indices, offset, fwd_queries, ids,
+                   ranks);
+
+    // Perform queries that have been received
+    query(bottom_tree, space, fwd_queries, callback, out, offset);
+
+    // Communicate results back
+    communicateResultsBack(comm, space, out, offset, ranks, ids);
+
+    Kokkos::Profiling::pushRegion(
+        "ArborX::DistributedTree::spatial::postprocess_results");
+
+    // Merge results
+    int const n_queries = Access::size(queries);
+    countResults(space, n_queries, ids, offset);
+    sortResults(space, ids, out);
+
+    Kokkos::Profiling::popRegion();
+  }
+
+  Kokkos::Profiling::popRegion();
+}
+
+template <typename DeviceType>
+template <typename ExecutionSpace, typename View, typename... OtherViews>
+void DistributedTreeImpl<DeviceType>::sortResults(ExecutionSpace const &space,
+                                                  View keys,
+                                                  OtherViews... other_views)
+{
+  auto const n = keys.extent(0);
+  // If they were no queries, min_val and max_val values won't change after
+  // the parallel reduce (they are initialized to +infty and -infty
+  // respectively) and the sort will hang.
+  if (n == 0)
+    return;
+
+  // We only want to get the permutation here, but sortObjects also sorts the
+  // elements given to it. Hence, we need to create a copy.
+  // TODO try to avoid the copy
+  View keys_clone(
+      Kokkos::view_alloc(Kokkos::WithoutInitializing,
+                         "ArborX::DistributedTree::query::sortResults::keys"),
+      keys.size());
+  Kokkos::deep_copy(space, keys_clone, keys);
+  auto const permutation = ArborX::Details::sortObjects(space, keys_clone);
+
+  // Call applyPermutation for every entry in the parameter pack.
+  // We need to use the comma operator here since the function returns void.
+  // The variable we assign to is actually not needed. We just need something
+  // to store the initializer list (that contains only zeros).
+  auto dummy = {
+      (ArborX::Details::applyPermutation(space, permutation, other_views),
+       0)...};
+  std::ignore = dummy;
+}
+
+template <typename DeviceType>
+template <typename ExecutionSpace, typename OffsetView>
+void DistributedTreeImpl<DeviceType>::countResults(
+    ExecutionSpace const &space, int n_queries,
+    Kokkos::View<int *, DeviceType> query_ids, OffsetView &offset)
+{
+  int const nnz = query_ids.extent(0);
+
+  Kokkos::realloc(offset, n_queries + 1);
+
+  Kokkos::parallel_for(
+      "ArborX::DistributedTree::query::count_results_per_query",
+      Kokkos::RangePolicy<ExecutionSpace>(space, 0, nnz), KOKKOS_LAMBDA(int i) {
+        Kokkos::atomic_increment(&offset(query_ids(i)));
+      });
+
+  exclusivePrefixSum(space, offset);
+}
+
+template <typename DeviceType>
+template <typename ExecutionSpace, typename Predicates, typename Ranks,
+          typename Query>
+void DistributedTreeImpl<DeviceType>::forwardQueries(
+    MPI_Comm comm, ExecutionSpace const &space, Predicates const &queries,
+    Kokkos::View<int *, DeviceType> indices,
+    Kokkos::View<int *, DeviceType> offset,
+    Kokkos::View<Query *, DeviceType> &fwd_queries,
+    Kokkos::View<int *, DeviceType> &fwd_ids, Ranks &fwd_ranks)
+{
+  Kokkos::Profiling::pushRegion("ArborX::DistributedTree::forwardQueries");
+
+  int comm_rank;
+  MPI_Comm_rank(comm, &comm_rank);
+
+  Distributor<DeviceType> distributor(comm);
+
+  using Access = AccessTraits<Predicates, PredicatesTag>;
+  int const n_queries = Access::size(queries);
+  int const n_exports = lastElement(offset);
+  int const n_imports = distributor.createFromSends(space, indices);
+
+  static_assert(
+      std::is_same<Query, typename AccessTraitsHelper<Access>::type>{}, "");
+  Kokkos::View<Query *, DeviceType> exports(
+      Kokkos::view_alloc(
+          Kokkos::WithoutInitializing,
+          "ArborX::DistributedTree::query::forwardQueries::queries"),
+      n_exports);
+  Kokkos::parallel_for(
+      "ArborX::DistributedTree::query::forward_queries_fill_buffer",
+      Kokkos::RangePolicy<ExecutionSpace>(space, 0, n_queries),
+      KOKKOS_LAMBDA(int q) {
+        for (int i = offset(q); i < offset(q + 1); ++i)
+        {
+          exports(i) = Access::get(queries, q);
+        }
+      });
+
+  Kokkos::View<int *, DeviceType> export_ranks(
+      Kokkos::view_alloc(
+          Kokkos::WithoutInitializing,
+          "ArborX::DistributedTree::query::forwardQueries::export_ranks"),
+      n_exports);
+  Kokkos::deep_copy(space, export_ranks, comm_rank);
+
+  Kokkos::View<int *, DeviceType> import_ranks(
+      Kokkos::view_alloc(
+          Kokkos::WithoutInitializing,
+          "ArborX::DistributedTree::query::forwardQueries::import_ranks"),
+      n_imports);
+  sendAcrossNetwork(space, distributor, export_ranks, import_ranks);
+
+  Kokkos::View<int *, DeviceType> export_ids(
+      Kokkos::view_alloc(
+          Kokkos::WithoutInitializing,
+          "ArborX::DistributedTree::query::forwardQueries::export_ids"),
+      n_exports);
+  Kokkos::parallel_for(
+      "ArborX::DistributedTree::query::forward_queries_fill_ids",
+      Kokkos::RangePolicy<ExecutionSpace>(space, 0, n_queries),
+      KOKKOS_LAMBDA(int q) {
+        for (int i = offset(q); i < offset(q + 1); ++i)
+        {
+          export_ids(i) = q;
+        }
+      });
+  Kokkos::View<int *, DeviceType> import_ids(
+      Kokkos::view_alloc(
+          Kokkos::WithoutInitializing,
+          "ArborX::DistributedTree::query::forwardQueries::import_ids"),
+      n_imports);
+  sendAcrossNetwork(space, distributor, export_ids, import_ids);
+
+  // Send queries across the network
+  Kokkos::View<Query *, DeviceType> imports(
+      Kokkos::view_alloc(
+          Kokkos::WithoutInitializing,
+          "ArborX::DistributedTree::query::forwardQueries::queries"),
+      n_imports);
+  sendAcrossNetwork(space, distributor, exports, imports);
+
+  fwd_queries = imports;
+  fwd_ids = import_ids;
+  fwd_ranks = import_ranks;
+
+  Kokkos::Profiling::popRegion();
+}
+
+template <typename DeviceType>
+template <typename ExecutionSpace, typename OutputView, typename Ranks,
+          typename Distances>
+void DistributedTreeImpl<DeviceType>::communicateResultsBack(
+    MPI_Comm comm, ExecutionSpace const &space, OutputView &out,
+    Kokkos::View<int *, DeviceType> offset, Ranks &ranks,
+    Kokkos::View<int *, DeviceType> &ids, Distances *distances_ptr)
+{
+  Kokkos::Profiling::pushRegion(
+      "ArborX::DistributedTree::communicateResultsBack");
+
+  int comm_rank;
+  MPI_Comm_rank(comm, &comm_rank);
+
+  int const n_fwd_queries = offset.extent_int(0) - 1;
+  int const n_exports = lastElement(offset);
+
+  // We are assuming here that if the same rank is related to multiple batches
+  // these batches appear consecutively. Hence, no reordering is necessary.
+  Distributor<DeviceType> distributor(comm);
+  // FIXME Distributor::createFromSends takes two views of the same type by
+  // a const reference.  There were two easy ways out, either take the views by
+  // value or cast at the callsite.  I went with the latter.  Proper fix
+  // involves more code cleanup in ArborX_DetailsDistributor.hpp than I am
+  // willing to do just now.
+  int const n_imports =
+      distributor.createFromSends(space, ranks, static_cast<Ranks>(offset));
+
+  Kokkos::View<int *, DeviceType> export_ranks(
+      Kokkos::view_alloc(Kokkos::WithoutInitializing, ranks.label()),
+      n_exports);
+  Kokkos::deep_copy(space, export_ranks, comm_rank);
+  Kokkos::View<int *, DeviceType> export_ids(
+      Kokkos::view_alloc(Kokkos::WithoutInitializing, ids.label()), n_exports);
+  Kokkos::parallel_for(
+      "ArborX::DistributedTree::query::fill_buffer",
+      Kokkos::RangePolicy<ExecutionSpace>(space, 0, n_fwd_queries),
+      KOKKOS_LAMBDA(int q) {
+        for (int i = offset(q); i < offset(q + 1); ++i)
+        {
+          export_ids(i) = ids(q);
+        }
+      });
+  OutputView export_out = out;
+
+  OutputView import_out(
+      Kokkos::view_alloc(Kokkos::WithoutInitializing, out.label()), n_imports);
+  Kokkos::View<int *, DeviceType> import_ranks(
+      Kokkos::view_alloc(Kokkos::WithoutInitializing, ranks.label()),
+      n_imports);
+  Kokkos::View<int *, DeviceType> import_ids(
+      Kokkos::view_alloc(Kokkos::WithoutInitializing, ids.label()), n_imports);
+
+  sendAcrossNetwork(space, distributor, export_out, import_out);
+  sendAcrossNetwork(space, distributor, export_ranks, import_ranks);
+  sendAcrossNetwork(space, distributor, export_ids, import_ids);
+
+  ids = import_ids;
+  ranks = import_ranks;
+  out = import_out;
+
+  if (distances_ptr)
+  {
+    auto &distances = *distances_ptr;
+    Kokkos::View<float *, DeviceType> export_distances = distances;
+    Kokkos::View<float *, DeviceType> import_distances(
+        Kokkos::view_alloc(Kokkos::WithoutInitializing, distances.label()),
+        n_imports);
+    sendAcrossNetwork(space, distributor, export_distances, import_distances);
+    distances = import_distances;
+  }
+
+  Kokkos::Profiling::popRegion();
+}
+
+template <typename DeviceType>
+template <typename ExecutionSpace, typename Predicates, typename Indices,
+          typename Offset, typename Ranks>
+void DistributedTreeImpl<DeviceType>::filterResults(
+    ExecutionSpace const &space, Predicates const &queries,
+    Kokkos::View<float *, DeviceType> distances, Indices &indices,
+    Offset &offset, Ranks &ranks)
+{
+  Kokkos::Profiling::pushRegion("ArborX::DistributedTree::filterResults");
+
+  using Access = AccessTraits<Predicates, PredicatesTag>;
+  int const n_queries = Access::size(queries);
+  // truncated views are prefixed with an underscore
+  Kokkos::View<int *, DeviceType> new_offset(offset.label(), n_queries + 1);
+
+  Kokkos::parallel_for("ArborX::DistributedTree::query::discard_results",
+                       Kokkos::RangePolicy<ExecutionSpace>(space, 0, n_queries),
+                       KOKKOS_LAMBDA(int q) {
+                         using KokkosExt::min;
+                         new_offset(q) = min(offset(q + 1) - offset(q),
+                                             getK(Access::get(queries, q)));
+                       });
+
+  exclusivePrefixSum(space, new_offset);
+
+  int const n_truncated_results = lastElement(new_offset);
+  Kokkos::View<int *, DeviceType> new_indices(indices.label(),
+                                              n_truncated_results);
+  Kokkos::View<int *, DeviceType> new_ranks(ranks.label(), n_truncated_results);
+
+  using PairIndexDistance = Kokkos::pair<Kokkos::Array<int, 2>, float>;
+  struct CompareDistance
+  {
+    KOKKOS_INLINE_FUNCTION bool operator()(PairIndexDistance const &lhs,
+                                           PairIndexDistance const &rhs)
+    {
+      // reverse order (larger distance means lower priority)
+      return lhs.second > rhs.second;
+    }
+  };
+
+  int const n_results = lastElement(offset);
+  Kokkos::View<PairIndexDistance *, DeviceType> buffer(
+      Kokkos::view_alloc(
+          Kokkos::WithoutInitializing,
+          "ArborX::DistributedTree::query::filterResults::buffer"),
+      n_results);
+  using PriorityQueue =
+      Details::PriorityQueue<PairIndexDistance, CompareDistance,
+                             UnmanagedStaticVector<PairIndexDistance>>;
+
+  Kokkos::parallel_for(
+      "ArborX::DistributedTree::query::truncate_results",
+      Kokkos::RangePolicy<ExecutionSpace>(space, 0, n_queries),
+      KOKKOS_LAMBDA(int q) {
+        if (offset(q + 1) > offset(q))
+        {
+          auto local_buffer = Kokkos::subview(
+              buffer, Kokkos::make_pair(offset(q), offset(q + 1)));
+          PriorityQueue queue(UnmanagedStaticVector<PairIndexDistance>(
+              local_buffer.data(), local_buffer.size()));
+          for (int i = offset(q); i < offset(q + 1); ++i)
+          {
+            queue.emplace(Kokkos::Array<int, 2>{{indices(i), ranks(i)}},
+                          distances(i));
+          }
+
+          int count = 0;
+          while (!queue.empty() && count < getK(Access::get(queries, q)))
+          {
+            new_indices(new_offset(q) + count) = queue.top().first[0];
+            new_ranks(new_offset(q) + count) = queue.top().first[1];
+            queue.pop();
+            ++count;
+          }
+        }
+      });
+  indices = new_indices;
+  ranks = new_ranks;
+  offset = new_offset;
+
+  Kokkos::Profiling::popRegion();
+}
+
+} // namespace Details
+} // namespace ArborX
+
+#endif
diff --git a/arborx/src/details/ArborX_DetailsDistributor.hpp b/arborx/src/details/ArborX_DetailsDistributor.hpp
new file mode 100644
index 000000000..c8097f913
--- /dev/null
+++ b/arborx/src/details/ArborX_DetailsDistributor.hpp
@@ -0,0 +1,425 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+#ifndef ARBORX_DETAILS_DISTRIBUTOR_HPP
+#define ARBORX_DETAILS_DISTRIBUTOR_HPP
+
+#include <ArborX_Config.hpp>
+
+#include <ArborX_DetailsSortUtils.hpp>
+#include <ArborX_DetailsUtils.hpp> // max
+#include <ArborX_Exception.hpp>
+
+#include <Kokkos_Core.hpp>
+
+#include <algorithm> // max_element
+#include <numeric>   // iota
+#include <sstream>
+#include <vector>
+
+#include <mpi.h>
+
+namespace ArborX
+{
+namespace Details
+{
+
+// Assuming that batched_ranks might contain elements multiply, but duplicates
+// are not separated by other elements, return the unique elements in that array
+// with the corresponding element counts and displacement (offsets).
+template <typename ExecutionSpace, typename InputView, typename OutputView>
+static void
+determineBufferLayout(ExecutionSpace const &space, InputView batched_ranks,
+                      InputView batched_offsets, OutputView permutation_indices,
+                      std::vector<int> &unique_ranks, std::vector<int> &counts,
+                      std::vector<int> &offsets)
+{
+  ARBORX_ASSERT(unique_ranks.empty());
+  ARBORX_ASSERT(offsets.empty());
+  ARBORX_ASSERT(counts.empty());
+  ARBORX_ASSERT(permutation_indices.extent_int(0) == 0);
+  ARBORX_ASSERT(batched_ranks.size() + 1 == batched_offsets.size());
+  static_assert(
+      std::is_same<typename InputView::non_const_value_type, int>::value, "");
+  static_assert(std::is_same<typename OutputView::value_type, int>::value, "");
+
+  // In case all the batches are empty, return an empty list of unique_ranks and
+  // counts, but still have one element in offsets. This is conforming with
+  // creating the total offsets from batched_ranks and batched_offsets ignoring
+  // empty batches and calling sortAndDetermeineBufferLayout.
+  offsets.push_back(0);
+
+  auto const n_batched_ranks = batched_ranks.size();
+  if (n_batched_ranks == 0 || lastElement(batched_offsets) == 0)
+    return;
+
+  using DeviceType = typename InputView::traits::device_type;
+
+  // Find the indices in batched_ranks for which the rank changes and store
+  // these ranks and the corresponding offsets in a new container that we can be
+  // sure to be large enough.
+  Kokkos::View<int *, DeviceType> compact_offsets(
+      Kokkos::view_alloc(Kokkos::WithoutInitializing, batched_offsets.label()),
+      batched_offsets.size());
+  Kokkos::View<int *, DeviceType> compact_ranks(
+      Kokkos::view_alloc(Kokkos::WithoutInitializing, batched_ranks.label()),
+      batched_ranks.size());
+
+  // Note that we never touch the first element of compact_offsets below.
+  // Consequently, it is uninitialized.
+  int n_unique_ranks;
+  Kokkos::parallel_scan(
+      "ArborX::Distributor::compact_offsets_and_ranks",
+      Kokkos::RangePolicy<ExecutionSpace>(space, 0, n_batched_ranks),
+      KOKKOS_LAMBDA(unsigned int i, int &update, bool last_pass) {
+        if (i == batched_ranks.size() - 1 ||
+            batched_ranks(i + 1) != batched_ranks(i))
+        {
+          if (last_pass)
+          {
+            compact_ranks(update) = batched_ranks(i);
+            compact_offsets(update + 1) = batched_offsets(i + 1);
+          }
+          ++update;
+        }
+      },
+      n_unique_ranks);
+
+  // Now create subviews containing the elements we actually need, copy
+  // everything to the CPU and fill the output variables.
+  auto restricted_offsets = InputView(
+      compact_offsets, std::make_pair(1, static_cast<int>(n_unique_ranks + 1)));
+  auto restricted_unique_ranks = InputView(
+      compact_ranks, std::make_pair(0, static_cast<int>(n_unique_ranks)));
+
+  auto const unique_ranks_host = Kokkos::create_mirror_view_and_copy(
+      Kokkos::HostSpace(), restricted_unique_ranks);
+  unique_ranks.reserve(n_unique_ranks);
+  auto const offsets_host = Kokkos::create_mirror_view_and_copy(
+      Kokkos::HostSpace(), restricted_offsets);
+  offsets.reserve(n_unique_ranks + 1);
+  counts.reserve(n_unique_ranks);
+
+  for (int i = 0; i < n_unique_ranks; ++i)
+  {
+    int const count =
+        i == 0 ? offsets_host(0) : offsets_host(i) - offsets_host(i - 1);
+    if (count > 0)
+    {
+      counts.push_back(count);
+      offsets.push_back(offsets_host(i));
+      unique_ranks.push_back(unique_ranks_host(i));
+    }
+  }
+}
+
+// Computes the array of indices that sort the input array (in reverse order)
+// but also returns the sorted unique elements in that array with the
+// corresponding element counts and displacement (offsets)
+template <typename ExecutionSpace, typename InputView, typename OutputView>
+static void sortAndDetermineBufferLayout(ExecutionSpace const &space,
+                                         InputView ranks,
+                                         OutputView permutation_indices,
+                                         std::vector<int> &unique_ranks,
+                                         std::vector<int> &counts,
+                                         std::vector<int> &offsets)
+{
+  ARBORX_ASSERT(unique_ranks.empty());
+  ARBORX_ASSERT(offsets.empty());
+  ARBORX_ASSERT(counts.empty());
+  ARBORX_ASSERT(permutation_indices.extent_int(0) == ranks.extent_int(0));
+  static_assert(
+      std::is_same<typename InputView::non_const_value_type, int>::value, "");
+  static_assert(std::is_same<typename OutputView::value_type, int>::value, "");
+
+  offsets.push_back(0);
+
+  auto const n = ranks.extent_int(0);
+  if (n == 0)
+    return;
+
+  // this implements a "sort" which is O(N * R) where (R) is the total number of
+  // unique destination ranks. it performs better than other algorithms in the
+  // case when (R) is small, but results may vary
+  using DeviceType = typename InputView::traits::device_type;
+
+  Kokkos::View<int *, DeviceType> device_ranks_duplicate(
+      Kokkos::view_alloc(Kokkos::WithoutInitializing, ranks.label()),
+      ranks.size());
+  Kokkos::deep_copy(space, device_ranks_duplicate, ranks);
+  auto device_permutation_indices =
+      Kokkos::create_mirror_view(DeviceType(), permutation_indices);
+  int offset = 0;
+  while (true)
+  {
+    int const largest_rank = ArborX::max(space, device_ranks_duplicate);
+    if (largest_rank == -1)
+      break;
+    unique_ranks.push_back(largest_rank);
+    int result = 0;
+    Kokkos::parallel_scan("ArborX::Distributor::process_biggest_rank_items",
+                          Kokkos::RangePolicy<ExecutionSpace>(space, 0, n),
+                          KOKKOS_LAMBDA(int i, int &update, bool last_pass) {
+                            bool const is_largest_rank =
+                                (device_ranks_duplicate(i) == largest_rank);
+                            if (is_largest_rank)
+                            {
+                              if (last_pass)
+                              {
+                                device_permutation_indices(i) = update + offset;
+                                device_ranks_duplicate(i) = -1;
+                              }
+                              ++update;
+                            }
+                          },
+                          result);
+    offset += result;
+    offsets.push_back(offset);
+  }
+  counts.reserve(offsets.size() - 1);
+  for (unsigned int i = 1; i < offsets.size(); ++i)
+    counts.push_back(offsets[i] - offsets[i - 1]);
+  Kokkos::deep_copy(space, permutation_indices, device_permutation_indices);
+  ARBORX_ASSERT(offsets.back() == static_cast<int>(ranks.size()));
+}
+
+template <typename DeviceType>
+class Distributor
+{
+public:
+  Distributor(MPI_Comm comm)
+      : _comm(comm)
+      , _permute{Kokkos::view_alloc(Kokkos::WithoutInitializing,
+                                    "ArborX::Distributor::permute"),
+                 0}
+  {
+  }
+
+  template <typename ExecutionSpace, typename View>
+  size_t createFromSends(ExecutionSpace const &space,
+                         View const &batched_destination_ranks,
+                         View const &batch_offsets)
+  {
+    static_assert(View::rank == 1, "");
+    static_assert(std::is_same<typename View::non_const_value_type, int>::value,
+                  "");
+
+    // The next two function calls are the only difference to the other
+    // overload.
+    // Note that we don't resize _permute here since we are assuming that no
+    // reordering is necessary.
+    determineBufferLayout(space, batched_destination_ranks, batch_offsets,
+                          _permute, _destinations, _dest_counts, _dest_offsets);
+
+    return preparePointToPointCommunication();
+  }
+
+  template <typename ExecutionSpace, typename View>
+  size_t createFromSends(ExecutionSpace const &space,
+                         View const &destination_ranks)
+  {
+    static_assert(View::rank == 1, "");
+    static_assert(std::is_same<typename View::non_const_value_type, int>::value,
+                  "");
+
+    // The next two function calls are the only difference to the other
+    // overload.
+    reallocWithoutInitializing(_permute, destination_ranks.size());
+    sortAndDetermineBufferLayout(space, destination_ranks, _permute,
+                                 _destinations, _dest_counts, _dest_offsets);
+
+    return preparePointToPointCommunication();
+  }
+
+  template <typename ExecutionSpace, typename ExportView, typename ImportView>
+  void doPostsAndWaits(ExecutionSpace const &space, ExportView const &exports,
+                       size_t num_packets, ImportView const &imports) const
+  {
+    ARBORX_ASSERT(num_packets * _src_offsets.back() == imports.size());
+    ARBORX_ASSERT(num_packets * _dest_offsets.back() == exports.size());
+
+    using ValueType = typename ImportView::value_type;
+    static_assert(
+        std::is_same<ValueType,
+                     std::remove_cv_t<typename ExportView::value_type>>::value,
+        "");
+    static_assert(ImportView::rank == 1, "");
+
+    static_assert(
+        std::is_same<typename ExportView::memory_space,
+                     typename decltype(_permute)::memory_space>::value,
+        "");
+
+    // This allows function to work even when ExportView is unmanaged.
+    using ExportViewWithoutMemoryTraits =
+        Kokkos::View<typename ExportView::data_type,
+                     typename ExportView::array_layout,
+                     typename ExportView::device_type>;
+
+    using DestBufferMirrorViewType =
+        decltype(ArborX::Details::create_layout_right_mirror_view_and_copy(
+            std::declval<typename ImportView::memory_space>(),
+            std::declval<ExportViewWithoutMemoryTraits>()));
+
+    constexpr int pointer_depth = internal::PointerDepth<
+        typename DestBufferMirrorViewType::traits::data_type>::value;
+    DestBufferMirrorViewType dest_buffer_mirror(
+        "ArborX::Distributor::doPostsAndWaits::destination_buffer_mirror", 0,
+        pointer_depth > 1 ? 0 : KOKKOS_INVALID_INDEX,
+        pointer_depth > 2 ? 0 : KOKKOS_INVALID_INDEX,
+        pointer_depth > 3 ? 0 : KOKKOS_INVALID_INDEX,
+        pointer_depth > 4 ? 0 : KOKKOS_INVALID_INDEX,
+        pointer_depth > 5 ? 0 : KOKKOS_INVALID_INDEX,
+        pointer_depth > 6 ? 0 : KOKKOS_INVALID_INDEX,
+        pointer_depth > 7 ? 0 : KOKKOS_INVALID_INDEX);
+
+    // If _permute is empty, we are assuming that we don't need to permute
+    // exports.
+    bool const permutation_necessary = _permute.size() != 0;
+    if (permutation_necessary)
+    {
+      auto dest_buffer = ExportViewWithoutMemoryTraits(
+          "ArborX::Distributor::doPostsAndWaits::destination_buffer",
+          typename ExportView::array_layout{});
+
+      reallocWithoutInitializing(dest_buffer, exports.layout());
+
+      // We need to create a local copy to avoid capturing a member variable
+      // (via the 'this' pointer) which we can't do using a KOKKOS_LAMBDA.
+      // Use KOKKOS_CLASS_LAMBDA when we require C++17.
+      auto const permute_copy = _permute;
+
+      ArborX::Details::applyInversePermutation(space, permute_copy, exports,
+                                               dest_buffer);
+
+      dest_buffer_mirror =
+          ArborX::Details::create_layout_right_mirror_view_and_copy(
+              typename ImportView::memory_space(), dest_buffer);
+    }
+    else
+    {
+      dest_buffer_mirror =
+          ArborX::Details::create_layout_right_mirror_view_and_copy(
+              typename ImportView::memory_space(), exports);
+    }
+
+    static_assert(
+        decltype(dest_buffer_mirror)::rank == 1 ||
+            std::is_same<typename decltype(dest_buffer_mirror)::array_layout,
+                         Kokkos::LayoutRight>::value,
+        "");
+    static_assert(ImportView::rank == 1 ||
+                      std::is_same<typename ImportView::array_layout,
+                                   Kokkos::LayoutRight>::value,
+                  "");
+
+    int comm_rank;
+    MPI_Comm_rank(_comm, &comm_rank);
+    int comm_size;
+    MPI_Comm_size(_comm, &comm_size);
+    int const indegrees = _sources.size();
+    int const outdegrees = _destinations.size();
+    std::vector<MPI_Request> requests;
+    requests.reserve(outdegrees + indegrees);
+    for (int i = 0; i < indegrees; ++i)
+    {
+      if (_sources[i] != comm_rank)
+      {
+        auto const message_size =
+            _src_counts[i] * num_packets * sizeof(ValueType);
+        auto const receive_buffer_ptr =
+            imports.data() + _src_offsets[i] * num_packets;
+        requests.emplace_back();
+        MPI_Irecv(receive_buffer_ptr, message_size, MPI_BYTE, _sources[i], 123,
+                  _comm, &requests.back());
+      }
+    }
+
+    // make sure the data in dest_buffer has been copied before sending it.
+    if (permutation_necessary)
+      space.fence();
+
+    for (int i = 0; i < outdegrees; ++i)
+    {
+      auto const message_size =
+          _dest_counts[i] * num_packets * sizeof(ValueType);
+      auto const send_buffer_ptr =
+          dest_buffer_mirror.data() + _dest_offsets[i] * num_packets;
+      if (_destinations[i] == comm_rank)
+      {
+        auto const it = std::find(_sources.begin(), _sources.end(), comm_rank);
+        ARBORX_ASSERT(it != _sources.end());
+        auto const position = it - _sources.begin();
+        auto const receive_buffer_ptr =
+            imports.data() + _src_offsets[position] * num_packets;
+
+        Kokkos::View<ValueType *, typename ImportView::traits::device_type,
+                     Kokkos::MemoryTraits<Kokkos::Unmanaged>>
+            receive_view(receive_buffer_ptr, message_size / sizeof(ValueType));
+        Kokkos::View<const ValueType *,
+                     typename ExportView::traits::device_type,
+                     Kokkos::MemoryTraits<Kokkos::Unmanaged>>
+            send_view(send_buffer_ptr, message_size / sizeof(ValueType));
+        Kokkos::deep_copy(space, receive_view, send_view);
+      }
+      else
+      {
+        requests.emplace_back();
+        MPI_Isend(send_buffer_ptr, message_size, MPI_BYTE, _destinations[i],
+                  123, _comm, &requests.back());
+      }
+    }
+    if (!requests.empty())
+      MPI_Waitall(requests.size(), requests.data(), MPI_STATUSES_IGNORE);
+  }
+  size_t getTotalReceiveLength() const { return _src_offsets.back(); }
+  size_t getTotalSendLength() const { return _dest_offsets.back(); }
+
+private:
+  size_t preparePointToPointCommunication()
+  {
+    int comm_size;
+    MPI_Comm_size(_comm, &comm_size);
+
+    std::vector<int> src_counts_dense(comm_size);
+    int const dest_size = _destinations.size();
+    for (int i = 0; i < dest_size; ++i)
+    {
+      src_counts_dense[_destinations[i]] = _dest_counts[i];
+    }
+    MPI_Alltoall(MPI_IN_PLACE, 0, MPI_DATATYPE_NULL, src_counts_dense.data(), 1,
+                 MPI_INT, _comm);
+
+    _src_offsets.push_back(0);
+    for (int i = 0; i < comm_size; ++i)
+      if (src_counts_dense[i] > 0)
+      {
+        _sources.push_back(i);
+        _src_counts.push_back(src_counts_dense[i]);
+        _src_offsets.push_back(_src_offsets.back() + _src_counts.back());
+      }
+
+    return _src_offsets.back();
+  }
+
+  MPI_Comm _comm;
+  Kokkos::View<int *, DeviceType> _permute;
+  std::vector<int> _dest_offsets;
+  std::vector<int> _dest_counts;
+  std::vector<int> _src_offsets;
+  std::vector<int> _src_counts;
+  std::vector<int> _sources;
+  std::vector<int> _destinations;
+};
+
+} // namespace Details
+} // namespace ArborX
+
+#endif
diff --git a/arborx/src/details/ArborX_DetailsFDBSCAN.hpp b/arborx/src/details/ArborX_DetailsFDBSCAN.hpp
new file mode 100644
index 000000000..27321281f
--- /dev/null
+++ b/arborx/src/details/ArborX_DetailsFDBSCAN.hpp
@@ -0,0 +1,100 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#ifndef ARBORX_DETAILSFDBSCAN_HPP
+#define ARBORX_DETAILSFDBSCAN_HPP
+
+#include <ArborX_Callbacks.hpp>
+#include <ArborX_DetailsUnionFind.hpp>
+#include <ArborX_Predicates.hpp>
+
+#include <Kokkos_Core.hpp>
+
+namespace ArborX
+{
+namespace Details
+{
+
+template <typename MemorySpace>
+struct CountUpToN
+{
+  Kokkos::View<int *, MemorySpace> _counts;
+  int _n;
+
+  template <typename Query>
+  KOKKOS_FUNCTION auto operator()(Query const &query, int) const
+  {
+    auto i = getData(query);
+    Kokkos::atomic_fetch_add(&_counts(i), 1);
+
+    if (_counts(i) < _n)
+      return ArborX::CallbackTreeTraversalControl::normal_continuation;
+
+    // Once count reaches threshold, terminate the traversal.
+    return ArborX::CallbackTreeTraversalControl::early_exit;
+  }
+};
+
+template <typename MemorySpace, typename CorePointsType>
+struct FDBSCANCallback
+{
+  UnionFind<MemorySpace> _union_find;
+  CorePointsType _is_core_point;
+
+  FDBSCANCallback(Kokkos::View<int *, MemorySpace> const &view,
+                  CorePointsType is_core_point)
+      : _union_find(view)
+      , _is_core_point(is_core_point)
+  {
+  }
+
+  template <typename Query>
+  KOKKOS_FUNCTION auto operator()(Query const &query, int j) const
+  {
+    int const i = ArborX::getData(query);
+
+    bool const is_border_point = !_is_core_point(i);
+    if (is_border_point)
+    {
+      // Ignore border points, they will be processed by the
+      // connected core points. Theoretically, border points could have been
+      // filtered out prior to running the algorithm, but that may be expensive.
+      return ArborX::CallbackTreeTraversalControl::early_exit;
+    }
+
+    bool const is_neighbor_core_point = _is_core_point(j);
+    if (is_neighbor_core_point && i > j)
+    {
+      // For a core point that is connected to another core point, do the
+      // standard CCS algorithm
+      _union_find.merge(i, j);
+    }
+    else if (!is_neighbor_core_point)
+    {
+      // For a border point that is connected to a core point, set its
+      // representative to that of the core point. If it is connected to
+      // multiple core points, it will be assigned to the cluster that the last
+      // core point was in.
+      //
+      // NOTE: DO NOT USE merge(i, j) here. This may set this border
+      // point as a representative for the whole cluster. This would mean that
+      // a) labels_(i) == i still (so it would be processed later, and b) it may
+      // be combined with a different cluster later forming a bridge.
+      _union_find.merge_into(j, i);
+    }
+
+    return ArborX::CallbackTreeTraversalControl::normal_continuation;
+  }
+};
+} // namespace Details
+} // namespace ArborX
+
+#endif
diff --git a/arborx/src/details/ArborX_DetailsFDBSCANDenseBox.hpp b/arborx/src/details/ArborX_DetailsFDBSCANDenseBox.hpp
new file mode 100644
index 000000000..d8816b25a
--- /dev/null
+++ b/arborx/src/details/ArborX_DetailsFDBSCANDenseBox.hpp
@@ -0,0 +1,390 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#ifndef ARBORX_DETAILSFDBSCANDENSEBOX_HPP
+#define ARBORX_DETAILSFDBSCANDENSEBOX_HPP
+
+#include <ArborX_Callbacks.hpp>
+#include <ArborX_DetailsKokkosExtAccessibilityTraits.hpp>
+#include <ArborX_DetailsUnionFind.hpp>
+#include <ArborX_DetailsUtils.hpp>
+#include <ArborX_Predicates.hpp>
+
+#include <Kokkos_Core.hpp>
+
+#include <cassert>
+
+namespace ArborX
+{
+namespace Details
+{
+
+struct CartesianGrid
+{
+  Box _bounds;
+  float _h;
+  size_t _nx;
+  size_t _ny;
+  size_t _nz;
+
+  CartesianGrid(Box const &bounds, float h)
+      : _bounds(bounds)
+      , _h(h)
+  {
+    auto const &min_corner = bounds.minCorner();
+    auto const &max_corner = bounds.maxCorner();
+    _nx = std::ceil((max_corner[0] - min_corner[0]) / h);
+    _ny = std::ceil((max_corner[1] - min_corner[1]) / h);
+    _nz = std::ceil((max_corner[2] - min_corner[2]) / h);
+
+    // Catch potential overflow in grid cell indices early. This is a
+    // conservative check as an actual overflow may not occur, depending on
+    // which cells are filled.
+    size_t constexpr max_size_t = std::numeric_limits<size_t>::max();
+    ARBORX_ASSERT(_nx == 0 || _ny == 0 || _nz == 0 ||
+                  (_ny < max_size_t / _nx && _nz < max_size_t / (_nx * _ny)));
+  }
+
+  KOKKOS_FUNCTION
+  size_t cellIndex(Point const &point) const
+  {
+    auto const &min_corner = _bounds.minCorner();
+    size_t i = std::floor((point[0] - min_corner[0]) / _h);
+    size_t j = std::floor((point[1] - min_corner[1]) / _h);
+    size_t k = std::floor((point[2] - min_corner[2]) / _h);
+    return k * _nx * _ny + j * _nx + i;
+  }
+
+  KOKKOS_FUNCTION
+  Box cellBox(size_t cell_index) const
+  {
+    auto const &min_corner = _bounds.minCorner();
+
+    auto i = cell_index % _nx;
+    auto j = (cell_index / _nx) % _ny;
+    auto k = cell_index / (_nx * _ny);
+    return {{min_corner[0] + i * _h, min_corner[1] + j * _h,
+             min_corner[2] + k * _h},
+            {min_corner[0] + (i + 1) * _h, min_corner[1] + (j + 1) * _h,
+             min_corner[2] + (k + 1) * _h}};
+  }
+};
+
+template <typename MemorySpace, typename Primitives, typename DenseCellOffsets,
+          typename Permutation>
+struct CountUpToN_DenseBox
+{
+  Kokkos::View<int *, MemorySpace> _counts;
+  Primitives _primitives;
+  DenseCellOffsets _dense_cell_offsets;
+  int _num_dense_cells;
+  Permutation _permute;
+  int core_min_size;
+  float eps;
+  int _n;
+
+  CountUpToN_DenseBox(Kokkos::View<int *, MemorySpace> const &counts,
+                      Primitives const &primitives,
+                      DenseCellOffsets const &dense_cell_offsets,
+                      Permutation const &permute, int core_min_size_in,
+                      float eps_in, int n)
+      : _counts(counts)
+      , _primitives(primitives)
+      , _dense_cell_offsets(dense_cell_offsets)
+      , _num_dense_cells(dense_cell_offsets.size() - 1)
+      , _permute(permute)
+      , core_min_size(core_min_size_in)
+      , eps(eps_in)
+      , _n(n)
+  {
+  }
+
+  template <typename Query>
+  KOKKOS_FUNCTION auto operator()(Query const &query, int k) const
+  {
+    using Access = AccessTraits<Primitives, PrimitivesTag>;
+
+    auto const i = getData(query);
+
+    bool const is_dense_cell = (k < _num_dense_cells);
+
+    int &count = _counts(i);
+    if (is_dense_cell)
+    {
+      Point const &query_point = Access::get(_primitives, i);
+
+      int const cell_start = _dense_cell_offsets(k);
+      int const cell_end = _dense_cell_offsets(k + 1);
+      for (int jj = cell_start; jj < cell_end; ++jj)
+      {
+        int j = _permute(jj);
+        if (distance(query_point, Access::get(_primitives, j)) <= eps)
+        {
+          Kokkos::atomic_fetch_add(&count, 1);
+          if (count >= _n)
+            return ArborX::CallbackTreeTraversalControl::early_exit;
+        }
+      }
+    }
+    else
+    {
+      Kokkos::atomic_fetch_add(&count, 1);
+      if (count >= _n)
+        return ArborX::CallbackTreeTraversalControl::early_exit;
+    }
+
+    return ArborX::CallbackTreeTraversalControl::normal_continuation;
+  }
+};
+
+template <typename MemorySpace, typename CorePointsType, typename Primitives,
+          typename DenseCellOffsets, typename Permutation>
+struct FDBSCANDenseBoxCallback
+{
+  UnionFind<MemorySpace> _union_find;
+  CorePointsType _is_core_point;
+  Primitives _primitives;
+  DenseCellOffsets _dense_cell_offsets;
+  int _num_dense_cells;
+  int _num_points_in_dense_cells;
+  Permutation _permute;
+  float eps;
+
+  FDBSCANDenseBoxCallback(Kokkos::View<int *, MemorySpace> const &labels,
+                          CorePointsType const &is_core_point,
+                          Primitives const &primitives,
+                          DenseCellOffsets const &dense_cell_offsets,
+                          Permutation const &permute, float eps_in)
+      : _union_find(labels)
+      , _is_core_point(is_core_point)
+      , _primitives(primitives)
+      , _dense_cell_offsets(dense_cell_offsets)
+      , _num_dense_cells(dense_cell_offsets.size() - 1)
+      , _num_points_in_dense_cells(lastElement(dense_cell_offsets))
+      , _permute(permute)
+      , eps(eps_in)
+  {
+  }
+
+  template <typename Query>
+  KOKKOS_FUNCTION auto operator()(Query const &query, int k) const
+  {
+    using Access = AccessTraits<Primitives, PrimitivesTag>;
+
+    auto const i = ArborX::getData(query);
+
+    bool const is_border_point = !_is_core_point(i);
+    if (is_border_point)
+      return ArborX::CallbackTreeTraversalControl::early_exit;
+
+    bool const is_dense_cell = (k < _num_dense_cells);
+
+    if (is_dense_cell)
+    {
+      int const cell_start = _dense_cell_offsets(k);
+      int const cell_end = _dense_cell_offsets(k + 1);
+
+      // Skip the dense box if they were already merged together
+      if (_union_find.representative(i) ==
+          _union_find.representative(_permute(cell_start)))
+        return ArborX::CallbackTreeTraversalControl::normal_continuation;
+
+      Point const &query_point = Access::get(_primitives, i);
+
+      for (int jj = cell_start; jj < cell_end; ++jj)
+      {
+        int j = _permute(jj);
+
+        // As soon as a pair is found, stop the search. If it is a case of
+        // merging two dense cells, this will stop all other threads from
+        // processing the same merge.
+        if (_union_find.representative(i) == _union_find.representative(j))
+          break;
+
+        if (distance(query_point, Access::get(_primitives, j)) <= eps)
+        {
+          // We connected to at least one point in the dense box, thus we
+          // connected to all of them, so may terminate
+          _union_find.merge(i, j);
+          break;
+        }
+      }
+    }
+    else
+    {
+      int j = _permute(_num_points_in_dense_cells + (k - _num_dense_cells));
+
+      // No need to check the distance here, as the fact that we are inside the
+      // callback guarantees that it is <= eps
+
+      bool const is_neighbor_core_point = _is_core_point(j);
+      if (is_neighbor_core_point && i > j)
+        _union_find.merge(i, j);
+      else if (!is_neighbor_core_point)
+        _union_find.merge_into(j, i);
+    }
+
+    return ArborX::CallbackTreeTraversalControl::normal_continuation;
+  }
+};
+
+template <typename ExecutionSpace, typename Primitives>
+Kokkos::View<size_t *,
+             typename AccessTraits<Primitives, PrimitivesTag>::memory_space>
+computeCellIndices(ExecutionSpace const &exec_space,
+                   Primitives const &primitives, CartesianGrid const &grid)
+{
+  using Access = AccessTraits<Primitives, PrimitivesTag>;
+  using MemorySpace = typename Access::memory_space;
+
+  auto const n = Access::size(primitives);
+
+  Kokkos::View<size_t *, MemorySpace> cell_indices(
+      Kokkos::view_alloc(Kokkos::WithoutInitializing,
+                         "ArborX::DBSCAN::cell_indices"),
+      n);
+  Kokkos::parallel_for("ArborX::DBSCAN::compute_cell_indices",
+                       Kokkos::RangePolicy<ExecutionSpace>(exec_space, 0, n),
+                       KOKKOS_LAMBDA(int i) {
+                         auto const &xyz = Access::get(primitives, i);
+                         cell_indices(i) = grid.cellIndex(xyz);
+                       });
+  return cell_indices;
+}
+
+// TODO: should put it together with other commonly used Kokkos
+// routines and unit test it in the future
+template <typename ExecutionSpace, typename View>
+Kokkos::View<int *, typename View::memory_space>
+computeOffsetsInOrderedView(ExecutionSpace const &exec_space, View view)
+{
+  using MemorySpace = typename View::memory_space;
+
+  static_assert(
+      KokkosExt::is_accessible_from<MemorySpace, ExecutionSpace>::value, "");
+
+  auto const n = view.extent(0);
+
+  int num_offsets;
+  Kokkos::View<int *, MemorySpace> offsets(
+      Kokkos::view_alloc(Kokkos::WithoutInitializing,
+                         "ArborX::DBSCAN::offsets"),
+      n + 1);
+  Kokkos::parallel_scan(
+      "ArborX::DBSCAN::compute_offsets",
+      Kokkos::RangePolicy<ExecutionSpace>(exec_space, 0, n + 1),
+      KOKKOS_LAMBDA(int i, int &update, bool final_pass) {
+        bool const is_cell_first_index =
+            (i == 0 || i == (int)n || view(i) != view(i - 1));
+        if (is_cell_first_index)
+        {
+          if (final_pass)
+            offsets(update) = i;
+          ++update;
+        }
+      },
+      num_offsets);
+  --num_offsets;
+  Kokkos::resize(offsets, num_offsets + 1);
+
+  return offsets;
+}
+
+template <typename ExecutionSpace, typename CellIndices, typename CellOffsets,
+          typename Permutation>
+int reorderDenseAndSparseCells(ExecutionSpace const &exec_space,
+                               CellOffsets cell_offsets, int core_min_size,
+                               CellIndices &sorted_cell_indices,
+                               Permutation &permute)
+{
+  using MemorySpace = typename CellIndices::memory_space;
+
+  static_assert(
+      KokkosExt::is_accessible_from<MemorySpace, ExecutionSpace>::value, "");
+
+  auto const num_nonempty_cells = cell_offsets.size() - 1;
+
+  // Count the number of points in the dense cells
+  int num_points_in_dense_cells = 0;
+  Kokkos::parallel_reduce(
+      "ArborX::DBSCAN::count_points_in_dense_cells",
+      Kokkos::RangePolicy<ExecutionSpace>(exec_space, 0, num_nonempty_cells),
+      KOKKOS_LAMBDA(int i, int &update) {
+        int num_points_in_cell = cell_offsets(i + 1) - cell_offsets(i);
+        if (num_points_in_cell >= core_min_size)
+          update += num_points_in_cell;
+      },
+      num_points_in_dense_cells);
+
+  // Create new arrays of cells indices and permute, so that the points in the
+  // dense cells go first, and the points in non-dense (sparse) cells go after
+  // them. The points in the same cell are still together.
+  Kokkos::View<int, MemorySpace> dense_offset("ArborX::DBSCAN::dense_offset");
+  Kokkos::View<int, MemorySpace> sparse_offset("ArborX::DBSCAN::sparse_offset");
+  Kokkos::deep_copy(dense_offset, 0);
+  Kokkos::deep_copy(sparse_offset, num_points_in_dense_cells);
+
+  auto reordered_permute = cloneWithoutInitializingNorCopying(permute);
+  auto reordered_cell_indices =
+      cloneWithoutInitializingNorCopying(sorted_cell_indices);
+  Kokkos::parallel_for(
+      "ArborX::DBSCAN::reorder_cell_indices_and_permutation",
+      Kokkos::RangePolicy<ExecutionSpace>(exec_space, 0, num_nonempty_cells),
+      KOKKOS_LAMBDA(int i) {
+        auto const num_points_in_cell = cell_offsets(i + 1) - cell_offsets(i);
+        bool const is_dense_cell = (num_points_in_cell >= core_min_size);
+        int offset = Kokkos::atomic_fetch_add(
+            (is_dense_cell ? &dense_offset() : &sparse_offset()),
+            num_points_in_cell);
+        for (int j = cell_offsets(i); j < cell_offsets(i + 1); ++j, ++offset)
+        {
+          reordered_cell_indices(offset) = sorted_cell_indices(j);
+          reordered_permute(offset) = permute(j);
+        }
+      });
+
+  sorted_cell_indices = reordered_cell_indices;
+  permute = reordered_permute;
+
+  return num_points_in_dense_cells;
+}
+
+template <typename ExecutionSpace, typename CellIndices, typename Permutation,
+          typename Labels>
+void unionFindWithinEachDenseCell(ExecutionSpace const &exec_space,
+                                  CellIndices sorted_dense_cell_indices,
+                                  Permutation permute, Labels labels)
+{
+  using MemorySpace = typename Permutation::memory_space;
+
+  UnionFind<MemorySpace> union_find{labels};
+
+  // The algorithm relies on the fact that the cell indices array only contains
+  // dense cells. Thus, as long as two cell indices are the same, a) they
+  // belong to the same cell, and b) that cell is dense, thus they should be in
+  // the same cluster. If, on the other hand, the array also contained
+  // non-dense cells, that would not have been possible, as an additional
+  // computations would have to be done to figure out if the points belong to a
+  // dense cell, which would have required a linear scan.
+  auto const n = sorted_dense_cell_indices.size();
+  Kokkos::parallel_for("ArborX::DBSCAN::union_find_within_each_dense_box",
+                       Kokkos::RangePolicy<ExecutionSpace>(exec_space, 1, n),
+                       KOKKOS_LAMBDA(int i) {
+                         if (sorted_dense_cell_indices(i) ==
+                             sorted_dense_cell_indices(i - 1))
+                           union_find.merge(permute(i), permute(i - 1));
+                       });
+}
+
+} // namespace Details
+} // namespace ArborX
+
+#endif
diff --git a/arborx/src/details/ArborX_DetailsHappyTreeFriends.hpp b/arborx/src/details/ArborX_DetailsHappyTreeFriends.hpp
new file mode 100644
index 000000000..5bbfe3cae
--- /dev/null
+++ b/arborx/src/details/ArborX_DetailsHappyTreeFriends.hpp
@@ -0,0 +1,61 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#ifndef ARBORX_DETAILS_HAPPY_TREE_FRIENDS_HPP
+#define ARBORX_DETAILS_HAPPY_TREE_FRIENDS_HPP
+
+#include <Kokkos_Macros.hpp>
+
+#include <type_traits>
+#include <utility> // declval
+
+namespace ArborX
+{
+namespace Details
+{
+struct HappyTreeFriends
+{
+  template <class BVH>
+  static KOKKOS_FUNCTION decltype(auto) getNodePtr(BVH const &bvh, int i)
+  {
+    return bvh.getNodePtr(i);
+  }
+
+  template <class BVH>
+  static KOKKOS_FUNCTION decltype(auto) getRoot(BVH const &bvh)
+  {
+    return bvh.getRoot();
+  }
+
+  template <class BVH>
+  using node_const_pointer_t = decltype(getRoot(std::declval<BVH const &>()));
+
+  template <class BVH>
+  using node_t =
+      std::remove_const_t<std::remove_pointer_t<node_const_pointer_t<BVH>>>;
+
+  template <class BVH>
+  static KOKKOS_FUNCTION decltype(auto)
+  getBoundingVolume(BVH const &bvh, node_t<BVH> const *node)
+  {
+    return bvh.getBoundingVolume(node);
+  }
+
+  template <class BVH>
+  static decltype(auto) getLeafNodes(BVH const &bvh)
+  {
+    return bvh.getLeafNodes();
+  }
+};
+} // namespace Details
+} // namespace ArborX
+
+#endif
diff --git a/arborx/src/details/ArborX_DetailsHeap.hpp b/arborx/src/details/ArborX_DetailsHeap.hpp
new file mode 100644
index 000000000..9e4ca479e
--- /dev/null
+++ b/arborx/src/details/ArborX_DetailsHeap.hpp
@@ -0,0 +1,129 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+#ifndef ARBORX_DETAILS_HEAP_HPP
+#define ARBORX_DETAILS_HEAP_HPP
+
+#include <Kokkos_Macros.hpp>
+
+#include <iterator> // iterator_traits
+#include <utility>  // move
+
+namespace ArborX
+{
+namespace Details
+{
+
+template <typename RandomIterator, typename Compare>
+KOKKOS_INLINE_FUNCTION bool isHeap(RandomIterator first, RandomIterator last,
+                                   Compare comp)
+{
+  using DistanceType =
+      typename std::iterator_traits<RandomIterator>::difference_type;
+  DistanceType len = last - first;
+  for (DistanceType pos = 0; pos < len; ++pos)
+  {
+    for (DistanceType child : {2 * pos + 1, 2 * pos + 2})
+      if (child < len && comp(*(first + pos), *(first + child)))
+        return false;
+  }
+  return true;
+}
+
+template <typename RandomIterator, typename DistanceType, typename ValueType,
+          typename Compare>
+KOKKOS_INLINE_FUNCTION void bubbleUp(RandomIterator first, DistanceType pos,
+                                     DistanceType top, ValueType val,
+                                     Compare comp)
+{
+  DistanceType parent = (pos - 1) / 2;
+  while (pos > top && comp(*(first + parent), val))
+  {
+    *(first + pos) = std::move(*(first + parent));
+    pos = parent;
+    parent = (pos - 1) / 2;
+  }
+  *(first + pos) = std::move(val);
+}
+
+template <typename RandomIterator, typename Compare>
+KOKKOS_INLINE_FUNCTION void pushHeap(RandomIterator first, RandomIterator last,
+                                     Compare comp)
+{
+  using DistanceType =
+      typename std::iterator_traits<RandomIterator>::difference_type;
+  using ValueType = typename std::iterator_traits<RandomIterator>::value_type;
+  if (last - first > 1)
+  {
+    ValueType value = std::move(*(last - 1));
+    bubbleUp(first, DistanceType((last - first) - 1), DistanceType(0),
+             std::move(value), comp);
+  }
+}
+
+template <typename RandomIterator, typename DistanceType, typename ValueType,
+          typename Compare>
+KOKKOS_INLINE_FUNCTION void bubbleDown(RandomIterator first, DistanceType pos,
+                                       DistanceType len, ValueType val,
+                                       Compare comp)
+{
+  DistanceType child = 2 * pos + 1;
+  // if right child exists and compares greater than left child
+  if (child + 1 < len && comp(*(first + child), *(first + child + 1)))
+    ++child;
+
+  while (child < len && comp(val, *(first + child)))
+  {
+    *(first + pos) = std::move(*(first + child));
+    pos = child;
+    child = 2 * pos + 1;
+    if (child + 1 < len && comp(*(first + child), *(first + child + 1)))
+      ++child;
+  }
+  *(first + pos) = std::move(val);
+}
+
+template <typename RandomIterator, typename Compare>
+KOKKOS_INLINE_FUNCTION void popHeap(RandomIterator first, RandomIterator last,
+                                    Compare comp)
+{
+  using DistanceType =
+      typename std::iterator_traits<RandomIterator>::difference_type;
+  using ValueType = typename std::iterator_traits<RandomIterator>::value_type;
+  if (last - first > 1)
+  {
+    ValueType value = std::move(*first);
+    bubbleDown(first, DistanceType(0), DistanceType((last - first) - 1),
+               std::move(*(last - 1)), comp);
+    *(last - 1) = std::move(value);
+  }
+}
+
+template <typename RandomIterator, typename Compare>
+KOKKOS_INLINE_FUNCTION void makeHeap(RandomIterator first, RandomIterator last,
+                                     Compare comp)
+{
+  RandomIterator heap_end = first;
+  while (heap_end != last)
+    pushHeap(first, ++heap_end, comp);
+}
+
+template <typename RandomIterator, typename Compare>
+KOKKOS_INLINE_FUNCTION void sortHeap(RandomIterator first, RandomIterator last,
+                                     Compare comp)
+{
+  while (first != last)
+    popHeap(first, last--, comp);
+}
+
+} // namespace Details
+} // namespace ArborX
+
+#endif
diff --git a/arborx/src/details/ArborX_DetailsKokkosExtAccessibilityTraits.hpp b/arborx/src/details/ArborX_DetailsKokkosExtAccessibilityTraits.hpp
new file mode 100644
index 000000000..daa020623
--- /dev/null
+++ b/arborx/src/details/ArborX_DetailsKokkosExtAccessibilityTraits.hpp
@@ -0,0 +1,50 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#ifndef ARBORX_DETAILS_KOKKOS_EXT_ACCESSIBILITY_TRAITS_HPP
+#define ARBORX_DETAILS_KOKKOS_EXT_ACCESSIBILITY_TRAITS_HPP
+
+#include <Kokkos_Core.hpp>
+
+#include <type_traits>
+
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
+
+namespace KokkosExt
+{
+
+template <typename MemorySpace, typename ExecutionSpace, typename = void>
+struct is_accessible_from : std::false_type
+{
+  static_assert(Kokkos::is_memory_space<MemorySpace>::value, "");
+  static_assert(Kokkos::is_execution_space<ExecutionSpace>::value, "");
+};
+
+template <typename MemorySpace, typename ExecutionSpace>
+struct is_accessible_from<MemorySpace, ExecutionSpace,
+                          std::enable_if_t<Kokkos::SpaceAccessibility<
+                              ExecutionSpace, MemorySpace>::accessible>>
+    : std::true_type
+{
+};
+
+template <typename View>
+struct is_accessible_from_host
+    : public is_accessible_from<typename View::memory_space, Kokkos::HostSpace>
+{
+  static_assert(Kokkos::is_view<View>::value, "");
+};
+
+} // namespace KokkosExt
+
+#endif // DOXYGEN_SHOULD_SKIP_THIS
+
+#endif
diff --git a/arborx/src/details/ArborX_DetailsKokkosExtArithmeticTraits.hpp b/arborx/src/details/ArborX_DetailsKokkosExtArithmeticTraits.hpp
new file mode 100644
index 000000000..138da7288
--- /dev/null
+++ b/arborx/src/details/ArborX_DetailsKokkosExtArithmeticTraits.hpp
@@ -0,0 +1,72 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#ifndef ARBORX_DETAILS_KOKKOS_EXT_ARITHMETIC_TRAITS_HPP
+#define ARBORX_DETAILS_KOKKOS_EXT_ARITHMETIC_TRAITS_HPP
+
+#include <cfloat> // DBL_MAX, DBL_EPSILON
+#include <cmath>  // HUGE_VAL
+
+namespace KokkosExt
+{
+namespace ArithmeticTraits
+{
+
+template <typename T>
+struct infinity;
+
+template <>
+struct infinity<float>
+{
+  static constexpr float value = HUGE_VALF;
+};
+
+template <>
+struct infinity<double>
+{
+  static constexpr double value = HUGE_VAL;
+};
+
+template <typename T>
+struct max;
+
+template <>
+struct max<float>
+{
+  static constexpr float value = FLT_MAX;
+};
+
+template <>
+struct max<double>
+{
+  static constexpr double value = DBL_MAX;
+};
+
+template <typename T>
+struct epsilon;
+
+template <>
+struct epsilon<float>
+{
+  static constexpr float value = FLT_EPSILON;
+};
+
+template <>
+struct epsilon<double>
+{
+  static constexpr double value = DBL_EPSILON;
+};
+
+} // namespace ArithmeticTraits
+
+} // namespace KokkosExt
+
+#endif
diff --git a/arborx/src/details/ArborX_DetailsKokkosExtMathFunctions.hpp b/arborx/src/details/ArborX_DetailsKokkosExtMathFunctions.hpp
new file mode 100644
index 000000000..55baa2024
--- /dev/null
+++ b/arborx/src/details/ArborX_DetailsKokkosExtMathFunctions.hpp
@@ -0,0 +1,41 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#ifndef ARBORX_DETAILS_KOKKOS_EXT_MATH_FUNCTIONS_HPP
+#define ARBORX_DETAILS_KOKKOS_EXT_MATH_FUNCTIONS_HPP
+
+#include <Kokkos_Macros.hpp>
+
+#include <cmath> // isfinite
+
+namespace KokkosExt
+{
+
+/** Determine whether the given floating point argument @param x has finite
+ * value.
+ *
+ * NOTE: Clang issues a warning if the std:: namespace is missing and nvcc
+ * complains about calling a __host__ function from a __host__ __device__
+ * function when it is present.
+ */
+template <typename T>
+KOKKOS_INLINE_FUNCTION bool isFinite(T x)
+{
+#ifdef __CUDA_ARCH__
+  return isfinite(x);
+#else
+  return std::isfinite(x);
+#endif
+}
+
+} // namespace KokkosExt
+
+#endif
diff --git a/arborx/src/details/ArborX_DetailsKokkosExtMinMaxOperations.hpp b/arborx/src/details/ArborX_DetailsKokkosExtMinMaxOperations.hpp
new file mode 100644
index 000000000..a0b470f6a
--- /dev/null
+++ b/arborx/src/details/ArborX_DetailsKokkosExtMinMaxOperations.hpp
@@ -0,0 +1,36 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#ifndef ARBORX_DETAILS_KOKKOS_EXT_MIN_MAX_OPERATIONS_HPP
+#define ARBORX_DETAILS_KOKKOS_EXT_MIN_MAX_OPERATIONS_HPP
+
+#include <Kokkos_Macros.hpp>
+
+namespace KokkosExt
+{
+
+//! Compute the maximum of two values.
+template <typename T>
+KOKKOS_INLINE_FUNCTION constexpr T const &max(T const &a, T const &b)
+{
+  return (a > b) ? a : b;
+}
+
+//! Compute the minimum of two values.
+template <typename T>
+KOKKOS_INLINE_FUNCTION constexpr T const &min(T const &a, T const &b)
+{
+  return (a < b) ? a : b;
+}
+
+} // namespace KokkosExt
+
+#endif
diff --git a/arborx/src/details/ArborX_DetailsKokkosExtScopedProfileRegion.hpp b/arborx/src/details/ArborX_DetailsKokkosExtScopedProfileRegion.hpp
new file mode 100644
index 000000000..f1368b26a
--- /dev/null
+++ b/arborx/src/details/ArborX_DetailsKokkosExtScopedProfileRegion.hpp
@@ -0,0 +1,37 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#ifndef ARBORX_DETAILS_KOKKOS_EXT_SCOPED_PROFILE_REGION_HPP
+#define ARBORX_DETAILS_KOKKOS_EXT_SCOPED_PROFILE_REGION_HPP
+
+#include <Kokkos_Core.hpp>
+
+#include <string>
+
+namespace KokkosExt
+{
+
+class ScopedProfileRegion
+{
+public:
+  ScopedProfileRegion(ScopedProfileRegion const &) = delete;
+  ScopedProfileRegion &operator=(ScopedProfileRegion const &) = delete;
+
+  explicit ScopedProfileRegion(std::string const &name)
+  {
+    Kokkos::Profiling::pushRegion(name);
+  }
+  ~ScopedProfileRegion() { Kokkos::Profiling::popRegion(); }
+};
+
+} // namespace KokkosExt
+
+#endif
diff --git a/arborx/src/details/ArborX_DetailsMortonCode.hpp b/arborx/src/details/ArborX_DetailsMortonCode.hpp
new file mode 100644
index 000000000..15042e477
--- /dev/null
+++ b/arborx/src/details/ArborX_DetailsMortonCode.hpp
@@ -0,0 +1,60 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#ifndef ARBORX_DETAILS_MORTON_CODE_UTILS_HPP
+#define ARBORX_DETAILS_MORTON_CODE_UTILS_HPP
+
+#include <ArborX_DetailsKokkosExtMinMaxOperations.hpp> // min. max
+#include <ArborX_Exception.hpp>
+
+namespace ArborX
+{
+
+namespace Details
+{
+
+// Expands a 10-bit integer into 30 bits
+// by inserting 2 zeros after each bit.
+KOKKOS_INLINE_FUNCTION
+unsigned int expandBits(unsigned int v)
+{
+  v = (v * 0x00010001u) & 0xFF0000FFu;
+  v = (v * 0x00000101u) & 0x0F00F00Fu;
+  v = (v * 0x00000011u) & 0xC30C30C3u;
+  v = (v * 0x00000005u) & 0x49249249u;
+  return v;
+}
+
+// Calculates a 30-bit Morton code for the
+// given 3D point located within the unit cube [0,1].
+KOKKOS_INLINE_FUNCTION
+unsigned int morton3D(double x, double y, double z)
+{
+  using KokkosExt::max;
+  using KokkosExt::min;
+
+  // The interval [0,1] is subdivided into 1024 bins (in each direction).
+  // If we were to use more bits to encode the Morton code, we would need
+  // to reflect these changes in expandBits()
+  x = min(max(x * 1024.0, 0.0), 1023.0);
+  y = min(max(y * 1024.0, 0.0), 1023.0);
+  z = min(max(z * 1024.0, 0.0), 1023.0);
+  unsigned int xx = expandBits((unsigned int)x);
+  unsigned int yy = expandBits((unsigned int)y);
+  unsigned int zz = expandBits((unsigned int)z);
+  return xx * 4 + yy * 2 + zz;
+}
+
+} // namespace Details
+
+} // namespace ArborX
+
+#endif
diff --git a/arborx/src/details/ArborX_DetailsNode.hpp b/arborx/src/details/ArborX_DetailsNode.hpp
new file mode 100644
index 000000000..e19847ab5
--- /dev/null
+++ b/arborx/src/details/ArborX_DetailsNode.hpp
@@ -0,0 +1,119 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#ifndef ARBORX_NODE_HPP
+#define ARBORX_NODE_HPP
+
+#include <ArborX_Box.hpp>
+
+#include <Kokkos_Macros.hpp>
+
+#include <cassert>
+#include <climits> // INT_MIN
+#include <utility> // std::move
+
+namespace ArborX
+{
+namespace Details
+{
+
+struct NodeWithTwoChildrenTag
+{
+};
+struct NodeWithLeftChildAndRopeTag
+{
+};
+
+template <class BoundingVolume>
+struct NodeWithTwoChildren
+{
+  using Tag = NodeWithTwoChildrenTag;
+  using bounding_volume_type = BoundingVolume;
+
+  KOKKOS_DEFAULTED_FUNCTION
+  constexpr NodeWithTwoChildren() = default;
+
+  KOKKOS_INLINE_FUNCTION constexpr bool isLeaf() const noexcept
+  {
+    return left_child == -1;
+  }
+
+  KOKKOS_INLINE_FUNCTION constexpr std::size_t getLeafPermutationIndex() const
+      noexcept
+  {
+    assert(isLeaf());
+    return right_child;
+  }
+
+  int left_child = -1;
+  int right_child = -1;
+  BoundingVolume bounding_volume;
+};
+
+template <class BoundingVolume>
+KOKKOS_INLINE_FUNCTION constexpr NodeWithTwoChildren<BoundingVolume>
+makeLeafNode(NodeWithTwoChildrenTag, std::size_t permutation_index,
+             BoundingVolume bounding_volume) noexcept
+{
+  return {-1, static_cast<int>(permutation_index), std::move(bounding_volume)};
+}
+
+int constexpr ROPE_SENTINEL = -1;
+
+template <class BoundingVolume>
+struct NodeWithLeftChildAndRope
+{
+  using Tag = NodeWithLeftChildAndRopeTag;
+  using bounding_volume_type = BoundingVolume;
+
+  KOKKOS_DEFAULTED_FUNCTION
+  constexpr NodeWithLeftChildAndRope() = default;
+
+  KOKKOS_INLINE_FUNCTION constexpr bool isLeaf() const noexcept
+  {
+    // Important: this check works only as long as the internal node with index
+    // 0 is at the root. If there is a need in the future, this can be changed
+    // to "< 0", but would require additional arithmetic (subtracting 1) in
+    // `getLeafPermutationIndex` and in `makeLeafNode`.
+    return left_child <= 0;
+  }
+
+  KOKKOS_INLINE_FUNCTION constexpr std::size_t getLeafPermutationIndex() const
+      noexcept
+  {
+    assert(isLeaf());
+    return -left_child;
+  }
+
+  // The meaning of the left child depends on whether the node is an internal
+  // node, or a leaf. For internal nodes, it is the child from the left
+  // subtree. For a leaf node, it is the negative of the permutation index.
+  int left_child = INT_MIN;
+
+  // An interesting property to remember: a right child is always the rope of
+  // the left child.
+  int rope = ROPE_SENTINEL;
+
+  BoundingVolume bounding_volume;
+};
+
+template <class BoundingVolume>
+KOKKOS_INLINE_FUNCTION constexpr NodeWithLeftChildAndRope<BoundingVolume>
+makeLeafNode(NodeWithLeftChildAndRopeTag, std::size_t permutation_index,
+             BoundingVolume bounding_volume) noexcept
+{
+  return {-static_cast<int>(permutation_index), ROPE_SENTINEL,
+          std::move(bounding_volume)};
+}
+} // namespace Details
+} // namespace ArborX
+
+#endif
diff --git a/arborx/src/details/ArborX_DetailsOperatorFunctionObjects.hpp b/arborx/src/details/ArborX_DetailsOperatorFunctionObjects.hpp
new file mode 100644
index 000000000..8ff650d94
--- /dev/null
+++ b/arborx/src/details/ArborX_DetailsOperatorFunctionObjects.hpp
@@ -0,0 +1,45 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#ifndef ARBORX_DETAILS_OPERATOR_FUNCTION_OBJECTS_HPP
+#define ARBORX_DETAILS_OPERATOR_FUNCTION_OBJECTS_HPP
+
+#include <Kokkos_Macros.hpp>
+
+namespace ArborX
+{
+namespace Details
+{
+
+template <typename T>
+struct Less
+{
+public:
+  KOKKOS_FUNCTION constexpr bool operator()(T const &lhs, T const &rhs) const
+  {
+    return lhs < rhs;
+  }
+};
+
+template <typename T>
+struct Greater
+{
+public:
+  KOKKOS_FUNCTION constexpr bool operator()(T const &lhs, T const &rhs) const
+  {
+    return lhs > rhs;
+  }
+};
+
+} // namespace Details
+} // namespace ArborX
+
+#endif
diff --git a/arborx/src/details/ArborX_DetailsPermutedData.hpp b/arborx/src/details/ArborX_DetailsPermutedData.hpp
new file mode 100644
index 000000000..f3e8dd3cc
--- /dev/null
+++ b/arborx/src/details/ArborX_DetailsPermutedData.hpp
@@ -0,0 +1,67 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#ifndef ARBORX_DETAILS_PERMUTED_DATA_HPP
+#define ARBORX_DETAILS_PERMUTED_DATA_HPP
+
+#include <ArborX_AccessTraits.hpp>
+
+namespace ArborX
+{
+
+namespace Details
+{
+
+template <typename Data, typename Permute, bool AttachIndices = false>
+struct PermutedData
+{
+  Data _data;
+  Permute _permute;
+  KOKKOS_FUNCTION auto &operator()(int i) const { return _data(_permute(i)); }
+};
+
+} // namespace Details
+
+template <typename Predicates, typename Permute, bool AttachIndices>
+struct AccessTraits<Details::PermutedData<Predicates, Permute, AttachIndices>,
+                    PredicatesTag>
+{
+  using PermutedPredicates =
+      Details::PermutedData<Predicates, Permute, AttachIndices>;
+  using NativeAccess = AccessTraits<Predicates, PredicatesTag>;
+
+  static std::size_t size(PermutedPredicates const &permuted_predicates)
+  {
+    return NativeAccess::size(permuted_predicates._data);
+  }
+
+  template <bool _Attach = AttachIndices>
+  KOKKOS_FUNCTION static auto get(PermutedPredicates const &permuted_predicates,
+                                  std::enable_if_t<_Attach, std::size_t> index)
+  {
+    auto const permuted_index = permuted_predicates._permute(index);
+    return attach(NativeAccess::get(permuted_predicates._data, permuted_index),
+                  (int)index);
+  }
+
+  template <bool _Attach = AttachIndices>
+  KOKKOS_FUNCTION static auto get(PermutedPredicates const &permuted_predicates,
+                                  std::enable_if_t<!_Attach, std::size_t> index)
+  {
+    auto const permuted_index = permuted_predicates._permute(index);
+    return NativeAccess::get(permuted_predicates._data, permuted_index);
+  }
+  using memory_space = typename NativeAccess::memory_space;
+};
+
+} // namespace ArborX
+
+#endif
diff --git a/arborx/src/details/ArborX_DetailsPriorityQueue.hpp b/arborx/src/details/ArborX_DetailsPriorityQueue.hpp
new file mode 100644
index 000000000..5d663c5d7
--- /dev/null
+++ b/arborx/src/details/ArborX_DetailsPriorityQueue.hpp
@@ -0,0 +1,113 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+#ifndef ARBORX_DETAILS_PRIORITY_QUEUE_HPP
+#define ARBORX_DETAILS_PRIORITY_QUEUE_HPP
+
+#include <ArborX_DetailsContainers.hpp>
+#include <ArborX_DetailsHeap.hpp>
+#include <ArborX_DetailsOperatorFunctionObjects.hpp> // Less
+
+#include <Kokkos_Macros.hpp>
+
+#include <cstddef>     // ptrdiff_t
+#include <type_traits> // is_same
+#include <utility>     // move, forward
+
+namespace ArborX
+{
+namespace Details
+{
+
+template <typename T, typename Compare = Less<T>,
+          typename Container = StaticVector<T, 256>>
+class PriorityQueue
+{
+public:
+  using container_type = Container;
+  using value_compare = Compare;
+  using value_type = typename Container::value_type;
+  using size_type = typename Container::size_type;
+  using reference = typename Container::reference;
+  using const_reference = typename Container::const_reference;
+  static_assert(std::is_same<value_type, T>::value,
+                "Template parameter T in PriorityQueue is not the same as "
+                "the type of the elements stored by the underlying "
+                "container Container::value_type");
+
+  KOKKOS_DEFAULTED_FUNCTION PriorityQueue() = default;
+
+  KOKKOS_FUNCTION PriorityQueue(Container const &c)
+      : _c(c)
+  {
+    assert(_c.empty() || isHeap(_c.data(), _c.data() + _c.size(), _compare));
+  }
+
+  // Capacity
+  KOKKOS_INLINE_FUNCTION bool empty() const { return _c.empty(); }
+  KOKKOS_INLINE_FUNCTION size_type size() const { return _c.size(); }
+
+  // Element access
+  KOKKOS_INLINE_FUNCTION reference top() { return _c.front(); }
+  KOKKOS_INLINE_FUNCTION const_reference top() const { return _c.front(); }
+
+  // Modifiers
+  KOKKOS_INLINE_FUNCTION void push(value_type const &value)
+  {
+    _c.pushBack(value);
+    pushHeap(_c.data(), _c.data() + _c.size(), _compare);
+  }
+  KOKKOS_INLINE_FUNCTION void push(value_type &&value)
+  {
+    _c.pushBack(std::move(value));
+    pushHeap(_c.data(), _c.data() + _c.size(), _compare);
+  }
+  template <class... Args>
+  KOKKOS_INLINE_FUNCTION void emplace(Args &&... args)
+  {
+    _c.emplaceBack(std::forward<Args>(args)...);
+    pushHeap(_c.data(), _c.data() + _c.size(), _compare);
+  }
+  KOKKOS_INLINE_FUNCTION void pop()
+  {
+    popHeap(_c.data(), _c.data() + _c.size(), _compare);
+    _c.popBack();
+  }
+  // in TreeTraversal::nearestQuery, pop() is often followed by push which is
+  // an opportunity for doing a single bubble-down operation instead of paying
+  // for both one bubble-down and one bubble-up
+  template <typename... Args>
+  KOKKOS_INLINE_FUNCTION void popPush(Args &&... args)
+  {
+    assert(!_c.empty());
+    bubbleDown(_c.data(), std::ptrdiff_t(0), std::ptrdiff_t(_c.size()),
+               T{std::forward<Args>(args)...}, _compare);
+  }
+
+  // Accessors that shouldn't be there but that are convenient in
+  // TreeTraversal::nearestQuery()
+  KOKKOS_INLINE_FUNCTION typename Container::pointer data()
+  {
+    return _c.data();
+  }
+  KOKKOS_INLINE_FUNCTION value_compare const &valueComp() const
+  {
+    return _compare;
+  }
+
+private:
+  Container _c;
+  Compare _compare;
+};
+
+} // namespace Details
+} // namespace ArborX
+
+#endif
diff --git a/arborx/src/details/ArborX_DetailsSortUtils.hpp b/arborx/src/details/ArborX_DetailsSortUtils.hpp
new file mode 100644
index 000000000..5d6c3f825
--- /dev/null
+++ b/arborx/src/details/ArborX_DetailsSortUtils.hpp
@@ -0,0 +1,281 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#ifndef ARBORX_DETAILS_SORT_UTILS_HPP
+#define ARBORX_DETAILS_SORT_UTILS_HPP
+
+#include <ArborX_Config.hpp> // ARBORX_ENABLE_ROCTHRUST
+
+#include <ArborX_DetailsKokkosExtAccessibilityTraits.hpp> // is_accessible_from
+#include <ArborX_DetailsUtils.hpp>                        // iota
+#include <ArborX_Exception.hpp>
+
+#include <Kokkos_Core.hpp>
+#include <Kokkos_Sort.hpp> // min_max_functor
+
+// clang-format off
+#if defined(KOKKOS_ENABLE_CUDA)
+#  if defined(KOKKOS_COMPILER_CLANG)
+// Some versions of Clang fail to compile Thrust, failing with errors like
+// this:
+//    <snip>/thrust/system/cuda/detail/core/agent_launcher.h:557:11:
+//    error: use of undeclared identifier 'va_printf'
+// The exact combination of versions for Clang and Thrust (or CUDA) for this
+// failure was not investigated, however even very recent version combination
+// (Clang 10.0.0 and Cuda 10.0) demonstrated failure.
+//
+// Defining _CubLog here allows us to avoid that code path, however disabling
+// some debugging diagnostics
+//
+// If _CubLog is already defined, we save it into ARBORX_CubLog_save, and
+// restore it at the end
+#    ifdef _CubLog
+#      define ARBORX_CubLog_save _CubLog
+#    endif
+#    define _CubLog
+#    include <thrust/device_ptr.h>
+#    include <thrust/sort.h>
+#    undef _CubLog
+#    ifdef ARBORX_CubLog_save
+#      define _CubLog ARBORX_CubLog_save
+#      undef ARBORX_CubLog_save
+#    endif
+#  else // #if defined(KOKKOS_COMPILER_CLANG)
+#    include <thrust/device_ptr.h>
+#    include <thrust/sort.h>
+#  endif // #if defined(KOKKOS_COMPILER_CLANG)
+#endif   // #if defined(KOKKOS_ENABLE_CUDA)
+// clang-format on
+
+#if defined(KOKKOS_ENABLE_HIP) && defined(ARBORX_ENABLE_ROCTHRUST)
+#include <thrust/device_ptr.h>
+#include <thrust/sort.h>
+#endif
+
+#if defined(KOKKOS_ENABLE_SYCL) && defined(ARBORX_ENABLE_ONEDPL)
+#include <oneapi/dpl/algorithm>
+#include <oneapi/dpl/execution>
+#include <oneapi/dpl/iterator>
+#endif
+
+namespace ArborX
+{
+
+namespace Details
+{
+
+// NOTE returns the permutation indices **and** sorts the input view
+template <typename ExecutionSpace, typename ViewType,
+          class SizeType = unsigned int>
+Kokkos::View<SizeType *, typename ViewType::device_type>
+sortObjects(ExecutionSpace const &space, ViewType &view)
+{
+  int const n = view.extent(0);
+
+  using ValueType = typename ViewType::value_type;
+  using CompType = Kokkos::BinOp1D<ViewType>;
+
+  Kokkos::MinMaxScalar<ValueType> result;
+  Kokkos::MinMax<ValueType> reducer(result);
+  parallel_reduce("ArborX::Sorting::find_min_max_view",
+                  Kokkos::RangePolicy<ExecutionSpace>(space, 0, n),
+                  Kokkos::Impl::min_max_functor<ViewType>(view), reducer);
+  if (result.min_val == result.max_val)
+  {
+    Kokkos::View<SizeType *, typename ViewType::device_type> permute(
+        Kokkos::view_alloc(Kokkos::WithoutInitializing,
+                           "ArborX::Sorting::permute"),
+        n);
+    iota(space, permute);
+    return permute;
+  }
+
+  Kokkos::BinSort<ViewType, CompType, typename ViewType::device_type, SizeType>
+      bin_sort(view, CompType(n / 2, result.min_val, result.max_val), true);
+  bin_sort.create_permute_vector();
+  bin_sort.sort(view);
+  // FIXME Kokkos::BinSort is currently missing overloads that an execution
+  // space as argument
+
+  return bin_sort.get_permute_vector();
+}
+
+#if defined(KOKKOS_ENABLE_CUDA) ||                                             \
+    (defined(KOKKOS_ENABLE_HIP) && defined(ARBORX_ENABLE_ROCTHRUST))
+// NOTE returns the permutation indices **and** sorts the input view
+template <typename ViewType, class SizeType = unsigned int>
+Kokkos::View<SizeType *, typename ViewType::device_type> sortObjects(
+#if defined(KOKKOS_ENABLE_CUDA)
+    Kokkos::Cuda const &space,
+#else
+    Kokkos::Experimental::HIP const &space,
+#endif
+    ViewType &view)
+{
+  int const n = view.extent(0);
+
+  using ValueType = typename ViewType::value_type;
+  static_assert(std::is_same<std::decay_t<decltype(space)>,
+                             typename ViewType::execution_space>::value,
+                "");
+
+  Kokkos::View<SizeType *, typename ViewType::device_type> permute(
+      Kokkos::view_alloc(Kokkos::WithoutInitializing,
+                         "ArborX::Sorting::permutation"),
+      n);
+  ArborX::iota(space, permute);
+
+#if defined(KOKKOS_ENABLE_CUDA)
+  auto const execution_policy = thrust::cuda::par.on(space.cuda_stream());
+#else
+  auto const execution_policy = thrust::hip::par.on(space.hip_stream());
+#endif
+
+  auto permute_ptr = thrust::device_ptr<SizeType>(permute.data());
+  auto begin_ptr = thrust::device_ptr<ValueType>(view.data());
+  auto end_ptr = thrust::device_ptr<ValueType>(view.data() + n);
+  thrust::sort_by_key(execution_policy, begin_ptr, end_ptr, permute_ptr);
+
+  return permute;
+}
+#endif
+
+#if defined(KOKKOS_ENABLE_SYCL) && defined(ARBORX_ENABLE_ONEDPL)
+// NOTE returns the permutation indices **and** sorts the input view
+template <typename ViewType, class SizeType = unsigned int>
+Kokkos::View<SizeType *, typename ViewType::device_type>
+sortObjects(Kokkos::Experimental::SYCL const &space, ViewType &view)
+{
+  int const n = view.extent(0);
+
+  static_assert(
+      KokkosExt::is_accessible_from<typename ViewType::memory_space,
+                                    Kokkos::Experimental::SYCL>::value,
+      "");
+
+  Kokkos::View<SizeType *, typename ViewType::device_type> permute(
+      Kokkos::view_alloc(Kokkos::WithoutInitializing,
+                         "ArborX::Sorting::permutation"),
+      n);
+  ArborX::iota(space, permute);
+
+  auto zipped_begin =
+      oneapi::dpl::make_zip_iterator(view.data(), permute.data());
+  oneapi::dpl::execution::device_policy policy(
+      *space.impl_internal_space_instance()->m_queue);
+  oneapi::dpl::sort(
+      policy, zipped_begin, zipped_begin + n,
+      [](auto lhs, auto rhs) { return std::get<0>(lhs) < std::get<0>(rhs); });
+
+  return permute;
+}
+#endif
+
+// Helper functions and structs for applyPermutations
+namespace PermuteHelper
+{
+template <class DstViewType, class SrcViewType, int Rank = DstViewType::Rank>
+struct CopyOp;
+
+template <class DstViewType, class SrcViewType>
+struct CopyOp<DstViewType, SrcViewType, 1>
+{
+  KOKKOS_INLINE_FUNCTION
+  static void copy(DstViewType const &dst, size_t i_dst, SrcViewType const &src,
+                   size_t i_src)
+  {
+    dst(i_dst) = src(i_src);
+  }
+};
+
+template <class DstViewType, class SrcViewType>
+struct CopyOp<DstViewType, SrcViewType, 2>
+{
+  KOKKOS_INLINE_FUNCTION
+  static void copy(DstViewType const &dst, size_t i_dst, SrcViewType const &src,
+                   size_t i_src)
+  {
+    for (unsigned int j = 0; j < dst.extent(1); j++)
+      dst(i_dst, j) = src(i_src, j);
+  }
+};
+
+template <class DstViewType, class SrcViewType>
+struct CopyOp<DstViewType, SrcViewType, 3>
+{
+  KOKKOS_INLINE_FUNCTION
+  static void copy(DstViewType const &dst, size_t i_dst, SrcViewType const &src,
+                   size_t i_src)
+  {
+    for (unsigned int j = 0; j < dst.extent(1); j++)
+      for (unsigned int k = 0; k < dst.extent(2); k++)
+        dst(i_dst, j, k) = src(i_src, j, k);
+  }
+};
+} // namespace PermuteHelper
+
+template <typename ExecutionSpace, typename PermutationView, typename InputView,
+          typename OutputView>
+void applyInversePermutation(ExecutionSpace const &space,
+                             PermutationView const &permutation,
+                             InputView const &input_view,
+                             OutputView const &output_view)
+{
+  static_assert(std::is_integral<typename PermutationView::value_type>::value,
+                "");
+  ARBORX_ASSERT(permutation.extent(0) == input_view.extent(0));
+  ARBORX_ASSERT(output_view.extent(0) == input_view.extent(0));
+
+  Kokkos::parallel_for(
+      "ArborX::Sorting::inverse_permute",
+      Kokkos::RangePolicy<ExecutionSpace>(space, 0, input_view.extent(0)),
+      KOKKOS_LAMBDA(int i) {
+        PermuteHelper::CopyOp<OutputView, InputView>::copy(
+            output_view, permutation(i), input_view, i);
+      });
+}
+
+template <typename ExecutionSpace, typename PermutationView, typename InputView,
+          typename OutputView>
+void applyPermutation(ExecutionSpace const &space,
+                      PermutationView const &permutation,
+                      InputView const &input_view,
+                      OutputView const &output_view)
+{
+  static_assert(std::is_integral<typename PermutationView::value_type>::value,
+                "");
+  ARBORX_ASSERT(permutation.extent(0) == input_view.extent(0));
+  ARBORX_ASSERT(output_view.extent(0) == input_view.extent(0));
+
+  Kokkos::parallel_for(
+      "ArborX::Sorting::permute",
+      Kokkos::RangePolicy<ExecutionSpace>(space, 0, input_view.extent(0)),
+      KOKKOS_LAMBDA(int i) {
+        PermuteHelper::CopyOp<OutputView, InputView>::copy(
+            output_view, i, input_view, permutation(i));
+      });
+}
+
+template <typename ExecutionSpace, typename PermutationView, typename View>
+void applyPermutation(ExecutionSpace const &space,
+                      PermutationView const &permutation, View &view)
+{
+  static_assert(std::is_integral<typename PermutationView::value_type>::value,
+                "");
+  auto scratch_view = clone(space, view);
+  applyPermutation(space, permutation, scratch_view, view);
+}
+
+} // namespace Details
+
+} // namespace ArborX
+
+#endif
diff --git a/arborx/src/details/ArborX_DetailsStack.hpp b/arborx/src/details/ArborX_DetailsStack.hpp
new file mode 100644
index 000000000..0a04223fa
--- /dev/null
+++ b/arborx/src/details/ArborX_DetailsStack.hpp
@@ -0,0 +1,73 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+#ifndef ARBORX_DETAILS_STACK_HPP
+#define ARBORX_DETAILS_STACK_HPP
+
+#include <ArborX_DetailsContainers.hpp>
+
+#include <Kokkos_Macros.hpp>
+
+#include <type_traits> // is_same
+#include <utility>     // move, forward
+
+namespace ArborX
+{
+namespace Details
+{
+
+template <typename T, typename Container = StaticVector<T, 64>>
+class Stack
+{
+public:
+  using container_type = Container;
+  using value_type = typename Container::value_type;
+  using size_type = typename Container::size_type;
+  using reference = typename Container::reference;
+  using const_reference = typename Container::const_reference;
+  static_assert(std::is_same<value_type, T>::value,
+                "Template parameter T in Stack is not the same as "
+                "the type of the elements stored by the underlying "
+                "container Container::value_type");
+
+  KOKKOS_DEFAULTED_FUNCTION Stack() = default;
+
+  // Capacity
+  KOKKOS_INLINE_FUNCTION bool empty() const { return _c.empty(); }
+  KOKKOS_INLINE_FUNCTION size_type size() const { return _c.size(); }
+
+  // Element access
+  KOKKOS_INLINE_FUNCTION reference &top() { return _c.back(); }
+  KOKKOS_INLINE_FUNCTION const_reference &top() const { return _c.back(); }
+
+  // Modifiers
+  KOKKOS_INLINE_FUNCTION void push(value_type const &value)
+  {
+    _c.pushBack(value);
+  }
+  KOKKOS_INLINE_FUNCTION void push(value_type &&value)
+  {
+    _c.pushBack(std::move(value));
+  }
+  template <class... Args>
+  KOKKOS_INLINE_FUNCTION void emplace(Args &&... args)
+  {
+    _c.emplaceBack(std::forward<Args>(args)...);
+  }
+  KOKKOS_INLINE_FUNCTION void pop() { _c.popBack(); }
+
+private:
+  Container _c;
+};
+
+} // namespace Details
+} // namespace ArborX
+
+#endif
diff --git a/arborx/src/details/ArborX_DetailsTags.hpp b/arborx/src/details/ArborX_DetailsTags.hpp
new file mode 100644
index 000000000..657b2df62
--- /dev/null
+++ b/arborx/src/details/ArborX_DetailsTags.hpp
@@ -0,0 +1,57 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#ifndef ARBORX_DETAILS_TAGS_HPP
+#define ARBORX_DETAILS_TAGS_HPP
+
+#include <ArborX_Box.hpp>
+#include <ArborX_Point.hpp>
+
+namespace ArborX
+{
+namespace Details
+{
+
+struct PointTag
+{
+};
+
+struct BoxTag
+{
+};
+
+template <typename T, typename Enable = void>
+struct Tag
+{
+};
+
+template <>
+struct Tag<Point>
+{
+  using type = PointTag;
+};
+
+template <>
+struct Tag<Box>
+{
+  using type = BoxTag;
+};
+
+template <typename T>
+struct Tag<T>
+{
+  using type = typename T::Tag;
+};
+
+} // namespace Details
+} // namespace ArborX
+
+#endif
diff --git a/arborx/src/details/ArborX_DetailsTreeConstruction.hpp b/arborx/src/details/ArborX_DetailsTreeConstruction.hpp
new file mode 100644
index 000000000..4a0539083
--- /dev/null
+++ b/arborx/src/details/ArborX_DetailsTreeConstruction.hpp
@@ -0,0 +1,416 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#ifndef ARBORX_DETAILS_TREE_CONSTRUCTION_HPP
+#define ARBORX_DETAILS_TREE_CONSTRUCTION_HPP
+
+#include <ArborX_AccessTraits.hpp>
+#include <ArborX_Box.hpp>
+#include <ArborX_DetailsAlgorithms.hpp> // expand
+#include <ArborX_DetailsMortonCode.hpp> // morton3D
+#include <ArborX_DetailsNode.hpp>       // makeLeafNode
+#include <ArborX_DetailsTags.hpp>
+
+#include <Kokkos_Core.hpp>
+
+#include <cassert>
+
+namespace Kokkos
+{ // reduction identity must be defined in Kokkos namespace
+template <>
+struct reduction_identity<ArborX::Box>
+{
+  KOKKOS_FUNCTION static ArborX::Box sum() { return {}; }
+};
+} // namespace Kokkos
+
+namespace ArborX
+{
+namespace Details
+{
+namespace TreeConstruction
+{
+
+template <typename ExecutionSpace, typename Primitives>
+inline void calculateBoundingBoxOfTheScene(ExecutionSpace const &space,
+                                           Primitives const &primitives,
+                                           Box &scene_bounding_box)
+{
+  using Access = AccessTraits<Primitives, PrimitivesTag>;
+  auto const n = Access::size(primitives);
+  Kokkos::parallel_reduce(
+      "ArborX::TreeConstruction::calculate_bounding_box_of_the_scene",
+      Kokkos::RangePolicy<ExecutionSpace>(space, 0, n),
+      KOKKOS_LAMBDA(int i, Box &update) {
+        update += Access::get(primitives, i);
+      },
+      scene_bounding_box);
+}
+
+template <typename ExecutionSpace, typename Primitives, typename MortonCodes>
+inline void assignMortonCodesDispatch(BoxTag, ExecutionSpace const &space,
+                                      Primitives const &primitives,
+                                      MortonCodes morton_codes,
+                                      Box const &scene_bounding_box)
+{
+  using Access = AccessTraits<Primitives, PrimitivesTag>;
+  auto const n = Access::size(primitives);
+  Kokkos::parallel_for("ArborX::TreeConstruction::assign_morton_codes",
+                       Kokkos::RangePolicy<ExecutionSpace>(space, 0, n),
+                       KOKKOS_LAMBDA(int i) {
+                         Point xyz;
+                         centroid(Access::get(primitives, i), xyz);
+                         translateAndScale(xyz, xyz, scene_bounding_box);
+                         morton_codes(i) = morton3D(xyz[0], xyz[1], xyz[2]);
+                       });
+}
+
+template <typename ExecutionSpace, typename Primitives, typename MortonCodes>
+inline void assignMortonCodesDispatch(PointTag, ExecutionSpace const &space,
+                                      Primitives const &primitives,
+                                      MortonCodes morton_codes,
+                                      Box const &scene_bounding_box)
+{
+  using Access = AccessTraits<Primitives, PrimitivesTag>;
+  auto const n = Access::size(primitives);
+  Kokkos::parallel_for(
+      "ArborX::TreeConstruction::assign_morton_codes",
+      Kokkos::RangePolicy<ExecutionSpace>(space, 0, n), KOKKOS_LAMBDA(int i) {
+        Point xyz;
+        translateAndScale(Access::get(primitives, i), xyz, scene_bounding_box);
+        morton_codes(i) = morton3D(xyz[0], xyz[1], xyz[2]);
+      });
+}
+
+template <typename ExecutionSpace, typename Primitives,
+          typename... MortonCodesViewProperties>
+inline void assignMortonCodes(
+    ExecutionSpace const &space, Primitives const &primitives,
+    Kokkos::View<unsigned int *, MortonCodesViewProperties...> morton_codes,
+    Box const &scene_bounding_box)
+{
+  using Access = AccessTraits<Primitives, PrimitivesTag>;
+
+  auto const n = Access::size(primitives);
+  ARBORX_ASSERT(static_cast<decltype(n)>(morton_codes.extent(0)) == n);
+
+  using Tag = typename AccessTraitsHelper<Access>::tag;
+  assignMortonCodesDispatch(Tag{}, space, primitives, morton_codes,
+                            scene_bounding_box);
+}
+
+template <typename ExecutionSpace, typename Primitives, typename Nodes>
+inline void initializeSingleLeafNode(ExecutionSpace const &space,
+                                     Primitives const &primitives,
+                                     Nodes const &leaf_nodes)
+{
+  using Access = AccessTraits<Primitives, PrimitivesTag>;
+
+  ARBORX_ASSERT(leaf_nodes.extent(0) == 1);
+  ARBORX_ASSERT(Access::size(primitives) == 1);
+
+  using Node = typename Nodes::value_type;
+  using BoundingVolume = typename Node::bounding_volume_type;
+
+  Kokkos::parallel_for(
+      "ArborX::TreeConstruction::initialize_single_leaf",
+      Kokkos::RangePolicy<ExecutionSpace>(space, 0, 1), KOKKOS_LAMBDA(int) {
+        BoundingVolume bounding_volume{};
+        expand(bounding_volume, Access::get(primitives, 0));
+        leaf_nodes(0) =
+            makeLeafNode(typename Node::Tag{}, 0, std::move(bounding_volume));
+      });
+}
+
+namespace
+{
+// Ideally, this would be
+//     static int constexpr UNTOUCHED_NODE = -1;
+// inside the GenerateHierachyFunctor class. But prior to C++17, this would
+// require to also have a definition outside of the class as it is odr-used.
+// This is a workaround.
+int constexpr UNTOUCHED_NODE = -1;
+} // namespace
+
+template <typename Primitives, typename MemorySpace, typename Node>
+class GenerateHierarchy
+{
+public:
+  template <typename ExecutionSpace,
+            typename... PermutationIndicesViewProperties,
+            typename... MortonCodesViewProperties,
+            typename... LeafNodesViewProperties,
+            typename... InternalNodesViewProperties>
+  GenerateHierarchy(
+      ExecutionSpace const &space, Primitives const &primitives,
+      Kokkos::View<unsigned int const *, PermutationIndicesViewProperties...>
+          permutation_indices,
+      Kokkos::View<unsigned int const *, MortonCodesViewProperties...>
+          sorted_morton_codes,
+      Kokkos::View<Node *, LeafNodesViewProperties...> leaf_nodes,
+      Kokkos::View<Node *, InternalNodesViewProperties...> internal_nodes)
+      : _primitives(primitives)
+      , _permutation_indices(permutation_indices)
+      , _sorted_morton_codes(sorted_morton_codes)
+      , _leaf_nodes(leaf_nodes)
+      , _internal_nodes(internal_nodes)
+      , _ranges(Kokkos::view_alloc(Kokkos::WithoutInitializing,
+                                   "ArborX::BVH::BVH::ranges"),
+                internal_nodes.extent(0))
+      , _num_internal_nodes(_internal_nodes.extent_int(0))
+  {
+    Kokkos::deep_copy(space, _ranges, UNTOUCHED_NODE);
+
+    Kokkos::parallel_for(
+        "ArborX::TreeConstruction::generate_hierarchy",
+        Kokkos::RangePolicy<ExecutionSpace>(space, _num_internal_nodes,
+                                            2 * _num_internal_nodes + 1),
+        *this);
+  }
+
+  KOKKOS_FUNCTION
+  int delta(int const i) const
+  {
+    // Per Apetrei:
+    //   Because we already know where the highest differing bit is for each
+    //   internal node, the delta function basically represents a distance
+    //   metric between two keys. Unlike the delta used by Karras, we are
+    //   interested in the index of the highest differing bit and not the length
+    //   of the common prefix. In practice, logical xor can be used instead of
+    //   finding the index of the highest differing bit as we can compare the
+    //   numbers. The higher the index of the differing bit, the larger the
+    //   number.
+
+    // This check is here simply to avoid code complications in the main
+    // operator
+    if (i < 0 || i >= _num_internal_nodes)
+      return INT_MAX;
+
+    // The Apetrei's paper does not mention dealing with duplicate indices. We
+    // follow the original Karras idea in this situation:
+    //   The case of duplicate Morton codes has to be handled explicitly, since
+    //   our construction algorithm relies on the keys being unique. We
+    //   accomplish this by augmenting each key with a bit representation of
+    //   its index, i.e. k_i = k_i <+> i, where <+> indicates string
+    //   concatenation.
+    // In this case, if the Morton indices are the same, we want to compare is.
+    // We also want the result in this situation to always be less than any
+    // Morton comparison. Thus, we add INT_MIN to it.
+    // We also avoid if/else statement by doing a "x + !x*<blah>" trick.
+    auto x = _sorted_morton_codes(i) ^ _sorted_morton_codes(i + 1);
+    return x + (!x) * (INT_MIN + (i ^ (i + 1)));
+  }
+
+  KOKKOS_FUNCTION Node *getNodePtr(int i) const
+  {
+    int const n = _num_internal_nodes;
+    return (i < n ? &(_internal_nodes(i)) : &(_leaf_nodes(i - n)));
+  }
+
+  template <typename Tag = typename Node::Tag>
+  KOKKOS_FUNCTION std::enable_if_t<std::is_same<Tag, NodeWithTwoChildrenTag>{}>
+  setRightChild(Node *node, int child_right) const
+  {
+    assert(!node->isLeaf());
+    node->right_child = child_right;
+  }
+
+  template <typename Tag = typename Node::Tag>
+  KOKKOS_FUNCTION
+      std::enable_if_t<std::is_same<Tag, NodeWithLeftChildAndRopeTag>{}>
+      setRightChild(Node *node, int) const
+  {
+    assert(!node->isLeaf());
+    (void)node;
+  }
+
+  template <typename Tag = typename Node::Tag>
+  KOKKOS_FUNCTION std::enable_if_t<std::is_same<Tag, NodeWithTwoChildrenTag>{}>
+  setRope(Node *, int, int) const
+  {
+  }
+
+  template <typename Tag = typename Node::Tag>
+  KOKKOS_FUNCTION
+      std::enable_if_t<std::is_same<Tag, NodeWithLeftChildAndRopeTag>{}>
+      setRope(Node *node, int range_right, int delta_right) const
+  {
+    int rope;
+    if (range_right != _num_internal_nodes)
+    {
+      // The way Karras indices constructed, the rope is going to be the right
+      // child of the first internal node that we are in the left subtree of.
+      // The determination of whether that node is internal or leaf requires an
+      // additional delta() evaluation.
+      rope = range_right + 1;
+      if (delta_right < delta(range_right + 1))
+        rope += _num_internal_nodes;
+    }
+    else
+    {
+      // The node is on the right-most path in the tree. The only reason we
+      // need to set it is because nodes may have been allocated without
+      // initializing.
+      rope = ROPE_SENTINEL;
+    }
+    node->rope = rope;
+  }
+
+  KOKKOS_FUNCTION void operator()(int i) const
+  {
+    auto const leaf_nodes_shift = _num_internal_nodes;
+
+    // Index in the orginal order primitives were given in.
+    auto const original_index = _permutation_indices(i - leaf_nodes_shift);
+
+    using BoundingVolume = typename Node::bounding_volume_type;
+    BoundingVolume bounding_volume{};
+    using Access = AccessTraits<Primitives, PrimitivesTag>;
+    expand(bounding_volume, Access::get(_primitives, original_index));
+
+    // Initialize leaf node
+    auto *leaf_node = getNodePtr(i);
+    *leaf_node =
+        makeLeafNode(typename Node::Tag{}, original_index, bounding_volume);
+
+    // For a leaf node, the range is just one index
+    int range_left = i - leaf_nodes_shift;
+    int range_right = range_left;
+
+    int delta_left = delta(range_left - 1);
+    int delta_right = delta(range_right);
+
+    setRope(leaf_node, range_right, delta_right);
+
+    // Walk toward the root and do process it even though technically its
+    // bounding box has already been computed (bounding box of the scene)
+    do
+    {
+      // Determine whether this node is left or right child of its parent
+      bool const is_left_child = delta_right < delta_left;
+
+      int left_child;
+      int right_child;
+      if (is_left_child)
+      {
+        // The main benefit of the Apetrei index (which is also called a split
+        // in the Karras algorithm) is that each child can compute it based
+        // just on the child's range. This is different from a Karras index,
+        // where the index can only be computed based on the range of the
+        // parent, and thus requires knowing the ranges of both children.
+        int const apetrei_parent = range_right;
+
+        // The range of the parent is the union of the ranges of children. Each
+        // child updates one of these range values, the farthest from the
+        // split. The first thread up stores the updated range value (which
+        // also serves as a flag). The second thread up finishes constructing
+        // the full parent range.
+        range_right = Kokkos::atomic_compare_exchange(
+            &_ranges(apetrei_parent), UNTOUCHED_NODE, range_left);
+
+        // Use an atomic flag per internal node to terminate the first
+        // thread that enters it, while letting the second one through.
+        // This ensures that every node gets processed only once, and not
+        // before both of its children are processed.
+        if (range_right == UNTOUCHED_NODE)
+          break;
+
+        // This is slightly convoluted due to the fact that the indices of leaf
+        // nodes have to be shifted. The determination whether the other child
+        // is a leaf node depends on the position of the split (which is
+        // apetrei index) to the range boundary.
+        left_child = i;
+        right_child = apetrei_parent + 1;
+        if (right_child == range_right)
+          right_child += leaf_nodes_shift;
+
+        delta_right = delta(range_right);
+
+        expand(bounding_volume, getNodePtr(right_child)->bounding_volume);
+      }
+      else
+      {
+        // The comments for this clause are identical to the ones above (in the
+        // if clause), and thus ommitted for brevity.
+
+        int const apetrei_parent = range_left - 1;
+
+        range_left = Kokkos::atomic_compare_exchange(
+            &_ranges(apetrei_parent), UNTOUCHED_NODE, range_right);
+        if (range_left == UNTOUCHED_NODE)
+          break;
+
+        left_child = apetrei_parent;
+        if (left_child == range_left)
+          left_child += leaf_nodes_shift;
+        right_child = i;
+
+        delta_left = delta(range_left - 1);
+
+        expand(bounding_volume, getNodePtr(left_child)->bounding_volume);
+      }
+
+      // Having the full range for the parent, we can compute the Karras index.
+      int const karras_parent =
+          delta_right < delta_left ? range_right : range_left;
+
+      auto *parent_node = getNodePtr(karras_parent);
+      parent_node->left_child = left_child;
+      setRightChild(parent_node, right_child);
+      setRope(parent_node, range_right, delta_right);
+      parent_node->bounding_volume = bounding_volume;
+
+      i = karras_parent;
+
+    } while (i != 0);
+  }
+
+private:
+  Primitives _primitives;
+  Kokkos::View<unsigned int const *, MemorySpace> _permutation_indices;
+  Kokkos::View<unsigned int const *, MemorySpace> _sorted_morton_codes;
+  Kokkos::View<Node *, MemorySpace> _leaf_nodes;
+  Kokkos::View<Node *, MemorySpace> _internal_nodes;
+  Kokkos::View<int *, MemorySpace> _ranges;
+  int _num_internal_nodes;
+};
+
+template <typename ExecutionSpace, typename Primitives,
+          typename... PermutationIndicesViewProperties,
+          typename... MortonCodesViewProperties, typename Node,
+          typename... LeafNodesViewProperties,
+          typename... InternalNodesViewProperties>
+void generateHierarchy(
+    ExecutionSpace const &space, Primitives const &primitives,
+    Kokkos::View<unsigned int *, PermutationIndicesViewProperties...>
+        permutation_indices,
+    Kokkos::View<unsigned int *, MortonCodesViewProperties...>
+        sorted_morton_codes,
+    Kokkos::View<Node *, LeafNodesViewProperties...> leaf_nodes,
+    Kokkos::View<Node *, InternalNodesViewProperties...> internal_nodes)
+{
+  using ConstPermutationIndices =
+      Kokkos::View<unsigned int const *, PermutationIndicesViewProperties...>;
+  using ConstMortonCodes =
+      Kokkos::View<unsigned int const *, MortonCodesViewProperties...>;
+
+  using MemorySpace = typename decltype(internal_nodes)::memory_space;
+
+  GenerateHierarchy<Primitives, MemorySpace, Node>(
+      space, primitives, ConstPermutationIndices(permutation_indices),
+      ConstMortonCodes(sorted_morton_codes), leaf_nodes, internal_nodes);
+}
+
+} // namespace TreeConstruction
+} // namespace Details
+} // namespace ArborX
+
+#endif
diff --git a/arborx/src/details/ArborX_DetailsTreeTraversal.hpp b/arborx/src/details/ArborX_DetailsTreeTraversal.hpp
new file mode 100644
index 000000000..418066f6f
--- /dev/null
+++ b/arborx/src/details/ArborX_DetailsTreeTraversal.hpp
@@ -0,0 +1,473 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+#ifndef ARBORX_DETAILS_TREE_TRAVERSAL_HPP
+#define ARBORX_DETAILS_TREE_TRAVERSAL_HPP
+
+#include <ArborX_AccessTraits.hpp>
+#include <ArborX_DetailsAlgorithms.hpp>
+#include <ArborX_DetailsHappyTreeFriends.hpp>
+#include <ArborX_DetailsKokkosExtArithmeticTraits.hpp>
+#include <ArborX_DetailsNode.hpp> // ROPE_SENTINEL
+#include <ArborX_DetailsPriorityQueue.hpp>
+#include <ArborX_DetailsStack.hpp>
+#include <ArborX_DetailsUtils.hpp>
+#include <ArborX_Exception.hpp>
+#include <ArborX_Predicates.hpp>
+
+namespace ArborX
+{
+namespace Details
+{
+
+template <typename BVH, typename Predicates, typename Callback, typename Tag>
+struct TreeTraversal
+{
+};
+
+template <typename BVH, typename Predicates, typename Callback>
+struct TreeTraversal<BVH, Predicates, Callback, SpatialPredicateTag>
+{
+  BVH _bvh;
+  Predicates _predicates;
+  Callback _callback;
+
+  using Access = AccessTraits<Predicates, PredicatesTag>;
+  using Node = HappyTreeFriends::node_t<BVH>;
+
+  template <typename ExecutionSpace>
+  TreeTraversal(ExecutionSpace const &space, BVH const &bvh,
+                Predicates const &predicates, Callback const &callback)
+      : _bvh{bvh}
+      , _predicates{predicates}
+      , _callback{callback}
+  {
+    if (_bvh.empty())
+    {
+      // do nothing
+    }
+    else if (_bvh.size() == 1)
+    {
+      Kokkos::parallel_for(
+          "ArborX::TreeTraversal::spatial::degenerated_one_leaf_tree",
+          Kokkos::RangePolicy<ExecutionSpace, OneLeafTree>(
+              space, 0, Access::size(predicates)),
+          *this);
+    }
+    else
+    {
+      static_assert(
+          std::is_same<typename Node::Tag, NodeWithTwoChildrenTag>{} ||
+              std::is_same<typename Node::Tag, NodeWithLeftChildAndRopeTag>{},
+          "Unrecognized node tag");
+
+      Kokkos::parallel_for("ArborX::TreeTraversal::spatial",
+                           Kokkos::RangePolicy<ExecutionSpace>(
+                               space, 0, Access::size(predicates)),
+                           *this);
+    }
+  }
+
+  struct OneLeafTree
+  {
+  };
+
+  KOKKOS_FUNCTION void operator()(OneLeafTree, int queryIndex) const
+  {
+    auto const &predicate = Access::get(_predicates, queryIndex);
+    Node const *root = HappyTreeFriends::getRoot(_bvh);
+    auto const &root_bounding_volume =
+        HappyTreeFriends::getBoundingVolume(_bvh, root);
+    if (predicate(root_bounding_volume))
+    {
+      _callback(predicate, 0);
+    }
+  }
+
+  // Stack-based traversal
+  template <typename Tag = typename Node::Tag>
+  KOKKOS_FUNCTION std::enable_if_t<std::is_same<Tag, NodeWithTwoChildrenTag>{}>
+  operator()(int queryIndex) const
+  {
+    auto const &predicate = Access::get(_predicates, queryIndex);
+
+    Node const *stack[64];
+    Node const **stack_ptr = stack;
+    *stack_ptr++ = nullptr;
+    Node const *node = HappyTreeFriends::getRoot(_bvh);
+    do
+    {
+      Node const *child_left =
+          HappyTreeFriends::getNodePtr(_bvh, node->left_child);
+      Node const *child_right =
+          HappyTreeFriends::getNodePtr(_bvh, node->right_child);
+
+      bool overlap_left =
+          predicate(HappyTreeFriends::getBoundingVolume(_bvh, child_left));
+      bool overlap_right =
+          predicate(HappyTreeFriends::getBoundingVolume(_bvh, child_right));
+
+      if (overlap_left && child_left->isLeaf())
+      {
+        if (invoke_callback_and_check_early_exit(
+                _callback, predicate, child_left->getLeafPermutationIndex()))
+          return;
+      }
+      if (overlap_right && child_right->isLeaf())
+      {
+        if (invoke_callback_and_check_early_exit(
+                _callback, predicate, child_right->getLeafPermutationIndex()))
+          return;
+      }
+
+      bool traverse_left = (overlap_left && !child_left->isLeaf());
+      bool traverse_right = (overlap_right && !child_right->isLeaf());
+
+      if (!traverse_left && !traverse_right)
+      {
+        node = *--stack_ptr;
+      }
+      else
+      {
+        node = traverse_left ? child_left : child_right;
+        if (traverse_left && traverse_right)
+          *stack_ptr++ = child_right;
+      }
+    } while (node != nullptr);
+  }
+
+  // Ropes-based traversal
+  template <typename Tag = typename Node::Tag>
+  KOKKOS_FUNCTION
+      std::enable_if_t<std::is_same<Tag, NodeWithLeftChildAndRopeTag>{}>
+      operator()(int queryIndex) const
+  {
+    auto const &predicate = Access::get(_predicates, queryIndex);
+
+    Node const *node;
+    int next = 0; // start with root
+    do
+    {
+      node = HappyTreeFriends::getNodePtr(_bvh, next);
+
+      if (predicate(HappyTreeFriends::getBoundingVolume(_bvh, node)))
+      {
+        if (!node->isLeaf())
+        {
+          next = node->left_child;
+        }
+        else
+        {
+          if (invoke_callback_and_check_early_exit(
+                  _callback, predicate, node->getLeafPermutationIndex()))
+            return;
+          next = node->rope;
+        }
+      }
+      else
+      {
+        next = node->rope;
+      }
+
+    } while (next != ROPE_SENTINEL);
+  }
+};
+
+template <typename BVH, typename Predicates, typename Callback>
+struct TreeTraversal<BVH, Predicates, Callback, NearestPredicateTag>
+{
+  using MemorySpace = typename BVH::memory_space;
+
+  BVH _bvh;
+  Predicates _predicates;
+  Callback _callback;
+
+  using Access = AccessTraits<Predicates, PredicatesTag>;
+  using Node = HappyTreeFriends::node_t<BVH>;
+
+  using Buffer = Kokkos::View<Kokkos::pair<int, float> *, MemorySpace>;
+  using Offset = Kokkos::View<int *, MemorySpace>;
+  struct BufferProvider
+  {
+    Buffer _buffer;
+    Offset _offset;
+
+    KOKKOS_FUNCTION auto operator()(int i) const
+    {
+      auto const *_offsetptr = &_offset(i);
+      return Kokkos::subview(_buffer,
+                             Kokkos::make_pair(*_offsetptr, *(_offsetptr + 1)));
+    }
+  };
+
+  BufferProvider _buffer;
+
+  template <typename ExecutionSpace>
+  void allocateBuffer(ExecutionSpace const &space)
+  {
+    auto const n_queries = Access::size(_predicates);
+
+    Offset offset(Kokkos::view_alloc(Kokkos::WithoutInitializing,
+                                     "ArborX::TreeTraversal::nearest::offset"),
+                  n_queries + 1);
+    // NOTE workaround to avoid implicit capture of *this
+    auto const &predicates = _predicates;
+    Kokkos::parallel_for(
+        "ArborX::TreeTraversal::nearest::"
+        "scan_queries_for_numbers_of_neighbors",
+        Kokkos::RangePolicy<ExecutionSpace>(space, 0, n_queries),
+        KOKKOS_LAMBDA(int i) { offset(i) = getK(Access::get(predicates, i)); });
+    exclusivePrefixSum(space, offset);
+    int const _buffersize = lastElement(offset);
+    // Allocate buffer over which to perform heap operations in
+    // TreeTraversal::nearestQuery() to store nearest leaf nodes found so far.
+    // It is not possible to anticipate how much memory to allocate since the
+    // number of nearest neighbors k is only known at runtime.
+
+    Buffer buffer(Kokkos::view_alloc(Kokkos::WithoutInitializing,
+                                     "ArborX::TreeTraversal::nearest::buffer"),
+                  _buffersize);
+    _buffer = BufferProvider{buffer, offset};
+  }
+
+  template <typename ExecutionSpace>
+  TreeTraversal(ExecutionSpace const &space, BVH const &bvh,
+                Predicates const &predicates, Callback const &callback)
+      : _bvh{bvh}
+      , _predicates{predicates}
+      , _callback{callback}
+  {
+    if (_bvh.empty())
+    {
+      // do nothing
+    }
+    else if (_bvh.size() == 1)
+    {
+      Kokkos::parallel_for(
+          "ArborX::TreeTraversal::nearest::degenerated_one_leaf_tree",
+          Kokkos::RangePolicy<ExecutionSpace, OneLeafTree>(
+              space, 0, Access::size(predicates)),
+          *this);
+    }
+    else
+    {
+      static_assert(
+          std::is_same<typename Node::Tag, NodeWithLeftChildAndRopeTag>{} ||
+              std::is_same<typename Node::Tag, NodeWithTwoChildrenTag>{},
+          "Unrecognized node tag");
+
+      allocateBuffer(space);
+
+      Kokkos::parallel_for("ArborX::TreeTraversal::nearest",
+                           Kokkos::RangePolicy<ExecutionSpace>(
+                               space, 0, Access::size(predicates)),
+                           *this);
+    }
+  }
+
+  struct OneLeafTree
+  {
+  };
+
+  KOKKOS_FUNCTION void operator()(OneLeafTree, int queryIndex) const
+  {
+    auto const &predicate = Access::get(_predicates, queryIndex);
+    auto const k = getK(predicate);
+
+    // NOTE thinking about making this a precondition
+    if (k < 1)
+      return;
+
+    _callback(predicate, 0);
+  }
+
+  template <typename Tag = typename Node::Tag>
+  KOKKOS_FUNCTION
+      std::enable_if_t<std::is_same<Tag, NodeWithTwoChildrenTag>{}, int>
+      getRightChild(Node const *node) const
+  {
+    assert(!node->isLeaf());
+    return node->right_child;
+  }
+
+  template <typename Tag = typename Node::Tag>
+  KOKKOS_FUNCTION
+      std::enable_if_t<std::is_same<Tag, NodeWithLeftChildAndRopeTag>{}, int>
+      getRightChild(Node const *node) const
+  {
+    assert(!node->isLeaf());
+    return HappyTreeFriends::getNodePtr(_bvh, node->left_child)->rope;
+  }
+
+  KOKKOS_FUNCTION void operator()(int queryIndex) const
+  {
+    auto const &predicate = Access::get(_predicates, queryIndex);
+    auto const k = getK(predicate);
+    auto const distance = [geometry = getGeometry(predicate),
+                           bvh = _bvh](Node const *node) {
+      using Details::distance;
+      return distance(geometry, HappyTreeFriends::getBoundingVolume(bvh, node));
+    };
+    auto const buffer = _buffer(queryIndex);
+
+    // NOTE thinking about making this a precondition
+    if (k < 1)
+      return;
+
+    // Nodes with a distance that exceed that radius can safely be
+    // discarded. Initialize the radius to infinity and tighten it once k
+    // neighbors have been found.
+    auto radius = KokkosExt::ArithmeticTraits::infinity<float>::value;
+
+    using PairIndexDistance = Kokkos::pair<int, float>;
+    static_assert(
+        std::is_same<typename decltype(buffer)::value_type,
+                     PairIndexDistance>::value,
+        "Type of the elements stored in the buffer passed as argument to "
+        "TreeTraversal::nearestQuery is not right");
+    struct CompareDistance
+    {
+      KOKKOS_INLINE_FUNCTION bool operator()(PairIndexDistance const &lhs,
+                                             PairIndexDistance const &rhs) const
+      {
+        return lhs.second < rhs.second;
+      }
+    };
+    // Use a priority queue for convenience to store the results and
+    // preserve the heap structure internally at all time.  There is no
+    // memory allocation, elements are stored in the buffer passed as an
+    // argument. The farthest leaf node is on top.
+    assert(k == (int)buffer.size());
+    PriorityQueue<PairIndexDistance, CompareDistance,
+                  UnmanagedStaticVector<PairIndexDistance>>
+        heap(UnmanagedStaticVector<PairIndexDistance>(buffer.data(),
+                                                      buffer.size()));
+
+    Node const *stack[64];
+    auto *stack_ptr = stack;
+    *stack_ptr++ = nullptr;
+#if !defined(__CUDA_ARCH__)
+    float stack_distance[64];
+    auto *stack_distance_ptr = stack_distance;
+    *stack_distance_ptr++ = 0.f;
+#endif
+
+    Node const *node = HappyTreeFriends::getRoot(_bvh);
+    Node const *child_left = nullptr;
+    Node const *child_right = nullptr;
+
+    float distance_left = 0.f;
+    float distance_right = 0.f;
+    float distance_node = 0.f;
+
+    do
+    {
+      bool traverse_left = false;
+      bool traverse_right = false;
+
+      if (distance_node < radius)
+      {
+        // Insert children into the stack and make sure that the
+        // closest one ends on top.
+        child_left = HappyTreeFriends::getNodePtr(_bvh, node->left_child);
+        child_right = HappyTreeFriends::getNodePtr(_bvh, getRightChild(node));
+
+        distance_left = distance(child_left);
+        distance_right = distance(child_right);
+
+        if (distance_left < radius && child_left->isLeaf())
+        {
+          auto leaf_pair = Kokkos::make_pair(
+              child_left->getLeafPermutationIndex(), distance_left);
+          if ((int)heap.size() < k)
+            heap.push(leaf_pair);
+          else
+            heap.popPush(leaf_pair);
+          if ((int)heap.size() == k)
+            radius = heap.top().second;
+        }
+
+        // Note: radius may have been already updated here from the left child
+        if (distance_right < radius && child_right->isLeaf())
+        {
+          auto leaf_pair = Kokkos::make_pair(
+              child_right->getLeafPermutationIndex(), distance_right);
+          if ((int)heap.size() < k)
+            heap.push(leaf_pair);
+          else
+            heap.popPush(leaf_pair);
+          if ((int)heap.size() == k)
+            radius = heap.top().second;
+        }
+
+        traverse_left = (distance_left < radius && !child_left->isLeaf());
+        traverse_right = (distance_right < radius && !child_right->isLeaf());
+      }
+
+      if (!traverse_left && !traverse_right)
+      {
+        node = *--stack_ptr;
+#if defined(__CUDA_ARCH__)
+        if (node != nullptr)
+        {
+          // This is a theoretically unnecessary duplication of distance
+          // calculation for stack nodes. However, for Cuda it's better than
+          // than putting the distances in stack.
+          distance_node = distance(node);
+        }
+#else
+        distance_node = *--stack_distance_ptr;
+#endif
+      }
+      else
+      {
+        node = (traverse_left &&
+                (distance_left <= distance_right || !traverse_right))
+                   ? child_left
+                   : child_right;
+        distance_node = (node == child_left ? distance_left : distance_right);
+        if (traverse_left && traverse_right)
+        {
+          *stack_ptr++ = (node == child_left ? child_right : child_left);
+#if !defined(__CUDA_ARCH__)
+          *stack_distance_ptr++ =
+              (node == child_left ? distance_right : distance_left);
+#endif
+        }
+      }
+    } while (node != nullptr);
+
+    // Sort the leaf nodes and output the results.
+    // NOTE: Do not try this at home.  Messing with the underlying container
+    // invalidates the state of the PriorityQueue.
+    sortHeap(heap.data(), heap.data() + heap.size(), heap.valueComp());
+    for (decltype(heap.size()) i = 0; i < heap.size(); ++i)
+    {
+      int const leaf_index = (heap.data() + i)->first;
+      _callback(predicate, leaf_index);
+    }
+  }
+};
+
+template <typename ExecutionSpace, typename BVH, typename Predicates,
+          typename Callback>
+void traverse(ExecutionSpace const &space, BVH const &bvh,
+              Predicates const &predicates, Callback const &callback)
+{
+  using Access = AccessTraits<Predicates, PredicatesTag>;
+  using Tag = typename AccessTraitsHelper<Access>::tag;
+  TreeTraversal<BVH, Predicates, Callback, Tag>(space, bvh, predicates,
+                                                callback);
+}
+
+} // namespace Details
+} // namespace ArborX
+
+#endif
diff --git a/arborx/src/details/ArborX_DetailsTreeVisualization.hpp b/arborx/src/details/ArborX_DetailsTreeVisualization.hpp
new file mode 100644
index 000000000..6ceed3aa8
--- /dev/null
+++ b/arborx/src/details/ArborX_DetailsTreeVisualization.hpp
@@ -0,0 +1,242 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+#ifndef ARBORX_DETAILS_TREE_VISUALIZATION_HPP
+#define ARBORX_DETAILS_TREE_VISUALIZATION_HPP
+
+#include <ArborX_DetailsHappyTreeFriends.hpp>
+#include <ArborX_DetailsKokkosExtAccessibilityTraits.hpp>
+#include <ArborX_DetailsTreeTraversal.hpp>
+
+#include <Kokkos_Core.hpp>
+
+#include <tuple> // ignore
+
+namespace ArborX
+{
+
+namespace Details
+{
+std::ostream &operator<<(std::ostream &os, Point const &p)
+{
+  os << "(" << p[0] << "," << p[1] << ")";
+  return os;
+}
+
+template <typename DeviceType>
+struct TreeVisualization
+{
+  static_assert(KokkosExt::is_accessible_from<typename DeviceType::memory_space,
+                                              Kokkos::HostSpace>{},
+                "tree visualization only available on the host");
+  struct TreeAccess
+  {
+    template <typename Tree>
+    KOKKOS_INLINE_FUNCTION static HappyTreeFriends::node_t<Tree> const *
+    getLeaf(Tree const &tree, size_t index)
+    {
+      auto leaf_nodes = HappyTreeFriends::getLeafNodes(tree);
+      auto const *first = leaf_nodes.data();
+      auto const *last = first + static_cast<ptrdiff_t>(leaf_nodes.size());
+      for (; first != last; ++first)
+        if (index == first->getLeafPermutationIndex())
+          return first;
+      return nullptr;
+    }
+
+    template <typename Tree>
+    KOKKOS_INLINE_FUNCTION static int
+    getIndex(HappyTreeFriends::node_t<Tree> const *node, Tree const &tree)
+    {
+      return node->isLeaf() ? node->getLeafPermutationIndex()
+                            : node - getRoot(tree);
+    }
+
+    template <typename Tree>
+    KOKKOS_INLINE_FUNCTION static HappyTreeFriends::node_t<Tree> const *
+    getRoot(Tree const &tree)
+    {
+      return HappyTreeFriends::getRoot(tree);
+    }
+
+    template <typename Tree>
+    KOKKOS_INLINE_FUNCTION static HappyTreeFriends::node_t<Tree> const *
+    getNodePtr(Tree const &tree, int index)
+    {
+      return HappyTreeFriends::getNodePtr(tree, index);
+    }
+
+    template <typename Tree, typename Node = HappyTreeFriends::node_t<Tree>>
+    KOKKOS_INLINE_FUNCTION static typename Tree::bounding_volume_type
+    getBoundingVolume(Node const *node, Tree const &tree)
+    {
+      return HappyTreeFriends::getBoundingVolume(tree, node);
+    }
+  };
+
+  template <typename Tree, typename Node = HappyTreeFriends::node_t<Tree>>
+  static std::string getNodeLabel(Node const *node, Tree const &tree)
+  {
+    auto const node_is_leaf = node->isLeaf();
+    auto const node_index = TreeAccess::getIndex(node, tree);
+    std::string label = node_is_leaf ? "l" : "i";
+    label.append(std::to_string(node_index));
+    return label;
+  }
+
+  template <typename Tree, typename Node = HappyTreeFriends::node_t<Tree>>
+  static std::string getNodeAttributes(Node const *node, Tree const &)
+  {
+    return node->isLeaf() ? "[leaf]" : "[internal]";
+  }
+
+  template <typename Tree, typename Node = HappyTreeFriends::node_t<Tree>>
+  static std::string getEdgeAttributes(Node const * /*parent*/,
+                                       Node const *child, Tree const &)
+  {
+    return child->isLeaf() ? "[pendant]" : "[edge]";
+  }
+
+  // Produces node and edges statements to be listed for a graph in DOT
+  // format:
+  // ```
+  // digraph g {
+  //   root = i0;
+  //   <paste node and edges statements here>
+  // }
+  // ```
+  struct GraphvizVisitor
+  {
+    std::ostream &_os;
+
+    template <typename Tree, typename Node = HappyTreeFriends::node_t<Tree>>
+    void visit(Node const *node, Tree const &tree) const
+    {
+      visitNode(node, tree);
+      visitEdgesStartingFromNode(node, tree);
+    }
+
+    template <typename Tree, typename Node = HappyTreeFriends::node_t<Tree>>
+    void visitNode(Node const *node, Tree const &tree) const
+    {
+      auto const node_label = getNodeLabel(node, tree);
+      auto const node_attributes = getNodeAttributes(node, tree);
+
+      _os << "    " << node_label << " " << node_attributes << ";\n";
+    }
+
+    template <typename Tree, typename Node = HappyTreeFriends::node_t<Tree>>
+    void visitEdgesStartingFromNode(Node const *node, Tree const &tree) const
+    {
+      auto const node_label = getNodeLabel(node, tree);
+      auto const node_is_internal = !node->isLeaf();
+      auto getNodePtr = [&](int i) { return TreeAccess::getNodePtr(tree, i); };
+
+      if (node_is_internal)
+        for (auto const *child :
+             {getNodePtr(node->left_child), getNodePtr(node->right_child)})
+        {
+          auto const child_label = getNodeLabel(child, tree);
+          auto const edge_attributes = getEdgeAttributes(node, child, tree);
+
+          _os << "    " << node_label << " -> " << child_label << " "
+              << edge_attributes << ";\n";
+        }
+    }
+  };
+
+  // Produces commands to enclose in a tikzpicture in a LateX document:
+  // ```
+  // \begin{tikzpicture}
+  //   <paste tikz commands here>
+  // \end{tikzpicture}
+  // ```
+  // NB ensure TikZ styles have been defined.
+  struct TikZVisitor
+  {
+    std::ostream &_os;
+
+    template <typename Tree, typename Node = HappyTreeFriends::node_t<Tree>>
+    void visit(Node const *node, Tree const &tree) const
+    {
+      auto const node_label = getNodeLabel(node, tree);
+      auto const node_attributes = getNodeAttributes(node, tree);
+      auto const bounding_volume = TreeAccess::getBoundingVolume(node, tree);
+      auto const min_corner = bounding_volume.minCorner();
+      auto const max_corner = bounding_volume.maxCorner();
+      _os << R"(\draw)" << node_attributes << " " << min_corner << " rectangle "
+          << max_corner << " node {" << node_label << "};\n";
+    }
+  };
+
+  template <typename Tree, typename Visitor>
+  static void visitAllIterative(Tree const &tree, Visitor const &visitor)
+  {
+    using Node = HappyTreeFriends::node_t<Tree>;
+    Stack<Node const *> stack;
+    stack.emplace(TreeAccess::getRoot(tree));
+    auto getNodePtr = [&](int i) { return TreeAccess::getNodePtr(tree, i); };
+    while (!stack.empty())
+    {
+      auto const *node = stack.top();
+      stack.pop();
+
+      visitor.visit(node, tree);
+
+      if (!node->isLeaf())
+        for (auto const *child :
+             {getNodePtr(node->left_child), getNodePtr(node->right_child)})
+          stack.push(child);
+    }
+  }
+
+  template <typename TreeType, typename VisitorType>
+  struct VisitorCallback
+  {
+    template <typename Query>
+    KOKKOS_FUNCTION void operator()(Query const &, int index) const
+    {
+      _visitor.visit(TreeAccess::getNodePtr(_tree, index), _tree);
+    }
+
+    TreeType _tree;
+    VisitorType _visitor;
+  };
+
+  template <typename Tree, typename Predicate, typename Visitor>
+  static void visit(Tree const &tree, Predicate const &pred,
+                    Visitor const &visitor)
+  {
+    // The preprocessor directives below are intended to silence the
+    // warnings about calling a __host__ function from a __host__
+    // __device__ function emitted by nvcc.
+#if defined(__CUDA_ARCH__)
+    std::ignore = tree;
+    std::ignore = pred;
+    std::ignore = visitor;
+    throw std::runtime_error("visit() is not meant to execute on the GPU");
+#else
+    using ExecutionSpace = typename DeviceType::execution_space;
+    using Predicates = Kokkos::View<Predicate *, DeviceType>;
+    using Callback = VisitorCallback<Tree, Visitor>;
+
+    Predicates predicates("predicates", 1);
+    predicates(0) = pred;
+
+    TreeTraversal<Tree, Predicates, Callback, NearestPredicateTag>
+        tree_traversal(ExecutionSpace{}, tree, predicates,
+                       Callback{tree, visitor});
+#endif
+  }
+};
+} // namespace Details
+} // namespace ArborX
+
+#endif
diff --git a/arborx/src/details/ArborX_DetailsUnionFind.hpp b/arborx/src/details/ArborX_DetailsUnionFind.hpp
new file mode 100644
index 000000000..e27a9fda2
--- /dev/null
+++ b/arborx/src/details/ArborX_DetailsUnionFind.hpp
@@ -0,0 +1,189 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#ifndef ARBORX_DETAILSUNIONFIND_HPP
+#define ARBORX_DETAILSUNIONFIND_HPP
+
+// The algorithm is based on the the following paper:
+//
+//   [1] Jaiganesh, Jayadharini, and Martin Burtscher. "A high-performance
+//   connected components implementation for GPUs." In Proceedings of the 27th
+//   International Symposium on High-Performance Parallel and Distributed
+//   Computing, pp. 92-104. 2018.
+//
+// The general gist of the algorithm can be found on the second page and reads:
+//
+// ```
+// ...the majority of the parallel CC algorithms are based on the following
+// “label propagation” approach. Each vertex has a label to hold the component
+// ID to which it belongs. Initially, this label is set to the vertex ID, that
+// is, each vertex is considered a separate component, which can trivially be
+// done in parallel. Then the vertices are iteratively processed in parallel to
+// determine the connected components. For instance, each vertex’s label can be
+// updated with the smallest label among its neighbors. This process repeats
+// until there are no more updates, at which point all vertices in a connected
+// component have the same label. In this example, the ID of the minimum vertex
+// in each component serves as the component ID, which guarantees uniqueness. To
+// speed up the computation, the labels are often replaced by “parent” pointers
+// that form a union-find data structure.
+// ```
+//
+// Union-find algorithm is sped up through path compression:
+//
+// ```
+// Starting from any vertex, we can follow the parent pointers until we reach a
+// vertex that points to itself. This final vertex is the “representative”.
+// Every vertex’s implicit label is the ID of its representative and, as before,
+// all vertices with the same label (aka representative) belong to the same
+// component. Thus, making the representative u point to v indirectly changes
+// the labels of all vertices whose representative used to be u. This makes
+// union operations very fast. A chain of parent pointers leading to a
+// representative is called a “path”. To also make the traversals of these
+// paths, i.e., the find operations, very fast, the paths are sporadically
+// shortened by making earlier elements skip over some elements and point
+// directly to later elements. This process is referred to as “path
+// compression”.
+// ```
+//
+// ECL-CC makes use of an intermediate pointer jumping:
+//
+// ```
+// Intermediate pointer jumping only requires a single traversal while still
+// compressing the path of all elements encountered along the way, albeit not by
+// as much as multiple pointer jumping. It accomplishes this by making every
+// element skip over the next element, thus halving the path length in each
+// traversal.
+// ```
+//
+// This is encoded in `representative()` function.
+
+#include <Kokkos_Core.hpp>
+
+namespace ArborX
+{
+namespace Details
+{
+
+template <typename MemorySpace>
+struct UnionFind
+{
+  Kokkos::View<int *, MemorySpace> labels_;
+
+  UnionFind(Kokkos::View<int *, MemorySpace> labels)
+      : labels_(labels)
+  {
+  }
+
+  // Per [1]:
+  //
+  // Note that the [`representative()`] code is re-entrant and synchronization
+  // free even though concurrent execution may cause data races on the parent
+  // array. However, these races are guaranteed to be benign for the following
+  // reasons. First, the only write to shared data is in [`parent[prev] = next;
+  // `]. This write updates a single aligned machine word and is therefore
+  // atomic. Moreover, it overwrites a valid entry with another valid entry.
+  // Hence, it does not matter if other threads see the old or the new value as
+  // either value will allow them to eventually reach the representative.
+  // Similarly, all the reads of the parent array will either fetch the old or
+  // new value, but both values are acceptable. The only problem that can occur
+  // is that two threads try to update the same parent pointer at the same time.
+  // In this case, one of the updates is lost. This reduces the code’s
+  // performance as duplicate work is performed and the path is not shortened by
+  // as much as it could have been, but it does not result in incorrect paths.
+  // On average, the savings of not having to perform synchronization far
+  // outweighs this small cost. Lastly, it should be noted that the rest of the
+  // code either accesses the parent array via calls to the find_repres function
+  // or changes the parent pointer of a representative vertex but never of a
+  // vertex that is in the middle of a path. If the find_repres code already
+  // sees the new representative, it will return it. Otherwise, it will return
+  // the old representative. Either return value is handled correctly.
+  KOKKOS_FUNCTION
+  int representative(int const i) const
+  {
+    // ##### ECL license (see LICENSE.ECL) #####
+    int curr = labels_(i);
+    if (curr != i)
+    {
+      int next;
+      int prev = i;
+      while (curr > (next = labels_(curr)))
+      {
+        labels_(prev) = next;
+        prev = curr;
+        curr = next;
+      }
+    }
+    return curr;
+  }
+
+  // In some situations it is necessary to make sure that the a particular
+  // label is assigned to a point. As a regular merge() does not guarantee
+  // that, an extra function is introduced, which assigns the label of the
+  // second point (or, rather, the label of its representative) to the first.
+  KOKKOS_FUNCTION
+  void merge_into(int i, int j) const { labels_(i) = representative(j); }
+
+  KOKKOS_FUNCTION
+  void merge(int i, int j) const
+  {
+    // Per [1]:
+    //
+    // ```
+    // ...checks if the representatives of the two endpoints of the edge are
+    // the same. If so, nothing needs to be done. If not, the parent of the
+    // larger of the two representatives is updated to point to the smaller
+    // representative using an atomic CAS operation (<snip> depending on
+    // which representative is smaller). The atomic CAS is required because
+    // the representative may have been changed by another thread between
+    // the call to `representative()` and the call to the CAS. If it has
+    // been changed, `ostat` or `vstat` is updated with the latest value and
+    // the do-while loop repeats the computation until it succeeds, i.e.,
+    // until there is no data race on the parent.
+    // ```
+
+    // ##### ECL license (see LICENSE.ECL) #####
+    int vstat = representative(i);
+    int ostat = representative(j);
+
+    bool repeat;
+    do
+    {
+      repeat = false;
+      if (vstat != ostat)
+      {
+        int ret;
+        if (vstat < ostat)
+        {
+          if ((ret = Kokkos::atomic_compare_exchange(&labels_(ostat), ostat,
+                                                     vstat)) != ostat)
+          {
+            ostat = ret;
+            repeat = true;
+          }
+        }
+        else
+        {
+          if ((ret = Kokkos::atomic_compare_exchange(&labels_(vstat), vstat,
+                                                     ostat)) != vstat)
+          {
+            vstat = ret;
+            repeat = true;
+          }
+        }
+      }
+    } while (repeat);
+  }
+};
+
+} // namespace Details
+} // namespace ArborX
+
+#endif
diff --git a/arborx/src/details/ArborX_DetailsUtils.hpp b/arborx/src/details/ArborX_DetailsUtils.hpp
new file mode 100644
index 000000000..60b52afbd
--- /dev/null
+++ b/arborx/src/details/ArborX_DetailsUtils.hpp
@@ -0,0 +1,578 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#ifndef ARBORX_DETAILS_UTILS_HPP
+#define ARBORX_DETAILS_UTILS_HPP
+
+#include <ArborX_Exception.hpp>
+
+#include <Kokkos_Core.hpp>
+#include <Kokkos_Sort.hpp> // min_max_functor
+
+namespace ArborX
+{
+
+namespace Details
+{
+
+namespace internal
+{
+template <typename PointerType>
+struct PointerDepth
+{
+  static int constexpr value = 0;
+};
+
+template <typename PointerType>
+struct PointerDepth<PointerType *>
+{
+  static int constexpr value = PointerDepth<PointerType>::value + 1;
+};
+
+template <typename PointerType, std::size_t N>
+struct PointerDepth<PointerType[N]>
+{
+  static int constexpr value = PointerDepth<PointerType>::value;
+};
+} // namespace internal
+
+template <typename View, typename ExecutionSpace>
+inline Kokkos::View<typename View::traits::data_type, Kokkos::LayoutRight,
+                    typename ExecutionSpace::memory_space>
+create_layout_right_mirror_view(
+    ExecutionSpace const & /*execution_space*/, View const &src,
+    typename std::enable_if<!(
+        (std::is_same<typename View::traits::array_layout,
+                      Kokkos::LayoutRight>::value ||
+         (View::rank == 1 && !std::is_same<typename View::traits::array_layout,
+                                           Kokkos::LayoutStride>::value)) &&
+        std::is_same<typename View::traits::memory_space,
+                     typename ExecutionSpace::memory_space>::value)>::type * =
+        nullptr)
+{
+  constexpr int pointer_depth =
+      internal::PointerDepth<typename View::traits::data_type>::value;
+  return Kokkos::View<typename View::traits::data_type, Kokkos::LayoutRight,
+                      typename ExecutionSpace::memory_space>(
+      std::string(src.label()).append("_layout_right_mirror"), src.extent(0),
+      pointer_depth > 1 ? src.extent(1) : KOKKOS_INVALID_INDEX,
+      pointer_depth > 2 ? src.extent(2) : KOKKOS_INVALID_INDEX,
+      pointer_depth > 3 ? src.extent(3) : KOKKOS_INVALID_INDEX,
+      pointer_depth > 4 ? src.extent(4) : KOKKOS_INVALID_INDEX,
+      pointer_depth > 5 ? src.extent(5) : KOKKOS_INVALID_INDEX,
+      pointer_depth > 6 ? src.extent(6) : KOKKOS_INVALID_INDEX,
+      pointer_depth > 7 ? src.extent(7) : KOKKOS_INVALID_INDEX);
+}
+
+template <typename View, typename ExecutionSpace>
+inline auto create_layout_right_mirror_view(
+    ExecutionSpace const & /*execution_space*/, View const &src,
+    typename std::enable_if<
+        ((std::is_same<typename View::traits::array_layout,
+                       Kokkos::LayoutRight>::value ||
+          (View::rank == 1 && !std::is_same<typename View::traits::array_layout,
+                                            Kokkos::LayoutStride>::value)) &&
+         std::is_same<typename View::traits::memory_space,
+                      typename ExecutionSpace::memory_space>::value)>::type * =
+        nullptr)
+{
+  return src;
+}
+
+template <typename View>
+inline auto create_layout_right_mirror_view(View const &src)
+{
+  return create_layout_right_mirror_view(
+      typename View::traits::host_mirror_space{}, src);
+}
+
+template <typename View, typename ExecutionSpace>
+inline auto create_layout_right_mirror_view_and_copy(
+    ExecutionSpace const &execution_space, View const &src,
+    typename std::enable_if<!(
+        (std::is_same<typename View::traits::array_layout,
+                      Kokkos::LayoutRight>::value ||
+         (View::rank == 1 && !std::is_same<typename View::traits::array_layout,
+                                           Kokkos::LayoutStride>::value)) &&
+        std::is_same<typename View::traits::memory_space,
+                     typename ExecutionSpace::memory_space>::value)>::type * =
+        0)
+{
+  constexpr int pointer_depth =
+      internal::PointerDepth<typename View::traits::data_type>::value;
+  Kokkos::View<typename View::traits::data_type, Kokkos::LayoutRight,
+               typename ExecutionSpace::memory_space>
+      layout_right_view(
+          Kokkos::view_alloc(
+              Kokkos::WithoutInitializing,
+              std::string(src.label()).append("_layout_right_mirror")),
+          src.extent(0),
+          pointer_depth > 1 ? src.extent(1) : KOKKOS_INVALID_INDEX,
+          pointer_depth > 2 ? src.extent(2) : KOKKOS_INVALID_INDEX,
+          pointer_depth > 3 ? src.extent(3) : KOKKOS_INVALID_INDEX,
+          pointer_depth > 4 ? src.extent(4) : KOKKOS_INVALID_INDEX,
+          pointer_depth > 5 ? src.extent(5) : KOKKOS_INVALID_INDEX,
+          pointer_depth > 6 ? src.extent(6) : KOKKOS_INVALID_INDEX,
+          pointer_depth > 7 ? src.extent(7) : KOKKOS_INVALID_INDEX);
+  auto tmp_view = Kokkos::create_mirror_view_and_copy(execution_space, src);
+  // TODO not quite sure wy this can't be execution_space
+  Kokkos::deep_copy(/*execution_space, */ layout_right_view, tmp_view);
+  return layout_right_view;
+}
+
+template <typename View, typename ExecutionSpace>
+inline auto create_layout_right_mirror_view_and_copy(
+    ExecutionSpace const & /*execution_space*/, View const &src,
+    typename std::enable_if<
+        ((std::is_same<typename View::traits::array_layout,
+                       Kokkos::LayoutRight>::value ||
+          (View::rank == 1 && !std::is_same<typename View::traits::array_layout,
+                                            Kokkos::LayoutStride>::value)) &&
+         std::is_same<typename View::traits::memory_space,
+                      typename ExecutionSpace::memory_space>::value)>::type * =
+        nullptr)
+{
+  return src;
+}
+
+// NOTE: This functor is used in exclusivePrefixSum( src, dst ).  We were
+// getting a compile error on CUDA when using a KOKKOS_LAMBDA.
+template <typename T, typename DeviceType>
+class ExclusiveScanFunctor
+{
+public:
+  ExclusiveScanFunctor(Kokkos::View<T *, DeviceType> const &in,
+                       Kokkos::View<T *, DeviceType> const &out)
+      : _in(in)
+      , _out(out)
+  {
+  }
+  KOKKOS_INLINE_FUNCTION void operator()(int i, T &update,
+                                         bool final_pass) const
+  {
+    T const in_i = _in(i);
+    if (final_pass)
+      _out(i) = update;
+    update += in_i;
+  }
+
+private:
+  Kokkos::View<T *, DeviceType> _in;
+  Kokkos::View<T *, DeviceType> _out;
+};
+} // namespace Details
+
+/** \brief Computes an exclusive scan.
+ *
+ *  \param[in] space Execution space
+ *  \param[in] src Input view with range of elements to sum
+ *  \param[out] dst Output view; may be equal to \p src
+ *
+ *  When \p dst is not provided or if \p src and \p dst are the same view, the
+ *  scan is performed in-place.  "Exclusive" means that the i-th input element
+ *  is not included in the i-th sum.
+ *
+ *  \pre \p src and \p dst must be of rank 1 and have the same size.
+ */
+template <typename ExecutionSpace, typename ST, typename... SP, typename DT,
+          typename... DP>
+void exclusivePrefixSum(ExecutionSpace &&space,
+                        Kokkos::View<ST, SP...> const &src,
+                        Kokkos::View<DT, DP...> const &dst)
+{
+  static_assert(
+      std::is_same<
+          typename Kokkos::ViewTraits<DT, DP...>::value_type,
+          typename Kokkos::ViewTraits<DT, DP...>::non_const_value_type>::value,
+      "exclusivePrefixSum requires non-const destination type");
+
+  static_assert(
+      (unsigned(Kokkos::ViewTraits<DT, DP...>::rank) ==
+       unsigned(Kokkos::ViewTraits<ST, SP...>::rank)) &&
+          (unsigned(Kokkos::ViewTraits<DT, DP...>::rank) == unsigned(1)),
+      "exclusivePrefixSum requires Views of rank 1");
+
+  using ValueType = typename Kokkos::ViewTraits<DT, DP...>::value_type;
+  using DeviceType = typename Kokkos::ViewTraits<DT, DP...>::device_type;
+
+  auto const n = src.extent(0);
+  ARBORX_ASSERT(n == dst.extent(0));
+  Kokkos::RangePolicy<std::decay_t<ExecutionSpace>> policy(
+      std::forward<ExecutionSpace>(space), 0, n);
+  Kokkos::parallel_scan(
+      "ArborX::Algorithms::exclusive_scan", policy,
+      Details::ExclusiveScanFunctor<ValueType, DeviceType>(src, dst));
+}
+
+/** \brief In-place exclusive scan.
+ *
+ *  \param[in] space Execution space
+ *  \param[in,out] v View with range of elements to sum
+ *
+ *  Calls \c exclusivePrefixSum(v, v)
+ */
+template <typename ExecutionSpace, typename T, typename... P>
+inline std::enable_if_t<
+    Kokkos::is_execution_space<std::remove_reference_t<ExecutionSpace>>::value>
+exclusivePrefixSum(ExecutionSpace &&space, Kokkos::View<T, P...> const &v)
+{
+  exclusivePrefixSum(std::forward<ExecutionSpace>(space), v, v);
+}
+
+template <typename ST, typename... SP, typename DT, typename... DP>
+[[deprecated]] inline void
+exclusivePrefixSum(Kokkos::View<ST, SP...> const &src,
+                   Kokkos::View<DT, DP...> const &dst)
+{
+  using ExecutionSpace = typename Kokkos::View<DT, DP...>::execution_space;
+  exclusivePrefixSum(ExecutionSpace{}, src, dst);
+}
+
+template <typename T, typename... P>
+[[deprecated]] inline void exclusivePrefixSum(Kokkos::View<T, P...> const &v)
+{
+  using ExecutionSpace = typename Kokkos::View<T, P...>::execution_space;
+  exclusivePrefixSum(ExecutionSpace{}, v);
+}
+
+/** \brief Get a copy of the last element.
+ *
+ *  Returns a copy of the last element in the view on the host.  Note that it
+ *  may require communication between host and device (e.g. if the view passed
+ *  as an argument lives on the device).
+ *
+ *  \pre \c v is of rank 1 and not empty.
+ */
+template <typename T, typename... P>
+typename Kokkos::ViewTraits<T, P...>::non_const_value_type
+lastElement(Kokkos::View<T, P...> const &v)
+{
+  static_assert((unsigned(Kokkos::ViewTraits<T, P...>::rank) == unsigned(1)),
+                "lastElement requires Views of rank 1");
+  auto const n = v.extent(0);
+  ARBORX_ASSERT(n > 0);
+  auto v_subview = Kokkos::subview(v, n - 1);
+  auto v_host = Kokkos::create_mirror_view(v_subview);
+  Kokkos::deep_copy(v_host, v_subview);
+  return v_host();
+}
+
+/** \brief Fills the view with a sequence of numbers
+ *
+ *  \param[in] space Execution space
+ *  \param[out] v Output view
+ *  \param[in] value (optional) Initial value
+ *
+ *  \note Similar to \c std::iota() but differs in that it directly assigns
+ *  <code>v(i) = value + i</code> instead of repetitively evaluating
+ *  <code>++value</code> which would be difficult to achieve in a performant
+ *  manner while still guaranteeing the order of execution.
+ */
+template <typename ExecutionSpace, typename T, typename... P>
+void iota(ExecutionSpace &&space, Kokkos::View<T, P...> const &v,
+          typename Kokkos::ViewTraits<T, P...>::value_type value = 0)
+{
+  using ValueType = typename Kokkos::ViewTraits<T, P...>::value_type;
+  static_assert((unsigned(Kokkos::ViewTraits<T, P...>::rank) == unsigned(1)),
+                "iota requires a View of rank 1");
+  static_assert(std::is_arithmetic<ValueType>::value,
+                "iota requires a View with an arithmetic value type");
+  static_assert(
+      std::is_same<ValueType, typename Kokkos::ViewTraits<
+                                  T, P...>::non_const_value_type>::value,
+      "iota requires a View with non-const value type");
+  auto const n = v.extent(0);
+  Kokkos::RangePolicy<std::decay_t<ExecutionSpace>> policy(
+      std::forward<ExecutionSpace>(space), 0, n);
+  Kokkos::parallel_for("ArborX::Algorithms::iota", policy,
+                       KOKKOS_LAMBDA(int i) { v(i) = value + (ValueType)i; });
+}
+
+template <typename T, typename... P>
+[[deprecated]] inline void
+iota(Kokkos::View<T, P...> const &v,
+     typename Kokkos::ViewTraits<T, P...>::value_type value = 0)
+{
+  using ExecutionSpace = typename Kokkos::ViewTraits<T, P...>::execution_space;
+  iota(ExecutionSpace{}, v, value);
+}
+
+/** \brief Returns the smallest and the greatest element in the view
+ *
+ *  \param[in] space Execution space
+ *  \param[in] v Input view
+ *
+ *  Returns a pair on the host with the smallest value in the view as the first
+ *  element and the greatest as the second.
+ */
+template <typename ExecutionSpace, typename ViewType>
+std::pair<typename ViewType::non_const_value_type,
+          typename ViewType::non_const_value_type>
+minMax(ExecutionSpace &&space, ViewType const &v)
+{
+  static_assert(ViewType::rank == 1, "minMax requires a View of rank 1");
+  auto const n = v.extent(0);
+  ARBORX_ASSERT(n > 0);
+  Kokkos::MinMaxScalar<typename ViewType::non_const_value_type> result;
+  Kokkos::MinMax<typename ViewType::non_const_value_type> reducer(result);
+  Kokkos::RangePolicy<std::decay_t<ExecutionSpace>> policy(
+      std::forward<ExecutionSpace>(space), 0, n);
+  Kokkos::parallel_reduce("ArborX::Algorithms::minmax", policy,
+                          Kokkos::Impl::min_max_functor<ViewType>(v), reducer);
+  return std::make_pair(result.min_val, result.max_val);
+}
+
+template <typename ViewType>
+[[deprecated]] inline std::pair<typename ViewType::non_const_value_type,
+                                typename ViewType::non_const_value_type>
+minMax(ViewType const &v)
+{
+  using ExecutionSpace = typename ViewType::execution_space;
+  return minMax(ExecutionSpace{}, v);
+}
+
+/** \brief Returns the smallest element in the view
+ *
+ *  \param[in] space Execution space
+ *  \param[in] v Input view
+ */
+template <typename ExecutionSpace, typename ViewType>
+typename ViewType::non_const_value_type min(ExecutionSpace &&space,
+                                            ViewType const &v)
+{
+  static_assert(ViewType::rank == 1, "min requires a View of rank 1");
+  auto const n = v.extent(0);
+  ARBORX_ASSERT(n > 0);
+  typename ViewType::non_const_value_type result;
+  Kokkos::Min<typename ViewType::non_const_value_type> reducer(result);
+  Kokkos::RangePolicy<std::decay_t<ExecutionSpace>> policy(
+      std::forward<ExecutionSpace>(space), 0, n);
+  Kokkos::parallel_reduce("ArborX::Algorithms::min", policy,
+                          KOKKOS_LAMBDA(int i, int &update) {
+                            if (v(i) < update)
+                              update = v(i);
+                          },
+                          reducer);
+  return result;
+}
+
+template <typename ViewType>
+[[deprecated]] inline typename ViewType::non_const_value_type
+min(ViewType const &v)
+{
+  using ExecutionSpace = typename ViewType::execution_space;
+  return min(ExecutionSpace{}, v);
+}
+
+/** \brief Returns the greatest element in the view
+ *
+ *  \param[in] space Execution space
+ *  \param[in] v Input view
+ */
+template <typename ExecutionSpace, typename ViewType>
+typename ViewType::non_const_value_type max(ExecutionSpace &&space,
+                                            ViewType const &v)
+{
+  static_assert(ViewType::rank == 1, "max requires a View of rank 1");
+  auto const n = v.extent(0);
+  ARBORX_ASSERT(n > 0);
+  typename ViewType::non_const_value_type result;
+  Kokkos::Max<typename ViewType::non_const_value_type> reducer(result);
+  Kokkos::RangePolicy<std::decay_t<ExecutionSpace>> policy(
+      std::forward<ExecutionSpace>(space), 0, n);
+  Kokkos::parallel_reduce("ArborX::Algorithms::max", policy,
+                          KOKKOS_LAMBDA(int i, int &update) {
+                            if (v(i) > update)
+                              update = v(i);
+                          },
+                          reducer);
+  return result;
+}
+
+template <typename ViewType>
+[[deprecated]] inline typename ViewType::non_const_value_type
+max(ViewType const &v)
+{
+  using ExecutionSpace = typename ViewType::execution_space;
+  return max(ExecutionSpace{}, v);
+}
+
+/** \brief Accumulate values in a view
+ *
+ *  \param[in] space Execution space
+ *  \param[in] v Input view
+ *  \param[in] init Initial value of the sum
+ *
+ *  Returns the sum of the given \p init value and elements in the given view \p
+ *  v.  Uses operator+ to sum up the elements.
+ */
+template <typename ExecutionSpace, typename ViewType>
+typename ViewType::non_const_value_type
+accumulate(ExecutionSpace &&space, ViewType const &v,
+           typename ViewType::non_const_value_type init)
+{
+  static_assert(ViewType::rank == 1, "accumulate requires a View of rank 1");
+  auto const n = v.extent(0);
+  // NOTE: Passing the argument init directly to the parallel_reduce() while
+  // using a lambda does not yield the expected result because Kokkos will
+  // supply a default init method that sets the reduction result to zero.
+  // Rather than going through the hassle of defining a custom functor for
+  // the reduction, introduce here a temporary variable and add it to init
+  // before returning.
+  typename ViewType::non_const_value_type tmp = 0;
+  Kokkos::RangePolicy<std::decay_t<ExecutionSpace>> policy(
+      std::forward<ExecutionSpace>(space), 0, n);
+  Kokkos::parallel_reduce(
+      "ArborX::Algorithms::accumulate", policy,
+      KOKKOS_LAMBDA(int i, typename ViewType::non_const_value_type &update) {
+        update += v(i);
+      },
+      tmp);
+  init += tmp;
+  return init;
+}
+
+template <typename ViewType>
+[[deprecated]] inline typename ViewType::non_const_value_type
+accumulate(ViewType const &v, typename ViewType::non_const_value_type init)
+{
+  using ExecutionSpace = typename ViewType::execution_space;
+  return accumulate(ExecutionSpace{}, v, init);
+}
+
+// FIXME shameless forward declaration
+template <typename View>
+typename View::non_const_type clone(View &v);
+
+/** \brief Computes the adjacent difference.
+ *
+ *  \param[in] space Execution space
+ *  \param[in] src Input view
+ *  \param[out] dst Output view; may not be equal to \p dst
+ *
+ *  Assigns to every element in the \p dst view the difference between its
+ *  corresponding element and the one preceding it in the \p src view, except
+ *  for the first element \c dst[0] which is assigned \c src[0]
+ *
+ *  \warning Undefined behavior if \p src and \p dst arrays overlap in any way.
+ */
+template <typename ExecutionSpace, typename SrcViewType, typename DstViewType>
+void adjacentDifference(ExecutionSpace &&space, SrcViewType const &src,
+                        DstViewType const &dst)
+{
+  static_assert(SrcViewType::rank == 1 && DstViewType::rank == 1,
+                "adjacentDifference operates on rank-1 views");
+  static_assert(std::is_same<typename DstViewType::value_type,
+                             typename DstViewType::non_const_value_type>::value,
+                "adjacentDifference requires non-const destination value type");
+  static_assert(std::is_same<typename SrcViewType::non_const_value_type,
+                             typename DstViewType::value_type>::value,
+                "adjacentDifference requires same value type for source and "
+                "destination");
+  // QUESTION Should we assert anything about the memory spaces?
+  auto const n = src.extent(0);
+  ARBORX_ASSERT(n == dst.extent(0));
+  ARBORX_ASSERT(src != dst);
+  Kokkos::RangePolicy<std::decay_t<ExecutionSpace>> policy(
+      std::forward<ExecutionSpace>(space), 0, n);
+  Kokkos::parallel_for("ArbroX::Algorithms::adjacent_difference", policy,
+                       KOKKOS_LAMBDA(int i) {
+                         if (i > 0)
+                           dst(i) = src(i) - src(i - 1);
+                         else
+                           dst(i) = src(i);
+                       });
+}
+
+template <typename SrcViewType, typename DstViewType>
+[[deprecated]] inline void adjacentDifference(SrcViewType const &src,
+                                              DstViewType const &dst)
+{
+  using ExecutionSpace = typename DstViewType::execution_space;
+  adjacentDifference(ExecutionSpace{}, src, dst);
+}
+
+// FIXME split this into one for STL-like algorithms and another one for view
+// utility helpers
+
+// FIXME get rid of this when Trilinos/Kokkos version is updated
+// clang-format off
+#ifndef KOKKOS_IMPL_CTOR_DEFAULT_ARG
+#  ifdef KOKKOS_ENABLE_DEPRECATED_CODE
+#    define KOKKOS_IMPL_CTOR_DEFAULT_ARG 0
+#  else
+#    define KOKKOS_IMPL_CTOR_DEFAULT_ARG (~std::size_t(0))
+#  endif
+#endif
+// clang-format on
+
+// NOTE: not possible to avoid initialization with Kokkos::realloc()
+template <typename View>
+void reallocWithoutInitializing(View &v,
+                                size_t n0 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+                                size_t n1 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+                                size_t n2 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+                                size_t n3 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+                                size_t n4 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+                                size_t n5 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+                                size_t n6 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+                                size_t n7 = KOKKOS_IMPL_CTOR_DEFAULT_ARG)
+{
+  static_assert(View::is_managed, "Can only realloc managed views");
+
+  size_t new_extents[8] = {n0, n1, n2, n3, n4, n5, n6, n7};
+  bool has_requested_extents = true;
+  for (unsigned int dim = 0; dim < v.rank_dynamic; ++dim)
+    if (new_extents[dim] != v.extent(dim))
+    {
+      has_requested_extents = false;
+      break;
+    }
+
+  if (!has_requested_extents)
+    v = View(Kokkos::view_alloc(Kokkos::WithoutInitializing, v.label()), n0, n1,
+             n2, n3, n4, n5, n6, n7);
+}
+
+template <typename View>
+void reallocWithoutInitializing(View &v,
+                                const typename View::array_layout &layout)
+{
+  static_assert(View::is_managed, "Can only realloc managed views");
+  v = View(Kokkos::view_alloc(Kokkos::WithoutInitializing, v.label()), layout);
+}
+
+template <typename View>
+typename View::non_const_type cloneWithoutInitializingNorCopying(View &v)
+{
+  return typename View::non_const_type(
+      Kokkos::view_alloc(Kokkos::WithoutInitializing, v.label()), v.layout());
+}
+
+template <typename ExecutionSpace, typename View>
+typename View::non_const_type clone(ExecutionSpace &&space, View &v)
+{
+  typename View::non_const_type w(
+      Kokkos::view_alloc(Kokkos::WithoutInitializing, v.label()), v.layout());
+  Kokkos::deep_copy(std::forward<ExecutionSpace>(space), w, v);
+  return w;
+}
+
+template <typename View>
+[[deprecated]] inline typename View::non_const_type clone(View &v)
+{
+  using ExecutionSpace = typename View::execution_space;
+  return clone(ExecutionSpace{}, v);
+}
+
+} // namespace ArborX
+
+#endif
diff --git a/arborx/src/details/ArborX_Exception.hpp b/arborx/src/details/ArborX_Exception.hpp
new file mode 100644
index 000000000..d6d42def2
--- /dev/null
+++ b/arborx/src/details/ArborX_Exception.hpp
@@ -0,0 +1,40 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+#ifndef ARBORX_SEARCH_EXCEPTION_HPP
+#define ARBORX_SEARCH_EXCEPTION_HPP
+
+#include <stdexcept>
+#include <string>
+
+namespace ArborX
+{
+class SearchException : public std::logic_error
+{
+public:
+  SearchException(std::string const &msg)
+      : std::logic_error(std::string("ArborX exception: ") + msg)
+  {
+  }
+};
+
+} // namespace ArborX
+
+#define ARBORX_STRINGIZE_DETAIL(x) #x
+#define ARBORX_STRINGIZE(x) ARBORX_STRINGIZE_DETAIL(x)
+
+// FIXME: Unconditionally assert for now
+// Once moved out, possibly make it conditional
+#define ARBORX_ASSERT(c)                                                       \
+  if (!(c))                                                                    \
+  throw ArborX::SearchException(#c ", failed at " __FILE__                     \
+                                   ":" ARBORX_STRINGIZE(__LINE__) ".")
+
+#endif
diff --git a/arborx/src/details/ArborX_KDOP.hpp b/arborx/src/details/ArborX_KDOP.hpp
new file mode 100644
index 000000000..65d14c84d
--- /dev/null
+++ b/arborx/src/details/ArborX_KDOP.hpp
@@ -0,0 +1,316 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#ifndef ARBORX_KDOP_HPP
+#define ARBORX_KDOP_HPP
+
+#include <ArborX_Box.hpp>
+#include <ArborX_DetailsAlgorithms.hpp>
+#include <ArborX_DetailsKokkosExtArithmeticTraits.hpp>
+#include <ArborX_Point.hpp>
+#include <ArborX_Sphere.hpp>
+
+#include <Kokkos_Array.hpp>
+#include <Kokkos_Macros.hpp>
+
+namespace ArborX
+{
+namespace Details
+{
+struct Direction
+{
+  float _data[3];
+};
+
+template <int k>
+struct KDOP_Directions;
+
+template <>
+struct KDOP_Directions<6>
+{
+protected:
+  static constexpr int n_directions = 3;
+  static KOKKOS_FUNCTION Kokkos::Array<Direction, n_directions> const &
+  directions()
+  {
+    static constexpr Kokkos::Array<Direction, n_directions> directions = {
+        Direction{1, 0, 0},
+        Direction{0, 1, 0},
+        Direction{0, 0, 1},
+    };
+    return directions;
+  }
+};
+
+template <>
+struct KDOP_Directions<14>
+{
+protected:
+  static constexpr int n_directions = 7;
+  static KOKKOS_FUNCTION Kokkos::Array<Direction, n_directions> const &
+  directions()
+  {
+    static constexpr Kokkos::Array<Direction, n_directions> directions = {
+        Direction{1, 0, 0},
+        Direction{0, 1, 0},
+        Direction{0, 0, 1},
+        // corners
+        Direction{1, 1, 1},
+        Direction{1, -1, 1},
+        Direction{1, 1, -1},
+        Direction{1, -1, -1},
+    };
+    return directions;
+  }
+};
+
+template <>
+struct KDOP_Directions<18>
+{
+protected:
+  static constexpr int n_directions = 9;
+  static KOKKOS_FUNCTION Kokkos::Array<Direction, n_directions> const &
+  directions()
+  {
+    static constexpr Kokkos::Array<Direction, n_directions> directions = {
+        Direction{1, 0, 0},
+        Direction{0, 1, 0},
+        Direction{0, 0, 1},
+        // edges
+        Direction{1, 1, 0},
+        Direction{1, 0, 1},
+        Direction{0, 1, 1},
+        Direction{1, -1, 0},
+        Direction{1, 0, -1},
+        Direction{0, 1, -1},
+    };
+    return directions;
+  }
+};
+
+template <>
+struct KDOP_Directions<26>
+{
+protected:
+  static constexpr int n_directions = 13;
+  static KOKKOS_FUNCTION Kokkos::Array<Direction, n_directions> const &
+  directions()
+  {
+    static constexpr Kokkos::Array<Direction, n_directions> directions = {
+        Direction{1, 0, 0},
+        Direction{0, 1, 0},
+        Direction{0, 0, 1},
+        // edges
+        Direction{1, 1, 0},
+        Direction{1, 0, 1},
+        Direction{0, 1, 1},
+        Direction{1, -1, 0},
+        Direction{1, 0, -1},
+        Direction{0, 1, -1},
+        // corners
+        Direction{1, 1, 1},
+        Direction{1, -1, 1},
+        Direction{1, 1, -1},
+        Direction{1, -1, -1},
+    };
+    return directions;
+  }
+};
+KOKKOS_INLINE_FUNCTION float project(Point const &p, Direction const &d)
+{
+  float r = 0.;
+  for (int i = 0; i < 3; ++i)
+  {
+    r += p[i] * d._data[i];
+  }
+  return r;
+}
+} // namespace Details
+
+namespace Experimental
+{
+
+template <int k>
+struct KDOP : private Details::KDOP_Directions<k>
+{
+  static constexpr int n_directions = Details::KDOP_Directions<k>::n_directions;
+  Kokkos::Array<float, n_directions> _min_values;
+  Kokkos::Array<float, n_directions> _max_values;
+  KOKKOS_FUNCTION KDOP()
+  {
+    for (int i = 0; i < n_directions; ++i)
+    {
+      _min_values[i] = KokkosExt::ArithmeticTraits::max<float>::value;
+      _max_values[i] = -KokkosExt::ArithmeticTraits::max<float>::value;
+    }
+  }
+  KOKKOS_FUNCTION KDOP &operator+=(Point const &p)
+  {
+    using KokkosExt::max;
+    using KokkosExt::min;
+    for (int i = 0; i < n_directions; ++i)
+    {
+      auto const proj_i = Details::project(p, this->directions()[i]);
+      _min_values[i] = min(_min_values[i], proj_i);
+      _max_values[i] = max(_max_values[i], proj_i);
+    }
+    return *this;
+  }
+  KOKKOS_FUNCTION KDOP &operator+=(Box const &b)
+  {
+    // NOTE if any of the ranges is invalid, the code below would actually
+    // expand the KDOP which is not what we want.
+    // We may revisit this later and decide passing a valid box becomes a
+    // precondition but this would be a breaking change (going from a wide to a
+    // narrow contract).
+    for (int i = 0; i < 3; ++i)
+    {
+      if (b.minCorner()[i] > b.maxCorner()[i])
+      {
+        return *this;
+      }
+    }
+
+    auto const xmin = b.minCorner()[0];
+    auto const ymin = b.minCorner()[1];
+    auto const zmin = b.minCorner()[2];
+    auto const xmax = b.maxCorner()[0];
+    auto const ymax = b.maxCorner()[1];
+    auto const zmax = b.maxCorner()[2];
+    for (auto const &point : {
+             Point{xmin, ymin, zmin},
+             Point{xmin, ymax, zmin},
+             Point{xmin, ymin, zmax},
+             Point{xmin, ymax, zmax},
+             Point{xmax, ymin, zmin},
+             Point{xmax, ymax, zmin},
+             Point{xmax, ymin, zmax},
+             Point{xmax, ymax, zmax},
+         })
+    {
+      *this += point;
+    }
+    return *this;
+  }
+  KOKKOS_FUNCTION KDOP &operator+=(KDOP const &other)
+  {
+    using KokkosExt::max;
+    using KokkosExt::min;
+    for (int i = 0; i < n_directions; ++i)
+    {
+      _min_values[i] = min(_min_values[i], other._min_values[i]);
+      _max_values[i] = max(_max_values[i], other._max_values[i]);
+    }
+    return *this;
+  }
+  KOKKOS_FUNCTION explicit operator Box() const
+  {
+    // WARNING implicit requirement on KDOP first three directions
+    Box b{};
+    for (int i = 0; i < 3; ++i)
+    {
+      b.minCorner()[i] = _min_values[i];
+      b.maxCorner()[i] = _max_values[i];
+    }
+    return b;
+  }
+  KOKKOS_FUNCTION bool intersects(Point const &point) const
+  {
+    for (int i = 0; i < n_directions; ++i)
+    {
+      auto const proj_i = Details::project(point, this->directions()[i]);
+      if (proj_i < _min_values[i] || proj_i > _max_values[i])
+      {
+        return false;
+      }
+    }
+    return true;
+  }
+  KOKKOS_FUNCTION bool intersects(Box const &box) const
+  {
+    KDOP other{};
+    other += box;
+    return intersects(other);
+  }
+  KOKKOS_FUNCTION bool intersects(KDOP<k> const &other) const
+  {
+    for (int i = 0; i < n_directions; ++i)
+    {
+      if (other._max_values[i] < _min_values[i] ||
+          other._min_values[i] > _max_values[i])
+      {
+        return false;
+      }
+    }
+    return true;
+  }
+};
+
+template <int k>
+KOKKOS_INLINE_FUNCTION void expand(KDOP<k> &that, KDOP<k> const &other)
+{
+  that += other;
+}
+
+template <int k>
+KOKKOS_INLINE_FUNCTION void expand(KDOP<k> &that, Point const &point)
+{
+  that += point;
+}
+
+template <int k>
+KOKKOS_INLINE_FUNCTION void expand(KDOP<k> &that, Box const &box)
+{
+  that += box;
+}
+
+template <int k>
+KOKKOS_INLINE_FUNCTION void expand(Box &a, KDOP<k> const &b)
+{
+  ArborX::Details::expand(a, (Box)b);
+}
+
+// NOTE intersects(predicate_geometry, bounding_volume)
+template <int k>
+KOKKOS_INLINE_FUNCTION bool intersects(Box const &a, KDOP<k> const &b)
+{
+  return b.intersects(a);
+}
+
+template <int k>
+KOKKOS_INLINE_FUNCTION bool intersects(KDOP<k> const &a, Box const &b)
+{
+  return a.intersects(b);
+}
+
+template <int k>
+KOKKOS_INLINE_FUNCTION bool intersects(Point const &p, KDOP<k> const &x)
+{
+  return x.intersects(p);
+}
+
+template <int k>
+KOKKOS_INLINE_FUNCTION bool intersects(KDOP<k> const &a, KDOP<k> const &b)
+{
+  return a.intersects(b);
+}
+
+template <int k>
+KOKKOS_INLINE_FUNCTION Point returnCentroid(KDOP<k> const &p)
+{
+  // FIXME approximation
+  return ArborX::Details::returnCentroid((Box)p);
+}
+
+} // namespace Experimental
+} // namespace ArborX
+
+#endif
diff --git a/arborx/src/details/ArborX_Point.hpp b/arborx/src/details/ArborX_Point.hpp
new file mode 100644
index 000000000..dab737a14
--- /dev/null
+++ b/arborx/src/details/ArborX_Point.hpp
@@ -0,0 +1,74 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#ifndef ARBORX_DETAILS_POINT_HPP
+#define ARBORX_DETAILS_POINT_HPP
+
+#include <Kokkos_Macros.hpp>
+
+#include <utility>
+
+namespace ArborX
+{
+class Point
+{
+private:
+  struct Data
+  {
+    float coords[3];
+  } _data = {};
+
+  struct Abomination
+  {
+    double xyz[3];
+  };
+
+public:
+  KOKKOS_DEFAULTED_FUNCTION
+  constexpr Point() noexcept = default;
+
+  KOKKOS_INLINE_FUNCTION
+  constexpr Point(Abomination data)
+      : Point(static_cast<float>(data.xyz[0]), static_cast<float>(data.xyz[1]),
+              static_cast<float>(data.xyz[2]))
+  {
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  constexpr Point(float x, float y, float z)
+      : _data{{x, y, z}}
+  {
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  constexpr float &operator[](unsigned int i) { return _data.coords[i]; }
+
+  KOKKOS_INLINE_FUNCTION
+  constexpr const float &operator[](unsigned int i) const
+  {
+    return _data.coords[i];
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  float volatile &operator[](unsigned int i) volatile
+  {
+    return _data.coords[i];
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  float const volatile &operator[](unsigned int i) const volatile
+  {
+    return _data.coords[i];
+  }
+};
+} // namespace ArborX
+
+#endif
diff --git a/arborx/src/details/ArborX_Predicates.hpp b/arborx/src/details/ArborX_Predicates.hpp
new file mode 100644
index 000000000..e5b6cb84a
--- /dev/null
+++ b/arborx/src/details/ArborX_Predicates.hpp
@@ -0,0 +1,143 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+#ifndef ARBORX_PREDICATE_HPP
+#define ARBORX_PREDICATE_HPP
+
+#include <ArborX_DetailsAlgorithms.hpp>
+
+namespace ArborX
+{
+namespace Details
+{
+struct NearestPredicateTag
+{
+};
+struct SpatialPredicateTag
+{
+};
+} // namespace Details
+
+template <typename Geometry>
+struct Nearest
+{
+  using Tag = Details::NearestPredicateTag;
+
+  KOKKOS_DEFAULTED_FUNCTION
+  Nearest() = default;
+
+  KOKKOS_INLINE_FUNCTION
+  Nearest(Geometry const &geometry, int k)
+      : _geometry(geometry)
+      , _k(k)
+  {
+  }
+
+  Geometry _geometry;
+  int _k = 0;
+};
+
+template <typename Geometry>
+struct Intersects
+{
+  using Tag = Details::SpatialPredicateTag;
+
+  KOKKOS_DEFAULTED_FUNCTION Intersects() = default;
+
+  KOKKOS_INLINE_FUNCTION Intersects(Geometry const &geometry)
+      : _geometry(geometry)
+  {
+  }
+
+  template <typename Other>
+  KOKKOS_INLINE_FUNCTION bool operator()(Other const &other) const
+  {
+    using Details::intersects;
+    return intersects(_geometry, other);
+  }
+
+  Geometry _geometry;
+};
+
+template <typename Geometry>
+KOKKOS_INLINE_FUNCTION Nearest<Geometry> nearest(Geometry const &geometry,
+                                                 int k = 1)
+{
+  return Nearest<Geometry>(geometry, k);
+}
+
+template <typename Geometry>
+KOKKOS_INLINE_FUNCTION Intersects<Geometry> intersects(Geometry const &geometry)
+{
+  return Intersects<Geometry>(geometry);
+}
+
+template <typename Geometry>
+KOKKOS_INLINE_FUNCTION int getK(Nearest<Geometry> const &pred)
+{
+  return pred._k;
+}
+
+template <typename Geometry>
+KOKKOS_INLINE_FUNCTION Geometry const &
+getGeometry(Nearest<Geometry> const &pred)
+{
+  return pred._geometry;
+}
+
+template <typename Geometry>
+KOKKOS_INLINE_FUNCTION Geometry const &
+getGeometry(Intersects<Geometry> const &pred)
+{
+  return pred._geometry;
+}
+
+template <typename Predicate, typename Data>
+struct PredicateWithAttachment : Predicate
+{
+  KOKKOS_DEFAULTED_FUNCTION PredicateWithAttachment() = default;
+  KOKKOS_INLINE_FUNCTION PredicateWithAttachment(Predicate const &pred,
+                                                 Data const &data)
+      : Predicate{pred}
+      , _data{data}
+  {
+  }
+  KOKKOS_INLINE_FUNCTION PredicateWithAttachment(Predicate &&pred, Data &&data)
+      : Predicate(std::forward<Predicate>(pred))
+      , _data(std::forward<Data>(data))
+  {
+  }
+  Data _data;
+};
+
+template <typename Predicate, typename Data>
+KOKKOS_INLINE_FUNCTION Data const &
+getData(PredicateWithAttachment<Predicate, Data> const &pred) noexcept
+{
+  return pred._data;
+}
+
+template <typename Predicate, typename Data>
+KOKKOS_INLINE_FUNCTION Predicate const &
+getPredicate(PredicateWithAttachment<Predicate, Data> const &pred) noexcept
+{
+  return static_cast<Predicate const &>(pred); // slicing
+}
+
+template <typename Predicate, typename Data>
+KOKKOS_INLINE_FUNCTION constexpr auto attach(Predicate &&pred, Data &&data)
+{
+  return PredicateWithAttachment<std::decay_t<Predicate>, std::decay_t<Data>>{
+      std::forward<Predicate>(pred), std::forward<Data>(data)};
+}
+
+} // namespace ArborX
+
+#endif
diff --git a/arborx/src/details/ArborX_Ray.hpp b/arborx/src/details/ArborX_Ray.hpp
new file mode 100644
index 000000000..d57b5e05d
--- /dev/null
+++ b/arborx/src/details/ArborX_Ray.hpp
@@ -0,0 +1,286 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+#ifndef ARBORX_RAY_HPP
+#define ARBORX_RAY_HPP
+
+#include <ArborX_Box.hpp>
+#include <ArborX_DetailsAlgorithms.hpp> // equal
+#include <ArborX_DetailsKokkosExtArithmeticTraits.hpp>
+#include <ArborX_Point.hpp>
+#include <ArborX_Sphere.hpp>
+
+#include <Kokkos_Macros.hpp>
+
+#include <cassert>
+#include <cmath>
+
+namespace ArborX
+{
+namespace Experimental
+{
+
+struct Vector : private Point
+{
+  using Point::Point;
+  using Point::operator[];
+};
+
+KOKKOS_INLINE_FUNCTION constexpr Vector makeVector(Point const &begin,
+                                                   Point const &end)
+{
+  Vector v;
+  for (int d = 0; d < 3; ++d)
+  {
+    v[d] = end[d] - begin[d];
+  }
+  return v;
+}
+
+KOKKOS_INLINE_FUNCTION constexpr auto dotProduct(Vector const &v,
+                                                 Vector const &w)
+{
+  return v[0] * w[0] + v[1] * w[1] + v[2] * w[2];
+}
+
+KOKKOS_INLINE_FUNCTION constexpr Vector crossProduct(Vector const &v,
+                                                     Vector const &w)
+{
+  return {v[1] * w[2] - v[2] * w[1], v[2] * w[0] - v[0] * w[2],
+          v[0] * w[1] - v[1] * w[0]};
+}
+
+KOKKOS_INLINE_FUNCTION constexpr bool operator==(Vector const &v,
+                                                 Vector const &w)
+{
+  return v[0] == w[0] && v[1] == w[1] && v[2] == w[2];
+}
+
+KOKKOS_INLINE_FUNCTION constexpr bool equals(Vector const &v, Vector const &w)
+{
+  return v == w;
+}
+
+struct Ray
+{
+  Point _origin = {};
+  Experimental::Vector _direction = {0.f, 0.f, 0.f};
+
+  // We would like to use Scalar defined as:
+  // using Scalar =
+  //    std::decay_t<decltype(std::declval<Experimental::Vector>()[0])>;
+  // However, this means using float to compute the norm. This creates a large
+  // error in the norm that affects ray tracing for triangles. Casting the
+  // norm from double to float once it has been computed is not enough to
+  // improve the value of the normalized vector. Thus, the norm has to return a
+  // double.
+  using Scalar = double;
+
+  KOKKOS_DEFAULTED_FUNCTION
+  constexpr Ray() = default;
+
+  KOKKOS_FUNCTION
+  Ray(Point const &origin, Experimental::Vector const &direction)
+      : _origin(origin)
+      , _direction(direction)
+  {
+    normalize(_direction);
+  }
+
+  KOKKOS_FUNCTION
+  static Scalar norm(Experimental::Vector const &v)
+  {
+    Scalar sq{};
+    for (int d = 0; d < 3; ++d)
+      sq += static_cast<Scalar>(v[d]) * static_cast<Scalar>(v[d]);
+    return std::sqrt(sq);
+  }
+
+  KOKKOS_FUNCTION static void normalize(Experimental::Vector &v)
+  {
+    auto const magv = norm(v);
+    assert(magv > 0);
+    for (int d = 0; d < 3; ++d)
+      v[d] /= magv;
+  }
+
+  KOKKOS_FUNCTION
+  constexpr Point &origin() { return _origin; }
+
+  KOKKOS_FUNCTION
+  constexpr Point const &origin() const { return _origin; }
+
+  KOKKOS_FUNCTION
+  constexpr Experimental::Vector &direction() { return _direction; }
+
+  KOKKOS_FUNCTION
+  constexpr Experimental::Vector const &direction() const { return _direction; }
+
+  // FIXME avoid breaking Wenjun's code
+  using Vector [[deprecated]] = ArborX::Experimental::Vector;
+};
+
+KOKKOS_INLINE_FUNCTION
+constexpr bool equals(Ray const &l, Ray const &r)
+{
+  using ArborX::Details::equals;
+  return equals(l.origin(), r.origin()) && equals(l.direction(), r.direction());
+}
+
+KOKKOS_INLINE_FUNCTION
+Point returnCentroid(Ray const &ray) { return ray.origin(); }
+
+// The ray-box intersection algorithm is based on [1]. Their 'efficient slag'
+// algorithm checks the intersections both in front and behind the ray. The
+// function here checks the intersections in front of the ray.
+//
+// There are few issues here. First, when a ray direction is aligned with one
+// of the axis, a division by zero will occur. This is fine, as usually it
+// results in +inf or -inf, which are treated correctly. However, it also leads
+// to the second situation, when it is 0/0 which occurs when the ray's origin
+// in that dimension is on the same plane as one of the corners (i.e., if
+// inv_ray_dir[d] == 0 && (minCorner[d] == origin[d] || maxCorner[d] ==
+// origin[d])). This leads to NaN, which are not treated correctly (unless, as
+// in [1], the underlying min/max functions are able to ignore them). The issue
+// is discussed in more details in [2] and the webiste (key word: A minimal
+// ray-tracer: rendering simple shapes).
+//
+// In the algorithm below, we explicitly ignoring NaN values, leading to
+// correct algorithm. An interesting side note is that per IEEE standard, all
+// comparisons with NaN are false.
+//
+// [1] Majercik, A., Crassin, C., Shirley, P., & McGuire, M. (2018). A ray-box
+// intersection algorithm and efficient dynamic voxel rendering. Journal of
+// Computer Graphics Techniques Vol, 7(3).
+//
+// [2] Williams, A., Barrus, S., Morley, R. K., & Shirley, P. (2005). An
+// efficient and robust ray-box intersection algorithm. In ACM SIGGRAPH 2005
+// Courses (pp. 9-es).
+KOKKOS_INLINE_FUNCTION
+bool intersects(Ray const &ray, Box const &box)
+{
+  auto const &minCorner = box.minCorner();
+  auto const &maxCorner = box.maxCorner();
+  auto const &origin = ray.origin();
+  auto const &direction = ray.direction();
+
+  auto const inf = KokkosExt::ArithmeticTraits::infinity<float>::value;
+  float max_min = -inf;
+  float min_max = inf;
+
+  for (int d = 0; d < 3; ++d)
+  {
+    float tmin;
+    float tmax;
+    if (direction[d] >= 0)
+    {
+      tmin = (minCorner[d] - origin[d]) / direction[d];
+      tmax = (maxCorner[d] - origin[d]) / direction[d];
+    }
+    else
+    {
+      tmin = (maxCorner[d] - origin[d]) / direction[d];
+      tmax = (minCorner[d] - origin[d]) / direction[d];
+    }
+
+    if (!std::isnan(tmin) && max_min < tmin)
+      max_min = tmin;
+    if (!std::isnan(tmax) && min_max > tmax)
+      min_max = tmax;
+  }
+
+  return max_min <= min_max && (min_max >= 0);
+}
+
+// Solves a*x^2 + b*x + c = 0.
+// If a solution exists, return true and stores roots at x1, x2.
+// If a solution does not exist, returns false.
+KOKKOS_INLINE_FUNCTION bool solveQuadratic(float const a, float const b,
+                                           float const c, float &x1, float &x2)
+{
+  assert(a != 0);
+
+  auto const discriminant = b * b - 4 * a * c;
+  if (discriminant < 0)
+    return false;
+  if (discriminant == 0)
+  {
+    x1 = x2 = -b / (2 * a);
+    return true;
+  }
+
+  // Instead of doing a simple
+  //    (-b +- std::sqrt(discriminant)) / (2*a)
+  // we use a more stable algorithm with less loss of precision (see, for
+  // example, https://www.scratchapixel.com/lessons/3d-basic-rendering/
+  // minimal-ray-tracer-rendering-simple-shapes/ray-sphere-intersection).
+  auto const q = (b > 0) ? (-b - std::sqrt(discriminant)) / 2.0
+                         : (-b + std::sqrt(discriminant)) / 2.0;
+  x1 = q / a;
+  x2 = c / q;
+
+  return true;
+}
+
+// Ray-Sphere intersection algorithm.
+//
+// The sphere can be expressed as the solution to
+//     |p - c|^2 - r^2 = 0,           (1)
+// where c is the center of the sphere, and r is the radius. On the other
+// hand, any point on a bidirectional ray satisfies
+//     p = o + t*d,                   (2)
+// where o is the origin, and d is the direction vector.
+// Substituting (2) into (1),
+//     |(o + t*d) - c|^2 - r^2 = 0,   (3)
+// results in a quadratic equation for unknown t
+//     a2 * t^2 + a1 * t + a0 = 0
+// with
+//     a2 = |d|^2, a1 = 2*(d, o - c), and a0 = |o - c|^2 - r^2.
+// Then, we only need to intersect the solution interval [tmin, tmax] with
+// [0, +inf) for the unidirectional ray.
+KOKKOS_INLINE_FUNCTION float overlapDistance(Ray const &ray,
+                                             Sphere const &sphere)
+{
+  auto const &r = sphere.radius();
+
+  // Vector oc = (origin_of_ray - center_of_sphere)
+  Vector const oc = makeVector(sphere.centroid(), ray.origin());
+
+  float const a2 = 1.f; // directions are normalized
+  float const a1 = 2.f * dotProduct(ray.direction(), oc);
+  float const a0 = dotProduct(oc, oc) - r * r;
+
+  float t1;
+  float t2;
+  if (!solveQuadratic(a2, a1, a0, t1, t2))
+  {
+    // No intersection of a bidirectional ray with the sphere
+    return 0.f;
+  }
+  float tmin = KokkosExt::min(t1, t2);
+  float tmax = KokkosExt::max(t1, t2);
+
+  if (tmax < 0)
+  {
+    // Half-ray does not intersect with the sphere
+    return 0.f;
+  }
+
+  // Overlap [tmin, tmax] with [0, +inf)
+  tmin = KokkosExt::max(0.f, tmin);
+
+  // As direction is normalized,
+  //   |(o + tmax*d) - (o + tmin*d)| = tmax - tmin
+  return (tmax - tmin);
+}
+
+} // namespace Experimental
+} // namespace ArborX
+#endif
diff --git a/arborx/src/details/ArborX_Sphere.hpp b/arborx/src/details/ArborX_Sphere.hpp
new file mode 100644
index 000000000..d4b4abf4e
--- /dev/null
+++ b/arborx/src/details/ArborX_Sphere.hpp
@@ -0,0 +1,47 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+#ifndef ARBORX_Sphere_HPP
+#define ARBORX_Sphere_HPP
+
+#include <ArborX_Point.hpp>
+
+#include <Kokkos_Macros.hpp>
+
+namespace ArborX
+{
+
+struct Sphere
+{
+  KOKKOS_DEFAULTED_FUNCTION
+  Sphere() = default;
+
+  KOKKOS_INLINE_FUNCTION
+  constexpr Sphere(Point const &centroid, double radius) // FIXME
+      : _centroid(centroid)
+      , _radius(static_cast<float>(radius))
+  {
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  constexpr Point &centroid() { return _centroid; }
+
+  KOKKOS_INLINE_FUNCTION
+  constexpr Point const &centroid() const { return _centroid; }
+
+  KOKKOS_INLINE_FUNCTION
+  constexpr float radius() const { return _radius; }
+
+  Point _centroid = {};
+  float _radius = 0.;
+};
+} // namespace ArborX
+
+#endif
diff --git a/arborx/src/details/ArborX_TraversalPolicy.hpp b/arborx/src/details/ArborX_TraversalPolicy.hpp
new file mode 100644
index 000000000..1885ac4a3
--- /dev/null
+++ b/arborx/src/details/ArborX_TraversalPolicy.hpp
@@ -0,0 +1,52 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#ifndef ARBORX_TRAVERSAL_POLICY_HPP
+#define ARBORX_TRAVERSAL_POLICY_HPP
+
+namespace ArborX
+{
+namespace Experimental
+{
+struct TraversalPolicy
+{
+  // Buffer size lets a user provide an upper bound for the number of results
+  // per query. If the guess is accurate, it avoids performing the tree
+  // traversals twice (the first one to count the number of results per query,
+  // the second to actually write down the results at the right location in
+  // the flattened array)
+  //
+  // The default value zero disables the buffer optimization. The sign of the
+  // integer is used to specify the policy in the case the size insufficient.
+  // If it is positive, the code falls back to the default behavior and
+  // performs a second pass. If it is negative, it throws an exception.
+  int _buffer_size = 0;
+
+  // Sort predicates allows disabling predicate sorting.
+  bool _sort_predicates = true;
+
+  TraversalPolicy &setBufferSize(int buffer_size)
+  {
+    _buffer_size = buffer_size;
+    return *this;
+  }
+
+  TraversalPolicy &setPredicateSorting(bool sort_predicates)
+  {
+    _sort_predicates = sort_predicates;
+    return *this;
+  }
+};
+
+} // namespace Experimental
+} // namespace ArborX
+
+#endif
diff --git a/arborx/test/ArborXTest_TreeTypeTraits.hpp b/arborx/test/ArborXTest_TreeTypeTraits.hpp
new file mode 100644
index 000000000..c6d1b07dc
--- /dev/null
+++ b/arborx/test/ArborXTest_TreeTypeTraits.hpp
@@ -0,0 +1,85 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#ifndef ARBORX_TEST_TREE_TYPE_TRAITS_HPP
+#define ARBORX_TEST_TREE_TYPE_TRAITS_HPP
+
+#include <ArborX.hpp>
+
+#include <tuple>
+
+// NOTE Because std::tuple does not take template template parameters
+template <template <class> class...>
+struct Tuple
+{
+};
+
+#ifndef ARBORX_TEST_TREE_TYPES
+// NOTE Emulate resulting name from using ArborX::BoundingVolumeHierarchy as
+// template parameter in Boost.Test
+template <class MemorySpace>
+using ArborX__BoundingVolumeHierarchy =
+    ArborX::BoundingVolumeHierarchy<MemorySpace>;
+#define ARBORX_TEST_TREE_TYPES Tuple<ArborX__BoundingVolumeHierarchy>
+#endif
+
+#ifndef ARBORX_TEST_DEVICE_TYPES
+#define ARBORX_TEST_DEVICE_TYPES                                               \
+  std::tuple<Kokkos::DefaultExecutionSpace::device_type>
+#endif
+
+template <template <class> class Tree, class DeviceType>
+struct TreeExecutionAndMemorySpaces
+// NOTE The name of this class will be part of the resulting name of the unit
+// test produced by Boost.Test, such as
+//
+// clang-format off
+// test_case_name<this_class_name<ArborX__BVH_ Kokkos__Device<Kokkos__Cuda_ Kokkos__CudaSpace>>>*
+// clang-format on
+{
+  static_assert(Kokkos::is_device<DeviceType>{}, "");
+  using device_type = DeviceType;
+  using execution_space = typename DeviceType::execution_space;
+  using memory_space = typename DeviceType::memory_space;
+  using type = Tree<memory_space>;
+};
+
+template <class...>
+struct Concatenate;
+
+template <class... Ts, class... Us>
+struct Concatenate<std::tuple<Ts...>, std::tuple<Us...>>
+{
+  using type = std::tuple<Ts..., Us...>;
+};
+
+template <class T, class U>
+struct CartesianProduct;
+
+template <class... Us>
+struct CartesianProduct<Tuple<>, std::tuple<Us...>>
+{
+  using type = std::tuple<>;
+};
+
+template <template <class> class T, template <class> class... Ts, class... Us>
+struct CartesianProduct<Tuple<T, Ts...>, std::tuple<Us...>>
+{
+  using type = typename Concatenate<
+      std::tuple<TreeExecutionAndMemorySpaces<T, Us>...>,
+      typename CartesianProduct<Tuple<Ts...>, std::tuple<Us...>>::type>::type;
+};
+
+using TreeTypeTraitsList =
+    typename CartesianProduct<ARBORX_TEST_TREE_TYPES,
+                              ARBORX_TEST_DEVICE_TYPES>::type;
+
+#endif
diff --git a/arborx/test/ArborX_BoostGeometryAdapters.hpp b/arborx/test/ArborX_BoostGeometryAdapters.hpp
new file mode 100644
index 000000000..2ef0040c1
--- /dev/null
+++ b/arborx/test/ArborX_BoostGeometryAdapters.hpp
@@ -0,0 +1,97 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#ifndef ARBORX_BOOST_GEOMETRY_ADAPTERS_HPP
+#define ARBORX_BOOST_GEOMETRY_ADAPTERS_HPP
+
+#include <ArborX_Box.hpp>
+#include <ArborX_Point.hpp>
+
+#include <boost/geometry.hpp>
+
+namespace boost
+{
+namespace geometry
+{
+namespace traits
+{
+// Adapt ArborX::Point to Boost.Geometry
+template <>
+struct tag<ArborX::Point>
+{
+  using type = point_tag;
+};
+
+template <>
+struct coordinate_type<ArborX::Point>
+{
+  using type = float;
+};
+
+template <>
+struct coordinate_system<ArborX::Point>
+{
+  using type = cs::cartesian;
+};
+
+template <>
+struct dimension<ArborX::Point> : boost::mpl::int_<3>
+{
+};
+
+template <size_t D>
+struct access<ArborX::Point, D>
+{
+  static inline float get(ArborX::Point const &p) { return p[D]; }
+
+  static inline void set(ArborX::Point &p, float value) { p[D] = value; }
+};
+
+// Adapt ArborX::Box to Boost.Geometry
+template <>
+struct tag<ArborX::Box>
+{
+  using type = box_tag;
+};
+
+template <>
+struct point_type<ArborX::Box>
+{
+  using type = ArborX::Point;
+};
+
+template <size_t D>
+struct indexed_access<ArborX::Box, min_corner, D>
+{
+  static inline float get(ArborX::Box const &b) { return b.minCorner()[D]; }
+
+  static inline void set(ArborX::Box &b, float value)
+  {
+    b.minCorner()[D] = value;
+  }
+};
+
+template <size_t D>
+struct indexed_access<ArborX::Box, max_corner, D>
+{
+  static inline float get(ArborX::Box const &b) { return b.maxCorner()[D]; }
+
+  static inline void set(ArborX::Box &b, float value)
+  {
+    b.maxCorner()[D] = value;
+  }
+};
+
+} // namespace traits
+} // namespace geometry
+} // namespace boost
+
+#endif
diff --git a/arborx/test/ArborX_BoostRTreeHelpers.hpp b/arborx/test/ArborX_BoostRTreeHelpers.hpp
new file mode 100644
index 000000000..030175c81
--- /dev/null
+++ b/arborx/test/ArborX_BoostRTreeHelpers.hpp
@@ -0,0 +1,337 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#ifndef ARBORX_BOOST_RTREE_HELPERS_HPP
+#define ARBORX_BOOST_RTREE_HELPERS_HPP
+
+#include <ArborX_Config.hpp>
+
+#include "ArborX_BoostGeometryAdapters.hpp"
+#include "ArborX_BoostRangeAdapters.hpp"
+#include <ArborX_Box.hpp>
+#include <ArborX_DetailsKokkosExtAccessibilityTraits.hpp> // is_accessible_from_host
+#include <ArborX_DetailsUtils.hpp> // exclusivePrefixSum, lastElement
+#include <ArborX_Point.hpp>
+#include <ArborX_Predicates.hpp>
+
+#include <boost/range/adaptors.hpp>
+#include <boost/range/algorithm/copy.hpp>
+#include <boost/range/algorithm/transform.hpp>
+#include <boost/range/combine.hpp>
+
+#ifdef ARBORX_ENABLE_MPI
+#include <mpi.h>
+#endif
+
+namespace BoostRTreeHelpers
+{
+// NOTE: The balancing algorithm does not really matter since the tree is
+// created using packing algorithm and there is no later insertion of new
+// objects into the tree.  The values of the maximum and the minimum number
+// of elements could be adjusted in principle but I didn't bother setting
+// this type as a template argument.
+using Parameter = boost::geometry::index::linear<16>;
+
+template <typename Value, typename Index>
+struct PairMaker
+{
+  using result_type = std::pair<Value, Index>;
+  template <typename T>
+  inline result_type operator()(T const &v) const
+  {
+    return result_type(v.value(), v.index());
+  }
+};
+
+template <typename Indexable>
+using RTree =
+    boost::geometry::index::rtree<std::pair<Indexable, int>, Parameter>;
+
+template <typename View>
+static RTree<typename View::value_type> makeRTree(View const &objects)
+{
+  using Indexable = typename View::value_type;
+  return RTree<Indexable>(
+      objects | boost::adaptors::indexed() |
+      boost::adaptors::transformed(PairMaker<Indexable, int>()));
+}
+
+// NOTE: Boost.Config defines BOOST_NO_CXX11_VARIADIC_TEMPLATES for nvcc
+// with the current version of CUDA we are using.  In consequence we are
+// not able to use std::tuple<Indexable, ...> which is unfortunate :(
+class AppendRankToPairObjectIndex
+{
+public:
+  AppendRankToPairObjectIndex(int rank)
+      : _rank(rank)
+  {
+  }
+
+  template <typename T1, typename T2>
+  inline boost::tuple<T1, T2, int> operator()(std::pair<T1, T2> const &p) const
+  {
+    return boost::make_tuple(std::get<0>(p), std::get<1>(p), _rank);
+  }
+
+private:
+  int _rank = -1;
+};
+
+#ifdef ARBORX_ENABLE_MPI
+template <typename Indexable>
+using ParallelRTree =
+    boost::geometry::index::rtree<boost::tuple<Indexable, int, int>, Parameter>;
+
+template <typename View>
+static ParallelRTree<typename View::value_type> makeRTree(MPI_Comm comm,
+                                                          View const &objects)
+{
+  using Indexable = typename View::value_type;
+
+  // Fill buffer with pair (object, index)
+  std::vector<std::pair<Indexable, int>> buffer;
+  boost::copy(objects | boost::adaptors::indexed() |
+                  boost::adaptors::transformed(PairMaker<Indexable, int>()),
+              std::back_inserter(buffer));
+
+  // Gather all buffers
+  int comm_size;
+  MPI_Comm_size(comm, &comm_size);
+  int comm_rank;
+  MPI_Comm_rank(comm, &comm_rank);
+  std::vector<int> counts(comm_size);
+  counts[comm_rank] = buffer.size();
+  MPI_Allgather(MPI_IN_PLACE, 0, MPI_DATATYPE_NULL, counts.data(), 1, MPI_INT,
+                comm);
+  std::vector<int> offsets(comm_size + 1);
+  offsets[0] = 0;
+  for (int i = 0; i < comm_size; ++i)
+    offsets[i + 1] = counts[i] + offsets[i];
+  decltype(buffer) all_buffers(offsets.back());
+  auto const bytes_per_element = sizeof(typename decltype(buffer)::value_type);
+  for (auto *pv : {&counts, &offsets})
+    for (auto &x : *pv)
+      x *= bytes_per_element;
+  MPI_Allgatherv(buffer.data(), counts[comm_rank], MPI_BYTE, all_buffers.data(),
+                 counts.data(), offsets.data(), MPI_BYTE, comm);
+  for (auto &x : offsets)
+    x /= bytes_per_element;
+
+  std::vector<boost::tuple<Indexable, int, int>> all_objects;
+  for (int i = 0; i < comm_size; ++i)
+    boost::transform(std::make_pair(all_buffers.data() + offsets[i],
+                                    all_buffers.data() + offsets[i + 1]),
+                     std::back_inserter(all_objects),
+                     AppendRankToPairObjectIndex(i));
+
+  return ParallelRTree<Indexable>(all_objects);
+}
+#endif
+
+template <typename Value>
+struct UnaryPredicate
+{
+  using Function = std::function<bool(Value const &)>;
+  UnaryPredicate(Function pred)
+      : _pred(pred)
+  {
+  }
+  inline bool operator()(Value const &val) const { return _pred(val); }
+  Function _pred;
+};
+
+template <typename Value>
+static auto translate(ArborX::Intersects<ArborX::Sphere> const &query)
+{
+  auto const sphere = getGeometry(query);
+  auto const radius = sphere.radius();
+  auto const centroid = sphere.centroid();
+  ArborX::Box box;
+  ArborX::Details::expand(box, sphere);
+  return boost::geometry::index::intersects(box) &&
+         boost::geometry::index::satisfies(
+             UnaryPredicate<Value>([centroid, radius](Value const &val) {
+               boost::geometry::index::indexable<Value> indexableGetter;
+               auto const &geometry = indexableGetter(val);
+               return boost::geometry::distance(centroid, geometry) <= radius;
+             }));
+}
+
+template <typename Value>
+static auto translate(ArborX::Intersects<ArborX::Box> const &query)
+{
+  ArborX::Box const &box = getGeometry(query);
+  return boost::geometry::index::intersects(box);
+}
+
+template <typename Value, typename Geometry>
+static auto translate(ArborX::Nearest<Geometry> const &query)
+{
+  auto const geometry = getGeometry(query);
+  auto const k = getK(query);
+  return boost::geometry::index::nearest(geometry, k);
+}
+
+template <typename Indexable, typename InputView,
+          typename OutputView = Kokkos::View<int *, Kokkos::HostSpace>>
+static std::tuple<OutputView, OutputView>
+performQueries(RTree<Indexable> const &rtree, InputView const &queries)
+{
+  static_assert(KokkosExt::is_accessible_from_host<InputView>::value, "");
+
+  using Value = typename RTree<Indexable>::value_type;
+  auto const n_queries = queries.extent_int(0);
+  OutputView offset("offset", n_queries + 1);
+  std::vector<Value> returned_values;
+  for (int i = 0; i < n_queries; ++i)
+    offset(i) = rtree.query(translate<Value>(queries(i)),
+                            std::back_inserter(returned_values));
+  using ExecutionSpace = typename InputView::execution_space;
+  ArborX::exclusivePrefixSum(ExecutionSpace{}, offset);
+  auto const n_results = ArborX::lastElement(offset);
+  OutputView indices("indices", n_results);
+  for (int i = 0; i < n_queries; ++i)
+    for (int j = offset(i); j < offset(i + 1); ++j)
+      indices(j) = returned_values[j].second;
+  return std::make_tuple(offset, indices);
+}
+
+#ifdef ARBORX_ENABLE_MPI
+template <typename Indexable, typename InputView,
+          typename OutputView1 =
+              Kokkos::View<Kokkos::pair<int, int> *, Kokkos::HostSpace>,
+          typename OutputView2 = Kokkos::View<int *, Kokkos::HostSpace>>
+static std::tuple<OutputView2, OutputView1>
+performQueries(ParallelRTree<Indexable> const &rtree, InputView const &queries)
+{
+  static_assert(KokkosExt::is_accessible_from_host<InputView>::value, "");
+  using Value = typename ParallelRTree<Indexable>::value_type;
+  auto const n_queries = queries.extent_int(0);
+  OutputView2 offset("offset", n_queries + 1);
+  std::vector<Value> returned_values;
+  for (int i = 0; i < n_queries; ++i)
+    offset(i) = rtree.query(translate<Value>(queries(i)),
+                            std::back_inserter(returned_values));
+  using ExecutionSpace = typename InputView::execution_space;
+  ArborX::exclusivePrefixSum(ExecutionSpace{}, offset);
+  auto const n_results = ArborX::lastElement(offset);
+  OutputView1 values("values", n_results);
+  for (int i = 0; i < n_queries; ++i)
+    for (int j = offset(i); j < offset(i + 1); ++j)
+    {
+      int index;
+      int rank;
+      boost::tie(boost::tuples::ignore, index, rank) = returned_values[j];
+      values(j) = {index, rank};
+    }
+  return std::make_tuple(offset, values);
+}
+#endif
+} // end namespace BoostRTreeHelpers
+
+namespace BoostExt
+{
+
+// FIXME Goal is to match the BVH interface
+template <typename Indexable>
+class RTree
+{
+public:
+  using DeviceType = Kokkos::DefaultHostExecutionSpace::device_type;
+  using memory_space = typename DeviceType::memory_space;
+
+  template <typename ExecutionSpace>
+  RTree(ExecutionSpace, Kokkos::View<Indexable *, DeviceType> const &values)
+  {
+    static_assert(Kokkos::is_execution_space<ExecutionSpace>::value, "");
+
+    _tree = BoostRTreeHelpers::makeRTree(values);
+  }
+
+  // WARNING trailing pack will match anything :/
+  template <typename ExecutionSpace, typename Predicates, typename InputView,
+            typename... TrailingArgs>
+  void query(ExecutionSpace const &, Predicates const &predicates,
+             InputView &indices, InputView &offset, TrailingArgs &&...) const
+  {
+    static_assert(Kokkos::is_execution_space<ExecutionSpace>::value, "");
+
+    std::tie(offset, indices) =
+        BoostRTreeHelpers::performQueries(_tree, predicates);
+  }
+
+  template <typename ExecutionSpace, typename Predicates, typename Callback,
+            typename... TrailingArgs>
+  void query(ExecutionSpace const &, Predicates const &, Callback const &,
+             TrailingArgs &&...) const
+  {
+    static_assert(Kokkos::is_execution_space<ExecutionSpace>::value, "");
+
+    throw std::runtime_error(
+        "Boost RTree does not support callback only query overload.");
+  }
+
+private:
+  BoostRTreeHelpers::RTree<Indexable> _tree;
+};
+
+#ifdef ARBORX_ENABLE_MPI
+template <typename Indexable>
+class ParallelRTree
+{
+public:
+  using DeviceType = Kokkos::DefaultHostExecutionSpace::device_type;
+  using memory_space = typename DeviceType::memory_space;
+
+  template <typename ExecutionSpace>
+  ParallelRTree(MPI_Comm comm, ExecutionSpace const &,
+                Kokkos::View<Indexable *, DeviceType> const &values)
+  {
+    static_assert(Kokkos::is_execution_space<ExecutionSpace>::value, "");
+
+    _tree = BoostRTreeHelpers::makeRTree(comm, values);
+  }
+
+  // WARNING trailing pack will match anything :/
+  template <typename ExecutionSpace, typename Predicates, typename InputView1,
+            typename InputView2, typename... TrailingArgs>
+  void query(ExecutionSpace const &, Predicates const &predicates,
+             InputView1 &indices, InputView2 &offset, TrailingArgs &&...) const
+  {
+    static_assert(Kokkos::is_execution_space<ExecutionSpace>::value, "");
+
+    std::tie(offset, indices) =
+        BoostRTreeHelpers::performQueries(_tree, predicates);
+  }
+
+private:
+  BoostRTreeHelpers::ParallelRTree<Indexable> _tree;
+};
+#endif
+
+} // namespace BoostExt
+
+namespace ArborX
+{
+// Specialization of ArborX::query
+template <typename Indexable, typename ExecutionSpace, typename Predicates,
+          typename InputView, typename... TrailingArgs>
+inline void query(BoostExt::RTree<Indexable> const &rtree,
+                  ExecutionSpace const &space, Predicates const &predicates,
+                  InputView &indices, InputView &offset,
+                  TrailingArgs &&... args)
+{
+  rtree.query(space, predicates, indices, offset,
+              std::forward<TrailingArgs>(args)...);
+}
+} // namespace ArborX
+
+#endif
diff --git a/arborx/test/ArborX_BoostRangeAdapters.hpp b/arborx/test/ArborX_BoostRangeAdapters.hpp
new file mode 100644
index 000000000..0832d336a
--- /dev/null
+++ b/arborx/test/ArborX_BoostRangeAdapters.hpp
@@ -0,0 +1,135 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#ifndef ARBORX_BOOST_RANGE_ADAPTERS_HPP
+#define ARBORX_BOOST_RANGE_ADAPTERS_HPP
+
+#include <ArborX_DetailsKokkosExtAccessibilityTraits.hpp>
+#include <ArborX_Exception.hpp>
+
+#include <Kokkos_Core.hpp>
+
+#include <boost/range.hpp>
+
+#include <type_traits> // is_same
+
+namespace boost
+{
+#define ARBORX_ASSERT_VIEW_COMPATIBLE(View)                                    \
+  using Traits = typename View::traits;                                        \
+  static_assert(Traits::rank == 1,                                             \
+                "Adaptor to Boost.Range only available for Views of rank 1");  \
+  static_assert(                                                               \
+      KokkosExt::is_accessible_from_host<View>::value,                         \
+      "Adaptor to Boost.Range only available when View memory space is "       \
+      "accessible from host");
+
+// Adapt Kokkos::View<T, P...> to Boost.Range
+template <typename T, typename... P>
+struct range_iterator<Kokkos::View<T, P...>>
+{
+  using View = Kokkos::View<T, P...>;
+  ARBORX_ASSERT_VIEW_COMPATIBLE(View)
+  using type = typename std::add_pointer<
+      typename Kokkos::ViewTraits<T, P...>::value_type>::type;
+};
+
+template <typename T, typename... P>
+struct range_const_iterator<Kokkos::View<T, P...>>
+{
+  using View = Kokkos::View<T, P...>;
+  ARBORX_ASSERT_VIEW_COMPATIBLE(View)
+  using type = typename std::add_pointer<
+      typename Kokkos::ViewTraits<T, P...>::const_value_type>::type;
+};
+
+template <typename T, typename... P>
+struct range_value<Kokkos::View<T, P...>>
+{
+  using View = Kokkos::View<T, P...>;
+  ARBORX_ASSERT_VIEW_COMPATIBLE(View)
+  using type = typename Kokkos::ViewTraits<T, P...>::value_type;
+};
+
+template <typename T, typename... P>
+struct range_reference<Kokkos::View<T, P...>>
+{
+  using View = Kokkos::View<T, P...>;
+  ARBORX_ASSERT_VIEW_COMPATIBLE(View)
+  using type = typename Kokkos::ViewTraits<T, P...>::reference_type;
+};
+
+template <typename T, typename... P>
+struct range_size<Kokkos::View<T, P...>>
+{
+  using View = Kokkos::View<T, P...>;
+  ARBORX_ASSERT_VIEW_COMPATIBLE(View)
+  using type = typename Kokkos::ViewTraits<T, P...>::size_type;
+};
+
+} // namespace boost
+
+namespace Kokkos
+{
+
+template <typename T, typename... P>
+inline typename boost::range_iterator<Kokkos::View<T, P...>>::type
+range_begin(Kokkos::View<T, P...> &v)
+{
+  using View = Kokkos::View<T, P...>;
+  ARBORX_ASSERT_VIEW_COMPATIBLE(View)
+  return v.data();
+}
+
+template <typename T, typename... P>
+inline typename boost::range_const_iterator<Kokkos::View<T, P...>>::type
+range_begin(Kokkos::View<T, P...> const &v)
+{
+  using View = Kokkos::View<T, P...>;
+  ARBORX_ASSERT_VIEW_COMPATIBLE(View)
+  return v.data();
+}
+
+template <typename T, typename... P>
+inline typename boost::range_iterator<Kokkos::View<T, P...>>::type
+range_end(Kokkos::View<T, P...> &v)
+{
+  using View = Kokkos::View<T, P...>;
+  ARBORX_ASSERT_VIEW_COMPATIBLE(View)
+  ARBORX_ASSERT(v.span_is_contiguous());
+  return v.data() + v.span();
+}
+
+template <typename T, typename... P>
+inline typename boost::range_const_iterator<Kokkos::View<T, P...>>::type
+range_end(Kokkos::View<T, P...> const &v)
+{
+  using View = Kokkos::View<T, P...>;
+  ARBORX_ASSERT_VIEW_COMPATIBLE(View)
+  ARBORX_ASSERT(v.span_is_contiguous());
+  return v.data() + v.span();
+}
+
+// optional
+template <typename T, typename... P>
+inline typename boost::range_size<Kokkos::View<T, P...>>::type
+range_calculate_size(Kokkos::View<T, P...> const &v)
+{
+  using View = Kokkos::View<T, P...>;
+  ARBORX_ASSERT_VIEW_COMPATIBLE(View)
+  return v.extent(0);
+}
+
+#undef ARBORX_ASSERT_VIEW_COMPATIBLE
+
+} // namespace Kokkos
+
+#endif
diff --git a/arborx/test/ArborX_EnableDeviceTypes.hpp.in b/arborx/test/ArborX_EnableDeviceTypes.hpp.in
new file mode 100644
index 000000000..8df99fa55
--- /dev/null
+++ b/arborx/test/ArborX_EnableDeviceTypes.hpp.in
@@ -0,0 +1,21 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#ifndef ARBORX_ENABLE_DEVICE_TYPES_HPP
+#define ARBORX_ENABLE_DEVICE_TYPES_HPP
+
+#include <Kokkos_Core.hpp>
+
+#include <tuple>
+
+using ARBORX_DEVICE_TYPES = std::tuple<@ARBORX_DEVICE_TYPES@>;
+
+#endif
diff --git a/arborx/test/ArborX_EnableViewComparison.hpp b/arborx/test/ArborX_EnableViewComparison.hpp
new file mode 100644
index 000000000..c7b8c1618
--- /dev/null
+++ b/arborx/test/ArborX_EnableViewComparison.hpp
@@ -0,0 +1,71 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#ifndef ARBORX_ENABLE_VIEW_COMPARISON_HPP
+#define ARBORX_ENABLE_VIEW_COMPARISON_HPP
+
+#include <ArborX_DetailsKokkosExtAccessibilityTraits.hpp> // is_accessible_from_host
+
+#include <Kokkos_Core.hpp>
+
+#include "BoostTest_CUDA_clang_workarounds.hpp"
+#include <boost/test/utils/is_forward_iterable.hpp>
+
+// Enable element-wise comparison for views that are accessible from the host
+namespace boost
+{
+namespace unit_test
+{
+
+template <typename T, typename... P>
+struct is_forward_iterable<Kokkos::View<T, P...>> : public boost::mpl::true_
+{
+  // NOTE Prefer static assertion to SFINAE because error message about no
+  // operator== for the operands is not as clear.
+  static_assert(
+      Kokkos::View<T, P...>::rank == 1 &&
+          KokkosExt::is_accessible_from_host<Kokkos::View<T, P...>>::value,
+      "Restricted to rank-one host-accessible views");
+};
+
+template <typename T, typename... P>
+struct bt_iterator_traits<Kokkos::View<T, P...>, true>
+{
+  using view_type = Kokkos::View<T, P...>;
+  using value_type = typename view_type::value_type;
+  using const_iterator =
+      typename std::add_pointer<typename view_type::const_value_type>::type;
+  static const_iterator begin(view_type const &v) { return v.data(); }
+  static const_iterator end(view_type const &v) { return v.data() + v.size(); }
+  static std::size_t size(view_type const &v) { return v.size(); }
+};
+
+template <typename T, size_t N, typename Proxy>
+struct is_forward_iterable<Kokkos::Array<T, N, Proxy>>
+    : public boost::mpl::true_
+{
+};
+
+template <typename T, size_t N, typename Proxy>
+struct bt_iterator_traits<Kokkos::Array<T, N, Proxy>, true>
+{
+  using array_type = Kokkos::Array<T, N, Proxy>;
+  using value_type = typename array_type::value_type;
+  using const_iterator = typename array_type::const_pointer;
+  static const_iterator begin(array_type const &v) { return v.data(); }
+  static const_iterator end(array_type const &v) { return v.data() + v.size(); }
+  static std::size_t size(array_type const &v) { return v.size(); }
+};
+
+} // namespace unit_test
+} // namespace boost
+
+#endif
diff --git a/arborx/test/BoostTest_CUDA_clang_workarounds.hpp b/arborx/test/BoostTest_CUDA_clang_workarounds.hpp
new file mode 100644
index 000000000..c9682b957
--- /dev/null
+++ b/arborx/test/BoostTest_CUDA_clang_workarounds.hpp
@@ -0,0 +1,24 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#ifndef BOOSTTEST_CUDA_CLANG_WORKAROUNDS_HPP
+#define BOOSTTEST_CUDA_CLANG_WORKAROUNDS_HPP
+
+#include <boost/fusion/adapted/std_tuple.hpp>
+#include <boost/fusion/include/std_tuple.hpp>
+#include <boost/type_traits/add_const.hpp>
+#include <boost/type_traits/add_pointer.hpp>
+
+#ifndef BOOST_STATIC_ASSERT
+#define BOOST_STATIC_ASSERT(m) static_assert(m, "");
+#endif
+
+#endif
diff --git a/arborx/test/CMakeLists.txt b/arborx/test/CMakeLists.txt
new file mode 100644
index 000000000..54bfd4208
--- /dev/null
+++ b/arborx/test/CMakeLists.txt
@@ -0,0 +1,186 @@
+
+set(ARBORX_DEVICE_TYPES)
+if(Kokkos_ENABLE_SERIAL)
+  list(APPEND ARBORX_DEVICE_TYPES Kokkos::Serial::device_type)
+endif()
+if(Kokkos_ENABLE_OPENMP)
+  list(APPEND ARBORX_DEVICE_TYPES Kokkos::OpenMP::device_type)
+endif()
+if(Kokkos_ENABLE_CUDA)
+  list(APPEND ARBORX_DEVICE_TYPES Kokkos::CudaSpace::device_type)
+endif()
+if(Kokkos_ENABLE_PTHREAD)
+  list(APPEND ARBORX_DEVICE_TYPES Kokkos::Threads::device_type)
+endif()
+if(Kokkos_ENABLE_HIP)
+  list(APPEND ARBORX_DEVICE_TYPES Kokkos::Experimental::HIPSpace::device_type)
+endif()
+if(Kokkos_ENABLE_OPENMPTARGET)
+  list(APPEND ARBORX_DEVICE_TYPES Kokkos::Experimental::OpenMPTarget::device_type)
+endif()
+if(Kokkos_ENABLE_SYCL)
+  list(APPEND ARBORX_DEVICE_TYPES Kokkos::Experimental::SYCL::device_type)
+endif()
+
+string(REPLACE ";" "," ARBORX_DEVICE_TYPES "${ARBORX_DEVICE_TYPES}")
+
+if(NOT ARBORX_DEVICE_TYPES)
+  message(SEND_ERROR "Kokkos_DEVICES must include at least one of 'SERIAL', 'OPENMP', 'CUDA', 'HIP', 'OPENMPTARGET', 'SYCL' or 'PTHREAD'!")
+endif()
+
+configure_file(ArborX_EnableDeviceTypes.hpp.in ${CMAKE_CURRENT_BINARY_DIR}/ArborX_EnableDeviceTypes.hpp @ONLY)
+
+find_package(Boost 1.67.0 REQUIRED COMPONENTS unit_test_framework)
+# CMake Boost version check is tricky due to multiple changes to the way Boost
+# package stores version information
+if(NOT DEFINED Boost_VERSION_MINOR)
+  set(Boost_VERSION_MINOR ${Boost_MINOR_VERSION})
+endif()
+if(Kokkos_ENABLE_CUDA AND Boost_VERSION VERSION_GREATER 1.68 AND Boost_VERSION VERSION_LESS 1.75)
+  message(WARNING "Boost versions 1.69 to 1.74 are known to yield build issues with NVCC")
+endif()
+
+# Compile only, nothing to run
+add_executable(ArborX_CompileOnly.exe
+  tstCompileOnlyAccessTraits.cpp
+  tstCompileOnlyCallbacks.cpp
+  tstCompileOnlyConcepts.cpp
+  tstCompileOnlyTypeRequirements.cpp
+  tstCompileOnlyMain.cpp
+)
+target_link_libraries(ArborX_CompileOnly.exe PRIVATE ArborX)
+
+add_executable(ArborX_DetailsUtils.exe tstDetailsUtils.cpp utf_main.cpp)
+# TODO link Boost::dynamic_linking interface target to enable dynamic linking
+# (adds BOOST_ALL_DYN_LINK)
+target_link_libraries(ArborX_DetailsUtils.exe PRIVATE ArborX Boost::unit_test_framework)
+target_compile_definitions(ArborX_DetailsUtils.exe PRIVATE BOOST_TEST_DYN_LINK)
+target_include_directories(ArborX_DetailsUtils.exe PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
+add_test(NAME ArborX_DetailsUtils_Test COMMAND ./ArborX_DetailsUtils.exe)
+
+add_executable(ArborX_Geometry.exe
+  tstDetailsAlgorithms.cpp
+  tstRay.cpp
+  tstKDOP.cpp
+)
+target_link_libraries(ArborX_Geometry.exe PRIVATE ArborX Boost::unit_test_framework)
+target_compile_definitions(ArborX_Geometry.exe PRIVATE BOOST_TEST_DYN_LINK)
+target_include_directories(ArborX_Geometry.exe PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
+add_test(NAME ArborX_Geometry_Test COMMAND ./ArborX_Geometry.exe)
+
+set(ARBORX_TEST_QUERY_TREE_SOURCES)
+foreach(_test Callbacks Degenerate ManufacturedSolution ComparisonWithBoost)
+  file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/tstQueryTree${_test}_BVH.cpp.tmp"
+    "#include <ArborX_LinearBVH.hpp>\n"
+    "#define ARBORX_TEST_TREE_TYPES Tuple<ArborX::BVH>\n"
+    "#define ARBORX_TEST_DEVICE_TYPES std::tuple<${ARBORX_DEVICE_TYPES}>\n"
+    "#include <tstQueryTree${_test}.cpp>\n"
+  )
+  configure_file(
+    "${CMAKE_CURRENT_BINARY_DIR}/tstQueryTree${_test}_BVH.cpp.tmp"
+    "${CMAKE_CURRENT_BINARY_DIR}/tstQueryTree${_test}_BVH.cpp" COPYONLY
+  )
+  list(APPEND ARBORX_TEST_QUERY_TREE_SOURCES "${CMAKE_CURRENT_BINARY_DIR}/tstQueryTree${_test}_BVH.cpp")
+  file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/tstQueryTree${_test}_BF.cpp.tmp"
+    "#include <ArborX_BruteForce.hpp>\n"
+    "#define ARBORX_TEST_TREE_TYPES Tuple<ArborX::BruteForce>\n"
+    "#define ARBORX_TEST_DEVICE_TYPES std::tuple<${ARBORX_DEVICE_TYPES}>\n"
+    "#define ARBORX_TEST_DISABLE_NEAREST_QUERY\n"
+    "#define ARBORX_TEST_DISABLE_CALLBACK_EARLY_EXIT\n"
+    "#include <tstQueryTree${_test}.cpp>\n"
+  )
+  configure_file(
+    "${CMAKE_CURRENT_BINARY_DIR}/tstQueryTree${_test}_BF.cpp.tmp"
+    "${CMAKE_CURRENT_BINARY_DIR}/tstQueryTree${_test}_BF.cpp" COPYONLY
+  )
+  list(APPEND ARBORX_TEST_QUERY_TREE_SOURCES "${CMAKE_CURRENT_BINARY_DIR}/tstQueryTree${_test}_BF.cpp")
+  foreach(_bounding_volume KDOP14 KDOP18) # purposefully ommitting KDOP6 and KDOP26 to reduce the number of instantiations
+    file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/tstQueryTree${_test}_BVH_${_bounding_volume}.cpp.tmp"
+      "#include <ArborX_LinearBVH.hpp>\n"
+      "#include <ArborX_KDOP.hpp>\n"
+      "using KDOP6 = ArborX::Experimental::KDOP<6>;\n"
+      "using KDOP14 = ArborX::Experimental::KDOP<14>;\n"
+      "using KDOP18 = ArborX::Experimental::KDOP<18>;\n"
+      "using KDOP26 = ArborX::Experimental::KDOP<26>;\n"
+      "template <class MemorySpace> using ArborX__BoundingVolumeHierarchy_${_bounding_volume} = ArborX::BasicBoundingVolumeHierarchy<MemorySpace, ${_bounding_volume}>;\n"
+      "#define ARBORX_TEST_TREE_TYPES Tuple<ArborX__BoundingVolumeHierarchy_${_bounding_volume}>\n"
+      "#define ARBORX_TEST_DEVICE_TYPES std::tuple<${ARBORX_DEVICE_TYPES}>\n"
+      "#define ARBORX_TEST_DISABLE_NEAREST_QUERY\n"
+      "#define ARBORX_TEST_DISABLE_SPATIAL_QUERY_INTERSECTS_SPHERE\n"
+      "#include <tstQueryTree${_test}.cpp>\n"
+    )
+    configure_file(
+      "${CMAKE_CURRENT_BINARY_DIR}/tstQueryTree${_test}_BVH_${_bounding_volume}.cpp.tmp"
+      "${CMAKE_CURRENT_BINARY_DIR}/tstQueryTree${_test}_BVH_${_bounding_volume}.cpp" COPYONLY
+    )
+    list(APPEND ARBORX_TEST_QUERY_TREE_SOURCES "${CMAKE_CURRENT_BINARY_DIR}/tstQueryTree${_test}_BVH_${_bounding_volume}.cpp")
+  endforeach()
+endforeach()
+add_executable(ArborX_QueryTree.exe
+  ${ARBORX_TEST_QUERY_TREE_SOURCES}
+  tstQueryTreeTraversalPolicy.cpp
+  tstQueryTreeIntersectsKDOP.cpp
+  tstKokkosToolsAnnotations.cpp
+  tstScopedProfileRegion.cpp
+  utf_main.cpp)
+target_link_libraries(ArborX_QueryTree.exe PRIVATE ArborX Boost::unit_test_framework)
+target_compile_definitions(ArborX_QueryTree.exe PRIVATE BOOST_TEST_DYN_LINK)
+target_include_directories(ArborX_QueryTree.exe PRIVATE ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
+add_test(NAME ArborX_QueryTree_Test COMMAND ./ArborX_QueryTree.exe)
+
+add_executable(ArborX_DetailsTreeConstruction.exe tstDetailsTreeConstruction.cpp utf_main.cpp)
+target_link_libraries(ArborX_DetailsTreeConstruction.exe PRIVATE ArborX Boost::unit_test_framework)
+target_compile_definitions(ArborX_DetailsTreeConstruction.exe PRIVATE BOOST_TEST_DYN_LINK)
+target_include_directories(ArborX_DetailsTreeConstruction.exe PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
+add_test(NAME ArborX_DetailsTreeConstruction_Test COMMAND ./ArborX_DetailsTreeConstruction.exe)
+
+add_executable(ArborX_DetailsContainers.exe
+  tstSequenceContainers.cpp
+  tstContainerAdaptors.cpp
+  tstHeapOperations.cpp
+  tstPriorityQueueMiscellaneous.cpp
+)
+target_link_libraries(ArborX_DetailsContainers.exe PRIVATE ArborX Boost::unit_test_framework)
+target_compile_definitions(ArborX_DetailsContainers.exe PRIVATE BOOST_TEST_DYN_LINK)
+add_test(NAME ArborX_DetailsContainers_Test COMMAND ./ArborX_DetailsContainers.exe)
+
+add_executable(ArborX_DetailsBatchedQueries.exe tstDetailsBatchedQueries.cpp utf_main.cpp)
+target_link_libraries(ArborX_DetailsBatchedQueries.exe PRIVATE ArborX Boost::unit_test_framework)
+target_compile_definitions(ArborX_DetailsBatchedQueries.exe PRIVATE BOOST_TEST_DYN_LINK)
+target_include_directories(ArborX_DetailsBatchedQueries.exe PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
+add_test(NAME ArborX_DetailsBatchedQueries_Test COMMAND ./ArborX_DetailsBatchedQueries.exe)
+
+add_executable(ArborX_DetailsCrsGraphWrapperImpl.exe tstDetailsCrsGraphWrapperImpl.cpp utf_main.cpp)
+target_link_libraries(ArborX_DetailsCrsGraphWrapperImpl.exe PRIVATE ArborX Boost::unit_test_framework)
+target_compile_definitions(ArborX_DetailsCrsGraphWrapperImpl.exe PRIVATE BOOST_TEST_DYN_LINK)
+target_include_directories(ArborX_DetailsCrsGraphWrapperImpl.exe PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
+add_test(NAME ArborX_DetailsCrsGraphWrapperImpl_Test COMMAND ./ArborX_DetailsCrsGraphWrapperImpl.exe)
+
+add_executable(ArborX_Clustering.exe tstDBSCAN.cpp utf_main.cpp)
+target_link_libraries(ArborX_Clustering.exe PRIVATE ArborX Boost::unit_test_framework)
+target_compile_definitions(ArborX_Clustering.exe PRIVATE BOOST_TEST_DYN_LINK)
+target_include_directories(ArborX_Clustering.exe PRIVATE ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}/examples/dbscan)
+add_test(NAME ArborX_Clustering_Test COMMAND ./ArborX_Clustering.exe)
+
+if(ARBORX_ENABLE_MPI)
+  add_executable(ArborX_DistributedTree.exe tstDistributedTree.cpp tstKokkosToolsDistributedAnnotations.cpp utf_main.cpp)
+  target_link_libraries(ArborX_DistributedTree.exe PRIVATE ArborX Boost::unit_test_framework)
+  target_compile_definitions(ArborX_DistributedTree.exe PRIVATE BOOST_TEST_DYN_LINK ARBORX_MPI_UNIT_TEST)
+  target_include_directories(ArborX_DistributedTree.exe PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
+  add_test(NAME ArborX_DistributedTree_Test COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} ./ArborX_DistributedTree.exe ${MPIEXEC_POSTFLAGS})
+
+  add_executable(ArborX_DetailsDistributedTreeImpl.exe tstDetailsDistributedTreeImpl.cpp utf_main.cpp)
+  target_link_libraries(ArborX_DetailsDistributedTreeImpl.exe PRIVATE ArborX Boost::unit_test_framework)
+  target_compile_definitions(ArborX_DetailsDistributedTreeImpl.exe PRIVATE BOOST_TEST_DYN_LINK ARBORX_MPI_UNIT_TEST)
+  target_include_directories(ArborX_DetailsDistributedTreeImpl.exe PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
+  add_test(NAME ArborX_DetailsDistributedTreeImpl_Test COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} ./ArborX_DetailsDistributedTreeImpl.exe ${MPIEXEC_POSTFLAGS})
+endif()
+
+add_executable(ArborX_BoostAdapters.exe tstBoostGeometryAdapters.cpp tstBoostRangeAdapters.cpp utf_main.cpp)
+target_link_libraries(ArborX_BoostAdapters.exe PRIVATE ArborX Boost::unit_test_framework)
+target_compile_definitions(ArborX_BoostAdapters.exe PRIVATE BOOST_TEST_DYN_LINK)
+add_test(NAME ArborX_BoostAdapters_Test COMMAND ./ArborX_BoostAdapters.exe)
+
+if(ARBORX_ENABLE_HEADER_SELF_CONTAINMENT_TESTS)
+  add_subdirectory(headers_self_contained)
+endif()
diff --git a/arborx/test/Search_UnitTestHelpers.hpp b/arborx/test/Search_UnitTestHelpers.hpp
new file mode 100644
index 000000000..aad452c0c
--- /dev/null
+++ b/arborx/test/Search_UnitTestHelpers.hpp
@@ -0,0 +1,276 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#ifndef ARBORX_SEARCH_TEST_HELPERS_HPP
+#define ARBORX_SEARCH_TEST_HELPERS_HPP
+
+// clang-format off
+#include "boost_ext/KokkosPairComparison.hpp"
+#include "boost_ext/TupleComparison.hpp"
+#include "boost_ext/CompressedStorageComparison.hpp"
+// clang-format on
+
+#include "ArborX_EnableViewComparison.hpp"
+#ifdef ARBORX_ENABLE_MPI
+#include "ArborX_BoostRTreeHelpers.hpp"
+#include <ArborX_DistributedTree.hpp>
+#endif
+
+#include <boost/test/unit_test.hpp>
+
+#include <iostream>
+#include <utility>
+#include <vector>
+
+template <typename T>
+struct is_distributed : std::false_type
+{
+};
+
+#ifdef ARBORX_ENABLE_MPI
+template <typename D>
+struct is_distributed<ArborX::DistributedTree<D>> : std::true_type
+{
+};
+
+template <typename I>
+struct is_distributed<BoostExt::ParallelRTree<I>> : std::true_type
+{
+};
+#endif
+
+template <typename T>
+auto make_reference_solution(std::vector<T> const &values,
+                             std::vector<int> const &offsets)
+{
+  return make_compressed_storage(offsets, values);
+}
+
+#ifdef ARBORX_ENABLE_MPI
+// FIXME This is a temporary workaround until we reconcile interfaces of
+// DistributedTree and BVH
+template <typename ExecutionSpace, typename MemorySpace, typename Queries,
+          typename Values, typename Offsets>
+void query(ArborX::DistributedTree<MemorySpace> const &tree,
+           ExecutionSpace const &space, Queries const &queries,
+           Values const &values, Offsets const &offsets)
+{
+  tree.query(space, queries, values, offsets);
+}
+#endif
+
+template <typename ExecutionSpace, typename Tree, typename Queries>
+auto query(ExecutionSpace const &exec_space, Tree const &tree,
+           Queries const &queries)
+{
+  using memory_space = typename Tree::memory_space;
+  using value_type =
+      std::conditional_t<is_distributed<Tree>{}, Kokkos::pair<int, int>, int>;
+  Kokkos::View<value_type *, memory_space> values("Testing::values", 0);
+  Kokkos::View<int *, memory_space> offsets("Testing::offsets", 0);
+  tree.query(exec_space, queries, values, offsets);
+  return make_compressed_storage(
+      Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace{}, offsets),
+      Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace{}, values));
+}
+
+#define ARBORX_TEST_QUERY_TREE(exec_space, tree, queries, reference)           \
+  BOOST_TEST(query(exec_space, tree, queries) == (reference),                  \
+             boost::test_tools::per_element());
+
+template <typename ValueType, typename ExecutionSpace, typename Tree,
+          typename Queries, typename Callback>
+auto query(ExecutionSpace const &exec_space, Tree const &tree,
+           Queries const &queries, Callback const &callback)
+{
+  using memory_space = typename Tree::memory_space;
+  Kokkos::View<ValueType *, memory_space> values("Testing::values", 0);
+  Kokkos::View<int *, memory_space> offsets("Testing::offsets", 0);
+  tree.query(exec_space, queries, callback, values, offsets);
+  return make_compressed_storage(
+      Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace{}, offsets),
+      Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace{}, values));
+}
+
+#define ARBORX_TEST_QUERY_TREE_CALLBACK(exec_space, tree, queries, callback,   \
+                                        reference)                             \
+  using value_type = typename decltype(reference)::value_type;                 \
+  BOOST_TEST(query<value_type>(exec_space, tree, queries, callback) ==         \
+                 (reference),                                                  \
+             boost::test_tools::per_element());
+
+// Workaround for NVCC that complains that the enclosing parent function
+// (query_with_distance) for an extended __host__ __device__ lambda must not
+// have deduced return type
+template <typename DeviceType, typename ExecutionSpace>
+Kokkos::View<Kokkos::pair<Kokkos::pair<int, int>, float> *, DeviceType>
+zip(ExecutionSpace const &space, Kokkos::View<int *, DeviceType> indices,
+    Kokkos::View<int *, DeviceType> ranks,
+    Kokkos::View<float *, DeviceType> distances)
+{
+  auto const n = indices.extent(0);
+  Kokkos::View<Kokkos::pair<Kokkos::pair<int, int>, float> *, DeviceType>
+      values(Kokkos::view_alloc(Kokkos::WithoutInitializing, "Testing::values"),
+             n);
+  Kokkos::parallel_for("ArborX:UnitTestSupport:zip",
+                       Kokkos::RangePolicy<ExecutionSpace>(space, 0, n),
+                       KOKKOS_LAMBDA(int i) {
+                         values(i) = {{indices(i), ranks(i)}, distances(i)};
+                       });
+  return values;
+}
+
+#ifdef ARBORX_ENABLE_MPI
+template <typename ExecutionSpace, typename Tree, typename Queries>
+auto query_with_distance(ExecutionSpace const &exec_space, Tree const &tree,
+                         Queries const &queries,
+                         std::enable_if_t<is_distributed<Tree>{}> * = nullptr)
+{
+  using MemorySpace = typename Tree::memory_space;
+  using DeviceType = Kokkos::Device<ExecutionSpace, MemorySpace>;
+
+  Kokkos::View<int *, MemorySpace> offsets("Testing::offsets", 0);
+  Kokkos::View<int *, MemorySpace> indices("Testing::indices", 0);
+  Kokkos::View<int *, MemorySpace> ranks("Testing::ranks", 0);
+  Kokkos::View<float *, MemorySpace> distances("Testing::distances", 0);
+  ArborX::Details::DistributedTreeImpl<DeviceType>::queryDispatchImpl(
+      ArborX::Details::NearestPredicateTag{}, tree, exec_space, queries,
+      indices, offsets, ranks, &distances);
+
+  auto values = zip(exec_space, indices, ranks, distances);
+
+  return make_compressed_storage(
+      Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace{}, offsets),
+      Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace{}, values));
+}
+#endif
+
+#define ARBORX_TEST_QUERY_TREE_WITH_DISTANCE(exec_space, tree, queries,        \
+                                             reference)                        \
+  BOOST_TEST(query_with_distance(exec_space, tree, queries) == (reference),    \
+             boost::test_tools::per_element());
+
+template <typename Tree, typename ExecutionSpace>
+auto make(ExecutionSpace const &exec_space, std::vector<ArborX::Box> const &b)
+{
+  int const n = b.size();
+  Kokkos::View<ArborX::Box *, typename Tree::memory_space> boxes(
+      "Testing::boxes", n);
+  auto boxes_host = Kokkos::create_mirror_view(boxes);
+  for (int i = 0; i < n; ++i)
+    boxes_host(i) = b[i];
+  Kokkos::deep_copy(boxes, boxes_host);
+  return Tree(exec_space, boxes);
+}
+
+#ifdef ARBORX_ENABLE_MPI
+template <typename DeviceType>
+ArborX::DistributedTree<typename DeviceType::memory_space>
+makeDistributedTree(MPI_Comm comm, std::vector<ArborX::Box> const &b)
+{
+  using ExecutionSpace = typename DeviceType::execution_space;
+
+  int const n = b.size();
+  Kokkos::View<ArborX::Box *, DeviceType> boxes("Testing::boxes", n);
+  auto boxes_host = Kokkos::create_mirror_view(boxes);
+  for (int i = 0; i < n; ++i)
+    boxes_host(i) = b[i];
+  Kokkos::deep_copy(boxes, boxes_host);
+
+  return ArborX::DistributedTree<typename DeviceType::memory_space>(
+      comm, ExecutionSpace{}, boxes);
+}
+#endif
+
+template <typename DeviceType>
+auto makeIntersectsBoxQueries(std::vector<ArborX::Box> const &boxes)
+{
+  int const n = boxes.size();
+  Kokkos::View<decltype(ArborX::intersects(ArborX::Box{})) *, DeviceType>
+      queries("Testing::intersecting_with_box_predicates", n);
+  auto queries_host = Kokkos::create_mirror_view(queries);
+  for (int i = 0; i < n; ++i)
+    queries_host(i) = ArborX::intersects(boxes[i]);
+  Kokkos::deep_copy(queries, queries_host);
+  return queries;
+}
+
+template <typename DeviceType, typename Data>
+auto makeIntersectsBoxWithAttachmentQueries(
+    std::vector<ArborX::Box> const &boxes, std::vector<Data> const &data)
+{
+  int const n = boxes.size();
+  Kokkos::View<decltype(
+                   ArborX::attach(ArborX::intersects(ArborX::Box{}), Data{})) *,
+               DeviceType>
+      queries("Testing::intersecting_with_box_with_attachment_predicates", n);
+  auto queries_host = Kokkos::create_mirror_view(queries);
+  for (int i = 0; i < n; ++i)
+    queries_host(i) = ArborX::attach(ArborX::intersects(boxes[i]), data[i]);
+  Kokkos::deep_copy(queries, queries_host);
+  return queries;
+}
+
+template <typename DeviceType>
+auto makeNearestQueries(
+    std::vector<std::pair<ArborX::Point, int>> const &points)
+{
+  // NOTE: `points` is not a very descriptive name here. It stores both the
+  // actual point and the number k of neighbors to query for.
+  int const n = points.size();
+  Kokkos::View<ArborX::Nearest<ArborX::Point> *, DeviceType> queries(
+      "Testing::nearest_queries", n);
+  auto queries_host = Kokkos::create_mirror_view(queries);
+  for (int i = 0; i < n; ++i)
+    queries_host(i) = ArborX::nearest(points[i].first, points[i].second);
+  Kokkos::deep_copy(queries, queries_host);
+  return queries;
+}
+
+template <typename DeviceType, typename Data>
+auto makeNearestWithAttachmentQueries(
+    std::vector<std::pair<ArborX::Point, int>> const &points,
+    std::vector<Data> const &data)
+{
+  // NOTE: `points` is not a very descriptive name here. It stores both the
+  // actual point and the number k of neighbors to query for.
+  int const n = points.size();
+  Kokkos::View<decltype(
+                   ArborX::attach(ArborX::Nearest<ArborX::Point>{}, Data{})) *,
+               DeviceType>
+      queries("Testing::nearest_queries", n);
+  auto queries_host = Kokkos::create_mirror_view(queries);
+  for (int i = 0; i < n; ++i)
+    queries_host(i) = ArborX::attach(
+        ArborX::nearest(points[i].first, points[i].second), data[i]);
+  Kokkos::deep_copy(queries, queries_host);
+  return queries;
+}
+
+template <typename DeviceType>
+Kokkos::View<decltype(ArborX::intersects(ArborX::Sphere{})) *, DeviceType>
+makeIntersectsSphereQueries(
+    std::vector<std::pair<ArborX::Point, float>> const &points)
+{
+  // NOTE: `points` is not a very descriptive name here. It stores both the
+  // actual point and the radius for the search around that point.
+  int const n = points.size();
+  Kokkos::View<decltype(ArborX::intersects(ArborX::Sphere{})) *, DeviceType>
+      queries("Testing::intersecting_with_sphere_predicates", n);
+  auto queries_host = Kokkos::create_mirror_view(queries);
+  for (int i = 0; i < n; ++i)
+    queries_host(i) =
+        ArborX::intersects(ArborX::Sphere{points[i].first, points[i].second});
+  Kokkos::deep_copy(queries, queries_host);
+  return queries;
+}
+
+#endif
diff --git a/arborx/test/boost_ext/CompressedStorageComparison.hpp b/arborx/test/boost_ext/CompressedStorageComparison.hpp
new file mode 100644
index 000000000..10e11a3c9
--- /dev/null
+++ b/arborx/test/boost_ext/CompressedStorageComparison.hpp
@@ -0,0 +1,110 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#ifndef ARBORX_BOOST_TEST_COMPRESSED_STORAGE_COMPARISON_HPP
+#define ARBORX_BOOST_TEST_COMPRESSED_STORAGE_COMPARISON_HPP
+
+#include <boost/test/tools/detail/print_helper.hpp>
+
+#include <iosfwd>
+#include <set>
+
+template <typename Offsets, typename Values>
+struct CompressedStorage
+{
+  Offsets offsets;
+  Values values;
+  using value_type = typename Values::value_type;
+  using index_type = typename Offsets::value_type;
+  struct ConstForwardIterator
+  {
+    index_type i;
+    CompressedStorage const *p;
+    using value_type = std::multiset<CompressedStorage::value_type>;
+    ConstForwardIterator &operator++()
+    {
+      ++i;
+      return *this;
+    }
+    ConstForwardIterator operator++(int)
+    {
+      ConstForwardIterator old{*this};
+      ++*this;
+      return old;
+    };
+    ConstForwardIterator operator==(ConstForwardIterator const &o)
+    {
+      return i == o.i;
+    }
+    ConstForwardIterator operator!=(ConstForwardIterator const &o)
+    {
+      return !(*this == o);
+    }
+    value_type operator*()
+    {
+      return {p->values.data() + p->offsets[i],
+              p->values.data() + p->offsets[i + 1]};
+    }
+  };
+  ConstForwardIterator cbegin() const { return {0, this}; }
+  ConstForwardIterator cend() const { return {offsets.size(), this}; }
+  std::size_t size() const { return offsets.size() - 1; }
+};
+
+template <typename Offsets, typename Values>
+CompressedStorage<std::decay_t<Offsets>, std::decay_t<Values>>
+make_compressed_storage(Offsets &&offsets, Values &&values)
+{
+  return {std::forward<Offsets>(offsets), std::forward<Values>(values)};
+}
+
+namespace boost
+{
+namespace unit_test
+{
+template <typename Offsets, typename Values>
+struct is_forward_iterable<CompressedStorage<Offsets, Values>>
+    : public boost::mpl::true_
+{
+};
+template <typename Offsets, typename Values>
+struct bt_iterator_traits<CompressedStorage<Offsets, Values>, true>
+{
+  using this_type = CompressedStorage<Offsets, Values>;
+  using const_iterator = typename this_type::ConstForwardIterator;
+  using value_type = typename const_iterator::value_type;
+  static const_iterator begin(this_type const &x) { return x.cbegin(); }
+  static const_iterator end(this_type const &x) { return x.cend(); }
+  static std::size_t size(this_type const &x) { return x.size(); }
+};
+} // namespace unit_test
+} // namespace boost
+
+// Customization for logging with Boost.Test
+namespace std
+{
+template <typename Key, typename Compare, typename Allocator>
+std::ostream &
+boost_test_print_type(std::ostream &os,
+                      std::multiset<Key, Compare, Allocator> const &s)
+{
+  os << '(';
+  for (auto const &x : s)
+  {
+    os << ' ';
+    boost::test_tools::tt_detail::print_log_value<Key>()(os, x);
+  }
+  os << " )";
+  return os;
+}
+} // namespace std
+
+#endif
diff --git a/arborx/test/boost_ext/KokkosPairComparison.hpp b/arborx/test/boost_ext/KokkosPairComparison.hpp
new file mode 100644
index 000000000..43e1be6cb
--- /dev/null
+++ b/arborx/test/boost_ext/KokkosPairComparison.hpp
@@ -0,0 +1,46 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#ifndef ARBORX_BOOST_TEST_KOKKOS_PAIR_COMPARISON_HPP
+#define ARBORX_BOOST_TEST_KOKKOS_PAIR_COMPARISON_HPP
+
+#include <Kokkos_Pair.hpp>
+
+#include <boost/test/tools/detail/print_helper.hpp>
+
+#include <iostream>
+
+// Enable comparison of Kokkos pairs
+namespace boost
+{
+namespace test_tools
+{
+namespace tt_detail
+{
+
+// FIXME needed for TuplePrinter
+template <typename T1, typename T2>
+std::ostream &operator<<(std::ostream &os, Kokkos::pair<T1, T2> const &p)
+{
+  os << '(' << p.first << ',' << p.second << ')';
+  return os;
+}
+
+template <typename T1, typename T2>
+struct print_log_value<Kokkos::pair<T1, T2>>
+{
+  void operator()(std::ostream &os, Kokkos::pair<T1, T2> const &p) { os << p; }
+};
+} // namespace tt_detail
+} // namespace test_tools
+} // namespace boost
+
+#endif
diff --git a/arborx/test/boost_ext/TupleComparison.hpp b/arborx/test/boost_ext/TupleComparison.hpp
new file mode 100644
index 000000000..74424d850
--- /dev/null
+++ b/arborx/test/boost_ext/TupleComparison.hpp
@@ -0,0 +1,62 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#ifndef ARBORX_BOOST_TEST_TUPLE_COMPARISON_HPP
+#define ARBORX_BOOST_TEST_TUPLE_COMPARISON_HPP
+
+#include <boost/test/tools/detail/print_helper.hpp>
+
+#include <iostream>
+#include <tuple>
+
+// Enable comparison of tuples
+namespace boost
+{
+namespace test_tools
+{
+namespace tt_detail
+{
+namespace cppreference
+{
+// helper function to print a tuple of any size
+// adapted from https://en.cppreference.com/w/cpp/utility/tuple/tuple_cat
+template <class Tuple, std::size_t N>
+struct TuplePrinter
+{
+  static void print(std::ostream &os, Tuple const &t)
+  {
+    TuplePrinter<Tuple, N - 1>::print(os, t);
+    os << ", " << std::get<N - 1>(t);
+  }
+};
+
+template <class Tuple>
+struct TuplePrinter<Tuple, 1>
+{
+  static void print(std::ostream &os, Tuple const &t) { os << std::get<0>(t); }
+};
+} // namespace cppreference
+
+template <typename... Args>
+struct print_log_value<std::tuple<Args...>>
+{
+  void operator()(std::ostream &os, std::tuple<Args...> const &t)
+  {
+    os << '(';
+    cppreference::TuplePrinter<decltype(t), sizeof...(Args)>::print(os, t);
+    os << ')';
+  }
+};
+} // namespace tt_detail
+} // namespace test_tools
+} // namespace boost
+
+#endif
diff --git a/arborx/test/headers_self_contained/CMakeLists.txt b/arborx/test/headers_self_contained/CMakeLists.txt
new file mode 100644
index 000000000..7c3a1a7e6
--- /dev/null
+++ b/arborx/test/headers_self_contained/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Create tests that contain each header separately. We do not  run these tests
+# but we just try to compile them.
+foreach (_header ${ArborX_HEADERS})
+  if(NOT ARBORX_ENABLE_MPI AND _header IN_LIST ArborX_HEADERS_MUST_ENABLE_MPI)
+    continue()
+  endif()
+  string(REGEX REPLACE "[\./]" "_" header_test_name ${_header})
+  set(header_test_name ArborX_HeaderSelfContained_${header_test_name})
+  add_executable(${header_test_name} tstHeader.cpp)
+  if(_header IN_LIST ArborX_HEADERS_MUST_INCLUDE_CONFIG_HPP)
+    target_compile_definitions(${header_test_name} PRIVATE ARBORX_HEADER_MUST_INCLUDE_CONFIG_HPP)
+  endif()
+  target_link_libraries(${header_test_name} PRIVATE ArborX)
+  target_compile_definitions(${header_test_name} PRIVATE ARBORX_HEADER_TEST_NAME=${_header})
+endforeach()
diff --git a/arborx/test/headers_self_contained/tstHeader.cpp b/arborx/test/headers_self_contained/tstHeader.cpp
new file mode 100644
index 000000000..5a45b6eca
--- /dev/null
+++ b/arborx/test/headers_self_contained/tstHeader.cpp
@@ -0,0 +1,27 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#define ARBORX_HEADER_TEST_STRINGIZE_IMPL(x) #x
+#define ARBORX_HEADER_TEST_STRINGIZE(x) ARBORX_HEADER_TEST_STRINGIZE_IMPL(x)
+
+#define ARBORX_HEADER_TO_TEST                                                  \
+  ARBORX_HEADER_TEST_STRINGIZE(ARBORX_HEADER_TEST_NAME)
+
+// include header twice to see if the include guards are set correctly
+#include ARBORX_HEADER_TO_TEST
+#include ARBORX_HEADER_TO_TEST
+
+#if defined(ARBORX_HEADER_MUST_INCLUDE_CONFIG_HPP) &&                          \
+    !defined(ARBORX_CONFIG_HPP)
+#error "This header does not include ArborX_Config.hpp"
+#endif
+
+int main() { return 0; }
diff --git a/arborx/test/tstBoostGeometryAdapters.cpp b/arborx/test/tstBoostGeometryAdapters.cpp
new file mode 100644
index 000000000..a8f962241
--- /dev/null
+++ b/arborx/test/tstBoostGeometryAdapters.cpp
@@ -0,0 +1,241 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#include "ArborX_BoostGeometryAdapters.hpp"
+#include <ArborX_DetailsAlgorithms.hpp>
+
+#include <boost/test/unit_test.hpp>
+
+#define BOOST_TEST_MODULE BoostGeometryAdapters
+
+namespace bg = boost::geometry;
+namespace details = ArborX::Details;
+// Conveniently importing Point and Box in ArborX::Details:: namespace
+// and declaring type aliases within boost::geometry:: so that we are able to
+// just use details:: and bg:: to specify what geometry or algorithm we mean.
+namespace ArborX
+{
+namespace Details
+{
+using ArborX::Box;
+using ArborX::Point;
+} // namespace Details
+} // namespace ArborX
+namespace boost
+{
+namespace geometry
+{
+using Point = model::point<float, 3, cs::cartesian>;
+using Box = model::box<Point>;
+} // namespace geometry
+} // namespace boost
+
+BOOST_AUTO_TEST_CASE(equals)
+{
+  details::Point point = {{1., 2., 3.}};
+  BOOST_TEST(details::equals(point, {{1., 2., 3.}}));
+  BOOST_TEST(!details::equals(point, {{0., 0., 0.}}));
+  BOOST_TEST(bg::equals(point, bg::make<details::Point>(1., 2., 3.)));
+  BOOST_TEST(!bg::equals(point, bg::make<details::Point>(4., 5., 6.)));
+  BOOST_TEST(bg::equals(point, bg::make<bg::Point>(1., 2., 3.)));
+  BOOST_TEST(!bg::equals(point, bg::make<bg::Point>(0., 0., 0.)));
+
+  details::Box box = {{{1., 2., 3.}}, {{4., 5., 6.}}};
+  BOOST_TEST(details::equals(box, {{{1., 2., 3.}}, {{4., 5., 6.}}}));
+  BOOST_TEST(!details::equals(box, {{{0., 0., 0.}}, {{1., 1., 1.}}}));
+  BOOST_TEST(bg::equals(box, details::Box{{{1., 2., 3.}}, {{4., 5., 6.}}}));
+  BOOST_TEST(!bg::equals(box, details::Box{{{0., 0., 0.}}, {{1., 1., 1.}}}));
+  BOOST_TEST(bg::equals(box, bg::Box(bg::make<bg::Point>(1., 2., 3.),
+                                     bg::make<bg::Point>(4., 5., 6.))));
+  BOOST_TEST(!bg::equals(box, bg::Box(bg::make<bg::Point>(0., 0., 0.),
+                                      bg::make<bg::Point>(1., 1., 1.))));
+  // Now just for fun compare the ArborX box to a Boost.Geometry box composed
+  // of ArborX points.
+  BOOST_TEST(bg::equals(
+      box, bg::model::box<details::Point>({{1., 2., 3.}}, {{4., 5., 6.}})));
+  BOOST_TEST(!bg::equals(
+      box, bg::model::box<details::Point>({{0., 0., 0.}}, {{0., 0., 0.}})));
+}
+
+BOOST_AUTO_TEST_CASE(distance)
+{
+  // NOTE unsure if should test for floating point equality here
+  details::Point a = {{0., 0., 0.}};
+  details::Point b = {{0., 1., 0.}};
+  BOOST_TEST(details::distance(a, b) == 1.);
+  BOOST_TEST(bg::distance(a, b) == 1.);
+
+  std::tie(a, b) = std::make_pair<details::Point, details::Point>(
+      {{0., 0., 0.}}, {{1., 1., 1.}});
+  BOOST_TEST(details::distance(a, b) == std::sqrt(3.f));
+  BOOST_TEST(bg::distance(a, b) == std::sqrt(3.0));
+
+  BOOST_TEST(details::distance(a, a) == 0.);
+  BOOST_TEST(bg::distance(a, a) == 0.);
+
+  details::Box unit_box = {{{0., 0., 0.}}, {{1., 1., 1.}}};
+  details::Point p = {{.5, .5, .5}};
+  // NOTE ArborX has no overload distance( Box, Point )
+  BOOST_TEST(details::distance(p, unit_box) == 0.);
+  // BOOST_TEST( details::distance( unit_box, p ) == 0. );
+  BOOST_TEST(bg::distance(p, unit_box) == 0.);
+  BOOST_TEST(bg::distance(unit_box, p) == 0.);
+
+  p = {{-1., -1., -1.}};
+  BOOST_TEST(details::distance(p, unit_box) == std::sqrt(3.f));
+  BOOST_TEST(bg::distance(p, unit_box) == std::sqrt(3.0));
+
+  p = {{-1., .5, -1.}};
+  BOOST_TEST(details::distance(p, unit_box) == std::sqrt(2.f));
+  BOOST_TEST(bg::distance(p, unit_box) == std::sqrt(2.0));
+
+  p = {{-1., .5, .5}};
+  BOOST_TEST(details::distance(p, unit_box) == 1.);
+  BOOST_TEST(bg::distance(p, unit_box) == 1.);
+}
+
+BOOST_AUTO_TEST_CASE(expand)
+{
+  using details::equals;
+  details::Box box;
+  // NOTE even though not considered valid, default constructed ArborX box can
+  // be expanded using Boost.Geometry algorithm.
+  BOOST_TEST(!bg::is_valid(box));
+  bg::expand(box, details::Point{{0., 0., 0.}});
+  details::expand(box, {{1., 1., 1.}});
+  BOOST_TEST(equals(box, {{{0., 0., 0.}}, {{1., 1., 1.}}}));
+  bg::expand(box, details::Box{{{1., 2., 3.}}, {{4., 5., 6.}}});
+  details::expand(box, {{{-1., -2., -3.}}, {{0., 0., 0.}}});
+  BOOST_TEST(equals(box, {{{-1., -2., -3.}}, {{4., 5., 6.}}}));
+}
+
+BOOST_AUTO_TEST_CASE(centroid)
+{
+  using details::equals;
+
+  // Interestingly enough, even though for Boost.Geometry, the ArborX default
+  // constructed "empty" box is not valid, it will still calculate its
+  // centroid.  Admittedly, the result (centroid at origin) is garbage :)
+  details::Box empty_box = {};
+  BOOST_TEST(!bg::is_valid(empty_box));
+  BOOST_TEST(
+      equals(bg::return_centroid<details::Point>(empty_box), {{0., 0., 0.}}));
+  BOOST_TEST(equals(details::returnCentroid(empty_box), {{0., 0., 0.}}));
+
+  details::Box unit_box = {{{0., 0., 0.}}, {{1., 1., 1.}}};
+  BOOST_TEST(
+      equals(bg::return_centroid<details::Point>(unit_box), {{.5, .5, .5}}));
+  BOOST_TEST(equals(details::returnCentroid(unit_box), {{.5, .5, .5}}));
+
+  details::Point a_point = {{1., 2., 3.}};
+  BOOST_TEST(equals(bg::return_centroid<details::Point>(a_point), a_point));
+  BOOST_TEST(equals(details::returnCentroid(a_point), a_point));
+}
+
+BOOST_AUTO_TEST_CASE(is_valid)
+{
+  details::Box empty_box = {};
+  BOOST_TEST(!details::isValid(empty_box));
+  std::string message;
+  BOOST_TEST(!bg::is_valid(empty_box, message));
+  BOOST_TEST(message == "Box has corners in wrong order");
+
+  details::Box a_box = {{{0., 0., 0.}}, {{0., 0., 0.}}};
+  BOOST_TEST(!details::isValid(a_box));
+  BOOST_TEST(!bg::is_valid(a_box, message));
+  BOOST_TEST(message == "Geometry has wrong topological dimension");
+
+  details::Box unit_box = {{{0., 0., 0.}}, {{1., 1., 1.}}};
+  BOOST_TEST(details::isValid(unit_box));
+  BOOST_TEST(bg::is_valid(unit_box));
+
+  details::Box invalid_box = {{{1., 2., 3.}}, {{4., NAN, 6.}}};
+  BOOST_TEST(!details::isValid(invalid_box));
+  BOOST_TEST(!bg::is_valid(invalid_box, message));
+  BOOST_TEST(message == "Geometry has point(s) with invalid coordinate(s)");
+
+  details::Box other_invalid_box = {{{1., 5., 3.}}, {{4., 3., 6.}}};
+  BOOST_TEST(!details::isValid(other_invalid_box));
+  BOOST_TEST(!bg::is_valid(other_invalid_box, message));
+  BOOST_TEST(message == "Box has corners in wrong order");
+
+  auto const infty = std::numeric_limits<double>::infinity();
+  other_invalid_box = {{{1., 5., 3.}}, {{infty, 3., 6.}}};
+  BOOST_TEST(!details::isValid(other_invalid_box));
+  BOOST_TEST(!bg::is_valid(other_invalid_box, message));
+  BOOST_TEST(message == "Geometry has point(s) with invalid coordinate(s)");
+
+  other_invalid_box = {{{1., 5., infty}}, {{4., 3., 6.}}};
+  BOOST_TEST(!details::isValid(other_invalid_box));
+  BOOST_TEST(!bg::is_valid(other_invalid_box, message));
+  BOOST_TEST(message == "Geometry has point(s) with invalid coordinate(s)");
+
+  details::Point a_point = {{1., 2., 3.}};
+  BOOST_TEST(details::isValid(a_point));
+  BOOST_TEST(bg::is_valid(a_point));
+
+  details::Point invalid_point = {{infty, 1.41, 3.14}};
+  BOOST_TEST(!details::isValid(invalid_point));
+  BOOST_TEST(!bg::is_valid(invalid_point, message));
+  BOOST_TEST(message == "Geometry has point(s) with invalid coordinate(s)");
+
+  // Also Boost.Geometry has a is_empty() algorithm but it has a different
+  // meaning, it checks whether a geometry is an empty set and always returns
+  // false for a point or a box.
+  BOOST_TEST(!bg::is_empty(empty_box));
+  BOOST_TEST(!bg::is_empty(a_box));
+  BOOST_TEST(!bg::is_empty(unit_box));
+  BOOST_TEST(!bg::is_empty(a_point));
+}
+
+BOOST_AUTO_TEST_CASE(intersects)
+{
+  details::Box const unit_box = {{{0., 0., 0.}}, {{1., 1., 1.}}};
+
+  // self-intersection
+  BOOST_TEST(details::intersects(unit_box, unit_box));
+  BOOST_TEST(bg::intersects(unit_box, unit_box));
+
+  // share a corner
+  details::Box other_box = {{{1., 1., 1.}}, {{2., 2., 2.}}};
+  BOOST_TEST(details::intersects(unit_box, other_box));
+  BOOST_TEST(bg::intersects(unit_box, other_box));
+
+  // share an edge
+  other_box = {{{1., 0., 1.}}, {{2., 1., 2.}}};
+  BOOST_TEST(details::intersects(unit_box, other_box));
+  BOOST_TEST(bg::intersects(unit_box, other_box));
+
+  // share a face
+  other_box = {{{0., -1., 0.}}, {{1., 0., 1.}}};
+  BOOST_TEST(details::intersects(unit_box, other_box));
+  BOOST_TEST(bg::intersects(unit_box, other_box));
+
+  // contains the other box
+  other_box = {{{.3, .3, .3}}, {{.6, .6, .6}}};
+  BOOST_TEST(details::intersects(unit_box, other_box));
+  BOOST_TEST(bg::intersects(unit_box, other_box));
+
+  // within the other box
+  other_box = {{{-1., -1., -1.}}, {{2., 2., 2.}}};
+  BOOST_TEST(details::intersects(unit_box, other_box));
+  BOOST_TEST(bg::intersects(unit_box, other_box));
+
+  // intersecting
+  other_box = {{{.5, .5, .5}}, {{2., 2., 2.}}};
+  BOOST_TEST(details::intersects(unit_box, other_box));
+  BOOST_TEST(bg::intersects(unit_box, other_box));
+
+  // disjoint
+  other_box = {{{1., 2., 3.}}, {{4., 5., 6.}}};
+  BOOST_TEST(!details::intersects(unit_box, other_box));
+  BOOST_TEST(!bg::intersects(unit_box, other_box));
+}
diff --git a/arborx/test/tstBoostRangeAdapters.cpp b/arborx/test/tstBoostRangeAdapters.cpp
new file mode 100644
index 000000000..f113baf8f
--- /dev/null
+++ b/arborx/test/tstBoostRangeAdapters.cpp
@@ -0,0 +1,78 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#include "ArborX_BoostRangeAdapters.hpp"
+#include "ArborX_EnableViewComparison.hpp"
+#include <ArborX_Box.hpp>
+#include <ArborX_DetailsAlgorithms.hpp>
+#include <ArborX_Point.hpp>
+
+#include <Kokkos_Core.hpp>
+
+#include <boost/range/algorithm.hpp> // reverse_copy, replace_if, count, generate, count_if
+#include <boost/range/algorithm_ext.hpp> // iota
+#include <boost/range/numeric.hpp>       // accumulate
+#include <boost/test/unit_test.hpp>
+
+#include <random>
+#include <sstream>
+
+#define BOOST_TEST_MODULE BoostRangeAdapters
+
+namespace tt = boost::test_tools;
+
+BOOST_AUTO_TEST_CASE(range_algorithms)
+{
+  Kokkos::View<int[4], Kokkos::HostSpace> w("w");
+
+  boost::iota(w, 0);
+  std::stringstream ss;
+  boost::reverse_copy(w, std::ostream_iterator<int>(ss, " "));
+  BOOST_TEST(ss.str() == "3 2 1 0 ");
+
+  boost::replace_if(w, [](int i) { return (i > 1); }, -1);
+  BOOST_TEST(w == std::vector<int>({0, 1, -1, -1}), tt::per_element());
+
+  BOOST_TEST(boost::count(w, -1), 2);
+  BOOST_TEST(boost::accumulate(w, 5), 4);
+}
+
+BOOST_AUTO_TEST_CASE(point_cloud)
+{
+  using ArborX::Point;
+  using ArborX::Details::distance;
+  double const seed = 3.14;
+  std::default_random_engine generator(seed);
+  std::uniform_real_distribution<double> distribution(-1., 1.);
+  int const n = 10000;
+  Kokkos::View<Point *, Kokkos::HostSpace> cloud("cloud", n);
+  boost::generate(cloud, [&distribution, &generator]() {
+    Point p;
+    p[0] = distribution(generator);
+    p[1] = distribution(generator);
+    p[2] = distribution(generator);
+    return p;
+  });
+
+  Point const origin = {0., 0., 0.};
+  double const radius = 1.;
+  // 4/3 pi 1^3 / 2^3
+  double const pi = 6. *
+                    static_cast<double>(boost::count_if(
+                        cloud,
+                        [origin, radius](Point point) {
+                          return (distance(point, origin) <= radius);
+                        })) /
+                    static_cast<double>(n);
+
+  double const relative_tolerance = .05;
+  BOOST_TEST(pi == 3.14, tt::tolerance(relative_tolerance));
+}
diff --git a/arborx/test/tstCompileOnlyAccessTraits.cpp b/arborx/test/tstCompileOnlyAccessTraits.cpp
new file mode 100644
index 000000000..924ce73fb
--- /dev/null
+++ b/arborx/test/tstCompileOnlyAccessTraits.cpp
@@ -0,0 +1,87 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#include <ArborX_AccessTraits.hpp>
+
+#include <Kokkos_Core.hpp>
+
+using ArborX::PredicatesTag;
+using ArborX::PrimitivesTag;
+using ArborX::Details::check_valid_access_traits;
+
+// NOTE Let's not bother with __host__ __device__ annotations here
+
+struct NoAccessTraitsSpecialization
+{
+};
+
+struct EmptySpecialization
+{
+};
+template <typename Tag>
+struct ArborX::AccessTraits<EmptySpecialization, Tag>
+{
+};
+
+struct InvalidMemorySpace
+{
+};
+template <typename Tag>
+struct ArborX::AccessTraits<InvalidMemorySpace, Tag>
+{
+  using memory_space = void;
+};
+
+struct SizeMemberFunctionNotStatic
+{
+};
+template <typename Tag>
+struct ArborX::AccessTraits<SizeMemberFunctionNotStatic, Tag>
+{
+  using memory_space = Kokkos::HostSpace;
+  int size(SizeMemberFunctionNotStatic) { return 255; }
+};
+
+// Ensure legacy access traits are still valid
+struct LegacyAccessTraits
+{
+};
+template <typename Tag>
+struct ArborX::Traits::Access<LegacyAccessTraits, Tag>
+{
+  using memory_space = Kokkos::HostSpace;
+  static int size(LegacyAccessTraits) { return 0; }
+  static Point get(LegacyAccessTraits, int) { return {}; }
+};
+
+void test_access_traits_compile_only()
+{
+  Kokkos::View<ArborX::Point *> p;
+  Kokkos::View<float **> v;
+  check_valid_access_traits(PrimitivesTag{}, p);
+  check_valid_access_traits(PrimitivesTag{}, v);
+
+  using NearestPredicate = decltype(ArborX::nearest(ArborX::Point{}));
+  Kokkos::View<NearestPredicate *> q;
+  check_valid_access_traits(PredicatesTag{}, q);
+
+  check_valid_access_traits(PrimitivesTag{}, LegacyAccessTraits{});
+
+  // Uncomment to see error messages
+
+  // check_valid_access_traits(PrimitivesTag{}, NoAccessTraitsSpecialization{});
+
+  // check_valid_access_traits(PrimitivesTag{}, EmptySpecialization{});
+
+  // check_valid_access_traits(PrimitivesTag{}, InvalidMemorySpace{});
+
+  // check_valid_access_traits(PrimitivesTag{}, SizeMemberFunctionNotStatic{});
+}
diff --git a/arborx/test/tstCompileOnlyCallbacks.cpp b/arborx/test/tstCompileOnlyCallbacks.cpp
new file mode 100644
index 000000000..a7f807313
--- /dev/null
+++ b/arborx/test/tstCompileOnlyCallbacks.cpp
@@ -0,0 +1,150 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#include <ArborX_AccessTraits.hpp>
+#include <ArborX_Callbacks.hpp>
+#include <ArborX_Predicates.hpp>
+
+// NOTE Let's not bother with __host__ __device__ annotations here
+
+struct NearestPredicates
+{
+};
+template <>
+struct ArborX::AccessTraits<NearestPredicates, ArborX::PredicatesTag>
+{
+  using memory_space = Kokkos::HostSpace;
+  static int size(NearestPredicates const &) { return 1; }
+  static auto get(NearestPredicates const &, int) { return nearest(Point{}); }
+};
+
+struct SpatialPredicates
+{
+};
+template <>
+struct ArborX::AccessTraits<SpatialPredicates, ArborX::PredicatesTag>
+{
+  using memory_space = Kokkos::HostSpace;
+  static int size(SpatialPredicates const &) { return 1; }
+  static auto get(SpatialPredicates const &, int)
+  {
+    return intersects(Point{});
+  }
+};
+
+// Custom callbacks
+struct CallbackMissingTag
+{
+  template <typename Predicate, typename OutputFunctor>
+  void operator()(Predicate const &, int, OutputFunctor const &) const
+  {
+  }
+};
+
+struct Wrong
+{
+};
+
+struct CallbackDoesNotTakeCorrectArgument
+{
+  template <typename OutputFunctor>
+  void operator()(Wrong, int, OutputFunctor const &) const
+  {
+  }
+};
+
+struct CustomCallback
+{
+  template <class Predicate>
+  KOKKOS_FUNCTION void operator()(Predicate const &, int) const
+  {
+  }
+};
+
+struct CustomCallbackMissingConstQualifier
+{
+  template <class Predicate>
+  KOKKOS_FUNCTION void operator()(Predicate const &, int)
+  {
+  }
+};
+
+struct CustomCallbackNonVoidReturnType
+{
+  template <class Predicate>
+  KOKKOS_FUNCTION auto operator()(Predicate const &, int) const
+  {
+    return Wrong{};
+  }
+};
+
+struct LegacyNearestPredicateCallback
+{
+  template <class Predicate, class OutputFunctor>
+  void operator()(Predicate const &, int, float, OutputFunctor const &) const
+  {
+  }
+};
+
+void test_callbacks_compile_only()
+{
+  using ArborX::Details::check_valid_callback;
+
+  // view type does not matter as long as we do not call the output functor
+  Kokkos::View<float *> v;
+
+  check_valid_callback(ArborX::Details::DefaultCallback{}, SpatialPredicates{},
+                       v);
+  check_valid_callback(ArborX::Details::DefaultCallback{}, NearestPredicates{},
+                       v);
+
+  // not required to tag inline callbacks any more
+  check_valid_callback(CallbackMissingTag{}, SpatialPredicates{}, v);
+  check_valid_callback(CallbackMissingTag{}, NearestPredicates{}, v);
+
+  check_valid_callback(CustomCallback{}, SpatialPredicates{});
+  check_valid_callback(CustomCallback{}, NearestPredicates{});
+
+  // generic lambdas are supported if not using NVCC
+#ifndef __NVCC__
+  check_valid_callback([](auto const & /*predicate*/, int /*primitive*/,
+                          auto const & /*out*/) {},
+                       SpatialPredicates{}, v);
+
+  check_valid_callback([](auto const & /*predicate*/, int /*primitive*/,
+                          auto const & /*out*/) {},
+                       NearestPredicates{}, v);
+
+  check_valid_callback([](auto const & /*predicate*/, int /*primitive*/) {},
+                       SpatialPredicates{});
+
+  check_valid_callback([](auto const & /*predicate*/, int /*primitive*/) {},
+                       NearestPredicates{});
+#endif
+
+  // Uncomment to see error messages
+
+  // check_valid_callback(LegacyNearestPredicateCallback{}, NearestPredicates{},
+  //                     v);
+
+  // check_valid_callback(CallbackDoesNotTakeCorrectArgument{},
+  //                     SpatialPredicates{}, v);
+
+  // check_valid_callback(CustomCallbackNonVoidReturnType{},
+  //                     SpatialPredicates{});
+
+  // check_valid_callback(CustomCallbackMissingConstQualifier{},
+  //                     SpatialPredicates{});
+
+#ifndef __NVCC__
+  // check_valid_callback([](Wrong, int /*primitive*/) {}, SpatialPredicates{});
+#endif
+}
diff --git a/arborx/test/tstCompileOnlyConcepts.cpp b/arborx/test/tstCompileOnlyConcepts.cpp
new file mode 100644
index 000000000..03fae584b
--- /dev/null
+++ b/arborx/test/tstCompileOnlyConcepts.cpp
@@ -0,0 +1,23 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#include <ArborX_DetailsConcepts.hpp>
+
+#include <tuple>
+#include <type_traits>
+
+void test_concepts_compile_only()
+{
+  using ArborX::Details::first_template_parameter_t;
+  static_assert(std::is_same<first_template_parameter_t<std::tuple<int, float>>,
+                             int>::value,
+                "");
+}
diff --git a/arborx/test/tstCompileOnlyMain.cpp b/arborx/test/tstCompileOnlyMain.cpp
new file mode 100644
index 000000000..8bfd76f25
--- /dev/null
+++ b/arborx/test/tstCompileOnlyMain.cpp
@@ -0,0 +1,12 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+int main() { return 0; }
diff --git a/arborx/test/tstCompileOnlyTypeRequirements.cpp b/arborx/test/tstCompileOnlyTypeRequirements.cpp
new file mode 100644
index 000000000..d07f33c42
--- /dev/null
+++ b/arborx/test/tstCompileOnlyTypeRequirements.cpp
@@ -0,0 +1,64 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#include <ArborX_LinearBVH.hpp>
+
+#include <Kokkos_Core.hpp>
+
+namespace Test
+{
+// NOTE only supporting Point and Box
+using PrimitivePointOrBox = ArborX::Point;
+// using PrimitivePointOrBox = ArborX::Box;
+
+// clang-format off
+struct FakeBoundingVolume
+{
+  KOKKOS_FUNCTION FakeBoundingVolume &operator+=(PrimitivePointOrBox) { return *this; }
+  KOKKOS_FUNCTION void operator+=(PrimitivePointOrBox) volatile {}
+  KOKKOS_FUNCTION operator ArborX::Box() const { return {}; }
+};
+KOKKOS_FUNCTION void expand(FakeBoundingVolume, FakeBoundingVolume) {}
+KOKKOS_FUNCTION void expand(FakeBoundingVolume, PrimitivePointOrBox) {}
+
+struct FakePredicateGeometry {};
+KOKKOS_FUNCTION ArborX::Point returnCentroid(FakePredicateGeometry) { return {}; }
+KOKKOS_FUNCTION bool intersects(FakePredicateGeometry, FakeBoundingVolume) { return true; }
+KOKKOS_FUNCTION float distance(FakePredicateGeometry, FakeBoundingVolume) { return 0.f; }
+// clang-format on
+} // namespace Test
+
+// Compile-only
+void check_bounding_volume_and_predicate_geometry_type_requirements()
+{
+  using ExecutionSpace = Kokkos::DefaultExecutionSpace;
+  using MemorySpace = ExecutionSpace::memory_space;
+  using Tree = ArborX::BasicBoundingVolumeHierarchy<MemorySpace,
+                                                    Test::FakeBoundingVolume>;
+
+  Kokkos::View<Test::PrimitivePointOrBox *, MemorySpace> primitives(
+      "primitives", 0);
+  Tree tree(ExecutionSpace{}, primitives);
+
+  using SpatialPredicate =
+      decltype(ArborX::intersects(Test::FakePredicateGeometry{}));
+  Kokkos::View<SpatialPredicate *, MemorySpace> spatial_predicates(
+      "spatial_predicates", 0);
+  tree.query(ExecutionSpace{}, spatial_predicates,
+             KOKKOS_LAMBDA(SpatialPredicate, int){});
+
+  using NearestPredicate =
+      decltype(ArborX::nearest(Test::FakePredicateGeometry{}));
+  Kokkos::View<NearestPredicate *, MemorySpace> nearest_predicates(
+      "nearest_predicates", 0);
+  tree.query(ExecutionSpace{}, nearest_predicates,
+             KOKKOS_LAMBDA(NearestPredicate, int){});
+}
diff --git a/arborx/test/tstContainerAdaptors.cpp b/arborx/test/tstContainerAdaptors.cpp
new file mode 100644
index 000000000..2217c4ac5
--- /dev/null
+++ b/arborx/test/tstContainerAdaptors.cpp
@@ -0,0 +1,73 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#include <ArborX_DetailsPriorityQueue.hpp>
+#include <ArborX_DetailsStack.hpp>
+
+#include <boost/test/unit_test.hpp>
+
+using ArborX::Details::PriorityQueue;
+using ArborX::Details::Stack;
+
+BOOST_AUTO_TEST_SUITE(ContainerAdaptors)
+
+BOOST_AUTO_TEST_CASE(stack_)
+{
+  // stack is empty at construction
+  Stack<int> stack;
+  BOOST_TEST(stack.empty());
+  BOOST_TEST(stack.size() == 0);
+  // insert element
+  stack.push(2);
+  BOOST_TEST(!stack.empty());
+  BOOST_TEST(stack.size() == 1);
+  BOOST_TEST(stack.top() == 2);
+  // insert another element
+  stack.push(5);
+  BOOST_TEST(!stack.empty());
+  BOOST_TEST(stack.size() == 2);
+  BOOST_TEST(stack.top() == 5);
+  // remove it
+  stack.pop();
+  BOOST_TEST(!stack.empty());
+  BOOST_TEST(stack.size() == 1);
+  BOOST_TEST(stack.top() == 2);
+  // empty the stack
+  stack.pop();
+  BOOST_TEST(stack.empty());
+  BOOST_TEST(stack.size() == 0);
+}
+
+BOOST_AUTO_TEST_CASE(priority_queue)
+{
+  PriorityQueue<int> queue;
+  // queue is empty at construction
+  BOOST_TEST(queue.empty());
+  // insert element
+  queue.push(33);
+  BOOST_TEST(!queue.empty());
+  BOOST_TEST(queue.top() == 33);
+  // smaller distance stays on top of the priority queue
+  queue.push(24);
+  BOOST_TEST(queue.top() == 33);
+  // remove highest priority element
+  queue.pop();
+  BOOST_TEST(queue.top() == 24);
+  // insert element with higher priority and check it shows up on top
+  queue.push(33);
+  BOOST_TEST(queue.top() == 33);
+  // empty the queue
+  queue.pop();
+  queue.pop();
+  BOOST_TEST(queue.empty());
+}
+
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/arborx/test/tstDBSCAN.cpp b/arborx/test/tstDBSCAN.cpp
new file mode 100644
index 000000000..5b9482c32
--- /dev/null
+++ b/arborx/test/tstDBSCAN.cpp
@@ -0,0 +1,270 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+#include "ArborX_EnableDeviceTypes.hpp" // ARBORX_DEVICE_TYPES
+#include <ArborX_DBSCAN.hpp>
+#include <ArborX_DBSCANVerification.hpp>
+
+#include "BoostTest_CUDA_clang_workarounds.hpp"
+#include <boost/test/unit_test.hpp>
+
+template <typename View>
+struct HiddenView
+{
+  View _view;
+};
+template <typename View>
+struct ArborX::AccessTraits<HiddenView<View>, ArborX::PrimitivesTag>
+{
+  using Data = HiddenView<View>;
+  static KOKKOS_FUNCTION std::size_t size(Data const &data)
+  {
+    return data._view.extent(0);
+  }
+  static KOKKOS_FUNCTION typename View::value_type const &get(Data const &data,
+                                                              std::size_t i)
+  {
+    return data._view(i);
+  }
+  using memory_space = typename View::memory_space;
+};
+
+BOOST_AUTO_TEST_SUITE(DBSCAN)
+
+template <typename DeviceType, typename T>
+auto buildView(std::vector<T> const &v)
+{
+  Kokkos::View<T *, DeviceType> view("Testing::v", v.size());
+  Kokkos::deep_copy(view, Kokkos::View<T const *, Kokkos::HostSpace,
+                                       Kokkos::MemoryTraits<Kokkos::Unmanaged>>(
+                              v.data(), v.size()));
+  return view;
+}
+
+BOOST_AUTO_TEST_CASE_TEMPLATE(dbscan_verifier, DeviceType, ARBORX_DEVICE_TYPES)
+{
+  using ExecutionSpace = typename DeviceType::execution_space;
+  using ArborX::Point;
+  using ArborX::Details::verifyDBSCAN;
+
+  ExecutionSpace space;
+
+  {
+    auto points = buildView<DeviceType, Point>({{{0, 0, 0}}, {{1, 1, 1}}});
+
+    auto r = std::sqrt(3);
+
+    BOOST_TEST(verifyDBSCAN(space, points, r - 0.1, 2,
+                            buildView<DeviceType, int>({-1, -1})));
+    BOOST_TEST(!verifyDBSCAN(space, points, r - 0.1, 2,
+                             buildView<DeviceType, int>({1, 2})));
+    BOOST_TEST(!verifyDBSCAN(space, points, r - 0.1, 2,
+                             buildView<DeviceType, int>({1, 1})));
+    BOOST_TEST(
+        verifyDBSCAN(space, points, r, 2, buildView<DeviceType, int>({1, 1})));
+    BOOST_TEST(
+        !verifyDBSCAN(space, points, r, 2, buildView<DeviceType, int>({1, 2})));
+    BOOST_TEST(verifyDBSCAN(space, points, r, 3,
+                            buildView<DeviceType, int>({-1, -1})));
+    BOOST_TEST(
+        !verifyDBSCAN(space, points, r, 3, buildView<DeviceType, int>({1, 1})));
+  }
+
+  {
+    auto points = buildView<DeviceType, Point>(
+        {{{0, 0, 0}}, {{1, 1, 1}}, {{3, 3, 3}}, {{6, 6, 6}}});
+
+    auto r = std::sqrt(3);
+
+    BOOST_TEST(verifyDBSCAN(space, points, r, 2,
+                            buildView<DeviceType, int>({1, 1, -1, -1})));
+    BOOST_TEST(verifyDBSCAN(space, points, r, 3,
+                            buildView<DeviceType, int>({-1, -1, -1, -1})));
+
+    BOOST_TEST(verifyDBSCAN(space, points, 2 * r, 2,
+                            buildView<DeviceType, int>({3, 3, 3, -1})));
+    BOOST_TEST(verifyDBSCAN(space, points, 2 * r, 3,
+                            buildView<DeviceType, int>({3, 3, 3, -1})));
+    BOOST_TEST(verifyDBSCAN(space, points, 2 * r, 4,
+                            buildView<DeviceType, int>({-1, -1, -1, -1})));
+
+    BOOST_TEST(verifyDBSCAN(space, points, 3 * r, 2,
+                            buildView<DeviceType, int>({5, 5, 5, 5})));
+    BOOST_TEST(verifyDBSCAN(space, points, 3 * r, 3,
+                            buildView<DeviceType, int>({5, 5, 5, 5})));
+    BOOST_TEST(verifyDBSCAN(space, points, 3 * r, 4,
+                            buildView<DeviceType, int>({7, 7, 7, 7})));
+    BOOST_TEST(verifyDBSCAN(space, points, 3 * r, 5,
+                            buildView<DeviceType, int>({-1, -1, -1, -1})));
+  }
+
+  {
+    // check for bridging effect
+    auto points = buildView<DeviceType, Point>({{-1, 0.5, 0},
+                                                {-1, -0.5, 0},
+                                                {-1, 0, 0},
+                                                {{0, 0, 0}},
+                                                {{1, 0, 0}},
+                                                {{1, 0.5, 0}},
+                                                {{1, -0.5, 0}}});
+
+    BOOST_TEST(verifyDBSCAN(space, points, 1, 3,
+                            buildView<DeviceType, int>({5, 5, 5, 5, 5, 5, 5})));
+    BOOST_TEST(
+        (verifyDBSCAN(space, points, 1, 4,
+                      buildView<DeviceType, int>({5, 5, 5, 5, 6, 6, 6})) ||
+         verifyDBSCAN(space, points, 1, 4,
+                      buildView<DeviceType, int>({5, 5, 5, 6, 6, 6, 6}))));
+    BOOST_TEST(
+        !verifyDBSCAN(space, points, 1, 4,
+                      buildView<DeviceType, int>({5, 5, 5, 5, 5, 5, 5})));
+  }
+
+  {
+    // check where a core point is connected to only boundary points, but which
+    // are stripped by a second core point
+
+    // o - core, x - border
+    //     -1 0 1 2
+    //    ----------
+    //  2 | x o x
+    //  1 |   x   x
+    //  0 |   o x o
+    // -1 |   x   x
+    // -2 | x o x
+    // clang-format off
+    auto points = buildView<DeviceType, Point>({
+        {0, -2, 0}, {-1, -2, 0}, {1, -2, 0}, {0, -1, 0}, // bottom
+        {0, 2, 0}, {-1, 2, 0}, {1, 2, 0}, {0, 1, 0}, // top
+        {2, 0, 0}, {2, -1, 0}, {2, 1, 0}, {1, 0, 0}, // right
+        {0, 0, 0}  // stripped core
+    });
+    // clang-format on
+
+    BOOST_TEST(verifyDBSCAN(
+        space, points, 1, 4,
+        buildView<DeviceType, int>({0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 5})));
+    // make sure the stripped core is not marked as noise
+    BOOST_TEST(!verifyDBSCAN(
+        space, points, 1, 4,
+        buildView<DeviceType, int>({0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, -1})));
+  }
+}
+
+BOOST_AUTO_TEST_CASE_TEMPLATE(dbscan, DeviceType, ARBORX_DEVICE_TYPES)
+{
+  using ExecutionSpace = typename DeviceType::execution_space;
+  using ArborX::dbscan;
+  using ArborX::Point;
+  using ArborX::Details::verifyDBSCAN;
+
+  ExecutionSpace space;
+
+  for (auto impl : {ArborX::DBSCAN::Implementation::FDBSCAN,
+                    ArborX::DBSCAN::Implementation::FDBSCAN_DenseBox})
+  {
+    ArborX::DBSCAN::Parameters params;
+    params.setImplementation(impl);
+    {
+      auto points = buildView<DeviceType, Point>({{{0, 0, 0}}, {{1, 1, 1}}});
+
+      auto r = std::sqrt(3);
+
+      BOOST_TEST(verifyDBSCAN(space, points, r - 0.1, 2,
+                              dbscan(space, points, r - 0.1, 2, params)));
+      BOOST_TEST(verifyDBSCAN(space, points, r, 2,
+                              dbscan(space, points, r, 2, params)));
+      BOOST_TEST(verifyDBSCAN(space, points, r, 3,
+                              dbscan(space, points, r, 3, params)));
+
+      // Test non-View primitives
+      HiddenView<decltype(points)> hidden_points{points};
+      BOOST_TEST(
+          verifyDBSCAN(space, hidden_points, r - 0.1, 2,
+                       dbscan(space, hidden_points, r - 0.1, 2, params)));
+      BOOST_TEST(verifyDBSCAN(space, hidden_points, r, 2,
+                              dbscan(space, hidden_points, r, 2, params)));
+      BOOST_TEST(verifyDBSCAN(space, hidden_points, r, 3,
+                              dbscan(space, hidden_points, r, 3, params)));
+    }
+
+    {
+      auto points = buildView<DeviceType, Point>(
+          {{{0, 0, 0}}, {{1, 1, 1}}, {{3, 3, 3}}, {{6, 6, 6}}});
+
+      auto r = std::sqrt(3);
+
+      BOOST_TEST(verifyDBSCAN(space, points, r, 2,
+                              dbscan(space, points, r, 2, params)));
+      BOOST_TEST(verifyDBSCAN(space, points, r, 3,
+                              dbscan(space, points, r, 3, params)));
+
+      BOOST_TEST(verifyDBSCAN(space, points, 2 * r, 2,
+                              dbscan(space, points, 2 * r, 2, params)));
+      BOOST_TEST(verifyDBSCAN(space, points, 2 * r, 3,
+                              dbscan(space, points, 2 * r, 3, params)));
+      BOOST_TEST(verifyDBSCAN(space, points, 2 * r, 4,
+                              dbscan(space, points, 2 * r, 4, params)));
+
+      BOOST_TEST(verifyDBSCAN(space, points, 3 * r, 2,
+                              dbscan(space, points, 3 * r, 2, params)));
+      BOOST_TEST(verifyDBSCAN(space, points, 3 * r, 3,
+                              dbscan(space, points, 3 * r, 3, params)));
+      BOOST_TEST(verifyDBSCAN(space, points, 3 * r, 4,
+                              dbscan(space, points, 3 * r, 4, params)));
+      BOOST_TEST(verifyDBSCAN(space, points, 3 * r, 5,
+                              dbscan(space, points, 3 * r, 5, params)));
+    }
+
+    {
+      // check for bridging effect
+      auto points = buildView<DeviceType, Point>({{-1, 0.5, 0},
+                                                  {-1, -0.5, 0},
+                                                  {-1, 0, 0},
+                                                  {{0, 0, 0}},
+                                                  {{1, 0, 0}},
+                                                  {{1, 0.5, 0}},
+                                                  {{1, -0.5, 0}}});
+
+      BOOST_TEST(verifyDBSCAN(space, points, 1.0, 3,
+                              dbscan(space, points, 1, 3, params)));
+      BOOST_TEST(verifyDBSCAN(space, points, 1.0, 4,
+                              dbscan(space, points, 1, 4, params)));
+    }
+  }
+
+  {
+    // check where a core point is connected to only boundary points, but which
+    // are stripped by a second core point
+
+    // o - core, x - border
+    //     -1 0 1 2
+    //    ----------
+    //  2 | x o x
+    //  1 |   x   x
+    //  0 |   o x o
+    // -1 |   x   x
+    // -2 | x o x
+    // clang-format off
+    auto points = buildView<DeviceType, Point>({
+        {0, -2, 0}, {-1, -2, 0}, {1, -2, 0}, {0, -1, 0}, // bottom
+        {0, 2, 0}, {-1, 2, 0}, {1, 2, 0}, {0, 1, 0}, // top
+        {2, 0, 0}, {2, -1, 0}, {2, 1, 0}, {1, 0, 0}, // right
+        {0, 0, 0}  // stripped core
+    });
+    // clang-format on
+
+    // This does *not* guarantee to trigger the issue, as it depends on the
+    // specific implementation and runtime. But it may.
+    BOOST_TEST(verifyDBSCAN(space, points, 1, 4, dbscan(space, points, 1, 4)));
+  }
+}
+
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/arborx/test/tstDetailsAlgorithms.cpp b/arborx/test/tstDetailsAlgorithms.cpp
new file mode 100644
index 000000000..5df205c02
--- /dev/null
+++ b/arborx/test/tstDetailsAlgorithms.cpp
@@ -0,0 +1,234 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#include <ArborX_DetailsAlgorithms.hpp>
+#include <ArborX_DetailsKokkosExtArithmeticTraits.hpp>
+
+#define BOOST_TEST_MODULE Geometry
+#include <boost/test/unit_test.hpp>
+
+// NOTE: message is not required any more with C++17
+#define STATIC_ASSERT(cond) static_assert(cond, "");
+
+using ArborX::Box;
+using ArborX::Point;
+using ArborX::Sphere;
+
+BOOST_AUTO_TEST_CASE(distance)
+{
+  using ArborX::Details::distance;
+  BOOST_TEST(distance({{1.0, 2.0, 3.0}}, {{1.0, 1.0, 1.0}}) == std::sqrt(5.f));
+
+  // box is unit cube
+  constexpr Box box{{{0.0, 0.0, 0.0}}, {{1.0, 1.0, 1.0}}};
+
+  // distance is zero if the point is inside the box
+  BOOST_TEST(distance({{0.5, 0.5, 0.5}}, box) == 0.0);
+  // or anywhere on the boundary
+  BOOST_TEST(distance({{0.0, 0.0, 0.5}}, box) == 0.0);
+  // normal projection onto center of one face
+  BOOST_TEST(distance({{2.0, 0.5, 0.5}}, box) == 1.0);
+  // projection onto edge
+  BOOST_TEST(distance({{2.0, 0.75, -1.0}}, box) == std::sqrt(2.f));
+  // projection onto corner node
+  BOOST_TEST(distance({{-1.0, 2.0, 2.0}}, box) == std::sqrt(3.f));
+
+  // unit sphere
+  constexpr Sphere sphere{{{0., 0., 0.}}, 1.};
+  BOOST_TEST(distance({{.5, .5, .5}}, sphere) == 0.);
+  BOOST_TEST(distance({{2., 0., 0.}}, sphere) == 1.);
+  BOOST_TEST(distance({{1., 1., 1.}}, sphere) == std::sqrt(3.f) - 1.f);
+}
+
+BOOST_AUTO_TEST_CASE(distance_box_box)
+{
+  using ArborX::Details::distance;
+
+  constexpr Box unit_box{{{0.0, 0.0, 0.0}}, {{1.0, 1.0, 1.0}}};
+
+  // distance to self
+  BOOST_TEST(distance(unit_box, unit_box) == 0);
+  // distance to another unit box translated along one axis
+  BOOST_TEST(distance(unit_box, Box{{{2, 0, 0}}, {{3, 1, 1}}}) == 1);
+  BOOST_TEST(distance(unit_box, Box{{{0, -3, 0}}, {{1, -2, 1}}}) == 2);
+  BOOST_TEST(distance(unit_box, Box{{{0, 0, 4}}, {{1, 1, 5}}}) == 3);
+  // distance to another unit box translated along a plane
+  BOOST_TEST(distance(unit_box, Box{{{-4, -4, 0}}, {{-3, -3, 1}}}) ==
+             3 * std::sqrt(2.f));
+  BOOST_TEST(distance(unit_box, Box{{{0, -2, 3}}, {{1, -1, 4}}}) ==
+             std::sqrt(5.f));
+  BOOST_TEST(distance(unit_box, Box{{{5, 0, 7}}, {{6, 1, 8}}}) ==
+             2 * std::sqrt(13.f));
+
+  // distance to another box that contains the box
+  BOOST_TEST(distance(unit_box, Box{{{-1, -2, -3}}, {{4, 5, 6}}}) == 0);
+  // distance to another box within the unit box
+  BOOST_TEST(distance(unit_box, Box{{{.1, .2, .3}}, {{.4, .5, .6}}}) == 0);
+  // distance to another box that overlaps with the unit box
+  BOOST_TEST(distance(unit_box, Box{{{.1, .2, .3}}, {{4, 5, 6}}}) == 0);
+
+  // distance to empty boxes
+  auto infinity = KokkosExt::ArithmeticTraits::infinity<float>::value;
+  BOOST_TEST(distance(unit_box, Box{}) == infinity);
+  BOOST_TEST(distance(Box{}, unit_box) == infinity);
+  BOOST_TEST(distance(Box{}, Box{}) == infinity);
+}
+
+BOOST_AUTO_TEST_CASE(distance_sphere_box)
+{
+  using ArborX::Details::distance;
+  auto infinity = KokkosExt::ArithmeticTraits::infinity<float>::value;
+
+  // unit sphere
+  constexpr Sphere sphere{{{0., 0., 0.}}, 1.};
+  // distance between a sphere and a box no intersection
+  BOOST_TEST(distance(sphere, Box{{2.0, 3.0, 4.0}, {2.5, 3.5, 4.5}}) ==
+             std::sqrt(29.f) - 1.f);
+  // distance between a sphere and a box with intersection
+  BOOST_TEST(distance(sphere, Box{{0.5, 0.5, 0.5}, {2.5, 3.5, 4.5}}) == 0.f);
+  // distance between a sphere included in a box and that box
+  BOOST_TEST(distance(sphere, Box{{-2., -2., -2.}, {2., 2., 2.}}) == 0.f);
+  // distance between a sphere and a box included in that sphere
+  BOOST_TEST(distance(sphere, Box{{0., 0., 0.}, {0.1, 0.2, 0.3}}) == 0.f);
+  // distance to empty box
+  BOOST_TEST(distance(sphere, Box{}) == infinity);
+}
+
+BOOST_AUTO_TEST_CASE(intersects)
+{
+  using ArborX::Details::intersects;
+
+  // uninitialized box does not intersect with other boxes
+  STATIC_ASSERT(!intersects(Box{}, {{{1.0, 2.0, 3.0}}, {{4.0, 5.0, 6.0}}}));
+  // uninitialized box does not even intersect with itself
+  STATIC_ASSERT(!intersects(Box{}, Box{}));
+  // box with zero extent does
+  STATIC_ASSERT(intersects(Box{{{0.0, 0.0, 0.0}}, {{0.0, 0.0, 0.0}}},
+                           Box{{{0.0, 0.0, 0.0}}, {{0.0, 0.0, 0.0}}}));
+
+  // point
+  constexpr Point point{{1.0, 1.0, 1.0}};
+  // point is contained in a box
+  STATIC_ASSERT(intersects(point, {{{0.0, 0.0, 0.0}}, {{2.0, 2.0, 2.0}}}));
+  STATIC_ASSERT(!intersects(point, {{{-1.0, -1.0, -1.0}}, {{0.0, 0.0, 0.0}}}));
+  // point is on a side of a box
+  STATIC_ASSERT(intersects(point, {{{0.0, 0.0, 0.0}}, {{2.0, 2.0, 1.0}}}));
+  // point is a corner of a box
+  STATIC_ASSERT(intersects(point, {{{0.0, 0.0, 0.0}}, {{1.0, 1.0, 1.0}}}));
+
+  // unit cube
+  constexpr Box box{{{0.0, 0.0, 0.0}}, {{1.0, 1.0, 1.0}}};
+  STATIC_ASSERT(intersects(box, box));
+  STATIC_ASSERT(!intersects(box, Box{}));
+  // smaller box inside
+  STATIC_ASSERT(intersects(box, {{{0.25, 0.25, 0.25}}, {{0.75, 0.75, 0.75}}}));
+  // bigger box that contains it
+  STATIC_ASSERT(intersects(box, {{{-1.0, -1.0, -1.0}}, {{2.0, 2.0, 2.0}}}));
+  // couple boxes that do intersect
+  STATIC_ASSERT(intersects(box, {{{0.5, 0.5, 0.5}}, {{1.5, 1.5, 1.5}}}));
+  STATIC_ASSERT(intersects(box, {{{-0.5, -0.5, -0.5}}, {{0.5, 0.5, 0.5}}}));
+  // couple boxes that do not
+  STATIC_ASSERT(!intersects(box, {{{-2.0, -2.0, -2.0}}, {{-1.0, -1.0, -1.0}}}));
+  STATIC_ASSERT(!intersects(box, {{{0.0, 0.0, 2.0}}, {{1.0, 1.0, 3.0}}}));
+  // boxes intersect if faces touch
+  STATIC_ASSERT(intersects(box, {{{1.0, 0.0, 0.0}}, {{2.0, 1.0, 1.0}}}));
+  STATIC_ASSERT(intersects(box, {{{-0.5, -0.5, -0.5}}, {{0.5, 0.0, 0.5}}}));
+
+  // unit sphere
+  constexpr Sphere sphere{{{0., 0., 0.}}, 1.};
+  BOOST_TEST(intersects(sphere, {{{0., 0., 0.}}, {{1., 1., 1.}}}));
+  BOOST_TEST(!intersects(sphere, {{{1., 2., 3.}}, {{4., 5., 6.}}}));
+}
+
+BOOST_AUTO_TEST_CASE(equals)
+{
+  using ArborX::Details::equals;
+  // points
+  STATIC_ASSERT(equals(Point{{0., 0., 0.}}, {{0., 0., 0.}}));
+  STATIC_ASSERT(!equals(Point{{0., 0., 0.}}, {{1., 1., 1.}}));
+  // boxes
+  STATIC_ASSERT(equals(Box{{{0.0, 0.0, 0.0}}, {{1.0, 1.0, 1.0}}},
+                       {{{0.0, 0.0, 0.0}}, {{1.0, 1.0, 1.0}}}));
+  STATIC_ASSERT(!equals(Box{{{0.0, 0.0, 0.0}}, {{1.0, 0.0, 1.0}}},
+                        {{{-1.0, -1.0, -1.0}}, {{1.0, 1.0, 1.0}}}));
+  // spheres
+  STATIC_ASSERT(equals({{{0., 0., 0.}}, 1.}, {{{0., 0., 0.}}, 1.}));
+  STATIC_ASSERT(!equals({{{0., 0., 0.}}, 1.}, {{{0., 1., 2.}}, 1.}));
+  STATIC_ASSERT(!equals({{{0., 0., 0.}}, 1.}, {{{0., 0., 0.}}, 2.}));
+}
+
+BOOST_AUTO_TEST_CASE(expand)
+{
+  using ArborX::Details::equals;
+  using ArborX::Details::expand;
+  Box box;
+
+  // expand box with points
+  expand(box, {{0.0, 0.0, 0.0}});
+  BOOST_TEST(equals(box, {{{0.0, 0.0, 0.0}}, {{0.0, 0.0, 0.0}}}));
+  expand(box, {{1.0, 1.0, 1.0}});
+  BOOST_TEST(equals(box, {{{0.0, 0.0, 0.0}}, {{1.0, 1.0, 1.0}}}));
+  expand(box, {{0.25, 0.75, 0.25}});
+  BOOST_TEST(equals(box, {{{0.0, 0.0, 0.0}}, {{1.0, 1.0, 1.0}}}));
+  expand(box, {{-1.0, -1.0, -1.0}});
+  BOOST_TEST(equals(box, {{{-1.0, -1.0, -1.0}}, {{1.0, 1.0, 1.0}}}));
+
+  // expand box with boxes
+  expand(box, {{{0.25, 0.25, 0.25}}, {{0.75, 0.75, 0.75}}});
+  BOOST_TEST(equals(box, {{{-1.0, -1.0, -1.0}}, {{1.0, 1.0, 1.0}}}));
+  expand(box, {{{10.0, 10.0, 10.0}}, {{11.0, 11.0, 11.0}}});
+  BOOST_TEST(equals(box, {{{-1.0, -1.0, -1.0}}, {{11.0, 11.0, 11.0}}}));
+
+  // expand box with spheres
+  expand(box, {{{0., 1., 2.}}, 3.});
+  BOOST_TEST(equals(box, {{{-3., -2., -1.}}, {{11., 11., 11.}}}));
+  expand(box, {{{0., 0., 0.}}, 1.});
+  BOOST_TEST(equals(box, {{{-3., -2., -1.}}, {{11., 11., 11.}}}));
+  expand(box, {{{0., 0., 0.}}, 24.});
+  BOOST_TEST(equals(box, {{{-24., -24., -24.}}, {{24., 24., 24.}}}));
+}
+
+BOOST_AUTO_TEST_CASE(centroid)
+{
+  using ArborX::Details::centroid;
+  Box box{{{-10.0, 0.0, 10.0}}, {{0.0, 10.0, 20.0}}};
+  Point center;
+  centroid(box, center);
+  BOOST_TEST(center[0] == -5.0);
+  BOOST_TEST(center[1] == 5.0);
+  BOOST_TEST(center[2] == 15.0);
+}
+
+BOOST_AUTO_TEST_CASE(is_valid)
+{
+  using ArborX::Details::isValid;
+
+  auto infty = std::numeric_limits<double>::infinity();
+
+  BOOST_TEST(isValid(Point{{1., 2., 3.}}));
+  BOOST_TEST(!isValid(Point{{0., infty, 0.}}));
+
+  BOOST_TEST(isValid(Box{{{1., 2., 3.}}, {{4., 5., 6.}}}));
+  BOOST_TEST(!isValid(Box{{{0., 0., 0.}}, {{0., 0., 0.}}}));
+  BOOST_TEST(!isValid(Box{{{0., 0., -infty}}, {{0., 0., 0.}}}));
+  BOOST_TEST(!isValid(Box{{{0., 0., 0.}}, {{+infty, 0., 0.}}}));
+  BOOST_TEST(!isValid(Box{}));
+  BOOST_TEST(!isValid(Box{{{1., 1., 1.}}, {{0., 0., 0.}}}));
+  BOOST_TEST(!isValid(Box{{{0., 0., 1.}}, {{0., 0., 0.}}}));
+  BOOST_TEST(!isValid(Box{{{0., 0., 0.}}, {{-1, 0., 0.}}}));
+
+  BOOST_TEST(isValid(Sphere{{{1., 2., 3.}}, 4.}));
+  BOOST_TEST(isValid(Sphere{{{0., 0., 0.}}, 0.}));
+  BOOST_TEST(!isValid(Sphere{{{1., 2., 3.}}, -1.}));
+  BOOST_TEST(!isValid(Sphere{{{0., 0., 0.}}, +infty}));
+  BOOST_TEST(!isValid(Sphere{{{0., -infty, 0.}}, +1.}));
+  BOOST_TEST(isValid(Sphere{}));
+}
diff --git a/arborx/test/tstDetailsBatchedQueries.cpp b/arborx/test/tstDetailsBatchedQueries.cpp
new file mode 100644
index 000000000..3599eb679
--- /dev/null
+++ b/arborx/test/tstDetailsBatchedQueries.cpp
@@ -0,0 +1,69 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#include "ArborX_EnableDeviceTypes.hpp" // ARBORX_DEVICE_TYPES
+#include "ArborX_EnableViewComparison.hpp"
+#include <ArborX_DetailsBatchedQueries.hpp>
+
+#include <boost/test/unit_test.hpp>
+
+#define BOOST_TEST_MODULE DetailsBatchedQueries
+
+namespace tt = boost::test_tools;
+
+template <typename DeviceType, typename ValueType>
+Kokkos::View<ValueType *, DeviceType> toView(std::vector<ValueType> const &v)
+{
+  Kokkos::View<ValueType *, DeviceType> w("Testing::whocares", v.size());
+  auto w_host = Kokkos::create_mirror_view(w);
+  for (int i = 0; i < w.extent_int(0); ++i)
+    w_host(i) = v[i];
+  Kokkos::deep_copy(w, w_host);
+  return w;
+}
+
+BOOST_AUTO_TEST_CASE_TEMPLATE(permute_offset_and_indices, DeviceType,
+                              ARBORX_DEVICE_TYPES)
+{
+  using ExecutionSpace = typename DeviceType::execution_space;
+
+  Kokkos::View<int *, DeviceType> offset("Testing::offset", 0);
+  Kokkos::View<int *, DeviceType> indices("Testing::indices", 0);
+
+  Kokkos::View<unsigned int *, DeviceType> permute("Testing::permute", 0);
+
+  BOOST_CHECK_THROW(
+      ArborX::Details::BatchedQueries<DeviceType>::reversePermutation(
+          ExecutionSpace{}, permute, offset, indices),
+      ArborX::SearchException);
+
+  Kokkos::resize(offset, 1);
+  BOOST_CHECK_NO_THROW(
+      ArborX::Details::BatchedQueries<DeviceType>::reversePermutation(
+          ExecutionSpace{}, permute, offset, indices));
+
+  std::vector<int> offset_ = {0, 0, 1, 3, 6, 10};
+  std::vector<int> indices_ = {1, 2, 2, 3, 3, 3, 4, 4, 4, 4};
+  std::vector<unsigned int> permute_ = {4, 3, 2, 1, 0};
+  std::vector<int> offset_ref = {0, 4, 7, 9, 10, 10};
+  std::vector<int> indices_ref = {4, 4, 4, 4, 3, 3, 3, 2, 2, 1};
+
+  std::tie(offset, indices) =
+      ArborX::Details::BatchedQueries<DeviceType>::reversePermutation(
+          ExecutionSpace{}, toView<DeviceType>(permute_),
+          toView<DeviceType>(offset_), toView<DeviceType>(indices_));
+  auto offset_host = Kokkos::create_mirror_view(offset);
+  Kokkos::deep_copy(offset_host, offset);
+  auto indices_host = Kokkos::create_mirror_view(indices);
+  Kokkos::deep_copy(indices_host, indices);
+  BOOST_TEST(offset_host == offset_ref, tt::per_element());
+  BOOST_TEST(indices_host == indices_ref, tt::per_element());
+}
diff --git a/arborx/test/tstDetailsCrsGraphWrapperImpl.cpp b/arborx/test/tstDetailsCrsGraphWrapperImpl.cpp
new file mode 100644
index 000000000..c8a1795e0
--- /dev/null
+++ b/arborx/test/tstDetailsCrsGraphWrapperImpl.cpp
@@ -0,0 +1,95 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#include "ArborX_EnableDeviceTypes.hpp" // ARBORX_DEVICE_TYPES
+#include "ArborX_EnableViewComparison.hpp"
+#include <ArborX_DetailsCrsGraphWrapperImpl.hpp>
+#include <ArborX_Predicates.hpp>
+#include <ArborX_TraversalPolicy.hpp>
+
+#include <boost/test/unit_test.hpp>
+
+#define BOOST_TEST_MODULE DetailsCrsGraphWrapperImpl
+
+namespace tt = boost::test_tools;
+
+struct Test1
+{
+  template <typename ExecutionSpace, typename Predicates,
+            typename InsertGenerator>
+  void query(ExecutionSpace const &space, Predicates const &predicates,
+             InsertGenerator const &insert_generator,
+             ArborX::Experimental::TraversalPolicy const & =
+                 ArborX::Experimental::TraversalPolicy()) const
+  {
+    using Access = ArborX::AccessTraits<Predicates, ArborX::PredicatesTag>;
+
+    Kokkos::parallel_for(
+        Kokkos::RangePolicy<ExecutionSpace>(space, 0, Access::size(predicates)),
+        KOKKOS_LAMBDA(int predicate_index) {
+          for (int primitive_index = 0; primitive_index < predicate_index;
+               ++primitive_index)
+            insert_generator(attach(Access::get(predicates, predicate_index),
+                                    predicate_index),
+                             primitive_index);
+        });
+  }
+};
+
+BOOST_AUTO_TEST_CASE_TEMPLATE(query_impl, DeviceType, ARBORX_DEVICE_TYPES)
+{
+  using ExecutionSpace = typename DeviceType::execution_space;
+
+  Kokkos::View<int *, DeviceType> offset("offset", 0);
+  Kokkos::View<int *, DeviceType> indices("indices", 0);
+
+  int const n = 10;
+  // Build a view of predicates.  Won't actually call any of them.  All is
+  // required is a valid access traits assocated to it. 'get()' nevers get
+  // called, only 'size()'.  FIXME
+  using Predicate = decltype(ArborX::intersects(std::declval<ArborX::Point>()));
+  Kokkos::View<Predicate *, DeviceType> predicates(
+      Kokkos::view_alloc("predicates", Kokkos::WithoutInitializing), n);
+
+  int const buffer_size = 2 * (n + 1);
+
+  ArborX::reallocWithoutInitializing(offset, n + 1);
+  Kokkos::deep_copy(offset, buffer_size);
+
+  Kokkos::View<unsigned int *, DeviceType> permute(
+      Kokkos::view_alloc(Kokkos::WithoutInitializing, "Testing::permute"), n);
+  ArborX::iota(ExecutionSpace{}, permute);
+
+  ArborX::exclusivePrefixSum(ExecutionSpace{}, offset);
+  ArborX::reallocWithoutInitializing(indices, ArborX::lastElement(offset));
+  ArborX::Details::CrsGraphWrapperImpl::queryImpl(
+      ExecutionSpace{}, Test1{}, predicates, ArborX::Details::DefaultCallback{},
+      indices, offset, permute,
+      ArborX::Details::BufferStatus::PreallocationHard);
+
+  auto indices_host =
+      Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace{}, indices);
+  auto offset_host =
+      Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace{}, offset);
+
+  std::vector<int> indices_ref;
+  std::vector<int> offset_ref;
+  offset_ref.push_back(0);
+  for (int i = 0; i < n; ++i)
+  {
+    for (int j = 0; j < i; ++j)
+      indices_ref.push_back(j);
+    offset_ref.push_back(indices_ref.size());
+  }
+
+  BOOST_TEST(offset_host == offset_ref, tt::per_element());
+  BOOST_TEST(indices_host == indices_ref, tt::per_element());
+}
diff --git a/arborx/test/tstDetailsDistributedTreeImpl.cpp b/arborx/test/tstDetailsDistributedTreeImpl.cpp
new file mode 100644
index 000000000..2fb76d0a2
--- /dev/null
+++ b/arborx/test/tstDetailsDistributedTreeImpl.cpp
@@ -0,0 +1,418 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#include "ArborX_EnableDeviceTypes.hpp" // ARBORX_DEVICE_TYPES
+#include "ArborX_EnableViewComparison.hpp"
+#include <ArborX_DetailsDistributedTreeImpl.hpp>
+
+#include <boost/test/unit_test.hpp>
+
+#define BOOST_TEST_MODULE DetailsDistributedTreeImpl
+
+#include <set>
+
+namespace tt = boost::test_tools;
+
+BOOST_AUTO_TEST_CASE_TEMPLATE(sort_results, DeviceType, ARBORX_DEVICE_TYPES)
+{
+  std::vector<int> ids_ = {4, 3, 2, 1, 4, 3, 2, 4, 3, 4};
+  std::vector<int> sorted_ids = {1, 2, 2, 3, 3, 3, 4, 4, 4, 4};
+  std::vector<int> offset = {0, 1, 3, 6, 10};
+  int const n = 10;
+  int const m = 4;
+  BOOST_TEST(ids_.size() == n);
+  BOOST_TEST(sorted_ids.size() == n);
+  BOOST_TEST(offset.size() == m + 1);
+  std::vector<int> results_ = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
+  std::vector<std::set<int>> sorted_results = {
+      {3},
+      {6, 2},
+      {8, 5, 1},
+      {9, 7, 4, 0},
+  };
+  std::vector<int> ranks_ = {10, 11, 12, 13, 14, 15, 16, 17, 18, 19};
+  std::vector<std::set<int>> sorted_ranks = {
+      {13},
+      {16, 12},
+      {18, 15, 11},
+      {19, 17, 14, 10},
+  };
+  BOOST_TEST(results_.size() == n);
+  BOOST_TEST(ranks_.size() == n);
+
+  Kokkos::View<int *, DeviceType> ids("query_ids", n);
+  Kokkos::View<int *, Kokkos::HostSpace,
+               Kokkos::MemoryTraits<Kokkos::Unmanaged>>
+      ids_host(ids_.data(), ids_.size());
+  Kokkos::deep_copy(ids, ids_host);
+
+  Kokkos::View<int *, DeviceType> results("results", n);
+  Kokkos::View<int *, Kokkos::HostSpace,
+               Kokkos::MemoryTraits<Kokkos::Unmanaged>>
+      results_host(results_.data(), results_.size());
+  Kokkos::deep_copy(results, results_host);
+
+  Kokkos::View<int *, DeviceType> ranks("ranks", n);
+  Kokkos::View<int *, Kokkos::HostSpace,
+               Kokkos::MemoryTraits<Kokkos::Unmanaged>>
+      ranks_host(ranks_.data(), ranks_.size());
+  Kokkos::deep_copy(ranks, ranks_host);
+
+  using ExecutionSpace = typename DeviceType::execution_space;
+  ArborX::Details::DistributedTreeImpl<DeviceType>::sortResults(
+      ExecutionSpace{}, ids, results, ranks);
+
+  // COMMENT: ids are untouched
+  Kokkos::deep_copy(ids_host, ids);
+  BOOST_TEST(ids_host == ids_, tt::per_element());
+
+  Kokkos::deep_copy(results_host, results);
+  Kokkos::deep_copy(ranks_host, ranks);
+  for (int q = 0; q < m; ++q)
+    for (int i = offset[q]; i < offset[q + 1]; ++i)
+    {
+      BOOST_TEST(sorted_results[q].count(results_host[i]) == 1);
+      BOOST_TEST(sorted_ranks[q].count(ranks_host[i]) == 1);
+    }
+
+  Kokkos::View<int *, DeviceType> not_sized_properly("", m);
+  BOOST_CHECK_THROW(
+      ArborX::Details::DistributedTreeImpl<DeviceType>::sortResults(
+          ExecutionSpace{}, ids, not_sized_properly),
+      ArborX::SearchException);
+}
+
+BOOST_AUTO_TEST_CASE_TEMPLATE(sort_results_2d, DeviceType, ARBORX_DEVICE_TYPES)
+{
+  std::array<int, 5> ids_{4, 2, 1, 3, 5};
+  Kokkos::View<int *, DeviceType> ids("ids", 5);
+  Kokkos::View<int *, Kokkos::HostSpace,
+               Kokkos::MemoryTraits<Kokkos::Unmanaged>>
+      ids_host(ids_.data(), ids_.size());
+  Kokkos::deep_copy(ids, ids_host);
+
+  int results_2d_[5][2] = {{1, 2}, {3, 4}, {5, 6}, {7, 8}, {9, 10}};
+  int sorted_results_2d[5][2] = {{5, 6}, {3, 4}, {7, 8}, {1, 2}, {9, 10}};
+  Kokkos::View<int **, DeviceType> results_2d("results", 5, 2);
+  auto results_2d_host = Kokkos::create_mirror_view(results_2d);
+  for (int i = 0; i < 5; ++i)
+    for (int j = 0; j < 2; ++j)
+      results_2d_host(i, j) = results_2d_[i][j];
+  Kokkos::deep_copy(results_2d, results_2d_host);
+
+  using ExecutionSpace = typename DeviceType::execution_space;
+  ArborX::Details::DistributedTreeImpl<DeviceType>::sortResults(
+      ExecutionSpace{}, ids, results_2d);
+
+  Kokkos::deep_copy(results_2d_host, results_2d);
+  for (int i = 0; i < 5; ++i)
+    for (int j = 0; j < 2; ++j)
+      BOOST_TEST(results_2d_host(i, j) == sorted_results_2d[i][j]);
+}
+
+BOOST_AUTO_TEST_CASE_TEMPLATE(sort_results_3d, DeviceType, ARBORX_DEVICE_TYPES)
+{
+  std::array<int, 5> ids_{4, 2, 1, 3, 5};
+  Kokkos::View<int *, DeviceType> ids("ids", 5);
+  Kokkos::View<int *, Kokkos::HostSpace,
+               Kokkos::MemoryTraits<Kokkos::Unmanaged>>
+      ids_host(ids_.data(), ids_.size());
+  Kokkos::deep_copy(ids, ids_host);
+
+  int results_3d_[5][2][2] = {{{1, 2}, {3, 4}},
+                              {{5, 6}, {7, 8}},
+                              {{9, 10}, {11, 12}},
+                              {{13, 14}, {15, 16}},
+                              {{17, 18}, {19, 20}}};
+  int sorted_results_3d[5][2][2] = {{{9, 10}, {11, 12}},
+                                    {{5, 6}, {7, 8}},
+                                    {{13, 14}, {15, 16}},
+                                    {{1, 2}, {3, 4}},
+                                    {{17, 18}, {19, 20}}};
+  Kokkos::View<int ***, DeviceType> results_3d("results", 5, 2, 2);
+  auto results_3d_host = Kokkos::create_mirror_view(results_3d);
+  for (int i = 0; i < 5; ++i)
+    for (int j = 0; j < 2; ++j)
+      for (int k = 0; k < 2; ++k)
+        results_3d_host(i, j, k) = results_3d_[i][j][k];
+  Kokkos::deep_copy(results_3d, results_3d_host);
+
+  using ExecutionSpace = typename DeviceType::execution_space;
+  ArborX::Details::DistributedTreeImpl<DeviceType>::sortResults(
+      ExecutionSpace{}, ids, results_3d);
+
+  Kokkos::deep_copy(results_3d_host, results_3d);
+  for (int i = 0; i < 5; ++i)
+    for (int j = 0; j < 2; ++j)
+      for (int k = 0; k < 2; ++k)
+        BOOST_TEST(results_3d_host(i, j, k) == sorted_results_3d[i][j][k]);
+}
+
+BOOST_AUTO_TEST_CASE_TEMPLATE(count_results, DeviceType, ARBORX_DEVICE_TYPES)
+{
+  std::vector<int> ids_ref = {4, 3, 2, 1, 4, 3, 2, 4, 3, 4};
+  std::vector<int> offset_ref = {
+      0, 0, 1, 3, 6, 10,
+  };
+  int const m = 5;
+  int const nnz = 10;
+  BOOST_TEST(ids_ref.size() == nnz);
+  BOOST_TEST(offset_ref.size() == m + 1);
+
+  Kokkos::View<int *, DeviceType> ids("query_ids", nnz);
+  auto ids_host = Kokkos::create_mirror_view(ids);
+  for (int i = 0; i < nnz; ++i)
+    ids_host(i) = ids_ref[i];
+  Kokkos::deep_copy(ids, ids_host);
+
+  Kokkos::View<int *, DeviceType> offset("offset", m);
+
+  using ExecutionSpace = typename DeviceType::execution_space;
+  ArborX::Details::DistributedTreeImpl<DeviceType>::countResults(
+      ExecutionSpace{}, m, ids, offset);
+
+  auto offset_host = Kokkos::create_mirror_view(offset);
+  Kokkos::deep_copy(offset_host, offset);
+  BOOST_TEST(offset_host == offset_ref, tt::per_element());
+}
+
+template <typename View1, typename View2>
+inline void checkViewWasNotAllocated(View1 const &v1, View2 const &v2)
+{
+  // NOTE: cannot use operator== here because array layout may "change" for
+  // rank-1 views
+  BOOST_TEST(v1.data() == v2.data());
+  BOOST_TEST(v1.span() == v2.span());
+
+  BOOST_TEST((int)View1::rank == (int)View2::rank);
+  BOOST_TEST((std::is_same<typename View1::const_value_type,
+                           typename View2::const_value_type>::value));
+  BOOST_TEST((std::is_same<typename View1::memory_space,
+                           typename View2::memory_space>::value));
+
+  BOOST_TEST(v1.extent(0) == v2.extent(0));
+  BOOST_TEST(v1.extent(1) == v2.extent(1));
+  BOOST_TEST(v1.extent(2) == v2.extent(2));
+  BOOST_TEST(v1.extent(3) == v2.extent(3));
+  BOOST_TEST(v1.extent(4) == v2.extent(4));
+  BOOST_TEST(v1.extent(5) == v2.extent(5));
+  BOOST_TEST(v1.extent(6) == v2.extent(6));
+  BOOST_TEST(v1.extent(7) == v2.extent(7));
+}
+
+template <typename View1, typename View2>
+inline void checkNewViewWasAllocated(View1 const &v1, View2 const &v2)
+{
+  BOOST_TEST(v1.data() != v2.data());
+
+  BOOST_TEST((int)View1::rank == (int)View2::rank);
+  BOOST_TEST((std::is_same<typename View1::const_value_type,
+                           typename View2::const_value_type>::value));
+
+  BOOST_TEST(v1.extent(0) == v2.extent(0));
+  BOOST_TEST(v1.extent(1) == v2.extent(1));
+  BOOST_TEST(v1.extent(2) == v2.extent(2));
+  BOOST_TEST(v1.extent(3) == v2.extent(3));
+  BOOST_TEST(v1.extent(4) == v2.extent(4));
+  BOOST_TEST(v1.extent(5) == v2.extent(5));
+  BOOST_TEST(v1.extent(6) == v2.extent(6));
+  BOOST_TEST(v1.extent(7) == v2.extent(7));
+}
+
+BOOST_AUTO_TEST_CASE_TEMPLATE(create_layout_right_mirror_view, DeviceType,
+                              ARBORX_DEVICE_TYPES)
+{
+  using ArborX::Details::create_layout_right_mirror_view;
+  using Kokkos::ALL;
+  using Kokkos::LayoutLeft;
+  using Kokkos::LayoutRight;
+  using Kokkos::make_pair;
+  using Kokkos::subview;
+  using Kokkos::View;
+
+  if (!Kokkos::SpaceAccessibility<
+          Kokkos::HostSpace, typename DeviceType::memory_space>::accessible)
+    return;
+
+  // rank-1 and not strided -> do not allocate
+  View<int *, LayoutLeft, DeviceType> u("u", 255);
+  auto u_h = create_layout_right_mirror_view(u);
+  checkViewWasNotAllocated(u, u_h);
+
+  // right layout -> do not allocate
+  View<int **, LayoutRight, DeviceType> v("v", 2, 3);
+  auto v_h = create_layout_right_mirror_view(v);
+  checkViewWasNotAllocated(v, v_h);
+
+  // the same with compile time size
+  View<int[2][3], LayoutRight, DeviceType> v_c("v");
+  auto v_c_h = create_layout_right_mirror_view(v_c);
+  checkViewWasNotAllocated(v_c, v_c_h);
+
+  // left layout and rank > 1 -> allocate
+  View<int **, LayoutLeft, DeviceType> w("w", 4, 5);
+  auto w_h = create_layout_right_mirror_view(w);
+  checkNewViewWasAllocated(w, w_h);
+
+  // the same with compile time size
+  View<int * [5], LayoutLeft, DeviceType> w_c("v", 4);
+  auto w_c_h = create_layout_right_mirror_view(w_c);
+  checkNewViewWasAllocated(w_c, w_c_h);
+
+  // strided layout -> allocate
+  auto x = subview(v, ALL, 0);
+  auto x_h = create_layout_right_mirror_view(x);
+  checkNewViewWasAllocated(x, x_h);
+
+  // subview is rank-1 and not strided -> do not allocate
+  auto y = subview(u, make_pair(8, 16));
+  auto y_h = create_layout_right_mirror_view(y);
+  checkViewWasNotAllocated(y, y_h);
+}
+
+void checkBufferLayout(std::vector<int> const &ranks,
+                       std::vector<int> const &permute_ref,
+                       std::vector<int> const &unique_ref,
+                       std::vector<int> const &counts_ref,
+                       std::vector<int> const &offsets_ref)
+{
+  std::vector<int> permute(ranks.size());
+  std::vector<int> unique;
+  std::vector<int> counts;
+  std::vector<int> offsets;
+  Kokkos::DefaultHostExecutionSpace space;
+  ArborX::Details::sortAndDetermineBufferLayout(
+      space,
+      Kokkos::View<int const *, Kokkos::HostSpace,
+                   Kokkos::MemoryTraits<Kokkos::Unmanaged>>(ranks.data(),
+                                                            ranks.size()),
+      Kokkos::View<int *, Kokkos::HostSpace,
+                   Kokkos::MemoryTraits<Kokkos::Unmanaged>>(permute.data(),
+                                                            permute.size()),
+      unique, counts, offsets);
+  BOOST_TEST(permute_ref == permute, tt::per_element());
+  BOOST_TEST(unique_ref == unique, tt::per_element());
+  BOOST_TEST(counts_ref == counts, tt::per_element());
+  BOOST_TEST(offsets_ref == offsets, tt::per_element());
+}
+
+BOOST_AUTO_TEST_CASE(sort_and_determine_buffer_layout)
+{
+  checkBufferLayout({}, {}, {}, {}, {0});
+  checkBufferLayout({2, 2}, {0, 1}, {2}, {2}, {0, 2});
+  checkBufferLayout({3, 3, 2, 3, 2, 1}, {0, 1, 3, 2, 4, 5}, {3, 2, 1},
+                    {3, 2, 1}, {0, 3, 5, 6});
+  checkBufferLayout({1, 2, 3, 2, 3, 3}, {5, 3, 0, 4, 1, 2}, {3, 2, 1},
+                    {3, 2, 1}, {0, 3, 5, 6});
+  checkBufferLayout({0, 1, 2, 3}, {3, 2, 1, 0}, {3, 2, 1, 0}, {1, 1, 1, 1},
+                    {0, 1, 2, 3, 4});
+}
+
+BOOST_AUTO_TEST_CASE(pointer_depth)
+{
+  static_assert(ArborX::Details::internal::PointerDepth<double>::value == 0,
+                "Failing for double");
+  static_assert(ArborX::Details::internal::PointerDepth<double *>::value == 1,
+                "Failing for double*");
+  static_assert(ArborX::Details::internal::PointerDepth<double[2]>::value == 0,
+                "Failing for double[2]");
+  static_assert(ArborX::Details::internal::PointerDepth<double **>::value == 2,
+                "Failing for double**");
+  static_assert(ArborX::Details::internal::PointerDepth<double * [2]>::value ==
+                    1,
+                "Failing for double*[2]");
+  static_assert(ArborX::Details::internal::PointerDepth<double[2][3]>::value ==
+                    0,
+                "Failing for double[2][3]");
+  static_assert(ArborX::Details::internal::PointerDepth<double ***>::value == 3,
+                "Failing for double***");
+  static_assert(
+      ArborX::Details::internal::PointerDepth<double * * [2]>::value == 2,
+      "Failing for double[2]");
+  static_assert(
+      ArborX::Details::internal::PointerDepth<double * [2][3]>::value == 1,
+      "Failing for double*[2][3]");
+  static_assert(
+      ArborX::Details::internal::PointerDepth<double[2][3][4]>::value == 0,
+      "Failing for double[2][3][4]");
+}
+
+template <typename DeviceType>
+struct Helper
+{
+  template <typename View1, typename View2, typename View3>
+  static void checkSendAcrossNetwork(MPI_Comm comm, View1 const &ranks,
+                                     View2 const &v_exp, View3 const &v_ref)
+  {
+    ArborX::Details::Distributor<DeviceType> distributor(comm);
+    distributor.createFromSends(typename DeviceType::execution_space{}, ranks);
+
+    // NOTE here we assume that the reference solution is sized properly
+    auto v_imp = Kokkos::create_mirror(typename View3::memory_space(), v_ref);
+
+    ArborX::Details::DistributedTreeImpl<DeviceType>::sendAcrossNetwork(
+        typename DeviceType::execution_space{}, distributor, v_exp, v_imp);
+
+    auto v_imp_host = Kokkos::create_mirror_view(v_imp);
+    Kokkos::deep_copy(v_imp_host, v_imp);
+    auto v_ref_host = Kokkos::create_mirror_view(v_ref);
+    Kokkos::deep_copy(v_ref_host, v_ref);
+
+    BOOST_TEST(v_imp.extent(0) == v_ref.extent(0));
+    BOOST_TEST(v_imp.extent(1) == v_ref.extent(1));
+    for (unsigned int i = 0; i < v_imp.extent(0); ++i)
+    {
+      for (unsigned int j = 0; j < v_imp.extent(1); ++j)
+      {
+        BOOST_TEST(v_imp_host(i, j) == v_ref_host(i, j));
+      }
+    }
+  }
+};
+
+BOOST_AUTO_TEST_CASE_TEMPLATE(send_across_network, DeviceType,
+                              ARBORX_DEVICE_TYPES)
+{
+  using ExecutionSpace = typename DeviceType::execution_space;
+  MPI_Comm comm = MPI_COMM_WORLD;
+  int comm_rank;
+  MPI_Comm_rank(comm, &comm_rank);
+  int comm_size;
+  MPI_Comm_size(comm, &comm_size);
+
+  int const DIM = 3;
+
+  // send 1 packet to rank k
+  // receive comm_size packets
+  Kokkos::View<int **, DeviceType> u_exp("u_exp", comm_size, DIM);
+  Kokkos::parallel_for(Kokkos::RangePolicy<ExecutionSpace>(0, comm_size),
+                       KOKKOS_LAMBDA(int i) {
+                         for (int j = 0; j < DIM; ++j)
+                           u_exp(i, j) = i + j * comm_rank;
+                       });
+
+  Kokkos::View<int *, DeviceType> ranks_u("", comm_size);
+  ArborX::iota(ExecutionSpace{}, ranks_u, 0);
+
+  Kokkos::View<int **, DeviceType> u_ref("u_ref", comm_size, DIM);
+  Kokkos::parallel_for(Kokkos::RangePolicy<ExecutionSpace>(0, comm_size),
+                       KOKKOS_LAMBDA(int i) {
+                         for (int j = 0; j < DIM; ++j)
+                           u_ref(i, j) = comm_rank + i * j;
+                       });
+
+  Helper<DeviceType>::checkSendAcrossNetwork(comm, ranks_u, u_exp, u_ref);
+
+  Kokkos::View<int **, DeviceType, Kokkos::MemoryUnmanaged> u_exp_unmanaged{
+      u_exp};
+  Helper<DeviceType>::checkSendAcrossNetwork(comm, ranks_u, u_exp_unmanaged,
+                                             u_ref);
+}
diff --git a/arborx/test/tstDetailsTreeConstruction.cpp b/arborx/test/tstDetailsTreeConstruction.cpp
new file mode 100644
index 000000000..2f2fd9140
--- /dev/null
+++ b/arborx/test/tstDetailsTreeConstruction.cpp
@@ -0,0 +1,294 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+#include "ArborX_EnableDeviceTypes.hpp" // ARBORX_DEVICE_TYPES
+#include "ArborX_EnableViewComparison.hpp"
+#include <ArborX_DetailsAlgorithms.hpp>
+#include <ArborX_DetailsMortonCode.hpp> // expandBits, morton3D
+#include <ArborX_DetailsNode.hpp>       // ROPE SENTINEL
+#include <ArborX_DetailsSortUtils.hpp>  // sortObjects
+#include <ArborX_DetailsTreeConstruction.hpp>
+
+#include <boost/test/unit_test.hpp>
+
+#include <array>
+#include <bitset>
+#include <functional>
+#include <limits>
+#include <sstream>
+#include <vector>
+
+namespace tt = boost::test_tools;
+
+BOOST_AUTO_TEST_CASE_TEMPLATE(assign_morton_codes, DeviceType,
+                              ARBORX_DEVICE_TYPES)
+{
+  std::vector<ArborX::Point> points = {
+      {{0.0, 0.0, 0.0}},          {{0.25, 0.75, 0.25}}, {{0.75, 0.25, 0.25}},
+      {{0.75, 0.75, 0.25}},       {{1.33, 2.33, 3.33}}, {{1.66, 2.66, 3.66}},
+      {{1024.0, 1024.0, 1024.0}},
+  };
+  int const n = points.size();
+  // lower left front corner corner of the octant the points fall in
+  std::vector<std::array<unsigned int, 3>> anchors = {
+      {{0, 0, 0}}, {{0, 0, 0}}, {{0, 0, 0}},         {{0, 0, 0}},
+      {{1, 2, 3}}, {{1, 2, 3}}, {{1023, 1023, 1023}}};
+  auto fun = [](std::array<unsigned int, 3> const &anchor) {
+    using ArborX::Details::expandBits;
+    unsigned int i = std::get<0>(anchor);
+    unsigned int j = std::get<1>(anchor);
+    unsigned int k = std::get<2>(anchor);
+    return 4 * expandBits(i) + 2 * expandBits(j) + expandBits(k);
+  };
+  std::vector<unsigned int> ref(n, std::numeric_limits<unsigned int>::max());
+  for (int i = 0; i < n; ++i)
+    ref[i] = fun(anchors[i]);
+  // using points rather than boxes for convenience here but still have to
+  // build the axis-aligned bounding boxes around them
+  Kokkos::View<ArborX::Box *, DeviceType> boxes("boxes", n);
+  auto boxes_host = Kokkos::create_mirror_view(boxes);
+  for (int i = 0; i < n; ++i)
+    ArborX::Details::expand(boxes_host(i), points[i]);
+  Kokkos::deep_copy(boxes, boxes_host);
+
+  typename DeviceType::execution_space space{};
+  ArborX::Box scene_host;
+  ArborX::Details::TreeConstruction::calculateBoundingBoxOfTheScene(
+      space, boxes, scene_host);
+
+  BOOST_TEST(ArborX::Details::equals(
+      scene_host, {{{0., 0., 0.}}, {{1024., 1024., 1024.}}}));
+
+  Kokkos::View<unsigned int *, DeviceType> morton_codes("morton_codes", n);
+  ArborX::Details::TreeConstruction::assignMortonCodes(
+      space, boxes, morton_codes, scene_host);
+  auto morton_codes_host = Kokkos::create_mirror_view(morton_codes);
+  Kokkos::deep_copy(morton_codes_host, morton_codes);
+  BOOST_TEST(morton_codes_host == ref, tt::per_element());
+}
+
+template <typename DeviceType>
+class FillK
+{
+public:
+  FillK(Kokkos::View<unsigned int *, DeviceType> k)
+      : _k(k)
+  {
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  void operator()(int const i) const { _k[i] = 4 - i; }
+
+private:
+  Kokkos::View<unsigned int *, DeviceType> _k;
+};
+
+BOOST_AUTO_TEST_CASE_TEMPLATE(indirect_sort, DeviceType, ARBORX_DEVICE_TYPES)
+{
+  // need a functionality that sort objects based on their Morton code and
+  // also returns the indices in the original configuration
+
+  // dummy unsorted Morton codes and corresponding sorted indices as reference
+  // solution
+  //
+  using ExecutionSpace = typename DeviceType::execution_space;
+  unsigned int const n = 4;
+  Kokkos::View<unsigned int *, DeviceType> k("k", n);
+  // Fill K with 4, 3, 2, 1
+  FillK<DeviceType> fill_k_functor(k);
+  Kokkos::parallel_for("fill_k", Kokkos::RangePolicy<ExecutionSpace>(0, n),
+                       fill_k_functor);
+
+  std::vector<size_t> ref = {3, 2, 1, 0};
+  // sort Morton codes and object ids
+  auto ids = ArborX::Details::sortObjects(ExecutionSpace{}, k);
+
+  auto k_host = Kokkos::create_mirror_view(k);
+  Kokkos::deep_copy(k_host, k);
+  auto ids_host = Kokkos::create_mirror_view(ids);
+  Kokkos::deep_copy(ids_host, ids);
+
+  // check that they are sorted
+  for (unsigned int i = 0; i < n; ++i)
+    BOOST_TEST(k_host[i] == i + 1);
+  // check that ids are properly ordered
+  BOOST_TEST(ids_host == ref, tt::per_element());
+}
+
+template <typename Primitives, typename MortonCodes, typename LeafNodes,
+          typename InternalNodes>
+void generateHierarchy(Primitives primitives, MortonCodes sorted_morton_codes,
+                       LeafNodes &leaf_nodes, InternalNodes &internal_nodes)
+{
+  using ArborX::Details::makeLeafNode;
+  using DeviceType = typename MortonCodes::device_type;
+
+  int const n = sorted_morton_codes.extent(0);
+
+  Kokkos::realloc(leaf_nodes, n);
+  Kokkos::realloc(internal_nodes, n - 1);
+
+  typename DeviceType::execution_space space{};
+
+  Kokkos::View<unsigned int *, DeviceType> permutation_indices(
+      "Testing::indices", n);
+  ArborX::iota(space, permutation_indices);
+
+  ArborX::Details::TreeConstruction::generateHierarchy(
+      space, primitives, permutation_indices, sorted_morton_codes, leaf_nodes,
+      internal_nodes);
+}
+
+template <typename Node, typename LeafNodes, typename InternalNodes>
+std::enable_if_t<
+    std::is_same<typename Node::Tag, ArborX::Details::NodeWithTwoChildrenTag>{}>
+traverse(LeafNodes leaf_nodes, InternalNodes internal_nodes, Node const *root,
+         std::ostringstream &sol)
+{
+  int n = leaf_nodes.extent(0);
+  auto getNodePtr = [&leaf_nodes, &internal_nodes, &n](int i) {
+    return i < n - 1 ? &internal_nodes(i) : &leaf_nodes(i - n + 1);
+  };
+
+  std::function<void(Node const *, std::ostream &)> traverseRecursive;
+  traverseRecursive = [&leaf_nodes, &internal_nodes, &getNodePtr,
+                       &traverseRecursive](Node const *node, std::ostream &os) {
+    if (node->isLeaf())
+    {
+      os << "L" << node - leaf_nodes.data();
+    }
+    else
+    {
+      os << "I" << node - internal_nodes.data();
+      for (Node const *child :
+           {getNodePtr(node->left_child), getNodePtr(node->right_child)})
+        traverseRecursive(child, os);
+    }
+  };
+
+  traverseRecursive(root, sol);
+}
+
+template <typename Node, typename LeafNodes, typename InternalNodes>
+std::enable_if_t<std::is_same<typename Node::Tag,
+                              ArborX::Details::NodeWithLeftChildAndRopeTag>{}>
+traverse(LeafNodes leaf_nodes, InternalNodes internal_nodes, Node const *root,
+         std::ostringstream &sol)
+{
+  int n = leaf_nodes.extent(0);
+  auto getNodePtr = [&leaf_nodes, &internal_nodes, &n](int i) {
+    return i < n - 1 ? &internal_nodes(i) : &leaf_nodes(i - n + 1);
+  };
+
+  using ArborX::Details::ROPE_SENTINEL;
+
+  std::function<void(Node const *, std::ostream &)> traverseRopes;
+  traverseRopes = [&leaf_nodes, &internal_nodes, &getNodePtr,
+                   &traverseRopes](Node const *node, std::ostream &os) {
+    if (node->isLeaf())
+    {
+      os << "L" << node - leaf_nodes.data();
+      if (node->rope != ROPE_SENTINEL)
+        traverseRopes(getNodePtr(node->rope), os);
+    }
+    else
+    {
+      os << "I" << node - internal_nodes.data();
+      traverseRopes(getNodePtr(node->left_child), os);
+    }
+  };
+
+  traverseRopes(root, sol);
+}
+
+namespace Test
+{
+struct FakePrimitive
+{
+};
+struct FakeBoundingVolume
+{
+};
+KOKKOS_FUNCTION void expand(FakeBoundingVolume, FakeBoundingVolume) {}
+KOKKOS_FUNCTION void expand(FakeBoundingVolume, FakePrimitive) {}
+} // namespace Test
+
+BOOST_AUTO_TEST_CASE_TEMPLATE(example_tree_construction, DeviceType,
+                              ARBORX_DEVICE_TYPES)
+{
+  if (!Kokkos::SpaceAccessibility<
+          Kokkos::HostSpace, typename DeviceType::memory_space>::accessible)
+    return;
+
+  // This is the example from the articles by Karras.
+  // See
+  // https://devblogs.nvidia.com/parallelforall/thinking-parallel-part-iii-tree-construction-gpu/
+  int const n = 8;
+  Kokkos::View<unsigned int *, DeviceType> sorted_morton_codes(
+      "sorted_morton_codes", n);
+  std::vector<std::string> s{
+      "00001", "00010", "00100", "00101", "10011", "11000", "11001", "11110",
+  };
+  for (int i = 0; i < n; ++i)
+  {
+    std::bitset<6> b(s[i]);
+    BOOST_TEST_MESSAGE(b << "  " << b.to_ulong());
+    sorted_morton_codes(i) = b.to_ulong();
+  }
+
+  Kokkos::View<Test::FakePrimitive *, DeviceType> primitives(
+      "Testing::primitives", n);
+
+  // Reference solution for the depth first search
+  std::ostringstream ref;
+  // clang-format off
+  ref << "I0" << "I3" << "I1" << "L0" << "L1" << "I2" << "L2" << "L3"
+      << "I4" << "L4" << "I5" << "I6" << "L5" << "L6" << "L7";
+  // clang-format on
+  BOOST_TEST_MESSAGE("ref = " << ref.str());
+
+  {
+    using Node = ArborX::Details::NodeWithTwoChildren<Test::FakeBoundingVolume>;
+
+    Kokkos::View<Node *, DeviceType> leaf_nodes("Testing::leaf_nodes", 0);
+    Kokkos::View<Node *, DeviceType> internal_nodes("Testing::internal_nodes",
+                                                    0);
+    generateHierarchy(primitives, sorted_morton_codes, leaf_nodes,
+                      internal_nodes);
+
+    auto const *root = internal_nodes.data();
+
+    std::ostringstream sol;
+    traverse(leaf_nodes, internal_nodes, root, sol);
+
+    BOOST_TEST_MESSAGE("sol(node_with_two_children) = " << sol.str());
+
+    BOOST_TEST(sol.str() == ref.str());
+  }
+  {
+    using Node =
+        ArborX::Details::NodeWithLeftChildAndRope<Test::FakeBoundingVolume>;
+
+    Kokkos::View<Node *, DeviceType> leaf_nodes("Testing::leaf_nodes", 0);
+    Kokkos::View<Node *, DeviceType> internal_nodes("Testing::internal_nodes",
+                                                    0);
+    generateHierarchy(primitives, sorted_morton_codes, leaf_nodes,
+                      internal_nodes);
+
+    auto const *root = internal_nodes.data();
+
+    std::ostringstream sol;
+    traverse(leaf_nodes, internal_nodes, root, sol);
+
+    BOOST_TEST_MESSAGE("sol(node_with_left_child_and_rope) = " << sol.str());
+
+    BOOST_TEST(sol.str() == ref.str());
+  }
+}
diff --git a/arborx/test/tstDetailsUtils.cpp b/arborx/test/tstDetailsUtils.cpp
new file mode 100644
index 000000000..3fd89e1bf
--- /dev/null
+++ b/arborx/test/tstDetailsUtils.cpp
@@ -0,0 +1,268 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#include "ArborX_EnableDeviceTypes.hpp" // ARBORX_DEVICE_TYPES
+#include "ArborX_EnableViewComparison.hpp"
+#include <ArborX_DetailsSortUtils.hpp>
+#include <ArborX_DetailsUtils.hpp>
+#include <ArborX_Exception.hpp>
+
+#include <Kokkos_Core.hpp>
+
+#include <boost/test/unit_test.hpp>
+
+#include <algorithm>
+#include <numeric>
+#include <vector>
+
+#define BOOST_TEST_MODULE StandardAlgorithms
+
+namespace tt = boost::test_tools;
+
+BOOST_AUTO_TEST_CASE_TEMPLATE(iota, DeviceType, ARBORX_DEVICE_TYPES)
+{
+  using ExecutionSpace = typename DeviceType::execution_space;
+  ExecutionSpace space{};
+  int const n = 10;
+  double const val = 3.;
+  Kokkos::View<double *, DeviceType> v("v", n);
+  ArborX::iota(space, v, val);
+  std::vector<double> v_ref(n);
+  std::iota(v_ref.begin(), v_ref.end(), val);
+  auto v_host = Kokkos::create_mirror_view(v);
+  Kokkos::deep_copy(v_host, v);
+  BOOST_TEST(v_ref == v_host, tt::per_element());
+
+  Kokkos::View<int[3], DeviceType> w("w");
+  ArborX::iota(space, w);
+  std::vector<int> w_ref = {0, 1, 2};
+  auto w_host = Kokkos::create_mirror_view(w);
+  Kokkos::deep_copy(w_host, w);
+  BOOST_TEST(w_ref == w_host, tt::per_element());
+}
+
+BOOST_AUTO_TEST_CASE_TEMPLATE(prefix_sum, DeviceType, ARBORX_DEVICE_TYPES)
+{
+  using ExecutionSpace = typename DeviceType::execution_space;
+  ExecutionSpace space{};
+  int const n = 10;
+  Kokkos::View<int *, DeviceType> x("x", n);
+  std::vector<int> x_ref(n, 1);
+  x_ref.back() = 0;
+  auto x_host = Kokkos::create_mirror_view(x);
+  for (int i = 0; i < n; ++i)
+    x_host(i) = x_ref[i];
+  Kokkos::deep_copy(x, x_host);
+  Kokkos::View<int *, DeviceType> y("y", n);
+  ArborX::exclusivePrefixSum(space, x, y);
+  std::vector<int> y_ref(n);
+  std::iota(y_ref.begin(), y_ref.end(), 0);
+  auto y_host = Kokkos::create_mirror_view(y);
+  Kokkos::deep_copy(y_host, y);
+  Kokkos::deep_copy(x_host, x);
+  BOOST_TEST(y_host == y_ref, tt::per_element());
+  BOOST_TEST(x_host == x_ref, tt::per_element());
+  // in-place
+  ArborX::exclusivePrefixSum(space, x, x);
+  Kokkos::deep_copy(x_host, x);
+  BOOST_TEST(x_host == y_ref, tt::per_element());
+  int const m = 11;
+  BOOST_TEST(n != m);
+  Kokkos::View<int *, DeviceType> z("z", m);
+  BOOST_CHECK_THROW(ArborX::exclusivePrefixSum(space, x, z),
+                    ArborX::SearchException);
+  Kokkos::View<double[3], DeviceType> v("v");
+  auto v_host = Kokkos::create_mirror_view(v);
+  v_host(0) = 1.;
+  v_host(1) = 1.;
+  v_host(2) = 0.;
+  Kokkos::deep_copy(v, v_host);
+  ArborX::exclusivePrefixSum(space, v);
+  Kokkos::deep_copy(v_host, v);
+  std::vector<double> v_ref = {0., 1., 2.};
+  BOOST_TEST(v_host == v_ref, tt::per_element());
+  Kokkos::View<double *, DeviceType> w("w", 4);
+  BOOST_CHECK_THROW(ArborX::exclusivePrefixSum(space, v, w),
+                    ArborX::SearchException);
+  v_host(0) = 1.;
+  v_host(1) = 0.;
+  v_host(2) = 0.;
+  Kokkos::deep_copy(v, v_host);
+  Kokkos::resize(w, 3);
+  ArborX::exclusivePrefixSum(space, v, w);
+  auto w_host = Kokkos::create_mirror_view(w);
+  Kokkos::deep_copy(w_host, w);
+  std::vector<double> w_ref = {0., 1., 1.};
+  BOOST_TEST(w_host == w_ref, tt::per_element());
+}
+
+BOOST_AUTO_TEST_CASE_TEMPLATE(last_element, DeviceType, ARBORX_DEVICE_TYPES)
+{
+  Kokkos::View<int *, DeviceType> v("v", 2);
+  auto v_host = Kokkos::create_mirror_view(v);
+  v_host(0) = 33;
+  v_host(1) = 24;
+  Kokkos::deep_copy(v, v_host);
+  BOOST_TEST(ArborX::lastElement(v) == 24);
+  Kokkos::View<int *, DeviceType> w("w", 0);
+  BOOST_CHECK_THROW(ArborX::lastElement(w), ArborX::SearchException);
+  Kokkos::View<double[1], DeviceType> u("u");
+  Kokkos::deep_copy(u, 3.14);
+  BOOST_TEST(ArborX::lastElement(u) == 3.14);
+}
+
+BOOST_AUTO_TEST_CASE_TEMPLATE(minmax, DeviceType, ARBORX_DEVICE_TYPES)
+{
+  using ExecutionSpace = typename DeviceType::execution_space;
+  ExecutionSpace space{};
+
+  Kokkos::View<double[4], DeviceType> v("v");
+  auto v_host = Kokkos::create_mirror_view(v);
+  v_host(0) = 3.14;
+  v_host(1) = 1.41;
+  v_host(2) = 2.71;
+  v_host(3) = 1.62;
+  Kokkos::deep_copy(v, v_host);
+
+  auto const result_float = ArborX::minMax(space, v);
+  BOOST_TEST(std::get<0>(result_float) == 1.41);
+  BOOST_TEST(std::get<1>(result_float) == 3.14);
+  Kokkos::View<int *, DeviceType> w("w", 0);
+  BOOST_CHECK_THROW(ArborX::minMax(space, w), ArborX::SearchException);
+  Kokkos::resize(w, 1);
+  Kokkos::deep_copy(w, 255);
+  auto const result_int = ArborX::minMax(space, w);
+  BOOST_TEST(std::get<0>(result_int) == 255);
+  BOOST_TEST(std::get<1>(result_int) == 255);
+
+  // testing use case in ORNL-CEES/DataTransferKit#336
+  Kokkos::View<int[2][3], DeviceType> u("u");
+  auto u_host = Kokkos::create_mirror_view(u);
+  u_host(0, 0) = 1; // x
+  u_host(0, 1) = 2; // y
+  u_host(0, 2) = 3; // z
+  u_host(1, 0) = 4; // x
+  u_host(1, 1) = 5; // y
+  u_host(1, 2) = 6; // Z
+  Kokkos::deep_copy(u, u_host);
+#if 0
+    // FIXME might be an issue with CUDA
+    auto const minmax_x =
+        ArborX::minMax( Kokkos::subview( u, Kokkos::ALL, 0 ) );
+    BOOST_TEST( std::get<0>( minmax_x ) == 1 );
+    BOOST_TEST( std::get<1>( minmax_x ) == 4 );
+    auto const minmax_y =
+        ArborX::minMax( Kokkos::subview( u, Kokkos::ALL, 1 ) );
+    BOOST_TEST( std::get<0>( minmax_y ) == 2 );
+    BOOST_TEST( std::get<1>( minmax_y ) == 5 );
+#endif
+}
+
+BOOST_AUTO_TEST_CASE_TEMPLATE(accumulate, DeviceType, ARBORX_DEVICE_TYPES)
+{
+  using ExecutionSpace = typename DeviceType::execution_space;
+  ExecutionSpace space{};
+
+  Kokkos::View<int[6], DeviceType> v("v");
+  Kokkos::deep_copy(v, 5);
+  BOOST_TEST(ArborX::accumulate(space, v, 3) == 33);
+
+  Kokkos::View<int *, DeviceType> w("w", 5);
+  ArborX::iota(space, w, 2);
+  BOOST_TEST(ArborX::accumulate(space, w, 4) == 24);
+}
+
+BOOST_AUTO_TEST_CASE_TEMPLATE(adjacent_difference, DeviceType,
+                              ARBORX_DEVICE_TYPES)
+{
+  using ExecutionSpace = typename DeviceType::execution_space;
+  ExecutionSpace space{};
+
+  Kokkos::View<int[5], DeviceType> v("v");
+  auto v_host = Kokkos::create_mirror_view(v);
+  v_host(0) = 2;
+  v_host(1) = 4;
+  v_host(2) = 6;
+  v_host(3) = 8;
+  v_host(4) = 10;
+  Kokkos::deep_copy(v, v_host);
+  // In-place operation is not allowed
+  BOOST_CHECK_THROW(ArborX::adjacentDifference(space, v, v),
+                    ArborX::SearchException);
+  auto w = Kokkos::create_mirror(DeviceType(), v);
+  BOOST_CHECK_NO_THROW(ArborX::adjacentDifference(space, v, w));
+  auto w_host = Kokkos::create_mirror_view(w);
+  Kokkos::deep_copy(w_host, w);
+  std::vector<int> w_ref(5, 2);
+  BOOST_TEST(w_host == w_ref, tt::per_element());
+
+  Kokkos::View<float *, DeviceType> x("x", 10);
+  Kokkos::deep_copy(x, 3.14);
+  BOOST_CHECK_THROW(ArborX::adjacentDifference(space, x, x),
+                    ArborX::SearchException);
+  Kokkos::View<float[10], DeviceType> y("y");
+  BOOST_CHECK_NO_THROW(ArborX::adjacentDifference(space, x, y));
+  std::vector<float> y_ref(10);
+  y_ref[0] = 3.14;
+  auto y_host = Kokkos::create_mirror_view(y);
+  Kokkos::deep_copy(y_host, y);
+  BOOST_TEST(y_host == y_ref, tt::per_element());
+
+  Kokkos::resize(x, 5);
+  BOOST_CHECK_THROW(ArborX::adjacentDifference(space, y, x),
+                    ArborX::SearchException);
+}
+
+BOOST_AUTO_TEST_CASE_TEMPLATE(min_and_max, DeviceType, ARBORX_DEVICE_TYPES)
+{
+  using ExecutionSpace = typename DeviceType::execution_space;
+  ExecutionSpace space{};
+
+  Kokkos::View<int[4], DeviceType> v("v");
+  ArborX::iota(space, v);
+  BOOST_TEST(ArborX::min(space, v) == 0);
+  BOOST_TEST(ArborX::max(space, v) == 3);
+
+  Kokkos::View<int *, DeviceType> w("w", 7);
+  ArborX::iota(space, w, 2);
+  BOOST_TEST(ArborX::min(space, w) == 2);
+  BOOST_TEST(ArborX::max(space, w) == 8);
+}
+
+BOOST_AUTO_TEST_CASE_TEMPLATE(sort_objects, DeviceType, ARBORX_DEVICE_TYPES)
+{
+  using ExecutionSpace = typename DeviceType::execution_space;
+  ExecutionSpace space{};
+
+  for (const auto &values : {std::vector<int>{36, 19, 25, 17, 3, 7, 1, 2, 9},
+                             std::vector<int>{36, 19, 25, 17, 3, 9, 1, 2, 7},
+                             std::vector<int>{100, 19, 36, 17, 3, 25, 1, 2, 7},
+                             std::vector<int>{15, 5, 11, 3, 4, 8}})
+  {
+    Kokkos::View<int *, Kokkos::HostSpace> host_view("data", values.size());
+    std::copy(values.begin(), values.end(), host_view.data());
+    auto device_view = Kokkos::create_mirror_view_and_copy(space, host_view);
+    auto device_permutation = ArborX::Details::sortObjects(space, device_view);
+    Kokkos::deep_copy(space, host_view, device_view);
+
+    // Check that values were sorted properly
+    std::vector<int> values_copy = values;
+    std::sort(values_copy.begin(), values_copy.end());
+    auto host_permutation = Kokkos::create_mirror_view_and_copy(
+        Kokkos::HostSpace{}, device_permutation);
+    BOOST_TEST(host_view == values_copy, tt::per_element());
+
+    // Check correctness of the permutation
+    for (unsigned int i = 0; i < values.size(); ++i)
+      values_copy[i] = values[host_permutation(i)];
+    BOOST_TEST(host_view == values_copy, tt::per_element());
+  }
+}
diff --git a/arborx/test/tstDistributedTree.cpp b/arborx/test/tstDistributedTree.cpp
new file mode 100644
index 000000000..e1037d1fb
--- /dev/null
+++ b/arborx/test/tstDistributedTree.cpp
@@ -0,0 +1,693 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#include "ArborX_BoostRTreeHelpers.hpp"
+#include "ArborX_EnableDeviceTypes.hpp" // ARBORX_DEVICE_TYPES
+#include <ArborX_DistributedTree.hpp>
+
+#include <boost/test/unit_test.hpp>
+
+#include <algorithm>
+#include <iostream>
+#include <random>
+#include <tuple>
+
+#include "Search_UnitTestHelpers.hpp"
+#include <mpi.h>
+
+#define BOOST_TEST_MODULE DistributedTree
+
+namespace tt = boost::test_tools;
+
+using PairIndexRank = Kokkos::pair<int, int>;
+using TupleIndexRankDistance = Kokkos::pair<Kokkos::pair<int, int>, float>;
+
+BOOST_AUTO_TEST_CASE_TEMPLATE(hello_world, DeviceType, ARBORX_DEVICE_TYPES)
+{
+  using Tree = ArborX::DistributedTree<typename DeviceType::memory_space>;
+  using ExecutionSpace = typename DeviceType::execution_space;
+
+  MPI_Comm comm = MPI_COMM_WORLD;
+  int comm_rank;
+  MPI_Comm_rank(comm, &comm_rank);
+  int comm_size;
+  MPI_Comm_size(comm, &comm_size);
+
+  int const n = 4;
+  Kokkos::View<ArborX::Point *, DeviceType> points("Testing::points", n);
+  // [  rank 0       [  rank 1       [  rank 2       [  rank 3       [
+  // x---x---x---x---x---x---x---x---x---x---x---x---x---x---x---x---
+  // ^   ^   ^   ^
+  // 0   1   2   3   ^   ^   ^   ^
+  //                 0   1   2   3   ^   ^   ^   ^
+  //                                 0   1   2   3   ^   ^   ^   ^
+  //                                                 0   1   2   3
+  Kokkos::parallel_for(Kokkos::RangePolicy<ExecutionSpace>(0, n),
+                       KOKKOS_LAMBDA(int i) {
+                         points(i) = {{(double)i / n + comm_rank, 0., 0.}};
+                       });
+
+  Tree tree(comm, ExecutionSpace{}, points);
+
+  // 0---0---0---0---1---1---1---1---2---2---2---2---3---3---3---3---
+  // |               |               |               |               |
+  // |               |               |               x   x   x   x   |
+  // |               |               |               |<------0------>|
+  // |               |               x   x   x   x   x               |
+  // |               |               |<------1------>|               |
+  // |               x   x   x   x   x               |               |
+  // |               |<------2------>|               |               |
+  // x   x   x   x   x               |               |               |
+  // |<------3------>|               |               |               |
+  // |               |               |               |               |
+  Kokkos::View<decltype(ArborX::intersects(ArborX::Sphere{})) *, DeviceType>
+      queries("Testing::queries", 1);
+  auto queries_host = Kokkos::create_mirror_view(queries);
+  queries_host(0) = ArborX::intersects(
+      ArborX::Sphere{{{0.5 + comm_size - 1 - comm_rank, 0., 0.}}, 0.5});
+  deep_copy(queries, queries_host);
+
+  // 0---0---0---0---1---1---1---1---2---2---2---2---3---3---3---3---
+  // |               |               |               |               |
+  // |               |               |           x   x   x           |
+  // |               |           x   x   x        <--0-->            |
+  // |           x   x   x        <--1-->            |               |
+  // x   x        <--2-->            |               |               |
+  // 3-->            |               |               |               |
+  // |               |               |               |               |
+  Kokkos::View<ArborX::Nearest<ArborX::Point> *, DeviceType> nearest_queries(
+      "Testing::nearest_queries", 1);
+  auto nearest_queries_host = Kokkos::create_mirror_view(nearest_queries);
+  nearest_queries_host(0) = ArborX::nearest<ArborX::Point>(
+      {{0.0 + comm_size - 1 - comm_rank, 0., 0.}},
+      comm_rank < comm_size - 1 ? 3 : 2);
+  deep_copy(nearest_queries, nearest_queries_host);
+
+  std::vector<PairIndexRank> values;
+  values.reserve(n + 1);
+  for (int i = 0; i < n; ++i)
+  {
+    values.emplace_back(n - 1 - i, comm_size - 1 - comm_rank);
+  }
+  if (comm_rank > 0)
+  {
+    values.emplace_back(0, comm_size - comm_rank);
+    ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree, queries,
+                           make_reference_solution(values, {0, n + 1}));
+  }
+  else
+  {
+    ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree, queries,
+                           make_reference_solution(values, {0, n}));
+  }
+
+  BOOST_TEST(n > 2);
+  if (comm_rank < comm_size - 1)
+  {
+    ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree, nearest_queries,
+                           make_reference_solution<PairIndexRank>(
+                               {{0, comm_size - 1 - comm_rank},
+                                {n - 1, comm_size - 2 - comm_rank},
+                                {1, comm_size - 1 - comm_rank}},
+                               {0, 3}));
+  }
+  else
+  {
+    ARBORX_TEST_QUERY_TREE(
+        ExecutionSpace{}, tree, nearest_queries,
+        make_reference_solution<PairIndexRank>(
+            {{0, comm_size - 1 - comm_rank}, {1, comm_size - 1 - comm_rank}},
+            {0, 2}));
+  }
+}
+
+BOOST_AUTO_TEST_CASE_TEMPLATE(empty_tree, DeviceType, ARBORX_DEVICE_TYPES)
+{
+  using ExecutionSpace = typename DeviceType::execution_space;
+
+  MPI_Comm comm = MPI_COMM_WORLD;
+  int comm_rank;
+  MPI_Comm_rank(comm, &comm_rank);
+  int comm_size;
+  MPI_Comm_size(comm, &comm_size);
+
+  auto const tree = makeDistributedTree<DeviceType>(comm, {});
+
+  BOOST_TEST(tree.empty());
+  BOOST_TEST(tree.size() == 0);
+
+  BOOST_TEST(ArborX::Details::equals(tree.bounds(), {}));
+
+  ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree,
+                         makeIntersectsBoxQueries<DeviceType>({}),
+                         make_reference_solution<PairIndexRank>({}, {0}));
+
+  ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree,
+                         makeIntersectsSphereQueries<DeviceType>({}),
+                         make_reference_solution<PairIndexRank>({}, {0}));
+
+  ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree,
+                         makeNearestQueries<DeviceType>({}),
+                         make_reference_solution<PairIndexRank>({}, {0}));
+
+  ARBORX_TEST_QUERY_TREE_WITH_DISTANCE(
+      ExecutionSpace{}, tree, makeNearestQueries<DeviceType>({}),
+      make_reference_solution<TupleIndexRankDistance>({}, {0}));
+
+  // Only rank 0 has a couple spatial queries with a spatial predicate
+  if (comm_rank == 0)
+  {
+    ARBORX_TEST_QUERY_TREE(
+        ExecutionSpace{}, tree, makeIntersectsBoxQueries<DeviceType>({{}, {}}),
+        make_reference_solution<PairIndexRank>({}, {0, 0, 0}));
+  }
+  else
+  {
+    ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree,
+                           makeIntersectsBoxQueries<DeviceType>({}),
+                           make_reference_solution<PairIndexRank>({}, {0}));
+  }
+
+  // All ranks but rank 0 have a single query with a spatial predicate
+  if (comm_rank == 0)
+  {
+    ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree,
+                           makeIntersectsSphereQueries<DeviceType>({}),
+                           make_reference_solution<PairIndexRank>({}, {0}));
+  }
+  else
+  {
+    ARBORX_TEST_QUERY_TREE(
+        ExecutionSpace{}, tree,
+        makeIntersectsSphereQueries<DeviceType>({
+            {{{(double)comm_rank, 0., 0.}}, (double)comm_size},
+        }),
+        make_reference_solution<PairIndexRank>({}, {0, 0}));
+  }
+
+  // All ranks but rank 0 have a single query with a nearest predicate
+  if (comm_rank == 0)
+  {
+    ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree,
+                           makeNearestQueries<DeviceType>({}),
+                           make_reference_solution<PairIndexRank>({}, {0}));
+  }
+  else
+  {
+    ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree,
+                           makeNearestQueries<DeviceType>({
+                               {{{0., 0., 0.}}, comm_rank},
+                           }),
+                           make_reference_solution<PairIndexRank>({}, {0, 0}));
+  }
+
+  // All ranks have a single query with a nearest predicate (this version
+  // returns distances as well)
+  ARBORX_TEST_QUERY_TREE_WITH_DISTANCE(
+      ExecutionSpace{}, tree,
+      makeNearestQueries<DeviceType>({
+          {{{0., 0., 0.}}, comm_size},
+      }),
+      make_reference_solution<TupleIndexRankDistance>({}, {0, 0}));
+}
+
+BOOST_AUTO_TEST_CASE_TEMPLATE(unique_leaf_on_rank_0, DeviceType,
+                              ARBORX_DEVICE_TYPES)
+{
+  using ExecutionSpace = typename DeviceType::execution_space;
+
+  MPI_Comm comm = MPI_COMM_WORLD;
+  int comm_rank;
+  MPI_Comm_rank(comm, &comm_rank);
+  int comm_size;
+  MPI_Comm_size(comm, &comm_size);
+
+  // tree has one unique leaf that lives on rank 0
+  auto const tree =
+      (comm_rank == 0 ? makeDistributedTree<DeviceType>(
+                            comm,
+                            {
+                                {{{0., 0., 0.}}, {{1., 1., 1.}}},
+                            })
+                      : makeDistributedTree<DeviceType>(comm, {}));
+
+  BOOST_TEST(!tree.empty());
+  BOOST_TEST(tree.size() == 1);
+
+  BOOST_TEST(
+      ArborX::Details::equals(tree.bounds(), {{{0., 0., 0.}}, {{1., 1., 1.}}}));
+
+  ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree,
+                         makeIntersectsBoxQueries<DeviceType>({}),
+                         make_reference_solution<PairIndexRank>({}, {0}));
+
+  ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree,
+                         makeIntersectsSphereQueries<DeviceType>({}),
+                         make_reference_solution<PairIndexRank>({}, {0}));
+
+  ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree,
+                         makeNearestQueries<DeviceType>({}),
+                         make_reference_solution<PairIndexRank>({}, {0}));
+
+  ARBORX_TEST_QUERY_TREE_WITH_DISTANCE(
+      ExecutionSpace{}, tree, makeNearestQueries<DeviceType>({}),
+      make_reference_solution<TupleIndexRankDistance>({}, {0}));
+
+  // Querying for more neighbors than there are leaves in the tree
+  ARBORX_TEST_QUERY_TREE(
+      ExecutionSpace{}, tree,
+      makeNearestQueries<DeviceType>({
+          {{{(double)comm_rank, (double)comm_rank, (double)comm_rank}},
+           comm_size},
+      }),
+      make_reference_solution<PairIndexRank>({{0, 0}}, {0, 1}));
+}
+
+BOOST_AUTO_TEST_CASE_TEMPLATE(one_leaf_per_rank, DeviceType,
+                              ARBORX_DEVICE_TYPES)
+{
+  using ExecutionSpace = typename DeviceType::execution_space;
+
+  MPI_Comm comm = MPI_COMM_WORLD;
+  int comm_rank;
+  MPI_Comm_rank(comm, &comm_rank);
+  int comm_size;
+  MPI_Comm_size(comm, &comm_size);
+
+  // tree has one leaf per rank
+  auto const tree = makeDistributedTree<DeviceType>(
+      comm,
+      {
+          {{{(double)comm_rank, 0., 0.}}, {{(double)comm_rank + 1., 1., 1.}}},
+      });
+
+  BOOST_TEST(!tree.empty());
+  BOOST_TEST((int)tree.size() == comm_size);
+
+  BOOST_TEST(ArborX::Details::equals(
+      tree.bounds(), {{{0., 0., 0.}}, {{(double)comm_size, 1., 1.}}}));
+
+  ARBORX_TEST_QUERY_TREE(
+      ExecutionSpace{}, tree,
+      makeIntersectsBoxQueries<DeviceType>({
+          {{{(double)comm_size - (double)comm_rank - .5, .5, .5}},
+           {{(double)comm_size - (double)comm_rank - .5, .5, .5}}},
+          {{{(double)comm_rank + .5, .5, .5}},
+           {{(double)comm_rank + .5, .5, .5}}},
+      }),
+      make_reference_solution<PairIndexRank>(
+          {{0, comm_size - 1 - comm_rank}, {0, comm_rank}}, {0, 1, 2}));
+
+  ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree,
+                         makeNearestQueries<DeviceType>({}),
+                         make_reference_solution<PairIndexRank>({}, {0}));
+
+  ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree,
+                         makeIntersectsBoxQueries<DeviceType>({}),
+                         make_reference_solution<PairIndexRank>({}, {0}));
+
+  if (comm_rank > 0)
+  {
+    ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree,
+                           makeNearestQueries<DeviceType>({
+                               {{{0., 0., 0.}}, comm_rank * comm_size},
+                           }),
+                           make_reference_solution(
+                               [comm_size]() {
+                                 std::vector<PairIndexRank> values;
+                                 values.reserve(comm_size);
+                                 for (int i = 0; i < comm_size; ++i)
+                                   values.emplace_back(0, i);
+                                 return values;
+                               }(),
+                               {0, comm_size}));
+  }
+  else
+  {
+    ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree,
+                           makeNearestQueries<DeviceType>({
+                               {{{0., 0., 0.}}, comm_rank * comm_size},
+                           }),
+                           make_reference_solution<PairIndexRank>({}, {0, 0}));
+  }
+}
+
+BOOST_AUTO_TEST_CASE_TEMPLATE(do_not_exceed_capacity, DeviceType,
+                              ARBORX_DEVICE_TYPES)
+{
+  using ExecutionSpace = typename DeviceType::execution_space;
+
+  // This unit tests exposes bug that essentially assumed the number of
+  // neighbors queried for would not exceed the maximum size of the default
+  // underlying container for a priority queue which was 256.
+  // https://github.com/arborx/ArborX/pull/126#issuecomment-538410096
+  // Each rank has the exact same cloud and perform a knn query that will push
+  // comm_size * 512 elements into the queue.
+  using ArborX::Box;
+  using ArborX::nearest;
+  using ArborX::Point;
+  using ExecutionSpace = typename DeviceType::execution_space;
+  MPI_Comm comm = MPI_COMM_WORLD;
+  Kokkos::View<Point *, DeviceType> points("Testing::points", 512);
+  Kokkos::parallel_for(Kokkos::RangePolicy<ExecutionSpace>(0, 512),
+                       KOKKOS_LAMBDA(int i) {
+                         points(i) = {{(float)i, (float)i, (float)i}};
+                       });
+
+  ArborX::DistributedTree<typename DeviceType::memory_space> tree{
+      comm, ExecutionSpace{}, points};
+  Kokkos::View<decltype(nearest(Point{})) *, DeviceType> queries(
+      "Testing::queries", 1);
+  Kokkos::deep_copy(queries, nearest(Point{0, 0, 0}, 512));
+  Kokkos::View<PairIndexRank *, DeviceType> values("Testing::values", 0);
+  Kokkos::View<int *, DeviceType> offset("Testing::offset", 0);
+  BOOST_CHECK_NO_THROW(tree.query(ExecutionSpace{}, queries, values, offset));
+}
+
+BOOST_AUTO_TEST_CASE_TEMPLATE(non_approximate_nearest_neighbors, DeviceType,
+                              ARBORX_DEVICE_TYPES)
+{
+  using ExecutionSpace = typename DeviceType::execution_space;
+
+  MPI_Comm comm = MPI_COMM_WORLD;
+  int comm_rank;
+  MPI_Comm_rank(comm, &comm_rank);
+  int comm_size;
+  MPI_Comm_size(comm, &comm_size);
+
+  //  +----------0----------1----------2----------3
+  //  |          |          |          |          |
+  //  |          |          |          |          |
+  //  |          |          |          |          |
+  //  |          |          |          |          |
+  //  0----------1----------2----------3----------+
+  //  [  rank 0  ]
+  //             [  rank 1  ]
+  //                        [  rank 2  ]
+  //                                   [  rank 3  ]
+  auto const tree = makeDistributedTree<DeviceType>(
+      comm, {
+                {{{(double)comm_rank, 0., 0.}}, {{(double)comm_rank, 0., 0.}}},
+                {{{(double)comm_rank + 1., 1., 1.}},
+                 {{(double)comm_rank + 1., 1., 1.}}},
+            });
+
+  BOOST_TEST(!tree.empty());
+  BOOST_TEST((int)tree.size() == 2 * comm_size);
+
+  //  +----------0----------1----------2----------3
+  //  |          |          |          |          |
+  //  |          |          |          |          |
+  //  |          |          |          |          |
+  //  |          |          |          |          |
+  //  0-------x--1-------X--2-------X--3-------X--+
+  //          ^          ^          ^          ^
+  //          3          2          1          0
+  if (comm_rank > 0)
+  {
+    ARBORX_TEST_QUERY_TREE(
+        ExecutionSpace{}, tree,
+        makeNearestQueries<DeviceType>({
+            {{{(double)(comm_size - 1 - comm_rank) + .75, 0., 0.}}, 1},
+        }),
+        make_reference_solution<PairIndexRank>({{0, comm_size - comm_rank}},
+                                               {0, 1}));
+  }
+  else
+  {
+    ARBORX_TEST_QUERY_TREE(
+        ExecutionSpace{}, tree,
+        makeNearestQueries<DeviceType>({
+            {{{(double)(comm_size - 1 - comm_rank) + .75, 0., 0.}}, 1},
+        }),
+        make_reference_solution<PairIndexRank>({{0, comm_size - 1}}, {0, 1}));
+  }
+}
+
+template <typename DeviceType>
+struct CustomInlineCallbackWithAttachment
+{
+  using tag = ArborX::Details::InlineCallbackTag;
+  Kokkos::View<ArborX::Point *, DeviceType> points;
+  ArborX::Point const origin = {{0., 0., 0.}};
+  template <typename Query, typename Insert>
+  KOKKOS_FUNCTION void operator()(Query const &query, int index,
+                                  Insert const &insert) const
+  {
+    auto data = ArborX::getData(query);
+    float const distance_to_origin =
+        ArborX::Details::distance(points(index), origin);
+
+    insert(distance_to_origin + data);
+  }
+};
+
+template <typename DeviceType>
+struct CustomPostCallbackWithAttachment
+{
+  using tag = ArborX::Details::PostCallbackTag;
+  Kokkos::View<ArborX::Point *, DeviceType> points;
+  ArborX::Point const origin = {{0., 0., 0.}};
+  template <typename Predicates, typename InOutView, typename InView,
+            typename OutView>
+  void operator()(Predicates const &queries, InOutView &offset, InView in,
+                  OutView &out) const
+  {
+    using ExecutionSpace = typename DeviceType::execution_space;
+    using ArborX::Details::distance;
+    auto const n = offset.extent(0) - 1;
+    ArborX::reallocWithoutInitializing(out, in.extent(0));
+    // NOTE workaround to avoid implicit capture of *this
+    auto const &points_ = points;
+    auto const &origin_ = origin;
+    Kokkos::parallel_for(
+        Kokkos::RangePolicy<ExecutionSpace>(0, n), KOKKOS_LAMBDA(int i) {
+          auto data = ArborX::getData(queries(i));
+          for (int j = offset(i); j < offset(i + 1); ++j)
+          {
+            out(j) = (float)distance(points_(in(j)), origin_) + data;
+          }
+        });
+  }
+};
+BOOST_AUTO_TEST_CASE_TEMPLATE(callback_with_attachment, DeviceType,
+                              ARBORX_DEVICE_TYPES)
+{
+  using ExecutionSpace = typename DeviceType::execution_space;
+
+  MPI_Comm comm = MPI_COMM_WORLD;
+  int comm_rank;
+  MPI_Comm_rank(comm, &comm_rank);
+  int comm_size;
+  MPI_Comm_size(comm, &comm_size);
+
+  //  +----------0----------1----------2----------3
+  //  |          |          |          |          |
+  //  |          |          |          |          |
+  //  |          |          |          |          |
+  //  |          |          |          |          |
+  //  0----------1----------2----------3----------+
+  //  [  rank 0  ]
+  //             [  rank 1  ]
+  //                        [  rank 2  ]
+  //                                   [  rank 3  ]
+  auto const tree = makeDistributedTree<DeviceType>(
+      comm,
+      {{{{(double)comm_rank, 0., 0.}}, {{(double)comm_rank + 1, 1., 1.}}}});
+
+  //  +--------0---------1----------2---------3
+  //  |        |         |          |         |
+  //  |        |         |          |         |
+  //  |        |         |          |         |
+  //  |        |         |          |         |
+  //  0--------1----x----2-----x----3----x----+
+  //                ^          ^         ^
+  //                0          1         2
+
+  int const n_queries = 1;
+  using ExecutionSpace = typename DeviceType::execution_space;
+  Kokkos::View<ArborX::Point *, DeviceType> points("Testing::points",
+                                                   n_queries);
+  Kokkos::parallel_for(Kokkos::RangePolicy<ExecutionSpace>(0, n_queries),
+                       KOKKOS_LAMBDA(int i) {
+                         points(i) = {(float)(comm_rank) + 1.5f, 0.f, 0.f};
+                       });
+  auto points_host =
+      Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace{}, points);
+
+  // This is a bit tricky. One would assume that it should be
+  // distance(points(i), origin) + comm_rank, matching code inside the
+  // callback. However, the callbacks are initialized and called on the rank
+  // that produces results, not on the rank that sets up the queries. In this
+  // example, for point 0 the callback will be called on rank 1, which is
+  // initialized with point 1. So, within the callback, points(0) corresponds
+  // to point 1 physically, and not point 0, even though the query() call is
+  // called on rank 0.
+  int const n_results = (comm_rank < comm_size - 1) ? 1 : 0;
+  ArborX::Point const origin = {{0., 0., 0.}};
+  Kokkos::View<float *, DeviceType> ref("Testing::ref", n_results);
+  Kokkos::parallel_for(
+      Kokkos::RangePolicy<ExecutionSpace>(0, n_results), KOKKOS_LAMBDA(int i) {
+        ref(i) =
+            float(ArborX::Details::distance(points(i), origin) + 1) + comm_rank;
+      });
+
+  {
+    Kokkos::View<float *, DeviceType> custom("Testing::custom", 0);
+    Kokkos::View<int *, DeviceType> offset("Testing::offset", 0);
+    tree.query(ExecutionSpace{},
+               makeIntersectsBoxWithAttachmentQueries<DeviceType, int>(
+                   {{points_host(0), points_host(0)}}, {comm_rank}),
+               CustomInlineCallbackWithAttachment<DeviceType>{points}, custom,
+               offset);
+
+    auto custom_host =
+        Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace{}, custom);
+    auto ref_host =
+        Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace{}, ref);
+    auto offset_host =
+        Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace{}, offset);
+    BOOST_TEST(make_compressed_storage(offset_host, custom_host) ==
+                   make_compressed_storage(offset_host, ref_host),
+               tt::per_element());
+  }
+  {
+    Kokkos::View<float *, DeviceType> custom("Testing::custom", 0);
+    Kokkos::View<int *, DeviceType> offset("Testing::offset", 0);
+    tree.query(ExecutionSpace{},
+               makeIntersectsBoxWithAttachmentQueries<DeviceType, int>(
+                   {{points_host(0), points_host(0)}}, {comm_rank}),
+               CustomPostCallbackWithAttachment<DeviceType>{points}, custom,
+               offset);
+
+    auto custom_host =
+        Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace{}, custom);
+    auto ref_host =
+        Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace{}, ref);
+    auto offset_host =
+        Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace{}, offset);
+    BOOST_TEST(make_compressed_storage(offset_host, custom_host) ==
+                   make_compressed_storage(offset_host, ref_host),
+               tt::per_element());
+  }
+}
+
+std::vector<std::array<double, 3>>
+make_random_cloud(double const Lx, double const Ly, double const Lz,
+                  int const n, double const seed)
+{
+  std::vector<std::array<double, 3>> cloud(n);
+  std::default_random_engine generator(seed);
+  std::uniform_real_distribution<double> distribution_x(0.0, Lx);
+  std::uniform_real_distribution<double> distribution_y(0.0, Ly);
+  std::uniform_real_distribution<double> distribution_z(0.0, Lz);
+  for (int i = 0; i < n; ++i)
+  {
+    double x = distribution_x(generator);
+    double y = distribution_y(generator);
+    double z = distribution_z(generator);
+    cloud[i] = {{x, y, z}};
+  }
+  return cloud;
+}
+
+BOOST_AUTO_TEST_CASE_TEMPLATE(boost_comparison, DeviceType, ARBORX_DEVICE_TYPES)
+{
+  using ExecutionSpace = typename DeviceType::execution_space;
+
+  MPI_Comm comm = MPI_COMM_WORLD;
+  int comm_rank;
+  MPI_Comm_rank(comm, &comm_rank);
+  int comm_size;
+  MPI_Comm_size(comm, &comm_size);
+
+  // Construct a random cloud of point. We use the same seed on all the
+  // processors.
+  double const Lx = 10.0;
+  double const Ly = 10.0;
+  double const Lz = 10.0;
+  int const n = 100;
+  auto cloud = make_random_cloud(Lx, Ly, Lz, n, 0);
+  auto queries = make_random_cloud(Lx, Ly, Lz, n, 1234);
+
+  // The formula is a bit complicated but it does not require n be divisible
+  // by comm_size
+  int const local_n = (n + comm_size - 1 - comm_rank) / comm_size;
+  Kokkos::View<ArborX::Box *, DeviceType> bounding_boxes(
+      "Testing::bounding_boxes", local_n);
+  auto bounding_boxes_host = Kokkos::create_mirror_view(bounding_boxes);
+  for (int i = 0; i < n; ++i)
+  {
+    if (i % comm_size == comm_rank)
+    {
+      auto const &point = cloud[i];
+      double const x = std::get<0>(point);
+      double const y = std::get<1>(point);
+      double const z = std::get<2>(point);
+      bounding_boxes_host[i / comm_size] = {{{x, y, z}}, {{x, y, z}}};
+    }
+  }
+  Kokkos::deep_copy(bounding_boxes, bounding_boxes_host);
+
+  // Initialize the distributed search tree
+  ArborX::DistributedTree<typename DeviceType::memory_space> distributed_tree(
+      comm, ExecutionSpace{}, bounding_boxes);
+
+  // make queries
+  Kokkos::View<double * [3], ExecutionSpace> point_coords(
+      "Testing::point_coords", local_n);
+  auto point_coords_host = Kokkos::create_mirror_view(point_coords);
+  Kokkos::View<double *, ExecutionSpace> radii("Testing::radii", local_n);
+  auto radii_host = Kokkos::create_mirror_view(radii);
+  Kokkos::View<int * [2], ExecutionSpace> within_n_pts("Testing::within_n_pts",
+                                                       local_n);
+  std::default_random_engine generator(0);
+  std::uniform_real_distribution<double> distribution_radius(
+      0.0, std::sqrt(Lx * Lx + Ly * Ly + Lz * Lz));
+  std::uniform_int_distribution<int> distribution_k(1, std::floor(sqrt(n * n)));
+  for (int i = 0; i < n; ++i)
+  {
+    if (i % comm_size == comm_rank)
+    {
+      auto const &point = queries[i];
+      int const j = i / comm_size;
+      double const x = std::get<0>(point);
+      double const y = std::get<1>(point);
+      double const z = std::get<2>(point);
+      radii_host(j) = distribution_radius(generator);
+
+      point_coords_host(j, 0) = x;
+      point_coords_host(j, 1) = y;
+      point_coords_host(j, 2) = z;
+    }
+  }
+  Kokkos::deep_copy(point_coords, point_coords_host);
+  Kokkos::deep_copy(radii, radii_host);
+
+  Kokkos::View<decltype(ArborX::intersects(ArborX::Sphere{})) *, DeviceType>
+      within_queries("Testing::within_queries", local_n);
+  Kokkos::parallel_for(
+      "register_within_queries",
+      Kokkos::RangePolicy<ExecutionSpace>(0, local_n), KOKKOS_LAMBDA(int i) {
+        within_queries(i) = ArborX::intersects(ArborX::Sphere{
+            {{point_coords(i, 0), point_coords(i, 1), point_coords(i, 2)}},
+            radii(i)});
+      });
+
+  auto within_queries_host = Kokkos::create_mirror_view(within_queries);
+  Kokkos::deep_copy(within_queries_host, within_queries);
+
+  BoostExt::ParallelRTree<ArborX::Box> rtree(comm, ExecutionSpace{},
+                                             bounding_boxes_host);
+
+  ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, distributed_tree, within_queries,
+                         query(ExecutionSpace{}, rtree, within_queries_host));
+}
diff --git a/arborx/test/tstException.cpp b/arborx/test/tstException.cpp
new file mode 100644
index 000000000..c7184cb39
--- /dev/null
+++ b/arborx/test/tstException.cpp
@@ -0,0 +1,37 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#include <ArborX_Exception.hpp>
+
+#include <boost/test/unit_test.hpp>
+
+BOOST_AUTO_TEST_SUITE(DesignByContract)
+
+BOOST_AUTO_TEST_CASE(dumb)
+{
+  using namespace ArborX;
+  BOOST_CHECK_NO_THROW(ARBORX_ASSERT(true));
+  std::string const prefix = "ArborX exception: ";
+  BOOST_CHECK_EXCEPTION(
+      ARBORX_ASSERT(false), SearchException, [&](std::exception const &e) {
+        std::string const message = e.what();
+        bool const message_starts_with_prefix = message.find(prefix) == 0;
+        bool const message_contains_filename =
+            message.find(__FILE__) != std::string::npos;
+        return message_starts_with_prefix && message_contains_filename;
+      });
+  std::string const message = "Keep calm and chive on!";
+  BOOST_CHECK_EXCEPTION(
+      throw SearchException(message), std::exception,
+      [&](std::exception const &e) { return prefix + message == e.what(); });
+}
+
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/arborx/test/tstHeapOperations.cpp b/arborx/test/tstHeapOperations.cpp
new file mode 100644
index 000000000..3aae8eca9
--- /dev/null
+++ b/arborx/test/tstHeapOperations.cpp
@@ -0,0 +1,208 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#include "ArborX_EnableViewComparison.hpp"
+#include <ArborX_DetailsHeap.hpp>
+#include <ArborX_DetailsPriorityQueue.hpp> // Less, Greater
+
+#include <Kokkos_Array.hpp>
+
+#include <boost/test/unit_test.hpp>
+
+using namespace ArborX::Details;
+namespace tt = boost::test_tools;
+
+BOOST_AUTO_TEST_SUITE(HeapOperations)
+
+BOOST_AUTO_TEST_CASE(push_heap)
+{
+  // Here checking against the example of binary heap insertion from
+  // https://en.wikipedia.org/wiki/Binary_heap#Insert
+  Kokkos::Array<int, 6> a = {11, 5, 8, 3, 4, 15};
+  BOOST_TEST(isHeap(a.data(), a.data() + 5, Less<int>()));
+  BOOST_TEST(!isHeap(a.data(), a.data() + 6, Less<int>()));
+  pushHeap(a.data(), a.data() + 6, Less<int>());
+  BOOST_TEST(isHeap(a.data(), a.data() + 6, Less<int>()));
+  Kokkos::Array<int, 6> ref = {15, 5, 11, 3, 4, 8};
+  BOOST_TEST(a == ref, tt::per_element());
+}
+
+BOOST_AUTO_TEST_CASE(pop_heap)
+{
+  // See https://en.wikipedia.org/wiki/Binary_heap#Extract
+  Kokkos::Array<int, 5> a = {11, 5, 8, 3, 4};
+  BOOST_TEST(isHeap(a.data(), a.data() + 5, Less<int>()));
+  popHeap(a.data(), a.data() + 5, Less<int>());
+  BOOST_TEST(isHeap(a.data(), a.data() + 4, Less<int>()));
+  BOOST_TEST(!isHeap(a.data(), a.data() + 5, Less<int>()));
+  Kokkos::Array<int, 5> ref = {8, 5, 4, 3, 11};
+  BOOST_TEST(a == ref, tt::per_element());
+}
+
+BOOST_AUTO_TEST_CASE(max_heap)
+{
+  // Here attempting to reproduce examples code from cppreference.com for
+  // std::push_heap() and std::pop_heap().  It turns out that calling
+  // std::make_heap() on { 3, 1, 4, 1, 5, 9 } is not equivalent to inserting
+  // one element at a time (I also tried to insert them in reverse order out
+  // of curiosity) and yields 9 5 4 1 1 3 :/
+  // cpluplus.com does make a note that the order of the elements will depend
+  // on implementation.
+  // Nevertheless, I thought it helps understanding how the algorithm works so
+  // I decided to keep it as a unit test.
+  Kokkos::Array<int, 7> a = {3, 1, 4, 1, 5, 9, 6};
+  Kokkos::Array<int, 7> ref;
+
+  pushHeap(a.data(), a.data() + 0, Less<int>());
+  ref = {3, 1, 4, 1, 5, 9, 6};
+  BOOST_TEST(a == ref, tt::per_element());
+
+  pushHeap(a.data(), a.data() + 1, Less<int>());
+  ref = {3, 1, 4, 1, 5, 9, 6};
+  BOOST_TEST(a == ref, tt::per_element());
+
+  pushHeap(a.data(), a.data() + 2, Less<int>());
+  ref = {3, 1, 4, 1, 5, 9, 6};
+  BOOST_TEST(a == ref, tt::per_element());
+
+  pushHeap(a.data(), a.data() + 3, Less<int>());
+  ref = {4, 1, 3, 1, 5, 9, 6};
+  BOOST_TEST(a == ref, tt::per_element());
+
+  pushHeap(a.data(), a.data() + 4, Less<int>());
+  ref = {4, 1, 3, 1, 5, 9, 6};
+  BOOST_TEST(a == ref, tt::per_element());
+
+  pushHeap(a.data(), a.data() + 5, Less<int>());
+  ref = {5, 4, 3, 1, 1, 9, 6};
+  BOOST_TEST(a == ref, tt::per_element());
+
+  pushHeap(a.data(), a.data() + 6, Less<int>());
+  ref = {9, 4, 5, 1, 1, 3, 6};
+  BOOST_TEST(a == ref, tt::per_element());
+
+  popHeap(a.data(), a.data() + 6, Less<int>());
+  ref = {5, 4, 3, 1, 1, 9, 6};
+  BOOST_TEST(a == ref, tt::per_element());
+
+  pushHeap(a.data(), a.data() + 6, Less<int>());
+  ref = {9, 4, 5, 1, 1, 3, 6};
+  BOOST_TEST(a == ref, tt::per_element());
+
+  pushHeap(a.data(), a.data() + 7, Less<int>());
+  ref = {9, 4, 6, 1, 1, 3, 5};
+  BOOST_TEST(a == ref, tt::per_element());
+}
+
+BOOST_AUTO_TEST_CASE(min_heap)
+{
+  // Here reproducing the example of a binary min heap from Wikipedia and then
+  // popping all elements one by one.
+  // This helped resolving an issue with ProprityQueue::pop() that was not
+  // exposed by other unit tests in this file, partly because they were too
+  // trivial.  The bug was only showing with real kNN search problems when
+  // comparing results from BoundingVolumeHierarchy with boost::rtree.
+  Kokkos::Array<int, 9> a = {1, 2, 3, 17, 19, 36, 7, 25, 100};
+  Kokkos::Array<int, 9> ref;
+  for (int i = 0; i < 9; ++i)
+  {
+    pushHeap(a.data(), a.data() + i, Greater<int>());
+    ref = {1, 2, 3, 17, 19, 36, 7, 25, 100};
+    BOOST_TEST(a == ref, tt::per_element());
+  }
+
+  popHeap(a.data(), a.data() + 9, Greater<int>());
+  ref = {2, 17, 3, 25, 19, 36, 7, 100, 1};
+  BOOST_TEST(a == ref, tt::per_element());
+
+  popHeap(a.data(), a.data() + 8, Greater<int>());
+  ref = {3, 17, 7, 25, 19, 36, 100, 2, 1};
+  BOOST_TEST(a == ref, tt::per_element());
+
+  popHeap(a.data(), a.data() + 7, Greater<int>());
+  ref = {7, 17, 36, 25, 19, 100, 3, 2, 1};
+  BOOST_TEST(a == ref, tt::per_element());
+
+  popHeap(a.data(), a.data() + 6, Greater<int>());
+  ref = {17, 19, 36, 25, 100, 7, 3, 2, 1};
+  BOOST_TEST(a == ref, tt::per_element());
+
+  popHeap(a.data(), a.data() + 5, Greater<int>());
+  ref = {19, 25, 36, 100, 17, 7, 3, 2, 1};
+  BOOST_TEST(a == ref, tt::per_element());
+
+  popHeap(a.data(), a.data() + 4, Greater<int>());
+  ref = {25, 100, 36, 19, 17, 7, 3, 2, 1};
+  BOOST_TEST(a == ref, tt::per_element());
+
+  popHeap(a.data(), a.data() + 3, Greater<int>());
+  ref = {36, 100, 25, 19, 17, 7, 3, 2, 1};
+  BOOST_TEST(a == ref, tt::per_element());
+
+  popHeap(a.data(), a.data() + 2, Greater<int>());
+  ref = {100, 36, 25, 19, 17, 7, 3, 2, 1};
+  BOOST_TEST(a == ref, tt::per_element());
+
+  popHeap(a.data(), a.data() + 1, Greater<int>());
+  ref = {100, 36, 25, 19, 17, 7, 3, 2, 1};
+  BOOST_TEST(a == ref, tt::per_element());
+
+  popHeap(a.data(), a.data() + 0, Greater<int>());
+  ref = {100, 36, 25, 19, 17, 7, 3, 2, 1};
+  BOOST_TEST(a == ref, tt::per_element());
+}
+
+BOOST_AUTO_TEST_CASE(make_heap)
+{
+  for (auto v : {
+           std::vector<int>{}, std::vector<int>{6}, std::vector<int>{2, 1},
+           std::vector<int>{1, 6, 2, 2, 9, 4, 16},
+           std::vector<int>{8, 6, 7, 2, 0}, std::vector<int>{3, 3, 3, 3, 3, 1},
+           std::vector<int>{36, 19, 25, 17, 3, 7, 1, 2, 9}, // <- already a heap
+       })
+  {
+    makeHeap(v.data(), v.data() + v.size(), Less<int>());
+    BOOST_TEST(std::is_heap(v.begin(), v.end()));
+  }
+}
+
+BOOST_AUTO_TEST_CASE(sort_heap)
+{
+  for (auto heap : {std::vector<int>{}, std::vector<int>{3},
+                    std::vector<int>{36, 19, 25, 17, 3, 7, 1, 2, 9},
+                    std::vector<int>{36, 19, 25, 17, 3, 9, 1, 2, 7},
+                    std::vector<int>{100, 19, 36, 17, 3, 25, 1, 2, 7},
+                    std::vector<int>{15, 5, 11, 3, 4, 8}})
+  {
+    sortHeap(heap.data(), heap.data() + heap.size(), Less<int>());
+    // std::sort_heap( heap.begin(), heap.end() );
+    BOOST_TEST(std::is_sorted(heap.begin(), heap.end()));
+  }
+}
+
+BOOST_AUTO_TEST_CASE(is_heap)
+{
+  for (auto heap : {std::vector<int>{36, 19, 25, 17, 3, 7, 1, 2, 9},
+                    std::vector<int>{36, 19, 25, 17, 3, 9, 1, 2, 7},
+                    std::vector<int>{100, 19, 36, 17, 3, 25, 1, 2, 7},
+                    std::vector<int>{15, 5, 11, 3, 4, 8}})
+  {
+    BOOST_TEST(isHeap(heap.data(), heap.data() + heap.size(), Less<int>()));
+  }
+  for (auto not_heap : {std::vector<int>{0, 1, 2, 3, 4, 3, 2, 1, 0},
+                        std::vector<int>{2, 1, 0, 1, 2}})
+  {
+    BOOST_TEST(!isHeap(not_heap.data(), not_heap.data() + not_heap.size(),
+                       Less<int>()));
+  }
+}
+
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/arborx/test/tstKDOP.cpp b/arborx/test/tstKDOP.cpp
new file mode 100644
index 000000000..c1154b7a0
--- /dev/null
+++ b/arborx/test/tstKDOP.cpp
@@ -0,0 +1,143 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#include <ArborX_DetailsAlgorithms.hpp>
+#include <ArborX_KDOP.hpp>
+
+#include "BoostTest_CUDA_clang_workarounds.hpp"
+#include <boost/test/unit_test.hpp>
+
+#include <tuple>
+#include <type_traits>
+
+using ArborX::Box;
+using ArborX::Point;
+using ArborX::Experimental::KDOP;
+
+using KDOP_types = std::tuple<KDOP<6>, KDOP<14>, KDOP<18>, KDOP<26>>;
+
+BOOST_AUTO_TEST_SUITE(DiscreteOrientedPolytopes)
+
+BOOST_AUTO_TEST_CASE_TEMPLATE(conversion_to_box, KDOP_t, KDOP_types)
+{
+  using ArborX::Details::equals;
+  KDOP_t x;
+  BOOST_TEST(equals((Box)x, Box{}));
+  x += Point{0, 1, 0};
+  x += Point{1, 0, 1};
+  BOOST_TEST(equals((Box)x, Box{{0, 0, 0}, {1, 1, 1}}));
+}
+
+BOOST_AUTO_TEST_CASE_TEMPLATE(intersects_KDOP, KDOP_t, KDOP_types)
+{
+  KDOP_t x;
+  BOOST_TEST(!intersects(x, x));
+  x += Point{1, 0, 0};
+  x += Point{0, 1, 0};
+  x += Point{0, 0, 1};
+  BOOST_TEST(intersects(x, x));
+  BOOST_TEST(!intersects(x, KDOP_t{}));
+}
+
+BOOST_AUTO_TEST_CASE_TEMPLATE(intersects_box, KDOP_t, KDOP_types)
+{
+  KDOP_t x;
+  BOOST_TEST(!intersects(x, Box{}));
+  BOOST_TEST(!intersects(x, Box{{0, 0, 0}, {1, 1, 1}}));
+  x += Point{1, 0, 0};
+  x += Point{0, 1, 0};
+  x += Point{0, 0, 1};
+  BOOST_TEST(!intersects(x, Box{}));
+  BOOST_TEST(intersects(x, Box{{0, 0, 0}, {1, 1, 1}}));
+}
+
+BOOST_AUTO_TEST_CASE_TEMPLATE(intersects_point, KDOP_t, KDOP_types)
+{
+  {
+    KDOP_t x;
+    BOOST_TEST(!intersects(Point{1, 1, 1}, x));
+  }
+  {
+    KDOP_t x; // unit cube with (1,1,0)--(1,1,1) edge chopped away
+    // bottom face
+    x += Point(0, 0, 0);
+    x += Point(1, 0, 0);
+    x += Point(1, 0.75, 0);
+    x += Point(0.75, 1, 0);
+    x += Point(0, 1, 0);
+    // top
+    x += Point(0, 0, 1);
+    x += Point(1, 0, 1);
+    x += Point(1, 0.75, 1);
+    x += Point(0.75, 1, 1);
+    x += Point(0, 1, 1);
+    // test intersection with point on the missing edge
+    BOOST_TEST(intersects(Point{1, 1, 0.5}, x) ==
+               (std::is_same<KDOP_t, KDOP<6>>::value ||
+                std::is_same<KDOP_t, KDOP<14>>::value));
+    BOOST_TEST(intersects(Point{1, 1, 0.625}, x) ==
+               (std::is_same<KDOP_t, KDOP<6>>::value ||
+                std::is_same<KDOP_t, KDOP<14>>::value));
+    BOOST_TEST(intersects(Point{1, 1, 0.375}, x) ==
+               (std::is_same<KDOP_t, KDOP<6>>::value ||
+                std::is_same<KDOP_t, KDOP<14>>::value));
+    BOOST_TEST(intersects(Point{1, 1, 0.875}, x) ==
+               (std::is_same<KDOP_t, KDOP<6>>::value));
+    BOOST_TEST(intersects(Point{1, 1, 0.125}, x) ==
+               (std::is_same<KDOP_t, KDOP<6>>::value));
+    // with both ends of the edge
+    BOOST_TEST(intersects(Point{1, 1, 0}, x) ==
+               (std::is_same<KDOP_t, KDOP<6>>::value));
+    BOOST_TEST(intersects(Point{1, 1, 1}, x) ==
+               (std::is_same<KDOP_t, KDOP<6>>::value));
+    // with centroid of unit cube
+    BOOST_TEST(intersects(Point{0.5, 0.5, 0.5}, x));
+    // with some point outside the unit cube
+    BOOST_TEST(!intersects(Point{1, 2, 3}, x));
+  }
+  {
+    KDOP_t x; // unit cube with (1,1,1) corner cut off
+    // bottom face
+    x += Point(0, 0, 0);
+    x += Point(1, 0, 0);
+    x += Point(1, 1, 0);
+    x += Point(0, 1, 0);
+    // top
+    x += Point(0, 0, 1);
+    x += Point(1, 0, 1);
+    x += Point(1, 0.75, 1);
+    x += Point(0.75, 1, 1);
+    x += Point(0, 1, 1);
+    // test intersection with center of the missing corner
+    BOOST_TEST(intersects(Point{1, 1, 1}, x) ==
+               (std::is_same<KDOP_t, KDOP<6>>::value ||
+                std::is_same<KDOP_t, KDOP<18>>::value));
+    // test with points on the edges out of that corner
+    BOOST_TEST(intersects(Point{0.5, 1, 1}, x));
+    BOOST_TEST(intersects(Point{0.875, 1, 1}, x) ==
+               (std::is_same<KDOP_t, KDOP<6>>::value ||
+                std::is_same<KDOP_t, KDOP<18>>::value));
+    BOOST_TEST(intersects(Point{1, 0.5, 1}, x));
+    BOOST_TEST(intersects(Point{1, 0.875, 1}, x) ==
+               (std::is_same<KDOP_t, KDOP<6>>::value ||
+                std::is_same<KDOP_t, KDOP<18>>::value));
+    BOOST_TEST(intersects(Point{1, 1, 0.5}, x));
+    BOOST_TEST(intersects(Point{1, 1, 0.875}, x) ==
+               (std::is_same<KDOP_t, KDOP<6>>::value ||
+                std::is_same<KDOP_t, KDOP<18>>::value));
+    // with centroid of unit cube
+    BOOST_TEST(intersects(Point{0.5, 0.5, 0.5}, x));
+    // with some point outside the unit cube
+    BOOST_TEST(!intersects(Point{1, 2, 3}, x));
+  }
+}
+
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/arborx/test/tstKokkosToolsAnnotations.cpp b/arborx/test/tstKokkosToolsAnnotations.cpp
new file mode 100644
index 000000000..04103620c
--- /dev/null
+++ b/arborx/test/tstKokkosToolsAnnotations.cpp
@@ -0,0 +1,249 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#include "ArborX_EnableDeviceTypes.hpp" // ARBORX_DEVICE_TYPES
+#include <ArborX_LinearBVH.hpp>
+
+#include <boost/test/unit_test.hpp>
+
+#include <string>
+
+#include "Search_UnitTestHelpers.hpp"
+
+#if (KOKKOS_VERSION >= 30200) // callback registriation from within the program
+                              // was added in Kokkkos v3.2
+
+BOOST_AUTO_TEST_SUITE(KokkosToolsAnnotations)
+
+namespace tt = boost::test_tools;
+
+bool isPrefixedWith(std::string const &s, std::string const &prefix)
+{
+  return s.find(prefix) == 0;
+}
+
+BOOST_AUTO_TEST_CASE(is_prefixed_with)
+{
+  BOOST_TEST(isPrefixedWith("ArborX::Whatever", "ArborX"));
+  BOOST_TEST(!isPrefixedWith("Nope", "ArborX"));
+  BOOST_TEST(!isPrefixedWith("Nope::ArborX", "ArborX"));
+}
+
+BOOST_AUTO_TEST_CASE_TEMPLATE(bvh_bvh_allocations_prefixed, DeviceType,
+                              ARBORX_DEVICE_TYPES)
+{
+  using Tree = ArborX::BVH<typename DeviceType::memory_space>;
+  using ExecutionSpace = typename DeviceType::execution_space;
+
+  Kokkos::Tools::Experimental::set_allocate_data_callback(
+      [](Kokkos::Profiling::SpaceHandle /*handle*/, const char *label,
+         void const * /*ptr*/, uint64_t /*size*/) {
+        BOOST_TEST_MESSAGE(label);
+        BOOST_TEST(
+            (isPrefixedWith(label, "ArborX::BVH::") || // data member
+             isPrefixedWith(label, "ArborX::BVH::BVH::") ||
+             isPrefixedWith(label, "ArborX::Sorting::") ||
+             isPrefixedWith(label, "Kokkos::SortImpl::BinSortFunctor::") ||
+             isPrefixedWith(label,
+                            "Kokkos::Serial::") || // unsure what's going on
+             isPrefixedWith(label, "Testing::")));
+      });
+
+  { // default constructed
+    Tree tree;
+  }
+
+  { // empty
+    auto tree = make<Tree>(ExecutionSpace{}, {});
+  }
+
+  { // one leaf
+    auto tree = make<Tree>(ExecutionSpace{}, {
+                                                 {{{0, 0, 0}}, {{1, 1, 1}}},
+                                             });
+  }
+
+  { // two leaves
+    auto tree = make<Tree>(ExecutionSpace{}, {
+                                                 {{{0, 0, 0}}, {{1, 1, 1}}},
+                                                 {{{0, 0, 0}}, {{1, 1, 1}}},
+                                             });
+  }
+
+  Kokkos::Tools::Experimental::set_allocate_data_callback(nullptr);
+}
+
+BOOST_AUTO_TEST_CASE_TEMPLATE(bvh_query_allocations_prefixed, DeviceType,
+                              ARBORX_DEVICE_TYPES)
+{
+  using ExecutionSpace = typename DeviceType::execution_space;
+
+  auto tree = make<ArborX::BVH<typename DeviceType::memory_space>>(
+      ExecutionSpace{}, {
+                            {{{0, 0, 0}}, {{1, 1, 1}}},
+                            {{{0, 0, 0}}, {{1, 1, 1}}},
+                        });
+
+  Kokkos::Tools::Experimental::set_allocate_data_callback(
+      [](Kokkos::Profiling::SpaceHandle /*handle*/, const char *label,
+         void const * /*ptr*/, uint64_t /*size*/) {
+        BOOST_TEST_MESSAGE(label);
+        BOOST_TEST(
+            (isPrefixedWith(label, "ArborX::BVH::query::") ||
+             isPrefixedWith(label, "ArborX::TreeTraversal::spatial::") ||
+             isPrefixedWith(label, "ArborX::TreeTraversal::nearest::") ||
+             isPrefixedWith(label, "ArborX::CrsGraphWrapper::") ||
+             isPrefixedWith(label, "ArborX::Sorting::") ||
+             isPrefixedWith(label, "Kokkos::SortImpl::BinSortFunctor::") ||
+             isPrefixedWith(label, "Testing::")));
+      });
+
+  // spatial predicates
+  query(ExecutionSpace{}, tree,
+        makeIntersectsBoxQueries<DeviceType>({
+            {{{0, 0, 0}}, {{1, 1, 1}}},
+            {{{0, 0, 0}}, {{1, 1, 1}}},
+        }));
+
+  // nearest predicates
+  query(ExecutionSpace{}, tree,
+        makeNearestQueries<DeviceType>({
+            {{{0, 0, 0}}, 1},
+            {{{0, 0, 0}}, 2},
+        }));
+
+  Kokkos::Tools::Experimental::set_allocate_data_callback(nullptr);
+}
+
+BOOST_AUTO_TEST_CASE_TEMPLATE(kernels_prefixed, DeviceType, ARBORX_DEVICE_TYPES)
+{
+  using Tree = ArborX::BVH<typename DeviceType::memory_space>;
+  using ExecutionSpace = typename DeviceType::execution_space;
+
+  auto const callback = [](char const *label, uint32_t, uint64_t *) {
+    BOOST_TEST_MESSAGE(label);
+    BOOST_TEST((isPrefixedWith(label, "ArborX::") ||
+                isPrefixedWith(label, "Kokkos::")));
+  };
+  Kokkos::Tools::Experimental::set_begin_parallel_for_callback(callback);
+  Kokkos::Tools::Experimental::set_begin_parallel_scan_callback(callback);
+  Kokkos::Tools::Experimental::set_begin_parallel_reduce_callback(callback);
+
+  // BVH::BVH
+
+  { // default constructed
+    Tree tree;
+  }
+
+  { // empty
+    auto tree = make<Tree>(ExecutionSpace{}, {});
+  }
+
+  { // one leaf
+    auto tree = make<Tree>(ExecutionSpace{}, {
+                                                 {{{0, 0, 0}}, {{1, 1, 1}}},
+                                             });
+  }
+
+  { // two leaves
+    auto tree = make<Tree>(ExecutionSpace{}, {
+                                                 {{{0, 0, 0}}, {{1, 1, 1}}},
+                                                 {{{0, 0, 0}}, {{1, 1, 1}}},
+                                             });
+  }
+
+  // BVH::query
+
+  auto tree = make<Tree>(ExecutionSpace{}, {
+                                               {{{0, 0, 0}}, {{1, 1, 1}}},
+                                               {{{0, 0, 0}}, {{1, 1, 1}}},
+                                           });
+
+  // spatial predicates
+  query(ExecutionSpace{}, tree,
+        makeIntersectsBoxQueries<DeviceType>({
+            {{{0, 0, 0}}, {{1, 1, 1}}},
+            {{{0, 0, 0}}, {{1, 1, 1}}},
+        }));
+
+  // nearest predicates
+  query(ExecutionSpace{}, tree,
+        makeNearestQueries<DeviceType>({
+            {{{0, 0, 0}}, 1},
+            {{{0, 0, 0}}, 2},
+        }));
+
+  Kokkos::Tools::Experimental::set_begin_parallel_for_callback(nullptr);
+  Kokkos::Tools::Experimental::set_begin_parallel_scan_callback(nullptr);
+  Kokkos::Tools::Experimental::set_begin_parallel_reduce_callback(nullptr);
+}
+
+BOOST_AUTO_TEST_CASE_TEMPLATE(regions_prefixed, DeviceType, ARBORX_DEVICE_TYPES)
+{
+  using Tree = ArborX::BVH<typename DeviceType::memory_space>;
+  using ExecutionSpace = typename DeviceType::execution_space;
+
+  Kokkos::Tools::Experimental::set_push_region_callback([](char const *label) {
+    BOOST_TEST_MESSAGE(label);
+    BOOST_TEST((isPrefixedWith(label, "ArborX::") ||
+                isPrefixedWith(label, "Kokkos::")));
+  });
+
+  // BVH::BVH
+
+  { // default constructed
+    Tree tree;
+  }
+
+  { // empty
+    auto tree = make<Tree>(ExecutionSpace{}, {});
+  }
+
+  { // one leaf
+    auto tree = make<Tree>(ExecutionSpace{}, {
+                                                 {{{0, 0, 0}}, {{1, 1, 1}}},
+                                             });
+  }
+
+  { // two leaves
+    auto tree = make<Tree>(ExecutionSpace{}, {
+                                                 {{{0, 0, 0}}, {{1, 1, 1}}},
+                                                 {{{0, 0, 0}}, {{1, 1, 1}}},
+                                             });
+  }
+
+  // BVH::query
+
+  auto tree = make<Tree>(ExecutionSpace{}, {
+                                               {{{0, 0, 0}}, {{1, 1, 1}}},
+                                               {{{0, 0, 0}}, {{1, 1, 1}}},
+                                           });
+
+  // spatial predicates
+  query(ExecutionSpace{}, tree,
+        makeIntersectsBoxQueries<DeviceType>({
+            {{{0, 0, 0}}, {{1, 1, 1}}},
+            {{{0, 0, 0}}, {{1, 1, 1}}},
+        }));
+
+  // nearest predicates
+  query(ExecutionSpace{}, tree,
+        makeNearestQueries<DeviceType>({
+            {{{0, 0, 0}}, 1},
+            {{{0, 0, 0}}, 2},
+        }));
+
+  Kokkos::Tools::Experimental::set_push_region_callback(nullptr);
+}
+
+BOOST_AUTO_TEST_SUITE_END()
+
+#endif
diff --git a/arborx/test/tstKokkosToolsDistributedAnnotations.cpp b/arborx/test/tstKokkosToolsDistributedAnnotations.cpp
new file mode 100644
index 000000000..c145c6516
--- /dev/null
+++ b/arborx/test/tstKokkosToolsDistributedAnnotations.cpp
@@ -0,0 +1,197 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#include "ArborX_EnableDeviceTypes.hpp" // ARBORX_DEVICE_TYPES
+#include <ArborX_DistributedTree.hpp>
+
+#include <boost/test/unit_test.hpp>
+
+#include <string>
+
+#include "Search_UnitTestHelpers.hpp"
+
+#if (KOKKOS_VERSION >= 30200) // callback registriation from within the program
+                              // was added in Kokkkos v3.2
+
+BOOST_AUTO_TEST_SUITE(KokkosToolsDistributedAnnotations)
+
+namespace tt = boost::test_tools;
+
+bool isPrefixedWith(std::string const &s, std::string const &prefix)
+{
+  return s.find(prefix) == 0;
+}
+
+BOOST_AUTO_TEST_CASE(is_prefixed_with)
+{
+  BOOST_TEST(isPrefixedWith("ArborX::Whatever", "ArborX"));
+  BOOST_TEST(!isPrefixedWith("Nope", "ArborX"));
+  BOOST_TEST(!isPrefixedWith("Nope::ArborX", "ArborX"));
+}
+
+BOOST_AUTO_TEST_CASE_TEMPLATE(
+    distributed_search_tree_distributed_search_tree_allocations_prefixed,
+    DeviceType, ARBORX_DEVICE_TYPES)
+{
+  auto tree = makeDistributedTree<DeviceType>(MPI_COMM_WORLD,
+                                              {
+                                                  {{{0, 0, 0}}, {{1, 1, 1}}},
+                                                  {{{0, 0, 0}}, {{1, 1, 1}}},
+                                              });
+
+  Kokkos::Tools::Experimental::set_allocate_data_callback(
+      [](Kokkos::Profiling::SpaceHandle /*handle*/, const char *label,
+         void const * /*ptr*/, uint64_t /*size*/) {
+        BOOST_TEST_MESSAGE(label);
+        BOOST_TEST((isPrefixedWith(label, "ArborX::DistributedTree::") ||
+                    isPrefixedWith(label, "ArborX::BVH::") ||
+                    isPrefixedWith(label, "ArborX::Sorting::") ||
+                    isPrefixedWith(label, "Testing::")));
+      });
+
+  { // one leaf per process
+    auto tree = makeDistributedTree<DeviceType>(MPI_COMM_WORLD,
+                                                {
+                                                    {{{0, 0, 0}}, {{1, 1, 1}}},
+                                                });
+  }
+
+  Kokkos::Tools::Experimental::set_allocate_data_callback(nullptr);
+}
+
+BOOST_AUTO_TEST_CASE_TEMPLATE(
+    distributed_search_tree_query_allocations_prefixed, DeviceType,
+    ARBORX_DEVICE_TYPES)
+{
+  using ExecutionSpace = typename DeviceType::execution_space;
+
+  auto tree = makeDistributedTree<DeviceType>(MPI_COMM_WORLD,
+                                              {
+                                                  {{{0, 0, 0}}, {{1, 1, 1}}},
+                                                  {{{0, 0, 0}}, {{1, 1, 1}}},
+                                              });
+
+  Kokkos::Tools::Experimental::set_allocate_data_callback(
+      [](Kokkos::Profiling::SpaceHandle /*handle*/, const char *label,
+         void const * /*ptr*/, uint64_t /*size*/) {
+        BOOST_TEST_MESSAGE(label);
+        BOOST_TEST((isPrefixedWith(label, "ArborX::DistributedTree::query::") ||
+                    isPrefixedWith(label, "ArborX::Distributor::") ||
+                    isPrefixedWith(label, "ArborX::BVH::query::") ||
+                    isPrefixedWith(label, "ArborX::TreeTraversal::spatial::") ||
+                    isPrefixedWith(label, "ArborX::TreeTraversal::nearest::") ||
+                    isPrefixedWith(label, "ArborX::CrsGraphWrapper::") ||
+                    isPrefixedWith(label, "ArborX::Sorting::") ||
+                    isPrefixedWith(label, "Kokkos::SortImpl::") ||
+                    isPrefixedWith(label, "Testing::")));
+      });
+
+  // spatial predicates
+  query(ExecutionSpace{}, tree,
+        makeIntersectsBoxQueries<DeviceType>({
+            {{{0, 0, 0}}, {{1, 1, 1}}},
+            {{{0, 0, 0}}, {{1, 1, 1}}},
+        }));
+
+  // nearest predicates
+  query(ExecutionSpace{}, tree,
+        makeNearestQueries<DeviceType>({
+            {{{0, 0, 0}}, 1},
+            {{{0, 0, 0}}, 2},
+        }));
+
+  Kokkos::Tools::Experimental::set_allocate_data_callback(nullptr);
+}
+
+BOOST_AUTO_TEST_CASE_TEMPLATE(kernels_prefixed, DeviceType, ARBORX_DEVICE_TYPES)
+{
+  using ExecutionSpace = typename DeviceType::execution_space;
+
+  auto const callback = [](char const *label, uint32_t, uint64_t *) {
+    BOOST_TEST_MESSAGE(label);
+    BOOST_TEST((isPrefixedWith(label, "ArborX::") ||
+                isPrefixedWith(label, "Kokkos::")));
+  };
+  Kokkos::Tools::Experimental::set_begin_parallel_for_callback(callback);
+  Kokkos::Tools::Experimental::set_begin_parallel_scan_callback(callback);
+  Kokkos::Tools::Experimental::set_begin_parallel_reduce_callback(callback);
+
+  // DistributedTree::query
+
+  auto tree = makeDistributedTree<DeviceType>(MPI_COMM_WORLD,
+                                              {
+                                                  {{{0, 0, 0}}, {{1, 1, 1}}},
+                                                  {{{0, 0, 0}}, {{1, 1, 1}}},
+                                              });
+
+  // spatial predicates
+  query(ExecutionSpace{}, tree,
+        makeIntersectsBoxQueries<DeviceType>({
+            {{{0, 0, 0}}, {{1, 1, 1}}},
+            {{{0, 0, 0}}, {{1, 1, 1}}},
+        }));
+
+  // nearest predicates
+  query(ExecutionSpace{}, tree,
+        makeNearestQueries<DeviceType>({
+            {{{0, 0, 0}}, 1},
+            {{{0, 0, 0}}, 2},
+        }));
+
+  Kokkos::Tools::Experimental::set_begin_parallel_for_callback(nullptr);
+  Kokkos::Tools::Experimental::set_begin_parallel_scan_callback(nullptr);
+  Kokkos::Tools::Experimental::set_begin_parallel_reduce_callback(nullptr);
+}
+
+BOOST_AUTO_TEST_CASE_TEMPLATE(regions_prefixed, DeviceType, ARBORX_DEVICE_TYPES)
+{
+  using ExecutionSpace = typename DeviceType::execution_space;
+
+  Kokkos::Tools::Experimental::set_push_region_callback([](char const *label) {
+    BOOST_TEST_MESSAGE(label);
+    BOOST_TEST((isPrefixedWith(label, "ArborX::") ||
+                isPrefixedWith(label, "Kokkos::")));
+  });
+
+  // DistributedTree::DistriibutedSearchTree
+
+  { // empty
+    auto tree = makeDistributedTree<DeviceType>(MPI_COMM_WORLD, {});
+  }
+
+  // DistributedTree::query
+
+  auto tree = makeDistributedTree<DeviceType>(MPI_COMM_WORLD,
+                                              {
+                                                  {{{0, 0, 0}}, {{1, 1, 1}}},
+                                                  {{{0, 0, 0}}, {{1, 1, 1}}},
+                                              });
+
+  // spatial predicates
+  query(ExecutionSpace{}, tree,
+        makeIntersectsBoxQueries<DeviceType>({
+            {{{0, 0, 0}}, {{1, 1, 1}}},
+            {{{0, 0, 0}}, {{1, 1, 1}}},
+        }));
+
+  // nearest predicates
+  query(ExecutionSpace{}, tree,
+        makeNearestQueries<DeviceType>({
+            {{{0, 0, 0}}, 1},
+            {{{0, 0, 0}}, 2},
+        }));
+
+  Kokkos::Tools::Experimental::set_push_region_callback(nullptr);
+}
+
+BOOST_AUTO_TEST_SUITE_END()
+
+#endif
diff --git a/arborx/test/tstPriorityQueueMiscellaneous.cpp b/arborx/test/tstPriorityQueueMiscellaneous.cpp
new file mode 100644
index 000000000..d5545d9a1
--- /dev/null
+++ b/arborx/test/tstPriorityQueueMiscellaneous.cpp
@@ -0,0 +1,144 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#include <ArborX_DetailsPriorityQueue.hpp>
+
+#include <boost/test/unit_test.hpp>
+
+#include <random>
+
+using ArborX::Details::PriorityQueue;
+
+namespace tt = boost::test_tools;
+
+// NOTE The tests below check that the priority queue invariant is maintained
+// while inserting and removing elements into the queue.  They rely on a hack
+// (reinterpret_cast) to access the underlying container.
+BOOST_AUTO_TEST_SUITE(PriorityQueueMiscellaneous)
+
+template <typename PriorityQueue>
+void check_heap(PriorityQueue const &queue,
+                std::vector<typename PriorityQueue::value_type> const &heap_ref)
+{
+  auto const size = queue.size();
+  BOOST_TEST(size == static_cast<decltype(size)>(heap_ref.size()));
+
+  // NOTE Shameless hack to inspect the private data of the priority queue.
+  // Will break if data is reordered in the PriorityQueue class declaration.
+  auto heap =
+      reinterpret_cast<typename PriorityQueue::value_type const *>(&queue);
+  for (typename PriorityQueue::size_type i = 0; i < size; ++i)
+    BOOST_TEST(heap[i] == heap_ref[i]);
+}
+
+BOOST_AUTO_TEST_CASE(pop_push)
+{
+  // note that calling pop_push(x) does not necessarily yield the same heap
+  // than calling consecutively pop() and push(x)
+  // below is a max heap example to illustrate this interesting property
+  PriorityQueue<int> queue;
+
+  std::vector<int> ref = {100, 19, 36, 17, 3, 25, 1, 2, 7};
+  for (auto x : ref)
+    queue.push(x);
+  check_heap(queue, ref);
+
+  queue.pop();
+  check_heap(queue, {36, 19, 25, 17, 3, 7, 1, 2});
+
+  queue.push(9);
+  check_heap(queue, {36, 19, 25, 17, 3, 7, 1, 2, 9});
+  //                                    ^^       ^^
+
+  // Clear the content of the queue
+  queue = PriorityQueue<int>();
+  for (auto x : ref)
+    queue.push(x);
+  check_heap(queue, ref);
+
+  queue.popPush(9);
+  check_heap(queue, {36, 19, 25, 17, 3, 9, 1, 2, 7});
+  //                                    ^^       ^^
+}
+
+template <typename PriorityQueue>
+void check_heap(PriorityQueue const &queue)
+{
+  using ValueType = typename PriorityQueue::value_type;
+  int const size = queue.size();
+  auto const compare = queue.valueComp();
+  auto heap = reinterpret_cast<ValueType const *>(&queue);
+  for (int i = 0; i < size; ++i)
+  {
+    int parent = (i - 1) / 2;
+    if (i > 0)
+      BOOST_TEST(!compare(heap[parent], heap[i]));
+    for (int child : {2 * i + 1, 2 * i + 2})
+      if (child < size)
+        BOOST_TEST(!compare(heap[i], heap[child]));
+  }
+}
+
+BOOST_AUTO_TEST_CASE(maintain_heap_properties)
+{
+  PriorityQueue<int> queue;
+
+  std::default_random_engine generator;
+  std::uniform_int_distribution<int> uniform_distribution(0, 100);
+
+  enum OperationType : int
+  {
+    POP,
+    PUSH,
+    POP_PUSH
+  };
+  std::discrete_distribution<int> discrete_distribution({POP, PUSH, POP_PUSH});
+
+  // initially insert a number of elements in the queue so that it is
+  // unlikely that an error will be raised (this would happen if pop() is
+  // called on an empty queue or push(x) on a queue that is already at maximum
+  // capacity)
+  for (int i = 0; i < 64; ++i)
+  {
+    queue.push(uniform_distribution(generator));
+    check_heap(queue);
+  }
+
+  // choose randomly whether to call pop(), push(x), or pop_push(x) and check
+  // that the heap properties are maintained
+  for (int i = 0; i < 512; ++i)
+  {
+    switch (discrete_distribution(generator))
+    {
+    case POP:
+      queue.pop();
+      break;
+    case PUSH:
+      queue.push(uniform_distribution(generator));
+      break;
+    case POP_PUSH:
+      queue.popPush(uniform_distribution(generator));
+      break;
+    default:
+      throw std::runtime_error("something went wrong");
+    }
+    check_heap(queue);
+  }
+
+  // remove all elements from the queue one by one
+  while (!queue.empty())
+  {
+    queue.pop();
+    check_heap(queue);
+  }
+}
+
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/arborx/test/tstQueryTreeCallbacks.cpp b/arborx/test/tstQueryTreeCallbacks.cpp
new file mode 100644
index 000000000..919d8117f
--- /dev/null
+++ b/arborx/test/tstQueryTreeCallbacks.cpp
@@ -0,0 +1,343 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#include <boost/test/unit_test.hpp>
+
+#include <numeric>
+#include <vector>
+
+#include "Search_UnitTestHelpers.hpp"
+// clang-format off
+#include "ArborXTest_TreeTypeTraits.hpp"
+// clang-format on
+
+BOOST_AUTO_TEST_SUITE(Callbacks)
+
+namespace tt = boost::test_tools;
+
+template <typename DeviceType>
+struct CustomInlineCallback
+{
+  using tag = ArborX::Details::InlineCallbackTag;
+  Kokkos::View<ArborX::Point *, DeviceType> points;
+  ArborX::Point const origin = {{0., 0., 0.}};
+  template <typename Query, typename Insert>
+  KOKKOS_FUNCTION void operator()(Query const &, int index,
+                                  Insert const &insert) const
+  {
+    float const distance_to_origin =
+        ArborX::Details::distance(points(index), origin);
+    insert({index, distance_to_origin});
+  }
+};
+
+template <typename DeviceType>
+struct CustomPostCallback
+{
+  using tag = ArborX::Details::PostCallbackTag;
+  Kokkos::View<ArborX::Point *, DeviceType> points;
+  ArborX::Point const origin = {{0., 0., 0.}};
+  template <typename Predicates, typename InOutView, typename InView,
+            typename OutView>
+  void operator()(Predicates const &, InOutView &offset, InView in,
+                  OutView &out) const
+  {
+    using ExecutionSpace = typename DeviceType::execution_space;
+    using ArborX::Details::distance;
+    auto const n = offset.extent(0) - 1;
+    ArborX::reallocWithoutInitializing(out, in.extent(0));
+    // NOTE woraround to avoid implicit capture of *this
+    auto const &points_ = points;
+    auto const &origin_ = origin;
+    Kokkos::parallel_for(
+        Kokkos::RangePolicy<ExecutionSpace>(0, n), KOKKOS_LAMBDA(int i) {
+          for (int j = offset(i); j < offset(i + 1); ++j)
+          {
+            out(j) = {in(j), (float)distance(points_(in(j)), origin_)};
+          }
+        });
+  }
+};
+
+BOOST_AUTO_TEST_CASE_TEMPLATE(callback_spatial_predicate, TreeTypeTraits,
+                              TreeTypeTraitsList)
+{
+  using Tree = typename TreeTypeTraits::type;
+  using ExecutionSpace = typename TreeTypeTraits::execution_space;
+  using DeviceType = typename TreeTypeTraits::device_type;
+
+  int const n = 10;
+  Kokkos::View<ArborX::Point *, DeviceType> points(
+      Kokkos::view_alloc(Kokkos::WithoutInitializing, "points"), n);
+  ArborX::Point const origin = {{0., 0., 0.}};
+  Kokkos::parallel_for(Kokkos::RangePolicy<ExecutionSpace>(0, n),
+                       KOKKOS_LAMBDA(int i) {
+                         points(i) = {{(double)i, (double)i, (double)i}};
+                       });
+  auto points_host =
+      Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace{}, points);
+
+  std::vector<Kokkos::pair<int, float>> values;
+  values.reserve(n);
+  for (int i = 0; i < n; ++i)
+    values.emplace_back(i, ArborX::Details::distance(points_host(i), origin));
+  std::vector<int> offsets = {0, n};
+
+  Tree const tree(ExecutionSpace{}, points);
+
+  ARBORX_TEST_QUERY_TREE_CALLBACK(ExecutionSpace{}, tree,
+                                  makeIntersectsBoxQueries<DeviceType>({
+                                      static_cast<ArborX::Box>(tree.bounds()),
+                                  }),
+                                  CustomInlineCallback<DeviceType>{points},
+                                  make_compressed_storage(offsets, values));
+
+  ARBORX_TEST_QUERY_TREE_CALLBACK(ExecutionSpace{}, tree,
+                                  makeIntersectsBoxQueries<DeviceType>({
+                                      static_cast<ArborX::Box>(tree.bounds()),
+                                  }),
+                                  CustomPostCallback<DeviceType>{points},
+                                  make_compressed_storage(offsets, values));
+}
+
+#ifndef ARBORX_TEST_DISABLE_NEAREST_QUERY
+BOOST_AUTO_TEST_CASE_TEMPLATE(callback_nearest_predicate, TreeTypeTraits,
+                              TreeTypeTraitsList)
+{
+  using Tree = typename TreeTypeTraits::type;
+  using ExecutionSpace = typename TreeTypeTraits::execution_space;
+  using DeviceType = typename TreeTypeTraits::device_type;
+
+  int const n = 10;
+  Kokkos::View<ArborX::Point *, DeviceType> points(
+      Kokkos::view_alloc(Kokkos::WithoutInitializing, "points"), n);
+  ArborX::Point const origin = {{0., 0., 0.}};
+  Kokkos::parallel_for(Kokkos::RangePolicy<ExecutionSpace>(0, n),
+                       KOKKOS_LAMBDA(int i) {
+                         points(i) = {{(double)i, (double)i, (double)i}};
+                       });
+  auto points_host =
+      Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace{}, points);
+
+  std::vector<Kokkos::pair<int, float>> values;
+  values.reserve(n);
+  for (int i = 0; i < n; ++i)
+    values.emplace_back(i, ArborX::Details::distance(points_host(i), origin));
+  std::vector<int> offsets = {0, n};
+
+  Tree const tree(ExecutionSpace{}, points);
+
+  ARBORX_TEST_QUERY_TREE_CALLBACK(ExecutionSpace{}, tree,
+                                  makeNearestQueries<DeviceType>({
+                                      {origin, n},
+                                  }),
+                                  CustomInlineCallback<DeviceType>{points},
+                                  make_compressed_storage(offsets, values));
+
+  ARBORX_TEST_QUERY_TREE_CALLBACK(ExecutionSpace{}, tree,
+                                  makeNearestQueries<DeviceType>({
+                                      {origin, n},
+                                  }),
+                                  CustomPostCallback<DeviceType>{points},
+                                  make_compressed_storage(offsets, values));
+}
+#endif
+
+#ifndef ARBORX_TEST_DISABLE_CALLBACK_EARLY_EXIT
+template <class DeviceType>
+struct Experimental_CustomCallbackEarlyExit
+{
+  Kokkos::View<int *, DeviceType, Kokkos::MemoryTraits<Kokkos::Atomic>> counts;
+  template <class Predicate>
+  KOKKOS_FUNCTION auto operator()(Predicate const &predicate, int) const
+  {
+    int i = getData(predicate);
+
+    if (counts(i)++ < i)
+    {
+      return ArborX::CallbackTreeTraversalControl::normal_continuation;
+    }
+
+    return ArborX::CallbackTreeTraversalControl::early_exit;
+  }
+};
+
+BOOST_AUTO_TEST_CASE_TEMPLATE(callback_early_exit, TreeTypeTraits,
+                              TreeTypeTraitsList)
+{
+  using Tree = typename TreeTypeTraits::type;
+  using ExecutionSpace = typename TreeTypeTraits::execution_space;
+  using DeviceType = typename TreeTypeTraits::device_type;
+
+  auto const tree =
+      make<Tree>(ExecutionSpace{}, {
+                                       {{{0., 0., 0.}}, {{0., 0., 0.}}},
+                                       {{{1., 1., 1.}}, {{1., 1., 1.}}},
+                                       {{{2., 2., 2.}}, {{2., 2., 2.}}},
+                                       {{{3., 3., 3.}}, {{3., 3., 3.}}},
+                                   });
+
+  Kokkos::View<int *, DeviceType> counts("counts", 4);
+
+  std::vector<int> counts_ref(4);
+  std::iota(counts_ref.begin(), counts_ref.end(), 1);
+
+  auto b = static_cast<ArborX::Box>(tree.bounds());
+  auto predicates = makeIntersectsBoxWithAttachmentQueries<DeviceType, int>(
+      {b, b, b, b}, {0, 1, 2, 3});
+
+  tree.query(ExecutionSpace{}, predicates,
+             Experimental_CustomCallbackEarlyExit<DeviceType>{counts});
+
+  auto counts_host =
+      Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace{}, counts);
+
+  BOOST_TEST(counts_host == counts_ref, tt::per_element());
+}
+#endif
+
+template <typename DeviceType>
+struct CustomInlineCallbackWithAttachment
+{
+  using tag = ArborX::Details::InlineCallbackTag;
+  Kokkos::View<ArborX::Point *, DeviceType> points;
+  ArborX::Point const origin = {{0., 0., 0.}};
+  template <typename Query, typename Insert>
+  KOKKOS_FUNCTION void operator()(Query const &query, int index,
+                                  Insert const &insert) const
+  {
+    float const distance_to_origin =
+        ArborX::Details::distance(points(index), origin);
+
+    auto data = ArborX::getData(query);
+    insert({index, data + distance_to_origin});
+  }
+};
+template <typename DeviceType>
+struct CustomPostCallbackWithAttachment
+{
+  using tag = ArborX::Details::PostCallbackTag;
+  Kokkos::View<ArborX::Point *, DeviceType> points;
+  ArborX::Point const origin = {{0., 0., 0.}};
+  template <typename Predicates, typename InOutView, typename InView,
+            typename OutView>
+  void operator()(Predicates const &queries, InOutView &offset, InView in,
+                  OutView &out) const
+  {
+    using ExecutionSpace = typename DeviceType::execution_space;
+    using ArborX::Details::distance;
+    auto const n = offset.extent(0) - 1;
+    ArborX::reallocWithoutInitializing(out, in.extent(0));
+    // NOTE workaround to avoid implicit capture of *this
+    auto const &points_ = points;
+    auto const &origin_ = origin;
+    Kokkos::parallel_for(
+        Kokkos::RangePolicy<ExecutionSpace>(0, n), KOKKOS_LAMBDA(int i) {
+          auto data_2 = ArborX::getData(queries(i));
+          auto data = data_2[1];
+          for (int j = offset(i); j < offset(i + 1); ++j)
+          {
+            out(j) = {in(j), data + (float)distance(points_(in(j)), origin_)};
+          }
+        });
+  }
+};
+
+BOOST_AUTO_TEST_CASE_TEMPLATE(callback_with_attachment_spatial_predicate,
+                              TreeTypeTraits, TreeTypeTraitsList)
+{
+  using Tree = typename TreeTypeTraits::type;
+  using ExecutionSpace = typename TreeTypeTraits::execution_space;
+  using DeviceType = typename TreeTypeTraits::device_type;
+
+  int const n = 10;
+  Kokkos::View<ArborX::Point *, DeviceType> points(
+      Kokkos::view_alloc(Kokkos::WithoutInitializing, "points"), n);
+  ArborX::Point const origin = {{0., 0., 0.}};
+  Kokkos::parallel_for(Kokkos::RangePolicy<ExecutionSpace>(0, n),
+                       KOKKOS_LAMBDA(int i) {
+                         points(i) = {{(double)i, (double)i, (double)i}};
+                       });
+  auto points_host =
+      Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace{}, points);
+
+  std::vector<Kokkos::pair<int, float>> values;
+  values.reserve(n);
+  float const delta = 5.f;
+  for (int i = 0; i < n; ++i)
+    values.emplace_back(
+        i, delta + ArborX::Details::distance(points_host(i), origin));
+  std::vector<int> offsets = {0, n};
+
+  Tree const tree(ExecutionSpace{}, points);
+
+  ARBORX_TEST_QUERY_TREE_CALLBACK(
+      ExecutionSpace{}, tree,
+      (makeIntersectsBoxWithAttachmentQueries<DeviceType, float>(
+          {static_cast<ArborX::Box>(tree.bounds())}, {delta})),
+      CustomInlineCallbackWithAttachment<DeviceType>{points},
+      make_compressed_storage(offsets, values));
+
+  ARBORX_TEST_QUERY_TREE_CALLBACK(
+      ExecutionSpace{}, tree,
+      (makeIntersectsBoxWithAttachmentQueries<DeviceType,
+                                              Kokkos::Array<float, 2>>(
+          {static_cast<ArborX::Box>(tree.bounds())}, {{0., delta}})),
+      CustomPostCallbackWithAttachment<DeviceType>{points},
+      make_compressed_storage(offsets, values));
+}
+
+#ifndef ARBORX_TEST_DISABLE_NEAREST_QUERY
+BOOST_AUTO_TEST_CASE_TEMPLATE(callback_with_attachment_nearest_predicate,
+                              TreeTypeTraits, TreeTypeTraitsList)
+{
+  using Tree = typename TreeTypeTraits::type;
+  using ExecutionSpace = typename TreeTypeTraits::execution_space;
+  using DeviceType = typename TreeTypeTraits::device_type;
+
+  int const n = 10;
+  Kokkos::View<ArborX::Point *, DeviceType> points(
+      Kokkos::view_alloc(Kokkos::WithoutInitializing, "points"), n);
+  ArborX::Point const origin = {{0., 0., 0.}};
+  Kokkos::parallel_for(Kokkos::RangePolicy<ExecutionSpace>(0, n),
+                       KOKKOS_LAMBDA(int i) {
+                         points(i) = {{(double)i, (double)i, (double)i}};
+                       });
+  auto points_host =
+      Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace{}, points);
+
+  std::vector<Kokkos::pair<int, float>> values;
+  values.reserve(n);
+  float const delta = 5.f;
+  for (int i = 0; i < n; ++i)
+    values.emplace_back(
+        i, delta + ArborX::Details::distance(points_host(i), origin));
+  std::vector<int> offsets = {0, n};
+
+  Tree const tree(ExecutionSpace{}, points);
+
+  ARBORX_TEST_QUERY_TREE_CALLBACK(
+      ExecutionSpace{}, tree,
+      (makeNearestWithAttachmentQueries<DeviceType, float>({{origin, n}},
+                                                           {delta})),
+      CustomInlineCallbackWithAttachment<DeviceType>{points},
+      make_compressed_storage(offsets, values));
+
+  ARBORX_TEST_QUERY_TREE_CALLBACK(
+      ExecutionSpace{}, tree,
+      (makeNearestWithAttachmentQueries<DeviceType, Kokkos::Array<float, 2>>(
+          {{origin, n}}, {{0, delta}})),
+      CustomPostCallbackWithAttachment<DeviceType>{points},
+      make_compressed_storage(offsets, values));
+}
+#endif
+
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/arborx/test/tstQueryTreeComparisonWithBoost.cpp b/arborx/test/tstQueryTreeComparisonWithBoost.cpp
new file mode 100644
index 000000000..b2023a440
--- /dev/null
+++ b/arborx/test/tstQueryTreeComparisonWithBoost.cpp
@@ -0,0 +1,269 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#include "ArborX_BoostRTreeHelpers.hpp"
+
+#include <boost/test/unit_test.hpp>
+
+#include <functional>
+#include <random>
+
+#include "Search_UnitTestHelpers.hpp"
+// clang-format off
+#include "ArborXTest_TreeTypeTraits.hpp"
+// clang-format on
+#include <Kokkos_Core.hpp>
+
+// We need a forward-declaration for NVCC, see below.
+namespace ArborX
+{
+namespace Experimental
+{
+template <int k>
+struct KDOP;
+}
+} // namespace ArborX
+
+BOOST_AUTO_TEST_SUITE(ComparisonWithBoost)
+
+namespace tt = boost::test_tools;
+
+inline Kokkos::View<ArborX::Point *, Kokkos::HostSpace>
+make_stuctured_cloud(double Lx, double Ly, double Lz, int nx, int ny, int nz)
+{
+  std::function<int(int, int, int)> ind = [nx, ny](int i, int j, int k) {
+    return i + j * nx + k * (nx * ny);
+  };
+  Kokkos::View<ArborX::Point *, Kokkos::HostSpace> cloud(
+      Kokkos::view_alloc(Kokkos::WithoutInitializing, "structured_cloud"),
+      nx * ny * nz);
+  for (int i = 0; i < nx; ++i)
+    for (int j = 0; j < ny; ++j)
+      for (int k = 0; k < nz; ++k)
+      {
+        cloud[ind(i, j, k)] = {
+            {i * Lx / (nx - 1), j * Ly / (ny - 1), k * Lz / (nz - 1)}};
+      }
+  return cloud;
+}
+
+template <typename Geometry>
+Kokkos::View<Geometry *, Kokkos::HostSpace>
+make_random_cloud(double Lx, double Ly, double Lz, int n);
+
+template <>
+inline Kokkos::View<ArborX::Point *, Kokkos::HostSpace>
+make_random_cloud(double Lx, double Ly, double Lz, int n)
+{
+  Kokkos::View<ArborX::Point *, Kokkos::HostSpace> cloud(
+      Kokkos::view_alloc(Kokkos::WithoutInitializing, "random_cloud"), n);
+  std::default_random_engine generator;
+  std::uniform_real_distribution<double> distribution_x(0.0, Lx);
+  std::uniform_real_distribution<double> distribution_y(0.0, Ly);
+  std::uniform_real_distribution<double> distribution_z(0.0, Lz);
+  for (int i = 0; i < n; ++i)
+  {
+    double x = distribution_x(generator);
+    double y = distribution_y(generator);
+    double z = distribution_z(generator);
+    cloud[i] = {{x, y, z}};
+  }
+  return cloud;
+}
+
+template <>
+inline Kokkos::View<ArborX::Box *, Kokkos::HostSpace>
+make_random_cloud(double Lx, double Ly, double Lz, int n)
+{
+  Kokkos::View<ArborX::Box *, Kokkos::HostSpace> cloud(
+      Kokkos::view_alloc(Kokkos::WithoutInitializing, "random_cloud"), n);
+  std::default_random_engine generator;
+  std::uniform_real_distribution<double> distribution_x(0.0, Lx);
+  std::uniform_real_distribution<double> distribution_y(0.0, Ly);
+  std::uniform_real_distribution<double> distribution_z(0.0, Lz);
+  double const min_xyz = std::min(std::min(Lx, Ly), Lz);
+  // We divide min_xyz by n in order to avoid a large number of overlapping
+  // boxes
+  std::uniform_real_distribution<double> distribution_l(
+      0.0, min_xyz / static_cast<double>(n));
+  for (int i = 0; i < n; ++i)
+  {
+    float x = distribution_x(generator);
+    float y = distribution_y(generator);
+    float z = distribution_z(generator);
+    float length = distribution_l(generator);
+    cloud[i] = {{x, y, z}, {x + length, y + length, z + length}};
+  }
+  return cloud;
+}
+
+template <typename Tree, typename ExecutionSpace, typename DeviceType,
+          typename PrimitiveGeometry>
+void boost_rtree_nearest_predicate()
+{
+  // construct a cloud of points (nodes of a structured grid)
+  double Lx = 10.0;
+  double Ly = 10.0;
+  double Lz = 10.0;
+  int nx = 11;
+  int ny = 11;
+  int nz = 11;
+  auto cloud = make_stuctured_cloud(Lx, Ly, Lz, nx, ny, nz);
+
+  // random objects for kNN queries
+  // compare our solution against Boost R-tree
+  int const n_queries = 100;
+  using MemorySpace = typename Tree::memory_space;
+  auto geometry_objects = Kokkos::create_mirror_view_and_copy(
+      MemorySpace{},
+      make_random_cloud<PrimitiveGeometry>(Lx, Ly, Lz, n_queries));
+
+  Kokkos::View<int *, ExecutionSpace> k("k", n_queries);
+  auto k_host = Kokkos::create_mirror_view(k);
+  // use random number k of for the kNN search
+  std::default_random_engine generator;
+  std::uniform_int_distribution<int> distribution_k(
+      1, std::floor(sqrt(nx * nx + ny * ny + nz * nz)));
+  for (unsigned int i = 0; i < n_queries; ++i)
+  {
+    k_host[i] = distribution_k(generator);
+  }
+
+  Kokkos::deep_copy(k, k_host);
+
+  Kokkos::View<ArborX::Nearest<PrimitiveGeometry> *, DeviceType>
+      nearest_queries("nearest_queries", n_queries);
+  Kokkos::parallel_for(
+      Kokkos::RangePolicy<ExecutionSpace>(0, n_queries), KOKKOS_LAMBDA(int i) {
+        nearest_queries(i) = ArborX::nearest(geometry_objects(i), k(i));
+      });
+  auto nearest_queries_host = Kokkos::create_mirror_view(nearest_queries);
+  Kokkos::deep_copy(nearest_queries_host, nearest_queries);
+
+  Tree tree(ExecutionSpace{},
+            Kokkos::create_mirror_view_and_copy(MemorySpace{}, cloud));
+
+  BoostExt::RTree<decltype(cloud)::value_type> rtree(ExecutionSpace{}, cloud);
+
+  ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree, nearest_queries,
+                         query(ExecutionSpace{}, rtree, nearest_queries_host));
+}
+
+BOOST_AUTO_TEST_CASE_TEMPLATE(boost_rtree_spatial_predicate, TreeTypeTraits,
+                              TreeTypeTraitsList)
+{
+  using Tree = typename TreeTypeTraits::type;
+  using ExecutionSpace = typename TreeTypeTraits::execution_space;
+  using DeviceType = typename TreeTypeTraits::device_type;
+
+  // FIXME_NVCC we see inexplainable test failures with NVCC and KDOP<18> and
+  // KDOP<26> here.
+#ifdef __NVCC__
+  if (std::is_same<typename Tree::bounding_volume_type,
+                   ArborX::Experimental::KDOP<18>>::value ||
+      std::is_same<typename Tree::bounding_volume_type,
+                   ArborX::Experimental::KDOP<26>>::value)
+    return;
+#endif
+
+  // construct a cloud of points (nodes of a structured grid)
+  double Lx = 10.0;
+  double Ly = 10.0;
+  double Lz = 10.0;
+  int nx = 11;
+  int ny = 11;
+  int nz = 11;
+  auto cloud = make_stuctured_cloud(Lx, Ly, Lz, nx, ny, nz);
+
+  // random points for radius search
+  // compare our solution against Boost R-tree
+  int const n_points = 100;
+  using MemorySpace = typename Tree::memory_space;
+  auto points = Kokkos::create_mirror_view_and_copy(
+      MemorySpace{}, make_random_cloud<ArborX::Point>(Lx, Ly, Lz, n_points));
+
+  Kokkos::View<double *, ExecutionSpace> radii("radii", n_points);
+  auto radii_host = Kokkos::create_mirror_view(radii);
+  // use random radius for the search
+  std::default_random_engine generator;
+  std::uniform_real_distribution<double> distribution_radius(
+      0.0, std::sqrt(Lx * Lx + Ly * Ly + Lz * Lz));
+  for (unsigned int i = 0; i < n_points; ++i)
+  {
+    radii_host[i] = distribution_radius(generator);
+  }
+
+  Kokkos::deep_copy(radii, radii_host);
+
+  Kokkos::View<decltype(ArborX::intersects(ArborX::Sphere{})) *, DeviceType>
+      within_queries("within_queries", n_points);
+  Kokkos::parallel_for(
+      Kokkos::RangePolicy<ExecutionSpace>(0, n_points), KOKKOS_LAMBDA(int i) {
+        within_queries(i) =
+            ArborX::intersects(ArborX::Sphere{points(i), radii(i)});
+      });
+  auto within_queries_host = Kokkos::create_mirror_view(within_queries);
+  Kokkos::deep_copy(within_queries_host, within_queries);
+
+  Kokkos::View<decltype(ArborX::intersects(ArborX::Box{})) *, DeviceType>
+      intersects_queries("intersects_queries", n_points);
+  Kokkos::parallel_for(
+      Kokkos::RangePolicy<ExecutionSpace>(0, n_points), KOKKOS_LAMBDA(int i) {
+        ArborX::Box box{{static_cast<float>(points(i)[0] - radii(i)),
+                         static_cast<float>(points(i)[1] - radii(i)),
+                         static_cast<float>(points(i)[2] - radii(i))},
+                        {static_cast<float>(points(i)[0] + radii(i)),
+                         static_cast<float>(points(i)[1] + radii(i)),
+                         static_cast<float>(points(i)[2] + radii(i))}};
+        intersects_queries(i) = ArborX::intersects(box);
+      });
+  auto intersects_queries_host = Kokkos::create_mirror_view(intersects_queries);
+  Kokkos::deep_copy(intersects_queries_host, intersects_queries);
+
+  Tree tree(ExecutionSpace{},
+            Kokkos::create_mirror_view_and_copy(MemorySpace{}, cloud));
+
+  BoostExt::RTree<decltype(cloud)::value_type> rtree(ExecutionSpace{}, cloud);
+
+  ARBORX_TEST_QUERY_TREE(
+      ExecutionSpace{}, tree, intersects_queries,
+      query(ExecutionSpace{}, rtree, intersects_queries_host));
+#ifndef ARBORX_TEST_DISABLE_SPATIAL_QUERY_INTERSECTS_SPHERE
+  ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree, within_queries,
+                         query(ExecutionSpace{}, rtree, within_queries_host));
+#endif
+}
+
+#ifndef ARBORX_TEST_DISABLE_NEAREST_QUERY
+BOOST_AUTO_TEST_CASE_TEMPLATE(boost_rtree_nearest_predicate_point,
+                              TreeTypeTraits, TreeTypeTraitsList)
+{
+  using Tree = typename TreeTypeTraits::type;
+  using ExecutionSpace = typename TreeTypeTraits::execution_space;
+  using DeviceType = typename TreeTypeTraits::device_type;
+
+  boost_rtree_nearest_predicate<Tree, ExecutionSpace, DeviceType,
+                                ArborX::Point>();
+}
+
+BOOST_AUTO_TEST_CASE_TEMPLATE(boost_rtree_nearest_predicate_box, TreeTypeTraits,
+                              TreeTypeTraitsList)
+{
+  using Tree = typename TreeTypeTraits::type;
+  using ExecutionSpace = typename TreeTypeTraits::execution_space;
+  using DeviceType = typename TreeTypeTraits::device_type;
+
+  boost_rtree_nearest_predicate<Tree, ExecutionSpace, DeviceType,
+                                ArborX::Box>();
+}
+#endif
+
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/arborx/test/tstQueryTreeDegenerate.cpp b/arborx/test/tstQueryTreeDegenerate.cpp
new file mode 100644
index 000000000..7f974f1a2
--- /dev/null
+++ b/arborx/test/tstQueryTreeDegenerate.cpp
@@ -0,0 +1,403 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#include <boost/test/unit_test.hpp>
+
+#include <vector>
+
+#include "Search_UnitTestHelpers.hpp"
+// clang-format off
+#include "ArborXTest_TreeTypeTraits.hpp"
+// clang-format on
+
+BOOST_AUTO_TEST_SUITE(Degenerate)
+
+namespace tt = boost::test_tools;
+
+BOOST_AUTO_TEST_CASE_TEMPLATE(empty_tree_spatial_predicate, TreeTypeTraits,
+                              TreeTypeTraitsList)
+{
+  using Tree = typename TreeTypeTraits::type;
+  using ExecutionSpace = typename TreeTypeTraits::execution_space;
+  using DeviceType = typename TreeTypeTraits::device_type;
+
+  // tree is empty, it has no leaves.
+  for (auto const &tree : {
+           Tree{}, // default constructed
+           make<Tree>(ExecutionSpace{},
+                      {}), // constructed with empty view of boxes
+       })
+  {
+    BOOST_TEST(tree.empty());
+    BOOST_TEST(tree.size() == 0);
+    // Tree::bounds() returns an invalid box when the tree is empty.
+    using ArborX::Details::equals;
+    BOOST_TEST(equals(static_cast<ArborX::Box>(tree.bounds()), {}));
+
+    // Passing a view with no query does seem a bit silly but we still need
+    // to support it. And since the tag dispatching yields different tree
+    // traversals for nearest and spatial predicates, we do have to check
+    // the results for various type of queries.
+    ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree,
+                           makeIntersectsBoxQueries<DeviceType>({}),
+                           make_reference_solution<int>({}, {0}));
+
+    // Now passing a couple queries of various type and checking the
+    // results.
+    ARBORX_TEST_QUERY_TREE(
+        ExecutionSpace{}, tree,
+        makeIntersectsBoxQueries<DeviceType>({
+            {}, // Did not bother giving a valid box here but that's fine.
+            {},
+        }),
+        make_reference_solution<int>({}, {0, 0, 0}));
+
+#ifndef ARBORX_TEST_DISABLE_SPATIAL_QUERY_INTERSECTS_SPHERE
+    // NOTE: Admittedly testing for both intersection with a box and with a
+    // sphere queries might be a bit overkill but I'd rather test for all the
+    // queries we plan on using.
+    ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree,
+                           makeIntersectsSphereQueries<DeviceType>({}),
+                           make_reference_solution<int>({}, {0}));
+
+    ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree,
+                           makeIntersectsSphereQueries<DeviceType>({
+                               {{{0., 0., 0.}}, 1.},
+                               {{{1., 1., 1.}}, 2.},
+                           }),
+                           make_reference_solution<int>({}, {0, 0, 0}));
+#endif
+  }
+}
+
+#ifndef ARBORX_TEST_DISABLE_NEAREST_QUERY
+BOOST_AUTO_TEST_CASE_TEMPLATE(empty_tree_nearest_predicate, TreeTypeTraits,
+                              TreeTypeTraitsList)
+{
+  using Tree = typename TreeTypeTraits::type;
+  using ExecutionSpace = typename TreeTypeTraits::execution_space;
+  using DeviceType = typename TreeTypeTraits::device_type;
+
+  // tree is empty, it has no leaves.
+  for (auto const &tree : {
+           Tree{}, // default constructed
+           make<Tree>(ExecutionSpace{},
+                      {}), // constructed with empty view of boxes
+       })
+  {
+    BOOST_TEST(tree.empty());
+    BOOST_TEST(tree.size() == 0);
+    // Tree::bounds() returns an invalid box when the tree is empty.
+    using ArborX::Details::equals;
+    BOOST_TEST(equals(static_cast<ArborX::Box>(tree.bounds()), {}));
+
+    // Passing a view with no query does seem a bit silly but we still need
+    // to support it. And since the tag dispatching yields different tree
+    // traversals for nearest and spatial predicates, we do have to check
+    // the results for various type of queries.
+    ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree,
+                           makeNearestQueries<DeviceType>({}),
+                           make_reference_solution<int>({}, {0}));
+
+    // Now passing a couple queries of various type and checking the
+    // results.
+    ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree,
+                           makeNearestQueries<DeviceType>({
+                               {{{0., 0., 0.}}, 1},
+                               {{{1., 1., 1.}}, 2},
+                           }),
+                           make_reference_solution<int>({}, {0, 0, 0}));
+  }
+}
+#endif
+
+BOOST_AUTO_TEST_CASE_TEMPLATE(single_leaf_tree_spatial_predicate,
+                              TreeTypeTraits, TreeTypeTraitsList)
+{
+  using Tree = typename TreeTypeTraits::type;
+  using ExecutionSpace = typename TreeTypeTraits::execution_space;
+  using DeviceType = typename TreeTypeTraits::device_type;
+
+  // tree has a single leaf (unit box)
+  auto const tree =
+      make<Tree>(ExecutionSpace{}, {
+                                       {{{0., 0., 0.}}, {{1., 1., 1.}}},
+                                   });
+
+  BOOST_TEST(!tree.empty());
+  BOOST_TEST(tree.size() == 1);
+  using ArborX::Details::equals;
+  BOOST_TEST(equals(static_cast<ArborX::Box>(tree.bounds()),
+                    {{{0., 0., 0.}}, {{1., 1., 1.}}}));
+
+  ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree,
+                         makeIntersectsBoxQueries<DeviceType>({}),
+                         make_reference_solution<int>({}, {0}));
+
+  ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree,
+                         makeIntersectsBoxQueries<DeviceType>({
+                             {{{5., 5., 5.}}, {{5., 5., 5.}}},
+                             {{{.5, .5, .5}}, {{.5, .5, .5}}},
+                         }),
+                         make_reference_solution<int>({0}, {0, 0, 1}));
+
+#ifndef ARBORX_TEST_DISABLE_SPATIAL_QUERY_INTERSECTS_SPHERE
+  ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree,
+                         makeIntersectsSphereQueries<DeviceType>({}),
+                         make_reference_solution<int>({}, {0}));
+
+  ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree,
+                         makeIntersectsSphereQueries<DeviceType>({
+                             {{{0., 0., 0.}}, 1.},
+                             {{{1., 1., 1.}}, 3.},
+                             {{{5., 5., 5.}}, 2.},
+                         }),
+                         make_reference_solution<int>({0, 0}, {0, 1, 2, 2}));
+#endif
+}
+
+#ifndef ARBORX_TEST_DISABLE_NEAREST_QUERY
+BOOST_AUTO_TEST_CASE_TEMPLATE(single_leaf_tree_nearest_predicate,
+                              TreeTypeTraits, TreeTypeTraitsList)
+{
+  using Tree = typename TreeTypeTraits::type;
+  using ExecutionSpace = typename TreeTypeTraits::execution_space;
+  using DeviceType = typename TreeTypeTraits::device_type;
+
+  // tree has a single leaf (unit box)
+  auto const tree =
+      make<Tree>(ExecutionSpace{}, {
+                                       {{{0., 0., 0.}}, {{1., 1., 1.}}},
+                                   });
+
+  BOOST_TEST(!tree.empty());
+  BOOST_TEST(tree.size() == 1);
+  using ArborX::Details::equals;
+  BOOST_TEST(equals(static_cast<ArborX::Box>(tree.bounds()),
+                    {{{0., 0., 0.}}, {{1., 1., 1.}}}));
+
+  ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree,
+                         makeNearestQueries<DeviceType>({}),
+                         make_reference_solution<int>({}, {0}));
+  ARBORX_TEST_QUERY_TREE(
+      ExecutionSpace{}, tree,
+      makeNearestQueries<DeviceType>({{{0., 0., 0.}, 3}, {{4., 5., 1.}, 1}}),
+      make_reference_solution<int>({0, 0}, {0, 1, 2}));
+
+  ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree,
+                         makeNearestQueries<DeviceType>({
+                             {{{0., 0., 0.}}, 1},
+                             {{{1., 1., 1.}}, 2},
+                             {{{2., 2., 2.}}, 3},
+                         }),
+                         make_reference_solution<int>({0, 0, 0}, {0, 1, 2, 3}));
+}
+#endif
+
+// FIXME Tree with two leaves is not "degenerated".  Find a better place for it.
+BOOST_AUTO_TEST_CASE_TEMPLATE(couple_leaves_tree_spatial_predicate,
+                              TreeTypeTraits, TreeTypeTraitsList)
+{
+  using Tree = typename TreeTypeTraits::type;
+  using ExecutionSpace = typename TreeTypeTraits::execution_space;
+  using DeviceType = typename TreeTypeTraits::device_type;
+
+  auto const tree =
+      make<Tree>(ExecutionSpace{}, {
+                                       {{{0., 0., 0.}}, {{0., 0., 0.}}},
+                                       {{{1., 1., 1.}}, {{1., 1., 1.}}},
+                                   });
+
+  BOOST_TEST(!tree.empty());
+  BOOST_TEST(tree.size() == 2);
+  using ArborX::Details::equals;
+  BOOST_TEST(equals(static_cast<ArborX::Box>(tree.bounds()),
+                    {{{0., 0., 0.}}, {{1., 1., 1.}}}));
+
+  // single query intersects with nothing
+  ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree,
+                         makeIntersectsBoxQueries<DeviceType>({
+                             {},
+                         }),
+                         make_reference_solution<int>({}, {0, 0}));
+
+  // single query intersects with both
+  ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree,
+                         makeIntersectsBoxQueries<DeviceType>({
+                             {{{0., 0., 0.}}, {{1., 1., 1.}}},
+                         }),
+                         make_reference_solution<int>({1, 0}, {0, 2}));
+
+  // single query intersects with only one
+  ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree,
+                         makeIntersectsBoxQueries<DeviceType>({
+                             {{{0.5, 0.5, 0.5}}, {{1.5, 1.5, 1.5}}},
+                         }),
+                         make_reference_solution<int>({1}, {0, 1}));
+
+  // a couple queries both intersect with nothing
+  ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree,
+                         makeIntersectsBoxQueries<DeviceType>({
+                             {},
+                             {},
+                         }),
+                         make_reference_solution<int>({}, {0, 0, 0}));
+
+  // a couple queries first intersects with nothing second with only one
+  ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree,
+                         makeIntersectsBoxQueries<DeviceType>({
+                             {},
+                             {{{0., 0., 0.}}, {{0., 0., 0.}}},
+                         }),
+                         make_reference_solution<int>({0}, {0, 0, 1}));
+
+  // no query
+  ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree,
+                         makeIntersectsBoxQueries<DeviceType>({}),
+                         make_reference_solution<int>({}, {0}));
+}
+
+#ifndef ARBORX_TEST_DISABLE_NEAREST_QUERY
+BOOST_AUTO_TEST_CASE_TEMPLATE(couple_leaves_tree_nearest_predicate,
+                              TreeTypeTraits, TreeTypeTraitsList)
+{
+  using Tree = typename TreeTypeTraits::type;
+  using ExecutionSpace = typename TreeTypeTraits::execution_space;
+  using DeviceType = typename TreeTypeTraits::device_type;
+
+  auto const tree =
+      make<Tree>(ExecutionSpace{}, {
+                                       {{{0., 0., 0.}}, {{0., 0., 0.}}},
+                                       {{{1., 1., 1.}}, {{1., 1., 1.}}},
+                                   });
+
+  BOOST_TEST(!tree.empty());
+  BOOST_TEST(tree.size() == 2);
+  using ArborX::Details::equals;
+  BOOST_TEST(equals(static_cast<ArborX::Box>(tree.bounds()),
+                    {{{0., 0., 0.}}, {{1., 1., 1.}}}));
+
+  // no query
+  ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree,
+                         makeNearestQueries<DeviceType>({}),
+                         make_reference_solution<int>({}, {0}));
+
+  ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree,
+                         makeNearestQueries<DeviceType>({
+                             {{{0., 0., 0.}}, 2},
+                             {{{1., 0., 0.}}, 4},
+                         }),
+                         make_reference_solution<int>({0, 1, 0, 1}, {0, 2, 4}));
+}
+#endif
+
+#ifndef ARBORX_TEST_DISABLE_SPATIAL_QUERY_INTERSECTS_SPHERE
+BOOST_AUTO_TEST_CASE_TEMPLATE(duplicated_leaves_spatial_predicate,
+                              TreeTypeTraits, TreeTypeTraitsList)
+{
+  using Tree = typename TreeTypeTraits::type;
+  using ExecutionSpace = typename TreeTypeTraits::execution_space;
+  using DeviceType = typename TreeTypeTraits::device_type;
+
+  // The tree contains multiple (more than two) leaves that will be assigned
+  // the same Morton code.  This was able to trigger a bug that we discovered
+  // when building trees over ~10M indexable values.  The hierarchy generated
+  // at construction had leaves with no parent which yielded a segfault later
+  // when computing bounding boxes and walking the hierarchy toward the root.
+  auto const tree =
+      make<Tree>(ExecutionSpace{}, {
+                                       {{{0., 0., 0.}}, {{0., 0., 0.}}},
+                                       {{{1., 1., 1.}}, {{1., 1., 1.}}},
+                                       {{{1., 1., 1.}}, {{1., 1., 1.}}},
+                                       {{{1., 1., 1.}}, {{1., 1., 1.}}},
+                                   });
+
+  ARBORX_TEST_QUERY_TREE(
+      ExecutionSpace{}, tree,
+      makeIntersectsSphereQueries<DeviceType>({
+          {{{0., 0., 0.}}, 1.},
+          {{{1., 1., 1.}}, 1.},
+          {{{.5, .5, .5}}, 1.},
+      }),
+      make_reference_solution<int>({0, 1, 2, 3, 0, 1, 2, 3}, {0, 1, 4, 8}));
+}
+#endif
+
+BOOST_AUTO_TEST_SUITE_END()
+
+BOOST_AUTO_TEST_SUITE(Miscellaneous)
+
+BOOST_AUTO_TEST_CASE_TEMPLATE(not_exceeding_stack_capacity_spatial_predicate,
+                              TreeTypeTraits, TreeTypeTraitsList)
+{
+  // FIXME This unit test might make little sense for other trees than BVH
+  // using Tree = typename TreeTypeTraits::type;
+  using ExecutionSpace = typename TreeTypeTraits::execution_space;
+  using DeviceType = typename TreeTypeTraits::device_type;
+
+  std::vector<ArborX::Box> boxes;
+  int const n = 4096; // exceeds stack capacity which is 64
+  boxes.reserve(n);
+  for (int i = 0; i < n; ++i)
+  {
+    double const a = i;
+    double const b = i + 1;
+    boxes.push_back({{{a, a, a}}, {{b, b, b}}});
+  }
+  auto const bvh = make<ArborX::BVH<typename DeviceType::memory_space>>(
+      ExecutionSpace{}, boxes);
+
+  Kokkos::View<int *, DeviceType> indices("indices", 0);
+  Kokkos::View<int *, DeviceType> offset("offset", 0);
+  // spatial query that is satisfied by all leaves in the tree
+  BOOST_CHECK_NO_THROW(ArborX::query(bvh, ExecutionSpace{},
+                                     makeIntersectsBoxQueries<DeviceType>({
+                                         {},
+                                         {{{0., 0., 0.}}, {{n, n, n}}},
+                                     }),
+                                     indices, offset));
+  BOOST_TEST(ArborX::lastElement(offset) == n);
+}
+
+#ifndef ARBORX_TEST_DISABLE_NEAREST_QUERY
+BOOST_AUTO_TEST_CASE_TEMPLATE(not_exceeding_stack_capacity_nearest_predicate,
+                              TreeTypeTraits, TreeTypeTraitsList)
+{
+  // FIXME This unit test might make little sense for other trees than BVH
+  // using Tree = typename TreeTypeTraits::type;
+  using ExecutionSpace = typename TreeTypeTraits::execution_space;
+  using DeviceType = typename TreeTypeTraits::device_type;
+
+  std::vector<ArborX::Box> boxes;
+  int const n = 4096; // exceed stack capacity which is 64
+  boxes.reserve(n);
+  for (int i = 0; i < n; ++i)
+  {
+    double const a = i;
+    double const b = i + 1;
+    boxes.push_back({{{a, a, a}}, {{b, b, b}}});
+  }
+  auto const bvh = make<ArborX::BVH<typename DeviceType::memory_space>>(
+      ExecutionSpace{}, boxes);
+
+  Kokkos::View<int *, DeviceType> indices("indices", 0);
+  Kokkos::View<int *, DeviceType> offset("offset", 0);
+  // nearest query asking for as many neighbors as they are leaves in the tree
+  BOOST_CHECK_NO_THROW(ArborX::query(bvh, ExecutionSpace{},
+                                     makeNearestQueries<DeviceType>({
+                                         {{{0., 0., 0.}}, n},
+                                     }),
+                                     indices, offset));
+  BOOST_TEST(ArborX::lastElement(offset) == n);
+}
+#endif
+
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/arborx/test/tstQueryTreeIntersectsKDOP.cpp b/arborx/test/tstQueryTreeIntersectsKDOP.cpp
new file mode 100644
index 000000000..2d03dd24b
--- /dev/null
+++ b/arborx/test/tstQueryTreeIntersectsKDOP.cpp
@@ -0,0 +1,82 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#include "ArborX_EnableDeviceTypes.hpp" // ARBORX_DEVICE_TYPES
+#include <ArborX_KDOP.hpp>
+#include <ArborX_LinearBVH.hpp>
+
+#include <Kokkos_CopyViews.hpp>
+
+#include <boost/test/unit_test.hpp>
+
+#include <vector>
+
+#include "Search_UnitTestHelpers.hpp"
+
+BOOST_AUTO_TEST_CASE_TEMPLATE(intersects_kdop, DeviceType, ARBORX_DEVICE_TYPES)
+{
+  using ExecutionSpace = typename DeviceType::execution_space;
+  using MemorySpace = typename DeviceType::memory_space;
+  using Tree = ArborX::BVH<MemorySpace>;
+
+  using ArborX::Point;
+
+  std::vector<ArborX::Point> primitives = {
+      {{0, 0, 0}}, // 0
+      {{1, 1, 1}}, // 1
+      {{2, 2, 2}}, // 2
+      {{3, 3, 3}}, // 3
+      {{1, 0, 0}}, // 4
+      {{2, 0, 0}}, // 5
+      {{3, 0, 0}}, // 6
+      {{0, 1, 0}}, // 7
+      {{0, 2, 0}}, // 8
+      {{0, 3, 0}}, // 9
+      {{0, 0, 1}}, // 10
+      {{0, 0, 2}}, // 11
+      {{0, 0, 3}}, // 12
+  };
+  Tree const tree(
+      ExecutionSpace{},
+      Kokkos::create_mirror_view_and_copy(
+          MemorySpace{},
+          Kokkos::View<Point *, Kokkos::HostSpace, Kokkos::MemoryUnmanaged>(
+              primitives.data(), primitives.size())));
+
+  // (0,0,0)->(1,2,3) box with (0,0,0)--(0,0,3) edge cut off
+  ArborX::Experimental::KDOP<18> x;
+  // bottom
+  x += ArborX::Point{0.25, 0, 0};
+  x += ArborX::Point{1, 0, 0};
+  x += ArborX::Point{1, 2, 0};
+  x += ArborX::Point{0, 2, 0};
+  x += ArborX::Point{0, 0.25, 0};
+  // top
+  x += ArborX::Point{0.25, 0, 3};
+  x += ArborX::Point{1, 0, 3};
+  x += ArborX::Point{1, 2, 3};
+  x += ArborX::Point{0, 2, 3};
+  x += ArborX::Point{0, 0.25, 3};
+
+  using IntersectsKDop = decltype(ArborX::intersects(x));
+  std::vector<IntersectsKDop> predicates = {ArborX::intersects(x)};
+
+  ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree,
+                         makeIntersectsBoxQueries<DeviceType>({}),
+                         make_reference_solution<int>({}, {0}));
+  ARBORX_TEST_QUERY_TREE(
+      ExecutionSpace{}, tree,
+      Kokkos::create_mirror_view_and_copy(
+          MemorySpace{}, Kokkos::View<IntersectsKDop *, Kokkos::HostSpace,
+                                      Kokkos::MemoryUnmanaged>(
+                             predicates.data(), predicates.size())),
+      make_reference_solution<int>({1, 4, 7, 8}, {0, 4}));
+}
diff --git a/arborx/test/tstQueryTreeManufacturedSolution.cpp b/arborx/test/tstQueryTreeManufacturedSolution.cpp
new file mode 100644
index 000000000..de76a9c0b
--- /dev/null
+++ b/arborx/test/tstQueryTreeManufacturedSolution.cpp
@@ -0,0 +1,257 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#include <boost/test/unit_test.hpp>
+
+#include <algorithm>
+#include <iostream>
+#include <random>
+#include <tuple>
+
+#include "Search_UnitTestHelpers.hpp"
+// clang-format off
+#include "ArborXTest_TreeTypeTraits.hpp"
+// clang-format on
+
+// We need a forward-declaration for NVCC, see below.
+namespace ArborX
+{
+namespace Experimental
+{
+template <int k>
+struct KDOP;
+}
+} // namespace ArborX
+
+BOOST_AUTO_TEST_SUITE(ManufacturedSolution)
+
+namespace tt = boost::test_tools;
+
+BOOST_AUTO_TEST_CASE_TEMPLATE(structured_grid, TreeTypeTraits,
+                              TreeTypeTraitsList)
+{
+  using Tree = typename TreeTypeTraits::type;
+  using ExecutionSpace = typename TreeTypeTraits::execution_space;
+  using DeviceType = typename TreeTypeTraits::device_type;
+
+  // FIXME_NVCC we see inexplainable test failures with NVCC and KDOP<18> and
+  // KDOP<26> here.
+#ifdef __NVCC__
+  if (std::is_same<typename Tree::bounding_volume_type,
+                   ArborX::Experimental::KDOP<18>>::value ||
+      std::is_same<typename Tree::bounding_volume_type,
+                   ArborX::Experimental::KDOP<26>>::value)
+    return;
+#endif
+
+  float Lx = 100.0;
+  float Ly = 100.0;
+  float Lz = 100.0;
+  int nx = 11;
+  int ny = 11;
+  int nz = 11;
+  int n = nx * ny * nz;
+  float hx = Lx / (nx - 1);
+  float hy = Ly / (ny - 1);
+  float hz = Lz / (nz - 1);
+
+  std::function<int(int, int, int)> ind = [nx, ny](int i, int j, int k) {
+    return i + j * nx + k * (nx * ny);
+  };
+
+  Kokkos::View<ArborX::Box *, DeviceType> bounding_boxes("bounding_boxes", n);
+  auto bounding_boxes_host = Kokkos::create_mirror_view(bounding_boxes);
+
+  for (int i = 0; i < nx; ++i)
+    for (int j = 0; j < ny; ++j)
+      for (int k = 0; k < nz; ++k)
+      {
+        ArborX::Point p{{i * hx, j * hy, k * hz}};
+        bounding_boxes_host[ind(i, j, k)] = {p, p};
+      }
+  Kokkos::deep_copy(bounding_boxes, bounding_boxes_host);
+
+  Tree const tree(ExecutionSpace{}, bounding_boxes);
+
+  std::vector<int> offset_ref(n + 1);
+  std::vector<int> indices_ref;
+
+  // (i) use the same objects for the queries as the objects used in BVH
+  // construction
+  // i-2  i-1  i  i+1
+  //
+  //  o    o   o   o   j+1
+  //          ---
+  //  o    o | x | o   j
+  //          ---
+  //  o    o   o   o   j-1
+  //
+  //  o    o   o   o   j-2
+  //
+  indices_ref.resize(n);
+  std::iota(offset_ref.begin(), offset_ref.end(), 0);
+  std::iota(indices_ref.begin(), indices_ref.end(), 0);
+
+  Kokkos::View<decltype(ArborX::intersects(ArborX::Box{})) *, DeviceType>
+      queries("queries", n);
+  Kokkos::parallel_for("fill_queries",
+                       Kokkos::RangePolicy<ExecutionSpace>(0, n),
+                       KOKKOS_LAMBDA(int i) {
+                         queries(i) = ArborX::intersects(bounding_boxes(i));
+                       });
+  ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree, queries,
+                         make_reference_solution(indices_ref, offset_ref));
+
+  // (ii) use bounding boxes that intersects with first neighbors
+  //
+  // i-2  i-1  i  i+1
+  //
+  //  o    x---x---x   j+1
+  //       |       |
+  //  o    x   x   x   j
+  //       |       |
+  //  o    x---x---x   j-1
+  //
+  //  o    o   o   o   j-2
+  //
+  std::vector<std::set<int>> ref(n);
+  for (int i = 0; i < nx; ++i)
+    for (int j = 0; j < ny; ++j)
+      for (int k = 0; k < nz; ++k)
+      {
+        int const index = ind(i, j, k);
+        // bounding box around nodes of the structured grid will
+        // intersect with neighboring nodes
+        bounding_boxes_host[index] = {
+            {{(i - 1) * hx, (j - 1) * hy, (k - 1) * hz}},
+            {{(i + 1) * hx, (j + 1) * hy, (k + 1) * hz}}};
+        // fill in reference solution to check against the collision
+        // list computed during the tree traversal
+        if ((i > 0) && (j > 0) && (k > 0))
+          ref[index].emplace(ind(i - 1, j - 1, k - 1));
+        if ((i > 0) && (k > 0))
+          ref[index].emplace(ind(i - 1, j, k - 1));
+        if ((i > 0) && (j < ny - 1) && (k > 0))
+          ref[index].emplace(ind(i - 1, j + 1, k - 1));
+        if ((i > 0) && (j > 0))
+          ref[index].emplace(ind(i - 1, j - 1, k));
+        if (i > 0)
+          ref[index].emplace(ind(i - 1, j, k));
+        if ((i > 0) && (j < ny - 1))
+          ref[index].emplace(ind(i - 1, j + 1, k));
+        if ((i > 0) && (j > 0) && (k < nz - 1))
+          ref[index].emplace(ind(i - 1, j - 1, k + 1));
+        if ((i > 0) && (k < nz - 1))
+          ref[index].emplace(ind(i - 1, j, k + 1));
+        if ((i > 0) && (j < ny - 1) && (k < nz - 1))
+          ref[index].emplace(ind(i - 1, j + 1, k + 1));
+
+        if ((j > 0) && (k > 0))
+          ref[index].emplace(ind(i, j - 1, k - 1));
+        if (k > 0)
+          ref[index].emplace(ind(i, j, k - 1));
+        if ((j < ny - 1) && (k > 0))
+          ref[index].emplace(ind(i, j + 1, k - 1));
+        if (j > 0)
+          ref[index].emplace(ind(i, j - 1, k));
+        if (true) // NOLINT
+          ref[index].emplace(ind(i, j, k));
+        if (j < ny - 1)
+          ref[index].emplace(ind(i, j + 1, k));
+        if ((j > 0) && (k < nz - 1))
+          ref[index].emplace(ind(i, j - 1, k + 1));
+        if (k < nz - 1)
+          ref[index].emplace(ind(i, j, k + 1));
+        if ((j < ny - 1) && (k < nz - 1))
+          ref[index].emplace(ind(i, j + 1, k + 1));
+
+        if ((i < nx - 1) && (j > 0) && (k > 0))
+          ref[index].emplace(ind(i + 1, j - 1, k - 1));
+        if ((i < nx - 1) && (k > 0))
+          ref[index].emplace(ind(i + 1, j, k - 1));
+        if ((i < nx - 1) && (j < ny - 1) && (k > 0))
+          ref[index].emplace(ind(i + 1, j + 1, k - 1));
+        if ((i < nx - 1) && (j > 0))
+          ref[index].emplace(ind(i + 1, j - 1, k));
+        if (i < nx - 1)
+          ref[index].emplace(ind(i + 1, j, k));
+        if ((i < nx - 1) && (j < ny - 1))
+          ref[index].emplace(ind(i + 1, j + 1, k));
+        if ((i < nx - 1) && (j > 0) && (k < nz - 1))
+          ref[index].emplace(ind(i + 1, j - 1, k + 1));
+        if ((i < nx - 1) && (k < nz - 1))
+          ref[index].emplace(ind(i + 1, j, k + 1));
+        if ((i < nx - 1) && (j < ny - 1) && (k < nz - 1))
+          ref[index].emplace(ind(i + 1, j + 1, k + 1));
+      }
+  Kokkos::deep_copy(bounding_boxes, bounding_boxes_host);
+
+  indices_ref.resize(0);
+  for (int i = 0; i < n; ++i)
+  {
+    std::copy(ref[i].begin(), ref[i].end(), std::back_inserter(indices_ref));
+    offset_ref[i + 1] = indices_ref.size();
+  }
+
+  Kokkos::parallel_for("fill_first_neighbors_queries",
+                       Kokkos::RangePolicy<ExecutionSpace>(0, n),
+                       KOKKOS_LAMBDA(int i) {
+                         queries[i] = ArborX::intersects(bounding_boxes[i]);
+                       });
+  ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree, queries,
+                         make_reference_solution(indices_ref, offset_ref));
+
+  // (iii) use random points
+  //
+  // i-1      i      i+1
+  //
+  //  o       o       o   j+1
+  //         -------
+  //        |       |
+  //        |   +   |
+  //  o     | x     | o   j
+  //         -------
+  //
+  //  o       o       o   j-1
+  //
+  std::default_random_engine generator;
+  std::uniform_real_distribution<double> distribution_x(0.0, Lz);
+  std::uniform_real_distribution<double> distribution_y(0.0, Ly);
+  std::uniform_real_distribution<double> distribution_z(0.0, Lz);
+
+  std::iota(offset_ref.begin(), offset_ref.end(), 0);
+  indices_ref.resize(n);
+  for (int l = 0; l < n; ++l)
+  {
+    double x = distribution_x(generator);
+    double y = distribution_y(generator);
+    double z = distribution_z(generator);
+    bounding_boxes_host(l) = {{{x - 0.5 * hx, y - 0.5 * hy, z - 0.5 * hz}},
+                              {{x + 0.5 * hx, y + 0.5 * hy, z + 0.5 * hz}}};
+
+    auto const i = static_cast<int>(std::round(x / hx));
+    auto const j = static_cast<int>(std::round(y / hy));
+    auto const k = static_cast<int>(std::round(z / hz));
+    // Save the indices for the check
+    indices_ref[l] = ind(i, j, k);
+  }
+  Kokkos::deep_copy(bounding_boxes, bounding_boxes_host);
+
+  Kokkos::parallel_for("fill_first_neighbors_queries",
+                       Kokkos::RangePolicy<ExecutionSpace>(0, n),
+                       KOKKOS_LAMBDA(int i) {
+                         queries[i] = ArborX::intersects(bounding_boxes[i]);
+                       });
+  ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree, queries,
+                         make_reference_solution(indices_ref, offset_ref));
+}
+
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/arborx/test/tstQueryTreeTraversalPolicy.cpp b/arborx/test/tstQueryTreeTraversalPolicy.cpp
new file mode 100644
index 000000000..dde72f5c2
--- /dev/null
+++ b/arborx/test/tstQueryTreeTraversalPolicy.cpp
@@ -0,0 +1,177 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#include "ArborX_EnableDeviceTypes.hpp" // ARBORX_DEVICE_TYPES
+#include <ArborX_LinearBVH.hpp>
+
+#include <boost/test/unit_test.hpp>
+
+#include <algorithm>
+#include <iostream>
+#include <random>
+#include <tuple>
+
+#include "Search_UnitTestHelpers.hpp"
+
+BOOST_AUTO_TEST_SUITE(TraversalPolicy)
+
+namespace tt = boost::test_tools;
+
+BOOST_AUTO_TEST_CASE_TEMPLATE(buffer_optimization, DeviceType,
+                              ARBORX_DEVICE_TYPES)
+{
+  using ExecutionSpace = typename DeviceType::execution_space;
+
+  auto const bvh = make<ArborX::BVH<typename DeviceType::memory_space>>(
+      ExecutionSpace{}, {
+                            {{{0., 0., 0.}}, {{0., 0., 0.}}},
+                            {{{1., 0., 0.}}, {{1., 0., 0.}}},
+                            {{{2., 0., 0.}}, {{2., 0., 0.}}},
+                            {{{3., 0., 0.}}, {{3., 0., 0.}}},
+                        });
+
+  auto const queries = makeIntersectsBoxQueries<DeviceType>({
+      {},
+      {{{0., 0., 0.}}, {{3., 3., 3.}}},
+      {},
+  });
+
+  using ViewType = Kokkos::View<int *, DeviceType>;
+  ViewType indices("indices", 0);
+  ViewType offset("offset", 0);
+
+  std::vector<int> indices_ref = {0, 1, 2, 3};
+  std::vector<int> offset_ref = {0, 0, 4, 4};
+  auto checkResultsAreFine = [&indices, &offset, &indices_ref,
+                              &offset_ref]() -> void {
+    auto indices_host = Kokkos::create_mirror_view(indices);
+    Kokkos::deep_copy(indices_host, indices);
+    auto offset_host = Kokkos::create_mirror_view(offset);
+    Kokkos::deep_copy(offset_host, offset);
+    BOOST_TEST(make_compressed_storage(offset_host, indices_host) ==
+                   make_compressed_storage(offset_ref, indices_ref),
+               tt::per_element());
+  };
+
+  BOOST_CHECK_NO_THROW(
+      ArborX::query(bvh, ExecutionSpace{}, queries, indices, offset));
+  checkResultsAreFine();
+
+  // compute number of results per query
+  auto counts = ArborX::cloneWithoutInitializingNorCopying(offset);
+  ArborX::adjacentDifference(ExecutionSpace{}, offset, counts);
+  // extract optimal buffer size
+  auto const max_results_per_query = ArborX::max(ExecutionSpace{}, counts);
+  BOOST_TEST(max_results_per_query == 4);
+
+  // optimal size
+  BOOST_CHECK_NO_THROW(
+      ArborX::query(bvh, ExecutionSpace{}, queries, indices, offset,
+                    ArborX::Experimental::TraversalPolicy().setBufferSize(
+                        -max_results_per_query)));
+  checkResultsAreFine();
+
+  // buffer size insufficient
+  BOOST_TEST(max_results_per_query > 1);
+  BOOST_CHECK_NO_THROW(
+      ArborX::query(bvh, ExecutionSpace{}, queries, indices, offset,
+                    ArborX::Experimental::TraversalPolicy().setBufferSize(+1)));
+  checkResultsAreFine();
+  BOOST_CHECK_THROW(
+      ArborX::query(bvh, ExecutionSpace{}, queries, indices, offset,
+                    ArborX::Experimental::TraversalPolicy().setBufferSize(-1)),
+      ArborX::SearchException);
+
+  // adequate buffer size
+  BOOST_TEST(max_results_per_query < 5);
+  BOOST_CHECK_NO_THROW(
+      ArborX::query(bvh, ExecutionSpace{}, queries, indices, offset,
+                    ArborX::Experimental::TraversalPolicy().setBufferSize(+5)));
+  checkResultsAreFine();
+  BOOST_CHECK_NO_THROW(
+      ArborX::query(bvh, ExecutionSpace{}, queries, indices, offset,
+                    ArborX::Experimental::TraversalPolicy().setBufferSize(-5)));
+  checkResultsAreFine();
+
+  // passing null size skips the buffer optimization and never throws
+  BOOST_CHECK_NO_THROW(
+      ArborX::query(bvh, ExecutionSpace{}, queries, indices, offset,
+                    ArborX::Experimental::TraversalPolicy().setBufferSize(0)));
+  checkResultsAreFine();
+}
+
+BOOST_AUTO_TEST_CASE_TEMPLATE(unsorted_predicates, DeviceType,
+                              ARBORX_DEVICE_TYPES)
+{
+  using ExecutionSpace = typename DeviceType::execution_space;
+
+  auto const bvh = make<ArborX::BVH<typename DeviceType::memory_space>>(
+      ExecutionSpace{}, {
+                            {{{0., 0., 0.}}, {{0., 0., 0.}}},
+                            {{{1., 1., 1.}}, {{1., 1., 1.}}},
+                            {{{2., 2., 2.}}, {{2., 2., 2.}}},
+                            {{{3., 3., 3.}}, {{3., 3., 3.}}},
+                        });
+
+  using ViewType = Kokkos::View<int *, DeviceType>;
+  ViewType indices("indices", 0);
+  ViewType offset("offset", 0);
+
+  std::vector<int> indices_ref = {2, 3, 0, 1};
+  std::vector<int> offset_ref = {0, 2, 4};
+  auto checkResultsAreFine = [&indices, &offset, &indices_ref,
+                              &offset_ref]() -> void {
+    auto indices_host = Kokkos::create_mirror_view(indices);
+    Kokkos::deep_copy(indices_host, indices);
+    auto offset_host = Kokkos::create_mirror_view(offset);
+    Kokkos::deep_copy(offset_host, offset);
+    BOOST_TEST(make_compressed_storage(offset_host, indices_host) ==
+                   make_compressed_storage(offset_ref, indices_ref),
+               tt::per_element());
+  };
+
+  {
+    auto const queries = makeIntersectsBoxQueries<DeviceType>({
+        {{{2., 2., 2.}}, {{3., 3., 3.}}},
+        {{{0., 0., 0.}}, {{1., 1., 1.}}},
+    });
+
+    BOOST_CHECK_NO_THROW(ArborX::query(
+        bvh, ExecutionSpace{}, queries, indices, offset,
+        ArborX::Experimental::TraversalPolicy().setPredicateSorting(true)));
+    checkResultsAreFine();
+
+    BOOST_CHECK_NO_THROW(ArborX::query(
+        bvh, ExecutionSpace{}, queries, indices, offset,
+        ArborX::Experimental::TraversalPolicy().setPredicateSorting(false)));
+    checkResultsAreFine();
+  }
+
+  indices_ref = {2, 3, 0, 1};
+  {
+    auto queries = makeNearestQueries<DeviceType>({
+        {{{2.5, 2.5, 2.5}}, 2},
+        {{{0.5, 0.5, 0.5}}, 2},
+    });
+
+    BOOST_CHECK_NO_THROW(ArborX::query(
+        bvh, ExecutionSpace{}, queries, indices, offset,
+        ArborX::Experimental::TraversalPolicy().setPredicateSorting(true)));
+    checkResultsAreFine();
+
+    BOOST_CHECK_NO_THROW(ArborX::query(
+        bvh, ExecutionSpace{}, queries, indices, offset,
+        ArborX::Experimental::TraversalPolicy().setPredicateSorting(false)));
+    checkResultsAreFine();
+  }
+}
+
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/arborx/test/tstRay.cpp b/arborx/test/tstRay.cpp
new file mode 100644
index 000000000..c6be3820d
--- /dev/null
+++ b/arborx/test/tstRay.cpp
@@ -0,0 +1,259 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+#include <ArborX_Box.hpp>
+#include <ArborX_Ray.hpp>
+
+#include <boost/test/unit_test.hpp>
+
+BOOST_AUTO_TEST_CASE(intersects_box)
+{
+  using ArborX::Box;
+  using ArborX::Point;
+  using ArborX::Experimental::Ray;
+
+  Box unit_box{{0, 0, 0}, {1, 1, 1}};
+
+  // origin is within the box
+  BOOST_TEST(intersects(Ray{{.5, .5, .5}, {1, 0, 0}}, unit_box));
+  BOOST_TEST(intersects(Ray{{.5, .5, .5}, {0, 1, 0}}, unit_box));
+  BOOST_TEST(intersects(Ray{{.5, .5, .5}, {0, 0, 1}}, unit_box));
+  BOOST_TEST(intersects(Ray{{.5, .5, .5}, {1, 1, 0}}, unit_box));
+  BOOST_TEST(intersects(Ray{{.5, .5, .5}, {1, 1, 1}}, unit_box));
+
+  // origin is outside the box
+  // hit the center of the face
+  BOOST_TEST(intersects(Ray{{-1, .5, .5}, {1, 0, 0}}, unit_box));
+  BOOST_TEST(!intersects(Ray{{-1, .5, .5}, {-1, 0, 0}}, unit_box));
+  BOOST_TEST(!intersects(Ray{{-1, .5, .5}, {0, 1, 1}}, unit_box));
+  BOOST_TEST(intersects(Ray{{2, .5, .5}, {-1, 0, 0}}, unit_box));
+  BOOST_TEST(!intersects(Ray{{2, .5, .5}, {1, 0, 0}}, unit_box));
+  BOOST_TEST(!intersects(Ray{{2, .5, .5}, {0, 1, 1}}, unit_box));
+  BOOST_TEST(intersects(Ray{{-1, 1.5, .5}, {1, -1, 0}}, unit_box));
+  BOOST_TEST(!intersects(Ray{{-1, 1.5, .5}, {1, 0, 0}}, unit_box));
+  BOOST_TEST(intersects(Ray{{-1, 1.5, 1.5}, {1, -1, -1}}, unit_box));
+  BOOST_TEST(!intersects(Ray{{-1, 1.5, 1.5}, {1, 0, 0}}, unit_box));
+  BOOST_TEST(!intersects(Ray{{-1, 1.5, 1.5}, {1, -1, 0}}, unit_box));
+  BOOST_TEST(!intersects(Ray{{-1, 1.5, 1.5}, {1, 0, -1}}, unit_box));
+  BOOST_TEST(intersects(Ray{{2, -.5, .5}, {-1, 1, 0}}, unit_box));
+  BOOST_TEST(!intersects(Ray{{2, -.5, .5}, {-1, 0, 0}}, unit_box));
+  BOOST_TEST(intersects(Ray{{2, -.5, 1.5}, {-1, 1, -1}}, unit_box));
+  BOOST_TEST(!intersects(Ray{{2, -.5, 1.5}, {-1, 0, 0}}, unit_box));
+  BOOST_TEST(!intersects(Ray{{2, -.5, 1.5}, {-1, 1, 0}}, unit_box));
+  BOOST_TEST(!intersects(Ray{{2, -.5, 1.5}, {-1, 0, -1}}, unit_box));
+
+  // hit the center of an edge
+  BOOST_TEST(intersects(Ray{{-1, 0, .5}, {1, 0, 0}}, unit_box));
+  BOOST_TEST(!intersects(Ray{{-1, 0, .5}, {-1, 0, 0}}, unit_box));
+  BOOST_TEST(!intersects(Ray{{-1, 0, .5}, {0, 1, 1}}, unit_box));
+  BOOST_TEST(intersects(Ray{{2, 0, .5}, {-1, 0, 0}}, unit_box));
+  BOOST_TEST(!intersects(Ray{{2, 0, .5}, {1, 0, 0}}, unit_box));
+  BOOST_TEST(!intersects(Ray{{2, 0, .5}, {0, 1, 1}}, unit_box));
+  BOOST_TEST(intersects(Ray{{-1, -1, .5}, {1, 1, 0}}, unit_box));
+  BOOST_TEST(intersects(Ray{{-1, 1, .5}, {1, -1, 0}}, unit_box));
+  BOOST_TEST(intersects(Ray{{-1, -2, .5}, {1, 2, 0}}, unit_box));
+  BOOST_TEST(intersects(Ray{{2, 2, .5}, {-1, -1, 0}}, unit_box));
+  BOOST_TEST(intersects(Ray{{2, -1, .5}, {-1, 1, 0}}, unit_box));
+  BOOST_TEST(intersects(Ray{{2, 1, .5}, {-1, -1, 0}}, unit_box));
+
+  // hit a corner
+  BOOST_TEST(intersects(Ray{{-0.5, 1.5, 1.5}, {1, -1, -1}}, unit_box));
+  BOOST_TEST(!intersects(Ray{{-1, 1, 1}, {-1, 0, 0}}, unit_box));
+  BOOST_TEST(!intersects(Ray{{-1, 1, 1}, {0, 1, 1}}, unit_box));
+  BOOST_TEST(!intersects(Ray{{2, 1, 1}, {1, 0, 0}}, unit_box));
+  BOOST_TEST(!intersects(Ray{{2, 1, 1}, {0, 1, 1}}, unit_box));
+  BOOST_TEST(intersects(Ray{{-1, -1, -1}, {1, 1, 1}}, unit_box));
+  BOOST_TEST(intersects(Ray{{2, 2, 2}, {-1, -1, -1}}, unit_box));
+
+  BOOST_TEST(!intersects(Ray{{1, 2, 3}, {4, 5, 6}}, unit_box));
+  BOOST_TEST(intersects(Ray{{1, 2, 3}, {-1, -2, -3}}, unit_box));
+
+  // origin is on the box (no 0*inf).
+  BOOST_TEST(intersects(Ray{{0, 0, 0}, {1, 1, 1}}, unit_box));
+  BOOST_TEST(intersects(Ray{{0, 0, 0}, {-1, -1, -1}}, unit_box));
+  BOOST_TEST(intersects(Ray{{1, 1, 1}, {-1, -1, -1}}, unit_box));
+  BOOST_TEST(intersects(Ray{{1, 1, 1}, {1, 1, 1}}, unit_box));
+
+  BOOST_TEST(intersects(Ray{{1, .5, .5}, {-1, 0, 0}}, unit_box));
+  BOOST_TEST(intersects(Ray{{1, .5, .5}, {1, 0, 0}}, unit_box));
+  BOOST_TEST(intersects(Ray{{.5, 1, .5}, {0, -1, 0}}, unit_box));
+  BOOST_TEST(intersects(Ray{{.5, 1, .5}, {0, 1, 0}}, unit_box));
+  BOOST_TEST(intersects(Ray{{.5, .5, 1}, {0, 0, -1}}, unit_box));
+  BOOST_TEST(intersects(Ray{{.5, .5, 1}, {0, 0, 1}}, unit_box));
+
+  BOOST_TEST(intersects(Ray{{0, 0, .5}, {1, 1, 0}}, unit_box));
+  BOOST_TEST(intersects(Ray{{0, 0, .5}, {-1, -1, 0}}, unit_box));
+  BOOST_TEST(intersects(Ray{{1, 1, .5}, {-1, -1, 0}}, unit_box));
+  BOOST_TEST(intersects(Ray{{1, 1, .5}, {1, 1, 0}}, unit_box));
+
+  BOOST_TEST(intersects(Ray{{0, 0.5, 0}, {-1, -2, 0}}, unit_box));
+  BOOST_TEST(intersects(Ray{{0.5, 0, 0.5}, {2, 0, -1}}, unit_box));
+
+  // origin is on the box (with 0*inf).
+  BOOST_TEST(intersects(Ray{{0, 0, 0}, {0, 1, -1}}, unit_box));
+  BOOST_TEST(intersects(Ray{{0, 0, 0}, {-1, 0, -1}}, unit_box));
+  BOOST_TEST(intersects(Ray{{0, 0, 0}, {-1, 1, 0}}, unit_box));
+  BOOST_TEST(intersects(Ray{{0, 0, 0}, {0, 0, 1}}, unit_box));
+  BOOST_TEST(intersects(Ray{{0, 0, 0}, {-1, 0, 0}}, unit_box));
+  BOOST_TEST(intersects(Ray{{0, 0, 0}, {0, -1, 0}}, unit_box));
+
+  BOOST_TEST(intersects(Ray{{1, 1, 1}, {0, -1, -1}}, unit_box));
+  BOOST_TEST(intersects(Ray{{1, 1, 1}, {1, 0, 1}}, unit_box));
+  BOOST_TEST(intersects(Ray{{1, 1, 1}, {-1, -1, 0}}, unit_box));
+  BOOST_TEST(intersects(Ray{{1, 1, 1}, {1, 0, 0}}, unit_box));
+  BOOST_TEST(intersects(Ray{{1, 1, 1}, {0, 1, 0}}, unit_box));
+  BOOST_TEST(intersects(Ray{{1, 1, 1}, {0, 0, -1}}, unit_box));
+
+  BOOST_TEST(intersects(Ray{{0, 1, 1}, {0, 0, 1}}, unit_box));
+  BOOST_TEST(intersects(Ray{{1, 0, 1}, {1, 0, 0}}, unit_box));
+  BOOST_TEST(intersects(Ray{{1, 1, 0}, {0, 1, 0}}, unit_box));
+
+  BOOST_TEST(intersects(Ray{{0, 0, 1}, {-1, 0, -1}}, unit_box));
+  BOOST_TEST(intersects(Ray{{0, 0, 1}, {0, 0, 1}}, unit_box));
+  BOOST_TEST(intersects(Ray{{1, 0, 0}, {0, 1, 0}}, unit_box));
+  BOOST_TEST(intersects(Ray{{1, 0, 0}, {-1, 0, 0}}, unit_box));
+  BOOST_TEST(intersects(Ray{{0, 1, 0}, {0, 0, 1}}, unit_box));
+  BOOST_TEST(intersects(Ray{{0, 1, 0}, {0, 0, -1}}, unit_box));
+
+  // more cases with 0*inf:
+  BOOST_TEST(intersects(Ray{{0, 1.5, 1.5}, {0, -1, -1}}, unit_box));
+  BOOST_TEST(!intersects(Ray{{0, 1.5, 1.5}, {0, 1, 1}}, unit_box));
+  BOOST_TEST(intersects(Ray{{1.5, 0, 1.5}, {-1, 0, -1}}, unit_box));
+  BOOST_TEST(!intersects(Ray{{1.5, 0, 1.5}, {1, 0, 1}}, unit_box));
+  BOOST_TEST(intersects(Ray{{1.5, 1.5, 0}, {-1, -1, 0}}, unit_box));
+  BOOST_TEST(!intersects(Ray{{1.5, 1.5, 0}, {1, 1, 0}}, unit_box));
+
+  BOOST_TEST(intersects(Ray{{1, 1.5, 1.5}, {0, -1, -1}}, unit_box));
+  BOOST_TEST(!intersects(Ray{{1, 1.5, 1.5}, {0, 1, 1}}, unit_box));
+  BOOST_TEST(intersects(Ray{{1.5, 1, 1.5}, {-1, 0, -1}}, unit_box));
+  BOOST_TEST(!intersects(Ray{{1.5, 1, 1.5}, {1, 0, 1}}, unit_box));
+  BOOST_TEST(intersects(Ray{{1.5, 1.5, 1}, {-1, -1, 0}}, unit_box));
+  BOOST_TEST(!intersects(Ray{{1.5, 1.5, 1}, {1, 1, 0}}, unit_box));
+
+  BOOST_TEST(intersects(Ray{{1.5, 0, 0}, {-1, 0, 2}}, unit_box));
+  BOOST_TEST(intersects(Ray{{1.5, 0, 0}, {-1, 2, 0}}, unit_box));
+  BOOST_TEST(!intersects(Ray{{1.5, 0, 0}, {-1, 0, 2.1}}, unit_box));
+  BOOST_TEST(!intersects(Ray{{1.5, 0, 0}, {-1, 2.1, 0}}, unit_box));
+  BOOST_TEST(intersects(Ray{{1.5, 1, 1}, {-1, 0, -2}}, unit_box));
+  BOOST_TEST(intersects(Ray{{1.5, 1, 1}, {-1, -2, 0}}, unit_box));
+  BOOST_TEST(!intersects(Ray{{1.5, 1, 1}, {-1, 0, -2.1}}, unit_box));
+  BOOST_TEST(!intersects(Ray{{1.5, 1, 1}, {-1, -2.1, 0}}, unit_box));
+
+  BOOST_TEST(intersects(Ray{{0, 1.5, 0}, {0, -1, 2}}, unit_box));
+  BOOST_TEST(intersects(Ray{{0, 1.5, 0}, {2, -1, 0}}, unit_box));
+  BOOST_TEST(!intersects(Ray{{0, 1.5, 0}, {0, -1, 2.1}}, unit_box));
+  BOOST_TEST(!intersects(Ray{{0, 1.5, 0}, {2.1, -1, 0}}, unit_box));
+  BOOST_TEST(intersects(Ray{{1, 1.5, 1}, {0, -1, -2}}, unit_box));
+  BOOST_TEST(intersects(Ray{{1, 1.5, 1}, {-2, -1, 0}}, unit_box));
+  BOOST_TEST(!intersects(Ray{{1, 1.5, 1}, {0, -1, -2.1}}, unit_box));
+  BOOST_TEST(!intersects(Ray{{1, 1.5, 1}, {-2.1, -1, 0}}, unit_box));
+}
+
+// NOTE until boost 1.70 need to cast both operands when comparing floating
+// points
+BOOST_AUTO_TEST_CASE(overlap_distance_sphere,
+                     *boost::unit_test::tolerance(1e-6f))
+{
+  using ArborX::Sphere;
+  using ArborX::Experimental::Ray;
+  constexpr Sphere unit_sphere{{0, 0, 0}, 1};
+
+  auto const sqrtf_3 = std::sqrt(3.f);
+  auto const half_sqrtf_2 = std::sqrt(2.f) / 2;
+  auto const half_sqrtf_3 = std::sqrt(3.f) / 2;
+
+  // hit center of the sphere
+  BOOST_TEST(overlapDistance(Ray{{-2, 0, 0}, {1, 0, 0}}, unit_sphere) == 2.f);
+  BOOST_TEST(overlapDistance(Ray{{0, 3, 0}, {0, -1, 0}}, unit_sphere) == 2.f);
+  BOOST_TEST(overlapDistance(Ray{{0, 0, -4}, {0, 0, 1}}, unit_sphere) == 2.f);
+  BOOST_TEST(overlapDistance(Ray{{-2, -2, -2}, {1, 1, 1}}, unit_sphere) == 2.f);
+  // miss it
+  BOOST_TEST(overlapDistance(Ray{{-2, -2, -2}, {1, 0, 0}}, unit_sphere) == 0.f);
+  BOOST_TEST(overlapDistance(Ray{{1, 2, 3}, {4, 5, 6}}, unit_sphere) == 0.f);
+  // half-radius
+  BOOST_TEST(overlapDistance(Ray{{-2, 0, 0.5}, {1, 0, 0}}, unit_sphere) ==
+             sqrtf_3);
+  BOOST_TEST(overlapDistance(Ray{{0, -0.5, 2}, {0, 0, -1}}, unit_sphere) ==
+             sqrtf_3);
+  // touch surface but no intersection
+  BOOST_TEST(overlapDistance(Ray{{1, -2, 0}, {0, 1, 0}}, unit_sphere) == 0.f);
+  BOOST_TEST(overlapDistance(Ray{{2, 2, -1}, {-1, -1, 0}}, unit_sphere) == 0.f);
+
+  // behind the origin
+  BOOST_TEST(overlapDistance(Ray{{-2, 0, 0}, {-1, 0, 0}}, unit_sphere) == 0.f);
+  BOOST_TEST(overlapDistance(Ray{{0, 2, 2}, {0, 1, 1}}, unit_sphere) == 0.f);
+  BOOST_TEST(overlapDistance(Ray{{0, 2, 2}, {0, 1, 1}}, unit_sphere) == 0.f);
+
+  // origin inside
+  BOOST_TEST(overlapDistance(Ray{{0.5, 0, 0}, {0, 1, 1}}, unit_sphere) ==
+             half_sqrtf_3);
+  BOOST_TEST(overlapDistance(Ray{{0, -half_sqrtf_3, 0}, {0, 0, 1}},
+                             unit_sphere) == 0.5f);
+  BOOST_TEST(overlapDistance(Ray{{0, 0, half_sqrtf_2}, {1, -1, 0}},
+                             unit_sphere) == half_sqrtf_2);
+  BOOST_TEST(overlapDistance(Ray{{0, 0.6, 0}, {0, 1, 0}}, unit_sphere) == 0.4f);
+  BOOST_TEST(overlapDistance(Ray{{0, 0, 0}, {1, 2, 3}}, unit_sphere) == 1.f);
+
+  // origin on surface
+  //   tangent
+  BOOST_TEST(overlapDistance(Ray{{0, 0, 1}, {1, -1, 0}}, unit_sphere) == 0.f);
+  BOOST_TEST(overlapDistance(Ray{{0, 1, 0}, {2, 0, 3}}, unit_sphere) == 0.f);
+  BOOST_TEST(
+      overlapDistance(Ray{{half_sqrtf_2, half_sqrtf_2, 0}, {1, -1, 0}},
+                      unit_sphere) == 0.f,
+      boost::test_tools::tolerance(5e-4f)); // inside at machine precision...
+  BOOST_TEST(overlapDistance(Ray{{-half_sqrtf_3, 0.5, 0}, {1, 2, 0}},
+                             unit_sphere) == 0.f);
+  BOOST_TEST(overlapDistance(Ray{{0.5, half_sqrtf_3, 0}, {2, -1, 0}},
+                             unit_sphere) == 0.f);
+  //   directed at sphere
+  BOOST_TEST(overlapDistance(Ray{{1, 0, 0}, {-2, 0, 0}}, unit_sphere) == 2.f);
+  BOOST_TEST(overlapDistance(Ray{{1, 0, 0}, {-2, 0, 0}}, unit_sphere) == 2.f);
+  BOOST_TEST(overlapDistance(Ray{{0, -half_sqrtf_2, half_sqrtf_2}, {0, 1, -1}},
+                             unit_sphere) == 2.f);
+  BOOST_TEST(overlapDistance(Ray{{half_sqrtf_3, 0.5, 0}, {-1, 0, 0}},
+                             unit_sphere) == sqrtf_3);
+  //   directed away
+  BOOST_TEST(overlapDistance(Ray{{0, 0, 1}, {1, 1, 1}}, unit_sphere) == 0.f);
+  BOOST_TEST(overlapDistance(Ray{{half_sqrtf_3, 0.5, 0}, {1, 0, 0}},
+                             unit_sphere) == 0.f);
+}
+
+#define STATIC_ASSERT(cond) static_assert(cond, "");
+BOOST_AUTO_TEST_CASE(make_euclidean_vector)
+{
+  using ArborX::Experimental::makeVector;
+  using ArborX::Experimental::Vector;
+  STATIC_ASSERT((makeVector({0, 0, 0}, {1, 2, 3}) == Vector{1, 2, 3}));
+  STATIC_ASSERT((makeVector({1, 2, 3}, {4, 5, 6}) == Vector{3, 3, 3}));
+}
+
+BOOST_AUTO_TEST_CASE(dot_product)
+{
+  using ArborX::Experimental::dotProduct;
+  STATIC_ASSERT(dotProduct({1, 0, 0}, {1, 0, 0}) == 1);
+  STATIC_ASSERT(dotProduct({1, 0, 0}, {0, 1, 0}) == 0);
+  STATIC_ASSERT(dotProduct({1, 0, 0}, {0, 0, 1}) == 0);
+  STATIC_ASSERT(dotProduct({1, 1, 1}, {1, 1, 1}) == 3);
+}
+
+BOOST_AUTO_TEST_CASE(cross_product)
+{
+  using ArborX::Experimental::crossProduct;
+  using ArborX::Experimental::Vector;
+  STATIC_ASSERT((crossProduct({1, 0, 0}, {1, 0, 0}) == Vector{0, 0, 0}));
+  STATIC_ASSERT((crossProduct({1, 0, 0}, {0, 1, 0}) == Vector{0, 0, 1}));
+  STATIC_ASSERT((crossProduct({1, 0, 0}, {0, 0, 1}) == Vector{0, -1, 0}));
+  STATIC_ASSERT((crossProduct({0, 1, 0}, {1, 0, 0}) == Vector{0, 0, -1}));
+  STATIC_ASSERT((crossProduct({0, 1, 0}, {0, 1, 0}) == Vector{0, 0, 0}));
+  STATIC_ASSERT((crossProduct({0, 1, 0}, {0, 0, 1}) == Vector{1, 0, 0}));
+  STATIC_ASSERT((crossProduct({1, 1, 1}, {1, 1, 1}) == Vector{0, 0, 0}));
+}
+#undef STATIC_ASSERT
diff --git a/arborx/test/tstScopedProfileRegion.cpp b/arborx/test/tstScopedProfileRegion.cpp
new file mode 100644
index 000000000..fbf13cb34
--- /dev/null
+++ b/arborx/test/tstScopedProfileRegion.cpp
@@ -0,0 +1,97 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#include <ArborX_DetailsKokkosExtScopedProfileRegion.hpp>
+
+#include <boost/test/unit_test.hpp>
+
+#include <stack>
+#include <string>
+#include <type_traits>
+
+#if (KOKKOS_VERSION >= 30200) // callback registration from within the program
+                              // was added in Kokkkos v3.2
+
+namespace
+{
+std::stack<std::string> arborx_test_region_stack;
+
+// NOTE: cannot use lambdas because they can only be converted to function
+// pointers if they don't capture anything
+void arborx_test_push_region(char const *label)
+{
+  BOOST_TEST_MESSAGE(std::string("push ") + label);
+  arborx_test_region_stack.push(label);
+}
+
+void arborx_test_pop_region()
+{
+  auto const &label = arborx_test_region_stack.top();
+  BOOST_TEST_MESSAGE(std::string("pop ") + label);
+  arborx_test_region_stack.pop();
+}
+
+} // namespace
+
+BOOST_AUTO_TEST_SUITE(KokkosToolsAnnotations)
+
+BOOST_AUTO_TEST_CASE(scoped_profile_region)
+{
+  Kokkos::Tools::Experimental::set_push_region_callback(
+      arborx_test_push_region);
+  Kokkos::Tools::Experimental::set_pop_region_callback(arborx_test_pop_region);
+
+  BOOST_TEST(arborx_test_region_stack.empty());
+
+  // Unnamed guard!  Profile region is popped at the end of the statement.
+  KokkosExt::ScopedProfileRegion("bug");
+
+  BOOST_TEST(arborx_test_region_stack.empty());
+
+  {
+    std::string outer_identifier = "outer";
+    KokkosExt::ScopedProfileRegion guard_outer(outer_identifier);
+
+    BOOST_TEST(arborx_test_region_stack.size() == 1);
+    BOOST_TEST(arborx_test_region_stack.top() == outer_identifier);
+
+    {
+      std::string inner_identifier = "inner";
+      KokkosExt::ScopedProfileRegion guard_inner(inner_identifier);
+      BOOST_TEST(arborx_test_region_stack.size() == 2);
+      BOOST_TEST(arborx_test_region_stack.top() == inner_identifier);
+    }
+
+    BOOST_TEST(arborx_test_region_stack.size() == 1);
+    BOOST_TEST(arborx_test_region_stack.top() == outer_identifier);
+  }
+
+  BOOST_TEST(arborx_test_region_stack.empty());
+
+  // Unset callbacks
+  Kokkos::Tools::Experimental::set_push_region_callback(nullptr);
+  Kokkos::Tools::Experimental::set_pop_region_callback(nullptr);
+}
+
+static_assert(
+    !std::is_default_constructible<KokkosExt::ScopedProfileRegion>::value, "");
+static_assert(
+    !std::is_copy_constructible<KokkosExt::ScopedProfileRegion>::value, "");
+static_assert(
+    !std::is_move_constructible<KokkosExt::ScopedProfileRegion>::value, "");
+static_assert(!std::is_copy_assignable<KokkosExt::ScopedProfileRegion>::value,
+              "");
+static_assert(!std::is_move_assignable<KokkosExt::ScopedProfileRegion>::value,
+              "");
+
+BOOST_AUTO_TEST_SUITE_END()
+
+#endif
diff --git a/arborx/test/tstSequenceContainers.cpp b/arborx/test/tstSequenceContainers.cpp
new file mode 100644
index 000000000..2284208a9
--- /dev/null
+++ b/arborx/test/tstSequenceContainers.cpp
@@ -0,0 +1,146 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#include <ArborX_DetailsContainers.hpp>
+
+#define BOOST_TEST_MODULE Containers
+#include <boost/test/unit_test.hpp>
+
+using ArborX::Details::StaticVector;
+using ArborX::Details::UnmanagedStaticVector;
+
+BOOST_AUTO_TEST_SUITE(SequenceContainers)
+
+BOOST_AUTO_TEST_CASE(dynamic_array_with_fixed_maximum_size)
+{
+  StaticVector<int, 4> a;
+
+  BOOST_TEST(a.empty());
+  BOOST_TEST(a.size() == 0);
+  BOOST_TEST(a.maxSize() == 4);
+  BOOST_TEST(a.capacity() == 4);
+
+  a.pushBack(255);
+  BOOST_TEST(!a.empty());
+  BOOST_TEST(a.size() == 1);
+  BOOST_TEST(a.maxSize() == 4);
+  BOOST_TEST(a.capacity() == 4);
+  BOOST_TEST(a.front() == 255);
+  BOOST_TEST(a[0] == 255);
+  BOOST_TEST(a.back() == 255);
+
+  a.pushBack(-1);
+  BOOST_TEST(!a.empty());
+  BOOST_TEST(a.size() == 2);
+  BOOST_TEST(a.maxSize() == 4);
+  BOOST_TEST(a.capacity() == 4);
+  BOOST_TEST(a.front() == 255);
+  BOOST_TEST(a[0] == 255);
+  BOOST_TEST(a.back() == -1);
+  BOOST_TEST(a[1] == -1);
+
+  a.pushBack(33);
+  BOOST_TEST(!a.empty());
+  BOOST_TEST(a.size() == 3);
+  BOOST_TEST(a.maxSize() == 4);
+  BOOST_TEST(a.capacity() == 4);
+  BOOST_TEST(a.front() == 255);
+  BOOST_TEST(a[0] == 255);
+  BOOST_TEST(a[1] == -1);
+  BOOST_TEST(a.back() == 33);
+  BOOST_TEST(a[2] == 33);
+
+  a.popBack();
+  BOOST_TEST(!a.empty());
+  BOOST_TEST(a.size() == 2);
+  BOOST_TEST(a.maxSize() == 4);
+  BOOST_TEST(a.capacity() == 4);
+  BOOST_TEST(a.front() == 255);
+  BOOST_TEST(a.back() == -1);
+
+  a.popBack();
+  BOOST_TEST(!a.empty());
+  BOOST_TEST(a.size() == 1);
+  BOOST_TEST(a.maxSize() == 4);
+  BOOST_TEST(a.capacity() == 4);
+  BOOST_TEST(a.front() == 255);
+  BOOST_TEST(a.back() == 255);
+
+  a.popBack();
+  BOOST_TEST(a.empty());
+  BOOST_TEST(a.size() == 0);
+  BOOST_TEST(a.maxSize() == 4);
+  BOOST_TEST(a.capacity() == 4);
+}
+
+BOOST_AUTO_TEST_CASE(non_owning_view_over_dynamic_array)
+{
+  float data[6] = {255, 255, 255, 255, 255, 255};
+  //                        ^^^^ ^^^^ ^^^^
+  UnmanagedStaticVector<float> a(data + 2, 3);
+
+  BOOST_TEST(!std::is_default_constructible<decltype(a)>::value);
+  BOOST_TEST(a.data() == data + 2);
+
+  BOOST_TEST(a.empty());
+  BOOST_TEST(a.size() == 0);
+  BOOST_TEST(a.maxSize() == 3);
+  BOOST_TEST(a.capacity() == 3);
+
+  a.pushBack(0);
+  BOOST_TEST(!a.empty());
+  BOOST_TEST(a.size() == 1);
+  BOOST_TEST(a.maxSize() == 3);
+  BOOST_TEST(a.capacity() == 3);
+  BOOST_TEST(a.front() == 0);
+  BOOST_TEST(a.back() == 0);
+  BOOST_TEST(a[0] == 0);
+
+  a.pushBack(1);
+  BOOST_TEST(!a.empty());
+  BOOST_TEST(a.size() == 2);
+  BOOST_TEST(a.maxSize() == 3);
+  BOOST_TEST(a.capacity() == 3);
+  BOOST_TEST(a.front() == 0);
+  BOOST_TEST(a[0] == 0);
+  BOOST_TEST(a.back() == 1);
+  BOOST_TEST(a[1] == 1);
+
+  a.pushBack(2);
+  BOOST_TEST(!a.empty());
+  BOOST_TEST(a.size() == 3);
+  BOOST_TEST(a.maxSize() == 3);
+  BOOST_TEST(a.capacity() == 3);
+  BOOST_TEST(a.front() == 0);
+  BOOST_TEST(a[0] == 0);
+  BOOST_TEST(a[1] == 1);
+  BOOST_TEST(a.back() == 2);
+  BOOST_TEST(a[2] == 2);
+
+  a.popBack();
+  BOOST_TEST(!a.empty());
+  BOOST_TEST(a.size() == 2);
+  BOOST_TEST(a.maxSize() == 3);
+  BOOST_TEST(a.capacity() == 3);
+  BOOST_TEST(a.front() == 0);
+  BOOST_TEST(a[0] == 0);
+  BOOST_TEST(a.back() == 1);
+  BOOST_TEST(a[1] == 1);
+
+  BOOST_TEST(data[0] == 255);
+  BOOST_TEST(data[1] == 255);
+  BOOST_TEST(data[2] == 0);
+  BOOST_TEST(data[3] == 1);
+  BOOST_TEST(data[4] == 2);
+  BOOST_TEST(data[5] == 255);
+}
+
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/arborx/test/utf_main.cpp b/arborx/test/utf_main.cpp
new file mode 100644
index 000000000..d3bdaceb8
--- /dev/null
+++ b/arborx/test/utf_main.cpp
@@ -0,0 +1,45 @@
+/****************************************************************************
+ * Copyright (c) 2017-2021 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#include <Kokkos_Core.hpp>
+
+#define BOOST_TEST_NO_MAIN
+#include <boost/test/unit_test.hpp>
+
+#if defined(ARBORX_MPI_UNIT_TEST)
+#include <mpi.h>
+#endif
+
+struct ExecutionEnvironmentScopeGuard
+{
+  ExecutionEnvironmentScopeGuard(int argc, char *argv[])
+  {
+#if defined(ARBORX_MPI_UNIT_TEST)
+    MPI_Init(&argc, &argv);
+#endif
+    Kokkos::initialize(argc, argv);
+  }
+  ~ExecutionEnvironmentScopeGuard()
+  {
+    Kokkos::finalize();
+#if defined(ARBORX_MPI_UNIT_TEST)
+    MPI_Finalize();
+#endif
+  }
+};
+
+bool init_function() { return true; }
+
+int main(int argc, char *argv[])
+{
+  ExecutionEnvironmentScopeGuard scope_guard(argc, argv);
+  return boost::unit_test::unit_test_main(&init_function, argc, argv);
+}

From 44766f8f52d76eebab4e03b047a716a9d1fc90b1 Mon Sep 17 00:00:00 2001
From: Paul Kuberry <pakuber@sandia.gov>
Date: Thu, 23 Sep 2021 07:54:53 -0600
Subject: [PATCH 03/40] Update Kokkos to tag 3.1.00

---
 kokkos/.gitignore                             |    3 +
 kokkos/.jenkins                               |   32 +
 kokkos/.travis.yml                            |    8 +-
 kokkos/BUILD.md                               |   47 +-
 kokkos/CHANGELOG.md                           |   64 +-
 kokkos/CMakeLists.txt                         |   61 +-
 kokkos/Copyright.txt                          |   12 +-
 kokkos/LICENSE                                |    4 +-
 kokkos/Makefile.kokkos                        |  193 +-
 kokkos/Makefile.targets                       |   24 +-
 kokkos/README.md                              |   80 +-
 kokkos/algorithms/src/Kokkos_Random.hpp       |  737 ++--
 kokkos/algorithms/src/Kokkos_Sort.hpp         |   22 +-
 kokkos/algorithms/unit_tests/CMakeLists.txt   |   30 +-
 kokkos/algorithms/unit_tests/Makefile         |    2 +-
 kokkos/algorithms/unit_tests/TestCuda.cpp     |   12 +-
 kokkos/algorithms/unit_tests/TestHIP.cpp      |   83 +
 kokkos/algorithms/unit_tests/TestHPX.cpp      |    4 +-
 kokkos/algorithms/unit_tests/TestOpenMP.cpp   |   28 +-
 .../unit_tests/TestOpenMP_Random.cpp          |   77 +
 .../unit_tests/TestOpenMP_Sort1D.cpp          |   65 +
 .../unit_tests/TestOpenMP_Sort3D.cpp          |   65 +
 .../unit_tests/TestOpenMP_SortDynamicView.cpp |   65 +
 kokkos/algorithms/unit_tests/TestROCm.cpp     |    4 +-
 kokkos/algorithms/unit_tests/TestRandom.hpp   |    6 +-
 kokkos/algorithms/unit_tests/TestSerial.cpp   |    4 +-
 kokkos/algorithms/unit_tests/TestSort.hpp     |   43 +-
 kokkos/algorithms/unit_tests/TestThreads.cpp  |    4 +-
 kokkos/algorithms/unit_tests/UnitTestMain.cpp |    4 +-
 kokkos/appveyor.yml                           |   10 +
 kokkos/benchmarks/bytes_and_flops/bench.hpp   |    4 +-
 .../bytes_and_flops/bench_stride.hpp          |    4 +-
 .../bytes_and_flops/bench_unroll_stride.hpp   |    4 +-
 kokkos/benchmarks/bytes_and_flops/main.cpp    |    4 +-
 kokkos/benchmarks/gather/gather.hpp           |    4 +-
 kokkos/benchmarks/gather/gather_unroll.hpp    |    4 +-
 kokkos/benchmarks/gather/main.cpp             |    4 +-
 kokkos/benchmarks/gups/gups-kokkos.cc         |    6 +-
 kokkos/benchmarks/policy_performance/main.cpp |    4 +-
 .../policy_performance/policy_perf_test.hpp   |    4 +-
 .../policy_performance/script_sample_usage.sh |    2 +-
 kokkos/benchmarks/stream/stream-kokkos.cc     |    6 +-
 kokkos/bin/hpcbind                            |    2 +-
 kokkos/cm_generate_makefile.bash              |  339 --
 kokkos/cmake/Dependencies.cmake               |    1 -
 kokkos/cmake/KokkosConfigCommon.cmake.in      |    3 +
 kokkos/cmake/KokkosCore_config.h.in           |    9 +
 kokkos/cmake/KokkosTrilinosConfig.cmake.in    |   17 +
 kokkos/cmake/Modules/FindTPLCUDA.cmake        |    6 +-
 kokkos/cmake/Modules/FindTPLPTHREAD.cmake     |   21 +-
 kokkos/cmake/README.md                        |   15 +-
 kokkos/cmake/compile_tests/clang_omp.cpp      |    2 +-
 kokkos/cmake/compile_tests/pthread.cpp        |    4 +
 kokkos/cmake/fake_tribits.cmake               |   39 +-
 kokkos/cmake/kokkos_arch.cmake                |  224 +-
 kokkos/cmake/kokkos_check_env.cmake           |   12 +
 kokkos/cmake/kokkos_compiler_id.cmake         |   26 +-
 kokkos/cmake/kokkos_corner_cases.cmake        |   28 +-
 kokkos/cmake/kokkos_enable_devices.cmake      |   37 +
 kokkos/cmake/kokkos_enable_options.cmake      |   30 +-
 kokkos/cmake/kokkos_functions.cmake           |  247 +-
 kokkos/cmake/kokkos_install.cmake             |    9 +-
 kokkos/cmake/kokkos_test_cxx_std.cmake        |   15 +-
 kokkos/cmake/kokkos_tpls.cmake                |    4 +
 kokkos/cmake/kokkos_tribits.cmake             |   93 +-
 kokkos/cmake/msvc.cmake                       |   11 +
 kokkos/cmake/tpls/FindTPLCUSPARSE.cmake       |   14 +-
 kokkos/config/test_all_sandia                 |   55 +-
 .../performance_tests/CMakeLists.txt          |   32 +-
 .../containers/performance_tests/TestCuda.cpp |    4 +-
 .../performance_tests/TestDynRankView.hpp     |    4 +-
 .../performance_tests/TestGlobal2LocalIds.hpp |    4 +-
 .../containers/performance_tests/TestHPX.cpp  |    4 +-
 .../containers/performance_tests/TestMain.cpp |    4 +-
 .../performance_tests/TestOpenMP.cpp          |    4 +-
 .../containers/performance_tests/TestROCm.cpp |    4 +-
 .../performance_tests/TestScatterView.hpp     |    4 +-
 .../performance_tests/TestThreads.cpp         |    4 +-
 .../TestUnorderedMapPerformance.hpp           |    4 +-
 kokkos/containers/src/Kokkos_Bitset.hpp       |   14 +-
 kokkos/containers/src/Kokkos_DualView.hpp     |  144 +-
 kokkos/containers/src/Kokkos_DynRankView.hpp  |   33 +-
 kokkos/containers/src/Kokkos_DynamicView.hpp  |   28 +-
 .../containers/src/Kokkos_ErrorReporter.hpp   |    6 +-
 kokkos/containers/src/Kokkos_Functional.hpp   |    4 +-
 kokkos/containers/src/Kokkos_OffsetView.hpp   |   45 +-
 kokkos/containers/src/Kokkos_ScatterView.hpp  |  313 +-
 .../containers/src/Kokkos_StaticCrsGraph.hpp  |   20 +-
 kokkos/containers/src/Kokkos_UnorderedMap.hpp |   42 +-
 kokkos/containers/src/Kokkos_Vector.hpp       |   12 +-
 .../src/impl/Kokkos_Bitset_impl.hpp           |    7 +-
 .../src/impl/Kokkos_Functional_impl.hpp       |    4 +-
 .../impl/Kokkos_StaticCrsGraph_factory.hpp    |   20 +-
 .../src/impl/Kokkos_UnorderedMap_impl.cpp     |    4 +-
 .../src/impl/Kokkos_UnorderedMap_impl.hpp     |   35 +-
 kokkos/containers/unit_tests/CMakeLists.txt   |   44 +-
 kokkos/containers/unit_tests/Makefile         |   79 +-
 kokkos/containers/unit_tests/TestBitset.hpp   |   10 +-
 .../{cuda => }/TestCuda_Category.hpp          |    4 +-
 kokkos/containers/unit_tests/TestDualView.hpp |  218 +-
 .../containers/unit_tests/TestDynViewAPI.hpp  |   46 +-
 .../unit_tests/TestDynViewAPI_generic.hpp     |    7 +-
 .../unit_tests/TestDynViewAPI_rank12345.hpp   |    7 +-
 .../unit_tests/TestDynViewAPI_rank67.hpp      |    4 +-
 .../containers/unit_tests/TestDynamicView.hpp |   16 +-
 .../unit_tests/TestErrorReporter.hpp          |   18 +-
 ...Cuda_DualView.cpp => TestHIP_Category.hpp} |   14 +-
 .../unit_tests/{hpx => }/TestHPX_Category.hpp |    4 +-
 .../containers/unit_tests/TestOffsetView.hpp  |   27 +-
 .../{openmp => }/TestOpenMP_Category.hpp      |    4 +-
 .../containers/unit_tests/TestScatterView.hpp |  134 +-
 .../{serial => }/TestSerial_Category.hpp      |    4 +-
 .../unit_tests/TestStaticCrsGraph.hpp         |    4 +-
 .../{threads => }/TestThreads_Category.hpp    |    4 +-
 .../unit_tests/TestUnorderedMap.hpp           |   26 +-
 kokkos/containers/unit_tests/TestVector.hpp   |    4 +-
 .../TestViewCtorPropEmbeddedDim.hpp           |    6 +-
 kokkos/containers/unit_tests/UnitTestMain.cpp |    4 +-
 .../cuda/TestCuda_DynRankViewAPI_generic.cpp  |   47 -
 .../cuda/TestCuda_DynRankViewAPI_rank67.cpp   |   47 -
 .../unit_tests/cuda/TestCuda_DynamicView.cpp  |   47 -
 .../cuda/TestCuda_ErrorReporter.cpp           |   47 -
 .../unit_tests/cuda/TestCuda_ScatterView.cpp  |   47 -
 .../cuda/TestCuda_StaticCrsGraph.cpp          |   47 -
 .../unit_tests/cuda/TestCuda_UnorderedMap.cpp |   47 -
 .../cuda/TestCuda_ViewCtorPropEmbeddedDim.cpp |   47 -
 .../hpx/TestHPX_DynRankViewAPI_generic.cpp    |   47 -
 .../hpx/TestHPX_DynRankViewAPI_rank12345.cpp  |   47 -
 .../hpx/TestHPX_DynRankViewAPI_rank67.cpp     |   47 -
 .../unit_tests/hpx/TestHPX_DynamicView.cpp    |   47 -
 .../unit_tests/hpx/TestHPX_ErrorReporter.cpp  |   47 -
 .../unit_tests/hpx/TestHPX_OffsetView.cpp     |   47 -
 .../unit_tests/hpx/TestHPX_ScatterView.cpp    |   47 -
 .../unit_tests/hpx/TestHPX_StaticCrsGraph.cpp |   47 -
 .../unit_tests/hpx/TestHPX_UnorderedMap.cpp   |   47 -
 .../hpx/TestHPX_ViewCtorPropEmbeddedDim.cpp   |   47 -
 .../unit_tests/openmp/TestOpenMP_DualView.cpp |   47 -
 .../TestOpenMP_DynRankViewAPI_generic.cpp     |   47 -
 .../TestOpenMP_DynRankViewAPI_rank12345.cpp   |   47 -
 .../TestOpenMP_DynRankViewAPI_rank67.cpp      |   47 -
 .../openmp/TestOpenMP_DynamicView.cpp         |   47 -
 .../openmp/TestOpenMP_ErrorReporter.cpp       |   47 -
 .../openmp/TestOpenMP_OffsetView.cpp          |   47 -
 .../openmp/TestOpenMP_ScatterView.cpp         |   47 -
 .../openmp/TestOpenMP_StaticCrsGraph.cpp      |   47 -
 .../openmp/TestOpenMP_UnorderedMap.cpp        |   47 -
 .../TestOpenMP_ViewCtorPropEmbeddedDim.cpp    |   47 -
 .../unit_tests/rocm/TestROCm_BitSet.cpp       |   47 -
 .../unit_tests/rocm/TestROCm_DualView.cpp     |   47 -
 .../rocm/TestROCm_DynRankViewAPI_generic.cpp  |   47 -
 .../TestROCm_DynRankViewAPI_rank12345.cpp     |   47 -
 .../rocm/TestROCm_DynRankViewAPI_rank67.cpp   |   47 -
 .../unit_tests/rocm/TestROCm_DynamicView.cpp  |   47 -
 .../rocm/TestROCm_ErrorReporter.cpp           |   47 -
 .../unit_tests/rocm/TestROCm_ScatterView.cpp  |   47 -
 .../rocm/TestROCm_StaticCrsGraph.cpp          |   47 -
 .../unit_tests/rocm/TestROCm_UnorderedMap.cpp |   47 -
 .../unit_tests/rocm/TestROCm_Vector.cpp       |   47 -
 .../rocm/TestROCm_ViewCtorPropEmbeddedDim.cpp |   47 -
 .../unit_tests/serial/TestSerial_DualView.cpp |   47 -
 .../TestSerial_DynRankViewAPI_generic.cpp     |   47 -
 .../TestSerial_DynRankViewAPI_rank12345.cpp   |   47 -
 .../TestSerial_DynRankViewAPI_rank67.cpp      |   47 -
 .../serial/TestSerial_DynamicView.cpp         |   47 -
 .../serial/TestSerial_ErrorReporter.cpp       |   47 -
 .../serial/TestSerial_OffsetView.cpp          |   46 -
 .../serial/TestSerial_ScatterView.cpp         |   47 -
 .../serial/TestSerial_StaticCrsGraph.cpp      |   47 -
 .../serial/TestSerial_UnorderedMap.cpp        |   47 -
 .../TestSerial_ViewCtorPropEmbeddedDim.cpp    |   47 -
 .../threads/TestThreads_DualView.cpp          |   47 -
 .../TestThreads_DynRankViewAPI_generic.cpp    |   47 -
 .../TestThreads_DynRankViewAPI_rank12345.cpp  |   47 -
 .../TestThreads_DynRankViewAPI_rank67.cpp     |   47 -
 .../threads/TestThreads_DynamicView.cpp       |   47 -
 .../threads/TestThreads_ErrorReporter.cpp     |   47 -
 .../threads/TestThreads_OffsetView.cpp        |   47 -
 .../threads/TestThreads_ScatterView.cpp       |   47 -
 .../threads/TestThreads_StaticCrsGraph.cpp    |   47 -
 .../threads/TestThreads_UnorderedMap.cpp      |   47 -
 .../TestThreads_ViewCtorPropEmbeddedDim.cpp   |   47 -
 kokkos/core/cmake/Dependencies.cmake          |    2 +-
 kokkos/core/cmake/KokkosCore_config.h.in      |    5 +
 kokkos/core/perf_test/CMakeLists.txt          |   21 +-
 kokkos/core/perf_test/PerfTestBlasKernels.hpp |  114 +-
 kokkos/core/perf_test/PerfTestDriver.hpp      |    4 +-
 kokkos/core/perf_test/PerfTestGramSchmidt.cpp |    9 +-
 kokkos/core/perf_test/PerfTestHexGrad.cpp     |    4 +-
 kokkos/core/perf_test/PerfTestMDRange.hpp     |    4 +-
 kokkos/core/perf_test/PerfTestMain.cpp        |   10 +-
 kokkos/core/perf_test/PerfTest_Category.hpp   |    6 +-
 .../perf_test/PerfTest_CustomReduction.cpp    |   12 +-
 .../core/perf_test/PerfTest_ViewAllocate.cpp  |    4 +-
 kokkos/core/perf_test/PerfTest_ViewCopy.hpp   |    4 +-
 .../core/perf_test/PerfTest_ViewCopy_a123.cpp |    4 +-
 .../core/perf_test/PerfTest_ViewCopy_a45.cpp  |    4 +-
 .../core/perf_test/PerfTest_ViewCopy_a6.cpp   |    4 +-
 .../core/perf_test/PerfTest_ViewCopy_a7.cpp   |    4 +-
 .../core/perf_test/PerfTest_ViewCopy_a8.cpp   |    4 +-
 .../core/perf_test/PerfTest_ViewCopy_b123.cpp |    4 +-
 .../core/perf_test/PerfTest_ViewCopy_b45.cpp  |    4 +-
 .../core/perf_test/PerfTest_ViewCopy_b6.cpp   |    4 +-
 .../core/perf_test/PerfTest_ViewCopy_b7.cpp   |    4 +-
 .../core/perf_test/PerfTest_ViewCopy_b8.cpp   |    4 +-
 .../core/perf_test/PerfTest_ViewCopy_c123.cpp |    4 +-
 .../core/perf_test/PerfTest_ViewCopy_c45.cpp  |    4 +-
 .../core/perf_test/PerfTest_ViewCopy_c6.cpp   |    4 +-
 .../core/perf_test/PerfTest_ViewCopy_c7.cpp   |    4 +-
 .../core/perf_test/PerfTest_ViewCopy_c8.cpp   |    4 +-
 .../core/perf_test/PerfTest_ViewCopy_d123.cpp |    4 +-
 .../core/perf_test/PerfTest_ViewCopy_d45.cpp  |    4 +-
 .../core/perf_test/PerfTest_ViewCopy_d6.cpp   |    4 +-
 .../core/perf_test/PerfTest_ViewCopy_d7.cpp   |    4 +-
 .../core/perf_test/PerfTest_ViewCopy_d8.cpp   |    4 +-
 kokkos/core/perf_test/PerfTest_ViewFill.hpp   |    4 +-
 .../core/perf_test/PerfTest_ViewFill_123.cpp  |    4 +-
 .../core/perf_test/PerfTest_ViewFill_45.cpp   |    4 +-
 kokkos/core/perf_test/PerfTest_ViewFill_6.cpp |    4 +-
 kokkos/core/perf_test/PerfTest_ViewFill_7.cpp |    4 +-
 kokkos/core/perf_test/PerfTest_ViewFill_8.cpp |    4 +-
 kokkos/core/perf_test/PerfTest_ViewResize.hpp |    4 +-
 .../perf_test/PerfTest_ViewResize_123.cpp     |    4 +-
 .../core/perf_test/PerfTest_ViewResize_45.cpp |    4 +-
 .../core/perf_test/PerfTest_ViewResize_6.cpp  |    4 +-
 .../core/perf_test/PerfTest_ViewResize_7.cpp  |    4 +-
 .../core/perf_test/PerfTest_ViewResize_8.cpp  |    4 +-
 kokkos/core/perf_test/test_atomic.cpp         |    4 +-
 kokkos/core/perf_test/test_mempool.cpp        |    4 +-
 kokkos/core/perf_test/test_taskdag.cpp        |    4 +-
 kokkos/core/src/CMakeLists.txt                |    8 +
 .../src/Cuda/KokkosExp_Cuda_IterateTile.hpp   |    4 +-
 .../KokkosExp_Cuda_IterateTile_Refactor.hpp   |    4 +-
 kokkos/core/src/Cuda/Kokkos_CudaSpace.cpp     |   47 +-
 kokkos/core/src/Cuda/Kokkos_Cuda_Alloc.hpp    |    4 +-
 .../Cuda/Kokkos_Cuda_Atomic_Intrinsics.hpp    |    4 +-
 ...uda_Atomic_Intrinsics_Restore_Builtins.hpp |    4 +-
 .../Cuda/Kokkos_Cuda_BlockSize_Deduction.hpp  |    4 +-
 kokkos/core/src/Cuda/Kokkos_Cuda_Error.hpp    |    8 +-
 kokkos/core/src/Cuda/Kokkos_Cuda_Instance.cpp |   37 +-
 kokkos/core/src/Cuda/Kokkos_Cuda_Instance.hpp |    2 +
 .../src/Cuda/Kokkos_Cuda_KernelLaunch.hpp     |   24 +-
 kokkos/core/src/Cuda/Kokkos_Cuda_Locks.cpp    |    4 +-
 kokkos/core/src/Cuda/Kokkos_Cuda_Locks.hpp    |   12 +-
 kokkos/core/src/Cuda/Kokkos_Cuda_Parallel.hpp |   38 +-
 .../core/src/Cuda/Kokkos_Cuda_ReduceScan.hpp  |   23 +-
 kokkos/core/src/Cuda/Kokkos_Cuda_Task.cpp     |    4 +-
 kokkos/core/src/Cuda/Kokkos_Cuda_Task.hpp     |    6 +-
 kokkos/core/src/Cuda/Kokkos_Cuda_Team.hpp     |   53 +-
 .../core/src/Cuda/Kokkos_Cuda_UniqueToken.hpp |   36 +-
 .../src/Cuda/Kokkos_Cuda_Vectorization.hpp    |   36 +-
 .../Kokkos_Cuda_Version_9_8_Compatibility.hpp |   30 +-
 kokkos/core/src/Cuda/Kokkos_Cuda_View.hpp     |   15 +-
 .../src/Cuda/Kokkos_Cuda_ViewCopyETIAvail.hpp |    4 +-
 .../src/Cuda/Kokkos_Cuda_ViewCopyETIDecl.hpp  |    4 +-
 .../src/Cuda/Kokkos_Cuda_WorkGraphPolicy.hpp  |    4 +-
 kokkos/core/src/Cuda/Kokkos_Cuda_abort.hpp    |    4 +-
 kokkos/core/src/Cuda/Kokkos_Cuda_fwd.hpp      |   67 +
 .../src/HIP/KokkosExp_HIP_IterateTile.hpp     | 3296 +++++++++++++++++
 kokkos/core/src/HIP/Kokkos_HIP_Abort.hpp      |   68 +
 kokkos/core/src/HIP/Kokkos_HIP_Atomic.hpp     |  576 +++
 .../HIP/Kokkos_HIP_BlockSize_Deduction.hpp    |  339 ++
 kokkos/core/src/HIP/Kokkos_HIP_Error.hpp      |  110 +
 kokkos/core/src/HIP/Kokkos_HIP_Instance.cpp   |  373 ++
 kokkos/core/src/HIP/Kokkos_HIP_Instance.hpp   |  141 +
 .../core/src/HIP/Kokkos_HIP_KernelLaunch.cpp  |   72 +
 .../core/src/HIP/Kokkos_HIP_KernelLaunch.hpp  |  212 ++
 kokkos/core/src/HIP/Kokkos_HIP_Locks.cpp      |  118 +
 kokkos/core/src/HIP/Kokkos_HIP_Locks.hpp      |  174 +
 .../src/HIP/Kokkos_HIP_Parallel_MDRange.hpp   |  411 ++
 .../src/HIP/Kokkos_HIP_Parallel_Range.hpp     |  655 ++++
 .../core/src/HIP/Kokkos_HIP_Parallel_Team.hpp |  562 +++
 kokkos/core/src/HIP/Kokkos_HIP_ReduceScan.hpp |  420 +++
 kokkos/core/src/HIP/Kokkos_HIP_Space.cpp      |  636 ++++
 kokkos/core/src/HIP/Kokkos_HIP_Team.hpp       | 1106 ++++++
 .../core/src/HIP/Kokkos_HIP_Vectorization.hpp |  160 +
 kokkos/core/src/HPX/Kokkos_HPX.cpp            |    8 +-
 .../Kokkos_HPX_ChunkedRoundRobinExecutor.hpp  |    4 +-
 kokkos/core/src/HPX/Kokkos_HPX_Task.cpp       |    4 +-
 kokkos/core/src/HPX/Kokkos_HPX_Task.hpp       |    4 +-
 .../src/HPX/Kokkos_HPX_ViewCopyETIAvail.hpp   |    4 +-
 .../src/HPX/Kokkos_HPX_ViewCopyETIDecl.hpp    |    4 +-
 .../src/HPX/Kokkos_HPX_WorkGraphPolicy.hpp    |    4 +-
 kokkos/core/src/KokkosExp_MDRangePolicy.hpp   |   67 +-
 kokkos/core/src/Kokkos_AnonymousSpace.hpp     |    4 +-
 kokkos/core/src/Kokkos_Array.hpp              |   56 +-
 kokkos/core/src/Kokkos_Atomic.hpp             |   35 +-
 kokkos/core/src/Kokkos_Complex.hpp            |  116 +-
 kokkos/core/src/Kokkos_Concepts.hpp           |   89 +-
 kokkos/core/src/Kokkos_CopyViews.hpp          |  564 ++-
 kokkos/core/src/Kokkos_Core.hpp               |   25 +-
 kokkos/core/src/Kokkos_Core_fwd.hpp           |   40 +-
 kokkos/core/src/Kokkos_Crs.hpp                |   20 +-
 kokkos/core/src/Kokkos_Cuda.hpp               |   18 +-
 kokkos/core/src/Kokkos_CudaSpace.hpp          |  132 +-
 kokkos/core/src/Kokkos_ExecPolicy.hpp         |   20 +-
 kokkos/core/src/Kokkos_Extents.hpp            |   43 +-
 kokkos/core/src/Kokkos_Future.hpp             |   21 +-
 kokkos/core/src/Kokkos_HBWSpace.hpp           |   25 +-
 kokkos/core/src/Kokkos_HIP.hpp                |   65 +
 kokkos/core/src/Kokkos_HIP_Space.hpp          |  758 ++++
 kokkos/core/src/Kokkos_HPX.hpp                |   46 +-
 kokkos/core/src/Kokkos_HostSpace.hpp          |   28 +-
 kokkos/core/src/Kokkos_Layout.hpp             |    4 +-
 kokkos/core/src/Kokkos_Macros.hpp             |  132 +-
 kokkos/core/src/Kokkos_MasterLock.hpp         |    4 +-
 kokkos/core/src/Kokkos_MemoryPool.hpp         |   71 +-
 kokkos/core/src/Kokkos_MemoryTraits.hpp       |    4 +-
 kokkos/core/src/Kokkos_NumericTraits.hpp      |   11 +-
 kokkos/core/src/Kokkos_OpenMP.hpp             |   16 +-
 kokkos/core/src/Kokkos_OpenMPTarget.hpp       |   90 +-
 kokkos/core/src/Kokkos_OpenMPTargetSpace.hpp  |   22 +-
 kokkos/core/src/Kokkos_Pair.hpp               |   22 +-
 kokkos/core/src/Kokkos_Parallel.hpp           |   83 +-
 kokkos/core/src/Kokkos_Parallel_Reduce.hpp    |   92 +-
 kokkos/core/src/Kokkos_PointerOwnership.hpp   |    4 +-
 .../src/Kokkos_Profiling_ProfileSection.hpp   |   80 +-
 kokkos/core/src/Kokkos_Qthreads.hpp           |  196 -
 kokkos/core/src/Kokkos_ROCm.hpp               |    4 +-
 kokkos/core/src/Kokkos_ROCmSpace.hpp          |    8 +-
 kokkos/core/src/Kokkos_ScratchSpace.hpp       |   24 +-
 kokkos/core/src/Kokkos_Serial.hpp             |   24 +-
 kokkos/core/src/Kokkos_TaskPolicy.hpp         |    4 +-
 kokkos/core/src/Kokkos_TaskScheduler.hpp      |   18 +-
 kokkos/core/src/Kokkos_TaskScheduler_fwd.hpp  |    4 +-
 kokkos/core/src/Kokkos_Threads.hpp            |   15 +-
 kokkos/core/src/Kokkos_Timer.hpp              |    6 +-
 kokkos/core/src/Kokkos_UniqueToken.hpp        |    4 +-
 kokkos/core/src/Kokkos_Vectorization.hpp      |    6 +-
 kokkos/core/src/Kokkos_View.hpp               |  212 +-
 kokkos/core/src/Kokkos_WorkGraphPolicy.hpp    |    6 +-
 kokkos/core/src/Kokkos_hwloc.hpp              |    4 +-
 kokkos/core/src/OpenMP/Kokkos_OpenMP_Exec.cpp |   12 +-
 kokkos/core/src/OpenMP/Kokkos_OpenMP_Exec.hpp |   16 +-
 .../src/OpenMP/Kokkos_OpenMP_Parallel.hpp     |   14 +-
 kokkos/core/src/OpenMP/Kokkos_OpenMP_Task.cpp |    4 +-
 kokkos/core/src/OpenMP/Kokkos_OpenMP_Task.hpp |    8 +-
 kokkos/core/src/OpenMP/Kokkos_OpenMP_Team.hpp |    9 +-
 .../OpenMP/Kokkos_OpenMP_ViewCopyETIAvail.hpp |    4 +-
 .../OpenMP/Kokkos_OpenMP_ViewCopyETIDecl.hpp  |    4 +-
 .../OpenMP/Kokkos_OpenMP_WorkGraphPolicy.hpp  |    4 +-
 .../OpenMPTarget/Kokkos_OpenMPTargetSpace.cpp |   38 +-
 .../OpenMPTarget/Kokkos_OpenMPTarget_Exec.cpp |  162 +-
 .../OpenMPTarget/Kokkos_OpenMPTarget_Exec.hpp |   59 +-
 .../Kokkos_OpenMPTarget_Instance.cpp          |   50 +
 .../Kokkos_OpenMPTarget_Instance.hpp          |   40 +
 .../Kokkos_OpenMPTarget_Parallel.hpp          |  553 ++-
 .../Kokkos_OpenMPTarget_Parallel_MDRange.hpp  |  549 +++
 .../OpenMPTarget/Kokkos_OpenMPTarget_Task.cpp |    4 +-
 .../OpenMPTarget/Kokkos_OpenMPTarget_Task.hpp |    6 +-
 .../core/src/Qthreads/Kokkos_QthreadsExec.cpp |  535 ---
 .../core/src/Qthreads/Kokkos_QthreadsExec.hpp |  687 ----
 .../src/Qthreads/Kokkos_Qthreads_Parallel.hpp |  753 ----
 .../src/Qthreads/Kokkos_Qthreads_Task.cpp     |  308 --
 .../src/Qthreads/Kokkos_Qthreads_Task.hpp     |  149 -
 .../Kokkos_Qthreads_TaskPolicy.cpp.old        |  493 ---
 .../Kokkos_Qthreads_TaskPolicy.hpp.old        |  666 ----
 .../Qthreads/Kokkos_Qthreads_TaskQueue.hpp    |  321 --
 .../Kokkos_Qthreads_TaskQueue_impl.hpp        |  398 --
 kokkos/core/src/Qthreads/README               |   24 -
 .../KokkosExp_ROCm_IterateTile_Refactor.hpp   |    4 +-
 kokkos/core/src/ROCm/Kokkos_ROCm_Atomic.hpp   |    4 +-
 kokkos/core/src/ROCm/Kokkos_ROCm_Config.hpp   |    4 +-
 kokkos/core/src/ROCm/Kokkos_ROCm_Exec.cpp     |    4 +-
 kokkos/core/src/ROCm/Kokkos_ROCm_Exec.hpp     |    4 +-
 kokkos/core/src/ROCm/Kokkos_ROCm_Impl.cpp     |    4 +-
 kokkos/core/src/ROCm/Kokkos_ROCm_Invoke.hpp   |    4 +-
 kokkos/core/src/ROCm/Kokkos_ROCm_Join.hpp     |    4 +-
 kokkos/core/src/ROCm/Kokkos_ROCm_Parallel.hpp |   17 +-
 kokkos/core/src/ROCm/Kokkos_ROCm_Reduce.hpp   |    4 +-
 .../core/src/ROCm/Kokkos_ROCm_ReduceScan.hpp  |    4 +-
 kokkos/core/src/ROCm/Kokkos_ROCm_Scan.hpp     |    4 +-
 kokkos/core/src/ROCm/Kokkos_ROCm_Space.cpp    |    8 +-
 kokkos/core/src/ROCm/Kokkos_ROCm_Task.cpp     |    4 +-
 kokkos/core/src/ROCm/Kokkos_ROCm_Task.hpp     |    4 +-
 kokkos/core/src/ROCm/Kokkos_ROCm_Tile.hpp     |   11 +-
 .../src/ROCm/Kokkos_ROCm_Vectorization.hpp    |   26 +-
 .../src/ROCm/Kokkos_ROCm_ViewCopyETIAvail.hpp |    4 +-
 .../src/ROCm/Kokkos_ROCm_ViewCopyETIDecl.hpp  |    4 +-
 .../Serial/Kokkos_Serial_ViewCopyETIAvail.hpp |    4 +-
 .../Serial/Kokkos_Serial_ViewCopyETIDecl.hpp  |    4 +-
 .../core/src/Threads/Kokkos_ThreadsExec.cpp   |   65 +-
 .../core/src/Threads/Kokkos_ThreadsExec.hpp   |    4 +-
 .../src/Threads/Kokkos_ThreadsExec_base.cpp   |   12 +-
 .../core/src/Threads/Kokkos_ThreadsTeam.hpp   |   42 +-
 .../src/Threads/Kokkos_Threads_Parallel.hpp   |   10 +-
 .../Kokkos_Threads_ViewCopyETIAvail.hpp       |    4 +-
 .../Kokkos_Threads_ViewCopyETIDecl.hpp        |    4 +-
 .../Kokkos_Threads_WorkGraphPolicy.hpp        |    7 +-
 ...TIInst_int64_t_double_LayoutLeft_Rank1.cpp |    4 +-
 ...TIInst_int64_t_double_LayoutLeft_Rank2.cpp |    4 +-
 ...TIInst_int64_t_double_LayoutLeft_Rank3.cpp |    4 +-
 ...TIInst_int64_t_double_LayoutLeft_Rank4.cpp |    4 +-
 ...TIInst_int64_t_double_LayoutLeft_Rank5.cpp |    4 +-
 ...TIInst_int64_t_double_LayoutLeft_Rank8.cpp |    4 +-
 ...IInst_int64_t_double_LayoutRight_Rank1.cpp |    4 +-
 ...IInst_int64_t_double_LayoutRight_Rank2.cpp |    4 +-
 ...IInst_int64_t_double_LayoutRight_Rank3.cpp |    4 +-
 ...IInst_int64_t_double_LayoutRight_Rank4.cpp |    4 +-
 ...IInst_int64_t_double_LayoutRight_Rank5.cpp |    4 +-
 ...IInst_int64_t_double_LayoutRight_Rank8.cpp |    4 +-
 ...Inst_int64_t_double_LayoutStride_Rank1.cpp |    4 +-
 ...Inst_int64_t_double_LayoutStride_Rank2.cpp |    4 +-
 ...Inst_int64_t_double_LayoutStride_Rank3.cpp |    4 +-
 ...Inst_int64_t_double_LayoutStride_Rank4.cpp |    4 +-
 ...Inst_int64_t_double_LayoutStride_Rank5.cpp |    4 +-
 ...Inst_int64_t_double_LayoutStride_Rank8.cpp |    4 +-
 ...ETIInst_int64_t_float_LayoutLeft_Rank1.cpp |    4 +-
 ...ETIInst_int64_t_float_LayoutLeft_Rank2.cpp |    4 +-
 ...ETIInst_int64_t_float_LayoutLeft_Rank3.cpp |    4 +-
 ...ETIInst_int64_t_float_LayoutLeft_Rank4.cpp |    4 +-
 ...ETIInst_int64_t_float_LayoutLeft_Rank5.cpp |    4 +-
 ...ETIInst_int64_t_float_LayoutLeft_Rank8.cpp |    4 +-
 ...TIInst_int64_t_float_LayoutRight_Rank1.cpp |    4 +-
 ...TIInst_int64_t_float_LayoutRight_Rank2.cpp |    4 +-
 ...TIInst_int64_t_float_LayoutRight_Rank3.cpp |    4 +-
 ...TIInst_int64_t_float_LayoutRight_Rank4.cpp |    4 +-
 ...TIInst_int64_t_float_LayoutRight_Rank5.cpp |    4 +-
 ...TIInst_int64_t_float_LayoutRight_Rank8.cpp |    4 +-
 ...IInst_int64_t_float_LayoutStride_Rank1.cpp |    4 +-
 ...IInst_int64_t_float_LayoutStride_Rank2.cpp |    4 +-
 ...IInst_int64_t_float_LayoutStride_Rank3.cpp |    4 +-
 ...IInst_int64_t_float_LayoutStride_Rank4.cpp |    4 +-
 ...IInst_int64_t_float_LayoutStride_Rank5.cpp |    4 +-
 ...IInst_int64_t_float_LayoutStride_Rank8.cpp |    4 +-
 ...IInst_int64_t_int64_t_LayoutLeft_Rank1.cpp |    4 +-
 ...IInst_int64_t_int64_t_LayoutLeft_Rank2.cpp |    4 +-
 ...IInst_int64_t_int64_t_LayoutLeft_Rank3.cpp |    4 +-
 ...IInst_int64_t_int64_t_LayoutLeft_Rank4.cpp |    4 +-
 ...IInst_int64_t_int64_t_LayoutLeft_Rank5.cpp |    4 +-
 ...IInst_int64_t_int64_t_LayoutLeft_Rank8.cpp |    4 +-
 ...Inst_int64_t_int64_t_LayoutRight_Rank1.cpp |    4 +-
 ...Inst_int64_t_int64_t_LayoutRight_Rank2.cpp |    4 +-
 ...Inst_int64_t_int64_t_LayoutRight_Rank3.cpp |    4 +-
 ...Inst_int64_t_int64_t_LayoutRight_Rank4.cpp |    4 +-
 ...Inst_int64_t_int64_t_LayoutRight_Rank5.cpp |    4 +-
 ...Inst_int64_t_int64_t_LayoutRight_Rank8.cpp |    4 +-
 ...nst_int64_t_int64_t_LayoutStride_Rank1.cpp |    4 +-
 ...nst_int64_t_int64_t_LayoutStride_Rank2.cpp |    4 +-
 ...nst_int64_t_int64_t_LayoutStride_Rank3.cpp |    4 +-
 ...nst_int64_t_int64_t_LayoutStride_Rank4.cpp |    4 +-
 ...nst_int64_t_int64_t_LayoutStride_Rank5.cpp |    4 +-
 ...nst_int64_t_int64_t_LayoutStride_Rank8.cpp |    4 +-
 ...pyETIInst_int64_t_int_LayoutLeft_Rank1.cpp |    4 +-
 ...pyETIInst_int64_t_int_LayoutLeft_Rank2.cpp |    4 +-
 ...pyETIInst_int64_t_int_LayoutLeft_Rank3.cpp |    4 +-
 ...pyETIInst_int64_t_int_LayoutLeft_Rank4.cpp |    4 +-
 ...pyETIInst_int64_t_int_LayoutLeft_Rank5.cpp |    4 +-
 ...pyETIInst_int64_t_int_LayoutLeft_Rank8.cpp |    4 +-
 ...yETIInst_int64_t_int_LayoutRight_Rank1.cpp |    4 +-
 ...yETIInst_int64_t_int_LayoutRight_Rank2.cpp |    4 +-
 ...yETIInst_int64_t_int_LayoutRight_Rank3.cpp |    4 +-
 ...yETIInst_int64_t_int_LayoutRight_Rank4.cpp |    4 +-
 ...yETIInst_int64_t_int_LayoutRight_Rank5.cpp |    4 +-
 ...yETIInst_int64_t_int_LayoutRight_Rank8.cpp |    4 +-
 ...ETIInst_int64_t_int_LayoutStride_Rank1.cpp |    4 +-
 ...ETIInst_int64_t_int_LayoutStride_Rank2.cpp |    4 +-
 ...ETIInst_int64_t_int_LayoutStride_Rank3.cpp |    4 +-
 ...ETIInst_int64_t_int_LayoutStride_Rank4.cpp |    4 +-
 ...ETIInst_int64_t_int_LayoutStride_Rank5.cpp |    4 +-
 ...ETIInst_int64_t_int_LayoutStride_Rank8.cpp |    4 +-
 ...opyETIInst_int_double_LayoutLeft_Rank1.cpp |    4 +-
 ...opyETIInst_int_double_LayoutLeft_Rank2.cpp |    4 +-
 ...opyETIInst_int_double_LayoutLeft_Rank3.cpp |    4 +-
 ...opyETIInst_int_double_LayoutLeft_Rank4.cpp |    4 +-
 ...opyETIInst_int_double_LayoutLeft_Rank5.cpp |    4 +-
 ...opyETIInst_int_double_LayoutLeft_Rank8.cpp |    4 +-
 ...pyETIInst_int_double_LayoutRight_Rank1.cpp |    4 +-
 ...pyETIInst_int_double_LayoutRight_Rank2.cpp |    4 +-
 ...pyETIInst_int_double_LayoutRight_Rank3.cpp |    4 +-
 ...pyETIInst_int_double_LayoutRight_Rank4.cpp |    4 +-
 ...pyETIInst_int_double_LayoutRight_Rank5.cpp |    4 +-
 ...pyETIInst_int_double_LayoutRight_Rank8.cpp |    4 +-
 ...yETIInst_int_double_LayoutStride_Rank1.cpp |    4 +-
 ...yETIInst_int_double_LayoutStride_Rank2.cpp |    4 +-
 ...yETIInst_int_double_LayoutStride_Rank3.cpp |    4 +-
 ...yETIInst_int_double_LayoutStride_Rank4.cpp |    4 +-
 ...yETIInst_int_double_LayoutStride_Rank5.cpp |    4 +-
 ...yETIInst_int_double_LayoutStride_Rank8.cpp |    4 +-
 ...CopyETIInst_int_float_LayoutLeft_Rank1.cpp |    4 +-
 ...CopyETIInst_int_float_LayoutLeft_Rank2.cpp |    4 +-
 ...CopyETIInst_int_float_LayoutLeft_Rank3.cpp |    4 +-
 ...CopyETIInst_int_float_LayoutLeft_Rank4.cpp |    4 +-
 ...CopyETIInst_int_float_LayoutLeft_Rank5.cpp |    4 +-
 ...CopyETIInst_int_float_LayoutLeft_Rank8.cpp |    4 +-
 ...opyETIInst_int_float_LayoutRight_Rank1.cpp |    4 +-
 ...opyETIInst_int_float_LayoutRight_Rank2.cpp |    4 +-
 ...opyETIInst_int_float_LayoutRight_Rank3.cpp |    4 +-
 ...opyETIInst_int_float_LayoutRight_Rank4.cpp |    4 +-
 ...opyETIInst_int_float_LayoutRight_Rank5.cpp |    4 +-
 ...opyETIInst_int_float_LayoutRight_Rank8.cpp |    4 +-
 ...pyETIInst_int_float_LayoutStride_Rank1.cpp |    4 +-
 ...pyETIInst_int_float_LayoutStride_Rank2.cpp |    4 +-
 ...pyETIInst_int_float_LayoutStride_Rank3.cpp |    4 +-
 ...pyETIInst_int_float_LayoutStride_Rank4.cpp |    4 +-
 ...pyETIInst_int_float_LayoutStride_Rank5.cpp |    4 +-
 ...pyETIInst_int_float_LayoutStride_Rank8.cpp |    4 +-
 ...pyETIInst_int_int64_t_LayoutLeft_Rank1.cpp |    4 +-
 ...pyETIInst_int_int64_t_LayoutLeft_Rank2.cpp |    4 +-
 ...pyETIInst_int_int64_t_LayoutLeft_Rank3.cpp |    4 +-
 ...pyETIInst_int_int64_t_LayoutLeft_Rank4.cpp |    4 +-
 ...pyETIInst_int_int64_t_LayoutLeft_Rank5.cpp |    4 +-
 ...pyETIInst_int_int64_t_LayoutLeft_Rank8.cpp |    4 +-
 ...yETIInst_int_int64_t_LayoutRight_Rank1.cpp |    4 +-
 ...yETIInst_int_int64_t_LayoutRight_Rank2.cpp |    4 +-
 ...yETIInst_int_int64_t_LayoutRight_Rank3.cpp |    4 +-
 ...yETIInst_int_int64_t_LayoutRight_Rank4.cpp |    4 +-
 ...yETIInst_int_int64_t_LayoutRight_Rank5.cpp |    4 +-
 ...yETIInst_int_int64_t_LayoutRight_Rank8.cpp |    4 +-
 ...ETIInst_int_int64_t_LayoutStride_Rank1.cpp |    4 +-
 ...ETIInst_int_int64_t_LayoutStride_Rank2.cpp |    4 +-
 ...ETIInst_int_int64_t_LayoutStride_Rank3.cpp |    4 +-
 ...ETIInst_int_int64_t_LayoutStride_Rank4.cpp |    4 +-
 ...ETIInst_int_int64_t_LayoutStride_Rank5.cpp |    4 +-
 ...ETIInst_int_int64_t_LayoutStride_Rank8.cpp |    4 +-
 ...ewCopyETIInst_int_int_LayoutLeft_Rank1.cpp |    4 +-
 ...ewCopyETIInst_int_int_LayoutLeft_Rank2.cpp |    4 +-
 ...ewCopyETIInst_int_int_LayoutLeft_Rank3.cpp |    4 +-
 ...ewCopyETIInst_int_int_LayoutLeft_Rank4.cpp |    4 +-
 ...ewCopyETIInst_int_int_LayoutLeft_Rank5.cpp |    4 +-
 ...ewCopyETIInst_int_int_LayoutLeft_Rank8.cpp |    4 +-
 ...wCopyETIInst_int_int_LayoutRight_Rank1.cpp |    4 +-
 ...wCopyETIInst_int_int_LayoutRight_Rank2.cpp |    4 +-
 ...wCopyETIInst_int_int_LayoutRight_Rank3.cpp |    4 +-
 ...wCopyETIInst_int_int_LayoutRight_Rank4.cpp |    4 +-
 ...wCopyETIInst_int_int_LayoutRight_Rank5.cpp |    4 +-
 ...wCopyETIInst_int_int_LayoutRight_Rank8.cpp |    4 +-
 ...CopyETIInst_int_int_LayoutStride_Rank1.cpp |    4 +-
 ...CopyETIInst_int_int_LayoutStride_Rank2.cpp |    4 +-
 ...CopyETIInst_int_int_LayoutStride_Rank3.cpp |    4 +-
 ...CopyETIInst_int_int_LayoutStride_Rank4.cpp |    4 +-
 ...CopyETIInst_int_int_LayoutStride_Rank5.cpp |    4 +-
 ...CopyETIInst_int_int_LayoutStride_Rank8.cpp |    4 +-
 ...TIInst_int64_t_double_LayoutLeft_Rank1.cpp |    4 +-
 ...TIInst_int64_t_double_LayoutLeft_Rank2.cpp |    4 +-
 ...TIInst_int64_t_double_LayoutLeft_Rank3.cpp |    4 +-
 ...TIInst_int64_t_double_LayoutLeft_Rank4.cpp |    4 +-
 ...TIInst_int64_t_double_LayoutLeft_Rank5.cpp |    4 +-
 ...TIInst_int64_t_double_LayoutLeft_Rank8.cpp |    4 +-
 ...IInst_int64_t_double_LayoutRight_Rank1.cpp |    4 +-
 ...IInst_int64_t_double_LayoutRight_Rank2.cpp |    4 +-
 ...IInst_int64_t_double_LayoutRight_Rank3.cpp |    4 +-
 ...IInst_int64_t_double_LayoutRight_Rank4.cpp |    4 +-
 ...IInst_int64_t_double_LayoutRight_Rank5.cpp |    4 +-
 ...IInst_int64_t_double_LayoutRight_Rank8.cpp |    4 +-
 ...Inst_int64_t_double_LayoutStride_Rank1.cpp |    4 +-
 ...Inst_int64_t_double_LayoutStride_Rank2.cpp |    4 +-
 ...Inst_int64_t_double_LayoutStride_Rank3.cpp |    4 +-
 ...Inst_int64_t_double_LayoutStride_Rank4.cpp |    4 +-
 ...Inst_int64_t_double_LayoutStride_Rank5.cpp |    4 +-
 ...Inst_int64_t_double_LayoutStride_Rank8.cpp |    4 +-
 ...ETIInst_int64_t_float_LayoutLeft_Rank1.cpp |    4 +-
 ...ETIInst_int64_t_float_LayoutLeft_Rank2.cpp |    4 +-
 ...ETIInst_int64_t_float_LayoutLeft_Rank3.cpp |    4 +-
 ...ETIInst_int64_t_float_LayoutLeft_Rank4.cpp |    4 +-
 ...ETIInst_int64_t_float_LayoutLeft_Rank5.cpp |    4 +-
 ...ETIInst_int64_t_float_LayoutLeft_Rank8.cpp |    4 +-
 ...TIInst_int64_t_float_LayoutRight_Rank1.cpp |    4 +-
 ...TIInst_int64_t_float_LayoutRight_Rank2.cpp |    4 +-
 ...TIInst_int64_t_float_LayoutRight_Rank3.cpp |    4 +-
 ...TIInst_int64_t_float_LayoutRight_Rank4.cpp |    4 +-
 ...TIInst_int64_t_float_LayoutRight_Rank5.cpp |    4 +-
 ...TIInst_int64_t_float_LayoutRight_Rank8.cpp |    4 +-
 ...IInst_int64_t_float_LayoutStride_Rank1.cpp |    4 +-
 ...IInst_int64_t_float_LayoutStride_Rank2.cpp |    4 +-
 ...IInst_int64_t_float_LayoutStride_Rank3.cpp |    4 +-
 ...IInst_int64_t_float_LayoutStride_Rank4.cpp |    4 +-
 ...IInst_int64_t_float_LayoutStride_Rank5.cpp |    4 +-
 ...IInst_int64_t_float_LayoutStride_Rank8.cpp |    4 +-
 ...IInst_int64_t_int64_t_LayoutLeft_Rank1.cpp |    4 +-
 ...IInst_int64_t_int64_t_LayoutLeft_Rank2.cpp |    4 +-
 ...IInst_int64_t_int64_t_LayoutLeft_Rank3.cpp |    4 +-
 ...IInst_int64_t_int64_t_LayoutLeft_Rank4.cpp |    4 +-
 ...IInst_int64_t_int64_t_LayoutLeft_Rank5.cpp |    4 +-
 ...IInst_int64_t_int64_t_LayoutLeft_Rank8.cpp |    4 +-
 ...Inst_int64_t_int64_t_LayoutRight_Rank1.cpp |    4 +-
 ...Inst_int64_t_int64_t_LayoutRight_Rank2.cpp |    4 +-
 ...Inst_int64_t_int64_t_LayoutRight_Rank3.cpp |    4 +-
 ...Inst_int64_t_int64_t_LayoutRight_Rank4.cpp |    4 +-
 ...Inst_int64_t_int64_t_LayoutRight_Rank5.cpp |    4 +-
 ...Inst_int64_t_int64_t_LayoutRight_Rank8.cpp |    4 +-
 ...nst_int64_t_int64_t_LayoutStride_Rank1.cpp |    4 +-
 ...nst_int64_t_int64_t_LayoutStride_Rank2.cpp |    4 +-
 ...nst_int64_t_int64_t_LayoutStride_Rank3.cpp |    4 +-
 ...nst_int64_t_int64_t_LayoutStride_Rank4.cpp |    4 +-
 ...nst_int64_t_int64_t_LayoutStride_Rank5.cpp |    4 +-
 ...nst_int64_t_int64_t_LayoutStride_Rank8.cpp |    4 +-
 ...pyETIInst_int64_t_int_LayoutLeft_Rank1.cpp |    4 +-
 ...pyETIInst_int64_t_int_LayoutLeft_Rank2.cpp |    4 +-
 ...pyETIInst_int64_t_int_LayoutLeft_Rank3.cpp |    4 +-
 ...pyETIInst_int64_t_int_LayoutLeft_Rank4.cpp |    4 +-
 ...pyETIInst_int64_t_int_LayoutLeft_Rank5.cpp |    4 +-
 ...pyETIInst_int64_t_int_LayoutLeft_Rank8.cpp |    4 +-
 ...yETIInst_int64_t_int_LayoutRight_Rank1.cpp |    4 +-
 ...yETIInst_int64_t_int_LayoutRight_Rank2.cpp |    4 +-
 ...yETIInst_int64_t_int_LayoutRight_Rank3.cpp |    4 +-
 ...yETIInst_int64_t_int_LayoutRight_Rank4.cpp |    4 +-
 ...yETIInst_int64_t_int_LayoutRight_Rank5.cpp |    4 +-
 ...yETIInst_int64_t_int_LayoutRight_Rank8.cpp |    4 +-
 ...ETIInst_int64_t_int_LayoutStride_Rank1.cpp |    4 +-
 ...ETIInst_int64_t_int_LayoutStride_Rank2.cpp |    4 +-
 ...ETIInst_int64_t_int_LayoutStride_Rank3.cpp |    4 +-
 ...ETIInst_int64_t_int_LayoutStride_Rank4.cpp |    4 +-
 ...ETIInst_int64_t_int_LayoutStride_Rank5.cpp |    4 +-
 ...ETIInst_int64_t_int_LayoutStride_Rank8.cpp |    4 +-
 ...opyETIInst_int_double_LayoutLeft_Rank1.cpp |    4 +-
 ...opyETIInst_int_double_LayoutLeft_Rank2.cpp |    4 +-
 ...opyETIInst_int_double_LayoutLeft_Rank3.cpp |    4 +-
 ...opyETIInst_int_double_LayoutLeft_Rank4.cpp |    4 +-
 ...opyETIInst_int_double_LayoutLeft_Rank5.cpp |    4 +-
 ...opyETIInst_int_double_LayoutLeft_Rank8.cpp |    4 +-
 ...pyETIInst_int_double_LayoutRight_Rank1.cpp |    4 +-
 ...pyETIInst_int_double_LayoutRight_Rank2.cpp |    4 +-
 ...pyETIInst_int_double_LayoutRight_Rank3.cpp |    4 +-
 ...pyETIInst_int_double_LayoutRight_Rank4.cpp |    4 +-
 ...pyETIInst_int_double_LayoutRight_Rank5.cpp |    4 +-
 ...pyETIInst_int_double_LayoutRight_Rank8.cpp |    4 +-
 ...yETIInst_int_double_LayoutStride_Rank1.cpp |    4 +-
 ...yETIInst_int_double_LayoutStride_Rank2.cpp |    4 +-
 ...yETIInst_int_double_LayoutStride_Rank3.cpp |    4 +-
 ...yETIInst_int_double_LayoutStride_Rank4.cpp |    4 +-
 ...yETIInst_int_double_LayoutStride_Rank5.cpp |    4 +-
 ...yETIInst_int_double_LayoutStride_Rank8.cpp |    4 +-
 ...CopyETIInst_int_float_LayoutLeft_Rank1.cpp |    4 +-
 ...CopyETIInst_int_float_LayoutLeft_Rank2.cpp |    4 +-
 ...CopyETIInst_int_float_LayoutLeft_Rank3.cpp |    4 +-
 ...CopyETIInst_int_float_LayoutLeft_Rank4.cpp |    4 +-
 ...CopyETIInst_int_float_LayoutLeft_Rank5.cpp |    4 +-
 ...CopyETIInst_int_float_LayoutLeft_Rank8.cpp |    4 +-
 ...opyETIInst_int_float_LayoutRight_Rank1.cpp |    4 +-
 ...opyETIInst_int_float_LayoutRight_Rank2.cpp |    4 +-
 ...opyETIInst_int_float_LayoutRight_Rank3.cpp |    4 +-
 ...opyETIInst_int_float_LayoutRight_Rank4.cpp |    4 +-
 ...opyETIInst_int_float_LayoutRight_Rank5.cpp |    4 +-
 ...opyETIInst_int_float_LayoutRight_Rank8.cpp |    4 +-
 ...pyETIInst_int_float_LayoutStride_Rank1.cpp |    4 +-
 ...pyETIInst_int_float_LayoutStride_Rank2.cpp |    4 +-
 ...pyETIInst_int_float_LayoutStride_Rank3.cpp |    4 +-
 ...pyETIInst_int_float_LayoutStride_Rank4.cpp |    4 +-
 ...pyETIInst_int_float_LayoutStride_Rank5.cpp |    4 +-
 ...pyETIInst_int_float_LayoutStride_Rank8.cpp |    4 +-
 ...pyETIInst_int_int64_t_LayoutLeft_Rank1.cpp |    4 +-
 ...pyETIInst_int_int64_t_LayoutLeft_Rank2.cpp |    4 +-
 ...pyETIInst_int_int64_t_LayoutLeft_Rank3.cpp |    4 +-
 ...pyETIInst_int_int64_t_LayoutLeft_Rank4.cpp |    4 +-
 ...pyETIInst_int_int64_t_LayoutLeft_Rank5.cpp |    4 +-
 ...pyETIInst_int_int64_t_LayoutLeft_Rank8.cpp |    4 +-
 ...yETIInst_int_int64_t_LayoutRight_Rank1.cpp |    4 +-
 ...yETIInst_int_int64_t_LayoutRight_Rank2.cpp |    4 +-
 ...yETIInst_int_int64_t_LayoutRight_Rank3.cpp |    4 +-
 ...yETIInst_int_int64_t_LayoutRight_Rank4.cpp |    4 +-
 ...yETIInst_int_int64_t_LayoutRight_Rank5.cpp |    4 +-
 ...yETIInst_int_int64_t_LayoutRight_Rank8.cpp |    4 +-
 ...ETIInst_int_int64_t_LayoutStride_Rank1.cpp |    4 +-
 ...ETIInst_int_int64_t_LayoutStride_Rank2.cpp |    4 +-
 ...ETIInst_int_int64_t_LayoutStride_Rank3.cpp |    4 +-
 ...ETIInst_int_int64_t_LayoutStride_Rank4.cpp |    4 +-
 ...ETIInst_int_int64_t_LayoutStride_Rank5.cpp |    4 +-
 ...ETIInst_int_int64_t_LayoutStride_Rank8.cpp |    4 +-
 ...ewCopyETIInst_int_int_LayoutLeft_Rank1.cpp |    4 +-
 ...ewCopyETIInst_int_int_LayoutLeft_Rank2.cpp |    4 +-
 ...ewCopyETIInst_int_int_LayoutLeft_Rank3.cpp |    4 +-
 ...ewCopyETIInst_int_int_LayoutLeft_Rank4.cpp |    4 +-
 ...ewCopyETIInst_int_int_LayoutLeft_Rank5.cpp |    4 +-
 ...ewCopyETIInst_int_int_LayoutLeft_Rank8.cpp |    4 +-
 ...wCopyETIInst_int_int_LayoutRight_Rank1.cpp |    4 +-
 ...wCopyETIInst_int_int_LayoutRight_Rank2.cpp |    4 +-
 ...wCopyETIInst_int_int_LayoutRight_Rank3.cpp |    4 +-
 ...wCopyETIInst_int_int_LayoutRight_Rank4.cpp |    4 +-
 ...wCopyETIInst_int_int_LayoutRight_Rank5.cpp |    4 +-
 ...wCopyETIInst_int_int_LayoutRight_Rank8.cpp |    4 +-
 ...CopyETIInst_int_int_LayoutStride_Rank1.cpp |    4 +-
 ...CopyETIInst_int_int_LayoutStride_Rank2.cpp |    4 +-
 ...CopyETIInst_int_int_LayoutStride_Rank3.cpp |    4 +-
 ...CopyETIInst_int_int_LayoutStride_Rank4.cpp |    4 +-
 ...CopyETIInst_int_int_LayoutStride_Rank5.cpp |    4 +-
 ...CopyETIInst_int_int_LayoutStride_Rank8.cpp |    4 +-
 ...TIInst_int64_t_double_LayoutLeft_Rank1.cpp |    4 +-
 ...TIInst_int64_t_double_LayoutLeft_Rank2.cpp |    4 +-
 ...TIInst_int64_t_double_LayoutLeft_Rank3.cpp |    4 +-
 ...TIInst_int64_t_double_LayoutLeft_Rank4.cpp |    4 +-
 ...TIInst_int64_t_double_LayoutLeft_Rank5.cpp |    4 +-
 ...TIInst_int64_t_double_LayoutLeft_Rank8.cpp |    4 +-
 ...IInst_int64_t_double_LayoutRight_Rank1.cpp |    4 +-
 ...IInst_int64_t_double_LayoutRight_Rank2.cpp |    4 +-
 ...IInst_int64_t_double_LayoutRight_Rank3.cpp |    4 +-
 ...IInst_int64_t_double_LayoutRight_Rank4.cpp |    4 +-
 ...IInst_int64_t_double_LayoutRight_Rank5.cpp |    4 +-
 ...IInst_int64_t_double_LayoutRight_Rank8.cpp |    4 +-
 ...Inst_int64_t_double_LayoutStride_Rank1.cpp |    4 +-
 ...Inst_int64_t_double_LayoutStride_Rank2.cpp |    4 +-
 ...Inst_int64_t_double_LayoutStride_Rank3.cpp |    4 +-
 ...Inst_int64_t_double_LayoutStride_Rank4.cpp |    4 +-
 ...Inst_int64_t_double_LayoutStride_Rank5.cpp |    4 +-
 ...Inst_int64_t_double_LayoutStride_Rank8.cpp |    4 +-
 ...ETIInst_int64_t_float_LayoutLeft_Rank1.cpp |    4 +-
 ...ETIInst_int64_t_float_LayoutLeft_Rank2.cpp |    4 +-
 ...ETIInst_int64_t_float_LayoutLeft_Rank3.cpp |    4 +-
 ...ETIInst_int64_t_float_LayoutLeft_Rank4.cpp |    4 +-
 ...ETIInst_int64_t_float_LayoutLeft_Rank5.cpp |    4 +-
 ...ETIInst_int64_t_float_LayoutLeft_Rank8.cpp |    4 +-
 ...TIInst_int64_t_float_LayoutRight_Rank1.cpp |    4 +-
 ...TIInst_int64_t_float_LayoutRight_Rank2.cpp |    4 +-
 ...TIInst_int64_t_float_LayoutRight_Rank3.cpp |    4 +-
 ...TIInst_int64_t_float_LayoutRight_Rank4.cpp |    4 +-
 ...TIInst_int64_t_float_LayoutRight_Rank5.cpp |    4 +-
 ...TIInst_int64_t_float_LayoutRight_Rank8.cpp |    4 +-
 ...IInst_int64_t_float_LayoutStride_Rank1.cpp |    4 +-
 ...IInst_int64_t_float_LayoutStride_Rank2.cpp |    4 +-
 ...IInst_int64_t_float_LayoutStride_Rank3.cpp |    4 +-
 ...IInst_int64_t_float_LayoutStride_Rank4.cpp |    4 +-
 ...IInst_int64_t_float_LayoutStride_Rank5.cpp |    4 +-
 ...IInst_int64_t_float_LayoutStride_Rank8.cpp |    4 +-
 ...IInst_int64_t_int64_t_LayoutLeft_Rank1.cpp |    4 +-
 ...IInst_int64_t_int64_t_LayoutLeft_Rank2.cpp |    4 +-
 ...IInst_int64_t_int64_t_LayoutLeft_Rank3.cpp |    4 +-
 ...IInst_int64_t_int64_t_LayoutLeft_Rank4.cpp |    4 +-
 ...IInst_int64_t_int64_t_LayoutLeft_Rank5.cpp |    4 +-
 ...IInst_int64_t_int64_t_LayoutLeft_Rank8.cpp |    4 +-
 ...Inst_int64_t_int64_t_LayoutRight_Rank1.cpp |    4 +-
 ...Inst_int64_t_int64_t_LayoutRight_Rank2.cpp |    4 +-
 ...Inst_int64_t_int64_t_LayoutRight_Rank3.cpp |    4 +-
 ...Inst_int64_t_int64_t_LayoutRight_Rank4.cpp |    4 +-
 ...Inst_int64_t_int64_t_LayoutRight_Rank5.cpp |    4 +-
 ...Inst_int64_t_int64_t_LayoutRight_Rank8.cpp |    4 +-
 ...nst_int64_t_int64_t_LayoutStride_Rank1.cpp |    4 +-
 ...nst_int64_t_int64_t_LayoutStride_Rank2.cpp |    4 +-
 ...nst_int64_t_int64_t_LayoutStride_Rank3.cpp |    4 +-
 ...nst_int64_t_int64_t_LayoutStride_Rank4.cpp |    4 +-
 ...nst_int64_t_int64_t_LayoutStride_Rank5.cpp |    4 +-
 ...nst_int64_t_int64_t_LayoutStride_Rank8.cpp |    4 +-
 ...pyETIInst_int64_t_int_LayoutLeft_Rank1.cpp |    4 +-
 ...pyETIInst_int64_t_int_LayoutLeft_Rank2.cpp |    4 +-
 ...pyETIInst_int64_t_int_LayoutLeft_Rank3.cpp |    4 +-
 ...pyETIInst_int64_t_int_LayoutLeft_Rank4.cpp |    4 +-
 ...pyETIInst_int64_t_int_LayoutLeft_Rank5.cpp |    4 +-
 ...pyETIInst_int64_t_int_LayoutLeft_Rank8.cpp |    4 +-
 ...yETIInst_int64_t_int_LayoutRight_Rank1.cpp |    4 +-
 ...yETIInst_int64_t_int_LayoutRight_Rank2.cpp |    4 +-
 ...yETIInst_int64_t_int_LayoutRight_Rank3.cpp |    4 +-
 ...yETIInst_int64_t_int_LayoutRight_Rank4.cpp |    4 +-
 ...yETIInst_int64_t_int_LayoutRight_Rank5.cpp |    4 +-
 ...yETIInst_int64_t_int_LayoutRight_Rank8.cpp |    4 +-
 ...ETIInst_int64_t_int_LayoutStride_Rank1.cpp |    4 +-
 ...ETIInst_int64_t_int_LayoutStride_Rank2.cpp |    4 +-
 ...ETIInst_int64_t_int_LayoutStride_Rank3.cpp |    4 +-
 ...ETIInst_int64_t_int_LayoutStride_Rank4.cpp |    4 +-
 ...ETIInst_int64_t_int_LayoutStride_Rank5.cpp |    4 +-
 ...ETIInst_int64_t_int_LayoutStride_Rank8.cpp |    4 +-
 ...opyETIInst_int_double_LayoutLeft_Rank1.cpp |    4 +-
 ...opyETIInst_int_double_LayoutLeft_Rank2.cpp |    4 +-
 ...opyETIInst_int_double_LayoutLeft_Rank3.cpp |    4 +-
 ...opyETIInst_int_double_LayoutLeft_Rank4.cpp |    4 +-
 ...opyETIInst_int_double_LayoutLeft_Rank5.cpp |    4 +-
 ...opyETIInst_int_double_LayoutLeft_Rank8.cpp |    4 +-
 ...pyETIInst_int_double_LayoutRight_Rank1.cpp |    4 +-
 ...pyETIInst_int_double_LayoutRight_Rank2.cpp |    4 +-
 ...pyETIInst_int_double_LayoutRight_Rank3.cpp |    4 +-
 ...pyETIInst_int_double_LayoutRight_Rank4.cpp |    4 +-
 ...pyETIInst_int_double_LayoutRight_Rank5.cpp |    4 +-
 ...pyETIInst_int_double_LayoutRight_Rank8.cpp |    4 +-
 ...yETIInst_int_double_LayoutStride_Rank1.cpp |    4 +-
 ...yETIInst_int_double_LayoutStride_Rank2.cpp |    4 +-
 ...yETIInst_int_double_LayoutStride_Rank3.cpp |    4 +-
 ...yETIInst_int_double_LayoutStride_Rank4.cpp |    4 +-
 ...yETIInst_int_double_LayoutStride_Rank5.cpp |    4 +-
 ...yETIInst_int_double_LayoutStride_Rank8.cpp |    4 +-
 ...CopyETIInst_int_float_LayoutLeft_Rank1.cpp |    4 +-
 ...CopyETIInst_int_float_LayoutLeft_Rank2.cpp |    4 +-
 ...CopyETIInst_int_float_LayoutLeft_Rank3.cpp |    4 +-
 ...CopyETIInst_int_float_LayoutLeft_Rank4.cpp |    4 +-
 ...CopyETIInst_int_float_LayoutLeft_Rank5.cpp |    4 +-
 ...CopyETIInst_int_float_LayoutLeft_Rank8.cpp |    4 +-
 ...opyETIInst_int_float_LayoutRight_Rank1.cpp |    4 +-
 ...opyETIInst_int_float_LayoutRight_Rank2.cpp |    4 +-
 ...opyETIInst_int_float_LayoutRight_Rank3.cpp |    4 +-
 ...opyETIInst_int_float_LayoutRight_Rank4.cpp |    4 +-
 ...opyETIInst_int_float_LayoutRight_Rank5.cpp |    4 +-
 ...opyETIInst_int_float_LayoutRight_Rank8.cpp |    4 +-
 ...pyETIInst_int_float_LayoutStride_Rank1.cpp |    4 +-
 ...pyETIInst_int_float_LayoutStride_Rank2.cpp |    4 +-
 ...pyETIInst_int_float_LayoutStride_Rank3.cpp |    4 +-
 ...pyETIInst_int_float_LayoutStride_Rank4.cpp |    4 +-
 ...pyETIInst_int_float_LayoutStride_Rank5.cpp |    4 +-
 ...pyETIInst_int_float_LayoutStride_Rank8.cpp |    4 +-
 ...pyETIInst_int_int64_t_LayoutLeft_Rank1.cpp |    4 +-
 ...pyETIInst_int_int64_t_LayoutLeft_Rank2.cpp |    4 +-
 ...pyETIInst_int_int64_t_LayoutLeft_Rank3.cpp |    4 +-
 ...pyETIInst_int_int64_t_LayoutLeft_Rank4.cpp |    4 +-
 ...pyETIInst_int_int64_t_LayoutLeft_Rank5.cpp |    4 +-
 ...pyETIInst_int_int64_t_LayoutLeft_Rank8.cpp |    4 +-
 ...yETIInst_int_int64_t_LayoutRight_Rank1.cpp |    4 +-
 ...yETIInst_int_int64_t_LayoutRight_Rank2.cpp |    4 +-
 ...yETIInst_int_int64_t_LayoutRight_Rank3.cpp |    4 +-
 ...yETIInst_int_int64_t_LayoutRight_Rank4.cpp |    4 +-
 ...yETIInst_int_int64_t_LayoutRight_Rank5.cpp |    4 +-
 ...yETIInst_int_int64_t_LayoutRight_Rank8.cpp |    4 +-
 ...ETIInst_int_int64_t_LayoutStride_Rank1.cpp |    4 +-
 ...ETIInst_int_int64_t_LayoutStride_Rank2.cpp |    4 +-
 ...ETIInst_int_int64_t_LayoutStride_Rank3.cpp |    4 +-
 ...ETIInst_int_int64_t_LayoutStride_Rank4.cpp |    4 +-
 ...ETIInst_int_int64_t_LayoutStride_Rank5.cpp |    4 +-
 ...ETIInst_int_int64_t_LayoutStride_Rank8.cpp |    4 +-
 ...ewCopyETIInst_int_int_LayoutLeft_Rank1.cpp |    4 +-
 ...ewCopyETIInst_int_int_LayoutLeft_Rank2.cpp |    4 +-
 ...ewCopyETIInst_int_int_LayoutLeft_Rank3.cpp |    4 +-
 ...ewCopyETIInst_int_int_LayoutLeft_Rank4.cpp |    4 +-
 ...ewCopyETIInst_int_int_LayoutLeft_Rank5.cpp |    4 +-
 ...ewCopyETIInst_int_int_LayoutLeft_Rank8.cpp |    4 +-
 ...wCopyETIInst_int_int_LayoutRight_Rank1.cpp |    4 +-
 ...wCopyETIInst_int_int_LayoutRight_Rank2.cpp |    4 +-
 ...wCopyETIInst_int_int_LayoutRight_Rank3.cpp |    4 +-
 ...wCopyETIInst_int_int_LayoutRight_Rank4.cpp |    4 +-
 ...wCopyETIInst_int_int_LayoutRight_Rank5.cpp |    4 +-
 ...wCopyETIInst_int_int_LayoutRight_Rank8.cpp |    4 +-
 ...CopyETIInst_int_int_LayoutStride_Rank1.cpp |    4 +-
 ...CopyETIInst_int_int_LayoutStride_Rank2.cpp |    4 +-
 ...CopyETIInst_int_int_LayoutStride_Rank3.cpp |    4 +-
 ...CopyETIInst_int_int_LayoutStride_Rank4.cpp |    4 +-
 ...CopyETIInst_int_int_LayoutStride_Rank5.cpp |    4 +-
 ...CopyETIInst_int_int_LayoutStride_Rank8.cpp |    4 +-
 ...TIInst_int64_t_double_LayoutLeft_Rank1.cpp |    4 +-
 ...TIInst_int64_t_double_LayoutLeft_Rank2.cpp |    4 +-
 ...TIInst_int64_t_double_LayoutLeft_Rank3.cpp |    4 +-
 ...TIInst_int64_t_double_LayoutLeft_Rank4.cpp |    4 +-
 ...TIInst_int64_t_double_LayoutLeft_Rank5.cpp |    4 +-
 ...TIInst_int64_t_double_LayoutLeft_Rank8.cpp |    4 +-
 ...IInst_int64_t_double_LayoutRight_Rank1.cpp |    4 +-
 ...IInst_int64_t_double_LayoutRight_Rank2.cpp |    4 +-
 ...IInst_int64_t_double_LayoutRight_Rank3.cpp |    4 +-
 ...IInst_int64_t_double_LayoutRight_Rank4.cpp |    4 +-
 ...IInst_int64_t_double_LayoutRight_Rank5.cpp |    4 +-
 ...IInst_int64_t_double_LayoutRight_Rank8.cpp |    4 +-
 ...Inst_int64_t_double_LayoutStride_Rank1.cpp |    4 +-
 ...Inst_int64_t_double_LayoutStride_Rank2.cpp |    4 +-
 ...Inst_int64_t_double_LayoutStride_Rank3.cpp |    4 +-
 ...Inst_int64_t_double_LayoutStride_Rank4.cpp |    4 +-
 ...Inst_int64_t_double_LayoutStride_Rank5.cpp |    4 +-
 ...Inst_int64_t_double_LayoutStride_Rank8.cpp |    4 +-
 ...ETIInst_int64_t_float_LayoutLeft_Rank1.cpp |    4 +-
 ...ETIInst_int64_t_float_LayoutLeft_Rank2.cpp |    4 +-
 ...ETIInst_int64_t_float_LayoutLeft_Rank3.cpp |    4 +-
 ...ETIInst_int64_t_float_LayoutLeft_Rank4.cpp |    4 +-
 ...ETIInst_int64_t_float_LayoutLeft_Rank5.cpp |    4 +-
 ...ETIInst_int64_t_float_LayoutLeft_Rank8.cpp |    4 +-
 ...TIInst_int64_t_float_LayoutRight_Rank1.cpp |    4 +-
 ...TIInst_int64_t_float_LayoutRight_Rank2.cpp |    4 +-
 ...TIInst_int64_t_float_LayoutRight_Rank3.cpp |    4 +-
 ...TIInst_int64_t_float_LayoutRight_Rank4.cpp |    4 +-
 ...TIInst_int64_t_float_LayoutRight_Rank5.cpp |    4 +-
 ...TIInst_int64_t_float_LayoutRight_Rank8.cpp |    4 +-
 ...IInst_int64_t_float_LayoutStride_Rank1.cpp |    4 +-
 ...IInst_int64_t_float_LayoutStride_Rank2.cpp |    4 +-
 ...IInst_int64_t_float_LayoutStride_Rank3.cpp |    4 +-
 ...IInst_int64_t_float_LayoutStride_Rank4.cpp |    4 +-
 ...IInst_int64_t_float_LayoutStride_Rank5.cpp |    4 +-
 ...IInst_int64_t_float_LayoutStride_Rank8.cpp |    4 +-
 ...IInst_int64_t_int64_t_LayoutLeft_Rank1.cpp |    4 +-
 ...IInst_int64_t_int64_t_LayoutLeft_Rank2.cpp |    4 +-
 ...IInst_int64_t_int64_t_LayoutLeft_Rank3.cpp |    4 +-
 ...IInst_int64_t_int64_t_LayoutLeft_Rank4.cpp |    4 +-
 ...IInst_int64_t_int64_t_LayoutLeft_Rank5.cpp |    4 +-
 ...IInst_int64_t_int64_t_LayoutLeft_Rank8.cpp |    4 +-
 ...Inst_int64_t_int64_t_LayoutRight_Rank1.cpp |    4 +-
 ...Inst_int64_t_int64_t_LayoutRight_Rank2.cpp |    4 +-
 ...Inst_int64_t_int64_t_LayoutRight_Rank3.cpp |    4 +-
 ...Inst_int64_t_int64_t_LayoutRight_Rank4.cpp |    4 +-
 ...Inst_int64_t_int64_t_LayoutRight_Rank5.cpp |    4 +-
 ...Inst_int64_t_int64_t_LayoutRight_Rank8.cpp |    4 +-
 ...nst_int64_t_int64_t_LayoutStride_Rank1.cpp |    4 +-
 ...nst_int64_t_int64_t_LayoutStride_Rank2.cpp |    4 +-
 ...nst_int64_t_int64_t_LayoutStride_Rank3.cpp |    4 +-
 ...nst_int64_t_int64_t_LayoutStride_Rank4.cpp |    4 +-
 ...nst_int64_t_int64_t_LayoutStride_Rank5.cpp |    4 +-
 ...nst_int64_t_int64_t_LayoutStride_Rank8.cpp |    4 +-
 ...pyETIInst_int64_t_int_LayoutLeft_Rank1.cpp |    4 +-
 ...pyETIInst_int64_t_int_LayoutLeft_Rank2.cpp |    4 +-
 ...pyETIInst_int64_t_int_LayoutLeft_Rank3.cpp |    4 +-
 ...pyETIInst_int64_t_int_LayoutLeft_Rank4.cpp |    4 +-
 ...pyETIInst_int64_t_int_LayoutLeft_Rank5.cpp |    4 +-
 ...pyETIInst_int64_t_int_LayoutLeft_Rank8.cpp |    4 +-
 ...yETIInst_int64_t_int_LayoutRight_Rank1.cpp |    4 +-
 ...yETIInst_int64_t_int_LayoutRight_Rank2.cpp |    4 +-
 ...yETIInst_int64_t_int_LayoutRight_Rank3.cpp |    4 +-
 ...yETIInst_int64_t_int_LayoutRight_Rank4.cpp |    4 +-
 ...yETIInst_int64_t_int_LayoutRight_Rank5.cpp |    4 +-
 ...yETIInst_int64_t_int_LayoutRight_Rank8.cpp |    4 +-
 ...ETIInst_int64_t_int_LayoutStride_Rank1.cpp |    4 +-
 ...ETIInst_int64_t_int_LayoutStride_Rank2.cpp |    4 +-
 ...ETIInst_int64_t_int_LayoutStride_Rank3.cpp |    4 +-
 ...ETIInst_int64_t_int_LayoutStride_Rank4.cpp |    4 +-
 ...ETIInst_int64_t_int_LayoutStride_Rank5.cpp |    4 +-
 ...ETIInst_int64_t_int_LayoutStride_Rank8.cpp |    4 +-
 ...opyETIInst_int_double_LayoutLeft_Rank1.cpp |    4 +-
 ...opyETIInst_int_double_LayoutLeft_Rank2.cpp |    4 +-
 ...opyETIInst_int_double_LayoutLeft_Rank3.cpp |    4 +-
 ...opyETIInst_int_double_LayoutLeft_Rank4.cpp |    4 +-
 ...opyETIInst_int_double_LayoutLeft_Rank5.cpp |    4 +-
 ...opyETIInst_int_double_LayoutLeft_Rank8.cpp |    4 +-
 ...pyETIInst_int_double_LayoutRight_Rank1.cpp |    4 +-
 ...pyETIInst_int_double_LayoutRight_Rank2.cpp |    4 +-
 ...pyETIInst_int_double_LayoutRight_Rank3.cpp |    4 +-
 ...pyETIInst_int_double_LayoutRight_Rank4.cpp |    4 +-
 ...pyETIInst_int_double_LayoutRight_Rank5.cpp |    4 +-
 ...pyETIInst_int_double_LayoutRight_Rank8.cpp |    4 +-
 ...yETIInst_int_double_LayoutStride_Rank1.cpp |    4 +-
 ...yETIInst_int_double_LayoutStride_Rank2.cpp |    4 +-
 ...yETIInst_int_double_LayoutStride_Rank3.cpp |    4 +-
 ...yETIInst_int_double_LayoutStride_Rank4.cpp |    4 +-
 ...yETIInst_int_double_LayoutStride_Rank5.cpp |    4 +-
 ...yETIInst_int_double_LayoutStride_Rank8.cpp |    4 +-
 ...CopyETIInst_int_float_LayoutLeft_Rank1.cpp |    4 +-
 ...CopyETIInst_int_float_LayoutLeft_Rank2.cpp |    4 +-
 ...CopyETIInst_int_float_LayoutLeft_Rank3.cpp |    4 +-
 ...CopyETIInst_int_float_LayoutLeft_Rank4.cpp |    4 +-
 ...CopyETIInst_int_float_LayoutLeft_Rank5.cpp |    4 +-
 ...CopyETIInst_int_float_LayoutLeft_Rank8.cpp |    4 +-
 ...opyETIInst_int_float_LayoutRight_Rank1.cpp |    4 +-
 ...opyETIInst_int_float_LayoutRight_Rank2.cpp |    4 +-
 ...opyETIInst_int_float_LayoutRight_Rank3.cpp |    4 +-
 ...opyETIInst_int_float_LayoutRight_Rank4.cpp |    4 +-
 ...opyETIInst_int_float_LayoutRight_Rank5.cpp |    4 +-
 ...opyETIInst_int_float_LayoutRight_Rank8.cpp |    4 +-
 ...pyETIInst_int_float_LayoutStride_Rank1.cpp |    4 +-
 ...pyETIInst_int_float_LayoutStride_Rank2.cpp |    4 +-
 ...pyETIInst_int_float_LayoutStride_Rank3.cpp |    4 +-
 ...pyETIInst_int_float_LayoutStride_Rank4.cpp |    4 +-
 ...pyETIInst_int_float_LayoutStride_Rank5.cpp |    4 +-
 ...pyETIInst_int_float_LayoutStride_Rank8.cpp |    4 +-
 ...pyETIInst_int_int64_t_LayoutLeft_Rank1.cpp |    4 +-
 ...pyETIInst_int_int64_t_LayoutLeft_Rank2.cpp |    4 +-
 ...pyETIInst_int_int64_t_LayoutLeft_Rank3.cpp |    4 +-
 ...pyETIInst_int_int64_t_LayoutLeft_Rank4.cpp |    4 +-
 ...pyETIInst_int_int64_t_LayoutLeft_Rank5.cpp |    4 +-
 ...pyETIInst_int_int64_t_LayoutLeft_Rank8.cpp |    4 +-
 ...yETIInst_int_int64_t_LayoutRight_Rank1.cpp |    4 +-
 ...yETIInst_int_int64_t_LayoutRight_Rank2.cpp |    4 +-
 ...yETIInst_int_int64_t_LayoutRight_Rank3.cpp |    4 +-
 ...yETIInst_int_int64_t_LayoutRight_Rank4.cpp |    4 +-
 ...yETIInst_int_int64_t_LayoutRight_Rank5.cpp |    4 +-
 ...yETIInst_int_int64_t_LayoutRight_Rank8.cpp |    4 +-
 ...ETIInst_int_int64_t_LayoutStride_Rank1.cpp |    4 +-
 ...ETIInst_int_int64_t_LayoutStride_Rank2.cpp |    4 +-
 ...ETIInst_int_int64_t_LayoutStride_Rank3.cpp |    4 +-
 ...ETIInst_int_int64_t_LayoutStride_Rank4.cpp |    4 +-
 ...ETIInst_int_int64_t_LayoutStride_Rank5.cpp |    4 +-
 ...ETIInst_int_int64_t_LayoutStride_Rank8.cpp |    4 +-
 ...ewCopyETIInst_int_int_LayoutLeft_Rank1.cpp |    4 +-
 ...ewCopyETIInst_int_int_LayoutLeft_Rank2.cpp |    4 +-
 ...ewCopyETIInst_int_int_LayoutLeft_Rank3.cpp |    4 +-
 ...ewCopyETIInst_int_int_LayoutLeft_Rank4.cpp |    4 +-
 ...ewCopyETIInst_int_int_LayoutLeft_Rank5.cpp |    4 +-
 ...ewCopyETIInst_int_int_LayoutLeft_Rank8.cpp |    4 +-
 ...wCopyETIInst_int_int_LayoutRight_Rank1.cpp |    4 +-
 ...wCopyETIInst_int_int_LayoutRight_Rank2.cpp |    4 +-
 ...wCopyETIInst_int_int_LayoutRight_Rank3.cpp |    4 +-
 ...wCopyETIInst_int_int_LayoutRight_Rank4.cpp |    4 +-
 ...wCopyETIInst_int_int_LayoutRight_Rank5.cpp |    4 +-
 ...wCopyETIInst_int_int_LayoutRight_Rank8.cpp |    4 +-
 ...CopyETIInst_int_int_LayoutStride_Rank1.cpp |    4 +-
 ...CopyETIInst_int_int_LayoutStride_Rank2.cpp |    4 +-
 ...CopyETIInst_int_int_LayoutStride_Rank3.cpp |    4 +-
 ...CopyETIInst_int_int_LayoutStride_Rank4.cpp |    4 +-
 ...CopyETIInst_int_int_LayoutStride_Rank5.cpp |    4 +-
 ...CopyETIInst_int_int_LayoutStride_Rank8.cpp |    4 +-
 ...TIInst_int64_t_double_LayoutLeft_Rank1.cpp |    4 +-
 ...TIInst_int64_t_double_LayoutLeft_Rank2.cpp |    4 +-
 ...TIInst_int64_t_double_LayoutLeft_Rank3.cpp |    4 +-
 ...TIInst_int64_t_double_LayoutLeft_Rank4.cpp |    4 +-
 ...TIInst_int64_t_double_LayoutLeft_Rank5.cpp |    4 +-
 ...TIInst_int64_t_double_LayoutLeft_Rank8.cpp |    4 +-
 ...IInst_int64_t_double_LayoutRight_Rank1.cpp |    4 +-
 ...IInst_int64_t_double_LayoutRight_Rank2.cpp |    4 +-
 ...IInst_int64_t_double_LayoutRight_Rank3.cpp |    4 +-
 ...IInst_int64_t_double_LayoutRight_Rank4.cpp |    4 +-
 ...IInst_int64_t_double_LayoutRight_Rank5.cpp |    4 +-
 ...IInst_int64_t_double_LayoutRight_Rank8.cpp |    4 +-
 ...Inst_int64_t_double_LayoutStride_Rank1.cpp |    4 +-
 ...Inst_int64_t_double_LayoutStride_Rank2.cpp |    4 +-
 ...Inst_int64_t_double_LayoutStride_Rank3.cpp |    4 +-
 ...Inst_int64_t_double_LayoutStride_Rank4.cpp |    4 +-
 ...Inst_int64_t_double_LayoutStride_Rank5.cpp |    4 +-
 ...Inst_int64_t_double_LayoutStride_Rank8.cpp |    4 +-
 ...ETIInst_int64_t_float_LayoutLeft_Rank1.cpp |    4 +-
 ...ETIInst_int64_t_float_LayoutLeft_Rank2.cpp |    4 +-
 ...ETIInst_int64_t_float_LayoutLeft_Rank3.cpp |    4 +-
 ...ETIInst_int64_t_float_LayoutLeft_Rank4.cpp |    4 +-
 ...ETIInst_int64_t_float_LayoutLeft_Rank5.cpp |    4 +-
 ...ETIInst_int64_t_float_LayoutLeft_Rank8.cpp |    4 +-
 ...TIInst_int64_t_float_LayoutRight_Rank1.cpp |    4 +-
 ...TIInst_int64_t_float_LayoutRight_Rank2.cpp |    4 +-
 ...TIInst_int64_t_float_LayoutRight_Rank3.cpp |    4 +-
 ...TIInst_int64_t_float_LayoutRight_Rank4.cpp |    4 +-
 ...TIInst_int64_t_float_LayoutRight_Rank5.cpp |    4 +-
 ...TIInst_int64_t_float_LayoutRight_Rank8.cpp |    4 +-
 ...IInst_int64_t_float_LayoutStride_Rank1.cpp |    4 +-
 ...IInst_int64_t_float_LayoutStride_Rank2.cpp |    4 +-
 ...IInst_int64_t_float_LayoutStride_Rank3.cpp |    4 +-
 ...IInst_int64_t_float_LayoutStride_Rank4.cpp |    4 +-
 ...IInst_int64_t_float_LayoutStride_Rank5.cpp |    4 +-
 ...IInst_int64_t_float_LayoutStride_Rank8.cpp |    4 +-
 ...IInst_int64_t_int64_t_LayoutLeft_Rank1.cpp |    4 +-
 ...IInst_int64_t_int64_t_LayoutLeft_Rank2.cpp |    4 +-
 ...IInst_int64_t_int64_t_LayoutLeft_Rank3.cpp |    4 +-
 ...IInst_int64_t_int64_t_LayoutLeft_Rank4.cpp |    4 +-
 ...IInst_int64_t_int64_t_LayoutLeft_Rank5.cpp |    4 +-
 ...IInst_int64_t_int64_t_LayoutLeft_Rank8.cpp |    4 +-
 ...Inst_int64_t_int64_t_LayoutRight_Rank1.cpp |    4 +-
 ...Inst_int64_t_int64_t_LayoutRight_Rank2.cpp |    4 +-
 ...Inst_int64_t_int64_t_LayoutRight_Rank3.cpp |    4 +-
 ...Inst_int64_t_int64_t_LayoutRight_Rank4.cpp |    4 +-
 ...Inst_int64_t_int64_t_LayoutRight_Rank5.cpp |    4 +-
 ...Inst_int64_t_int64_t_LayoutRight_Rank8.cpp |    4 +-
 ...nst_int64_t_int64_t_LayoutStride_Rank1.cpp |    4 +-
 ...nst_int64_t_int64_t_LayoutStride_Rank2.cpp |    4 +-
 ...nst_int64_t_int64_t_LayoutStride_Rank3.cpp |    4 +-
 ...nst_int64_t_int64_t_LayoutStride_Rank4.cpp |    4 +-
 ...nst_int64_t_int64_t_LayoutStride_Rank5.cpp |    4 +-
 ...nst_int64_t_int64_t_LayoutStride_Rank8.cpp |    4 +-
 ...pyETIInst_int64_t_int_LayoutLeft_Rank1.cpp |    4 +-
 ...pyETIInst_int64_t_int_LayoutLeft_Rank2.cpp |    4 +-
 ...pyETIInst_int64_t_int_LayoutLeft_Rank3.cpp |    4 +-
 ...pyETIInst_int64_t_int_LayoutLeft_Rank4.cpp |    4 +-
 ...pyETIInst_int64_t_int_LayoutLeft_Rank5.cpp |    4 +-
 ...pyETIInst_int64_t_int_LayoutLeft_Rank8.cpp |    4 +-
 ...yETIInst_int64_t_int_LayoutRight_Rank1.cpp |    4 +-
 ...yETIInst_int64_t_int_LayoutRight_Rank2.cpp |    4 +-
 ...yETIInst_int64_t_int_LayoutRight_Rank3.cpp |    4 +-
 ...yETIInst_int64_t_int_LayoutRight_Rank4.cpp |    4 +-
 ...yETIInst_int64_t_int_LayoutRight_Rank5.cpp |    4 +-
 ...yETIInst_int64_t_int_LayoutRight_Rank8.cpp |    4 +-
 ...ETIInst_int64_t_int_LayoutStride_Rank1.cpp |    4 +-
 ...ETIInst_int64_t_int_LayoutStride_Rank2.cpp |    4 +-
 ...ETIInst_int64_t_int_LayoutStride_Rank3.cpp |    4 +-
 ...ETIInst_int64_t_int_LayoutStride_Rank4.cpp |    4 +-
 ...ETIInst_int64_t_int_LayoutStride_Rank5.cpp |    4 +-
 ...ETIInst_int64_t_int_LayoutStride_Rank8.cpp |    4 +-
 ...opyETIInst_int_double_LayoutLeft_Rank1.cpp |    4 +-
 ...opyETIInst_int_double_LayoutLeft_Rank2.cpp |    4 +-
 ...opyETIInst_int_double_LayoutLeft_Rank3.cpp |    4 +-
 ...opyETIInst_int_double_LayoutLeft_Rank4.cpp |    4 +-
 ...opyETIInst_int_double_LayoutLeft_Rank5.cpp |    4 +-
 ...opyETIInst_int_double_LayoutLeft_Rank8.cpp |    4 +-
 ...pyETIInst_int_double_LayoutRight_Rank1.cpp |    4 +-
 ...pyETIInst_int_double_LayoutRight_Rank2.cpp |    4 +-
 ...pyETIInst_int_double_LayoutRight_Rank3.cpp |    4 +-
 ...pyETIInst_int_double_LayoutRight_Rank4.cpp |    4 +-
 ...pyETIInst_int_double_LayoutRight_Rank5.cpp |    4 +-
 ...pyETIInst_int_double_LayoutRight_Rank8.cpp |    4 +-
 ...yETIInst_int_double_LayoutStride_Rank1.cpp |    4 +-
 ...yETIInst_int_double_LayoutStride_Rank2.cpp |    4 +-
 ...yETIInst_int_double_LayoutStride_Rank3.cpp |    4 +-
 ...yETIInst_int_double_LayoutStride_Rank4.cpp |    4 +-
 ...yETIInst_int_double_LayoutStride_Rank5.cpp |    4 +-
 ...yETIInst_int_double_LayoutStride_Rank8.cpp |    4 +-
 ...CopyETIInst_int_float_LayoutLeft_Rank1.cpp |    4 +-
 ...CopyETIInst_int_float_LayoutLeft_Rank2.cpp |    4 +-
 ...CopyETIInst_int_float_LayoutLeft_Rank3.cpp |    4 +-
 ...CopyETIInst_int_float_LayoutLeft_Rank4.cpp |    4 +-
 ...CopyETIInst_int_float_LayoutLeft_Rank5.cpp |    4 +-
 ...CopyETIInst_int_float_LayoutLeft_Rank8.cpp |    4 +-
 ...opyETIInst_int_float_LayoutRight_Rank1.cpp |    4 +-
 ...opyETIInst_int_float_LayoutRight_Rank2.cpp |    4 +-
 ...opyETIInst_int_float_LayoutRight_Rank3.cpp |    4 +-
 ...opyETIInst_int_float_LayoutRight_Rank4.cpp |    4 +-
 ...opyETIInst_int_float_LayoutRight_Rank5.cpp |    4 +-
 ...opyETIInst_int_float_LayoutRight_Rank8.cpp |    4 +-
 ...pyETIInst_int_float_LayoutStride_Rank1.cpp |    4 +-
 ...pyETIInst_int_float_LayoutStride_Rank2.cpp |    4 +-
 ...pyETIInst_int_float_LayoutStride_Rank3.cpp |    4 +-
 ...pyETIInst_int_float_LayoutStride_Rank4.cpp |    4 +-
 ...pyETIInst_int_float_LayoutStride_Rank5.cpp |    4 +-
 ...pyETIInst_int_float_LayoutStride_Rank8.cpp |    4 +-
 ...pyETIInst_int_int64_t_LayoutLeft_Rank1.cpp |    4 +-
 ...pyETIInst_int_int64_t_LayoutLeft_Rank2.cpp |    4 +-
 ...pyETIInst_int_int64_t_LayoutLeft_Rank3.cpp |    4 +-
 ...pyETIInst_int_int64_t_LayoutLeft_Rank4.cpp |    4 +-
 ...pyETIInst_int_int64_t_LayoutLeft_Rank5.cpp |    4 +-
 ...pyETIInst_int_int64_t_LayoutLeft_Rank8.cpp |    4 +-
 ...yETIInst_int_int64_t_LayoutRight_Rank1.cpp |    4 +-
 ...yETIInst_int_int64_t_LayoutRight_Rank2.cpp |    4 +-
 ...yETIInst_int_int64_t_LayoutRight_Rank3.cpp |    4 +-
 ...yETIInst_int_int64_t_LayoutRight_Rank4.cpp |    4 +-
 ...yETIInst_int_int64_t_LayoutRight_Rank5.cpp |    4 +-
 ...yETIInst_int_int64_t_LayoutRight_Rank8.cpp |    4 +-
 ...ETIInst_int_int64_t_LayoutStride_Rank1.cpp |    4 +-
 ...ETIInst_int_int64_t_LayoutStride_Rank2.cpp |    4 +-
 ...ETIInst_int_int64_t_LayoutStride_Rank3.cpp |    4 +-
 ...ETIInst_int_int64_t_LayoutStride_Rank4.cpp |    4 +-
 ...ETIInst_int_int64_t_LayoutStride_Rank5.cpp |    4 +-
 ...ETIInst_int_int64_t_LayoutStride_Rank8.cpp |    4 +-
 ...ewCopyETIInst_int_int_LayoutLeft_Rank1.cpp |    4 +-
 ...ewCopyETIInst_int_int_LayoutLeft_Rank2.cpp |    4 +-
 ...ewCopyETIInst_int_int_LayoutLeft_Rank3.cpp |    4 +-
 ...ewCopyETIInst_int_int_LayoutLeft_Rank4.cpp |    4 +-
 ...ewCopyETIInst_int_int_LayoutLeft_Rank5.cpp |    4 +-
 ...ewCopyETIInst_int_int_LayoutLeft_Rank8.cpp |    4 +-
 ...wCopyETIInst_int_int_LayoutRight_Rank1.cpp |    4 +-
 ...wCopyETIInst_int_int_LayoutRight_Rank2.cpp |    4 +-
 ...wCopyETIInst_int_int_LayoutRight_Rank3.cpp |    4 +-
 ...wCopyETIInst_int_int_LayoutRight_Rank4.cpp |    4 +-
 ...wCopyETIInst_int_int_LayoutRight_Rank5.cpp |    4 +-
 ...wCopyETIInst_int_int_LayoutRight_Rank8.cpp |    4 +-
 ...CopyETIInst_int_int_LayoutStride_Rank1.cpp |    4 +-
 ...CopyETIInst_int_int_LayoutStride_Rank2.cpp |    4 +-
 ...CopyETIInst_int_int_LayoutStride_Rank3.cpp |    4 +-
 ...CopyETIInst_int_int_LayoutStride_Rank4.cpp |    4 +-
 ...CopyETIInst_int_int_LayoutStride_Rank5.cpp |    4 +-
 ...CopyETIInst_int_int_LayoutStride_Rank8.cpp |    4 +-
 ...TIInst_int64_t_double_LayoutLeft_Rank1.cpp |    4 +-
 ...TIInst_int64_t_double_LayoutLeft_Rank2.cpp |    4 +-
 ...TIInst_int64_t_double_LayoutLeft_Rank3.cpp |    4 +-
 ...TIInst_int64_t_double_LayoutLeft_Rank4.cpp |    4 +-
 ...TIInst_int64_t_double_LayoutLeft_Rank5.cpp |    4 +-
 ...TIInst_int64_t_double_LayoutLeft_Rank8.cpp |    4 +-
 ...IInst_int64_t_double_LayoutRight_Rank1.cpp |    4 +-
 ...IInst_int64_t_double_LayoutRight_Rank2.cpp |    4 +-
 ...IInst_int64_t_double_LayoutRight_Rank3.cpp |    4 +-
 ...IInst_int64_t_double_LayoutRight_Rank4.cpp |    4 +-
 ...IInst_int64_t_double_LayoutRight_Rank5.cpp |    4 +-
 ...IInst_int64_t_double_LayoutRight_Rank8.cpp |    4 +-
 ...Inst_int64_t_double_LayoutStride_Rank1.cpp |    4 +-
 ...Inst_int64_t_double_LayoutStride_Rank2.cpp |    4 +-
 ...Inst_int64_t_double_LayoutStride_Rank3.cpp |    4 +-
 ...Inst_int64_t_double_LayoutStride_Rank4.cpp |    4 +-
 ...Inst_int64_t_double_LayoutStride_Rank5.cpp |    4 +-
 ...Inst_int64_t_double_LayoutStride_Rank8.cpp |    4 +-
 ...ETIInst_int64_t_float_LayoutLeft_Rank1.cpp |    4 +-
 ...ETIInst_int64_t_float_LayoutLeft_Rank2.cpp |    4 +-
 ...ETIInst_int64_t_float_LayoutLeft_Rank3.cpp |    4 +-
 ...ETIInst_int64_t_float_LayoutLeft_Rank4.cpp |    4 +-
 ...ETIInst_int64_t_float_LayoutLeft_Rank5.cpp |    4 +-
 ...ETIInst_int64_t_float_LayoutLeft_Rank8.cpp |    4 +-
 ...TIInst_int64_t_float_LayoutRight_Rank1.cpp |    4 +-
 ...TIInst_int64_t_float_LayoutRight_Rank2.cpp |    4 +-
 ...TIInst_int64_t_float_LayoutRight_Rank3.cpp |    4 +-
 ...TIInst_int64_t_float_LayoutRight_Rank4.cpp |    4 +-
 ...TIInst_int64_t_float_LayoutRight_Rank5.cpp |    4 +-
 ...TIInst_int64_t_float_LayoutRight_Rank8.cpp |    4 +-
 ...IInst_int64_t_float_LayoutStride_Rank1.cpp |    4 +-
 ...IInst_int64_t_float_LayoutStride_Rank2.cpp |    4 +-
 ...IInst_int64_t_float_LayoutStride_Rank3.cpp |    4 +-
 ...IInst_int64_t_float_LayoutStride_Rank4.cpp |    4 +-
 ...IInst_int64_t_float_LayoutStride_Rank5.cpp |    4 +-
 ...IInst_int64_t_float_LayoutStride_Rank8.cpp |    4 +-
 ...IInst_int64_t_int64_t_LayoutLeft_Rank1.cpp |    4 +-
 ...IInst_int64_t_int64_t_LayoutLeft_Rank2.cpp |    4 +-
 ...IInst_int64_t_int64_t_LayoutLeft_Rank3.cpp |    4 +-
 ...IInst_int64_t_int64_t_LayoutLeft_Rank4.cpp |    4 +-
 ...IInst_int64_t_int64_t_LayoutLeft_Rank5.cpp |    4 +-
 ...IInst_int64_t_int64_t_LayoutLeft_Rank8.cpp |    4 +-
 ...Inst_int64_t_int64_t_LayoutRight_Rank1.cpp |    4 +-
 ...Inst_int64_t_int64_t_LayoutRight_Rank2.cpp |    4 +-
 ...Inst_int64_t_int64_t_LayoutRight_Rank3.cpp |    4 +-
 ...Inst_int64_t_int64_t_LayoutRight_Rank4.cpp |    4 +-
 ...Inst_int64_t_int64_t_LayoutRight_Rank5.cpp |    4 +-
 ...Inst_int64_t_int64_t_LayoutRight_Rank8.cpp |    4 +-
 ...nst_int64_t_int64_t_LayoutStride_Rank1.cpp |    4 +-
 ...nst_int64_t_int64_t_LayoutStride_Rank2.cpp |    4 +-
 ...nst_int64_t_int64_t_LayoutStride_Rank3.cpp |    4 +-
 ...nst_int64_t_int64_t_LayoutStride_Rank4.cpp |    4 +-
 ...nst_int64_t_int64_t_LayoutStride_Rank5.cpp |    4 +-
 ...nst_int64_t_int64_t_LayoutStride_Rank8.cpp |    4 +-
 ...pyETIInst_int64_t_int_LayoutLeft_Rank1.cpp |    4 +-
 ...pyETIInst_int64_t_int_LayoutLeft_Rank2.cpp |    4 +-
 ...pyETIInst_int64_t_int_LayoutLeft_Rank3.cpp |    4 +-
 ...pyETIInst_int64_t_int_LayoutLeft_Rank4.cpp |    4 +-
 ...pyETIInst_int64_t_int_LayoutLeft_Rank5.cpp |    4 +-
 ...pyETIInst_int64_t_int_LayoutLeft_Rank8.cpp |    4 +-
 ...yETIInst_int64_t_int_LayoutRight_Rank1.cpp |    4 +-
 ...yETIInst_int64_t_int_LayoutRight_Rank2.cpp |    4 +-
 ...yETIInst_int64_t_int_LayoutRight_Rank3.cpp |    4 +-
 ...yETIInst_int64_t_int_LayoutRight_Rank4.cpp |    4 +-
 ...yETIInst_int64_t_int_LayoutRight_Rank5.cpp |    4 +-
 ...yETIInst_int64_t_int_LayoutRight_Rank8.cpp |    4 +-
 ...ETIInst_int64_t_int_LayoutStride_Rank1.cpp |    4 +-
 ...ETIInst_int64_t_int_LayoutStride_Rank2.cpp |    4 +-
 ...ETIInst_int64_t_int_LayoutStride_Rank3.cpp |    4 +-
 ...ETIInst_int64_t_int_LayoutStride_Rank4.cpp |    4 +-
 ...ETIInst_int64_t_int_LayoutStride_Rank5.cpp |    4 +-
 ...ETIInst_int64_t_int_LayoutStride_Rank8.cpp |    4 +-
 ...opyETIInst_int_double_LayoutLeft_Rank1.cpp |    4 +-
 ...opyETIInst_int_double_LayoutLeft_Rank2.cpp |    4 +-
 ...opyETIInst_int_double_LayoutLeft_Rank3.cpp |    4 +-
 ...opyETIInst_int_double_LayoutLeft_Rank4.cpp |    4 +-
 ...opyETIInst_int_double_LayoutLeft_Rank5.cpp |    4 +-
 ...opyETIInst_int_double_LayoutLeft_Rank8.cpp |    4 +-
 ...pyETIInst_int_double_LayoutRight_Rank1.cpp |    4 +-
 ...pyETIInst_int_double_LayoutRight_Rank2.cpp |    4 +-
 ...pyETIInst_int_double_LayoutRight_Rank3.cpp |    4 +-
 ...pyETIInst_int_double_LayoutRight_Rank4.cpp |    4 +-
 ...pyETIInst_int_double_LayoutRight_Rank5.cpp |    4 +-
 ...pyETIInst_int_double_LayoutRight_Rank8.cpp |    4 +-
 ...yETIInst_int_double_LayoutStride_Rank1.cpp |    4 +-
 ...yETIInst_int_double_LayoutStride_Rank2.cpp |    4 +-
 ...yETIInst_int_double_LayoutStride_Rank3.cpp |    4 +-
 ...yETIInst_int_double_LayoutStride_Rank4.cpp |    4 +-
 ...yETIInst_int_double_LayoutStride_Rank5.cpp |    4 +-
 ...yETIInst_int_double_LayoutStride_Rank8.cpp |    4 +-
 ...CopyETIInst_int_float_LayoutLeft_Rank1.cpp |    4 +-
 ...CopyETIInst_int_float_LayoutLeft_Rank2.cpp |    4 +-
 ...CopyETIInst_int_float_LayoutLeft_Rank3.cpp |    4 +-
 ...CopyETIInst_int_float_LayoutLeft_Rank4.cpp |    4 +-
 ...CopyETIInst_int_float_LayoutLeft_Rank5.cpp |    4 +-
 ...CopyETIInst_int_float_LayoutLeft_Rank8.cpp |    4 +-
 ...opyETIInst_int_float_LayoutRight_Rank1.cpp |    4 +-
 ...opyETIInst_int_float_LayoutRight_Rank2.cpp |    4 +-
 ...opyETIInst_int_float_LayoutRight_Rank3.cpp |    4 +-
 ...opyETIInst_int_float_LayoutRight_Rank4.cpp |    4 +-
 ...opyETIInst_int_float_LayoutRight_Rank5.cpp |    4 +-
 ...opyETIInst_int_float_LayoutRight_Rank8.cpp |    4 +-
 ...pyETIInst_int_float_LayoutStride_Rank1.cpp |    4 +-
 ...pyETIInst_int_float_LayoutStride_Rank2.cpp |    4 +-
 ...pyETIInst_int_float_LayoutStride_Rank3.cpp |    4 +-
 ...pyETIInst_int_float_LayoutStride_Rank4.cpp |    4 +-
 ...pyETIInst_int_float_LayoutStride_Rank5.cpp |    4 +-
 ...pyETIInst_int_float_LayoutStride_Rank8.cpp |    4 +-
 ...pyETIInst_int_int64_t_LayoutLeft_Rank1.cpp |    4 +-
 ...pyETIInst_int_int64_t_LayoutLeft_Rank2.cpp |    4 +-
 ...pyETIInst_int_int64_t_LayoutLeft_Rank3.cpp |    4 +-
 ...pyETIInst_int_int64_t_LayoutLeft_Rank4.cpp |    4 +-
 ...pyETIInst_int_int64_t_LayoutLeft_Rank5.cpp |    4 +-
 ...pyETIInst_int_int64_t_LayoutLeft_Rank8.cpp |    4 +-
 ...yETIInst_int_int64_t_LayoutRight_Rank1.cpp |    4 +-
 ...yETIInst_int_int64_t_LayoutRight_Rank2.cpp |    4 +-
 ...yETIInst_int_int64_t_LayoutRight_Rank3.cpp |    4 +-
 ...yETIInst_int_int64_t_LayoutRight_Rank4.cpp |    4 +-
 ...yETIInst_int_int64_t_LayoutRight_Rank5.cpp |    4 +-
 ...yETIInst_int_int64_t_LayoutRight_Rank8.cpp |    4 +-
 ...ETIInst_int_int64_t_LayoutStride_Rank1.cpp |    4 +-
 ...ETIInst_int_int64_t_LayoutStride_Rank2.cpp |    4 +-
 ...ETIInst_int_int64_t_LayoutStride_Rank3.cpp |    4 +-
 ...ETIInst_int_int64_t_LayoutStride_Rank4.cpp |    4 +-
 ...ETIInst_int_int64_t_LayoutStride_Rank5.cpp |    4 +-
 ...ETIInst_int_int64_t_LayoutStride_Rank8.cpp |    4 +-
 ...ewCopyETIInst_int_int_LayoutLeft_Rank1.cpp |    4 +-
 ...ewCopyETIInst_int_int_LayoutLeft_Rank2.cpp |    4 +-
 ...ewCopyETIInst_int_int_LayoutLeft_Rank3.cpp |    4 +-
 ...ewCopyETIInst_int_int_LayoutLeft_Rank4.cpp |    4 +-
 ...ewCopyETIInst_int_int_LayoutLeft_Rank5.cpp |    4 +-
 ...ewCopyETIInst_int_int_LayoutLeft_Rank8.cpp |    4 +-
 ...wCopyETIInst_int_int_LayoutRight_Rank1.cpp |    4 +-
 ...wCopyETIInst_int_int_LayoutRight_Rank2.cpp |    4 +-
 ...wCopyETIInst_int_int_LayoutRight_Rank3.cpp |    4 +-
 ...wCopyETIInst_int_int_LayoutRight_Rank4.cpp |    4 +-
 ...wCopyETIInst_int_int_LayoutRight_Rank5.cpp |    4 +-
 ...wCopyETIInst_int_int_LayoutRight_Rank8.cpp |    4 +-
 ...CopyETIInst_int_int_LayoutStride_Rank1.cpp |    4 +-
 ...CopyETIInst_int_int_LayoutStride_Rank2.cpp |    4 +-
 ...CopyETIInst_int_int_LayoutStride_Rank3.cpp |    4 +-
 ...CopyETIInst_int_int_LayoutStride_Rank4.cpp |    4 +-
 ...CopyETIInst_int_int_LayoutStride_Rank5.cpp |    4 +-
 ...CopyETIInst_int_int_LayoutStride_Rank8.cpp |    4 +-
 kokkos/core/src/impl/CMakeLists.txt           |    2 +-
 .../src/impl/KokkosExp_Host_IterateTile.hpp   |    4 +-
 .../core/src/impl/KokkosExp_ViewMapping.hpp   |    4 +-
 kokkos/core/src/impl/Kokkos_AnalyzePolicy.hpp |   21 +-
 .../core/src/impl/Kokkos_Atomic_Assembly.hpp  |    7 +-
 .../Kokkos_Atomic_Compare_Exchange_Strong.hpp |   50 +-
 .../Kokkos_Atomic_Compare_Exchange_Weak.hpp   |   37 +-
 .../core/src/impl/Kokkos_Atomic_Decrement.hpp |    6 +-
 .../core/src/impl/Kokkos_Atomic_Exchange.hpp  |   86 +-
 .../core/src/impl/Kokkos_Atomic_Fetch_Add.hpp |   67 +-
 .../core/src/impl/Kokkos_Atomic_Fetch_And.hpp |    4 +-
 .../core/src/impl/Kokkos_Atomic_Fetch_Or.hpp  |    4 +-
 .../core/src/impl/Kokkos_Atomic_Fetch_Sub.hpp |   45 +-
 .../core/src/impl/Kokkos_Atomic_Generic.hpp   |  113 +-
 .../impl/Kokkos_Atomic_Generic_Secondary.hpp  |   76 +
 .../core/src/impl/Kokkos_Atomic_Increment.hpp |    6 +-
 kokkos/core/src/impl/Kokkos_Atomic_Load.hpp   |   19 +-
 .../src/impl/Kokkos_Atomic_Memory_Order.hpp   |    4 +-
 kokkos/core/src/impl/Kokkos_Atomic_MinMax.hpp |  223 ++
 kokkos/core/src/impl/Kokkos_Atomic_Store.hpp  |   17 +-
 kokkos/core/src/impl/Kokkos_Atomic_View.hpp   |    6 +-
 .../core/src/impl/Kokkos_Atomic_Windows.hpp   |  171 +-
 kokkos/core/src/impl/Kokkos_BitOps.hpp        |    4 +-
 kokkos/core/src/impl/Kokkos_CPUDiscovery.cpp  |    4 +-
 kokkos/core/src/impl/Kokkos_CPUDiscovery.hpp  |    4 +-
 kokkos/core/src/impl/Kokkos_ChaseLev.hpp      |   31 +-
 kokkos/core/src/impl/Kokkos_ClockTic.hpp      |    9 +-
 .../core/src/impl/Kokkos_ConcurrentBitset.hpp |    4 +-
 kokkos/core/src/impl/Kokkos_Core.cpp          |  554 ++-
 kokkos/core/src/impl/Kokkos_EBO.hpp           |   24 +-
 kokkos/core/src/impl/Kokkos_Error.cpp         |    6 +-
 kokkos/core/src/impl/Kokkos_Error.hpp         |   19 +-
 kokkos/core/src/impl/Kokkos_ExecPolicy.cpp    |    4 +-
 .../src/impl/Kokkos_FixedBufferMemoryPool.hpp |   31 +-
 .../core/src/impl/Kokkos_FunctorAdapter.hpp   |   49 +-
 .../core/src/impl/Kokkos_FunctorAnalysis.hpp  |    6 +-
 kokkos/core/src/impl/Kokkos_HBWSpace.cpp      |   15 +-
 kokkos/core/src/impl/Kokkos_HostBarrier.cpp   |    6 +-
 kokkos/core/src/impl/Kokkos_HostBarrier.hpp   |    7 +-
 kokkos/core/src/impl/Kokkos_HostSpace.cpp     |   44 +-
 .../src/impl/Kokkos_HostSpace_deepcopy.cpp    |    4 +-
 .../src/impl/Kokkos_HostSpace_deepcopy.hpp    |    4 +-
 .../core/src/impl/Kokkos_HostThreadTeam.cpp   |   15 +-
 .../core/src/impl/Kokkos_HostThreadTeam.hpp   |   26 +-
 kokkos/core/src/impl/Kokkos_LIFO.hpp          |   11 +-
 .../core/src/impl/Kokkos_LinkedListNode.hpp   |    7 +-
 kokkos/core/src/impl/Kokkos_MemoryPool.cpp    |    4 +-
 .../src/impl/Kokkos_MemoryPoolAllocator.hpp   |   16 +-
 kokkos/core/src/impl/Kokkos_MemorySpace.hpp   |    4 +-
 kokkos/core/src/impl/Kokkos_Memory_Fence.hpp  |    6 +-
 .../src/impl/Kokkos_MultipleTaskQueue.hpp     |   54 +-
 kokkos/core/src/impl/Kokkos_OldMacros.hpp     |   14 +-
 kokkos/core/src/impl/Kokkos_OptionalRef.hpp   |   21 +-
 .../core/src/impl/Kokkos_PhysicalLayout.hpp   |    4 +-
 .../src/impl/Kokkos_Profiling_DeviceInfo.hpp  |   78 +-
 .../src/impl/Kokkos_Profiling_Interface.cpp   |   80 +-
 .../src/impl/Kokkos_Profiling_Interface.hpp   |  110 +-
 kokkos/core/src/impl/Kokkos_Serial.cpp        |    6 +-
 kokkos/core/src/impl/Kokkos_Serial_Task.cpp   |    4 +-
 kokkos/core/src/impl/Kokkos_Serial_Task.hpp   |    6 +-
 .../impl/Kokkos_Serial_WorkGraphPolicy.hpp    |    4 +-
 kokkos/core/src/impl/Kokkos_SharedAlloc.cpp   |   17 +-
 kokkos/core/src/impl/Kokkos_SharedAlloc.hpp   |   13 +-
 .../src/impl/Kokkos_SimpleTaskScheduler.hpp   |   20 +-
 .../core/src/impl/Kokkos_SingleTaskQueue.hpp  |    6 +-
 kokkos/core/src/impl/Kokkos_Spinwait.cpp      |    4 +-
 kokkos/core/src/impl/Kokkos_Spinwait.hpp      |    4 +-
 kokkos/core/src/impl/Kokkos_Stacktrace.cpp    |    2 +-
 kokkos/core/src/impl/Kokkos_Tags.hpp          |    4 +-
 kokkos/core/src/impl/Kokkos_TaskBase.hpp      |   51 +-
 kokkos/core/src/impl/Kokkos_TaskNode.hpp      |   14 +-
 .../core/src/impl/Kokkos_TaskPolicyData.hpp   |   26 +-
 kokkos/core/src/impl/Kokkos_TaskQueue.hpp     |    8 +-
 .../core/src/impl/Kokkos_TaskQueueCommon.hpp  |   27 +-
 .../impl/Kokkos_TaskQueueMemoryManager.hpp    |    4 +-
 .../src/impl/Kokkos_TaskQueueMultiple.hpp     |    4 +-
 .../impl/Kokkos_TaskQueueMultiple_impl.hpp    |    4 +-
 .../core/src/impl/Kokkos_TaskQueue_impl.hpp   |   26 +-
 kokkos/core/src/impl/Kokkos_TaskResult.hpp    |   12 +-
 .../core/src/impl/Kokkos_TaskTeamMember.hpp   |   16 +-
 kokkos/core/src/impl/Kokkos_Timer.hpp         |    4 +-
 kokkos/core/src/impl/Kokkos_Traits.hpp        |  209 +-
 kokkos/core/src/impl/Kokkos_Utilities.hpp     |    4 +-
 kokkos/core/src/impl/Kokkos_VLAEmulation.hpp  |    6 +-
 kokkos/core/src/impl/Kokkos_ViewArray.hpp     |    9 +-
 kokkos/core/src/impl/Kokkos_ViewCtor.hpp      |    9 +-
 .../src/impl/Kokkos_ViewFillCopyETIAvail.hpp  |    4 +-
 .../src/impl/Kokkos_ViewFillCopyETIDecl.hpp   |    4 +-
 .../core/src/impl/Kokkos_ViewLayoutTiled.hpp  |   41 +-
 kokkos/core/src/impl/Kokkos_ViewMapping.hpp   |   69 +-
 kokkos/core/src/impl/Kokkos_ViewTile.hpp      |   24 +-
 .../core/src/impl/Kokkos_ViewUniformType.hpp  |    4 +-
 kokkos/core/src/impl/Kokkos_Volatile_Load.hpp |    4 +-
 kokkos/core/src/impl/Kokkos_hwloc.cpp         |    4 +-
 kokkos/core/src/kokkos.pc.in                  |   71 -
 kokkos/core/unit_test/CMakeLists.txt          |  234 +-
 kokkos/core/unit_test/IncrementalTest.cpp.in  |   58 +
 kokkos/core/unit_test/Makefile                |   66 +-
 kokkos/core/unit_test/TestAggregate.hpp       |    4 +-
 kokkos/core/unit_test/TestAtomic.hpp          |   32 +-
 .../core/unit_test/TestAtomicOperations.hpp   |    4 +-
 .../TestAtomicOperations_complexdouble.hpp    |    4 +-
 .../TestAtomicOperations_complexfloat.hpp     |    4 +-
 .../unit_test/TestAtomicOperations_double.hpp |    4 +-
 .../unit_test/TestAtomicOperations_float.hpp  |    4 +-
 .../unit_test/TestAtomicOperations_int.hpp    |    4 +-
 .../TestAtomicOperations_longint.hpp          |    4 +-
 .../TestAtomicOperations_longlongint.hpp      |    4 +-
 .../TestAtomicOperations_unsignedint.hpp      |    4 +-
 .../TestAtomicOperations_unsignedlongint.hpp  |    4 +-
 kokkos/core/unit_test/TestAtomicViews.hpp     |  296 +-
 kokkos/core/unit_test/TestCTestDevice.cpp     |  138 +
 kokkos/core/unit_test/TestCXX11.hpp           |    5 +-
 kokkos/core/unit_test/TestCXX11Deduction.hpp  |    4 +-
 kokkos/core/unit_test/TestCompilerMacros.hpp  |    9 +-
 kokkos/core/unit_test/TestComplex.hpp         |   56 +-
 kokkos/core/unit_test/TestConcepts.hpp        |   81 +
 .../core/unit_test/TestConcurrentBitset.hpp   |    4 +-
 kokkos/core/unit_test/TestCrs.hpp             |   14 +-
 kokkos/core/unit_test/TestDeepCopy.hpp        |  145 +
 .../unit_test/TestDefaultDeviceTypeInit.hpp   |    4 +-
 kokkos/core/unit_test/TestFunctorAnalysis.hpp |    4 +-
 kokkos/core/unit_test/TestHWLOC.cpp           |    4 +-
 kokkos/core/unit_test/TestInit.hpp            |    4 +-
 kokkos/core/unit_test/TestLocalDeepCopy.hpp   |   75 +-
 kokkos/core/unit_test/TestMDRange.hpp         |   54 +-
 kokkos/core/unit_test/TestMDRange_a.hpp       |    4 +-
 kokkos/core/unit_test/TestMDRange_b.hpp       |    4 +-
 kokkos/core/unit_test/TestMDRange_c.hpp       |    4 +-
 kokkos/core/unit_test/TestMDRange_d.hpp       |    4 +-
 kokkos/core/unit_test/TestMDRange_e.hpp       |    4 +-
 kokkos/core/unit_test/TestMemoryPool.hpp      |   18 +-
 .../core/unit_test/TestPolicyConstruction.hpp |    4 +-
 kokkos/core/unit_test/TestRange.hpp           |   62 +-
 kokkos/core/unit_test/TestRangeRequire.hpp    |  518 +++
 kokkos/core/unit_test/TestReduce.hpp          |   71 +-
 .../unit_test/TestReduceCombinatorical.hpp    |    8 +-
 kokkos/core/unit_test/TestReducers.hpp        |    4 +-
 kokkos/core/unit_test/TestReducers_a.hpp      |    4 +-
 kokkos/core/unit_test/TestReducers_b.hpp      |    4 +-
 kokkos/core/unit_test/TestReducers_c.hpp      |    4 +-
 kokkos/core/unit_test/TestReducers_d.hpp      |    4 +-
 kokkos/core/unit_test/TestResize.hpp          |   20 +-
 kokkos/core/unit_test/TestScan.hpp            |   16 +-
 kokkos/core/unit_test/TestSharedAlloc.hpp     |    8 +-
 kokkos/core/unit_test/TestStackTrace.cpp      |    4 +-
 kokkos/core/unit_test/TestStackTrace.hpp      |    4 +-
 kokkos/core/unit_test/TestStackTrace_f0.cpp   |    4 +-
 kokkos/core/unit_test/TestStackTrace_f1.cpp   |    4 +-
 kokkos/core/unit_test/TestStackTrace_f2.cpp   |    4 +-
 kokkos/core/unit_test/TestStackTrace_f3.cpp   |    4 +-
 kokkos/core/unit_test/TestStackTrace_f4.cpp   |    4 +-
 kokkos/core/unit_test/TestTaskScheduler.hpp   |    7 +-
 .../unit_test/TestTaskScheduler_single.hpp    |    4 +-
 kokkos/core/unit_test/TestTeam.hpp            |  316 +-
 kokkos/core/unit_test/TestTeamTeamSize.hpp    |   10 +-
 kokkos/core/unit_test/TestTeamVector.hpp      |   11 +-
 kokkos/core/unit_test/TestTeamVectorRange.hpp |    6 +-
 .../unit_test/TestTemplateMetaFunctions.hpp   |   12 +-
 kokkos/core/unit_test/TestTile.hpp            |    4 +-
 kokkos/core/unit_test/TestUniqueToken.hpp     |    4 +-
 kokkos/core/unit_test/TestUtilities.hpp       |    4 +-
 kokkos/core/unit_test/TestViewAPI.hpp         |   72 +-
 kokkos/core/unit_test/TestViewAPI_a.hpp       |    4 +-
 kokkos/core/unit_test/TestViewAPI_b.hpp       |    4 +-
 kokkos/core/unit_test/TestViewAPI_c.hpp       |    4 +-
 kokkos/core/unit_test/TestViewAPI_d.hpp       |    4 +-
 kokkos/core/unit_test/TestViewAPI_e.hpp       |   16 +-
 kokkos/core/unit_test/TestViewCopy.hpp        |  532 ++-
 .../unit_test/TestViewCtorPropEmbeddedDim.hpp |    6 +-
 .../core/unit_test/TestViewIsAssignable.hpp   |  145 +
 .../TestViewLayoutStrideAssignment.hpp        |   12 +-
 kokkos/core/unit_test/TestViewLayoutTiled.hpp |   24 +-
 kokkos/core/unit_test/TestViewMapping_a.hpp   |   51 +-
 kokkos/core/unit_test/TestViewMapping_b.hpp   |    4 +-
 .../unit_test/TestViewMapping_subview.hpp     |    4 +-
 kokkos/core/unit_test/TestViewOfClass.hpp     |    4 +-
 kokkos/core/unit_test/TestViewResize.hpp      |    4 +-
 kokkos/core/unit_test/TestViewSpaceAssign.hpp |    4 +-
 kokkos/core/unit_test/TestViewSubview.hpp     |    4 +-
 kokkos/core/unit_test/TestView_64bit.hpp      |    6 +-
 kokkos/core/unit_test/TestWorkGraph.hpp       |    6 +-
 kokkos/core/unit_test/UnitTestConfig.make     |    2 +-
 kokkos/core/unit_test/UnitTestMain.cpp        |    4 +-
 kokkos/core/unit_test/UnitTestMainInit.cpp    |    4 +-
 .../unit_test/UnitTest_PushFinalizeHook.cpp   |    4 +-
 .../UnitTest_PushFinalizeHook_terminate.cpp   |    4 +-
 .../unit_test/config/cmaketest/CMakeLists.txt |   12 +-
 .../AMDAVX_Qthreads_KokkosCore_config.h       |   17 -
 ...RMv8-ThunderX_Qthreads_KokkosCore_config.h |   18 -
 .../ARMv80_Qthreads_KokkosCore_config.h       |   17 -
 .../ARMv81_Qthreads_KokkosCore_config.h       |   17 -
 .../results/BDW_Qthreads_KokkosCore_config.h  |   23 -
 .../results/BGQ_Qthreads_KokkosCore_config.h  |   16 -
 .../results/HSW_Qthreads_KokkosCore_config.h  |   20 -
 .../results/KNC_Qthreads_KokkosCore_config.h  |   20 -
 .../results/KNL_Qthreads_KokkosCore_config.h  |   20 -
 .../Kepler30_Qthreads_KokkosCore_config.h     |   16 -
 .../Kepler32_Qthreads_KokkosCore_config.h     |   16 -
 .../Kepler35_Qthreads_KokkosCore_config.h     |   16 -
 .../Kepler37_Qthreads_KokkosCore_config.h     |   16 -
 .../Kepler_Qthreads_KokkosCore_config.h       |   16 -
 .../Maxwell50_Qthreads_KokkosCore_config.h    |   16 -
 .../Maxwell52_Qthreads_KokkosCore_config.h    |   16 -
 .../Maxwell53_Qthreads_KokkosCore_config.h    |   16 -
 .../Maxwell_Qthreads_KokkosCore_config.h      |   16 -
 .../results/None_Qthreads_KokkosCore_config.h |   16 -
 .../Pascal60_Qthreads_KokkosCore_config.h     |   16 -
 .../Pascal61_Qthreads_KokkosCore_config.h     |   16 -
 .../Power7_Qthreads_KokkosCore_config.h       |   20 -
 .../Power8_Qthreads_KokkosCore_config.h       |   20 -
 .../Power9_Qthreads_KokkosCore_config.h       |   20 -
 .../results/SKX_Qthreads_KokkosCore_config.h  |   23 -
 .../results/SNB_Qthreads_KokkosCore_config.h  |   20 -
 .../results/WSM_Qthreads_KokkosCore_config.h  |   20 -
 .../test-code/test_config_run.bash            |    2 +-
 .../cuda/TestCudaHostPinned_Category.hpp      |    4 +-
 .../cuda/TestCudaHostPinned_SharedAlloc.cpp   |    4 +-
 .../cuda/TestCudaHostPinned_ViewAPI_a.cpp     |    4 +-
 .../cuda/TestCudaHostPinned_ViewAPI_b.cpp     |    4 +-
 .../cuda/TestCudaHostPinned_ViewAPI_c.cpp     |    4 +-
 .../cuda/TestCudaHostPinned_ViewAPI_d.cpp     |    4 +-
 .../cuda/TestCudaHostPinned_ViewAPI_e.cpp     |    4 +-
 .../cuda/TestCudaHostPinned_ViewCopy.cpp      |    4 +-
 .../cuda/TestCudaHostPinned_ViewMapping_a.cpp |    4 +-
 .../cuda/TestCudaHostPinned_ViewMapping_b.cpp |    4 +-
 ...TestCudaHostPinned_ViewMapping_subview.cpp |    4 +-
 .../unit_test/cuda/TestCudaUVM_Category.hpp   |    4 +-
 .../cuda/TestCudaUVM_SharedAlloc.cpp          |    4 +-
 .../unit_test/cuda/TestCudaUVM_ViewAPI_a.cpp  |    4 +-
 .../unit_test/cuda/TestCudaUVM_ViewAPI_b.cpp  |    4 +-
 .../unit_test/cuda/TestCudaUVM_ViewAPI_c.cpp  |    4 +-
 .../unit_test/cuda/TestCudaUVM_ViewAPI_d.cpp  |    4 +-
 .../unit_test/cuda/TestCudaUVM_ViewAPI_e.cpp  |    4 +-
 .../unit_test/cuda/TestCudaUVM_ViewCopy.cpp   |    4 +-
 .../cuda/TestCudaUVM_ViewMapping_a.cpp        |    4 +-
 .../cuda/TestCudaUVM_ViewMapping_b.cpp        |    4 +-
 .../cuda/TestCudaUVM_ViewMapping_subview.cpp  |    4 +-
 ...estCuda_AtomicOperations_complexdouble.cpp |    4 +-
 ...TestCuda_AtomicOperations_complexfloat.cpp |    4 +-
 .../cuda/TestCuda_AtomicOperations_double.cpp |    4 +-
 .../cuda/TestCuda_AtomicOperations_float.cpp  |    4 +-
 .../cuda/TestCuda_AtomicOperations_int.cpp    |    4 +-
 .../TestCuda_AtomicOperations_longint.cpp     |    4 +-
 .../TestCuda_AtomicOperations_longlongint.cpp |    4 +-
 .../TestCuda_AtomicOperations_unsignedint.cpp |    4 +-
 ...tCuda_AtomicOperations_unsignedlongint.cpp |    4 +-
 .../unit_test/cuda/TestCuda_AtomicViews.cpp   |    4 +-
 .../core/unit_test/cuda/TestCuda_Atomics.cpp  |    4 +-
 .../core/unit_test/cuda/TestCuda_Category.hpp |    4 +-
 .../core/unit_test/cuda/TestCuda_Complex.cpp  |    4 +-
 .../unit_test/cuda/TestCuda_Concepts.cpp}     |    7 +-
 kokkos/core/unit_test/cuda/TestCuda_Crs.cpp   |    4 +-
 .../cuda/TestCuda_DebugPinUVMSpace.cpp        |    4 +-
 .../cuda/TestCuda_DebugSerialExecution.cpp    |    4 +-
 .../cuda/TestCuda_DeepCopyAlignment.cpp       |    6 +-
 .../cuda/TestCuda_FunctorAnalysis.cpp         |    4 +-
 kokkos/core/unit_test/cuda/TestCuda_Init.cpp  |    4 +-
 .../unit_test/cuda/TestCuda_InterOp_Init.cpp  |    4 +-
 .../cuda/TestCuda_InterOp_Streams.cpp         |    4 +-
 .../unit_test/cuda/TestCuda_LocalDeepCopy.cpp |    4 +-
 .../unit_test/cuda/TestCuda_MDRange_a.cpp     |    4 +-
 .../unit_test/cuda/TestCuda_MDRange_b.cpp     |    4 +-
 .../unit_test/cuda/TestCuda_MDRange_c.cpp     |    4 +-
 .../unit_test/cuda/TestCuda_MDRange_d.cpp     |    4 +-
 .../unit_test/cuda/TestCuda_MDRange_e.cpp     |    4 +-
 kokkos/core/unit_test/cuda/TestCuda_Other.cpp |    4 +-
 .../unit_test/cuda/TestCuda_RangePolicy.cpp   |    4 +-
 .../cuda/TestCuda_RangePolicyRequire.cpp}     |    6 +-
 .../unit_test/cuda/TestCuda_Reducers_a.cpp    |    4 +-
 .../unit_test/cuda/TestCuda_Reducers_b.cpp    |    4 +-
 .../unit_test/cuda/TestCuda_Reducers_c.cpp    |    4 +-
 .../unit_test/cuda/TestCuda_Reducers_d.cpp    |    4 +-
 .../unit_test/cuda/TestCuda_Reductions.cpp    |    4 +-
 .../cuda/TestCuda_Reductions_DeviceView.cpp   |    4 +-
 kokkos/core/unit_test/cuda/TestCuda_Scan.cpp  |    4 +-
 .../unit_test/cuda/TestCuda_SharedAlloc.cpp   |    4 +-
 .../core/unit_test/cuda/TestCuda_Spaces.cpp   |   71 +-
 .../unit_test/cuda/TestCuda_SubView_a.cpp     |    4 +-
 .../unit_test/cuda/TestCuda_SubView_b.cpp     |    4 +-
 .../unit_test/cuda/TestCuda_SubView_c01.cpp   |    4 +-
 .../unit_test/cuda/TestCuda_SubView_c02.cpp   |    4 +-
 .../unit_test/cuda/TestCuda_SubView_c03.cpp   |    4 +-
 .../unit_test/cuda/TestCuda_SubView_c04.cpp   |    4 +-
 .../unit_test/cuda/TestCuda_SubView_c05.cpp   |    4 +-
 .../unit_test/cuda/TestCuda_SubView_c06.cpp   |    4 +-
 .../unit_test/cuda/TestCuda_SubView_c07.cpp   |    4 +-
 .../unit_test/cuda/TestCuda_SubView_c08.cpp   |    4 +-
 .../unit_test/cuda/TestCuda_SubView_c09.cpp   |    4 +-
 .../unit_test/cuda/TestCuda_SubView_c10.cpp   |    4 +-
 .../unit_test/cuda/TestCuda_SubView_c11.cpp   |    4 +-
 .../unit_test/cuda/TestCuda_SubView_c12.cpp   |    4 +-
 .../unit_test/cuda/TestCuda_SubView_c13.cpp   |    4 +-
 kokkos/core/unit_test/cuda/TestCuda_Task.cpp  |    4 +-
 kokkos/core/unit_test/cuda/TestCuda_Team.cpp  |  118 +-
 .../cuda/TestCuda_TeamReductionScan.cpp       |    4 +-
 .../unit_test/cuda/TestCuda_TeamScratch.cpp   |    6 +-
 .../unit_test/cuda/TestCuda_TeamTeamSize.cpp  |    4 +-
 .../cuda/TestCuda_TeamVectorRange.cpp         |    4 +-
 .../unit_test/cuda/TestCuda_UniqueToken.cpp   |    4 +-
 .../unit_test/cuda/TestCuda_ViewAPI_a.cpp     |    4 +-
 .../unit_test/cuda/TestCuda_ViewAPI_b.cpp     |    4 +-
 .../unit_test/cuda/TestCuda_ViewAPI_c.cpp     |    4 +-
 .../unit_test/cuda/TestCuda_ViewAPI_d.cpp     |    4 +-
 .../unit_test/cuda/TestCuda_ViewAPI_e.cpp     |    5 +-
 .../TestCuda_ViewLayoutStrideAssignment.cpp   |    4 +-
 .../unit_test/cuda/TestCuda_ViewMapping_a.cpp |    4 +-
 .../unit_test/cuda/TestCuda_ViewMapping_b.cpp |    4 +-
 .../cuda/TestCuda_ViewMapping_subview.cpp     |    4 +-
 .../unit_test/cuda/TestCuda_ViewOfClass.cpp   |    4 +-
 .../unit_test/cuda/TestCuda_ViewResize.cpp    |    4 +-
 .../unit_test/cuda/TestCuda_View_64bit.cpp    |    4 +-
 .../unit_test/cuda/TestCuda_WorkGraph.cpp     |    4 +-
 .../default/TestDefaultDeviceType.cpp         |    4 +-
 .../default/TestDefaultDeviceTypeResize.cpp   |    4 +-
 .../TestDefaultDeviceType_Category.hpp        |    4 +-
 .../default/TestDefaultDeviceType_a1.cpp      |    4 +-
 .../default/TestDefaultDeviceType_a2.cpp      |    4 +-
 .../default/TestDefaultDeviceType_a3.cpp      |    4 +-
 .../default/TestDefaultDeviceType_b1.cpp      |    4 +-
 .../default/TestDefaultDeviceType_b2.cpp      |    4 +-
 .../default/TestDefaultDeviceType_b3.cpp      |    4 +-
 .../default/TestDefaultDeviceType_c1.cpp      |    4 +-
 .../default/TestDefaultDeviceType_c2.cpp      |    4 +-
 .../default/TestDefaultDeviceType_c3.cpp      |    4 +-
 .../default/TestDefaultDeviceType_d.cpp       |    6 +-
 .../TestHIPHostPinned_Category.hpp}           |   13 +-
 .../TestHIPHostPinned_SharedAlloc.cpp}        |   13 +-
 .../TestHIPHostPinned_ViewAPI_a.cpp}          |    6 +-
 .../TestHIPHostPinned_ViewAPI_b.cpp}          |    6 +-
 .../TestHIPHostPinned_ViewAPI_c.cpp}          |    6 +-
 .../TestHIPHostPinned_ViewAPI_d.cpp}          |    6 +-
 .../TestHIPHostPinned_ViewAPI_e.cpp}          |    6 +-
 .../hip/TestHIPHostPinned_ViewCopy.cpp        |   46 +
 .../hip/TestHIPHostPinned_ViewMapping_a.cpp   |   46 +
 .../hip/TestHIPHostPinned_ViewMapping_b.cpp   |   46 +
 .../TestHIPHostPinned_ViewMapping_subview.cpp |   46 +
 ...estHIP_AtomicOperations_complexdouble.cpp} |    6 +-
 ...TestHIP_AtomicOperations_complexfloat.cpp} |    6 +-
 .../TestHIP_AtomicOperations_double.cpp}      |    6 +-
 .../TestHIP_AtomicOperations_float.cpp}       |    6 +-
 .../TestHIP_AtomicOperations_int.cpp}         |    6 +-
 .../TestHIP_AtomicOperations_longint.cpp}     |    6 +-
 .../TestHIP_AtomicOperations_longlongint.cpp} |    6 +-
 .../TestHIP_AtomicOperations_unsignedint.cpp} |    6 +-
 ...tHIP_AtomicOperations_unsignedlongint.cpp} |    6 +-
 .../unit_test/hip/TestHIP_AtomicViews.cpp}    |    8 +-
 kokkos/core/unit_test/hip/TestHIP_Atomics.cpp |   46 +
 .../unit_test/hip/TestHIP_Category.hpp}       |   14 +-
 kokkos/core/unit_test/hip/TestHIP_Complex.cpp |   47 +
 .../core/unit_test/hip/TestHIP_Concepts.cpp   |   46 +
 kokkos/core/unit_test/hip/TestHIP_Crs.cpp     |   46 +
 .../TestHIP_DeepCopyAlignment.cpp}            |    6 +-
 .../unit_test/hip/TestHIP_FunctorAnalysis.cpp |   47 +
 .../unit_test/hip/TestHIP_Init.cpp}           |   10 +-
 .../unit_test/hip/TestHIP_InterOp_Init.cpp    |   85 +
 .../unit_test/hip/TestHIP_LocalDeepCopy.cpp   |   46 +
 .../TestHIP_MDRange_a.cpp}                    |    6 +-
 .../TestHIP_MDRange_b.cpp}                    |    6 +-
 .../TestHIP_MDRange_c.cpp}                    |    6 +-
 .../TestHIP_MDRange_d.cpp}                    |    6 +-
 .../TestHIP_MDRange_e.cpp}                    |    6 +-
 .../unit_test/hip/TestHIP_RangePolicy.cpp     |   47 +
 .../hip/TestHIP_RangePolicyRequire.cpp        |   47 +
 .../core/unit_test/hip/TestHIP_Reducers_a.cpp |   46 +
 .../core/unit_test/hip/TestHIP_Reducers_b.cpp |   46 +
 .../core/unit_test/hip/TestHIP_Reducers_c.cpp |   46 +
 .../core/unit_test/hip/TestHIP_Reducers_d.cpp |   46 +
 .../unit_test/hip/TestHIP_Reductions.cpp}     |   10 +-
 kokkos/core/unit_test/hip/TestHIP_Scan.cpp    |   47 +
 .../core/unit_test/hip/TestHIP_ScanUnit.cpp   |   97 +
 .../unit_test/hip/TestHIP_SharedAlloc.cpp     |   55 +
 kokkos/core/unit_test/hip/TestHIP_Spaces.cpp  |  233 ++
 .../TestHIP_SubView_a.cpp}                    |   81 +-
 .../core/unit_test/hip/TestHIP_SubView_b.cpp  |   66 +
 .../TestHIP_SubView_c01.cpp}                  |   13 +-
 .../unit_test/hip/TestHIP_SubView_c02.cpp     |   55 +
 .../TestHIP_SubView_c03.cpp}                  |   14 +-
 .../TestHIP_SubView_c04.cpp}                  |   13 +-
 .../unit_test/hip/TestHIP_SubView_c05.cpp     |   55 +
 .../unit_test/hip/TestHIP_SubView_c06.cpp     |   55 +
 .../TestHIP_SubView_c07.cpp}                  |   13 +-
 .../TestHIP_SubView_c08.cpp}                  |   14 +-
 .../unit_test/hip/TestHIP_SubView_c09.cpp     |   55 +
 .../unit_test/hip/TestHIP_SubView_c10.cpp     |   54 +
 .../unit_test/hip/TestHIP_SubView_c11.cpp     |   55 +
 .../unit_test/hip/TestHIP_SubView_c12.cpp     |   55 +
 .../unit_test/hip/TestHIP_SubView_c13.cpp     |   54 +
 .../core/unit_test/hip/TestHIP_ViewAPI_c.cpp  |   46 +
 .../core/unit_test/hip/TestHIP_ViewAPI_d.cpp  |   46 +
 .../unit_test/hip/TestHIP_ViewMapping_a.cpp   |   46 +
 .../unit_test/hip/TestHIP_ViewMapping_b.cpp   |   46 +
 .../hip/TestHIP_ViewMapping_subview.cpp       |   46 +
 .../unit_test/hip/TestHIP_ViewOfClass.cpp     |   46 +
 .../core/unit_test/hip/TestHIP_ViewResize.cpp |   46 +
 .../core/unit_test/hip/TestHIP_View_64bit.cpp |   46 +
 ...TestHPX_AtomicOperations_complexdouble.cpp |    4 +-
 .../TestHPX_AtomicOperations_complexfloat.cpp |    4 +-
 .../hpx/TestHPX_AtomicOperations_double.cpp   |    4 +-
 .../hpx/TestHPX_AtomicOperations_float.cpp    |    4 +-
 .../hpx/TestHPX_AtomicOperations_int.cpp      |    4 +-
 .../hpx/TestHPX_AtomicOperations_longint.cpp  |    4 +-
 .../TestHPX_AtomicOperations_longlongint.cpp  |    4 +-
 .../TestHPX_AtomicOperations_unsignedint.cpp  |    4 +-
 ...stHPX_AtomicOperations_unsignedlongint.cpp |    4 +-
 .../unit_test/hpx/TestHPX_AtomicViews.cpp     |    4 +-
 kokkos/core/unit_test/hpx/TestHPX_Atomics.cpp |    4 +-
 .../core/unit_test/hpx/TestHPX_Category.hpp   |    4 +-
 kokkos/core/unit_test/hpx/TestHPX_Complex.cpp |    4 +-
 .../unit_test/hpx/TestHPX_Concepts.cpp}       |    7 +-
 kokkos/core/unit_test/hpx/TestHPX_Crs.cpp     |    4 +-
 .../hpx/TestHPX_DeepCopyAlignment.cpp         |    4 +-
 .../unit_test/hpx/TestHPX_FunctorAnalysis.cpp |    4 +-
 kokkos/core/unit_test/hpx/TestHPX_Init.cpp    |    4 +-
 kokkos/core/unit_test/hpx/TestHPX_InterOp.cpp |    4 +-
 .../unit_test/hpx/TestHPX_LocalDeepCopy.cpp   |    4 +-
 .../core/unit_test/hpx/TestHPX_MDRange_a.cpp  |    4 +-
 .../core/unit_test/hpx/TestHPX_MDRange_b.cpp  |    4 +-
 .../core/unit_test/hpx/TestHPX_MDRange_c.cpp  |    4 +-
 .../core/unit_test/hpx/TestHPX_MDRange_d.cpp  |    4 +-
 .../core/unit_test/hpx/TestHPX_MDRange_e.cpp  |    4 +-
 kokkos/core/unit_test/hpx/TestHPX_Other.cpp   |    4 +-
 .../unit_test/hpx/TestHPX_RangePolicy.cpp     |    4 +-
 .../hpx/TestHPX_RangePolicyRequire.cpp}       |    6 +-
 .../core/unit_test/hpx/TestHPX_Reducers_a.cpp |    4 +-
 .../core/unit_test/hpx/TestHPX_Reducers_b.cpp |    4 +-
 .../core/unit_test/hpx/TestHPX_Reducers_c.cpp |    4 +-
 .../core/unit_test/hpx/TestHPX_Reducers_d.cpp |    4 +-
 .../core/unit_test/hpx/TestHPX_Reductions.cpp |    4 +-
 .../hpx/TestHPX_Reductions_DeviceView.cpp     |    4 +-
 kokkos/core/unit_test/hpx/TestHPX_Scan.cpp    |    4 +-
 .../unit_test/hpx/TestHPX_SharedAlloc.cpp     |    4 +-
 .../core/unit_test/hpx/TestHPX_SubView_a.cpp  |    4 +-
 .../core/unit_test/hpx/TestHPX_SubView_b.cpp  |    4 +-
 .../unit_test/hpx/TestHPX_SubView_c01.cpp     |    4 +-
 .../unit_test/hpx/TestHPX_SubView_c02.cpp     |    4 +-
 .../unit_test/hpx/TestHPX_SubView_c03.cpp     |    4 +-
 .../unit_test/hpx/TestHPX_SubView_c04.cpp     |    4 +-
 .../unit_test/hpx/TestHPX_SubView_c05.cpp     |    4 +-
 .../unit_test/hpx/TestHPX_SubView_c06.cpp     |    4 +-
 .../unit_test/hpx/TestHPX_SubView_c07.cpp     |    4 +-
 .../unit_test/hpx/TestHPX_SubView_c08.cpp     |    4 +-
 .../unit_test/hpx/TestHPX_SubView_c09.cpp     |    4 +-
 .../unit_test/hpx/TestHPX_SubView_c10.cpp     |    4 +-
 .../unit_test/hpx/TestHPX_SubView_c11.cpp     |    4 +-
 .../unit_test/hpx/TestHPX_SubView_c12.cpp     |    4 +-
 .../unit_test/hpx/TestHPX_SubView_c13.cpp     |    4 +-
 kokkos/core/unit_test/hpx/TestHPX_Task.cpp    |    4 +-
 kokkos/core/unit_test/hpx/TestHPX_Team.cpp    |    4 +-
 .../hpx/TestHPX_TeamReductionScan.cpp         |    4 +-
 .../unit_test/hpx/TestHPX_TeamScratch.cpp     |    6 +-
 .../unit_test/hpx/TestHPX_TeamTeamSize.cpp    |    4 +-
 .../unit_test/hpx/TestHPX_TeamVectorRange.cpp |    4 +-
 .../unit_test/hpx/TestHPX_UniqueToken.cpp     |    4 +-
 .../core/unit_test/hpx/TestHPX_ViewAPI_a.cpp  |    4 +-
 .../core/unit_test/hpx/TestHPX_ViewAPI_b.cpp  |    4 +-
 .../core/unit_test/hpx/TestHPX_ViewAPI_c.cpp  |    4 +-
 .../core/unit_test/hpx/TestHPX_ViewAPI_d.cpp  |    4 +-
 .../core/unit_test/hpx/TestHPX_ViewAPI_e.cpp  |    4 +-
 .../TestHPX_ViewLayoutStrideAssignment.cpp    |    4 +-
 .../unit_test/hpx/TestHPX_ViewMapping_a.cpp   |    4 +-
 .../unit_test/hpx/TestHPX_ViewMapping_b.cpp   |    4 +-
 .../hpx/TestHPX_ViewMapping_subview.cpp       |    4 +-
 .../unit_test/hpx/TestHPX_ViewOfClass.cpp     |    4 +-
 .../core/unit_test/hpx/TestHPX_ViewResize.cpp |    4 +-
 .../core/unit_test/hpx/TestHPX_View_64bit.cpp |    4 +-
 .../core/unit_test/hpx/TestHPX_WorkGraph.cpp  |    4 +-
 .../incremental/Test01_execspace.hpp          |  111 +
 .../incremental/Test02_atomic_host.hpp        |   97 +
 .../Test03a_MemorySpace_malloc.hpp}           |   47 +-
 .../incremental/Test03b_MemorySpace_free.hpp  |   83 +
 .../Test04_ParallelFor_RangePolicy.hpp        |  169 +
 .../Test05_ParallelReduce_RangePolicy.hpp     |  154 +
 .../Test06_ParallelFor_MDRangePolicy.hpp      |  263 ++
 .../incremental/Test08_deep_copy.hpp          |  207 ++
 .../incremental/Test10_HierarchicalBasics.hpp |  101 +
 .../Test11a_ParallelFor_TeamThreadRange.hpp   |   99 +
 .../Test11b_ParallelFor_TeamVectorRange.hpp   |   99 +
 .../Test11c_ParallelFor_ThreadVectorRange.hpp |  105 +
 .../incremental/Test12a_ThreadScratch.hpp     |  125 +
 .../incremental/Test12b_TeamScratch.hpp       |  113 +
 .../Test13a_ParallelRed_TeamThreadRange.hpp   |  105 +
 .../Test13b_ParallelRed_TeamVectorRange.hpp}  |   97 +-
 .../Test13c_ParallelRed_ThreadVectorRange.hpp |  112 +
 kokkos/core/unit_test/openmp/TestOpenMP.hpp   |    4 +-
 ...tOpenMP_AtomicOperations_complexdouble.cpp |    4 +-
 ...stOpenMP_AtomicOperations_complexfloat.cpp |    4 +-
 .../TestOpenMP_AtomicOperations_double.cpp    |    4 +-
 .../TestOpenMP_AtomicOperations_float.cpp     |    4 +-
 .../TestOpenMP_AtomicOperations_int.cpp       |    4 +-
 .../TestOpenMP_AtomicOperations_longint.cpp   |    4 +-
 ...estOpenMP_AtomicOperations_longlongint.cpp |    4 +-
 ...estOpenMP_AtomicOperations_unsignedint.cpp |    4 +-
 ...penMP_AtomicOperations_unsignedlongint.cpp |    4 +-
 .../openmp/TestOpenMP_AtomicViews.cpp         |    4 +-
 .../unit_test/openmp/TestOpenMP_Atomics.cpp   |    4 +-
 .../unit_test/openmp/TestOpenMP_Category.hpp  |    4 +-
 .../unit_test/openmp/TestOpenMP_Complex.cpp   |    4 +-
 .../unit_test/openmp/TestOpenMP_Concepts.cpp} |    7 +-
 .../core/unit_test/openmp/TestOpenMP_Crs.cpp  |    4 +-
 .../openmp/TestOpenMP_DeepCopyAlignment.cpp   |    4 +-
 .../openmp/TestOpenMP_FunctorAnalysis.cpp     |    4 +-
 .../core/unit_test/openmp/TestOpenMP_Init.cpp |    4 +-
 .../unit_test/openmp/TestOpenMP_InterOp.cpp   |    4 +-
 .../openmp/TestOpenMP_LocalDeepCopy.cpp       |    4 +-
 .../unit_test/openmp/TestOpenMP_MDRange_a.cpp |    4 +-
 .../unit_test/openmp/TestOpenMP_MDRange_b.cpp |    4 +-
 .../unit_test/openmp/TestOpenMP_MDRange_c.cpp |    4 +-
 .../unit_test/openmp/TestOpenMP_MDRange_d.cpp |    4 +-
 .../unit_test/openmp/TestOpenMP_MDRange_e.cpp |    4 +-
 .../unit_test/openmp/TestOpenMP_Other.cpp     |    6 +-
 .../openmp/TestOpenMP_RangePolicy.cpp         |    4 +-
 .../openmp/TestOpenMP_RangePolicyRequire.cpp} |    6 +-
 .../openmp/TestOpenMP_Reducers_a.cpp          |    4 +-
 .../openmp/TestOpenMP_Reducers_b.cpp          |    4 +-
 .../openmp/TestOpenMP_Reducers_c.cpp          |    4 +-
 .../openmp/TestOpenMP_Reducers_d.cpp          |    4 +-
 .../openmp/TestOpenMP_Reductions.cpp          |    4 +-
 .../TestOpenMP_Reductions_DeviceView.cpp      |    4 +-
 .../core/unit_test/openmp/TestOpenMP_Scan.cpp |    4 +-
 .../openmp/TestOpenMP_SharedAlloc.cpp         |    4 +-
 .../unit_test/openmp/TestOpenMP_SubView_a.cpp |    4 +-
 .../unit_test/openmp/TestOpenMP_SubView_b.cpp |    4 +-
 .../openmp/TestOpenMP_SubView_c01.cpp         |    4 +-
 .../openmp/TestOpenMP_SubView_c02.cpp         |    4 +-
 .../openmp/TestOpenMP_SubView_c03.cpp         |    4 +-
 .../openmp/TestOpenMP_SubView_c04.cpp         |    4 +-
 .../openmp/TestOpenMP_SubView_c05.cpp         |    4 +-
 .../openmp/TestOpenMP_SubView_c06.cpp         |    4 +-
 .../openmp/TestOpenMP_SubView_c07.cpp         |    4 +-
 .../openmp/TestOpenMP_SubView_c08.cpp         |    4 +-
 .../openmp/TestOpenMP_SubView_c09.cpp         |    4 +-
 .../openmp/TestOpenMP_SubView_c10.cpp         |    4 +-
 .../openmp/TestOpenMP_SubView_c11.cpp         |    4 +-
 .../openmp/TestOpenMP_SubView_c12.cpp         |    4 +-
 .../openmp/TestOpenMP_SubView_c13.cpp         |    4 +-
 .../core/unit_test/openmp/TestOpenMP_Task.cpp |    4 +-
 .../core/unit_test/openmp/TestOpenMP_Team.cpp |   36 +-
 .../openmp/TestOpenMP_TeamReductionScan.cpp   |    4 +-
 .../openmp/TestOpenMP_TeamScratch.cpp         |    6 +-
 .../openmp/TestOpenMP_TeamTeamSize.cpp        |    4 +-
 .../openmp/TestOpenMP_TeamVectorRange.cpp     |    4 +-
 .../openmp/TestOpenMP_UniqueToken.cpp         |    4 +-
 .../unit_test/openmp/TestOpenMP_ViewAPI_a.cpp |    4 +-
 .../unit_test/openmp/TestOpenMP_ViewAPI_b.cpp |    4 +-
 .../unit_test/openmp/TestOpenMP_ViewAPI_c.cpp |    4 +-
 .../unit_test/openmp/TestOpenMP_ViewAPI_d.cpp |    4 +-
 .../unit_test/openmp/TestOpenMP_ViewAPI_e.cpp |    4 +-
 .../TestOpenMP_ViewLayoutStrideAssignment.cpp |    4 +-
 .../openmp/TestOpenMP_ViewMapping_a.cpp       |    4 +-
 .../openmp/TestOpenMP_ViewMapping_b.cpp       |    4 +-
 .../openmp/TestOpenMP_ViewMapping_subview.cpp |    4 +-
 .../openmp/TestOpenMP_ViewOfClass.cpp         |    4 +-
 .../openmp/TestOpenMP_ViewResize.cpp          |    4 +-
 .../openmp/TestOpenMP_View_64bit.cpp          |    4 +-
 .../unit_test/openmp/TestOpenMP_WorkGraph.cpp |    4 +-
 .../openmptarget/TestOpenMPTarget.hpp         |    4 +-
 ...PTarget_AtomicOperations_complexdouble.cpp |    4 +-
 ...MPTarget_AtomicOperations_complexfloat.cpp |    4 +-
 ...stOpenMPTarget_AtomicOperations_double.cpp |    4 +-
 ...estOpenMPTarget_AtomicOperations_float.cpp |    4 +-
 .../TestOpenMPTarget_AtomicOperations_int.cpp |    4 +-
 ...tOpenMPTarget_AtomicOperations_longint.cpp |    4 +-
 ...nMPTarget_AtomicOperations_longlongint.cpp |    4 +-
 ...nMPTarget_AtomicOperations_unsignedint.cpp |    4 +-
 ...arget_AtomicOperations_unsignedlongint.cpp |    4 +-
 .../TestOpenMPTarget_AtomicViews.cpp          |    4 +-
 .../openmptarget/TestOpenMPTarget_Atomics.cpp |    4 +-
 .../TestOpenMPTarget_Category.hpp             |    4 +-
 .../openmptarget/TestOpenMPTarget_Complex.cpp |    4 +-
 .../TestOpenMPTarget_Concepts.cpp             |   46 +
 .../openmptarget/TestOpenMPTarget_Crs.cpp     |    0
 .../TestOpenMPTarget_DeepCopyAlignment.cpp    |    4 +-
 .../TestOpenMPTarget_FunctorAnalysis.cpp      |    0
 .../openmptarget/TestOpenMPTarget_Init.cpp    |    4 +-
 .../TestOpenMPTarget_LocalDeepCopy.cpp        |    0
 .../TestOpenMPTarget_MDRange_a.cpp            |    4 +-
 .../TestOpenMPTarget_MDRange_b.cpp            |    4 +-
 .../TestOpenMPTarget_MDRange_c.cpp            |    4 +-
 .../TestOpenMPTarget_MDRange_d.cpp            |    4 +-
 .../TestOpenMPTarget_MDRange_e.cpp            |    4 +-
 .../openmptarget/TestOpenMPTarget_Other.cpp   |    4 +-
 .../TestOpenMPTarget_RangePolicy.cpp          |    4 +-
 .../TestOpenMPTarget_RangePolicyRequire.cpp   |    0
 .../TestOpenMPTarget_Reducers_a.cpp           |    4 +-
 .../TestOpenMPTarget_Reducers_b.cpp           |    4 +-
 .../TestOpenMPTarget_Reducers_c.cpp           |    4 +-
 .../TestOpenMPTarget_Reducers_d.cpp           |    4 +-
 .../TestOpenMPTarget_Reductions.cpp           |    4 +-
 ...TestOpenMPTarget_Reductions_DeviceView.cpp |    0
 .../openmptarget/TestOpenMPTarget_Scan.cpp    |    4 +-
 .../TestOpenMPTarget_SharedAlloc.cpp          |    6 +-
 .../TestOpenMPTarget_SubView_a.cpp            |   28 +-
 .../TestOpenMPTarget_SubView_b.cpp            |    8 +-
 .../TestOpenMPTarget_SubView_c01.cpp          |    6 +-
 .../TestOpenMPTarget_SubView_c02.cpp          |    6 +-
 .../TestOpenMPTarget_SubView_c03.cpp          |    6 +-
 .../TestOpenMPTarget_SubView_c04.cpp          |    6 +-
 .../TestOpenMPTarget_SubView_c05.cpp          |    6 +-
 .../TestOpenMPTarget_SubView_c06.cpp          |    6 +-
 .../TestOpenMPTarget_SubView_c07.cpp          |    6 +-
 .../TestOpenMPTarget_SubView_c08.cpp          |    6 +-
 .../TestOpenMPTarget_SubView_c09.cpp          |    6 +-
 .../TestOpenMPTarget_SubView_c10.cpp          |    6 +-
 .../TestOpenMPTarget_SubView_c11.cpp          |    6 +-
 .../TestOpenMPTarget_SubView_c12.cpp          |    6 +-
 .../TestOpenMPTarget_SubView_c13.cpp          |    0
 .../openmptarget/TestOpenMPTarget_Team.cpp    |    8 +-
 .../TestOpenMPTarget_TeamReductionScan.cpp    |   10 +-
 .../TestOpenMPTarget_TeamScratch.cpp          |   14 +-
 .../TestOpenMPTarget_TeamTeamSize.cpp         |    0
 .../TestOpenMPTarget_TeamVectorRange.cpp      |    0
 .../TestOpenMPTarget_UniqueToken.cpp          |    0
 .../TestOpenMPTarget_ViewAPI_a.cpp            |    4 +-
 .../TestOpenMPTarget_ViewAPI_b.cpp            |    4 +-
 .../TestOpenMPTarget_ViewAPI_c.cpp            |    4 +-
 .../TestOpenMPTarget_ViewAPI_d.cpp            |    4 +-
 .../TestOpenMPTarget_ViewAPI_e.cpp            |    4 +-
 ...penMPTarget_ViewLayoutStrideAssignment.cpp |    0
 .../TestOpenMPTarget_ViewMapping_a.cpp        |    4 +-
 .../TestOpenMPTarget_ViewMapping_b.cpp        |    4 +-
 .../TestOpenMPTarget_ViewMapping_subview.cpp  |    4 +-
 .../TestOpenMPTarget_ViewOfClass.cpp          |    4 +-
 .../TestOpenMPTarget_ViewResize.cpp           |    0
 .../TestOpenMPTarget_View_64bit.cpp           |    0
 .../TestOpenMPTarget_WorkGraph.cpp            |    0
 .../qthreads/TestQthreads_Atomics.cpp         |  209 --
 .../qthreads/TestQthreads_Complex.cpp         |    2 -
 .../unit_test/qthreads/TestQthreads_Other.cpp |  196 -
 .../qthreads/TestQthreads_Reductions.cpp      |  157 -
 .../qthreads/TestQthreads_SubView_c05.cpp     |   55 -
 .../qthreads/TestQthreads_SubView_c06.cpp     |   55 -
 .../qthreads/TestQthreads_SubView_c08.cpp     |   55 -
 .../qthreads/TestQthreads_SubView_c09.cpp     |   55 -
 .../qthreads/TestQthreads_SubView_c11.cpp     |   55 -
 .../qthreads/TestQthreads_SubView_c12.cpp     |   55 -
 .../qthreads/TestQthreads_SubView_c13.cpp     |   55 -
 .../qthreads/TestQthreads_SubView_c_all.cpp   |   13 -
 .../unit_test/qthreads/TestQthreads_Team.cpp  |  136 -
 .../qthreads/TestQthreads_ViewAPI_a.cpp       |   56 -
 .../qthreads/TestQthreads_ViewAPI_b.cpp       |  132 -
 .../rocm/TestROCmHostPinned_Category.hpp      |    4 +-
 .../rocm/TestROCmHostPinned_SharedAlloc.cpp   |    4 +-
 .../rocm/TestROCmHostPinned_ViewAPI_a.cpp     |    4 +-
 .../rocm/TestROCmHostPinned_ViewAPI_b.cpp     |    4 +-
 .../rocm/TestROCmHostPinned_ViewAPI_c.cpp     |    4 +-
 .../rocm/TestROCmHostPinned_ViewAPI_d.cpp     |    4 +-
 .../rocm/TestROCmHostPinned_ViewAPI_e.cpp     |    4 +-
 .../rocm/TestROCmHostPinned_ViewCopy.cpp      |    4 +-
 .../rocm/TestROCmHostPinned_ViewMapping_a.cpp |    4 +-
 .../rocm/TestROCmHostPinned_ViewMapping_b.cpp |    4 +-
 ...TestROCmHostPinned_ViewMapping_subview.cpp |    4 +-
 .../rocm/TestROCmHostPinned_View_64bit.cpp    |    4 +-
 .../rocm/TestROCm_AtomicOperations_double.cpp |    4 +-
 .../rocm/TestROCm_AtomicOperations_float.cpp  |    4 +-
 .../rocm/TestROCm_AtomicOperations_int.cpp    |    4 +-
 .../TestROCm_AtomicOperations_longint.cpp     |    4 +-
 .../TestROCm_AtomicOperations_longlongint.cpp |    4 +-
 .../TestROCm_AtomicOperations_unsignedint.cpp |    4 +-
 ...tROCm_AtomicOperations_unsignedlongint.cpp |    4 +-
 .../unit_test/rocm/TestROCm_AtomicViews.cpp   |    4 +-
 .../core/unit_test/rocm/TestROCm_Atomics.cpp  |    4 +-
 .../core/unit_test/rocm/TestROCm_Category.hpp |    4 +-
 .../core/unit_test/rocm/TestROCm_Complex.cpp  |    4 +-
 kokkos/core/unit_test/rocm/TestROCm_Crs.cpp   |    4 +-
 .../rocm/TestROCm_DeepCopyAlignment.cpp       |    4 +-
 kokkos/core/unit_test/rocm/TestROCm_Init.cpp  |    4 +-
 .../rocm/TestROCm_MDRangeReduce_a.cpp         |    4 +-
 .../rocm/TestROCm_MDRangeReduce_b.cpp         |    4 +-
 .../rocm/TestROCm_MDRangeReduce_c.cpp         |    4 +-
 .../rocm/TestROCm_MDRangeReduce_d.cpp         |    4 +-
 .../rocm/TestROCm_MDRangeReduce_e.cpp         |    4 +-
 .../unit_test/rocm/TestROCm_MDRange_a.cpp     |    4 +-
 .../unit_test/rocm/TestROCm_MDRange_b.cpp     |    4 +-
 .../unit_test/rocm/TestROCm_MDRange_c.cpp     |    4 +-
 .../unit_test/rocm/TestROCm_MDRange_d.cpp     |    4 +-
 .../unit_test/rocm/TestROCm_MDRange_e.cpp     |    4 +-
 kokkos/core/unit_test/rocm/TestROCm_Other.cpp |    4 +-
 .../unit_test/rocm/TestROCm_RangePolicy.cpp   |    4 +-
 .../unit_test/rocm/TestROCm_Reducers_a.cpp    |    4 +-
 .../unit_test/rocm/TestROCm_Reducers_b.cpp    |    4 +-
 .../unit_test/rocm/TestROCm_Reducers_c.cpp    |    4 +-
 .../unit_test/rocm/TestROCm_Reducers_d.cpp    |    4 +-
 .../unit_test/rocm/TestROCm_Reductions.cpp    |    4 +-
 kokkos/core/unit_test/rocm/TestROCm_Scan.cpp  |    4 +-
 .../unit_test/rocm/TestROCm_SharedAlloc.cpp   |    4 +-
 .../core/unit_test/rocm/TestROCm_Spaces.cpp   |    4 +-
 .../unit_test/rocm/TestROCm_SubView_a.cpp     |    4 +-
 .../unit_test/rocm/TestROCm_SubView_b.cpp     |    4 +-
 .../unit_test/rocm/TestROCm_SubView_c01.cpp   |    4 +-
 .../unit_test/rocm/TestROCm_SubView_c02.cpp   |    4 +-
 .../unit_test/rocm/TestROCm_SubView_c03.cpp   |    4 +-
 .../unit_test/rocm/TestROCm_SubView_c04.cpp   |    4 +-
 .../unit_test/rocm/TestROCm_SubView_c05.cpp   |    4 +-
 .../unit_test/rocm/TestROCm_SubView_c06.cpp   |    4 +-
 .../unit_test/rocm/TestROCm_SubView_c07.cpp   |    4 +-
 .../unit_test/rocm/TestROCm_SubView_c08.cpp   |    4 +-
 .../unit_test/rocm/TestROCm_SubView_c09.cpp   |    4 +-
 .../unit_test/rocm/TestROCm_SubView_c10.cpp   |    4 +-
 .../unit_test/rocm/TestROCm_SubView_c11.cpp   |    4 +-
 .../unit_test/rocm/TestROCm_SubView_c12.cpp   |    4 +-
 .../unit_test/rocm/TestROCm_SubView_c13.cpp   |    4 +-
 kokkos/core/unit_test/rocm/TestROCm_Team.cpp  |    4 +-
 .../rocm/TestROCm_TeamReductionScan.cpp       |    4 +-
 .../unit_test/rocm/TestROCm_TeamScratch.cpp   |    4 +-
 .../unit_test/rocm/TestROCm_TeamTeamSize.cpp  |    4 +-
 .../unit_test/rocm/TestROCm_ViewAPI_a.cpp     |    4 +-
 .../unit_test/rocm/TestROCm_ViewAPI_b.cpp     |    4 +-
 .../unit_test/rocm/TestROCm_ViewAPI_c.cpp     |    4 +-
 .../unit_test/rocm/TestROCm_ViewAPI_d.cpp     |    4 +-
 .../unit_test/rocm/TestROCm_ViewAPI_e.cpp     |    4 +-
 .../unit_test/rocm/TestROCm_ViewMapping_a.cpp |    4 +-
 .../unit_test/rocm/TestROCm_ViewMapping_b.cpp |    4 +-
 .../rocm/TestROCm_ViewMapping_subview.cpp     |    4 +-
 .../unit_test/rocm/TestROCm_ViewOfClass.cpp   |    4 +-
 ...tSerial_AtomicOperations_complexdouble.cpp |    4 +-
 ...stSerial_AtomicOperations_complexfloat.cpp |    4 +-
 .../TestSerial_AtomicOperations_double.cpp    |    4 +-
 .../TestSerial_AtomicOperations_float.cpp     |    4 +-
 .../TestSerial_AtomicOperations_int.cpp       |    4 +-
 .../TestSerial_AtomicOperations_longint.cpp   |    4 +-
 ...estSerial_AtomicOperations_longlongint.cpp |    4 +-
 ...estSerial_AtomicOperations_unsignedint.cpp |    4 +-
 ...erial_AtomicOperations_unsignedlongint.cpp |    4 +-
 .../serial/TestSerial_AtomicViews.cpp         |    4 +-
 .../unit_test/serial/TestSerial_Atomics.cpp   |    4 +-
 .../unit_test/serial/TestSerial_Category.hpp  |    4 +-
 .../unit_test/serial/TestSerial_Complex.cpp   |    4 +-
 .../unit_test/serial/TestSerial_Concepts.cpp} |    7 +-
 .../core/unit_test/serial/TestSerial_Crs.cpp  |    4 +-
 .../serial/TestSerial_DeepCopyAlignment.cpp   |    4 +-
 .../serial/TestSerial_FunctorAnalysis.cpp     |    4 +-
 .../core/unit_test/serial/TestSerial_Init.cpp |    4 +-
 .../serial/TestSerial_LocalDeepCopy.cpp       |    4 +-
 .../unit_test/serial/TestSerial_MDRange_a.cpp |    4 +-
 .../unit_test/serial/TestSerial_MDRange_b.cpp |    4 +-
 .../unit_test/serial/TestSerial_MDRange_c.cpp |    4 +-
 .../unit_test/serial/TestSerial_MDRange_d.cpp |    4 +-
 .../unit_test/serial/TestSerial_MDRange_e.cpp |    4 +-
 .../unit_test/serial/TestSerial_Other.cpp     |    4 +-
 .../serial/TestSerial_RangePolicy.cpp         |    4 +-
 .../serial/TestSerial_RangePolicyRequire.cpp} |    6 +-
 .../serial/TestSerial_Reducers_a.cpp          |    4 +-
 .../serial/TestSerial_Reducers_b.cpp          |    4 +-
 .../serial/TestSerial_Reducers_c.cpp          |    4 +-
 .../serial/TestSerial_Reducers_d.cpp          |    4 +-
 .../serial/TestSerial_Reductions.cpp          |    4 +-
 .../TestSerial_Reductions_DeviceView.cpp      |    4 +-
 .../core/unit_test/serial/TestSerial_Scan.cpp |    4 +-
 .../serial/TestSerial_SharedAlloc.cpp         |    4 +-
 .../unit_test/serial/TestSerial_SubView_a.cpp |    4 +-
 .../unit_test/serial/TestSerial_SubView_b.cpp |    4 +-
 .../serial/TestSerial_SubView_c01.cpp         |    4 +-
 .../serial/TestSerial_SubView_c02.cpp         |    4 +-
 .../serial/TestSerial_SubView_c03.cpp         |    4 +-
 .../serial/TestSerial_SubView_c04.cpp         |    4 +-
 .../serial/TestSerial_SubView_c05.cpp         |    4 +-
 .../serial/TestSerial_SubView_c06.cpp         |    4 +-
 .../serial/TestSerial_SubView_c07.cpp         |    4 +-
 .../serial/TestSerial_SubView_c08.cpp         |    4 +-
 .../serial/TestSerial_SubView_c09.cpp         |    4 +-
 .../serial/TestSerial_SubView_c10.cpp         |    4 +-
 .../serial/TestSerial_SubView_c11.cpp         |    4 +-
 .../serial/TestSerial_SubView_c12.cpp         |    4 +-
 .../serial/TestSerial_SubView_c13.cpp         |    4 +-
 .../core/unit_test/serial/TestSerial_Task.cpp |    4 +-
 .../core/unit_test/serial/TestSerial_Team.cpp |  105 +-
 .../serial/TestSerial_TeamReductionScan.cpp   |    4 +-
 .../serial/TestSerial_TeamScratch.cpp         |    6 +-
 .../serial/TestSerial_TeamTeamSize.cpp        |    4 +-
 .../serial/TestSerial_TeamVectorRange.cpp     |    4 +-
 .../serial/TestSerial_UniqueToken.cpp         |    4 +-
 .../unit_test/serial/TestSerial_ViewAPI_a.cpp |    4 +-
 .../unit_test/serial/TestSerial_ViewAPI_b.cpp |    4 +-
 .../unit_test/serial/TestSerial_ViewAPI_c.cpp |    4 +-
 .../unit_test/serial/TestSerial_ViewAPI_d.cpp |    4 +-
 .../unit_test/serial/TestSerial_ViewAPI_e.cpp |    4 +-
 .../TestSerial_ViewLayoutStrideAssignment.cpp |    4 +-
 .../serial/TestSerial_ViewMapping_a.cpp       |    4 +-
 .../serial/TestSerial_ViewMapping_b.cpp       |    4 +-
 .../serial/TestSerial_ViewMapping_subview.cpp |    4 +-
 .../serial/TestSerial_ViewOfClass.cpp         |    4 +-
 .../serial/TestSerial_ViewResize.cpp          |    4 +-
 .../serial/TestSerial_View_64bit.cpp          |    4 +-
 .../unit_test/serial/TestSerial_WorkGraph.cpp |    4 +-
 kokkos/core/unit_test/standalone/Makefile     |    3 +-
 .../unit_test/standalone/UnitTestMainInit.cpp |    9 +-
 ...Threads_AtomicOperations_complexdouble.cpp |    4 +-
 ...tThreads_AtomicOperations_complexfloat.cpp |    4 +-
 .../TestThreads_AtomicOperations_double.cpp   |    4 +-
 .../TestThreads_AtomicOperations_float.cpp    |    4 +-
 .../TestThreads_AtomicOperations_int.cpp      |    4 +-
 .../TestThreads_AtomicOperations_longint.cpp  |    4 +-
 ...stThreads_AtomicOperations_longlongint.cpp |    4 +-
 ...stThreads_AtomicOperations_unsignedint.cpp |    4 +-
 ...reads_AtomicOperations_unsignedlongint.cpp |    4 +-
 .../threads/TestThreads_AtomicViews.cpp       |    4 +-
 .../unit_test/threads/TestThreads_Atomics.cpp |    4 +-
 .../threads/TestThreads_Category.hpp          |    4 +-
 .../unit_test/threads/TestThreads_Complex.cpp |    4 +-
 .../threads/TestThreads_Concepts.cpp}         |    7 +-
 .../unit_test/threads/TestThreads_Crs.cpp     |    4 +-
 .../threads/TestThreads_DeepCopyAlignment.cpp |    4 +-
 .../threads/TestThreads_FunctorAnalysis.cpp   |    4 +-
 .../unit_test/threads/TestThreads_Init.cpp    |    4 +-
 .../threads/TestThreads_LocalDeepCopy.cpp     |    4 +-
 .../threads/TestThreads_MDRange_a.cpp         |    4 +-
 .../threads/TestThreads_MDRange_b.cpp         |    4 +-
 .../threads/TestThreads_MDRange_c.cpp         |    4 +-
 .../threads/TestThreads_MDRange_d.cpp         |    4 +-
 .../threads/TestThreads_MDRange_e.cpp         |    4 +-
 .../unit_test/threads/TestThreads_Other.cpp   |    4 +-
 .../threads/TestThreads_RangePolicy.cpp       |    4 +-
 .../TestThreads_RangePolicyRequire.cpp}       |    6 +-
 .../threads/TestThreads_Reducers_a.cpp        |    4 +-
 .../threads/TestThreads_Reducers_b.cpp        |    4 +-
 .../threads/TestThreads_Reducers_c.cpp        |    4 +-
 .../threads/TestThreads_Reducers_d.cpp        |    4 +-
 .../threads/TestThreads_Reductions.cpp        |    4 +-
 .../TestThreads_Reductions_DeviceView.cpp     |    4 +-
 .../unit_test/threads/TestThreads_Scan.cpp    |    4 +-
 .../threads/TestThreads_SharedAlloc.cpp       |    4 +-
 .../threads/TestThreads_SubView_a.cpp         |    4 +-
 .../threads/TestThreads_SubView_b.cpp         |    4 +-
 .../threads/TestThreads_SubView_c01.cpp       |    4 +-
 .../threads/TestThreads_SubView_c02.cpp       |    4 +-
 .../threads/TestThreads_SubView_c03.cpp       |    4 +-
 .../threads/TestThreads_SubView_c04.cpp       |    4 +-
 .../threads/TestThreads_SubView_c05.cpp       |    4 +-
 .../threads/TestThreads_SubView_c06.cpp       |    4 +-
 .../threads/TestThreads_SubView_c07.cpp       |    4 +-
 .../threads/TestThreads_SubView_c08.cpp       |    4 +-
 .../threads/TestThreads_SubView_c09.cpp       |    4 +-
 .../threads/TestThreads_SubView_c10.cpp       |    4 +-
 .../threads/TestThreads_SubView_c11.cpp       |    4 +-
 .../threads/TestThreads_SubView_c12.cpp       |    4 +-
 .../threads/TestThreads_SubView_c13.cpp       |    4 +-
 .../unit_test/threads/TestThreads_Team.cpp    |   36 +-
 .../threads/TestThreads_TeamReductionScan.cpp |    4 +-
 .../threads/TestThreads_TeamScratch.cpp       |    6 +-
 .../threads/TestThreads_TeamTeamSize.cpp      |    4 +-
 .../threads/TestThreads_TeamVectorRange.cpp   |    4 +-
 .../threads/TestThreads_UniqueToken.cpp       |    4 +-
 .../threads/TestThreads_ViewAPI_a.cpp         |    4 +-
 .../threads/TestThreads_ViewAPI_b.cpp         |    4 +-
 .../threads/TestThreads_ViewAPI_c.cpp         |    4 +-
 .../threads/TestThreads_ViewAPI_d.cpp         |    4 +-
 .../threads/TestThreads_ViewAPI_e.cpp         |    4 +-
 ...TestThreads_ViewLayoutStrideAssignment.cpp |    4 +-
 .../threads/TestThreads_ViewMapping_a.cpp     |    4 +-
 .../threads/TestThreads_ViewMapping_b.cpp     |    4 +-
 .../TestThreads_ViewMapping_subview.cpp       |    4 +-
 .../threads/TestThreads_ViewOfClass.cpp       |    4 +-
 .../threads/TestThreads_ViewResize.cpp        |    4 +-
 .../threads/TestThreads_View_64bit.cpp        |    4 +-
 .../threads/TestThreads_WorkGraph.cpp         |    4 +-
 kokkos/doc/design_notes_space_instances.md    |   70 +-
 kokkos/doc/develop_builds.md                  |    8 +-
 .../query_cuda_arch.cpp                       |    2 +-
 kokkos/doc/kokkos-promotion.txt               |   28 +-
 kokkos/example/CMakeLists.txt                 |   20 +-
 kokkos/example/README                         |    7 -
 .../build_cmake_in_tree/cmake_example.cpp     |    6 +-
 .../build_cmake_installed/cmake_example.cpp   |    6 +-
 kokkos/example/cmake/Dependencies.cmake       |    3 -
 kokkos/example/query_device/query_device.cpp  |    6 +-
 .../tutorial/01_hello_world/hello_world.cpp   |    4 +-
 .../hello_world_lambda.cpp                    |    4 +-
 .../02_simple_reduce/simple_reduce.cpp        |    4 +-
 .../simple_reduce_lambda.cpp                  |    4 +-
 .../example/tutorial/03_simple_view/Makefile  |    2 +-
 .../tutorial/03_simple_view/simple_view.cpp   |    4 +-
 .../simple_view_lambda.cpp                    |    4 +-
 .../simple_memoryspaces.cpp                   |    4 +-
 .../05_simple_atomics/simple_atomics.cpp      |    4 +-
 .../simple_mdrangepolicy.cpp                  |    4 +-
 .../01_data_layouts/data_layouts.cpp          |    4 +-
 .../02_memory_traits/memory_traits.cpp        |    4 +-
 .../Advanced_Views/03_subviews/subviews.cpp   |    4 +-
 .../Advanced_Views/04_dualviews/dual_view.cpp |    4 +-
 .../05_NVIDIA_UVM/uvm_example.cpp             |    4 +-
 .../overlapping_deepcopy.cpp                  |    4 +-
 .../01_random_numbers/random_numbers.cpp      |   10 +-
 kokkos/example/tutorial/CMakeLists.txt        |    8 +-
 .../01_thread_teams/thread_teams.cpp          |    4 +-
 .../thread_teams_lambda.cpp                   |    4 +-
 .../nested_parallel_for.cpp                   |    4 +-
 .../03_vectorization/vectorization.cpp        |    4 +-
 .../04_team_scan/team_scan.cpp                |    4 +-
 kokkos/example/tutorial/README                |   13 +-
 .../launch_bounds/launch_bounds_reduce.cpp    |    4 +-
 kokkos/example/virtual_functions/Makefile     |    2 +-
 kokkos/generate_makefile.bash                 |  578 ++-
 kokkos/gnu_generate_makefile.bash             |  484 +++
 kokkos/master_history.txt                     |    1 +
 kokkos/scripts/apply-clang-format             |    8 +
 kokkos/scripts/docker/Dockerfile.clang        |    3 -
 kokkos/scripts/docker/Dockerfile.hipcc        |   29 +
 kokkos/scripts/docker/check_format_cpp.sh     |   75 +-
 kokkos/scripts/snapshot.py                    |    4 +-
 .../scripts/testing_scripts/TestEXEC_TEST.cpp |    4 +-
 .../testing_scripts/generate_makefile.bash    |   31 +-
 ...cm_test_all_sandia => gnu_test_all_sandia} |  290 +-
 .../scripts/testing_scripts/test_all_sandia   |  396 +-
 kokkos/scripts/update-copyright               |    1 +
 kokkos/scripts/update-version                 |   35 +
 kokkos/tpls/gtest/gtest/gtest-all.cc          |    4 +-
 kokkos/tpls/gtest/gtest/gtest.h               |    6 +-
 2160 files changed, 29179 insertions(+), 19210 deletions(-)
 create mode 100644 kokkos/algorithms/unit_tests/TestHIP.cpp
 create mode 100644 kokkos/algorithms/unit_tests/TestOpenMP_Random.cpp
 create mode 100644 kokkos/algorithms/unit_tests/TestOpenMP_Sort1D.cpp
 create mode 100644 kokkos/algorithms/unit_tests/TestOpenMP_Sort3D.cpp
 create mode 100644 kokkos/algorithms/unit_tests/TestOpenMP_SortDynamicView.cpp
 create mode 100644 kokkos/appveyor.yml
 delete mode 100755 kokkos/cm_generate_makefile.bash
 create mode 100644 kokkos/cmake/KokkosTrilinosConfig.cmake.in
 create mode 100644 kokkos/cmake/kokkos_check_env.cmake
 create mode 100644 kokkos/cmake/msvc.cmake
 rename kokkos/containers/unit_tests/{cuda => }/TestCuda_Category.hpp (93%)
 rename kokkos/containers/unit_tests/{cuda/TestCuda_DualView.cpp => TestHIP_Category.hpp} (88%)
 rename kokkos/containers/unit_tests/{hpx => }/TestHPX_Category.hpp (93%)
 rename kokkos/containers/unit_tests/{openmp => }/TestOpenMP_Category.hpp (93%)
 rename kokkos/containers/unit_tests/{serial => }/TestSerial_Category.hpp (93%)
 rename kokkos/containers/unit_tests/{threads => }/TestThreads_Category.hpp (93%)
 delete mode 100644 kokkos/containers/unit_tests/cuda/TestCuda_DynRankViewAPI_generic.cpp
 delete mode 100644 kokkos/containers/unit_tests/cuda/TestCuda_DynRankViewAPI_rank67.cpp
 delete mode 100644 kokkos/containers/unit_tests/cuda/TestCuda_DynamicView.cpp
 delete mode 100644 kokkos/containers/unit_tests/cuda/TestCuda_ErrorReporter.cpp
 delete mode 100644 kokkos/containers/unit_tests/cuda/TestCuda_ScatterView.cpp
 delete mode 100644 kokkos/containers/unit_tests/cuda/TestCuda_StaticCrsGraph.cpp
 delete mode 100644 kokkos/containers/unit_tests/cuda/TestCuda_UnorderedMap.cpp
 delete mode 100644 kokkos/containers/unit_tests/cuda/TestCuda_ViewCtorPropEmbeddedDim.cpp
 delete mode 100644 kokkos/containers/unit_tests/hpx/TestHPX_DynRankViewAPI_generic.cpp
 delete mode 100644 kokkos/containers/unit_tests/hpx/TestHPX_DynRankViewAPI_rank12345.cpp
 delete mode 100644 kokkos/containers/unit_tests/hpx/TestHPX_DynRankViewAPI_rank67.cpp
 delete mode 100644 kokkos/containers/unit_tests/hpx/TestHPX_DynamicView.cpp
 delete mode 100644 kokkos/containers/unit_tests/hpx/TestHPX_ErrorReporter.cpp
 delete mode 100644 kokkos/containers/unit_tests/hpx/TestHPX_OffsetView.cpp
 delete mode 100644 kokkos/containers/unit_tests/hpx/TestHPX_ScatterView.cpp
 delete mode 100644 kokkos/containers/unit_tests/hpx/TestHPX_StaticCrsGraph.cpp
 delete mode 100644 kokkos/containers/unit_tests/hpx/TestHPX_UnorderedMap.cpp
 delete mode 100644 kokkos/containers/unit_tests/hpx/TestHPX_ViewCtorPropEmbeddedDim.cpp
 delete mode 100644 kokkos/containers/unit_tests/openmp/TestOpenMP_DualView.cpp
 delete mode 100644 kokkos/containers/unit_tests/openmp/TestOpenMP_DynRankViewAPI_generic.cpp
 delete mode 100644 kokkos/containers/unit_tests/openmp/TestOpenMP_DynRankViewAPI_rank12345.cpp
 delete mode 100644 kokkos/containers/unit_tests/openmp/TestOpenMP_DynRankViewAPI_rank67.cpp
 delete mode 100644 kokkos/containers/unit_tests/openmp/TestOpenMP_DynamicView.cpp
 delete mode 100644 kokkos/containers/unit_tests/openmp/TestOpenMP_ErrorReporter.cpp
 delete mode 100644 kokkos/containers/unit_tests/openmp/TestOpenMP_OffsetView.cpp
 delete mode 100644 kokkos/containers/unit_tests/openmp/TestOpenMP_ScatterView.cpp
 delete mode 100644 kokkos/containers/unit_tests/openmp/TestOpenMP_StaticCrsGraph.cpp
 delete mode 100644 kokkos/containers/unit_tests/openmp/TestOpenMP_UnorderedMap.cpp
 delete mode 100644 kokkos/containers/unit_tests/openmp/TestOpenMP_ViewCtorPropEmbeddedDim.cpp
 delete mode 100644 kokkos/containers/unit_tests/rocm/TestROCm_BitSet.cpp
 delete mode 100644 kokkos/containers/unit_tests/rocm/TestROCm_DualView.cpp
 delete mode 100644 kokkos/containers/unit_tests/rocm/TestROCm_DynRankViewAPI_generic.cpp
 delete mode 100644 kokkos/containers/unit_tests/rocm/TestROCm_DynRankViewAPI_rank12345.cpp
 delete mode 100644 kokkos/containers/unit_tests/rocm/TestROCm_DynRankViewAPI_rank67.cpp
 delete mode 100644 kokkos/containers/unit_tests/rocm/TestROCm_DynamicView.cpp
 delete mode 100644 kokkos/containers/unit_tests/rocm/TestROCm_ErrorReporter.cpp
 delete mode 100644 kokkos/containers/unit_tests/rocm/TestROCm_ScatterView.cpp
 delete mode 100644 kokkos/containers/unit_tests/rocm/TestROCm_StaticCrsGraph.cpp
 delete mode 100644 kokkos/containers/unit_tests/rocm/TestROCm_UnorderedMap.cpp
 delete mode 100644 kokkos/containers/unit_tests/rocm/TestROCm_Vector.cpp
 delete mode 100644 kokkos/containers/unit_tests/rocm/TestROCm_ViewCtorPropEmbeddedDim.cpp
 delete mode 100644 kokkos/containers/unit_tests/serial/TestSerial_DualView.cpp
 delete mode 100644 kokkos/containers/unit_tests/serial/TestSerial_DynRankViewAPI_generic.cpp
 delete mode 100644 kokkos/containers/unit_tests/serial/TestSerial_DynRankViewAPI_rank12345.cpp
 delete mode 100644 kokkos/containers/unit_tests/serial/TestSerial_DynRankViewAPI_rank67.cpp
 delete mode 100644 kokkos/containers/unit_tests/serial/TestSerial_DynamicView.cpp
 delete mode 100644 kokkos/containers/unit_tests/serial/TestSerial_ErrorReporter.cpp
 delete mode 100644 kokkos/containers/unit_tests/serial/TestSerial_OffsetView.cpp
 delete mode 100644 kokkos/containers/unit_tests/serial/TestSerial_ScatterView.cpp
 delete mode 100644 kokkos/containers/unit_tests/serial/TestSerial_StaticCrsGraph.cpp
 delete mode 100644 kokkos/containers/unit_tests/serial/TestSerial_UnorderedMap.cpp
 delete mode 100644 kokkos/containers/unit_tests/serial/TestSerial_ViewCtorPropEmbeddedDim.cpp
 delete mode 100644 kokkos/containers/unit_tests/threads/TestThreads_DualView.cpp
 delete mode 100644 kokkos/containers/unit_tests/threads/TestThreads_DynRankViewAPI_generic.cpp
 delete mode 100644 kokkos/containers/unit_tests/threads/TestThreads_DynRankViewAPI_rank12345.cpp
 delete mode 100644 kokkos/containers/unit_tests/threads/TestThreads_DynRankViewAPI_rank67.cpp
 delete mode 100644 kokkos/containers/unit_tests/threads/TestThreads_DynamicView.cpp
 delete mode 100644 kokkos/containers/unit_tests/threads/TestThreads_ErrorReporter.cpp
 delete mode 100644 kokkos/containers/unit_tests/threads/TestThreads_OffsetView.cpp
 delete mode 100644 kokkos/containers/unit_tests/threads/TestThreads_ScatterView.cpp
 delete mode 100644 kokkos/containers/unit_tests/threads/TestThreads_StaticCrsGraph.cpp
 delete mode 100644 kokkos/containers/unit_tests/threads/TestThreads_UnorderedMap.cpp
 delete mode 100644 kokkos/containers/unit_tests/threads/TestThreads_ViewCtorPropEmbeddedDim.cpp
 create mode 100644 kokkos/core/src/Cuda/Kokkos_Cuda_fwd.hpp
 create mode 100644 kokkos/core/src/HIP/KokkosExp_HIP_IterateTile.hpp
 create mode 100644 kokkos/core/src/HIP/Kokkos_HIP_Abort.hpp
 create mode 100644 kokkos/core/src/HIP/Kokkos_HIP_Atomic.hpp
 create mode 100644 kokkos/core/src/HIP/Kokkos_HIP_BlockSize_Deduction.hpp
 create mode 100644 kokkos/core/src/HIP/Kokkos_HIP_Error.hpp
 create mode 100644 kokkos/core/src/HIP/Kokkos_HIP_Instance.cpp
 create mode 100644 kokkos/core/src/HIP/Kokkos_HIP_Instance.hpp
 create mode 100644 kokkos/core/src/HIP/Kokkos_HIP_KernelLaunch.cpp
 create mode 100644 kokkos/core/src/HIP/Kokkos_HIP_KernelLaunch.hpp
 create mode 100644 kokkos/core/src/HIP/Kokkos_HIP_Locks.cpp
 create mode 100644 kokkos/core/src/HIP/Kokkos_HIP_Locks.hpp
 create mode 100644 kokkos/core/src/HIP/Kokkos_HIP_Parallel_MDRange.hpp
 create mode 100644 kokkos/core/src/HIP/Kokkos_HIP_Parallel_Range.hpp
 create mode 100644 kokkos/core/src/HIP/Kokkos_HIP_Parallel_Team.hpp
 create mode 100644 kokkos/core/src/HIP/Kokkos_HIP_ReduceScan.hpp
 create mode 100644 kokkos/core/src/HIP/Kokkos_HIP_Space.cpp
 create mode 100644 kokkos/core/src/HIP/Kokkos_HIP_Team.hpp
 create mode 100644 kokkos/core/src/HIP/Kokkos_HIP_Vectorization.hpp
 create mode 100644 kokkos/core/src/Kokkos_HIP.hpp
 create mode 100644 kokkos/core/src/Kokkos_HIP_Space.hpp
 delete mode 100644 kokkos/core/src/Kokkos_Qthreads.hpp
 create mode 100644 kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTarget_Instance.cpp
 create mode 100644 kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTarget_Instance.hpp
 create mode 100644 kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTarget_Parallel_MDRange.hpp
 delete mode 100644 kokkos/core/src/Qthreads/Kokkos_QthreadsExec.cpp
 delete mode 100644 kokkos/core/src/Qthreads/Kokkos_QthreadsExec.hpp
 delete mode 100644 kokkos/core/src/Qthreads/Kokkos_Qthreads_Parallel.hpp
 delete mode 100644 kokkos/core/src/Qthreads/Kokkos_Qthreads_Task.cpp
 delete mode 100644 kokkos/core/src/Qthreads/Kokkos_Qthreads_Task.hpp
 delete mode 100644 kokkos/core/src/Qthreads/Kokkos_Qthreads_TaskPolicy.cpp.old
 delete mode 100644 kokkos/core/src/Qthreads/Kokkos_Qthreads_TaskPolicy.hpp.old
 delete mode 100644 kokkos/core/src/Qthreads/Kokkos_Qthreads_TaskQueue.hpp
 delete mode 100644 kokkos/core/src/Qthreads/Kokkos_Qthreads_TaskQueue_impl.hpp
 delete mode 100644 kokkos/core/src/Qthreads/README
 create mode 100644 kokkos/core/src/impl/Kokkos_Atomic_Generic_Secondary.hpp
 create mode 100644 kokkos/core/src/impl/Kokkos_Atomic_MinMax.hpp
 delete mode 100644 kokkos/core/src/kokkos.pc.in
 create mode 100644 kokkos/core/unit_test/IncrementalTest.cpp.in
 create mode 100644 kokkos/core/unit_test/TestCTestDevice.cpp
 create mode 100644 kokkos/core/unit_test/TestConcepts.hpp
 create mode 100644 kokkos/core/unit_test/TestRangeRequire.hpp
 create mode 100644 kokkos/core/unit_test/TestViewIsAssignable.hpp
 delete mode 100644 kokkos/core/unit_test/config/results/AMDAVX_Qthreads_KokkosCore_config.h
 delete mode 100644 kokkos/core/unit_test/config/results/ARMv8-ThunderX_Qthreads_KokkosCore_config.h
 delete mode 100644 kokkos/core/unit_test/config/results/ARMv80_Qthreads_KokkosCore_config.h
 delete mode 100644 kokkos/core/unit_test/config/results/ARMv81_Qthreads_KokkosCore_config.h
 delete mode 100644 kokkos/core/unit_test/config/results/BDW_Qthreads_KokkosCore_config.h
 delete mode 100644 kokkos/core/unit_test/config/results/BGQ_Qthreads_KokkosCore_config.h
 delete mode 100644 kokkos/core/unit_test/config/results/HSW_Qthreads_KokkosCore_config.h
 delete mode 100644 kokkos/core/unit_test/config/results/KNC_Qthreads_KokkosCore_config.h
 delete mode 100644 kokkos/core/unit_test/config/results/KNL_Qthreads_KokkosCore_config.h
 delete mode 100644 kokkos/core/unit_test/config/results/Kepler30_Qthreads_KokkosCore_config.h
 delete mode 100644 kokkos/core/unit_test/config/results/Kepler32_Qthreads_KokkosCore_config.h
 delete mode 100644 kokkos/core/unit_test/config/results/Kepler35_Qthreads_KokkosCore_config.h
 delete mode 100644 kokkos/core/unit_test/config/results/Kepler37_Qthreads_KokkosCore_config.h
 delete mode 100644 kokkos/core/unit_test/config/results/Kepler_Qthreads_KokkosCore_config.h
 delete mode 100644 kokkos/core/unit_test/config/results/Maxwell50_Qthreads_KokkosCore_config.h
 delete mode 100644 kokkos/core/unit_test/config/results/Maxwell52_Qthreads_KokkosCore_config.h
 delete mode 100644 kokkos/core/unit_test/config/results/Maxwell53_Qthreads_KokkosCore_config.h
 delete mode 100644 kokkos/core/unit_test/config/results/Maxwell_Qthreads_KokkosCore_config.h
 delete mode 100644 kokkos/core/unit_test/config/results/None_Qthreads_KokkosCore_config.h
 delete mode 100644 kokkos/core/unit_test/config/results/Pascal60_Qthreads_KokkosCore_config.h
 delete mode 100644 kokkos/core/unit_test/config/results/Pascal61_Qthreads_KokkosCore_config.h
 delete mode 100644 kokkos/core/unit_test/config/results/Power7_Qthreads_KokkosCore_config.h
 delete mode 100644 kokkos/core/unit_test/config/results/Power8_Qthreads_KokkosCore_config.h
 delete mode 100644 kokkos/core/unit_test/config/results/Power9_Qthreads_KokkosCore_config.h
 delete mode 100644 kokkos/core/unit_test/config/results/SKX_Qthreads_KokkosCore_config.h
 delete mode 100644 kokkos/core/unit_test/config/results/SNB_Qthreads_KokkosCore_config.h
 delete mode 100644 kokkos/core/unit_test/config/results/WSM_Qthreads_KokkosCore_config.h
 rename kokkos/{containers/unit_tests/cuda/TestCuda_Vector.cpp => core/unit_test/cuda/TestCuda_Concepts.cpp} (92%)
 rename kokkos/{containers/unit_tests/cuda/TestCuda_BitSet.cpp => core/unit_test/cuda/TestCuda_RangePolicyRequire.cpp} (92%)
 rename kokkos/core/unit_test/{qthreads/TestQthreads_Category.hpp => hip/TestHIPHostPinned_Category.hpp} (85%)
 rename kokkos/core/unit_test/{qthreads/TestQthreads_SubView_c10.cpp => hip/TestHIPHostPinned_SharedAlloc.cpp} (86%)
 rename kokkos/core/unit_test/{qthreads/TestQqthreads_ViewAPI_a.cpp => hip/TestHIPHostPinned_ViewAPI_a.cpp} (91%)
 rename kokkos/core/unit_test/{qthreads/TestQqthreads_ViewAPI_b.cpp => hip/TestHIPHostPinned_ViewAPI_b.cpp} (91%)
 rename kokkos/core/unit_test/{qthreads/TestQqthreads_ViewAPI_c.cpp => hip/TestHIPHostPinned_ViewAPI_c.cpp} (91%)
 rename kokkos/core/unit_test/{qthreads/TestQqthreads_ViewAPI_d.cpp => hip/TestHIPHostPinned_ViewAPI_d.cpp} (91%)
 rename kokkos/core/unit_test/{qthreads/TestQqthreads_ViewAPI_e.cpp => hip/TestHIPHostPinned_ViewAPI_e.cpp} (91%)
 create mode 100644 kokkos/core/unit_test/hip/TestHIPHostPinned_ViewCopy.cpp
 create mode 100644 kokkos/core/unit_test/hip/TestHIPHostPinned_ViewMapping_a.cpp
 create mode 100644 kokkos/core/unit_test/hip/TestHIPHostPinned_ViewMapping_b.cpp
 create mode 100644 kokkos/core/unit_test/hip/TestHIPHostPinned_ViewMapping_subview.cpp
 rename kokkos/core/unit_test/{qthreads/TestQqthreads_AtomicOperations_complexdouble.cpp => hip/TestHIP_AtomicOperations_complexdouble.cpp} (91%)
 rename kokkos/core/unit_test/{qthreads/TestQqthreads_AtomicOperations_complexfloat.cpp => hip/TestHIP_AtomicOperations_complexfloat.cpp} (91%)
 rename kokkos/core/unit_test/{qthreads/TestQqthreads_AtomicOperations_double.cpp => hip/TestHIP_AtomicOperations_double.cpp} (91%)
 rename kokkos/core/unit_test/{qthreads/TestQqthreads_AtomicOperations_float.cpp => hip/TestHIP_AtomicOperations_float.cpp} (91%)
 rename kokkos/core/unit_test/{qthreads/TestQqthreads_AtomicOperations_int.cpp => hip/TestHIP_AtomicOperations_int.cpp} (91%)
 rename kokkos/core/unit_test/{qthreads/TestQqthreads_AtomicOperations_longint.cpp => hip/TestHIP_AtomicOperations_longint.cpp} (91%)
 rename kokkos/core/unit_test/{qthreads/TestQqthreads_AtomicOperations_longlongint.cpp => hip/TestHIP_AtomicOperations_longlongint.cpp} (91%)
 rename kokkos/core/unit_test/{qthreads/TestQqthreads_AtomicOperations_unsignedint.cpp => hip/TestHIP_AtomicOperations_unsignedint.cpp} (91%)
 rename kokkos/core/unit_test/{qthreads/TestQqthreads_AtomicOperations_unsignedlongint.cpp => hip/TestHIP_AtomicOperations_unsignedlongint.cpp} (91%)
 rename kokkos/{containers/unit_tests/hpx/TestHPX_DualView.cpp => core/unit_test/hip/TestHIP_AtomicViews.cpp} (90%)
 create mode 100644 kokkos/core/unit_test/hip/TestHIP_Atomics.cpp
 rename kokkos/{containers/unit_tests/rocm/TestROCm_Category.hpp => core/unit_test/hip/TestHIP_Category.hpp} (87%)
 create mode 100644 kokkos/core/unit_test/hip/TestHIP_Complex.cpp
 create mode 100644 kokkos/core/unit_test/hip/TestHIP_Concepts.cpp
 create mode 100644 kokkos/core/unit_test/hip/TestHIP_Crs.cpp
 rename kokkos/core/unit_test/{qthreads/TestQthreads_DeepCopyAlignment.cpp => hip/TestHIP_DeepCopyAlignment.cpp} (91%)
 create mode 100644 kokkos/core/unit_test/hip/TestHIP_FunctorAnalysis.cpp
 rename kokkos/{containers/unit_tests/cuda/TestCuda_DynRankViewAPI_rank12345.cpp => core/unit_test/hip/TestHIP_Init.cpp} (88%)
 create mode 100644 kokkos/core/unit_test/hip/TestHIP_InterOp_Init.cpp
 create mode 100644 kokkos/core/unit_test/hip/TestHIP_LocalDeepCopy.cpp
 rename kokkos/core/unit_test/{qthreads/TestQqthreads_MDRange_a.cpp => hip/TestHIP_MDRange_a.cpp} (91%)
 rename kokkos/core/unit_test/{qthreads/TestQqthreads_MDRange_b.cpp => hip/TestHIP_MDRange_b.cpp} (91%)
 rename kokkos/core/unit_test/{qthreads/TestQqthreads_MDRange_c.cpp => hip/TestHIP_MDRange_c.cpp} (91%)
 rename kokkos/core/unit_test/{qthreads/TestQqthreads_MDRange_d.cpp => hip/TestHIP_MDRange_d.cpp} (91%)
 rename kokkos/core/unit_test/{qthreads/TestQqthreads_MDRange_e.cpp => hip/TestHIP_MDRange_e.cpp} (91%)
 create mode 100644 kokkos/core/unit_test/hip/TestHIP_RangePolicy.cpp
 create mode 100644 kokkos/core/unit_test/hip/TestHIP_RangePolicyRequire.cpp
 create mode 100644 kokkos/core/unit_test/hip/TestHIP_Reducers_a.cpp
 create mode 100644 kokkos/core/unit_test/hip/TestHIP_Reducers_b.cpp
 create mode 100644 kokkos/core/unit_test/hip/TestHIP_Reducers_c.cpp
 create mode 100644 kokkos/core/unit_test/hip/TestHIP_Reducers_d.cpp
 rename kokkos/{containers/unit_tests/cuda/TestCuda_OffsetView.cpp => core/unit_test/hip/TestHIP_Reductions.cpp} (89%)
 create mode 100644 kokkos/core/unit_test/hip/TestHIP_Scan.cpp
 create mode 100644 kokkos/core/unit_test/hip/TestHIP_ScanUnit.cpp
 create mode 100644 kokkos/core/unit_test/hip/TestHIP_SharedAlloc.cpp
 create mode 100644 kokkos/core/unit_test/hip/TestHIP_Spaces.cpp
 rename kokkos/core/unit_test/{qthreads/TestQthreads_SubView_a.cpp => hip/TestHIP_SubView_a.cpp} (53%)
 create mode 100644 kokkos/core/unit_test/hip/TestHIP_SubView_b.cpp
 rename kokkos/core/unit_test/{qthreads/TestQthreads_SubView_c01.cpp => hip/TestHIP_SubView_c01.cpp} (86%)
 create mode 100644 kokkos/core/unit_test/hip/TestHIP_SubView_c02.cpp
 rename kokkos/core/unit_test/{qthreads/TestQthreads_SubView_c03.cpp => hip/TestHIP_SubView_c03.cpp} (84%)
 rename kokkos/core/unit_test/{qthreads/TestQthreads_SubView_c04.cpp => hip/TestHIP_SubView_c04.cpp} (86%)
 create mode 100644 kokkos/core/unit_test/hip/TestHIP_SubView_c05.cpp
 create mode 100644 kokkos/core/unit_test/hip/TestHIP_SubView_c06.cpp
 rename kokkos/core/unit_test/{qthreads/TestQthreads_SubView_c07.cpp => hip/TestHIP_SubView_c07.cpp} (86%)
 rename kokkos/core/unit_test/{qthreads/TestQthreads_SubView_c02.cpp => hip/TestHIP_SubView_c08.cpp} (84%)
 create mode 100644 kokkos/core/unit_test/hip/TestHIP_SubView_c09.cpp
 create mode 100644 kokkos/core/unit_test/hip/TestHIP_SubView_c10.cpp
 create mode 100644 kokkos/core/unit_test/hip/TestHIP_SubView_c11.cpp
 create mode 100644 kokkos/core/unit_test/hip/TestHIP_SubView_c12.cpp
 create mode 100644 kokkos/core/unit_test/hip/TestHIP_SubView_c13.cpp
 create mode 100644 kokkos/core/unit_test/hip/TestHIP_ViewAPI_c.cpp
 create mode 100644 kokkos/core/unit_test/hip/TestHIP_ViewAPI_d.cpp
 create mode 100644 kokkos/core/unit_test/hip/TestHIP_ViewMapping_a.cpp
 create mode 100644 kokkos/core/unit_test/hip/TestHIP_ViewMapping_b.cpp
 create mode 100644 kokkos/core/unit_test/hip/TestHIP_ViewMapping_subview.cpp
 create mode 100644 kokkos/core/unit_test/hip/TestHIP_ViewOfClass.cpp
 create mode 100644 kokkos/core/unit_test/hip/TestHIP_ViewResize.cpp
 create mode 100644 kokkos/core/unit_test/hip/TestHIP_View_64bit.cpp
 rename kokkos/{containers/unit_tests/hpx/TestHPX_Vector.cpp => core/unit_test/hpx/TestHPX_Concepts.cpp} (92%)
 rename kokkos/{containers/unit_tests/hpx/TestHPX_BitSet.cpp => core/unit_test/hpx/TestHPX_RangePolicyRequire.cpp} (92%)
 create mode 100644 kokkos/core/unit_test/incremental/Test01_execspace.hpp
 create mode 100644 kokkos/core/unit_test/incremental/Test02_atomic_host.hpp
 rename kokkos/core/unit_test/{qthreads/TestQthreads_SubView_b.cpp => incremental/Test03a_MemorySpace_malloc.hpp} (65%)
 create mode 100644 kokkos/core/unit_test/incremental/Test03b_MemorySpace_free.hpp
 create mode 100644 kokkos/core/unit_test/incremental/Test04_ParallelFor_RangePolicy.hpp
 create mode 100644 kokkos/core/unit_test/incremental/Test05_ParallelReduce_RangePolicy.hpp
 create mode 100644 kokkos/core/unit_test/incremental/Test06_ParallelFor_MDRangePolicy.hpp
 create mode 100644 kokkos/core/unit_test/incremental/Test08_deep_copy.hpp
 create mode 100644 kokkos/core/unit_test/incremental/Test10_HierarchicalBasics.hpp
 create mode 100644 kokkos/core/unit_test/incremental/Test11a_ParallelFor_TeamThreadRange.hpp
 create mode 100644 kokkos/core/unit_test/incremental/Test11b_ParallelFor_TeamVectorRange.hpp
 create mode 100644 kokkos/core/unit_test/incremental/Test11c_ParallelFor_ThreadVectorRange.hpp
 create mode 100644 kokkos/core/unit_test/incremental/Test12a_ThreadScratch.hpp
 create mode 100644 kokkos/core/unit_test/incremental/Test12b_TeamScratch.hpp
 create mode 100644 kokkos/core/unit_test/incremental/Test13a_ParallelRed_TeamThreadRange.hpp
 rename kokkos/core/unit_test/{qthreads/TestQthreads.hpp => incremental/Test13b_ParallelRed_TeamVectorRange.hpp} (54%)
 create mode 100644 kokkos/core/unit_test/incremental/Test13c_ParallelRed_ThreadVectorRange.hpp
 rename kokkos/{containers/unit_tests/openmp/TestOpenMP_BitSet.cpp => core/unit_test/openmp/TestOpenMP_Concepts.cpp} (92%)
 rename kokkos/{containers/unit_tests/openmp/TestOpenMP_Vector.cpp => core/unit_test/openmp/TestOpenMP_RangePolicyRequire.cpp} (92%)
 create mode 100644 kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Concepts.cpp
 create mode 100644 kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Crs.cpp
 create mode 100644 kokkos/core/unit_test/openmptarget/TestOpenMPTarget_FunctorAnalysis.cpp
 create mode 100644 kokkos/core/unit_test/openmptarget/TestOpenMPTarget_LocalDeepCopy.cpp
 create mode 100644 kokkos/core/unit_test/openmptarget/TestOpenMPTarget_RangePolicyRequire.cpp
 create mode 100644 kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Reductions_DeviceView.cpp
 create mode 100644 kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c13.cpp
 create mode 100644 kokkos/core/unit_test/openmptarget/TestOpenMPTarget_TeamTeamSize.cpp
 create mode 100644 kokkos/core/unit_test/openmptarget/TestOpenMPTarget_TeamVectorRange.cpp
 create mode 100644 kokkos/core/unit_test/openmptarget/TestOpenMPTarget_UniqueToken.cpp
 create mode 100644 kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewLayoutStrideAssignment.cpp
 create mode 100644 kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewResize.cpp
 create mode 100644 kokkos/core/unit_test/openmptarget/TestOpenMPTarget_View_64bit.cpp
 create mode 100644 kokkos/core/unit_test/openmptarget/TestOpenMPTarget_WorkGraph.cpp
 delete mode 100644 kokkos/core/unit_test/qthreads/TestQthreads_Atomics.cpp
 delete mode 100644 kokkos/core/unit_test/qthreads/TestQthreads_Complex.cpp
 delete mode 100644 kokkos/core/unit_test/qthreads/TestQthreads_Other.cpp
 delete mode 100644 kokkos/core/unit_test/qthreads/TestQthreads_Reductions.cpp
 delete mode 100644 kokkos/core/unit_test/qthreads/TestQthreads_SubView_c05.cpp
 delete mode 100644 kokkos/core/unit_test/qthreads/TestQthreads_SubView_c06.cpp
 delete mode 100644 kokkos/core/unit_test/qthreads/TestQthreads_SubView_c08.cpp
 delete mode 100644 kokkos/core/unit_test/qthreads/TestQthreads_SubView_c09.cpp
 delete mode 100644 kokkos/core/unit_test/qthreads/TestQthreads_SubView_c11.cpp
 delete mode 100644 kokkos/core/unit_test/qthreads/TestQthreads_SubView_c12.cpp
 delete mode 100644 kokkos/core/unit_test/qthreads/TestQthreads_SubView_c13.cpp
 delete mode 100644 kokkos/core/unit_test/qthreads/TestQthreads_SubView_c_all.cpp
 delete mode 100644 kokkos/core/unit_test/qthreads/TestQthreads_Team.cpp
 delete mode 100644 kokkos/core/unit_test/qthreads/TestQthreads_ViewAPI_a.cpp
 delete mode 100644 kokkos/core/unit_test/qthreads/TestQthreads_ViewAPI_b.cpp
 rename kokkos/{containers/unit_tests/serial/TestSerial_BitSet.cpp => core/unit_test/serial/TestSerial_Concepts.cpp} (92%)
 rename kokkos/{containers/unit_tests/serial/TestSerial_Vector.cpp => core/unit_test/serial/TestSerial_RangePolicyRequire.cpp} (92%)
 rename kokkos/{containers/unit_tests/threads/TestThreads_BitSet.cpp => core/unit_test/threads/TestThreads_Concepts.cpp} (92%)
 rename kokkos/{containers/unit_tests/threads/TestThreads_Vector.cpp => core/unit_test/threads/TestThreads_RangePolicyRequire.cpp} (92%)
 delete mode 100644 kokkos/example/cmake/Dependencies.cmake
 create mode 100755 kokkos/gnu_generate_makefile.bash
 create mode 100644 kokkos/scripts/docker/Dockerfile.hipcc
 rename kokkos/scripts/testing_scripts/{cm_test_all_sandia => gnu_test_all_sandia} (80%)
 create mode 100755 kokkos/scripts/update-version

diff --git a/kokkos/.gitignore b/kokkos/.gitignore
index de4b66da3..d67eb0f8f 100644
--- a/kokkos/.gitignore
+++ b/kokkos/.gitignore
@@ -8,3 +8,6 @@
 .project
 testing/
 .settings/
+/.vs
+/out/build
+/CMakeSettings.json
diff --git a/kokkos/.jenkins b/kokkos/.jenkins
index 67491f174..c23bd8ac1 100644
--- a/kokkos/.jenkins
+++ b/kokkos/.jenkins
@@ -9,6 +9,38 @@ pipeline {
     stages {
         stage('Build') {
             parallel {
+                stage('HIP-3.1-HCC') {
+                    agent {
+                        dockerfile {
+                            filename 'Dockerfile.hipcc'
+                            dir 'scripts/docker'
+                            additionalBuildArgs '--pull --build-arg BASE=rocm/dev-ubuntu-18.04:3.1'
+                            label 'rocm-docker && vega'
+                            args '-v /tmp/ccache.kokkos:/tmp/ccache --device=/dev/kfd --device=/dev/dri --security-opt seccomp=unconfined --group-add video'
+                        }
+                    }
+                    steps {
+                        sh 'ccache --zero-stats'
+                        sh '''rm -rf build && mkdir -p build && cd build && \
+                              cmake \
+                                -DCMAKE_BUILD_TYPE=Debug \
+                                -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
+                                -DCMAKE_CXX_COMPILER=hipcc \
+                                -DCMAKE_CXX_FLAGS="-Werror -Wno-unused-command-line-argument -Wno-braced-scalar-init" \
+                                -DKokkos_ENABLE_COMPILER_WARNINGS=ON \
+                                -DKokkos_ENABLE_TESTS=ON \
+                                -DKokkos_ENABLE_HIP=ON \
+                                -DKokkos_ENABLE_LIBDL=OFF \
+                                -DKokkos_ENABLE_PROFILING=OFF \
+                              .. && \
+                              make -j8 && ctest --output-on-failure'''
+                    }
+                    post {
+                        always {
+                            sh 'ccache --show-stats'
+                        }
+                    }
+                }
                 stage('CUDA-9.2-Clang') {
                     agent {
                         dockerfile {
diff --git a/kokkos/.travis.yml b/kokkos/.travis.yml
index 1d8cb0b3b..d1dca455b 100644
--- a/kokkos/.travis.yml
+++ b/kokkos/.travis.yml
@@ -31,8 +31,8 @@ branches:
 
 env:
   - 
-  - BACKEND="OPENMP"
-#  - BACKEND="PTHREAD"
+#  - BACKEND="OPENMP"
+  - BACKEND="PTHREAD"
   - CMAKE_BUILD_TYPE=Debug COVERAGE=yes GTEST_FILTER="-*DeathTest*"
   - CMAKE_BUILD_TYPE=Debug BACKEND="OPENMP" COVERAGE=yes GTEST_FILTER="-*DeathTest*"
 #  - CMAKE_BUILD_TYPE=Debug BACKEND="PTHREAD" COVERAGE=yes
@@ -46,9 +46,6 @@ matrix:
     - os: osx
       compiler: gcc
 # Apple Clang doesn't support OpenMP
-    - os: osx
-      compiler: clang
-      env: BACKEND="OPENMP"
     - os: osx
       compiler: clang
       env: CMAKE_BUILD_TYPE=Debug BACKEND="OPENMP" COVERAGE=yes GTEST_FILTER="-*DeathTest*"
@@ -66,6 +63,7 @@ before_script:
       export HOMEBREW_NO_AUTO_UPDATE=1;
       brew ls --versions ccache   > /dev/null || brew install ccache;
       export PATH=/usr/local/opt/ccache/libexec:$PATH;
+      if [[ ${BACKEND} == "OPENMP" ]]; then brew install libomp; fi
     fi
   - ccache -z
   - if [[ ${COVERAGE} ]]; then export CXX="${CXX} --coverage"; fi
diff --git a/kokkos/BUILD.md b/kokkos/BUILD.md
index c4d6c9836..63dbf7fdb 100644
--- a/kokkos/BUILD.md
+++ b/kokkos/BUILD.md
@@ -18,7 +18,7 @@ Then for every executable or library in your project:
 target_link_libraries(myTarget Kokkos::kokkos)
 ````
 That's it! There is no checking Kokkos preprocessor, compiler, or linker flags.
-Kokkos propagates all the necesssary flags to your project.
+Kokkos propagates all the necessary flags to your project.
 This means not only is linking to Kokkos easy, but Kokkos itself can actually configure compiler and linker flags for *your*
 project. If building in-tree, there is no `find_package` and you link with `target_link_libraries(kokkos)`.
 
@@ -40,6 +40,13 @@ cmake ${srcdir} \
 ````
 which activates the OpenMP backend. All of the options controlling device backends, options, architectures, and third-party libraries (TPLs) are given below.
 
+## Platform-specific Problems
+
+### Cray
+
+* The Cray compiler wrappers do static linking by default. This seems to break the Kokkos build. You will likely need to set the environment variable `CRAYPE_LINK_TYPE=dynamic` in order to link correctly. Kokkos warns during configure if this is missing.
+* The Cray compiler identifies to CMake as Clang, but it sometimes has its own flags that differ from Clang. We try to include all exceptions, but flag errors may occur in which a Clang-specific flag is passed that the Cray compiler does not recognize.
+
 ## Spack
 An alternative to manually building with the CMake is to use the Spack package manager.
 To do so, download the `kokkos-spack` git repo and add to the package list:
@@ -63,6 +70,7 @@ For a complete list of Kokkos options, run:
 ````
 spack info kokkos
 ````
+More details can be found in the kokkos-spack repository [README](https://github.com/kokkos/kokkos-spack/blob/master/README.md).
 
 #### Spack Development
 Spack currently installs packages to a location determined by a unique hash. This hash name is not really "human readable".
@@ -73,37 +81,13 @@ spack find -p kokkos ...
 ````
 where `...` is the unique spec identifying the particular Kokkos configuration and version.
 
-A better way to use Spack for doing Kokkos development is the DIY feature of Spack.
-If you wish to develop Kokkos itself, go to the Kokkos source folder:
-````
-spack diy -u cmake kokkos@diy ...
-````
-where `...` is a Spack spec identifying the exact Kokkos configuration.
-This then creates a `spack-build` directory where you can run `make`.
-
-If doing development on a downstream project, you can do almost exactly the same thing.
-````
-spack diy -u cmake ${myproject}@${myversion} ... ^kokkos...
-````
-where the `...` are the specs for your project and the desired Kokkos configuration.
-Again, a `spack-build` directory will be created where you can run `make`.
-
-Spack has a few idiosyncracies that make building outside of Spack annoying related to Spack forcing use of a compiler wrapper. This can be worked around by having a `-DSpack_WORKAROUND=On` given your CMake. Then add the block of code to your CMakeLists.txt:
-
-````
-if (Spack_WORKAROUND)
- set(SPACK_CXX $ENV{SPACK_CXX})
- if(SPACK_CXX)
-   set(CMAKE_CXX_COMPILER ${SPACK_CXX} CACHE STRING "the C++ compiler" FORCE)
-   set(ENV{CXX} ${SPACK_CXX})
- endif()
-endif()
-````
+A better way to use Spack for doing Kokkos development is the dev-build feature of Spack.
+For dev-build details, consult the kokkos-spack repository [README](https://github.com/kokkos/kokkos-spack/blob/master/README.md).
 
 # Kokkos Keyword Listing
 
 ## Device Backends
-Device backends can be enabled by specifiying `-DKokkos_ENABLE_X`.
+Device backends can be enabled by specifying `-DKokkos_ENABLE_X`.
 
 * Kokkos_ENABLE_CUDA
     * Whether to build CUDA backend
@@ -122,7 +106,7 @@ Device backends can be enabled by specifiying `-DKokkos_ENABLE_X`.
     * BOOL Default: ON
 
 ## Enable Options
-Options can be enabled by specifiying `-DKokkos_ENABLE_X`.
+Options can be enabled by specifying `-DKokkos_ENABLE_X`.
 
 * Kokkos_ENABLE_AGGRESSIVE_VECTORIZATION
     * Whether to aggressively vectorize loops
@@ -157,6 +141,9 @@ Options can be enabled by specifiying `-DKokkos_ENABLE_X`.
 * Kokkos_ENABLE_DEPRECATED_CODE
     * Whether to enable deprecated code
     * BOOL Default: OFF
+* Kokkos_ENABLE_EXAMPLES
+    * Whether to enable building examples
+    * BOOL Default: OFF
 * Kokkos_ENABLE_HPX_ASYNC_DISPATCH
     * Whether HPX supports asynchronous dispatch
     * BOOL Default: OFF
@@ -225,7 +212,7 @@ The following options control `find_package` paths for CMake-based TPLs:
     * PATH Default:
 
 ## Architecture Keywords
-Architecture-specific optimizations can be enabled by specifiying `-DKokkos_ARCH_X`.
+Architecture-specific optimizations can be enabled by specifying `-DKokkos_ARCH_X`.
 
 * Kokkos_ARCH_AMDAVX
     * Whether to optimize for the AMDAVX architecture
diff --git a/kokkos/CHANGELOG.md b/kokkos/CHANGELOG.md
index fc141d77c..149e63ca9 100644
--- a/kokkos/CHANGELOG.md
+++ b/kokkos/CHANGELOG.md
@@ -1,7 +1,61 @@
 # Change Log
 
-## [2.9.99](https://github.com/kokkos/kokkos/tree/2.9.99) (2020-01-27)
-[Full Changelog](https://github.com/kokkos/kokkos/compare/2.9.00...2.9.99)
+## [3.1.00](https://github.com/kokkos/kokkos/tree/3.1.00) (2020-04-14)
+[Full Changelog](https://github.com/kokkos/kokkos/compare/3.0.00...3.1.00)
+
+**Features:**
+
+- HIP Support for AMD
+- OpenMPTarget Support with clang
+- Windows VS19 (Serial) Support [\#1533](https://github.com/kokkos/kokkos/issues/1533)
+
+**Implemented enhancements:**
+
+- generate\_makefile.bash should allow tests to be disabled [\#2886](https://github.com/kokkos/kokkos/issues/2886)
+- clang/7+cuda/9 build -Werror-unused parameter error in nightly test [\#2884](https://github.com/kokkos/kokkos/issues/2884)
+- ScatterView memory space is not user settable [\#2826](https://github.com/kokkos/kokkos/issues/2826)
+- clang/8+cuda/10.0 build error with c++17 [\#2809](https://github.com/kokkos/kokkos/issues/2809)
+- warnings.... [\#2805](https://github.com/kokkos/kokkos/issues/2805)
+- Kokkos version in cpp define [\#2787](https://github.com/kokkos/kokkos/issues/2787)
+- Remove Defunct QThreads Backend [\#2751](https://github.com/kokkos/kokkos/issues/2751)
+- Improve Kokkos::fence behavior with multiple execution spaces [\#2659](https://github.com/kokkos/kokkos/issues/2659)
+- polylithic\(?\) initialization of Kokkos [\#2658](https://github.com/kokkos/kokkos/issues/2658)
+- Unnecessary\(?\) check for host execution space initialization from Cuda initialization [\#2652](https://github.com/kokkos/kokkos/issues/2652)
+- Kokkos error reporting failures with CUDA GPUs in exclusive mode [\#2471](https://github.com/kokkos/kokkos/issues/2471)
+- atomicMax equivalent \(and other atomics\) [\#2401](https://github.com/kokkos/kokkos/issues/2401)
+- Fix alignment for Kokkos::complex [\#2255](https://github.com/kokkos/kokkos/issues/2255)
+- Warnings with Cuda 10.1 [\#2206](https://github.com/kokkos/kokkos/issues/2206)
+- dual view with Kokkos::ViewAllocateWithoutInitializing [\#2188](https://github.com/kokkos/kokkos/issues/2188)
+- Check error code  from cudaOccupancyMaxActiveBlocksPerMultiprocessor [\#2172](https://github.com/kokkos/kokkos/issues/2172)
+- Add non-member Kokkos::resize/realloc for DualView [\#2170](https://github.com/kokkos/kokkos/issues/2170)
+- Construct DualView without initialization [\#2046](https://github.com/kokkos/kokkos/issues/2046)
+- Expose is\_assignable to determine if one view can be assigned to another [\#1936](https://github.com/kokkos/kokkos/issues/1936)
+- profiling label [\#1935](https://github.com/kokkos/kokkos/issues/1935)
+- team\_broadcast of bool failed on CUDA backend [\#1908](https://github.com/kokkos/kokkos/issues/1908)
+- View static\_extent [\#660](https://github.com/kokkos/kokkos/issues/660)
+- Misleading Kokkos::Cuda::initialize ERROR message when compiled for wrong GPU architecture [\#1944](https://github.com/kokkos/kokkos/issues/1944)
+- Cryptic Error When Malloc Fails [\#2164](https://github.com/kokkos/kokkos/issues/2164)
+- Drop support for intermediate standards in CMake [\#2336](https://github.com/kokkos/kokkos/issues/2336)
+
+**Fixed bugs:**
+
+- DualView sync\_device with length zero creates cuda errors [\#2946](https://github.com/kokkos/kokkos/issues/2946)
+- building with nvcc and clang \(or clang based XL\) as host compiler: "Kokkos::atomic\_fetch\_min\(volatile int \*, int\)" has already been defined [\#2903](https://github.com/kokkos/kokkos/issues/2903)
+- Cuda 9.1,10.1 debug builds failing due to -Werror=unused-parameter [\#2880](https://github.com/kokkos/kokkos/issues/2880)
+- clang -Werror: Kokkos\_FixedBufferMemoryPool.hpp:140:28: error: unused parameter 'alloc\_size' [\#2869](https://github.com/kokkos/kokkos/issues/2869)
+- intel/16.0.1, intel/17.0.1 nightly build failures with debugging enabled [\#2867](https://github.com/kokkos/kokkos/issues/2867)
+- intel/16.0.1 debug build errors [\#2863](https://github.com/kokkos/kokkos/issues/2863)
+- xl/16.1.1 with cpp14, openmp build, nightly test failures [\#2856](https://github.com/kokkos/kokkos/issues/2856)
+- Intel nightly test failures: team\_vector [\#2852](https://github.com/kokkos/kokkos/issues/2852)
+- Kokkos Views with intmax/2\<N\<intmax can hang during construction [\#2850](https://github.com/kokkos/kokkos/issues/2850)
+- workgraph\_fib test seg-faults with threads backend and hwloc [\#2797](https://github.com/kokkos/kokkos/issues/2797)
+- cuda.view\_64bit test hangs on Power8+Kepler37 system - develop and 2.9.00 branches [\#2771](https://github.com/kokkos/kokkos/issues/2771)
+- device\_type for Kokkos\_Random ?  [\#2693](https://github.com/kokkos/kokkos/issues/2693)
+- "More than one tag given" error in Experimental::require\(\) [\#2608](https://github.com/kokkos/kokkos/issues/2608)
+- Segfault on Marvell from our finalization stack [\#2542](https://github.com/kokkos/kokkos/issues/2542)
+
+## [3.0.00](https://github.com/kokkos/kokkos/tree/3.0.00) (2020-01-27)
+[Full Changelog](https://github.com/kokkos/kokkos/compare/2.9.00...3.0.00)
 
 **Implemented enhancements:**
 
@@ -31,7 +85,7 @@
 - OffsetView: Kokkos::OffsetView missing constructor which takes pointer [\#2247](https://github.com/kokkos/kokkos/issues/2247)
 - OffsetView: Kokkos::OffsetView: allow offset=0 [\#2246](https://github.com/kokkos/kokkos/issues/2246)
 - DeepCopy: Missing DeepCopy instrumentation in Kokkos [\#2522](https://github.com/kokkos/kokkos/issues/2522)
-- nvcc\_wrapper: --host-only fails with mutiple -W\* flags [\#2484](https://github.com/kokkos/kokkos/issues/2484)
+- nvcc\_wrapper: --host-only fails with multiple -W\* flags [\#2484](https://github.com/kokkos/kokkos/issues/2484)
 - nvcc\_wrapper: taking first -std option is counterintuitive [\#2553](https://github.com/kokkos/kokkos/issues/2553)
 - Subview: Error taking subviews of views with static_extents of min rank [\#2448](https://github.com/kokkos/kokkos/issues/2448)
 - TeamPolicy: reducers with valuetypes without += broken on CUDA [\#2410](https://github.com/kokkos/kokkos/issues/2410)
@@ -214,7 +268,7 @@
 ## [2.6.00](https://github.com/kokkos/kokkos/tree/2.6.00) (2018-03-07)
 [Full Changelog](https://github.com/kokkos/kokkos/compare/2.5.00...2.6.00)
 
-**Part of the Kokkos C++ Performance Portability Programming EcoSystem 2.6**      
+**Part of the Kokkos C++ Performance Portability Programming EcoSystem 2.6**
 
 **Implemented enhancements:**
 
@@ -258,7 +312,7 @@
 ## [2.5.00](https://github.com/kokkos/kokkos/tree/2.5.00) (2017-12-15)
 [Full Changelog](https://github.com/kokkos/kokkos/compare/2.04.11...2.5.00)
 
-**Part of the Kokkos C++ Performance Portability Programming EcoSystem 2.5**      
+**Part of the Kokkos C++ Performance Portability Programming EcoSystem 2.5**
 
 **Implemented enhancements:**
 
diff --git a/kokkos/CMakeLists.txt b/kokkos/CMakeLists.txt
index 6a4451b2e..db8887903 100644
--- a/kokkos/CMakeLists.txt
+++ b/kokkos/CMakeLists.txt
@@ -2,7 +2,7 @@
 # We want to determine if options are given with the wrong case
 # In order to detect which arguments are given to compare against
 # the list of valid arguments, at the beginning here we need to
-# form a list of all the given variables. If it begins with any 
+# form a list of all the given variables. If it begins with any
 # case of KoKkOS, we add it to the list.
 
 
@@ -25,6 +25,8 @@ SET(KOKKOS_TOP_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR})
 
 # Needed to simplify syntax of if statements
 CMAKE_POLICY(SET CMP0054 NEW)
+# Needed to make IN_LIST a valid operator
+CMAKE_POLICY(SET CMP0057 NEW)
 
 # Is this a build as part of Trilinos?
 IF(COMMAND TRIBITS_PACKAGE_DECL)
@@ -65,7 +67,7 @@ IF(NOT KOKKOS_HAS_TRILINOS)
   cmake_minimum_required(VERSION 3.10 FATAL_ERROR)
   set(CMAKE_DISABLE_SOURCE_CHANGES ON)
   set(CMAKE_DISABLE_IN_SOURCE_BUILD ON)
-  IF (Spack_WORKAROUND) 
+  IF (Spack_WORKAROUND)
     #if we are explicitly using Spack for development,
     #nuke the Spack compiler
     SET(SPACK_CXX $ENV{SPACK_CXX})
@@ -75,7 +77,15 @@ IF(NOT KOKKOS_HAS_TRILINOS)
     ENDIF()
   ENDif()
   IF(NOT DEFINED ${PROJECT_NAME})
+    # WORKAROUND FOR HIPCC
+    IF(Kokkos_ENABLE_HIP)
+      SET(KOKKOS_INTERNAL_CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
+      SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --amdgpu-target=gfx906")
+    ENDIF()
     PROJECT(Kokkos CXX)
+    IF(Kokkos_ENABLE_HIP)
+      SET(CMAKE_CXX_FLAGS ${KOKKOS_INTERNAL_CMAKE_CXX_FLAGS})
+    ENDIF()
   ENDIF()
 ENDIF()
 
@@ -92,16 +102,17 @@ ENDIF()
 
 
 set(Kokkos_VERSION_MAJOR 3)
-set(Kokkos_VERSION_MINOR 0)
+set(Kokkos_VERSION_MINOR 1)
 set(Kokkos_VERSION_PATCH 0)
 set(Kokkos_VERSION "${Kokkos_VERSION_MAJOR}.${Kokkos_VERSION_MINOR}.${Kokkos_VERSION_PATCH}")
+math(EXPR KOKKOS_VERSION "${Kokkos_VERSION_MAJOR} * 10000 + ${Kokkos_VERSION_MINOR} * 100 + ${Kokkos_VERSION_PATCH}")
 
-IF(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.12.0") 
+IF(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.12.0")
   MESSAGE(STATUS "Setting policy CMP0074 to use <Package>_ROOT variables")
   CMAKE_POLICY(SET CMP0074 NEW)
 ENDIF()
 
-# Load either the real TriBITS or a TriBITS wrapper 
+# Load either the real TriBITS or a TriBITS wrapper
 # for certain utility functions that are universal (like GLOBAL_SET)
 INCLUDE(${KOKKOS_SRC_PATH}/cmake/fake_tribits.cmake)
 
@@ -118,18 +129,14 @@ ENDIF()
 # These are the variables we will append to as we go
 # I really wish these were regular variables
 # but scoping issues can make it difficult
-GLOBAL_RESET(KOKKOS_COMPILE_OPTIONS)
-GLOBAL_RESET(KOKKOS_LINK_OPTIONS)
-GLOBAL_RESET(KOKKOS_CUDA_OPTIONS)
-GLOBAL_RESET(KOKKOS_CUDAFE_OPTIONS)
-GLOBAL_RESET(KOKKOS_XCOMPILER_OPTIONS)
+GLOBAL_SET(KOKKOS_COMPILE_OPTIONS)
+GLOBAL_SET(KOKKOS_LINK_OPTIONS)
+GLOBAL_SET(KOKKOS_CUDA_OPTIONS)
+GLOBAL_SET(KOKKOS_CUDAFE_OPTIONS)
+GLOBAL_SET(KOKKOS_XCOMPILER_OPTIONS)
 # We need to append text here for making sure TPLs
 # we import are available for an installed Kokkos
-GLOBAL_RESET(KOKKOS_TPL_EXPORTS)
-# We need these for controlling the exact -std flag
-GLOBAL_RESET(KOKKOS_DONT_ALLOW_EXTENSIONS)
-GLOBAL_RESET(KOKKOS_USE_CXX_EXTENSIONS)
-GLOBAL_RESET(KOKKOS_CXX_STANDARD_FEATURE)
+GLOBAL_SET(KOKKOS_TPL_EXPORTS)
 
 # Include a set of Kokkos-specific wrapper functions that
 # will either call raw CMake or TriBITS
@@ -137,6 +144,9 @@ GLOBAL_RESET(KOKKOS_CXX_STANDARD_FEATURE)
 INCLUDE(${KOKKOS_SRC_PATH}/cmake/kokkos_tribits.cmake)
 
 
+# Check the environment and set certain variables
+# to allow platform-specific checks
+INCLUDE(${KOKKOS_SRC_PATH}/cmake/kokkos_check_env.cmake)
 # The build environment setup goes in the following steps
 # 1) Check all the enable options. This includes checking Kokkos_DEVICES
 # 2) Check the compiler ID (type and version)
@@ -187,14 +197,21 @@ IF (KOKKOS_HAS_TRILINOS)
   # Because Tribits doesn't use lists, it uses spaces for the list of CXX flags
   # we have to match the annoying behavior
   STRING(REPLACE ";" " " KOKKOSCORE_COMPILE_OPTIONS "${KOKKOS_COMPILE_OPTIONS}")
-  STRING(REPLACE ";" " " KOKKOSCORE_CUDA_OPTIONS    "${KOKKOS_CUDA_OPTIONS}")
-  FOREACH(CUDAFE_FLAG ${KOKKOS_CUDAFE_OPTIONS})
-    SET(KOKKOSCORE_CUDAFE_OPTIONS "${KOKKOSCORE_CUDAFE_OPTIONS} -Xcudafe ${CUDAFE_FLAG}")
-  ENDFOREACH()
+  LIST(APPEND KOKKOS_ALL_COMPILE_OPTIONS ${KOKKOS_COMPILE_OPTIONS})
+  LIST(APPEND KOKKOS_ALL_COMPILE_OPTIONS ${KOKKOS_CUDA_OPTIONS})
   FOREACH(XCOMP_FLAG ${KOKKOS_XCOMPILER_OPTIONS})
     SET(KOKKOSCORE_XCOMPILER_OPTIONS "${KOKKOSCORE_XCOMPILER_OPTIONS} -Xcompiler ${XCOMP_FLAG}")
+    LIST(APPEND KOKKOS_ALL_COMPILE_OPTIONS -Xcompiler ${XCOMP_FLAG})
   ENDFOREACH()
-  SET(KOKKOSCORE_CXX_FLAGS "${KOKKOSCORE_COMPILE_OPTIONS} ${CMAKE_CXX${KOKKOS_CXX_STANDARD}_STANDARD_COMPILE_OPTION} ${KOKKOSCORE_CUDA_OPTIONS} ${KOKKOSCORE_CUDAFE_OPTIONS} ${KOKKOSCORE_XCOMPILER_OPTIONS}")
+  SET(KOKKOSCORE_CXX_FLAGS "${KOKKOSCORE_COMPILE_OPTIONS} ${CMAKE_CXX${KOKKOS_CXX_STANDARD}_STANDARD_COMPILE_OPTION} ${KOKKOSCORE_XCOMPILER_OPTIONS}")
+  IF (KOKKOS_ENABLE_CUDA)
+    STRING(REPLACE ";" " " KOKKOSCORE_CUDA_OPTIONS    "${KOKKOS_CUDA_OPTIONS}")
+    FOREACH(CUDAFE_FLAG ${KOKKOS_CUDAFE_OPTIONS})
+      SET(KOKKOSCORE_CUDAFE_OPTIONS "${KOKKOSCORE_CUDAFE_OPTIONS} -Xcudafe ${CUDAFE_FLAG}")
+      LIST(APPEND KOKKOS_ALL_COMPILE_OPTIONS -Xcudafe ${CUDAFE_FLAG})
+    ENDFOREACH()
+    SET(KOKKOSCORE_CXX_FLAGS "${KOKKOSCORE_CXX_FLAGS} ${KOKKOSCORE_CUDA_OPTIONS} ${KOKKOSCORE_CUDAFE_OPTIONS}")
+  ENDIF()
   # Both parent scope and this package
   # In ProjectCompilerPostConfig.cmake, we capture the "global" flags Trilinos wants in
   # TRILINOS_TOPLEVEL_CXX_FLAGS
@@ -203,6 +220,8 @@ IF (KOKKOS_HAS_TRILINOS)
   #CMAKE_CXX_FLAGS will get added to Kokkos and Kokkos dependencies automatically here
   #These flags get set up in KOKKOS_PACKAGE_DECL, which means they
   #must be configured before KOKKOS_PACKAGE_DECL
+  SET(KOKKOS_ALL_COMPILE_OPTIONS
+    $<$<COMPILE_LANGUAGE:CXX>:${KOKKOS_ALL_COMPILE_OPTIONS}>)
 ENDIF()
 
 KOKKOS_PACKAGE_DECL()
@@ -250,7 +269,7 @@ INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/KokkosCore_config.h" DESTINATION ${CM
 IF (HAS_PARENT)
   FOREACH(DEV Kokkos_ENABLED_DEVICES)
     #I would much rather not make these cache variables or global properties, but I can't
-    #make any guarantees on whether PARENT_SCOPE is good enough to make 
+    #make any guarantees on whether PARENT_SCOPE is good enough to make
     #these variables visible where I need them
     SET(Kokkos_ENABLE_${DEV} ON PARENT_SCOPE)
     SET_PROPERTY(GLOBAL PROPERTY Kokkos_ENABLE_${DEV} ON)
diff --git a/kokkos/Copyright.txt b/kokkos/Copyright.txt
index 89f7daf06..5e2f8d864 100644
--- a/kokkos/Copyright.txt
+++ b/kokkos/Copyright.txt
@@ -1,13 +1,13 @@
 //@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:
@@ -23,10 +23,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -36,6 +36,6 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Questions? Contact Christian R. Trott (crtrott@sandia.gov)
-// 
+//
 // ************************************************************************
 //@HEADER
diff --git a/kokkos/LICENSE b/kokkos/LICENSE
index e2fe85c96..c6f17087d 100644
--- a/kokkos/LICENSE
+++ b/kokkos/LICENSE
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/Makefile.kokkos b/kokkos/Makefile.kokkos
index 77147d59c..afb3a371e 100644
--- a/kokkos/Makefile.kokkos
+++ b/kokkos/Makefile.kokkos
@@ -1,6 +1,11 @@
 # Default settings common options.
 
-# Options: Cuda,ROCm,OpenMP,Pthread,Qthreads,Serial
+KOKKOS_VERSION_MAJOR = 3
+KOKKOS_VERSION_MINOR = 1
+KOKKOS_VERSION_PATCH = 0
+KOKKOS_VERSION = $(shell echo $(KOKKOS_VERSION_MAJOR)*10000+$(KOKKOS_VERSION_MINOR)*100+$(KOKKOS_VERSION_PATCH) | bc)
+
+# Options: Cuda,HIP,ROCm,OpenMP,Pthread,Serial
 #KOKKOS_DEVICES ?= "OpenMP"
 KOKKOS_DEVICES ?= "Pthread"
 # Options: 
@@ -8,7 +13,7 @@ KOKKOS_DEVICES ?= "Pthread"
 # NVIDIA:   Kepler,Kepler30,Kepler32,Kepler35,Kepler37,Maxwell,Maxwell50,Maxwell52,Maxwell53,Pascal60,Pascal61,Volta70,Volta72,Turing75
 # ARM:      ARMv80,ARMv81,ARMv8-ThunderX,ARMv8-TX2
 # IBM:      BGQ,Power7,Power8,Power9
-# AMD-GPUS: Kaveri,Carrizo,Fiji,Vega
+# AMD-GPUS: Vega900,Vega906
 # AMD-CPUS: AMDAVX,Ryzen,EPYC
 KOKKOS_ARCH ?= ""
 # Options: yes,no
@@ -29,6 +34,9 @@ KOKKOS_STANDALONE_CMAKE ?= "no"
 # Options: force_uvm,use_ldg,rdc,enable_lambda,enable_constexpr
 KOKKOS_CUDA_OPTIONS ?= ""
 
+# Options: rdc
+KOKKOS_HIP_OPTIONS ?= ""
+
 # Default settings specific options.
 # Options: enable_async_dispatch
 KOKKOS_HPX_OPTIONS ?= ""
@@ -76,29 +84,50 @@ KOKKOS_INTERNAL_CUDA_USE_CONSTEXPR := $(call kokkos_has_string,$(KOKKOS_CUDA_OPT
 KOKKOS_INTERNAL_HPX_ENABLE_ASYNC_DISPATCH := $(call kokkos_has_string,$(KOKKOS_HPX_OPTIONS),enable_async_dispatch)
 KOKKOS_INTERNAL_ENABLE_ETI := $(call kokkos_has_string,$(KOKKOS_OPTIONS),enable_eti)
 
+KOKKOS_INTERNAL_HIP_USE_RELOC := $(call kokkos_has_string,$(KOKKOS_HIP_OPTIONS),rdc)
 
 # Check for Kokkos Host Execution Spaces one of which must be on.
 KOKKOS_INTERNAL_USE_OPENMP := $(call kokkos_has_string,$(subst OpenMPTarget,,$(KOKKOS_DEVICES)),OpenMP)
 KOKKOS_INTERNAL_USE_PTHREADS := $(call kokkos_has_string,$(KOKKOS_DEVICES),Pthread)
-KOKKOS_INTERNAL_USE_QTHREADS := $(call kokkos_has_string,$(KOKKOS_DEVICES),Qthreads)
 KOKKOS_INTERNAL_USE_HPX := $(call kokkos_has_string,$(KOKKOS_DEVICES),HPX)
 KOKKOS_INTERNAL_USE_SERIAL := $(call kokkos_has_string,$(KOKKOS_DEVICES),Serial)
 
 ifeq ($(KOKKOS_INTERNAL_USE_OPENMP), 0)
   ifeq ($(KOKKOS_INTERNAL_USE_PTHREADS), 0)
-    ifeq ($(KOKKOS_INTERNAL_USE_QTHREADS), 0)
-      ifeq ($(KOKKOS_INTERNAL_USE_HPX), 0)
-        KOKKOS_INTERNAL_USE_SERIAL := 1
-      endif
+    ifeq ($(KOKKOS_INTERNAL_USE_HPX), 0)
+      KOKKOS_INTERNAL_USE_SERIAL := 1
     endif
   endif
 endif
 
 # Check for other Execution Spaces.
 KOKKOS_INTERNAL_USE_CUDA := $(call kokkos_has_string,$(KOKKOS_DEVICES),Cuda)
-KOKKOS_INTERNAL_USE_ROCM := $(call kokkos_has_string,$(KOKKOS_DEVICES),ROCm)
+KOKKOS_INTERNAL_USE_HIP := $(call kokkos_has_string,$(KOKKOS_DEVICES),HIP)
 KOKKOS_INTERNAL_USE_OPENMPTARGET := $(call kokkos_has_string,$(KOKKOS_DEVICES),OpenMPTarget)
 
+KOKKOS_DEVICELIST =
+ifeq ($(KOKKOS_INTERNAL_USE_SERIAL), 1)
+  KOKKOS_DEVICELIST += Serial
+endif
+ifeq ($(KOKKOS_INTERNAL_USE_OPENMP), 1)
+  KOKKOS_DEVICELIST += OpenMP
+endif
+ifeq ($(KOKKOS_INTERNAL_USE_PTHREADS), 1)
+  KOKKOS_DEVICELIST += Threads
+endif
+ifeq ($(KOKKOS_INTERNAL_USE_HPX), 1)
+  KOKKOS_DEVICELIST += HPX
+endif
+ifeq ($(KOKKOS_INTERNAL_USE_CUDA), 1)
+  KOKKOS_DEVICELIST += Cuda
+endif
+ifeq ($(KOKKOS_INTERNAL_USE_HIP), 1)
+  KOKKOS_DEVICELIST += HIP
+endif
+ifeq ($(KOKKOS_INTERNAL_USE_OPENMPTARGET), 1)
+  KOKKOS_DEVICELIST += OPENMPTARGET
+endif
+
 ifeq ($(KOKKOS_INTERNAL_USE_CUDA), 1)
   KOKKOS_INTERNAL_NVCC_PATH := $(shell which nvcc)
   ifeq ($(origin CUDA_PATH), undefined)
@@ -122,10 +151,11 @@ KOKKOS_INTERNAL_COMPILER_INTEL       := $(call kokkos_has_string,$(KOKKOS_CXX_VE
 KOKKOS_INTERNAL_COMPILER_PGI         := $(call kokkos_has_string,$(KOKKOS_CXX_VERSION),PGI)
 KOKKOS_INTERNAL_COMPILER_XL          := $(strip $(shell $(CXX) -qversion       2>&1 | grep XL                  | wc -l))
 KOKKOS_INTERNAL_COMPILER_CRAY        := $(strip $(shell $(CXX) -craype-verbose 2>&1 | grep "CC-"               | wc -l))
-KOKKOS_INTERNAL_COMPILER_NVCC        := $(strip $(shell export OMPI_CXX=$(OMPI_CXX); export MPICH_CXX=$(MPICH_CXX); echo "$(shell $(CXX) --version 2>&1 | grep nvcc | wc -l)>0" | bc))
+KOKKOS_INTERNAL_COMPILER_NVCC        := $(strip $(shell echo "$(shell export OMPI_CXX=$(OMPI_CXX); export MPICH_CXX=$(MPICH_CXX); $(CXX) --version 2>&1 | grep nvcc | wc -l)>0" | bc))
 KOKKOS_INTERNAL_COMPILER_CLANG       := $(call kokkos_has_string,$(KOKKOS_CXX_VERSION),clang)
 KOKKOS_INTERNAL_COMPILER_APPLE_CLANG := $(call kokkos_has_string,$(KOKKOS_CXX_VERSION),Apple LLVM)
 KOKKOS_INTERNAL_COMPILER_HCC         := $(call kokkos_has_string,$(KOKKOS_CXX_VERSION),HCC)
+KOKKOS_INTERNAL_COMPILER_GCC         := $(call kokkos_has_string,$(KOKKOS_CXX_VERSION),GCC)
 
 # Check Host Compiler if using NVCC through nvcc_wrapper
 ifeq ($(KOKKOS_INTERNAL_COMPILER_NVCC), 1)
@@ -174,20 +204,20 @@ ifeq ($(KOKKOS_INTERNAL_ENABLE_COMPILER_WARNINGS), 1)
     KOKKOS_INTERNAL_COMPILER_WARNINGS =
   else
     ifeq ($(KOKKOS_INTERNAL_COMPILER_CLANG), 1)
-      KOKKOS_INTERNAL_COMPILER_WARNINGS = -Wall -Wshadow -pedantic -Wsign-compare -Wtype-limits -Wuninitialized
+      KOKKOS_INTERNAL_COMPILER_WARNINGS = -Wall -Wunused-parameter -Wshadow -pedantic -Wsign-compare -Wtype-limits -Wuninitialized
     else
       ifeq ($(KOKKOS_INTERNAL_COMPILER_APPLE_CLANG), 1)
-        KOKKOS_INTERNAL_COMPILER_WARNINGS = -Wall -Wshadow -pedantic -Wsign-compare -Wtype-limits -Wuninitialized
+        KOKKOS_INTERNAL_COMPILER_WARNINGS = -Wall -Wunused-parameter -Wshadow -pedantic -Wsign-compare -Wtype-limits -Wuninitialized
       else
         ifeq ($(KOKKOS_INTERNAL_COMPILER_XL), 1)
-          KOKKOS_INTERNAL_COMPILER_WARNINGS = -Wall -Wshadow -pedantic -Wsign-compare -Wtype-limits -Wuninitialized
+          KOKKOS_INTERNAL_COMPILER_WARNINGS = -Wall -Wunused-parameter -Wshadow -pedantic -Wsign-compare -Wtype-limits -Wuninitialized
         else
           ifeq ($(KOKKOS_INTERNAL_COMPILER_CRAY), 1)
             # TODO check if cray accepts GNU style warnings
             KOKKOS_INTERNAL_COMPILER_WARNINGS =
           else
             #gcc
-            KOKKOS_INTERNAL_COMPILER_WARNINGS = -Wall -Wshadow -pedantic -Wsign-compare -Wtype-limits -Wignored-qualifiers -Wempty-body -Wclobbered -Wuninitialized
+            KOKKOS_INTERNAL_COMPILER_WARNINGS = -Wall -Wunused-parameter -Wshadow -pedantic -Wsign-compare -Wtype-limits -Wignored-qualifiers -Wempty-body -Wclobbered -Wuninitialized
           endif
         endif
       endif
@@ -224,7 +254,12 @@ ifeq ($(KOKKOS_INTERNAL_COMPILER_XL), 1)
   KOKKOS_INTERNAL_OPENMPTARGET_FLAG := -DKOKKOS_IBM_XL_OMP45_WORKAROUND -qsmp=omp -qoffload -qnoeh
 else
   ifeq ($(KOKKOS_INTERNAL_COMPILER_CLANG), 1)
-    KOKKOS_INTERNAL_OPENMPTARGET_FLAG := -DKOKKOS_BUG_WORKAROUND_IBM_CLANG_OMP45_VIEW_INIT -fopenmp-implicit-declare-target -fopenmp-targets=nvptx64-nvidia-cuda -fopenmp -fopenmp=libomp
+    #KOKKOS_INTERNAL_OPENMPTARGET_FLAG := -DKOKKOS_BUG_WORKAROUND_IBM_CLANG_OMP45_VIEW_INIT -fopenmp-implicit-declare-target -fopenmp-targets=nvptx64-nvidia-cuda -fopenmp -fopenmp=libomp
+    KOKKOS_INTERNAL_OPENMPTARGET_FLAG := -DKOKKOS_WORKAROUND_OPENMPTARGET_CLANG -fopenmp -fopenmp=libomp
+    KOKKOS_INTERNAL_OPENMPTARGET_LIB := -lomptarget
+  else
+    #Assume GCC
+    KOKKOS_INTERNAL_OPENMPTARGET_FLAG := -fopenmp -foffload=nvptx-none
   endif
 endif
 
@@ -347,11 +382,8 @@ KOKKOS_INTERNAL_USE_ARCH_IBM := $(strip $(shell echo $(KOKKOS_INTERNAL_USE_ARCH_
 KOKKOS_INTERNAL_USE_ARCH_AMDAVX := $(call kokkos_has_string,$(KOKKOS_ARCH),AMDAVX)
 KOKKOS_INTERNAL_USE_ARCH_RYZEN := $(call kokkos_has_string,$(KOKKOS_ARCH),Ryzen)
 KOKKOS_INTERNAL_USE_ARCH_EPYC := $(call kokkos_has_string,$(KOKKOS_ARCH),EPYC)
-KOKKOS_INTERNAL_USE_ARCH_KAVERI := $(call kokkos_has_string,$(KOKKOS_ARCH),Kaveri)
-KOKKOS_INTERNAL_USE_ARCH_CARRIZO := $(call kokkos_has_string,$(KOKKOS_ARCH),Carrizo)
-KOKKOS_INTERNAL_USE_ARCH_FIJI := $(call kokkos_has_string,$(KOKKOS_ARCH),Fiji)
-KOKKOS_INTERNAL_USE_ARCH_VEGA := $(call kokkos_has_string,$(KOKKOS_ARCH),Vega)
-KOKKOS_INTERNAL_USE_ARCH_GFX901 := $(call kokkos_has_string,$(KOKKOS_ARCH),gfx901)
+KOKKOS_INTERNAL_USE_ARCH_VEGA900 := $(call kokkos_has_string,$(KOKKOS_ARCH),Vega900)
+KOKKOS_INTERNAL_USE_ARCH_VEGA906 := $(call kokkos_has_string,$(KOKKOS_ARCH),Vega906)
 
 # Any AVX?
 KOKKOS_INTERNAL_USE_ARCH_SSE42      := $(shell expr $(KOKKOS_INTERNAL_USE_ARCH_WSM))
@@ -424,6 +456,10 @@ tmp := $(call kokkos_append_header,'\#error "Do not include $(KOKKOS_CONFIG_HEAD
 tmp := $(call kokkos_append_header,'\#else')
 tmp := $(call kokkos_append_header,'\#define KOKKOS_CORE_CONFIG_H')
 tmp := $(call kokkos_append_header,'\#endif')
+
+tmp := $(call kokkos_append_header,"")
+tmp := $(call kokkos_append_header,"\#define KOKKOS_VERSION $(KOKKOS_VERSION)")
+tmp := $(call kokkos_append_header,"")
 	
 tmp := $(call kokkos_append_header,"/* Execution Spaces */")
 
@@ -436,9 +472,15 @@ ifeq ($(KOKKOS_INTERNAL_USE_ROCM), 1)
   tmp := $(call kokkos_append_header,'\#define KOKKOS_ENABLE_ROCM')
   tmp := $(call kokkos_append_header,'\#define KOKKOS_IMPL_ROCM_CLANG_WORKAROUND 1')
 endif
+ifeq ($(KOKKOS_INTERNAL_USE_HIP), 1)
+  tmp := $(call kokkos_append_header,'\#define KOKKOS_ENABLE_HIP')
+endif
 
 ifeq ($(KOKKOS_INTERNAL_USE_OPENMPTARGET), 1)
   tmp := $(call kokkos_append_header,'\#define KOKKOS_ENABLE_OPENMPTARGET')
+  ifeq ($(KOKKOS_INTERNAL_COMPILER_GCC), 1)
+  tmp := $(call kokkos_append_header,"\#define KOKKOS_WORKAROUND_OPENMPTARGET_GCC")
+  endif
 endif
 
 ifeq ($(KOKKOS_INTERNAL_USE_OPENMP), 1)
@@ -449,10 +491,6 @@ ifeq ($(KOKKOS_INTERNAL_USE_PTHREADS), 1)
   tmp := $(call kokkos_append_header,"\#define KOKKOS_ENABLE_THREADS")
 endif
 
-ifeq ($(KOKKOS_INTERNAL_USE_QTHREADS), 1)
-  tmp := $(call kokkos_append_header,"\#define KOKKOS_ENABLE_QTHREADS")
-endif
-
 ifeq ($(KOKKOS_INTERNAL_USE_HPX), 1)
   tmp := $(call kokkos_append_header,"\#define KOKKOS_ENABLE_HPX")
 endif
@@ -960,6 +998,14 @@ endif
 
 # Figure out the architecture flag for Cuda.
 ifeq ($(KOKKOS_INTERNAL_USE_CUDA), 1)
+   KOKKOS_INTERNAL_USE_CUDA_ARCH=1
+endif
+ifeq ($(KOKKOS_INTERNAL_USE_HIP), 1)
+   ifeq ($(KOKKOS_INTERNAL_COMPILER_NVCC), 1)
+     KOKKOS_INTERNAL_USE_CUDA_ARCH=1
+   endif
+endif
+ifeq ($(KOKKOS_INTERNAL_USE_CUDA_ARCH), 1)
   ifeq ($(KOKKOS_INTERNAL_COMPILER_NVCC), 1)
     KOKKOS_INTERNAL_CUDA_ARCH_FLAG=-arch
   else ifeq ($(KOKKOS_INTERNAL_COMPILER_CLANG), 1)
@@ -968,7 +1014,17 @@ ifeq ($(KOKKOS_INTERNAL_USE_CUDA), 1)
   else
     $(error Makefile.kokkos: CUDA is enabled but the compiler is neither NVCC nor Clang (got version string $(KOKKOS_CXX_VERSION)) )
   endif
+  KOKKOS_INTERNAL_USE_CUDA_ARCH = 1
+endif
 
+ifeq ($(KOKKOS_INTERNAL_USE_OPENMPTARGET), 1)
+  ifeq ($(KOKKOS_INTERNAL_COMPILER_CLANG), 1)
+    KOKKOS_INTERNAL_CUDA_ARCH_FLAG=-fopenmp-targets=nvptx64-nvidia-cuda -Xopenmp-target -march
+  endif
+  KOKKOS_INTERNAL_USE_CUDA_ARCH = 1
+endif
+
+ifeq ($(KOKKOS_INTERNAL_USE_CUDA_ARCH), 1)
   ifeq ($(KOKKOS_INTERNAL_USE_ARCH_KEPLER30), 1)
     tmp := $(call kokkos_append_header,"\#define KOKKOS_ARCH_KEPLER")
     tmp := $(call kokkos_append_header,"\#define KOKKOS_ARCH_KEPLER30")
@@ -1036,55 +1092,49 @@ ifeq ($(KOKKOS_INTERNAL_USE_CUDA), 1)
     ifeq ($(KOKKOS_INTERNAL_COMPILER_NVCC), 1)
       KOKKOS_LDFLAGS += $(KOKKOS_INTERNAL_CUDA_ARCH_FLAG)
     endif
+    ifeq ($(KOKKOS_INTERNAL_COMPILER_CLANG), 1)
+      ifeq ($(KOKKOS_INTERNAL_USE_OPENMPTARGET), 1)
+        KOKKOS_LDFLAGS += $(KOKKOS_INTERNAL_CUDA_ARCH_FLAG)
+      endif
+    endif
+  endif
+  ifeq ($(KOKKOS_INTERNAL_USE_HIP), 1)
+    KOKKOS_CXXFLAGS += --expt-extended-lambda
   endif
 endif
 
+
 # Figure out the architecture flag for ROCm.
-ifeq ($(KOKKOS_INTERNAL_USE_ROCM), 1)
+ifeq ($(KOKKOS_INTERNAL_USE_HIP), 1)
   # Lets start with adding architecture defines
-  ifeq ($(KOKKOS_INTERNAL_USE_ARCH_KAVERI), 1)
-    tmp := $(call kokkos_append_header,"\#define KOKKOS_ARCH_ROCM 701")
-    tmp := $(call kokkos_append_header,"\#define KOKKOS_ARCH_KAVERI")
-    KOKKOS_INTERNAL_ROCM_ARCH_FLAG := --amdgpu-target=gfx701 
-  endif
-  ifeq ($(KOKKOS_INTERNAL_USE_ARCH_CARRIZO), 1)
-    tmp := $(call kokkos_append_header,"\#define KOKKOS_ARCH_ROCM 801")
-    tmp := $(call kokkos_append_header,"\#define KOKKOS_ARCH_CARRIZO")
-    KOKKOS_INTERNAL_ROCM_ARCH_FLAG := --amdgpu-target=gfx801 
-  endif
-  ifeq ($(KOKKOS_INTERNAL_USE_ARCH_FIJI), 1)
-    tmp := $(call kokkos_append_header,"\#define KOKKOS_ARCH_ROCM 803")
-    tmp := $(call kokkos_append_header,"\#define KOKKOS_ARCH_FIJI")
-    KOKKOS_INTERNAL_ROCM_ARCH_FLAG := --amdgpu-target=gfx803
+  ifeq ($(KOKKOS_INTERNAL_USE_ARCH_VEGA900), 1)
+    tmp := $(call kokkos_append_header,"\#define KOKKOS_ARCH_HIP 900")
+    tmp := $(call kokkos_append_header,"\#define KOKKOS_ARCH_VEGA900")
+    KOKKOS_INTERNAL_HIP_ARCH_FLAG := --amdgpu-target=gfx900
   endif
-  ifeq ($(KOKKOS_INTERNAL_USE_ARCH_VEGA), 1)
-    tmp := $(call kokkos_append_header,"\#define KOKKOS_ARCH_ROCM 900")
-    tmp := $(call kokkos_append_header,"\#define KOKKOS_ARCH_VEGA")
-    KOKKOS_INTERNAL_ROCM_ARCH_FLAG := --amdgpu-target=gfx900 
+  ifeq ($(KOKKOS_INTERNAL_USE_ARCH_VEGA906), 1)
+    tmp := $(call kokkos_append_header,"\#define KOKKOS_ARCH_HIP 906")
+    tmp := $(call kokkos_append_header,"\#define KOKKOS_ARCH_VEGA906")
+    KOKKOS_INTERNAL_HIP_ARCH_FLAG := --amdgpu-target=gfx906
   endif
-  ifeq ($(KOKKOS_INTERNAL_USE_ARCH_GFX901), 1)
-    tmp := $(call kokkos_append_header,"\#define KOKKOS_ARCH_ROCM 901")
-    tmp := $(call kokkos_append_header,"\#define KOKKOS_ARCH_GFX901")
-    KOKKOS_INTERNAL_ROCM_ARCH_FLAG := --amdgpu-target=gfx901 
+
+  KOKKOS_SRC += $(wildcard $(KOKKOS_PATH)/core/src/HIP/*.cpp)
+  KOKKOS_HEADERS += $(wildcard $(KOKKOS_PATH)/core/src/HIP/*.hpp)
+
+  KOKKOS_CXXFLAGS+=$(KOKKOS_INTERNAL_HIP_ARCH_FLAG)
+  KOKKOS_LDFLAGS+=$(KOKKOS_INTERNAL_HIP_ARCH_FLAG)
+
+  ifeq ($(KOKKOS_INTERNAL_HIP_USE_RELOC), 1)
+    tmp := $(call kokkos_append_header,"\#define KOKKOS_ENABLE_HIP_RELOCATABLE_DEVICE_CODE")
+    KOKKOS_CXXFLAGS+=-fgpu-rdc
+    KOKKOS_LDFLAGS+=-fgpu-rdc
+  else
+    KOKKOS_CXXFLAGS+=-fno-gpu-rdc
+    KOKKOS_LDFLAGS+=-fno-gpu-rdc
   endif
- 
-  
-  KOKKOS_INTERNAL_HCC_PATH := $(shell which $(CXX))
-  ROCM_HCC_PATH ?= $(KOKKOS_INTERNAL_HCC_PATH:/bin/clang++=)
-
-  KOKKOS_CXXFLAGS += $(shell $(ROCM_HCC_PATH)/bin/hcc-config --cxxflags) 
-  KOKKOS_LDFLAGS += $(shell $(ROCM_HCC_PATH)/bin/hcc-config --ldflags) -lhc_am -lm 
-  KOKKOS_CXXLDFLAGS += $(shell $(ROCM_HCC_PATH)/bin/hcc-config --ldflags) -lhc_am -lm
-  KOKKOS_TPL_LIBRARY_NAMES += hc_am m
-  KOKKOS_LDFLAGS += $(KOKKOS_INTERNAL_ROCM_ARCH_FLAG)
-
-  KOKKOS_SRC += $(wildcard $(KOKKOS_PATH)/core/src/ROCm/*.cpp)
-ifeq ($(KOKKOS_INTERNAL_ENABLE_ETI), 1)
-  KOKKOS_SRC += $(wildcard $(KOKKOS_ETI_PATH)/ROCm/*.cpp)
-endif
-  KOKKOS_HEADERS += $(wildcard $(KOKKOS_PATH)/core/src/ROCm/*.hpp)
 endif
 
+
 KOKKOS_INTERNAL_LS_CONFIG := $(shell ls KokkosCore_config.h 2>&1)
 
 ifeq ($(KOKKOS_INTERNAL_LS_CONFIG), KokkosCore_config.h)
@@ -1135,7 +1185,7 @@ endif
 endif
 
 ifeq ($(KOKKOS_INTERNAL_USE_OPENMPTARGET), 1)
-  KOKKOS_SRC += $(KOKKOS_PATH)/core/src/OpenMPTarget/Kokkos_OpenMPTarget_Exec.cpp $(KOKKOS_PATH)/core/src/OpenMPTarget/Kokkos_OpenMPTargetSpace.cpp
+  KOKKOS_SRC += $(wildcard $(KOKKOS_PATH)/core/src/OpenMPTarget/*.cpp)
   KOKKOS_HEADERS += $(wildcard $(KOKKOS_PATH)/core/src/OpenMPTarget/*.hpp)
   ifeq ($(KOKKOS_INTERNAL_USE_CUDA), 1)
     KOKKOS_CXXFLAGS += -Xcompiler $(KOKKOS_INTERNAL_OPENMPTARGET_FLAG)
@@ -1143,6 +1193,7 @@ ifeq ($(KOKKOS_INTERNAL_USE_OPENMPTARGET), 1)
     KOKKOS_CXXFLAGS += $(KOKKOS_INTERNAL_OPENMPTARGET_FLAG)
   endif
   KOKKOS_LDFLAGS += $(KOKKOS_INTERNAL_OPENMPTARGET_FLAG)
+  KOKKOS_LIBS += $(KOKKOS_INTERNAL_OPENMPTARGET_LIB)
 endif
 
 ifeq ($(KOKKOS_INTERNAL_USE_OPENMP), 1)
@@ -1172,22 +1223,6 @@ endif
   KOKKOS_TPL_LIBRARY_NAMES += pthread
 endif
 
-ifeq ($(KOKKOS_INTERNAL_USE_QTHREADS), 1)
-  KOKKOS_SRC += $(wildcard $(KOKKOS_PATH)/core/src/Qthreads/*.cpp)
-  KOKKOS_HEADERS += $(wildcard $(KOKKOS_PATH)/core/src/Qthreads/*.hpp)
-  ifneq ($(KOKKOS_CMAKE), yes)
-    ifneq ($(QTHREADS_PATH),)
-      KOKKOS_CPPFLAGS += -I$(QTHREADS_PATH)/include
-      KOKKOS_LIBDIRS += -L$(QTHREADS_PATH)/lib
-      KOKKOS_CXXLDFLAGS += -L$(QTHREADS_PATH)/lib
-      KOKKOS_TPL_INCLUDE_DIRS += $(QTHREADS_PATH)/include
-      KOKKOS_TPL_LIBRARY_DIRS += $(QTHREADS_PATH)/lib64
-    endif
-    KOKKOS_LIBS += -lqthread
-    KOKKOS_TPL_LIBRARY_NAMES += qthread
-  endif
-endif
-
 ifeq ($(KOKKOS_INTERNAL_USE_HPX), 1)
   KOKKOS_SRC += $(wildcard $(KOKKOS_PATH)/core/src/HPX/*.cpp)
   KOKKOS_HEADERS += $(wildcard $(KOKKOS_PATH)/core/src/HPX/*.hpp)
diff --git a/kokkos/Makefile.targets b/kokkos/Makefile.targets
index 0a1f52201..18e37a71f 100644
--- a/kokkos/Makefile.targets
+++ b/kokkos/Makefile.targets
@@ -55,6 +55,17 @@ ifeq ($(KOKKOS_INTERNAL_ENABLE_ETI), 1)
 endif
 endif
 
+ifeq ($(KOKKOS_INTERNAL_USE_HIP), 1)
+Kokkos_HIP_Space.o: $(KOKKOS_CPP_DEPENDS) $(KOKKOS_PATH)/core/src/HIP/Kokkos_HIP_Space.cpp
+	$(CXX) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) $(CXXFLAGS) -c $(KOKKOS_PATH)/core/src/HIP/Kokkos_HIP_Space.cpp
+Kokkos_HIP_Instance.o: $(KOKKOS_CPP_DEPENDS) $(KOKKOS_PATH)/core/src/HIP/Kokkos_HIP_Instance.cpp
+	$(CXX) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) $(CXXFLAGS) -c $(KOKKOS_PATH)/core/src/HIP/Kokkos_HIP_Instance.cpp
+Kokkos_HIP_KernelLaunch.o: $(KOKKOS_CPP_DEPENDS) $(KOKKOS_PATH)/core/src/HIP/Kokkos_HIP_KernelLaunch.cpp
+	$(CXX) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) $(CXXFLAGS) -c $(KOKKOS_PATH)/core/src/HIP/Kokkos_HIP_KernelLaunch.cpp
+Kokkos_HIP_Locks.o: $(KOKKOS_CPP_DEPENDS) $(KOKKOS_PATH)/core/src/HIP/Kokkos_HIP_Locks.cpp
+	$(CXX) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) $(CXXFLAGS) -c $(KOKKOS_PATH)/core/src/HIP/Kokkos_HIP_Locks.cpp
+endif
+
 ifeq ($(KOKKOS_INTERNAL_USE_ROCM), 1)
 Kokkos_ROCm_Exec.o: $(KOKKOS_CPP_DEPENDS) $(KOKKOS_PATH)/core/src/ROCm/Kokkos_ROCm_Exec.cpp
 	$(CXX) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) $(CXXFLAGS) -c $(KOKKOS_PATH)/core/src/ROCm/Kokkos_ROCm_Exec.cpp
@@ -79,13 +90,6 @@ ifeq ($(KOKKOS_INTERNAL_ENABLE_ETI), 1)
 endif
 endif
 
-ifeq ($(KOKKOS_INTERNAL_USE_QTHREADS), 1)
-Kokkos_QthreadsExec.o: $(KOKKOS_CPP_DEPENDS) $(KOKKOS_PATH)/core/src/Qthreads/Kokkos_QthreadsExec.cpp
-	$(CXX) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) $(CXXFLAGS) -c $(KOKKOS_PATH)/core/src/Qthreads/Kokkos_QthreadsExec.cpp
-Kokkos_Qthreads_Task.o: $(KOKKOS_CPP_DEPENDS) $(KOKKOS_PATH)/core/src/Qthreads/Kokkos_Qthreads_Task.cpp
-	$(CXX) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) $(CXXFLAGS) -c $(KOKKOS_PATH)/core/src/Qthreads/Kokkos_Qthreads_Task.cpp
-endif
-
 ifeq ($(KOKKOS_INTERNAL_USE_OPENMP), 1)
 Kokkos_OpenMP_Exec.o: $(KOKKOS_CPP_DEPENDS) $(KOKKOS_PATH)/core/src/OpenMP/Kokkos_OpenMP_Exec.cpp
 	$(CXX) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) $(CXXFLAGS) -c $(KOKKOS_PATH)/core/src/OpenMP/Kokkos_OpenMP_Exec.cpp
@@ -106,10 +110,12 @@ endif
 ifeq ($(KOKKOS_INTERNAL_USE_OPENMPTARGET), 1)
 Kokkos_OpenMPTarget_Exec.o: $(KOKKOS_CPP_DEPENDS) $(KOKKOS_PATH)/core/src/OpenMPTarget/Kokkos_OpenMPTarget_Exec.cpp
 	$(CXX) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) $(CXXFLAGS) -c $(KOKKOS_PATH)/core/src/OpenMPTarget/Kokkos_OpenMPTarget_Exec.cpp
+Kokkos_OpenMPTarget_Instance.o: $(KOKKOS_CPP_DEPENDS) $(KOKKOS_PATH)/core/src/OpenMPTarget/Kokkos_OpenMPTarget_Instance.cpp
+	$(CXX) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) $(CXXFLAGS) -c $(KOKKOS_PATH)/core/src/OpenMPTarget/Kokkos_OpenMPTarget_Instance.cpp
 Kokkos_OpenMPTargetSpace.o: $(KOKKOS_CPP_DEPENDS) $(KOKKOS_PATH)/core/src/OpenMPTarget/Kokkos_OpenMPTargetSpace.cpp
 	$(CXX) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) $(CXXFLAGS) -c $(KOKKOS_PATH)/core/src/OpenMPTarget/Kokkos_OpenMPTargetSpace.cpp
-#Kokkos_OpenMPTarget_Task.o: $(KOKKOS_CPP_DEPENDS) $(KOKKOS_PATH)/core/src/OpenMPTarget/Kokkos_OpenMPTarget_Task.cpp
-#       $(CXX) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) $(CXXFLAGS) -c $(KOKKOS_PATH)/core/src/OpenMPTarget/Kokkos_OpenMPTarget_Task.cpp
+Kokkos_OpenMPTarget_Task.o: $(KOKKOS_CPP_DEPENDS) $(KOKKOS_PATH)/core/src/OpenMPTarget/Kokkos_OpenMPTarget_Task.cpp
+	$(CXX) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) $(CXXFLAGS) -c $(KOKKOS_PATH)/core/src/OpenMPTarget/Kokkos_OpenMPTarget_Task.cpp
 endif
 
 Kokkos_HBWSpace.o: $(KOKKOS_CPP_DEPENDS) $(KOKKOS_PATH)/core/src/impl/Kokkos_HBWSpace.cpp
diff --git a/kokkos/README.md b/kokkos/README.md
index 322dabfda..a04df9eb9 100644
--- a/kokkos/README.md
+++ b/kokkos/README.md
@@ -11,8 +11,8 @@ CUDA, HPX, OpenMP and Pthreads as backend programming models with several other
 backends in development.
 
 Kokkos Core is part of the Kokkos C++ Performance Portability Programming EcoSystem,
-which also provides math kernels (https://github.com/kokkos/kokkos-kernels), as well as 
-profiling and debugging tools (https://github.com/kokkos/kokkos-tools).  
+which also provides math kernels (https://github.com/kokkos/kokkos-kernels), as well as
+profiling and debugging tools (https://github.com/kokkos/kokkos-tools).
 
 # Learning about Kokkos
 
@@ -23,7 +23,7 @@ For questions find us on Slack: https://kokkosteam.slack.com or open a github is
 For non-public questions send an email to
 crtrott(at)sandia.gov
 
-A separate repository with extensive tutorial material can be found under 
+A separate repository with extensive tutorial material can be found under
 https://github.com/kokkos/kokkos-tutorials.
 
 Furthermore, the 'example/tutorial' directory provides step by step tutorial
@@ -41,12 +41,12 @@ To learn more about Kokkos consider watching one of our presentations:
 
 # Contributing to Kokkos
 
-We are open and try to encourage contributions from external developers. 
+We are open and try to encourage contributions from external developers.
 To do so please first open an issue describing the contribution and then issue
 a pull request against the develop branch. For larger features it may be good
-to get guidance from the core development team first through the github issue. 
+to get guidance from the core development team first through the github issue.
 
-Note that Kokkos Core is licensed under standard 3-clause BSD terms of use. 
+Note that Kokkos Core is licensed under standard 3-clause BSD terms of use.
 Which means contributing to Kokkos allows anyone else to use your contributions
 not just for public purposes but also for closed source commercial projects.
 For specifics see the LICENSE file contained in the repository or distribution.
@@ -94,9 +94,9 @@ For specifics see the LICENSE file contained in the repository or distribution.
 * Intel 18.2.199 (with gcc 4.9.3)
 
 ### Primary tested compilers on ARM (Cavium ThunderX2)
-* GCC 7.2.0 
+* GCC 7.2.0
 * ARM/Clang 18.4.0
-  
+
 ### Other compilers working:
 * X86:
     * Cygwin 2.1.0 64bit with gcc 4.9.3
@@ -110,47 +110,47 @@ For specifics see the LICENSE file contained in the repository or distribution.
 
 
 Primary tested compiler are passing in release mode
-with warnings as errors. They also are tested with a comprehensive set of 
+with warnings as errors. They also are tested with a comprehensive set of
 backend combinations (i.e. OpenMP, Pthreads, Serial, OpenMP+Serial, ...).
 We are using the following set of flags:
-* GCC:   
+* GCC:
    ````
-      -Wall -Wshadow -pedantic 
+      -Wall -Wunused-parameter -Wshadow -pedantic
       -Werror -Wsign-compare -Wtype-limits
-      -Wignored-qualifiers -Wempty-body 
+      -Wignored-qualifiers -Wempty-body
       -Wclobbered -Wuninitialized
    ````
-* Intel: 
+* Intel:
     ````
-      -Wall -Wshadow -pedantic 
-      -Werror -Wsign-compare -Wtype-limits 
+      -Wall -Wunused-parameter -Wshadow -pedantic
+      -Werror -Wsign-compare -Wtype-limits
       -Wuninitialized
     ````
-* Clang: 
+* Clang:
     ````
-      -Wall -Wshadow -pedantic 
-      -Werror -Wsign-compare -Wtype-limits 
+      -Wall -Wunused-parameter -Wshadow -pedantic
+      -Werror -Wsign-compare -Wtype-limits
       -Wuninitialized
-    ````    
+    ````
 
-* NVCC:  
+* NVCC:
   ````
-    -Wall -Wshadow -pedantic 
-    -Werror -Wsign-compare -Wtype-limits 
+    -Wall -Wunused-parameter -Wshadow -pedantic
+    -Werror -Wsign-compare -Wtype-limits
     -Wuninitialized
   ````
 
-Other compilers are tested occasionally, in particular when pushing from develop to 
+Other compilers are tested occasionally, in particular when pushing from develop to
 master branch. These are tested less rigorously without `-Werror` and only for a select set of backends.
 
 # Building and Installing Kokkos
-Kokkos provide a CMake build system and a raw Makefile build system. 
+Kokkos provide a CMake build system and a raw Makefile build system.
 The CMake build system is strongly encouraged and will be the most rigorously supported in future releases.
 Full details are given in the [build instructions](BUILD.md). Basic setups are shown here:
 
 ## CMake
 
-The best way to install Kokkos is using the CMake build system. Assuming Kokkos lives in `$srcdir`: 
+The best way to install Kokkos is using the CMake build system. Assuming Kokkos lives in `$srcdir`:
 ````
 cmake $srcdir \
   -DCMAKE_CXX_COMPILER=$path_to_compiler \
@@ -162,9 +162,9 @@ cmake $srcdir \
 ````
 then simply type `make install`. The Kokkos CMake package will then be installed in `$path_to_install` to be used by downstream packages.
 
-To validate the Kokkos build, configure with 
+To validate the Kokkos build, configure with
 ````
- -DKokkos_ENABLE_TESTS=On 
+ -DKokkos_ENABLE_TESTS=On
 ````
 and run `make test` after completing the build.
 
@@ -209,7 +209,7 @@ For a complete list of Kokkos options, run:
 spack info kokkos
 ````
 Spack currently installs packages to a location determined by a unique hash. This hash name is not really "human readable".
-Generally, Spack usage should never really require you to reference the computer-generated unique install folder. 
+Generally, Spack usage should never really require you to reference the computer-generated unique install folder.
 More details are given in the [build instructions](BUILD.md). If you must know, you can locate Spack Kokkos installations with:
 ````
 spack find -p kokkos ...
@@ -217,7 +217,7 @@ spack find -p kokkos ...
 where `...` is the unique spec identifying the particular Kokkos configuration and version.
 
 
-## Raw Makefile 
+## Raw Makefile
 A bash script is provided to generate raw makefiles.
 To install Kokkos as a library create a build directory and run the following
 ````
@@ -240,33 +240,33 @@ changing the device type for which to build.
 For individual projects, it may be preferable to build Kokkos inline rather than link to an installed package.
 The main reason is that you may otherwise need many different
 configurations of Kokkos installed depending on the required compile time
-features an application needs. For example there is only one default 
+features an application needs. For example there is only one default
 execution space, which means you need different installations to have OpenMP
 or Pthreads as the default space. Also for the CUDA backend there are certain
-choices, such as allowing relocatable device code, which must be made at 
+choices, such as allowing relocatable device code, which must be made at
 installation time. Building Kokkos inline uses largely the same process
-as compiling an application against an installed Kokkos library. 
+as compiling an application against an installed Kokkos library.
 
 For CMake, this means copying over the Kokkos source code into your project and adding `add_subdirectory(kokkos)` to your CMakeLists.txt.
 
-For raw Makefiles, see the example benchmarks/bytes_and_flops/Makefile which can be used with an installed library and or an inline build.  
+For raw Makefiles, see the example benchmarks/bytes_and_flops/Makefile which can be used with an installed library and or an inline build.
 
 # Kokkos and CUDA UVM
 
-Kokkos does support UVM as a specific memory space called CudaUVMSpace. 
-Allocations made with that space are accessible from host and device. 
+Kokkos does support UVM as a specific memory space called CudaUVMSpace.
+Allocations made with that space are accessible from host and device.
 You can tell Kokkos to use that as the default space for Cuda allocations.
 In either case UVM comes with a number of restrictions:
-* You can't access allocations on the host while a kernel is potentially 
-running. This will lead to segfaults. To avoid that you either need to 
+* You can't access allocations on the host while a kernel is potentially
+running. This will lead to segfaults. To avoid that you either need to
 call Kokkos::Cuda::fence() (or just Kokkos::fence()), after kernels, or
 you can set the environment variable CUDA_LAUNCH_BLOCKING=1.
-* In multi socket multi GPU machines without NVLINK, UVM defaults 
+* In multi socket multi GPU machines without NVLINK, UVM defaults
 to using zero copy allocations for technical reasons related to using multiple
 GPUs from the same process. If an executable doesn't do that (e.g. each
-MPI rank of an application uses a single GPU [can be the same GPU for 
+MPI rank of an application uses a single GPU [can be the same GPU for
 multiple MPI ranks]) you can set CUDA_MANAGED_FORCE_DEVICE_ALLOC=1.
-This will enforce proper UVM allocations, but can lead to errors if 
+This will enforce proper UVM allocations, but can lead to errors if
 more than a single GPU is used by a single process.
 
 
diff --git a/kokkos/algorithms/src/Kokkos_Random.hpp b/kokkos/algorithms/src/Kokkos_Random.hpp
index 52510f1cd..0a7967523 100644
--- a/kokkos/algorithms/src/Kokkos_Random.hpp
+++ b/kokkos/algorithms/src/Kokkos_Random.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -537,6 +537,145 @@ struct rand<Generator, Kokkos::complex<double> > {
   }
 };
 
+template <class DeviceType>
+class Random_XorShift1024_Pool;
+
+namespace Impl {
+
+template <bool UseCArrayState>
+struct Random_XorShift1024_State {
+  uint64_t state_[16];
+  KOKKOS_DEFAULTED_FUNCTION
+  Random_XorShift1024_State() = default;
+
+  template <class StateViewType>
+  KOKKOS_FUNCTION Random_XorShift1024_State(const StateViewType& v,
+                                            int state_idx) {
+    for (int i = 0; i < 16; i++) state_[i] = v(state_idx, i);
+  }
+
+  KOKKOS_FUNCTION
+  uint64_t operator[](const int i) const { return state_[i]; }
+
+  KOKKOS_FUNCTION
+  uint64_t& operator[](const int i) { return state_[i]; }
+};
+
+template <>
+struct Random_XorShift1024_State<false> {
+  uint64_t* state_;
+  const int stride_;
+  KOKKOS_FUNCTION
+  Random_XorShift1024_State() : state_(nullptr), stride_(1){};
+
+  template <class StateViewType>
+  KOKKOS_FUNCTION Random_XorShift1024_State(const StateViewType& v,
+                                            int state_idx)
+      : state_(&v(state_idx, 0)), stride_(v.stride_1()) {}
+
+  KOKKOS_FUNCTION
+  uint64_t operator[](const int i) const { return state_[i * stride_]; }
+
+  KOKKOS_FUNCTION
+  uint64_t& operator[](const int i) { return state_[i * stride_]; }
+};
+
+template <class ExecutionSpace>
+struct Random_XorShift1024_UseCArrayState : std::true_type {};
+
+#ifdef KOKKOS_ENABLE_CUDA
+template <>
+struct Random_XorShift1024_UseCArrayState<Kokkos::Cuda> : std::false_type {};
+#endif
+#ifdef KOKKOS_ENABLE_HIP
+template <>
+struct Random_XorShift1024_UseCArrayState<Kokkos::Experimental::HIP>
+    : std::false_type {};
+#endif
+#ifdef KOKKOS_ENABLE_OPENMPTARGET
+template <>
+struct Random_XorShift1024_UseCArrayState<Kokkos::Experimental::OpenMPTarget>
+    : std::false_type {};
+#endif
+
+template <class ExecutionSpace>
+struct Random_UniqueIndex {
+  using locks_view_type = View<int*, ExecutionSpace>;
+  KOKKOS_FUNCTION
+  static int get_state_idx(const locks_view_type) {
+#ifdef KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST
+#ifdef KOKKOS_ENABLE_DEPRECATED_CODE
+    const int i = ExecutionSpace::hardware_thread_id();
+#else
+    const int i = ExecutionSpace::impl_hardware_thread_id();
+#endif
+    return i;
+#else
+    return 0;
+#endif
+  }
+};
+
+#ifdef KOKKOS_ENABLE_CUDA
+template <>
+struct Random_UniqueIndex<Kokkos::Cuda> {
+  using locks_view_type = View<int*, Kokkos::Cuda>;
+  KOKKOS_FUNCTION
+  static int get_state_idx(const locks_view_type& locks_) {
+#ifdef __CUDA_ARCH__
+    const int i_offset =
+        (threadIdx.x * blockDim.y + threadIdx.y) * blockDim.z + threadIdx.z;
+    int i = (((blockIdx.x * gridDim.y + blockIdx.y) * gridDim.z + blockIdx.z) *
+                 blockDim.x * blockDim.y * blockDim.z +
+             i_offset) %
+            locks_.extent(0);
+    while (Kokkos::atomic_compare_exchange(&locks_(i), 0, 1)) {
+      i += blockDim.x * blockDim.y * blockDim.z;
+      if (i >= static_cast<int>(locks_.extent(0))) {
+        i = i_offset;
+      }
+    }
+    return i;
+#else
+    (void)locks_;
+    return 0;
+#endif
+  }
+};
+#endif
+
+#ifdef KOKKOS_ENABLE_HIP
+template <>
+struct Random_UniqueIndex<Kokkos::Experimental::HIP> {
+  using locks_view_type = View<int*, Kokkos::Experimental::HIP>;
+  KOKKOS_FUNCTION
+  static int get_state_idx(const locks_view_type& locks_) {
+#ifdef __HIP_DEVICE_COMPILE__
+    const int i_offset =
+        (hipThreadIdx_x * hipBlockDim_y + hipThreadIdx_y) * hipBlockDim_z +
+        hipThreadIdx_z;
+    int i = (((hipBlockIdx_x * hipGridDim_y + hipBlockIdx_y) * hipGridDim_z +
+              hipBlockIdx_z) *
+                 hipBlockDim_x * hipBlockDim_y * hipBlockDim_z +
+             i_offset) %
+            locks_.extent(0);
+    while (Kokkos::atomic_compare_exchange(&locks_(i), 0, 1)) {
+      i += hipBlockDim_x * hipBlockDim_y * hipBlockDim_z;
+      if (i >= static_cast<int>(locks_.extent(0))) {
+        i = i_offset;
+      }
+    }
+    return i;
+#else
+    (void)locks_;
+    return 0;
+#endif
+  }
+};
+#endif
+
+}  // namespace Impl
+
 template <class DeviceType>
 class Random_XorShift64_Pool;
 
@@ -550,10 +689,10 @@ class Random_XorShift64 {
  public:
   typedef DeviceType device_type;
 
-  enum { MAX_URAND = 0xffffffffU };
-  enum { MAX_URAND64 = 0xffffffffffffffffULL - 1 };
-  enum { MAX_RAND = static_cast<int>(0xffffffff / 2) };
-  enum { MAX_RAND64 = static_cast<int64_t>(0xffffffffffffffffLL / 2 - 1) };
+  constexpr static uint32_t MAX_URAND   = std::numeric_limits<uint32_t>::max();
+  constexpr static uint64_t MAX_URAND64 = std::numeric_limits<uint64_t>::max();
+  constexpr static int32_t MAX_RAND     = std::numeric_limits<int32_t>::max();
+  constexpr static int64_t MAX_RAND64   = std::numeric_limits<int64_t>::max();
 
   KOKKOS_INLINE_FUNCTION
   Random_XorShift64(uint64_t state, int state_idx = 0)
@@ -637,10 +776,12 @@ class Random_XorShift64 {
   }
 
   KOKKOS_INLINE_FUNCTION
-  float frand() { return 1.0f * urand64() / MAX_URAND64; }
+  float frand() { return urand64() / static_cast<float>(MAX_URAND64); }
 
   KOKKOS_INLINE_FUNCTION
-  float frand(const float& range) { return range * urand64() / MAX_URAND64; }
+  float frand(const float& range) {
+    return range * urand64() / static_cast<float>(MAX_URAND64);
+  }
 
   KOKKOS_INLINE_FUNCTION
   float frand(const float& start, const float& end) {
@@ -648,10 +789,12 @@ class Random_XorShift64 {
   }
 
   KOKKOS_INLINE_FUNCTION
-  double drand() { return 1.0 * urand64() / MAX_URAND64; }
+  double drand() { return urand64() / static_cast<double>(MAX_URAND64); }
 
   KOKKOS_INLINE_FUNCTION
-  double drand(const double& range) { return range * urand64() / MAX_URAND64; }
+  double drand(const double& range) {
+    return range * urand64() / static_cast<double>(MAX_URAND64);
+  }
 
   KOKKOS_INLINE_FUNCTION
   double drand(const double& start, const double& end) {
@@ -662,6 +805,11 @@ class Random_XorShift64 {
   // number
   KOKKOS_INLINE_FUNCTION
   double normal() {
+#ifndef __HIP_DEVICE_COMPILE__  // FIXME_HIP
+    using std::sqrt;
+#else
+    using ::sqrt;
+#endif
     double S = 2.0;
     double U;
     while (S >= 1.0) {
@@ -669,7 +817,7 @@ class Random_XorShift64 {
       const double V = 2.0 * drand() - 1.0;
       S              = U * U + V * V;
     }
-    return U * std::sqrt(-2.0 * log(S) / S);
+    return U * sqrt(-2.0 * log(S) / S);
   }
 
   KOKKOS_INLINE_FUNCTION
@@ -681,9 +829,10 @@ class Random_XorShift64 {
 template <class DeviceType = Kokkos::DefaultExecutionSpace>
 class Random_XorShift64_Pool {
  private:
-  typedef View<int*, DeviceType> lock_type;
+  using execution_space = typename DeviceType::execution_space;
+  typedef View<int*, execution_space> locks_type;
   typedef View<uint64_t*, DeviceType> state_data_type;
-  lock_type locks_;
+  locks_type locks_;
   state_data_type state_;
   int num_states_;
 
@@ -695,11 +844,8 @@ class Random_XorShift64_Pool {
   Random_XorShift64_Pool() { num_states_ = 0; }
   Random_XorShift64_Pool(uint64_t seed) {
     num_states_ = 0;
-#ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-    init(seed, DeviceType::max_hardware_threads());
-#else
-    init(seed, DeviceType::impl_max_hardware_threads());
-#endif
+
+    init(seed, execution_space().concurrency());
   }
 
   KOKKOS_INLINE_FUNCTION
@@ -719,11 +865,11 @@ class Random_XorShift64_Pool {
 
     num_states_ = num_states;
 
-    locks_ = lock_type("Kokkos::Random_XorShift64::locks", num_states_);
+    locks_ = locks_type("Kokkos::Random_XorShift64::locks", num_states_);
     state_ = state_data_type("Kokkos::Random_XorShift64::state", num_states_);
 
     typename state_data_type::HostMirror h_state = create_mirror_view(state_);
-    typename lock_type::HostMirror h_lock        = create_mirror_view(locks_);
+    typename locks_type::HostMirror h_lock       = create_mirror_view(locks_);
 
     // Execute on the HostMirror's default execution space.
     Random_XorShift64<typename state_data_type::HostMirror::execution_space>
@@ -746,13 +892,8 @@ class Random_XorShift64_Pool {
 
   KOKKOS_INLINE_FUNCTION
   Random_XorShift64<DeviceType> get_state() const {
-#ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-    const int i = DeviceType::hardware_thread_id();
-    ;
-#else
-    const int i = DeviceType::impl_hardware_thread_id();
-    ;
-#endif
+    const int i =
+        Impl::Random_UniqueIndex<execution_space>::get_state_idx(locks_);
     return Random_XorShift64<DeviceType>(state_(i), i);
   }
 
@@ -765,35 +906,35 @@ class Random_XorShift64_Pool {
   KOKKOS_INLINE_FUNCTION
   void free_state(const Random_XorShift64<DeviceType>& state) const {
     state_(state.state_idx_) = state.state_;
+    locks_(state.state_idx_) = 0;
   }
 };
 
-template <class DeviceType>
-class Random_XorShift1024_Pool;
-
 template <class DeviceType>
 class Random_XorShift1024 {
+  using execution_space = typename DeviceType::execution_space;
+
  private:
   int p_;
   const int state_idx_;
-  uint64_t state_[16];
+  Impl::Random_XorShift1024_State<
+      Impl::Random_XorShift1024_UseCArrayState<execution_space>::value>
+      state_;
   friend class Random_XorShift1024_Pool<DeviceType>;
 
  public:
   typedef Random_XorShift1024_Pool<DeviceType> pool_type;
   typedef DeviceType device_type;
 
-  enum { MAX_URAND = 0xffffffffU };
-  enum { MAX_URAND64 = 0xffffffffffffffffULL - 1 };
-  enum { MAX_RAND = static_cast<int>(0xffffffffU / 2) };
-  enum { MAX_RAND64 = static_cast<int64_t>(0xffffffffffffffffULL / 2 - 1) };
+  constexpr static uint32_t MAX_URAND   = std::numeric_limits<uint32_t>::max();
+  constexpr static uint64_t MAX_URAND64 = std::numeric_limits<uint64_t>::max();
+  constexpr static int32_t MAX_RAND     = std::numeric_limits<int32_t>::max();
+  constexpr static int64_t MAX_RAND64   = std::numeric_limits<int64_t>::max();
 
   KOKKOS_INLINE_FUNCTION
   Random_XorShift1024(const typename pool_type::state_data_type& state, int p,
                       int state_idx = 0)
-      : p_(p), state_idx_(state_idx) {
-    for (int i = 0; i < 16; i++) state_[i] = state(state_idx, i);
-  }
+      : p_(p), state_idx_(state_idx), state_(state, state_idx) {}
 
   KOKKOS_INLINE_FUNCTION
   uint32_t urand() {
@@ -876,10 +1017,12 @@ class Random_XorShift1024 {
   }
 
   KOKKOS_INLINE_FUNCTION
-  float frand() { return 1.0f * urand64() / MAX_URAND64; }
+  float frand() { return urand64() / static_cast<float>(MAX_URAND64); }
 
   KOKKOS_INLINE_FUNCTION
-  float frand(const float& range) { return range * urand64() / MAX_URAND64; }
+  float frand(const float& range) {
+    return range * urand64() / static_cast<float>(MAX_URAND64);
+  }
 
   KOKKOS_INLINE_FUNCTION
   float frand(const float& start, const float& end) {
@@ -887,10 +1030,12 @@ class Random_XorShift1024 {
   }
 
   KOKKOS_INLINE_FUNCTION
-  double drand() { return 1.0 * urand64() / MAX_URAND64; }
+  double drand() { return urand64() / static_cast<double>(MAX_URAND64); }
 
   KOKKOS_INLINE_FUNCTION
-  double drand(const double& range) { return range * urand64() / MAX_URAND64; }
+  double drand(const double& range) {
+    return range * urand64() / static_cast<double>(MAX_URAND64);
+  }
 
   KOKKOS_INLINE_FUNCTION
   double drand(const double& start, const double& end) {
@@ -901,6 +1046,11 @@ class Random_XorShift1024 {
   // number
   KOKKOS_INLINE_FUNCTION
   double normal() {
+#ifndef KOKKOS_ENABLE_HIP  // FIXME_HIP
+    using std::sqrt;
+#else
+    using ::sqrt;
+#endif
     double S = 2.0;
     double U;
     while (S >= 1.0) {
@@ -908,7 +1058,7 @@ class Random_XorShift1024 {
       const double V = 2.0 * drand() - 1.0;
       S              = U * U + V * V;
     }
-    return U * std::sqrt(-2.0 * log(S) / S);
+    return U * sqrt(-2.0 * log(S) / S);
   }
 
   KOKKOS_INLINE_FUNCTION
@@ -920,10 +1070,12 @@ class Random_XorShift1024 {
 template <class DeviceType = Kokkos::DefaultExecutionSpace>
 class Random_XorShift1024_Pool {
  private:
+  using execution_space = typename DeviceType::execution_space;
+  typedef View<int*, execution_space> locks_type;
   typedef View<int*, DeviceType> int_view_type;
   typedef View<uint64_t * [16], DeviceType> state_data_type;
 
-  int_view_type locks_;
+  locks_type locks_;
   state_data_type state_;
   int_view_type p_;
   int num_states_;
@@ -939,11 +1091,8 @@ class Random_XorShift1024_Pool {
 
   inline Random_XorShift1024_Pool(uint64_t seed) {
     num_states_ = 0;
-#ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-    init(seed, DeviceType::max_hardware_threads());
-#else
-    init(seed, DeviceType::impl_max_hardware_threads());
-#endif
+
+    init(seed, execution_space().concurrency());
   }
 
   KOKKOS_INLINE_FUNCTION
@@ -965,12 +1114,12 @@ class Random_XorShift1024_Pool {
   inline void init(uint64_t seed, int num_states) {
     if (seed == 0) seed = uint64_t(1318319);
     num_states_ = num_states;
-    locks_ = int_view_type("Kokkos::Random_XorShift1024::locks", num_states_);
+    locks_      = locks_type("Kokkos::Random_XorShift1024::locks", num_states_);
     state_ = state_data_type("Kokkos::Random_XorShift1024::state", num_states_);
     p_     = int_view_type("Kokkos::Random_XorShift1024::p", num_states_);
 
     typename state_data_type::HostMirror h_state = create_mirror_view(state_);
-    typename int_view_type::HostMirror h_lock    = create_mirror_view(locks_);
+    typename locks_type::HostMirror h_lock       = create_mirror_view(locks_);
     typename int_view_type::HostMirror h_p       = create_mirror_view(p_);
 
     // Execute on the HostMirror's default execution space.
@@ -997,11 +1146,8 @@ class Random_XorShift1024_Pool {
 
   KOKKOS_INLINE_FUNCTION
   Random_XorShift1024<DeviceType> get_state() const {
-#ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-    const int i = DeviceType::hardware_thread_id();
-#else
-    const int i = DeviceType::impl_hardware_thread_id();
-#endif
+    const int i =
+        Impl::Random_UniqueIndex<execution_space>::get_state_idx(locks_);
     return Random_XorShift1024<DeviceType>(state_, p_(i), i);
   };
 
@@ -1014,482 +1160,11 @@ class Random_XorShift1024_Pool {
   KOKKOS_INLINE_FUNCTION
   void free_state(const Random_XorShift1024<DeviceType>& state) const {
     for (int i = 0; i < 16; i++) state_(state.state_idx_, i) = state.state_[i];
-    p_(state.state_idx_) = state.p_;
+    p_(state.state_idx_)     = state.p_;
+    locks_(state.state_idx_) = 0;
   }
 };
 
-#if defined(KOKKOS_ENABLE_CUDA) && defined(__CUDACC__)
-
-template <>
-class Random_XorShift1024<Kokkos::Cuda> {
- private:
-  int p_;
-  const int state_idx_;
-  uint64_t* state_;
-  const int stride_;
-  friend class Random_XorShift1024_Pool<Kokkos::Cuda>;
-
- public:
-  typedef Kokkos::Cuda device_type;
-  typedef Random_XorShift1024_Pool<device_type> pool_type;
-
-  enum { MAX_URAND = 0xffffffffU };
-  enum { MAX_URAND64 = 0xffffffffffffffffULL - 1 };
-  enum { MAX_RAND = static_cast<int>(0xffffffffU / 2) };
-  enum { MAX_RAND64 = static_cast<int64_t>(0xffffffffffffffffULL / 2 - 1) };
-
-  KOKKOS_INLINE_FUNCTION
-  Random_XorShift1024(const typename pool_type::state_data_type& state, int p,
-                      int state_idx = 0)
-      : p_(p),
-        state_idx_(state_idx),
-        state_(&state(state_idx, 0)),
-        stride_(state.stride_1()) {}
-
-  KOKKOS_INLINE_FUNCTION
-  uint32_t urand() {
-    uint64_t state_0 = state_[p_ * stride_];
-    uint64_t state_1 = state_[(p_ = (p_ + 1) & 15) * stride_];
-    state_1 ^= state_1 << 31;
-    state_1 ^= state_1 >> 11;
-    state_0 ^= state_0 >> 30;
-    uint64_t tmp =
-        (state_[p_ * stride_] = state_0 ^ state_1) * 1181783497276652981ULL;
-    tmp = tmp >> 16;
-    return static_cast<uint32_t>(tmp & MAX_URAND);
-  }
-
-  KOKKOS_INLINE_FUNCTION
-  uint64_t urand64() {
-    uint64_t state_0 = state_[p_ * stride_];
-    uint64_t state_1 = state_[(p_ = (p_ + 1) & 15) * stride_];
-    state_1 ^= state_1 << 31;
-    state_1 ^= state_1 >> 11;
-    state_0 ^= state_0 >> 30;
-    return ((state_[p_ * stride_] = state_0 ^ state_1) *
-            1181783497276652981LL) -
-           1;
-  }
-
-  KOKKOS_INLINE_FUNCTION
-  uint32_t urand(const uint32_t& range) {
-    const uint32_t max_val = (MAX_URAND / range) * range;
-    uint32_t tmp           = urand();
-    while (tmp >= max_val) urand();
-    return tmp % range;
-  }
-
-  KOKKOS_INLINE_FUNCTION
-  uint32_t urand(const uint32_t& start, const uint32_t& end) {
-    return urand(end - start) + start;
-  }
-
-  KOKKOS_INLINE_FUNCTION
-  uint64_t urand64(const uint64_t& range) {
-    const uint64_t max_val = (MAX_URAND64 / range) * range;
-    uint64_t tmp           = urand64();
-    while (tmp >= max_val) urand64();
-    return tmp % range;
-  }
-
-  KOKKOS_INLINE_FUNCTION
-  uint64_t urand64(const uint64_t& start, const uint64_t& end) {
-    return urand64(end - start) + start;
-  }
-
-  KOKKOS_INLINE_FUNCTION
-  int rand() { return static_cast<int>(urand() / 2); }
-
-  KOKKOS_INLINE_FUNCTION
-  int rand(const int& range) {
-    const int max_val = (MAX_RAND / range) * range;
-    int tmp           = rand();
-    while (tmp >= max_val) rand();
-    return tmp % range;
-  }
-
-  KOKKOS_INLINE_FUNCTION
-  int rand(const int& start, const int& end) {
-    return rand(end - start) + start;
-  }
-
-  KOKKOS_INLINE_FUNCTION
-  int64_t rand64() { return static_cast<int64_t>(urand64() / 2); }
-
-  KOKKOS_INLINE_FUNCTION
-  int64_t rand64(const int64_t& range) {
-    const int64_t max_val = (MAX_RAND64 / range) * range;
-    int64_t tmp           = rand64();
-    while (tmp >= max_val) rand64();
-    return tmp % range;
-  }
-
-  KOKKOS_INLINE_FUNCTION
-  int64_t rand64(const int64_t& start, const int64_t& end) {
-    return rand64(end - start) + start;
-  }
-
-  KOKKOS_INLINE_FUNCTION
-  float frand() { return 1.0f * urand64() / MAX_URAND64; }
-
-  KOKKOS_INLINE_FUNCTION
-  float frand(const float& range) { return range * urand64() / MAX_URAND64; }
-
-  KOKKOS_INLINE_FUNCTION
-  float frand(const float& start, const float& end) {
-    return frand(end - start) + start;
-  }
-
-  KOKKOS_INLINE_FUNCTION
-  double drand() { return 1.0 * urand64() / MAX_URAND64; }
-
-  KOKKOS_INLINE_FUNCTION
-  double drand(const double& range) { return range * urand64() / MAX_URAND64; }
-
-  KOKKOS_INLINE_FUNCTION
-  double drand(const double& start, const double& end) {
-    return frand(end - start) + start;
-  }
-
-  // Marsaglia polar method for drawing a standard normal distributed random
-  // number
-  KOKKOS_INLINE_FUNCTION
-  double normal() {
-    double S = 2.0;
-    double U;
-    while (S >= 1.0) {
-      U              = 2.0 * drand() - 1.0;
-      const double V = 2.0 * drand() - 1.0;
-      S              = U * U + V * V;
-    }
-    return U * std::sqrt(-2.0 * log(S) / S);
-  }
-
-  KOKKOS_INLINE_FUNCTION
-  double normal(const double& mean, const double& std_dev = 1.0) {
-    return mean + normal() * std_dev;
-  }
-};
-
-template <>
-inline Random_XorShift64_Pool<Kokkos::Cuda>::Random_XorShift64_Pool(
-    uint64_t seed) {
-  num_states_ = 0;
-  init(seed, 4 * 32768);
-}
-
-template <>
-KOKKOS_INLINE_FUNCTION Random_XorShift64<Kokkos::Cuda>
-Random_XorShift64_Pool<Kokkos::Cuda>::get_state() const {
-#ifdef __CUDA_ARCH__
-  const int i_offset =
-      (threadIdx.x * blockDim.y + threadIdx.y) * blockDim.z + threadIdx.z;
-  int i = (((blockIdx.x * gridDim.y + blockIdx.y) * gridDim.z + blockIdx.z) *
-               blockDim.x * blockDim.y * blockDim.z +
-           i_offset) %
-          num_states_;
-  while (Kokkos::atomic_compare_exchange(&locks_(i), 0, 1)) {
-    i += blockDim.x * blockDim.y * blockDim.z;
-    if (i >= num_states_) {
-      i = i_offset;
-    }
-  }
-
-  return Random_XorShift64<Kokkos::Cuda>(state_(i), i);
-#else
-  return Random_XorShift64<Kokkos::Cuda>(state_(0), 0);
-#endif
-}
-
-template <>
-KOKKOS_INLINE_FUNCTION void Random_XorShift64_Pool<Kokkos::Cuda>::free_state(
-    const Random_XorShift64<Kokkos::Cuda>& state) const {
-  state_(state.state_idx_) = state.state_;
-#ifdef __CUDA_ARCH__
-  locks_(state.state_idx_) = 0;
-  return;
-#endif
-}
-
-template <>
-inline Random_XorShift1024_Pool<Kokkos::Cuda>::Random_XorShift1024_Pool(
-    uint64_t seed) {
-  num_states_ = 0;
-  init(seed, 4 * 32768);
-}
-
-template <>
-KOKKOS_INLINE_FUNCTION Random_XorShift1024<Kokkos::Cuda>
-Random_XorShift1024_Pool<Kokkos::Cuda>::get_state() const {
-#ifdef __CUDA_ARCH__
-  const int i_offset =
-      (threadIdx.x * blockDim.y + threadIdx.y) * blockDim.z + threadIdx.z;
-  int i = (((blockIdx.x * gridDim.y + blockIdx.y) * gridDim.z + blockIdx.z) *
-               blockDim.x * blockDim.y * blockDim.z +
-           i_offset) %
-          num_states_;
-  while (Kokkos::atomic_compare_exchange(&locks_(i), 0, 1)) {
-    i += blockDim.x * blockDim.y * blockDim.z;
-    if (i >= num_states_) {
-      i = i_offset;
-    }
-  }
-
-  return Random_XorShift1024<Kokkos::Cuda>(state_, p_(i), i);
-#else
-  return Random_XorShift1024<Kokkos::Cuda>(state_, p_(0), 0);
-#endif
-}
-
-template <>
-KOKKOS_INLINE_FUNCTION void Random_XorShift1024_Pool<Kokkos::Cuda>::free_state(
-    const Random_XorShift1024<Kokkos::Cuda>& state) const {
-  for (int i = 0; i < 16; i++) state_(state.state_idx_, i) = state.state_[i];
-#ifdef __CUDA_ARCH__
-  locks_(state.state_idx_) = 0;
-  return;
-#endif
-}
-
-#endif
-
-#if defined(KOKKOS_ENABLE_ROCM)
-
-template <>
-class Random_XorShift1024<Kokkos::Experimental::ROCm> {
- private:
-  int p_;
-  const int state_idx_;
-  uint64_t* state_;
-  const int stride_;
-  friend class Random_XorShift1024_Pool<Kokkos::Experimental::ROCm>;
-
- public:
-  typedef Kokkos::Experimental::ROCm device_type;
-  typedef Random_XorShift1024_Pool<device_type> pool_type;
-
-  enum { MAX_URAND = 0xffffffffU };
-  enum { MAX_URAND64 = 0xffffffffffffffffULL - 1 };
-  enum { MAX_RAND = static_cast<int>(0xffffffffU / 2) };
-  enum { MAX_RAND64 = static_cast<int64_t>(0xffffffffffffffffULL / 2 - 1) };
-
-  KOKKOS_INLINE_FUNCTION
-  Random_XorShift1024(const typename pool_type::state_data_type& state, int p,
-                      int state_idx = 0)
-      : p_(p),
-        state_idx_(state_idx),
-        state_(&state(state_idx, 0)),
-        stride_(state.stride_1()) {}
-
-  KOKKOS_INLINE_FUNCTION
-  uint32_t urand() {
-    uint64_t state_0 = state_[p_ * stride_];
-    uint64_t state_1 = state_[(p_ = (p_ + 1) & 15) * stride_];
-    state_1 ^= state_1 << 31;
-    state_1 ^= state_1 >> 11;
-    state_0 ^= state_0 >> 30;
-    uint64_t tmp =
-        (state_[p_ * stride_] = state_0 ^ state_1) * 1181783497276652981ULL;
-    tmp = tmp >> 16;
-    return static_cast<uint32_t>(tmp & MAX_URAND);
-  }
-
-  KOKKOS_INLINE_FUNCTION
-  uint64_t urand64() {
-    uint64_t state_0 = state_[p_ * stride_];
-    uint64_t state_1 = state_[(p_ = (p_ + 1) & 15) * stride_];
-    state_1 ^= state_1 << 31;
-    state_1 ^= state_1 >> 11;
-    state_0 ^= state_0 >> 30;
-    return ((state_[p_ * stride_] = state_0 ^ state_1) *
-            1181783497276652981LL) -
-           1;
-  }
-
-  KOKKOS_INLINE_FUNCTION
-  uint32_t urand(const uint32_t& range) {
-    const uint32_t max_val = (MAX_URAND / range) * range;
-    uint32_t tmp           = urand();
-    while (tmp >= max_val) urand();
-    return tmp % range;
-  }
-
-  KOKKOS_INLINE_FUNCTION
-  uint32_t urand(const uint32_t& start, const uint32_t& end) {
-    return urand(end - start) + start;
-  }
-
-  KOKKOS_INLINE_FUNCTION
-  uint64_t urand64(const uint64_t& range) {
-    const uint64_t max_val = (MAX_URAND64 / range) * range;
-    uint64_t tmp           = urand64();
-    while (tmp >= max_val) urand64();
-    return tmp % range;
-  }
-
-  KOKKOS_INLINE_FUNCTION
-  uint64_t urand64(const uint64_t& start, const uint64_t& end) {
-    return urand64(end - start) + start;
-  }
-
-  KOKKOS_INLINE_FUNCTION
-  int rand() { return static_cast<int>(urand() / 2); }
-
-  KOKKOS_INLINE_FUNCTION
-  int rand(const int& range) {
-    const int max_val = (MAX_RAND / range) * range;
-    int tmp           = rand();
-    while (tmp >= max_val) rand();
-    return tmp % range;
-  }
-
-  KOKKOS_INLINE_FUNCTION
-  int rand(const int& start, const int& end) {
-    return rand(end - start) + start;
-  }
-
-  KOKKOS_INLINE_FUNCTION
-  int64_t rand64() { return static_cast<int64_t>(urand64() / 2); }
-
-  KOKKOS_INLINE_FUNCTION
-  int64_t rand64(const int64_t& range) {
-    const int64_t max_val = (MAX_RAND64 / range) * range;
-    int64_t tmp           = rand64();
-    while (tmp >= max_val) rand64();
-    return tmp % range;
-  }
-
-  KOKKOS_INLINE_FUNCTION
-  int64_t rand64(const int64_t& start, const int64_t& end) {
-    return rand64(end - start) + start;
-  }
-
-  KOKKOS_INLINE_FUNCTION
-  float frand() { return 1.0f * urand64() / MAX_URAND64; }
-
-  KOKKOS_INLINE_FUNCTION
-  float frand(const float& range) { return range * urand64() / MAX_URAND64; }
-
-  KOKKOS_INLINE_FUNCTION
-  float frand(const float& start, const float& end) {
-    return frand(end - start) + start;
-  }
-
-  KOKKOS_INLINE_FUNCTION
-  double drand() { return 1.0 * urand64() / MAX_URAND64; }
-
-  KOKKOS_INLINE_FUNCTION
-  double drand(const double& range) { return range * urand64() / MAX_URAND64; }
-
-  KOKKOS_INLINE_FUNCTION
-  double drand(const double& start, const double& end) {
-    return frand(end - start) + start;
-  }
-
-  // Marsaglia polar method for drawing a standard normal distributed random
-  // number
-  KOKKOS_INLINE_FUNCTION
-  double normal() {
-    double S = 2.0;
-    double U;
-    while (S >= 1.0) {
-      U              = 2.0 * drand() - 1.0;
-      const double V = 2.0 * drand() - 1.0;
-      S              = U * U + V * V;
-    }
-    return U * std::sqrt(-2.0 * log(S) / S);
-  }
-
-  KOKKOS_INLINE_FUNCTION
-  double normal(const double& mean, const double& std_dev = 1.0) {
-    return mean + normal() * std_dev;
-  }
-};
-
-template <>
-inline Random_XorShift64_Pool<
-    Kokkos::Experimental::ROCm>::Random_XorShift64_Pool(uint64_t seed) {
-  num_states_ = 0;
-  init(seed, 4 * 32768);
-}
-
-template <>
-KOKKOS_INLINE_FUNCTION Random_XorShift64<Kokkos::Experimental::ROCm>
-Random_XorShift64_Pool<Kokkos::Experimental::ROCm>::get_state() const {
-#ifdef __HCC_ACCELERATOR__
-  const int i_offset =
-      (threadIdx_x * blockDim_y + threadIdx_y) * blockDim_z + threadIdx_z;
-  int i = (((blockIdx_x * gridDim_y + blockIdx_y) * gridDim_z + blockIdx_z) *
-               blockDim_x * blockDim_y * blockDim_z +
-           i_offset) %
-          num_states_;
-  while (Kokkos::atomic_compare_exchange(&locks_(i), 0, 1)) {
-    i += blockDim_x * blockDim_y * blockDim_z;
-    if (i >= num_states_) {
-      i = i_offset;
-    }
-  }
-
-  return Random_XorShift64<Kokkos::Experimental::ROCm>(state_(i), i);
-#else
-  return Random_XorShift64<Kokkos::Experimental::ROCm>(state_(0), 0);
-#endif
-}
-
-template <>
-KOKKOS_INLINE_FUNCTION void
-Random_XorShift64_Pool<Kokkos::Experimental::ROCm>::free_state(
-    const Random_XorShift64<Kokkos::Experimental::ROCm>& state) const {
-#ifdef __HCC_ACCELERATOR__
-  state_(state.state_idx_) = state.state_;
-  locks_(state.state_idx_) = 0;
-  return;
-#endif
-}
-
-template <>
-inline Random_XorShift1024_Pool<
-    Kokkos::Experimental::ROCm>::Random_XorShift1024_Pool(uint64_t seed) {
-  num_states_ = 0;
-  init(seed, 4 * 32768);
-}
-
-template <>
-KOKKOS_INLINE_FUNCTION Random_XorShift1024<Kokkos::Experimental::ROCm>
-Random_XorShift1024_Pool<Kokkos::Experimental::ROCm>::get_state() const {
-#ifdef __HCC_ACCELERATOR__
-  const int i_offset =
-      (threadIdx_x * blockDim_y + threadIdx_y) * blockDim_z + threadIdx_z;
-  int i = (((blockIdx_x * gridDim_y + blockIdx_y) * gridDim_z + blockIdx_z) *
-               blockDim_x * blockDim_y * blockDim_z +
-           i_offset) %
-          num_states_;
-  while (Kokkos::atomic_compare_exchange(&locks_(i), 0, 1)) {
-    i += blockDim_x * blockDim_y * blockDim_z;
-    if (i >= num_states_) {
-      i = i_offset;
-    }
-  }
-
-  return Random_XorShift1024<Kokkos::Experimental::ROCm>(state_, p_(i), i);
-#else
-  return Random_XorShift1024<Kokkos::Experimental::ROCm>(state_, p_(0), 0);
-#endif
-}
-
-template <>
-KOKKOS_INLINE_FUNCTION void
-Random_XorShift1024_Pool<Kokkos::Experimental::ROCm>::free_state(
-    const Random_XorShift1024<Kokkos::Experimental::ROCm>& state) const {
-#ifdef __HCC_ACCELERATOR__
-  for (int i = 0; i < 16; i++) state_(state.state_idx_, i) = state.state_[i];
-  locks_(state.state_idx_) = 0;
-  return;
-#endif
-}
-
-#endif
-
 namespace Impl {
 
 template <class ViewType, class RandomPool, int loops, int rank,
@@ -2043,7 +1718,7 @@ void fill_random(ViewType a, RandomPool g,
                  typename ViewType::const_value_type range) {
   int64_t LDA = a.extent(0);
   if (LDA > 0)
-    parallel_for((LDA + 127) / 128,
+    parallel_for("Kokkos::fill_random", (LDA + 127) / 128,
                  Impl::fill_random_functor_range<ViewType, RandomPool, 128,
                                                  ViewType::Rank, IndexType>(
                      a, g, range));
@@ -2055,7 +1730,7 @@ void fill_random(ViewType a, RandomPool g,
                  typename ViewType::const_value_type end) {
   int64_t LDA = a.extent(0);
   if (LDA > 0)
-    parallel_for((LDA + 127) / 128,
+    parallel_for("Kokkos::fill_random", (LDA + 127) / 128,
                  Impl::fill_random_functor_begin_end<ViewType, RandomPool, 128,
                                                      ViewType::Rank, IndexType>(
                      a, g, begin, end));
diff --git a/kokkos/algorithms/src/Kokkos_Sort.hpp b/kokkos/algorithms/src/Kokkos_Sort.hpp
index 405b179f5..1c79a505b 100644
--- a/kokkos/algorithms/src/Kokkos_Sort.hpp
+++ b/kokkos/algorithms/src/Kokkos_Sort.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -201,7 +201,7 @@ class BinSort {
   bool sort_within_bins;
 
  public:
-  BinSort() {}
+  BinSort() = default;
 
   //----------------------------------------
   // Constructor: takes the keys, the binning_operator and optionally whether to
@@ -327,7 +327,7 @@ class BinSort {
                    Kokkos::RangePolicy<execution_space>(0, len), functor);
     }
 
-    Kokkos::fence();
+    execution_space().fence();
   }
 
   template <class ValuesViewType>
@@ -349,14 +349,14 @@ class BinSort {
 
  public:
   KOKKOS_INLINE_FUNCTION
-  void operator()(const bin_count_tag& tag, const int& i) const {
+  void operator()(const bin_count_tag& /*tag*/, const int i) const {
     const int j = range_begin + i;
     bin_count_atomic(bin_op.bin(keys, j))++;
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()(const bin_offset_tag& tag, const int& i, value_type& offset,
-                  const bool& final) const {
+  void operator()(const bin_offset_tag& /*tag*/, const int i,
+                  value_type& offset, const bool& final) const {
     if (final) {
       bin_offsets(i) = offset;
     }
@@ -364,7 +364,7 @@ class BinSort {
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()(const bin_binning_tag& tag, const int& i) const {
+  void operator()(const bin_binning_tag& /*tag*/, const int i) const {
     const int j     = range_begin + i;
     const int bin   = bin_op.bin(keys, j);
     const int count = bin_count_atomic(bin)++;
@@ -373,7 +373,7 @@ class BinSort {
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()(const bin_sort_bins_tag& tag, const int& i) const {
+  void operator()(const bin_sort_bins_tag& /*tag*/, const int i) const {
     auto bin_size = bin_count_const(i);
     if (bin_size <= 1) return;
     int upper_bound = bin_offsets(i) + bin_size;
@@ -381,7 +381,7 @@ class BinSort {
     while (!sorted) {
       sorted      = true;
       int old_idx = sort_order(bin_offsets(i));
-      int new_idx;
+      int new_idx = 0;
       for (int k = bin_offsets(i) + 1; k < upper_bound; k++) {
         new_idx = sort_order(k);
 
@@ -446,7 +446,7 @@ struct BinOp3D {
   typename KeyViewType::non_const_value_type range_[3];
   typename KeyViewType::non_const_value_type min_[3];
 
-  BinOp3D() {}
+  BinOp3D() = default;
 
   BinOp3D(int max_bins__[], typename KeyViewType::const_value_type min[],
           typename KeyViewType::const_value_type max[]) {
diff --git a/kokkos/algorithms/unit_tests/CMakeLists.txt b/kokkos/algorithms/unit_tests/CMakeLists.txt
index 6fb08ce2e..e3563a8b9 100644
--- a/kokkos/algorithms/unit_tests/CMakeLists.txt
+++ b/kokkos/algorithms/unit_tests/CMakeLists.txt
@@ -20,16 +20,38 @@ KOKKOS_ADD_TEST_LIBRARY(
   HEADERS ${GTEST_SOURCE_DIR}/gtest/gtest.h
   SOURCES ${GTEST_SOURCE_DIR}/gtest/gtest-all.cc
 )
-KOKKOS_TARGET_COMPILE_DEFINITIONS(kokkosalgorithms_gtest PUBLIC "-DGTEST_HAS_PTHREAD=0")
+# WORKAROUND FOR HIPCC
+IF(Kokkos_ENABLE_HIP)
+  TARGET_COMPILE_DEFINITIONS(kokkosalgorithms_gtest PUBLIC "-DGTEST_HAS_PTHREAD=0 --amdgpu-target=gfx906")
+ELSE()
+  TARGET_COMPILE_DEFINITIONS(kokkosalgorithms_gtest PUBLIC "-DGTEST_HAS_PTHREAD=0")
+ENDIF()
+
+TARGET_COMPILE_FEATURES(kokkosalgorithms_gtest PUBLIC cxx_std_11)
 
 SET(SOURCES
-  UnitTestMain.cpp 
-  TestCuda.cpp
-  )
+  UnitTestMain.cpp
+)
 
 IF(Kokkos_ENABLE_OPENMP)
   LIST( APPEND SOURCES
     TestOpenMP.cpp
+    TestOpenMP_Sort1D.cpp
+    TestOpenMP_Sort3D.cpp
+    TestOpenMP_SortDynamicView.cpp
+    TestOpenMP_Random.cpp
+  )
+ENDIF()
+
+IF(Kokkos_ENABLE_HIP)
+  LIST( APPEND SOURCES
+    TestHIP.cpp
+  )
+ENDIF()
+
+IF(Kokkos_ENABLE_CUDA)
+  LIST( APPEND SOURCES
+    TestCuda.cpp
   )
 ENDIF()
 
diff --git a/kokkos/algorithms/unit_tests/Makefile b/kokkos/algorithms/unit_tests/Makefile
index 3c862d03d..4a192b08e 100644
--- a/kokkos/algorithms/unit_tests/Makefile
+++ b/kokkos/algorithms/unit_tests/Makefile
@@ -44,7 +44,7 @@ ifeq ($(KOKKOS_INTERNAL_USE_PTHREADS), 1)
 endif
 
 ifeq ($(KOKKOS_INTERNAL_USE_OPENMP), 1)
-	OBJ_OPENMP = TestOpenMP.o UnitTestMain.o gtest-all.o
+	OBJ_OPENMP = TestOpenMP.o TestOpenMP_Random.o TestOpenMP_Sort1D.o TestOpenMP_Sort3D.o TestOpenMP_SortDynamicView.o UnitTestMain.o gtest-all.o
 	TARGETS += KokkosAlgorithms_UnitTest_OpenMP
 	TEST_TARGETS += test-openmp
 endif
diff --git a/kokkos/algorithms/unit_tests/TestCuda.cpp b/kokkos/algorithms/unit_tests/TestCuda.cpp
index 9562af63a..86cee61f6 100644
--- a/kokkos/algorithms/unit_tests/TestCuda.cpp
+++ b/kokkos/algorithms/unit_tests/TestCuda.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -59,11 +59,15 @@
 namespace Test {
 
 void cuda_test_random_xorshift64(int num_draws) {
-  Impl::test_random<Kokkos::Random_XorShift64_Pool<Kokkos::Cuda> >(num_draws);
+  Impl::test_random<Kokkos::Random_XorShift64_Pool<Kokkos::Cuda>>(num_draws);
+  Impl::test_random<Kokkos::Random_XorShift64_Pool<
+      Kokkos::Device<Kokkos::Cuda, Kokkos::CudaSpace>>>(num_draws);
 }
 
 void cuda_test_random_xorshift1024(int num_draws) {
-  Impl::test_random<Kokkos::Random_XorShift1024_Pool<Kokkos::Cuda> >(num_draws);
+  Impl::test_random<Kokkos::Random_XorShift1024_Pool<Kokkos::Cuda>>(num_draws);
+  Impl::test_random<Kokkos::Random_XorShift1024_Pool<
+      Kokkos::Device<Kokkos::Cuda, Kokkos::CudaSpace>>>(num_draws);
 }
 
 #define CUDA_RANDOM_XORSHIFT64(num_draws) \
diff --git a/kokkos/algorithms/unit_tests/TestHIP.cpp b/kokkos/algorithms/unit_tests/TestHIP.cpp
new file mode 100644
index 000000000..5e5ccb6a2
--- /dev/null
+++ b/kokkos/algorithms/unit_tests/TestHIP.cpp
@@ -0,0 +1,83 @@
+/*
+//@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
+*/
+
+#include <Kokkos_Macros.hpp>
+#ifdef KOKKOS_ENABLE_HIP
+
+#include <cstdint>
+#include <iostream>
+#include <iomanip>
+
+#include <gtest/gtest.h>
+
+#include <Kokkos_Core.hpp>
+
+#include <TestRandom.hpp>
+#include <TestSort.hpp>
+
+namespace Test {
+
+void hip_test_random_xorshift64(size_t num_draws) {
+  Impl::test_random<Kokkos::Random_XorShift64_Pool<Kokkos::Experimental::HIP>>(
+      num_draws);
+  Impl::test_random<Kokkos::Random_XorShift64_Pool<Kokkos::Device<
+      Kokkos::Experimental::HIP, Kokkos::Experimental::HIPSpace>>>(num_draws);
+}
+
+void hip_test_random_xorshift1024(size_t num_draws) {
+  Impl::test_random<
+      Kokkos::Random_XorShift1024_Pool<Kokkos::Experimental::HIP>>(num_draws);
+  Impl::test_random<Kokkos::Random_XorShift1024_Pool<Kokkos::Device<
+      Kokkos::Experimental::HIP, Kokkos::Experimental::HIPSpace>>>(num_draws);
+}
+
+TEST(hip, Random_XorShift64) { hip_test_random_xorshift64(132141141); }
+TEST(hip, Random_XorShift1024_0) { hip_test_random_xorshift1024(52428813); }
+TEST(hip, SortUnsigned) {
+  Impl::test_sort<Kokkos::Experimental::HIP, unsigned>(171);
+}
+}  // namespace Test
+#else
+void KOKKOS_ALGORITHMS_UNITTESTS_TESTHIP_PREVENT_LINK_ERROR() {}
+#endif /* #ifdef KOKKOS_ENABLE_HIP */
diff --git a/kokkos/algorithms/unit_tests/TestHPX.cpp b/kokkos/algorithms/unit_tests/TestHPX.cpp
index 84cb61448..2981e9794 100644
--- a/kokkos/algorithms/unit_tests/TestHPX.cpp
+++ b/kokkos/algorithms/unit_tests/TestHPX.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/algorithms/unit_tests/TestOpenMP.cpp b/kokkos/algorithms/unit_tests/TestOpenMP.cpp
index e6bfcb9b5..5ded3ce39 100644
--- a/kokkos/algorithms/unit_tests/TestOpenMP.cpp
+++ b/kokkos/algorithms/unit_tests/TestOpenMP.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -55,30 +55,8 @@
 
 namespace Test {
 
-#define OPENMP_RANDOM_XORSHIFT64(num_draws)                             \
-  TEST(openmp, Random_XorShift64) {                                     \
-    Impl::test_random<Kokkos::Random_XorShift64_Pool<Kokkos::OpenMP> >( \
-        num_draws);                                                     \
-  }
+TEST(openmp, SortIssue1160) { Impl::test_issue_1160_sort<Kokkos::OpenMP>(); }
 
-#define OPENMP_RANDOM_XORSHIFT1024(num_draws)                             \
-  TEST(openmp, Random_XorShift1024) {                                     \
-    Impl::test_random<Kokkos::Random_XorShift1024_Pool<Kokkos::OpenMP> >( \
-        num_draws);                                                       \
-  }
-
-#define OPENMP_SORT_UNSIGNED(size)                   \
-  TEST(openmp, SortUnsigned) {                       \
-    Impl::test_sort<Kokkos::OpenMP, unsigned>(size); \
-  }
-
-OPENMP_RANDOM_XORSHIFT64(10240000)
-OPENMP_RANDOM_XORSHIFT1024(10130144)
-OPENMP_SORT_UNSIGNED(171)
-
-#undef OPENMP_RANDOM_XORSHIFT64
-#undef OPENMP_RANDOM_XORSHIFT1024
-#undef OPENMP_SORT_UNSIGNED
 }  // namespace Test
 #else
 void KOKKOS_ALGORITHMS_UNITTESTS_TESTOPENMP_PREVENT_LINK_ERROR() {}
diff --git a/kokkos/algorithms/unit_tests/TestOpenMP_Random.cpp b/kokkos/algorithms/unit_tests/TestOpenMP_Random.cpp
new file mode 100644
index 000000000..1ca8e0a82
--- /dev/null
+++ b/kokkos/algorithms/unit_tests/TestOpenMP_Random.cpp
@@ -0,0 +1,77 @@
+/*
+//@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
+*/
+
+#include <Kokkos_Macros.hpp>
+#ifdef KOKKOS_ENABLE_OPENMP
+
+#include <gtest/gtest.h>
+#include <Kokkos_Core.hpp>
+
+//----------------------------------------------------------------------------
+#include <TestRandom.hpp>
+#include <iomanip>
+
+namespace Test {
+
+#define OPENMP_RANDOM_XORSHIFT64(num_draws)                             \
+  TEST(openmp, Random_XorShift64) {                                     \
+    Impl::test_random<Kokkos::Random_XorShift64_Pool<Kokkos::OpenMP> >( \
+        num_draws);                                                     \
+  }
+
+#define OPENMP_RANDOM_XORSHIFT1024(num_draws)                             \
+  TEST(openmp, Random_XorShift1024) {                                     \
+    Impl::test_random<Kokkos::Random_XorShift1024_Pool<Kokkos::OpenMP> >( \
+        num_draws);                                                       \
+  }
+
+OPENMP_RANDOM_XORSHIFT64(10240000)
+OPENMP_RANDOM_XORSHIFT1024(10130144)
+
+#undef OPENMP_RANDOM_XORSHIFT64
+#undef OPENMP_RANDOM_XORSHIFT1024
+}  // namespace Test
+#else
+void KOKKOS_ALGORITHMS_UNITTESTS_TESTOPENMP_PREVENT_LINK_ERROR() {}
+#endif
diff --git a/kokkos/algorithms/unit_tests/TestOpenMP_Sort1D.cpp b/kokkos/algorithms/unit_tests/TestOpenMP_Sort1D.cpp
new file mode 100644
index 000000000..a9b2010ad
--- /dev/null
+++ b/kokkos/algorithms/unit_tests/TestOpenMP_Sort1D.cpp
@@ -0,0 +1,65 @@
+/*
+//@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
+*/
+
+#include <Kokkos_Macros.hpp>
+#ifdef KOKKOS_ENABLE_OPENMP
+
+#include <gtest/gtest.h>
+#include <Kokkos_Core.hpp>
+
+//----------------------------------------------------------------------------
+#include <TestRandom.hpp>
+#include <TestSort.hpp>
+#include <iomanip>
+
+namespace Test {
+
+TEST(openmp, SortUnsigned1D) {
+  Impl::test_1D_sort<Kokkos::OpenMP, unsigned>(171);
+}
+
+}  // namespace Test
+#else
+void KOKKOS_ALGORITHMS_UNITTESTS_TESTOPENMP_PREVENT_LINK_ERROR() {}
+#endif
diff --git a/kokkos/algorithms/unit_tests/TestOpenMP_Sort3D.cpp b/kokkos/algorithms/unit_tests/TestOpenMP_Sort3D.cpp
new file mode 100644
index 000000000..127d911d7
--- /dev/null
+++ b/kokkos/algorithms/unit_tests/TestOpenMP_Sort3D.cpp
@@ -0,0 +1,65 @@
+/*
+//@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
+*/
+
+#include <Kokkos_Macros.hpp>
+#ifdef KOKKOS_ENABLE_OPENMP
+
+#include <gtest/gtest.h>
+#include <Kokkos_Core.hpp>
+
+//----------------------------------------------------------------------------
+#include <TestRandom.hpp>
+#include <TestSort.hpp>
+#include <iomanip>
+
+namespace Test {
+
+TEST(openmp, SortUnsigned3D) {
+  Impl::test_3D_sort<Kokkos::OpenMP, unsigned>(171);
+}
+
+}  // namespace Test
+#else
+void KOKKOS_ALGORITHMS_UNITTESTS_TESTOPENMP_PREVENT_LINK_ERROR() {}
+#endif
diff --git a/kokkos/algorithms/unit_tests/TestOpenMP_SortDynamicView.cpp b/kokkos/algorithms/unit_tests/TestOpenMP_SortDynamicView.cpp
new file mode 100644
index 000000000..3dc885404
--- /dev/null
+++ b/kokkos/algorithms/unit_tests/TestOpenMP_SortDynamicView.cpp
@@ -0,0 +1,65 @@
+/*
+//@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
+*/
+
+#include <Kokkos_Macros.hpp>
+#ifdef KOKKOS_ENABLE_OPENMP
+
+#include <gtest/gtest.h>
+#include <Kokkos_Core.hpp>
+
+//----------------------------------------------------------------------------
+#include <TestRandom.hpp>
+#include <TestSort.hpp>
+#include <iomanip>
+
+namespace Test {
+
+TEST(openmp, SortUnsignedDynamicView) {
+  Impl::test_dynamic_view_sort<Kokkos::OpenMP, unsigned>(171);
+}
+
+}  // namespace Test
+#else
+void KOKKOS_ALGORITHMS_UNITTESTS_TESTOPENMP_PREVENT_LINK_ERROR() {}
+#endif
diff --git a/kokkos/algorithms/unit_tests/TestROCm.cpp b/kokkos/algorithms/unit_tests/TestROCm.cpp
index d1d59c137..29814cca3 100644
--- a/kokkos/algorithms/unit_tests/TestROCm.cpp
+++ b/kokkos/algorithms/unit_tests/TestROCm.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/algorithms/unit_tests/TestRandom.hpp b/kokkos/algorithms/unit_tests/TestRandom.hpp
index bec648a47..10a496242 100644
--- a/kokkos/algorithms/unit_tests/TestRandom.hpp
+++ b/kokkos/algorithms/unit_tests/TestRandom.hpp
@@ -23,10 +23,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -140,7 +140,7 @@ struct test_random_functor {
         density_3d(d3d) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator()(int i, RandomProperties& prop) const {
+  void operator()(int /*i*/, RandomProperties& prop) const {
     using Kokkos::atomic_fetch_add;
 
     rnd_type rand_gen = rand_pool.get_state();
diff --git a/kokkos/algorithms/unit_tests/TestSerial.cpp b/kokkos/algorithms/unit_tests/TestSerial.cpp
index 01f36b27d..2eacdc267 100644
--- a/kokkos/algorithms/unit_tests/TestSerial.cpp
+++ b/kokkos/algorithms/unit_tests/TestSerial.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/algorithms/unit_tests/TestSort.hpp b/kokkos/algorithms/unit_tests/TestSort.hpp
index 9ceb53fff..b6ff91c25 100644
--- a/kokkos/algorithms/unit_tests/TestSort.hpp
+++ b/kokkos/algorithms/unit_tests/TestSort.hpp
@@ -23,10 +23,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -130,7 +130,7 @@ struct sum3D {
 };
 
 template <class ExecutionSpace, typename KeyType>
-void test_1D_sort(unsigned int n, bool force_kokkos) {
+void test_1D_sort_impl(unsigned int n, bool force_kokkos) {
   typedef Kokkos::View<KeyType*, ExecutionSpace> KeyViewType;
   KeyViewType keys("Keys", n);
 
@@ -165,7 +165,7 @@ void test_1D_sort(unsigned int n, bool force_kokkos) {
 }
 
 template <class ExecutionSpace, typename KeyType>
-void test_3D_sort(unsigned int n) {
+void test_3D_sort_impl(unsigned int n) {
   typedef Kokkos::View<KeyType * [3], ExecutionSpace> KeyViewType;
 
   KeyViewType keys("Keys", n * n * n);
@@ -214,7 +214,7 @@ void test_3D_sort(unsigned int n) {
 //----------------------------------------------------------------------------
 
 template <class ExecutionSpace, typename KeyType>
-void test_dynamic_view_sort(unsigned int n) {
+void test_dynamic_view_sort_impl(unsigned int n) {
   typedef Kokkos::Experimental::DynamicView<KeyType*, ExecutionSpace>
       KeyDynamicViewType;
   typedef Kokkos::View<KeyType*, ExecutionSpace> KeyViewType;
@@ -278,7 +278,7 @@ void test_dynamic_view_sort(unsigned int n) {
 //----------------------------------------------------------------------------
 
 template <class ExecutionSpace>
-void test_issue_1160() {
+void test_issue_1160_impl() {
   Kokkos::View<int*, ExecutionSpace> element_("element", 10);
   Kokkos::View<double*, ExecutionSpace> x_("x", 10);
   Kokkos::View<double*, ExecutionSpace> v_("y", 10);
@@ -345,17 +345,34 @@ void test_issue_1160() {
 
 //----------------------------------------------------------------------------
 
+template <class ExecutionSpace, typename KeyType>
+void test_1D_sort(unsigned int N) {
+  test_1D_sort_impl<ExecutionSpace, KeyType>(N * N * N, true);
+  test_1D_sort_impl<ExecutionSpace, KeyType>(N * N * N, false);
+}
+
+template <class ExecutionSpace, typename KeyType>
+void test_3D_sort(unsigned int N) {
+  test_3D_sort_impl<ExecutionSpace, KeyType>(N);
+}
+
+template <class ExecutionSpace, typename KeyType>
+void test_dynamic_view_sort(unsigned int N) {
+  test_dynamic_view_sort_impl<ExecutionSpace, KeyType>(N * N);
+}
+
+template <class ExecutionSpace>
+void test_issue_1160_sort() {
+  test_issue_1160_impl<ExecutionSpace>();
+}
+
 template <class ExecutionSpace, typename KeyType>
 void test_sort(unsigned int N) {
-  test_1D_sort<ExecutionSpace, KeyType>(N * N * N, true);
-  test_1D_sort<ExecutionSpace, KeyType>(N * N * N, false);
-#if !defined(KOKKOS_ENABLE_ROCM)
+  test_1D_sort<ExecutionSpace, KeyType>(N);
   test_3D_sort<ExecutionSpace, KeyType>(N);
-  test_dynamic_view_sort<ExecutionSpace, KeyType>(N * N);
-#endif
-  test_issue_1160<ExecutionSpace>();
+  test_dynamic_view_sort<ExecutionSpace, KeyType>(N);
+  test_issue_1160_sort<ExecutionSpace>();
 }
-
 }  // namespace Impl
 }  // namespace Test
 #endif /* KOKKOS_ALGORITHMS_UNITTESTS_TESTSORT_HPP */
diff --git a/kokkos/algorithms/unit_tests/TestThreads.cpp b/kokkos/algorithms/unit_tests/TestThreads.cpp
index 733b76217..c75e6e8df 100644
--- a/kokkos/algorithms/unit_tests/TestThreads.cpp
+++ b/kokkos/algorithms/unit_tests/TestThreads.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/algorithms/unit_tests/UnitTestMain.cpp b/kokkos/algorithms/unit_tests/UnitTestMain.cpp
index c62c74058..e245aad35 100644
--- a/kokkos/algorithms/unit_tests/UnitTestMain.cpp
+++ b/kokkos/algorithms/unit_tests/UnitTestMain.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/appveyor.yml b/kokkos/appveyor.yml
new file mode 100644
index 000000000..8f139ba6a
--- /dev/null
+++ b/kokkos/appveyor.yml
@@ -0,0 +1,10 @@
+image:
+  - Visual Studio 2019
+clone_folder: c:\projects\source
+build_script:
+- cmd: >-
+    mkdir build &&
+    cd build &&
+    cmake c:\projects\source -DKokkos_ENABLE_TESTS=ON -DKokkos_ENABLE_LIBDL=OFF -DKokkos_ENABLE_PROFILING=OFF &&
+    cmake --build . --target install &&
+    ctest -C Debug -V
diff --git a/kokkos/benchmarks/bytes_and_flops/bench.hpp b/kokkos/benchmarks/bytes_and_flops/bench.hpp
index 419702574..62d7ef4a4 100644
--- a/kokkos/benchmarks/bytes_and_flops/bench.hpp
+++ b/kokkos/benchmarks/bytes_and_flops/bench.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/benchmarks/bytes_and_flops/bench_stride.hpp b/kokkos/benchmarks/bytes_and_flops/bench_stride.hpp
index 1b0a77be4..64817fe9d 100644
--- a/kokkos/benchmarks/bytes_and_flops/bench_stride.hpp
+++ b/kokkos/benchmarks/bytes_and_flops/bench_stride.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/benchmarks/bytes_and_flops/bench_unroll_stride.hpp b/kokkos/benchmarks/bytes_and_flops/bench_unroll_stride.hpp
index ebd2c39f5..00ce635a4 100644
--- a/kokkos/benchmarks/bytes_and_flops/bench_unroll_stride.hpp
+++ b/kokkos/benchmarks/bytes_and_flops/bench_unroll_stride.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/benchmarks/bytes_and_flops/main.cpp b/kokkos/benchmarks/bytes_and_flops/main.cpp
index 3eceba78f..c21a16200 100644
--- a/kokkos/benchmarks/bytes_and_flops/main.cpp
+++ b/kokkos/benchmarks/bytes_and_flops/main.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/benchmarks/gather/gather.hpp b/kokkos/benchmarks/gather/gather.hpp
index 4ecaad045..239614184 100644
--- a/kokkos/benchmarks/gather/gather.hpp
+++ b/kokkos/benchmarks/gather/gather.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/benchmarks/gather/gather_unroll.hpp b/kokkos/benchmarks/gather/gather_unroll.hpp
index e816c80e6..4dc046f99 100644
--- a/kokkos/benchmarks/gather/gather_unroll.hpp
+++ b/kokkos/benchmarks/gather/gather_unroll.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/benchmarks/gather/main.cpp b/kokkos/benchmarks/gather/main.cpp
index d6b9c983a..6a2db3e02 100644
--- a/kokkos/benchmarks/gather/main.cpp
+++ b/kokkos/benchmarks/gather/main.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/benchmarks/gups/gups-kokkos.cc b/kokkos/benchmarks/gups/gups-kokkos.cc
index 40a8bed94..36fc36925 100644
--- a/kokkos/benchmarks/gups/gups-kokkos.cc
+++ b/kokkos/benchmarks/gups/gups-kokkos.cc
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -61,7 +61,7 @@ typedef int GUPSIndex;
 
 double now() {
 	struct timeval now;
-	gettimeofday(&now, NULL);
+	gettimeofday(&now, nullptr);
 
 	return (double) now.tv_sec + ((double) now.tv_usec * 1.0e-6);
 }
diff --git a/kokkos/benchmarks/policy_performance/main.cpp b/kokkos/benchmarks/policy_performance/main.cpp
index 9ed733a5c..332e5574d 100644
--- a/kokkos/benchmarks/policy_performance/main.cpp
+++ b/kokkos/benchmarks/policy_performance/main.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/benchmarks/policy_performance/policy_perf_test.hpp b/kokkos/benchmarks/policy_performance/policy_perf_test.hpp
index 87bc36f32..7a1500891 100644
--- a/kokkos/benchmarks/policy_performance/policy_perf_test.hpp
+++ b/kokkos/benchmarks/policy_performance/policy_perf_test.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/benchmarks/policy_performance/script_sample_usage.sh b/kokkos/benchmarks/policy_performance/script_sample_usage.sh
index f4bfb87f8..1c2db5664 100755
--- a/kokkos/benchmarks/policy_performance/script_sample_usage.sh
+++ b/kokkos/benchmarks/policy_performance/script_sample_usage.sh
@@ -2,7 +2,7 @@
 
 # Sample script for benchmarking policy performance 
 
-# Suggested enviroment variables to export prior to executing script:
+# Suggested environment variables to export prior to executing script:
 # KNL: 
 # OMP_NUM_THREADS=256 KMP_AFFINITY=compact
 # Power:
diff --git a/kokkos/benchmarks/stream/stream-kokkos.cc b/kokkos/benchmarks/stream/stream-kokkos.cc
index 0a4ca84cc..8d604079d 100644
--- a/kokkos/benchmarks/stream/stream-kokkos.cc
+++ b/kokkos/benchmarks/stream/stream-kokkos.cc
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -64,7 +64,7 @@ typedef int StreamIndex;
 
 double now() {
 	struct timeval now;
-	gettimeofday(&now, NULL);
+	gettimeofday(&now, nullptr);
 
 	return (double) now.tv_sec + ((double) now.tv_usec * 1.0e-6);
 }
diff --git a/kokkos/bin/hpcbind b/kokkos/bin/hpcbind
index b185a9282..6af091a7d 100755
--- a/kokkos/bin/hpcbind
+++ b/kokkos/bin/hpcbind
@@ -383,7 +383,7 @@ fi
 # Check unknown arguments
 ################################################################################
 if [[ ${#UNKNOWN_ARGS[*]} > 0 ]]; then
-  echo "HPCBIND Uknown options: ${UNKNOWN_ARGS[*]}" > >(tee -a ${HPCBIND_LOG})
+  echo "HPCBIND Unknown options: ${UNKNOWN_ARGS[*]}" > >(tee -a ${HPCBIND_LOG})
   exit 1
 fi
 
diff --git a/kokkos/cm_generate_makefile.bash b/kokkos/cm_generate_makefile.bash
deleted file mode 100755
index fd7cfe2d3..000000000
--- a/kokkos/cm_generate_makefile.bash
+++ /dev/null
@@ -1,339 +0,0 @@
-#!/bin/bash
-
-update_kokkos_devices() {
-   SEARCH_TEXT="*$1*"
-   if [[ $KOKKOS_DEVICES == $SEARCH_TEXT ]]; then
-      echo kokkos devices already includes $SEARCH_TEXT
-   else
-      if [ "$KOKKOS_DEVICES" = "" ]; then
-         KOKKOS_DEVICES="$1"
-         echo reseting kokkos devices to $KOKKOS_DEVICES
-      else
-         KOKKOS_DEVICES="${KOKKOS_DEVICES},$1"
-         echo appending to kokkos devices $KOKKOS_DEVICES
-      fi
-   fi
-}
-
-get_kokkos_device_list() {
-  KOKKOS_DEVICE_CMD=
-  PARSE_DEVICES_LST=$(echo $KOKKOS_DEVICES | tr "," "\n")
-  for DEVICE_ in $PARSE_DEVICES_LST
-  do 
-     UC_DEVICE=$(echo $DEVICE_ | tr "[:lower:]" "[:upper:]")
-     KOKKOS_DEVICE_CMD="-DKokkos_ENABLE_${UC_DEVICE}=ON ${KOKKOS_DEVICE_CMD}"
-  done
-}
-
-get_kokkos_arch_list() {
-  KOKKOS_ARCH_CMD=
-  PARSE_ARCH_LST=$(echo $KOKKOS_ARCH | tr "," "\n")
-  for ARCH_ in $PARSE_ARCH_LST
-  do 
-     UC_ARCH=$(echo $ARCH_ | tr "[:lower:]" "[:upper:]")
-     KOKKOS_ARCH_CMD="-DKokkos_ARCH_${UC_ARCH}=ON ${KOKKOS_ARCH_CMD}"
-  done
-}
-
-get_kokkos_cuda_option_list() {
-  echo parsing KOKKOS_CUDA_OPTIONS=$KOKKOS_CUDA_OPTIONS
-  KOKKOS_CUDA_OPTION_CMD=
-  PARSE_CUDA_LST=$(echo $KOKKOS_CUDA_OPTIONS | tr "," "\n")
-  for CUDA_ in $PARSE_CUDA_LST
-  do 
-     CUDA_OPT_NAME=
-     if [ "${CUDA_}" == "enable_lambda" ]; then
-        CUDA_OPT_NAME=CUDA_LAMBDA
-     elif  [ "${CUDA_}" == "rdc" ]; then	
-        CUDA_OPT_NAME=CUDA_RELOCATABLE_DEVICE_CODE
-     elif  [ "${CUDA_}" == "force_uvm" ]; then
-        CUDA_OPT_NAME=CUDA_UVM
-     elif  [ "${CUDA_}" == "use_ldg" ]; then
-        CUDA_OPT_NAME=CUDA_LDG_INTRINSIC
-     else
-        echo "${CUDA_} is not a valid cuda options..."
-     fi
-     if [ "${CUDA_OPT_NAME}" != "" ]; then
-        KOKKOS_CUDA_OPTION_CMD="-DKokkos_ENABLE_${CUDA_OPT_NAME}=ON ${KOKKOS_CUDA_OPTION_CMD}"
-     fi
-  done
-}
-
-get_kokkos_option_list() {
-  echo parsing KOKKOS_OPTIONS=$KOKKOS_OPTIONS
-  KOKKOS_OPTION_CMD=
-  PARSE_OPTIONS_LST=$(echo $KOKKOS_OPTIONS | tr "," "\n")
-  for OPT_ in $PARSE_OPTIONS_LST
-  do 
-     UC_OPT_=$(echo $OPT_ | tr "[:lower:]" "[:upper:]")
-     if [[ "$UC_OPT_" == *DISABLE* ]]; then
-        FLIP_OPT_=${UC_OPT_/DISABLE/ENABLE}
-        KOKKOS_OPTION_CMD="-DKokkos_${FLIP_OPT_}=OFF ${KOKKOS_OPTION_CMD}"
-     elif [[ "$UC_OPT_" == *ENABLE* ]]; then
-        KOKKOS_OPTION_CMD="-DKokkos_${UC_OPT_}=ON ${KOKKOS_OPTION_CMD}"
-     else
-        KOKKOS_OPTION_CMD="-DKokkos_ENABLE_${UC_OPT_}=ON ${KOKKOS_OPTION_CMD}"
-     fi
-  done
-}
-
-display_help_text() {
-
-      echo "Kokkos configure options:"
-      echo ""
-      echo "--kokkos-path=/Path/To/Kokkos:        Path to the Kokkos root directory."
-      echo "--prefix=/Install/Path:               Path to install the Kokkos library."
-      echo ""
-      echo "--with-cuda[=/Path/To/Cuda]:          Enable Cuda and set path to Cuda Toolkit."
-      echo "--with-openmp:                        Enable OpenMP backend."
-      echo "--with-pthread:                       Enable Pthreads backend."
-      echo "--with-serial:                        Enable Serial backend."
-      echo "--with-devices:                       Explicitly add a set of backends."
-      echo ""
-      echo "--arch=[OPT]:  Set target architectures. Options are:"
-      echo "               [AMD]"
-      echo "                 AMDAVX          = AMD CPU"
-      echo "                 EPYC            = AMD EPYC Zen-Core CPU"
-      echo "               [ARM]"
-      echo "                 ARMv80          = ARMv8.0 Compatible CPU"
-      echo "                 ARMv81          = ARMv8.1 Compatible CPU"
-      echo "                 ARMv8-ThunderX  = ARMv8 Cavium ThunderX CPU"
-      echo "                 ARMv8-TX2       = ARMv8 Cavium ThunderX2 CPU"
-      echo "               [IBM]"
-      echo "                 BGQ             = IBM Blue Gene Q"
-      echo "                 Power7          = IBM POWER7 and POWER7+ CPUs"
-      echo "                 Power8          = IBM POWER8 CPUs"
-      echo "                 Power9          = IBM POWER9 CPUs"
-      echo "               [Intel]"
-      echo "                 WSM             = Intel Westmere CPUs"
-      echo "                 SNB             = Intel Sandy/Ivy Bridge CPUs"
-      echo "                 HSW             = Intel Haswell CPUs"
-      echo "                 BDW             = Intel Broadwell Xeon E-class CPUs"
-      echo "                 SKX             = Intel Sky Lake Xeon E-class HPC CPUs (AVX512)"
-      echo "               [Intel Xeon Phi]"
-      echo "                 KNC             = Intel Knights Corner Xeon Phi"
-      echo "                 KNL             = Intel Knights Landing Xeon Phi"
-      echo "               [NVIDIA]"
-      echo "                 Kepler30        = NVIDIA Kepler generation CC 3.0"
-      echo "                 Kepler32        = NVIDIA Kepler generation CC 3.2"
-      echo "                 Kepler35        = NVIDIA Kepler generation CC 3.5"
-      echo "                 Kepler37        = NVIDIA Kepler generation CC 3.7"
-      echo "                 Maxwell50       = NVIDIA Maxwell generation CC 5.0"
-      echo "                 Maxwell52       = NVIDIA Maxwell generation CC 5.2"
-      echo "                 Maxwell53       = NVIDIA Maxwell generation CC 5.3"
-      echo "                 Pascal60        = NVIDIA Pascal generation CC 6.0"
-      echo "                 Pascal61        = NVIDIA Pascal generation CC 6.1"
-      echo "                 Volta70         = NVIDIA Volta generation CC 7.0"
-      echo "                 Volta72         = NVIDIA Volta generation CC 7.2"
-      echo ""
-      echo "--compiler=/Path/To/Compiler  Set the compiler."
-      echo "--debug,-dbg:                 Enable Debugging."
-      echo "--cxxflags=[FLAGS]            Overwrite CXXFLAGS for library build and test"
-      echo "                                build.  This will still set certain required"
-      echo "                                flags via KOKKOS_CXXFLAGS (such as -fopenmp,"
-      echo "                                --std=c++11, etc.)."
-      echo "--cxxstandard=[FLAGS]         Overwrite KOKKOS_CXX_STANDARD for library build and test"
-      echo "                                c++11 (default), c++14, c++17, c++1y, c++1z, c++2a"
-      echo "--ldflags=[FLAGS]             Overwrite LDFLAGS for library build and test"
-      echo "                                build. This will still set certain required"
-      echo "                                flags via KOKKOS_LDFLAGS (such as -fopenmp,"
-      echo "                                -lpthread, etc.)."
-      echo "--with-gtest=/Path/To/Gtest:  Set path to gtest.  (Used in unit and performance"
-      echo "                                tests.)"
-      echo "--with-hwloc=/Path/To/Hwloc:  Set path to hwloc library."
-      echo "--with-memkind=/Path/To/MemKind:  Set path to memkind library."
-      echo "--with-options=[OPT]:         Additional options to Kokkos:"
-      echo "                                compiler_warnings"
-      echo "                                aggressive_vectorization = add ivdep on loops"
-      echo "                                disable_profiling = do not compile with profiling hooks"
-      echo "                                "
-      echo "--with-cuda-options=[OPT]:    Additional options to CUDA:"
-      echo "                                force_uvm, use_ldg, enable_lambda, rdc"
-      echo "--with-hpx-options=[OPT]:     Additional options to HPX:"
-      echo "                                enable_async_dispatch"
-      echo "--gcc-toolchain=/Path/To/GccRoot:  Set the gcc toolchain to use with clang (e.g. /usr)" 
-      echo "--make-j=[NUM]:               DEPRECATED: call make with appropriate"
-      echo "                                -j flag"
-
-}
-
-while [[ $# > 0 ]]
-do
-  key="$1"
-
-  case $key in
-    --kokkos-path*)
-      KOKKOS_PATH="${key#*=}"
-      ;;
-    --hpx-path*)
-      HPX_PATH="${key#*=}"
-      ;;
-    --prefix*)
-      PREFIX="${key#*=}"
-      ;;
-    --with-cuda)
-      update_kokkos_devices Cuda
-      CUDA_PATH_NVCC=$(command -v nvcc)
-      CUDA_PATH=${CUDA_PATH_NVCC%/bin/nvcc}
-      ;;
-    # Catch this before '--with-cuda*'
-    --with-cuda-options*)
-      KOKKOS_CUDA_OPTIONS="${key#*=}"
-      ;;
-    --with-cuda*)
-      update_kokkos_devices Cuda
-      CUDA_PATH="${key#*=}"
-      ;;
-    --with-openmp)
-      update_kokkos_devices OpenMP
-      ;;
-    --with-pthread)
-      update_kokkos_devices Pthread
-      ;;
-    --with-serial)
-      update_kokkos_devices Serial
-      ;;
-    --with-hpx-options*)
-      KOKKOS_HPX_OPT="${key#*=}"
-      ;;
-    --with-hpx*)
-      update_kokkos_devices HPX
-      if [ -z "$HPX_PATH" ]; then
-        HPX_PATH="${key#*=}"
-      fi
-      ;;
-    --with-devices*)
-      DEVICES="${key#*=}"
-      PARSE_DEVICES=$(echo $DEVICES | tr "," "\n")
-      for DEVICE_ in $PARSE_DEVICES
-      do 
-         update_kokkos_devices $DEVICE_
-      done
-      ;;
-    --with-gtest*)
-      GTEST_PATH="${key#*=}"
-      ;;
-    --with-hwloc*)
-      HWLOC_PATH="${key#*=}"
-      ;;
-    --with-memkind*)
-      MEMKIND_PATH="${key#*=}"
-      ;;
-    --arch*)
-      KOKKOS_ARCH="${key#*=}"
-      ;;
-    --cxxflags*)
-      KOKKOS_CXXFLAGS="${key#*=}"
-      KOKKOS_CXXFLAGS=${KOKKOS_CXXFLAGS//,/ }
-      ;;
-    --cxxstandard*)
-      KOKKOS_CXX_STANDARD="${key#*=}"
-      ;;
-    --ldflags*)
-      KOKKOS_LDFLAGS="${key#*=}"
-      ;;
-    --debug|-dbg)
-      KOKKOS_DEBUG=yes
-      ;;
-    --make-j*)
-      echo "Warning: ${key} is deprecated"
-      echo "Call make with appropriate -j flag"
-      ;;
-    --compiler*)
-      COMPILER="${key#*=}"
-      CNUM=$(command -v ${COMPILER} 2>&1 >/dev/null | grep "no ${COMPILER}" | wc -l)
-      if [ ${CNUM} -gt 0 ]; then
-        echo "Invalid compiler by --compiler command: '${COMPILER}'"
-        exit
-      fi
-      if [[ ! -n  ${COMPILER} ]]; then
-        echo "Empty compiler specified by --compiler command."
-        exit
-      fi
-      CNUM=$(command -v ${COMPILER} | grep ${COMPILER} | wc -l)
-      if [ ${CNUM} -eq 0 ]; then
-        echo "Invalid compiler by --compiler command: '${COMPILER}'"
-        exit
-      fi
-      # ... valid compiler, ensure absolute path set 
-      WCOMPATH=$(command -v $COMPILER)
-      COMPDIR=$(dirname $WCOMPATH)
-      COMPNAME=$(basename $WCOMPATH)
-      COMPILER=${COMPDIR}/${COMPNAME}
-      ;;
-    --with-options*)
-      KOKKOS_OPTIONS="${key#*=}"
-      ;;
-    --gcc-toolchain*)
-      KOKKOS_GCC_TOOLCHAIN="${key#*=}"
-      ;;
-    --help)
-      display_help_text
-      exit 0
-      ;;
-    *)
-      echo "warning: ignoring unknown option $key"
-      ;;
-  esac
-
-  shift
-done
-
-
-if [ "$COMPILER" == "" ]; then
-    COMPILER_CMD=
-else
-    COMPILER_CMD=-DCMAKE_CXX_COMPILER=$COMPILER
-fi
-
-if [ "$KOKKOS_DEBUG" == "" ]; then
-    KOKKOS_DEBUG_CMD=-DCMAKE_BUILD_TYPE=RELEASE
-else
-    KOKKOS_DEBUG_CMD=-DCMAKE_BUILD_TYPE=DEBUG
-fi
-
-if [ ! -e ${KOKKOS_PATH}/CMakeLists.txt ]; then
-   if [ "${KOKKOS_PATH}" == "" ]; then
-      CM_SCRIPT=$0
-      KOKKOS_PATH=`dirname $CM_SCRIPT`
-      if [ ! -e ${KOKKOS_PATH}/CMakeLists.txt ]; then
-         echo "${KOKKOS_PATH} repository appears to not be complete.  please verify and try again"
-         exit 0
-      fi
-   else
-      echo "KOKKOS_PATH does not appear to be set properly. please specify in location of CMakeLists.txt"   
-      display_help_text
-      exit 0
-   fi
-fi
-
-get_kokkos_device_list
-get_kokkos_option_list
-get_kokkos_arch_list
-get_kokkos_cuda_option_list
-
-## if HPX is enabled, we need to enforce cxx standard = 14
-if [[ ${KOKKOS_DEVICE_CMD} == *Kokkos_ENABLE_HPX* ]]; then
-   if [ "${KOKKOS_CXX_STANDARD}" == "" ] || [ ${#KOKKOS_CXX_STANDARD} -lt 14 ]; then
-      echo CXX Standard must be 14 or higher for HPX to work.
-      KOKKOS_CXX_STANDARD=14
-   fi
-fi
-
-if [ "$KOKKOS_CXX_STANDARD" == "" ]; then
-    STANDARD_CMD=
-else
-    STANDARD_CMD=-DKokkos_CXX_STANDARD=${KOKKOS_CXX_STANDARD}
-fi
-
-if [[ ${COMPILER} == *clang* ]]; then
-   gcc_path=$(which g++ | awk --field-separator='/bin/g++' '{printf $1}' )
-   KOKKOS_CXXFLAGS="${KOKKOS_CXXFLAGS} --gcc-toolchain=${gcc_path}"
-
-   if [ ! "${CUDA_PATH}" == "" ]; then
-      KOKKOS_CXXFLAGS="${KOKKOS_CXXFLAGS} --cuda-path=${CUDA_PATH}"
-   fi 
-fi
- 
-echo cmake $COMPILER_CMD  -DCMAKE_CXX_FLAGS="${KOKKOS_CXXFLAGS}" -DCMAKE_EXE_LINKER_FLAGS="${KOKKOS_LDFLAGS}" -DCMAKE_INSTALL_PREFIX=${PREFIX} ${KOKKOS_DEVICE_CMD} ${KOKKOS_ARCH_CMD} -DKokkos_ENABLE_TESTS=ON ${KOKKOS_OPTION_CMD} ${KOKKOS_CUDA_OPTION_CMD} -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_CXX_EXTENSIONS=OFF ${STANDARD_CMD} ${KOKKOS_DEBUG_CMD} ${KOKKOS_PATH}
-cmake $COMPILER_CMD  -DCMAKE_CXX_FLAGS="${KOKKOS_CXXFLAGS//\"}" -DCMAKE_EXE_LINKER_FLAGS="${KOKKOS_LDFLAGS//\"}" -DCMAKE_INSTALL_PREFIX=${PREFIX} ${KOKKOS_DEVICE_CMD} ${KOKKOS_ARCH_CMD} -DKokkos_ENABLE_TESTS=ON ${KOKKOS_OPTION_CMD} ${KOKKOS_CUDA_OPTION_CMD} -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_CXX_EXTENSIONS=OFF ${STANDARD_CMD} ${KOKKOS_DEBUG_CMD} ${KOKKOS_PATH}
diff --git a/kokkos/cmake/Dependencies.cmake b/kokkos/cmake/Dependencies.cmake
index 8c51eab4d..c0be9f564 100644
--- a/kokkos/cmake/Dependencies.cmake
+++ b/kokkos/cmake/Dependencies.cmake
@@ -6,5 +6,4 @@ TRIBITS_PACKAGE_DEFINE_DEPENDENCIES(
     Core                  core              PS       REQUIRED
     Containers            containers        PS       OPTIONAL
     Algorithms            algorithms        PS       OPTIONAL
-    Example               example           EX       OPTIONAL
   )
diff --git a/kokkos/cmake/KokkosConfigCommon.cmake.in b/kokkos/cmake/KokkosConfigCommon.cmake.in
index da9c61976..8c663d01c 100644
--- a/kokkos/cmake/KokkosConfigCommon.cmake.in
+++ b/kokkos/cmake/KokkosConfigCommon.cmake.in
@@ -73,6 +73,9 @@ function(kokkos_check)
     # use it to check that there are variables defined for all required
     # arguments. Success or failure messages will be displayed but we are
     # responsible for signaling failure and skip the build system generation.
+    if (KOKKOS_CHECK_RETURN_VALUE)
+      set(Kokkos_${arg}_FIND_QUIETLY ON)
+    endif()
     find_package_handle_standard_args("Kokkos_${arg}" DEFAULT_MSG
             ${KOKKOS_CHECK_${arg}})
     if(NOT Kokkos_${arg}_FOUND)
diff --git a/kokkos/cmake/KokkosCore_config.h.in b/kokkos/cmake/KokkosCore_config.h.in
index 084afba8a..1d0b58fe0 100644
--- a/kokkos/cmake/KokkosCore_config.h.in
+++ b/kokkos/cmake/KokkosCore_config.h.in
@@ -5,11 +5,19 @@
 #define KOKKOS_CORE_CONFIG_H
 #endif
 
+// KOKKOS_VERSION % 100 is the patch level
+// KOKKOS_VERSION / 100 % 100 is the minor version
+// KOKKOS_VERSION / 10000 is the major version
+#cmakedefine KOKKOS_VERSION @KOKKOS_VERSION@
+
+
 /* Execution Spaces */
 #cmakedefine KOKKOS_ENABLE_SERIAL
 #cmakedefine KOKKOS_ENABLE_OPENMP
+#cmakedefine KOKKOS_ENABLE_OPENMPTARGET
 #cmakedefine KOKKOS_ENABLE_THREADS
 #cmakedefine KOKKOS_ENABLE_CUDA
+#cmakedefine KOKKOS_ENABLE_HIP
 #cmakedefine KOKKOS_ENABLE_HPX
 #cmakedefine KOKKOS_ENABLE_MEMKIND
 #cmakedefine KOKKOS_ENABLE_LIBRT
@@ -33,6 +41,7 @@
 #cmakedefine KOKKOS_ENABLE_CUDA_LAMBDA
 #cmakedefine KOKKOS_ENABLE_CUDA_CONSTEXPR
 #cmakedefine KOKKOS_ENABLE_CUDA_LDG_INTRINSIC
+#cmakedefine KOKKOS_ENABLE_HIP_RELOCATABLE_DEVICE_CODE
 #cmakedefine KOKKOS_ENABLE_HPX_ASYNC_DISPATCH
 #cmakedefine KOKKOS_ENABLE_DEBUG
 #cmakedefine KOKKOS_ENABLE_DEBUG_DUALVIEW_MODIFY_CHECK
diff --git a/kokkos/cmake/KokkosTrilinosConfig.cmake.in b/kokkos/cmake/KokkosTrilinosConfig.cmake.in
new file mode 100644
index 000000000..626ef5a8e
--- /dev/null
+++ b/kokkos/cmake/KokkosTrilinosConfig.cmake.in
@@ -0,0 +1,17 @@
+IF (NOT TARGET Kokkos::kokkos)
+  # Compute the installation prefix relative to this file.
+  get_filename_component(KOKKOS_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
+  get_filename_component(KOKKOS_IMPORT_PREFIX "${KOKKOS_IMPORT_PREFIX}" PATH)
+  get_filename_component(KOKKOS_IMPORT_PREFIX "${KOKKOS_IMPORT_PREFIX}" PATH)
+  get_filename_component(KOKKOS_IMPORT_PREFIX "${KOKKOS_IMPORT_PREFIX}" PATH)
+  if(KOKKOS_IMPORT_PREFIX STREQUAL "/")
+    set(KOKKOS_IMPORT_PREFIX "")
+  endif()
+  add_library(Kokkos::kokkos INTERFACE IMPORTED)
+  set_target_properties(Kokkos::kokkos PROPERTIES
+    INTERFACE_LINK_LIBRARIES "@Kokkos_LIBRARIES@;@KOKKOS_LINK_OPTIONS@"
+    INTERFACE_COMPILE_FEATURES "@KOKKOS_CXX_STANDARD_FEATURE@"
+    INTERFACE_COMPILE_OPTIONS "@KOKKOS_ALL_COMPILE_OPTIONS@"
+    INTERFACE_INCLUDE_DIRECTORIES "${KOKKOS_IMPORT_PREFIX}/include"
+  )
+ENDIF()
diff --git a/kokkos/cmake/Modules/FindTPLCUDA.cmake b/kokkos/cmake/Modules/FindTPLCUDA.cmake
index 36aefcdb4..1b36ab819 100644
--- a/kokkos/cmake/Modules/FindTPLCUDA.cmake
+++ b/kokkos/cmake/Modules/FindTPLCUDA.cmake
@@ -1,8 +1,12 @@
 
 IF (KOKKOS_CXX_COMPILER_ID STREQUAL Clang)
+   # Note: "stubs" suffix allows CMake to find the dummy
+   # libcuda.so provided by the NVIDIA CUDA Toolkit for
+   # cross-compiling CUDA on a host without a GPU.
    KOKKOS_FIND_IMPORTED(CUDA INTERFACE
     LIBRARIES cudart cuda
-    LIBRARY_PATHS ENV LD_LIBRARY_PATH ENV CUDA_PATH
+    LIBRARY_PATHS ENV LD_LIBRARY_PATH ENV CUDA_PATH /usr/local/cuda
+    LIBRARY_SUFFIXES lib lib64 lib/stubs lib64/stubs
     ALLOW_SYSTEM_PATH_FALLBACK
    )
 ELSE()
diff --git a/kokkos/cmake/Modules/FindTPLPTHREAD.cmake b/kokkos/cmake/Modules/FindTPLPTHREAD.cmake
index b4b8c3412..1d154e29a 100644
--- a/kokkos/cmake/Modules/FindTPLPTHREAD.cmake
+++ b/kokkos/cmake/Modules/FindTPLPTHREAD.cmake
@@ -3,15 +3,18 @@ TRY_COMPILE(KOKKOS_HAS_PTHREAD_ARG
   ${KOKKOS_TOP_BUILD_DIR}/tpl_tests
   ${KOKKOS_SOURCE_DIR}/cmake/compile_tests/pthread.cpp
   LINK_LIBRARIES -pthread
-  COMPILE_DEFINITIONS -pthread)
+  COMPILE_DEFINITIONS -pthread
+)
+# The test no longer requires C++11
+# if we did needed C++ standard support, then we should add option
+# ${CMAKE_CXX${KOKKOS_CXX_STANDARD}_STANDARD_COMPILE_OPTION}
 
 INCLUDE(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(PTHREAD DEFAULT_MSG KOKKOS_HAS_PTHREAD_ARG)
-
-KOKKOS_CREATE_IMPORTED_TPL(PTHREAD
-  INTERFACE   #this is not a real library with a real location
-  COMPILE_OPTIONS -pthread
-  LINK_OPTIONS    -pthread)
-
-
-
+#Only create the TPL if we succeed
+IF (KOKKOS_HAS_PTHREAD_ARG)
+  KOKKOS_CREATE_IMPORTED_TPL(PTHREAD
+    INTERFACE   #this is not a real library with a real location
+    COMPILE_OPTIONS -pthread
+    LINK_OPTIONS    -pthread)
+ENDIF()
diff --git a/kokkos/cmake/README.md b/kokkos/cmake/README.md
index 2ac873158..6d0cc2daf 100644
--- a/kokkos/cmake/README.md
+++ b/kokkos/cmake/README.md
@@ -67,7 +67,7 @@ Note that all of these use `PUBLIC`! Almost every Kokkos flag is not private to
 
 
 ### Compiler Features and Compiler Options
-Compiler options are flags like `-fopenmp` that do not need to be "resolved." 
+Compiler options are flags like `-fopenmp` that do not need to be "resolved."
 The flag is either on or off.
 Compiler features are more fine-grained and require conflicting requests to be resolved.
 Suppose I have
@@ -81,7 +81,7 @@ add_library(B b.cpp)
 target_compile_features(B PUBLIC cxx_std_14)
 target_link_libraries(A B)
 ````
-I have requested two diferent features.
+I have requested two different features.
 CMake understands the requests and knows that `cxx_std_11` is a subset of `cxx_std_14`.
 CMake then picks C++14 for library `B`.
 CMake would not have been able to do feature resolution if we had directly done:
@@ -145,11 +145,11 @@ If Kokkos depends on, e.g. `hwloc` the downstream project will also need to link
 There are three stages in adding a new third-party library (TPL):
 * Finding: find the desired library on the system and verify the installation is correct
 * Importing: create a CMake target, if necessary, that is compatible with `target_link_libraries`. This is mostly relevant for TPLs not installed with CMake.
-* Exporting: make the desired library visible to downstream projects 
+* Exporting: make the desired library visible to downstream projects
 
 TPLs are somewhat complicated by whether the library was installed with CMake or some other build system.
 If CMake, our lives are greatly simplified. We simply use `find_package` to locate the installed CMake project then call `target_link_libraries(kokkoscore PUBLIC/PRIVATE TPL)`. For libaries not installed with CMake, the process is a bit more complex.
-It is up to the Kokkos developers to "convert" the library into a CMake target as if it had been installed as a valid modern CMake target with properties.  
+It is up to the Kokkos developers to "convert" the library into a CMake target as if it had been installed as a valid modern CMake target with properties.
 There are helper functions for simplifying the process of importing TPLs in Kokkos, but we walk through the process in detail to clearly illustrate the steps involved.
 
 #### TPL Search Order
@@ -166,8 +166,9 @@ There are 3 possibilities that could be used:
 The following is the search order that Kokkos follows. Note: This differs from the default search order used by CMake `find_library` and `find_header`. CMake prefers default system paths over user-provided paths.
 For Kokkos (and package managers in general), it is better to prefer user-provided paths since this usually indicates a specific version we want.
 
-1. `<NAME>_ROOT`
-1. `Kokkos_<NAME>_DIR`
+1. `<NAME>_ROOT` command line option
+1. `<NAME>_ROOT` environment variable
+1. `Kokkos_<NAME>_DIR` command line option
 1.  Paths added by Kokkos CMake logic
 1.  Default system paths (if allowed)
 
@@ -179,7 +180,7 @@ If you do not find the TPL where you expect it, you should error out rather than
 #### Finding TPLs
 
 If finding a TPL that is not a modern CMake project, refer to the `FindHWLOC.cmake` file in `cmake/Modules` for an example.
-You will ususally need to verify expected headers with `find_path`
+You will usually need to verify expected headers with `find_path`
 ````
 find_path(TPL_INCLUDE_DIR mytpl.h PATHS "${KOKKOS_MYTPL_DIR}/include")
 ````
diff --git a/kokkos/cmake/compile_tests/clang_omp.cpp b/kokkos/cmake/compile_tests/clang_omp.cpp
index ce3bbfb26..60a5c5228 100644
--- a/kokkos/cmake/compile_tests/clang_omp.cpp
+++ b/kokkos/cmake/compile_tests/clang_omp.cpp
@@ -1,6 +1,6 @@
 #include <omp.h>
 
-int main(int argc, char** argv) {
+int main(int, char**) {
   int thr = omp_get_num_threads();
   if (thr > 0)
     return thr;
diff --git a/kokkos/cmake/compile_tests/pthread.cpp b/kokkos/cmake/compile_tests/pthread.cpp
index 3b13f7ba3..92310da02 100644
--- a/kokkos/cmake/compile_tests/pthread.cpp
+++ b/kokkos/cmake/compile_tests/pthread.cpp
@@ -4,6 +4,10 @@ void* kokkos_test(void* args) { return args; }
 
 int main(void) {
   pthread_t thread;
+  /* Use NULL to avoid C++11. Some compilers
+     do not have C++11 by default.  Forcing C++11
+     in the compile tests can be done, but is unnecessary
+  */
   pthread_create(&thread, NULL, kokkos_test, NULL);
   pthread_join(thread, NULL);
   return 0;
diff --git a/kokkos/cmake/fake_tribits.cmake b/kokkos/cmake/fake_tribits.cmake
index 26948d2cf..acee4a249 100644
--- a/kokkos/cmake/fake_tribits.cmake
+++ b/kokkos/cmake/fake_tribits.cmake
@@ -24,10 +24,6 @@ IF(NOT ${MACRO_DEFINE_NAME} STREQUAL "")
 ENDIF()
 ENDMACRO()
 
-MACRO(GLOBAL_RESET VARNAME)
-  SET(${VARNAME} "" CACHE INTERNAL "" FORCE)
-ENDMACRO()
-
 MACRO(GLOBAL_OVERWRITE VARNAME VALUE TYPE)
   SET(${VARNAME} ${VALUE} CACHE ${TYPE} "" FORCE)
 ENDMACRO()
@@ -88,13 +84,9 @@ MACRO(ADD_INTERFACE_LIBRARY LIB_NAME)
   SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES INTERFACE TRUE)
 ENDMACRO()
 
-IF(NOT TARGET check)
-  ADD_CUSTOM_TARGET(check COMMAND ${CMAKE_CTEST_COMMAND} -VV -C ${CMAKE_CFG_INTDIR})
-ENDIF()
-
 FUNCTION(KOKKOS_ADD_TEST)
   if (KOKKOS_HAS_TRILINOS)
-    CMAKE_PARSE_ARGUMENTS(TEST 
+    CMAKE_PARSE_ARGUMENTS(TEST
       ""
       "EXE;NAME"
       ""
@@ -108,22 +100,27 @@ FUNCTION(KOKKOS_ADD_TEST)
     TRIBITS_ADD_TEST(
       ${EXE_ROOT}
       NAME ${TEST_NAME}
-      ${ARGN} 
       COMM serial mpi
       NUM_MPI_PROCS 1
       ${TEST_UNPARSED_ARGUMENTS}
     )
   else()
-    CMAKE_PARSE_ARGUMENTS(TEST 
+    CMAKE_PARSE_ARGUMENTS(TEST
       "WILL_FAIL"
       "FAIL_REGULAR_EXPRESSION;PASS_REGULAR_EXPRESSION;EXE;NAME"
       "CATEGORIES;CMD_ARGS"
       ${ARGN})
+    # To match Tribits, we should always be receiving
+    # the root names of exes/libs
     IF(TEST_EXE)
-      SET(EXE ${TEST_EXE})
+      SET(EXE_ROOT ${TEST_EXE})
     ELSE()
-      SET(EXE ${TEST_NAME})
+      SET(EXE_ROOT ${TEST_NAME})
     ENDIF()
+    # Prepend package name to the test name
+    # These should be the full target name
+    SET(TEST_NAME ${PACKAGE_NAME}_${TEST_NAME})
+    SET(EXE ${PACKAGE_NAME}_${EXE_ROOT})
     IF(WIN32)
       ADD_TEST(NAME ${TEST_NAME} WORKING_DIRECTORY ${LIBRARY_OUTPUT_PATH} COMMAND ${EXE}${CMAKE_EXECUTABLE_SUFFIX} ${TEST_CMD_ARGS})
     ELSE()
@@ -160,7 +157,7 @@ FUNCTION(KOKKOS_TPL_FIND_INCLUDE_DIRS_AND_LIBRARIES TPL_NAME)
   if (KOKKOS_HAS_TRILINOS)
     TRIBITS_TPL_FIND_INCLUDE_DIRS_AND_LIBRARIES(${TPL_NAME} ${ARGN})
   else()
-    CMAKE_PARSE_ARGUMENTS(PARSE 
+    CMAKE_PARSE_ARGUMENTS(PARSE
       ""
       ""
       "REQUIRED_HEADERS;REQUIRED_LIBS_NAMES"
@@ -214,13 +211,13 @@ ENDFUNCTION()
 
 FUNCTION(KOKKOS_TARGET_INCLUDE_DIRECTORIES TARGET)
 IF(KOKKOS_HAS_TRILINOS)
-  KOKKOS_LIB_TYPE(${TARGET} INCTYPE) 
+  KOKKOS_LIB_TYPE(${TARGET} INCTYPE)
   #don't trust tribits to do this correctly - but need to add package name
   TARGET_INCLUDE_DIRECTORIES(${TARGET} ${INCTYPE} ${ARGN})
-ELSEIF(TARGET ${TARGET}) 
+ELSEIF(TARGET ${TARGET})
   #the target actually exists - this means we are doing separate libs
   #or this a test library
-  KOKKOS_LIB_TYPE(${TARGET} INCTYPE) 
+  KOKKOS_LIB_TYPE(${TARGET} INCTYPE)
   TARGET_INCLUDE_DIRECTORIES(${TARGET} ${INCTYPE} ${ARGN})
 ELSE()
   GET_PROPERTY(LIBS GLOBAL PROPERTY KOKKOS_LIBRARIES_NAMES)
@@ -239,7 +236,7 @@ ELSE()
   SET(options INTERFACE)
   SET(oneValueArgs)
   SET(multiValueArgs)
-  CMAKE_PARSE_ARGUMENTS(PARSE 
+  CMAKE_PARSE_ARGUMENTS(PARSE
     "INTERFACE"
     ""
     ""
@@ -264,7 +261,7 @@ ELSE()
   SET(oneValueArgs)
   SET(multiValueArgs HEADERS SOURCES)
 
-  CMAKE_PARSE_ARGUMENTS(PARSE 
+  CMAKE_PARSE_ARGUMENTS(PARSE
     "STATIC;SHARED"
     ""
     "HEADERS;SOURCES"
@@ -277,10 +274,6 @@ ELSE()
     LIST(REMOVE_DUPLICATES PARSE_SOURCES)
   ENDIF()
   ADD_LIBRARY(${NAME} ${PARSE_SOURCES})
-  target_link_libraries(
-    ${NAME}
-    PUBLIC kokkos
-  )
 ENDIF()
 ENDFUNCTION()
 
diff --git a/kokkos/cmake/kokkos_arch.cmake b/kokkos/cmake/kokkos_arch.cmake
index c33247c95..d73a35398 100644
--- a/kokkos/cmake/kokkos_arch.cmake
+++ b/kokkos/cmake/kokkos_arch.cmake
@@ -9,52 +9,6 @@ FUNCTION(KOKKOS_ARCH_OPTION SUFFIX DEV_TYPE DESCRIPTION)
   SET(KOKKOS_ARCH_${SUFFIX} ${KOKKOS_ARCH_${SUFFIX}} PARENT_SCOPE)
 ENDFUNCTION()
 
-FUNCTION(ARCH_FLAGS)
-  SET(COMPILERS NVIDIA PGI XL DEFAULT Cray Intel Clang AppleClang GNU)
-  CMAKE_PARSE_ARGUMENTS(
-    PARSE
-    "LINK_ONLY;COMPILE_ONLY"
-    ""
-    "${COMPILERS}"
-    ${ARGN})
-
-  SET(COMPILER ${KOKKOS_CXX_COMPILER_ID})
-
-  SET(FLAGS)
-  SET(NEW_COMPILE_OPTIONS)
-  SET(NEW_XCOMPILER_OPTIONS)
-  SET(NEW_LINK_OPTIONS)
-  LIST(APPEND NEW_XCOMPILER_OPTIONS ${KOKKOS_XCOMPILER_OPTIONS})
-  LIST(APPEND NEW_COMPILE_OPTIONS ${KOKKOS_COMPILE_OPTIONS})
-  LIST(APPEND NEW_LINK_OPTIONS ${KOKKOS_LINK_OPTIONS})
-  FOREACH(COMP ${COMPILERS})
-    IF (COMPILER STREQUAL "${COMP}")
-      IF (PARSE_${COMPILER})
-        IF (NOT "${PARSE_${COMPILER}}" STREQUAL "NO-VALUE-SPECIFIED")
-           SET(FLAGS ${PARSE_${COMPILER}})
-        ENDIF()
-      ELSEIF(PARSE_DEFAULT)
-        SET(FLAGS ${PARSE_DEFAULT})
-      ENDIF()
-    ENDIF()
-  ENDFOREACH()
-
-  IF (NOT LINK_ONLY)
-    # The funky logic here is for future handling of argument deduplication
-    # If we naively pass multiple -Xcompiler flags to target_compile_options
-    # -Xcompiler will get deduplicated and break the build
-    IF ("-Xcompiler" IN_LIST FLAGS)
-      LIST(REMOVE_ITEM FLAGS "-Xcompiler")
-      GLOBAL_APPEND(KOKKOS_XCOMPILER_OPTIONS ${FLAGS})
-    ELSE()
-      GLOBAL_APPEND(KOKKOS_COMPILE_OPTIONS ${FLAGS})
-    ENDIF()
-  ENDIF()
-
-  IF (NOT COMPILE_ONLY)
-    GLOBAL_APPEND(KOKKOS_LINK_OPTIONS ${FLAGS})
-  ENDIF()
-ENDFUNCTION()
 
 # Make sure devices and compiler ID are done
 KOKKOS_CFG_DEPENDS(ARCH COMPILER_ID)
@@ -98,14 +52,15 @@ KOKKOS_ARCH_OPTION(VOLTA70         GPU  "NVIDIA Volta generation CC 7.0")
 KOKKOS_ARCH_OPTION(VOLTA72         GPU  "NVIDIA Volta generation CC 7.2")
 KOKKOS_ARCH_OPTION(TURING75        GPU  "NVIDIA Turing generation CC 7.5")
 KOKKOS_ARCH_OPTION(EPYC            HOST "AMD Epyc architecture")
-
+KOKKOS_ARCH_OPTION(VEGA900         GPU  "AMD GPU MI25 GFX900")
+KOKKOS_ARCH_OPTION(VEGA906         GPU  "AMD GPU MI50/MI60 GFX906")
 
 IF (KOKKOS_ENABLE_CUDA)
  #Regardless of version, make sure we define the general architecture name
  IF (KOKKOS_ARCH_KEPLER30 OR KOKKOS_ARCH_KEPLER32 OR KOKKOS_ARCH_KEPLER35 OR KOKKOS_ARCH_KEPLER37)
    SET(KOKKOS_ARCH_KEPLER ON)
  ENDIF()
- 
+
  #Regardless of version, make sure we define the general architecture name
  IF (KOKKOS_ARCH_MAXWELL50 OR KOKKOS_ARCH_MAXWELL52 OR KOKKOS_ARCH_MAXWELL53)
    SET(KOKKOS_ARCH_MAXWELL ON)
@@ -126,13 +81,13 @@ ENDIF()
 
 IF(KOKKOS_ENABLE_COMPILER_WARNINGS)
   SET(COMMON_WARNINGS
-    "-Wall" "-Wshadow" "-pedantic" 
+    "-Wall" "-Wunused-parameter" "-Wshadow" "-pedantic"
     "-Wsign-compare" "-Wtype-limits" "-Wuninitialized")
 
   SET(GNU_WARNINGS "-Wempty-body" "-Wclobbered" "-Wignored-qualifiers"
     ${COMMON_WARNINGS})
 
-  ARCH_FLAGS(
+  COMPILER_SPECIFIC_FLAGS(
     PGI NO-VALUE-SPECIFIED
     GNU     ${GNU_WARNINGS}
     DEFAULT ${COMMON_WARNINGS}
@@ -141,7 +96,8 @@ ENDIF()
 
 
 #------------------------------- KOKKOS_CUDA_OPTIONS ---------------------------
-GLOBAL_RESET(KOKKOS_CUDA_OPTIONS)
+#clear anything that might be in the cache
+GLOBAL_SET(KOKKOS_CUDA_OPTIONS)
 # Construct the Makefile options
 IF (KOKKOS_ENABLE_CUDA_LAMBDA)
   IF(KOKKOS_CXX_COMPILER_ID STREQUAL NVIDIA)
@@ -157,6 +113,7 @@ ENDIF()
 
 IF (KOKKOS_CXX_COMPILER_ID STREQUAL Clang)
   SET(CUDA_ARCH_FLAG "--cuda-gpu-arch")
+  SET(AMDGPU_ARCH_FLAG "--amdgpu-target")
   GLOBAL_APPEND(KOKKOS_CUDA_OPTIONS -x cuda)
   IF (KOKKOS_ENABLE_CUDA)
      SET(KOKKOS_IMPL_CUDA_CLANG_WORKAROUND ON CACHE BOOL "enable CUDA Clang workarounds" FORCE)
@@ -171,27 +128,13 @@ IF (KOKKOS_CXX_COMPILER_ID STREQUAL NVIDIA)
     GLOBAL_APPEND(KOKKOS_CUDA_OPTIONS -lineinfo)
   ENDIF()
   UNSET(_UPPERCASE_CMAKE_BUILD_TYPE)
-  IF (KOKKOS_CXX_COMPILER_VERSION VERSION_GREATER 9.0 OR KOKKOS_CXX_COMPILER_VERSION VERSION_EQUAL 9.0)
-    GLOBAL_APPEND(KOKKOS_CUDAFE_OPTIONS --diag_suppress=esa_on_defaulted_function_ignored) 
+  IF (KOKKOS_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 9.0 AND KOKKOS_CXX_COMPILER_VERSION VERSION_LESS 10.0)
+    GLOBAL_APPEND(KOKKOS_CUDAFE_OPTIONS --diag_suppress=esa_on_defaulted_function_ignored)
   ENDIF()
 ENDIF()
 
-IF(KOKKOS_ENABLE_OPENMP)
-  IF (KOKKOS_CXX_COMPILER_ID STREQUAL AppleClang)
-    MESSAGE(FATAL_ERROR "Apple Clang does not support OpenMP. Use native Clang instead")
-  ENDIF()
-  ARCH_FLAGS(
-    Clang      -fopenmp=libomp
-    PGI        -mp
-    NVIDIA     -Xcompiler -fopenmp
-    Cray       NO-VALUE-SPECIFIED
-    XL         -qsmp=omp
-    DEFAULT    -fopenmp 
-  )
-ENDIF()
-
 IF (KOKKOS_ARCH_ARMV80)
-  ARCH_FLAGS(
+  COMPILER_SPECIFIC_FLAGS(
     Cray NO-VALUE-SPECIFIED
     PGI  NO-VALUE-SPECIFIED
     DEFAULT -march=armv8-a
@@ -199,7 +142,7 @@ IF (KOKKOS_ARCH_ARMV80)
 ENDIF()
 
 IF (KOKKOS_ARCH_ARMV81)
-  ARCH_FLAGS(
+  COMPILER_SPECIFIC_FLAGS(
     Cray NO-VALUE-SPECIFIED
     PGI  NO-VALUE-SPECIFIED
     DEFAULT -march=armv8.1-a
@@ -208,7 +151,7 @@ ENDIF()
 
 IF (KOKKOS_ARCH_ARMV8_THUNDERX)
   SET(KOKKOS_ARCH_ARMV80 ON) #Not a cache variable
-  ARCH_FLAGS(
+  COMPILER_SPECIFIC_FLAGS(
     Cray NO-VALUE-SPECIFIED
     PGI  NO-VALUE-SPECIFIED
     DEFAULT -march=armv8-a -mtune=thunderx
@@ -217,7 +160,7 @@ ENDIF()
 
 IF (KOKKOS_ARCH_ARMV8_THUNDERX2)
   SET(KOKKOS_ARCH_ARMV81 ON) #Not a cache variable
-  ARCH_FLAGS(
+  COMPILER_SPECIFIC_FLAGS(
     Cray NO-VALUE-SPECIFIED
     PGI  NO-VALUE-SPECIFIED
     DEFAULT -mcpu=thunderx2t99 -mtune=thunderx2t99
@@ -225,7 +168,7 @@ IF (KOKKOS_ARCH_ARMV8_THUNDERX2)
 ENDIF()
 
 IF (KOKKOS_ARCH_EPYC)
-  ARCH_FLAGS(
+  COMPILER_SPECIFIC_FLAGS(
     Intel   -mavx2
     DEFAULT -march=znver1 -mtune=znver1
   )
@@ -234,7 +177,7 @@ IF (KOKKOS_ARCH_EPYC)
 ENDIF()
 
 IF (KOKKOS_ARCH_WSM)
-  ARCH_FLAGS(
+  COMPILER_SPECIFIC_FLAGS(
     Intel   -xSSE4.2
     PGI     -tp=nehalem
     Cray    NO-VALUE-SPECIFIED
@@ -245,7 +188,7 @@ ENDIF()
 
 IF (KOKKOS_ARCH_SNB OR KOKKOS_ARCH_AMDAVX)
   SET(KOKKOS_ARCH_AVX ON)
-  ARCH_FLAGS(
+  COMPILER_SPECIFIC_FLAGS(
     Intel   -mavx
     PGI     -tp=sandybridge
     Cray    NO-VALUE-SPECIFIED
@@ -255,7 +198,7 @@ ENDIF()
 
 IF (KOKKOS_ARCH_HSW)
   SET(KOKKOS_ARCH_AVX2 ON)
-  ARCH_FLAGS(
+  COMPILER_SPECIFIC_FLAGS(
     Intel   -xCORE-AVX2
     PGI     -tp=haswell
     Cray    NO-VALUE-SPECIFIED
@@ -265,7 +208,7 @@ ENDIF()
 
 IF (KOKKOS_ARCH_BDW)
   SET(KOKKOS_ARCH_AVX2 ON)
-  ARCH_FLAGS(
+  COMPILER_SPECIFIC_FLAGS(
     Intel   -xCORE-AVX2
     PGI     -tp=haswell
     Cray    NO-VALUE-SPECIFIED
@@ -275,7 +218,7 @@ ENDIF()
 
 IF (KOKKOS_ARCH_EPYC)
   SET(KOKKOS_ARCH_AMD_AVX2 ON)
-  ARCH_FLAGS(
+  COMPILER_SPECIFIC_FLAGS(
     Intel   -mvax2
     DEFAULT  -march=znver1 -mtune=znver1
   )
@@ -284,7 +227,7 @@ ENDIF()
 IF (KOKKOS_ARCH_KNL)
   #avx512-mic
   SET(KOKKOS_ARCH_AVX512MIC ON) #not a cache variable
-  ARCH_FLAGS(
+  COMPILER_SPECIFIC_FLAGS(
     Intel   -xMIC-AVX512
     PGI     NO-VALUE-SPECIFIED
     Cray    NO-VALUE-SPECIFIED
@@ -294,7 +237,7 @@ ENDIF()
 
 IF (KOKKOS_ARCH_KNC)
   SET(KOKKOS_USE_ISA_KNC ON)
-  ARCH_FLAGS(
+  COMPILER_SPECIFIC_FLAGS(
     DEFAULT -mmic
   )
 ENDIF()
@@ -302,7 +245,7 @@ ENDIF()
 IF (KOKKOS_ARCH_SKX)
   #avx512-xeon
   SET(KOKKOS_ARCH_AVX512XEON ON)
-  ARCH_FLAGS(
+  COMPILER_SPECIFIC_FLAGS(
     Intel   -xCORE-AVX512
     PGI     NO-VALUE-SPECIFIED
     Cray    NO-VALUE-SPECIFIED
@@ -319,7 +262,7 @@ IF (KOKKOS_ARCH_BDW OR KOKKOS_ARCH_SKX)
 ENDIF()
 
 IF (KOKKOS_ARCH_POWER7)
-  ARCH_FLAGS(
+  COMPILER_SPECIFIC_FLAGS(
     PGI     NO-VALUE-SPECIFIED
     DEFAULT -mcpu=power7 -mtune=power7
   )
@@ -327,7 +270,7 @@ IF (KOKKOS_ARCH_POWER7)
 ENDIF()
 
 IF (KOKKOS_ARCH_POWER8)
-  ARCH_FLAGS(
+  COMPILER_SPECIFIC_FLAGS(
     PGI     NO-VALUE-SPECIFIED
     NVIDIA  NO-VALUE-SPECIFIED
     DEFAULT -mcpu=power8 -mtune=power8
@@ -335,7 +278,7 @@ IF (KOKKOS_ARCH_POWER8)
 ENDIF()
 
 IF (KOKKOS_ARCH_POWER9)
-  ARCH_FLAGS(
+  COMPILER_SPECIFIC_FLAGS(
     PGI     NO-VALUE-SPECIFIED
     NVIDIA  NO-VALUE-SPECIFIED
     DEFAULT -mcpu=power9 -mtune=power9
@@ -347,33 +290,50 @@ IF (KOKKOS_ARCH_POWER8 OR KOKKOS_ARCH_POWER9)
 ENDIF()
 
 IF (Kokkos_ENABLE_CUDA_RELOCATABLE_DEVICE_CODE)
-  ARCH_FLAGS(
+  COMPILER_SPECIFIC_FLAGS(
     Clang  -fcuda-rdc
     NVIDIA --relocatable-device-code=true
   )
 ENDIF()
 
+#Right now we cannot get the compiler ID when cross-compiling, so just check
+#that HIP is enabled
+IF (Kokkos_ENABLE_HIP)
+  IF (Kokkos_ENABLE_HIP_RELOCATABLE_DEVICE_CODE)
+    COMPILER_SPECIFIC_FLAGS(
+      DEFAULT -fgpu-rdc
+    )
+  ELSE()
+    COMPILER_SPECIFIC_FLAGS(
+      DEFAULT -fno-gpu-rdc
+    )
+  ENDIF()
+ENDIF()
+
 
 SET(CUDA_ARCH_ALREADY_SPECIFIED "")
 FUNCTION(CHECK_CUDA_ARCH ARCH FLAG)
-IF(KOKKOS_ARCH_${ARCH})
-  IF(CUDA_ARCH_ALREADY_SPECIFIED)
-    MESSAGE(FATAL_ERROR "Multiple GPU architectures given! Already have ${CUDA_ARCH_ALREADY_SPECIFIED}, but trying to add ${ARCH}. If you are re-running CMake, try clearing the cache and running again.")
-  ENDIF()
-  SET(CUDA_ARCH_ALREADY_SPECIFIED ${ARCH} PARENT_SCOPE)
-  IF (NOT KOKKOS_ENABLE_CUDA)
-    MESSAGE(WARNING "Given CUDA arch ${ARCH}, but Kokkos_ENABLE_CUDA is OFF. Option will be ignored.")
-    UNSET(KOKKOS_ARCH_${ARCH} PARENT_SCOPE)
-  ELSE()
-    GLOBAL_APPEND(KOKKOS_CUDA_OPTIONS "${CUDA_ARCH_FLAG}=${FLAG}")
-    IF(KOKKOS_ENABLE_CUDA_RELOCATABLE_DEVICE_CODE)
-       GLOBAL_APPEND(KOKKOS_LINK_OPTIONS "${CUDA_ARCH_FLAG}=${FLAG}")
+  IF(KOKKOS_ARCH_${ARCH})
+    IF(CUDA_ARCH_ALREADY_SPECIFIED)
+      MESSAGE(FATAL_ERROR "Multiple GPU architectures given! Already have ${CUDA_ARCH_ALREADY_SPECIFIED}, but trying to add ${ARCH}. If you are re-running CMake, try clearing the cache and running again.")
+    ENDIF()
+    SET(CUDA_ARCH_ALREADY_SPECIFIED ${ARCH} PARENT_SCOPE)
+    IF (NOT KOKKOS_ENABLE_CUDA AND NOT KOKKOS_ENABLE_OPENMPTARGET)
+      MESSAGE(WARNING "Given CUDA arch ${ARCH}, but Kokkos_ENABLE_CUDA and Kokkos_ENABLE_OPENMPTARGET are OFF. Option will be ignored.")
+      UNSET(KOKKOS_ARCH_${ARCH} PARENT_SCOPE)
+    ELSE()
+      SET(KOKKOS_CUDA_ARCH_FLAG ${FLAG} PARENT_SCOPE)
+      GLOBAL_APPEND(KOKKOS_CUDA_OPTIONS "${CUDA_ARCH_FLAG}=${FLAG}")
+      IF(KOKKOS_ENABLE_CUDA_RELOCATABLE_DEVICE_CODE)
+        GLOBAL_APPEND(KOKKOS_LINK_OPTIONS "${CUDA_ARCH_FLAG}=${FLAG}")
+      ENDIF()
     ENDIF()
   ENDIF()
-ENDIF()
 ENDFUNCTION()
 
 
+#These will define KOKKOS_CUDA_ARCH_FLAG
+#to the corresponding flag name if ON
 CHECK_CUDA_ARCH(KEPLER30  sm_30)
 CHECK_CUDA_ARCH(KEPLER32  sm_32)
 CHECK_CUDA_ARCH(KEPLER35  sm_35)
@@ -383,18 +343,76 @@ CHECK_CUDA_ARCH(MAXWELL52 sm_52)
 CHECK_CUDA_ARCH(MAXWELL53 sm_53)
 CHECK_CUDA_ARCH(PASCAL60  sm_60)
 CHECK_CUDA_ARCH(PASCAL61  sm_61)
-CHECK_CUDA_ARCH(VOLTA70  sm_70)
-CHECK_CUDA_ARCH(VOLTA72  sm_72)
+CHECK_CUDA_ARCH(VOLTA70   sm_70)
+CHECK_CUDA_ARCH(VOLTA72   sm_72)
 CHECK_CUDA_ARCH(TURING75  sm_75)
 
+SET(AMDGPU_ARCH_ALREADY_SPECIFIED "")
+FUNCTION(CHECK_AMDGPU_ARCH ARCH FLAG)
+  IF(KOKKOS_ARCH_${ARCH})
+    IF(AMDGPU_ARCH_ALREADY_SPECIFIED)
+      MESSAGE(FATAL_ERROR "Multiple GPU architectures given! Already have ${AMDGPU_ARCH_ALREADY_SPECIFIED}, but trying to add ${ARCH}. If you are re-running CMake, try clearing the cache and running again.")
+    ENDIF()
+    SET(AMDGPU_ARCH_ALREADY_SPECIFIED ${ARCH} PARENT_SCOPE)
+    IF (NOT KOKKOS_ENABLE_HIP AND NOT KOKKOS_ENABLE_OPENMPTARGET)
+      MESSAGE(WARNING "Given HIP arch ${ARCH}, but Kokkos_ENABLE_AMDGPU and Kokkos_ENABLE_OPENMPTARGET are OFF. Option will be ignored.")
+      UNSET(KOKKOS_ARCH_${ARCH} PARENT_SCOPE)
+    ELSE()
+      SET(KOKKOS_AMDGPU_ARCH_FLAG ${FLAG} PARENT_SCOPE)
+      GLOBAL_APPEND(KOKKOS_AMDGPU_OPTIONS "${AMDGPU_ARCH_FLAG}=${FLAG}")
+      IF(KOKKOS_ENABLE_HIP)
+        GLOBAL_APPEND(KOKKOS_LINK_OPTIONS "${AMDGPU_ARCH_FLAG}=${FLAG}")
+      ENDIF()
+    ENDIF()
+  ENDIF()
+ENDFUNCTION()
+
+#These will define KOKKOS_AMDGPU_ARCH_FLAG
+#to the corresponding flag name if ON
+CHECK_AMDGPU_ARCH(VEGA900 gfx900) # Radeon Instinct MI25
+CHECK_AMDGPU_ARCH(VEGA906 gfx906) # Radeon Instinct MI50 and MI60
+
+IF (KOKKOS_ENABLE_OPENMPTARGET)
+  SET(CLANG_CUDA_ARCH ${KOKKOS_CUDA_ARCH_FLAG})
+  IF (CLANG_CUDA_ARCH)
+    COMPILER_SPECIFIC_FLAGS(
+      Clang -Xopenmp-target -march=${CLANG_CUDA_ARCH} -fopenmp-targets=nvptx64-nvidia-cuda
+      XL -qtgtarch=${KOKKOS_CUDA_ARCH_FLAG}
+    )
+  ENDIF()
+  SET(CLANG_AMDGPU_ARCH ${KOKKOS_AMDGPU_ARCH_FLAG})
+  IF (CLANG_AMDGPU_ARCH)
+    COMPILER_SPECIFIC_FLAGS(
+      Clang -Xopenmp-target=amdgcn-amd-amdhsa -march=${CLANG_AMDGPU_ARCH} -fopenmp-targets=amdgcn-amd-amdhsa
+    )
+  ENDIF()
+ENDIF()
+
+IF(KOKKOS_ENABLE_CUDA AND NOT CUDA_ARCH_ALREADY_SPECIFIED)
+  MESSAGE(SEND_ERROR "CUDA enabled but no NVIDIA GPU architecture currently enabled.  Please give one -DKokkos_ARCH_{..}=ON' to enable an NVIDIA GPU architecture.")
+ENDIF()
+
 #CMake verbose is kind of pointless
 #Let's just always print things
 MESSAGE(STATUS "Execution Spaces:")
-IF(KOKKOS_ENABLE_CUDA)
-  MESSAGE(STATUS "  Device Parallel: CUDA")
-ELSE()
-  MESSAGE(STATUS "  Device Parallel: NONE")
+
+FOREACH (_BACKEND CUDA OPENMPTARGET HIP)
+  IF(KOKKOS_ENABLE_${_BACKEND})
+    IF(_DEVICE_PARALLEL)
+      MESSAGE(FATAL_ERROR "Multiple device parallel execution spaces are not allowed! "
+                          "Trying to enable execution space ${_BACKEND}, "
+                          "but execution space ${_DEVICE_PARALLEL} is already enabled. "
+                          "Remove the CMakeCache.txt file and re-configure.")
+    ENDIF()
+    SET(_DEVICE_PARALLEL ${_BACKEND})
+  ENDIF()
+ENDFOREACH()
+IF(NOT _DEVICE_PARALLEL)
+  SET(_DEVICE_PARALLEL "NONE")
 ENDIF()
+MESSAGE(STATUS "    Device Parallel: ${_DEVICE_PARALLEL}")
+UNSET(_DEVICE_PARALLEL)
+
 
 FOREACH (_BACKEND OPENMP PTHREAD HPX)
   IF(KOKKOS_ENABLE_${_BACKEND})
diff --git a/kokkos/cmake/kokkos_check_env.cmake b/kokkos/cmake/kokkos_check_env.cmake
new file mode 100644
index 000000000..a455a403b
--- /dev/null
+++ b/kokkos/cmake/kokkos_check_env.cmake
@@ -0,0 +1,12 @@
+SET(CRAYPE_VERSION $ENV{CRAYPE_VERSION})
+IF (CRAYPE_VERSION)
+  SET(KOKKOS_IS_CRAYPE TRUE)
+  SET(CRAYPE_LINK_TYPE $ENV{CRAYPE_LINK_TYPE})
+  IF (CRAYPE_LINK_TYPE)
+    IF (NOT CRAYPE_LINK_TYPE STREQUAL "dynamic")
+      MESSAGE(WARNING "CRAYPE_LINK_TYPE is set to ${CRAYPE_LINK_TYPE}. Linking is likely to fail unless this is set to 'dynamic'")
+    ENDIF()
+  ELSE()
+      MESSAGE(WARNING "CRAYPE_LINK_TYPE is not set. Linking is likely to fail unless this is set to 'dynamic'")
+  ENDIF()
+ENDIF()
diff --git a/kokkos/cmake/kokkos_compiler_id.cmake b/kokkos/cmake/kokkos_compiler_id.cmake
index d239c3b32..cd5e7c9e4 100644
--- a/kokkos/cmake/kokkos_compiler_id.cmake
+++ b/kokkos/cmake/kokkos_compiler_id.cmake
@@ -13,7 +13,7 @@ EXECUTE_PROCESS(COMMAND ${CMAKE_CXX_COMPILER} --version
 
 
 STRING(REGEX REPLACE "^ +" ""
-       INTERNAL_HAVE_COMPILER_NVCC ${INTERNAL_HAVE_COMPILER_NVCC})
+       INTERNAL_HAVE_COMPILER_NVCC "${INTERNAL_HAVE_COMPILER_NVCC}")
 
 
 IF(INTERNAL_HAVE_COMPILER_NVCC)
@@ -31,16 +31,32 @@ IF(INTERNAL_HAVE_COMPILER_NVCC)
   SET(KOKKOS_CXX_COMPILER_VERSION ${TEMP_CXX_COMPILER_VERSION} CACHE STRING INTERNAL FORCE)
 ENDIF()
 
-IF(KOKKOS_CXX_COMPILER_ID STREQUAL Cray)
 
-  # SET nvcc's compiler version.
+IF(KOKKOS_CXX_COMPILER_ID STREQUAL Clang)
+  # The Cray compiler reports as Clang to most versions of CMake
+  EXECUTE_PROCESS(COMMAND ${CMAKE_CXX_COMPILER} --version
+                  COMMAND grep Cray
+                  COMMAND wc -l
+                  OUTPUT_VARIABLE INTERNAL_HAVE_CRAY_COMPILER
+                  OUTPUT_STRIP_TRAILING_WHITESPACE)
+  IF (INTERNAL_HAVE_CRAY_COMPILER) #not actually Clang
+    SET(KOKKOS_CLANG_IS_CRAY TRUE)
+  ENDIF()
+ENDIF()
+
+IF(KOKKOS_CXX_COMPILER_ID STREQUAL Cray OR KOKKOS_CLANG_IS_CRAY)
+  # SET Cray's compiler version.
   EXECUTE_PROCESS(COMMAND ${CMAKE_CXX_COMPILER} --version
                   OUTPUT_VARIABLE INTERNAL_CXX_COMPILER_VERSION
                   OUTPUT_STRIP_TRAILING_WHITESPACE)
 
-  STRING(REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]+$"
+  STRING(REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]+"
          TEMP_CXX_COMPILER_VERSION ${INTERNAL_CXX_COMPILER_VERSION})
-  SET(KOKKOS_CXX_COMPILER_VERSION ${TEMP_CXX_COMPILER_VERSION} CACHE STRING INTERNAL FORCE)
+  IF (KOKKOS_CLANG_IS_CRAY)
+    SET(KOKKOS_CLANG_CRAY_COMPILER_VERSION ${TEMP_CXX_COMPILER_VERSION})
+  ELSE()
+    SET(KOKKOS_CXX_COMPILER_VERSION ${TEMP_CXX_COMPILER_VERSION} CACHE STRING INTERNAL FORCE)
+  ENDIF()
 ENDIF()
 
 # Enforce the minimum compilers supported by Kokkos.
diff --git a/kokkos/cmake/kokkos_corner_cases.cmake b/kokkos/cmake/kokkos_corner_cases.cmake
index c03c385fa..e30be3c84 100644
--- a/kokkos/cmake/kokkos_corner_cases.cmake
+++ b/kokkos/cmake/kokkos_corner_cases.cmake
@@ -1,4 +1,4 @@
-IF(KOKKOS_CXX_COMPILER_ID STREQUAL Clang AND KOKKOS_ENABLE_OPENMP)
+IF(KOKKOS_CXX_COMPILER_ID STREQUAL Clang AND KOKKOS_ENABLE_OPENMP AND NOT KOKKOS_CLANG_IS_CRAY)
   # The clang "version" doesn't actually tell you what runtimes and tools
   # were built into Clang. We should therefore make sure that libomp
   # was actually built into Clang. Otherwise the user will get nonsensical
@@ -11,7 +11,7 @@ IF(KOKKOS_CXX_COMPILER_ID STREQUAL Clang AND KOKKOS_ENABLE_OPENMP)
   #also - this is easier to use than CMakeCheckCXXSourceCompiles
   TRY_COMPILE(CLANG_HAS_OMP
     ${KOKKOS_TOP_BUILD_DIR}/corner_cases
-    ${KOKKOS_SOURCE_DIR}/cmake/compile_tests/clang_omp.cpp 
+    ${KOKKOS_SOURCE_DIR}/cmake/compile_tests/clang_omp.cpp
     COMPILE_DEFINITIONS -fopenmp=libomp
     LINK_LIBRARIES -fopenmp=libomp
   )
@@ -22,6 +22,30 @@ IF(KOKKOS_CXX_COMPILER_ID STREQUAL Clang AND KOKKOS_ENABLE_OPENMP)
   UNSET(CLANG_HAS_OMP CACHE) #make sure CMake always re-runs this
 ENDIF()
 
+IF(KOKKOS_CXX_COMPILER_ID STREQUAL AppleClang AND KOKKOS_ENABLE_OPENMP)
+  # The clang "version" doesn't actually tell you what runtimes and tools
+  # were built into Clang. We should therefore make sure that libomp
+  # was actually built into Clang. Otherwise the user will get nonsensical
+  # errors when they try to build.
+
+  #Try compile is the height of CMake nonsense
+  #I can't just give it compiler and link flags
+  #I have to hackily pretend that compiler flags are compiler definitions
+  #and that linker flags are libraries
+  #also - this is easier to use than CMakeCheckCXXSourceCompiles
+  TRY_COMPILE(APPLECLANG_HAS_OMP
+    ${KOKKOS_TOP_BUILD_DIR}/corner_cases
+    ${KOKKOS_SOURCE_DIR}/cmake/compile_tests/clang_omp.cpp
+    COMPILE_DEFINITIONS -Xpreprocessor -fopenmp
+    LINK_LIBRARIES -lomp
+  )
+  IF (NOT APPLECLANG_HAS_OMP)
+    UNSET(APPLECLANG_HAS_OMP CACHE) #make sure CMake always re-runs this
+    MESSAGE(FATAL_ERROR "AppleClang failed OpenMP check. You have requested -DKokkos_ENABLE_OPENMP=ON, but the AppleClang compiler does not appear to have been built with OpenMP support")
+  ENDIF()
+  UNSET(APPLECLANG_HAS_OMP CACHE) #make sure CMake always re-runs this
+ENDIF()
+
 
 IF (KOKKOS_CXX_STANDARD STREQUAL 17)
   IF (KOKKOS_CXX_COMPILER_ID STREQUAL GNU AND KOKKOS_CXX_COMPILER_VERSION VERSION_LESS 7)
diff --git a/kokkos/cmake/kokkos_enable_devices.cmake b/kokkos/cmake/kokkos_enable_devices.cmake
index ff0987667..7b50cfe45 100644
--- a/kokkos/cmake/kokkos_enable_devices.cmake
+++ b/kokkos/cmake/kokkos_enable_devices.cmake
@@ -31,6 +31,41 @@ ELSE()
   SET(OMP_DEFAULT OFF)
 ENDIF()
 KOKKOS_DEVICE_OPTION(OPENMP ${OMP_DEFAULT} HOST "Whether to build OpenMP backend")
+IF(KOKKOS_ENABLE_OPENMP)
+  SET(ClangOpenMPFlag -fopenmp=libomp)
+  IF(KOKKOS_CLANG_IS_CRAY)
+    SET(ClangOpenMPFlag -fopenmp)
+  ENDIF()
+  COMPILER_SPECIFIC_FLAGS(
+    Clang      ${ClangOpenMPFlag}
+    AppleClang -Xpreprocessor -fopenmp
+    PGI        -mp
+    NVIDIA     -Xcompiler -fopenmp
+    Cray       NO-VALUE-SPECIFIED
+    XL         -qsmp=omp
+    DEFAULT    -fopenmp
+  )
+  COMPILER_SPECIFIC_LIBS(
+    AppleClang -lomp
+  )
+ENDIF()
+
+KOKKOS_DEVICE_OPTION(OPENMPTARGET OFF DEVICE "Whether to build the OpenMP target backend")
+IF (KOKKOS_ENABLE_OPENMPTARGET)
+  COMPILER_SPECIFIC_FLAGS(
+    Clang      -fopenmp -fopenmp=libomp
+    XL         -qsmp=omp -qoffload -qnoeh
+    DEFAULT    -fopenmp
+  )
+  COMPILER_SPECIFIC_DEFS(
+    XL    KOKKOS_IBM_XL_OMP45_WORKAROUND
+    Clang KOKKOS_WORKAROUND_OPENMPTARGET_CLANG
+  )
+# Are there compilers which identify as Clang and need this library?
+#  COMPILER_SPECIFIC_LIBS(
+#    Clang -lopenmptarget
+#  )
+ENDIF()
 
 IF(Trilinos_ENABLE_Kokkos AND TPL_ENABLE_CUDA)
   SET(CUDA_DEFAULT ON)
@@ -59,3 +94,5 @@ ENDIF()
 KOKKOS_DEVICE_OPTION(SERIAL ${SERIAL_DEFAULT} HOST "Whether to build serial backend")
 
 KOKKOS_DEVICE_OPTION(HPX OFF HOST "Whether to build HPX backend (experimental)")
+
+KOKKOS_DEVICE_OPTION(HIP OFF DEVICE "Whether to build HIP backend")
diff --git a/kokkos/cmake/kokkos_enable_options.cmake b/kokkos/cmake/kokkos_enable_options.cmake
index c0e49482b..4560c3df8 100644
--- a/kokkos/cmake/kokkos_enable_options.cmake
+++ b/kokkos/cmake/kokkos_enable_options.cmake
@@ -21,6 +21,7 @@ ENDFUNCTION()
 
 # Certain defaults will depend on knowing the enabled devices
 KOKKOS_CFG_DEPENDS(OPTIONS DEVICES)
+KOKKOS_CFG_DEPENDS(OPTIONS COMPILER_ID)
 
 # Put a check in just in case people are using this option
 KOKKOS_DEPRECATED_LIST(OPTIONS ENABLE)
@@ -28,8 +29,10 @@ KOKKOS_DEPRECATED_LIST(OPTIONS ENABLE)
 KOKKOS_ENABLE_OPTION(CUDA_RELOCATABLE_DEVICE_CODE  OFF "Whether to enable relocatable device code (RDC) for CUDA")
 KOKKOS_ENABLE_OPTION(CUDA_UVM             OFF "Whether to use unified memory (UM) for CUDA by default")
 KOKKOS_ENABLE_OPTION(CUDA_LDG_INTRINSIC   OFF "Whether to use CUDA LDG intrinsics")
+KOKKOS_ENABLE_OPTION(HIP_RELOCATABLE_DEVICE_CODE  OFF "Whether to enable relocatable device code (RDC) for HIP")
 KOKKOS_ENABLE_OPTION(HPX_ASYNC_DISPATCH   OFF "Whether HPX supports asynchronous dispatch")
 KOKKOS_ENABLE_OPTION(TESTS         OFF  "Whether to build the unit tests")
+KOKKOS_ENABLE_OPTION(EXAMPLES      OFF  "Whether to build the examples")
 STRING(TOUPPER "${CMAKE_BUILD_TYPE}" UPPERCASE_CMAKE_BUILD_TYPE)
 IF(UPPERCASE_CMAKE_BUILD_TYPE STREQUAL "DEBUG")
   KOKKOS_ENABLE_OPTION(DEBUG                ON "Whether to activate extra debug features - may increase compile times")
@@ -51,12 +54,14 @@ IF (KOKKOS_ENABLE_CUDA)
   SET(KOKKOS_COMPILER_CUDA_VERSION "${KOKKOS_COMPILER_VERSION_MAJOR}${KOKKOS_COMPILER_VERSION_MINOR}")
 ENDIF()
 
-IF (Trilinos_ENABLE_Kokkos AND TPL_ENABLE_CUDA AND DEFINED KOKKOS_COMPILER_CUDA_VERSION AND KOKKOS_COMPILER_CUDA_VERSION GREATER 70)
-  SET(LAMBDA_DEFAULT ON)
+IF (Trilinos_ENABLE_Kokkos AND TPL_ENABLE_CUDA)
+  SET(CUDA_LAMBDA_DEFAULT ON)
+ELSEIF (KOKKOS_ENABLE_CUDA AND (KOKKOS_CXX_COMPILER_ID STREQUAL Clang))
+  SET(CUDA_LAMBDA_DEFAULT ON)
 ELSE()
-  SET(LAMBDA_DEFAULT OFF)
+  SET(CUDA_LAMBDA_DEFAULT OFF)
 ENDIF()
-KOKKOS_ENABLE_OPTION(CUDA_LAMBDA ${LAMBDA_DEFAULT} "Whether to activate experimental lambda features")
+KOKKOS_ENABLE_OPTION(CUDA_LAMBDA ${CUDA_LAMBDA_DEFAULT} "Whether to activate experimental lambda features")
 IF (Trilinos_ENABLE_Kokkos)
   SET(COMPLEX_ALIGN_DEFAULT OFF)
 ELSE()
@@ -64,7 +69,13 @@ ELSE()
 ENDIF()
 KOKKOS_ENABLE_OPTION(COMPLEX_ALIGN ${COMPLEX_ALIGN_DEFAULT}  "Whether to align Kokkos::complex to 2*alignof(RealType)")
 
-KOKKOS_ENABLE_OPTION(CUDA_CONSTEXPR OFF "Whether to activate experimental relaxed constexpr functions")
+
+IF (KOKKOS_ENABLE_CUDA AND (KOKKOS_CXX_COMPILER_ID STREQUAL Clang))
+  SET(CUDA_CONSTEXPR_DEFAULT ON)
+ELSE()
+  SET(CUDA_CONSTEXPR_DEFAULT OFF)
+ENDIF()
+KOKKOS_ENABLE_OPTION(CUDA_CONSTEXPR ${CUDA_CONSTEXPR_DEFAULT} "Whether to activate experimental relaxed constexpr functions")
 
 FUNCTION(check_device_specific_options)
   CMAKE_PARSE_ARGUMENTS(SOME "" "DEVICE" "OPTIONS" ${ARGN})
@@ -84,9 +95,18 @@ FUNCTION(check_device_specific_options)
 ENDFUNCTION()
 
 CHECK_DEVICE_SPECIFIC_OPTIONS(DEVICE CUDA OPTIONS CUDA_UVM CUDA_RELOCATABLE_DEVICE_CODE CUDA_LAMBDA CUDA_CONSTEXPR CUDA_LDG_INTRINSIC)
+CHECK_DEVICE_SPECIFIC_OPTIONS(DEVICE HIP OPTIONS HIP_RELOCATABLE_DEVICE_CODE)
 CHECK_DEVICE_SPECIFIC_OPTIONS(DEVICE HPX OPTIONS HPX_ASYNC_DISPATCH)
 
 # Needed due to change from deprecated name to new header define name
 IF (KOKKOS_ENABLE_AGGRESSIVE_VECTORIZATION)
   SET(KOKKOS_OPT_RANGE_AGGRESSIVE_VECTORIZATION ON)
 ENDIF()
+
+# This is known to occur with Clang 9. We would need to use nvcc as the linker
+# http://lists.llvm.org/pipermail/cfe-dev/2018-June/058296.html
+# TODO: Through great effort we can use a different linker by hacking
+# CMAKE_CXX_LINK_EXECUTABLE in a future release
+IF (KOKKOS_ENABLE_CUDA_RELOCATABLE_DEVICE_CODE AND KOKKOS_CXX_COMPILER_ID STREQUAL Clang)
+  MESSAGE(FATAL_ERROR "Relocatable device code is currently not supported with Clang - must use nvcc_wrapper or turn off RDC")
+ENDIF()
diff --git a/kokkos/cmake/kokkos_functions.cmake b/kokkos/cmake/kokkos_functions.cmake
index 3644c48dd..fd04966ba 100644
--- a/kokkos/cmake/kokkos_functions.cmake
+++ b/kokkos/cmake/kokkos_functions.cmake
@@ -3,9 +3,9 @@
 #   kokkos_option
 
 # Validate options are given with correct case and define an internal
-# upper-case version for use within 
+# upper-case version for use within
 
-# 
+#
 #
 # @FUNCTION: kokkos_deprecated_list
 #
@@ -62,7 +62,7 @@ FUNCTION(kokkos_option CAMEL_SUFFIX DEFAULT TYPE DOCSTRING)
           UNSET(${opt} CACHE)
         ELSE()
           MESSAGE(FATAL_ERROR "Matching option found for ${CAMEL_NAME} with the wrong case ${opt}. Please delete your CMakeCache.txt and change option to -D${CAMEL_NAME}=${${opt}}. This is now enforced to avoid hard-to-debug CMake cache inconsistencies.")
-	ENDIF()
+        ENDIF()
       ENDIF()
     ENDIF()
   ENDFOREACH()
@@ -125,7 +125,7 @@ MACRO(kokkos_export_imported_tpl NAME)
       KOKKOS_APPEND_CONFIG_LINE("IF(NOT TARGET ${NAME})")
       KOKKOS_APPEND_CONFIG_LINE("ADD_LIBRARY(${NAME} UNKNOWN IMPORTED)")
       KOKKOS_APPEND_CONFIG_LINE("SET_TARGET_PROPERTIES(${NAME} PROPERTIES")
-      
+
       GET_TARGET_PROPERTY(TPL_LIBRARY ${NAME} IMPORTED_LOCATION)
       IF(TPL_LIBRARY)
         KOKKOS_APPEND_CONFIG_LINE("IMPORTED_LOCATION ${TPL_LIBRARY}")
@@ -198,7 +198,7 @@ MACRO(kokkos_import_tpl NAME)
   # I have still been getting errors about ROOT variables being ignored
   # I'm not sure if this is a scope issue - but make sure
   # the policy is set before we do any find_package calls
-  IF(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.12.0") 
+  IF(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.12.0")
     CMAKE_POLICY(SET CMP0074 NEW)
   ENDIF()
 
@@ -341,11 +341,12 @@ ENDMACRO()
 # default, custom paths are prioritized over system paths. The searched
 # order is:
 # 1. <NAME>_ROOT variable
-# 2. Kokkos_<NAME>_DIR variable
-# 3. Locations in the PATHS option
-# 4. Default system paths, if allowed.
+# 2. <NAME>_ROOT environment variable
+# 3. Kokkos_<NAME>_DIR variable
+# 4. Locations in the PATHS option
+# 5. Default system paths, if allowed.
 #
-# Default system paths are allowed if none of options (1)-(3) are specified
+# Default system paths are allowed if none of options (1)-(4) are specified
 # or if default paths are specifically allowed via ALLOW_SYSTEM_PATH_FALLBACK
 #
 # Usage::
@@ -387,33 +388,29 @@ MACRO(kokkos_find_header VAR_NAME HEADER TPL_NAME)
    "PATHS"
    ${ARGN})
 
-  SET(${HEADER}_FOUND FALSE)
+  SET(${VAR_NAME} "${VARNAME}-NOTFOUND")
   SET(HAVE_CUSTOM_PATHS FALSE)
-  IF(NOT ${HEADER}_FOUND AND DEFINED ${TPL_NAME}_ROOT)
-    #ONLY look in the root directory
-    FIND_PATH(${VAR_NAME} ${HEADER} PATHS ${${TPL_NAME}_ROOT}/include NO_DEFAULT_PATH)
-    SET(HAVE_CUSTOM_PATHS TRUE)
-  ENDIF()
 
-  IF(NOT ${HEADER}_FOUND AND DEFINED KOKKOS_${TPL_NAME}_DIR)
-    #ONLY look in the root directory
-    FIND_PATH(${VAR_NAME} ${HEADER} PATHS ${KOKKOS_${TPL_NAME}_DIR}/include NO_DEFAULT_PATH)
+  IF(DEFINED ${TPL_NAME}_ROOT OR
+     DEFINED ENV{${TPL_NAME}_ROOT} OR
+     DEFINED KOKKOS_${TPL_NAME}_DIR OR
+     TPL_PATHS)
+    FIND_PATH(${VAR_NAME} ${HEADER}
+      PATHS
+        ${${TPL_NAME}_ROOT}
+        $ENV{${TPL_NAME}_ROOT}
+        ${KOKKOS_${TPL_NAME}_DIR}
+        ${TPL_PATHS}
+      PATH_SUFFIXES include
+      NO_DEFAULT_PATH)
     SET(HAVE_CUSTOM_PATHS TRUE)
   ENDIF()
 
-  IF (NOT ${HEADER}_FOUND AND TPL_PATHS)
-    #we got custom paths
-    #ONLY look in these paths and nowhere else
-    FIND_PATH(${VAR_NAME} ${HEADER} PATHS ${TPL_PATHS} NO_DEFAULT_PATH)
-    SET(HAVE_CUSTOM_PATHS TRUE)
+  IF(NOT HAVE_CUSTOM_PATHS OR TPL_ALLOW_SYSTEM_PATH_FALLBACK)
+    #No-op if ${VAR_NAME} set by previous call
+    FIND_PATH(${VAR_NAME} ${HEADER})
   ENDIF()
 
-  IF (NOT HAVE_CUSTOM_PATHS OR TPL_ALLOW_SYSTEM_PATH_FALLBACK)
-    #Now go ahead and look in system paths
-    IF (NOT ${HEADER}_FOUND)
-      FIND_PATH(${VAR_NAME} ${HEADER})
-    ENDIF()
-  ENDIF()
 ENDMACRO()
 
 #
@@ -424,9 +421,10 @@ ENDMACRO()
 # default, custom paths are prioritized over system paths. The search
 # order is:
 # 1. <NAME>_ROOT variable
-# 2. Kokkos_<NAME>_DIR variable
-# 3. Locations in the PATHS option
-# 4. Default system paths, if allowed.
+# 2. <NAME>_ROOT environment variable
+# 3. Kokkos_<NAME>_DIR variable
+# 4. Locations in the PATHS option
+# 5. Default system paths, if allowed.
 #
 # Default system paths are allowed if none of options (1)-(3) are specified
 # or if default paths are specifically allowed via ALLOW_SYSTEM_PATH_FALLBACK
@@ -439,6 +437,7 @@ ENDMACRO()
 #     <TPL_NAME>
 #    [ALLOW_SYSTEM_PATH_FALLBACK]
 #    [PATHS path1 [path2 ...]]
+#    [SUFFIXES suffix1 [suffix2 ...]]
 #   )
 #
 #   ``<VAR_NAME>``
@@ -463,39 +462,46 @@ ENDMACRO()
 #
 #   Custom paths to search for the library
 #
+#   ``SUFFIXES``
+#
+#   Suffixes appended to PATHS when attempting to locate
+#   the library. Defaults to {lib, lib64}.
+#
 MACRO(kokkos_find_library VAR_NAME LIB TPL_NAME)
   CMAKE_PARSE_ARGUMENTS(TPL
    "ALLOW_SYSTEM_PATH_FALLBACK"
    ""
-   "PATHS"
+   "PATHS;SUFFIXES"
    ${ARGN})
 
-  SET(${LIB}_FOUND FALSE)
-  SET(HAVE_CUSTOM_PATHS FALSE)
-  IF(NOT ${LIB}_FOUND AND DEFINED ${TPL_NAME}_ROOT)
-    FIND_LIBRARY(${VAR_NAME} ${LIB} PATHS ${${TPL_NAME}_ROOT}/lib ${${TPL_NAME}_ROOT}/lib64 NO_DEFAULT_PATH)
-    SET(HAVE_CUSTOM_PATHS TRUE)
+  IF(NOT TPL_SUFFIXES)
+    SET(TPL_SUFFIXES lib lib64)
   ENDIF()
 
-  IF(NOT ${LIB}_FOUND AND DEFINED KOKKOS_${TPL_NAME}_DIR)
-    #we got root paths, only look in these paths and nowhere else
-    FIND_LIBRARY(${VAR_NAME} ${LIB} PATHS ${KOKKOS_${TPL_NAME}_DIR}/lib ${KOKKOS_${TPL_NAME}_DIR}/lib64 NO_DEFAULT_PATH)
-    SET(HAVE_CUSTOM_PATHS TRUE)
-  ENDIF()
+  SET(${VAR_NAME} "${VARNAME}-NOTFOUND")
+  SET(HAVE_CUSTOM_PATHS FALSE)
 
-  IF (NOT ${LIB}_FOUND AND TPL_PATHS)
-    #we got custom paths, only look in these paths and nowhere else
-    FIND_LIBRARY(${VAR_NAME} ${LIB} PATHS ${TPL_PATHS} NO_DEFAULT_PATH)
+  IF(DEFINED ${TPL_NAME}_ROOT OR
+     DEFINED ENV{${TPL_NAME}_ROOT} OR
+     DEFINED KOKKOS_${TPL_NAME}_DIR OR
+     TPL_PATHS)
+    FIND_LIBRARY(${VAR_NAME} ${LIB}
+      PATHS
+        ${${TPL_NAME}_ROOT}
+        $ENV{${TPL_NAME}_ROOT}
+        ${KOKKOS_${TPL_NAME}_DIR}
+        ${TPL_PATHS}
+      PATH_SUFFIXES
+        ${TPL_SUFFIXES}
+      NO_DEFAULT_PATH)
     SET(HAVE_CUSTOM_PATHS TRUE)
   ENDIF()
 
-
-  IF (NOT HAVE_CUSTOM_PATHS OR TPL_ALLOW_SYSTEM_PATH_FALLBACK)
-    IF (NOT ${LIB}_FOUND)
-      #Now go ahead and look in system paths
-      FIND_LIBRARY(${VAR_NAME} ${LIB})
-    ENDIF()
+  IF(NOT HAVE_CUSTOM_PATHS OR TPL_ALLOW_SYSTEM_PATH_FALLBACK)
+    #No-op if ${VAR_NAME} set by previous call
+    FIND_LIBRARY(${VAR_NAME} ${LIB} PATH_SUFFIXES ${TPL_SUFFIXES})
   ENDIF()
+
 ENDMACRO()
 
 #
@@ -510,26 +516,28 @@ ENDMACRO()
 #     <NAME>
 #     INTERFACE
 #     ALLOW_SYSTEM_PATH_FALLBACK
-#     LIBRARY <path_to_librarY>
-#     LINK_LIBRARIES <lib1> <lib2> ...
-#     COMPILE_OPTIONS <opt1> <opt2> ...
-#     LINK_OPTIONS <opt1> <opt2> ...
+#     MODULE_NAME <name>
+#     IMPORTED_NAME <name>
+#     LIBRARY <name>
+#     LIBRARIES <name1> <name2> ...
+#     LIBRARY_PATHS <path1> <path2> ...
+#     LIBRARY_SUFFIXES <suffix1> <suffix2> ...
+#     HEADER <name>
+#     HEADERS <name1> <name2> ...
+#     HEADER_PATHS <path1> <path2> ...
+#   )
 #
 #   ``INTERFACE``
 #
 #     If specified, this TPL will build an INTERFACE library rather than an
 #     IMPORTED target
 #
-#   ``ALLOW_SYSTEM_PATH_FALLBACK"
+#   ``ALLOW_SYSTEM_PATH_FALLBACK``
 #
 #     If custom paths are given and the library is not found
 #     should we be allowed to search default system paths
 #     or error out if not found in given paths.
 #
-#   ``LIBRARY <name>``
-#
-#     If specified, this gives the name of the library to look for
-#
 #   ``MODULE_NAME <name>``
 #
 #     If specified, the name of the enclosing module passed to
@@ -541,29 +549,42 @@ ENDMACRO()
 #     If specified, this gives the name of the target to build.
 #     Defaults to Kokkos::<NAME>
 #
+#   ``LIBRARY <name>``
+#
+#     If specified, this gives the name of the library to look for
+#
+#   ``LIBRARIES <name1> <name2> ...``
+#
+#     If specified, this gives a list of libraries to find for the package
+#
 #   ``LIBRARY_PATHS <path1> <path2> ...``
 #
-#     If specified, this gives a list of paths to search for the library
-#     If not given, <NAME>_ROOT/lib and <NAME>_ROOT/lib64 will be searched.
+#     If specified, this gives a list of paths to search for the library.
+#     If not given, <NAME>_ROOT will be searched.
 #
-#   ``HEADER_PATHS <path1> <path2> ...``
+#   ``LIBRARY_SUFFIXES <suffix1> <suffix2> ...``
 #
-#     If specified, this gives a list of paths to search for the headers
-#     If not given, <NAME>_ROOT/include and <NAME>_ROOT/include will be searched.
+#     Suffixes appended to LIBRARY_PATHS when attempting to locate
+#     libraries. If not given, defaults to {lib, lib64}.
+#
+#   ``HEADER <name>``
+#
+#     If specified, this gives the name of a header to to look for
 #
 #   ``HEADERS <name1> <name2> ...``
 #
 #     If specified, this gives a list of headers to find for the package
 #
-#   ``LIBRARIES <name1> <name2> ...``
+#   ``HEADER_PATHS <path1> <path2> ...``
 #
-#     If specified, this gives a list of libraries to find for the package
+#     If specified, this gives a list of paths to search for the headers
+#     If not given, <NAME>_ROOT/include and <NAME>_ROOT/include will be searched.
 #
 MACRO(kokkos_find_imported NAME)
   CMAKE_PARSE_ARGUMENTS(TPL
    "INTERFACE;ALLOW_SYSTEM_PATH_FALLBACK"
-   "HEADER;LIBRARY;IMPORTED_NAME;MODULE_NAME"
-   "HEADER_PATHS;LIBRARY_PATHS;HEADERS;LIBRARIES"
+   "IMPORTED_NAME;MODULE_NAME;LIBRARY;HEADER"
+   "LIBRARIES;LIBRARY_PATHS;LIBRARY_SUFFIXES;HEADERS;HEADER_PATHS"
    ${ARGN})
 
   IF(NOT TPL_MODULE_NAME)
@@ -584,6 +605,10 @@ MACRO(kokkos_find_imported NAME)
     ENDIF()
   ENDIF()
 
+  IF (NOT TPL_LIBRARY_SUFFIXES)
+    SET(TPL_LIBRARY_SUFFIXES lib lib64)
+  ENDIF()
+
   SET(${NAME}_INCLUDE_DIRS)
   IF (TPL_HEADER)
     KOKKOS_FIND_HEADER(${NAME}_INCLUDE_DIRS ${TPL_HEADER} ${NAME} ${ALLOW_PATH_FALLBACK_OPT} PATHS ${TPL_HEADER_PATHS})
@@ -598,16 +623,22 @@ MACRO(kokkos_find_imported NAME)
 
   SET(${NAME}_LIBRARY)
   IF(TPL_LIBRARY)
-    KOKKOS_FIND_LIBRARY(${NAME}_LIBRARY ${TPL_LIBRARY} ${NAME} ${ALLOW_PATH_FALLBACK_OPT} PATHS ${TPL_LIBRARY_PATHS})
+    KOKKOS_FIND_LIBRARY(${NAME}_LIBRARY ${TPL_LIBRARY} ${NAME}
+      ${ALLOW_PATH_FALLBACK_OPT}
+      PATHS ${TPL_LIBRARY_PATHS}
+      SUFFIXES ${TPL_LIBRARY_SUFFIXES})
   ENDIF()
 
   SET(${NAME}_FOUND_LIBRARIES)
   FOREACH(LIB ${TPL_LIBRARIES})
-    KOKKOS_FIND_LIBRARY(${LIB}_LOCATION ${LIB} ${NAME} ${ALLOW_PATH_FALLBACK_OPT} PATHS ${TPL_LIBRARY_PATHS})
+    KOKKOS_FIND_LIBRARY(${LIB}_LOCATION ${LIB} ${NAME}
+      ${ALLOW_PATH_FALLBACK_OPT}
+      PATHS ${TPL_LIBRARY_PATHS}
+      SUFFIXES ${TPL_LIBRARY_SUFFIXES})
     IF(${LIB}_LOCATION)
       LIST(APPEND ${NAME}_FOUND_LIBRARIES ${${LIB}_LOCATION})
     ELSE()
-      SET(${NAME}_FOUND_LIBRARIES ${${LIB}_LOCATION}) 
+      SET(${NAME}_FOUND_LIBRARIES ${${LIB}_LOCATION})
       BREAK()
     ENDIF()
   ENDFOREACH()
@@ -629,6 +660,13 @@ MACRO(kokkos_find_imported NAME)
 
   MARK_AS_ADVANCED(${NAME}_INCLUDE_DIRS ${NAME}_FOUND_LIBRARIES ${NAME}_LIBRARY)
 
+  #this is so much fun on a Cray system
+  #/usr/include should never be added as a -isystem include
+  #this freaks out the compiler include search order
+  IF (KOKKOS_IS_CRAYPE)
+    LIST(REMOVE_ITEM ${NAME}_INCLUDE_DIRS "/usr/include")
+  ENDIF()
+
   IF (${TPL_MODULE_NAME}_FOUND)
     SET(IMPORT_TYPE)
     IF (TPL_INTERFACE)
@@ -698,3 +736,66 @@ FUNCTION(kokkos_link_tpl TARGET)
   ENDIF()
 ENDFUNCTION()
 
+FUNCTION(COMPILER_SPECIFIC_OPTIONS_HELPER)
+  SET(COMPILERS NVIDIA PGI XL DEFAULT Cray Intel Clang AppleClang GNU)
+  CMAKE_PARSE_ARGUMENTS(
+    PARSE
+    "LINK_OPTIONS;COMPILE_OPTIONS;COMPILE_DEFINITIONS;LINK_LIBRARIES"
+    ""
+    "${COMPILERS}"
+    ${ARGN})
+  IF(PARSE_UNPARSED_ARGUMENTS)
+    MESSAGE(SEND_ERROR "'${PARSE_UNPARSED_ARGUMENTS}' argument(s) not recognized when providing compiler specific options")
+  ENDIF()
+
+  SET(COMPILER ${KOKKOS_CXX_COMPILER_ID})
+
+  SET(COMPILER_SPECIFIC_FLAGS_TMP)
+  FOREACH(COMP ${COMPILERS})
+    IF (COMPILER STREQUAL "${COMP}")
+      IF (PARSE_${COMPILER})
+        IF (NOT "${PARSE_${COMPILER}}" STREQUAL "NO-VALUE-SPECIFIED")
+           SET(COMPILER_SPECIFIC_FLAGS_TMP ${PARSE_${COMPILER}})
+        ENDIF()
+      ELSEIF(PARSE_DEFAULT)
+        SET(COMPILER_SPECIFIC_FLAGS_TMP ${PARSE_DEFAULT})
+      ENDIF()
+    ENDIF()
+  ENDFOREACH()
+
+  IF (PARSE_COMPILE_OPTIONS)
+    # The funky logic here is for future handling of argument deduplication
+    # If we naively pass multiple -Xcompiler flags to target_compile_options
+    # -Xcompiler will get deduplicated and break the build
+    IF ("-Xcompiler" IN_LIST COMPILER_SPECIFIC_FLAGS_TMP)
+      LIST(REMOVE_ITEM COMPILER_SPECIFIC_FLAGS_TMP "-Xcompiler")
+      GLOBAL_APPEND(KOKKOS_XCOMPILER_OPTIONS ${COMPILER_SPECIFIC_FLAGS_TMP})
+    ELSE()
+      GLOBAL_APPEND(KOKKOS_COMPILE_OPTIONS ${COMPILER_SPECIFIC_FLAGS_TMP})
+    ENDIF()
+  ENDIF()
+
+  IF (PARSE_LINK_OPTIONS)
+    GLOBAL_APPEND(KOKKOS_LINK_OPTIONS ${COMPILER_SPECIFIC_FLAGS_TMP})
+  ENDIF()
+
+  IF (PARSE_COMPILE_DEFINITIONS)
+    GLOBAL_APPEND(KOKKOS_COMPILE_DEFINITIONS ${COMPILER_SPECIFIC_FLAGS_TMP})
+  ENDIF()
+
+  IF (PARSE_LINK_LIBRARIES)
+    GLOBAL_APPEND(KOKKOS_LINK_LIBRARIES ${COMPILER_SPECIFIC_FLAGS_TMP})
+  ENDIF()
+ENDFUNCTION(COMPILER_SPECIFIC_OPTIONS_HELPER)
+
+FUNCTION(COMPILER_SPECIFIC_FLAGS)
+  COMPILER_SPECIFIC_OPTIONS_HELPER(${ARGN} COMPILE_OPTIONS LINK_OPTIONS)
+ENDFUNCTION(COMPILER_SPECIFIC_FLAGS)
+
+FUNCTION(COMPILER_SPECIFIC_DEFS)
+  COMPILER_SPECIFIC_OPTIONS_HELPER(${ARGN} COMPILE_DEFINITIONS)
+ENDFUNCTION(COMPILER_SPECIFIC_DEFS)
+
+FUNCTION(COMPILER_SPECIFIC_LIBS)
+  COMPILER_SPECIFIC_OPTIONS_HELPER(${ARGN} LINK_LIBRARIES)
+ENDFUNCTION(COMPILER_SPECIFIC_LIBS)
diff --git a/kokkos/cmake/kokkos_install.cmake b/kokkos/cmake/kokkos_install.cmake
index 1e4a5a2aa..6a39590f0 100644
--- a/kokkos/cmake/kokkos_install.cmake
+++ b/kokkos/cmake/kokkos_install.cmake
@@ -31,12 +31,11 @@ IF (NOT KOKKOS_HAS_TRILINOS)
 ELSE()
   CONFIGURE_FILE(cmake/KokkosConfigCommon.cmake.in ${Kokkos_BINARY_DIR}/KokkosConfigCommon.cmake @ONLY)
   file(READ ${Kokkos_BINARY_DIR}/KokkosConfigCommon.cmake KOKKOS_CONFIG_COMMON)
-  file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/KokkosConfig_install.cmake" ${KOKKOS_CONFIG_COMMON})
+  file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/KokkosConfig_install.cmake" "${KOKKOS_CONFIG_COMMON}")
+  CONFIGURE_FILE(cmake/KokkosTrilinosConfig.cmake.in ${Kokkos_BINARY_DIR}/KokkosTrilinosConfig.cmake @ONLY)
+  file(READ ${Kokkos_BINARY_DIR}/KokkosTrilinosConfig.cmake KOKKOS_TRILINOS_CONFIG)
+  file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/KokkosConfig_install.cmake" "${KOKKOS_TRILINOS_CONFIG}")
 ENDIF()
 
-# build and install pkgconfig file
-CONFIGURE_FILE(core/src/kokkos.pc.in kokkos.pc @ONLY)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/kokkos.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
-
 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/KokkosCore_config.h DESTINATION ${KOKKOS_HEADER_DIR})
 
diff --git a/kokkos/cmake/kokkos_test_cxx_std.cmake b/kokkos/cmake/kokkos_test_cxx_std.cmake
index c264517ab..603b4b3d7 100644
--- a/kokkos/cmake/kokkos_test_cxx_std.cmake
+++ b/kokkos/cmake/kokkos_test_cxx_std.cmake
@@ -14,12 +14,12 @@ FUNCTION(kokkos_set_cxx_standard_feature standard)
     ENDIF()
   ELSEIF(CMAKE_CXX_EXTENSIONS)
     IF(KOKKOS_DONT_ALLOW_EXTENSIONS)
-      MESSAGE(FATAL_ERROR "The chosen configuration does not support CXX extensions flags: ${KOKKOS_DONT_ALLOW_EXTENSIONS}. Must set CMAKE_CXX_EXTENSIONS=OFF to continue") 
+      MESSAGE(FATAL_ERROR "The chosen configuration does not support CXX extensions flags: ${KOKKOS_DONT_ALLOW_EXTENSIONS}. Must set CMAKE_CXX_EXTENSIONS=OFF to continue")
     ELSE()
       GLOBAL_SET(KOKKOS_USE_CXX_EXTENSIONS ON)
     ENDIF()
   ELSE()
-    #For trilinos, we need to make sure downstream projects 
+    #For trilinos, we need to make sure downstream projects
     GLOBAL_SET(KOKKOS_USE_CXX_EXTENSIONS OFF)
   ENDIF()
 
@@ -29,6 +29,10 @@ FUNCTION(kokkos_set_cxx_standard_feature standard)
   ELSEIF(NOT KOKKOS_USE_CXX_EXTENSIONS AND ${STANDARD_NAME})
     MESSAGE(STATUS "Using ${${STANDARD_NAME}} for C++${standard} standard as feature")
     GLOBAL_SET(KOKKOS_CXX_STANDARD_FEATURE ${FEATURE_NAME})
+  ELSEIF(KOKKOS_CXX_COMPILER_ID STREQUAL "MSVC")
+    #MSVC doesn't need a command line flag, that doesn't mean it has no support
+    MESSAGE(STATUS "Using no flag for C++${standard} standard as feature")
+    GLOBAL_SET(KOKKOS_CXX_STANDARD_FEATURE ${FEATURE_NAME})
   ELSE()
     #nope, we can't do anything here
     MESSAGE(WARNING "C++${standard} is not supported as a compiler feature. We will choose custom flags for now, but this behavior has been deprecated. Please open an issue at https://github.com/kokkos/kokkos/issues reporting that ${KOKKOS_CXX_COMPILER_ID} ${KOKKOS_CXX_COMPILER_VERSION} failed for ${KOKKOS_CXX_STANDARD}, preferrably including your CMake command.")
@@ -119,6 +123,9 @@ IF (NOT KOKKOS_CXX_STANDARD_FEATURE)
   ELSEIF(KOKKOS_CXX_COMPILER_ID STREQUAL Intel)
     INCLUDE(${KOKKOS_SRC_PATH}/cmake/intel.cmake)
     kokkos_set_intel_flags(${KOKKOS_CXX_STANDARD} ${KOKKOS_CXX_INTERMEDIATE_STANDARD})
+  ELSEIF(KOKKOS_CXX_COMPILER_ID STREQUAL "MSVC")
+    INCLUDE(${KOKKOS_SRC_PATH}/cmake/msvc.cmake)
+    kokkos_set_msvc_flags(${KOKKOS_CXX_STANDARD} ${KOKKOS_CXX_INTERMEDIATE_STANDARD})
   ELSE()
     INCLUDE(${KOKKOS_SRC_PATH}/cmake/gnu.cmake)
     kokkos_set_gnu_flags(${KOKKOS_CXX_STANDARD} ${KOKKOS_CXX_INTERMEDIATE_STANDARD})
@@ -128,9 +135,9 @@ IF (NOT KOKKOS_CXX_STANDARD_FEATURE)
   IF (DEFINED CXX_STD_FLAGS_ACCEPTED)
     UNSET(CXX_STD_FLAGS_ACCEPTED CACHE)
   ENDIF()
-  CHECK_CXX_COMPILER_FLAG(${KOKKOS_CXX_STANDARD_FLAG} CXX_STD_FLAGS_ACCEPTED)
+  CHECK_CXX_COMPILER_FLAG("${KOKKOS_CXX_STANDARD_FLAG}" CXX_STD_FLAGS_ACCEPTED)
   IF (NOT CXX_STD_FLAGS_ACCEPTED)
-    CHECK_CXX_COMPILER_FLAG(${KOKKOS_CXX_INTERMEDIATE_STANDARD_FLAG} CXX_INT_STD_FLAGS_ACCEPTED)
+    CHECK_CXX_COMPILER_FLAG("${KOKKOS_CXX_INTERMEDIATE_STANDARD_FLAG}" CXX_INT_STD_FLAGS_ACCEPTED)
     IF (NOT CXX_INT_STD_FLAGS_ACCEPTED)
       MESSAGE(FATAL_ERROR "${KOKKOS_CXX_COMPILER_ID} did not accept ${KOKKOS_CXX_STANDARD_FLAG} or ${KOKKOS_CXX_INTERMEDIATE_STANDARD_FLAG}. You likely need to reduce the level of the C++ standard from ${KOKKOS_CXX_STANDARD}")
     ENDIF()
diff --git a/kokkos/cmake/kokkos_tpls.cmake b/kokkos/cmake/kokkos_tpls.cmake
index 181a497d5..76efd4284 100644
--- a/kokkos/cmake/kokkos_tpls.cmake
+++ b/kokkos/cmake/kokkos_tpls.cmake
@@ -15,6 +15,10 @@ KOKKOS_TPL_OPTION(CUDA    Off)
 KOKKOS_TPL_OPTION(LIBRT   Off)
 KOKKOS_TPL_OPTION(LIBDL   On)
 
+IF(KOKKOS_ENABLE_PROFILING AND NOT KOKKOS_ENABLE_LIBDL)
+  MESSAGE(SEND_ERROR "Kokkos_ENABLE_PROFILING requires Kokkos_ENABLE_LIBDL=ON")
+ENDIF()
+
 IF(Trilinos_ENABLE_Kokkos AND TPL_ENABLE_HPX)
 SET(HPX_DEFAULT ON)
 ELSE()
diff --git a/kokkos/cmake/kokkos_tribits.cmake b/kokkos/cmake/kokkos_tribits.cmake
index d2317d244..1c3b704ad 100644
--- a/kokkos/cmake/kokkos_tribits.cmake
+++ b/kokkos/cmake/kokkos_tribits.cmake
@@ -43,6 +43,8 @@ MACRO(KOKKOS_SUBPACKAGE NAME)
     SET(PACKAGE_NAME ${PACKAGE_NAME}${NAME})
     STRING(TOUPPER ${PACKAGE_NAME} PACKAGE_NAME_UC)
     SET(${PACKAGE_NAME}_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
+    #ADD_INTERFACE_LIBRARY(PACKAGE_${PACKAGE_NAME})
+    #GLOBAL_SET(${PACKAGE_NAME}_LIBS "")
   endif()
 ENDMACRO()
 
@@ -114,57 +116,63 @@ MACRO(KOKKOS_INTERNAL_ADD_LIBRARY_INSTALL LIBRARY_NAME)
   VERIFY_EMPTY(KOKKOS_ADD_LIBRARY ${PARSE_UNPARSED_ARGUMENTS})
 ENDMACRO()
 
-FUNCTION(KOKKOS_ADD_EXECUTABLE EXE_NAME)
+FUNCTION(KOKKOS_ADD_EXECUTABLE ROOT_NAME)
   if (KOKKOS_HAS_TRILINOS)
-    TRIBITS_ADD_EXECUTABLE(${EXE_NAME} ${ARGN})
+    TRIBITS_ADD_EXECUTABLE(${ROOT_NAME} ${ARGN})
   else()
-    CMAKE_PARSE_ARGUMENTS(PARSE 
+    CMAKE_PARSE_ARGUMENTS(PARSE
       "TESTONLY"
       ""
       "SOURCES;TESTONLYLIBS"
       ${ARGN})
 
+    SET(EXE_NAME ${PACKAGE_NAME}_${ROOT_NAME})
     ADD_EXECUTABLE(${EXE_NAME} ${PARSE_SOURCES})
     IF (PARSE_TESTONLYLIBS)
-      TARGET_LINK_LIBRARIES(${EXE_NAME} ${PARSE_TESTONLYLIBS})
+      TARGET_LINK_LIBRARIES(${EXE_NAME} PRIVATE ${PARSE_TESTONLYLIBS})
     ENDIF()
     VERIFY_EMPTY(KOKKOS_ADD_EXECUTABLE ${PARSE_UNPARSED_ARGUMENTS})
+    #All executables must link to all the kokkos targets
+    #This is just private linkage because exe is final
+    TARGET_LINK_LIBRARIES(${EXE_NAME} PRIVATE kokkos)
   endif()
 ENDFUNCTION()
 
-IF(NOT TARGET check)
-  ADD_CUSTOM_TARGET(check COMMAND ${CMAKE_CTEST_COMMAND} -VV -C ${CMAKE_CFG_INTDIR})
-ENDIF()
-
-
 FUNCTION(KOKKOS_ADD_EXECUTABLE_AND_TEST ROOT_NAME)
 IF (KOKKOS_HAS_TRILINOS)
   TRIBITS_ADD_EXECUTABLE_AND_TEST(
-    ${ROOT_NAME} 
-    TESTONLYLIBS kokkos_gtest 
+    ${ROOT_NAME}
+    TESTONLYLIBS kokkos_gtest
     ${ARGN}
     NUM_MPI_PROCS 1
     COMM serial mpi
     FAIL_REGULAR_EXPRESSION "  FAILED  "
   )
 ELSE()
-  CMAKE_PARSE_ARGUMENTS(PARSE 
+  CMAKE_PARSE_ARGUMENTS(PARSE
     ""
     ""
     "SOURCES;CATEGORIES"
     ${ARGN})
   VERIFY_EMPTY(KOKKOS_ADD_EXECUTABLE_AND_TEST ${PARSE_UNPARSED_ARGUMENTS})
-  SET(EXE_NAME ${PACKAGE_NAME}_${ROOT_NAME})
-  KOKKOS_ADD_TEST_EXECUTABLE(${EXE_NAME}
+  KOKKOS_ADD_TEST_EXECUTABLE(${ROOT_NAME}
     SOURCES ${PARSE_SOURCES}
   )
-  KOKKOS_ADD_TEST(NAME ${ROOT_NAME} 
-    EXE ${EXE_NAME}
+  KOKKOS_ADD_TEST(NAME ${ROOT_NAME}
+    EXE ${ROOT_NAME}
     FAIL_REGULAR_EXPRESSION "  FAILED  "
   )
 ENDIF()
 ENDFUNCTION()
 
+FUNCTION(KOKKOS_SET_EXE_PROPERTY ROOT_NAME)
+  SET(TARGET_NAME ${PACKAGE_NAME}_${ROOT_NAME})
+  IF (NOT TARGET ${TARGET_NAME})
+    MESSAGE(SEND_ERROR "No target ${TARGET_NAME} exists - cannot set target properties")
+  ENDIF()
+  SET_PROPERTY(TARGET ${TARGET_PROPERTY} PROPERTY ${ARGN})
+ENDFUNCTION()
+
 MACRO(KOKKOS_SETUP_BUILD_ENVIRONMENT)
  INCLUDE(${KOKKOS_SRC_PATH}/cmake/kokkos_compiler_id.cmake)
  INCLUDE(${KOKKOS_SRC_PATH}/cmake/kokkos_enable_devices.cmake)
@@ -178,20 +186,17 @@ MACRO(KOKKOS_SETUP_BUILD_ENVIRONMENT)
  INCLUDE(${KOKKOS_SRC_PATH}/cmake/kokkos_corner_cases.cmake)
 ENDMACRO()
 
-MACRO(KOKKOS_ADD_TEST_EXECUTABLE EXE_NAME)
-  CMAKE_PARSE_ARGUMENTS(PARSE 
+MACRO(KOKKOS_ADD_TEST_EXECUTABLE ROOT_NAME)
+  CMAKE_PARSE_ARGUMENTS(PARSE
     ""
     ""
     "SOURCES"
     ${ARGN})
-  KOKKOS_ADD_EXECUTABLE(${EXE_NAME}
+  KOKKOS_ADD_EXECUTABLE(${ROOT_NAME}
     SOURCES ${PARSE_SOURCES}
     ${PARSE_UNPARSED_ARGUMENTS}
     TESTONLYLIBS kokkos_gtest
   )
-  IF (NOT KOKKOS_HAS_TRILINOS)
-    ADD_DEPENDENCIES(check ${EXE_NAME})
-  ENDIF()
 ENDMACRO()
 
 MACRO(KOKKOS_PACKAGE_POSTPROCESS)
@@ -201,7 +206,7 @@ MACRO(KOKKOS_PACKAGE_POSTPROCESS)
 ENDMACRO()
 
 FUNCTION(KOKKOS_SET_LIBRARY_PROPERTIES LIBRARY_NAME)
-  CMAKE_PARSE_ARGUMENTS(PARSE 
+  CMAKE_PARSE_ARGUMENTS(PARSE
     "PLAIN_STYLE"
     ""
     ""
@@ -230,6 +235,15 @@ FUNCTION(KOKKOS_SET_LIBRARY_PROPERTIES LIBRARY_NAME)
     $<$<COMPILE_LANGUAGE:CXX>:${KOKKOS_COMPILE_OPTIONS}>
   )
 
+  TARGET_COMPILE_DEFINITIONS(
+    ${LIBRARY_NAME} PUBLIC
+    $<$<COMPILE_LANGUAGE:CXX>:${KOKKOS_COMPILE_DEFINITIONS}>
+  )
+
+  TARGET_LINK_LIBRARIES(
+    ${LIBRARY_NAME} PUBLIC ${KOKKOS_LINK_LIBRARIES}
+  )
+
   IF (KOKKOS_ENABLE_CUDA)
     TARGET_COMPILE_OPTIONS(
       ${LIBRARY_NAME}
@@ -240,11 +254,18 @@ FUNCTION(KOKKOS_SET_LIBRARY_PROPERTIES LIBRARY_NAME)
       LIST(APPEND NODEDUP_CUDAFE_OPTIONS -Xcudafe ${OPT})
     ENDFOREACH()
     TARGET_COMPILE_OPTIONS(
-      ${LIBRARY_NAME} 
+      ${LIBRARY_NAME}
       PUBLIC $<$<COMPILE_LANGUAGE:CXX>:${NODEDUP_CUDAFE_OPTIONS}>
     )
   ENDIF()
 
+  IF (KOKKOS_ENABLE_HIP)
+    TARGET_COMPILE_OPTIONS(
+      ${LIBRARY_NAME}
+      PUBLIC $<$<COMPILE_LANGUAGE:CXX>:${KOKKOS_AMDGPU_OPTIONS}>
+    )
+  ENDIF()
+
   LIST(LENGTH KOKKOS_XCOMPILER_OPTIONS XOPT_LENGTH)
   IF (XOPT_LENGTH GREATER 1)
     MESSAGE(FATAL_ERROR "CMake deduplication does not allow multiple -Xcompiler flags (${KOKKOS_XCOMPILER_OPTIONS}): will require Kokkos to upgrade to minimum 3.12")
@@ -253,12 +274,12 @@ FUNCTION(KOKKOS_SET_LIBRARY_PROPERTIES LIBRARY_NAME)
     SET(NODEDUP_XCOMPILER_OPTIONS)
     FOREACH(OPT ${KOKKOS_XCOMPILER_OPTIONS})
       #I have to do this for now because we can't guarantee 3.12 support
-      #I really should do this with the shell option 
-      LIST(APPEND NODEDUP_XCOMPILER_OPTIONS -Xcompiler) 
-      LIST(APPEND NODEDUP_XCOMPILER_OPTIONS ${OPT}) 
+      #I really should do this with the shell option
+      LIST(APPEND NODEDUP_XCOMPILER_OPTIONS -Xcompiler)
+      LIST(APPEND NODEDUP_XCOMPILER_OPTIONS ${OPT})
     ENDFOREACH()
     TARGET_COMPILE_OPTIONS(
-      ${LIBRARY_NAME} 
+      ${LIBRARY_NAME}
       PUBLIC $<$<COMPILE_LANGUAGE:CXX>:${NODEDUP_XCOMPILER_OPTIONS}>
     )
   ENDIF()
@@ -276,7 +297,7 @@ FUNCTION(KOKKOS_SET_LIBRARY_PROPERTIES LIBRARY_NAME)
 ENDFUNCTION()
 
 FUNCTION(KOKKOS_INTERNAL_ADD_LIBRARY LIBRARY_NAME)
-  CMAKE_PARSE_ARGUMENTS(PARSE 
+  CMAKE_PARSE_ARGUMENTS(PARSE
     "STATIC;SHARED"
     ""
     "HEADERS;SOURCES"
@@ -362,7 +383,7 @@ FUNCTION(KOKKOS_LIB_INCLUDE_DIRECTORIES TARGET)
     #ignore the target, tribits doesn't do anything directly with targets
     TRIBITS_INCLUDE_DIRECTORIES(${ARGN})
   ELSE() #append to a list for later
-    KOKKOS_LIB_TYPE(${TARGET} INCTYPE) 
+    KOKKOS_LIB_TYPE(${TARGET} INCTYPE)
     FOREACH(DIR ${ARGN})
       TARGET_INCLUDE_DIRECTORIES(${TARGET} ${INCTYPE} $<BUILD_INTERFACE:${DIR}>)
     ENDFOREACH()
@@ -390,3 +411,15 @@ MACRO(KOKKOS_ADD_TEST_DIRECTORIES)
     ENDIF()
   ENDIF()
 ENDMACRO()
+
+MACRO(KOKKOS_ADD_EXAMPLE_DIRECTORIES)
+  if (KOKKOS_HAS_TRILINOS)
+    TRIBITS_ADD_EXAMPLE_DIRECTORIES(${ARGN})
+  else()
+    IF(KOKKOS_ENABLE_EXAMPLES)
+      FOREACH(EXAMPLE_DIR ${ARGN})
+        ADD_SUBDIRECTORY(${EXAMPLE_DIR})
+      ENDFOREACH()
+    ENDIF()
+  endif()
+ENDMACRO()
diff --git a/kokkos/cmake/msvc.cmake b/kokkos/cmake/msvc.cmake
new file mode 100644
index 000000000..85421bdba
--- /dev/null
+++ b/kokkos/cmake/msvc.cmake
@@ -0,0 +1,11 @@
+
+FUNCTION(kokkos_set_msvc_flags full_standard int_standard)
+  IF (CMAKE_CXX_EXTENSIONS)
+    SET(KOKKOS_CXX_STANDARD_FLAG "" PARENT_SCOPE)
+    SET(KOKKOS_CXX_INTERMEDIATE_STANDARD_FLAG "" PARENT_SCOPE)
+  ELSE()
+    SET(KOKKOS_CXX_STANDARD_FLAG "" PARENT_SCOPE)
+    SET(KOKKOS_CXX_INTERMEDIATE_STANDARD_FLAG "" PARENT_SCOPE)
+  ENDIF()
+ENDFUNCTION()
+
diff --git a/kokkos/cmake/tpls/FindTPLCUSPARSE.cmake b/kokkos/cmake/tpls/FindTPLCUSPARSE.cmake
index b8cee0480..a59868b73 100644
--- a/kokkos/cmake/tpls/FindTPLCUSPARSE.cmake
+++ b/kokkos/cmake/tpls/FindTPLCUSPARSE.cmake
@@ -55,19 +55,9 @@
 
 # Check for CUDA support
 
-IF (NOT TPL_ENABLE_CUDA OR CUDA_VERSION VERSION_LESS "4.1")
-  MESSAGE(FATAL_ERROR "\nCUSPARSE: did not find acceptable version of CUDA libraries (4.1 or greater)")
+IF (NOT TPL_ENABLE_CUDA)
+  MESSAGE(FATAL_ERROR "\nCUSPARSE requires CUDA")
 ELSE()
-  IF(CMAKE_VERSION VERSION_LESS "2.8.8")
-    # FindCUDA before CMake 2.8.8 does not find cusparse library; therefore, we must
-    find_library(CUDA_cusparse_LIBRARY
-      cusparse
-      HINTS ${CUDA_TOOLKIT_ROOT_DIR}/lib
-      )
-    IF(CUDA_cusparse_LIBRARY STREQUAL "CUDA_cusparse_LIBRARY-NOTFOUND") 
-      MESSAGE(FATAL_ERROR "\nCUSPARSE: could not find cuspasre library.")
-    ENDIF()
-  ENDIF()
   GLOBAL_SET(TPL_CUSPARSE_LIBRARY_DIRS)
   GLOBAL_SET(TPL_CUSPARSE_INCLUDE_DIRS ${TPL_CUDA_INCLUDE_DIRS})
   GLOBAL_SET(TPL_CUSPARSE_LIBRARIES    ${CUDA_cusparse_LIBRARY})
diff --git a/kokkos/config/test_all_sandia b/kokkos/config/test_all_sandia
index d94c38cbc..193a162a4 100755
--- a/kokkos/config/test_all_sandia
+++ b/kokkos/config/test_all_sandia
@@ -76,19 +76,18 @@ CLANG_BUILD_LIST="Pthread,Serial,Pthread_Serial"
 CUDA_BUILD_LIST="Cuda_OpenMP,Cuda_Pthread,Cuda_Serial"
 CUDA_IBM_BUILD_LIST="Cuda_OpenMP,Cuda_Serial"
 
-GCC_WARNING_FLAGS="-Wall,-Wshadow,-pedantic,-Werror,-Wsign-compare,-Wtype-limits,-Wignored-qualifiers,-Wempty-body,-Wclobbered,-Wuninitialized"
-IBM_WARNING_FLAGS="-Wall,-Wshadow,-pedantic,-Werror,-Wsign-compare,-Wtype-limits,-Wuninitialized"
-CLANG_WARNING_FLAGS="-Wall,-Wshadow,-pedantic,-Werror,-Wsign-compare,-Wtype-limits,-Wuninitialized"
-INTEL_WARNING_FLAGS="-Wall,-Wshadow,-pedantic,-Werror,-Wsign-compare,-Wtype-limits,-Wuninitialized"
-#CUDA_WARNING_FLAGS="-Wall,-Wshadow,-pedantic,-Werror,-Wsign-compare,-Wtype-limits,-Wuninitialized"
-CUDA_WARNING_FLAGS="-Wall,-Wshadow,-pedantic,-Wsign-compare,-Wtype-limits,-Wuninitialized"
+GCC_WARNING_FLAGS="-Wall,-Wunused-parameter,-Wshadow,-pedantic,-Werror,-Wsign-compare,-Wtype-limits,-Wignored-qualifiers,-Wempty-body,-Wclobbered,-Wuninitialized"
+IBM_WARNING_FLAGS="-Wall,-Wunused-parameter,-Wshadow,-pedantic,-Werror,-Wsign-compare,-Wtype-limits,-Wuninitialized"
+CLANG_WARNING_FLAGS="-Wall,-Wunused-parameter,-Wshadow,-pedantic,-Werror,-Wsign-compare,-Wtype-limits,-Wuninitialized"
+INTEL_WARNING_FLAGS="-Wall,-Wunused-parameter,-Wshadow,-pedantic,-Werror,-Wsign-compare,-Wtype-limits,-Wuninitialized"
+#CUDA_WARNING_FLAGS="-Wall,-Wunused-parameter,-Wshadow,-pedantic,-Werror,-Wsign-compare,-Wtype-limits,-Wuninitialized"
+CUDA_WARNING_FLAGS="-Wall,-Wunused-parameter,-Wshadow,-pedantic,-Wsign-compare,-Wtype-limits,-Wuninitialized"
 PGI_WARNING_FLAGS=""
 
 # Default. Machine specific can override.
 DEBUG=False
 ARGS=""
 CUSTOM_BUILD_LIST=""
-QTHREADS_PATH=""
 DRYRUN=False
 BUILD_ONLY=False
 declare -i NUM_JOBS_TO_RUN_IN_PARALLEL=1
@@ -114,9 +113,6 @@ do
     --kokkos-path*)
       KOKKOS_PATH="${key#*=}"
       ;;
-    --qthreads-path*)
-      QTHREADS_PATH="${key#*=}"
-      ;;
     --build-list*)
       CUSTOM_BUILD_LIST="${key#*=}"
       ;;
@@ -417,8 +413,8 @@ if [ "$PRINT_HELP" = "True" ]; then
   echo "--build-list=BUILD,BUILD,BUILD..."
   echo "    Provide a comma-separated list of builds instead of running all builds"
   echo "    Valid items:"
-  echo "      OpenMP, Pthread, Qthreads, Serial, OpenMP_Serial, Pthread_Serial"
-  echo "      Qthreads_Serial, Cuda_OpenMP, Cuda_Pthread, Cuda_Serial"
+  echo "      OpenMP, Pthread, Serial, OpenMP_Serial, Pthread_Serial"
+  echo "      Cuda_OpenMP, Cuda_Pthread, Cuda_Serial"
   echo ""
 
   echo "ARGS: list of expressions matching compilers to test"
@@ -483,33 +479,6 @@ for ARG in $ARGS; do
   done
 done
 
-# Check if Qthreads build requested.
-HAVE_QTHREADS_BUILD="False"
-if [ -n "$CUSTOM_BUILD_LIST" ]; then
-  if [[ "$CUSTOM_BUILD_LIST" = *Qthreads* ]]; then
-    HAVE_QTHREADS_BUILD="True"
-  fi
-else
-  for COMPILER_DATA in "${COMPILERS[@]}"; do
-    ARR=($COMPILER_DATA)
-    BUILD_LIST=${ARR[2]}
-    if [[ "$BUILD_LIST" = *Qthreads* ]]; then
-      HAVE_QTHREADS_BUILD="True"
-    fi
-  done
-fi
-
-# Ensure Qthreads path is set if Qthreads build is requested.
-if [ "$HAVE_QTHREADS_BUILD" = "True" ]; then
-  if [ -z "$QTHREADS_PATH" ]; then
-    echo "Need to supply Qthreads path (--qthreads-path) when testing Qthreads backend." >&2
-    exit 1
-  else
-    # Strip trailing slashes from path.
-    QTHREADS_PATH=$(echo $QTHREADS_PATH | sed 's/\/*$//')
-  fi
-fi
-
 #
 # Functions.
 #
@@ -627,14 +596,6 @@ single_build_and_test() {
     local extra_args=--with-hwloc=$(dirname $(dirname $(which hwloc-info)))
   fi
 
-  if [[ "$build" = *Qthreads* ]]; then
-    if [[ "$build_type" = hwloc* ]]; then
-      local extra_args="$extra_args --qthreads-path=${QTHREADS_PATH}_hwloc"
-    else
-      local extra_args="$extra_args --qthreads-path=$QTHREADS_PATH"
-    fi
-  fi
-
   if [[ "$OPT_FLAG" = "" ]]; then
     OPT_FLAG="-O3"
   fi
diff --git a/kokkos/containers/performance_tests/CMakeLists.txt b/kokkos/containers/performance_tests/CMakeLists.txt
index ca7680819..1011cb8fd 100644
--- a/kokkos/containers/performance_tests/CMakeLists.txt
+++ b/kokkos/containers/performance_tests/CMakeLists.txt
@@ -5,58 +5,42 @@ KOKKOS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../src )
 
 IF(Kokkos_ENABLE_CUDA)
    SET(SOURCES
-     TestMain.cpp 
+     TestMain.cpp
      TestCuda.cpp
      )
 
-   KOKKOS_ADD_TEST_EXECUTABLE( PerfTestExec_Cuda
+   KOKKOS_ADD_EXECUTABLE_AND_TEST( PerformanceTest_Cuda
                                SOURCES ${SOURCES}
                              )
-
-   KOKKOS_ADD_TEST( NAME PerformanceTest_Cuda
-                    EXE  PerfTestExec_Cuda
-                  )
 ENDIF()
 
 IF(Kokkos_ENABLE_PTHREAD)
    SET(SOURCES
-     TestMain.cpp 
+     TestMain.cpp
      TestThreads.cpp
    )
-   KOKKOS_ADD_TEST_EXECUTABLE( PerfTestExec_Threads
+   KOKKOS_ADD_EXECUTABLE_AND_TEST( PerformanceTest_Threads
                                SOURCES ${SOURCES}
                              )
-
-   KOKKOS_ADD_TEST( NAME PerformanceTest_Threads
-                    EXE  PerfTestExec_Threads
-                  )
 ENDIF()
 
 IF(Kokkos_ENABLE_OPENMP)
    SET(SOURCES
-     TestMain.cpp 
+     TestMain.cpp
      TestOpenMP.cpp
    )
-   KOKKOS_ADD_TEST_EXECUTABLE( PerfTestExec_OpenMP
+   KOKKOS_ADD_EXECUTABLE_AND_TEST( PerformanceTest_OpenMP
                                SOURCES ${SOURCES}
                              )
-
-   KOKKOS_ADD_TEST( NAME PerformanceTest_OpenMP
-                    EXE  PerfTestExec_OpenMP
-                  )
 ENDIF()
 
 IF(Kokkos_ENABLE_HPX)
    SET(SOURCES
-     TestMain.cpp 
+     TestMain.cpp
      TestHPX.cpp
    )
-   KOKKOS_ADD_TEST_EXECUTABLE( PerfTestExec_HPX
+   KOKKOS_ADD_EXECUTABLE_AND_TEST( PerformanceTest_HPX
                                SOURCES ${SOURCES}
                              )
-
-   KOKKOS_ADD_TEST( NAME PerformanceTest_HPX
-                    EXE  PerfTestExec_HPX
-                  )
 ENDIF()
 
diff --git a/kokkos/containers/performance_tests/TestCuda.cpp b/kokkos/containers/performance_tests/TestCuda.cpp
index 8caf478e5..697a006c3 100644
--- a/kokkos/containers/performance_tests/TestCuda.cpp
+++ b/kokkos/containers/performance_tests/TestCuda.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/containers/performance_tests/TestDynRankView.hpp b/kokkos/containers/performance_tests/TestDynRankView.hpp
index 1abe4b3b3..ee13f7e58 100644
--- a/kokkos/containers/performance_tests/TestDynRankView.hpp
+++ b/kokkos/containers/performance_tests/TestDynRankView.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/containers/performance_tests/TestGlobal2LocalIds.hpp b/kokkos/containers/performance_tests/TestGlobal2LocalIds.hpp
index b6ec6abf3..0d2ee4bc8 100644
--- a/kokkos/containers/performance_tests/TestGlobal2LocalIds.hpp
+++ b/kokkos/containers/performance_tests/TestGlobal2LocalIds.hpp
@@ -23,10 +23,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/containers/performance_tests/TestHPX.cpp b/kokkos/containers/performance_tests/TestHPX.cpp
index f93bc45ce..48be466bf 100644
--- a/kokkos/containers/performance_tests/TestHPX.cpp
+++ b/kokkos/containers/performance_tests/TestHPX.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/containers/performance_tests/TestMain.cpp b/kokkos/containers/performance_tests/TestMain.cpp
index 357526090..e3c8edb04 100644
--- a/kokkos/containers/performance_tests/TestMain.cpp
+++ b/kokkos/containers/performance_tests/TestMain.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/containers/performance_tests/TestOpenMP.cpp b/kokkos/containers/performance_tests/TestOpenMP.cpp
index e98ea8cdb..a9c8639ed 100644
--- a/kokkos/containers/performance_tests/TestOpenMP.cpp
+++ b/kokkos/containers/performance_tests/TestOpenMP.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/containers/performance_tests/TestROCm.cpp b/kokkos/containers/performance_tests/TestROCm.cpp
index 95ccc5e7b..55b770b49 100644
--- a/kokkos/containers/performance_tests/TestROCm.cpp
+++ b/kokkos/containers/performance_tests/TestROCm.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/containers/performance_tests/TestScatterView.hpp b/kokkos/containers/performance_tests/TestScatterView.hpp
index be66a9715..3d4c57f3e 100644
--- a/kokkos/containers/performance_tests/TestScatterView.hpp
+++ b/kokkos/containers/performance_tests/TestScatterView.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/containers/performance_tests/TestThreads.cpp b/kokkos/containers/performance_tests/TestThreads.cpp
index 8ee234db4..2f3740453 100644
--- a/kokkos/containers/performance_tests/TestThreads.cpp
+++ b/kokkos/containers/performance_tests/TestThreads.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/containers/performance_tests/TestUnorderedMapPerformance.hpp b/kokkos/containers/performance_tests/TestUnorderedMapPerformance.hpp
index 73f3b090b..905784234 100644
--- a/kokkos/containers/performance_tests/TestUnorderedMapPerformance.hpp
+++ b/kokkos/containers/performance_tests/TestUnorderedMapPerformance.hpp
@@ -23,10 +23,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/containers/src/Kokkos_Bitset.hpp b/kokkos/containers/src/Kokkos_Bitset.hpp
index 5810dbce8..ab75fc1e1 100644
--- a/kokkos/containers/src/Kokkos_Bitset.hpp
+++ b/kokkos/containers/src/Kokkos_Bitset.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -103,19 +103,19 @@ class Bitset {
     }
   }
 
-  KOKKOS_INLINE_FUNCTION
+  KOKKOS_DEFAULTED_FUNCTION
   Bitset(const Bitset<Device>&) = default;
 
-  KOKKOS_INLINE_FUNCTION
+  KOKKOS_DEFAULTED_FUNCTION
   Bitset& operator=(const Bitset<Device>&) = default;
 
-  KOKKOS_INLINE_FUNCTION
+  KOKKOS_DEFAULTED_FUNCTION
   Bitset(Bitset<Device>&&) = default;
 
-  KOKKOS_INLINE_FUNCTION
+  KOKKOS_DEFAULTED_FUNCTION
   Bitset& operator=(Bitset<Device>&&) = default;
 
-  KOKKOS_INLINE_FUNCTION
+  KOKKOS_DEFAULTED_FUNCTION
   ~Bitset() = default;
 
   /// number of bits in the set
diff --git a/kokkos/containers/src/Kokkos_DualView.hpp b/kokkos/containers/src/Kokkos_DualView.hpp
index ed9a595bf..ede7d9a31 100644
--- a/kokkos/containers/src/Kokkos_DualView.hpp
+++ b/kokkos/containers/src/Kokkos_DualView.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -238,6 +238,53 @@ class DualView : public ViewTraits<DataType, Arg1Type, Arg2Type, Arg3Type> {
 #endif
   }
 
+  /// \brief Constructor that allocates View objects on both host and device.
+  ///
+  /// This constructor works like the analogous constructor of View.
+  /// The first arguments are wrapped up in a ViewCtor class, this allows
+  /// for a label, without initializing, and all of the other things that can
+  /// be wrapped up in a Ctor class.
+  /// The arguments that follow are the dimensions of the
+  /// View objects.  For example, if the View has three dimensions,
+  /// the first three integer arguments will be nonzero, and you may
+  /// omit the integer arguments that follow.
+  template <class... P>
+  DualView(const Impl::ViewCtorProp<P...>& arg_prop,
+           typename std::enable_if<!Impl::ViewCtorProp<P...>::has_pointer,
+                                   size_t>::type const n0 =
+               KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+           const size_t n1 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+           const size_t n2 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+           const size_t n3 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+           const size_t n4 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+           const size_t n5 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+           const size_t n6 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+           const size_t n7 = KOKKOS_IMPL_CTOR_DEFAULT_ARG)
+      : d_view(arg_prop, n0, n1, n2, n3, n4, n5, n6, n7),
+        h_view(create_mirror_view(d_view))  // without UVM, host View mirrors
+        ,
+        modified_flags(t_modified_flags("DualView::modified_flags")) {
+#ifdef KOKKOS_ENABLE_DEPRECATED_CODE
+    modified_host   = t_modified_flag(modified_flags, 0);
+    modified_device = t_modified_flag(modified_flags, 1);
+#endif
+  }
+
+  explicit inline DualView(const ViewAllocateWithoutInitializing& arg_prop,
+                           const size_t arg_N0 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+                           const size_t arg_N1 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+                           const size_t arg_N2 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+                           const size_t arg_N3 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+                           const size_t arg_N4 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+                           const size_t arg_N5 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+                           const size_t arg_N6 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
+                           const size_t arg_N7 = KOKKOS_IMPL_CTOR_DEFAULT_ARG)
+      : DualView(Impl::ViewCtorProp<std::string,
+                                    Kokkos::Impl::WithoutInitializing_t>(
+                     arg_prop.label, Kokkos::WithoutInitializing),
+                 arg_N0, arg_N1, arg_N2, arg_N3, arg_N4, arg_N5, arg_N6,
+                 arg_N7) {}
+
   //! Copy constructor (shallow copy)
   template <class SS, class LS, class DS, class MS>
   DualView(const DualView<SS, LS, DS, MS>& src)
@@ -470,23 +517,43 @@ class DualView : public ViewTraits<DataType, Arg1Type, Arg2Type, Arg3Type> {
   ///   as modified, by calling the modify() method with the
   ///   appropriate template parameter.
   template <class Device>
-  void sync(const typename Impl::enable_if<
+  void sync(const typename std::enable_if<
                 (std::is_same<typename traits::data_type,
                               typename traits::non_const_data_type>::value) ||
                     (std::is_same<Device, int>::value),
                 int>::type& = 0) {
-    if (modified_flags.data() == NULL) return;
+    if (modified_flags.data() == nullptr) return;
 
     int dev = get_device_side<Device>();
 
     if (dev == 1) {  // if Device is the same as DualView's device type
       if ((modified_flags(0) > 0) && (modified_flags(0) >= modified_flags(1))) {
+#ifdef KOKKOS_ENABLE_CUDA
+        if (std::is_same<typename t_dev::memory_space,
+                         Kokkos::CudaUVMSpace>::value) {
+          if (d_view.data() == h_view.data())
+            Kokkos::Impl::cuda_prefetch_pointer(
+                Kokkos::Cuda(), d_view.data(),
+                sizeof(typename t_dev::value_type) * d_view.span(), true);
+        }
+#endif
+
         deep_copy(d_view, h_view);
         modified_flags(0) = modified_flags(1) = 0;
       }
     }
     if (dev == 0) {  // hopefully Device is the same as DualView's host type
       if ((modified_flags(1) > 0) && (modified_flags(1) >= modified_flags(0))) {
+#ifdef KOKKOS_ENABLE_CUDA
+        if (std::is_same<typename t_dev::memory_space,
+                         Kokkos::CudaUVMSpace>::value) {
+          if (d_view.data() == h_view.data())
+            Kokkos::Impl::cuda_prefetch_pointer(
+                Kokkos::Cuda(), d_view.data(),
+                sizeof(typename t_dev::value_type) * d_view.span(), false);
+        }
+#endif
+
         deep_copy(h_view, d_view);
         modified_flags(0) = modified_flags(1) = 0;
       }
@@ -499,12 +566,12 @@ class DualView : public ViewTraits<DataType, Arg1Type, Arg2Type, Arg3Type> {
   }
 
   template <class Device>
-  void sync(const typename Impl::enable_if<
+  void sync(const typename std::enable_if<
                 (!std::is_same<typename traits::data_type,
                                typename traits::non_const_data_type>::value) ||
                     (std::is_same<Device, int>::value),
                 int>::type& = 0) {
-    if (modified_flags.data() == NULL) return;
+    if (modified_flags.data() == nullptr) return;
 
     int dev = get_device_side<Device>();
 
@@ -527,8 +594,18 @@ class DualView : public ViewTraits<DataType, Arg1Type, Arg2Type, Arg3Type> {
                       typename traits::non_const_data_type>::value)
       Impl::throw_runtime_exception(
           "Calling sync_host on a DualView with a const datatype.");
-    if (modified_flags.data() == NULL) return;
+    if (modified_flags.data() == nullptr) return;
     if (modified_flags(1) > modified_flags(0)) {
+#ifdef KOKKOS_ENABLE_CUDA
+      if (std::is_same<typename t_dev::memory_space,
+                       Kokkos::CudaUVMSpace>::value) {
+        if (d_view.data() == h_view.data())
+          Kokkos::Impl::cuda_prefetch_pointer(
+              Kokkos::Cuda(), d_view.data(),
+              sizeof(typename t_dev::value_type) * d_view.span(), false);
+      }
+#endif
+
       deep_copy(h_view, d_view);
       modified_flags(1) = modified_flags(0) = 0;
     }
@@ -539,8 +616,18 @@ class DualView : public ViewTraits<DataType, Arg1Type, Arg2Type, Arg3Type> {
                       typename traits::non_const_data_type>::value)
       Impl::throw_runtime_exception(
           "Calling sync_device on a DualView with a const datatype.");
-    if (modified_flags.data() == NULL) return;
+    if (modified_flags.data() == nullptr) return;
     if (modified_flags(0) > modified_flags(1)) {
+#ifdef KOKKOS_ENABLE_CUDA
+      if (std::is_same<typename t_dev::memory_space,
+                       Kokkos::CudaUVMSpace>::value) {
+        if (d_view.data() == h_view.data())
+          Kokkos::Impl::cuda_prefetch_pointer(
+              Kokkos::Cuda(), d_view.data(),
+              sizeof(typename t_dev::value_type) * d_view.span(), true);
+      }
+#endif
+
       deep_copy(d_view, h_view);
       modified_flags(1) = modified_flags(0) = 0;
     }
@@ -548,7 +635,7 @@ class DualView : public ViewTraits<DataType, Arg1Type, Arg2Type, Arg3Type> {
 
   template <class Device>
   bool need_sync() const {
-    if (modified_flags.data() == NULL) return false;
+    if (modified_flags.data() == nullptr) return false;
     int dev = get_device_side<Device>();
 
     if (dev == 1) {  // if Device is the same as DualView's device type
@@ -565,12 +652,12 @@ class DualView : public ViewTraits<DataType, Arg1Type, Arg2Type, Arg3Type> {
   }
 
   inline bool need_sync_host() const {
-    if (modified_flags.data() == NULL) return false;
+    if (modified_flags.data() == nullptr) return false;
     return modified_flags(0) < modified_flags(1);
   }
 
   inline bool need_sync_device() const {
-    if (modified_flags.data() == NULL) return false;
+    if (modified_flags.data() == nullptr) return false;
     return modified_flags(1) < modified_flags(0);
   }
 
@@ -581,7 +668,7 @@ class DualView : public ViewTraits<DataType, Arg1Type, Arg2Type, Arg3Type> {
   /// data as modified.
   template <class Device>
   void modify() {
-    if (modified_flags.data() == NULL) return;
+    if (modified_flags.data() == nullptr) return;
     int dev = get_device_side<Device>();
 
     if (dev == 1) {  // if Device is the same as DualView's device type
@@ -612,7 +699,7 @@ class DualView : public ViewTraits<DataType, Arg1Type, Arg2Type, Arg3Type> {
   }
 
   inline void modify_host() {
-    if (modified_flags.data() != NULL) {
+    if (modified_flags.data() != nullptr) {
       modified_flags(0) =
           (modified_flags(1) > modified_flags(0) ? modified_flags(1)
                                                  : modified_flags(0)) +
@@ -631,7 +718,7 @@ class DualView : public ViewTraits<DataType, Arg1Type, Arg2Type, Arg3Type> {
   }
 
   inline void modify_device() {
-    if (modified_flags.data() != NULL) {
+    if (modified_flags.data() != nullptr) {
       modified_flags(1) =
           (modified_flags(1) > modified_flags(0) ? modified_flags(1)
                                                  : modified_flags(0)) +
@@ -650,7 +737,7 @@ class DualView : public ViewTraits<DataType, Arg1Type, Arg2Type, Arg3Type> {
   }
 
   inline void clear_sync_state() {
-    if (modified_flags.data() != NULL)
+    if (modified_flags.data() != nullptr)
       modified_flags(1) = modified_flags(0) = 0;
   }
 
@@ -675,7 +762,7 @@ class DualView : public ViewTraits<DataType, Arg1Type, Arg2Type, Arg3Type> {
     h_view = create_mirror_view(d_view);
 
     /* Reset dirty flags */
-    if (modified_flags.data() == NULL) {
+    if (modified_flags.data() == nullptr) {
       modified_flags = t_modified_flags("DualView::modified_flags");
     } else
       modified_flags(1) = modified_flags(0) = 0;
@@ -693,7 +780,7 @@ class DualView : public ViewTraits<DataType, Arg1Type, Arg2Type, Arg3Type> {
               const size_t n5 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
               const size_t n6 = KOKKOS_IMPL_CTOR_DEFAULT_ARG,
               const size_t n7 = KOKKOS_IMPL_CTOR_DEFAULT_ARG) {
-    if (modified_flags.data() == NULL) {
+    if (modified_flags.data() == nullptr) {
       modified_flags = t_modified_flags("DualView::modified_flags");
     }
     if (modified_flags(1) >= modified_flags(0)) {
@@ -866,4 +953,27 @@ void deep_copy(
 
 }  // namespace Kokkos
 
+//----------------------------------------------------------------------------
+//----------------------------------------------------------------------------
+
+namespace Kokkos {
+
+//
+// Non-member resize and realloc
+//
+
+template <class... Properties, class... Args>
+void resize(DualView<Properties...>& dv, Args&&... args) noexcept(
+    noexcept(dv.resize(std::forward<Args>(args)...))) {
+  dv.resize(std::forward<Args>(args)...);
+}
+
+template <class... Properties, class... Args>
+void realloc(DualView<Properties...>& dv, Args&&... args) noexcept(
+    noexcept(dv.realloc(std::forward<Args>(args)...))) {
+  dv.realloc(std::forward<Args>(args)...);
+}
+
+}  // end namespace Kokkos
+
 #endif
diff --git a/kokkos/containers/src/Kokkos_DynRankView.hpp b/kokkos/containers/src/Kokkos_DynRankView.hpp
index 9b0d4f0fe..4ab212d7b 100644
--- a/kokkos/containers/src/Kokkos_DynRankView.hpp
+++ b/kokkos/containers/src/Kokkos_DynRankView.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -293,6 +293,7 @@ KOKKOS_INLINE_FUNCTION void dyn_rank_view_verify_operator_bounds(
     dyn_rank_view_error_operator_bounds<0>(buffer + n, LEN - n, map, args...);
     Kokkos::Impl::throw_runtime_exception(std::string(buffer));
 #else
+    (void)tracker;
     Kokkos::abort("DynRankView bounds error");
 #endif
   }
@@ -1065,8 +1066,8 @@ class DynRankView : public ViewTraits<DataType, Properties...> {
   //----------------------------------------
   // Standard constructor, destructor, and assignment operators...
 
-  KOKKOS_INLINE_FUNCTION
-  ~DynRankView() {}
+  KOKKOS_DEFAULTED_FUNCTION
+  ~DynRankView() = default;
 
   KOKKOS_INLINE_FUNCTION
   DynRankView() : m_track(), m_map(), m_rank() {}  // Default ctor
@@ -1773,7 +1774,7 @@ struct DynRankViewRemap {
     const Kokkos::Impl::ParallelFor<DynRankViewRemap, Policy> closure(
         *this, Policy(0, n0));
     closure.execute();
-    // Kokkos::fence(); // ??
+    // ExecSpace().fence(); // ??
   }
 
   KOKKOS_INLINE_FUNCTION
@@ -1806,7 +1807,8 @@ inline void deep_copy(
     const DynRankView<DT, DP...>& dst,
     typename ViewTraits<DT, DP...>::const_value_type& value,
     typename std::enable_if<std::is_same<
-        typename ViewTraits<DT, DP...>::specialize, void>::value>::type* = 0) {
+        typename ViewTraits<DT, DP...>::specialize, void>::value>::type* =
+        nullptr) {
   static_assert(
       std::is_same<typename ViewTraits<DT, DP...>::non_const_value_type,
                    typename ViewTraits<DT, DP...>::value_type>::value,
@@ -1843,7 +1845,7 @@ inline void deep_copy(
         (std::is_same<typename DstType::traits::specialize, void>::value &&
          std::is_same<typename SrcType::traits::specialize, void>::value &&
          (Kokkos::is_dyn_rank_view<DstType>::value ||
-          Kokkos::is_dyn_rank_view<SrcType>::value))>::type* = 0) {
+          Kokkos::is_dyn_rank_view<SrcType>::value))>::type* = nullptr) {
   static_assert(
       std::is_same<typename DstType::traits::value_type,
                    typename DstType::traits::non_const_value_type>::value,
@@ -2009,7 +2011,7 @@ inline typename DynRankView<T, P...>::HostMirror create_mirror(
     typename std::enable_if<
         std::is_same<typename ViewTraits<T, P...>::specialize, void>::value &&
         !std::is_same<typename Kokkos::ViewTraits<T, P...>::array_layout,
-                      Kokkos::LayoutStride>::value>::type* = 0) {
+                      Kokkos::LayoutStride>::value>::type* = nullptr) {
   typedef DynRankView<T, P...> src_type;
   typedef typename src_type::HostMirror dst_type;
 
@@ -2036,7 +2038,8 @@ template <class Space, class T, class... P>
 typename Impl::MirrorDRVType<Space, T, P...>::view_type create_mirror(
     const Space&, const Kokkos::DynRankView<T, P...>& src,
     typename std::enable_if<std::is_same<
-        typename ViewTraits<T, P...>::specialize, void>::value>::type* = 0) {
+        typename ViewTraits<T, P...>::specialize, void>::value>::type* =
+        nullptr) {
   return typename Impl::MirrorDRVType<Space, T, P...>::view_type(
       src.label(), Impl::reconstructLayout(src.layout(), src.rank()));
 }
@@ -2050,7 +2053,7 @@ inline typename DynRankView<T, P...>::HostMirror create_mirror_view(
              typename DynRankView<T, P...>::HostMirror::memory_space>::value &&
          std::is_same<typename DynRankView<T, P...>::data_type,
                       typename DynRankView<T, P...>::HostMirror::data_type>::
-             value)>::type* = 0) {
+             value)>::type* = nullptr) {
   return src;
 }
 
@@ -2072,7 +2075,8 @@ template <class Space, class T, class... P>
 typename Impl::MirrorDRViewType<Space, T, P...>::view_type create_mirror_view(
     const Space&, const Kokkos::DynRankView<T, P...>& src,
     typename std::enable_if<
-        Impl::MirrorDRViewType<Space, T, P...>::is_same_memspace>::type* = 0) {
+        Impl::MirrorDRViewType<Space, T, P...>::is_same_memspace>::type* =
+        nullptr) {
   return src;
 }
 
@@ -2094,7 +2098,8 @@ create_mirror_view_and_copy(
     const Space&, const Kokkos::DynRankView<T, P...>& src,
     std::string const& name = "",
     typename std::enable_if<
-        Impl::MirrorDRViewType<Space, T, P...>::is_same_memspace>::type* = 0) {
+        Impl::MirrorDRViewType<Space, T, P...>::is_same_memspace>::type* =
+        nullptr) {
   (void)name;
   return src;
 }
@@ -2139,7 +2144,7 @@ inline void resize(DynRankView<T, P...>& v,
   static_assert(Kokkos::ViewTraits<T, P...>::is_managed,
                 "Can only resize managed views");
 
-  drview_type v_resized(v.label(), n0, n1, n2, n3, n4, n5, n6);
+  drview_type v_resized(v.label(), n0, n1, n2, n3, n4, n5, n6, n7);
 
   Kokkos::Impl::DynRankViewRemap<drview_type, drview_type>(v_resized, v);
 
@@ -2166,7 +2171,7 @@ inline void realloc(DynRankView<T, P...>& v,
   const std::string label = v.label();
 
   v = drview_type();  // Deallocate first, if the only view to allocation
-  v = drview_type(label, n0, n1, n2, n3, n4, n5, n6);
+  v = drview_type(label, n0, n1, n2, n3, n4, n5, n6, n7);
 }
 
 }  // namespace Kokkos
diff --git a/kokkos/containers/src/Kokkos_DynamicView.hpp b/kokkos/containers/src/Kokkos_DynamicView.hpp
index cf02cf66a..ebbbcc5e8 100644
--- a/kokkos/containers/src/Kokkos_DynamicView.hpp
+++ b/kokkos/containers/src/Kokkos_DynamicView.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -70,10 +70,10 @@ struct ChunkArraySpace<Kokkos::CudaSpace> {
   using memory_space = typename Kokkos::CudaUVMSpace;
 };
 #endif
-#ifdef KOKKOS_ENABLE_ROCM
+#ifdef KOKKOS_ENABLE_HIP
 template <>
-struct ChunkArraySpace<Kokkos::Experimental::ROCmSpace> {
-  using memory_space = typename Kokkos::Experimental::ROCmHostPinnedSpace;
+struct ChunkArraySpace<Kokkos::Experimental::HIPSpace> {
+  using memory_space = typename Kokkos::Experimental::HIPHostPinnedSpace;
 };
 #endif
 }  // end namespace Impl
@@ -248,8 +248,8 @@ class DynamicView : public Kokkos::ViewTraits<DataType, P...> {
   //----------------------------------------
 
   template <typename I0, class... Args>
-  KOKKOS_INLINE_FUNCTION reference_type operator()(const I0& i0,
-                                                   const Args&... args) const {
+  KOKKOS_INLINE_FUNCTION reference_type
+  operator()(const I0& i0, const Args&... /*args*/) const {
     static_assert(Kokkos::Impl::are_integral<I0, Args...>::value,
                   "Indices must be integral type");
 
@@ -265,7 +265,7 @@ class DynamicView : public Kokkos::ViewTraits<DataType, P...> {
     // If not bounds checking then we assume a non-zero pointer is valid.
 
 #if !defined(KOKKOS_ENABLE_DEBUG_BOUNDS_CHECK)
-    if (0 == *ch)
+    if (nullptr == *ch)
 #endif
     {
       // Verify that allocation of the requested chunk in in progress.
@@ -280,7 +280,7 @@ class DynamicView : public Kokkos::ViewTraits<DataType, P...> {
 
       // Allocation of this chunk is in progress
       // so wait for allocation to complete.
-      while (0 == *ch)
+      while (nullptr == *ch)
         ;
     }
 
@@ -325,7 +325,7 @@ class DynamicView : public Kokkos::ViewTraits<DataType, P...> {
         --*pc;
         typename traits::memory_space().deallocate(
             m_chunks[*pc], sizeof(local_value_type) << m_chunk_shift);
-        m_chunks[*pc] = 0;
+        m_chunks[*pc] = nullptr;
       }
     }
     // *m_chunks[m_chunk_max+1] stores the 'extent' requested by resize
@@ -366,10 +366,10 @@ class DynamicView : public Kokkos::ViewTraits<DataType, P...> {
     // Initialize or destroy array of chunk pointers.
     // Two entries beyond the max chunks are allocation counters.
     inline void operator()(unsigned i) const {
-      if (m_destroy && i < m_chunk_max && 0 != m_chunks[i]) {
+      if (m_destroy && i < m_chunk_max && nullptr != m_chunks[i]) {
         typename traits::memory_space().deallocate(m_chunks[i], m_chunk_size);
       }
-      m_chunks[i] = 0;
+      m_chunks[i] = nullptr;
     }
 
     void execute(bool arg_destroy) {
@@ -419,7 +419,7 @@ class DynamicView : public Kokkos::ViewTraits<DataType, P...> {
                               const unsigned min_chunk_size,
                               const unsigned max_extent)
       : m_track(),
-        m_chunks(0)
+        m_chunks(nullptr)
         // The chunk size is guaranteed to be a power of two
         ,
         m_chunk_shift(Kokkos::Impl::integral_power_of_two_that_contains(
@@ -528,7 +528,7 @@ struct CommonSubview<Kokkos::Experimental::DynamicView<DP...>,
   typedef SrcType src_subview_type;
   dst_subview_type dst_sub;
   src_subview_type src_sub;
-  CommonSubview(const DstType& dst, const SrcType& src, const Arg0& arg0)
+  CommonSubview(const DstType& dst, const SrcType& src, const Arg0& /*arg0*/)
       : dst_sub(dst), src_sub(src) {}
 };
 
diff --git a/kokkos/containers/src/Kokkos_ErrorReporter.hpp b/kokkos/containers/src/Kokkos_ErrorReporter.hpp
index 91d75b0f4..e07c386b7 100644
--- a/kokkos/containers/src/Kokkos_ErrorReporter.hpp
+++ b/kokkos/containers/src/Kokkos_ErrorReporter.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -187,7 +187,7 @@ template <typename ReportType, typename DeviceType>
 void ErrorReporter<ReportType, DeviceType>::resize(const size_t new_size) {
   m_reports.resize(new_size);
   m_reporters.resize(new_size);
-  Kokkos::fence();
+  typename DeviceType::execution_space().fence();
 }
 
 }  // namespace Experimental
diff --git a/kokkos/containers/src/Kokkos_Functional.hpp b/kokkos/containers/src/Kokkos_Functional.hpp
index c1a850b1d..d90845851 100644
--- a/kokkos/containers/src/Kokkos_Functional.hpp
+++ b/kokkos/containers/src/Kokkos_Functional.hpp
@@ -23,10 +23,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/containers/src/Kokkos_OffsetView.hpp b/kokkos/containers/src/Kokkos_OffsetView.hpp
index a1fe793cc..c3c66f0d7 100644
--- a/kokkos/containers/src/Kokkos_OffsetView.hpp
+++ b/kokkos/containers/src/Kokkos_OffsetView.hpp
@@ -362,19 +362,18 @@ class OffsetView : public ViewTraits<DataType, Properties...> {
   //----------------------------------------
 
  private:
-  enum {
-    is_layout_left =
-        std::is_same<typename traits::array_layout, Kokkos::LayoutLeft>::value,
+  static constexpr bool is_layout_left =
+      std::is_same<typename traits::array_layout, Kokkos::LayoutLeft>::value;
 
-    is_layout_right =
-        std::is_same<typename traits::array_layout, Kokkos::LayoutRight>::value,
+  static constexpr bool is_layout_right =
+      std::is_same<typename traits::array_layout, Kokkos::LayoutRight>::value;
 
-    is_layout_stride = std::is_same<typename traits::array_layout,
-                                    Kokkos::LayoutStride>::value,
+  static constexpr bool is_layout_stride =
+      std::is_same<typename traits::array_layout, Kokkos::LayoutStride>::value;
 
-    is_default_map = std::is_same<typename traits::specialize, void>::value &&
-                     (is_layout_left || is_layout_right || is_layout_stride)
-  };
+  static constexpr bool is_default_map =
+      std::is_same<typename traits::specialize, void>::value &&
+      (is_layout_left || is_layout_right || is_layout_stride);
 
   template <class Space, bool = Kokkos::Impl::MemorySpaceAccess<
                              Space, typename traits::memory_space>::accessible>
@@ -804,8 +803,8 @@ class OffsetView : public ViewTraits<DataType, Properties...> {
   //----------------------------------------
   // Standard destructor, constructors, and assignment operators
 
-  KOKKOS_INLINE_FUNCTION
-  ~OffsetView() {}
+  KOKKOS_DEFAULTED_FUNCTION
+  ~OffsetView() = default;
 
   KOKKOS_INLINE_FUNCTION
   OffsetView() : m_track(), m_map() {
@@ -1317,7 +1316,7 @@ KOKKOS_INLINE_FUNCTION
 
 KOKKOS_INLINE_FUNCTION
 Kokkos::Impl::ALL_t shift_input(const Kokkos::Impl::ALL_t arg,
-                                const int64_t offset) {
+                                const int64_t /*offset*/) {
   return arg;
 }
 
@@ -1347,9 +1346,9 @@ KOKKOS_INLINE_FUNCTION void map_arg_to_new_begin(
 
 template <size_t N, class Arg, class A>
 KOKKOS_INLINE_FUNCTION void map_arg_to_new_begin(
-    const size_t i, Kokkos::Array<int64_t, N>& subviewBegins,
-    typename std::enable_if<N == 0, const Arg>::type shiftedArg, const Arg arg,
-    const A viewBegins, size_t& counter) {}
+    const size_t /*i*/, Kokkos::Array<int64_t, N>& /*subviewBegins*/,
+    typename std::enable_if<N == 0, const Arg>::type /*shiftedArg*/,
+    const Arg /*arg*/, const A /*viewBegins*/, size_t& /*counter*/) {}
 
 template <class D, class... P, class T>
 KOKKOS_INLINE_FUNCTION
@@ -1832,7 +1831,8 @@ inline void deep_copy(
     const OffsetView<DT, DP...>& dst,
     typename ViewTraits<DT, DP...>::const_value_type& value,
     typename std::enable_if<std::is_same<
-        typename ViewTraits<DT, DP...>::specialize, void>::value>::type* = 0) {
+        typename ViewTraits<DT, DP...>::specialize, void>::value>::type* =
+        nullptr) {
   static_assert(
       std::is_same<typename ViewTraits<DT, DP...>::non_const_value_type,
                    typename ViewTraits<DT, DP...>::value_type>::value,
@@ -1846,7 +1846,8 @@ template <class DT, class... DP, class ST, class... SP>
 inline void deep_copy(
     const OffsetView<DT, DP...>& dst, const OffsetView<ST, SP...>& value,
     typename std::enable_if<std::is_same<
-        typename ViewTraits<DT, DP...>::specialize, void>::value>::type* = 0) {
+        typename ViewTraits<DT, DP...>::specialize, void>::value>::type* =
+        nullptr) {
   static_assert(
       std::is_same<typename ViewTraits<DT, DP...>::value_type,
                    typename ViewTraits<ST, SP...>::non_const_value_type>::value,
@@ -1859,7 +1860,8 @@ template <class DT, class... DP, class ST, class... SP>
 inline void deep_copy(
     const OffsetView<DT, DP...>& dst, const View<ST, SP...>& value,
     typename std::enable_if<std::is_same<
-        typename ViewTraits<DT, DP...>::specialize, void>::value>::type* = 0) {
+        typename ViewTraits<DT, DP...>::specialize, void>::value>::type* =
+        nullptr) {
   static_assert(
       std::is_same<typename ViewTraits<DT, DP...>::value_type,
                    typename ViewTraits<ST, SP...>::non_const_value_type>::value,
@@ -1873,7 +1875,8 @@ template <class DT, class... DP, class ST, class... SP>
 inline void deep_copy(
     const View<DT, DP...>& dst, const OffsetView<ST, SP...>& value,
     typename std::enable_if<std::is_same<
-        typename ViewTraits<DT, DP...>::specialize, void>::value>::type* = 0) {
+        typename ViewTraits<DT, DP...>::specialize, void>::value>::type* =
+        nullptr) {
   static_assert(
       std::is_same<typename ViewTraits<DT, DP...>::value_type,
                    typename ViewTraits<ST, SP...>::non_const_value_type>::value,
@@ -2011,7 +2014,7 @@ create_mirror_view(
          std::is_same<
              typename Kokkos::Experimental::OffsetView<T, P...>::data_type,
              typename Kokkos::Experimental::OffsetView<
-                 T, P...>::HostMirror::data_type>::value)>::type* = 0) {
+                 T, P...>::HostMirror::data_type>::value)>::type* = nullptr) {
   return src;
 }
 
diff --git a/kokkos/containers/src/Kokkos_ScatterView.hpp b/kokkos/containers/src/Kokkos_ScatterView.hpp
index b659b70b3..eb3bc1f2b 100644
--- a/kokkos/containers/src/Kokkos_ScatterView.hpp
+++ b/kokkos/containers/src/Kokkos_ScatterView.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -171,24 +171,41 @@ struct DefaultContribution<Kokkos::Cuda,
 };
 #endif
 
+#ifdef KOKKOS_ENABLE_HIP
+template <>
+struct DefaultDuplication<Kokkos::Experimental::HIP> {
+  enum : int { value = Kokkos::Experimental::ScatterNonDuplicated };
+};
+template <>
+struct DefaultContribution<Kokkos::Experimental::HIP,
+                           Kokkos::Experimental::ScatterNonDuplicated> {
+  enum : int { value = Kokkos::Experimental::ScatterAtomic };
+};
+template <>
+struct DefaultContribution<Kokkos::Experimental::HIP,
+                           Kokkos::Experimental::ScatterDuplicated> {
+  enum : int { value = Kokkos::Experimental::ScatterAtomic };
+};
+#endif
+
 /* ScatterValue <Op=ScatterSum, contribution=ScatterNonAtomic> is the object
    returned by the access operator() of ScatterAccess, This class inherits from
    the Sum<> reducer and it wraps join(dest, src) with convenient operator+=,
    etc. Note the addition of update(ValueType const& rhs) and reset()  so that
    all reducers can have common functions See ReduceDuplicates and
    ResetDuplicates ) */
-template <typename ValueType, int Op, int contribution>
+template <typename ValueType, int Op, typename DeviceType, int contribution>
 struct ScatterValue;
 
-template <typename ValueType>
-struct ScatterValue<ValueType, Kokkos::Experimental::ScatterSum,
+template <typename ValueType, typename DeviceType>
+struct ScatterValue<ValueType, Kokkos::Experimental::ScatterSum, DeviceType,
                     Kokkos::Experimental::ScatterNonAtomic>
-    : Sum<ValueType, Kokkos::DefaultExecutionSpace> {
+    : Sum<ValueType, DeviceType> {
  public:
   KOKKOS_FORCEINLINE_FUNCTION ScatterValue(ValueType& value_in)
-      : Sum<ValueType, Kokkos::DefaultExecutionSpace>(value_in) {}
+      : Sum<ValueType, DeviceType>(value_in) {}
   KOKKOS_FORCEINLINE_FUNCTION ScatterValue(ScatterValue&& other)
-      : Sum<ValueType, Kokkos::DefaultExecutionSpace>(other.reference()) {}
+      : Sum<ValueType, DeviceType>(other.reference()) {}
   KOKKOS_FORCEINLINE_FUNCTION void operator+=(ValueType const& rhs) {
     this->join(this->reference(), rhs);
   }
@@ -206,13 +223,13 @@ struct ScatterValue<ValueType, Kokkos::Experimental::ScatterSum,
  * of ScatterAccess, similar to that returned by an Atomic View, it wraps
  Kokkos::atomic_add with convenient operator+=, etc. This version also has the
  update(rhs) and reset() functions. */
-template <typename ValueType>
-struct ScatterValue<ValueType, Kokkos::Experimental::ScatterSum,
+template <typename ValueType, typename DeviceType>
+struct ScatterValue<ValueType, Kokkos::Experimental::ScatterSum, DeviceType,
                     Kokkos::Experimental::ScatterAtomic>
-    : Sum<ValueType, Kokkos::DefaultExecutionSpace> {
+    : Sum<ValueType, DeviceType> {
  public:
   KOKKOS_FORCEINLINE_FUNCTION ScatterValue(ValueType& value_in)
-      : Sum<ValueType, Kokkos::DefaultExecutionSpace>(value_in) {}
+      : Sum<ValueType, DeviceType>(value_in) {}
 
   KOKKOS_FORCEINLINE_FUNCTION void operator+=(ValueType const& rhs) {
     this->join(this->reference(), rhs);
@@ -244,15 +261,15 @@ struct ScatterValue<ValueType, Kokkos::Experimental::ScatterSum,
    etc. Note the addition of update(ValueType const& rhs) and reset()  so that
    all reducers can have common functions See ReduceDuplicates and
    ResetDuplicates ) */
-template <typename ValueType>
-struct ScatterValue<ValueType, Kokkos::Experimental::ScatterProd,
+template <typename ValueType, typename DeviceType>
+struct ScatterValue<ValueType, Kokkos::Experimental::ScatterProd, DeviceType,
                     Kokkos::Experimental::ScatterNonAtomic>
-    : Prod<ValueType, Kokkos::DefaultExecutionSpace> {
+    : Prod<ValueType, DeviceType> {
  public:
   KOKKOS_FORCEINLINE_FUNCTION ScatterValue(ValueType& value_in)
-      : Prod<ValueType, Kokkos::DefaultExecutionSpace>(value_in) {}
+      : Prod<ValueType, DeviceType>(value_in) {}
   KOKKOS_FORCEINLINE_FUNCTION ScatterValue(ScatterValue&& other)
-      : Prod<ValueType, Kokkos::DefaultExecutionSpace>(other.reference()) {}
+      : Prod<ValueType, DeviceType>(other.reference()) {}
   KOKKOS_FORCEINLINE_FUNCTION void operator*=(ValueType const& rhs) {
     this->join(this->reference(), rhs);
   }
@@ -271,13 +288,13 @@ struct ScatterValue<ValueType, Kokkos::Experimental::ScatterProd,
  atomic_prod with convenient operator*=, etc. atomic_prod uses the
  atomic_compare_exchange. This version also has the update(rhs) and reset()
  functions. */
-template <typename ValueType>
-struct ScatterValue<ValueType, Kokkos::Experimental::ScatterProd,
+template <typename ValueType, typename DeviceType>
+struct ScatterValue<ValueType, Kokkos::Experimental::ScatterProd, DeviceType,
                     Kokkos::Experimental::ScatterAtomic>
-    : Prod<ValueType, Kokkos::DefaultExecutionSpace> {
+    : Prod<ValueType, DeviceType> {
  public:
   KOKKOS_FORCEINLINE_FUNCTION ScatterValue(ValueType& value_in)
-      : Prod<ValueType, Kokkos::DefaultExecutionSpace>(value_in) {}
+      : Prod<ValueType, DeviceType>(value_in) {}
 
   KOKKOS_FORCEINLINE_FUNCTION void operator*=(ValueType const& rhs) {
     this->join(this->reference(), rhs);
@@ -320,15 +337,15 @@ struct ScatterValue<ValueType, Kokkos::Experimental::ScatterProd,
    Note the addition of update(ValueType const& rhs) and reset() are so that all
    reducers can have a common update function See ReduceDuplicates and
    ResetDuplicates ) */
-template <typename ValueType>
-struct ScatterValue<ValueType, Kokkos::Experimental::ScatterMin,
+template <typename ValueType, typename DeviceType>
+struct ScatterValue<ValueType, Kokkos::Experimental::ScatterMin, DeviceType,
                     Kokkos::Experimental::ScatterNonAtomic>
-    : Min<ValueType, Kokkos::DefaultExecutionSpace> {
+    : Min<ValueType, DeviceType> {
  public:
   KOKKOS_FORCEINLINE_FUNCTION ScatterValue(ValueType& value_in)
-      : Min<ValueType, Kokkos::DefaultExecutionSpace>(value_in) {}
+      : Min<ValueType, DeviceType>(value_in) {}
   KOKKOS_FORCEINLINE_FUNCTION ScatterValue(ScatterValue&& other)
-      : Min<ValueType, Kokkos::DefaultExecutionSpace>(other.reference()) {}
+      : Min<ValueType, DeviceType>(other.reference()) {}
   KOKKOS_FORCEINLINE_FUNCTION void update(ValueType const& rhs) {
     this->join(this->reference(), rhs);
   }
@@ -340,13 +357,13 @@ struct ScatterValue<ValueType, Kokkos::Experimental::ScatterMin,
  * of ScatterAccess, similar to that returned by an Atomic View, it wraps and
  atomic_min with the update(rhs) function. atomic_min uses the
  atomic_compare_exchange. This version also has the reset() function */
-template <typename ValueType>
-struct ScatterValue<ValueType, Kokkos::Experimental::ScatterMin,
+template <typename ValueType, typename DeviceType>
+struct ScatterValue<ValueType, Kokkos::Experimental::ScatterMin, DeviceType,
                     Kokkos::Experimental::ScatterAtomic>
-    : Min<ValueType, Kokkos::DefaultExecutionSpace> {
+    : Min<ValueType, DeviceType> {
  public:
   KOKKOS_FORCEINLINE_FUNCTION ScatterValue(ValueType& value_in)
-      : Min<ValueType, Kokkos::DefaultExecutionSpace>(value_in) {}
+      : Min<ValueType, DeviceType>(value_in) {}
 
   KOKKOS_FORCEINLINE_FUNCTION
   void atomic_min(ValueType& dest, const ValueType& src) const {
@@ -382,15 +399,15 @@ struct ScatterValue<ValueType, Kokkos::Experimental::ScatterMin,
    Note the addition of update(ValueType const& rhs) and reset() are so that all
    reducers can have a common update function See ReduceDuplicates and
    ResetDuplicates ) */
-template <typename ValueType>
-struct ScatterValue<ValueType, Kokkos::Experimental::ScatterMax,
+template <typename ValueType, typename DeviceType>
+struct ScatterValue<ValueType, Kokkos::Experimental::ScatterMax, DeviceType,
                     Kokkos::Experimental::ScatterNonAtomic>
-    : Max<ValueType, Kokkos::DefaultExecutionSpace> {
+    : Max<ValueType, DeviceType> {
  public:
   KOKKOS_FORCEINLINE_FUNCTION ScatterValue(ValueType& value_in)
-      : Max<ValueType, Kokkos::DefaultExecutionSpace>(value_in) {}
+      : Max<ValueType, DeviceType>(value_in) {}
   KOKKOS_FORCEINLINE_FUNCTION ScatterValue(ScatterValue&& other)
-      : Max<ValueType, Kokkos::DefaultExecutionSpace>(other.reference()) {}
+      : Max<ValueType, DeviceType>(other.reference()) {}
   KOKKOS_FORCEINLINE_FUNCTION void update(ValueType const& rhs) {
     this->join(this->reference(), rhs);
   }
@@ -402,13 +419,13 @@ struct ScatterValue<ValueType, Kokkos::Experimental::ScatterMax,
  * of ScatterAccess, similar to that returned by an Atomic View, it wraps and
  atomic_max with the update(rhs) function. atomic_max uses the
  atomic_compare_exchange. This version also has the reset() function  */
-template <typename ValueType>
-struct ScatterValue<ValueType, Kokkos::Experimental::ScatterMax,
+template <typename ValueType, typename DeviceType>
+struct ScatterValue<ValueType, Kokkos::Experimental::ScatterMax, DeviceType,
                     Kokkos::Experimental::ScatterAtomic>
-    : Max<ValueType, Kokkos::DefaultExecutionSpace> {
+    : Max<ValueType, DeviceType> {
  public:
   KOKKOS_FORCEINLINE_FUNCTION ScatterValue(ValueType& value_in)
-      : Max<ValueType, Kokkos::DefaultExecutionSpace>(value_in) {}
+      : Max<ValueType, DeviceType>(value_in) {}
 
   KOKKOS_FORCEINLINE_FUNCTION
   void atomic_max(ValueType& dest, const ValueType& src) const {
@@ -558,6 +575,8 @@ struct ReduceDuplicatesBase {
       Kokkos::Profiling::beginParallelFor(std::string("reduce_") + name, 0,
                                           &kpID);
     }
+#else
+    (void)name;
 #endif
     typedef RangePolicy<ExecSpace, size_t> policy_type;
     typedef Kokkos::Impl::ParallelFor<Derived, policy_type> closure_type;
@@ -584,8 +603,9 @@ struct ReduceDuplicates
       : Base(src_in, dst_in, stride_in, start_in, n_in, name) {}
   KOKKOS_FORCEINLINE_FUNCTION void operator()(size_t i) const {
     for (size_t j = Base::start; j < Base::n; ++j) {
-      ScatterValue<ValueType, Op, Kokkos::Experimental::ScatterNonAtomic> sv(
-          Base::dst[i]);
+      ScatterValue<ValueType, Op, ExecSpace,
+                   Kokkos::Experimental::ScatterNonAtomic>
+          sv(Base::dst[i]);
       sv.update(Base::src[i + Base::stride * j]);
     }
   }
@@ -607,6 +627,8 @@ struct ResetDuplicatesBase {
       Kokkos::Profiling::beginParallelFor(std::string("reduce_") + name, 0,
                                           &kpID);
     }
+#else
+    (void)name;
 #endif
     typedef RangePolicy<ExecSpace, size_t> policy_type;
     typedef Kokkos::Impl::ParallelFor<Derived, policy_type> closure_type;
@@ -630,8 +652,9 @@ struct ResetDuplicates : public ResetDuplicatesBase<ExecSpace, ValueType, Op> {
   ResetDuplicates(ValueType* data_in, size_t size_in, std::string const& name)
       : Base(data_in, size_in, name) {}
   KOKKOS_FORCEINLINE_FUNCTION void operator()(size_t i) const {
-    ScatterValue<ValueType, Op, Kokkos::Experimental::ScatterNonAtomic> sv(
-        Base::data[i]);
+    ScatterValue<ValueType, Op, ExecSpace,
+                 Kokkos::Experimental::ScatterNonAtomic>
+        sv(Base::data[i]);
     sv.reset();
   }
 };
@@ -644,35 +667,40 @@ namespace Kokkos {
 namespace Experimental {
 
 template <typename DataType,
-          typename Layout    = Kokkos::DefaultExecutionSpace::array_layout,
-          typename ExecSpace = Kokkos::DefaultExecutionSpace,
-          int Op             = ScatterSum,
-          int duplication =
-              Kokkos::Impl::Experimental::DefaultDuplication<ExecSpace>::value,
+          typename Layout     = Kokkos::DefaultExecutionSpace::array_layout,
+          typename DeviceType = Kokkos::DefaultExecutionSpace,
+          int Op              = ScatterSum,
+          int duplication     = Kokkos::Impl::Experimental::DefaultDuplication<
+              typename DeviceType::execution_space>::value,
           int contribution = Kokkos::Impl::Experimental::DefaultContribution<
-              ExecSpace, duplication>::value>
+              typename DeviceType::execution_space, duplication>::value>
 class ScatterView;
 
-template <typename DataType, int Op, typename ExecSpace, typename Layout,
+template <typename DataType, int Op, typename DeviceType, typename Layout,
           int duplication, int contribution, int override_contribution>
 class ScatterAccess;
 
 // non-duplicated implementation
-template <typename DataType, int Op, typename ExecSpace, typename Layout,
+template <typename DataType, int Op, typename DeviceType, typename Layout,
           int contribution>
-class ScatterView<DataType, Layout, ExecSpace, Op, ScatterNonDuplicated,
+class ScatterView<DataType, Layout, DeviceType, Op, ScatterNonDuplicated,
                   contribution> {
  public:
-  typedef Kokkos::View<DataType, Layout, ExecSpace> original_view_type;
+  using execution_space = typename DeviceType::execution_space;
+  using memory_space    = typename DeviceType::memory_space;
+  using device_type     = Kokkos::Device<execution_space, memory_space>;
+  typedef Kokkos::View<DataType, Layout, device_type> original_view_type;
   typedef typename original_view_type::value_type original_value_type;
   typedef typename original_view_type::reference_type original_reference_type;
-  friend class ScatterAccess<DataType, Op, ExecSpace, Layout,
+  friend class ScatterAccess<DataType, Op, DeviceType, Layout,
                              ScatterNonDuplicated, contribution,
                              ScatterNonAtomic>;
-  friend class ScatterAccess<DataType, Op, ExecSpace, Layout,
+  friend class ScatterAccess<DataType, Op, DeviceType, Layout,
                              ScatterNonDuplicated, contribution, ScatterAtomic>;
+  template <class, class, class, int, int, int>
+  friend class ScatterView;
 
-  ScatterView() {}
+  ScatterView() = default;
 
   template <typename RT, typename... RP>
   ScatterView(View<RT, RP...> const& original_view)
@@ -682,13 +710,26 @@ class ScatterView<DataType, Layout, ExecSpace, Op, ScatterNonDuplicated,
   ScatterView(std::string const& name, Dims... dims)
       : internal_view(name, dims...) {}
 
+  template <typename OtherDataType, typename OtherDeviceType>
+  KOKKOS_FUNCTION ScatterView(
+      const ScatterView<OtherDataType, Layout, OtherDeviceType, Op,
+                        ScatterNonDuplicated, contribution>& other_view)
+      : internal_view(other_view.internal_view) {}
+
+  template <typename OtherDataType, typename OtherDeviceType>
+  KOKKOS_FUNCTION void operator=(
+      const ScatterView<OtherDataType, Layout, OtherDeviceType, Op,
+                        ScatterNonDuplicated, contribution>& other_view) {
+    internal_view = other_view.internal_view;
+  }
+
   template <int override_contrib = contribution>
   KOKKOS_FORCEINLINE_FUNCTION
-      ScatterAccess<DataType, Op, ExecSpace, Layout, ScatterNonDuplicated,
+      ScatterAccess<DataType, Op, DeviceType, Layout, ScatterNonDuplicated,
                     contribution, override_contrib>
       access() const {
-    return ScatterAccess<DataType, Op, ExecSpace, Layout, ScatterNonDuplicated,
-                         contribution, override_contrib>{*this};
+    return ScatterAccess<DataType, Op, DeviceType, Layout, ScatterNonDuplicated,
+                         contribution, override_contrib>(*this);
   }
 
   original_view_type subview() const { return internal_view; }
@@ -700,18 +741,17 @@ class ScatterView<DataType, Layout, ExecSpace, Op, ScatterNonDuplicated,
                   "ScatterView contribute destination has different layout");
     static_assert(
         Kokkos::Impl::VerifyExecutionCanAccessMemorySpace<
-            typename ExecSpace::memory_space,
-            typename dest_type::memory_space>::value,
+            memory_space, typename dest_type::memory_space>::value,
         "ScatterView contribute destination memory space not accessible");
     if (dest.data() == internal_view.data()) return;
-    Kokkos::Impl::Experimental::ReduceDuplicates<ExecSpace, original_value_type,
-                                                 Op>(
+    Kokkos::Impl::Experimental::ReduceDuplicates<execution_space,
+                                                 original_value_type, Op>(
         internal_view.data(), dest.data(), 0, 0, 1, internal_view.label());
   }
 
   void reset() {
-    Kokkos::Impl::Experimental::ResetDuplicates<ExecSpace, original_value_type,
-                                                Op>(
+    Kokkos::Impl::Experimental::ResetDuplicates<execution_space,
+                                                original_value_type, Op>(
         internal_view.data(), internal_view.size(), internal_view.label());
   }
   template <typename DT, typename... RP>
@@ -742,17 +782,17 @@ class ScatterView<DataType, Layout, ExecSpace, Op, ScatterNonDuplicated,
   internal_view_type internal_view;
 };
 
-template <typename DataType, int Op, typename ExecSpace, typename Layout,
+template <typename DataType, int Op, typename DeviceType, typename Layout,
           int contribution, int override_contribution>
-class ScatterAccess<DataType, Op, ExecSpace, Layout, ScatterNonDuplicated,
+class ScatterAccess<DataType, Op, DeviceType, Layout, ScatterNonDuplicated,
                     contribution, override_contribution> {
  public:
-  typedef ScatterView<DataType, Layout, ExecSpace, Op, ScatterNonDuplicated,
+  typedef ScatterView<DataType, Layout, DeviceType, Op, ScatterNonDuplicated,
                       contribution>
       view_type;
   typedef typename view_type::original_value_type original_value_type;
-  typedef Kokkos::Impl::Experimental::ScatterValue<original_value_type, Op,
-                                                   override_contribution>
+  typedef Kokkos::Impl::Experimental::ScatterValue<
+      original_value_type, Op, DeviceType, override_contribution>
       value_type;
 
   KOKKOS_INLINE_FUNCTION
@@ -760,9 +800,8 @@ class ScatterAccess<DataType, Op, ExecSpace, Layout, ScatterNonDuplicated,
 
   KOKKOS_INLINE_FUNCTION
   ScatterAccess(view_type const& view_in) : view(view_in) {}
-
-  KOKKOS_INLINE_FUNCTION
-  ~ScatterAccess() {}
+  KOKKOS_DEFAULTED_FUNCTION
+  ~ScatterAccess() = default;
 
   template <typename... Args>
   KOKKOS_FORCEINLINE_FUNCTION value_type operator()(Args... args) const {
@@ -786,26 +825,47 @@ class ScatterAccess<DataType, Op, ExecSpace, Layout, ScatterNonDuplicated,
 // LayoutLeft and LayoutRight are different enough that we'll just specialize
 // each
 
-template <typename DataType, int Op, typename ExecSpace, int contribution>
-class ScatterView<DataType, Kokkos::LayoutRight, ExecSpace, Op,
+template <typename DataType, int Op, typename DeviceType, int contribution>
+class ScatterView<DataType, Kokkos::LayoutRight, DeviceType, Op,
                   ScatterDuplicated, contribution> {
  public:
-  typedef Kokkos::View<DataType, Kokkos::LayoutRight, ExecSpace>
+  using execution_space = typename DeviceType::execution_space;
+  using memory_space    = typename DeviceType::memory_space;
+  using device_type     = Kokkos::Device<execution_space, memory_space>;
+  typedef Kokkos::View<DataType, Kokkos::LayoutRight, device_type>
       original_view_type;
   typedef typename original_view_type::value_type original_value_type;
   typedef typename original_view_type::reference_type original_reference_type;
-  friend class ScatterAccess<DataType, Op, ExecSpace, Kokkos::LayoutRight,
+  friend class ScatterAccess<DataType, Op, DeviceType, Kokkos::LayoutRight,
                              ScatterDuplicated, contribution, ScatterNonAtomic>;
-  friend class ScatterAccess<DataType, Op, ExecSpace, Kokkos::LayoutRight,
+  friend class ScatterAccess<DataType, Op, DeviceType, Kokkos::LayoutRight,
                              ScatterDuplicated, contribution, ScatterAtomic>;
+  template <class, class, class, int, int, int>
+  friend class ScatterView;
+
   typedef typename Kokkos::Impl::Experimental::DuplicatedDataType<
       DataType, Kokkos::LayoutRight>
       data_type_info;
   typedef typename data_type_info::value_type internal_data_type;
-  typedef Kokkos::View<internal_data_type, Kokkos::LayoutRight, ExecSpace>
+  typedef Kokkos::View<internal_data_type, Kokkos::LayoutRight, device_type>
       internal_view_type;
 
-  ScatterView() {}
+  ScatterView() = default;
+
+  template <typename OtherDataType, typename OtherDeviceType>
+  KOKKOS_FUNCTION ScatterView(
+      const ScatterView<OtherDataType, Kokkos::LayoutRight, OtherDeviceType, Op,
+                        ScatterDuplicated, contribution>& other_view)
+      : unique_token(other_view.unique_token),
+        internal_view(other_view.internal_view) {}
+
+  template <typename OtherDataType, typename OtherDeviceType>
+  KOKKOS_FUNCTION void operator=(
+      const ScatterView<OtherDataType, Kokkos::LayoutRight, OtherDeviceType, Op,
+                        ScatterDuplicated, contribution>& other_view) {
+    unique_token  = other_view.unique_token;
+    internal_view = other_view.internal_view;
+  }
 
   template <typename RT, typename... RP>
   ScatterView(View<RT, RP...> const& original_view)
@@ -855,12 +915,12 @@ class ScatterView<DataType, Kokkos::LayoutRight, ExecSpace, Op,
 
   template <int override_contribution = contribution>
   KOKKOS_FORCEINLINE_FUNCTION
-      ScatterAccess<DataType, Op, ExecSpace, Kokkos::LayoutRight,
+      ScatterAccess<DataType, Op, DeviceType, Kokkos::LayoutRight,
                     ScatterDuplicated, contribution, override_contribution>
       access() const {
-    return ScatterAccess<DataType, Op, ExecSpace, Kokkos::LayoutRight,
+    return ScatterAccess<DataType, Op, DeviceType, Kokkos::LayoutRight,
                          ScatterDuplicated, contribution,
-                         override_contribution>{*this};
+                         override_contribution>(*this);
   }
 
   typename Kokkos::Impl::Experimental::Slice<Kokkos::LayoutRight,
@@ -880,20 +940,19 @@ class ScatterView<DataType, Kokkos::LayoutRight, ExecSpace, Op,
                   "ScatterView deep_copy destination has different layout");
     static_assert(
         Kokkos::Impl::VerifyExecutionCanAccessMemorySpace<
-            typename ExecSpace::memory_space,
-            typename dest_type::memory_space>::value,
+            memory_space, typename dest_type::memory_space>::value,
         "ScatterView deep_copy destination memory space not accessible");
     bool is_equal = (dest.data() == internal_view.data());
     size_t start  = is_equal ? 1 : 0;
-    Kokkos::Impl::Experimental::ReduceDuplicates<ExecSpace, original_value_type,
-                                                 Op>(
+    Kokkos::Impl::Experimental::ReduceDuplicates<execution_space,
+                                                 original_value_type, Op>(
         internal_view.data(), dest.data(), internal_view.stride(0), start,
         internal_view.extent(0), internal_view.label());
   }
 
   void reset() {
-    Kokkos::Impl::Experimental::ResetDuplicates<ExecSpace, original_value_type,
-                                                Op>(
+    Kokkos::Impl::Experimental::ResetDuplicates<execution_space,
+                                                original_value_type, Op>(
         internal_view.data(), internal_view.size(), internal_view.label());
   }
   template <typename DT, typename... RP>
@@ -902,8 +961,8 @@ class ScatterView<DataType, Kokkos::LayoutRight, ExecSpace, Op,
       reset();
       return;
     }
-    Kokkos::Impl::Experimental::ResetDuplicates<ExecSpace, original_value_type,
-                                                Op>(
+    Kokkos::Impl::Experimental::ResetDuplicates<execution_space,
+                                                original_value_type, Op>(
         internal_view.data() + view.size(), internal_view.size() - view.size(),
         internal_view.label());
   }
@@ -931,33 +990,39 @@ class ScatterView<DataType, Kokkos::LayoutRight, ExecSpace, Op,
 
  protected:
   typedef Kokkos::Experimental::UniqueToken<
-      ExecSpace, Kokkos::Experimental::UniqueTokenScope::Global>
+      execution_space, Kokkos::Experimental::UniqueTokenScope::Global>
       unique_token_type;
 
   unique_token_type unique_token;
   internal_view_type internal_view;
 };
 
-template <typename DataType, int Op, typename ExecSpace, int contribution>
-class ScatterView<DataType, Kokkos::LayoutLeft, ExecSpace, Op,
+template <typename DataType, int Op, typename DeviceType, int contribution>
+class ScatterView<DataType, Kokkos::LayoutLeft, DeviceType, Op,
                   ScatterDuplicated, contribution> {
  public:
-  typedef Kokkos::View<DataType, Kokkos::LayoutLeft, ExecSpace>
+  using execution_space = typename DeviceType::execution_space;
+  using memory_space    = typename DeviceType::memory_space;
+  using device_type     = Kokkos::Device<execution_space, memory_space>;
+  typedef Kokkos::View<DataType, Kokkos::LayoutLeft, device_type>
       original_view_type;
   typedef typename original_view_type::value_type original_value_type;
   typedef typename original_view_type::reference_type original_reference_type;
-  friend class ScatterAccess<DataType, Op, ExecSpace, Kokkos::LayoutLeft,
+  friend class ScatterAccess<DataType, Op, DeviceType, Kokkos::LayoutLeft,
                              ScatterDuplicated, contribution, ScatterNonAtomic>;
-  friend class ScatterAccess<DataType, Op, ExecSpace, Kokkos::LayoutLeft,
+  friend class ScatterAccess<DataType, Op, DeviceType, Kokkos::LayoutLeft,
                              ScatterDuplicated, contribution, ScatterAtomic>;
+  template <class, class, class, int, int, int>
+  friend class ScatterView;
+
   typedef typename Kokkos::Impl::Experimental::DuplicatedDataType<
       DataType, Kokkos::LayoutLeft>
       data_type_info;
   typedef typename data_type_info::value_type internal_data_type;
-  typedef Kokkos::View<internal_data_type, Kokkos::LayoutLeft, ExecSpace>
+  typedef Kokkos::View<internal_data_type, Kokkos::LayoutLeft, device_type>
       internal_view_type;
 
-  ScatterView() {}
+  ScatterView() = default;
 
   template <typename RT, typename... RP>
   ScatterView(View<RT, RP...> const& original_view) : unique_token() {
@@ -1011,14 +1076,29 @@ class ScatterView<DataType, Kokkos::LayoutLeft, ExecSpace, Op,
     reset();
   }
 
+  template <typename OtherDataType, typename OtherDeviceType>
+  KOKKOS_FUNCTION ScatterView(
+      const ScatterView<OtherDataType, Kokkos::LayoutLeft, OtherDeviceType, Op,
+                        ScatterDuplicated, contribution>& other_view)
+      : unique_token(other_view.unique_token),
+        internal_view(other_view.internal_view) {}
+
+  template <typename OtherDataType, typename OtherDeviceType>
+  KOKKOS_FUNCTION void operator=(
+      const ScatterView<OtherDataType, Kokkos::LayoutLeft, OtherDeviceType, Op,
+                        ScatterDuplicated, contribution>& other_view) {
+    unique_token  = other_view.unique_token;
+    internal_view = other_view.internal_view;
+  }
+
   template <int override_contribution = contribution>
   KOKKOS_FORCEINLINE_FUNCTION
-      ScatterAccess<DataType, Op, ExecSpace, Kokkos::LayoutLeft,
+      ScatterAccess<DataType, Op, DeviceType, Kokkos::LayoutLeft,
                     ScatterDuplicated, contribution, override_contribution>
       access() const {
-    return ScatterAccess<DataType, Op, ExecSpace, Kokkos::LayoutLeft,
+    return ScatterAccess<DataType, Op, DeviceType, Kokkos::LayoutLeft,
                          ScatterDuplicated, contribution,
-                         override_contribution>{*this};
+                         override_contribution>(*this);
   }
 
   typename Kokkos::Impl::Experimental::Slice<Kokkos::LayoutLeft,
@@ -1042,22 +1122,21 @@ class ScatterView<DataType, Kokkos::LayoutLeft, ExecSpace, Op,
                   "ScatterView deep_copy destination has different layout");
     static_assert(
         Kokkos::Impl::VerifyExecutionCanAccessMemorySpace<
-            typename ExecSpace::memory_space,
-            typename dest_type::memory_space>::value,
+            memory_space, typename dest_type::memory_space>::value,
         "ScatterView deep_copy destination memory space not accessible");
     auto extent   = internal_view.extent(internal_view_type::rank - 1);
     bool is_equal = (dest.data() == internal_view.data());
     size_t start  = is_equal ? 1 : 0;
-    Kokkos::Impl::Experimental::ReduceDuplicates<ExecSpace, original_value_type,
-                                                 Op>(
+    Kokkos::Impl::Experimental::ReduceDuplicates<execution_space,
+                                                 original_value_type, Op>(
         internal_view.data(), dest.data(),
         internal_view.stride(internal_view_type::rank - 1), start, extent,
         internal_view.label());
   }
 
   void reset() {
-    Kokkos::Impl::Experimental::ResetDuplicates<ExecSpace, original_value_type,
-                                                Op>(
+    Kokkos::Impl::Experimental::ResetDuplicates<execution_space,
+                                                original_value_type, Op>(
         internal_view.data(), internal_view.size(), internal_view.label());
   }
   template <typename DT, typename... RP>
@@ -1066,8 +1145,8 @@ class ScatterView<DataType, Kokkos::LayoutLeft, ExecSpace, Op,
       reset();
       return;
     }
-    Kokkos::Impl::Experimental::ResetDuplicates<ExecSpace, original_value_type,
-                                                Op>(
+    Kokkos::Impl::Experimental::ResetDuplicates<execution_space,
+                                                original_value_type, Op>(
         internal_view.data() + view.size(), internal_view.size() - view.size(),
         internal_view.label());
   }
@@ -1103,7 +1182,7 @@ class ScatterView<DataType, Kokkos::LayoutLeft, ExecSpace, Op,
 
  protected:
   typedef Kokkos::Experimental::UniqueToken<
-      ExecSpace, Kokkos::Experimental::UniqueTokenScope::Global>
+      execution_space, Kokkos::Experimental::UniqueTokenScope::Global>
       unique_token_type;
 
   unique_token_type unique_token;
@@ -1120,17 +1199,17 @@ class ScatterView<DataType, Kokkos::LayoutLeft, ExecSpace, Op,
    ScatterAccess serves as a non-const object on the stack which can store the
    thread ID */
 
-template <typename DataType, int Op, typename ExecSpace, typename Layout,
+template <typename DataType, int Op, typename DeviceType, typename Layout,
           int contribution, int override_contribution>
-class ScatterAccess<DataType, Op, ExecSpace, Layout, ScatterDuplicated,
+class ScatterAccess<DataType, Op, DeviceType, Layout, ScatterDuplicated,
                     contribution, override_contribution> {
  public:
-  typedef ScatterView<DataType, Layout, ExecSpace, Op, ScatterDuplicated,
+  typedef ScatterView<DataType, Layout, DeviceType, Op, ScatterDuplicated,
                       contribution>
       view_type;
   typedef typename view_type::original_value_type original_value_type;
-  typedef Kokkos::Impl::Experimental::ScatterValue<original_value_type, Op,
-                                                   override_contribution>
+  typedef Kokkos::Impl::Experimental::ScatterValue<
+      original_value_type, Op, DeviceType, override_contribution>
       value_type;
 
   KOKKOS_FORCEINLINE_FUNCTION
@@ -1184,7 +1263,7 @@ template <int Op = Kokkos::Experimental::ScatterSum, int duplication = -1,
           int contribution = -1, typename RT, typename... RP>
 ScatterView<
     RT, typename ViewTraits<RT, RP...>::array_layout,
-    typename ViewTraits<RT, RP...>::execution_space,
+    typename ViewTraits<RT, RP...>::device_type,
     Op
     /* just setting defaults if not specified... things got messy because the
        view type does not come before the duplication/contribution settings in
diff --git a/kokkos/containers/src/Kokkos_StaticCrsGraph.hpp b/kokkos/containers/src/Kokkos_StaticCrsGraph.hpp
index ee250f9f2..c11413d62 100644
--- a/kokkos/containers/src/Kokkos_StaticCrsGraph.hpp
+++ b/kokkos/containers/src/Kokkos_StaticCrsGraph.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -112,7 +112,7 @@ struct StaticCrsGraphBalancerFunctor {
         }
       } else {
         if ((count >= (current_block + 1) * cost_per_workset) ||
-            (iRow + 2 == row_offsets.extent(0))) {
+            (iRow + 2 == int_type(row_offsets.extent(0)))) {
           if (end_block > current_block + 1) {
             int_type num_block                   = end_block - current_block;
             row_block_offsets(current_block + 1) = iRow;
@@ -358,8 +358,8 @@ class StaticCrsGraph {
   /**  \brief  Destroy this view of the array.
    *           If the last view then allocated memory is deallocated.
    */
-  KOKKOS_INLINE_FUNCTION
-  ~StaticCrsGraph() {}
+  KOKKOS_DEFAULTED_FUNCTION
+  ~StaticCrsGraph() = default;
 
   /**  \brief  Return number of rows in the graph
    */
@@ -396,7 +396,7 @@ class StaticCrsGraph {
     const data_type count = static_cast<data_type>(row_map(i + 1) - start);
 
     if (count == 0) {
-      return GraphRowViewConst<StaticCrsGraph>(NULL, 1, 0);
+      return GraphRowViewConst<StaticCrsGraph>(nullptr, 1, 0);
     } else {
       return GraphRowViewConst<StaticCrsGraph>(entries, 1, count, start);
     }
@@ -414,9 +414,10 @@ class StaticCrsGraph {
         row_map_type, View<size_type*, array_layout, device_type> >
         partitioner(row_map, block_offsets, fix_cost_per_row, num_blocks);
 
-    Kokkos::parallel_for(Kokkos::RangePolicy<execution_space>(0, numRows()),
+    Kokkos::parallel_for("Kokkos::StaticCrsGraph::create_block_partitioning",
+                         Kokkos::RangePolicy<execution_space>(0, numRows()),
                          partitioner);
-    Kokkos::fence();
+    typename device_type::execution_space().fence();
 
     row_block_offsets = block_offsets;
   }
@@ -522,7 +523,8 @@ DataType maximum_entry(const StaticCrsGraph<DataType, Arg1Type, Arg2Type,
   typedef Impl::StaticCrsGraphMaximumEntry<GraphType> FunctorType;
 
   DataType result = 0;
-  Kokkos::parallel_reduce(graph.entries.extent(0), FunctorType(graph), result);
+  Kokkos::parallel_reduce("Kokkos::maximum_entry", graph.entries.extent(0),
+                          FunctorType(graph), result);
   return result;
 }
 
diff --git a/kokkos/containers/src/Kokkos_UnorderedMap.hpp b/kokkos/containers/src/Kokkos_UnorderedMap.hpp
index 298d5f6c3..6f0434dd0 100644
--- a/kokkos/containers/src/Kokkos_UnorderedMap.hpp
+++ b/kokkos/containers/src/Kokkos_UnorderedMap.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -100,7 +100,7 @@ class UnorderedMapInsertResult {
   KOKKOS_FORCEINLINE_FUNCTION
   bool existing() const { return (m_status & EXISTING); }
 
-  /// Did the map fail to insert the key due to insufficent capacity
+  /// Did the map fail to insert the key due to insufficient capacity
   KOKKOS_FORCEINLINE_FUNCTION
   bool failed() const { return m_index == UnorderedMapInvalidIndex; }
 
@@ -201,9 +201,9 @@ class UnorderedMapInsertResult {
 ///
 template <typename Key, typename Value,
           typename Device = Kokkos::DefaultExecutionSpace,
-          typename Hasher = pod_hash<typename Impl::remove_const<Key>::type>,
+          typename Hasher = pod_hash<typename std::remove_const<Key>::type>,
           typename EqualTo =
-              pod_equal_to<typename Impl::remove_const<Key>::type> >
+              pod_equal_to<typename std::remove_const<Key>::type> >
 class UnorderedMap {
  private:
   typedef typename ViewTraits<Key, Device, void, void>::host_mirror_space
@@ -215,13 +215,13 @@ class UnorderedMap {
 
   // key_types
   typedef Key declared_key_type;
-  typedef typename Impl::remove_const<declared_key_type>::type key_type;
-  typedef typename Impl::add_const<key_type>::type const_key_type;
+  typedef typename std::remove_const<declared_key_type>::type key_type;
+  typedef typename std::add_const<key_type>::type const_key_type;
 
   // value_types
   typedef Value declared_value_type;
-  typedef typename Impl::remove_const<declared_value_type>::type value_type;
-  typedef typename Impl::add_const<value_type>::type const_value_type;
+  typedef typename std::remove_const<declared_value_type>::type value_type;
+  typedef typename std::add_const<value_type>::type const_value_type;
 
   typedef Device device_type;
   typedef typename Device::execution_space execution_space;
@@ -296,25 +296,13 @@ class UnorderedMap {
   //! \name Public member functions
   //@{
 
-  UnorderedMap()
-      : m_bounded_insert(),
-        m_hasher(),
-        m_equal_to(),
-        m_size(),
-        m_available_indexes(),
-        m_hash_lists(),
-        m_next_index(),
-        m_keys(),
-        m_values(),
-        m_scalars() {}
-
   /// \brief Constructor
   ///
   /// \param capacity_hint [in] Initial guess of how many unique keys will be
   /// inserted into the map \param hash [in] Hasher function for \c Key
   /// instances.  The
   ///   default value usually suffices.
-  UnorderedMap(size_type capacity_hint, hasher_type hasher = hasher_type(),
+  UnorderedMap(size_type capacity_hint = 0, hasher_type hasher = hasher_type(),
                equal_to_type equal_to = equal_to_type())
       : m_bounded_insert(true),
         m_hasher(hasher),
@@ -689,7 +677,7 @@ class UnorderedMap {
   template <typename SKey, typename SValue>
   UnorderedMap(
       UnorderedMap<SKey, SValue, Device, Hasher, EqualTo> const &src,
-      typename Impl::enable_if<
+      typename std::enable_if<
           Impl::UnorderedMapCanAssign<declared_key_type, declared_value_type,
                                       SKey, SValue>::value,
           int>::type = 0)
@@ -705,7 +693,7 @@ class UnorderedMap {
         m_scalars(src.m_scalars) {}
 
   template <typename SKey, typename SValue>
-  typename Impl::enable_if<
+  typename std::enable_if<
       Impl::UnorderedMapCanAssign<declared_key_type, declared_value_type, SKey,
                                   SValue>::value,
       declared_map_type &>::type
@@ -724,9 +712,9 @@ class UnorderedMap {
   }
 
   template <typename SKey, typename SValue, typename SDevice>
-  typename Impl::enable_if<
-      std::is_same<typename Impl::remove_const<SKey>::type, key_type>::value &&
-      std::is_same<typename Impl::remove_const<SValue>::type,
+  typename std::enable_if<
+      std::is_same<typename std::remove_const<SKey>::type, key_type>::value &&
+      std::is_same<typename std::remove_const<SValue>::type,
                    value_type>::value>::type
   create_copy_view(
       UnorderedMap<SKey, SValue, SDevice, Hasher, EqualTo> const &src) {
diff --git a/kokkos/containers/src/Kokkos_Vector.hpp b/kokkos/containers/src/Kokkos_Vector.hpp
index da1996283..02c3e44fc 100644
--- a/kokkos/containers/src/Kokkos_Vector.hpp
+++ b/kokkos/containers/src/Kokkos_Vector.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -109,7 +109,7 @@ class vector : public DualView<Scalar*, LayoutLeft, Arg1Type> {
   void resize(size_t n, const Scalar& val) { assign(n, val); }
 
   void assign(size_t n, const Scalar& val) {
-    /* Resize if necessary (behavour of std:vector) */
+    /* Resize if necessary (behavior of std:vector) */
 
     if (n > span()) DV::resize(size_t(n * _extra_storage));
     _size = n;
@@ -118,12 +118,12 @@ class vector : public DualView<Scalar*, LayoutLeft, Arg1Type> {
 
     if (DV::template need_sync<typename DV::t_dev::device_type>()) {
       set_functor_host f(DV::h_view, val);
-      parallel_for(n, f);
+      parallel_for("Kokkos::vector::assign", n, f);
       typename DV::t_host::execution_space().fence();
       DV::template modify<typename DV::t_host::device_type>();
     } else {
       set_functor f(DV::d_view, val);
-      parallel_for(n, f);
+      parallel_for("Kokkos::vector::assign", n, f);
       typename DV::t_dev::execution_space().fence();
       DV::template modify<typename DV::t_dev::device_type>();
     }
@@ -234,7 +234,7 @@ class vector : public DualView<Scalar*, LayoutLeft, Arg1Type> {
 
   const_reference back() const { return DV::h_view(_size - 1); }
 
-  /* std::algorithms wich work originally with iterators, here they are
+  /* std::algorithms which work originally with iterators, here they are
    * implemented as member functions */
 
   size_t lower_bound(const size_t& start, const size_t& theEnd,
diff --git a/kokkos/containers/src/impl/Kokkos_Bitset_impl.hpp b/kokkos/containers/src/impl/Kokkos_Bitset_impl.hpp
index 22b8a541d..6fd4319a8 100644
--- a/kokkos/containers/src/impl/Kokkos_Bitset_impl.hpp
+++ b/kokkos/containers/src/impl/Kokkos_Bitset_impl.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -77,7 +77,8 @@ struct BitsetCount {
 
   size_type apply() const {
     size_type count = 0u;
-    parallel_reduce(m_bitset.m_blocks.extent(0), *this, count);
+    parallel_reduce("Kokkos::Impl::BitsetCount::apply",
+                    m_bitset.m_blocks.extent(0), *this, count);
     return count;
   }
 
diff --git a/kokkos/containers/src/impl/Kokkos_Functional_impl.hpp b/kokkos/containers/src/impl/Kokkos_Functional_impl.hpp
index 6e0f9f10b..6ba67766a 100644
--- a/kokkos/containers/src/impl/Kokkos_Functional_impl.hpp
+++ b/kokkos/containers/src/impl/Kokkos_Functional_impl.hpp
@@ -23,10 +23,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/containers/src/impl/Kokkos_StaticCrsGraph_factory.hpp b/kokkos/containers/src/impl/Kokkos_StaticCrsGraph_factory.hpp
index ce6c4b637..a5fb9990f 100644
--- a/kokkos/containers/src/impl/Kokkos_StaticCrsGraph_factory.hpp
+++ b/kokkos/containers/src/impl/Kokkos_StaticCrsGraph_factory.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -58,8 +58,8 @@ inline typename StaticCrsGraph<DataType, Arg1Type, Arg2Type, SizeType,
 create_mirror_view(
     const StaticCrsGraph<DataType, Arg1Type, Arg2Type, SizeType, Arg3Type>&
         view,
-    typename Impl::enable_if<ViewTraits<DataType, Arg1Type, Arg2Type,
-                                        Arg3Type>::is_hostspace>::type* = 0) {
+    typename std::enable_if<ViewTraits<DataType, Arg1Type, Arg2Type,
+                                       Arg3Type>::is_hostspace>::type* = 0) {
   return view;
 }
 #else
@@ -70,8 +70,8 @@ inline typename StaticCrsGraph<DataType, Arg1Type, Arg2Type, Arg3Type,
 create_mirror_view(
     const StaticCrsGraph<DataType, Arg1Type, Arg2Type, Arg3Type, SizeType>&
         view,
-    typename Impl::enable_if<ViewTraits<DataType, Arg1Type, Arg2Type,
-                                        Arg3Type>::is_hostspace>::type* = 0) {
+    typename std::enable_if<ViewTraits<DataType, Arg1Type, Arg2Type,
+                                       Arg3Type>::is_hostspace>::type* = 0) {
   return view;
 }
 #endif
@@ -128,8 +128,8 @@ inline typename StaticCrsGraph<DataType, Arg1Type, Arg2Type, SizeType,
 create_mirror_view(
     const StaticCrsGraph<DataType, Arg1Type, Arg2Type, SizeType, Arg3Type>&
         view,
-    typename Impl::enable_if<!ViewTraits<DataType, Arg1Type, Arg2Type,
-                                         Arg3Type>::is_hostspace>::type* = 0)
+    typename std::enable_if<!ViewTraits<DataType, Arg1Type, Arg2Type,
+                                        Arg3Type>::is_hostspace>::type* = 0)
 #else
 template <class DataType, class Arg1Type, class Arg2Type, class Arg3Type,
           typename SizeType>
@@ -138,8 +138,8 @@ inline typename StaticCrsGraph<DataType, Arg1Type, Arg2Type, Arg3Type,
 create_mirror_view(
     const StaticCrsGraph<DataType, Arg1Type, Arg2Type, Arg3Type, SizeType>&
         view,
-    typename Impl::enable_if<!ViewTraits<DataType, Arg1Type, Arg2Type,
-                                         Arg3Type>::is_hostspace>::type* = 0)
+    typename std::enable_if<!ViewTraits<DataType, Arg1Type, Arg2Type,
+                                        Arg3Type>::is_hostspace>::type* = 0)
 #endif
 {
   return create_mirror(view);
diff --git a/kokkos/containers/src/impl/Kokkos_UnorderedMap_impl.cpp b/kokkos/containers/src/impl/Kokkos_UnorderedMap_impl.cpp
index 59f1a1e4c..e10e256b6 100644
--- a/kokkos/containers/src/impl/Kokkos_UnorderedMap_impl.cpp
+++ b/kokkos/containers/src/impl/Kokkos_UnorderedMap_impl.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/containers/src/impl/Kokkos_UnorderedMap_impl.hpp b/kokkos/containers/src/impl/Kokkos_UnorderedMap_impl.hpp
index 623cf3855..813936575 100644
--- a/kokkos/containers/src/impl/Kokkos_UnorderedMap_impl.hpp
+++ b/kokkos/containers/src/impl/Kokkos_UnorderedMap_impl.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -71,7 +71,10 @@ struct UnorderedMapRehash {
   UnorderedMapRehash(map_type const& dst, const_map_type const& src)
       : m_dst(dst), m_src(src) {}
 
-  void apply() const { parallel_for(m_src.capacity(), *this); }
+  void apply() const {
+    parallel_for("Kokkos::Impl::UnorderedMapRehash::apply", m_src.capacity(),
+                 *this);
+  }
 
   KOKKOS_INLINE_FUNCTION
   void operator()(size_type i) const {
@@ -91,7 +94,10 @@ struct UnorderedMapErase {
 
   UnorderedMapErase(map_type const& map) : m_map(map) {}
 
-  void apply() const { parallel_for(m_map.m_hash_lists.extent(0), *this); }
+  void apply() const {
+    parallel_for("Kokkos::Impl::UnorderedMapErase::apply",
+                 m_map.m_hash_lists.extent(0), *this);
+  }
 
   KOKKOS_INLINE_FUNCTION
   void operator()(size_type i) const {
@@ -152,7 +158,10 @@ struct UnorderedMapHistogram {
         m_distance("UnorderedMap Histogram"),
         m_block_distance("UnorderedMap Histogram") {}
 
-  void calculate() { parallel_for(m_map.m_hash_lists.extent(0), *this); }
+  void calculate() {
+    parallel_for("Kokkos::Impl::UnorderedMapHistogram::calculate",
+                 m_map.m_hash_lists.extent(0), *this);
+  }
 
   void clear() {
     Kokkos::deep_copy(m_length, 0);
@@ -229,7 +238,10 @@ struct UnorderedMapPrint {
 
   UnorderedMapPrint(map_type const& map) : m_map(map) {}
 
-  void apply() { parallel_for(m_map.m_hash_lists.extent(0), *this); }
+  void apply() {
+    parallel_for("Kokkos::Impl::UnorderedMapPrint::apply",
+                 m_map.m_hash_lists.extent(0), *this);
+  }
 
   KOKKOS_INLINE_FUNCTION
   void operator()(size_type i) const {
@@ -245,21 +257,22 @@ struct UnorderedMapPrint {
 };
 
 template <typename DKey, typename DValue, typename SKey, typename SValue>
-struct UnorderedMapCanAssign : public false_ {};
+struct UnorderedMapCanAssign : public std::false_type {};
 
 template <typename Key, typename Value>
-struct UnorderedMapCanAssign<Key, Value, Key, Value> : public true_ {};
+struct UnorderedMapCanAssign<Key, Value, Key, Value> : public std::true_type {};
 
 template <typename Key, typename Value>
-struct UnorderedMapCanAssign<const Key, Value, Key, Value> : public true_ {};
+struct UnorderedMapCanAssign<const Key, Value, Key, Value>
+    : public std::true_type {};
 
 template <typename Key, typename Value>
 struct UnorderedMapCanAssign<const Key, const Value, Key, Value>
-    : public true_ {};
+    : public std::true_type {};
 
 template <typename Key, typename Value>
 struct UnorderedMapCanAssign<const Key, const Value, const Key, Value>
-    : public true_ {};
+    : public std::true_type {};
 
 }  // namespace Impl
 }  // namespace Kokkos
diff --git a/kokkos/containers/unit_tests/CMakeLists.txt b/kokkos/containers/unit_tests/CMakeLists.txt
index a83ab1293..448cdf438 100644
--- a/kokkos/containers/unit_tests/CMakeLists.txt
+++ b/kokkos/containers/unit_tests/CMakeLists.txt
@@ -3,7 +3,7 @@ KOKKOS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
 KOKKOS_INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR})
 KOKKOS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../src )
 
-foreach(Tag Threads;Serial;OpenMP;HPX;Cuda)
+foreach(Tag Threads;Serial;OpenMP;HPX;Cuda;HIP)
   # Because there is always an exception to the rule
   if(Tag STREQUAL "Threads")
     set(DEVICE "PTHREAD")
@@ -13,23 +13,31 @@ foreach(Tag Threads;Serial;OpenMP;HPX;Cuda)
   string(TOLOWER ${Tag} dir)
   # Add test for that backend if it is enabled
   if(Kokkos_ENABLE_${DEVICE})
-    KOKKOS_ADD_EXECUTABLE_AND_TEST(
-      UnitTest_${Tag}
-      SOURCES
-        UnitTestMain.cpp
-        ${dir}/Test${Tag}_BitSet.cpp
-        ${dir}/Test${Tag}_DualView.cpp
-        ${dir}/Test${Tag}_DynamicView.cpp
-        ${dir}/Test${Tag}_DynRankViewAPI_generic.cpp
-        ${dir}/Test${Tag}_DynRankViewAPI_rank12345.cpp
-        ${dir}/Test${Tag}_DynRankViewAPI_rank67.cpp
-        ${dir}/Test${Tag}_ErrorReporter.cpp
-        ${dir}/Test${Tag}_OffsetView.cpp
-        ${dir}/Test${Tag}_ScatterView.cpp
-        ${dir}/Test${Tag}_StaticCrsGraph.cpp
-        ${dir}/Test${Tag}_UnorderedMap.cpp
-        ${dir}/Test${Tag}_Vector.cpp
-        ${dir}/Test${Tag}_ViewCtorPropEmbeddedDim.cpp
+    set(UnitTestSources UnitTestMain.cpp)
+    set(dir ${CMAKE_CURRENT_BINARY_DIR}/${dir})
+    file(MAKE_DIRECTORY ${dir})
+    foreach(Name
+        Bitset
+        DualView
+        DynamicView
+        DynViewAPI_generic
+        DynViewAPI_rank12345
+        DynViewAPI_rank67
+        ErrorReporter
+        OffsetView
+        ScatterView
+        StaticCrsGraph
+        UnorderedMap
+        Vector
+        ViewCtorPropEmbeddedDim
+        )
+      set(file ${dir}/Test${Tag}_${Name}.cpp)
+      file(WRITE ${file}
+          "#include <Test${Tag}_Category.hpp>\n"
+          "#include <Test${Name}.hpp>\n"
       )
+      list(APPEND UnitTestSources ${file})
+    endforeach()
+    KOKKOS_ADD_EXECUTABLE_AND_TEST(UnitTest_${Tag} SOURCES ${UnitTestSources})
   endif()
 endforeach()
diff --git a/kokkos/containers/unit_tests/Makefile b/kokkos/containers/unit_tests/Makefile
index a7e0233f8..308b5aa8b 100644
--- a/kokkos/containers/unit_tests/Makefile
+++ b/kokkos/containers/unit_tests/Makefile
@@ -9,7 +9,7 @@ vpath %.cpp ${KOKKOS_PATH}/containers/unit_tests/serial
 vpath %.cpp ${KOKKOS_PATH}/containers/unit_tests/threads
 vpath %.cpp ${KOKKOS_PATH}/containers/unit_tests/rocm
 vpath %.cpp ${KOKKOS_PATH}/containers/unit_tests/cuda
-
+vpath %.cpp ${CURDIR}
 default: build_all
 	echo "End Build"
 
@@ -31,14 +31,24 @@ KOKKOS_CXXFLAGS += -I$(GTEST_PATH) -I${KOKKOS_PATH}/containers/unit_tests
 TEST_TARGETS =
 TARGETS =
 
+TESTS = Bitset DualView DynamicView DynViewAPI_generic DynViewAPI_rank12345 DynViewAPI_rank67 ErrorReporter OffsetView ScatterView StaticCrsGraph UnorderedMap Vector ViewCtorPropEmbeddedDim
+tmp := $(foreach device, $(KOKKOS_DEVICELIST), \
+  tmp2 := $(foreach test, $(TESTS), \
+    $(if $(filter Test$(device)_$(test).cpp, $(shell ls Test$(device)_$(test).cpp 2>/dev/null)),,\
+      $(shell echo "\#include<Test"$(device)"_Category.hpp>" > Test$(device)_$(test).cpp); \
+      $(shell echo "\#include<Test"$(test)".hpp>" >> Test$(device)_$(test).cpp); \
+     )\
+  ) \
+)
+
 ifeq ($(KOKKOS_INTERNAL_USE_CUDA), 1)
 	OBJ_CUDA = UnitTestMain.o gtest-all.o
-	OBJ_CUDA += TestCuda_BitSet.o
+	OBJ_CUDA += TestCuda_Bitset.o
 	OBJ_CUDA += TestCuda_DualView.o
 	OBJ_CUDA += TestCuda_DynamicView.o
-	OBJ_CUDA += TestCuda_DynRankViewAPI_generic.o
-	OBJ_CUDA += TestCuda_DynRankViewAPI_rank12345.o
-	OBJ_CUDA += TestCuda_DynRankViewAPI_rank67.o
+	OBJ_CUDA += TestCuda_DynViewAPI_generic.o
+	OBJ_CUDA += TestCuda_DynViewAPI_rank12345.o
+	OBJ_CUDA += TestCuda_DynViewAPI_rank67.o
 	OBJ_CUDA += TestCuda_ErrorReporter.o
 	OBJ_CUDA += TestCuda_OffsetView.o
 	OBJ_CUDA += TestCuda_ScatterView.o
@@ -50,33 +60,14 @@ ifeq ($(KOKKOS_INTERNAL_USE_CUDA), 1)
 	TEST_TARGETS += test-cuda
 endif
 
-ifeq ($(KOKKOS_INTERNAL_USE_ROCM), 1)
-	OBJ_ROCM = UnitTestMain.o gtest-all.o
-	OBJ_ROCM += TestROCm_BitSet.o
-	OBJ_ROCM += TestROCm_DualView.o
-	OBJ_ROCM += TestROCm_DynamicView.o
-	OBJ_ROCM += TestROCm_DynRankViewAPI_generic.o
-	OBJ_ROCM += TestROCm_DynRankViewAPI_rank12345.o
-	OBJ_ROCM += TestROCm_DynRankViewAPI_rank67.o
-	OBJ_ROCM += TestROCm_ErrorReporter.o
-	OBJ_ROCM += TestROCm_OffsetView.o
-	OBJ_ROCM += TestROCm_ScatterView.o
-	OBJ_ROCM += TestROCm_StaticCrsGraph.o
-	OBJ_ROCM += TestROCm_UnorderedMap.o
-	OBJ_ROCM += TestROCm_Vector.o
-	OBJ_ROCM += TestROCm_ViewCtorPropEmbeddedDim.o
-	TARGETS += KokkosContainers_UnitTest_ROCm
-	TEST_TARGETS += test-rocm
-endif
-
 ifeq ($(KOKKOS_INTERNAL_USE_PTHREADS), 1)
 	OBJ_THREADS = UnitTestMain.o gtest-all.o
-	OBJ_THREADS += TestThreads_BitSet.o
+	OBJ_THREADS += TestThreads_Bitset.o
 	OBJ_THREADS += TestThreads_DualView.o
 	OBJ_THREADS += TestThreads_DynamicView.o
-	OBJ_THREADS += TestThreads_DynRankViewAPI_generic.o
-	OBJ_THREADS += TestThreads_DynRankViewAPI_rank12345.o
-	OBJ_THREADS += TestThreads_DynRankViewAPI_rank67.o
+	OBJ_THREADS += TestThreads_DynViewAPI_generic.o
+	OBJ_THREADS += TestThreads_DynViewAPI_rank12345.o
+	OBJ_THREADS += TestThreads_DynViewAPI_rank67.o
 	OBJ_THREADS += TestThreads_ErrorReporter.o
 	OBJ_THREADS += TestThreads_OffsetView.o
 	OBJ_THREADS += TestThreads_ScatterView.o
@@ -90,12 +81,12 @@ endif
 
 ifeq ($(KOKKOS_INTERNAL_USE_OPENMP), 1)
 	OBJ_OPENMP = UnitTestMain.o gtest-all.o
-	OBJ_OPENMP += TestOpenMP_BitSet.o
+	OBJ_OPENMP += TestOpenMP_Bitset.o
 	OBJ_OPENMP += TestOpenMP_DualView.o
 	OBJ_OPENMP += TestOpenMP_DynamicView.o
-	OBJ_OPENMP += TestOpenMP_DynRankViewAPI_generic.o
-	OBJ_OPENMP += TestOpenMP_DynRankViewAPI_rank12345.o
-	OBJ_OPENMP += TestOpenMP_DynRankViewAPI_rank67.o
+	OBJ_OPENMP += TestOpenMP_DynViewAPI_generic.o
+	OBJ_OPENMP += TestOpenMP_DynViewAPI_rank12345.o
+	OBJ_OPENMP += TestOpenMP_DynViewAPI_rank67.o
 	OBJ_OPENMP += TestOpenMP_ErrorReporter.o
 	OBJ_OPENMP += TestOpenMP_OffsetView.o
 	OBJ_OPENMP += TestOpenMP_ScatterView.o
@@ -109,12 +100,12 @@ endif
 
 ifeq ($(KOKKOS_INTERNAL_USE_HPX), 1)
 	OBJ_HPX = UnitTestMain.o gtest-all.o
-	OBJ_HPX += TestHPX_BitSet.o
+	OBJ_HPX += TestHPX_Bitset.o
 	OBJ_HPX += TestHPX_DualView.o
 	OBJ_HPX += TestHPX_DynamicView.o
-	OBJ_HPX += TestHPX_DynRankViewAPI_generic.o
-	OBJ_HPX += TestHPX_DynRankViewAPI_rank12345.o
-	OBJ_HPX += TestHPX_DynRankViewAPI_rank67.o
+	OBJ_HPX += TestHPX_DynViewAPI_generic.o
+	OBJ_HPX += TestHPX_DynViewAPI_rank12345.o
+	OBJ_HPX += TestHPX_DynViewAPI_rank67.o
 	OBJ_HPX += TestHPX_ErrorReporter.o
 	OBJ_HPX += TestHPX_OffsetView.o
 	OBJ_HPX += TestHPX_ScatterView.o
@@ -128,12 +119,12 @@ endif
 
 ifeq ($(KOKKOS_INTERNAL_USE_SERIAL), 1)
 	OBJ_SERIAL = UnitTestMain.o gtest-all.o
-	OBJ_SERIAL += TestSerial_BitSet.o
+	OBJ_SERIAL += TestSerial_Bitset.o
 	OBJ_SERIAL += TestSerial_DualView.o
 	OBJ_SERIAL += TestSerial_DynamicView.o
-	OBJ_SERIAL += TestSerial_DynRankViewAPI_generic.o
-	OBJ_SERIAL += TestSerial_DynRankViewAPI_rank12345.o
-	OBJ_SERIAL += TestSerial_DynRankViewAPI_rank67.o
+	OBJ_SERIAL += TestSerial_DynViewAPI_generic.o
+	OBJ_SERIAL += TestSerial_DynViewAPI_rank12345.o
+	OBJ_SERIAL += TestSerial_DynViewAPI_rank67.o
 	OBJ_SERIAL += TestSerial_ErrorReporter.o
 	OBJ_SERIAL += TestSerial_OffsetView.o
 	OBJ_SERIAL += TestSerial_ScatterView.o
@@ -148,9 +139,6 @@ endif
 KokkosContainers_UnitTest_Cuda: $(OBJ_CUDA) $(KOKKOS_LINK_DEPENDS)
 	$(LINK) $(EXTRA_PATH) $(OBJ_CUDA) $(KOKKOS_LIBS) $(LIB) $(KOKKOS_LDFLAGS) $(LDFLAGS) -o KokkosContainers_UnitTest_Cuda
 
-KokkosContainers_UnitTest_ROCm: $(OBJ_ROCM) $(KOKKOS_LINK_DEPENDS)
-	$(LINK) $(EXTRA_PATH) $(OBJ_ROCM) $(KOKKOS_LIBS) $(LIB) $(KOKKOS_LDFLAGS) $(LDFLAGS) -o KokkosContainers_UnitTest_ROCm
-
 KokkosContainers_UnitTest_Threads: $(OBJ_THREADS) $(KOKKOS_LINK_DEPENDS)
 	$(LINK) $(EXTRA_PATH) $(OBJ_THREADS) $(KOKKOS_LIBS) $(LIB) $(KOKKOS_LDFLAGS) $(LDFLAGS) -o KokkosContainers_UnitTest_Threads
 
@@ -166,9 +154,6 @@ KokkosContainers_UnitTest_Serial: $(OBJ_SERIAL) $(KOKKOS_LINK_DEPENDS)
 test-cuda: KokkosContainers_UnitTest_Cuda
 	./KokkosContainers_UnitTest_Cuda
 
-test-rocm: KokkosContainers_UnitTest_ROCm
-	./KokkosContainers_UnitTest_ROCm
-
 test-threads: KokkosContainers_UnitTest_Threads
 	./KokkosContainers_UnitTest_Threads
 
@@ -186,7 +171,7 @@ build_all: $(TARGETS)
 test: $(TEST_TARGETS)
 
 clean: kokkos-clean
-	rm -f *.o $(TARGETS)
+	rm -f *.o $(TARGETS) *.cpp
 
 # Compilation rules
 
diff --git a/kokkos/containers/unit_tests/TestBitset.hpp b/kokkos/containers/unit_tests/TestBitset.hpp
index 31a1e3ddb..661a1365c 100644
--- a/kokkos/containers/unit_tests/TestBitset.hpp
+++ b/kokkos/containers/unit_tests/TestBitset.hpp
@@ -23,10 +23,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -192,7 +192,7 @@ void test_bitset() {
 
     bitset_type bitset(test_sizes[i]);
 
-    // std::cout << "  Check inital count " << std::endl;
+    // std::cout << "  Check initial count " << std::endl;
     // nothing should be set
     {
       Impl::TestBitsetTest<bitset_type> f(bitset);
@@ -253,8 +253,10 @@ void test_bitset() {
   }
 }
 
+// FIXME_HIP deadlock
+#ifndef KOKKOS_ENABLE_HIP
 TEST(TEST_CATEGORY, bitset) { test_bitset<TEST_EXECSPACE>(); }
-
+#endif
 }  // namespace Test
 
 #endif  // KOKKOS_TEST_BITSET_HPP
diff --git a/kokkos/containers/unit_tests/cuda/TestCuda_Category.hpp b/kokkos/containers/unit_tests/TestCuda_Category.hpp
similarity index 93%
rename from kokkos/containers/unit_tests/cuda/TestCuda_Category.hpp
rename to kokkos/containers/unit_tests/TestCuda_Category.hpp
index 14fc58b11..50935d7a3 100644
--- a/kokkos/containers/unit_tests/cuda/TestCuda_Category.hpp
+++ b/kokkos/containers/unit_tests/TestCuda_Category.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/containers/unit_tests/TestDualView.hpp b/kokkos/containers/unit_tests/TestDualView.hpp
index 5755f1e9b..665f25115 100644
--- a/kokkos/containers/unit_tests/TestDualView.hpp
+++ b/kokkos/containers/unit_tests/TestDualView.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -67,11 +67,17 @@ struct test_dualview_combinations {
   Scalar result;
 
   template <typename ViewType>
-  Scalar run_me(unsigned int n, unsigned int m) {
+  Scalar run_me(unsigned int n, unsigned int m, bool with_init) {
     if (n < 10) n = 10;
     if (m < 3) m = 3;
-    ViewType a("A", n, m);
 
+    ViewType a;
+
+    if (with_init) {
+      a = ViewType("A", n, m);
+    } else {
+      a = ViewType(Kokkos::ViewAllocateWithoutInitializing("A"), n, m);
+    }
     Kokkos::deep_copy(a.d_view, 1);
 
     a.template modify<typename ViewType::execution_space>();
@@ -96,9 +102,9 @@ struct test_dualview_combinations {
     return count - a.d_view.extent(0) * a.d_view.extent(1) - 2 - 4 - 3 * 2;
   }
 
-  test_dualview_combinations(unsigned int size) {
+  test_dualview_combinations(unsigned int size, bool with_init) {
     result = run_me<Kokkos::DualView<Scalar**, Kokkos::LayoutLeft, Device> >(
-        size, 3);
+        size, 3, with_init);
   }
 };
 
@@ -124,18 +130,25 @@ struct test_dual_view_deep_copy {
   typedef Device execution_space;
 
   template <typename ViewType>
-  void run_me() {
-    const unsigned int n         = 10;
-    const unsigned int m         = 5;
-    const unsigned int sum_total = n * m;
-
-    ViewType a("A", n, m);
-    ViewType b("B", n, m);
+  void run_me(int n, const int m, const bool use_templ_sync) {
+    ViewType a, b;
+    if (n >= 0) {
+      a = ViewType("A", n, m);
+      b = ViewType("B", n, m);
+    } else {
+      n = 0;
+    }
+    const scalar_type sum_total = scalar_type(n * m);
 
     Kokkos::deep_copy(a.d_view, 1);
 
-    a.template modify<typename ViewType::execution_space>();
-    a.template sync<typename ViewType::host_mirror_space>();
+    if (use_templ_sync) {
+      a.template modify<typename ViewType::execution_space>();
+      a.template sync<typename ViewType::host_mirror_space>();
+    } else {
+      a.modify_device();
+      a.sync_host();
+    }
 
     // Check device view is initialized as expected
     scalar_type a_d_sum = 0;
@@ -159,7 +172,11 @@ struct test_dual_view_deep_copy {
 
     // Test deep_copy
     Kokkos::deep_copy(b, a);
-    b.template sync<typename ViewType::host_mirror_space>();
+    if (use_templ_sync) {
+      b.template sync<typename ViewType::host_mirror_space>();
+    } else {
+      b.sync_host();
+    }
 
     // Perform same checks on b as done on a
     // Check device view is initialized as expected
@@ -183,6 +200,145 @@ struct test_dual_view_deep_copy {
   }  // end run_me
 
   test_dual_view_deep_copy() {
+    run_me<Kokkos::DualView<Scalar**, Kokkos::LayoutLeft, Device> >(10, 5,
+                                                                    true);
+    run_me<Kokkos::DualView<Scalar**, Kokkos::LayoutLeft, Device> >(10, 5,
+                                                                    false);
+    // Test zero length but allocated (a.d_view.data!=nullptr but
+    // a.d_view.span()==0)
+    run_me<Kokkos::DualView<Scalar**, Kokkos::LayoutLeft, Device> >(0, 5, true);
+    run_me<Kokkos::DualView<Scalar**, Kokkos::LayoutLeft, Device> >(0, 5,
+                                                                    false);
+
+    // Test default constructed view
+    run_me<Kokkos::DualView<Scalar**, Kokkos::LayoutLeft, Device> >(-1, 5,
+                                                                    true);
+    run_me<Kokkos::DualView<Scalar**, Kokkos::LayoutLeft, Device> >(-1, 5,
+                                                                    false);
+  }
+};
+
+template <typename Scalar, class Device>
+struct test_dualview_resize {
+  typedef Scalar scalar_type;
+  typedef Device execution_space;
+
+  template <typename ViewType>
+  void run_me() {
+    const unsigned int n      = 10;
+    const unsigned int m      = 5;
+    const unsigned int factor = 2;
+
+    ViewType a("A", n, m);
+    Kokkos::deep_copy(a.d_view, 1);
+
+    /* Covers case "Resize on Device" */
+    a.modify_device();
+    Kokkos::resize(a, factor * n, factor * m);
+    ASSERT_EQ(a.extent(0), n * factor);
+    ASSERT_EQ(a.extent(1), m * factor);
+
+    Kokkos::deep_copy(a.d_view, 1);
+    a.sync_host();
+
+    // Check device view is initialized as expected
+    scalar_type a_d_sum = 0;
+    // Execute on the execution_space associated with t_dev's memory space
+    typedef typename ViewType::t_dev::memory_space::execution_space
+        t_dev_exec_space;
+    Kokkos::parallel_reduce(
+        Kokkos::RangePolicy<t_dev_exec_space>(0, a.d_view.extent(0)),
+        SumViewEntriesFunctor<scalar_type, typename ViewType::t_dev>(a.d_view),
+        a_d_sum);
+
+    // Check host view is synced as expected
+    scalar_type a_h_sum = 0;
+    for (size_t i = 0; i < a.h_view.extent(0); ++i)
+      for (size_t j = 0; j < a.h_view.extent(1); ++j) {
+        a_h_sum += a.h_view(i, j);
+      }
+
+    // Check
+    ASSERT_EQ(a_h_sum, a_d_sum);
+    ASSERT_EQ(a_h_sum, a.extent(0) * a.extent(1));
+
+    /* Covers case "Resize on Host" */
+    a.modify_host();
+
+    Kokkos::resize(a, n / factor, m / factor);
+    ASSERT_EQ(a.extent(0), n / factor);
+    ASSERT_EQ(a.extent(1), m / factor);
+
+    a.sync_device();
+
+    // Check device view is initialized as expected
+    a_d_sum = 0;
+    // Execute on the execution_space associated with t_dev's memory space
+    typedef typename ViewType::t_dev::memory_space::execution_space
+        t_dev_exec_space;
+    Kokkos::parallel_reduce(
+        Kokkos::RangePolicy<t_dev_exec_space>(0, a.d_view.extent(0)),
+        SumViewEntriesFunctor<scalar_type, typename ViewType::t_dev>(a.d_view),
+        a_d_sum);
+
+    // Check host view is synced as expected
+    a_h_sum = 0;
+    for (size_t i = 0; i < a.h_view.extent(0); ++i)
+      for (size_t j = 0; j < a.h_view.extent(1); ++j) {
+        a_h_sum += a.h_view(i, j);
+      }
+
+    // Check
+    ASSERT_EQ(a_h_sum, a.extent(0) * a.extent(1));
+    ASSERT_EQ(a_h_sum, a_d_sum);
+
+  }  // end run_me
+
+  test_dualview_resize() {
+    run_me<Kokkos::DualView<Scalar**, Kokkos::LayoutLeft, Device> >();
+  }
+};
+
+template <typename Scalar, class Device>
+struct test_dualview_realloc {
+  typedef Scalar scalar_type;
+  typedef Device execution_space;
+
+  template <typename ViewType>
+  void run_me() {
+    const unsigned int n = 10;
+    const unsigned int m = 5;
+
+    ViewType a("A", n, m);
+    Kokkos::realloc(a, n, m);
+
+    Kokkos::deep_copy(a.d_view, 1);
+    a.modify_device();
+    a.sync_host();
+
+    // Check device view is initialized as expected
+    scalar_type a_d_sum = 0;
+    // Execute on the execution_space associated with t_dev's memory space
+    typedef typename ViewType::t_dev::memory_space::execution_space
+        t_dev_exec_space;
+    Kokkos::parallel_reduce(
+        Kokkos::RangePolicy<t_dev_exec_space>(0, a.d_view.extent(0)),
+        SumViewEntriesFunctor<scalar_type, typename ViewType::t_dev>(a.d_view),
+        a_d_sum);
+
+    // Check host view is synced as expected
+    scalar_type a_h_sum = 0;
+    for (size_t i = 0; i < a.h_view.extent(0); ++i)
+      for (size_t j = 0; j < a.h_view.extent(1); ++j) {
+        a_h_sum += a.h_view(i, j);
+      }
+
+    // Check
+    ASSERT_EQ(a_h_sum, a.extent(0) * a.extent(1));
+    ASSERT_EQ(a_h_sum, a_d_sum);
+  }  // end run_me
+
+  test_dualview_realloc() {
     run_me<Kokkos::DualView<Scalar**, Kokkos::LayoutLeft, Device> >();
   }
 };
@@ -190,8 +346,8 @@ struct test_dual_view_deep_copy {
 }  // namespace Impl
 
 template <typename Scalar, typename Device>
-void test_dualview_combinations(unsigned int size) {
-  Impl::test_dualview_combinations<Scalar, Device> test(size);
+void test_dualview_combinations(unsigned int size, bool with_init) {
+  Impl::test_dualview_combinations<Scalar, Device> test(size, with_init);
   ASSERT_EQ(test.result, 0);
 }
 
@@ -200,8 +356,22 @@ void test_dualview_deep_copy() {
   Impl::test_dual_view_deep_copy<Scalar, Device>();
 }
 
+template <typename Scalar, typename Device>
+void test_dualview_realloc() {
+  Impl::test_dualview_realloc<Scalar, Device>();
+}
+
+template <typename Scalar, typename Device>
+void test_dualview_resize() {
+  Impl::test_dualview_resize<Scalar, Device>();
+}
+
 TEST(TEST_CATEGORY, dualview_combination) {
-  test_dualview_combinations<int, TEST_EXECSPACE>(10);
+  test_dualview_combinations<int, TEST_EXECSPACE>(10, true);
+}
+
+TEST(TEST_CATEGORY, dualview_combinations_without_init) {
+  test_dualview_combinations<int, TEST_EXECSPACE>(10, false);
 }
 
 TEST(TEST_CATEGORY, dualview_deep_copy) {
@@ -209,6 +379,14 @@ TEST(TEST_CATEGORY, dualview_deep_copy) {
   test_dualview_deep_copy<double, TEST_EXECSPACE>();
 }
 
+TEST(TEST_CATEGORY, dualview_realloc) {
+  test_dualview_realloc<int, TEST_EXECSPACE>();
+}
+
+TEST(TEST_CATEGORY, dualview_resize) {
+  test_dualview_resize<int, TEST_EXECSPACE>();
+}
+
 }  // namespace Test
 
-#endif  // KOKKOS_TEST_UNORDERED_MAP_HPP
+#endif  // KOKKOS_TEST_DUALVIEW_HPP
diff --git a/kokkos/containers/unit_tests/TestDynViewAPI.hpp b/kokkos/containers/unit_tests/TestDynViewAPI.hpp
index fcd1d373c..5c1d0229c 100644
--- a/kokkos/containers/unit_tests/TestDynViewAPI.hpp
+++ b/kokkos/containers/unit_tests/TestDynViewAPI.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -706,8 +706,6 @@ class TestDynViewAPI {
 
   typedef typename View0::host_mirror_space host_view_space;
 
-  TestDynViewAPI() {}
-
   static void run_tests() {
     run_test_resize_realloc();
     run_test_mirror();
@@ -1078,12 +1076,12 @@ class TestDynViewAPI {
     ASSERT_TRUE(Kokkos::is_dyn_rank_view<dView0>::value);
     ASSERT_FALSE(Kokkos::is_dyn_rank_view<Kokkos::View<double> >::value);
 
-    ASSERT_TRUE(dx.data() == 0);  // Okay with UVM
-    ASSERT_TRUE(dy.data() == 0);  // Okay with UVM
-    ASSERT_TRUE(dz.data() == 0);  // Okay with UVM
-    ASSERT_TRUE(hx.data() == 0);
-    ASSERT_TRUE(hy.data() == 0);
-    ASSERT_TRUE(hz.data() == 0);
+    ASSERT_TRUE(dx.data() == nullptr);  // Okay with UVM
+    ASSERT_TRUE(dy.data() == nullptr);  // Okay with UVM
+    ASSERT_TRUE(dz.data() == nullptr);  // Okay with UVM
+    ASSERT_TRUE(hx.data() == nullptr);
+    ASSERT_TRUE(hy.data() == nullptr);
+    ASSERT_TRUE(hz.data() == nullptr);
     ASSERT_EQ(dx.extent(0), 0u);  // Okay with UVM
     ASSERT_EQ(dy.extent(0), 0u);  // Okay with UVM
     ASSERT_EQ(dz.extent(0), 0u);  // Okay with UVM
@@ -1154,11 +1152,11 @@ class TestDynViewAPI {
 
     ASSERT_EQ(dx.use_count(), size_t(2));
 
-    ASSERT_FALSE(dx.data() == 0);
-    ASSERT_FALSE(const_dx.data() == 0);
-    ASSERT_FALSE(unmanaged_dx.data() == 0);
-    ASSERT_FALSE(unmanaged_from_ptr_dx.data() == 0);
-    ASSERT_FALSE(dy.data() == 0);
+    ASSERT_FALSE(dx.data() == nullptr);
+    ASSERT_FALSE(const_dx.data() == nullptr);
+    ASSERT_FALSE(unmanaged_dx.data() == nullptr);
+    ASSERT_FALSE(unmanaged_from_ptr_dx.data() == nullptr);
+    ASSERT_FALSE(dy.data() == nullptr);
     ASSERT_NE(dx, dy);
 
     ASSERT_EQ(dx.extent(0), unsigned(N0));
@@ -1318,17 +1316,17 @@ class TestDynViewAPI {
     ASSERT_NE(dx, dz);
 
     dx = dView0();
-    ASSERT_TRUE(dx.data() == 0);
-    ASSERT_FALSE(dy.data() == 0);
-    ASSERT_FALSE(dz.data() == 0);
+    ASSERT_TRUE(dx.data() == nullptr);
+    ASSERT_FALSE(dy.data() == nullptr);
+    ASSERT_FALSE(dz.data() == nullptr);
     dy = dView0();
-    ASSERT_TRUE(dx.data() == 0);
-    ASSERT_TRUE(dy.data() == 0);
-    ASSERT_FALSE(dz.data() == 0);
+    ASSERT_TRUE(dx.data() == nullptr);
+    ASSERT_TRUE(dy.data() == nullptr);
+    ASSERT_FALSE(dz.data() == nullptr);
     dz = dView0();
-    ASSERT_TRUE(dx.data() == 0);
-    ASSERT_TRUE(dy.data() == 0);
-    ASSERT_TRUE(dz.data() == 0);
+    ASSERT_TRUE(dx.data() == nullptr);
+    ASSERT_TRUE(dy.data() == nullptr);
+    ASSERT_TRUE(dz.data() == nullptr);
 
     // View - DynRankView Interoperability tests
     // deep_copy from view to dynrankview
diff --git a/kokkos/containers/unit_tests/TestDynViewAPI_generic.hpp b/kokkos/containers/unit_tests/TestDynViewAPI_generic.hpp
index e37ea11bb..b3e2812b4 100644
--- a/kokkos/containers/unit_tests/TestDynViewAPI_generic.hpp
+++ b/kokkos/containers/unit_tests/TestDynViewAPI_generic.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -44,7 +44,10 @@
 
 #include <TestDynViewAPI.hpp>
 namespace Test {
+// FIXME_HIP attempt to access inaccessible memory space
+#ifndef KOKKOS_ENABLE_HIP
 TEST(TEST_CATEGORY, dyn_rank_view_api_generic) {
   TestDynViewAPI<double, TEST_EXECSPACE>::run_tests();
 }
+#endif
 }  // namespace Test
diff --git a/kokkos/containers/unit_tests/TestDynViewAPI_rank12345.hpp b/kokkos/containers/unit_tests/TestDynViewAPI_rank12345.hpp
index 308854bd8..86a2e4e95 100644
--- a/kokkos/containers/unit_tests/TestDynViewAPI_rank12345.hpp
+++ b/kokkos/containers/unit_tests/TestDynViewAPI_rank12345.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -45,7 +45,10 @@
 #include <TestDynViewAPI.hpp>
 
 namespace Test {
+// FIXME_HIP failing with wrong value
+#ifndef KOKKOS_ENABLE_HIP
 TEST(TEST_CATEGORY, dyn_rank_view_api_operator_rank12345) {
   TestDynViewAPI<double, TEST_EXECSPACE>::run_operator_test_rank12345();
 }
+#endif
 }  // namespace Test
diff --git a/kokkos/containers/unit_tests/TestDynViewAPI_rank67.hpp b/kokkos/containers/unit_tests/TestDynViewAPI_rank67.hpp
index 2e349ba38..eb8df60a8 100644
--- a/kokkos/containers/unit_tests/TestDynViewAPI_rank67.hpp
+++ b/kokkos/containers/unit_tests/TestDynViewAPI_rank67.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/containers/unit_tests/TestDynamicView.hpp b/kokkos/containers/unit_tests/TestDynamicView.hpp
index a4976297c..8eabbcb37 100644
--- a/kokkos/containers/unit_tests/TestDynamicView.hpp
+++ b/kokkos/containers/unit_tests/TestDynamicView.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -79,7 +79,6 @@ struct TestDynamicView {
       ASSERT_EQ(da.size(), da_size);
 
 #if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
-#if !defined(KOKKOS_ENABLE_CUDA) || (8000 <= CUDA_VERSION)
       Kokkos::parallel_for(
           Kokkos::RangePolicy<execution_space>(0, da_size),
           KOKKOS_LAMBDA(const int i) { da(i) = Scalar(i); });
@@ -93,7 +92,6 @@ struct TestDynamicView {
           result_sum);
 
       ASSERT_EQ(result_sum, (value_type)(da_size * (da_size - 1) / 2));
-#endif
 #endif
 
       // add 3x more entries i.e. 4x larger than previous size
@@ -103,7 +101,6 @@ struct TestDynamicView {
       ASSERT_EQ(da.size(), da_resize);
 
 #if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
-#if !defined(KOKKOS_ENABLE_CUDA) || (8000 <= CUDA_VERSION)
       Kokkos::parallel_for(
           Kokkos::RangePolicy<execution_space>(da_size, da_resize),
           KOKKOS_LAMBDA(const int i) { da(i) = Scalar(i); });
@@ -118,7 +115,6 @@ struct TestDynamicView {
 
       ASSERT_EQ(new_result_sum + result_sum,
                 (value_type)(da_resize * (da_resize - 1) / 2));
-#endif
 #endif
     }  // end scope
 
@@ -135,7 +131,6 @@ struct TestDynamicView {
       ASSERT_EQ(da.size(), da_size);
 
 #if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
-#if !defined(KOKKOS_ENABLE_CUDA) || (8000 <= CUDA_VERSION)
       Kokkos::parallel_for(
           Kokkos::RangePolicy<execution_space>(0, da_size),
           KOKKOS_LAMBDA(const int i) { da(i) = Scalar(i); });
@@ -149,7 +144,6 @@ struct TestDynamicView {
           result_sum);
 
       ASSERT_EQ(result_sum, (value_type)(da_size * (da_size - 1) / 2));
-#endif
 #endif
 
       // add 3x more entries i.e. 4x larger than previous size
@@ -159,7 +153,6 @@ struct TestDynamicView {
       ASSERT_EQ(da.size(), da_resize);
 
 #if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
-#if !defined(KOKKOS_ENABLE_CUDA) || (8000 <= CUDA_VERSION)
       Kokkos::parallel_for(
           Kokkos::RangePolicy<execution_space>(da_size, da_resize),
           KOKKOS_LAMBDA(const int i) { da(i) = Scalar(i); });
@@ -174,7 +167,6 @@ struct TestDynamicView {
 
       ASSERT_EQ(new_result_sum + result_sum,
                 (value_type)(da_resize * (da_resize - 1) / 2));
-#endif
 #endif
     }  // end scope
 
@@ -191,7 +183,6 @@ struct TestDynamicView {
       ASSERT_EQ(da.size(), da_size);
 
 #if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
-#if !defined(KOKKOS_ENABLE_CUDA) || (8000 <= CUDA_VERSION)
       Kokkos::parallel_for(
           Kokkos::RangePolicy<execution_space>(0, da_size),
           KOKKOS_LAMBDA(const int i) { da(i) = Scalar(i); });
@@ -205,7 +196,6 @@ struct TestDynamicView {
           result_sum);
 
       ASSERT_EQ(result_sum, (value_type)(da_size * (da_size - 1) / 2));
-#endif
 #endif
 
       // remove the final 3/4 entries i.e. first 1/4 remain
@@ -214,7 +204,6 @@ struct TestDynamicView {
       ASSERT_EQ(da.size(), da_resize);
 
 #if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
-#if !defined(KOKKOS_ENABLE_CUDA) || (8000 <= CUDA_VERSION)
       Kokkos::parallel_for(
           Kokkos::RangePolicy<execution_space>(0, da_resize),
           KOKKOS_LAMBDA(const int i) { da(i) = Scalar(i); });
@@ -228,7 +217,6 @@ struct TestDynamicView {
           new_result_sum);
 
       ASSERT_EQ(new_result_sum, (value_type)(da_resize * (da_resize - 1) / 2));
-#endif
 #endif
     }  // end scope
   }
diff --git a/kokkos/containers/unit_tests/TestErrorReporter.hpp b/kokkos/containers/unit_tests/TestErrorReporter.hpp
index 6f7be142a..318132500 100644
--- a/kokkos/containers/unit_tests/TestErrorReporter.hpp
+++ b/kokkos/containers/unit_tests/TestErrorReporter.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -50,9 +50,13 @@
 #include <Kokkos_Core.hpp>
 #include <Kokkos_ErrorReporter.hpp>
 
+#ifndef M_PI
+#define M_PI 3.14159265358979323846
+#endif
+
 namespace Test {
 
-// Just save the data in the report.  Informative text goies in the
+// Just save the data in the report.  Informative text goes in the
 // operator<<(..).
 template <typename DataType1, typename DataType2, typename DataType3>
 struct ThreeValReport {
@@ -85,7 +89,7 @@ struct ErrorReporterDriverBase {
       error_reporter_type;
   error_reporter_type m_errorReporter;
 
-  ErrorReporterDriverBase(int reporter_capacity, int test_size)
+  ErrorReporterDriverBase(int reporter_capacity, int /*test_size*/)
       : m_errorReporter(reporter_capacity) {}
 
   KOKKOS_INLINE_FUNCTION bool error_condition(const int work_idx) const {
@@ -176,7 +180,8 @@ struct ErrorReporterDriver : public ErrorReporterDriverBase<DeviceType> {
   }
 };
 
-#if defined(KOKKOS_CLASS_LAMBDA)
+#if defined(KOKKOS_CLASS_LAMBDA) && \
+    (!defined(KOKKOS_ENABLE_CUDA) || defined(KOKKOS_ENABLE_CUDA_LAMBDA))
 template <typename DeviceType>
 struct ErrorReporterDriverUseLambda
     : public ErrorReporterDriverBase<DeviceType> {
@@ -225,7 +230,8 @@ struct ErrorReporterDriverNativeOpenMP
 };
 #endif
 
-#if defined(KOKKOS_CLASS_LAMBDA)
+#if defined(KOKKOS_CLASS_LAMBDA) && \
+    (!defined(KOKKOS_ENABLE_CUDA) || defined(KOKKOS_ENABLE_CUDA_LAMBDA))
 TEST(TEST_CATEGORY, ErrorReporterViaLambda) {
   TestErrorReporter<ErrorReporterDriverUseLambda<TEST_EXECSPACE>>();
 }
diff --git a/kokkos/containers/unit_tests/cuda/TestCuda_DualView.cpp b/kokkos/containers/unit_tests/TestHIP_Category.hpp
similarity index 88%
rename from kokkos/containers/unit_tests/cuda/TestCuda_DualView.cpp
rename to kokkos/containers/unit_tests/TestHIP_Category.hpp
index 9d2f0f41b..c2d60d181 100644
--- a/kokkos/containers/unit_tests/cuda/TestCuda_DualView.cpp
+++ b/kokkos/containers/unit_tests/TestHIP_Category.hpp
@@ -1,4 +1,3 @@
-
 /*
 //@HEADER
 // ************************************************************************
@@ -25,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -43,5 +42,10 @@
 //@HEADER
 */
 
-#include <cuda/TestCuda_Category.hpp>
-#include <TestDualView.hpp>
+#ifndef KOKKOS_TEST_HIP_HPP
+#define KOKKOS_TEST_HIP_HPP
+
+#define TEST_CATEGORY hip
+#define TEST_EXECSPACE Kokkos::Experimental::HIP
+
+#endif
diff --git a/kokkos/containers/unit_tests/hpx/TestHPX_Category.hpp b/kokkos/containers/unit_tests/TestHPX_Category.hpp
similarity index 93%
rename from kokkos/containers/unit_tests/hpx/TestHPX_Category.hpp
rename to kokkos/containers/unit_tests/TestHPX_Category.hpp
index 5f0446bb3..64fc7c075 100644
--- a/kokkos/containers/unit_tests/hpx/TestHPX_Category.hpp
+++ b/kokkos/containers/unit_tests/TestHPX_Category.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/containers/unit_tests/TestOffsetView.hpp b/kokkos/containers/unit_tests/TestOffsetView.hpp
index 9b18707bb..5114b8022 100644
--- a/kokkos/containers/unit_tests/TestOffsetView.hpp
+++ b/kokkos/containers/unit_tests/TestOffsetView.hpp
@@ -23,10 +23,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -60,7 +60,7 @@ using std::endl;
 namespace Test {
 
 template <typename Scalar, typename Device>
-void test_offsetview_construction(unsigned int size) {
+void test_offsetview_construction() {
   typedef Kokkos::Experimental::OffsetView<Scalar**, Device> offset_view_type;
   typedef Kokkos::View<Scalar**, Device> view_type;
 
@@ -185,15 +185,17 @@ void test_offsetview_construction(unsigned int size) {
 
     Kokkos::deep_copy(view3D, 1);
 
-    Kokkos::Array<int64_t, 3> begins = {{-10, -20, -30}};
-    Kokkos::Experimental::OffsetView<Scalar***, Device> offsetView3D(view3D,
-                                                                     begins);
-
     typedef Kokkos::MDRangePolicy<Device, Kokkos::Rank<3>,
                                   Kokkos::IndexType<int64_t> >
         range3_type;
     typedef typename range3_type::point_type point3_type;
 
+    typename point3_type::value_type begins0 = -10, begins1 = -20,
+                                     begins2 = -30;
+    Kokkos::Array<int64_t, 3> begins         = {{begins0, begins1, begins2}};
+    Kokkos::Experimental::OffsetView<Scalar***, Device> offsetView3D(view3D,
+                                                                     begins);
+
     range3_type rangePolicy3DZero(point3_type{{0, 0, 0}},
                                   point3_type{{extent0, extent1, extent2}});
 
@@ -207,9 +209,8 @@ void test_offsetview_construction(unsigned int size) {
         view3DSum);
 
     range3_type rangePolicy3D(
-        point3_type{{begins[0], begins[1], begins[2]}},
-        point3_type{
-            {begins[0] + extent0, begins[1] + extent1, begins[2] + extent2}});
+        point3_type{{begins0, begins1, begins2}},
+        point3_type{{begins0 + extent0, begins1 + extent1, begins2 + extent2}});
     int offsetView3DSum = 0;
 
     Kokkos::parallel_reduce(
@@ -388,7 +389,7 @@ void test_offsetview_unmanaged_construction() {
 }
 
 template <typename Scalar, typename Device>
-void test_offsetview_subview(unsigned int size) {
+void test_offsetview_subview() {
   {  // test subview 1
     Kokkos::Experimental::OffsetView<Scalar*, Device> sliceMe("offsetToSlice",
                                                               {-10, 20});
@@ -675,7 +676,7 @@ void test_offsetview_offsets_rank3() {
 #endif
 
 TEST(TEST_CATEGORY, offsetview_construction) {
-  test_offsetview_construction<int, TEST_EXECSPACE>(10);
+  test_offsetview_construction<int, TEST_EXECSPACE>();
 }
 
 TEST(TEST_CATEGORY, offsetview_unmanaged_construction) {
@@ -683,7 +684,7 @@ TEST(TEST_CATEGORY, offsetview_unmanaged_construction) {
 }
 
 TEST(TEST_CATEGORY, offsetview_subview) {
-  test_offsetview_subview<int, TEST_EXECSPACE>(10);
+  test_offsetview_subview<int, TEST_EXECSPACE>();
 }
 
 #if defined(KOKKOS_ENABLE_CUDA_LAMBDA) || !defined(KOKKOS_ENABLE_CUDA)
diff --git a/kokkos/containers/unit_tests/openmp/TestOpenMP_Category.hpp b/kokkos/containers/unit_tests/TestOpenMP_Category.hpp
similarity index 93%
rename from kokkos/containers/unit_tests/openmp/TestOpenMP_Category.hpp
rename to kokkos/containers/unit_tests/TestOpenMP_Category.hpp
index ef8a12b4f..a0169d170 100644
--- a/kokkos/containers/unit_tests/openmp/TestOpenMP_Category.hpp
+++ b/kokkos/containers/unit_tests/TestOpenMP_Category.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/containers/unit_tests/TestScatterView.hpp b/kokkos/containers/unit_tests/TestScatterView.hpp
index 76254ca26..915d96d32 100644
--- a/kokkos/containers/unit_tests/TestScatterView.hpp
+++ b/kokkos/containers/unit_tests/TestScatterView.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -50,21 +50,21 @@
 
 namespace Test {
 
-template <typename ExecSpace, typename Layout, int duplication,
+template <typename DeviceType, typename Layout, int duplication,
           int contribution, int op>
 struct test_scatter_view_impl_cls;
 
-template <typename ExecSpace, typename Layout, int duplication,
+template <typename DeviceType, typename Layout, int duplication,
           int contribution>
-struct test_scatter_view_impl_cls<ExecSpace, Layout, duplication, contribution,
+struct test_scatter_view_impl_cls<DeviceType, Layout, duplication, contribution,
                                   Kokkos::Experimental::ScatterSum> {
  public:
-  typedef Kokkos::Experimental::ScatterView<double * [3], Layout, ExecSpace,
+  typedef Kokkos::Experimental::ScatterView<double * [3], Layout, DeviceType,
                                             Kokkos::Experimental::ScatterSum,
                                             duplication, contribution>
       scatter_view_type;
 
-  typedef Kokkos::View<double * [3], Layout, ExecSpace> orig_view_type;
+  typedef Kokkos::View<double * [3], Layout, DeviceType> orig_view_type;
 
   scatter_view_type scatter_view;
   int scatterSize;
@@ -90,7 +90,8 @@ struct test_scatter_view_impl_cls<ExecSpace, Layout, duplication, contribution,
 
   void run_parallel(int n) {
     scatterSize = n;
-    auto policy = Kokkos::RangePolicy<ExecSpace, int>(0, n);
+    auto policy =
+        Kokkos::RangePolicy<typename DeviceType::execution_space, int>(0, n);
     Kokkos::parallel_for(policy, *this, "scatter_view_test: Sum");
   }
 
@@ -123,17 +124,17 @@ struct test_scatter_view_impl_cls<ExecSpace, Layout, duplication, contribution,
   }
 };
 
-template <typename ExecSpace, typename Layout, int duplication,
+template <typename DeviceType, typename Layout, int duplication,
           int contribution>
-struct test_scatter_view_impl_cls<ExecSpace, Layout, duplication, contribution,
+struct test_scatter_view_impl_cls<DeviceType, Layout, duplication, contribution,
                                   Kokkos::Experimental::ScatterProd> {
  public:
-  typedef Kokkos::Experimental::ScatterView<double * [3], Layout, ExecSpace,
+  typedef Kokkos::Experimental::ScatterView<double * [3], Layout, DeviceType,
                                             Kokkos::Experimental::ScatterProd,
                                             duplication, contribution>
       scatter_view_type;
 
-  typedef Kokkos::View<double * [3], Layout, ExecSpace> orig_view_type;
+  typedef Kokkos::View<double * [3], Layout, DeviceType> orig_view_type;
 
   scatter_view_type scatter_view;
   int scatterSize;
@@ -159,7 +160,8 @@ struct test_scatter_view_impl_cls<ExecSpace, Layout, duplication, contribution,
 
   void run_parallel(int n) {
     scatterSize = n;
-    auto policy = Kokkos::RangePolicy<ExecSpace, int>(0, n);
+    auto policy =
+        Kokkos::RangePolicy<typename DeviceType::execution_space, int>(0, n);
     Kokkos::parallel_for(policy, *this, "scatter_view_test: Prod");
   }
 
@@ -192,17 +194,17 @@ struct test_scatter_view_impl_cls<ExecSpace, Layout, duplication, contribution,
   }
 };
 
-template <typename ExecSpace, typename Layout, int duplication,
+template <typename DeviceType, typename Layout, int duplication,
           int contribution>
-struct test_scatter_view_impl_cls<ExecSpace, Layout, duplication, contribution,
+struct test_scatter_view_impl_cls<DeviceType, Layout, duplication, contribution,
                                   Kokkos::Experimental::ScatterMin> {
  public:
-  typedef Kokkos::Experimental::ScatterView<double * [3], Layout, ExecSpace,
+  typedef Kokkos::Experimental::ScatterView<double * [3], Layout, DeviceType,
                                             Kokkos::Experimental::ScatterMin,
                                             duplication, contribution>
       scatter_view_type;
 
-  typedef Kokkos::View<double * [3], Layout, ExecSpace> orig_view_type;
+  typedef Kokkos::View<double * [3], Layout, DeviceType> orig_view_type;
 
   scatter_view_type scatter_view;
   int scatterSize;
@@ -228,7 +230,8 @@ struct test_scatter_view_impl_cls<ExecSpace, Layout, duplication, contribution,
 
   void run_parallel(int n) {
     scatterSize = n;
-    auto policy = Kokkos::RangePolicy<ExecSpace, int>(0, n);
+    auto policy =
+        Kokkos::RangePolicy<typename DeviceType::execution_space, int>(0, n);
     Kokkos::parallel_for(policy, *this, "scatter_view_test: Prod");
   }
 
@@ -261,17 +264,17 @@ struct test_scatter_view_impl_cls<ExecSpace, Layout, duplication, contribution,
   }
 };
 
-template <typename ExecSpace, typename Layout, int duplication,
+template <typename DeviceType, typename Layout, int duplication,
           int contribution>
-struct test_scatter_view_impl_cls<ExecSpace, Layout, duplication, contribution,
+struct test_scatter_view_impl_cls<DeviceType, Layout, duplication, contribution,
                                   Kokkos::Experimental::ScatterMax> {
  public:
-  typedef Kokkos::Experimental::ScatterView<double * [3], Layout, ExecSpace,
+  typedef Kokkos::Experimental::ScatterView<double * [3], Layout, DeviceType,
                                             Kokkos::Experimental::ScatterMax,
                                             duplication, contribution>
       scatter_view_type;
 
-  typedef Kokkos::View<double * [3], Layout, ExecSpace> orig_view_type;
+  typedef Kokkos::View<double * [3], Layout, DeviceType> orig_view_type;
 
   scatter_view_type scatter_view;
   int scatterSize;
@@ -297,7 +300,7 @@ struct test_scatter_view_impl_cls<ExecSpace, Layout, duplication, contribution,
 
   void run_parallel(int n) {
     scatterSize = n;
-    auto policy = Kokkos::RangePolicy<ExecSpace, int>(0, n);
+    Kokkos::RangePolicy<typename DeviceType::execution_space, int> policy(0, n);
     Kokkos::parallel_for(policy, *this, "scatter_view_test: Prod");
   }
 
@@ -330,20 +333,18 @@ struct test_scatter_view_impl_cls<ExecSpace, Layout, duplication, contribution,
   }
 };
 
-template <typename ExecSpace, typename Layout, int duplication,
+template <typename DeviceType, typename Layout, int duplication,
           int contribution, int op>
 struct test_scatter_view_config {
  public:
   typedef
-      typename test_scatter_view_impl_cls<ExecSpace, Layout, duplication,
+      typename test_scatter_view_impl_cls<DeviceType, Layout, duplication,
                                           contribution, op>::scatter_view_type
           scatter_view_def;
-  typedef typename test_scatter_view_impl_cls<ExecSpace, Layout, duplication,
+  typedef typename test_scatter_view_impl_cls<DeviceType, Layout, duplication,
                                               contribution, op>::orig_view_type
       orig_view_def;
 
-  test_scatter_view_config() {}
-
   void run_test(int n) {
     // Test creation via create_scatter_view
     {
@@ -351,7 +352,7 @@ struct test_scatter_view_config {
       scatter_view_def scatter_view = Kokkos::Experimental::create_scatter_view<
           op, duplication, contribution>(original_view);
 
-      test_scatter_view_impl_cls<ExecSpace, Layout, duplication, contribution,
+      test_scatter_view_impl_cls<DeviceType, Layout, duplication, contribution,
                                  op>
           scatter_view_test_impl(scatter_view);
       scatter_view_test_impl.initialize(original_view);
@@ -379,7 +380,7 @@ struct test_scatter_view_config {
       orig_view_def original_view("original_view", n);
       scatter_view_def scatter_view(original_view);
 
-      test_scatter_view_impl_cls<ExecSpace, Layout, duplication, contribution,
+      test_scatter_view_impl_cls<DeviceType, Layout, duplication, contribution,
                                  op>
           scatter_view_test_impl(scatter_view);
       scatter_view_test_impl.initialize(original_view);
@@ -405,17 +406,18 @@ struct test_scatter_view_config {
   }
 };
 
-template <typename ExecSpace, int ScatterType>
+template <typename DeviceType, int ScatterType>
 struct TestDuplicatedScatterView {
   TestDuplicatedScatterView(int n) {
     // ScatterSum test
-    test_scatter_view_config<
-        ExecSpace, Kokkos::LayoutRight, Kokkos::Experimental::ScatterDuplicated,
-        Kokkos::Experimental::ScatterNonAtomic, ScatterType>
+    test_scatter_view_config<DeviceType, Kokkos::LayoutRight,
+                             Kokkos::Experimental::ScatterDuplicated,
+                             Kokkos::Experimental::ScatterNonAtomic,
+                             ScatterType>
         test_sv_right_config;
     test_sv_right_config.run_test(n);
     test_scatter_view_config<
-        ExecSpace, Kokkos::LayoutLeft, Kokkos::Experimental::ScatterDuplicated,
+        DeviceType, Kokkos::LayoutLeft, Kokkos::Experimental::ScatterDuplicated,
         Kokkos::Experimental::ScatterNonAtomic, ScatterType>
         test_sv_left_config;
     test_sv_left_config.run_test(n);
@@ -429,6 +431,16 @@ template <int ScatterType>
 struct TestDuplicatedScatterView<Kokkos::Cuda, ScatterType> {
   TestDuplicatedScatterView(int) {}
 };
+template <int ScatterType>
+struct TestDuplicatedScatterView<
+    Kokkos::Device<Kokkos::Cuda, Kokkos::CudaSpace>, ScatterType> {
+  TestDuplicatedScatterView(int) {}
+};
+template <int ScatterType>
+struct TestDuplicatedScatterView<
+    Kokkos::Device<Kokkos::Cuda, Kokkos::CudaUVMSpace>, ScatterType> {
+  TestDuplicatedScatterView(int) {}
+};
 #endif
 
 #ifdef KOKKOS_ENABLE_ROCM
@@ -440,17 +452,15 @@ struct TestDuplicatedScatterView<Kokkos::Experimental::ROCm, ScatterType> {
 };
 #endif
 
-template <typename ExecSpace, int ScatterType>
+template <typename DeviceType, int ScatterType>
 void test_scatter_view(int n) {
-  // all of these configurations should compile okay, but only some of them are
-  // correct and/or sensible in terms of memory use
-  Kokkos::Experimental::UniqueToken<ExecSpace> unique_token{ExecSpace()};
+  using execution_space = typename DeviceType::execution_space;
 
   // no atomics or duplication is only sensible if the execution space
   // is running essentially in serial (doesn't have to be Serial though,
   // we also test OpenMP with one thread: LAMMPS cares about that)
-  if (unique_token.size() == 1) {
-    test_scatter_view_config<ExecSpace, Kokkos::LayoutRight,
+  if (execution_space().concurrency() == 1) {
+    test_scatter_view_config<DeviceType, Kokkos::LayoutRight,
                              Kokkos::Experimental::ScatterNonDuplicated,
                              Kokkos::Experimental::ScatterNonAtomic,
                              ScatterType>
@@ -458,9 +468,9 @@ void test_scatter_view(int n) {
     test_sv_config.run_test(n);
   }
 #ifdef KOKKOS_ENABLE_SERIAL
-  if (!std::is_same<ExecSpace, Kokkos::Serial>::value) {
+  if (!std::is_same<DeviceType, Kokkos::Serial>::value) {
 #endif
-    test_scatter_view_config<ExecSpace, Kokkos::LayoutRight,
+    test_scatter_view_config<DeviceType, Kokkos::LayoutRight,
                              Kokkos::Experimental::ScatterNonDuplicated,
                              Kokkos::Experimental::ScatterAtomic, ScatterType>
         test_sv_config;
@@ -473,16 +483,18 @@ void test_scatter_view(int n) {
   constexpr std::size_t maximum_allowed_total_bytes =
       8ull * 1024ull * 1024ull * 1024ull;
   std::size_t const maximum_allowed_copy_bytes =
-      maximum_allowed_total_bytes / std::size_t(unique_token.size());
+      maximum_allowed_total_bytes /
+      std::size_t(execution_space().concurrency());
   constexpr std::size_t bytes_per_value = sizeof(double) * 3;
   std::size_t const maximum_allowed_copy_values =
       maximum_allowed_copy_bytes / bytes_per_value;
   n = std::min(n, int(maximum_allowed_copy_values));
-  TestDuplicatedScatterView<ExecSpace, ScatterType> duptest(n);
+  TestDuplicatedScatterView<DeviceType, ScatterType> duptest(n);
 }
 
+// FIXME_HIP ScatterView requires UniqueToken
+#ifndef KOKKOS_ENABLE_HIP
 TEST(TEST_CATEGORY, scatterview) {
-#ifndef KOKKOS_ENABLE_ROCM
   test_scatter_view<TEST_EXECSPACE, Kokkos::Experimental::ScatterSum>(10);
   test_scatter_view<TEST_EXECSPACE, Kokkos::Experimental::ScatterProd>(10);
   test_scatter_view<TEST_EXECSPACE, Kokkos::Experimental::ScatterMin>(10);
@@ -504,8 +516,38 @@ TEST(TEST_CATEGORY, scatterview) {
   test_scatter_view<TEST_EXECSPACE, Kokkos::Experimental::ScatterProd>(big_n);
   test_scatter_view<TEST_EXECSPACE, Kokkos::Experimental::ScatterMin>(big_n);
   test_scatter_view<TEST_EXECSPACE, Kokkos::Experimental::ScatterMax>(big_n);
+}
+
+TEST(TEST_CATEGORY, scatterview_devicetype) {
+  using device_type =
+      Kokkos::Device<TEST_EXECSPACE, typename TEST_EXECSPACE::memory_space>;
+
+  test_scatter_view<device_type, Kokkos::Experimental::ScatterSum>(10);
+  test_scatter_view<device_type, Kokkos::Experimental::ScatterProd>(10);
+  test_scatter_view<device_type, Kokkos::Experimental::ScatterMin>(10);
+  test_scatter_view<device_type, Kokkos::Experimental::ScatterMax>(10);
+
+#ifdef KOKKOS_ENABLE_CUDA
+  if (std::is_same<TEST_EXECSPACE, Kokkos::Cuda>::value) {
+    using cuda_device_type = Kokkos::Device<Kokkos::Cuda, Kokkos::CudaSpace>;
+    test_scatter_view<cuda_device_type, Kokkos::Experimental::ScatterSum>(10);
+    test_scatter_view<cuda_device_type, Kokkos::Experimental::ScatterProd>(10);
+    test_scatter_view<cuda_device_type, Kokkos::Experimental::ScatterMin>(10);
+    test_scatter_view<cuda_device_type, Kokkos::Experimental::ScatterMax>(10);
+    using cudauvm_device_type =
+        Kokkos::Device<Kokkos::Cuda, Kokkos::CudaUVMSpace>;
+    test_scatter_view<cudauvm_device_type, Kokkos::Experimental::ScatterSum>(
+        10);
+    test_scatter_view<cudauvm_device_type, Kokkos::Experimental::ScatterProd>(
+        10);
+    test_scatter_view<cudauvm_device_type, Kokkos::Experimental::ScatterMin>(
+        10);
+    test_scatter_view<cudauvm_device_type, Kokkos::Experimental::ScatterMax>(
+        10);
+  }
 #endif
 }
+#endif
 
 }  // namespace Test
 
diff --git a/kokkos/containers/unit_tests/serial/TestSerial_Category.hpp b/kokkos/containers/unit_tests/TestSerial_Category.hpp
similarity index 93%
rename from kokkos/containers/unit_tests/serial/TestSerial_Category.hpp
rename to kokkos/containers/unit_tests/TestSerial_Category.hpp
index 3ad66b084..2aa09a315 100644
--- a/kokkos/containers/unit_tests/serial/TestSerial_Category.hpp
+++ b/kokkos/containers/unit_tests/TestSerial_Category.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/containers/unit_tests/TestStaticCrsGraph.hpp b/kokkos/containers/unit_tests/TestStaticCrsGraph.hpp
index 6121b5222..15c190242 100644
--- a/kokkos/containers/unit_tests/TestStaticCrsGraph.hpp
+++ b/kokkos/containers/unit_tests/TestStaticCrsGraph.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/containers/unit_tests/threads/TestThreads_Category.hpp b/kokkos/containers/unit_tests/TestThreads_Category.hpp
similarity index 93%
rename from kokkos/containers/unit_tests/threads/TestThreads_Category.hpp
rename to kokkos/containers/unit_tests/TestThreads_Category.hpp
index 5c37163bc..74a2b0da3 100644
--- a/kokkos/containers/unit_tests/threads/TestThreads_Category.hpp
+++ b/kokkos/containers/unit_tests/TestThreads_Category.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/containers/unit_tests/TestUnorderedMap.hpp b/kokkos/containers/unit_tests/TestUnorderedMap.hpp
index 436a4c8b7..3ec3a4e5e 100644
--- a/kokkos/containers/unit_tests/TestUnorderedMap.hpp
+++ b/kokkos/containers/unit_tests/TestUnorderedMap.hpp
@@ -23,10 +23,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -174,6 +174,9 @@ struct TestFind {
 
 }  // namespace Impl
 
+// MSVC reports a syntax error for this test.
+// WORKAROUND MSVC
+#ifndef _WIN32
 template <typename Device>
 void test_insert(uint32_t num_nodes, uint32_t num_inserts,
                  uint32_t num_duplicates, bool near) {
@@ -225,6 +228,7 @@ void test_insert(uint32_t num_nodes, uint32_t num_inserts,
     EXPECT_EQ(0u, map.size());
   }
 }
+#endif
 
 template <typename Device>
 void test_failed_insert(uint32_t num_nodes) {
@@ -291,12 +295,17 @@ void test_deep_copy(uint32_t num_nodes) {
   }
 }
 
+// FIXME_HIP deadlock
+#ifndef KOKKOS_ENABLE_HIP
+// WORKAROUND MSVC
+#ifndef _WIN32
 TEST(TEST_CATEGORY, UnorderedMap_insert) {
   for (int i = 0; i < 500; ++i) {
     test_insert<TEST_EXECSPACE>(100000, 90000, 100, true);
     test_insert<TEST_EXECSPACE>(100000, 90000, 100, false);
   }
 }
+#endif
 
 TEST(TEST_CATEGORY, UnorderedMap_failed_insert) {
   for (int i = 0; i < 1000; ++i) test_failed_insert<TEST_EXECSPACE>(10000);
@@ -305,6 +314,19 @@ TEST(TEST_CATEGORY, UnorderedMap_failed_insert) {
 TEST(TEST_CATEGORY, UnorderedMap_deep_copy) {
   for (int i = 0; i < 2; ++i) test_deep_copy<TEST_EXECSPACE>(10000);
 }
+#endif
+
+TEST(TEST_CATEGORY, UnorderedMap_valid_empty) {
+  using Key   = int;
+  using Value = int;
+  using Map   = Kokkos::UnorderedMap<Key, Value, TEST_EXECSPACE>;
+
+  Map m{};
+  Map n{};
+  n = Map{m.capacity()};
+  n.rehash(m.capacity());
+  Kokkos::deep_copy(n, m);
+}
 
 }  // namespace Test
 
diff --git a/kokkos/containers/unit_tests/TestVector.hpp b/kokkos/containers/unit_tests/TestVector.hpp
index be6368ac0..4174a477c 100644
--- a/kokkos/containers/unit_tests/TestVector.hpp
+++ b/kokkos/containers/unit_tests/TestVector.hpp
@@ -23,10 +23,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/containers/unit_tests/TestViewCtorPropEmbeddedDim.hpp b/kokkos/containers/unit_tests/TestViewCtorPropEmbeddedDim.hpp
index 473e5ae87..3f7d4101f 100644
--- a/kokkos/containers/unit_tests/TestViewCtorPropEmbeddedDim.hpp
+++ b/kokkos/containers/unit_tests/TestViewCtorPropEmbeddedDim.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -64,7 +64,7 @@ struct TestViewCtorProp_EmbeddedDim {
   using DynRankViewIntType    = typename Kokkos::DynRankView<int, ExecSpace>;
   using DynRankViewDoubleType = typename Kokkos::DynRankView<double, ExecSpace>;
 
-  // Cuda 7.0 has issues with using a lamda in parallel_for to initialize the
+  // Cuda 7.0 has issues with using a lambda in parallel_for to initialize the
   // view - replace with this functor
   template <class ViewType>
   struct Functor {
diff --git a/kokkos/containers/unit_tests/UnitTestMain.cpp b/kokkos/containers/unit_tests/UnitTestMain.cpp
index c62c74058..e245aad35 100644
--- a/kokkos/containers/unit_tests/UnitTestMain.cpp
+++ b/kokkos/containers/unit_tests/UnitTestMain.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/containers/unit_tests/cuda/TestCuda_DynRankViewAPI_generic.cpp b/kokkos/containers/unit_tests/cuda/TestCuda_DynRankViewAPI_generic.cpp
deleted file mode 100644
index f131914b0..000000000
--- a/kokkos/containers/unit_tests/cuda/TestCuda_DynRankViewAPI_generic.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-
-/*
-//@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
-*/
-
-#include <cuda/TestCuda_Category.hpp>
-#include <TestDynViewAPI_generic.hpp>
diff --git a/kokkos/containers/unit_tests/cuda/TestCuda_DynRankViewAPI_rank67.cpp b/kokkos/containers/unit_tests/cuda/TestCuda_DynRankViewAPI_rank67.cpp
deleted file mode 100644
index e2aa2de55..000000000
--- a/kokkos/containers/unit_tests/cuda/TestCuda_DynRankViewAPI_rank67.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-
-/*
-//@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
-*/
-
-#include <cuda/TestCuda_Category.hpp>
-#include <TestDynViewAPI_rank67.hpp>
diff --git a/kokkos/containers/unit_tests/cuda/TestCuda_DynamicView.cpp b/kokkos/containers/unit_tests/cuda/TestCuda_DynamicView.cpp
deleted file mode 100644
index bfbdfabda..000000000
--- a/kokkos/containers/unit_tests/cuda/TestCuda_DynamicView.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-
-/*
-//@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
-*/
-
-#include <cuda/TestCuda_Category.hpp>
-#include <TestDynamicView.hpp>
diff --git a/kokkos/containers/unit_tests/cuda/TestCuda_ErrorReporter.cpp b/kokkos/containers/unit_tests/cuda/TestCuda_ErrorReporter.cpp
deleted file mode 100644
index 1d5f1073e..000000000
--- a/kokkos/containers/unit_tests/cuda/TestCuda_ErrorReporter.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-
-/*
-//@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
-*/
-
-#include <cuda/TestCuda_Category.hpp>
-#include <TestErrorReporter.hpp>
diff --git a/kokkos/containers/unit_tests/cuda/TestCuda_ScatterView.cpp b/kokkos/containers/unit_tests/cuda/TestCuda_ScatterView.cpp
deleted file mode 100644
index 85d0a443c..000000000
--- a/kokkos/containers/unit_tests/cuda/TestCuda_ScatterView.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-
-/*
-//@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
-*/
-
-#include <cuda/TestCuda_Category.hpp>
-#include <TestScatterView.hpp>
diff --git a/kokkos/containers/unit_tests/cuda/TestCuda_StaticCrsGraph.cpp b/kokkos/containers/unit_tests/cuda/TestCuda_StaticCrsGraph.cpp
deleted file mode 100644
index 1b82c6230..000000000
--- a/kokkos/containers/unit_tests/cuda/TestCuda_StaticCrsGraph.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-
-/*
-//@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
-*/
-
-#include <cuda/TestCuda_Category.hpp>
-#include <TestStaticCrsGraph.hpp>
diff --git a/kokkos/containers/unit_tests/cuda/TestCuda_UnorderedMap.cpp b/kokkos/containers/unit_tests/cuda/TestCuda_UnorderedMap.cpp
deleted file mode 100644
index 9c18e95d0..000000000
--- a/kokkos/containers/unit_tests/cuda/TestCuda_UnorderedMap.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-
-/*
-//@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
-*/
-
-#include <cuda/TestCuda_Category.hpp>
-#include <TestUnorderedMap.hpp>
diff --git a/kokkos/containers/unit_tests/cuda/TestCuda_ViewCtorPropEmbeddedDim.cpp b/kokkos/containers/unit_tests/cuda/TestCuda_ViewCtorPropEmbeddedDim.cpp
deleted file mode 100644
index 69a0f692b..000000000
--- a/kokkos/containers/unit_tests/cuda/TestCuda_ViewCtorPropEmbeddedDim.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-
-/*
-//@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
-*/
-
-#include <cuda/TestCuda_Category.hpp>
-#include <TestViewCtorPropEmbeddedDim.hpp>
diff --git a/kokkos/containers/unit_tests/hpx/TestHPX_DynRankViewAPI_generic.cpp b/kokkos/containers/unit_tests/hpx/TestHPX_DynRankViewAPI_generic.cpp
deleted file mode 100644
index aa5e51038..000000000
--- a/kokkos/containers/unit_tests/hpx/TestHPX_DynRankViewAPI_generic.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-
-/*
-//@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
-*/
-
-#include <hpx/TestHPX_Category.hpp>
-#include <TestDynViewAPI_generic.hpp>
diff --git a/kokkos/containers/unit_tests/hpx/TestHPX_DynRankViewAPI_rank12345.cpp b/kokkos/containers/unit_tests/hpx/TestHPX_DynRankViewAPI_rank12345.cpp
deleted file mode 100644
index 1fa0d869a..000000000
--- a/kokkos/containers/unit_tests/hpx/TestHPX_DynRankViewAPI_rank12345.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-
-/*
-//@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
-*/
-
-#include <hpx/TestHPX_Category.hpp>
-#include <TestDynViewAPI_rank12345.hpp>
diff --git a/kokkos/containers/unit_tests/hpx/TestHPX_DynRankViewAPI_rank67.cpp b/kokkos/containers/unit_tests/hpx/TestHPX_DynRankViewAPI_rank67.cpp
deleted file mode 100644
index 8384635a3..000000000
--- a/kokkos/containers/unit_tests/hpx/TestHPX_DynRankViewAPI_rank67.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-
-/*
-//@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
-*/
-
-#include <hpx/TestHPX_Category.hpp>
-#include <TestDynViewAPI_rank67.hpp>
diff --git a/kokkos/containers/unit_tests/hpx/TestHPX_DynamicView.cpp b/kokkos/containers/unit_tests/hpx/TestHPX_DynamicView.cpp
deleted file mode 100644
index 1c844f2d7..000000000
--- a/kokkos/containers/unit_tests/hpx/TestHPX_DynamicView.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-
-/*
-//@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
-*/
-
-#include <hpx/TestHPX_Category.hpp>
-#include <TestDynamicView.hpp>
diff --git a/kokkos/containers/unit_tests/hpx/TestHPX_ErrorReporter.cpp b/kokkos/containers/unit_tests/hpx/TestHPX_ErrorReporter.cpp
deleted file mode 100644
index 03e85f381..000000000
--- a/kokkos/containers/unit_tests/hpx/TestHPX_ErrorReporter.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-
-/*
-//@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
-*/
-
-#include <hpx/TestHPX_Category.hpp>
-#include <TestErrorReporter.hpp>
diff --git a/kokkos/containers/unit_tests/hpx/TestHPX_OffsetView.cpp b/kokkos/containers/unit_tests/hpx/TestHPX_OffsetView.cpp
deleted file mode 100644
index d7777d648..000000000
--- a/kokkos/containers/unit_tests/hpx/TestHPX_OffsetView.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-
-/*
-//@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
-*/
-
-#include <hpx/TestHPX_Category.hpp>
-#include <TestOffsetView.hpp>
diff --git a/kokkos/containers/unit_tests/hpx/TestHPX_ScatterView.cpp b/kokkos/containers/unit_tests/hpx/TestHPX_ScatterView.cpp
deleted file mode 100644
index 19e1fdbfb..000000000
--- a/kokkos/containers/unit_tests/hpx/TestHPX_ScatterView.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-
-/*
-//@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
-*/
-
-#include <hpx/TestHPX_Category.hpp>
-#include <TestScatterView.hpp>
diff --git a/kokkos/containers/unit_tests/hpx/TestHPX_StaticCrsGraph.cpp b/kokkos/containers/unit_tests/hpx/TestHPX_StaticCrsGraph.cpp
deleted file mode 100644
index 0f3cc5f79..000000000
--- a/kokkos/containers/unit_tests/hpx/TestHPX_StaticCrsGraph.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-
-/*
-//@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
-*/
-
-#include <hpx/TestHPX_Category.hpp>
-#include <TestStaticCrsGraph.hpp>
diff --git a/kokkos/containers/unit_tests/hpx/TestHPX_UnorderedMap.cpp b/kokkos/containers/unit_tests/hpx/TestHPX_UnorderedMap.cpp
deleted file mode 100644
index 63697c438..000000000
--- a/kokkos/containers/unit_tests/hpx/TestHPX_UnorderedMap.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-
-/*
-//@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
-*/
-
-#include <hpx/TestHPX_Category.hpp>
-#include <TestUnorderedMap.hpp>
diff --git a/kokkos/containers/unit_tests/hpx/TestHPX_ViewCtorPropEmbeddedDim.cpp b/kokkos/containers/unit_tests/hpx/TestHPX_ViewCtorPropEmbeddedDim.cpp
deleted file mode 100644
index d95e4a5e6..000000000
--- a/kokkos/containers/unit_tests/hpx/TestHPX_ViewCtorPropEmbeddedDim.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-
-/*
-//@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
-*/
-
-#include <hpx/TestHPX_Category.hpp>
-#include <TestViewCtorPropEmbeddedDim.hpp>
diff --git a/kokkos/containers/unit_tests/openmp/TestOpenMP_DualView.cpp b/kokkos/containers/unit_tests/openmp/TestOpenMP_DualView.cpp
deleted file mode 100644
index a71cdc439..000000000
--- a/kokkos/containers/unit_tests/openmp/TestOpenMP_DualView.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-
-/*
-//@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
-*/
-
-#include <openmp/TestOpenMP_Category.hpp>
-#include <TestDualView.hpp>
diff --git a/kokkos/containers/unit_tests/openmp/TestOpenMP_DynRankViewAPI_generic.cpp b/kokkos/containers/unit_tests/openmp/TestOpenMP_DynRankViewAPI_generic.cpp
deleted file mode 100644
index 3e0681c7a..000000000
--- a/kokkos/containers/unit_tests/openmp/TestOpenMP_DynRankViewAPI_generic.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-
-/*
-//@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
-*/
-
-#include <openmp/TestOpenMP_Category.hpp>
-#include <TestDynViewAPI_generic.hpp>
diff --git a/kokkos/containers/unit_tests/openmp/TestOpenMP_DynRankViewAPI_rank12345.cpp b/kokkos/containers/unit_tests/openmp/TestOpenMP_DynRankViewAPI_rank12345.cpp
deleted file mode 100644
index f64dee714..000000000
--- a/kokkos/containers/unit_tests/openmp/TestOpenMP_DynRankViewAPI_rank12345.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-
-/*
-//@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
-*/
-
-#include <openmp/TestOpenMP_Category.hpp>
-#include <TestDynViewAPI_rank12345.hpp>
diff --git a/kokkos/containers/unit_tests/openmp/TestOpenMP_DynRankViewAPI_rank67.cpp b/kokkos/containers/unit_tests/openmp/TestOpenMP_DynRankViewAPI_rank67.cpp
deleted file mode 100644
index 3d0216bbc..000000000
--- a/kokkos/containers/unit_tests/openmp/TestOpenMP_DynRankViewAPI_rank67.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-
-/*
-//@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
-*/
-
-#include <openmp/TestOpenMP_Category.hpp>
-#include <TestDynViewAPI_rank67.hpp>
diff --git a/kokkos/containers/unit_tests/openmp/TestOpenMP_DynamicView.cpp b/kokkos/containers/unit_tests/openmp/TestOpenMP_DynamicView.cpp
deleted file mode 100644
index 6aac7285f..000000000
--- a/kokkos/containers/unit_tests/openmp/TestOpenMP_DynamicView.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-
-/*
-//@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
-*/
-
-#include <openmp/TestOpenMP_Category.hpp>
-#include <TestDynamicView.hpp>
diff --git a/kokkos/containers/unit_tests/openmp/TestOpenMP_ErrorReporter.cpp b/kokkos/containers/unit_tests/openmp/TestOpenMP_ErrorReporter.cpp
deleted file mode 100644
index 9f80d0cce..000000000
--- a/kokkos/containers/unit_tests/openmp/TestOpenMP_ErrorReporter.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-
-/*
-//@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
-*/
-
-#include <openmp/TestOpenMP_Category.hpp>
-#include <TestErrorReporter.hpp>
diff --git a/kokkos/containers/unit_tests/openmp/TestOpenMP_OffsetView.cpp b/kokkos/containers/unit_tests/openmp/TestOpenMP_OffsetView.cpp
deleted file mode 100644
index 65bfeb15f..000000000
--- a/kokkos/containers/unit_tests/openmp/TestOpenMP_OffsetView.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-
-/*
-//@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
-*/
-
-#include <openmp/TestOpenMP_Category.hpp>
-#include <TestOffsetView.hpp>
diff --git a/kokkos/containers/unit_tests/openmp/TestOpenMP_ScatterView.cpp b/kokkos/containers/unit_tests/openmp/TestOpenMP_ScatterView.cpp
deleted file mode 100644
index a362ac177..000000000
--- a/kokkos/containers/unit_tests/openmp/TestOpenMP_ScatterView.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-
-/*
-//@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
-*/
-
-#include <openmp/TestOpenMP_Category.hpp>
-#include <TestScatterView.hpp>
diff --git a/kokkos/containers/unit_tests/openmp/TestOpenMP_StaticCrsGraph.cpp b/kokkos/containers/unit_tests/openmp/TestOpenMP_StaticCrsGraph.cpp
deleted file mode 100644
index aefa214e6..000000000
--- a/kokkos/containers/unit_tests/openmp/TestOpenMP_StaticCrsGraph.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-
-/*
-//@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
-*/
-
-#include <openmp/TestOpenMP_Category.hpp>
-#include <TestStaticCrsGraph.hpp>
diff --git a/kokkos/containers/unit_tests/openmp/TestOpenMP_UnorderedMap.cpp b/kokkos/containers/unit_tests/openmp/TestOpenMP_UnorderedMap.cpp
deleted file mode 100644
index f88585fb9..000000000
--- a/kokkos/containers/unit_tests/openmp/TestOpenMP_UnorderedMap.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-
-/*
-//@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
-*/
-
-#include <openmp/TestOpenMP_Category.hpp>
-#include <TestUnorderedMap.hpp>
diff --git a/kokkos/containers/unit_tests/openmp/TestOpenMP_ViewCtorPropEmbeddedDim.cpp b/kokkos/containers/unit_tests/openmp/TestOpenMP_ViewCtorPropEmbeddedDim.cpp
deleted file mode 100644
index 5878ea138..000000000
--- a/kokkos/containers/unit_tests/openmp/TestOpenMP_ViewCtorPropEmbeddedDim.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-
-/*
-//@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
-*/
-
-#include <openmp/TestOpenMP_Category.hpp>
-#include <TestViewCtorPropEmbeddedDim.hpp>
diff --git a/kokkos/containers/unit_tests/rocm/TestROCm_BitSet.cpp b/kokkos/containers/unit_tests/rocm/TestROCm_BitSet.cpp
deleted file mode 100644
index 9a886afcf..000000000
--- a/kokkos/containers/unit_tests/rocm/TestROCm_BitSet.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-
-/*
-//@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
-*/
-
-#include <rocm/TestROCm_Category.hpp>
-#include <TestBitset.hpp>
diff --git a/kokkos/containers/unit_tests/rocm/TestROCm_DualView.cpp b/kokkos/containers/unit_tests/rocm/TestROCm_DualView.cpp
deleted file mode 100644
index 5eb67a8d1..000000000
--- a/kokkos/containers/unit_tests/rocm/TestROCm_DualView.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-
-/*
-//@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
-*/
-
-#include <rocm/TestROCm_Category.hpp>
-#include <TestDualView.hpp>
diff --git a/kokkos/containers/unit_tests/rocm/TestROCm_DynRankViewAPI_generic.cpp b/kokkos/containers/unit_tests/rocm/TestROCm_DynRankViewAPI_generic.cpp
deleted file mode 100644
index a061748bb..000000000
--- a/kokkos/containers/unit_tests/rocm/TestROCm_DynRankViewAPI_generic.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-
-/*
-//@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
-*/
-
-#include <rocm/TestROCm_Category.hpp>
-#include <TestDynViewAPI_generic.hpp>
diff --git a/kokkos/containers/unit_tests/rocm/TestROCm_DynRankViewAPI_rank12345.cpp b/kokkos/containers/unit_tests/rocm/TestROCm_DynRankViewAPI_rank12345.cpp
deleted file mode 100644
index d459bc118..000000000
--- a/kokkos/containers/unit_tests/rocm/TestROCm_DynRankViewAPI_rank12345.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-
-/*
-//@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
-*/
-
-#include <rocm/TestROCm_Category.hpp>
-#include <TestDynViewAPI_rank12345.hpp>
diff --git a/kokkos/containers/unit_tests/rocm/TestROCm_DynRankViewAPI_rank67.cpp b/kokkos/containers/unit_tests/rocm/TestROCm_DynRankViewAPI_rank67.cpp
deleted file mode 100644
index 3013da60b..000000000
--- a/kokkos/containers/unit_tests/rocm/TestROCm_DynRankViewAPI_rank67.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-
-/*
-//@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
-*/
-
-#include <rocm/TestROCm_Category.hpp>
-#include <TestDynViewAPI_rank67.hpp>
diff --git a/kokkos/containers/unit_tests/rocm/TestROCm_DynamicView.cpp b/kokkos/containers/unit_tests/rocm/TestROCm_DynamicView.cpp
deleted file mode 100644
index 4b847a5ba..000000000
--- a/kokkos/containers/unit_tests/rocm/TestROCm_DynamicView.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-
-/*
-//@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
-*/
-
-#include <rocm/TestROCm_Category.hpp>
-#include <TestDynamicView.hpp>
diff --git a/kokkos/containers/unit_tests/rocm/TestROCm_ErrorReporter.cpp b/kokkos/containers/unit_tests/rocm/TestROCm_ErrorReporter.cpp
deleted file mode 100644
index 410e1782e..000000000
--- a/kokkos/containers/unit_tests/rocm/TestROCm_ErrorReporter.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-
-/*
-//@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
-*/
-
-#include <rocm/TestROCm_Category.hpp>
-#include <TestErrorReporter.hpp>
diff --git a/kokkos/containers/unit_tests/rocm/TestROCm_ScatterView.cpp b/kokkos/containers/unit_tests/rocm/TestROCm_ScatterView.cpp
deleted file mode 100644
index 5598cb9fa..000000000
--- a/kokkos/containers/unit_tests/rocm/TestROCm_ScatterView.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-
-/*
-//@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
-*/
-
-#include <rocm/TestROCm_Category.hpp>
-#include <TestScatterView.hpp>
diff --git a/kokkos/containers/unit_tests/rocm/TestROCm_StaticCrsGraph.cpp b/kokkos/containers/unit_tests/rocm/TestROCm_StaticCrsGraph.cpp
deleted file mode 100644
index b8d3e0abe..000000000
--- a/kokkos/containers/unit_tests/rocm/TestROCm_StaticCrsGraph.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-
-/*
-//@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
-*/
-
-#include <rocm/TestROCm_Category.hpp>
-#include <TestStaticCrsGraph.hpp>
diff --git a/kokkos/containers/unit_tests/rocm/TestROCm_UnorderedMap.cpp b/kokkos/containers/unit_tests/rocm/TestROCm_UnorderedMap.cpp
deleted file mode 100644
index 8680c9d0f..000000000
--- a/kokkos/containers/unit_tests/rocm/TestROCm_UnorderedMap.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-
-/*
-//@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
-*/
-
-#include <rocm/TestROCm_Category.hpp>
-#include <TestUnorderedMap.hpp>
diff --git a/kokkos/containers/unit_tests/rocm/TestROCm_Vector.cpp b/kokkos/containers/unit_tests/rocm/TestROCm_Vector.cpp
deleted file mode 100644
index 81e2c2779..000000000
--- a/kokkos/containers/unit_tests/rocm/TestROCm_Vector.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-
-/*
-//@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
-*/
-
-#include <rocm/TestROCm_Category.hpp>
-#include <TestVector.hpp>
diff --git a/kokkos/containers/unit_tests/rocm/TestROCm_ViewCtorPropEmbeddedDim.cpp b/kokkos/containers/unit_tests/rocm/TestROCm_ViewCtorPropEmbeddedDim.cpp
deleted file mode 100644
index 58b00dc2f..000000000
--- a/kokkos/containers/unit_tests/rocm/TestROCm_ViewCtorPropEmbeddedDim.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-
-/*
-//@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
-*/
-
-#include <rocm/TestROCm_Category.hpp>
-#include <TestViewCtorPropEmbeddedDim.hpp>
diff --git a/kokkos/containers/unit_tests/serial/TestSerial_DualView.cpp b/kokkos/containers/unit_tests/serial/TestSerial_DualView.cpp
deleted file mode 100644
index a27548795..000000000
--- a/kokkos/containers/unit_tests/serial/TestSerial_DualView.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-
-/*
-//@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
-*/
-
-#include <serial/TestSerial_Category.hpp>
-#include <TestDualView.hpp>
diff --git a/kokkos/containers/unit_tests/serial/TestSerial_DynRankViewAPI_generic.cpp b/kokkos/containers/unit_tests/serial/TestSerial_DynRankViewAPI_generic.cpp
deleted file mode 100644
index 0f36be1f6..000000000
--- a/kokkos/containers/unit_tests/serial/TestSerial_DynRankViewAPI_generic.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-
-/*
-//@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
-*/
-
-#include <serial/TestSerial_Category.hpp>
-#include <TestDynViewAPI_generic.hpp>
diff --git a/kokkos/containers/unit_tests/serial/TestSerial_DynRankViewAPI_rank12345.cpp b/kokkos/containers/unit_tests/serial/TestSerial_DynRankViewAPI_rank12345.cpp
deleted file mode 100644
index 2b038b83a..000000000
--- a/kokkos/containers/unit_tests/serial/TestSerial_DynRankViewAPI_rank12345.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-
-/*
-//@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
-*/
-
-#include <serial/TestSerial_Category.hpp>
-#include <TestDynViewAPI_rank12345.hpp>
diff --git a/kokkos/containers/unit_tests/serial/TestSerial_DynRankViewAPI_rank67.cpp b/kokkos/containers/unit_tests/serial/TestSerial_DynRankViewAPI_rank67.cpp
deleted file mode 100644
index 655d4f1c8..000000000
--- a/kokkos/containers/unit_tests/serial/TestSerial_DynRankViewAPI_rank67.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-
-/*
-//@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
-*/
-
-#include <serial/TestSerial_Category.hpp>
-#include <TestDynViewAPI_rank67.hpp>
diff --git a/kokkos/containers/unit_tests/serial/TestSerial_DynamicView.cpp b/kokkos/containers/unit_tests/serial/TestSerial_DynamicView.cpp
deleted file mode 100644
index 56db2adf7..000000000
--- a/kokkos/containers/unit_tests/serial/TestSerial_DynamicView.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-
-/*
-//@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
-*/
-
-#include <serial/TestSerial_Category.hpp>
-#include <TestDynamicView.hpp>
diff --git a/kokkos/containers/unit_tests/serial/TestSerial_ErrorReporter.cpp b/kokkos/containers/unit_tests/serial/TestSerial_ErrorReporter.cpp
deleted file mode 100644
index 3d1f51ccc..000000000
--- a/kokkos/containers/unit_tests/serial/TestSerial_ErrorReporter.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-
-/*
-//@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
-*/
-
-#include <serial/TestSerial_Category.hpp>
-#include <TestErrorReporter.hpp>
diff --git a/kokkos/containers/unit_tests/serial/TestSerial_OffsetView.cpp b/kokkos/containers/unit_tests/serial/TestSerial_OffsetView.cpp
deleted file mode 100644
index a92175e61..000000000
--- a/kokkos/containers/unit_tests/serial/TestSerial_OffsetView.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-//@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
-*/
-
-#include <serial/TestSerial_Category.hpp>
-#include <TestOffsetView.hpp>
diff --git a/kokkos/containers/unit_tests/serial/TestSerial_ScatterView.cpp b/kokkos/containers/unit_tests/serial/TestSerial_ScatterView.cpp
deleted file mode 100644
index 2d4d2f76d..000000000
--- a/kokkos/containers/unit_tests/serial/TestSerial_ScatterView.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-
-/*
-//@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
-*/
-
-#include <serial/TestSerial_Category.hpp>
-#include <TestScatterView.hpp>
diff --git a/kokkos/containers/unit_tests/serial/TestSerial_StaticCrsGraph.cpp b/kokkos/containers/unit_tests/serial/TestSerial_StaticCrsGraph.cpp
deleted file mode 100644
index 0b3ffe047..000000000
--- a/kokkos/containers/unit_tests/serial/TestSerial_StaticCrsGraph.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-
-/*
-//@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
-*/
-
-#include <serial/TestSerial_Category.hpp>
-#include <TestStaticCrsGraph.hpp>
diff --git a/kokkos/containers/unit_tests/serial/TestSerial_UnorderedMap.cpp b/kokkos/containers/unit_tests/serial/TestSerial_UnorderedMap.cpp
deleted file mode 100644
index 652b7573e..000000000
--- a/kokkos/containers/unit_tests/serial/TestSerial_UnorderedMap.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-
-/*
-//@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
-*/
-
-#include <serial/TestSerial_Category.hpp>
-#include <TestUnorderedMap.hpp>
diff --git a/kokkos/containers/unit_tests/serial/TestSerial_ViewCtorPropEmbeddedDim.cpp b/kokkos/containers/unit_tests/serial/TestSerial_ViewCtorPropEmbeddedDim.cpp
deleted file mode 100644
index 6532e3949..000000000
--- a/kokkos/containers/unit_tests/serial/TestSerial_ViewCtorPropEmbeddedDim.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-
-/*
-//@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
-*/
-
-#include <serial/TestSerial_Category.hpp>
-#include <TestViewCtorPropEmbeddedDim.hpp>
diff --git a/kokkos/containers/unit_tests/threads/TestThreads_DualView.cpp b/kokkos/containers/unit_tests/threads/TestThreads_DualView.cpp
deleted file mode 100644
index 67b31d038..000000000
--- a/kokkos/containers/unit_tests/threads/TestThreads_DualView.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-
-/*
-//@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
-*/
-
-#include <threads/TestThreads_Category.hpp>
-#include <TestDualView.hpp>
diff --git a/kokkos/containers/unit_tests/threads/TestThreads_DynRankViewAPI_generic.cpp b/kokkos/containers/unit_tests/threads/TestThreads_DynRankViewAPI_generic.cpp
deleted file mode 100644
index cddb7ae4f..000000000
--- a/kokkos/containers/unit_tests/threads/TestThreads_DynRankViewAPI_generic.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-
-/*
-//@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
-*/
-
-#include <threads/TestThreads_Category.hpp>
-#include <TestDynViewAPI_generic.hpp>
diff --git a/kokkos/containers/unit_tests/threads/TestThreads_DynRankViewAPI_rank12345.cpp b/kokkos/containers/unit_tests/threads/TestThreads_DynRankViewAPI_rank12345.cpp
deleted file mode 100644
index b5645d682..000000000
--- a/kokkos/containers/unit_tests/threads/TestThreads_DynRankViewAPI_rank12345.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-
-/*
-//@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
-*/
-
-#include <threads/TestThreads_Category.hpp>
-#include <TestDynViewAPI_rank12345.hpp>
diff --git a/kokkos/containers/unit_tests/threads/TestThreads_DynRankViewAPI_rank67.cpp b/kokkos/containers/unit_tests/threads/TestThreads_DynRankViewAPI_rank67.cpp
deleted file mode 100644
index f1784f4a5..000000000
--- a/kokkos/containers/unit_tests/threads/TestThreads_DynRankViewAPI_rank67.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-
-/*
-//@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
-*/
-
-#include <threads/TestThreads_Category.hpp>
-#include <TestDynViewAPI_rank67.hpp>
diff --git a/kokkos/containers/unit_tests/threads/TestThreads_DynamicView.cpp b/kokkos/containers/unit_tests/threads/TestThreads_DynamicView.cpp
deleted file mode 100644
index 273ced7bd..000000000
--- a/kokkos/containers/unit_tests/threads/TestThreads_DynamicView.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-
-/*
-//@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
-*/
-
-#include <threads/TestThreads_Category.hpp>
-#include <TestDynamicView.hpp>
diff --git a/kokkos/containers/unit_tests/threads/TestThreads_ErrorReporter.cpp b/kokkos/containers/unit_tests/threads/TestThreads_ErrorReporter.cpp
deleted file mode 100644
index 3f39959ba..000000000
--- a/kokkos/containers/unit_tests/threads/TestThreads_ErrorReporter.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-
-/*
-//@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
-*/
-
-#include <threads/TestThreads_Category.hpp>
-#include <TestErrorReporter.hpp>
diff --git a/kokkos/containers/unit_tests/threads/TestThreads_OffsetView.cpp b/kokkos/containers/unit_tests/threads/TestThreads_OffsetView.cpp
deleted file mode 100644
index c5734fd86..000000000
--- a/kokkos/containers/unit_tests/threads/TestThreads_OffsetView.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-
-/*
-//@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
-*/
-
-#include <threads/TestThreads_Category.hpp>
-#include <TestOffsetView.hpp>
diff --git a/kokkos/containers/unit_tests/threads/TestThreads_ScatterView.cpp b/kokkos/containers/unit_tests/threads/TestThreads_ScatterView.cpp
deleted file mode 100644
index f8bda09cb..000000000
--- a/kokkos/containers/unit_tests/threads/TestThreads_ScatterView.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-
-/*
-//@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
-*/
-
-#include <threads/TestThreads_Category.hpp>
-#include <TestScatterView.hpp>
diff --git a/kokkos/containers/unit_tests/threads/TestThreads_StaticCrsGraph.cpp b/kokkos/containers/unit_tests/threads/TestThreads_StaticCrsGraph.cpp
deleted file mode 100644
index 38cba9753..000000000
--- a/kokkos/containers/unit_tests/threads/TestThreads_StaticCrsGraph.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-
-/*
-//@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
-*/
-
-#include <threads/TestThreads_Category.hpp>
-#include <TestStaticCrsGraph.hpp>
diff --git a/kokkos/containers/unit_tests/threads/TestThreads_UnorderedMap.cpp b/kokkos/containers/unit_tests/threads/TestThreads_UnorderedMap.cpp
deleted file mode 100644
index dbfcf0dc3..000000000
--- a/kokkos/containers/unit_tests/threads/TestThreads_UnorderedMap.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-
-/*
-//@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
-*/
-
-#include <threads/TestThreads_Category.hpp>
-#include <TestUnorderedMap.hpp>
diff --git a/kokkos/containers/unit_tests/threads/TestThreads_ViewCtorPropEmbeddedDim.cpp b/kokkos/containers/unit_tests/threads/TestThreads_ViewCtorPropEmbeddedDim.cpp
deleted file mode 100644
index 17e1465cf..000000000
--- a/kokkos/containers/unit_tests/threads/TestThreads_ViewCtorPropEmbeddedDim.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-
-/*
-//@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
-*/
-
-#include <threads/TestThreads_Category.hpp>
-#include <TestViewCtorPropEmbeddedDim.hpp>
diff --git a/kokkos/core/cmake/Dependencies.cmake b/kokkos/core/cmake/Dependencies.cmake
index 9ad7660bd..cc901a4ed 100644
--- a/kokkos/core/cmake/Dependencies.cmake
+++ b/kokkos/core/cmake/Dependencies.cmake
@@ -1,5 +1,5 @@
 TRIBITS_PACKAGE_DEFINE_DEPENDENCIES(
-  LIB_OPTIONAL_TPLS Pthread CUDA HWLOC QTHREADS DLlib HPX
+  LIB_OPTIONAL_TPLS Pthread CUDA HWLOC DLlib HPX
   TEST_OPTIONAL_TPLS CUSPARSE
   )
 
diff --git a/kokkos/core/cmake/KokkosCore_config.h.in b/kokkos/core/cmake/KokkosCore_config.h.in
index f430c2b5f..095c869a3 100644
--- a/kokkos/core/cmake/KokkosCore_config.h.in
+++ b/kokkos/core/cmake/KokkosCore_config.h.in
@@ -12,6 +12,7 @@
 #endif
 
 #cmakedefine KOKKOS_ENABLE_CUDA
+#cmakedefine KOKKOS_ENABLE_HIP
 #cmakedefine KOKKOS_ENABLE_OPENMP
 #cmakedefine KOKKOS_ENABLE_THREADS
 #cmakedefine KOKKOS_ENABLE_SERIAL
@@ -63,6 +64,10 @@
 #cmakedefine KOKKOS_ENABLE_ISA_POWERPCLE
 #endif
 
+#ifdef KOKKOS_ENABLE_HIP
+#cmakedefine KOKKOS_ENABLE_HIP_RELOCATABLE_DEVICE_CODE
+#endif
+
 #cmakedefine KOKKOS_ARCH_ARMV80 1
 #cmakedefine KOKKOS_ARCH_ARMV81 1
 #cmakedefine KOKKOS_ARCH_ARMV8_THUNDERX 1
diff --git a/kokkos/core/perf_test/CMakeLists.txt b/kokkos/core/perf_test/CMakeLists.txt
index 79567835e..ca695e270 100644
--- a/kokkos/core/perf_test/CMakeLists.txt
+++ b/kokkos/core/perf_test/CMakeLists.txt
@@ -48,6 +48,14 @@ SET(SOURCES
   PerfTest_ViewResize_8.cpp
   )
 
+IF(Kokkos_ENABLE_HIP)
+# FIXME requires TeamPolicy
+  LIST(REMOVE_ITEM SOURCES
+    PerfTest_CustomReduction.cpp
+    PerfTest_ExecSpacePartitioning.cpp
+    )
+ENDIF()
+
 # Per #374, we always want to build this test, but we only want to run
 # it as a PERFORMANCE test.  That's why we separate building the test
 # from running the test.
@@ -58,11 +66,14 @@ KOKKOS_INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/../../algorithms/src")
 KOKKOS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
 KOKKOS_INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR})
 
-KOKKOS_ADD_EXECUTABLE_AND_TEST(
-  PerfTestExec
-  SOURCES ${SOURCES}
-  CATEGORIES PERFORMANCE
-)
+# This test currently times out for MSVC
+IF(NOT KOKKOS_CXX_COMPILER_ID STREQUAL "MSVC")
+  KOKKOS_ADD_EXECUTABLE_AND_TEST(
+    PerfTestExec
+    SOURCES ${SOURCES}
+    CATEGORIES PERFORMANCE
+  )
+ENDIF()
 
 KOKKOS_ADD_EXECUTABLE_AND_TEST(
   PerformanceTest_TaskDag
diff --git a/kokkos/core/perf_test/PerfTestBlasKernels.hpp b/kokkos/core/perf_test/PerfTestBlasKernels.hpp
index 4704a5feb..2717b133b 100644
--- a/kokkos/core/perf_test/PerfTestBlasKernels.hpp
+++ b/kokkos/core/perf_test/PerfTestBlasKernels.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -49,64 +49,9 @@
 
 namespace Kokkos {
 
-template <class ConstVectorType,
-          class Device = typename ConstVectorType::execution_space>
-struct Dot;
-
-template <class ConstVectorType,
-          class Device = typename ConstVectorType::execution_space>
-struct DotSingle;
-
-template <class ConstScalarType, class VectorType,
-          class Device = typename VectorType::execution_space>
-struct Scale;
-
-template <class ConstScalarType, class ConstVectorType, class VectorType,
-          class Device = typename VectorType::execution_space>
-struct AXPBY;
-
-/** \brief  Y = alpha * X + beta * Y */
-template <class ConstScalarType, class ConstVectorType, class VectorType>
-void axpby(const ConstScalarType& alpha, const ConstVectorType& X,
-           const ConstScalarType& beta, const VectorType& Y) {
-  typedef AXPBY<ConstScalarType, ConstVectorType, VectorType> functor;
-
-  parallel_for(Y.extent(0), functor(alpha, X, beta, Y));
-}
-
-/** \brief  Y *= alpha */
-template <class ConstScalarType, class VectorType>
-void scale(const ConstScalarType& alpha, const VectorType& Y) {
-  typedef Scale<ConstScalarType, VectorType> functor;
-
-  parallel_for(Y.extent(0), functor(alpha, Y));
-}
-
-template <class ConstVectorType, class Finalize>
-void dot(const ConstVectorType& X, const ConstVectorType& Y,
-         const Finalize& finalize) {
-  typedef Dot<ConstVectorType> functor;
-
-  parallel_reduce(X.extent(0), functor(X, Y), finalize);
-}
-
-template <class ConstVectorType, class Finalize>
-void dot(const ConstVectorType& X, const Finalize& finalize) {
-  typedef DotSingle<ConstVectorType> functor;
-
-  parallel_reduce(X.extent(0), functor(X), finalize);
-}
-
-} /* namespace Kokkos */
-
-//----------------------------------------------------------------------------
-//----------------------------------------------------------------------------
-
-namespace Kokkos {
-
-template <class Type, class Device>
+template <class Type>
 struct Dot {
-  typedef typename Device::execution_space execution_space;
+  typedef typename Type::execution_space execution_space;
 
   static_assert(static_cast<unsigned>(Type::Rank) == static_cast<unsigned>(1),
                 "Dot static_assert Fail: Rank != 1");
@@ -136,9 +81,9 @@ struct Dot {
   static void init(value_type& update) { update = 0; }
 };
 
-template <class Type, class Device>
+template <class Type>
 struct DotSingle {
-  typedef typename Device::execution_space execution_space;
+  typedef typename Type::execution_space execution_space;
 
   static_assert(static_cast<unsigned>(Type::Rank) == static_cast<unsigned>(1),
                 "DotSingle static_assert Fail: Rank != 1");
@@ -169,9 +114,9 @@ struct DotSingle {
   static void init(value_type& update) { update = 0; }
 };
 
-template <class ScalarType, class VectorType, class Device>
+template <class ScalarType, class VectorType>
 struct Scale {
-  typedef typename Device::execution_space execution_space;
+  typedef typename VectorType::execution_space execution_space;
 
   static_assert(static_cast<unsigned>(ScalarType::Rank) ==
                     static_cast<unsigned>(0),
@@ -196,10 +141,9 @@ struct Scale {
   void operator()(int i) const { Y[i] *= alpha(); }
 };
 
-template <class ScalarType, class ConstVectorType, class VectorType,
-          class Device>
+template <class ScalarType, class ConstVectorType, class VectorType>
 struct AXPBY {
-  typedef typename Device::execution_space execution_space;
+  typedef typename VectorType::execution_space execution_space;
 
   static_assert(static_cast<unsigned>(ScalarType::Rank) ==
                     static_cast<unsigned>(0),
@@ -233,4 +177,42 @@ struct AXPBY {
 
 } /* namespace Kokkos */
 
+//----------------------------------------------------------------------------
+//----------------------------------------------------------------------------
+
+namespace Kokkos {
+/** \brief  Y = alpha * X + beta * Y */
+template <class ConstScalarType, class ConstVectorType, class VectorType>
+void axpby(const ConstScalarType& alpha, const ConstVectorType& X,
+           const ConstScalarType& beta, const VectorType& Y) {
+  typedef AXPBY<ConstScalarType, ConstVectorType, VectorType> functor;
+
+  parallel_for(Y.extent(0), functor(alpha, X, beta, Y));
+}
+
+/** \brief  Y *= alpha */
+template <class ConstScalarType, class VectorType>
+void scale(const ConstScalarType& alpha, const VectorType& Y) {
+  typedef Scale<ConstScalarType, VectorType> functor;
+
+  parallel_for(Y.extent(0), functor(alpha, Y));
+}
+
+template <class ConstVectorType, class Finalize>
+void dot(const ConstVectorType& X, const ConstVectorType& Y,
+         const Finalize& finalize) {
+  typedef Dot<ConstVectorType> functor;
+
+  parallel_reduce(X.extent(0), functor(X, Y), finalize);
+}
+
+template <class ConstVectorType, class Finalize>
+void dot(const ConstVectorType& X, const Finalize& finalize) {
+  typedef DotSingle<ConstVectorType> functor;
+
+  parallel_reduce(X.extent(0), functor(X), finalize);
+}
+
+} /* namespace Kokkos */
+
 #endif /* #ifndef KOKKOS_BLAS_KERNELS_HPP */
diff --git a/kokkos/core/perf_test/PerfTestDriver.hpp b/kokkos/core/perf_test/PerfTestDriver.hpp
index b7b49c000..95d5128ab 100644
--- a/kokkos/core/perf_test/PerfTestDriver.hpp
+++ b/kokkos/core/perf_test/PerfTestDriver.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/perf_test/PerfTestGramSchmidt.cpp b/kokkos/core/perf_test/PerfTestGramSchmidt.cpp
index 787c5e807..0916b230e 100644
--- a/kokkos/core/perf_test/PerfTestGramSchmidt.cpp
+++ b/kokkos/core/perf_test/PerfTestGramSchmidt.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -69,7 +69,10 @@ struct InvNorm2 : public Kokkos::DotSingle<VectorView> {
 
   KOKKOS_INLINE_FUNCTION
   void final(value_type& result) const {
-    result = std::sqrt(result);
+#ifndef KOKKOS_ENABLE_HIP  // FIXME_HIP
+    using std::sqrt;
+#endif
+    result = sqrt(result);
     Rjj()  = result;
     inv()  = (0 < result) ? 1.0 / result : 0;
   }
diff --git a/kokkos/core/perf_test/PerfTestHexGrad.cpp b/kokkos/core/perf_test/PerfTestHexGrad.cpp
index 4c3c9fd52..d87928286 100644
--- a/kokkos/core/perf_test/PerfTestHexGrad.cpp
+++ b/kokkos/core/perf_test/PerfTestHexGrad.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/perf_test/PerfTestMDRange.hpp b/kokkos/core/perf_test/PerfTestMDRange.hpp
index 00123fbfd..3afff96ff 100644
--- a/kokkos/core/perf_test/PerfTestMDRange.hpp
+++ b/kokkos/core/perf_test/PerfTestMDRange.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/perf_test/PerfTestMain.cpp b/kokkos/core/perf_test/PerfTestMain.cpp
index 7a258623e..8f4d48d57 100644
--- a/kokkos/core/perf_test/PerfTestMain.cpp
+++ b/kokkos/core/perf_test/PerfTestMain.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -54,13 +54,13 @@ int command_line_num_args(int n = 0) {
   return n_args;
 }
 
-const char* command_line_arg(int k, char** input_args = NULL) {
+const char* command_line_arg(int k, char** input_args = nullptr) {
   static char** args;
-  if (input_args != NULL) args = input_args;
+  if (input_args != nullptr) args = input_args;
   if (command_line_num_args() > k)
     return args[k];
   else
-    return NULL;
+    return nullptr;
 }
 
 }  // namespace Test
diff --git a/kokkos/core/perf_test/PerfTest_Category.hpp b/kokkos/core/perf_test/PerfTest_Category.hpp
index ce5d99eb7..0f24490bf 100644
--- a/kokkos/core/perf_test/PerfTest_Category.hpp
+++ b/kokkos/core/perf_test/PerfTest_Category.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -50,7 +50,7 @@
 namespace Test {
 
 extern int command_line_num_args(int n = 0);
-extern const char* command_line_arg(int k, char** input_args = NULL);
+extern const char* command_line_arg(int k, char** input_args = nullptr);
 
 }  // namespace Test
 
diff --git a/kokkos/core/perf_test/PerfTest_CustomReduction.cpp b/kokkos/core/perf_test/PerfTest_CustomReduction.cpp
index 7447eb6e7..75ca4a0d5 100644
--- a/kokkos/core/perf_test/PerfTest_CustomReduction.cpp
+++ b/kokkos/core/perf_test/PerfTest_CustomReduction.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -76,8 +76,8 @@ void custom_reduction_test(int N, int R, int num_trials) {
                     Kokkos::ThreadVectorRange(team, 32),
                     [&](const int& k, Scalar& max_) {
                       const Scalar val = a((i * 32 + j) * 32 + k);
-                      if (val > lmax) lmax = val;
-                      if ((k == 11) && (j == 17) && (i == 2)) lmax = 11.5;
+                      if (val > max_) max_ = val;
+                      if ((k == 11) && (j == 17) && (i == 2)) max_ = 11.5;
                     },
                     Kokkos::Max<Scalar>(t_max));
                 if (t_max > thread_max) thread_max = t_max;
@@ -106,8 +106,8 @@ void custom_reduction_test(int N, int R, int num_trials) {
                       Kokkos::ThreadVectorRange(team, 32),
                       [&](const int& k, Scalar& max_) {
                         const Scalar val = a((i * 32 + j) * 32 + k);
-                        if (val > lmax) lmax = val;
-                        if ((k == 11) && (j == 17) && (i == 2)) lmax = 11.5;
+                        if (val > max_) max_ = val;
+                        if ((k == 11) && (j == 17) && (i == 2)) max_ = 11.5;
                       },
                       Kokkos::Max<Scalar>(t_max));
                   if (t_max > thread_max) thread_max = t_max;
diff --git a/kokkos/core/perf_test/PerfTest_ViewAllocate.cpp b/kokkos/core/perf_test/PerfTest_ViewAllocate.cpp
index b71dce878..550316bec 100644
--- a/kokkos/core/perf_test/PerfTest_ViewAllocate.cpp
+++ b/kokkos/core/perf_test/PerfTest_ViewAllocate.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/perf_test/PerfTest_ViewCopy.hpp b/kokkos/core/perf_test/PerfTest_ViewCopy.hpp
index ded941107..8e7bf25e8 100644
--- a/kokkos/core/perf_test/PerfTest_ViewCopy.hpp
+++ b/kokkos/core/perf_test/PerfTest_ViewCopy.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/perf_test/PerfTest_ViewCopy_a123.cpp b/kokkos/core/perf_test/PerfTest_ViewCopy_a123.cpp
index ae0966969..dceef801a 100644
--- a/kokkos/core/perf_test/PerfTest_ViewCopy_a123.cpp
+++ b/kokkos/core/perf_test/PerfTest_ViewCopy_a123.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/perf_test/PerfTest_ViewCopy_a45.cpp b/kokkos/core/perf_test/PerfTest_ViewCopy_a45.cpp
index d7711f190..3f9b69446 100644
--- a/kokkos/core/perf_test/PerfTest_ViewCopy_a45.cpp
+++ b/kokkos/core/perf_test/PerfTest_ViewCopy_a45.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/perf_test/PerfTest_ViewCopy_a6.cpp b/kokkos/core/perf_test/PerfTest_ViewCopy_a6.cpp
index 4888d0d7c..ac364c31c 100644
--- a/kokkos/core/perf_test/PerfTest_ViewCopy_a6.cpp
+++ b/kokkos/core/perf_test/PerfTest_ViewCopy_a6.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/perf_test/PerfTest_ViewCopy_a7.cpp b/kokkos/core/perf_test/PerfTest_ViewCopy_a7.cpp
index 2aaaf075e..94f30bac9 100644
--- a/kokkos/core/perf_test/PerfTest_ViewCopy_a7.cpp
+++ b/kokkos/core/perf_test/PerfTest_ViewCopy_a7.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/perf_test/PerfTest_ViewCopy_a8.cpp b/kokkos/core/perf_test/PerfTest_ViewCopy_a8.cpp
index 9f5f2a91a..b916169f1 100644
--- a/kokkos/core/perf_test/PerfTest_ViewCopy_a8.cpp
+++ b/kokkos/core/perf_test/PerfTest_ViewCopy_a8.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/perf_test/PerfTest_ViewCopy_b123.cpp b/kokkos/core/perf_test/PerfTest_ViewCopy_b123.cpp
index 33d6570d2..f314cb0ff 100644
--- a/kokkos/core/perf_test/PerfTest_ViewCopy_b123.cpp
+++ b/kokkos/core/perf_test/PerfTest_ViewCopy_b123.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/perf_test/PerfTest_ViewCopy_b45.cpp b/kokkos/core/perf_test/PerfTest_ViewCopy_b45.cpp
index b20915e91..5d06f060a 100644
--- a/kokkos/core/perf_test/PerfTest_ViewCopy_b45.cpp
+++ b/kokkos/core/perf_test/PerfTest_ViewCopy_b45.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/perf_test/PerfTest_ViewCopy_b6.cpp b/kokkos/core/perf_test/PerfTest_ViewCopy_b6.cpp
index 98b8f0f13..0e28fee63 100644
--- a/kokkos/core/perf_test/PerfTest_ViewCopy_b6.cpp
+++ b/kokkos/core/perf_test/PerfTest_ViewCopy_b6.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/perf_test/PerfTest_ViewCopy_b7.cpp b/kokkos/core/perf_test/PerfTest_ViewCopy_b7.cpp
index 1d7a47cad..37e1325fc 100644
--- a/kokkos/core/perf_test/PerfTest_ViewCopy_b7.cpp
+++ b/kokkos/core/perf_test/PerfTest_ViewCopy_b7.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/perf_test/PerfTest_ViewCopy_b8.cpp b/kokkos/core/perf_test/PerfTest_ViewCopy_b8.cpp
index 869828ab3..986c39aaf 100644
--- a/kokkos/core/perf_test/PerfTest_ViewCopy_b8.cpp
+++ b/kokkos/core/perf_test/PerfTest_ViewCopy_b8.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/perf_test/PerfTest_ViewCopy_c123.cpp b/kokkos/core/perf_test/PerfTest_ViewCopy_c123.cpp
index d2ffb9bc8..b98563ee4 100644
--- a/kokkos/core/perf_test/PerfTest_ViewCopy_c123.cpp
+++ b/kokkos/core/perf_test/PerfTest_ViewCopy_c123.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/perf_test/PerfTest_ViewCopy_c45.cpp b/kokkos/core/perf_test/PerfTest_ViewCopy_c45.cpp
index 9d28f60ba..a0ef11e09 100644
--- a/kokkos/core/perf_test/PerfTest_ViewCopy_c45.cpp
+++ b/kokkos/core/perf_test/PerfTest_ViewCopy_c45.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/perf_test/PerfTest_ViewCopy_c6.cpp b/kokkos/core/perf_test/PerfTest_ViewCopy_c6.cpp
index 24ac4a53d..fea5dde73 100644
--- a/kokkos/core/perf_test/PerfTest_ViewCopy_c6.cpp
+++ b/kokkos/core/perf_test/PerfTest_ViewCopy_c6.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/perf_test/PerfTest_ViewCopy_c7.cpp b/kokkos/core/perf_test/PerfTest_ViewCopy_c7.cpp
index f4809bade..a8c8d866f 100644
--- a/kokkos/core/perf_test/PerfTest_ViewCopy_c7.cpp
+++ b/kokkos/core/perf_test/PerfTest_ViewCopy_c7.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/perf_test/PerfTest_ViewCopy_c8.cpp b/kokkos/core/perf_test/PerfTest_ViewCopy_c8.cpp
index 0955ebfb8..e5abdaa5d 100644
--- a/kokkos/core/perf_test/PerfTest_ViewCopy_c8.cpp
+++ b/kokkos/core/perf_test/PerfTest_ViewCopy_c8.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/perf_test/PerfTest_ViewCopy_d123.cpp b/kokkos/core/perf_test/PerfTest_ViewCopy_d123.cpp
index ed220d51b..2b58f8dd1 100644
--- a/kokkos/core/perf_test/PerfTest_ViewCopy_d123.cpp
+++ b/kokkos/core/perf_test/PerfTest_ViewCopy_d123.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/perf_test/PerfTest_ViewCopy_d45.cpp b/kokkos/core/perf_test/PerfTest_ViewCopy_d45.cpp
index e937ad5e2..fe34e4fd1 100644
--- a/kokkos/core/perf_test/PerfTest_ViewCopy_d45.cpp
+++ b/kokkos/core/perf_test/PerfTest_ViewCopy_d45.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/perf_test/PerfTest_ViewCopy_d6.cpp b/kokkos/core/perf_test/PerfTest_ViewCopy_d6.cpp
index 08f12d2de..115b223e6 100644
--- a/kokkos/core/perf_test/PerfTest_ViewCopy_d6.cpp
+++ b/kokkos/core/perf_test/PerfTest_ViewCopy_d6.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/perf_test/PerfTest_ViewCopy_d7.cpp b/kokkos/core/perf_test/PerfTest_ViewCopy_d7.cpp
index d5a6f3931..51e88795e 100644
--- a/kokkos/core/perf_test/PerfTest_ViewCopy_d7.cpp
+++ b/kokkos/core/perf_test/PerfTest_ViewCopy_d7.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/perf_test/PerfTest_ViewCopy_d8.cpp b/kokkos/core/perf_test/PerfTest_ViewCopy_d8.cpp
index 4015686e6..2a53cdef2 100644
--- a/kokkos/core/perf_test/PerfTest_ViewCopy_d8.cpp
+++ b/kokkos/core/perf_test/PerfTest_ViewCopy_d8.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/perf_test/PerfTest_ViewFill.hpp b/kokkos/core/perf_test/PerfTest_ViewFill.hpp
index b1b7350c4..38be4bb21 100644
--- a/kokkos/core/perf_test/PerfTest_ViewFill.hpp
+++ b/kokkos/core/perf_test/PerfTest_ViewFill.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/perf_test/PerfTest_ViewFill_123.cpp b/kokkos/core/perf_test/PerfTest_ViewFill_123.cpp
index 448410cf8..0bf8a2832 100644
--- a/kokkos/core/perf_test/PerfTest_ViewFill_123.cpp
+++ b/kokkos/core/perf_test/PerfTest_ViewFill_123.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/perf_test/PerfTest_ViewFill_45.cpp b/kokkos/core/perf_test/PerfTest_ViewFill_45.cpp
index 6893f6830..53ac509da 100644
--- a/kokkos/core/perf_test/PerfTest_ViewFill_45.cpp
+++ b/kokkos/core/perf_test/PerfTest_ViewFill_45.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/perf_test/PerfTest_ViewFill_6.cpp b/kokkos/core/perf_test/PerfTest_ViewFill_6.cpp
index 299790b31..f0a2e248f 100644
--- a/kokkos/core/perf_test/PerfTest_ViewFill_6.cpp
+++ b/kokkos/core/perf_test/PerfTest_ViewFill_6.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/perf_test/PerfTest_ViewFill_7.cpp b/kokkos/core/perf_test/PerfTest_ViewFill_7.cpp
index 825ffb3fa..675d9e636 100644
--- a/kokkos/core/perf_test/PerfTest_ViewFill_7.cpp
+++ b/kokkos/core/perf_test/PerfTest_ViewFill_7.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/perf_test/PerfTest_ViewFill_8.cpp b/kokkos/core/perf_test/PerfTest_ViewFill_8.cpp
index 199581d0f..35e1e81c4 100644
--- a/kokkos/core/perf_test/PerfTest_ViewFill_8.cpp
+++ b/kokkos/core/perf_test/PerfTest_ViewFill_8.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/perf_test/PerfTest_ViewResize.hpp b/kokkos/core/perf_test/PerfTest_ViewResize.hpp
index e38c69593..2ea81b504 100644
--- a/kokkos/core/perf_test/PerfTest_ViewResize.hpp
+++ b/kokkos/core/perf_test/PerfTest_ViewResize.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/perf_test/PerfTest_ViewResize_123.cpp b/kokkos/core/perf_test/PerfTest_ViewResize_123.cpp
index 993ad3eda..1dc4f285f 100644
--- a/kokkos/core/perf_test/PerfTest_ViewResize_123.cpp
+++ b/kokkos/core/perf_test/PerfTest_ViewResize_123.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/perf_test/PerfTest_ViewResize_45.cpp b/kokkos/core/perf_test/PerfTest_ViewResize_45.cpp
index feaecf51d..3754a5bb1 100644
--- a/kokkos/core/perf_test/PerfTest_ViewResize_45.cpp
+++ b/kokkos/core/perf_test/PerfTest_ViewResize_45.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/perf_test/PerfTest_ViewResize_6.cpp b/kokkos/core/perf_test/PerfTest_ViewResize_6.cpp
index d3d1585c1..1b8d6fbc8 100644
--- a/kokkos/core/perf_test/PerfTest_ViewResize_6.cpp
+++ b/kokkos/core/perf_test/PerfTest_ViewResize_6.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/perf_test/PerfTest_ViewResize_7.cpp b/kokkos/core/perf_test/PerfTest_ViewResize_7.cpp
index 021c7fa07..f8efa195f 100644
--- a/kokkos/core/perf_test/PerfTest_ViewResize_7.cpp
+++ b/kokkos/core/perf_test/PerfTest_ViewResize_7.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/perf_test/PerfTest_ViewResize_8.cpp b/kokkos/core/perf_test/PerfTest_ViewResize_8.cpp
index 60ca0d618..afeeb6435 100644
--- a/kokkos/core/perf_test/PerfTest_ViewResize_8.cpp
+++ b/kokkos/core/perf_test/PerfTest_ViewResize_8.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/perf_test/test_atomic.cpp b/kokkos/core/perf_test/test_atomic.cpp
index df4e1a0b2..7699d7b91 100644
--- a/kokkos/core/perf_test/test_atomic.cpp
+++ b/kokkos/core/perf_test/test_atomic.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/perf_test/test_mempool.cpp b/kokkos/core/perf_test/test_mempool.cpp
index 1186cf1bb..ad8622e7a 100644
--- a/kokkos/core/perf_test/test_mempool.cpp
+++ b/kokkos/core/perf_test/test_mempool.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/perf_test/test_taskdag.cpp b/kokkos/core/perf_test/test_taskdag.cpp
index b0dcb0531..a97edc59e 100644
--- a/kokkos/core/perf_test/test_taskdag.cpp
+++ b/kokkos/core/perf_test/test_taskdag.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/CMakeLists.txt b/kokkos/core/src/CMakeLists.txt
index eb058a982..5b91b3078 100644
--- a/kokkos/core/src/CMakeLists.txt
+++ b/kokkos/core/src/CMakeLists.txt
@@ -35,6 +35,10 @@ IF (KOKKOS_ENABLE_OPENMP)
   ENDIF()
 ENDIF()
 
+IF (KOKKOS_ENABLE_OPENMPTARGET)
+  APPEND_GLOB(KOKKOS_CORE_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/OpenMPTarget/*.cpp)
+ENDIF()
+
 IF (KOKKOS_ENABLE_PTHREAD)
   APPEND_GLOB(KOKKOS_CORE_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/Threads/*.cpp)
   IF (KOKKOS_ENABLE_ETI)
@@ -42,6 +46,10 @@ IF (KOKKOS_ENABLE_PTHREAD)
   ENDIF()
 ENDIF()
 
+IF (KOKKOS_ENABLE_HIP)
+  APPEND_GLOB(KOKKOS_CORE_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/HIP/*.cpp)
+ENDIF()
+
 IF (KOKKOS_ENABLE_HPX)
   APPEND_GLOB(KOKKOS_CORE_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/HPX/*.cpp)
 ENDIF()
diff --git a/kokkos/core/src/Cuda/KokkosExp_Cuda_IterateTile.hpp b/kokkos/core/src/Cuda/KokkosExp_Cuda_IterateTile.hpp
index 3cb5a8019..370626392 100644
--- a/kokkos/core/src/Cuda/KokkosExp_Cuda_IterateTile.hpp
+++ b/kokkos/core/src/Cuda/KokkosExp_Cuda_IterateTile.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/Cuda/KokkosExp_Cuda_IterateTile_Refactor.hpp b/kokkos/core/src/Cuda/KokkosExp_Cuda_IterateTile_Refactor.hpp
index 37a304a03..cb7f5971a 100644
--- a/kokkos/core/src/Cuda/KokkosExp_Cuda_IterateTile_Refactor.hpp
+++ b/kokkos/core/src/Cuda/KokkosExp_Cuda_IterateTile_Refactor.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/Cuda/Kokkos_CudaSpace.cpp b/kokkos/core/src/Cuda/Kokkos_CudaSpace.cpp
index 9dd1ccfd8..e11961d76 100644
--- a/kokkos/core/src/Cuda/Kokkos_CudaSpace.cpp
+++ b/kokkos/core/src/Cuda/Kokkos_CudaSpace.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -147,7 +147,7 @@ void CudaSpace::access_error(const void *const) {
 /*--------------------------------------------------------------------------*/
 
 bool CudaUVMSpace::available() {
-#if defined(CUDA_VERSION) && (6000 <= CUDA_VERSION) && !defined(__APPLE__)
+#if defined(CUDA_VERSION) && !defined(__APPLE__)
   enum { UVM_available = true };
 #else
   enum { UVM_available = false };
@@ -219,19 +219,10 @@ void *CudaSpace::allocate(const size_t arg_alloc_size) const {
 void *CudaUVMSpace::allocate(const size_t arg_alloc_size) const {
   void *ptr = nullptr;
 
-  enum { max_uvm_allocations = 65536 };
-
   Cuda::impl_static_fence();
   if (arg_alloc_size > 0) {
     Kokkos::Impl::num_uvm_allocations++;
 
-    if (Kokkos::Impl::num_uvm_allocations.load() > max_uvm_allocations) {
-      throw Experimental::CudaRawMemoryAllocationFailure(
-          arg_alloc_size, 1,
-          Experimental::RawMemoryAllocationFailure::FailureMode::
-              MaximumCudaUVMAllocationsExceeded);
-    }
-
     auto error_code =
         cudaMallocManaged(&ptr, arg_alloc_size, cudaMemAttachGlobal);
 
@@ -360,7 +351,8 @@ SharedAllocationRecord<Kokkos::CudaSpace, void>::attach_texture_object(
   resDesc.res.linear.sizeInBytes = alloc_size;
   resDesc.res.linear.devPtr      = alloc_ptr;
 
-  CUDA_SAFE_CALL(cudaCreateTextureObject(&tex_obj, &resDesc, &texDesc, NULL));
+  CUDA_SAFE_CALL(
+      cudaCreateTextureObject(&tex_obj, &resDesc, &texDesc, nullptr));
 
   return tex_obj;
 }
@@ -797,6 +789,8 @@ SharedAllocationRecord<Kokkos::CudaHostPinnedSpace, void>
 // Iterate records to print orphaned memory ...
 void SharedAllocationRecord<Kokkos::CudaSpace, void>::print_records(
     std::ostream &s, const Kokkos::CudaSpace &, bool detail) {
+  (void)s;
+  (void)detail;
 #ifdef KOKKOS_DEBUG
   SharedAllocationRecord<void, void> *r = &s_root_record;
 
@@ -869,6 +863,8 @@ void SharedAllocationRecord<Kokkos::CudaSpace, void>::print_records(
 
 void SharedAllocationRecord<Kokkos::CudaUVMSpace, void>::print_records(
     std::ostream &s, const Kokkos::CudaUVMSpace &, bool detail) {
+  (void)s;
+  (void)detail;
 #ifdef KOKKOS_DEBUG
   SharedAllocationRecord<void, void>::print_host_accessible_records(
       s, "CudaUVM", &s_root_record, detail);
@@ -881,6 +877,8 @@ void SharedAllocationRecord<Kokkos::CudaUVMSpace, void>::print_records(
 
 void SharedAllocationRecord<Kokkos::CudaHostPinnedSpace, void>::print_records(
     std::ostream &s, const Kokkos::CudaHostPinnedSpace &, bool detail) {
+  (void)s;
+  (void)detail;
 #ifdef KOKKOS_DEBUG
   SharedAllocationRecord<void, void>::print_host_accessible_records(
       s, "CudaHostPinned", &s_root_record, detail);
@@ -895,7 +893,7 @@ void SharedAllocationRecord<Kokkos::CudaHostPinnedSpace, void>::print_records(
 //==============================================================================
 
 void *cuda_resize_scratch_space(std::int64_t bytes, bool force_shrink) {
-  static void *ptr                 = NULL;
+  static void *ptr                 = nullptr;
   static std::int64_t current_size = 0;
   if (current_size == 0) {
     current_size = bytes;
@@ -917,6 +915,27 @@ void *cuda_resize_scratch_space(std::int64_t bytes, bool force_shrink) {
   return ptr;
 }
 
+void cuda_prefetch_pointer(const Cuda &space, const void *ptr, size_t bytes,
+                           bool to_device) {
+  if ((ptr == nullptr) || (bytes == 0)) return;
+  cudaPointerAttributes attr;
+  CUDA_SAFE_CALL(cudaPointerGetAttributes(&attr, ptr));
+  // I measured this and it turns out prefetching towards the host slows
+  // DualView syncs down. Probably because the latency is not too bad in the
+  // first place for the pull down. If we want to change that provde
+  // cudaCpuDeviceId as the device if to_device is false
+#if CUDA_VERSION < 10000
+  bool is_managed = attr.isManaged;
+#else
+  bool is_managed = attr.type == cudaMemoryTypeManaged;
+#endif
+  if (to_device && is_managed &&
+      space.cuda_device_prop().concurrentManagedAccess) {
+    CUDA_SAFE_CALL(cudaMemPrefetchAsync(ptr, bytes, space.cuda_device(),
+                                        space.cuda_stream()));
+  }
+}
+
 }  // namespace Impl
 }  // namespace Kokkos
 #else
diff --git a/kokkos/core/src/Cuda/Kokkos_Cuda_Alloc.hpp b/kokkos/core/src/Cuda/Kokkos_Cuda_Alloc.hpp
index b2f55e315..e76133fae 100644
--- a/kokkos/core/src/Cuda/Kokkos_Cuda_Alloc.hpp
+++ b/kokkos/core/src/Cuda/Kokkos_Cuda_Alloc.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/Cuda/Kokkos_Cuda_Atomic_Intrinsics.hpp b/kokkos/core/src/Cuda/Kokkos_Cuda_Atomic_Intrinsics.hpp
index 6badf2b19..8a6c0433c 100644
--- a/kokkos/core/src/Cuda/Kokkos_Cuda_Atomic_Intrinsics.hpp
+++ b/kokkos/core/src/Cuda/Kokkos_Cuda_Atomic_Intrinsics.hpp
@@ -53,10 +53,10 @@ LICENSE ASSOCIATED WITH SUBSEQUENT MODIFICATIONS
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/Cuda/Kokkos_Cuda_Atomic_Intrinsics_Restore_Builtins.hpp b/kokkos/core/src/Cuda/Kokkos_Cuda_Atomic_Intrinsics_Restore_Builtins.hpp
index fe61ddbd3..d7cd1bab1 100644
--- a/kokkos/core/src/Cuda/Kokkos_Cuda_Atomic_Intrinsics_Restore_Builtins.hpp
+++ b/kokkos/core/src/Cuda/Kokkos_Cuda_Atomic_Intrinsics_Restore_Builtins.hpp
@@ -23,10 +23,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/Cuda/Kokkos_Cuda_BlockSize_Deduction.hpp b/kokkos/core/src/Cuda/Kokkos_Cuda_BlockSize_Deduction.hpp
index c1cdf0066..34b681be1 100644
--- a/kokkos/core/src/Cuda/Kokkos_Cuda_BlockSize_Deduction.hpp
+++ b/kokkos/core/src/Cuda/Kokkos_Cuda_BlockSize_Deduction.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/Cuda/Kokkos_Cuda_Error.hpp b/kokkos/core/src/Cuda/Kokkos_Cuda_Error.hpp
index e498decba..01e60315e 100644
--- a/kokkos/core/src/Cuda/Kokkos_Cuda_Error.hpp
+++ b/kokkos/core/src/Cuda/Kokkos_Cuda_Error.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -58,10 +58,10 @@ namespace Impl {
 void cuda_device_synchronize();
 
 void cuda_internal_error_throw(cudaError e, const char* name,
-                               const char* file = NULL, const int line = 0);
+                               const char* file = nullptr, const int line = 0);
 
 inline void cuda_internal_safe_call(cudaError e, const char* name,
-                                    const char* file = NULL,
+                                    const char* file = nullptr,
                                     const int line   = 0) {
   if (cudaSuccess != e) {
     cuda_internal_error_throw(e, name, file, line);
diff --git a/kokkos/core/src/Cuda/Kokkos_Cuda_Instance.cpp b/kokkos/core/src/Cuda/Kokkos_Cuda_Instance.cpp
index 359310e59..37d0ffb68 100644
--- a/kokkos/core/src/Cuda/Kokkos_Cuda_Instance.cpp
+++ b/kokkos/core/src/Cuda/Kokkos_Cuda_Instance.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -115,10 +115,14 @@ __global__ void query_cuda_kernel_arch(int *d_arch) {
 
 /** Query what compute capability is actually launched to the device: */
 int cuda_kernel_arch() {
-  int *d_arch = 0;
+  int arch    = 0;
+  int *d_arch = nullptr;
+
   cudaMalloc((void **)&d_arch, sizeof(int));
+  cudaMemcpy(d_arch, &arch, sizeof(int), cudaMemcpyDefault);
+
   query_cuda_kernel_arch<<<1, 1>>>(d_arch);
-  int arch = 0;
+
   cudaMemcpy(&arch, d_arch, sizeof(int), cudaMemcpyDefault);
   cudaFree(d_arch);
   return arch;
@@ -313,6 +317,7 @@ void CudaInternal::initialize(int cuda_device_id, cudaStream_t stream) {
 
   enum { WordSize = sizeof(size_type) };
 
+#ifndef KOKKOS_IMPL_TURN_OFF_CUDA_HOST_INIT_CHECK
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
   if (!HostSpace::execution_space::is_initialized()) {
 #else
@@ -323,6 +328,7 @@ void CudaInternal::initialize(int cuda_device_id, cudaStream_t stream) {
         "initialized");
     throw_runtime_exception(msg);
   }
+#endif
 
   const CudaInternalDevices &dev_info = CudaInternalDevices::singleton();
 
@@ -340,7 +346,8 @@ void CudaInternal::initialize(int cuda_device_id, cudaStream_t stream) {
   if (ok_init && ok_dev) {
     const struct cudaDeviceProp &cudaProp = dev_info.m_cudaProp[cuda_device_id];
 
-    m_cudaDev = cuda_device_id;
+    m_cudaDev    = cuda_device_id;
+    m_deviceProp = cudaProp;
 
     CUDA_SAFE_CALL(cudaSetDevice(m_cudaDev));
     Kokkos::Impl::cuda_device_synchronize();
@@ -348,17 +355,24 @@ void CudaInternal::initialize(int cuda_device_id, cudaStream_t stream) {
     // Query what compute capability architecture a kernel executes:
     m_cudaArch = cuda_kernel_arch();
 
+    if (m_cudaArch == 0) {
+      std::stringstream ss;
+      ss << "Kokkos::Cuda::initialize ERROR: likely mismatch of architecture"
+         << std::endl;
+      std::string msg = ss.str();
+      Kokkos::abort(msg.c_str());
+    }
+
     int compiled_major = m_cudaArch / 100;
     int compiled_minor = (m_cudaArch % 100) / 10;
 
-    if (compiled_major < 5 && cudaProp.major >= 5) {
+    if (compiled_major != cudaProp.major || compiled_minor < cudaProp.minor) {
       std::stringstream ss;
       ss << "Kokkos::Cuda::initialize ERROR: running kernels compiled for "
             "compute capability "
          << compiled_major << "." << compiled_minor
-         << " (< 5.0) on device with compute capability " << cudaProp.major
-         << "." << cudaProp.minor
-         << " (>=5.0), this would give incorrect results!" << std::endl;
+         << " on device with compute capability " << cudaProp.major << "."
+         << cudaProp.minor << " is not supported by CUDA!" << std::endl;
       std::string msg = ss.str();
       Kokkos::abort(msg.c_str());
     }
@@ -742,7 +756,7 @@ int Cuda::impl_is_initialized()
 void Cuda::initialize(const Cuda::SelectDevice config, size_t num_instances)
 #else
 void Cuda::impl_initialize(const Cuda::SelectDevice config,
-                           size_t num_instances)
+                           size_t /*num_instances*/)
 #endif
 {
   Impl::CudaInternal::singleton().initialize(config.cuda_device_id, 0);
@@ -826,6 +840,9 @@ const char *Cuda::name() { return "Cuda"; }
 
 cudaStream_t Cuda::cuda_stream() const { return m_space_instance->m_stream; }
 int Cuda::cuda_device() const { return m_space_instance->m_cudaDev; }
+const cudaDeviceProp &Cuda::cuda_device_prop() const {
+  return m_space_instance->m_deviceProp;
+}
 
 }  // namespace Kokkos
 
diff --git a/kokkos/core/src/Cuda/Kokkos_Cuda_Instance.hpp b/kokkos/core/src/Cuda/Kokkos_Cuda_Instance.hpp
index 9d2c939af..2158f03dd 100644
--- a/kokkos/core/src/Cuda/Kokkos_Cuda_Instance.hpp
+++ b/kokkos/core/src/Cuda/Kokkos_Cuda_Instance.hpp
@@ -97,6 +97,8 @@ class CudaInternal {
   int m_maxThreadsPerSM;
   int m_maxThreadsPerBlock;
 
+  cudaDeviceProp m_deviceProp;
+
   mutable size_type m_scratchSpaceCount;
   mutable size_type m_scratchFlagsCount;
   mutable size_type m_scratchUnifiedCount;
diff --git a/kokkos/core/src/Cuda/Kokkos_Cuda_KernelLaunch.hpp b/kokkos/core/src/Cuda/Kokkos_Cuda_KernelLaunch.hpp
index 292832e15..ca72b3b30 100644
--- a/kokkos/core/src/Cuda/Kokkos_Cuda_KernelLaunch.hpp
+++ b/kokkos/core/src/Cuda/Kokkos_Cuda_KernelLaunch.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -150,7 +150,7 @@ template <class DriverType>
 __global__ static void cuda_parallel_launch_constant_or_global_memory(
     const DriverType* driver_ptr) {
   const DriverType& driver =
-      driver_ptr != NULL
+      driver_ptr != nullptr
           ? *driver_ptr
           : *((const DriverType*)kokkos_impl_cuda_constant_memory_buffer);
 
@@ -162,7 +162,7 @@ __global__
 __launch_bounds__(maxTperB, minBperSM) static void cuda_parallel_launch_constant_or_global_memory(
     const DriverType* driver_ptr) {
   const DriverType& driver =
-      driver_ptr != NULL
+      driver_ptr != nullptr
           ? *driver_ptr
           : *((const DriverType*)kokkos_impl_cuda_constant_memory_buffer);
 
@@ -260,6 +260,8 @@ struct CudaParallelLaunch<
             (prefer_shmem ? cudaFuncCachePreferShared
                           : cudaFuncCachePreferL1)));
       }
+#else
+      (void)prefer_shmem;
 #endif
 
       // Copy functor to constant memory on the device
@@ -317,6 +319,8 @@ struct CudaParallelLaunch<DriverType, Kokkos::LaunchBounds<0, 0>,
             (prefer_shmem ? cudaFuncCachePreferShared
                           : cudaFuncCachePreferL1)));
       }
+#else
+      (void)prefer_shmem;
 #endif
 
       // Copy functor to constant memory on the device
@@ -371,6 +375,8 @@ struct CudaParallelLaunch<
             (prefer_shmem ? cudaFuncCachePreferShared
                           : cudaFuncCachePreferL1)));
       }
+#else
+      (void)prefer_shmem;
 #endif
 
       KOKKOS_ENSURE_CUDA_LOCK_ARRAYS_ON_DEVICE();
@@ -419,6 +425,8 @@ struct CudaParallelLaunch<DriverType, Kokkos::LaunchBounds<0, 0>,
             (prefer_shmem ? cudaFuncCachePreferShared
                           : cudaFuncCachePreferL1)));
       }
+#else
+      (void)prefer_shmem;
 #endif
 
       KOKKOS_ENSURE_CUDA_LOCK_ARRAYS_ON_DEVICE();
@@ -465,11 +473,13 @@ struct CudaParallelLaunch<
             (prefer_shmem ? cudaFuncCachePreferShared
                           : cudaFuncCachePreferL1)));
       }
+#else
+      (void)prefer_shmem;
 #endif
 
       KOKKOS_ENSURE_CUDA_LOCK_ARRAYS_ON_DEVICE();
 
-      DriverType* driver_ptr = NULL;
+      DriverType* driver_ptr = nullptr;
       driver_ptr             = reinterpret_cast<DriverType*>(
           cuda_instance->scratch_functor(sizeof(DriverType)));
       cudaMemcpyAsync(driver_ptr, &driver, sizeof(DriverType),
@@ -516,11 +526,13 @@ struct CudaParallelLaunch<DriverType, Kokkos::LaunchBounds<0, 0>,
             (prefer_shmem ? cudaFuncCachePreferShared
                           : cudaFuncCachePreferL1)));
       }
+#else
+      (void)prefer_shmem;
 #endif
 
       KOKKOS_ENSURE_CUDA_LOCK_ARRAYS_ON_DEVICE();
 
-      DriverType* driver_ptr = NULL;
+      DriverType* driver_ptr = nullptr;
       driver_ptr             = reinterpret_cast<DriverType*>(
           cuda_instance->scratch_functor(sizeof(DriverType)));
       cudaMemcpyAsync(driver_ptr, &driver, sizeof(DriverType),
diff --git a/kokkos/core/src/Cuda/Kokkos_Cuda_Locks.cpp b/kokkos/core/src/Cuda/Kokkos_Cuda_Locks.cpp
index 41fc522b5..07dadb3c1 100644
--- a/kokkos/core/src/Cuda/Kokkos_Cuda_Locks.cpp
+++ b/kokkos/core/src/Cuda/Kokkos_Cuda_Locks.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/Cuda/Kokkos_Cuda_Locks.hpp b/kokkos/core/src/Cuda/Kokkos_Cuda_Locks.hpp
index 8baf295ef..a4b5d08cc 100644
--- a/kokkos/core/src/Cuda/Kokkos_Cuda_Locks.hpp
+++ b/kokkos/core/src/Cuda/Kokkos_Cuda_Locks.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -113,10 +113,10 @@ __device__
 
 #define CUDA_SPACE_ATOMIC_MASK 0x1FFFF
 
-/// \brief Aquire a lock for the address
+/// \brief Acquire a lock for the address
 ///
-/// This function tries to aquire the lock for the hash value derived
-/// from the provided ptr. If the lock is successfully aquired the
+/// This function tries to acquire the lock for the hash value derived
+/// from the provided ptr. If the lock is successfully acquired the
 /// function returns true. Otherwise it returns false.
 __device__ inline bool lock_address_cuda_space(void* ptr) {
   size_t offset = size_t(ptr);
@@ -131,7 +131,7 @@ __device__ inline bool lock_address_cuda_space(void* ptr) {
 ///
 /// This function releases the lock for the hash value derived
 /// from the provided ptr. This function should only be called
-/// after previously successfully aquiring a lock with
+/// after previously successfully acquiring a lock with
 /// lock_address.
 __device__ inline void unlock_address_cuda_space(void* ptr) {
   size_t offset = size_t(ptr);
diff --git a/kokkos/core/src/Cuda/Kokkos_Cuda_Parallel.hpp b/kokkos/core/src/Cuda/Kokkos_Cuda_Parallel.hpp
index a3469ef4a..71ddadf74 100644
--- a/kokkos/core/src/Cuda/Kokkos_Cuda_Parallel.hpp
+++ b/kokkos/core/src/Cuda/Kokkos_Cuda_Parallel.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -192,7 +192,7 @@ class TeamPolicyInternal<Kokkos::Cuda, Properties...>
   }
 
   template <class FunctorType, class ReducerType>
-  inline int team_size_max(const FunctorType& f, const ReducerType& r,
+  inline int team_size_max(const FunctorType& f, const ReducerType& /*r*/,
                            const ParallelReduceTag&) const {
     using closure_type =
         Impl::ParallelReduce<FunctorType, TeamPolicy<Properties...>,
@@ -304,7 +304,7 @@ class TeamPolicyInternal<Kokkos::Cuda, Properties...>
     return m_thread_scratch_size[level];
   }
 
-  inline typename traits::execution_space space() const { return m_space; }
+  const typename traits::execution_space& space() const { return m_space; }
 
   TeamPolicyInternal()
       : m_space(typename traits::execution_space()),
@@ -325,13 +325,13 @@ class TeamPolicyInternal<Kokkos::Cuda, Properties...>
         m_team_scratch_size{0, 0},
         m_thread_scratch_size{0, 0},
         m_chunk_size(32) {
-    // Make sure league size is permissable
+    // Make sure league size is permissible
     if (league_size_ >= int(Impl::cuda_internal_maximum_grid_count()))
       Impl::throw_runtime_exception(
           "Requested too large league_size for TeamPolicy on Cuda execution "
           "space.");
 
-    // Make sure total block size is permissable
+    // Make sure total block size is permissible
     if (m_team_size * m_vector_length > 1024) {
       Impl::throw_runtime_exception(
           std::string("Kokkos::TeamPolicy< Cuda > the team size is too large. "
@@ -351,7 +351,7 @@ class TeamPolicyInternal<Kokkos::Cuda, Properties...>
         m_team_scratch_size{0, 0},
         m_thread_scratch_size{0, 0},
         m_chunk_size(32) {
-    // Make sure league size is permissable
+    // Make sure league size is permissible
     if (league_size_ >= int(Impl::cuda_internal_maximum_grid_count()))
       Impl::throw_runtime_exception(
           "Requested too large league_size for TeamPolicy on Cuda execution "
@@ -367,13 +367,13 @@ class TeamPolicyInternal<Kokkos::Cuda, Properties...>
         m_team_scratch_size{0, 0},
         m_thread_scratch_size{0, 0},
         m_chunk_size(32) {
-    // Make sure league size is permissable
+    // Make sure league size is permissible
     if (league_size_ >= int(Impl::cuda_internal_maximum_grid_count()))
       Impl::throw_runtime_exception(
           "Requested too large league_size for TeamPolicy on Cuda execution "
           "space.");
 
-    // Make sure total block size is permissable
+    // Make sure total block size is permissible
     if (m_team_size * m_vector_length > 1024) {
       Impl::throw_runtime_exception(
           std::string("Kokkos::TeamPolicy< Cuda > the team size is too large. "
@@ -392,7 +392,7 @@ class TeamPolicyInternal<Kokkos::Cuda, Properties...>
         m_team_scratch_size{0, 0},
         m_thread_scratch_size{0, 0},
         m_chunk_size(32) {
-    // Make sure league size is permissable
+    // Make sure league size is permissible
     if (league_size_ >= int(Impl::cuda_internal_maximum_grid_count()))
       Impl::throw_runtime_exception(
           "Requested too large league_size for TeamPolicy on Cuda execution "
@@ -895,10 +895,10 @@ class ParallelFor<FunctorType, Kokkos::TeamPolicy<Properties...>,
 
     // Functor's reduce memory, team scan memory, and team shared memory depend
     // upon team size.
-    m_scratch_ptr[0] = NULL;
+    m_scratch_ptr[0] = nullptr;
     m_scratch_ptr[1] =
         m_team_size <= 0
-            ? NULL
+            ? nullptr
             : cuda_resize_scratch_space(
                   static_cast<ptrdiff_t>(m_scratch_size[1]) *
                   static_cast<ptrdiff_t>(Cuda::concurrency() /
@@ -1207,7 +1207,7 @@ class ParallelReduce<FunctorType, Kokkos::RangePolicy<Traits...>, ReducerType,
   ParallelReduce(const FunctorType& arg_functor, const Policy& arg_policy,
                  const ViewType& arg_result,
                  typename std::enable_if<Kokkos::is_view<ViewType>::value,
-                                         void*>::type = NULL)
+                                         void*>::type = nullptr)
       : m_functor(arg_functor),
         m_policy(arg_policy),
         m_reducer(InvalidType()),
@@ -1499,7 +1499,7 @@ class ParallelReduce<FunctorType, Kokkos::MDRangePolicy<Traits...>, ReducerType,
   ParallelReduce(const FunctorType& arg_functor, const Policy& arg_policy,
                  const ViewType& arg_result,
                  typename std::enable_if<Kokkos::is_view<ViewType>::value,
-                                         void*>::type = NULL)
+                                         void*>::type = nullptr)
       : m_functor(arg_functor),
         m_policy(arg_policy),
         m_reducer(InvalidType()),
@@ -1810,7 +1810,7 @@ class ParallelReduce<FunctorType, Kokkos::TeamPolicy<Properties...>,
   ParallelReduce(const FunctorType& arg_functor, const Policy& arg_policy,
                  const ViewType& arg_result,
                  typename std::enable_if<Kokkos::is_view<ViewType>::value,
-                                         void*>::type = NULL)
+                                         void*>::type = nullptr)
       : m_functor(arg_functor),
         m_policy(arg_policy),
         m_reducer(InvalidType()),
@@ -1824,7 +1824,7 @@ class ParallelReduce<FunctorType, Kokkos::TeamPolicy<Properties...>,
         m_team_begin(0),
         m_shmem_begin(0),
         m_shmem_size(0),
-        m_scratch_ptr{NULL, NULL},
+        m_scratch_ptr{nullptr, nullptr},
         m_league_size(arg_policy.league_size()),
         m_team_size(arg_policy.team_size()),
         m_vector_size(arg_policy.vector_length()) {
@@ -1861,7 +1861,7 @@ class ParallelReduce<FunctorType, Kokkos::TeamPolicy<Properties...>,
     m_scratch_size[1] = m_policy.scratch_size(1, m_team_size);
     m_scratch_ptr[1] =
         m_team_size <= 0
-            ? NULL
+            ? nullptr
             : cuda_resize_scratch_space(
                   static_cast<std::int64_t>(m_scratch_size[1]) *
                   (static_cast<std::int64_t>(Cuda::concurrency() /
@@ -1923,7 +1923,7 @@ class ParallelReduce<FunctorType, Kokkos::TeamPolicy<Properties...>,
         m_team_begin(0),
         m_shmem_begin(0),
         m_shmem_size(0),
-        m_scratch_ptr{NULL, NULL},
+        m_scratch_ptr{nullptr, nullptr},
         m_league_size(arg_policy.league_size()),
         m_team_size(arg_policy.team_size()),
         m_vector_size(arg_policy.vector_length()) {
@@ -1960,7 +1960,7 @@ class ParallelReduce<FunctorType, Kokkos::TeamPolicy<Properties...>,
     m_scratch_size[1] = m_policy.scratch_size(1, m_team_size);
     m_scratch_ptr[1] =
         m_team_size <= 0
-            ? NULL
+            ? nullptr
             : cuda_resize_scratch_space(
                   static_cast<ptrdiff_t>(m_scratch_size[1]) *
                   static_cast<ptrdiff_t>(Cuda::concurrency() /
diff --git a/kokkos/core/src/Cuda/Kokkos_Cuda_ReduceScan.hpp b/kokkos/core/src/Cuda/Kokkos_Cuda_ReduceScan.hpp
index 04ad33e55..7d996fba0 100644
--- a/kokkos/core/src/Cuda/Kokkos_Cuda_ReduceScan.hpp
+++ b/kokkos/core/src/Cuda/Kokkos_Cuda_ReduceScan.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -133,7 +133,8 @@ __device__ bool cuda_inter_block_reduction(
     typename FunctorValueTraits<FunctorType, ArgTag>::reference_type value,
     typename FunctorValueTraits<FunctorType, ArgTag>::reference_type neutral,
     const JoinOp& join, Cuda::size_type* const m_scratch_space,
-    typename FunctorValueTraits<FunctorType, ArgTag>::pointer_type const result,
+    typename FunctorValueTraits<FunctorType,
+                                ArgTag>::pointer_type const /*result*/,
     Cuda::size_type* const m_scratch_flags,
     const int max_active_thread = blockDim.y) {
 #ifdef __CUDA_ARCH__
@@ -236,6 +237,12 @@ __device__ bool cuda_inter_block_reduction(
   // "value"
   return last_block;
 #else
+  (void)value;
+  (void)neutral;
+  (void)join;
+  (void)m_scratch_space;
+  (void)m_scratch_flags;
+  (void)max_active_thread;
   return true;
 #endif
 }
@@ -426,6 +433,10 @@ __device__ inline
   // "value"
   return last_block;
 #else
+  (void)reducer;
+  (void)m_scratch_space;
+  (void)m_scratch_flags;
+  (void)max_active_thread;
   return true;
 #endif
 }
@@ -500,7 +511,7 @@ struct CudaReductionsFunctor<FunctorType, ArgTag, false, true> {
   }
 
   __device__ static inline bool scalar_inter_block_reduction(
-      const FunctorType& functor, const Cuda::size_type block_id,
+      const FunctorType& functor, const Cuda::size_type /*block_id*/,
       const Cuda::size_type block_count, Cuda::size_type* const shared_data,
       Cuda::size_type* const global_data, Cuda::size_type* const global_flags) {
     Scalar* const global_team_buffer_element = ((Scalar*)global_data);
@@ -577,7 +588,7 @@ struct CudaReductionsFunctor<FunctorType, ArgTag, false, false> {
 
   __device__ static inline void scalar_intra_block_reduction(
       const FunctorType& functor, Scalar value, const bool skip, Scalar* result,
-      const int shared_elements, Scalar* shared_team_buffer_element) {
+      const int /*shared_elements*/, Scalar* shared_team_buffer_element) {
     const int warp_id = (threadIdx.y * blockDim.x) / 32;
     Scalar* const my_shared_team_buffer_element =
         shared_team_buffer_element + threadIdx.y * blockDim.x + threadIdx.x;
@@ -601,7 +612,7 @@ struct CudaReductionsFunctor<FunctorType, ArgTag, false, false> {
   }
 
   __device__ static inline bool scalar_inter_block_reduction(
-      const FunctorType& functor, const Cuda::size_type block_id,
+      const FunctorType& functor, const Cuda::size_type /*block_id*/,
       const Cuda::size_type block_count, Cuda::size_type* const shared_data,
       Cuda::size_type* const global_data, Cuda::size_type* const global_flags) {
     Scalar* const global_team_buffer_element = ((Scalar*)global_data);
diff --git a/kokkos/core/src/Cuda/Kokkos_Cuda_Task.cpp b/kokkos/core/src/Cuda/Kokkos_Cuda_Task.cpp
index 1dbaeca4d..777f57ced 100644
--- a/kokkos/core/src/Cuda/Kokkos_Cuda_Task.cpp
+++ b/kokkos/core/src/Cuda/Kokkos_Cuda_Task.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/Cuda/Kokkos_Cuda_Task.hpp b/kokkos/core/src/Cuda/Kokkos_Cuda_Task.hpp
index 26d874a1e..decbecc5e 100644
--- a/kokkos/core/src/Cuda/Kokkos_Cuda_Task.hpp
+++ b/kokkos/core/src/Cuda/Kokkos_Cuda_Task.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -128,7 +128,7 @@ class TaskQueueSpecialization<SimpleTaskScheduler<Kokkos::Cuda, QueueType>> {
     auto current_task = OptionalRef<task_base_type>();
 
     // Loop until all queues are empty and no tasks in flight
-    while (not queue.is_done()) {
+    while (!queue.is_done()) {
       if (warp_lane == 0) {  // should be (?) same as team_exec.team_rank() == 0
         // pop off a task
         current_task =
diff --git a/kokkos/core/src/Cuda/Kokkos_Cuda_Team.hpp b/kokkos/core/src/Cuda/Kokkos_Cuda_Team.hpp
index 4747052ca..d9d5ed0bf 100644
--- a/kokkos/core/src/Cuda/Kokkos_Cuda_Team.hpp
+++ b/kokkos/core/src/Cuda/Kokkos_Cuda_Team.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -164,6 +164,8 @@ class CudaTeamMember {
   template <class ValueType>
   KOKKOS_INLINE_FUNCTION void team_broadcast(ValueType& val,
                                              const int& thread_id) const {
+    (void)val;
+    (void)thread_id;
 #ifdef __CUDA_ARCH__
     if (1 == blockDim.z) {  // team == block
       __syncthreads();
@@ -184,6 +186,9 @@ class CudaTeamMember {
   template <class Closure, class ValueType>
   KOKKOS_INLINE_FUNCTION void team_broadcast(Closure const& f, ValueType& val,
                                              const int& thread_id) const {
+    (void)f;
+    (void)val;
+    (void)thread_id;
 #ifdef __CUDA_ARCH__
     f(val);
 
@@ -230,6 +235,8 @@ class CudaTeamMember {
       typename std::enable_if<is_reducer<ReducerType>::value>::type
       team_reduce(ReducerType const& reducer,
                   typename ReducerType::value_type& value) const noexcept {
+    (void)reducer;
+    (void)value;
 #ifdef __CUDA_ARCH__
     cuda_intra_block_reduction(reducer, value, blockDim.y);
 #endif /* #ifdef __CUDA_ARCH__ */
@@ -274,6 +281,8 @@ class CudaTeamMember {
 
     return base_data[threadIdx.y];
 #else
+    (void)value;
+    (void)global_accum;
     return Type();
 #endif
   }
@@ -302,6 +311,8 @@ class CudaTeamMember {
       typename std::enable_if<is_reducer<ReducerType>::value>::type
       vector_reduce(ReducerType const& reducer,
                     typename ReducerType::value_type& value) {
+    (void)reducer;
+    (void)value;
 #ifdef __CUDA_ARCH__
     if (blockDim.x == 1) return;
 
@@ -509,6 +520,11 @@ class CudaTeamMember {
     return 0;
 
 #else
+    (void)reducer;
+    (void)global_scratch_flags;
+    (void)global_scratch_space;
+    (void)shmem;
+    (void)shmem_size;
     return 0;
 #endif
   }
@@ -683,6 +699,8 @@ KOKKOS_INLINE_FUNCTION void parallel_for(
     const Impl::TeamThreadRangeBoundariesStruct<iType, Impl::CudaTeamMember>&
         loop_boundaries,
     const Closure& closure) {
+  (void)loop_boundaries;
+  (void)closure;
 #ifdef __CUDA_ARCH__
   for (iType i = loop_boundaries.start + threadIdx.y; i < loop_boundaries.end;
        i += blockDim.y)
@@ -706,6 +724,9 @@ KOKKOS_INLINE_FUNCTION
     parallel_reduce(const Impl::TeamThreadRangeBoundariesStruct<
                         iType, Impl::CudaTeamMember>& loop_boundaries,
                     const Closure& closure, const ReducerType& reducer) {
+  (void)loop_boundaries;
+  (void)closure;
+  (void)reducer;
 #ifdef __CUDA_ARCH__
   typename ReducerType::value_type value;
   reducer.init(value);
@@ -734,6 +755,9 @@ KOKKOS_INLINE_FUNCTION
     parallel_reduce(const Impl::TeamThreadRangeBoundariesStruct<
                         iType, Impl::CudaTeamMember>& loop_boundaries,
                     const Closure& closure, ValueType& result) {
+  (void)loop_boundaries;
+  (void)closure;
+  (void)result;
 #ifdef __CUDA_ARCH__
   ValueType val;
   Kokkos::Sum<ValueType> reducer(val);
@@ -755,6 +779,8 @@ KOKKOS_INLINE_FUNCTION void parallel_for(
     const Impl::TeamVectorRangeBoundariesStruct<iType, Impl::CudaTeamMember>&
         loop_boundaries,
     const Closure& closure) {
+  (void)loop_boundaries;
+  (void)closure;
 #ifdef __CUDA_ARCH__
   for (iType i = loop_boundaries.start + threadIdx.y * blockDim.x + threadIdx.x;
        i < loop_boundaries.end; i += blockDim.y * blockDim.x)
@@ -768,6 +794,9 @@ KOKKOS_INLINE_FUNCTION
     parallel_reduce(const Impl::TeamVectorRangeBoundariesStruct<
                         iType, Impl::CudaTeamMember>& loop_boundaries,
                     const Closure& closure, const ReducerType& reducer) {
+  (void)loop_boundaries;
+  (void)closure;
+  (void)reducer;
 #ifdef __CUDA_ARCH__
   typename ReducerType::value_type value;
   reducer.init(value);
@@ -788,6 +817,9 @@ KOKKOS_INLINE_FUNCTION
     parallel_reduce(const Impl::TeamVectorRangeBoundariesStruct<
                         iType, Impl::CudaTeamMember>& loop_boundaries,
                     const Closure& closure, ValueType& result) {
+  (void)loop_boundaries;
+  (void)closure;
+  (void)result;
 #ifdef __CUDA_ARCH__
   ValueType val;
   Kokkos::Sum<ValueType> reducer(val);
@@ -818,6 +850,8 @@ KOKKOS_INLINE_FUNCTION void parallel_for(
     const Impl::ThreadVectorRangeBoundariesStruct<iType, Impl::CudaTeamMember>&
         loop_boundaries,
     const Closure& closure) {
+  (void)loop_boundaries;
+  (void)closure;
 #ifdef __CUDA_ARCH__
   for (iType i = loop_boundaries.start + threadIdx.x; i < loop_boundaries.end;
        i += blockDim.x) {
@@ -853,6 +887,9 @@ KOKKOS_INLINE_FUNCTION
     parallel_reduce(Impl::ThreadVectorRangeBoundariesStruct<
                         iType, Impl::CudaTeamMember> const& loop_boundaries,
                     Closure const& closure, ReducerType const& reducer) {
+  (void)loop_boundaries;
+  (void)closure;
+  (void)reducer;
 #ifdef __CUDA_ARCH__
 
   reducer.init(reducer.reference());
@@ -884,6 +921,9 @@ KOKKOS_INLINE_FUNCTION
     parallel_reduce(Impl::ThreadVectorRangeBoundariesStruct<
                         iType, Impl::CudaTeamMember> const& loop_boundaries,
                     Closure const& closure, ValueType& result) {
+  (void)loop_boundaries;
+  (void)closure;
+  (void)result;
 #ifdef __CUDA_ARCH__
   result = ValueType();
 
@@ -912,6 +952,8 @@ KOKKOS_INLINE_FUNCTION void parallel_scan(
     const Impl::ThreadVectorRangeBoundariesStruct<iType, Impl::CudaTeamMember>&
         loop_boundaries,
     const Closure& closure) {
+  (void)loop_boundaries;
+  (void)closure;
 #ifdef __CUDA_ARCH__
 
   // Extract value_type from closure
@@ -986,6 +1028,7 @@ template <class FunctorType>
 KOKKOS_INLINE_FUNCTION void single(
     const Impl::VectorSingleStruct<Impl::CudaTeamMember>&,
     const FunctorType& lambda) {
+  (void)lambda;
 #ifdef __CUDA_ARCH__
   if (threadIdx.x == 0) lambda();
 #ifdef KOKKOS_IMPL_CUDA_SYNCWARP_NEEDS_MASK
@@ -1003,6 +1046,7 @@ template <class FunctorType>
 KOKKOS_INLINE_FUNCTION void single(
     const Impl::ThreadSingleStruct<Impl::CudaTeamMember>&,
     const FunctorType& lambda) {
+  (void)lambda;
 #ifdef __CUDA_ARCH__
   if (threadIdx.x == 0 && threadIdx.y == 0) lambda();
 #ifdef KOKKOS_IMPL_CUDA_SYNCWARP_NEEDS_MASK
@@ -1020,6 +1064,8 @@ template <class FunctorType, class ValueType>
 KOKKOS_INLINE_FUNCTION void single(
     const Impl::VectorSingleStruct<Impl::CudaTeamMember>&,
     const FunctorType& lambda, ValueType& val) {
+  (void)lambda;
+  (void)val;
 #ifdef __CUDA_ARCH__
   if (threadIdx.x == 0) lambda(val);
   unsigned mask = blockDim.x == 32
@@ -1034,6 +1080,9 @@ template <class FunctorType, class ValueType>
 KOKKOS_INLINE_FUNCTION void single(
     const Impl::ThreadSingleStruct<Impl::CudaTeamMember>& single_struct,
     const FunctorType& lambda, ValueType& val) {
+  (void)single_struct;
+  (void)lambda;
+  (void)val;
 #ifdef __CUDA_ARCH__
   if (threadIdx.x == 0 && threadIdx.y == 0) {
     lambda(val);
diff --git a/kokkos/core/src/Cuda/Kokkos_Cuda_UniqueToken.hpp b/kokkos/core/src/Cuda/Kokkos_Cuda_UniqueToken.hpp
index 9649d4cec..3b470edbc 100644
--- a/kokkos/core/src/Cuda/Kokkos_Cuda_UniqueToken.hpp
+++ b/kokkos/core/src/Cuda/Kokkos_Cuda_UniqueToken.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -76,41 +76,17 @@ class UniqueToken<Cuda, UniqueTokenScope::Global> {
   explicit UniqueToken(execution_space const& = execution_space());
 #endif
 
-#ifdef KOKKOS_CUDA_9_DEFAULTED_BUG_WORKAROUND
-  KOKKOS_INLINE_FUNCTION
-  UniqueToken(const UniqueToken& rhs)
-      : m_buffer(rhs.m_buffer), m_count(rhs.m_count) {}
-
-  KOKKOS_INLINE_FUNCTION
-  UniqueToken(UniqueToken&& rhs)
-      : m_buffer(std::move(rhs.m_buffer)), m_count(std::move(rhs.m_count)) {}
-
-  KOKKOS_INLINE_FUNCTION
-  UniqueToken& operator=(const UniqueToken& rhs) {
-    m_buffer = rhs.m_buffer;
-    m_count  = rhs.m_count;
-    return *this;
-  }
-
-  KOKKOS_INLINE_FUNCTION
-  UniqueToken& operator=(UniqueToken&& rhs) {
-    m_buffer = std::move(rhs.m_buffer);
-    m_count  = std::move(rhs.m_count);
-    return *this;
-  }
-#else
-  KOKKOS_INLINE_FUNCTION
+  KOKKOS_DEFAULTED_FUNCTION
   UniqueToken(const UniqueToken&) = default;
 
-  KOKKOS_INLINE_FUNCTION
+  KOKKOS_DEFAULTED_FUNCTION
   UniqueToken(UniqueToken&&) = default;
 
-  KOKKOS_INLINE_FUNCTION
+  KOKKOS_DEFAULTED_FUNCTION
   UniqueToken& operator=(const UniqueToken&) = default;
 
-  KOKKOS_INLINE_FUNCTION
+  KOKKOS_DEFAULTED_FUNCTION
   UniqueToken& operator=(UniqueToken&&) = default;
-#endif
 
   /// \brief upper bound for acquired values, i.e. 0 <= value < size()
   KOKKOS_INLINE_FUNCTION
diff --git a/kokkos/core/src/Cuda/Kokkos_Cuda_Vectorization.hpp b/kokkos/core/src/Cuda/Kokkos_Cuda_Vectorization.hpp
index c07597f98..f75d2e56f 100644
--- a/kokkos/core/src/Cuda/Kokkos_Cuda_Vectorization.hpp
+++ b/kokkos/core/src/Cuda/Kokkos_Cuda_Vectorization.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -55,7 +55,7 @@ namespace Kokkos {
 namespace Impl {
 
 // Include all lanes
-constexpr unsigned shfl_all_mask = 0xffffffff;
+constexpr unsigned shfl_all_mask = 0xffffffffu;
 
 //----------------------------------------------------------------------------
 // Shuffle operations require input to be a register (stack) variable
@@ -71,20 +71,32 @@ struct in_place_shfl_op {
     return *static_cast<Derived const*>(this);
   }
 
-  // sizeof(Scalar) == sizeof(int) case
+  // sizeof(Scalar) <= sizeof(int) case
   template <class Scalar>
   // requires _assignable_from_bits<Scalar>
-  __device__ inline typename std::enable_if<sizeof(Scalar) == sizeof(int)>::type
+  __device__ inline typename std::enable_if<sizeof(Scalar) <= sizeof(int)>::type
   operator()(Scalar& out, Scalar const& in, int lane_or_delta, int width,
              unsigned mask = shfl_all_mask) const noexcept {
+    using shfl_type = int;
+    union conv_type {
+      Scalar orig;
+      shfl_type conv;
+    };
+    conv_type tmp_in;
+    tmp_in.orig = in;
+    conv_type tmp_out;
+    tmp_out.conv = tmp_in.conv;
+    conv_type res;
     //------------------------------------------------
-    reinterpret_cast<int&>(out) = self().do_shfl_op(
-        mask, reinterpret_cast<int const&>(in), lane_or_delta, width);
+    res.conv = self().do_shfl_op(
+        mask, reinterpret_cast<shfl_type const&>(tmp_out.conv), lane_or_delta,
+        width);
     //------------------------------------------------
+    out = res.orig;
   }
 
 // TODO: figure out why 64-bit shfl fails in Clang
-#if (CUDA_VERSION >= 9000) && (!defined(KOKKOS_COMPILER_CLANG))
+#if !defined(KOKKOS_COMPILER_CLANG)
   // sizeof(Scalar) == sizeof(double) case
   // requires _assignable_from_bits<Scalar>
   template <class Scalar>
@@ -140,6 +152,10 @@ struct in_place_shfl_fn : in_place_shfl_op<in_place_shfl_fn> {
   __device__ KOKKOS_IMPL_FORCEINLINE T do_shfl_op(unsigned mask, T& val,
                                                   int lane, int width) const
       noexcept {
+    (void)mask;
+    (void)val;
+    (void)lane;
+    (void)width;
     return KOKKOS_IMPL_CUDA_SHFL_MASK(mask, val, lane, width);
   }
 };
@@ -167,6 +183,10 @@ struct in_place_shfl_down_fn : in_place_shfl_op<in_place_shfl_down_fn> {
   __device__ KOKKOS_IMPL_FORCEINLINE T do_shfl_op(unsigned mask, T& val,
                                                   int lane, int width) const
       noexcept {
+    (void)mask;
+    (void)val;
+    (void)lane;
+    (void)width;
     return KOKKOS_IMPL_CUDA_SHFL_DOWN_MASK(mask, val, lane, width);
   }
 };
diff --git a/kokkos/core/src/Cuda/Kokkos_Cuda_Version_9_8_Compatibility.hpp b/kokkos/core/src/Cuda/Kokkos_Cuda_Version_9_8_Compatibility.hpp
index 66231e55f..0cdd84ce2 100644
--- a/kokkos/core/src/Cuda/Kokkos_Cuda_Version_9_8_Compatibility.hpp
+++ b/kokkos/core/src/Cuda/Kokkos_Cuda_Version_9_8_Compatibility.hpp
@@ -1,20 +1,6 @@
 #include <Kokkos_Macros.hpp>
 
 #if defined(__CUDA_ARCH__)
-#if (CUDA_VERSION < 9000)
-#define KOKKOS_IMPL_CUDA_ACTIVEMASK 0
-#define KOKKOS_IMPL_CUDA_SYNCWARP __threadfence_block()
-#define KOKKOS_IMPL_CUDA_SYNCWARP_MASK(m) \
-  if (m) __threadfence_block()
-#define KOKKOS_IMPL_CUDA_BALLOT(x) __ballot(x)
-#define KOKKOS_IMPL_CUDA_BALLOT_MASK(m, x) __ballot(x)
-#define KOKKOS_IMPL_CUDA_SHFL(x, y, z) __shfl(x, y, z)
-#define KOKKOS_IMPL_CUDA_SHFL_MASK(m, x, y, z) __shfl(x, y, z)
-#define KOKKOS_IMPL_CUDA_SHFL_UP(x, y, z) __shfl_up(x, y, z)
-#define KOKKOS_IMPL_CUDA_SHFL_UP_MASK(m, x, y, z) __shfl_up(x, y, z)
-#define KOKKOS_IMPL_CUDA_SHFL_DOWN(x, y, z) __shfl_down(x, y, z)
-#define KOKKOS_IMPL_CUDA_SHFL_DOWN_MASK(m, x, y, z) __shfl_down(x, y, z)
-#else
 #define KOKKOS_IMPL_CUDA_ACTIVEMASK __activemask()
 #define KOKKOS_IMPL_CUDA_SYNCWARP __syncwarp(0xffffffff)
 #define KOKKOS_IMPL_CUDA_SYNCWARP_MASK(m) __syncwarp(m)
@@ -27,7 +13,6 @@
 #define KOKKOS_IMPL_CUDA_SHFL_DOWN(x, y, z) \
   __shfl_down_sync(0xffffffff, x, y, z)
 #define KOKKOS_IMPL_CUDA_SHFL_DOWN_MASK(m, x, y, z) __shfl_down_sync(m, x, y, z)
-#endif
 #else
 #define KOKKOS_IMPL_CUDA_ACTIVEMASK 0
 #define KOKKOS_IMPL_CUDA_SYNCWARP
@@ -41,25 +26,13 @@
 #define KOKKOS_IMPL_CUDA_SHFL_DOWN_MASK(m, x, y, z) 0
 #endif
 
-#if (CUDA_VERSION >= 9000) && (!defined(KOKKOS_COMPILER_CLANG))
+#if !defined(KOKKOS_COMPILER_CLANG)
 #define KOKKOS_IMPL_CUDA_MAX_SHFL_SIZEOF sizeof(long long)
 #else
 #define KOKKOS_IMPL_CUDA_MAX_SHFL_SIZEOF sizeof(int)
 #endif
 
 #if defined(__CUDA_ARCH__)
-#if (CUDA_VERSION < 9000)
-#define KOKKOS_IMPL_CUDA_SYNCWARP_OR_RETURN(MSG)                           \
-  {                                                                        \
-    const unsigned b = __ballot(1);                                        \
-    if (b != 0xffffffff) {                                                 \
-      printf(" SYNCWARP AT %s (%d,%d,%d) (%d,%d,%d) failed %x\n", MSG,     \
-             blockIdx.x, blockIdx.y, blockIdx.z, threadIdx.x, threadIdx.y, \
-             threadIdx.z, b);                                              \
-      return;                                                              \
-    }                                                                      \
-  }
-#else
 #define KOKKOS_IMPL_CUDA_SYNCWARP_OR_RETURN(MSG)                           \
   {                                                                        \
     __syncwarp();                                                          \
@@ -71,7 +44,6 @@
       return;                                                              \
     }                                                                      \
   }
-#endif
 #else
 #define KOKKOS_IMPL_CUDA_SYNCWARP_OR_RETURN(MSG)
 #endif
diff --git a/kokkos/core/src/Cuda/Kokkos_Cuda_View.hpp b/kokkos/core/src/Cuda/Kokkos_Cuda_View.hpp
index 9521c732c..364f334a4 100644
--- a/kokkos/core/src/Cuda/Kokkos_Cuda_View.hpp
+++ b/kokkos/core/src/Cuda/Kokkos_Cuda_View.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -84,8 +84,8 @@ struct CudaTextureFetch {
   KOKKOS_INLINE_FUNCTION
   CudaTextureFetch() : m_obj(), m_ptr(), m_offset() {}
 
-  KOKKOS_INLINE_FUNCTION
-  ~CudaTextureFetch() {}
+  KOKKOS_DEFAULTED_FUNCTION
+  ~CudaTextureFetch() = default;
 
   KOKKOS_INLINE_FUNCTION
   CudaTextureFetch(const CudaTextureFetch& rhs)
@@ -153,8 +153,8 @@ struct CudaLDGFetch {
   KOKKOS_INLINE_FUNCTION
   CudaLDGFetch() : m_ptr() {}
 
-  KOKKOS_INLINE_FUNCTION
-  ~CudaLDGFetch() {}
+  KOKKOS_DEFAULTED_FUNCTION
+  ~CudaLDGFetch() = default;
 
   KOKKOS_INLINE_FUNCTION
   CudaLDGFetch(const CudaLDGFetch& rhs) : m_ptr(rhs.m_ptr) {}
@@ -250,7 +250,7 @@ class ViewDataHandle<
   KOKKOS_INLINE_FUNCTION
   static handle_type assign(value_type* arg_data_ptr,
                             track_type const& arg_tracker) {
-    if (arg_data_ptr == NULL) return handle_type();
+    if (arg_data_ptr == nullptr) return handle_type();
 
 #if defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST)
     // Assignment of texture = non-texture requires creation of a texture object
@@ -273,6 +273,7 @@ class ViewDataHandle<
     return handle_type(arg_data_ptr, r);
 
 #else
+    (void)arg_tracker;
     Kokkos::Impl::cuda_abort(
         "Cannot create Cuda texture object from within a Cuda kernel");
     return handle_type();
diff --git a/kokkos/core/src/Cuda/Kokkos_Cuda_ViewCopyETIAvail.hpp b/kokkos/core/src/Cuda/Kokkos_Cuda_ViewCopyETIAvail.hpp
index 8722c64df..2fbfb6727 100644
--- a/kokkos/core/src/Cuda/Kokkos_Cuda_ViewCopyETIAvail.hpp
+++ b/kokkos/core/src/Cuda/Kokkos_Cuda_ViewCopyETIAvail.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/Cuda/Kokkos_Cuda_ViewCopyETIDecl.hpp b/kokkos/core/src/Cuda/Kokkos_Cuda_ViewCopyETIDecl.hpp
index cddc0b1ad..18e56aa32 100644
--- a/kokkos/core/src/Cuda/Kokkos_Cuda_ViewCopyETIDecl.hpp
+++ b/kokkos/core/src/Cuda/Kokkos_Cuda_ViewCopyETIDecl.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/Cuda/Kokkos_Cuda_WorkGraphPolicy.hpp b/kokkos/core/src/Cuda/Kokkos_Cuda_WorkGraphPolicy.hpp
index eb9d55c47..0753e383a 100644
--- a/kokkos/core/src/Cuda/Kokkos_Cuda_WorkGraphPolicy.hpp
+++ b/kokkos/core/src/Cuda/Kokkos_Cuda_WorkGraphPolicy.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/Cuda/Kokkos_Cuda_abort.hpp b/kokkos/core/src/Cuda/Kokkos_Cuda_abort.hpp
index 7e9f38c82..698695dbd 100644
--- a/kokkos/core/src/Cuda/Kokkos_Cuda_abort.hpp
+++ b/kokkos/core/src/Cuda/Kokkos_Cuda_abort.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/Cuda/Kokkos_Cuda_fwd.hpp b/kokkos/core/src/Cuda/Kokkos_Cuda_fwd.hpp
new file mode 100644
index 000000000..4bda5e941
--- /dev/null
+++ b/kokkos/core/src/Cuda/Kokkos_Cuda_fwd.hpp
@@ -0,0 +1,67 @@
+/*
+//@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
+*/
+
+#ifndef KOKKOS_CUDA_FWD_HPP_
+#define KOKKOS_CUDA_FWD_HPP_
+#if defined(KOKKOS_ENABLE_CUDA)
+namespace Kokkos {
+
+class CudaSpace;            ///< Memory space on Cuda GPU
+class CudaUVMSpace;         ///< Memory space on Cuda GPU with UVM
+class CudaHostPinnedSpace;  ///< Memory space on Host accessible to Cuda GPU
+class Cuda;                 ///< Execution space for Cuda GPU
+
+namespace Impl {
+
+template <class ExecSpace>
+void cuda_prefetch_pointer(const ExecSpace& /*space*/, const void* /*ptr*/,
+                           size_t /*bytes*/, bool /*to_device*/) {}
+
+void cuda_prefetch_pointer(const Cuda& space, const void* ptr, size_t bytes,
+                           bool to_device);
+
+}  // namespace Impl
+}  // namespace Kokkos
+#endif
+#endif
diff --git a/kokkos/core/src/HIP/KokkosExp_HIP_IterateTile.hpp b/kokkos/core/src/HIP/KokkosExp_HIP_IterateTile.hpp
new file mode 100644
index 000000000..e2525d70c
--- /dev/null
+++ b/kokkos/core/src/HIP/KokkosExp_HIP_IterateTile.hpp
@@ -0,0 +1,3296 @@
+/*
+//@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
+*/
+
+#ifndef KOKKOS_HIP_EXP_ITERATE_TILE_REFACTOR_HPP
+#define KOKKOS_HIP_EXP_ITERATE_TILE_REFACTOR_HPP
+
+#include <Kokkos_Macros.hpp>
+#if defined(__HIPCC__)
+
+#include <iostream>
+#include <algorithm>
+#include <cstdio>
+
+#include <utility>
+
+#if defined(KOKKOS_ENABLE_PROFILING)
+#include <impl/Kokkos_Profiling_Interface.hpp>
+#include <typeinfo>
+#endif
+
+namespace Kokkos {
+namespace Impl {
+
+// ------------------------------------------------------------------ //
+// ParallelFor iteration pattern
+template <int N, typename PolicyType, typename Functor, typename Tag>
+struct DeviceIterateTile;
+
+// Rank 2
+// Specializations for void tag type
+template <typename PolicyType, typename Functor>
+struct DeviceIterateTile<2, PolicyType, Functor, void> {
+  using index_type = typename PolicyType::index_type;
+
+  __device__ DeviceIterateTile(const PolicyType& policy_, const Functor& f_)
+      : m_policy(policy_), m_func(f_) {}
+
+  KOKKOS_INLINE_FUNCTION
+  void exec_range() const {
+    // LL
+    if (PolicyType::inner_direction == PolicyType::Left) {
+      for (index_type tile_id1 = static_cast<index_type>(hipBlockIdx_y);
+           tile_id1 < m_policy.m_tile_end[1]; tile_id1 += hipGridDim_y) {
+        const index_type offset_1 =
+            tile_id1 * m_policy.m_tile[1] +
+            static_cast<index_type>(hipThreadIdx_y) +
+            static_cast<index_type>(m_policy.m_lower[1]);
+        if (offset_1 < m_policy.m_upper[1] &&
+            static_cast<index_type>(hipThreadIdx_y) < m_policy.m_tile[1]) {
+          for (index_type tile_id0 = static_cast<index_type>(hipBlockIdx_x);
+               tile_id0 < m_policy.m_tile_end[0]; tile_id0 += hipGridDim_x) {
+            const index_type offset_0 =
+                tile_id0 * m_policy.m_tile[0] +
+                static_cast<index_type>(hipThreadIdx_x) +
+                static_cast<index_type>(m_policy.m_lower[0]);
+            if (offset_0 < m_policy.m_upper[0] &&
+                static_cast<index_type>(hipThreadIdx_x) < m_policy.m_tile[0]) {
+              m_func(offset_0, offset_1);
+            }
+          }
+        }
+      }
+    }
+    // LR
+    else {
+      for (index_type tile_id0 = static_cast<index_type>(hipBlockIdx_x);
+           tile_id0 < m_policy.m_tile_end[0]; tile_id0 += hipGridDim_x) {
+        const index_type offset_0 =
+            tile_id0 * m_policy.m_tile[0] +
+            static_cast<index_type>(hipThreadIdx_x) +
+            static_cast<index_type>(m_policy.m_lower[0]);
+        if (offset_0 < m_policy.m_upper[0] &&
+            static_cast<index_type>(hipThreadIdx_x) < m_policy.m_tile[0]) {
+          for (index_type tile_id1 = static_cast<index_type>(hipBlockIdx_y);
+               tile_id1 < m_policy.m_tile_end[1]; tile_id1 += hipGridDim_y) {
+            const index_type offset_1 =
+                tile_id1 * m_policy.m_tile[1] +
+                static_cast<index_type>(hipThreadIdx_y) +
+                static_cast<index_type>(m_policy.m_lower[1]);
+            if (offset_1 < m_policy.m_upper[1] &&
+                static_cast<index_type>(hipThreadIdx_y) < m_policy.m_tile[1]) {
+              m_func(offset_0, offset_1);
+            }
+          }
+        }
+      }
+    }
+  }  // end exec_range
+
+ private:
+  const PolicyType& m_policy;
+  const Functor& m_func;
+};
+
+// Specializations for tag type
+template <typename PolicyType, typename Functor, typename Tag>
+struct DeviceIterateTile<2, PolicyType, Functor, Tag> {
+  using index_type = typename PolicyType::index_type;
+
+  KOKKOS_INLINE_FUNCTION
+  DeviceIterateTile(const PolicyType& policy_, const Functor& f_)
+      : m_policy(policy_), m_func(f_) {}
+
+  KOKKOS_INLINE_FUNCTION
+  void exec_range() const {
+    if (PolicyType::inner_direction == PolicyType::Left) {
+      // Loop over size maxnumblocks until full range covered
+      for (index_type tile_id1 = static_cast<index_type>(hipBlockIdx_y);
+           tile_id1 < m_policy.m_tile_end[1]; tile_id1 += hipGridDim_y) {
+        const index_type offset_1 =
+            tile_id1 * m_policy.m_tile[1] +
+            static_cast<index_type>(hipThreadIdx_y) +
+            static_cast<index_type>(m_policy.m_lower[1]);
+        if (offset_1 < m_policy.m_upper[1] &&
+            static_cast<index_type>(hipThreadIdx_y) < m_policy.m_tile[1]) {
+          for (index_type tile_id0 = static_cast<index_type>(hipBlockIdx_x);
+               tile_id0 < m_policy.m_tile_end[0]; tile_id0 += hipGridDim_x) {
+            const index_type offset_0 =
+                tile_id0 * m_policy.m_tile[0] +
+                static_cast<index_type>(hipThreadIdx_x) +
+                static_cast<index_type>(m_policy.m_lower[0]);
+            if (offset_0 < m_policy.m_upper[0] &&
+                static_cast<index_type>(hipThreadIdx_x) < m_policy.m_tile[0]) {
+              m_func(Tag(), offset_0, offset_1);
+            }
+          }
+        }
+      }
+    } else {
+      for (index_type tile_id0 = static_cast<index_type>(hipBlockIdx_x);
+           tile_id0 < m_policy.m_tile_end[0]; tile_id0 += hipGridDim_x) {
+        const index_type offset_0 =
+            tile_id0 * m_policy.m_tile[0] +
+            static_cast<index_type>(hipThreadIdx_x) +
+            static_cast<index_type>(m_policy.m_lower[0]);
+        if (offset_0 < m_policy.m_upper[0] &&
+            static_cast<index_type>(hipThreadIdx_x) < m_policy.m_tile[0]) {
+          for (index_type tile_id1 = static_cast<index_type>(hipBlockIdx_y);
+               tile_id1 < m_policy.m_tile_end[1]; tile_id1 += hipGridDim_y) {
+            const index_type offset_1 =
+                tile_id1 * m_policy.m_tile[1] +
+                static_cast<index_type>(hipThreadIdx_y) +
+                static_cast<index_type>(m_policy.m_lower[1]);
+            if (offset_1 < m_policy.m_upper[1] &&
+                static_cast<index_type>(hipThreadIdx_y) < m_policy.m_tile[1]) {
+              m_func(Tag(), offset_0, offset_1);
+            }
+          }
+        }
+      }
+    }
+  }  // end exec_range
+
+ private:
+  const PolicyType& m_policy;
+  const Functor& m_func;
+};
+
+// Rank 3
+// Specializations for void tag type
+template <typename PolicyType, typename Functor>
+struct DeviceIterateTile<3, PolicyType, Functor, void> {
+  using index_type = typename PolicyType::index_type;
+
+  __device__ DeviceIterateTile(const PolicyType& policy_, const Functor& f_)
+      : m_policy(policy_), m_func(f_) {}
+
+  KOKKOS_INLINE_FUNCTION
+  void exec_range() const {
+    // LL
+    if (PolicyType::inner_direction == PolicyType::Left) {
+      for (index_type tile_id2 = static_cast<index_type>(hipBlockIdx_z);
+           tile_id2 < m_policy.m_tile_end[2]; tile_id2 += hipGridDim_z) {
+        const index_type offset_2 =
+            tile_id2 * m_policy.m_tile[2] +
+            static_cast<index_type>(hipThreadIdx_z) +
+            static_cast<index_type>(m_policy.m_lower[2]);
+        if (offset_2 < m_policy.m_upper[2] &&
+            static_cast<index_type>(hipThreadIdx_z) < m_policy.m_tile[2]) {
+          for (index_type tile_id1 = static_cast<index_type>(hipBlockIdx_y);
+               tile_id1 < m_policy.m_tile_end[1]; tile_id1 += hipGridDim_y) {
+            const index_type offset_1 =
+                tile_id1 * m_policy.m_tile[1] +
+                static_cast<index_type>(hipThreadIdx_y) +
+                static_cast<index_type>(m_policy.m_lower[1]);
+            if (offset_1 < m_policy.m_upper[1] &&
+                static_cast<index_type>(hipThreadIdx_y) < m_policy.m_tile[1]) {
+              for (index_type tile_id0 = static_cast<index_type>(hipBlockIdx_x);
+                   tile_id0 < m_policy.m_tile_end[0];
+                   tile_id0 += hipGridDim_x) {
+                const index_type offset_0 =
+                    tile_id0 * m_policy.m_tile[0] +
+                    static_cast<index_type>(hipThreadIdx_x) +
+                    static_cast<index_type>(m_policy.m_lower[0]);
+                if (offset_0 < m_policy.m_upper[0] &&
+                    static_cast<index_type>(hipThreadIdx_x) <
+                        m_policy.m_tile[0]) {
+                  m_func(offset_0, offset_1, offset_2);
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+    // LR
+    else {
+      for (index_type tile_id0 = static_cast<index_type>(hipBlockIdx_x);
+           tile_id0 < m_policy.m_tile_end[0]; tile_id0 += hipGridDim_x) {
+        const index_type offset_0 =
+            tile_id0 * m_policy.m_tile[0] +
+            static_cast<index_type>(hipThreadIdx_x) +
+            static_cast<index_type>(m_policy.m_lower[0]);
+        if (offset_0 < m_policy.m_upper[0] &&
+            static_cast<index_type>(hipThreadIdx_x) < m_policy.m_tile[0]) {
+          for (index_type tile_id1 = static_cast<index_type>(hipBlockIdx_y);
+               tile_id1 < m_policy.m_tile_end[1]; tile_id1 += hipGridDim_y) {
+            const index_type offset_1 =
+                tile_id1 * m_policy.m_tile[1] +
+                static_cast<index_type>(hipThreadIdx_y) +
+                static_cast<index_type>(m_policy.m_lower[1]);
+            if (offset_1 < m_policy.m_upper[1] &&
+                static_cast<index_type>(hipThreadIdx_y) < m_policy.m_tile[1]) {
+              for (index_type tile_id2 = static_cast<index_type>(hipBlockIdx_z);
+                   tile_id2 < m_policy.m_tile_end[2];
+                   tile_id2 += hipGridDim_z) {
+                const index_type offset_2 =
+                    tile_id2 * m_policy.m_tile[2] +
+                    static_cast<index_type>(hipThreadIdx_z) +
+                    static_cast<index_type>(m_policy.m_lower[2]);
+                if (offset_2 < m_policy.m_upper[2] &&
+                    static_cast<index_type>(hipThreadIdx_z) <
+                        m_policy.m_tile[2]) {
+                  m_func(offset_0, offset_1, offset_2);
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }  // end exec_range
+
+ private:
+  const PolicyType& m_policy;
+  const Functor& m_func;
+};
+
+// Specializations for void tag type
+template <typename PolicyType, typename Functor, typename Tag>
+struct DeviceIterateTile<3, PolicyType, Functor, Tag> {
+  using index_type = typename PolicyType::index_type;
+
+  KOKKOS_INLINE_FUNCTION
+  DeviceIterateTile(const PolicyType& policy_, const Functor& f_)
+      : m_policy(policy_), m_func(f_) {}
+
+  KOKKOS_INLINE_FUNCTION
+  void exec_range() const {
+    if (PolicyType::inner_direction == PolicyType::Left) {
+      for (index_type tile_id2 = static_cast<index_type>(hipBlockIdx_z);
+           tile_id2 < m_policy.m_tile_end[2]; tile_id2 += hipGridDim_z) {
+        const index_type offset_2 =
+            tile_id2 * m_policy.m_tile[2] +
+            static_cast<index_type>(hipThreadIdx_z) +
+            static_cast<index_type>(m_policy.m_lower[2]);
+        if (offset_2 < m_policy.m_upper[2] &&
+            static_cast<index_type>(hipThreadIdx_z) < m_policy.m_tile[2]) {
+          for (index_type tile_id1 = static_cast<index_type>(hipBlockIdx_y);
+               tile_id1 < m_policy.m_tile_end[1]; tile_id1 += hipGridDim_y) {
+            const index_type offset_1 =
+                tile_id1 * m_policy.m_tile[1] +
+                static_cast<index_type>(hipThreadIdx_y) +
+                static_cast<index_type>(m_policy.m_lower[1]);
+            if (offset_1 < m_policy.m_upper[1] &&
+                static_cast<index_type>(hipThreadIdx_y) < m_policy.m_tile[1]) {
+              for (index_type tile_id0 = static_cast<index_type>(hipBlockIdx_x);
+                   tile_id0 < m_policy.m_tile_end[0];
+                   tile_id0 += hipGridDim_x) {
+                const index_type offset_0 =
+                    tile_id0 * m_policy.m_tile[0] +
+                    static_cast<index_type>(hipThreadIdx_x) +
+                    static_cast<index_type>(m_policy.m_lower[0]);
+                if (offset_0 < m_policy.m_upper[0] &&
+                    static_cast<index_type>(hipThreadIdx_x) <
+                        m_policy.m_tile[0]) {
+                  m_func(Tag(), offset_0, offset_1, offset_2);
+                }
+              }
+            }
+          }
+        }
+      }
+    } else {
+      for (index_type tile_id0 = static_cast<index_type>(hipBlockIdx_x);
+           tile_id0 < m_policy.m_tile_end[0]; tile_id0 += hipGridDim_x) {
+        const index_type offset_0 =
+            tile_id0 * m_policy.m_tile[0] +
+            static_cast<index_type>(hipThreadIdx_x) +
+            static_cast<index_type>(m_policy.m_lower[0]);
+        if (offset_0 < m_policy.m_upper[0] &&
+            static_cast<index_type>(hipThreadIdx_x) < m_policy.m_tile[0]) {
+          for (index_type tile_id1 = static_cast<index_type>(hipBlockIdx_y);
+               tile_id1 < m_policy.m_tile_end[1]; tile_id1 += hipGridDim_y) {
+            const index_type offset_1 =
+                tile_id1 * m_policy.m_tile[1] +
+                static_cast<index_type>(hipThreadIdx_y) +
+                static_cast<index_type>(m_policy.m_lower[1]);
+            if (offset_1 < m_policy.m_upper[1] &&
+                static_cast<index_type>(hipThreadIdx_y) < m_policy.m_tile[1]) {
+              for (index_type tile_id2 = static_cast<index_type>(hipBlockIdx_z);
+                   tile_id2 < m_policy.m_tile_end[2];
+                   tile_id2 += hipGridDim_z) {
+                const index_type offset_2 =
+                    tile_id2 * m_policy.m_tile[2] +
+                    static_cast<index_type>(hipThreadIdx_z) +
+                    static_cast<index_type>(m_policy.m_lower[2]);
+                if (offset_2 < m_policy.m_upper[2] &&
+                    static_cast<index_type>(hipThreadIdx_z) <
+                        m_policy.m_tile[2]) {
+                  m_func(Tag(), offset_0, offset_1, offset_2);
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }  // end exec_range
+
+ private:
+  const PolicyType& m_policy;
+  const Functor& m_func;
+};
+
+// Rank 4
+// Specializations for void tag type
+template <typename PolicyType, typename Functor>
+struct DeviceIterateTile<4, PolicyType, Functor, void> {
+  using index_type = typename PolicyType::index_type;
+
+  __device__ DeviceIterateTile(const PolicyType& policy_, const Functor& f_)
+      : m_policy(policy_), m_func(f_) {}
+
+  static constexpr index_type max_blocks = 65535;
+
+  KOKKOS_INLINE_FUNCTION
+  void exec_range() const {
+    // LL
+    if (PolicyType::inner_direction == PolicyType::Left) {
+      const index_type temp0  = m_policy.m_tile_end[0];
+      const index_type temp1  = m_policy.m_tile_end[1];
+      const index_type numbl0 = (temp0 <= max_blocks ? temp0 : max_blocks);
+      const index_type numbl1 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl0)
+               : (temp1 <= max_blocks ? temp1 : max_blocks));
+
+      const index_type tile_id0 =
+          static_cast<index_type>(hipBlockIdx_x) % numbl0;
+      const index_type tile_id1 =
+          static_cast<index_type>(hipBlockIdx_x) / numbl0;
+      const index_type thr_id0 =
+          static_cast<index_type>(hipThreadIdx_x) % m_policy.m_tile[0];
+      const index_type thr_id1 =
+          static_cast<index_type>(hipThreadIdx_x) / m_policy.m_tile[0];
+
+      for (index_type tile_id3 = static_cast<index_type>(hipBlockIdx_z);
+           tile_id3 < m_policy.m_tile_end[3]; tile_id3 += hipGridDim_z) {
+        const index_type offset_3 =
+            tile_id3 * m_policy.m_tile[3] +
+            static_cast<index_type>(hipThreadIdx_z) +
+            static_cast<index_type>(m_policy.m_lower[3]);
+        if (offset_3 < m_policy.m_upper[3] &&
+            static_cast<index_type>(hipThreadIdx_z) < m_policy.m_tile[3]) {
+          for (index_type tile_id2 = static_cast<index_type>(hipBlockIdx_y);
+               tile_id2 < m_policy.m_tile_end[2]; tile_id2 += hipGridDim_y) {
+            const index_type offset_2 =
+                tile_id2 * m_policy.m_tile[2] +
+                static_cast<index_type>(hipThreadIdx_y) +
+                static_cast<index_type>(m_policy.m_lower[2]);
+            if (offset_2 < m_policy.m_upper[2] &&
+                static_cast<index_type>(hipThreadIdx_y) < m_policy.m_tile[2]) {
+              for (index_type j = tile_id1; j < m_policy.m_tile_end[1];
+                   j += numbl1) {
+                const index_type offset_1 =
+                    j * m_policy.m_tile[1] + thr_id1 +
+                    static_cast<index_type>(m_policy.m_lower[1]);
+                if (offset_1 < m_policy.m_upper[1] &&
+                    thr_id1 < m_policy.m_tile[1]) {
+                  for (index_type i = tile_id0; i < m_policy.m_tile_end[0];
+                       i += numbl0) {
+                    const index_type offset_0 =
+                        i * m_policy.m_tile[0] + thr_id0 +
+                        static_cast<index_type>(m_policy.m_lower[0]);
+                    if (offset_0 < m_policy.m_upper[0] &&
+                        thr_id0 < m_policy.m_tile[0]) {
+                      m_func(offset_0, offset_1, offset_2, offset_3);
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+    // LR
+    else {
+      const index_type temp0  = m_policy.m_tile_end[0];
+      const index_type temp1  = m_policy.m_tile_end[1];
+      const index_type numbl1 = (temp1 <= max_blocks ? temp1 : max_blocks);
+      const index_type numbl0 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl1)
+               : (temp0 <= max_blocks ? temp0 : max_blocks));
+
+      const index_type tile_id0 =
+          static_cast<index_type>(hipBlockIdx_x) / numbl1;
+      const index_type tile_id1 =
+          static_cast<index_type>(hipBlockIdx_x) % numbl1;
+      const index_type thr_id0 =
+          static_cast<index_type>(hipThreadIdx_x) / m_policy.m_tile[1];
+      const index_type thr_id1 =
+          static_cast<index_type>(hipThreadIdx_x) % m_policy.m_tile[1];
+
+      for (index_type i = tile_id0; i < m_policy.m_tile_end[0]; i += numbl0) {
+        const index_type offset_0 =
+            i * m_policy.m_tile[0] + thr_id0 +
+            static_cast<index_type>(m_policy.m_lower[0]);
+        if (offset_0 < m_policy.m_upper[0] && thr_id0 < m_policy.m_tile[0]) {
+          for (index_type j = tile_id1; j < m_policy.m_tile_end[1];
+               j += numbl1) {
+            const index_type offset_1 =
+                j * m_policy.m_tile[1] + thr_id1 +
+                static_cast<index_type>(m_policy.m_lower[1]);
+            if (offset_1 < m_policy.m_upper[1] &&
+                thr_id1 < m_policy.m_tile[1]) {
+              for (index_type tile_id2 = static_cast<index_type>(hipBlockIdx_y);
+                   tile_id2 < m_policy.m_tile_end[2];
+                   tile_id2 += hipGridDim_y) {
+                const index_type offset_2 =
+                    tile_id2 * m_policy.m_tile[2] +
+                    static_cast<index_type>(hipThreadIdx_y) +
+                    static_cast<index_type>(m_policy.m_lower[2]);
+                if (offset_2 < m_policy.m_upper[2] &&
+                    static_cast<index_type>(hipThreadIdx_y) <
+                        m_policy.m_tile[2]) {
+                  for (index_type tile_id3 =
+                           static_cast<index_type>(hipBlockIdx_z);
+                       tile_id3 < m_policy.m_tile_end[3];
+                       tile_id3 += hipGridDim_z) {
+                    const index_type offset_3 =
+                        tile_id3 * m_policy.m_tile[3] +
+                        static_cast<index_type>(hipThreadIdx_z) +
+                        static_cast<index_type>(m_policy.m_lower[3]);
+                    if (offset_3 < m_policy.m_upper[3] &&
+                        static_cast<index_type>(hipThreadIdx_z) <
+                            m_policy.m_tile[3]) {
+                      m_func(offset_0, offset_1, offset_2, offset_3);
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }  // end exec_range
+
+ private:
+  const PolicyType& m_policy;
+  const Functor& m_func;
+};
+
+// Specializations for void tag type
+template <typename PolicyType, typename Functor, typename Tag>
+struct DeviceIterateTile<4, PolicyType, Functor, Tag> {
+  using index_type = typename PolicyType::index_type;
+
+  KOKKOS_INLINE_FUNCTION
+  DeviceIterateTile(const PolicyType& policy_, const Functor& f_)
+      : m_policy(policy_), m_func(f_) {}
+
+  static constexpr index_type max_blocks = 65535;
+
+  KOKKOS_INLINE_FUNCTION
+  void exec_range() const {
+    if (PolicyType::inner_direction == PolicyType::Left) {
+      const index_type temp0  = m_policy.m_tile_end[0];
+      const index_type temp1  = m_policy.m_tile_end[1];
+      const index_type numbl0 = (temp0 <= max_blocks ? temp0 : max_blocks);
+      const index_type numbl1 =
+          (temp0 * temp1 > max_blocks
+               ? static_cast<index_type>(max_blocks / numbl0)
+               : (temp1 <= max_blocks ? temp1 : max_blocks));
+
+      const index_type tile_id0 =
+          static_cast<index_type>(hipBlockIdx_x) % numbl0;
+      const index_type tile_id1 =
+          static_cast<index_type>(hipBlockIdx_x) / numbl0;
+      const index_type thr_id0 =
+          static_cast<index_type>(hipThreadIdx_x) % m_policy.m_tile[0];
+      const index_type thr_id1 =
+          static_cast<index_type>(hipThreadIdx_x) / m_policy.m_tile[0];
+
+      for (index_type tile_id3 = static_cast<index_type>(hipBlockIdx_z);
+           tile_id3 < m_policy.m_tile_end[3]; tile_id3 += hipGridDim_z) {
+        const index_type offset_3 =
+            tile_id3 * m_policy.m_tile[3] +
+            static_cast<index_type>(hipThreadIdx_z) +
+            static_cast<index_type>(m_policy.m_lower[3]);
+        if (offset_3 < m_policy.m_upper[3] &&
+            static_cast<index_type>(hipThreadIdx_z) < m_policy.m_tile[3]) {
+          for (index_type tile_id2 = static_cast<index_type>(hipBlockIdx_y);
+               tile_id2 < m_policy.m_tile_end[2]; tile_id2 += hipGridDim_y) {
+            const index_type offset_2 =
+                tile_id2 * m_policy.m_tile[2] +
+                static_cast<index_type>(hipThreadIdx_y) +
+                static_cast<index_type>(m_policy.m_lower[2]);
+            if (offset_2 < m_policy.m_upper[2] &&
+                static_cast<index_type>(hipThreadIdx_y) < m_policy.m_tile[2]) {
+              for (index_type j = tile_id1; j < m_policy.m_tile_end[1];
+                   j += numbl1) {
+                const index_type offset_1 =
+                    j * m_policy.m_tile[1] + thr_id1 +
+                    static_cast<index_type>(m_policy.m_lower[1]);
+                if (offset_1 < m_policy.m_upper[1] &&
+                    thr_id1 < m_policy.m_tile[1]) {
+                  for (index_type i = tile_id0; i < m_policy.m_tile_end[0];
+                       i += numbl0) {
+                    const index_type offset_0 =
+                        i * m_policy.m_tile[0] + thr_id0 +
+                        static_cast<index_type>(m_policy.m_lower[0]);
+                    if (offset_0 < m_policy.m_upper[0] &&
+                        thr_id0 < m_policy.m_tile[0]) {
+                      m_func(Tag(), offset_0, offset_1, offset_2, offset_3);
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    } else {
+      const index_type temp0  = m_policy.m_tile_end[0];
+      const index_type temp1  = m_policy.m_tile_end[1];
+      const index_type numbl1 = (temp1 <= max_blocks ? temp1 : max_blocks);
+      const index_type numbl0 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl1)
+               : (temp0 <= max_blocks ? temp0 : max_blocks));
+
+      const index_type tile_id0 =
+          static_cast<index_type>(hipBlockIdx_x) / numbl1;
+      const index_type tile_id1 =
+          static_cast<index_type>(hipBlockIdx_x) % numbl1;
+      const index_type thr_id0 =
+          static_cast<index_type>(hipThreadIdx_x) / m_policy.m_tile[1];
+      const index_type thr_id1 =
+          static_cast<index_type>(hipThreadIdx_x) % m_policy.m_tile[1];
+
+      for (index_type i = tile_id0; i < m_policy.m_tile_end[0]; i += numbl0) {
+        const index_type offset_0 =
+            i * m_policy.m_tile[0] + thr_id0 +
+            static_cast<index_type>(m_policy.m_lower[0]);
+        if (offset_0 < m_policy.m_upper[0] && thr_id0 < m_policy.m_tile[0]) {
+          for (index_type j = tile_id1; j < m_policy.m_tile_end[1];
+               j += numbl1) {
+            const index_type offset_1 =
+                tile_id1 * m_policy.m_tile[1] + thr_id1 +
+                static_cast<index_type>(m_policy.m_lower[1]);
+            if (offset_1 < m_policy.m_upper[1] &&
+                thr_id1 < m_policy.m_tile[1]) {
+              for (index_type tile_id2 = static_cast<index_type>(hipBlockIdx_y);
+                   tile_id2 < m_policy.m_tile_end[2];
+                   tile_id2 += hipGridDim_y) {
+                const index_type offset_2 =
+                    tile_id2 * m_policy.m_tile[2] +
+                    static_cast<index_type>(hipThreadIdx_y) +
+                    static_cast<index_type>(m_policy.m_lower[2]);
+                if (offset_2 < m_policy.m_upper[2] &&
+                    static_cast<index_type>(hipThreadIdx_y) <
+                        m_policy.m_tile[2]) {
+                  for (index_type tile_id3 =
+                           static_cast<index_type>(hipBlockIdx_z);
+                       tile_id3 < m_policy.m_tile_end[3];
+                       tile_id3 += hipGridDim_z) {
+                    const index_type offset_3 =
+                        tile_id3 * m_policy.m_tile[3] +
+                        static_cast<index_type>(hipThreadIdx_z) +
+                        static_cast<index_type>(m_policy.m_lower[3]);
+                    if (offset_3 < m_policy.m_upper[3] &&
+                        static_cast<index_type>(hipThreadIdx_z) <
+                            m_policy.m_tile[3]) {
+                      m_func(Tag(), offset_0, offset_1, offset_2, offset_3);
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }  // end exec_range
+
+ private:
+  const PolicyType& m_policy;
+  const Functor& m_func;
+};
+
+// Rank 5
+// Specializations for void tag type
+template <typename PolicyType, typename Functor>
+struct DeviceIterateTile<5, PolicyType, Functor, void> {
+  using index_type = typename PolicyType::index_type;
+
+  __device__ DeviceIterateTile(const PolicyType& policy_, const Functor& f_)
+      : m_policy(policy_), m_func(f_) {}
+
+  static constexpr index_type max_blocks = 65535;
+
+  KOKKOS_INLINE_FUNCTION
+  void exec_range() const {
+    // LL
+    if (PolicyType::inner_direction == PolicyType::Left) {
+      index_type temp0        = m_policy.m_tile_end[0];
+      index_type temp1        = m_policy.m_tile_end[1];
+      const index_type numbl0 = (temp0 <= max_blocks ? temp0 : max_blocks);
+      const index_type numbl1 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl0)
+               : (temp1 <= max_blocks ? temp1 : max_blocks));
+
+      const index_type tile_id0 =
+          static_cast<index_type>(hipBlockIdx_x) % numbl0;
+      const index_type tile_id1 =
+          static_cast<index_type>(hipBlockIdx_x) / numbl0;
+      const index_type thr_id0 =
+          static_cast<index_type>(hipThreadIdx_x) % m_policy.m_tile[0];
+      const index_type thr_id1 =
+          static_cast<index_type>(hipThreadIdx_x) / m_policy.m_tile[0];
+
+      temp0                   = m_policy.m_tile_end[2];
+      temp1                   = m_policy.m_tile_end[3];
+      const index_type numbl2 = (temp0 <= max_blocks ? temp0 : max_blocks);
+      const index_type numbl3 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl2)
+               : (temp1 <= max_blocks ? temp1 : max_blocks));
+
+      const index_type tile_id2 =
+          static_cast<index_type>(hipBlockIdx_y) % numbl2;
+      const index_type tile_id3 =
+          static_cast<index_type>(hipBlockIdx_y) / numbl2;
+      const index_type thr_id2 =
+          static_cast<index_type>(hipThreadIdx_y) % m_policy.m_tile[2];
+      const index_type thr_id3 =
+          static_cast<index_type>(hipThreadIdx_y) / m_policy.m_tile[2];
+
+      for (index_type tile_id4 = static_cast<index_type>(hipBlockIdx_z);
+           tile_id4 < m_policy.m_tile_end[4]; tile_id4 += hipGridDim_z) {
+        const index_type offset_4 =
+            tile_id4 * m_policy.m_tile[4] +
+            static_cast<index_type>(hipThreadIdx_z) +
+            static_cast<index_type>(m_policy.m_lower[4]);
+        if (offset_4 < m_policy.m_upper[4] &&
+            static_cast<index_type>(hipThreadIdx_z) < m_policy.m_tile[4]) {
+          for (index_type l = tile_id3; l < m_policy.m_tile_end[3];
+               l += numbl3) {
+            const index_type offset_3 =
+                l * m_policy.m_tile[3] + thr_id3 +
+                static_cast<index_type>(m_policy.m_lower[3]);
+            if (offset_3 < m_policy.m_upper[3] &&
+                thr_id3 < m_policy.m_tile[3]) {
+              for (index_type k = tile_id2; k < m_policy.m_tile_end[2];
+                   k += numbl2) {
+                const index_type offset_2 =
+                    k * m_policy.m_tile[2] + thr_id2 +
+                    static_cast<index_type>(m_policy.m_lower[2]);
+                if (offset_2 < m_policy.m_upper[2] &&
+                    thr_id2 < m_policy.m_tile[2]) {
+                  for (index_type j = tile_id1; j < m_policy.m_tile_end[1];
+                       j += numbl1) {
+                    const index_type offset_1 =
+                        j * m_policy.m_tile[1] + thr_id1 +
+                        static_cast<index_type>(m_policy.m_lower[1]);
+                    if (offset_1 < m_policy.m_upper[1] &&
+                        thr_id1 < m_policy.m_tile[1]) {
+                      for (index_type i = tile_id0; i < m_policy.m_tile_end[0];
+                           i += numbl0) {
+                        const index_type offset_0 =
+                            i * m_policy.m_tile[0] + thr_id0 +
+                            static_cast<index_type>(m_policy.m_lower[0]);
+                        if (offset_0 < m_policy.m_upper[0] &&
+                            thr_id0 < m_policy.m_tile[0]) {
+                          m_func(offset_0, offset_1, offset_2, offset_3,
+                                 offset_4);
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+    // LR
+    else {
+      index_type temp0        = m_policy.m_tile_end[0];
+      index_type temp1        = m_policy.m_tile_end[1];
+      const index_type numbl1 = (temp1 <= max_blocks ? temp1 : max_blocks);
+      const index_type numbl0 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl1)
+               : (temp0 <= max_blocks ? temp0 : max_blocks));
+
+      const index_type tile_id0 =
+          static_cast<index_type>(hipBlockIdx_x) / numbl1;
+      const index_type tile_id1 =
+          static_cast<index_type>(hipBlockIdx_x) % numbl1;
+      const index_type thr_id0 =
+          static_cast<index_type>(hipThreadIdx_x) / m_policy.m_tile[1];
+      const index_type thr_id1 =
+          static_cast<index_type>(hipThreadIdx_x) % m_policy.m_tile[1];
+
+      temp0                   = m_policy.m_tile_end[2];
+      temp1                   = m_policy.m_tile_end[3];
+      const index_type numbl3 = (temp1 <= max_blocks ? temp1 : max_blocks);
+      const index_type numbl2 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl3)
+               : (temp0 <= max_blocks ? temp0 : max_blocks));
+
+      const index_type tile_id2 =
+          static_cast<index_type>(hipBlockIdx_y) / numbl3;
+      const index_type tile_id3 =
+          static_cast<index_type>(hipBlockIdx_y) % numbl3;
+      const index_type thr_id2 =
+          static_cast<index_type>(hipThreadIdx_y) / m_policy.m_tile[3];
+      const index_type thr_id3 =
+          static_cast<index_type>(hipThreadIdx_y) % m_policy.m_tile[3];
+
+      for (index_type i = tile_id0; i < m_policy.m_tile_end[0]; i += numbl0) {
+        const index_type offset_0 =
+            i * m_policy.m_tile[0] + thr_id0 +
+            static_cast<index_type>(m_policy.m_lower[0]);
+        if (offset_0 < m_policy.m_upper[0] && thr_id0 < m_policy.m_tile[0]) {
+          for (index_type j = tile_id1; j < m_policy.m_tile_end[1];
+               j += numbl1) {
+            const index_type offset_1 =
+                j * m_policy.m_tile[1] + thr_id1 +
+                static_cast<index_type>(m_policy.m_lower[1]);
+            if (offset_1 < m_policy.m_upper[1] &&
+                thr_id1 < m_policy.m_tile[1]) {
+              for (index_type k = tile_id2; k < m_policy.m_tile_end[2];
+                   k += numbl2) {
+                const index_type offset_2 =
+                    k * m_policy.m_tile[2] + thr_id2 +
+                    static_cast<index_type>(m_policy.m_lower[2]);
+                if (offset_2 < m_policy.m_upper[2] &&
+                    thr_id2 < m_policy.m_tile[2]) {
+                  for (index_type l = tile_id3; l < m_policy.m_tile_end[3];
+                       l += numbl3) {
+                    const index_type offset_3 =
+                        l * m_policy.m_tile[3] + thr_id3 +
+                        static_cast<index_type>(m_policy.m_lower[3]);
+                    if (offset_3 < m_policy.m_upper[3] &&
+                        thr_id3 < m_policy.m_tile[3]) {
+                      for (index_type tile_id4 =
+                               static_cast<index_type>(hipBlockIdx_z);
+                           tile_id4 < m_policy.m_tile_end[4];
+                           tile_id4 += hipGridDim_z) {
+                        const index_type offset_4 =
+                            tile_id4 * m_policy.m_tile[4] +
+                            static_cast<index_type>(hipThreadIdx_z) +
+                            static_cast<index_type>(m_policy.m_lower[4]);
+                        if (offset_4 < m_policy.m_upper[4] &&
+                            static_cast<index_type>(hipThreadIdx_z) <
+                                m_policy.m_tile[4]) {
+                          m_func(offset_0, offset_1, offset_2, offset_3,
+                                 offset_4);
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }  // end exec_range
+
+ private:
+  const PolicyType& m_policy;
+  const Functor& m_func;
+};
+
+// Specializations for tag type
+template <typename PolicyType, typename Functor, typename Tag>
+struct DeviceIterateTile<5, PolicyType, Functor, Tag> {
+  using index_type = typename PolicyType::index_type;
+
+  KOKKOS_INLINE_FUNCTION
+  DeviceIterateTile(const PolicyType& policy_, const Functor& f_)
+      : m_policy(policy_), m_func(f_) {}
+
+  static constexpr index_type max_blocks = 65535;
+
+  KOKKOS_INLINE_FUNCTION
+  void exec_range() const {
+    // LL
+    if (PolicyType::inner_direction == PolicyType::Left) {
+      index_type temp0        = m_policy.m_tile_end[0];
+      index_type temp1        = m_policy.m_tile_end[1];
+      const index_type numbl0 = (temp0 <= max_blocks ? temp0 : max_blocks);
+      const index_type numbl1 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl0)
+               : (temp1 <= max_blocks ? temp1 : max_blocks));
+
+      const index_type tile_id0 =
+          static_cast<index_type>(hipBlockIdx_x) % numbl0;
+      const index_type tile_id1 =
+          static_cast<index_type>(hipBlockIdx_x) / numbl0;
+      const index_type thr_id0 =
+          static_cast<index_type>(hipThreadIdx_x) % m_policy.m_tile[0];
+      const index_type thr_id1 =
+          static_cast<index_type>(hipThreadIdx_x) / m_policy.m_tile[0];
+
+      temp0                   = m_policy.m_tile_end[2];
+      temp1                   = m_policy.m_tile_end[3];
+      const index_type numbl2 = (temp0 <= max_blocks ? temp0 : max_blocks);
+      const index_type numbl3 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl2)
+               : (temp1 <= max_blocks ? temp1 : max_blocks));
+
+      const index_type tile_id2 =
+          static_cast<index_type>(hipBlockIdx_y) % numbl2;
+      const index_type tile_id3 =
+          static_cast<index_type>(hipBlockIdx_y) / numbl2;
+      const index_type thr_id2 =
+          static_cast<index_type>(hipThreadIdx_y) % m_policy.m_tile[2];
+      const index_type thr_id3 =
+          static_cast<index_type>(hipThreadIdx_y) / m_policy.m_tile[2];
+
+      for (index_type tile_id4 = static_cast<index_type>(hipBlockIdx_z);
+           tile_id4 < m_policy.m_tile_end[4]; tile_id4 += hipGridDim_z) {
+        const index_type offset_4 =
+            tile_id4 * m_policy.m_tile[4] +
+            static_cast<index_type>(hipThreadIdx_z) +
+            static_cast<index_type>(m_policy.m_lower[4]);
+        if (offset_4 < m_policy.m_upper[4] &&
+            static_cast<index_type>(hipThreadIdx_z) < m_policy.m_tile[4]) {
+          for (index_type l = tile_id3; l < m_policy.m_tile_end[3];
+               l += numbl3) {
+            const index_type offset_3 =
+                l * m_policy.m_tile[3] + thr_id3 +
+                static_cast<index_type>(m_policy.m_lower[3]);
+            if (offset_3 < m_policy.m_upper[3] &&
+                thr_id3 < m_policy.m_tile[3]) {
+              for (index_type k = tile_id2; k < m_policy.m_tile_end[2];
+                   k += numbl2) {
+                const index_type offset_2 =
+                    k * m_policy.m_tile[2] + thr_id2 +
+                    static_cast<index_type>(m_policy.m_lower[2]);
+                if (offset_2 < m_policy.m_upper[2] &&
+                    thr_id2 < m_policy.m_tile[2]) {
+                  for (index_type j = tile_id1; j < m_policy.m_tile_end[1];
+                       j += numbl1) {
+                    const index_type offset_1 =
+                        j * m_policy.m_tile[1] + thr_id1 +
+                        static_cast<index_type>(m_policy.m_lower[1]);
+                    if (offset_1 < m_policy.m_upper[1] &&
+                        thr_id1 < m_policy.m_tile[1]) {
+                      for (index_type i = tile_id0; i < m_policy.m_tile_end[0];
+                           i += numbl0) {
+                        const index_type offset_0 =
+                            i * m_policy.m_tile[0] + thr_id0 +
+                            static_cast<index_type>(m_policy.m_lower[0]);
+                        if (offset_0 < m_policy.m_upper[0] &&
+                            thr_id0 < m_policy.m_tile[0]) {
+                          m_func(Tag(), offset_0, offset_1, offset_2, offset_3,
+                                 offset_4);
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+    // LR
+    else {
+      index_type temp0        = m_policy.m_tile_end[0];
+      index_type temp1        = m_policy.m_tile_end[1];
+      const index_type numbl1 = (temp1 <= max_blocks ? temp1 : max_blocks);
+      const index_type numbl0 =
+          (temp0 * temp1 > max_blocks
+               ? static_cast<index_type>(max_blocks / numbl1)
+               : (temp0 <= max_blocks ? temp0 : max_blocks));
+
+      const index_type tile_id0 =
+          static_cast<index_type>(hipBlockIdx_x) / numbl1;
+      const index_type tile_id1 =
+          static_cast<index_type>(hipBlockIdx_x) % numbl1;
+      const index_type thr_id0 =
+          static_cast<index_type>(hipThreadIdx_x) / m_policy.m_tile[1];
+      const index_type thr_id1 =
+          static_cast<index_type>(hipThreadIdx_x) % m_policy.m_tile[1];
+
+      temp0                   = m_policy.m_tile_end[2];
+      temp1                   = m_policy.m_tile_end[3];
+      const index_type numbl3 = (temp1 <= max_blocks ? temp1 : max_blocks);
+      const index_type numbl2 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl3)
+               : (temp0 <= max_blocks ? temp0 : max_blocks));
+
+      const index_type tile_id2 =
+          static_cast<index_type>(hipBlockIdx_y) / numbl3;
+      const index_type tile_id3 =
+          static_cast<index_type>(hipBlockIdx_y) % numbl3;
+      const index_type thr_id2 =
+          static_cast<index_type>(hipThreadIdx_y) / m_policy.m_tile[3];
+      const index_type thr_id3 =
+          static_cast<index_type>(hipThreadIdx_y) % m_policy.m_tile[3];
+
+      for (index_type i = tile_id0; i < m_policy.m_tile_end[0]; i += numbl0) {
+        const index_type offset_0 =
+            i * m_policy.m_tile[0] + thr_id0 +
+            static_cast<index_type>(m_policy.m_lower[0]);
+        if (offset_0 < m_policy.m_upper[0] && thr_id0 < m_policy.m_tile[0]) {
+          for (index_type j = tile_id1; j < m_policy.m_tile_end[1];
+               j += numbl1) {
+            const index_type offset_1 =
+                j * m_policy.m_tile[1] + thr_id1 +
+                static_cast<index_type>(m_policy.m_lower[1]);
+            if (offset_1 < m_policy.m_upper[1] &&
+                thr_id1 < m_policy.m_tile[1]) {
+              for (index_type k = tile_id2; k < m_policy.m_tile_end[2];
+                   k += numbl2) {
+                const index_type offset_2 =
+                    k * m_policy.m_tile[2] + thr_id2 +
+                    static_cast<index_type>(m_policy.m_lower[2]);
+                if (offset_2 < m_policy.m_upper[2] &&
+                    thr_id2 < m_policy.m_tile[2]) {
+                  for (index_type l = tile_id3; l < m_policy.m_tile_end[3];
+                       l += numbl3) {
+                    const index_type offset_3 =
+                        l * m_policy.m_tile[3] + thr_id3 +
+                        static_cast<index_type>(m_policy.m_lower[3]);
+                    if (offset_3 < m_policy.m_upper[3] &&
+                        thr_id3 < m_policy.m_tile[3]) {
+                      for (index_type tile_id4 =
+                               static_cast<index_type>(hipBlockIdx_z);
+                           tile_id4 < m_policy.m_tile_end[4];
+                           tile_id4 += hipGridDim_z) {
+                        const index_type offset_4 =
+                            tile_id4 * m_policy.m_tile[4] +
+                            static_cast<index_type>(hipThreadIdx_z) +
+                            static_cast<index_type>(m_policy.m_lower[4]);
+                        if (offset_4 < m_policy.m_upper[4] &&
+                            static_cast<index_type>(hipThreadIdx_z) <
+                                m_policy.m_tile[4]) {
+                          m_func(Tag(), offset_0, offset_1, offset_2, offset_3,
+                                 offset_4);
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }  // end exec_range
+
+ private:
+  const PolicyType& m_policy;
+  const Functor& m_func;
+};
+
+// Rank 6
+// Specializations for void tag type
+template <typename PolicyType, typename Functor>
+struct DeviceIterateTile<6, PolicyType, Functor, void> {
+  using index_type = typename PolicyType::index_type;
+
+  __device__ DeviceIterateTile(const PolicyType& rp_, const Functor& f_)
+      : m_policy(rp_), m_func(f_) {}
+
+  static constexpr index_type max_blocks = 65535;
+
+  KOKKOS_INLINE_FUNCTION
+  void exec_range() const {
+    // LL
+    if (PolicyType::inner_direction == PolicyType::Left) {
+      index_type temp0        = m_policy.m_tile_end[0];
+      index_type temp1        = m_policy.m_tile_end[1];
+      const index_type numbl0 = (temp0 <= max_blocks ? temp0 : max_blocks);
+      const index_type numbl1 =
+          (temp0 * temp1 > max_blocks
+               ? static_cast<index_type>(max_blocks / numbl0)
+               : (temp1 <= max_blocks ? temp1 : max_blocks));
+
+      const index_type tile_id0 =
+          static_cast<index_type>(hipBlockIdx_x) % numbl0;
+      const index_type tile_id1 =
+          static_cast<index_type>(hipBlockIdx_x) / numbl0;
+      const index_type thr_id0 =
+          static_cast<index_type>(hipThreadIdx_x) % m_policy.m_tile[0];
+      const index_type thr_id1 =
+          static_cast<index_type>(hipThreadIdx_x) / m_policy.m_tile[0];
+
+      temp0                   = m_policy.m_tile_end[2];
+      temp1                   = m_policy.m_tile_end[3];
+      const index_type numbl2 = (temp0 <= max_blocks ? temp0 : max_blocks);
+      const index_type numbl3 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl2)
+               : (temp1 <= max_blocks ? temp1 : max_blocks));
+
+      const index_type tile_id2 =
+          static_cast<index_type>(hipBlockIdx_y) % numbl2;
+      const index_type tile_id3 =
+          static_cast<index_type>(hipBlockIdx_y) / numbl2;
+      const index_type thr_id2 =
+          static_cast<index_type>(hipThreadIdx_y) % m_policy.m_tile[2];
+      const index_type thr_id3 =
+          static_cast<index_type>(hipThreadIdx_y) / m_policy.m_tile[2];
+
+      temp0                   = m_policy.m_tile_end[4];
+      temp1                   = m_policy.m_tile_end[5];
+      const index_type numbl4 = (temp0 <= max_blocks ? temp0 : max_blocks);
+      const index_type numbl5 =
+          (temp0 * temp1 > max_blocks
+               ? static_cast<index_type>(max_blocks / numbl4)
+               : (temp1 <= max_blocks ? temp1 : max_blocks));
+
+      const index_type tile_id4 =
+          static_cast<index_type>(hipBlockIdx_z) % numbl4;
+      const index_type tile_id5 =
+          static_cast<index_type>(hipBlockIdx_z) / numbl4;
+      const index_type thr_id4 =
+          static_cast<index_type>(hipThreadIdx_z) % m_policy.m_tile[4];
+      const index_type thr_id5 =
+          static_cast<index_type>(hipThreadIdx_z) / m_policy.m_tile[4];
+
+      for (index_type n = tile_id5; n < m_policy.m_tile_end[5]; n += numbl5) {
+        const index_type offset_5 =
+            n * m_policy.m_tile[5] + thr_id5 +
+            static_cast<index_type>(m_policy.m_lower[5]);
+        if (offset_5 < m_policy.m_upper[5] && thr_id5 < m_policy.m_tile[5]) {
+          for (index_type m = tile_id4; m < m_policy.m_tile_end[4];
+               m += numbl4) {
+            const index_type offset_4 =
+                m * m_policy.m_tile[4] + thr_id4 +
+                static_cast<index_type>(m_policy.m_lower[4]);
+            if (offset_4 < m_policy.m_upper[4] &&
+                thr_id4 < m_policy.m_tile[4]) {
+              for (index_type l = tile_id3; l < m_policy.m_tile_end[3];
+                   l += numbl3) {
+                const index_type offset_3 =
+                    l * m_policy.m_tile[3] + thr_id3 +
+                    static_cast<index_type>(m_policy.m_lower[3]);
+                if (offset_3 < m_policy.m_upper[3] &&
+                    thr_id3 < m_policy.m_tile[3]) {
+                  for (index_type k = tile_id2; k < m_policy.m_tile_end[2];
+                       k += numbl2) {
+                    const index_type offset_2 =
+                        k * m_policy.m_tile[2] + thr_id2 +
+                        static_cast<index_type>(m_policy.m_lower[2]);
+                    if (offset_2 < m_policy.m_upper[2] &&
+                        thr_id2 < m_policy.m_tile[2]) {
+                      for (index_type j = tile_id1; j < m_policy.m_tile_end[1];
+                           j += numbl1) {
+                        const index_type offset_1 =
+                            j * m_policy.m_tile[1] + thr_id1 +
+                            static_cast<index_type>(m_policy.m_lower[1]);
+                        if (offset_1 < m_policy.m_upper[1] &&
+                            thr_id1 < m_policy.m_tile[1]) {
+                          for (index_type i = tile_id0;
+                               i < m_policy.m_tile_end[0]; i += numbl0) {
+                            const index_type offset_0 =
+                                i * m_policy.m_tile[0] + thr_id0 +
+                                static_cast<index_type>(m_policy.m_lower[0]);
+                            if (offset_0 < m_policy.m_upper[0] &&
+                                thr_id0 < m_policy.m_tile[0]) {
+                              m_func(offset_0, offset_1, offset_2, offset_3,
+                                     offset_4, offset_5);
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+    // LR
+    else {
+      index_type temp0        = m_policy.m_tile_end[0];
+      index_type temp1        = m_policy.m_tile_end[1];
+      const index_type numbl1 = (temp1 <= max_blocks ? temp1 : max_blocks);
+      const index_type numbl0 =
+          (temp0 * temp1 > max_blocks
+               ? static_cast<index_type>(max_blocks / numbl1)
+               : (temp0 <= max_blocks ? temp0 : max_blocks));
+
+      const index_type tile_id0 =
+          static_cast<index_type>(hipBlockIdx_x) / numbl1;
+      const index_type tile_id1 =
+          static_cast<index_type>(hipBlockIdx_x) % numbl1;
+      const index_type thr_id0 =
+          static_cast<index_type>(hipThreadIdx_x) / m_policy.m_tile[1];
+      const index_type thr_id1 =
+          static_cast<index_type>(hipThreadIdx_x) % m_policy.m_tile[1];
+
+      temp0                   = m_policy.m_tile_end[2];
+      temp1                   = m_policy.m_tile_end[3];
+      const index_type numbl3 = (temp1 <= max_blocks ? temp1 : max_blocks);
+      const index_type numbl2 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl3)
+               : (temp0 <= max_blocks ? temp0 : max_blocks));
+
+      const index_type tile_id2 =
+          static_cast<index_type>(hipBlockIdx_y) / numbl3;
+      const index_type tile_id3 =
+          static_cast<index_type>(hipBlockIdx_y) % numbl3;
+      const index_type thr_id2 =
+          static_cast<index_type>(hipThreadIdx_y) / m_policy.m_tile[3];
+      const index_type thr_id3 =
+          static_cast<index_type>(hipThreadIdx_y) % m_policy.m_tile[3];
+
+      temp0                   = m_policy.m_tile_end[4];
+      temp1                   = m_policy.m_tile_end[5];
+      const index_type numbl5 = (temp1 <= max_blocks ? temp1 : max_blocks);
+      const index_type numbl4 =
+          (temp0 * temp1 > max_blocks
+               ? index_type(max_blocks / numbl5)
+               : (temp0 <= max_blocks ? temp0 : max_blocks));
+
+      const index_type tile_id4 =
+          static_cast<index_type>(hipBlockIdx_z) / numbl5;
+      const index_type tile_id5 =
+          static_cast<index_type>(hipBlockIdx_z) % numbl5;
+      const index_type thr_id4 =
+          static_cast<index_type>(hipThreadIdx_z) / m_policy.m_tile[5];
+      const index_type thr_id5 =
+          static_cast<index_type>(hipThreadIdx_z) % m_policy.m_tile[5];
+
+      for (index_type i = tile_id0; i < m_policy.m_tile_end[0]; i += numbl0) {
+        const index_type offset_0 =
+            i * m_policy.m_tile[0] + thr_id0 +
+            static_cast<index_type>(m_policy.m_lower[0]);
+        if (offset_0 < m_policy.m_upper[0] && thr_id0 < m_policy.m_tile[0]) {
+          for (index_type j = tile_id1; j < m_policy.m_tile_end[1];
+               j += numbl1) {
+            const index_type offset_1 =
+                j * m_policy.m_tile[1] + thr_id1 +
+                static_cast<index_type>(m_policy.m_lower[1]);
+            if (offset_1 < m_policy.m_upper[1] &&
+                thr_id1 < m_policy.m_tile[1]) {
+              for (index_type k = tile_id2; k < m_policy.m_tile_end[2];
+                   k += numbl2) {
+                const index_type offset_2 =
+                    k * m_policy.m_tile[2] + thr_id2 +
+                    static_cast<index_type>(m_policy.m_lower[2]);
+                if (offset_2 < m_policy.m_upper[2] &&
+                    thr_id2 < m_policy.m_tile[2]) {
+                  for (index_type l = tile_id3; l < m_policy.m_tile_end[3];
+                       l += numbl3) {
+                    const index_type offset_3 =
+                        l * m_policy.m_tile[3] + thr_id3 +
+                        static_cast<index_type>(m_policy.m_lower[3]);
+                    if (offset_3 < m_policy.m_upper[3] &&
+                        thr_id3 < m_policy.m_tile[3]) {
+                      for (index_type m = tile_id4; m < m_policy.m_tile_end[4];
+                           m += numbl4) {
+                        const index_type offset_4 =
+                            m * m_policy.m_tile[4] + thr_id4 +
+                            static_cast<index_type>(m_policy.m_lower[4]);
+                        if (offset_4 < m_policy.m_upper[4] &&
+                            thr_id4 < m_policy.m_tile[4]) {
+                          for (index_type n = tile_id5;
+                               n < m_policy.m_tile_end[5]; n += numbl5) {
+                            const index_type offset_5 =
+                                n * m_policy.m_tile[5] + thr_id5 +
+                                static_cast<index_type>(m_policy.m_lower[5]);
+                            if (offset_5 < m_policy.m_upper[5] &&
+                                thr_id5 < m_policy.m_tile[5]) {
+                              m_func(offset_0, offset_1, offset_2, offset_3,
+                                     offset_4, offset_5);
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }  // end exec_range
+
+ private:
+  const PolicyType& m_policy;
+  const Functor& m_func;
+};
+
+// Specializations for tag type
+template <typename PolicyType, typename Functor, typename Tag>
+struct DeviceIterateTile<6, PolicyType, Functor, Tag> {
+  using index_type = typename PolicyType::index_type;
+
+  KOKKOS_INLINE_FUNCTION
+  DeviceIterateTile(const PolicyType& policy_, const Functor& f_)
+      : m_policy(policy_), m_func(f_) {}
+
+  static constexpr index_type max_blocks = 65535;
+
+  KOKKOS_INLINE_FUNCTION
+  void exec_range() const {
+    // LL
+    if (PolicyType::inner_direction == PolicyType::Left) {
+      index_type temp0        = m_policy.m_tile_end[0];
+      index_type temp1        = m_policy.m_tile_end[1];
+      const index_type numbl0 = (temp0 <= max_blocks ? temp0 : max_blocks);
+      const index_type numbl1 =
+          (temp0 * temp1 > max_blocks
+               ? static_cast<index_type>(max_blocks / numbl0)
+               : (temp1 <= max_blocks ? temp1 : max_blocks));
+
+      const index_type tile_id0 =
+          static_cast<index_type>(hipBlockIdx_x) % numbl0;
+      const index_type tile_id1 =
+          static_cast<index_type>(hipBlockIdx_x) / numbl0;
+      const index_type thr_id0 =
+          static_cast<index_type>(hipThreadIdx_x) % m_policy.m_tile[0];
+      const index_type thr_id1 =
+          static_cast<index_type>(hipThreadIdx_x) / m_policy.m_tile[0];
+
+      temp0                   = m_policy.m_tile_end[2];
+      temp1                   = m_policy.m_tile_end[3];
+      const index_type numbl2 = (temp0 <= max_blocks ? temp0 : max_blocks);
+      const index_type numbl3 =
+          (temp0 * temp1 > max_blocks
+               ? static_cast<index_type>(max_blocks / numbl2)
+               : (temp1 <= max_blocks ? temp1 : max_blocks));
+
+      const index_type tile_id2 =
+          static_cast<index_type>(hipBlockIdx_y) % numbl2;
+      const index_type tile_id3 =
+          static_cast<index_type>(hipBlockIdx_y) / numbl2;
+      const index_type thr_id2 =
+          static_cast<index_type>(hipThreadIdx_y) % m_policy.m_tile[2];
+      const index_type thr_id3 =
+          static_cast<index_type>(hipThreadIdx_y) / m_policy.m_tile[2];
+
+      temp0                   = m_policy.m_tile_end[4];
+      temp1                   = m_policy.m_tile_end[5];
+      const index_type numbl4 = (temp0 <= max_blocks ? temp0 : max_blocks);
+      const index_type numbl5 =
+          (temp0 * temp1 > max_blocks
+               ? static_cast<index_type>(max_blocks / numbl4)
+               : (temp1 <= max_blocks ? temp1 : max_blocks));
+
+      const index_type tile_id4 =
+          static_cast<index_type>(hipBlockIdx_z) % numbl4;
+      const index_type tile_id5 =
+          static_cast<index_type>(hipBlockIdx_z) / numbl4;
+      const index_type thr_id4 =
+          static_cast<index_type>(hipThreadIdx_z) % m_policy.m_tile[4];
+      const index_type thr_id5 =
+          static_cast<index_type>(hipThreadIdx_z) / m_policy.m_tile[4];
+
+      for (index_type n = tile_id5; n < m_policy.m_tile_end[5]; n += numbl5) {
+        const index_type offset_5 =
+            n * m_policy.m_tile[5] + thr_id5 +
+            static_cast<index_type>(m_policy.m_lower[5]);
+        if (offset_5 < m_policy.m_upper[5] && thr_id5 < m_policy.m_tile[5]) {
+          for (index_type m = tile_id4; m < m_policy.m_tile_end[4];
+               m += numbl4) {
+            const index_type offset_4 =
+                m * m_policy.m_tile[4] + thr_id4 +
+                static_cast<index_type>(m_policy.m_lower[4]);
+            if (offset_4 < m_policy.m_upper[4] &&
+                thr_id4 < m_policy.m_tile[4]) {
+              for (index_type l = tile_id3; l < m_policy.m_tile_end[3];
+                   l += numbl3) {
+                const index_type offset_3 =
+                    l * m_policy.m_tile[3] + thr_id3 +
+                    static_cast<index_type>(m_policy.m_lower[3]);
+                if (offset_3 < m_policy.m_upper[3] &&
+                    thr_id3 < m_policy.m_tile[3]) {
+                  for (index_type k = tile_id2; k < m_policy.m_tile_end[2];
+                       k += numbl2) {
+                    const index_type offset_2 =
+                        k * m_policy.m_tile[2] + thr_id2 +
+                        static_cast<index_type>(m_policy.m_lower[2]);
+                    if (offset_2 < m_policy.m_upper[2] &&
+                        thr_id2 < m_policy.m_tile[2]) {
+                      for (index_type j = tile_id1; j < m_policy.m_tile_end[1];
+                           j += numbl1) {
+                        const index_type offset_1 =
+                            j * m_policy.m_tile[1] + thr_id1 +
+                            static_cast<index_type>(m_policy.m_lower[1]);
+                        if (offset_1 < m_policy.m_upper[1] &&
+                            thr_id1 < m_policy.m_tile[1]) {
+                          for (index_type i = tile_id0;
+                               i < m_policy.m_tile_end[0]; i += numbl0) {
+                            const index_type offset_0 =
+                                i * m_policy.m_tile[0] + thr_id0 +
+                                static_cast<index_type>(m_policy.m_lower[0]);
+                            if (offset_0 < m_policy.m_upper[0] &&
+                                thr_id0 < m_policy.m_tile[0]) {
+                              m_func(Tag(), offset_0, offset_1, offset_2,
+                                     offset_3, offset_4, offset_5);
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+    // LR
+    else {
+      index_type temp0        = m_policy.m_tile_end[0];
+      index_type temp1        = m_policy.m_tile_end[1];
+      const index_type numbl1 = (temp1 <= max_blocks ? temp1 : max_blocks);
+      const index_type numbl0 =
+          (temp0 * temp1 > max_blocks
+               ? static_cast<index_type>(max_blocks / numbl1)
+               : (temp0 <= max_blocks ? temp0 : max_blocks));
+
+      const index_type tile_id0 =
+          static_cast<index_type>(hipBlockIdx_x) / numbl1;
+      const index_type tile_id1 =
+          static_cast<index_type>(hipBlockIdx_x) % numbl1;
+      const index_type thr_id0 =
+          static_cast<index_type>(hipThreadIdx_x) / m_policy.m_tile[1];
+      const index_type thr_id1 =
+          static_cast<index_type>(hipThreadIdx_x) % m_policy.m_tile[1];
+
+      temp0                   = m_policy.m_tile_end[2];
+      temp1                   = m_policy.m_tile_end[3];
+      const index_type numbl3 = (temp1 <= max_blocks ? temp1 : max_blocks);
+      const index_type numbl2 =
+          (temp0 * temp1 > max_blocks
+               ? static_cast<index_type>(max_blocks / numbl3)
+               : (temp0 <= max_blocks ? temp0 : max_blocks));
+
+      const index_type tile_id2 =
+          static_cast<index_type>(hipBlockIdx_y) / numbl3;
+      const index_type tile_id3 =
+          static_cast<index_type>(hipBlockIdx_y) % numbl3;
+      const index_type thr_id2 =
+          static_cast<index_type>(hipThreadIdx_y) / m_policy.m_tile[3];
+      const index_type thr_id3 =
+          static_cast<index_type>(hipThreadIdx_y) % m_policy.m_tile[3];
+
+      temp0                   = m_policy.m_tile_end[4];
+      temp1                   = m_policy.m_tile_end[5];
+      const index_type numbl5 = (temp1 <= max_blocks ? temp1 : max_blocks);
+      const index_type numbl4 =
+          (temp0 * temp1 > max_blocks
+               ? static_cast<index_type>(max_blocks / numbl5)
+               : (temp0 <= max_blocks ? temp0 : max_blocks));
+
+      const index_type tile_id4 =
+          static_cast<index_type>(hipBlockIdx_z) / numbl5;
+      const index_type tile_id5 =
+          static_cast<index_type>(hipBlockIdx_z) % numbl5;
+      const index_type thr_id4 =
+          static_cast<index_type>(hipThreadIdx_z) / m_policy.m_tile[5];
+      const index_type thr_id5 =
+          static_cast<index_type>(hipThreadIdx_z) % m_policy.m_tile[5];
+
+      for (index_type i = tile_id0; i < m_policy.m_tile_end[0]; i += numbl0) {
+        const index_type offset_0 =
+            i * m_policy.m_tile[0] + thr_id0 +
+            static_cast<index_type>(m_policy.m_lower[0]);
+        if (offset_0 < m_policy.m_upper[0] && thr_id0 < m_policy.m_tile[0]) {
+          for (index_type j = tile_id1; j < m_policy.m_tile_end[1];
+               j += numbl1) {
+            const index_type offset_1 =
+                j * m_policy.m_tile[1] + thr_id1 +
+                static_cast<index_type>(m_policy.m_lower[1]);
+            if (offset_1 < m_policy.m_upper[1] &&
+                thr_id1 < m_policy.m_tile[1]) {
+              for (index_type k = tile_id2; k < m_policy.m_tile_end[2];
+                   k += numbl2) {
+                const index_type offset_2 =
+                    k * m_policy.m_tile[2] + thr_id2 +
+                    static_cast<index_type>(m_policy.m_lower[2]);
+                if (offset_2 < m_policy.m_upper[2] &&
+                    thr_id2 < m_policy.m_tile[2]) {
+                  for (index_type l = tile_id3; l < m_policy.m_tile_end[3];
+                       l += numbl3) {
+                    const index_type offset_3 =
+                        l * m_policy.m_tile[3] + thr_id3 +
+                        static_cast<index_type>(m_policy.m_lower[3]);
+                    if (offset_3 < m_policy.m_upper[3] &&
+                        thr_id3 < m_policy.m_tile[3]) {
+                      for (index_type m = tile_id4; m < m_policy.m_tile_end[4];
+                           m += numbl4) {
+                        const index_type offset_4 =
+                            m * m_policy.m_tile[4] + thr_id4 +
+                            static_cast<index_type>(m_policy.m_lower[4]);
+                        if (offset_4 < m_policy.m_upper[4] &&
+                            thr_id4 < m_policy.m_tile[4]) {
+                          for (index_type n = tile_id5;
+                               n < m_policy.m_tile_end[5]; n += numbl5) {
+                            const index_type offset_5 =
+                                n * m_policy.m_tile[5] + thr_id5 +
+                                static_cast<index_type>(m_policy.m_lower[5]);
+                            if (offset_5 < m_policy.m_upper[5] &&
+                                thr_id5 < m_policy.m_tile[5]) {
+                              m_func(Tag(), offset_0, offset_1, offset_2,
+                                     offset_3, offset_4, offset_5);
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }  // end exec_range
+
+ private:
+  const PolicyType& m_policy;
+  const Functor& m_func;
+};
+
+// ----------------------------------------------------------------------------------
+
+namespace Reduce {
+
+template <typename T>
+using is_void = std::is_same<T, void>;
+
+template <typename T>
+struct is_array_type : std::false_type {
+  using value_type = T;
+};
+
+template <typename T>
+struct is_array_type<T*> : std::true_type {
+  using value_type = T;
+};
+
+template <typename T>
+struct is_array_type<T[]> : std::true_type {
+  using value_type = T;
+};
+
+// ------------------------------------------------------------------ //
+template <int N, typename PolicyType, typename Functor, typename Tag,
+          typename ValueType, typename Enable = void>
+struct DeviceIterateTile;
+
+// ParallelReduce iteration pattern
+// Scalar reductions
+
+// num_blocks = min( num_tiles, max_num_blocks ); //i.e. determined by number of
+// tiles and reduction algorithm constraints extract n-dim tile offsets (i.e.
+// tile's global starting mulit-index) from the tileid = blockid using tile
+// dimensions local indices within a tile extracted from (index_type)threadIdx_x
+// using tile dims, constrained by blocksize combine tile and local id info for
+// multi-dim global ids
+
+// Pattern:
+// Each block+thread is responsible for a tile+local_id combo (additional when
+// striding by num_blocks)
+// 1. create offset arrays
+// 2. loop over number of tiles, striding by griddim (equal to num tiles, or max
+// num blocks)
+// 3. temps set for tile_idx and thrd_idx, which will be modified
+// 4. if LL vs LR:
+//      determine tile starting point offsets (multidim)
+//      determine local index offsets (multidim)
+//      concatentate tile offset + local offset for global multi-dim index
+//    if offset withinin range bounds AND local offset within tile bounds, call
+//    functor
+
+// ValueType = T
+// Rank 2
+// Specializations for void tag type
+template <typename PolicyType, typename Functor, typename ValueType>
+struct DeviceIterateTile<
+    2, PolicyType, Functor, void, ValueType,
+    typename std::enable_if<!is_array_type<ValueType>::value>::type> {
+  using index_type = typename PolicyType::index_type;
+
+  __device__ DeviceIterateTile(const PolicyType& rp_, const Functor& f_,
+                               ValueType& v_)
+      : m_policy(rp_), m_func(f_), m_v(v_) {}
+
+  KOKKOS_INLINE_FUNCTION
+  void exec_range() const {
+    if (static_cast<index_type>(hipBlockIdx_x) < m_policy.m_num_tiles &&
+        static_cast<index_type>(hipThreadIdx_y) < m_policy.m_prod_tile_dims) {
+      index_type m_offset[PolicyType::rank];  // tile starting global id offset
+      index_type
+          m_local_offset[PolicyType::rank];  // tile starting global id offset
+
+      for (index_type tileidx = static_cast<index_type>(hipBlockIdx_x);
+           tileidx < m_policy.m_num_tiles; tileidx += hipGridDim_x) {
+        index_type tile_idx =
+            tileidx;  // temp because tile_idx will be modified while
+                      // determining tile starting point offsets
+        index_type thrd_idx = static_cast<index_type>(hipThreadIdx_y);
+        bool in_bounds      = true;
+
+        // LL
+        if (PolicyType::inner_direction == PolicyType::Left) {
+          for (int i = 0; i < PolicyType::rank; ++i) {
+            // Deduce this blocks tile_id
+            m_offset[i] =
+                (tile_idx % m_policy.m_tile_end[i]) * m_policy.m_tile[i] +
+                m_policy.m_lower[i];
+            tile_idx /= m_policy.m_tile_end[i];
+
+            m_local_offset[i] = (thrd_idx % m_policy.m_tile[i]);
+            thrd_idx /= m_policy.m_tile[i];
+
+            m_offset[i] += m_local_offset[i];
+            if (!(m_offset[i] < m_policy.m_upper[i] &&
+                  m_local_offset[i] < m_policy.m_tile[i])) {
+              in_bounds &= false;
+            }
+          }
+          if (in_bounds) {
+            m_func(m_offset[0], m_offset[1], m_v);
+          }
+        }
+        // LR
+        else {
+          for (int i = PolicyType::rank - 1; i >= 0; --i) {
+            m_offset[i] =
+                (tile_idx % m_policy.m_tile_end[i]) * m_policy.m_tile[i] +
+                m_policy.m_lower[i];
+            tile_idx /= m_policy.m_tile_end[i];
+
+            m_local_offset[i] = (thrd_idx % m_policy.m_tile[i]);
+            thrd_idx /= m_policy.m_tile[i];
+
+            m_offset[i] += m_local_offset[i];
+            if (!(m_offset[i] < m_policy.m_upper[i] &&
+                  m_local_offset[i] < m_policy.m_tile[i])) {
+              in_bounds &= false;
+            }
+          }
+          if (in_bounds) {
+            m_func(m_offset[0], m_offset[1], m_v);
+          }
+        }
+      }
+    }
+
+  }  // end exec_range
+
+ private:
+  const PolicyType& m_policy;
+  const Functor& m_func;
+  ValueType& m_v;
+};
+
+// Specializations for tag type
+template <typename PolicyType, typename Functor, typename Tag,
+          typename ValueType>
+struct DeviceIterateTile<
+    2, PolicyType, Functor, Tag, ValueType,
+    typename std::enable_if<!is_array_type<ValueType>::value &&
+                            !is_void<Tag>::value>::type> {
+  using index_type = typename PolicyType::index_type;
+
+  KOKKOS_INLINE_FUNCTION
+  DeviceIterateTile(const PolicyType& rp_, const Functor& f_, ValueType& v_)
+      : m_policy(rp_), m_func(f_), m_v(v_) {}
+
+  KOKKOS_INLINE_FUNCTION
+  void exec_range() const {
+    if (static_cast<index_type>(hipBlockIdx_x) < m_policy.m_num_tiles &&
+        static_cast<index_type>(hipThreadIdx_y) < m_policy.m_prod_tile_dims) {
+      index_type m_offset[PolicyType::rank];  // tile starting global id offset
+      index_type
+          m_local_offset[PolicyType::rank];  // tile starting global id offset
+
+      for (index_type tileidx = static_cast<index_type>(hipBlockIdx_x);
+           tileidx < m_policy.m_num_tiles; tileidx += hipGridDim_x) {
+        index_type tile_idx =
+            tileidx;  // temp because tile_idx will be modified while
+                      // determining tile starting point offsets
+        index_type thrd_idx = static_cast<index_type>(hipThreadIdx_y);
+        bool in_bounds      = true;
+
+        // LL
+        if (PolicyType::inner_direction == PolicyType::Left) {
+          for (int i = 0; i < PolicyType::rank; ++i) {
+            m_offset[i] =
+                (tile_idx % m_policy.m_tile_end[i]) * m_policy.m_tile[i] +
+                m_policy.m_lower[i];
+            tile_idx /= m_policy.m_tile_end[i];
+
+            // tile-local indices identified with (index_type)threadIdx_y
+            m_local_offset[i] = (thrd_idx % m_policy.m_tile[i]);
+            thrd_idx /= m_policy.m_tile[i];
+
+            m_offset[i] += m_local_offset[i];
+            if (!(m_offset[i] < m_policy.m_upper[i] &&
+                  m_local_offset[i] < m_policy.m_tile[i])) {
+              in_bounds &= false;
+            }
+          }
+          if (in_bounds) {
+            m_func(Tag(), m_offset[0], m_offset[1], m_v);
+          }
+        }
+        // LR
+        else {
+          for (int i = PolicyType::rank - 1; i >= 0; --i) {
+            m_offset[i] =
+                (tile_idx % m_policy.m_tile_end[i]) * m_policy.m_tile[i] +
+                m_policy.m_lower[i];
+            tile_idx /= m_policy.m_tile_end[i];
+
+            // tile-local indices identified with (index_type)threadIdx_y
+            m_local_offset[i] =
+                (thrd_idx %
+                 m_policy.m_tile[i]);  // Move this to first computation,
+                                       // add to m_offset right away
+            thrd_idx /= m_policy.m_tile[i];
+
+            m_offset[i] += m_local_offset[i];
+            if (!(m_offset[i] < m_policy.m_upper[i] &&
+                  m_local_offset[i] < m_policy.m_tile[i])) {
+              in_bounds &= false;
+            }
+          }
+          if (in_bounds) {
+            m_func(Tag(), m_offset[0], m_offset[1], m_v);
+          }
+        }
+      }
+    }
+  }  // end exec_range
+
+ private:
+  const PolicyType& m_policy;
+  const Functor& m_func;
+  ValueType& m_v;
+};
+
+// Rank 3
+// Specializations for void tag type
+template <typename PolicyType, typename Functor, typename ValueType>
+struct DeviceIterateTile<
+    3, PolicyType, Functor, void, ValueType,
+    typename std::enable_if<!is_array_type<ValueType>::value>::type> {
+  using index_type = typename PolicyType::index_type;
+
+  __device__ DeviceIterateTile(const PolicyType& policy_, const Functor& f_,
+                               ValueType& v_)
+      : m_policy(policy_), m_func(f_), m_v(v_) {}
+
+  KOKKOS_INLINE_FUNCTION
+  void exec_range() const {
+    if (static_cast<index_type>(hipBlockIdx_x) < m_policy.m_num_tiles &&
+        static_cast<index_type>(hipThreadIdx_y) < m_policy.m_prod_tile_dims) {
+      index_type m_offset[PolicyType::rank];  // tile starting global id offset
+      index_type
+          m_local_offset[PolicyType::rank];  // tile starting global id offset
+
+      for (index_type tileidx = static_cast<index_type>(hipBlockIdx_x);
+           tileidx < m_policy.m_num_tiles; tileidx += hipGridDim_x) {
+        index_type tile_idx =
+            tileidx;  // temp because tile_idx will be modified while
+                      // determining tile starting point offsets
+        index_type thrd_idx = static_cast<index_type>(hipThreadIdx_y);
+        bool in_bounds      = true;
+
+        // LL
+        if (PolicyType::inner_direction == PolicyType::Left) {
+          for (int i = 0; i < PolicyType::rank; ++i) {
+            m_offset[i] =
+                (tile_idx % m_policy.m_tile_end[i]) * m_policy.m_tile[i] +
+                m_policy.m_lower[i];
+            tile_idx /= m_policy.m_tile_end[i];
+
+            // tile-local indices identified with (index_type)threadIdx_y
+            m_local_offset[i] = (thrd_idx % m_policy.m_tile[i]);
+            thrd_idx /= m_policy.m_tile[i];
+
+            m_offset[i] += m_local_offset[i];
+            if (!(m_offset[i] < m_policy.m_upper[i] &&
+                  m_local_offset[i] < m_policy.m_tile[i])) {
+              in_bounds &= false;
+            }
+          }
+          if (in_bounds) {
+            m_func(m_offset[0], m_offset[1], m_offset[2], m_v);
+          }
+        }
+        // LR
+        else {
+          for (int i = PolicyType::rank - 1; i >= 0; --i) {
+            m_offset[i] =
+                (tile_idx % m_policy.m_tile_end[i]) * m_policy.m_tile[i] +
+                m_policy.m_lower[i];
+            tile_idx /= m_policy.m_tile_end[i];
+
+            // tile-local indices identified with (index_type)threadIdx_y
+            m_local_offset[i] =
+                (thrd_idx %
+                 m_policy.m_tile[i]);  // Move this to first computation,
+                                       // add to m_offset right away
+            thrd_idx /= m_policy.m_tile[i];
+
+            m_offset[i] += m_local_offset[i];
+            if (!(m_offset[i] < m_policy.m_upper[i] &&
+                  m_local_offset[i] < m_policy.m_tile[i])) {
+              in_bounds &= false;
+            }
+          }
+          if (in_bounds) {
+            m_func(m_offset[0], m_offset[1], m_offset[2], m_v);
+          }
+        }
+      }
+    }
+  }  // end exec_range
+
+ private:
+  const PolicyType& m_policy;
+  const Functor& m_func;
+  ValueType& m_v;
+};
+
+// Specializations for void tag type
+template <typename PolicyType, typename Functor, typename Tag,
+          typename ValueType>
+struct DeviceIterateTile<
+    3, PolicyType, Functor, Tag, ValueType,
+    typename std::enable_if<!is_array_type<ValueType>::value &&
+                            !is_void<Tag>::value>::type> {
+  using index_type = typename PolicyType::index_type;
+
+  KOKKOS_INLINE_FUNCTION
+  DeviceIterateTile(const PolicyType& policy_, const Functor& f_, ValueType& v_)
+      : m_policy(policy_), m_func(f_), m_v(v_) {}
+
+  KOKKOS_INLINE_FUNCTION
+  void exec_range() const {
+    if (static_cast<index_type>(hipBlockIdx_x) < m_policy.m_num_tiles &&
+        static_cast<index_type>(hipThreadIdx_y) < m_policy.m_prod_tile_dims) {
+      index_type m_offset[PolicyType::rank];  // tile starting global id offset
+      index_type
+          m_local_offset[PolicyType::rank];  // tile starting global id offset
+
+      for (index_type tileidx = static_cast<index_type>(hipBlockIdx_x);
+           tileidx < m_policy.m_num_tiles; tileidx += hipGridDim_x) {
+        index_type tile_idx =
+            tileidx;  // temp because tile_idx will be modified while
+                      // determining tile starting point offsets
+        index_type thrd_idx = static_cast<index_type>(hipThreadIdx_y);
+        bool in_bounds      = true;
+
+        // LL
+        if (PolicyType::inner_direction == PolicyType::Left) {
+          for (int i = 0; i < PolicyType::rank; ++i) {
+            m_offset[i] =
+                (tile_idx % m_policy.m_tile_end[i]) * m_policy.m_tile[i] +
+                m_policy.m_lower[i];
+            tile_idx /= m_policy.m_tile_end[i];
+
+            // tile-local indices identified with (index_type)threadIdx_y
+            m_local_offset[i] = (thrd_idx % m_policy.m_tile[i]);
+            thrd_idx /= m_policy.m_tile[i];
+
+            m_offset[i] += m_local_offset[i];
+            if (!(m_offset[i] < m_policy.m_upper[i] &&
+                  m_local_offset[i] < m_policy.m_tile[i])) {
+              in_bounds &= false;
+            }
+          }
+          if (in_bounds) {
+            m_func(Tag(), m_offset[0], m_offset[1], m_offset[2], m_v);
+          }
+        }
+        // LR
+        else {
+          for (int i = PolicyType::rank - 1; i >= 0; --i) {
+            m_offset[i] =
+                (tile_idx % m_policy.m_tile_end[i]) * m_policy.m_tile[i] +
+                m_policy.m_lower[i];
+            tile_idx /= m_policy.m_tile_end[i];
+
+            // tile-local indices identified with (index_type)threadIdx_y
+            m_local_offset[i] =
+                (thrd_idx %
+                 m_policy.m_tile[i]);  // Move this to first computation,
+                                       // add to m_offset right away
+            thrd_idx /= m_policy.m_tile[i];
+
+            m_offset[i] += m_local_offset[i];
+            if (!(m_offset[i] < m_policy.m_upper[i] &&
+                  m_local_offset[i] < m_policy.m_tile[i])) {
+              in_bounds &= false;
+            }
+          }
+          if (in_bounds) {
+            m_func(Tag(), m_offset[0], m_offset[1], m_offset[2], m_v);
+          }
+        }
+      }
+    }
+  }  // end exec_range
+
+ private:
+  const PolicyType& m_policy;
+  const Functor& m_func;
+  ValueType& m_v;
+};
+
+// Rank 4
+// Specializations for void tag type
+template <typename PolicyType, typename Functor, typename ValueType>
+struct DeviceIterateTile<
+    4, PolicyType, Functor, void, ValueType,
+    typename std::enable_if<!is_array_type<ValueType>::value>::type> {
+  using index_type = typename PolicyType::index_type;
+
+  __device__ DeviceIterateTile(const PolicyType& policy_, const Functor& f_,
+                               ValueType& v_)
+      : m_policy(policy_), m_func(f_), m_v(v_) {}
+
+  static constexpr index_type max_blocks = 65535;
+
+  KOKKOS_INLINE_FUNCTION
+  void exec_range() const {
+    if (static_cast<index_type>(hipBlockIdx_x) < m_policy.m_num_tiles &&
+        static_cast<index_type>(hipThreadIdx_y) < m_policy.m_prod_tile_dims) {
+      index_type m_offset[PolicyType::rank];  // tile starting global id offset
+      index_type
+          m_local_offset[PolicyType::rank];  // tile starting global id offset
+
+      for (index_type tileidx = static_cast<index_type>(hipBlockIdx_x);
+           tileidx < m_policy.m_num_tiles; tileidx += hipGridDim_x) {
+        index_type tile_idx =
+            tileidx;  // temp because tile_idx will be modified while
+                      // determining tile starting point offsets
+        index_type thrd_idx = static_cast<index_type>(hipThreadIdx_y);
+        bool in_bounds      = true;
+
+        // LL
+        if (PolicyType::inner_direction == PolicyType::Left) {
+          for (int i = 0; i < PolicyType::rank; ++i) {
+            m_offset[i] =
+                (tile_idx % m_policy.m_tile_end[i]) * m_policy.m_tile[i] +
+                m_policy.m_lower[i];
+            tile_idx /= m_policy.m_tile_end[i];
+
+            // tile-local indices identified with (index_type)hipThreadIdx_y
+            m_local_offset[i] = (thrd_idx % m_policy.m_tile[i]);
+            thrd_idx /= m_policy.m_tile[i];
+
+            m_offset[i] += m_local_offset[i];
+            if (!(m_offset[i] < m_policy.m_upper[i] &&
+                  m_local_offset[i] < m_policy.m_tile[i])) {
+              in_bounds &= false;
+            }
+          }
+          if (in_bounds) {
+            m_func(m_offset[0], m_offset[1], m_offset[2], m_offset[3], m_v);
+          }
+        }
+        // LR
+        else {
+          for (int i = PolicyType::rank - 1; i >= 0; --i) {
+            m_offset[i] =
+                (tile_idx % m_policy.m_tile_end[i]) * m_policy.m_tile[i] +
+                m_policy.m_lower[i];
+            tile_idx /= m_policy.m_tile_end[i];
+
+            // tile-local indices identified with (index_type)threadIdx_y
+            m_local_offset[i] = (thrd_idx % m_policy.m_tile[i]);
+            thrd_idx /= m_policy.m_tile[i];
+
+            m_offset[i] += m_local_offset[i];
+            if (!(m_offset[i] < m_policy.m_upper[i] &&
+                  m_local_offset[i] < m_policy.m_tile[i])) {
+              in_bounds &= false;
+            }
+          }
+          if (in_bounds) {
+            m_func(m_offset[0], m_offset[1], m_offset[2], m_offset[3], m_v);
+          }
+        }
+      }
+    }
+  }  // end exec_range
+
+ private:
+  const PolicyType& m_policy;
+  const Functor& m_func;
+  ValueType& m_v;
+};
+
+// Specializations for void tag type
+template <typename PolicyType, typename Functor, typename Tag,
+          typename ValueType>
+struct DeviceIterateTile<
+    4, PolicyType, Functor, Tag, ValueType,
+    typename std::enable_if<!is_array_type<ValueType>::value &&
+                            !is_void<Tag>::value>::type> {
+  using index_type = typename PolicyType::index_type;
+
+  KOKKOS_INLINE_FUNCTION
+  DeviceIterateTile(const PolicyType& policy_, const Functor& f_, ValueType& v_)
+      : m_policy(policy_), m_func(f_), m_v(v_) {}
+
+  static constexpr index_type max_blocks = 65535;
+
+  KOKKOS_INLINE_FUNCTION
+  void exec_range() const {
+    if (static_cast<index_type>(hipBlockIdx_x) < m_policy.m_num_tiles &&
+        static_cast<index_type>(hipThreadIdx_y) < m_policy.m_prod_tile_dims) {
+      index_type m_offset[PolicyType::rank];  // tile starting global id offset
+      index_type
+          m_local_offset[PolicyType::rank];  // tile starting global id offset
+
+      for (index_type tileidx = static_cast<index_type>(hipBlockIdx_x);
+           tileidx < m_policy.m_num_tiles; tileidx += hipGridDim_x) {
+        index_type tile_idx =
+            tileidx;  // temp because tile_idx will be modified while
+                      // determining tile starting point offsets
+        index_type thrd_idx = static_cast<index_type>(hipThreadIdx_y);
+        bool in_bounds      = true;
+
+        // LL
+        if (PolicyType::inner_direction == PolicyType::Left) {
+          for (int i = 0; i < PolicyType::rank; ++i) {
+            m_offset[i] =
+                (tile_idx % m_policy.m_tile_end[i]) * m_policy.m_tile[i] +
+                m_policy.m_lower[i];
+            tile_idx /= m_policy.m_tile_end[i];
+
+            // tile-local indices identified with hipThreadIdx_y
+            m_local_offset[i] = (thrd_idx % m_policy.m_tile[i]);
+            thrd_idx /= m_policy.m_tile[i];
+
+            m_offset[i] += m_local_offset[i];
+            if (!(m_offset[i] < m_policy.m_upper[i] &&
+                  m_local_offset[i] < m_policy.m_tile[i])) {
+              in_bounds &= false;
+            }
+          }
+          if (in_bounds) {
+            m_func(Tag(), m_offset[0], m_offset[1], m_offset[2], m_offset[3],
+                   m_v);
+          }
+        }
+        // LR
+        else {
+          for (int i = PolicyType::rank - 1; i >= 0; --i) {
+            m_offset[i] =
+                (tile_idx % m_policy.m_tile_end[i]) * m_policy.m_tile[i] +
+                m_policy.m_lower[i];
+            tile_idx /= m_policy.m_tile_end[i];
+
+            // tile-local indices identified with hipThreadIdx_y
+            m_local_offset[i] = (thrd_idx % m_policy.m_tile[i]);
+            thrd_idx /= m_policy.m_tile[i];
+
+            m_offset[i] += m_local_offset[i];
+            if (!(m_offset[i] < m_policy.m_upper[i] &&
+                  m_local_offset[i] < m_policy.m_tile[i])) {
+              in_bounds &= false;
+            }
+          }
+          if (in_bounds) {
+            m_func(Tag(), m_offset[0], m_offset[1], m_offset[2], m_offset[3],
+                   m_v);
+          }
+        }
+      }
+    }
+  }  // end exec_range
+
+ private:
+  const PolicyType& m_policy;
+  const Functor& m_func;
+  ValueType& m_v;
+};
+
+// Rank 5
+// Specializations for void tag type
+template <typename PolicyType, typename Functor, typename ValueType>
+struct DeviceIterateTile<
+    5, PolicyType, Functor, void, ValueType,
+    typename std::enable_if<!is_array_type<ValueType>::value>::type> {
+  using index_type = typename PolicyType::index_type;
+
+  __device__ DeviceIterateTile(const PolicyType& policy_, const Functor& f_,
+                               ValueType& v_)
+      : m_policy(policy_), m_func(f_), m_v(v_) {}
+
+  static constexpr index_type max_blocks = 65535;
+
+  KOKKOS_INLINE_FUNCTION
+  void exec_range() const {
+    if (static_cast<index_type>(hipBlockIdx_x) < m_policy.m_num_tiles &&
+        static_cast<index_type>(hipThreadIdx_y) < m_policy.m_prod_tile_dims) {
+      index_type m_offset[PolicyType::rank];  // tile starting global id offset
+      index_type
+          m_local_offset[PolicyType::rank];  // tile starting global id offset
+
+      for (index_type tileidx = static_cast<index_type>(hipBlockIdx_x);
+           tileidx < m_policy.m_num_tiles; tileidx += hipGridDim_x) {
+        index_type tile_idx =
+            tileidx;  // temp because tile_idx will be modified while
+                      // determining tile starting point offsets
+        index_type thrd_idx = static_cast<index_type>(hipThreadIdx_y);
+        bool in_bounds      = true;
+
+        // LL
+        if (PolicyType::inner_direction == PolicyType::Left) {
+          for (int i = 0; i < PolicyType::rank; ++i) {
+            m_offset[i] =
+                (tile_idx % m_policy.m_tile_end[i]) * m_policy.m_tile[i] +
+                m_policy.m_lower[i];
+            tile_idx /= m_policy.m_tile_end[i];
+
+            // tile-local indices identified with (index_type)threadIdx_y
+            m_local_offset[i] = (thrd_idx % m_policy.m_tile[i]);
+            thrd_idx /= m_policy.m_tile[i];
+
+            m_offset[i] += m_local_offset[i];
+            if (!(m_offset[i] < m_policy.m_upper[i] &&
+                  m_local_offset[i] < m_policy.m_tile[i])) {
+              in_bounds &= false;
+            }
+          }
+          if (in_bounds) {
+            m_func(m_offset[0], m_offset[1], m_offset[2], m_offset[3],
+                   m_offset[4], m_v);
+          }
+        }
+        // LR
+        else {
+          for (int i = PolicyType::rank - 1; i >= 0; --i) {
+            m_offset[i] =
+                (tile_idx % m_policy.m_tile_end[i]) * m_policy.m_tile[i] +
+                m_policy.m_lower[i];
+            tile_idx /= m_policy.m_tile_end[i];
+
+            // tile-local indices identified with hipThreadIdx_y
+            m_local_offset[i] = (thrd_idx % m_policy.m_tile[i]);
+            thrd_idx /= m_policy.m_tile[i];
+
+            m_offset[i] += m_local_offset[i];
+            if (!(m_offset[i] < m_policy.m_upper[i] &&
+                  m_local_offset[i] < m_policy.m_tile[i])) {
+              in_bounds &= false;
+            }
+          }
+          if (in_bounds) {
+            m_func(m_offset[0], m_offset[1], m_offset[2], m_offset[3],
+                   m_offset[4], m_v);
+          }
+        }
+      }
+    }
+  }  // end exec_range
+
+ private:
+  const PolicyType& m_policy;
+  const Functor& m_func;
+  ValueType& m_v;
+};
+
+// Specializations for tag type
+template <typename PolicyType, typename Functor, typename Tag,
+          typename ValueType>
+struct DeviceIterateTile<
+    5, PolicyType, Functor, Tag, ValueType,
+    typename std::enable_if<!is_array_type<ValueType>::value &&
+                            !is_void<Tag>::value>::type> {
+  using index_type = typename PolicyType::index_type;
+
+  __device__ DeviceIterateTile(const PolicyType& policy_, const Functor& f_,
+                               ValueType& v_)
+      : m_policy(policy_), m_func(f_), m_v(v_) {}
+
+  static constexpr index_type max_blocks = 65535;
+
+  KOKKOS_INLINE_FUNCTION
+  void exec_range() const {
+    if (static_cast<index_type>(hipBlockIdx_x) < m_policy.m_num_tiles &&
+        static_cast<index_type>(hipThreadIdx_y) < m_policy.m_prod_tile_dims) {
+      index_type m_offset[PolicyType::rank];  // tile starting global id offset
+      index_type
+          m_local_offset[PolicyType::rank];  // tile starting global id offset
+
+      for (index_type tileidx = static_cast<index_type>(hipBlockIdx_x);
+           tileidx < m_policy.m_num_tiles; tileidx += hipGridDim_x) {
+        index_type tile_idx =
+            tileidx;  // temp because tile_idx will be modified while
+                      // determining tile starting point offsets
+        index_type thrd_idx = static_cast<index_type>(hipThreadIdx_y);
+        bool in_bounds      = true;
+
+        // LL
+        if (PolicyType::inner_direction == PolicyType::Left) {
+          for (int i = 0; i < PolicyType::rank; ++i) {
+            m_offset[i] =
+                (tile_idx % m_policy.m_tile_end[i]) * m_policy.m_tile[i] +
+                m_policy.m_lower[i];
+            tile_idx /= m_policy.m_tile_end[i];
+
+            // tile-local indices identified with hipThreadIdx_y
+            m_local_offset[i] = (thrd_idx % m_policy.m_tile[i]);
+            thrd_idx /= m_policy.m_tile[i];
+
+            m_offset[i] += m_local_offset[i];
+            if (!(m_offset[i] < m_policy.m_upper[i] &&
+                  m_local_offset[i] < m_policy.m_tile[i])) {
+              in_bounds &= false;
+            }
+          }
+          if (in_bounds) {
+            m_func(Tag(), m_offset[0], m_offset[1], m_offset[2], m_offset[3],
+                   m_offset[4], m_v);
+          }
+        }
+        // LR
+        else {
+          for (int i = PolicyType::rank - 1; i >= 0; --i) {
+            m_offset[i] =
+                (tile_idx % m_policy.m_tile_end[i]) * m_policy.m_tile[i] +
+                m_policy.m_lower[i];
+            tile_idx /= m_policy.m_tile_end[i];
+
+            // tile-local indices identified with hipThreadIdx_y
+            m_local_offset[i] = (thrd_idx % m_policy.m_tile[i]);
+            thrd_idx /= m_policy.m_tile[i];
+
+            m_offset[i] += m_local_offset[i];
+            if (!(m_offset[i] < m_policy.m_upper[i] &&
+                  m_local_offset[i] < m_policy.m_tile[i])) {
+              in_bounds &= false;
+            }
+          }
+          if (in_bounds) {
+            m_func(Tag(), m_offset[0], m_offset[1], m_offset[2], m_offset[3],
+                   m_offset[4], m_v);
+          }
+        }
+      }
+    }
+  }  // end exec_range
+
+ private:
+  const PolicyType& m_policy;
+  const Functor& m_func;
+  ValueType& m_v;
+};
+
+// Rank 6
+// Specializations for void tag type
+template <typename PolicyType, typename Functor, typename ValueType>
+struct DeviceIterateTile<
+    6, PolicyType, Functor, void, ValueType,
+    typename std::enable_if<!is_array_type<ValueType>::value>::type> {
+  using index_type = typename PolicyType::index_type;
+
+  __device__ DeviceIterateTile(const PolicyType& policy_, const Functor& f_,
+                               ValueType& v_)
+      : m_policy(policy_), m_func(f_), m_v(v_) {}
+
+  static constexpr index_type max_blocks = 65535;
+
+  KOKKOS_INLINE_FUNCTION
+  void exec_range() const {
+    if (static_cast<index_type>(hipBlockIdx_x) < m_policy.m_num_tiles &&
+        static_cast<index_type>(hipThreadIdx_y) < m_policy.m_prod_tile_dims) {
+      index_type m_offset[PolicyType::rank];  // tile starting global id offset
+      index_type
+          m_local_offset[PolicyType::rank];  // tile starting global id offset
+
+      for (index_type tileidx = static_cast<index_type>(hipBlockIdx_x);
+           tileidx < m_policy.m_num_tiles; tileidx += hipGridDim_x) {
+        index_type tile_idx =
+            tileidx;  // temp because tile_idx will be modified while
+                      // determining tile starting point offsets
+        index_type thrd_idx = static_cast<index_type>(hipThreadIdx_y);
+        bool in_bounds      = true;
+
+        // LL
+        if (PolicyType::inner_direction == PolicyType::Left) {
+          for (int i = 0; i < PolicyType::rank; ++i) {
+            m_offset[i] =
+                (tile_idx % m_policy.m_tile_end[i]) * m_policy.m_tile[i] +
+                m_policy.m_lower[i];
+            tile_idx /= m_policy.m_tile_end[i];
+
+            // tile-local indices identified with hipThreadIdx_y
+            m_local_offset[i] = (thrd_idx % m_policy.m_tile[i]);
+            thrd_idx /= m_policy.m_tile[i];
+
+            m_offset[i] += m_local_offset[i];
+            if (!(m_offset[i] < m_policy.m_upper[i] &&
+                  m_local_offset[i] < m_policy.m_tile[i])) {
+              in_bounds &= false;
+            }
+          }
+          if (in_bounds) {
+            m_func(m_offset[0], m_offset[1], m_offset[2], m_offset[3],
+                   m_offset[4], m_offset[5], m_v);
+          }
+        }
+        // LR
+        else {
+          for (int i = PolicyType::rank - 1; i >= 0; --i) {
+            m_offset[i] =
+                (tile_idx % m_policy.m_tile_end[i]) * m_policy.m_tile[i] +
+                m_policy.m_lower[i];
+            tile_idx /= m_policy.m_tile_end[i];
+
+            // tile-local indices identified with hipThreadIdx_y
+            m_local_offset[i] = (thrd_idx % m_policy.m_tile[i]);
+            thrd_idx /= m_policy.m_tile[i];
+
+            m_offset[i] += m_local_offset[i];
+            if (!(m_offset[i] < m_policy.m_upper[i] &&
+                  m_local_offset[i] < m_policy.m_tile[i])) {
+              in_bounds &= false;
+            }
+          }
+          if (in_bounds) {
+            m_func(m_offset[0], m_offset[1], m_offset[2], m_offset[3],
+                   m_offset[4], m_offset[5], m_v);
+          }
+        }
+      }
+    }
+  }  // end exec_range
+
+ private:
+  const PolicyType& m_policy;
+  const Functor& m_func;
+  ValueType& m_v;
+};
+
+// Specializations for tag type
+template <typename PolicyType, typename Functor, typename Tag,
+          typename ValueType>
+struct DeviceIterateTile<
+    6, PolicyType, Functor, Tag, ValueType,
+    typename std::enable_if<!is_array_type<ValueType>::value &&
+                            !is_void<Tag>::value>::type> {
+  using index_type = typename PolicyType::index_type;
+
+  __device__ DeviceIterateTile(const PolicyType& rp_, const Functor& f_,
+                               ValueType& v_)
+      : m_policy(rp_), m_func(f_), m_v(v_) {}
+
+  static constexpr index_type max_blocks = 65535;
+
+  KOKKOS_INLINE_FUNCTION
+  void exec_range() const {
+    if (static_cast<index_type>(hipBlockIdx_x) < m_policy.m_num_tiles &&
+        static_cast<index_type>(hipThreadIdx_y) < m_policy.m_prod_tile_dims) {
+      index_type m_offset[PolicyType::rank];  // tile starting global id offset
+      index_type
+          m_local_offset[PolicyType::rank];  // tile starting global id offset
+
+      for (index_type tileidx = static_cast<index_type>(hipBlockIdx_x);
+           tileidx < m_policy.m_num_tiles; tileidx += hipGridDim_x) {
+        index_type tile_idx =
+            tileidx;  // temp because tile_idx will be modified while
+                      // determining tile starting point offsets
+        index_type thrd_idx = static_cast<index_type>(hipThreadIdx_y);
+        bool in_bounds      = true;
+
+        // LL
+        if (PolicyType::inner_direction == PolicyType::Left) {
+          for (int i = 0; i < PolicyType::rank; ++i) {
+            m_offset[i] =
+                (tile_idx % m_policy.m_tile_end[i]) * m_policy.m_tile[i] +
+                m_policy.m_lower[i];
+            tile_idx /= m_policy.m_tile_end[i];
+
+            // tile-local indices identified with (index_type)threadIdx_y
+            m_local_offset[i] = (thrd_idx % m_policy.m_tile[i]);
+            thrd_idx /= m_policy.m_tile[i];
+
+            m_offset[i] += m_local_offset[i];
+            if (!(m_offset[i] < m_policy.m_upper[i] &&
+                  m_local_offset[i] < m_policy.m_tile[i])) {
+              in_bounds &= false;
+            }
+          }
+          if (in_bounds) {
+            m_func(Tag(), m_offset[0], m_offset[1], m_offset[2], m_offset[3],
+                   m_offset[4], m_offset[5], m_v);
+          }
+        }
+        // LR
+        else {
+          for (int i = PolicyType::rank - 1; i >= 0; --i) {
+            m_offset[i] =
+                (tile_idx % m_policy.m_tile_end[i]) * m_policy.m_tile[i] +
+                m_policy.m_lower[i];
+            tile_idx /= m_policy.m_tile_end[i];
+
+            // tile-local indices identified with (index_type)threadIdx_y
+            m_local_offset[i] = (thrd_idx % m_policy.m_tile[i]);
+            thrd_idx /= m_policy.m_tile[i];
+
+            m_offset[i] += m_local_offset[i];
+            if (!(m_offset[i] < m_policy.m_upper[i] &&
+                  m_local_offset[i] < m_policy.m_tile[i])) {
+              in_bounds &= false;
+            }
+          }
+          if (in_bounds) {
+            m_func(Tag(), m_offset[0], m_offset[1], m_offset[2], m_offset[3],
+                   m_offset[4], m_offset[5], m_v);
+          }
+        }
+      }
+    }
+  }  // end exec_range
+
+ private:
+  const PolicyType& m_policy;
+  const Functor& m_func;
+  ValueType& m_v;
+};
+
+// ValueType = T[], T*
+// Rank 2
+// Specializations for void tag type
+template <typename PolicyType, typename Functor, typename ValueType>
+struct DeviceIterateTile<
+    2, PolicyType, Functor, void, ValueType,
+    typename std::enable_if<is_array_type<ValueType>::value>::type> {
+  using index_type = typename PolicyType::index_type;
+  using value_type = typename is_array_type<ValueType>::value_type;
+
+  __device__ DeviceIterateTile(const PolicyType& policy_, const Functor& f_,
+                               value_type* v_)
+      : m_policy(policy_), m_func(f_), m_v(v_) {}
+
+  KOKKOS_INLINE_FUNCTION
+  void exec_range() const {
+    if (static_cast<index_type>(hipBlockIdx_x) < m_policy.m_num_tiles &&
+        static_cast<index_type>(hipThreadIdx_y) < m_policy.m_prod_tile_dims) {
+      index_type m_offset[PolicyType::rank];  // tile starting global id offset
+      index_type
+          m_local_offset[PolicyType::rank];  // tile starting global id offset
+
+      for (index_type tileidx = static_cast<index_type>(hipBlockIdx_x);
+           tileidx < m_policy.m_num_tiles; tileidx += hipGridDim_x) {
+        index_type tile_idx =
+            tileidx;  // temp because tile_idx will be modified while
+                      // determining tile starting point offsets
+        index_type thrd_idx = static_cast<index_type>(hipThreadIdx_y);
+        bool in_bounds      = true;
+
+        // LL
+        if (PolicyType::inner_direction == PolicyType::Left) {
+          for (int i = 0; i < PolicyType::rank; ++i) {
+            m_offset[i] =
+                (tile_idx % m_policy.m_tile_end[i]) * m_policy.m_tile[i] +
+                m_policy.m_lower[i];
+            tile_idx /= m_policy.m_tile_end[i];
+
+            m_local_offset[i] = (thrd_idx % m_policy.m_tile[i]);
+            thrd_idx /= m_policy.m_tile[i];
+
+            m_offset[i] += m_local_offset[i];
+            if (!(m_offset[i] < m_policy.m_upper[i] &&
+                  m_local_offset[i] < m_policy.m_tile[i])) {
+              in_bounds &= false;
+            }
+          }
+          if (in_bounds) {
+            m_func(m_offset[0], m_offset[1], m_v);
+          }
+        }
+        // LR
+        else {
+          for (int i = PolicyType::rank - 1; i >= 0; --i) {
+            m_offset[i] =
+                (tile_idx % m_policy.m_tile_end[i]) * m_policy.m_tile[i] +
+                m_policy.m_lower[i];
+            tile_idx /= m_policy.m_tile_end[i];
+
+            // tile-local indices identified with (index_type)threadIdx_y
+            m_local_offset[i] =
+                (thrd_idx %
+                 m_policy.m_tile[i]);  // Move this to first computation,
+                                       // add to m_offset right away
+            thrd_idx /= m_policy.m_tile[i];
+
+            m_offset[i] += m_local_offset[i];
+            if (!(m_offset[i] < m_policy.m_upper[i] &&
+                  m_local_offset[i] < m_policy.m_tile[i])) {
+              in_bounds &= false;
+            }
+          }
+          if (in_bounds) {
+            m_func(m_offset[0], m_offset[1], m_v);
+          }
+        }
+      }
+    }
+  }  // end exec_range
+
+ private:
+  const PolicyType& m_policy;
+  const Functor& m_func;
+  value_type* m_v;
+};
+
+// Specializations for tag type
+template <typename PolicyType, typename Functor, typename Tag,
+          typename ValueType>
+struct DeviceIterateTile<
+    2, PolicyType, Functor, Tag, ValueType,
+    typename std::enable_if<is_array_type<ValueType>::value &&
+                            !is_void<Tag>::value>::type> {
+  using index_type = typename PolicyType::index_type;
+  using value_type = typename is_array_type<ValueType>::value_type;
+
+  KOKKOS_INLINE_FUNCTION
+  DeviceIterateTile(const PolicyType& rp_, const Functor& f_, value_type* v_)
+      : m_policy(rp_), m_func(f_), m_v(v_) {}
+
+  KOKKOS_INLINE_FUNCTION
+  void exec_range() const {
+    if (static_cast<index_type>(hipBlockIdx_x) < m_policy.m_num_tiles &&
+        static_cast<index_type>(hipThreadIdx_y) < m_policy.m_prod_tile_dims) {
+      index_type m_offset[PolicyType::rank];  // tile starting global id offset
+      index_type
+          m_local_offset[PolicyType::rank];  // tile starting global id offset
+
+      for (index_type tileidx = static_cast<index_type>(hipBlockIdx_x);
+           tileidx < m_policy.m_num_tiles; tileidx += hipGridDim_x) {
+        index_type tile_idx =
+            tileidx;  // temp because tile_idx will be modified while
+                      // determining tile starting point offsets
+        index_type thrd_idx = static_cast<index_type>(hipThreadIdx_y);
+        bool in_bounds      = true;
+
+        // LL
+        if (PolicyType::inner_direction == PolicyType::Left) {
+          for (int i = 0; i < PolicyType::rank; ++i) {
+            m_offset[i] =
+                (tile_idx % m_policy.m_tile_end[i]) * m_policy.m_tile[i] +
+                m_policy.m_lower[i];
+            tile_idx /= m_policy.m_tile_end[i];
+
+            // tile-local indices identified with (index_type)threadIdx_y
+            m_local_offset[i] = (thrd_idx % m_policy.m_tile[i]);
+            thrd_idx /= m_policy.m_tile[i];
+
+            m_offset[i] += m_local_offset[i];
+            if (!(m_offset[i] < m_policy.m_upper[i] &&
+                  m_local_offset[i] < m_policy.m_tile[i])) {
+              in_bounds &= false;
+            }
+          }
+          if (in_bounds) {
+            m_func(Tag(), m_offset[0], m_offset[1], m_v);
+          }
+        }
+        // LR
+        else {
+          for (int i = PolicyType::rank - 1; i >= 0; --i) {
+            m_offset[i] =
+                (tile_idx % m_policy.m_tile_end[i]) * m_policy.m_tile[i] +
+                m_policy.m_lower[i];
+            tile_idx /= m_policy.m_tile_end[i];
+
+            // tile-local indices identified with (index_type)threadIdx_y
+            m_local_offset[i] = (thrd_idx % m_policy.m_tile[i]);
+            thrd_idx /= m_policy.m_tile[i];
+
+            m_offset[i] += m_local_offset[i];
+            if (!(m_offset[i] < m_policy.m_upper[i] &&
+                  m_local_offset[i] < m_policy.m_tile[i])) {
+              in_bounds &= false;
+            }
+          }
+          if (in_bounds) {
+            m_func(Tag(), m_offset[0], m_offset[1], m_v);
+          }
+        }
+      }  // end for loop over num_tiles - product of tiles in each direction
+    }
+  }  // end exec_range
+
+ private:
+  const PolicyType& m_policy;
+  const Functor& m_func;
+  value_type* m_v;
+};
+
+// Rank 3
+// Specializations for void tag type
+template <typename PolicyType, typename Functor, typename ValueType>
+struct DeviceIterateTile<
+    3, PolicyType, Functor, void, ValueType,
+    typename std::enable_if<is_array_type<ValueType>::value>::type> {
+  using index_type = typename PolicyType::index_type;
+  using value_type = typename is_array_type<ValueType>::value_type;
+
+  KOKKOS_INLINE_FUNCTION
+  DeviceIterateTile(const PolicyType& policy_, const Functor& f_,
+                    value_type* v_)
+      : m_policy(policy_), m_func(f_), m_v(v_) {}
+
+  KOKKOS_INLINE_FUNCTION
+  void exec_range() const {
+    if (static_cast<index_type>(hipBlockIdx_x) < m_policy.m_num_tiles &&
+        static_cast<index_type>(hipThreadIdx_y) < m_policy.m_prod_tile_dims) {
+      index_type m_offset[PolicyType::rank];  // tile starting global id offset
+      index_type
+          m_local_offset[PolicyType::rank];  // tile starting global id offset
+
+      for (index_type tileidx = static_cast<index_type>(hipBlockIdx_x);
+           tileidx < m_policy.m_num_tiles; tileidx += hipGridDim_x) {
+        index_type tile_idx =
+            tileidx;  // temp because tile_idx will be modified while
+                      // determining tile starting point offsets
+        index_type thrd_idx = static_cast<index_type>(hipThreadIdx_y);
+        bool in_bounds      = true;
+
+        // LL
+        if (PolicyType::inner_direction == PolicyType::Left) {
+          for (int i = 0; i < PolicyType::rank; ++i) {
+            m_offset[i] =
+                (tile_idx % m_policy.m_tile_end[i]) * m_policy.m_tile[i] +
+                m_policy.m_lower[i];
+            tile_idx /= m_policy.m_tile_end[i];
+
+            // tile-local indices identified with (index_type)threadIdx_y
+            m_local_offset[i] =
+                (thrd_idx %
+                 m_policy.m_tile[i]);  // Move this to first computation,
+                                       // add to m_offset right away
+            thrd_idx /= m_policy.m_tile[i];
+
+            m_offset[i] += m_local_offset[i];
+            if (!(m_offset[i] < m_policy.m_upper[i] &&
+                  m_local_offset[i] < m_policy.m_tile[i])) {
+              in_bounds &= false;
+            }
+          }
+          if (in_bounds) {
+            m_func(m_offset[0], m_offset[1], m_offset[2], m_v);
+          }
+        }
+        // LR
+        else {
+          for (int i = PolicyType::rank - 1; i >= 0; --i) {
+            m_offset[i] =
+                (tile_idx % m_policy.m_tile_end[i]) * m_policy.m_tile[i] +
+                m_policy.m_lower[i];
+            tile_idx /= m_policy.m_tile_end[i];
+
+            // tile-local indices identified with (index_type)threadIdx_y
+            m_local_offset[i] =
+                (thrd_idx %
+                 m_policy.m_tile[i]);  // Move this to first computation,
+                                       // add to m_offset right away
+            thrd_idx /= m_policy.m_tile[i];
+
+            m_offset[i] += m_local_offset[i];
+            if (!(m_offset[i] < m_policy.m_upper[i] &&
+                  m_local_offset[i] < m_policy.m_tile[i])) {
+              in_bounds &= false;
+            }
+          }
+          if (in_bounds) {
+            m_func(m_offset[0], m_offset[1], m_offset[2], m_v);
+          }
+        }
+      }
+    }
+  }  // end exec_range
+
+ private:
+  const PolicyType& m_policy;
+  const Functor& m_func;
+  value_type* m_v;
+};
+
+// Specializations for void tag type
+template <typename PolicyType, typename Functor, typename Tag,
+          typename ValueType>
+struct DeviceIterateTile<
+    3, PolicyType, Functor, Tag, ValueType,
+    typename std::enable_if<is_array_type<ValueType>::value &&
+                            !is_void<Tag>::value>::type> {
+  using index_type = typename PolicyType::index_type;
+  using value_type = typename is_array_type<ValueType>::value_type;
+
+  KOKKOS_INLINE_FUNCTION
+  DeviceIterateTile(const PolicyType& policy_, const Functor& f_,
+                    value_type* v_)
+      : m_policy(policy_), m_func(f_), m_v(v_) {}
+
+  KOKKOS_INLINE_FUNCTION
+  void exec_range() const {
+    if (static_cast<index_type>(hipBlockIdx_x) < m_policy.m_num_tiles &&
+        static_cast<index_type>(hipThreadIdx_y) < m_policy.m_prod_tile_dims) {
+      index_type m_offset[PolicyType::rank];  // tile starting global id offset
+      index_type
+          m_local_offset[PolicyType::rank];  // tile starting global id offset
+
+      for (index_type tileidx = static_cast<index_type>(hipBlockIdx_x);
+           tileidx < m_policy.m_num_tiles; tileidx += hipGridDim_x) {
+        index_type tile_idx =
+            tileidx;  // temp because tile_idx will be modified while
+                      // determining tile starting point offsets
+        index_type thrd_idx = static_cast<index_type>(hipThreadIdx_y);
+        bool in_bounds      = true;
+
+        // LL
+        if (PolicyType::inner_direction == PolicyType::Left) {
+          for (int i = 0; i < PolicyType::rank; ++i) {
+            m_offset[i] =
+                (tile_idx % m_policy.m_tile_end[i]) * m_policy.m_tile[i] +
+                m_policy.m_lower[i];
+            tile_idx /= m_policy.m_tile_end[i];
+
+            // tile-local indices identified with hipThreadIdx_y
+            m_local_offset[i] = (thrd_idx % m_policy.m_tile[i]);
+            thrd_idx /= m_policy.m_tile[i];
+
+            m_offset[i] += m_local_offset[i];
+            if (!(m_offset[i] < m_policy.m_upper[i] &&
+                  m_local_offset[i] < m_policy.m_tile[i])) {
+              in_bounds &= false;
+            }
+          }
+          if (in_bounds) {
+            m_func(Tag(), m_offset[0], m_offset[1], m_offset[2], m_v);
+          }
+        }
+        // LR
+        else {
+          for (int i = PolicyType::rank - 1; i >= 0; --i) {
+            m_offset[i] =
+                (tile_idx % m_policy.m_tile_end[i]) * m_policy.m_tile[i] +
+                m_policy.m_lower[i];
+            tile_idx /= m_policy.m_tile_end[i];
+
+            // tile-local indices identified with (index_type)threadIdx_y
+            m_local_offset[i] = (thrd_idx % m_policy.m_tile[i]);
+            thrd_idx /= m_policy.m_tile[i];
+
+            m_offset[i] += m_local_offset[i];
+            if (!(m_offset[i] < m_policy.m_upper[i] &&
+                  m_local_offset[i] < m_policy.m_tile[i])) {
+              in_bounds &= false;
+            }
+          }
+          if (in_bounds) {
+            m_func(Tag(), m_offset[0], m_offset[1], m_offset[2], m_v);
+          }
+        }
+      }
+    }
+  }  // end exec_range
+
+ private:
+  const PolicyType& m_policy;
+  const Functor& m_func;
+  value_type* m_v;
+};
+
+// Rank 4
+// Specializations for void tag type
+template <typename PolicyType, typename Functor, typename ValueType>
+struct DeviceIterateTile<
+    4, PolicyType, Functor, void, ValueType,
+    typename std::enable_if<is_array_type<ValueType>::value>::type> {
+  using index_type = typename PolicyType::index_type;
+  using value_type = typename is_array_type<ValueType>::value_type;
+
+  KOKKOS_INLINE_FUNCTION
+  DeviceIterateTile(const PolicyType& policy_, const Functor& f_,
+                    value_type* v_)
+      : m_policy(policy_), m_func(f_), m_v(v_) {}
+
+  static constexpr index_type max_blocks = 65535;
+
+  KOKKOS_INLINE_FUNCTION
+  void exec_range() const {
+    if (static_cast<index_type>(hipBlockIdx_x) < m_policy.m_num_tiles &&
+        static_cast<index_type>(hipThreadIdx_y) < m_policy.m_prod_tile_dims) {
+      index_type m_offset[PolicyType::rank];  // tile starting global id offset
+      index_type
+          m_local_offset[PolicyType::rank];  // tile starting global id offset
+
+      for (index_type tileidx = static_cast<index_type>(hipBlockIdx_x);
+           tileidx < m_policy.m_num_tiles; tileidx += hipGridDim_x) {
+        index_type tile_idx =
+            tileidx;  // temp because tile_idx will be modified while
+                      // determining tile starting point offsets
+        index_type thrd_idx = static_cast<index_type>(hipThreadIdx_y);
+        bool in_bounds      = true;
+
+        // LL
+        if (PolicyType::inner_direction == PolicyType::Left) {
+          for (int i = 0; i < PolicyType::rank; ++i) {
+            m_offset[i] =
+                (tile_idx % m_policy.m_tile_end[i]) * m_policy.m_tile[i] +
+                m_policy.m_lower[i];
+            tile_idx /= m_policy.m_tile_end[i];
+
+            // tile-local indices identified with hipThreadIdx_y
+            m_local_offset[i] = (thrd_idx % m_policy.m_tile[i]);
+            thrd_idx /= m_policy.m_tile[i];
+
+            m_offset[i] += m_local_offset[i];
+            if (!(m_offset[i] < m_policy.m_upper[i] &&
+                  m_local_offset[i] < m_policy.m_tile[i])) {
+              in_bounds &= false;
+            }
+          }
+          if (in_bounds) {
+            m_func(m_offset[0], m_offset[1], m_offset[2], m_offset[3], m_v);
+          }
+        }
+        // LR
+        else {
+          for (int i = PolicyType::rank - 1; i >= 0; --i) {
+            m_offset[i] =
+                (tile_idx % m_policy.m_tile_end[i]) * m_policy.m_tile[i] +
+                m_policy.m_lower[i];
+            tile_idx /= m_policy.m_tile_end[i];
+
+            // tile-local indices identified with hipThreadIdx_y
+            m_local_offset[i] = (thrd_idx % m_policy.m_tile[i]);
+            thrd_idx /= m_policy.m_tile[i];
+
+            m_offset[i] += m_local_offset[i];
+            if (!(m_offset[i] < m_policy.m_upper[i] &&
+                  m_local_offset[i] < m_policy.m_tile[i])) {
+              in_bounds &= false;
+            }
+          }
+          if (in_bounds) {
+            m_func(m_offset[0], m_offset[1], m_offset[2], m_offset[3], m_v);
+          }
+        }
+      }
+    }
+  }  // end exec_range
+
+ private:
+  const PolicyType& m_policy;
+  const Functor& m_func;
+  value_type* m_v;
+};
+
+// Specializations for void tag type
+template <typename PolicyType, typename Functor, typename Tag,
+          typename ValueType>
+struct DeviceIterateTile<
+    4, PolicyType, Functor, Tag, ValueType,
+    typename std::enable_if<is_array_type<ValueType>::value &&
+                            !is_void<Tag>::value>::type> {
+  using index_type = typename PolicyType::index_type;
+  using value_type = typename is_array_type<ValueType>::value_type;
+
+  KOKKOS_INLINE_FUNCTION
+  DeviceIterateTile(const PolicyType& policy_, const Functor& f_,
+                    value_type* v_)
+      : m_policy(policy_), m_func(f_), m_v(v_) {}
+
+  static constexpr index_type max_blocks = 65535;
+
+  KOKKOS_INLINE_FUNCTION
+  void exec_range() const {
+    if (static_cast<index_type>(hipBlockIdx_x) < m_policy.m_num_tiles &&
+        static_cast<index_type>(hipThreadIdx_y) < m_policy.m_prod_tile_dims) {
+      index_type m_offset[PolicyType::rank];  // tile starting global id offset
+      index_type
+          m_local_offset[PolicyType::rank];  // tile starting global id offset
+
+      for (index_type tileidx = static_cast<index_type>(hipBlockIdx_x);
+           tileidx < m_policy.m_num_tiles; tileidx += hipGridDim_x) {
+        index_type tile_idx =
+            tileidx;  // temp because tile_idx will be modified while
+                      // determining tile starting point offsets
+        index_type thrd_idx = static_cast<index_type>(hipThreadIdx_y);
+        bool in_bounds      = true;
+
+        // LL
+        if (PolicyType::inner_direction == PolicyType::Left) {
+          for (int i = 0; i < PolicyType::rank; ++i) {
+            m_offset[i] =
+                (tile_idx % m_policy.m_tile_end[i]) * m_policy.m_tile[i] +
+                m_policy.m_lower[i];
+            tile_idx /= m_policy.m_tile_end[i];
+
+            // tile-local indices identified with (index_type)threadIdx_y
+            m_local_offset[i] = (thrd_idx % m_policy.m_tile[i]);
+            thrd_idx /= m_policy.m_tile[i];
+
+            m_offset[i] += m_local_offset[i];
+            if (!(m_offset[i] < m_policy.m_upper[i] &&
+                  m_local_offset[i] < m_policy.m_tile[i])) {
+              in_bounds &= false;
+            }
+          }
+          if (in_bounds) {
+            m_func(Tag(), m_offset[0], m_offset[1], m_offset[2], m_offset[3],
+                   m_v);
+          }
+        }
+        // LR
+        else {
+          for (int i = PolicyType::rank - 1; i >= 0; --i) {
+            m_offset[i] =
+                (tile_idx % m_policy.m_tile_end[i]) * m_policy.m_tile[i] +
+                m_policy.m_lower[i];
+            tile_idx /= m_policy.m_tile_end[i];
+
+            // tile-local indices identified with (index_type)threadIdx_y
+            m_local_offset[i] = (thrd_idx % m_policy.m_tile[i]);
+            thrd_idx /= m_policy.m_tile[i];
+
+            m_offset[i] += m_local_offset[i];
+            if (!(m_offset[i] < m_policy.m_upper[i] &&
+                  m_local_offset[i] < m_policy.m_tile[i])) {
+              in_bounds &= false;
+            }
+          }
+          if (in_bounds) {
+            m_func(Tag(), m_offset[0], m_offset[1], m_offset[2], m_offset[3],
+                   m_v);
+          }
+        }
+      }
+    }
+  }  // end exec_range
+
+ private:
+  const PolicyType& m_policy;
+  const Functor& m_func;
+  value_type* m_v;
+};
+
+// Rank 5
+// Specializations for void tag type
+template <typename PolicyType, typename Functor, typename ValueType>
+struct DeviceIterateTile<
+    5, PolicyType, Functor, void, ValueType,
+    typename std::enable_if<is_array_type<ValueType>::value>::type> {
+  using index_type = typename PolicyType::index_type;
+  using value_type = typename is_array_type<ValueType>::value_type;
+
+  KOKKOS_INLINE_FUNCTION
+  DeviceIterateTile(const PolicyType& policy_, const Functor& f_,
+                    value_type* v_)
+      : m_policy(policy_), m_func(f_), m_v(v_) {}
+
+  static constexpr index_type max_blocks = 65535;
+
+  KOKKOS_INLINE_FUNCTION
+  void exec_range() const {
+    if (static_cast<index_type>(hipBlockIdx_x) < m_policy.m_num_tiles &&
+        static_cast<index_type>(hipThreadIdx_y) < m_policy.m_prod_tile_dims) {
+      index_type m_offset[PolicyType::rank];  // tile starting global id offset
+      index_type
+          m_local_offset[PolicyType::rank];  // tile starting global id offset
+
+      for (index_type tileidx = static_cast<index_type>(hipBlockIdx_x);
+           tileidx < m_policy.m_num_tiles; tileidx += hipGridDim_x) {
+        index_type tile_idx =
+            tileidx;  // temp because tile_idx will be modified while
+                      // determining tile starting point offsets
+        index_type thrd_idx = static_cast<index_type>(hipThreadIdx_y);
+        bool in_bounds      = true;
+
+        // LL
+        if (PolicyType::inner_direction == PolicyType::Left) {
+          for (int i = 0; i < PolicyType::rank; ++i) {
+            m_offset[i] =
+                (tile_idx % m_policy.m_tile_end[i]) * m_policy.m_tile[i] +
+                m_policy.m_lower[i];
+            tile_idx /= m_policy.m_tile_end[i];
+
+            // tile-local indices identified with hipThreadIdx_y
+            m_local_offset[i] = (thrd_idx % m_policy.m_tile[i]);
+            thrd_idx /= m_policy.m_tile[i];
+
+            m_offset[i] += m_local_offset[i];
+            if (!(m_offset[i] < m_policy.m_upper[i] &&
+                  m_local_offset[i] < m_policy.m_tile[i])) {
+              in_bounds &= false;
+            }
+          }
+          if (in_bounds) {
+            m_func(m_offset[0], m_offset[1], m_offset[2], m_offset[3],
+                   m_offset[4], m_v);
+          }
+        }
+        // LR
+        else {
+          for (int i = PolicyType::rank - 1; i >= 0; --i) {
+            m_offset[i] =
+                (tile_idx % m_policy.m_tile_end[i]) * m_policy.m_tile[i] +
+                m_policy.m_lower[i];
+            tile_idx /= m_policy.m_tile_end[i];
+
+            // tile-local indices identified with hipThreadIdx_y
+            m_local_offset[i] = (thrd_idx % m_policy.m_tile[i]);
+            thrd_idx /= m_policy.m_tile[i];
+
+            m_offset[i] += m_local_offset[i];
+            if (!(m_offset[i] < m_policy.m_upper[i] &&
+                  m_local_offset[i] < m_policy.m_tile[i])) {
+              in_bounds &= false;
+            }
+          }
+          if (in_bounds) {
+            m_func(m_offset[0], m_offset[1], m_offset[2], m_offset[3],
+                   m_offset[4], m_v);
+          }
+        }
+      }
+    }
+  }  // end exec_range
+
+ private:
+  const PolicyType& m_policy;
+  const Functor& m_func;
+  value_type* m_v;
+};
+
+// Specializations for tag type
+template <typename PolicyType, typename Functor, typename Tag,
+          typename ValueType>
+struct DeviceIterateTile<
+    5, PolicyType, Functor, Tag, ValueType,
+    typename std::enable_if<is_array_type<ValueType>::value &&
+                            !is_void<Tag>::value>::type> {
+  using index_type = typename PolicyType::index_type;
+  using value_type = typename is_array_type<ValueType>::value_type;
+
+  KOKKOS_INLINE_FUNCTION
+  DeviceIterateTile(const PolicyType& policy_, const Functor& f_,
+                    value_type* v_)
+      : m_policy(policy_), m_func(f_), m_v(v_) {}
+
+  static constexpr index_type max_blocks = 65535;
+
+  KOKKOS_INLINE_FUNCTION
+  void exec_range() const {
+    if (static_cast<index_type>(hipBlockIdx_x) < m_policy.m_num_tiles &&
+        static_cast<index_type>(hipThreadIdx_y) < m_policy.m_prod_tile_dims) {
+      index_type m_offset[PolicyType::rank];  // tile starting global id offset
+      index_type
+          m_local_offset[PolicyType::rank];  // tile starting global id offset
+
+      for (index_type tileidx = static_cast<index_type>(hipBlockIdx_x);
+           tileidx < m_policy.m_num_tiles; tileidx += hipGridDim_x) {
+        index_type tile_idx =
+            tileidx;  // temp because tile_idx will be modified while
+                      // determining tile starting point offsets
+        index_type thrd_idx = static_cast<index_type>(hipThreadIdx_y);
+        bool in_bounds      = true;
+
+        // LL
+        if (PolicyType::inner_direction == PolicyType::Left) {
+          for (int i = 0; i < PolicyType::rank; ++i) {
+            m_offset[i] =
+                (tile_idx % m_policy.m_tile_end[i]) * m_policy.m_tile[i] +
+                m_policy.m_lower[i];
+            tile_idx /= m_policy.m_tile_end[i];
+
+            // tile-local indices identified with hipThreadIdx_y
+            m_local_offset[i] = (thrd_idx % m_policy.m_tile[i]);
+            thrd_idx /= m_policy.m_tile[i];
+
+            m_offset[i] += m_local_offset[i];
+            if (!(m_offset[i] < m_policy.m_upper[i] &&
+                  m_local_offset[i] < m_policy.m_tile[i])) {
+              in_bounds &= false;
+            }
+          }
+          if (in_bounds) {
+            m_func(Tag(), m_offset[0], m_offset[1], m_offset[2], m_offset[3],
+                   m_offset[4], m_v);
+          }
+        }
+        // LR
+        else {
+          for (int i = PolicyType::rank - 1; i >= 0; --i) {
+            m_offset[i] =
+                (tile_idx % m_policy.m_tile_end[i]) * m_policy.m_tile[i] +
+                m_policy.m_lower[i];
+            tile_idx /= m_policy.m_tile_end[i];
+
+            // tile-local indices identified with hipThreadIdx_y
+            m_local_offset[i] = (thrd_idx % m_policy.m_tile[i]);
+            thrd_idx /= m_policy.m_tile[i];
+
+            m_offset[i] += m_local_offset[i];
+            if (!(m_offset[i] < m_policy.m_upper[i] &&
+                  m_local_offset[i] < m_policy.m_tile[i])) {
+              in_bounds &= false;
+            }
+          }
+          if (in_bounds) {
+            m_func(Tag(), m_offset[0], m_offset[1], m_offset[2], m_offset[3],
+                   m_offset[4], m_v);
+          }
+        }
+      }
+    }
+  }  // end exec_range
+
+ private:
+  const PolicyType& m_policy;
+  const Functor& m_func;
+  value_type* m_v;
+};
+
+// Rank 6
+// Specializations for void tag type
+template <typename PolicyType, typename Functor, typename ValueType>
+struct DeviceIterateTile<
+    6, PolicyType, Functor, void, ValueType,
+    typename std::enable_if<is_array_type<ValueType>::value>::type> {
+  using index_type = typename PolicyType::index_type;
+  using value_type = typename is_array_type<ValueType>::value_type;
+
+  KOKKOS_INLINE_FUNCTION
+  DeviceIterateTile(const PolicyType& policy_, const Functor& f_,
+                    value_type* v_)
+      : m_policy(policy_), m_func(f_), m_v(v_) {}
+
+  static constexpr index_type max_blocks = 65535;
+
+  KOKKOS_INLINE_FUNCTION
+  void exec_range() const {
+    if (static_cast<index_type>(hipBlockIdx_x) < m_policy.m_num_tiles &&
+        static_cast<index_type>(hipThreadIdx_y) < m_policy.m_prod_tile_dims) {
+      index_type m_offset[PolicyType::rank];  // tile starting global id offset
+      index_type
+          m_local_offset[PolicyType::rank];  // tile starting global id offset
+
+      for (index_type tileidx = static_cast<index_type>(hipBlockIdx_x);
+           tileidx < m_policy.m_num_tiles; tileidx += hipGridDim_x) {
+        index_type tile_idx =
+            tileidx;  // temp because tile_idx will be modified while
+                      // determining tile starting point offsets
+        index_type thrd_idx = static_cast<index_type>(hipThreadIdx_y);
+        bool in_bounds      = true;
+
+        // LL
+        if (PolicyType::inner_direction == PolicyType::Left) {
+          for (int i = 0; i < PolicyType::rank; ++i) {
+            m_offset[i] =
+                (tile_idx % m_policy.m_tile_end[i]) * m_policy.m_tile[i] +
+                m_policy.m_lower[i];
+            tile_idx /= m_policy.m_tile_end[i];
+
+            // tile-local indices identified with hipThreadIdx_y
+            m_local_offset[i] = (thrd_idx % m_policy.m_tile[i]);
+            thrd_idx /= m_policy.m_tile[i];
+
+            m_offset[i] += m_local_offset[i];
+            if (!(m_offset[i] < m_policy.m_upper[i] &&
+                  m_local_offset[i] < m_policy.m_tile[i])) {
+              in_bounds &= false;
+            }
+          }
+          if (in_bounds) {
+            m_func(m_offset[0], m_offset[1], m_offset[2], m_offset[3],
+                   m_offset[4], m_offset[5], m_v);
+          }
+        }
+        // LR
+        else {
+          for (int i = PolicyType::rank - 1; i >= 0; --i) {
+            m_offset[i] =
+                (tile_idx % m_policy.m_tile_end[i]) * m_policy.m_tile[i] +
+                m_policy.m_lower[i];
+            tile_idx /= m_policy.m_tile_end[i];
+
+            // tile-local indices identified with hipThreadIdx_y
+            m_local_offset[i] = (thrd_idx % m_policy.m_tile[i]);
+            thrd_idx /= m_policy.m_tile[i];
+
+            m_offset[i] += m_local_offset[i];
+            if (!(m_offset[i] < m_policy.m_upper[i] &&
+                  m_local_offset[i] < m_policy.m_tile[i])) {
+              in_bounds &= false;
+            }
+          }
+          if (in_bounds) {
+            m_func(m_offset[0], m_offset[1], m_offset[2], m_offset[3],
+                   m_offset[4], m_offset[5], m_v);
+          }
+        }
+      }
+    }
+  }  // end exec_range
+
+ private:
+  const PolicyType& m_policy;
+  const Functor& m_func;
+  value_type* m_v;
+};
+
+// Specializations for tag type
+template <typename PolicyType, typename Functor, typename Tag,
+          typename ValueType>
+struct DeviceIterateTile<
+    6, PolicyType, Functor, Tag, ValueType,
+    typename std::enable_if<is_array_type<ValueType>::value &&
+                            !is_void<Tag>::value>::type> {
+  using index_type = typename PolicyType::index_type;
+  using value_type = typename is_array_type<ValueType>::value_type;
+
+  KOKKOS_INLINE_FUNCTION
+  DeviceIterateTile(const PolicyType& policy_, const Functor& f_,
+                    value_type* v_)
+      : m_policy(policy_), m_func(f_), m_v(v_) {}
+
+  static constexpr index_type max_blocks = 65535;
+
+  KOKKOS_INLINE_FUNCTION
+  void exec_range() const {
+    if (static_cast<index_type>(hipBlockIdx_x) < m_policy.m_num_tiles &&
+        static_cast<index_type>(hipThreadIdx_y) < m_policy.m_prod_tile_dims) {
+      index_type m_offset[PolicyType::rank];  // tile starting global id offset
+      index_type
+          m_local_offset[PolicyType::rank];  // tile starting global id offset
+
+      for (index_type tileidx = static_cast<index_type>(hipBlockIdx_x);
+           tileidx < m_policy.m_num_tiles; tileidx += hipGridDim_x) {
+        index_type tile_idx =
+            tileidx;  // temp because tile_idx will be modified while
+                      // determining tile starting point offsets
+        index_type thrd_idx = static_cast<index_type>(hipThreadIdx_y);
+        bool in_bounds      = true;
+
+        // LL
+        if (PolicyType::inner_direction == PolicyType::Left) {
+          for (int i = 0; i < PolicyType::rank; ++i) {
+            m_offset[i] =
+                (tile_idx % m_policy.m_tile_end[i]) * m_policy.m_tile[i] +
+                m_policy.m_lower[i];
+            tile_idx /= m_policy.m_tile_end[i];
+
+            // tile-local indices identified with hipThreadIdx_y
+            m_local_offset[i] = (thrd_idx % m_policy.m_tile[i]);
+            thrd_idx /= m_policy.m_tile[i];
+
+            m_offset[i] += m_local_offset[i];
+            if (!(m_offset[i] < m_policy.m_upper[i] &&
+                  m_local_offset[i] < m_policy.m_tile[i])) {
+              in_bounds &= false;
+            }
+          }
+          if (in_bounds) {
+            m_func(Tag(), m_offset[0], m_offset[1], m_offset[2], m_offset[3],
+                   m_offset[4], m_offset[5], m_v);
+          }
+        }
+        // LR
+        else {
+          for (int i = PolicyType::rank - 1; i >= 0; --i) {
+            m_offset[i] =
+                (tile_idx % m_policy.m_tile_end[i]) * m_policy.m_tile[i] +
+                m_policy.m_lower[i];
+            tile_idx /= m_policy.m_tile_end[i];
+
+            // tile-local indices identified with hipThreadIdx_y
+            m_local_offset[i] = (thrd_idx % m_policy.m_tile[i]);
+            thrd_idx /= m_policy.m_tile[i];
+
+            m_offset[i] += m_local_offset[i];
+            if (!(m_offset[i] < m_policy.m_upper[i] &&
+                  m_local_offset[i] < m_policy.m_tile[i])) {
+              in_bounds &= false;
+            }
+          }
+          if (in_bounds) {
+            m_func(Tag(), m_offset[0], m_offset[1], m_offset[2], m_offset[3],
+                   m_offset[4], m_offset[5], m_v);
+          }
+        }
+      }
+    }
+  }  // end exec_range
+
+ private:
+  const PolicyType& m_policy;
+  const Functor& m_func;
+  value_type* m_v;
+};
+
+}  // namespace Reduce
+}  // namespace Impl
+}  // namespace Kokkos
+#endif
+#endif
diff --git a/kokkos/core/src/HIP/Kokkos_HIP_Abort.hpp b/kokkos/core/src/HIP/Kokkos_HIP_Abort.hpp
new file mode 100644
index 000000000..1eaae3830
--- /dev/null
+++ b/kokkos/core/src/HIP/Kokkos_HIP_Abort.hpp
@@ -0,0 +1,68 @@
+/*
+//@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
+*/
+
+#ifndef KOKKOS_HIP_ABORT_HPP
+#define KOKKOS_HIP_ABORT_HPP
+
+#include <Kokkos_Macros.hpp>
+#if defined(KOKKOS_ENABLE_HIP)
+
+#include <hip/hip_runtime.h>
+
+namespace Kokkos {
+namespace Impl {
+
+__device__ inline void hip_abort(char const *msg) {
+  printf("%s", msg);
+  // FIXME_HIP both abort and the __assertfail system call are currently
+  // implemented with __builtin_trap which causes the program to exit abnormally
+  // without printing the error message.
+  // abort();
+}
+
+}  // namespace Impl
+}  // namespace Kokkos
+
+#endif
+#endif
diff --git a/kokkos/core/src/HIP/Kokkos_HIP_Atomic.hpp b/kokkos/core/src/HIP/Kokkos_HIP_Atomic.hpp
new file mode 100644
index 000000000..c09e09f50
--- /dev/null
+++ b/kokkos/core/src/HIP/Kokkos_HIP_Atomic.hpp
@@ -0,0 +1,576 @@
+/*
+//@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
+*/
+
+#ifndef KOKKOS_HIP_ATOMIC_HPP
+#define KOKKOS_HIP_ATOMIC_HPP
+
+#ifdef KOKKOS_ENABLE_HIP_ATOMICS
+
+namespace Kokkos {
+// HIP can do:
+// Types int/unsigned int
+// variants:
+// atomic_exchange/compare_exchange/fetch_add/fetch_sub/fetch_max/fetch_min/fetch_and/fetch_or/fetch_xor/fetch_inc/fetch_dec
+
+// atomic_exchange -------------------------------------------------------------
+
+__inline__ __device__ int atomic_exchange(volatile int *const dest,
+                                          const int val) {
+  return atomicExch(const_cast<int *>(dest), val);
+}
+
+__inline__ __device__ unsigned int atomic_exchange(
+    volatile unsigned int *const dest, const unsigned int val) {
+  return atomicExch(const_cast<unsigned int *>(dest), val);
+}
+
+__inline__ __device__ unsigned long long int atomic_exchange(
+    volatile unsigned long long int *const dest,
+    const unsigned long long int val) {
+  return atomicExch(const_cast<unsigned long long *>(dest), val);
+}
+
+__inline__ __device__ float atomic_exchange(volatile float *const dest,
+                                            const float val) {
+  return atomicExch(const_cast<float *>(dest), val);
+}
+
+template <typename T>
+__inline__ __device__ T atomic_exchange(
+    volatile T *const dest,
+    typename std::enable_if<sizeof(T) == sizeof(int), const T &>::type val) {
+  int tmp = atomicExch(reinterpret_cast<int *>(const_cast<T *>(dest)),
+                       *reinterpret_cast<int *>(const_cast<T *>(&val)));
+  return reinterpret_cast<T &>(tmp);
+}
+
+template <typename T>
+__inline__ __device__ T atomic_exchange(
+    volatile T *const dest,
+    typename std::enable_if<sizeof(T) != sizeof(int) &&
+                                sizeof(T) == sizeof(unsigned long long int),
+                            const T &>::type val) {
+  typedef unsigned long long int type;
+
+  type tmp = atomicExch(reinterpret_cast<type *>(const_cast<T *>(dest)),
+                        *reinterpret_cast<type *>(const_cast<T *>(&val)));
+  return reinterpret_cast<T &>(tmp);
+}
+
+template <typename T>
+__inline__ __device__ T
+atomic_exchange(volatile T *const dest,
+                typename std::enable_if<sizeof(T) != sizeof(int) &&
+                                            sizeof(T) != sizeof(long long),
+                                        const T>::type &val) {
+  // FIXME_HIP
+  Kokkos::abort("atomic_exchange not implemented for large types.\n");
+  T return_val;
+  int done                 = 0;
+  unsigned int active      = __ballot(1);
+  unsigned int done_active = 0;
+  while (active != done_active) {
+    if (!done) {
+      // if (Impl::lock_address_hip_space((void*)dest))
+      {
+        return_val = *dest;
+        *dest      = val;
+        // Impl::unlock_address_hip_space((void*)dest);
+        done = 1;
+      }
+    }
+    done_active = __ballot(done);
+  }
+  return return_val;
+}
+
+// atomic_assign ---------------------------------------------------------------
+
+template <typename T>
+__inline__ __device__ void atomic_assign(
+    volatile T *const dest,
+    typename std::enable_if<sizeof(T) == sizeof(int), const T &>::type val) {
+  atomicExch(reinterpret_cast<int *>(const_cast<T *>(dest)),
+             *reinterpret_cast<int *>(const_cast<T *>(&val)));
+}
+
+template <typename T>
+__inline__ __device__ void atomic_assign(
+    volatile T *const dest,
+    typename std::enable_if<sizeof(T) != sizeof(int) &&
+                                sizeof(T) == sizeof(unsigned long long int),
+                            const T &>::type val) {
+  typedef unsigned long long int type;
+  atomicExch(reinterpret_cast<type *>(const_cast<T *>(dest)),
+             *reinterpret_cast<type *>(const_cast<T *>(&val)));
+}
+
+template <typename T>
+__inline__ __device__ void atomic_assign(
+    volatile T *const dest,
+    typename std::enable_if<sizeof(T) != sizeof(int) &&
+                                sizeof(T) != sizeof(unsigned long long int),
+                            const T &>::type val) {
+  atomic_exchange(dest, val);
+}
+
+// atomic_compare_exchange -----------------------------------------------------
+
+inline __device__ int atomic_compare_exchange(volatile int *dest, int compare,
+                                              const int &val) {
+  return atomicCAS(const_cast<int *>(dest), compare, val);
+}
+
+inline __device__ unsigned int atomic_compare_exchange(
+    volatile unsigned int *dest, unsigned int compare,
+    const unsigned int &val) {
+  return atomicCAS(const_cast<unsigned int *>(dest), compare, val);
+}
+
+inline __device__ unsigned long long int atomic_compare_exchange(
+    volatile unsigned long long int *dest, unsigned long long int compare,
+    const unsigned long long int &val) {
+  return atomicCAS(const_cast<unsigned long long int *>(dest), compare, val);
+}
+
+template <class T>
+__inline__ __device__ T atomic_compare_exchange(
+    volatile T *dest, T compare,
+    typename std::enable_if<sizeof(T) == sizeof(int), const T &>::type val) {
+  // FIXME_HIP UB
+  union U {
+    int i;
+    T f;
+    __inline__ __device__ U() {}
+  } idest, icompare, ival;
+  icompare.f = compare;
+  ival.f     = val;
+  idest.i    = atomicCAS(reinterpret_cast<int *>(const_cast<T *>(dest)),
+                      icompare.i, ival.i);
+  return idest.f;
+}
+
+template <class T>
+__inline__ __device__ T atomic_compare_exchange(
+    volatile T *dest, T compare,
+    typename std::enable_if<sizeof(T) == sizeof(unsigned long long int),
+                            const T &>::type val) {
+  // FIXME_HIP UB
+  union U {
+    unsigned long long int i;
+    T f;
+    __inline__ __device__ U() {}
+  } idest, icompare, ival;
+  icompare.f = compare;
+  ival.f     = val;
+  idest.i    = atomicCAS(
+      reinterpret_cast<unsigned long long int *>(const_cast<T *>(dest)),
+      icompare.i, ival.i);
+  return idest.f;
+}
+
+template <typename T>
+__inline__ __device__ T atomic_compare_exchange(
+    volatile T *const dest, const T &compare,
+    typename std::enable_if<sizeof(T) != sizeof(int) &&
+                                sizeof(T) != sizeof(long long),
+                            const T>::type &val) {
+  // FIXME_HIP
+  Kokkos::abort("atomic_compare_exchange not implemented for large types.\n");
+  T return_val;
+  int done                 = 0;
+  unsigned int active      = __ballot(1);
+  unsigned int done_active = 0;
+  while (active != done_active) {
+    if (!done) {
+      // if (Impl::lock_address_hip_space((void*)dest))
+      {
+        return_val = *dest;
+        if (return_val == compare) *dest = val;
+        // Impl::unlock_address_hip_space((void*)dest);
+        done = 1;
+      }
+    }
+    done_active = __ballot(done);
+  }
+  return return_val;
+}
+
+// atomic_fetch_add ------------------------------------------------------------
+
+inline __device__ int atomic_fetch_add(volatile int *dest, const int &val) {
+  return atomicAdd(const_cast<int *>(dest), val);
+}
+
+inline __device__ unsigned int atomic_fetch_add(volatile unsigned int *dest,
+                                                const unsigned int &val) {
+  return atomicAdd(const_cast<unsigned int *>(dest), val);
+}
+
+inline __device__ unsigned long long atomic_fetch_add(
+    volatile unsigned long long *dest, const unsigned long long &val) {
+  return atomicAdd(const_cast<unsigned long long *>(dest), val);
+}
+
+inline __device__ float atomic_fetch_add(volatile float *dest,
+                                         const float &val) {
+  return atomicAdd(const_cast<float *>(dest), val);
+}
+
+template <typename T>
+inline __device__ T atomic_fetch_add(
+    volatile T *const dest,
+    typename std::enable_if<sizeof(T) == sizeof(int), const T>::type val) {
+  // FIXME_HIP UB
+  union U {
+    int i;
+    T t;
+    __inline__ __device__ U() {}
+  } assume, oldval, newval;
+
+  oldval.t = *dest;
+
+  do {
+    assume.i = oldval.i;
+    newval.t = assume.t + val;
+    oldval.i = atomicCAS(reinterpret_cast<int *>(const_cast<T *>(dest)),
+                         assume.i, newval.i);
+  } while (assume.i != oldval.i);
+
+  return oldval.t;
+}
+
+template <typename T>
+inline __device__ T atomic_fetch_add(
+    volatile T *const dest,
+    typename std::enable_if<sizeof(T) == sizeof(long long), const T>::type
+        val) {
+  // FIXME_HIP UB
+  union U {
+    unsigned long long i;
+    T t;
+    __inline__ __device__ U() {}
+  } assume, oldval, newval;
+
+  oldval.t = *dest;
+
+  do {
+    assume.i = oldval.i;
+    newval.t = assume.t + val;
+    oldval.i = atomic_compare_exchange(
+        reinterpret_cast<volatile unsigned long long *>(dest), assume.i,
+        newval.i);
+  } while (assume.i != oldval.i);
+
+  return oldval.t;
+}
+
+__inline__ __device__ char atomic_fetch_add(volatile char *dest,
+                                            const char &val) {
+  unsigned int oldval, newval, assume;
+  oldval = *reinterpret_cast<volatile unsigned int *>(&dest);
+
+  do {
+    assume = oldval;
+    newval = assume & 0x7fffff00 + ((assume & 0xff) + val) & 0xff;
+    oldval =
+        atomicCAS(reinterpret_cast<unsigned int *>(const_cast<char *>(dest)),
+                  assume, newval);
+  } while (assume != oldval);
+
+  return oldval;
+}
+
+__inline__ __device__ short atomic_fetch_add(volatile short *dest,
+                                             const short &val) {
+  unsigned int oldval, newval, assume;
+  oldval = *reinterpret_cast<volatile unsigned int *>(&dest);
+
+  do {
+    assume = oldval;
+    newval = assume & 0x7fff0000 + ((assume & 0xffff) + val) & 0xffff;
+    oldval =
+        atomicCAS(reinterpret_cast<unsigned int *>(const_cast<short *>(dest)),
+                  assume, newval);
+  } while (assume != oldval);
+
+  return oldval;
+}
+
+__inline__ __device__ long long atomic_fetch_add(volatile long long *dest,
+                                                 const long long &val) {
+  return atomicAdd(
+      reinterpret_cast<unsigned long long *>(const_cast<long long *>(dest)),
+      val);
+}
+
+template <class T>
+__inline__ __device__ T
+atomic_fetch_add(volatile T *dest,
+                 typename std::enable_if<sizeof(T) != sizeof(int) &&
+                                             sizeof(T) != sizeof(long long),
+                                         const T &>::type val) {
+  // FIXME_HIP
+  Kokkos::abort("atomic_fetch_add not implemented for large types.\n");
+  T return_val;
+  int done                 = 0;
+  unsigned int active      = __ballot(1);
+  unsigned int done_active = 0;
+  while (active != done_active) {
+    if (!done) {
+      // if(Kokkos::Impl::lock_address_hip_space((void *)dest))
+      {
+        return_val = *dest;
+        *dest      = return_val + val;
+        // Kokkos::Impl::unlock_address_hip_space((void *)dest);
+        done = 1;
+      }
+    }
+    done_active = __ballot(done);
+  }
+  return return_val;
+}
+
+// atmic_fetch_sub -------------------------------------------------------------
+
+__inline__ __device__ int atomic_fetch_sub(volatile int *dest, int const &val) {
+  return atomicSub(const_cast<int *>(dest), val);
+}
+
+__inline__ __device__ unsigned int atomic_fetch_sub(volatile unsigned int *dest,
+                                                    unsigned int const &val) {
+  return atomicSub(const_cast<unsigned int *>(dest), val);
+}
+
+__inline__ __device__ unsigned long long atomic_fetch_sub(
+    unsigned long long *dest, int64_t const &val) {
+  return atomicAdd(reinterpret_cast<unsigned long long *>(dest),
+                   -reinterpret_cast<unsigned long long const &>(val));
+}
+
+__inline__ __device__ char atomic_fetch_sub(volatile char *dest,
+                                            const char &val) {
+  unsigned int oldval, newval, assume;
+  oldval = *reinterpret_cast<volatile unsigned int *>(dest);
+
+  do {
+    assume = oldval;
+    newval = assume & 0x7fffff00 + ((assume & 0xff) - val) & 0xff;
+    oldval =
+        atomicCAS(reinterpret_cast<unsigned int *>(const_cast<char *>(dest)),
+                  assume, newval);
+  } while (assume != oldval);
+
+  return oldval;
+}
+
+__inline__ __device__ short atomic_fetch_sub(volatile short *dest,
+                                             const short &val) {
+  unsigned int oldval, newval, assume;
+  oldval = *reinterpret_cast<volatile unsigned int *>(dest);
+
+  do {
+    assume = oldval;
+    newval = assume & 0x7fff0000 + ((assume & 0xffff) - val) & 0xffff;
+    oldval =
+        atomicCAS(reinterpret_cast<unsigned int *>(const_cast<short *>(dest)),
+                  assume, newval);
+  } while (assume != oldval);
+
+  return oldval;
+}
+
+__inline__ __device__ long long atomic_fetch_sub(volatile long long *dest,
+                                                 const long long &val) {
+  return static_cast<long long>(atomicAdd(
+      reinterpret_cast<unsigned long long int *>(const_cast<long long *>(dest)),
+      -reinterpret_cast<unsigned long long int const &>(val)));
+}
+
+template <class T>
+__inline__ __device__ T atomic_fetch_sub(
+    volatile T *dest,
+    typename std::enable_if<sizeof(T) == sizeof(int), T>::type val) {
+  // FIXME_HIP UB
+  union U {
+    int i;
+    T t;
+    __inline__ __device__ U() {}
+  } assume, oldval, newval;
+
+  oldval.t = *dest;
+
+  do {
+    assume.i = oldval.i;
+    newval.t = assume.t - val;
+    oldval.i = atomic_compare_exchange(reinterpret_cast<volatile int *>(dest),
+                                       assume.i, newval.i);
+  } while (assume.i != oldval.i);
+
+  return oldval.t;
+}
+
+template <typename T>
+inline __device__ T atomic_fetch_sub(
+    volatile T *const dest,
+    typename std::enable_if<sizeof(T) == sizeof(long long), const T>::type
+        val) {
+  // FIXME_HIP UB
+  union U {
+    unsigned long long i;
+    T t;
+    __inline__ __device__ U() {}
+  } assume, oldval, newval;
+
+  oldval.t = *dest;
+
+  do {
+    assume.i = oldval.i;
+    newval.t = assume.t - val;
+    oldval.i = atomic_compare_exchange(
+        reinterpret_cast<volatile unsigned long long *>(dest), assume.i,
+        newval.i);
+  } while (assume.i != oldval.i);
+
+  return oldval.t;
+}
+
+template <class T>
+__inline__ __device__ T atomic_fetch_sub(
+    volatile T *dest,
+    typename std::enable_if<sizeof(T) == sizeof(char), T>::type val) {
+  unsigned int oldval, newval, assume;
+  oldval = *reinterpret_cast<volatile unsigned int *>(dest);
+
+  do {
+    assume = oldval;
+    newval = assume & 0x7fffff00 + ((assume & 0xff) - val) & 0xff;
+    oldval = atomicCAS(reinterpret_cast<unsigned int *>(dest), assume, newval);
+  } while (assume != oldval);
+
+  return reinterpret_cast<T>(oldval) & 0xff;
+}
+
+template <class T>
+__inline__ __device__ T atomic_fetch_sub(
+    volatile T *dest,
+    typename std::enable_if<sizeof(T) == sizeof(short), T>::type val) {
+  unsigned int oldval, newval, assume;
+  oldval = *reinterpret_cast<int *>(dest);
+
+  do {
+    assume = oldval;
+    newval = assume & 0x7fff0000 + ((assume & 0xffff) - val) & 0xffff;
+    oldval = atomicCAS(reinterpret_cast<unsigned int *>(dest), assume, newval);
+  } while (assume != oldval);
+
+  return reinterpret_cast<T>(oldval) & 0xffff;
+}
+
+template <typename T>
+__inline__ __device__ T
+atomic_fetch_sub(volatile T *const dest,
+                 typename std::enable_if<sizeof(T) != sizeof(int) &&
+                                             sizeof(T) != sizeof(long long),
+                                         const T>::type &val) {
+  // FIXME_HIP
+  Kokkos::abort("atomic_fetch_sub not implemented for large types.\n");
+  T return_val;
+  int done                 = 0;
+  unsigned int active      = __ballot(1);
+  unsigned int done_active = 0;
+  while (active != done_active) {
+    if (!done) {
+      /*if (Impl::lock_address_hip_space((void*)dest)) */
+      {
+        return_val = *dest;
+        *dest      = return_val - val;
+        // Impl::unlock_address_hip_space((void*)dest);
+        done = 1;
+      }
+    }
+    done_active = __ballot(done);
+  }
+  return return_val;
+}
+
+// atomic_fetch_or -------------------------------------------------------------
+
+__inline__ __device__ int atomic_fetch_or(volatile int *const dest,
+                                          int const val) {
+  return atomicOr(const_cast<int *>(dest), val);
+}
+
+__inline__ __device__ unsigned int atomic_fetch_or(
+    volatile unsigned int *const dest, unsigned int const val) {
+  return atomicOr(const_cast<unsigned int *>(dest), val);
+}
+
+__inline__ __device__ unsigned long long int atomic_fetch_or(
+    volatile unsigned long long int *const dest,
+    unsigned long long int const val) {
+  return atomicOr(const_cast<unsigned long long int *>(dest), val);
+}
+
+// atomic_fetch_and ------------------------------------------------------------
+
+__inline__ __device__ int atomic_fetch_and(volatile int *const dest,
+                                           int const val) {
+  return atomicAnd(const_cast<int *>(dest), val);
+}
+
+__inline__ __device__ unsigned int atomic_fetch_and(
+    volatile unsigned int *const dest, unsigned int const val) {
+  return atomicAnd(const_cast<unsigned int *>(dest), val);
+}
+
+__inline__ __device__ unsigned long long int atomic_fetch_and(
+    volatile unsigned long long int *const dest,
+    unsigned long long int const val) {
+  return atomicAnd(const_cast<unsigned long long int *>(dest), val);
+}
+}  // namespace Kokkos
+#endif
+
+#endif
diff --git a/kokkos/core/src/HIP/Kokkos_HIP_BlockSize_Deduction.hpp b/kokkos/core/src/HIP/Kokkos_HIP_BlockSize_Deduction.hpp
new file mode 100644
index 000000000..8799d359f
--- /dev/null
+++ b/kokkos/core/src/HIP/Kokkos_HIP_BlockSize_Deduction.hpp
@@ -0,0 +1,339 @@
+/*
+//@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
+*/
+
+#ifndef KOKKOS_HIP_BLOCKSIZE_DEDUCTION_HPP
+#define KOKKOS_HIP_BLOCKSIZE_DEDUCTION_HPP
+
+#include <Kokkos_Macros.hpp>
+
+#if defined(__HIPCC__)
+
+#include <HIP/Kokkos_HIP_Instance.hpp>
+#include <HIP/Kokkos_HIP_KernelLaunch.hpp>
+
+namespace Kokkos {
+namespace Experimental {
+namespace Impl {
+template <typename DriverType, typename LaunchBounds, bool Large>
+struct HIPGetMaxBlockSize;
+
+template <typename DriverType, typename LaunchBounds>
+int hip_get_max_block_size(typename DriverType::functor_type const &f,
+                           size_t const vector_length,
+                           size_t const shmem_extra_block,
+                           size_t const shmem_extra_thread) {
+  return HIPGetMaxBlockSize<DriverType, LaunchBounds, true>::get_block_size(
+      f, vector_length, shmem_extra_block, shmem_extra_thread);
+}
+
+template <class FunctorType, class LaunchBounds>
+int hip_get_max_block_size(const HIPInternal * /*hip_instance*/,
+                           const hipFuncAttributes &attr,
+                           const FunctorType & /*f*/,
+                           const size_t /*vector_length*/,
+                           const size_t /*shmem_block*/,
+                           const size_t /*shmem_thread*/) {
+  // FIXME_HIP find a better algorithm. Be aware that
+  // maxThreadsPerMultiProcessor, regsPerBlock, and l2CacheSize are bugged and
+  // always return zero
+  // https://github.com/ROCm-Developer-Tools/HIP/blob/6c5fa32815650cc20a4f783d09b013610348a4d5/include/hip/hcc_detail/hip_runtime_api.h#L438-L440
+  // and we don't have access to the same information than we do for CUDA
+
+  int const max_threads_per_block_mi60 = 1024;
+  int const max_threads_per_block      = LaunchBounds::maxTperB == 0
+                                        ? max_threads_per_block_mi60
+                                        : LaunchBounds::maxTperB;
+  return std::min(attr.maxThreadsPerBlock, max_threads_per_block);
+}
+
+template <typename DriverType>
+struct HIPGetMaxBlockSize<DriverType, Kokkos::LaunchBounds<>, true> {
+  static int get_block_size(typename DriverType::functor_type const &f,
+                            size_t const vector_length,
+                            size_t const shmem_extra_block,
+                            size_t const shmem_extra_thread) {
+    unsigned int numBlocks = 0;
+    int blockSize          = 1024;
+    int sharedmem =
+        shmem_extra_block + shmem_extra_thread * (blockSize / vector_length) +
+        ::Kokkos::Impl::FunctorTeamShmemSize<
+            typename DriverType::functor_type>::value(f, blockSize /
+                                                             vector_length);
+    hipOccupancyMaxActiveBlocksPerMultiprocessor(
+        &numBlocks, hip_parallel_launch_constant_memory<DriverType>, blockSize,
+        sharedmem);
+
+    if (numBlocks > 0) return blockSize;
+    while (blockSize > HIPTraits::WarpSize && numBlocks == 0) {
+      blockSize /= 2;
+      sharedmem =
+          shmem_extra_block + shmem_extra_thread * (blockSize / vector_length) +
+          ::Kokkos::Impl::FunctorTeamShmemSize<
+              typename DriverType::functor_type>::value(f, blockSize /
+                                                               vector_length);
+
+      hipOccupancyMaxActiveBlocksPerMultiprocessor(
+          &numBlocks, hip_parallel_launch_constant_memory<DriverType>,
+          blockSize, sharedmem);
+    }
+    int blockSizeUpperBound = blockSize * 2;
+    while (blockSize < blockSizeUpperBound && numBlocks > 0) {
+      blockSize += HIPTraits::WarpSize;
+      sharedmem =
+          shmem_extra_block + shmem_extra_thread * (blockSize / vector_length) +
+          ::Kokkos::Impl::FunctorTeamShmemSize<
+              typename DriverType::functor_type>::value(f, blockSize /
+                                                               vector_length);
+
+      hipOccupancyMaxActiveBlocksPerMultiprocessor(
+          &numBlocks, hip_parallel_launch_constant_memory<DriverType>,
+          blockSize, sharedmem);
+    }
+    return blockSize - HIPTraits::WarpSize;
+  }
+};
+
+template <typename DriverType, typename LaunchBounds, bool Large>
+struct HIPGetOptBlockSize;
+
+template <typename DriverType, typename LaunchBounds>
+int hip_get_opt_block_size(typename DriverType::functor_type const &f,
+                           size_t const vector_length,
+                           size_t const shmem_extra_block,
+                           size_t const shmem_extra_thread) {
+  return HIPGetOptBlockSize<
+      DriverType, LaunchBounds,
+      (HIPTraits::ConstantMemoryUseThreshold <
+       sizeof(DriverType))>::get_block_size(f, vector_length, shmem_extra_block,
+                                            shmem_extra_thread);
+}
+
+template <typename FunctorType, typename LaunchBounds>
+int hip_get_opt_block_size(HIPInternal const * /*hip_instance*/,
+                           hipFuncAttributes const &attr,
+                           FunctorType const & /*f*/,
+                           size_t const /*vector_length*/,
+                           size_t const /*shmem_block*/,
+                           size_t const /*shmem_thread*/) {
+  // FIXME_HIP find a better algorithm. Be aware that
+  // maxThreadsPerMultiProcessor, regsPerBlock, and l2CacheSize are bugged and
+  // always return zero
+  // https://github.com/ROCm-Developer-Tools/HIP/blob/6c5fa32815650cc20a4f783d09b013610348a4d5/include/hip/hcc_detail/hip_runtime_api.h#L438-L440
+  // and we don't have access to the same information than we do for CUDA
+
+  int const max_threads_per_block_mi60 = 1024;
+  int const max_threads_per_block      = LaunchBounds::maxTperB == 0
+                                        ? max_threads_per_block_mi60
+                                        : LaunchBounds::maxTperB;
+  return std::min(attr.maxThreadsPerBlock, max_threads_per_block);
+}
+
+// FIXME_HIP the code is identical to the false struct except for
+// hip_parallel_launch_constant_memory
+template <typename DriverType>
+struct HIPGetOptBlockSize<DriverType, Kokkos::LaunchBounds<0, 0>, true> {
+  static int get_block_size(typename DriverType::functor_type const &f,
+                            size_t const vector_length,
+                            size_t const shmem_extra_block,
+                            size_t const shmem_extra_thread) {
+    int blockSize = HIPTraits::WarpSize / 2;
+    int numBlocks;
+    int sharedmem;
+    int maxOccupancy  = 0;
+    int bestBlockSize = 0;
+
+    while (blockSize < 1024) {
+      blockSize *= 2;
+
+      // calculate the occupancy with that optBlockSize and check whether its
+      // larger than the largest one found so far
+      sharedmem =
+          shmem_extra_block + shmem_extra_thread * (blockSize / vector_length) +
+          ::Kokkos::Impl::FunctorTeamShmemSize<
+              typename DriverType::functor_type>::value(f, blockSize /
+                                                               vector_length);
+      hipOccupancyMaxActiveBlocksPerMultiprocessor(
+          &numBlocks, hip_parallel_launch_constant_memory<DriverType>,
+          blockSize, sharedmem);
+      if (maxOccupancy < numBlocks * blockSize) {
+        maxOccupancy  = numBlocks * blockSize;
+        bestBlockSize = blockSize;
+      }
+    }
+    return bestBlockSize;
+  }
+};
+
+template <typename DriverType>
+struct HIPGetOptBlockSize<DriverType, Kokkos::LaunchBounds<0, 0>, false> {
+  static int get_block_size(const typename DriverType::functor_type &f,
+                            const size_t vector_length,
+                            const size_t shmem_extra_block,
+                            const size_t shmem_extra_thread) {
+    int blockSize = HIPTraits::WarpSize / 2;
+    int numBlocks;
+    int sharedmem;
+    int maxOccupancy  = 0;
+    int bestBlockSize = 0;
+
+    while (blockSize < 1024) {
+      blockSize *= 2;
+      sharedmem =
+          shmem_extra_block + shmem_extra_thread * (blockSize / vector_length) +
+          ::Kokkos::Impl::FunctorTeamShmemSize<
+              typename DriverType::functor_type>::value(f, blockSize /
+                                                               vector_length);
+
+      hipOccupancyMaxActiveBlocksPerMultiprocessor(
+          &numBlocks, hip_parallel_launch_local_memory<DriverType>, blockSize,
+          sharedmem);
+
+      if (maxOccupancy < numBlocks * blockSize) {
+        maxOccupancy  = numBlocks * blockSize;
+        bestBlockSize = blockSize;
+      }
+    }
+    return bestBlockSize;
+  }
+};
+
+// FIXME_HIP the code is identical to the false struct except for
+// hip_parallel_launch_constant_memory
+template <typename DriverType, unsigned int MaxThreadsPerBlock,
+          unsigned int MinBlocksPerSM>
+struct HIPGetOptBlockSize<
+    DriverType, Kokkos::LaunchBounds<MaxThreadsPerBlock, MinBlocksPerSM>,
+    true> {
+  static int get_block_size(const typename DriverType::functor_type &f,
+                            const size_t vector_length,
+                            const size_t shmem_extra_block,
+                            const size_t shmem_extra_thread) {
+    int blockSize = HIPTraits::WarpSize / 2;
+    int numBlocks;
+    int sharedmem;
+    int maxOccupancy  = 0;
+    int bestBlockSize = 0;
+    int max_threads_per_block =
+        std::min(MaxThreadsPerBlock,
+                 hip_internal_maximum_warp_count() * HIPTraits::WarpSize);
+
+    while (blockSize < max_threads_per_block) {
+      blockSize *= 2;
+
+      // calculate the occupancy with that optBlockSize and check whether its
+      // larger than the largest one found so far
+      sharedmem =
+          shmem_extra_block + shmem_extra_thread * (blockSize / vector_length) +
+          ::Kokkos::Impl::FunctorTeamShmemSize<
+              typename DriverType::functor_type>::value(f, blockSize /
+                                                               vector_length);
+      hipOccupancyMaxActiveBlocksPerMultiprocessor(
+          &numBlocks,
+          hip_parallel_launch_constant_memory<DriverType, MaxThreadsPerBlock,
+                                              MinBlocksPerSM>,
+          blockSize, sharedmem);
+      if (numBlocks >= static_cast<int>(MinBlocksPerSM) &&
+          blockSize <= static_cast<int>(MaxThreadsPerBlock)) {
+        if (maxOccupancy < numBlocks * blockSize) {
+          maxOccupancy  = numBlocks * blockSize;
+          bestBlockSize = blockSize;
+        }
+      }
+    }
+    if (maxOccupancy > 0) return bestBlockSize;
+    return -1;
+  }
+};
+
+template <typename DriverType, unsigned int MaxThreadsPerBlock,
+          unsigned int MinBlocksPerSM>
+struct HIPGetOptBlockSize<
+    DriverType, Kokkos::LaunchBounds<MaxThreadsPerBlock, MinBlocksPerSM>,
+    false> {
+  static int get_block_size(const typename DriverType::functor_type &f,
+                            const size_t vector_length,
+                            const size_t shmem_extra_block,
+                            const size_t shmem_extra_thread) {
+    int blockSize = HIPTraits::WarpSize / 2;
+    int numBlocks;
+    int sharedmem;
+    int maxOccupancy  = 0;
+    int bestBlockSize = 0;
+    int max_threads_per_block =
+        std::min(MaxThreadsPerBlock,
+                 hip_internal_maximum_warp_count() * HIPTraits::WarpSize);
+
+    while (blockSize < max_threads_per_block) {
+      blockSize *= 2;
+      sharedmem =
+          shmem_extra_block + shmem_extra_thread * (blockSize / vector_length) +
+          ::Kokkos::Impl::FunctorTeamShmemSize<
+              typename DriverType::functor_type>::value(f, blockSize /
+                                                               vector_length);
+
+      hipOccupancyMaxActiveBlocksPerMultiprocessor(
+          &numBlocks,
+          hip_parallel_launch_local_memory<DriverType, MaxThreadsPerBlock,
+                                           MinBlocksPerSM>,
+          blockSize, sharedmem);
+      if (numBlocks >= int(MinBlocksPerSM) &&
+          blockSize <= int(MaxThreadsPerBlock)) {
+        if (maxOccupancy < numBlocks * blockSize) {
+          maxOccupancy  = numBlocks * blockSize;
+          bestBlockSize = blockSize;
+        }
+      }
+    }
+    if (maxOccupancy > 0) return bestBlockSize;
+    return -1;
+  }
+};
+
+}  // namespace Impl
+}  // namespace Experimental
+}  // namespace Kokkos
+
+#endif
+
+#endif
diff --git a/kokkos/core/src/HIP/Kokkos_HIP_Error.hpp b/kokkos/core/src/HIP/Kokkos_HIP_Error.hpp
new file mode 100644
index 000000000..2abded0e9
--- /dev/null
+++ b/kokkos/core/src/HIP/Kokkos_HIP_Error.hpp
@@ -0,0 +1,110 @@
+/*
+//@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
+*/
+
+#ifndef KOKKOS_HIP_ERROR_HPP
+#define KOKKOS_HIP_ERROR_HPP
+
+#include <Kokkos_Macros.hpp>
+#include <impl/Kokkos_Error.hpp>
+
+#include <hip/hip_runtime.h>
+
+#include <ostream>
+
+namespace Kokkos {
+namespace Impl {
+
+void hip_internal_error_throw(hipError_t e, const char* name,
+                              const char* file = NULL, const int line = 0);
+
+inline void hip_internal_safe_call(hipError_t e, const char* name,
+                                   const char* file = NULL,
+                                   const int line   = 0) {
+  if (hipSuccess != e) {
+    hip_internal_error_throw(e, name, file, line);
+  }
+}
+
+}  // namespace Impl
+}  // namespace Kokkos
+
+#define HIP_SAFE_CALL(call) \
+  Kokkos::Impl::hip_internal_safe_call(call, #call, __FILE__, __LINE__)
+
+namespace Kokkos {
+namespace Experimental {
+
+class HIPRawMemoryAllocationFailure : public RawMemoryAllocationFailure {
+ private:
+  hipError_t m_error_code = hipSuccess;
+
+  static FailureMode get_failure_mode(hipError_t error_code) {
+    switch (error_code) {
+      case hipErrorMemoryAllocation: return FailureMode::OutOfMemoryError;
+      case hipErrorInvalidValue: return FailureMode::InvalidAllocationSize;
+      default: return FailureMode::Unknown;
+    }
+  }
+
+ public:
+  HIPRawMemoryAllocationFailure(size_t arg_attempted_size,
+                                hipError_t arg_error_code,
+                                AllocationMechanism arg_mechanism) noexcept
+      : RawMemoryAllocationFailure(
+            arg_attempted_size, /* HIPSpace doesn't handle alignment? */ 1,
+            get_failure_mode(arg_error_code), arg_mechanism),
+        m_error_code(arg_error_code) {}
+
+  void append_additional_error_information(std::ostream& o) const override {
+    if (m_error_code != hipSuccess) {
+      o << "  The HIP allocation returned the error code \"\""
+        << hipGetErrorName(m_error_code) << "\".";
+    }
+  }
+};
+
+}  // namespace Experimental
+}  // namespace Kokkos
+
+#endif
diff --git a/kokkos/core/src/HIP/Kokkos_HIP_Instance.cpp b/kokkos/core/src/HIP/Kokkos_HIP_Instance.cpp
new file mode 100644
index 000000000..1dcba0ff3
--- /dev/null
+++ b/kokkos/core/src/HIP/Kokkos_HIP_Instance.cpp
@@ -0,0 +1,373 @@
+/*
+//@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
+*/
+
+/*--------------------------------------------------------------------------*/
+/* Kokkos interfaces */
+
+#include <Kokkos_Core.hpp>
+
+#include <HIP/Kokkos_HIP_Instance.hpp>
+#include <Kokkos_HIP.hpp>
+#include <Kokkos_HIP_Space.hpp>
+#include <impl/Kokkos_Error.hpp>
+
+/*--------------------------------------------------------------------------*/
+/* Standard 'C' libraries */
+#include <stdlib.h>
+
+/* Standard 'C++' libraries */
+#include <iostream>
+#include <sstream>
+#include <string>
+#include <vector>
+
+namespace Kokkos {
+namespace Experimental {
+namespace {
+class HIPInternalDevices {
+ public:
+  enum { MAXIMUM_DEVICE_COUNT = 64 };
+  struct hipDeviceProp_t m_hipProp[MAXIMUM_DEVICE_COUNT];
+  int m_hipDevCount;
+
+  HIPInternalDevices();
+
+  static HIPInternalDevices const &singleton();
+};
+
+HIPInternalDevices::HIPInternalDevices() {
+  HIP_SAFE_CALL(hipGetDeviceCount(&m_hipDevCount));
+
+  if (m_hipDevCount > MAXIMUM_DEVICE_COUNT) {
+    Kokkos::abort(
+        "Sorry, you have more GPUs per node than we thought anybody would ever "
+        "have. Please report this to github.com/kokkos/kokkos.");
+  }
+  for (int i = 0; i < m_hipDevCount; ++i) {
+    HIP_SAFE_CALL(hipGetDeviceProperties(m_hipProp + i, i));
+  }
+}
+
+const HIPInternalDevices &HIPInternalDevices::singleton() {
+  static HIPInternalDevices self;
+  return self;
+}
+}  // namespace
+
+namespace Impl {
+
+int HIPInternal::was_initialized = 0;
+int HIPInternal::was_finalized   = 0;
+//----------------------------------------------------------------------------
+
+void HIPInternal::print_configuration(std::ostream & /*s*/) const {
+  // FIXME_HIP
+  Kokkos::abort("print_configuration not implemented!\n");
+  /*const HIPInternalDevices & dev_info = HIPInternalDevices::singleton();
+
+#if defined( KOKKOS_ENABLE_HIP )
+    s << "macro  KOKKOS_ENABLE_HIP      : defined" << std::endl ;
+#endif
+#if defined( __hcc_version__ )
+    s << "macro  __hcc_version__          = " << __hcc_version__
+      << std::endl ;
+#endif
+
+  for ( int i = 0 ; i < dev_info.m_hipDevCount ; ++i ) {
+    s << "Kokkos::Experimental::HIP[ " << i << " ] "
+      << dev_info.m_hipProp[i].name
+      << " version " << (dev_info.m_hipProp[i].major) << "." <<
+dev_info.m_hipProp[i].minor
+      << ", Total Global Memory: " <<
+human_memory_size(dev_info.m_hipProp[i].totalGlobalMem)
+      << ", Shared Memory per Wavefront: " <<
+human_memory_size(dev_info.m_hipProp[i].sharedMemPerWavefront); if ( m_hipDev ==
+i ) s << " : Selected" ; s << std::endl ;
+  }*/
+}
+
+//----------------------------------------------------------------------------
+
+HIPInternal::~HIPInternal() {
+  if (m_scratchSpace || m_scratchFlags) {
+    std::cerr << "Kokkos::Experimental::HIP ERROR: Failed to call "
+                 "Kokkos::Experimental::HIP::finalize()"
+              << std::endl;
+    std::cerr.flush();
+  }
+
+  m_hipDev            = -1;
+  m_hipArch           = -1;
+  m_multiProcCount    = 0;
+  m_maxWarpCount      = 0;
+  m_maxSharedWords    = 0;
+  m_maxShmemPerBlock  = 0;
+  m_scratchSpaceCount = 0;
+  m_scratchFlagsCount = 0;
+  m_scratchSpace      = 0;
+  m_scratchFlags      = 0;
+}
+
+int HIPInternal::verify_is_initialized(const char *const label) const {
+  if (m_hipDev < 0) {
+    std::cerr << "Kokkos::Experimental::HIP::" << label
+              << " : ERROR device not initialized" << std::endl;
+  }
+  return 0 <= m_hipDev;
+}
+
+HIPInternal &HIPInternal::singleton() {
+  static HIPInternal *self = nullptr;
+  if (!self) {
+    self = new HIPInternal();
+  }
+  return *self;
+}
+
+void HIPInternal::initialize(int hip_device_id) {
+  if (was_finalized)
+    Kokkos::abort("Calling HIP::initialize after HIP::finalize is illegal\n");
+
+  if (is_initialized()) return;
+
+  enum { WordSize = sizeof(size_type) };
+
+  if (!HostSpace::execution_space::impl_is_initialized()) {
+    const std::string msg(
+        "HIP::initialize ERROR : HostSpace::execution_space "
+        "is not initialized");
+    Kokkos::Impl::throw_runtime_exception(msg);
+  }
+
+  const HIPInternalDevices &dev_info = HIPInternalDevices::singleton();
+
+  const bool ok_init = 0 == m_scratchSpace || 0 == m_scratchFlags;
+
+  // Need at least a GPU device
+  const bool ok_id =
+      0 <= hip_device_id && hip_device_id < dev_info.m_hipDevCount;
+
+  if (ok_init && ok_id) {
+    const struct hipDeviceProp_t &hipProp = dev_info.m_hipProp[hip_device_id];
+
+    m_hipDev = hip_device_id;
+
+    hipSetDevice(m_hipDev);
+
+    // FIXME_HIP for now always uses default stream
+    m_stream = 0;
+
+    // number of multiprocessors
+    m_multiProcCount = hipProp.multiProcessorCount;
+
+    //----------------------------------
+    // Maximum number of warps,
+    // at most one warp per thread in a warp for reduction.
+    m_maxWarpCount = hipProp.maxThreadsPerBlock / Impl::HIPTraits::WarpSize;
+    if (HIPTraits::WarpSize < m_maxWarpCount) {
+      m_maxWarpCount = Impl::HIPTraits::WarpSize;
+    }
+    m_maxSharedWords = hipProp.sharedMemPerBlock / WordSize;
+
+    //----------------------------------
+    // Maximum number of blocks
+    m_maxBlock = hipProp.maxGridSize[0];
+
+    m_shmemPerSM         = hipProp.maxSharedMemoryPerMultiProcessor;
+    m_maxShmemPerBlock   = hipProp.sharedMemPerBlock;
+    m_maxThreadsPerSM    = hipProp.maxThreadsPerMultiProcessor;
+    m_maxThreadsPerBlock = hipProp.maxThreadsPerBlock;
+
+    //----------------------------------
+    // Multiblock reduction uses scratch flags for counters
+    // and scratch space for partial reduction values.
+    // Allocate some initial space.  This will grow as needed.
+    {
+      const unsigned reduce_block_count =
+          m_maxWarpCount * Impl::HIPTraits::WarpSize;
+
+      (void)scratch_flags(reduce_block_count * 2 * sizeof(size_type));
+      (void)scratch_space(reduce_block_count * 16 * sizeof(size_type));
+    }
+    //----------------------------------
+  } else {
+    std::ostringstream msg;
+    msg << "Kokkos::Experimental::HIP::initialize(" << hip_device_id
+        << ") FAILED";
+
+    if (!ok_init) {
+      msg << " : Already initialized";
+    }
+    if (!ok_id) {
+      msg << " : Device identifier out of range "
+          << "[0.." << dev_info.m_hipDevCount - 1 << "]";
+    }
+    Kokkos::Impl::throw_runtime_exception(msg.str());
+  }
+
+  // Init the array for used for arbitrarily sized atomics
+  // FIXME_HIP uncomment this when global variable works
+  // if (m_stream == 0) ::Kokkos::Impl::initialize_host_hip_lock_arrays();
+}
+
+//----------------------------------------------------------------------------
+
+typedef Kokkos::Experimental::HIP::size_type
+    ScratchGrain[Impl::HIPTraits::WarpSize];
+enum { sizeScratchGrain = sizeof(ScratchGrain) };
+
+Kokkos::Experimental::HIP::size_type *HIPInternal::scratch_space(
+    const Kokkos::Experimental::HIP::size_type size) {
+  if (verify_is_initialized("scratch_space") &&
+      m_scratchSpaceCount * sizeScratchGrain < size) {
+    m_scratchSpaceCount = (size + sizeScratchGrain - 1) / sizeScratchGrain;
+
+    typedef Kokkos::Impl::SharedAllocationRecord<Kokkos::Experimental::HIPSpace,
+                                                 void>
+        Record;
+
+    static Record *const r = Record::allocate(
+        Kokkos::Experimental::HIPSpace(), "InternalScratchSpace",
+        (sizeScratchGrain * m_scratchSpaceCount));
+
+    Record::increment(r);
+
+    m_scratchSpace = reinterpret_cast<size_type *>(r->data());
+  }
+
+  return m_scratchSpace;
+}
+
+Kokkos::Experimental::HIP::size_type *HIPInternal::scratch_flags(
+    const Kokkos::Experimental::HIP::size_type size) {
+  if (verify_is_initialized("scratch_flags") &&
+      m_scratchFlagsCount * sizeScratchGrain < size) {
+    m_scratchFlagsCount = (size + sizeScratchGrain - 1) / sizeScratchGrain;
+
+    typedef Kokkos::Impl::SharedAllocationRecord<Kokkos::Experimental::HIPSpace,
+                                                 void>
+        Record;
+
+    Record *const r = Record::allocate(
+        Kokkos::Experimental::HIPSpace(), "InternalScratchFlags",
+        (sizeScratchGrain * m_scratchFlagsCount));
+
+    Record::increment(r);
+
+    m_scratchFlags = reinterpret_cast<size_type *>(r->data());
+
+    hipMemset(m_scratchFlags, 0, m_scratchFlagsCount * sizeScratchGrain);
+  }
+
+  return m_scratchFlags;
+}
+
+//----------------------------------------------------------------------------
+
+void HIPInternal::finalize() {
+  HIP().fence();
+  was_finalized = 1;
+  if (0 != m_scratchSpace || 0 != m_scratchFlags) {
+    typedef Kokkos::Impl::SharedAllocationRecord<Kokkos::Experimental::HIPSpace>
+        RecordHIP;
+
+    RecordHIP::decrement(RecordHIP::get_record(m_scratchFlags));
+    RecordHIP::decrement(RecordHIP::get_record(m_scratchSpace));
+
+    m_hipDev            = -1;
+    m_hipArch           = -1;
+    m_multiProcCount    = 0;
+    m_maxWarpCount      = 0;
+    m_maxBlock          = 0;
+    m_maxSharedWords    = 0;
+    m_maxShmemPerBlock  = 0;
+    m_scratchSpaceCount = 0;
+    m_scratchFlagsCount = 0;
+    m_scratchSpace      = 0;
+    m_scratchFlags      = 0;
+  }
+}
+
+//----------------------------------------------------------------------------
+
+Kokkos::Experimental::HIP::size_type hip_internal_maximum_warp_count() {
+  return HIPInternal::singleton().m_maxWarpCount;
+}
+
+Kokkos::Experimental::HIP::size_type hip_internal_maximum_grid_count() {
+  return HIPInternal::singleton().m_maxBlock;
+}
+
+Kokkos::Experimental::HIP::size_type *hip_internal_scratch_space(
+    const Kokkos::Experimental::HIP::size_type size) {
+  return HIPInternal::singleton().scratch_space(size);
+}
+
+Kokkos::Experimental::HIP::size_type *hip_internal_scratch_flags(
+    const Kokkos::Experimental::HIP::size_type size) {
+  return HIPInternal::singleton().scratch_flags(size);
+}
+
+}  // namespace Impl
+}  // namespace Experimental
+}  // namespace Kokkos
+
+//----------------------------------------------------------------------------
+
+namespace Kokkos {
+namespace Impl {
+void hip_device_synchronize() { HIP_SAFE_CALL(hipDeviceSynchronize()); }
+
+void hip_internal_error_throw(hipError_t e, const char *name, const char *file,
+                              const int line) {
+  std::ostringstream out;
+  out << name << " error( " << hipGetErrorName(e)
+      << "): " << hipGetErrorString(e);
+  if (file) {
+    out << " " << file << ":" << line;
+  }
+  throw_runtime_exception(out.str());
+}
+}  // namespace Impl
+}  // namespace Kokkos
diff --git a/kokkos/core/src/HIP/Kokkos_HIP_Instance.hpp b/kokkos/core/src/HIP/Kokkos_HIP_Instance.hpp
new file mode 100644
index 000000000..c66fb2776
--- /dev/null
+++ b/kokkos/core/src/HIP/Kokkos_HIP_Instance.hpp
@@ -0,0 +1,141 @@
+/*
+//@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
+*/
+
+/*--------------------------------------------------------------------------*/
+
+#ifndef KOKKOS_HIP_INSTANCE_HPP
+#define KOKKOS_HIP_INSTANCE_HPP
+
+#include <Kokkos_HIP_Space.hpp>
+
+namespace Kokkos {
+namespace Experimental {
+namespace Impl {
+
+struct HIPTraits {
+  static int constexpr WarpSize       = 64;
+  static int constexpr WarpIndexShift = 6; /* WarpSize == 1 << WarpShift*/
+
+  static int constexpr ConstantMemoryUsage        = 0x008000; /* 32k bytes */
+  static int constexpr ConstantMemoryUseThreshold = 0x000200; /* 512 bytes */
+};
+
+//----------------------------------------------------------------------------
+
+HIP::size_type hip_internal_maximum_warp_count();
+HIP::size_type hip_internal_maximum_grid_count();
+
+HIP::size_type *hip_internal_scratch_space(const HIP::size_type size);
+HIP::size_type *hip_internal_scratch_flags(const HIP::size_type size);
+
+//----------------------------------------------------------------------------
+
+class HIPInternal {
+ private:
+  HIPInternal(const HIPInternal &);
+  HIPInternal &operator=(const HIPInternal &);
+
+ public:
+  using size_type = ::Kokkos::Experimental::HIP::size_type;
+
+  int m_hipDev;
+  int m_hipArch;
+  unsigned m_multiProcCount;
+  unsigned m_maxWarpCount;
+  unsigned m_maxBlock;
+  unsigned m_maxSharedWords;
+  int m_shmemPerSM;
+  int m_maxShmemPerBlock;
+  int m_maxThreadsPerSM;
+  int m_maxThreadsPerBlock;
+  size_type m_scratchSpaceCount;
+  size_type m_scratchFlagsCount;
+  size_type *m_scratchSpace;
+  size_type *m_scratchFlags;
+
+  hipStream_t m_stream;
+
+  static int was_initialized;
+  static int was_finalized;
+
+  static HIPInternal &singleton();
+
+  int verify_is_initialized(const char *const label) const;
+
+  int is_initialized() const {
+    return m_hipDev >= 0;
+  }  // 0 != m_scratchSpace && 0 != m_scratchFlags ; }
+
+  void initialize(int hip_device_id);
+  void finalize();
+
+  void print_configuration(std::ostream &) const;
+
+  ~HIPInternal();
+
+  HIPInternal()
+      : m_hipDev(-1),
+        m_hipArch(-1),
+        m_multiProcCount(0),
+        m_maxWarpCount(0),
+        m_maxBlock(0),
+        m_maxSharedWords(0),
+        m_shmemPerSM(0),
+        m_maxShmemPerBlock(0),
+        m_maxThreadsPerSM(0),
+        m_maxThreadsPerBlock(0),
+        m_scratchSpaceCount(0),
+        m_scratchFlagsCount(0),
+        m_scratchSpace(0),
+        m_scratchFlags(0) {}
+
+  size_type *scratch_space(const size_type size);
+  size_type *scratch_flags(const size_type size);
+};
+
+}  // namespace Impl
+}  // namespace Experimental
+}  // namespace Kokkos
+
+#endif
diff --git a/kokkos/core/src/HIP/Kokkos_HIP_KernelLaunch.cpp b/kokkos/core/src/HIP/Kokkos_HIP_KernelLaunch.cpp
new file mode 100644
index 000000000..7c8582ef0
--- /dev/null
+++ b/kokkos/core/src/HIP/Kokkos_HIP_KernelLaunch.cpp
@@ -0,0 +1,72 @@
+/*
+//@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
+*/
+
+#include <Kokkos_Core.hpp>
+#include <Kokkos_HIP_Space.hpp>
+#include <HIP/Kokkos_HIP_KernelLaunch.hpp>
+
+namespace Kokkos {
+namespace Experimental {
+namespace Impl {
+
+void *hip_resize_scratch_space(std::int64_t bytes, bool force_shrink) {
+  static void *ptr                 = nullptr;
+  static std::int64_t current_size = 0;
+  if (bytes > current_size) {
+    current_size = bytes;
+    if (ptr) Kokkos::kokkos_free<::Kokkos::Experimental::HIPSpace>(ptr);
+    ptr = Kokkos::kokkos_malloc<Kokkos::Experimental::HIPSpace>(
+        "HIPSpace::ScratchMemory", current_size);
+  }
+  if ((bytes < current_size) && (force_shrink)) {
+    current_size = bytes;
+    Kokkos::kokkos_free<::Kokkos::Experimental::HIPSpace>(ptr);
+    ptr = Kokkos::kokkos_malloc<Kokkos::Experimental::HIPSpace>(
+        "HIPSpace::ScratchMemory", current_size);
+  }
+  return ptr;
+}
+}  // namespace Impl
+}  // namespace Experimental
+}  // namespace Kokkos
diff --git a/kokkos/core/src/HIP/Kokkos_HIP_KernelLaunch.hpp b/kokkos/core/src/HIP/Kokkos_HIP_KernelLaunch.hpp
new file mode 100644
index 000000000..5c19a3e0d
--- /dev/null
+++ b/kokkos/core/src/HIP/Kokkos_HIP_KernelLaunch.hpp
@@ -0,0 +1,212 @@
+/*
+//@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
+*/
+
+#ifndef KOKKOS_HIP_KERNEL_LAUNCH_HPP
+#define KOKKOS_HIP_KERNEL_LAUNCH_HPP
+
+#include <Kokkos_Macros.hpp>
+
+#if defined(__HIPCC__)
+
+#include <Kokkos_HIP_Space.hpp>
+#include <HIP/Kokkos_HIP_Error.hpp>
+#include <HIP/Kokkos_HIP_Instance.hpp>
+
+// FIXME_HIP cannot use global variable on the device with ROCm 2.9
+//__device__ __constant__ unsigned long kokkos_impl_hip_constant_memory_buffer
+//    [Kokkos::Experimental::Impl::HIPTraits::ConstantMemoryUsage /
+//     sizeof(unsigned long)];
+
+namespace Kokkos {
+namespace Experimental {
+template <typename T>
+inline __device__ T *kokkos_impl_hip_shared_memory() {
+  extern __shared__ HIPSpace::size_type sh[];
+  return (T *)sh;
+}
+}  // namespace Experimental
+}  // namespace Kokkos
+
+namespace Kokkos {
+namespace Experimental {
+namespace Impl {
+
+void *hip_resize_scratch_space(std::int64_t bytes, bool force_shrink = false);
+
+template <typename DriverType>
+__global__ static void hip_parallel_launch_constant_memory() {
+  __device__ __constant__ unsigned long kokkos_impl_hip_constant_memory_buffer
+      [Kokkos::Experimental::Impl::HIPTraits::ConstantMemoryUsage /
+       sizeof(unsigned long)];
+
+  const DriverType &driver = *(reinterpret_cast<const DriverType *>(
+      kokkos_impl_hip_constant_memory_buffer));
+
+  driver();
+}
+
+template <class DriverType>
+__global__ static void hip_parallel_launch_local_memory(
+    const DriverType driver) {
+  driver();
+}
+
+template <class DriverType, unsigned int maxTperB, unsigned int minBperSM>
+__global__ __launch_bounds__(
+    maxTperB,
+    minBperSM) static void hip_parallel_launch_local_memory(const DriverType
+                                                                driver) {
+  driver();
+}
+
+enum class HIPLaunchMechanism : unsigned {
+  Default        = 0,
+  ConstantMemory = 1,
+  GlobalMemory   = 2,
+  LocalMemory    = 4
+};
+
+constexpr inline HIPLaunchMechanism operator|(HIPLaunchMechanism p1,
+                                              HIPLaunchMechanism p2) {
+  return static_cast<HIPLaunchMechanism>(static_cast<unsigned>(p1) |
+                                         static_cast<unsigned>(p2));
+}
+constexpr inline HIPLaunchMechanism operator&(HIPLaunchMechanism p1,
+                                              HIPLaunchMechanism p2) {
+  return static_cast<HIPLaunchMechanism>(static_cast<unsigned>(p1) &
+                                         static_cast<unsigned>(p2));
+}
+
+template <HIPLaunchMechanism l>
+struct HIPDispatchProperties {
+  HIPLaunchMechanism launch_mechanism = l;
+};
+
+template <class DriverType, class LaunchBounds = Kokkos::LaunchBounds<>,
+          HIPLaunchMechanism LaunchMechanism = HIPLaunchMechanism::LocalMemory>
+struct HIPParallelLaunch;
+
+template <class DriverType, unsigned int MaxThreadsPerBlock,
+          unsigned int MinBlocksPerSM>
+struct HIPParallelLaunch<
+    DriverType, Kokkos::LaunchBounds<MaxThreadsPerBlock, MinBlocksPerSM>,
+    HIPLaunchMechanism::LocalMemory> {
+  inline HIPParallelLaunch(const DriverType &driver, const dim3 &grid,
+                           const dim3 &block, const int shmem,
+                           const HIPInternal *hip_instance,
+                           const bool /*prefer_shmem*/) {
+    if ((grid.x != 0) && ((block.x * block.y * block.z) != 0)) {
+      if (hip_instance->m_maxShmemPerBlock < shmem) {
+        Kokkos::Impl::throw_runtime_exception(
+            "HIPParallelLaunch FAILED: shared memory request is too large");
+      }
+
+      // Invoke the driver function on the device
+      printf("%i %i %i | %i %i %i | %i\n", grid.x, grid.y, grid.z, block.x,
+             block.y, block.z, shmem);
+      printf("Pre Launch Error: %s\n", hipGetErrorName(hipGetLastError()));
+
+      hipLaunchKernelGGL(
+          (hip_parallel_launch_local_memory<DriverType, MaxThreadsPerBlock,
+                                            MinBlocksPerSM>),
+          grid, block, shmem, hip_instance->m_stream, driver);
+
+      Kokkos::Experimental::HIP().fence();
+      printf("Post Launch Error: %s\n", hipGetErrorName(hipGetLastError()));
+#if defined(KOKKOS_ENABLE_DEBUG_BOUNDS_CHECK)
+      HIP_SAFE_CALL(hipGetLastError());
+      Kokkos::Experimental::HIP().fence();
+#endif
+    }
+  }
+
+  static hipFuncAttributes get_hip_func_attributes() {
+    hipFuncAttributes attr;
+    hipFuncGetAttributes(
+        &attr, hip_parallel_launch_local_memory<DriverType, MaxThreadsPerBlock,
+                                                MinBlocksPerSM>);
+    return attr;
+  }
+};
+
+template <class DriverType>
+struct HIPParallelLaunch<DriverType, Kokkos::LaunchBounds<0, 0>,
+                         HIPLaunchMechanism::LocalMemory> {
+  inline HIPParallelLaunch(const DriverType &driver, const dim3 &grid,
+                           const dim3 &block, const int shmem,
+                           const HIPInternal *hip_instance,
+                           const bool /*prefer_shmem*/) {
+    if ((grid.x != 0) && ((block.x * block.y * block.z) != 0)) {
+      if (hip_instance->m_maxShmemPerBlock < shmem) {
+        Kokkos::Impl::throw_runtime_exception(std::string(
+            "HIPParallelLaunch FAILED: shared memory request is too large"));
+      }
+
+      // Invoke the driver function on the device
+      hipLaunchKernelGGL(hip_parallel_launch_local_memory<DriverType>, grid,
+                         block, shmem, hip_instance->m_stream, driver);
+
+      Kokkos::Experimental::HIP().fence();
+#if defined(KOKKOS_ENABLE_DEBUG_BOUNDS_CHECK)
+      HIP_SAFE_CALL(hipGetLastError());
+      Kokkos::Experimental::HIP().fence();
+#endif
+    }
+  }
+
+  static hipFuncAttributes get_hip_func_attributes() {
+    hipFuncAttributes attr;
+    hipFuncGetAttributes(&attr,
+                         reinterpret_cast<void *>(
+                             &hip_parallel_launch_local_memory<DriverType>));
+    return attr;
+  }
+};
+}  // namespace Impl
+}  // namespace Experimental
+}  // namespace Kokkos
+
+#endif
+
+#endif
diff --git a/kokkos/core/src/HIP/Kokkos_HIP_Locks.cpp b/kokkos/core/src/HIP/Kokkos_HIP_Locks.cpp
new file mode 100644
index 000000000..0a34ed505
--- /dev/null
+++ b/kokkos/core/src/HIP/Kokkos_HIP_Locks.cpp
@@ -0,0 +1,118 @@
+/*
+//@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
+*/
+
+#include <Kokkos_Macros.hpp>
+
+#include <HIP/Kokkos_HIP_Locks.hpp>
+#include <HIP/Kokkos_HIP_Error.hpp>
+#include <Kokkos_HIP_Space.hpp>
+
+#include <hip/hip_runtime.h>
+
+#include <iostream>
+
+#ifdef KOKKOS_ENABLE_HIP_RELOCATABLE_DEVICE_CODE
+__device__ __constant__ HIPLockArrays g_device_hip_lock_arrays = {nullptr,
+                                                                  nullptr, 0};
+#endif
+
+namespace Kokkos {
+
+namespace {
+
+__global__ void init_lock_array_kernel_atomic() {
+  unsigned i = hipBlockIdx_x * hipBlockDim_x + hipThreadIdx_x;
+  if (i < KOKKOS_IMPL_HIP_SPACE_ATOMIC_MASK + 1) {
+    g_device_hip_lock_arrays.atomic[i] = 0;
+  }
+}
+
+__global__ void init_lock_array_kernel_threadid(int N) {
+  unsigned i = hipBlockIdx_x * hipBlockDim_x + hipThreadIdx_x;
+  if (i < static_cast<unsigned>(N)) {
+    g_device_hip_lock_arrays.scratch[i] = 0;
+  }
+}
+
+}  // namespace
+
+namespace Impl {
+
+HIPLockArrays g_host_hip_lock_arrays = {nullptr, nullptr, 0};
+
+void initialize_host_hip_lock_arrays() {
+  if (g_host_hip_lock_arrays.atomic != nullptr) return;
+  HIP_SAFE_CALL(hipMalloc(
+      &g_host_hip_lock_arrays.atomic,
+      sizeof(std::int32_t) * (KOKKOS_IMPL_HIP_SPACE_ATOMIC_MASK + 1)));
+  HIP_SAFE_CALL(hipMalloc(
+      &g_host_hip_lock_arrays.scratch,
+      sizeof(std::int32_t) * (::Kokkos::Experimental::HIP::concurrency())));
+
+  g_host_hip_lock_arrays.n = ::Kokkos::Experimental::HIP::concurrency();
+
+  KOKKOS_COPY_HIP_LOCK_ARRAYS_TO_DEVICE();
+  hipLaunchKernelGGL(init_lock_array_kernel_atomic,
+                     (KOKKOS_IMPL_HIP_SPACE_ATOMIC_MASK + 1 + 255) / 256, 256,
+                     0, 0);
+  hipLaunchKernelGGL(init_lock_array_kernel_threadid,
+                     (::Kokkos::Experimental::HIP::concurrency() + 255) / 256,
+                     256, 0, 0, ::Kokkos::Experimental::HIP::concurrency());
+}
+
+void finalize_host_hip_lock_arrays() {
+  if (g_host_hip_lock_arrays.atomic == nullptr) return;
+  hipFree(g_host_hip_lock_arrays.atomic);
+  g_host_hip_lock_arrays.atomic = nullptr;
+  hipFree(g_host_hip_lock_arrays.scratch);
+  g_host_hip_lock_arrays.scratch = nullptr;
+  g_host_hip_lock_arrays.n       = 0;
+#ifdef KOKKOS_ENABLE_HIP_RELOCATABLE_DEVICE_CODE
+  KOKKOS_COPY_HIP_LOCK_ARRAYS_TO_DEVICE();
+#endif
+}
+
+}  // namespace Impl
+
+}  // namespace Kokkos
diff --git a/kokkos/core/src/HIP/Kokkos_HIP_Locks.hpp b/kokkos/core/src/HIP/Kokkos_HIP_Locks.hpp
new file mode 100644
index 000000000..fb6728ea1
--- /dev/null
+++ b/kokkos/core/src/HIP/Kokkos_HIP_Locks.hpp
@@ -0,0 +1,174 @@
+/*
+//@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
+*/
+
+#ifndef KOKKOS_HIP_LOCKS_HPP
+#define KOKKOS_HIP_LOCKS_HPP
+
+#include <Kokkos_Macros.hpp>
+
+#include <cstdint>
+
+#include <HIP/Kokkos_HIP_Error.hpp>
+
+// FIXME_HIP We cannot use global variables defined in a namespace
+
+struct HIPLockArrays {
+  std::int32_t* atomic;
+  std::int32_t* scratch;
+  std::int32_t n;
+};
+
+/// \brief This global variable in Host space is the central definition
+///        of these arrays.
+extern HIPLockArrays g_host_hip_lock_arrays;
+
+namespace Kokkos {
+namespace Impl {
+
+/// \brief After this call, the g_host_hip_lock_arrays variable has
+///        valid, initialized arrays.
+///
+/// This call is idempotent.
+void initialize_host_hip_lock_arrays();
+
+/// \brief After this call, the g_host_hip_lock_arrays variable has
+///        all null pointers, and all array memory has been freed.
+///
+/// This call is idempotent.
+void finalize_host_hip_lock_arrays();
+
+}  // namespace Impl
+}  // namespace Kokkos
+
+#if defined(__HIPCC__)
+
+/// \brief This global variable in HIP space is what kernels use
+///        to get access to the lock arrays.
+///
+/// When relocatable device code is enabled, there can be one single
+/// instance of this global variable for the entire executable,
+/// whose definition will be in Kokkos_HIP_Locks.cpp (and whose declaration
+/// here must then be extern).
+/// This one instance will be initialized by initialize_host_HIP_lock_arrays
+/// and need not be modified afterwards.
+///
+/// When relocatable device code is disabled, an instance of this variable
+/// will be created in every translation unit that sees this header file.
+/// Since the Kokkos_HIP_Locks.cpp translation unit cannot initialize the
+/// instances in other translation units, we must update this HIP global
+/// variable based on the Host global variable prior to running any kernels
+/// that will use it.
+/// That is the purpose of the KOKKOS_ENSURE_HIP_LOCK_ARRAYS_ON_DEVICE macro.
+__device__
+#ifdef KOKKOS_ENABLE_HIP_RELOCATABLE_DEVICE_CODE
+    __constant__ extern
+#endif
+    HIPLockArrays g_device_hip_lock_arrays;
+
+#define KOKKOS_IMPL_HIP_SPACE_ATOMIC_MASK 0x1FFFF
+
+namespace Kokkos {
+namespace Impl {
+
+/// \brief Acquire a lock for the address
+///
+/// This function tries to acquire the lock for the hash value derived
+/// from the provided ptr. If the lock is successfully acquired the
+/// function returns true. Otherwise it returns false.
+__device__ inline bool lock_address_hip_space(void* ptr) {
+  auto offset = reinterpret_cast<size_t>(ptr);
+  offset      = offset >> 2;
+  offset      = offset & KOKKOS_IMPL_HIP_SPACE_ATOMIC_MASK;
+  return (0 == atomicCAS(&g_device_hip_lock_arrays.atomic[offset], 0, 1));
+}
+
+/// \brief Release lock for the address
+///
+/// This function releases the lock for the hash value derived
+/// from the provided ptr. This function should only be called
+/// after previously successfully aquiring a lock with
+/// lock_address.
+__device__ inline void unlock_address_hip_space(void* ptr) {
+  auto offset = reinterpret_cast<size_t>(ptr);
+  offset      = offset >> 2;
+  offset      = offset & KOKKOS_IMPL_HIP_SPACE_ATOMIC_MASK;
+  atomicExch(&g_device_hip_lock_arrays.atomic[offset], 0);
+}
+
+}  // namespace Impl
+}  // namespace Kokkos
+
+// Make lock_array_copied an explicit translation unit scope thingy
+namespace Kokkos {
+namespace Impl {
+namespace {
+static int lock_array_copied = 0;
+inline int eliminate_warning_for_lock_array() { return lock_array_copied; }
+}  // namespace
+}  // namespace Impl
+}  // namespace Kokkos
+
+/* Dan Ibanez: it is critical that this code be a macro, so that it will
+   capture the right address for g_device_hip_lock_arrays!
+   putting this in an inline function will NOT do the right thing! */
+#define KOKKOS_COPY_HIP_LOCK_ARRAYS_TO_DEVICE()                             \
+  {                                                                         \
+    if (::Kokkos::Impl::lock_array_copied == 0) {                           \
+      HIP_SAFE_CALL(hipMemcpyToSymbol(HIP_SYMBOL(g_device_hip_lock_arrays), \
+                                      &g_host_hip_lock_arrays,              \
+                                      sizeof(HIPLockArrays)));              \
+    }                                                                       \
+    lock_array_copied = 1;                                                  \
+  }
+
+#ifdef KOKKOS_ENABLE_HIP_RELOCATABLE_DEVICE_CODE
+#define KOKKOS_ENSURE_HIP_LOCK_ARRAYS_ON_DEVICE()
+#else
+#define KOKKOS_ENSURE_HIP_LOCK_ARRAYS_ON_DEVICE() \
+  KOKKOS_COPY_HIP_LOCK_ARRAYS_TO_DEVICE()
+#endif
+
+#endif /* defined( __HIPCC__ ) */
+
+#endif /* #ifndef KOKKOS_HIP_LOCKS_HPP */
diff --git a/kokkos/core/src/HIP/Kokkos_HIP_Parallel_MDRange.hpp b/kokkos/core/src/HIP/Kokkos_HIP_Parallel_MDRange.hpp
new file mode 100644
index 000000000..7a6161346
--- /dev/null
+++ b/kokkos/core/src/HIP/Kokkos_HIP_Parallel_MDRange.hpp
@@ -0,0 +1,411 @@
+/*
+//@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
+*/
+
+#ifndef KOKKOS_HIP_PARALLEL_MDRANGE_HPP
+#define KOKKOS_HIP_PARALLEL_MDRANGE_HPP
+
+#include <HIP/Kokkos_HIP_BlockSize_Deduction.hpp>
+#include <HIP/Kokkos_HIP_KernelLaunch.hpp>
+#include <HIP/Kokkos_HIP_ReduceScan.hpp>
+#include <KokkosExp_MDRangePolicy.hpp>
+#include <Kokkos_Parallel.hpp>
+
+namespace Kokkos {
+namespace Impl {
+// ParallelFor
+template <class FunctorType, class... Traits>
+class ParallelFor<FunctorType, Kokkos::MDRangePolicy<Traits...>,
+                  Kokkos::Experimental::HIP> {
+ public:
+  using Policy = Kokkos::MDRangePolicy<Traits...>;
+
+ private:
+  using array_index_type = typename Policy::array_index_type;
+  using index_type       = typename Policy::index_type;
+  using LaunchBounds     = typename Policy::launch_bounds;
+
+  const FunctorType m_functor;
+  const Policy m_policy;
+
+  ParallelFor()        = delete;
+  ParallelFor& operator=(ParallelFor const&) = delete;
+
+ public:
+  inline __device__ void operator()(void) const {
+    Kokkos::Impl::DeviceIterateTile<Policy::rank, Policy, FunctorType,
+                                    typename Policy::work_tag>(m_policy,
+                                                               m_functor)
+        .exec_range();
+  }
+
+  inline void execute() const {
+    if (m_policy.m_num_tiles == 0) return;
+    array_index_type const maxblocks = static_cast<array_index_type>(
+        m_policy.space().impl_internal_space_instance()->m_maxBlock);
+    if (Policy::rank == 2) {
+      dim3 const block(m_policy.m_tile[0], m_policy.m_tile[1], 1);
+      dim3 const grid(
+          std::min((m_policy.m_upper[0] - m_policy.m_lower[0] + block.x - 1) /
+                       block.x,
+                   maxblocks),
+          std::min((m_policy.m_upper[1] - m_policy.m_lower[1] + block.y - 1) /
+                       block.y,
+                   maxblocks),
+          1);
+      Kokkos::Experimental::Impl::HIPParallelLaunch<ParallelFor, LaunchBounds>(
+          *this, grid, block, 0,
+          m_policy.space().impl_internal_space_instance(), false);
+    } else if (Policy::rank == 3) {
+      dim3 const block(m_policy.m_tile[0], m_policy.m_tile[1],
+                       m_policy.m_tile[2]);
+      dim3 const grid(
+          std::min((m_policy.m_upper[0] - m_policy.m_lower[0] + block.x - 1) /
+                       block.x,
+                   maxblocks),
+          std::min((m_policy.m_upper[1] - m_policy.m_lower[1] + block.y - 1) /
+                       block.y,
+                   maxblocks),
+          std::min((m_policy.m_upper[2] - m_policy.m_lower[2] + block.z - 1) /
+                       block.z,
+                   maxblocks));
+      Kokkos::Experimental::Impl::HIPParallelLaunch<ParallelFor, LaunchBounds>(
+          *this, grid, block, 0,
+          m_policy.space().impl_internal_space_instance(), false);
+    } else if (Policy::rank == 4) {
+      // id0,id1 encoded within hipThreadIdx_x; id2 to hipThreadIdx_y; id3 to
+      // hipThreadIdx_z
+      dim3 const block(m_policy.m_tile[0] * m_policy.m_tile[1],
+                       m_policy.m_tile[2], m_policy.m_tile[3]);
+      dim3 const grid(
+          std::min(static_cast<index_type>(m_policy.m_tile_end[0] *
+                                           m_policy.m_tile_end[1]),
+                   static_cast<index_type>(maxblocks)),
+          std::min((m_policy.m_upper[2] - m_policy.m_lower[2] + block.y - 1) /
+                       block.y,
+                   maxblocks),
+          std::min((m_policy.m_upper[3] - m_policy.m_lower[3] + block.z - 1) /
+                       block.z,
+                   maxblocks));
+      Kokkos::Experimental::Impl::HIPParallelLaunch<ParallelFor, LaunchBounds>(
+          *this, grid, block, 0,
+          m_policy.space().impl_internal_space_instance(), false);
+    } else if (Policy::rank == 5) {
+      // id0,id1 encoded within hipThreadIdx_x; id2,id3 to hipThreadIdx_y; id4
+      // to hipThreadIdx_z
+      dim3 const block(m_policy.m_tile[0] * m_policy.m_tile[1],
+                       m_policy.m_tile[2] * m_policy.m_tile[3],
+                       m_policy.m_tile[4]);
+      dim3 const grid(
+          std::min(static_cast<index_type>(m_policy.m_tile_end[0] *
+                                           m_policy.m_tile_end[1]),
+                   static_cast<index_type>(maxblocks)),
+          std::min(static_cast<index_type>(m_policy.m_tile_end[2] *
+                                           m_policy.m_tile_end[3]),
+                   static_cast<index_type>(maxblocks)),
+          std::min((m_policy.m_upper[4] - m_policy.m_lower[4] + block.z - 1) /
+                       block.z,
+                   maxblocks));
+      Kokkos::Experimental::Impl::HIPParallelLaunch<ParallelFor, LaunchBounds>(
+          *this, grid, block, 0,
+          m_policy.space().impl_internal_space_instance(), false);
+    } else if (Policy::rank == 6) {
+      // id0,id1 encoded within hipThreadIdx_x; id2,id3 to hipThreadIdx_y;
+      // id4,id5 to hipThreadIdx_z
+      dim3 const block(m_policy.m_tile[0] * m_policy.m_tile[1],
+                       m_policy.m_tile[2] * m_policy.m_tile[3],
+                       m_policy.m_tile[4] * m_policy.m_tile[5]);
+      dim3 const grid(std::min(static_cast<index_type>(m_policy.m_tile_end[0] *
+                                                       m_policy.m_tile_end[1]),
+                               static_cast<index_type>(maxblocks)),
+                      std::min(static_cast<index_type>(m_policy.m_tile_end[2] *
+                                                       m_policy.m_tile_end[3]),
+                               static_cast<index_type>(maxblocks)),
+                      std::min(static_cast<index_type>(m_policy.m_tile_end[4] *
+                                                       m_policy.m_tile_end[5]),
+                               static_cast<index_type>(maxblocks)));
+      Kokkos::Experimental::Impl::HIPParallelLaunch<ParallelFor, LaunchBounds>(
+          *this, grid, block, 0,
+          m_policy.space().impl_internal_space_instance(), false);
+    } else {
+      printf("Kokkos::MDRange Error: Exceeded rank bounds with HIP\n");
+      Kokkos::abort("Aborting");
+    }
+
+  }  // end execute
+
+  ParallelFor(FunctorType const& arg_functor, Policy const& arg_policy)
+      : m_functor(arg_functor), m_policy(arg_policy) {}
+};
+
+// ParallelReduce
+template <class FunctorType, class ReducerType, class... Traits>
+class ParallelReduce<FunctorType, Kokkos::MDRangePolicy<Traits...>, ReducerType,
+                     Kokkos::Experimental::HIP> {
+ public:
+  using Policy = Kokkos::MDRangePolicy<Traits...>;
+
+ private:
+  using array_index_type = typename Policy::array_index_type;
+  using index_type       = typename Policy::index_type;
+
+  using WorkTag      = typename Policy::work_tag;
+  using Member       = typename Policy::member_type;
+  using LaunchBounds = typename Policy::launch_bounds;
+
+  using ReducerConditional =
+      Kokkos::Impl::if_c<std::is_same<InvalidType, ReducerType>::value,
+                         FunctorType, ReducerType>;
+  using ReducerTypeFwd = typename ReducerConditional::type;
+  using WorkTagFwd =
+      typename Kokkos::Impl::if_c<std::is_same<InvalidType, ReducerType>::value,
+                                  WorkTag, void>::type;
+
+  using ValueTraits =
+      Kokkos::Impl::FunctorValueTraits<ReducerTypeFwd, WorkTagFwd>;
+  using ValueInit = Kokkos::Impl::FunctorValueInit<ReducerTypeFwd, WorkTagFwd>;
+  using ValueJoin = Kokkos::Impl::FunctorValueJoin<ReducerTypeFwd, WorkTagFwd>;
+
+ public:
+  using pointer_type   = typename ValueTraits::pointer_type;
+  using value_type     = typename ValueTraits::value_type;
+  using reference_type = typename ValueTraits::reference_type;
+  using functor_type   = FunctorType;
+  using size_type      = Experimental::HIP::size_type;
+
+  // Algorithmic constraints: blockSize is a power of two AND hipBlockDim_y ==
+  // hipBlockDim_z == 1
+
+  const FunctorType m_functor;
+  const Policy m_policy;  // used for workrange and nwork
+  const ReducerType m_reducer;
+  const pointer_type m_result_ptr;
+  const bool m_result_ptr_device_accessible;
+  size_type* m_scratch_space;
+  size_type* m_scratch_flags;
+
+  using DeviceIteratePattern = typename Kokkos::Impl::Reduce::DeviceIterateTile<
+      Policy::rank, Policy, FunctorType, WorkTag, reference_type>;
+
+  // Shall we use the shfl based reduction or not (only use it for static sized
+  // types of more than 128bit
+  enum {
+    UseShflReduction = ((sizeof(value_type) > 2 * sizeof(double)) &&
+                        (ValueTraits::StaticValueSize != 0))
+  };
+  // Some crutch to do function overloading
+ private:
+  using DummyShflReductionType  = double;
+  using DummySHMEMReductionType = int;
+
+ public:
+  inline __device__ void exec_range(reference_type update) const {
+    DeviceIteratePattern(m_policy, m_functor, update).exec_range();
+  }
+
+  inline __device__ void operator()(void) const {
+    const integral_nonzero_constant<size_type, ValueTraits::StaticValueSize /
+                                                   sizeof(size_type)>
+        word_count(ValueTraits::value_size(
+                       ReducerConditional::select(m_functor, m_reducer)) /
+                   sizeof(size_type));
+
+    {
+      reference_type value = ValueInit::init(
+          ReducerConditional::select(m_functor, m_reducer),
+          Experimental::kokkos_impl_hip_shared_memory<size_type>() +
+              hipThreadIdx_y * word_count.value);
+
+      // Number of blocks is bounded so that the reduction can be limited to two
+      // passes. Each thread block is given an approximately equal amount of
+      // work to perform. Accumulate the values for this block. The accumulation
+      // ordering does not match the final pass, but is arithmatically
+      // equivalent.
+
+      this->exec_range(value);
+    }
+
+    // Reduce with final value at hipBlockDim_y - 1 location.
+    // Problem: non power-of-two blockDim
+    if (::Kokkos::Impl::hip_single_inter_block_reduce_scan<
+            false, ReducerTypeFwd, WorkTagFwd>(
+            ReducerConditional::select(m_functor, m_reducer), hipBlockIdx_x,
+            hipGridDim_x,
+            Experimental::kokkos_impl_hip_shared_memory<size_type>(),
+            m_scratch_space, m_scratch_flags)) {
+      // This is the final block with the final result at the final threads'
+      // location
+      size_type* const shared =
+          Experimental::kokkos_impl_hip_shared_memory<size_type>() +
+          (hipBlockDim_y - 1) * word_count.value;
+      size_type* const global = m_result_ptr_device_accessible
+                                    ? reinterpret_cast<size_type*>(m_result_ptr)
+                                    : m_scratch_space;
+
+      if (hipThreadIdx_y == 0) {
+        Kokkos::Impl::FunctorFinal<ReducerTypeFwd, WorkTagFwd>::final(
+            ReducerConditional::select(m_functor, m_reducer), shared);
+      }
+
+      if (Experimental::Impl::HIPTraits::WarpSize < word_count.value) {
+        __syncthreads();
+      }
+
+      for (unsigned i = hipThreadIdx_y; i < word_count.value;
+           i += hipBlockDim_y) {
+        global[i] = shared[i];
+      }
+    }
+  }
+
+  // Determine block size constrained by shared memory:
+  // This is copy/paste from Kokkos_HIP_Parallel_Range
+  inline unsigned local_block_size(const FunctorType& f) {
+    unsigned n     = Experimental::Impl::HIPTraits::WarpSize * 8;
+    int shmem_size = ::Kokkos::Impl::hip_single_inter_block_reduce_scan_shmem<
+        false, FunctorType, WorkTag>(f, n);
+    while (
+        (n &&
+         (m_policy.space().impl_internal_space_instance()->m_maxShmemPerBlock <
+          shmem_size)) ||
+        (n > static_cast<unsigned>(
+                 ::Kokkos::Experimental::Impl::hip_get_max_block_size<
+                     ParallelReduce, LaunchBounds>(f, 1, shmem_size, 0)))) {
+      n >>= 1;
+      shmem_size = ::Kokkos::Impl::hip_single_inter_block_reduce_scan_shmem<
+          false, FunctorType, WorkTag>(f, n);
+    }
+    return n;
+  }
+
+  inline void execute() {
+    const int nwork = m_policy.m_num_tiles;
+    if (nwork) {
+      int block_size = m_policy.m_prod_tile_dims;
+      // CONSTRAINT: Algorithm requires block_size >= product of tile dimensions
+      // Nearest power of two
+      int exponent_pow_two    = std::ceil(std::log2(block_size));
+      block_size              = std::pow(2, exponent_pow_two);
+      int suggested_blocksize = local_block_size(m_functor);
+
+      block_size = (block_size > suggested_blocksize)
+                       ? block_size
+                       : suggested_blocksize;  // Note: block_size must be less
+                                               // than or equal to 512
+
+      m_scratch_space =
+          ::Kokkos::Experimental::Impl::hip_internal_scratch_space(
+              ValueTraits::value_size(
+                  ReducerConditional::select(m_functor, m_reducer)) *
+              block_size /* block_size == max block_count */);
+      m_scratch_flags =
+          ::Kokkos::Experimental::Impl::hip_internal_scratch_flags(
+              sizeof(size_type));
+
+      // REQUIRED ( 1 , N , 1 )
+      const dim3 block(1, block_size, 1);
+      // Required grid.x <= block.y
+      const dim3 grid(std::min(int(block.y), int(nwork)), 1, 1);
+
+      const int shmem =
+          UseShflReduction
+              ? 0
+              : ::Kokkos::Impl::hip_single_inter_block_reduce_scan_shmem<
+                    false, FunctorType, WorkTag>(m_functor, block.y);
+
+      Kokkos::Experimental::Impl::HIPParallelLaunch<ParallelReduce,
+                                                    LaunchBounds>(
+          *this, grid, block, shmem,
+          m_policy.space().impl_internal_space_instance(),
+          false);  // copy to device and execute
+
+      if (!m_result_ptr_device_accessible) {
+        Experimental::HIP().fence();
+
+        if (m_result_ptr) {
+          const int size = ValueTraits::value_size(
+              ReducerConditional::select(m_functor, m_reducer));
+          DeepCopy<HostSpace, Experimental::HIPSpace>(m_result_ptr,
+                                                      m_scratch_space, size);
+        }
+      }
+    } else {
+      if (m_result_ptr) {
+        ValueInit::init(ReducerConditional::select(m_functor, m_reducer),
+                        m_result_ptr);
+      }
+    }
+  }
+
+  template <class ViewType>
+  ParallelReduce(const FunctorType& arg_functor, const Policy& arg_policy,
+                 const ViewType& arg_result,
+                 typename std::enable_if<Kokkos::is_view<ViewType>::value,
+                                         void*>::type = NULL)
+      : m_functor(arg_functor),
+        m_policy(arg_policy),
+        m_reducer(InvalidType()),
+        m_result_ptr(arg_result.data()),
+        m_result_ptr_device_accessible(
+            MemorySpaceAccess<Kokkos::Experimental::HIPSpace,
+                              typename ViewType::memory_space>::accessible),
+        m_scratch_space(0),
+        m_scratch_flags(0) {}
+
+  ParallelReduce(const FunctorType& arg_functor, const Policy& arg_policy,
+                 const ReducerType& reducer)
+      : m_functor(arg_functor),
+        m_policy(arg_policy),
+        m_reducer(reducer),
+        m_result_ptr(reducer.view().data()),
+        m_result_ptr_device_accessible(
+            MemorySpaceAccess<Kokkos::Experimental::HIPSpace,
+                              typename ReducerType::result_view_type::
+                                  memory_space>::accessible),
+        m_scratch_space(0),
+        m_scratch_flags(0) {}
+};
+}  // namespace Impl
+}  // namespace Kokkos
+
+#endif
diff --git a/kokkos/core/src/HIP/Kokkos_HIP_Parallel_Range.hpp b/kokkos/core/src/HIP/Kokkos_HIP_Parallel_Range.hpp
new file mode 100644
index 000000000..a9c44606e
--- /dev/null
+++ b/kokkos/core/src/HIP/Kokkos_HIP_Parallel_Range.hpp
@@ -0,0 +1,655 @@
+/*
+//@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
+*/
+
+#ifndef KOKKO_HIP_PARALLEL_RANGE_HPP
+#define KOKKO_HIP_PARALLEL_RANGE_HPP
+
+#include <Kokkos_Parallel.hpp>
+
+#if defined(__HIPCC__)
+
+#include <HIP/Kokkos_HIP_BlockSize_Deduction.hpp>
+#include <HIP/Kokkos_HIP_KernelLaunch.hpp>
+#include <HIP/Kokkos_HIP_ReduceScan.hpp>
+
+namespace Kokkos {
+namespace Impl {
+
+template <class FunctorType, class... Traits>
+class ParallelFor<FunctorType, Kokkos::RangePolicy<Traits...>,
+                  Kokkos::Experimental::HIP> {
+ public:
+  using Policy = Kokkos::RangePolicy<Traits...>;
+
+ private:
+  using Member       = typename Policy::member_type;
+  using WorkTag      = typename Policy::work_tag;
+  using LaunchBounds = typename Policy::launch_bounds;
+
+  const FunctorType m_functor;
+  const Policy m_policy;
+
+  ParallelFor()        = delete;
+  ParallelFor& operator=(const ParallelFor&) = delete;
+
+  template <class TagType>
+  inline __device__
+      typename std::enable_if<std::is_same<TagType, void>::value>::type
+      exec_range(const Member i) const {
+    m_functor(i);
+  }
+
+  template <class TagType>
+  inline __device__
+      typename std::enable_if<!std::is_same<TagType, void>::value>::type
+      exec_range(const Member i) const {
+    m_functor(TagType(), i);
+  }
+
+ public:
+  using functor_type = FunctorType;
+
+  inline __device__ void operator()(void) const {
+    const Member work_stride = hipBlockDim_y * hipGridDim_x;
+    const Member work_end    = m_policy.end();
+
+    for (Member iwork =
+             m_policy.begin() + hipThreadIdx_y + hipBlockDim_y * hipBlockIdx_x;
+         iwork < work_end;
+         iwork = iwork < work_end - work_stride ? iwork + work_stride
+                                                : work_end) {
+      this->template exec_range<WorkTag>(iwork);
+    }
+  }
+
+  inline void execute() const {
+    const typename Policy::index_type nwork = m_policy.end() - m_policy.begin();
+
+    const int block_size = 256;  // FIXME_HIP Choose block_size better
+    const dim3 block(1, block_size, 1);
+    const dim3 grid(
+        typename Policy::index_type((nwork + block.y - 1) / block.y), 1, 1);
+
+    Kokkos::Experimental::Impl::HIPParallelLaunch<ParallelFor, LaunchBounds>(
+        *this, grid, block, 0, m_policy.space().impl_internal_space_instance(),
+        false);
+  }
+
+  ParallelFor(const FunctorType& arg_functor, const Policy& arg_policy)
+      : m_functor(arg_functor), m_policy(arg_policy) {}
+};
+
+//----------------------------------------------------------------------------
+//----------------------------------------------------------------------------
+
+template <class FunctorType, class ReducerType, class... Traits>
+class ParallelReduce<FunctorType, Kokkos::RangePolicy<Traits...>, ReducerType,
+                     Kokkos::Experimental::HIP> {
+ public:
+  using Policy = Kokkos::RangePolicy<Traits...>;
+
+ private:
+  using WorkRange    = typename Policy::WorkRange;
+  using WorkTag      = typename Policy::work_tag;
+  using Member       = typename Policy::member_type;
+  using LaunchBounds = typename Policy::launch_bounds;
+
+  using ReducerConditional =
+      Kokkos::Impl::if_c<std::is_same<InvalidType, ReducerType>::value,
+                         FunctorType, ReducerType>;
+  using ReducerTypeFwd = typename ReducerConditional::type;
+  using WorkTagFwd =
+      typename Kokkos::Impl::if_c<std::is_same<InvalidType, ReducerType>::value,
+                                  WorkTag, void>::type;
+
+  using ValueTraits =
+      Kokkos::Impl::FunctorValueTraits<ReducerTypeFwd, WorkTagFwd>;
+  using ValueInit = Kokkos::Impl::FunctorValueInit<ReducerTypeFwd, WorkTagFwd>;
+  using ValueJoin = Kokkos::Impl::FunctorValueJoin<ReducerTypeFwd, WorkTagFwd>;
+
+ public:
+  using pointer_type   = typename ValueTraits::pointer_type;
+  using value_type     = typename ValueTraits::value_type;
+  using reference_type = typename ValueTraits::reference_type;
+  using functor_type   = FunctorType;
+  using size_type      = Kokkos::Experimental::HIP::size_type;
+  using index_type     = typename Policy::index_type;
+
+  // Algorithmic constraints: blockSize is a power of two AND hipBlockDim_y ==
+  // hipBlockDim_z == 1
+
+  const FunctorType m_functor;
+  const Policy m_policy;
+  const ReducerType m_reducer;
+  const pointer_type m_result_ptr;
+  const bool m_result_ptr_device_accessible;
+  size_type* m_scratch_space = nullptr;
+  size_type* m_scratch_flags = nullptr;
+
+  // Shall we use the shfl based reduction or not (only use it for static sized
+  // types of more than 128bit)
+  enum {
+    UseShflReduction = false
+  };  //((sizeof(value_type)>2*sizeof(double)) && ValueTraits::StaticValueSize)
+      //};
+      // Some crutch to do function overloading
+ private:
+  using DummyShflReductionType  = double;
+  using DummySHMEMReductionType = int;
+
+ public:
+  // Make the exec_range calls call to Reduce::DeviceIterateTile
+  template <class TagType>
+  __device__ inline
+      typename std::enable_if<std::is_same<TagType, void>::value>::type
+      exec_range(const Member& i, reference_type update) const {
+    m_functor(i, update);
+  }
+
+  template <class TagType>
+  __device__ inline
+      typename std::enable_if<!std::is_same<TagType, void>::value>::type
+      exec_range(const Member& i, reference_type update) const {
+    m_functor(TagType(), i, update);
+  }
+
+  __device__ inline void operator()() const {
+    const integral_nonzero_constant<size_type, ValueTraits::StaticValueSize /
+                                                   sizeof(size_type)>
+        word_count(ValueTraits::value_size(
+                       ReducerConditional::select(m_functor, m_reducer)) /
+                   sizeof(size_type));
+
+    {
+      reference_type value = ValueInit::init(
+          ReducerConditional::select(m_functor, m_reducer),
+          ::Kokkos::Experimental::kokkos_impl_hip_shared_memory<size_type>() +
+              hipThreadIdx_y * word_count.value);
+
+      // Number of blocks is bounded so that the reduction can be limited to two
+      // passes. Each thread block is given an approximately equal amount of
+      // work to perform. Accumulate the values for this block. The accumulation
+      // ordering does not match the final pass, but is arithmetically
+      // equivalent.
+
+      const WorkRange range(m_policy, hipBlockIdx_x, hipGridDim_x);
+
+      for (Member iwork     = range.begin() + hipThreadIdx_y,
+                  iwork_end = range.end();
+           iwork < iwork_end; iwork += hipBlockDim_y) {
+        this->template exec_range<WorkTag>(iwork, value);
+      }
+    }
+
+    // Reduce with final value at hipBlockDim_y - 1 location.
+    if (hip_single_inter_block_reduce_scan<false, ReducerTypeFwd, WorkTagFwd>(
+            ReducerConditional::select(m_functor, m_reducer), hipBlockIdx_x,
+            hipGridDim_x,
+            ::Kokkos::Experimental::kokkos_impl_hip_shared_memory<size_type>(),
+            m_scratch_space, m_scratch_flags)) {
+      // This is the final block with the final result at the final threads'
+      // location
+
+      size_type* const shared =
+          ::Kokkos::Experimental::kokkos_impl_hip_shared_memory<size_type>() +
+          (hipBlockDim_y - 1) * word_count.value;
+      size_type* const global = m_result_ptr_device_accessible
+                                    ? reinterpret_cast<size_type*>(m_result_ptr)
+                                    : m_scratch_space;
+
+      if (hipThreadIdx_y == 0) {
+        Kokkos::Impl::FunctorFinal<ReducerTypeFwd, WorkTagFwd>::final(
+            ReducerConditional::select(m_functor, m_reducer), shared);
+      }
+
+      if (::Kokkos::Experimental::Impl::HIPTraits::WarpSize <
+          word_count.value) {
+        __syncthreads();
+      }
+
+      for (unsigned i = hipThreadIdx_y; i < word_count.value;
+           i += hipBlockDim_y) {
+        global[i] = shared[i];
+      }
+    }
+  }
+
+  // Determine block size constrained by shared memory:
+  inline unsigned local_block_size(const FunctorType& f) {
+    // FIXME_HIP I don't know where 8 comes from
+    unsigned int n = ::Kokkos::Experimental::Impl::HIPTraits::WarpSize * 8;
+    int shmem_size =
+        hip_single_inter_block_reduce_scan_shmem<false, FunctorType, WorkTag>(
+            f, n);
+    while (
+        (n &&
+         (m_policy.space().impl_internal_space_instance()->m_maxShmemPerBlock <
+          shmem_size)) ||
+        (n > static_cast<unsigned int>(
+                 Kokkos::Experimental::Impl::hip_get_max_block_size<
+                     ParallelReduce, LaunchBounds>(f, 1, shmem_size, 0)))) {
+      n >>= 1;
+      shmem_size =
+          hip_single_inter_block_reduce_scan_shmem<false, FunctorType, WorkTag>(
+              f, n);
+    }
+    return n;
+  }
+
+  inline void execute() {
+    const index_type nwork = m_policy.end() - m_policy.begin();
+    if (nwork) {
+      const int block_size = local_block_size(m_functor);
+
+      m_scratch_space =
+          ::Kokkos::Experimental::Impl::hip_internal_scratch_space(
+              ValueTraits::value_size(
+                  ReducerConditional::select(m_functor, m_reducer)) *
+              block_size /* block_size == max block_count */);
+      m_scratch_flags =
+          ::Kokkos::Experimental::Impl::hip_internal_scratch_flags(
+              sizeof(size_type));
+
+      // REQUIRED ( 1 , N , 1 )
+      const dim3 block(1, block_size, 1);
+      // Required grid.x <= block.y
+      const dim3 grid(
+          std::min(int(block.y), int((nwork + block.y - 1) / block.y)), 1, 1);
+
+      const int shmem =
+          UseShflReduction
+              ? 0
+              : hip_single_inter_block_reduce_scan_shmem<false, FunctorType,
+                                                         WorkTag>(m_functor,
+                                                                  block.y);
+
+      Kokkos::Experimental::Impl::HIPParallelLaunch<ParallelReduce,
+                                                    LaunchBounds>(
+          *this, grid, block, shmem,
+          m_policy.space().impl_internal_space_instance(),
+          false);  // copy to device and execute
+
+      if (!m_result_ptr_device_accessible) {
+        ::Kokkos::Experimental::HIP().fence();
+
+        if (m_result_ptr) {
+          const int size = ValueTraits::value_size(
+              ReducerConditional::select(m_functor, m_reducer));
+          DeepCopy<HostSpace, ::Kokkos::Experimental::HIPSpace>(
+              m_result_ptr, m_scratch_space, size);
+        }
+      }
+    } else {
+      if (m_result_ptr) {
+        ValueInit::init(ReducerConditional::select(m_functor, m_reducer),
+                        m_result_ptr);
+      }
+    }
+  }
+
+  template <class ViewType>
+  ParallelReduce(const FunctorType& arg_functor, const Policy& arg_policy,
+                 const ViewType& arg_result,
+                 typename std::enable_if<Kokkos::is_view<ViewType>::value,
+                                         void*>::type = NULL)
+      : m_functor(arg_functor),
+        m_policy(arg_policy),
+        m_reducer(InvalidType()),
+        m_result_ptr(arg_result.data()),
+        m_result_ptr_device_accessible(
+            MemorySpaceAccess<Kokkos::Experimental::HIPSpace,
+                              typename ViewType::memory_space>::accessible) {}
+
+  ParallelReduce(const FunctorType& arg_functor, const Policy& arg_policy,
+                 const ReducerType& reducer)
+      : m_functor(arg_functor),
+        m_policy(arg_policy),
+        m_reducer(reducer),
+        m_result_ptr(reducer.view().data()),
+        m_result_ptr_device_accessible(
+            MemorySpaceAccess<Kokkos::Experimental::HIPSpace,
+                              typename ReducerType::result_view_type::
+                                  memory_space>::accessible) {}
+};
+
+template <class FunctorType, class... Traits>
+class ParallelScanHIPBase {
+ public:
+  using Policy = Kokkos::RangePolicy<Traits...>;
+
+ protected:
+  using Member       = typename Policy::member_type;
+  using WorkTag      = typename Policy::work_tag;
+  using WorkRange    = typename Policy::WorkRange;
+  using LaunchBounds = typename Policy::launch_bounds;
+
+  using ValueTraits = Kokkos::Impl::FunctorValueTraits<FunctorType, WorkTag>;
+  using ValueInit   = Kokkos::Impl::FunctorValueInit<FunctorType, WorkTag>;
+  using ValueOps    = Kokkos::Impl::FunctorValueOps<FunctorType, WorkTag>;
+
+ public:
+  using pointer_type   = typename ValueTraits::pointer_type;
+  using reference_type = typename ValueTraits::reference_type;
+  using functor_type   = FunctorType;
+  using size_type      = Kokkos::Experimental::HIP::size_type;
+  using index_type     = typename Policy::index_type;
+
+ protected:
+  // Algorithmic constraints:
+  //  (a) hipBlockDim_y is a power of two
+  //  (b) hipBlockDim_x == hipBlockDim_z == 1
+  //  (c) hipGridDim_x  <= hipBlockDim_y * hipBlockDim_y
+  //  (d) hipGridDim_y  == hipGridDim_z == 1
+
+  const FunctorType m_functor;
+  const Policy m_policy;
+  size_type* m_scratch_space = nullptr;
+  size_type* m_scratch_flags = nullptr;
+  size_type m_final          = false;
+  int m_grid_x               = 0;
+
+ private:
+  template <class TagType>
+  __device__ inline
+      typename std::enable_if<std::is_same<TagType, void>::value>::type
+      exec_range(const Member& i, reference_type update,
+                 const bool final_result) const {
+    m_functor(i, update, final_result);
+  }
+
+  template <class TagType>
+  __device__ inline
+      typename std::enable_if<!std::is_same<TagType, void>::value>::type
+      exec_range(const Member& i, reference_type update,
+                 const bool final_result) const {
+    m_functor(TagType(), i, update, final_result);
+  }
+
+  //----------------------------------------
+
+  __device__ inline void initial(void) const {
+    const integral_nonzero_constant<size_type, ValueTraits::StaticValueSize /
+                                                   sizeof(size_type)>
+        word_count(ValueTraits::value_size(m_functor) / sizeof(size_type));
+
+    size_type* const shared_value =
+        Kokkos::Experimental::kokkos_impl_hip_shared_memory<size_type>() +
+        word_count.value * hipThreadIdx_y;
+
+    ValueInit::init(m_functor, shared_value);
+
+    // Number of blocks is bounded so that the reduction can be limited to two
+    // passes. Each thread block is given an approximately equal amount of work
+    // to perform. Accumulate the values for this block. The accumulation
+    // ordering does not match the final pass, but is arithmetically equivalent.
+
+    const WorkRange range(m_policy, hipBlockIdx_x, hipGridDim_x);
+
+    for (Member iwork = range.begin() + hipThreadIdx_y, iwork_end = range.end();
+         iwork < iwork_end; iwork += hipBlockDim_y) {
+      this->template exec_range<WorkTag>(
+          iwork, ValueOps::reference(shared_value), false);
+    }
+
+    // Reduce and scan, writing out scan of blocks' totals and block-groups'
+    // totals. Blocks' scan values are written to 'hipBlockIdx_x' location.
+    // Block-groups' scan values are at: i = ( j * hipBlockDim_y - 1 ) for i <
+    // hipGridDim_x
+    hip_single_inter_block_reduce_scan<true, FunctorType, WorkTag>(
+        m_functor, hipBlockIdx_x, hipGridDim_x,
+        Kokkos::Experimental::kokkos_impl_hip_shared_memory<size_type>(),
+        m_scratch_space, m_scratch_flags);
+  }
+
+  //----------------------------------------
+
+  __device__ inline void final(void) const {
+    const integral_nonzero_constant<size_type, ValueTraits::StaticValueSize /
+                                                   sizeof(size_type)>
+        word_count(ValueTraits::value_size(m_functor) / sizeof(size_type));
+
+    // Use shared memory as an exclusive scan: { 0 , value[0] , value[1] ,
+    // value[2] , ... }
+    size_type* const shared_data =
+        Kokkos::Experimental::kokkos_impl_hip_shared_memory<size_type>();
+    size_type* const shared_prefix =
+        shared_data + word_count.value * hipThreadIdx_y;
+    size_type* const shared_accum =
+        shared_data + word_count.value * (hipBlockDim_y + 1);
+
+    // Starting value for this thread block is the previous block's total.
+    if (hipBlockIdx_x) {
+      size_type* const block_total =
+          m_scratch_space + word_count.value * (hipBlockIdx_x - 1);
+      for (unsigned i = hipThreadIdx_y; i < word_count.value; ++i) {
+        shared_accum[i] = block_total[i];
+      }
+    } else if (0 == hipThreadIdx_y) {
+      ValueInit::init(m_functor, shared_accum);
+    }
+
+    const WorkRange range(m_policy, hipBlockIdx_x, hipGridDim_x);
+
+    for (typename Policy::member_type iwork_base = range.begin();
+         iwork_base < range.end(); iwork_base += hipBlockDim_y) {
+      const typename Policy::member_type iwork = iwork_base + hipThreadIdx_y;
+
+      __syncthreads();  // Don't overwrite previous iteration values until they
+                        // are used
+
+      ValueInit::init(m_functor, shared_prefix + word_count.value);
+
+      // Copy previous block's accumulation total into thread[0] prefix and
+      // inclusive scan value of this block
+      for (unsigned i = hipThreadIdx_y; i < word_count.value; ++i) {
+        shared_data[i + word_count.value] = shared_data[i] = shared_accum[i];
+      }
+
+      // Make sure the write is seen by all threads
+      __threadfence_block();
+
+      // Call functor to accumulate inclusive scan value for this work item
+      const bool doWork = (iwork < range.end());
+      if (doWork) {
+        this->template exec_range<WorkTag>(
+            iwork, ValueOps::reference(shared_prefix + word_count.value),
+            false);
+      }
+
+      // Scan block values into locations shared_data[1..hipBlockDim_y]
+      hip_intra_block_reduce_scan<true, FunctorType, WorkTag>(
+          m_functor,
+          typename ValueTraits::pointer_type(shared_data + word_count.value));
+
+      {
+        size_type* const block_total =
+            shared_data + word_count.value * hipBlockDim_y;
+        for (unsigned i = hipThreadIdx_y; i < word_count.value; ++i) {
+          shared_accum[i] = block_total[i];
+        }
+      }
+
+      // Call functor with exclusive scan value
+      if (doWork) {
+        this->template exec_range<WorkTag>(
+            iwork, ValueOps::reference(shared_prefix), true);
+      }
+    }
+  }
+
+ public:
+  //----------------------------------------
+
+  __device__ inline void operator()(void) const {
+    if (!m_final) {
+      initial();
+    } else {
+      final();
+    }
+  }
+
+  // Determine block size constrained by shared memory:
+  inline unsigned local_block_size(const FunctorType& f) {
+    // hipBlockDim_y must be power of two = 128 (2 warps) or 256 (4 warps) or
+    // 512 (8 warps) hipGridDim_x <= hipBlockDim_y * hipBlockDim_y
+    //
+    // TODO check best option
+
+    unsigned n = Experimental::Impl::HIPTraits::WarpSize * 4;
+    while (n && static_cast<unsigned>(m_policy.space()
+                                          .impl_internal_space_instance()
+                                          ->m_maxShmemPerBlock) <
+                    hip_single_inter_block_reduce_scan_shmem<false, FunctorType,
+                                                             WorkTag>(f, n)) {
+      n >>= 1;
+    }
+    return n;
+  }
+
+  inline void impl_execute() {
+    const index_type nwork = m_policy.end() - m_policy.begin();
+    if (nwork) {
+      // FIXME_HIP we cannot choose it larger for large work sizes to work
+      // correctly, the unit tests fail with wrong results
+      const int gridMaxComputeCapability_2x = 0x01fff;
+
+      // FIXME_HIP block sizes greater than 256 don't work correctly,
+      // the unit tests fail with wrong results
+      const int block_size =
+          std::min(static_cast<int>(local_block_size(m_functor)), 256);
+
+      const int grid_max =
+          std::min(block_size * block_size, gridMaxComputeCapability_2x);
+
+      // At most 'max_grid' blocks:
+      const int max_grid =
+          std::min<int>(grid_max, (nwork + block_size - 1) / block_size);
+
+      // How much work per block:
+      const int work_per_block = (nwork + max_grid - 1) / max_grid;
+
+      // How many block are really needed for this much work:
+      m_grid_x = (nwork + work_per_block - 1) / work_per_block;
+
+      m_scratch_space = Kokkos::Experimental::Impl::hip_internal_scratch_space(
+          ValueTraits::value_size(m_functor) * m_grid_x);
+      m_scratch_flags = Kokkos::Experimental::Impl::hip_internal_scratch_flags(
+          sizeof(size_type) * 1);
+
+      dim3 grid(m_grid_x, 1, 1);
+      dim3 block(1, block_size, 1);  // REQUIRED DIMENSIONS ( 1 , N , 1 )
+      const int shmem = ValueTraits::value_size(m_functor) * (block_size + 2);
+
+      m_final = false;
+      Kokkos::Experimental::Impl::HIPParallelLaunch<ParallelScanHIPBase,
+                                                    LaunchBounds>(
+          *this, grid, block, shmem,
+          m_policy.space().impl_internal_space_instance(),
+          false);  // copy to device and execute
+
+      m_final = true;
+      Kokkos::Experimental::Impl::HIPParallelLaunch<ParallelScanHIPBase,
+                                                    LaunchBounds>(
+          *this, grid, block, shmem,
+          m_policy.space().impl_internal_space_instance(),
+          false);  // copy to device and execute
+    }
+  }
+
+  ParallelScanHIPBase(const FunctorType& arg_functor, const Policy& arg_policy)
+      : m_functor(arg_functor), m_policy(arg_policy) {}
+};
+
+template <class FunctorType, class... Traits>
+class ParallelScan<FunctorType, Kokkos::RangePolicy<Traits...>,
+                   Kokkos::Experimental::HIP>
+    : private ParallelScanHIPBase<FunctorType, Traits...> {
+ public:
+  using Base = ParallelScanHIPBase<FunctorType, Traits...>;
+  using Base::operator();
+
+  inline void execute() { Base::impl_execute(); }
+
+  ParallelScan(const FunctorType& arg_functor,
+               const typename Base::Policy& arg_policy)
+      : Base(arg_functor, arg_policy) {}
+};
+
+//----------------------------------------------------------------------------
+
+template <class FunctorType, class ReturnType, class... Traits>
+class ParallelScanWithTotal<FunctorType, Kokkos::RangePolicy<Traits...>,
+                            ReturnType, Kokkos::Experimental::HIP>
+    : private ParallelScanHIPBase<FunctorType, Traits...> {
+ public:
+  using Base = ParallelScanHIPBase<FunctorType, Traits...>;
+  using Base::operator();
+
+  ReturnType& m_returnvalue;
+
+  inline void execute() {
+    Base::impl_execute();
+
+    const auto nwork = Base::m_policy.end() - Base::m_policy.begin();
+    if (nwork) {
+      const int size = Base::ValueTraits::value_size(Base::m_functor);
+      DeepCopy<HostSpace, Kokkos::Experimental::HIPSpace>(
+          &m_returnvalue,
+          Base::m_scratch_space + (Base::m_grid_x - 1) * size / sizeof(int),
+          size);
+    }
+  }
+
+  ParallelScanWithTotal(const FunctorType& arg_functor,
+                        const typename Base::Policy& arg_policy,
+                        ReturnType& arg_returnvalue)
+      : Base(arg_functor, arg_policy), m_returnvalue(arg_returnvalue) {}
+};
+
+}  // namespace Impl
+}  // namespace Kokkos
+
+#endif
+
+#endif
diff --git a/kokkos/core/src/HIP/Kokkos_HIP_Parallel_Team.hpp b/kokkos/core/src/HIP/Kokkos_HIP_Parallel_Team.hpp
new file mode 100644
index 000000000..53097f364
--- /dev/null
+++ b/kokkos/core/src/HIP/Kokkos_HIP_Parallel_Team.hpp
@@ -0,0 +1,562 @@
+/*
+//@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
+*/
+
+#ifndef KOKKO_HIP_PARALLEL_TEAM_HPP
+#define KOKKO_HIP_PARALLEL_TEAM_HPP
+
+#include <Kokkos_Parallel.hpp>
+
+#if defined(__HIPCC__)
+
+#include <HIP/Kokkos_HIP_KernelLaunch.hpp>
+#include <HIP/Kokkos_HIP_Locks.hpp>
+#include <HIP/Kokkos_HIP_Team.hpp>
+#include <HIP/Kokkos_HIP_Instance.hpp>
+
+namespace Kokkos {
+namespace Impl {
+template <typename... Properties>
+class TeamPolicyInternal<Kokkos::Experimental::HIP, Properties...>
+    : public PolicyTraits<Properties...> {
+ public:
+  using execution_policy = TeamPolicyInternal;
+
+  using traits = PolicyTraits<Properties...>;
+
+  template <typename ExecSpace, typename... OtherProperties>
+  friend class TeamPolicyInternal;
+
+ private:
+  static int constexpr MAX_WARP = 8;
+
+  typename traits::execution_space m_space;
+  int m_league_size;
+  int m_team_size;
+  int m_vector_length;
+  int m_team_scratch_size[2];
+  int m_thread_scratch_size[2];
+  int m_chunk_size;
+
+ public:
+  using execution_space = Kokkos::Experimental::HIP;
+
+  template <class... OtherProperties>
+  TeamPolicyInternal(TeamPolicyInternal<OtherProperties...> const& p) {
+    m_league_size            = p.m_league_size;
+    m_team_size              = p.m_team_size;
+    m_vector_length          = p.m_vector_length;
+    m_team_scratch_size[0]   = p.m_team_scratch_size[0];
+    m_team_scratch_size[1]   = p.m_team_scratch_size[1];
+    m_thread_scratch_size[0] = p.m_thread_scratch_size[0];
+    m_thread_scratch_size[1] = p.m_thread_scratch_size[1];
+    m_chunk_size             = p.m_chunk_size;
+    m_space                  = p.m_space;
+  }
+
+  TeamPolicyInternal& operator=(TeamPolicyInternal const& p) {
+    m_league_size            = p.m_league_size;
+    m_team_size              = p.m_team_size;
+    m_vector_length          = p.m_vector_length;
+    m_team_scratch_size[0]   = p.m_team_scratch_size[0];
+    m_team_scratch_size[1]   = p.m_team_scratch_size[1];
+    m_thread_scratch_size[0] = p.m_thread_scratch_size[0];
+    m_thread_scratch_size[1] = p.m_thread_scratch_size[1];
+    m_chunk_size             = p.m_chunk_size;
+    m_space                  = p.m_space;
+    return *this;
+  }
+
+  template <typename FunctorType>
+  int team_size_max(FunctorType const& f, ParallelForTag const&) const {
+    using closure_type =
+        Impl::ParallelFor<FunctorType, TeamPolicy<Properties...> >;
+    hipFuncAttributes attr = ::Kokkos::Experimental::Impl::HIPParallelLaunch<
+        closure_type,
+        typename traits::launch_bounds>::get_hip_func_attributes();
+    int const block_size = ::Kokkos::Experimental::Impl::hip_get_max_block_size<
+        FunctorType, typename traits::launch_bounds>(
+        space().impl_internal_space_instance(), attr, f,
+        static_cast<size_t>(vector_length()),
+        static_cast<size_t>(team_scratch_size(0)) + 2 * sizeof(double),
+        static_cast<size_t>(thread_scratch_size(0)) + sizeof(double));
+    return block_size / vector_length();
+  }
+
+  template <typename FunctorType>
+  int team_size_recommended(FunctorType const& f, ParallelForTag const&) const {
+    typedef Impl::ParallelFor<FunctorType, TeamPolicy<Properties...> >
+        closure_type;
+    hipFuncAttributes attr = ::Kokkos::Experimental::Impl::HIPParallelLaunch<
+        closure_type,
+        typename traits::launch_bounds>::get_hip_func_attributes();
+    int const block_size = ::Kokkos::Experimental::Impl::hip_get_opt_block_size<
+        FunctorType, typename traits::launch_bounds>(
+        space().impl_internal_space_instance(), attr, f,
+        static_cast<size_t>(vector_length()),
+        static_cast<size_t>(team_scratch_size(0)) + 2 * sizeof(double),
+        static_cast<size_t>(thread_scratch_size(0)) + sizeof(double));
+    return block_size / vector_length();
+  }
+
+  static int vector_length_max() {
+    return ::Kokkos::Experimental::Impl::HIPTraits::WarpSize;
+  }
+
+  static int verify_requested_vector_length(int requested_vector_length) {
+    int test_vector_length =
+        std::min(requested_vector_length, vector_length_max());
+
+    // Allow only power-of-two vector_length
+    if (!(is_integral_power_of_two(test_vector_length))) {
+      int test_pow2 = 1;
+      for (int i = 0; i < 5; i++) {
+        test_pow2 = test_pow2 << 1;
+        if (test_pow2 > test_vector_length) {
+          break;
+        }
+      }
+      test_vector_length = test_pow2 >> 1;
+    }
+
+    return test_vector_length;
+  }
+
+  static int scratch_size_max(int level) {
+    return (
+        level == 0 ? 1024 * 40 :  // FIXME_HIP arbitrarily setting this to 48kB
+            20 * 1024 * 1024);    // FIXME_HIP arbitrarily setting this to 20MB
+  }
+
+  int vector_length() const { return m_vector_length; }
+
+  int team_size() const { return m_team_size; }
+
+  int league_size() const { return m_league_size; }
+
+  int scratch_size(int level, int team_size_ = -1) const {
+    if (team_size_ < 0) team_size_ = m_team_size;
+    return m_team_scratch_size[level] +
+           team_size_ * m_thread_scratch_size[level];
+  }
+
+  int team_scratch_size(int level) const { return m_team_scratch_size[level]; }
+
+  int thread_scratch_size(int level) const {
+    return m_thread_scratch_size[level];
+  }
+
+  typename traits::execution_space space() const { return m_space; }
+
+  TeamPolicyInternal()
+      : m_space(typename traits::execution_space()),
+        m_league_size(0),
+        m_team_size(-1),
+        m_vector_length(0),
+        m_team_scratch_size{0, 0},
+        m_thread_scratch_size{0, 0},
+        m_chunk_size(::Kokkos::Experimental::Impl::HIPTraits::WarpSize) {}
+
+  /** \brief  Specify league size, request team size */
+  TeamPolicyInternal(const execution_space space_, int league_size_,
+                     int team_size_request, int vector_length_request = 1)
+      : m_space(space_),
+        m_league_size(league_size_),
+        m_team_size(team_size_request),
+        m_vector_length(verify_requested_vector_length(vector_length_request)),
+        m_team_scratch_size{0, 0},
+        m_thread_scratch_size{0, 0},
+        m_chunk_size(::Kokkos::Experimental::Impl::HIPTraits::WarpSize) {
+    // Make sure league size is permissable
+    if (league_size_ >=
+        static_cast<int>(
+            ::Kokkos::Experimental::Impl::hip_internal_maximum_grid_count()))
+      Impl::throw_runtime_exception(
+          "Requested too large league_size for TeamPolicy on HIP execution "
+          "space.");
+
+    // Make sure total block size is permissable
+    if (m_team_size * m_vector_length > 1024) {
+      Impl::throw_runtime_exception(
+          std::string("Kokkos::TeamPolicy< HIP > the team size is too large. "
+                      "Team size x vector length must be smaller than 1024."));
+    }
+  }
+
+  /** \brief  Specify league size, request team size */
+  TeamPolicyInternal(const execution_space space_, int league_size_,
+                     const Kokkos::AUTO_t& /* team_size_request */,
+                     int vector_length_request = 1)
+      : m_space(space_),
+        m_league_size(league_size_),
+        m_team_size(-1),
+        m_vector_length(verify_requested_vector_length(vector_length_request)),
+        m_team_scratch_size{0, 0},
+        m_thread_scratch_size{0, 0},
+        m_chunk_size(::Kokkos::Experimental::Impl::HIPTraits::WarpSize) {
+    // Make sure league size is permissable
+    if (league_size_ >=
+        static_cast<int>(
+            ::Kokkos::Experimental::Impl::hip_internal_maximum_grid_count()))
+      Impl::throw_runtime_exception(
+          "Requested too large league_size for TeamPolicy on HIP execution "
+          "space.");
+  }
+
+  TeamPolicyInternal(int league_size_, int team_size_request,
+                     int vector_length_request = 1)
+      : m_space(typename traits::execution_space()),
+        m_league_size(league_size_),
+        m_team_size(team_size_request),
+        m_vector_length(verify_requested_vector_length(vector_length_request)),
+        m_team_scratch_size{0, 0},
+        m_thread_scratch_size{0, 0},
+        m_chunk_size(::Kokkos::Experimental::Impl::HIPTraits::WarpSize) {
+    // Make sure league size is permissable
+    if (league_size_ >=
+        static_cast<int>(
+            ::Kokkos::Experimental::Impl::hip_internal_maximum_grid_count()))
+      Impl::throw_runtime_exception(
+          "Requested too large league_size for TeamPolicy on HIP execution "
+          "space.");
+
+    // Make sure total block size is permissable
+    if (m_team_size * m_vector_length > 1024) {
+      Impl::throw_runtime_exception(
+          std::string("Kokkos::TeamPolicy< HIP > the team size is too large. "
+                      "Team size x vector length must be smaller than 1024."));
+    }
+  }
+
+  TeamPolicyInternal(int league_size_,
+                     const Kokkos::AUTO_t& /* team_size_request */,
+                     int vector_length_request = 1)
+      : m_space(typename traits::execution_space()),
+        m_league_size(league_size_),
+        m_team_size(-1),
+        m_vector_length(verify_requested_vector_length(vector_length_request)),
+        m_team_scratch_size{0, 0},
+        m_thread_scratch_size{0, 0},
+        m_chunk_size(::Kokkos::Experimental::Impl::HIPTraits::WarpSize) {
+    // Make sure league size is permissable
+    if (league_size_ >=
+        static_cast<int>(
+            ::Kokkos::Experimental::Impl::hip_internal_maximum_grid_count()))
+      Impl::throw_runtime_exception(
+          "Requested too large league_size for TeamPolicy on HIP execution "
+          "space.");
+  }
+
+  int chunk_size() const { return m_chunk_size; }
+
+  TeamPolicyInternal& set_chunk_size(typename traits::index_type chunk_size_) {
+    m_chunk_size = chunk_size_;
+    return *this;
+  }
+
+  /** \brief set per team scratch size for a specific level of the scratch
+   * hierarchy */
+  TeamPolicyInternal& set_scratch_size(int level,
+                                       PerTeamValue const& per_team) {
+    m_team_scratch_size[level] = per_team.value;
+    return *this;
+  }
+
+  /** \brief set per thread scratch size for a specific level of the scratch
+   * hierarchy */
+  TeamPolicyInternal& set_scratch_size(int level,
+                                       PerThreadValue const& per_thread) {
+    m_thread_scratch_size[level] = per_thread.value;
+    return *this;
+  }
+
+  /** \brief set per thread and per team scratch size for a specific level of
+   * the scratch hierarchy */
+  TeamPolicyInternal& set_scratch_size(int level, PerTeamValue const& per_team,
+                                       PerThreadValue const& per_thread) {
+    m_team_scratch_size[level]   = per_team.value;
+    m_thread_scratch_size[level] = per_thread.value;
+    return *this;
+  }
+
+  using member_type = Kokkos::Impl::HIPTeamMember;
+
+ protected:
+  template <class ClosureType, class FunctorType, class BlockSizeCallable>
+  int internal_team_size_common(const FunctorType& f,
+                                BlockSizeCallable&& block_size_callable) const {
+    using closure_type = ClosureType;
+    using functor_value_traits =
+        Impl::FunctorValueTraits<FunctorType, typename traits::work_tag>;
+
+    hipFuncAttributes attr = ::Kokkos::Experimental::Impl::HIPParallelLaunch<
+        closure_type,
+        typename traits::launch_bounds>::get_hip_func_attributes();
+    const int block_size = std::forward<BlockSizeCallable>(block_size_callable)(
+        space().impl_internal_space_instance(), attr, f,
+        static_cast<size_t>(vector_length()),
+        static_cast<size_t>(team_scratch_size(0)) + 2 * sizeof(double),
+        static_cast<size_t>(thread_scratch_size(0)) + sizeof(double) +
+            ((functor_value_traits::StaticValueSize != 0)
+                 ? 0
+                 : functor_value_traits::value_size(f)));
+    KOKKOS_ASSERT(block_size > 0);
+
+    // Currently we require Power-of-2 team size for reductions.
+    int p2 = 1;
+    while (p2 <= block_size) p2 *= 2;
+    p2 /= 2;
+    return p2 / vector_length();
+  }
+
+  template <class ClosureType, class FunctorType>
+  int internal_team_size_max(const FunctorType& f) const {
+    return internal_team_size_common<ClosureType>(
+        f, ::Kokkos::Experimental::Impl::hip_get_max_block_size<
+               FunctorType, typename traits::launch_bounds>);
+  }
+
+  template <class ClosureType, class FunctorType>
+  int internal_team_size_recommended(const FunctorType& f) const {
+    return internal_team_size_common<ClosureType>(
+        f, ::Kokkos::Experimental::Impl::hip_get_opt_block_size<
+               FunctorType, typename traits::launch_bounds>);
+  }
+};
+
+struct HIPLockArrays {
+  std::int32_t* atomic  = nullptr;
+  std::int32_t* scratch = nullptr;
+  std::int32_t n        = 0;
+};
+
+template <typename FunctorType, typename... Properties>
+class ParallelFor<FunctorType, Kokkos::TeamPolicy<Properties...>,
+                  Kokkos::Experimental::HIP> {
+ public:
+  using Policy = TeamPolicyInternal<Kokkos::Experimental::HIP, Properties...>;
+  using functor_type = FunctorType;
+  using size_type    = ::Kokkos::Experimental::HIP::size_type;
+
+ private:
+  using Member       = typename Policy::member_type;
+  using WorkTag      = typename Policy::work_tag;
+  using LaunchBounds = typename Policy::launch_bounds;
+
+  // Algorithmic constraints: hipBlockDim_y is a power of two AND hipBlockDim_y
+  // == hipBlockDim_z == 1 shared memory utilization:
+  //
+  //  [ team   reduce space ]
+  //  [ team   shared space ]
+
+  FunctorType const m_functor;
+  Policy const m_policy;
+  size_type const m_league_size;
+  int m_team_size;
+  size_type const m_vector_size;
+  int m_shmem_begin;
+  int m_shmem_size;
+  void* m_scratch_ptr[2];
+  int m_scratch_size[2];
+  mutable HIPLockArrays hip_lock_arrays;
+
+  template <typename TagType>
+  __device__ inline
+      typename std::enable_if<std::is_same<TagType, void>::value>::type
+      exec_team(const Member& member) const {
+    m_functor(member);
+  }
+
+  template <typename TagType>
+  __device__ inline
+      typename std::enable_if<!std::is_same<TagType, void>::value>::type
+      exec_team(const Member& member) const {
+    m_functor(TagType(), member);
+  }
+
+ public:
+  __device__ inline void operator()(void) const {
+    // Iterate this block through the league
+    int64_t threadid = 0;
+    if (m_scratch_size[1] > 0) {
+      __shared__ int64_t base_thread_id;
+      if (hipThreadIdx_x == 0 && hipThreadIdx_y == 0) {
+        threadid = (hipBlockIdx_x * hipBlockDim_z + hipThreadIdx_z) %
+                   (hip_lock_arrays.n / (hipBlockDim_x * hipBlockDim_y));
+        threadid *= hipBlockDim_x * hipBlockDim_y;
+        int done = 0;
+        while (!done) {
+          done = (0 == atomicCAS(&hip_lock_arrays.scratch[threadid], 0, 1));
+          if (!done) {
+            threadid += hipBlockDim_x * hipBlockDim_y;
+            if (int64_t(threadid + hipBlockDim_x * hipBlockDim_y) >=
+                int64_t(hip_lock_arrays.n))
+              threadid = 0;
+          }
+        }
+        base_thread_id = threadid;
+      }
+      __syncthreads();
+      threadid = base_thread_id;
+    }
+
+    int const int_league_size = static_cast<int>(m_league_size);
+    for (int league_rank = hipBlockIdx_x; league_rank < int_league_size;
+         league_rank += hipGridDim_x) {
+      this->template exec_team<WorkTag>(typename Policy::member_type(
+          ::Kokkos::Experimental::kokkos_impl_hip_shared_memory<void>(),
+          m_shmem_begin, m_shmem_size,
+          static_cast<void*>(
+              static_cast<char*>(m_scratch_ptr[1]) +
+              ptrdiff_t(threadid / (hipBlockDim_x * hipBlockDim_y)) *
+                  m_scratch_size[1]),
+          m_scratch_size[1], league_rank, m_league_size));
+    }
+    if (m_scratch_size[1] > 0) {
+      __syncthreads();
+      if (hipThreadIdx_x == 0 && hipThreadIdx_y == 0)
+        hip_lock_arrays.scratch[threadid] = 0;
+    }
+  }
+
+  inline void execute() const {
+    HIP_SAFE_CALL(hipMalloc(
+        &hip_lock_arrays.atomic,
+        sizeof(std::int32_t) * (KOKKOS_IMPL_HIP_SPACE_ATOMIC_MASK + 1)));
+    HIP_SAFE_CALL(hipMalloc(
+        &hip_lock_arrays.scratch,
+        sizeof(std::int32_t) * (::Kokkos::Experimental::HIP::concurrency())));
+    HIP_SAFE_CALL(hipMemset(
+        hip_lock_arrays.scratch, 0,
+        sizeof(std::int32_t) * (::Kokkos::Experimental::HIP::concurrency())));
+    hip_lock_arrays.n = ::Kokkos::Experimental::HIP::concurrency();
+
+    int64_t const shmem_size_total = m_shmem_begin + m_shmem_size;
+    dim3 const grid(static_cast<int>(m_league_size), 1, 1);
+    dim3 const block(static_cast<int>(m_vector_size),
+                     static_cast<int>(m_team_size), 1);
+
+    ::Kokkos::Experimental::Impl::HIPParallelLaunch<ParallelFor, LaunchBounds>(
+        *this, grid, block, shmem_size_total,
+        m_policy.space().impl_internal_space_instance(),
+        true);  // copy to device and execute
+
+    if (hip_lock_arrays.atomic) {
+      HIP_SAFE_CALL(hipFree(hip_lock_arrays.atomic));
+      hip_lock_arrays.atomic = nullptr;
+    }
+    if (hip_lock_arrays.scratch) {
+      HIP_SAFE_CALL(hipFree(hip_lock_arrays.scratch));
+      hip_lock_arrays.scratch = nullptr;
+    }
+    hip_lock_arrays.n = 0;
+  }
+
+  ParallelFor(FunctorType const& arg_functor, Policy const& arg_policy)
+      : m_functor(arg_functor),
+        m_policy(arg_policy),
+        m_league_size(arg_policy.league_size()),
+        m_team_size(arg_policy.team_size()),
+        m_vector_size(arg_policy.vector_length()) {
+    hipFuncAttributes attr = ::Kokkos::Experimental::Impl::HIPParallelLaunch<
+        ParallelFor, LaunchBounds>::get_hip_func_attributes();
+    m_team_size =
+        m_team_size >= 0
+            ? m_team_size
+            : ::Kokkos::Experimental::Impl::hip_get_opt_block_size<
+                  FunctorType, LaunchBounds>(
+                  m_policy.space().impl_internal_space_instance(), attr,
+                  m_functor, m_vector_size, m_policy.team_scratch_size(0),
+                  m_policy.thread_scratch_size(0)) /
+                  m_vector_size;
+
+    m_shmem_begin = (sizeof(double) * (m_team_size + 2));
+    m_shmem_size =
+        (m_policy.scratch_size(0, m_team_size) +
+         FunctorTeamShmemSize<FunctorType>::value(m_functor, m_team_size));
+    m_scratch_size[0] = m_policy.scratch_size(0, m_team_size);
+    m_scratch_size[1] = m_policy.scratch_size(1, m_team_size);
+
+    // Functor's reduce memory, team scan memory, and team shared memory depend
+    // upon team size.
+    m_scratch_ptr[0] = nullptr;
+    m_scratch_ptr[1] =
+        m_team_size <= 0
+            ? nullptr
+            : ::Kokkos::Experimental::Impl::hip_resize_scratch_space(
+                  static_cast<ptrdiff_t>(m_scratch_size[1]) *
+                  static_cast<ptrdiff_t>(
+                      ::Kokkos::Experimental::HIP::concurrency() /
+                      (m_team_size * m_vector_size)));
+
+    int const shmem_size_total = m_shmem_begin + m_shmem_size;
+    if (m_policy.space().impl_internal_space_instance()->m_maxShmemPerBlock <
+        shmem_size_total) {
+      printf(
+          "%i %i\n",
+          m_policy.space().impl_internal_space_instance()->m_maxShmemPerBlock,
+          shmem_size_total);
+      Kokkos::Impl::throw_runtime_exception(std::string(
+          "Kokkos::Impl::ParallelFor< HIP > insufficient shared memory"));
+    }
+
+    if (static_cast<int>(m_team_size) >
+        static_cast<int>(
+            ::Kokkos::Experimental::Impl::hip_get_max_block_size<FunctorType,
+                                                                 LaunchBounds>(
+                m_policy.space().impl_internal_space_instance(), attr,
+                arg_functor, arg_policy.vector_length(),
+                arg_policy.team_scratch_size(0),
+                arg_policy.thread_scratch_size(0)) /
+            arg_policy.vector_length())) {
+      Kokkos::Impl::throw_runtime_exception(std::string(
+          "Kokkos::Impl::ParallelFor< HIP > requested too large team size."));
+    }
+  }
+};
+}  // namespace Impl
+}  // namespace Kokkos
+
+#endif
+
+#endif
diff --git a/kokkos/core/src/HIP/Kokkos_HIP_ReduceScan.hpp b/kokkos/core/src/HIP/Kokkos_HIP_ReduceScan.hpp
new file mode 100644
index 000000000..362128c41
--- /dev/null
+++ b/kokkos/core/src/HIP/Kokkos_HIP_ReduceScan.hpp
@@ -0,0 +1,420 @@
+/*
+//@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
+*/
+
+#ifndef KOKKOS_HIP_REDUCESCAN_HPP
+#define KOKKOS_HIP_REDUCESCAN_HPP
+
+#include <Kokkos_Macros.hpp>
+
+#if defined(__HIPCC__)
+
+namespace Kokkos {
+namespace Impl {
+template <class FunctorType, class ArgTag, bool DoScan, bool UseShfl>
+struct HIPReductionsFunctor;
+
+template <typename FunctorType, typename ArgTag>
+struct HIPReductionsFunctor<FunctorType, ArgTag, false, false> {
+  using ValueTraits  = FunctorValueTraits<FunctorType, ArgTag>;
+  using ValueJoin    = FunctorValueJoin<FunctorType, ArgTag>;
+  using ValueInit    = FunctorValueInit<FunctorType, ArgTag>;
+  using ValueOps     = FunctorValueOps<FunctorType, ArgTag>;
+  using pointer_type = typename ValueTraits::pointer_type;
+  using Scalar       = typename ValueTraits::value_type;
+
+  __device__ static inline void scalar_intra_warp_reduction(
+      FunctorType const& functor,
+      Scalar* value,           // Contribution
+      bool const skip_vector,  // Skip threads if Kokkos vector lanes are not
+                               // part of the reduction
+      int const width)         // How much of the warp participates
+  {
+    int const lane_id = (hipThreadIdx_y * hipBlockDim_x + hipThreadIdx_x) %
+                        ::Kokkos::Experimental::Impl::HIPTraits::WarpSize;
+    for (int delta = skip_vector ? hipBlockDim_x : 1; delta < width;
+         delta *= 2) {
+      if (lane_id + delta < ::Kokkos::Experimental::Impl::HIPTraits::WarpSize) {
+        ValueJoin::join(functor, value, value + delta);
+      }
+    }
+    *value = *(value - lane_id);
+  }
+
+  __device__ static inline void scalar_intra_block_reduction(
+      FunctorType const& functor, Scalar value, bool const skip, Scalar* result,
+      int const /*shared_elements*/, Scalar* shared_team_buffer_element) {
+    int const warp_id = (hipThreadIdx_y * hipBlockDim_x) /
+                        ::Kokkos::Experimental::Impl::HIPTraits::WarpSize;
+    Scalar* const my_shared_team_buffer_element =
+        shared_team_buffer_element + hipThreadIdx_y * hipBlockDim_x +
+        hipThreadIdx_x;
+    *my_shared_team_buffer_element = value;
+    // Warp Level Reduction, ignoring Kokkos vector entries
+    scalar_intra_warp_reduction(
+        functor, my_shared_team_buffer_element, skip,
+        ::Kokkos::Experimental::Impl::HIPTraits::WarpSize);
+    // Wait for every warp to be done before using one warp to do final cross
+    // warp reduction
+    __syncthreads();
+
+    if (warp_id == 0) {
+      const unsigned int delta =
+          (hipThreadIdx_y * hipBlockDim_x + hipThreadIdx_x) *
+          ::Kokkos::Experimental::Impl::HIPTraits::WarpSize;
+      if (delta < hipBlockDim_x * hipBlockDim_y)
+        *my_shared_team_buffer_element = shared_team_buffer_element[delta];
+      scalar_intra_warp_reduction(
+          functor, my_shared_team_buffer_element, false,
+          hipBlockDim_x * hipBlockDim_y /
+              ::Kokkos::Experimental::Impl::HIPTraits::WarpSize);
+      if (hipThreadIdx_x + hipThreadIdx_y == 0)
+        *result = *shared_team_buffer_element;
+    }
+  }
+
+  __device__ static inline bool scalar_inter_block_reduction(
+      FunctorType const& functor,
+      ::Kokkos::Experimental::HIP::size_type const /*block_id*/,
+      ::Kokkos::Experimental::HIP::size_type const block_count,
+      ::Kokkos::Experimental::HIP::size_type* const shared_data,
+      ::Kokkos::Experimental::HIP::size_type* const global_data,
+      ::Kokkos::Experimental::HIP::size_type* const global_flags) {
+    Scalar* const global_team_buffer_element =
+        reinterpret_cast<Scalar*>(global_data);
+    Scalar* const my_global_team_buffer_element =
+        global_team_buffer_element + hipBlockIdx_x;
+    Scalar* shared_team_buffer_elements =
+        reinterpret_cast<Scalar*>(shared_data);
+    Scalar value        = shared_team_buffer_elements[hipThreadIdx_y];
+    int shared_elements = (hipBlockDim_x * hipBlockDim_y) /
+                          ::Kokkos::Experimental::Impl::HIPTraits::WarpSize;
+    int global_elements = block_count;
+    __syncthreads();
+
+    // Do the scalar reduction inside each block
+    scalar_intra_block_reduction(functor, value, true,
+                                 my_global_team_buffer_element, shared_elements,
+                                 shared_team_buffer_elements);
+    __syncthreads();
+
+    // Use the last block that is done to do the do the reduction across the
+    // block
+    __shared__ unsigned int num_teams_done;
+    if (hipThreadIdx_x + hipThreadIdx_y == 0) {
+      __threadfence();
+      num_teams_done = Kokkos::atomic_fetch_add(global_flags, 1) + 1;
+    }
+    bool is_last_block = false;
+    // FIXME_HIP HIP does not support syncthreads_or. That's why we need to make
+    // num_teams_done __shared__
+    // if (__syncthreads_or(num_teams_done == hipGridDim_x)) {*/
+    __syncthreads();
+    if (num_teams_done == hipGridDim_x) {
+      is_last_block = true;
+      *global_flags = 0;
+      ValueInit::init(functor, &value);
+      for (int i = hipThreadIdx_y * hipBlockDim_x + hipThreadIdx_x;
+           i < global_elements; i += hipBlockDim_x * hipBlockDim_y) {
+        ValueJoin::join(functor, &value, &global_team_buffer_element[i]);
+      }
+      scalar_intra_block_reduction(
+          functor, value, false,
+          shared_team_buffer_elements + (hipBlockDim_y - 1), shared_elements,
+          shared_team_buffer_elements);
+    }
+
+    return is_last_block;
+  }
+};
+
+//----------------------------------------------------------------------------
+/*
+ *  Algorithmic constraints:
+ *   (a) hipBlockDim_y is a power of two
+ *   (b) hipBlockDim_y <= 1024
+ *   (c) hipBlockDim_x == hipBlockDim_z == 1
+ */
+
+template <bool DoScan, class FunctorType, class ArgTag>
+__device__ void hip_intra_block_reduce_scan(
+    FunctorType const& functor,
+    typename FunctorValueTraits<FunctorType, ArgTag>::pointer_type const
+        base_data) {
+  using ValueTraits = FunctorValueTraits<FunctorType, ArgTag>;
+  using ValueJoin   = FunctorValueJoin<FunctorType, ArgTag>;
+
+  using pointer_type = typename ValueTraits::pointer_type;
+
+  unsigned int const value_count   = ValueTraits::value_count(functor);
+  unsigned int const BlockSizeMask = hipBlockDim_y - 1;
+  int const WarpMask = Experimental::Impl::HIPTraits::WarpSize - 1;
+
+  // Must have power of two thread count
+  if ((hipBlockDim_y - 1) & hipBlockDim_y) {
+    Kokkos::abort(
+        "HIP::hip_intra_block_reduce_scan requires power-of-two "
+        "hipBlockDim_y\n");
+  }
+
+  auto block_reduce_step =
+      [&functor, value_count](int const R, pointer_type const TD, int const S) {
+        if (R > ((1 << S) - 1)) {
+          ValueJoin::join(functor, TD, (TD - (value_count << S)));
+        }
+      };
+
+  {  // Intra-warp reduction:
+    const unsigned rtid_intra      = hipThreadIdx_y & WarpMask;
+    const pointer_type tdata_intra = base_data + value_count * hipThreadIdx_y;
+
+    block_reduce_step(rtid_intra, tdata_intra, 0);
+    block_reduce_step(rtid_intra, tdata_intra, 1);
+    block_reduce_step(rtid_intra, tdata_intra, 2);
+    block_reduce_step(rtid_intra, tdata_intra, 3);
+    block_reduce_step(rtid_intra, tdata_intra, 4);
+    block_reduce_step(rtid_intra, tdata_intra, 5);
+  }
+
+  __syncthreads();  // Wait for all warps to reduce
+
+  {  // Inter-warp reduce-scan by a single warp to avoid extra synchronizations
+    unsigned int const rtid_inter =
+        ((hipThreadIdx_y + 1)
+         << Experimental::Impl::HIPTraits::WarpIndexShift) -
+        1;
+
+    if (rtid_inter < hipBlockDim_y) {
+      pointer_type const tdata_inter = base_data + value_count * rtid_inter;
+
+      if ((1 << 6) < BlockSizeMask) {
+        block_reduce_step(rtid_inter, tdata_inter, 6);
+      }
+      if ((1 << 7) < BlockSizeMask) {
+        block_reduce_step(rtid_inter, tdata_inter, 7);
+      }
+      if ((1 << 8) < BlockSizeMask) {
+        block_reduce_step(rtid_inter, tdata_inter, 8);
+      }
+      if ((1 << 9) < BlockSizeMask) {
+        block_reduce_step(rtid_inter, tdata_inter, 9);
+      }
+      if ((1 << 10) < BlockSizeMask) {
+        block_reduce_step(rtid_inter, tdata_inter, 10);
+      }
+    }
+  }
+
+  __syncthreads();  // Wait for inter-warp reduce-scan to complete
+
+  if (DoScan) {
+    // Update all the values for the respective warps (except for the last one)
+    // by adding from the last value of the previous warp.
+    if (hipThreadIdx_y >= Experimental::Impl::HIPTraits::WarpSize &&
+        (hipThreadIdx_y & WarpMask) !=
+            Experimental::Impl::HIPTraits::WarpSize - 1) {
+      const int offset_to_previous_warp_total =
+          (hipThreadIdx_y & (~WarpMask)) - 1;
+      ValueJoin::join(functor, base_data + value_count * hipThreadIdx_y,
+                      base_data + value_count * offset_to_previous_warp_total);
+    }
+  }
+}
+
+//----------------------------------------------------------------------------
+/**\brief  Input value-per-thread starting at 'shared_data'.
+ *         Reduction value at last thread's location.
+ *
+ *  If 'DoScan' then write blocks' scan values and block-groups' scan values.
+ *
+ *  Global reduce result is in the last threads' 'shared_data' location.
+ */
+
+template <bool DoScan, class FunctorType, class ArgTag>
+__device__ bool hip_single_inter_block_reduce_scan2(
+    FunctorType const& functor,
+    ::Kokkos::Experimental::HIP::size_type const block_id,
+    ::Kokkos::Experimental::HIP::size_type const block_count,
+    ::Kokkos::Experimental::HIP::size_type* const shared_data,
+    ::Kokkos::Experimental::HIP::size_type* const global_data,
+    ::Kokkos::Experimental::HIP::size_type* const global_flags) {
+  using size_type   = ::Kokkos::Experimental::HIP::size_type;
+  using ValueTraits = FunctorValueTraits<FunctorType, ArgTag>;
+  using ValueJoin   = FunctorValueJoin<FunctorType, ArgTag>;
+  using ValueInit   = FunctorValueInit<FunctorType, ArgTag>;
+  using ValueOps    = FunctorValueOps<FunctorType, ArgTag>;
+
+  using pointer_type = typename ValueTraits::pointer_type;
+
+  // '__ffs' = position of the least significant bit set to 1.
+  // 'hipBlockDim_y' is guaranteed to be a power of two so this
+  // is the integral shift value that can replace an integral divide.
+  unsigned int const BlockSizeShift = __ffs(hipBlockDim_y) - 1;
+  unsigned int const BlockSizeMask  = hipBlockDim_y - 1;
+
+  // Must have power of two thread count
+  if (BlockSizeMask & hipBlockDim_y) {
+    Kokkos::abort(
+        "HIP::hip_single_inter_block_reduce_scan requires power-of-two "
+        "blockDim");
+  }
+
+  integral_nonzero_constant<size_type, ValueTraits::StaticValueSize /
+                                           sizeof(size_type)> const
+      word_count(ValueTraits::value_size(functor) / sizeof(size_type));
+
+  // Reduce the accumulation for the entire block.
+  hip_intra_block_reduce_scan<false, FunctorType, ArgTag>(
+      functor, pointer_type(shared_data));
+
+  {
+    // Write accumulation total to global scratch space.
+    // Accumulation total is the last thread's data.
+    size_type* const shared = shared_data + word_count.value * BlockSizeMask;
+    size_type* const global = global_data + word_count.value * block_id;
+
+    for (size_t i = hipThreadIdx_y; i < word_count.value; i += hipBlockDim_y) {
+      global[i] = shared[i];
+    }
+  }
+
+  // Contributing blocks note that their contribution has been completed via an
+  // atomic-increment flag If this block is not the last block to contribute to
+  // this group then the block is done.
+  // FIXME_HIP __syncthreads_or is not supported by HIP yet.
+  // const bool is_last_block = !__syncthreads_or(
+  //    threadIdx.y
+  //        ? 0
+  //        : (1 + atomicInc(global_flags, block_count - 1) < block_count));
+  __shared__ int n_done;
+  n_done = 0;
+  __syncthreads();
+  if (hipThreadIdx_y == 0) {
+    __threadfence();
+    n_done = 1 + atomicInc(global_flags, block_count - 1);
+  }
+  __syncthreads();
+  bool const is_last_block = (n_done == static_cast<int>(block_count));
+
+  if (is_last_block) {
+    size_type const b = (static_cast<long long int>(block_count) *
+                         static_cast<long long int>(hipThreadIdx_y)) >>
+                        BlockSizeShift;
+    size_type const e = (static_cast<long long int>(block_count) *
+                         static_cast<long long int>(hipThreadIdx_y + 1)) >>
+                        BlockSizeShift;
+
+    {
+      void* const shared_ptr = shared_data + word_count.value * hipThreadIdx_y;
+      /* reference_type shared_value = */ ValueInit::init(functor, shared_ptr);
+
+      for (size_type i = b; i < e; ++i) {
+        ValueJoin::join(functor, shared_ptr,
+                        global_data + word_count.value * i);
+      }
+    }
+
+    hip_intra_block_reduce_scan<DoScan, FunctorType, ArgTag>(
+        functor, pointer_type(shared_data));
+
+    if (DoScan) {
+      size_type* const shared_value =
+          shared_data + word_count.value * (hipThreadIdx_y ? hipThreadIdx_y - 1
+                                                           : hipBlockDim_y);
+
+      if (!hipThreadIdx_y) {
+        ValueInit::init(functor, shared_value);
+      }
+
+      // Join previous inclusive scan value to each member
+      for (size_type i = b; i < e; ++i) {
+        size_type* const global_value = global_data + word_count.value * i;
+        ValueJoin::join(functor, shared_value, global_value);
+        ValueOps::copy(functor, global_value, shared_value);
+      }
+    }
+  }
+
+  return is_last_block;
+}
+
+template <bool DoScan, typename FunctorType, typename ArgTag>
+__device__ bool hip_single_inter_block_reduce_scan(
+    FunctorType const& functor,
+    ::Kokkos::Experimental::HIP::size_type const block_id,
+    ::Kokkos::Experimental::HIP::size_type const block_count,
+    ::Kokkos::Experimental::HIP::size_type* const shared_data,
+    ::Kokkos::Experimental::HIP::size_type* const global_data,
+    ::Kokkos::Experimental::HIP::size_type* const global_flags) {
+  using ValueTraits = FunctorValueTraits<FunctorType, ArgTag>;
+  if (!DoScan && /*FIXME*/ (bool)ValueTraits::StaticValueSize)
+    // FIXME_HIP For now we don't use shuffle
+    // return Kokkos::Impl::HIPReductionsFunctor<
+    //    FunctorType, ArgTag, false, (ValueTraits::StaticValueSize > 16)>::
+    //    scalar_inter_block_reduction(functor, block_id, block_count,
+    //                                 shared_data, global_data, global_flags);
+    return Kokkos::Impl::HIPReductionsFunctor<
+        FunctorType, ArgTag, false,
+        false>::scalar_inter_block_reduction(functor, block_id, block_count,
+                                             shared_data, global_data,
+                                             global_flags);
+  else {
+    return hip_single_inter_block_reduce_scan2<DoScan, FunctorType, ArgTag>(
+        functor, block_id, block_count, shared_data, global_data, global_flags);
+  }
+}
+
+// Size in bytes required for inter block reduce or scan
+template <bool DoScan, class FunctorType, class ArgTag>
+inline unsigned hip_single_inter_block_reduce_scan_shmem(
+    const FunctorType& functor, const unsigned BlockSize) {
+  return (BlockSize + 2) *
+         Impl::FunctorValueTraits<FunctorType, ArgTag>::value_size(functor);
+}
+
+}  // namespace Impl
+}  // namespace Kokkos
+
+#endif
+
+#endif
diff --git a/kokkos/core/src/HIP/Kokkos_HIP_Space.cpp b/kokkos/core/src/HIP/Kokkos_HIP_Space.cpp
new file mode 100644
index 000000000..2dca7f13c
--- /dev/null
+++ b/kokkos/core/src/HIP/Kokkos_HIP_Space.cpp
@@ -0,0 +1,636 @@
+/*
+//@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
+*/
+
+#include <stdlib.h>
+#include <iostream>
+#include <sstream>
+#include <stdexcept>
+#include <algorithm>
+#include <atomic>
+#include <Kokkos_Macros.hpp>
+
+#include <Kokkos_Core.hpp>
+#include <Kokkos_HIP.hpp>
+#include <Kokkos_HIP_Space.hpp>
+
+#include <impl/Kokkos_Error.hpp>
+#include <impl/Kokkos_MemorySpace.hpp>
+
+/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*/
+namespace Kokkos {
+namespace Impl {
+
+namespace {
+hipStream_t get_deep_copy_stream() {
+  static hipStream_t s = 0;
+  if (s == 0) {
+    HIP_SAFE_CALL(hipStreamCreate(&s));
+  }
+  return s;
+}
+}  // namespace
+
+DeepCopy<Kokkos::Experimental::HIPSpace, Kokkos::Experimental::HIPSpace,
+         Kokkos::Experimental::HIP>::DeepCopy(void* dst, const void* src,
+                                              size_t n) {
+  HIP_SAFE_CALL(hipMemcpy(dst, src, n, hipMemcpyDefault));
+}
+
+DeepCopy<HostSpace, Kokkos::Experimental::HIPSpace,
+         Kokkos::Experimental::HIP>::DeepCopy(void* dst, const void* src,
+                                              size_t n) {
+  HIP_SAFE_CALL(hipMemcpy(dst, src, n, hipMemcpyDefault));
+}
+
+DeepCopy<Kokkos::Experimental::HIPSpace, HostSpace,
+         Kokkos::Experimental::HIP>::DeepCopy(void* dst, const void* src,
+                                              size_t n) {
+  HIP_SAFE_CALL(hipMemcpy(dst, src, n, hipMemcpyDefault));
+}
+
+DeepCopy<Kokkos::Experimental::HIPSpace, Kokkos::Experimental::HIPSpace,
+         Kokkos::Experimental::HIP>::DeepCopy(const Kokkos::Experimental::HIP&
+                                              /*instance*/,
+                                              void* dst, const void* src,
+                                              size_t n) {
+  // FIXME_HIP use instance
+  HIP_SAFE_CALL(hipMemcpy(dst, src, n, hipMemcpyDefault));
+}
+
+DeepCopy<HostSpace, Kokkos::Experimental::HIPSpace, Kokkos::Experimental::HIP>::
+    DeepCopy(const Kokkos::Experimental::HIP& /*instance*/, void* dst,
+             const void* src, size_t n) {
+  // FIXME_HIP use instance
+  HIP_SAFE_CALL(hipMemcpy(dst, src, n, hipMemcpyDefault));
+}
+
+DeepCopy<Kokkos::Experimental::HIPSpace, HostSpace, Kokkos::Experimental::HIP>::
+    DeepCopy(const Kokkos::Experimental::HIP& /*instance*/, void* dst,
+             const void* src, size_t n) {
+  // FIXME_HIP use instance
+  HIP_SAFE_CALL(hipMemcpy(dst, src, n, hipMemcpyDefault));
+}
+
+DeepCopy<Kokkos::Experimental::HIPHostPinnedSpace,
+         Kokkos::Experimental::HIPHostPinnedSpace,
+         Kokkos::Experimental::HIP>::DeepCopy(void* dst, const void* src,
+                                              size_t n) {
+  HIP_SAFE_CALL(hipMemcpy(dst, src, n, hipMemcpyDefault));
+}
+
+DeepCopy<HostSpace, Kokkos::Experimental::HIPHostPinnedSpace,
+         Kokkos::Experimental::HIP>::DeepCopy(void* dst, const void* src,
+                                              size_t n) {
+  HIP_SAFE_CALL(hipMemcpy(dst, src, n, hipMemcpyDefault));
+}
+
+DeepCopy<Kokkos::Experimental::HIPHostPinnedSpace, HostSpace,
+         Kokkos::Experimental::HIP>::DeepCopy(void* dst, const void* src,
+                                              size_t n) {
+  HIP_SAFE_CALL(hipMemcpy(dst, src, n, hipMemcpyDefault));
+}
+
+DeepCopy<Kokkos::Experimental::HIPHostPinnedSpace,
+         Kokkos::Experimental::HIPHostPinnedSpace, Kokkos::Experimental::HIP>::
+    DeepCopy(const Kokkos::Experimental::HIP& /*instance*/, void* dst,
+             const void* src, size_t n) {
+  // FIXME_HIP use instance
+  HIP_SAFE_CALL(hipMemcpy(dst, src, n, hipMemcpyDefault));
+}
+
+DeepCopy<HostSpace, Kokkos::Experimental::HIPHostPinnedSpace,
+         Kokkos::Experimental::HIP>::DeepCopy(const Kokkos::Experimental::HIP&
+                                              /*instance*/,
+                                              void* dst, const void* src,
+                                              size_t n) {
+  // FIXME_HIP use instance
+  HIP_SAFE_CALL(hipMemcpy(dst, src, n, hipMemcpyDefault));
+}
+
+DeepCopy<Kokkos::Experimental::HIPHostPinnedSpace, HostSpace,
+         Kokkos::Experimental::HIP>::DeepCopy(const Kokkos::Experimental::HIP&
+                                              /*instance*/,
+                                              void* dst, const void* src,
+                                              size_t n) {
+  // FIXME_HIP use instance
+  HIP_SAFE_CALL(hipMemcpy(dst, src, n, hipMemcpyDefault));
+}
+
+void DeepCopyAsyncHIP(void* dst, void const* src, size_t n) {
+  hipStream_t s = get_deep_copy_stream();
+  HIP_SAFE_CALL(hipMemcpyAsync(dst, src, n, hipMemcpyDefault, s));
+  hipStreamSynchronize(s);
+}
+
+}  // namespace Impl
+}  // namespace Kokkos
+
+/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*/
+
+namespace Kokkos {
+
+void Experimental::HIPSpace::access_error() {
+  const std::string msg(
+      "Kokkos::Experimental::HIPSpace::access_error attempt to execute "
+      "Experimental::HIP function from non-HIP space");
+  Kokkos::Impl::throw_runtime_exception(msg);
+}
+
+void Experimental::HIPSpace::access_error(const void* const) {
+  const std::string msg(
+      "Kokkos::Experimental::HIPSpace::access_error attempt to execute "
+      "Experimental::HIP function from non-HIP space");
+  Kokkos::Impl::throw_runtime_exception(msg);
+}
+
+}  // namespace Kokkos
+
+/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*/
+
+namespace Kokkos {
+namespace Experimental {
+
+HIPSpace::HIPSpace() : m_device(HIP().hip_device()) {}
+
+HIPHostPinnedSpace::HIPHostPinnedSpace() {}
+
+void* HIPSpace::allocate(const size_t arg_alloc_size) const {
+  void* ptr = nullptr;
+
+  auto const error_code = hipMalloc(&ptr, arg_alloc_size);
+  if (error_code != hipSuccess) {
+    hipGetLastError();  // This is the only way to clear the last error, which
+                        // we should do here since we're turning it into an
+                        // exception here
+    throw HIPRawMemoryAllocationFailure(
+        arg_alloc_size, error_code,
+        RawMemoryAllocationFailure::AllocationMechanism::HIPMalloc);
+  }
+
+  return ptr;
+}
+
+void* HIPHostPinnedSpace::allocate(const size_t arg_alloc_size) const {
+  void* ptr = nullptr;
+
+  auto const error_code = hipHostMalloc(&ptr, arg_alloc_size);
+  if (error_code != hipSuccess) {
+    hipGetLastError();  // This is the only way to clear the last error, which
+                        // we should do here since we're turning it into an
+                        // exception here
+    throw HIPRawMemoryAllocationFailure(
+        arg_alloc_size, error_code,
+        RawMemoryAllocationFailure::AllocationMechanism::HIPHostMalloc);
+  }
+
+  return ptr;
+}
+
+void HIPSpace::deallocate(void* const arg_alloc_ptr,
+                          const size_t /* arg_alloc_size */) const {
+  HIP_SAFE_CALL(hipFree(arg_alloc_ptr));
+}
+
+void HIPHostPinnedSpace::deallocate(void* const arg_alloc_ptr,
+                                    const size_t /* arg_alloc_size */) const {
+  HIP_SAFE_CALL(hipHostFree(arg_alloc_ptr));
+}
+
+}  // namespace Experimental
+}  // namespace Kokkos
+
+//----------------------------------------------------------------------------
+//----------------------------------------------------------------------------
+
+namespace Kokkos {
+namespace Impl {
+
+#ifdef KOKKOS_DEBUG
+SharedAllocationRecord<void, void>
+    SharedAllocationRecord<Kokkos::Experimental::HIPSpace, void>::s_root_record;
+
+SharedAllocationRecord<void, void> SharedAllocationRecord<
+    Kokkos::Experimental::HIPHostPinnedSpace, void>::s_root_record;
+#endif
+
+std::string SharedAllocationRecord<Kokkos::Experimental::HIPSpace,
+                                   void>::get_label() const {
+  SharedAllocationHeader header;
+
+  Kokkos::Impl::DeepCopy<Kokkos::HostSpace, Kokkos::Experimental::HIPSpace>(
+      &header, RecordBase::head(), sizeof(SharedAllocationHeader));
+
+  return std::string(header.m_label);
+}
+
+std::string SharedAllocationRecord<Kokkos::Experimental::HIPHostPinnedSpace,
+                                   void>::get_label() const {
+  return std::string(RecordBase::head()->m_label);
+}
+
+SharedAllocationRecord<Kokkos::Experimental::HIPSpace, void>*
+SharedAllocationRecord<Kokkos::Experimental::HIPSpace, void>::allocate(
+    const Kokkos::Experimental::HIPSpace& arg_space,
+    const std::string& arg_label, const size_t arg_alloc_size) {
+  return new SharedAllocationRecord(arg_space, arg_label, arg_alloc_size);
+}
+
+SharedAllocationRecord<Kokkos::Experimental::HIPHostPinnedSpace, void>*
+SharedAllocationRecord<Kokkos::Experimental::HIPHostPinnedSpace, void>::
+    allocate(const Kokkos::Experimental::HIPHostPinnedSpace& arg_space,
+             const std::string& arg_label, const size_t arg_alloc_size) {
+  return new SharedAllocationRecord(arg_space, arg_label, arg_alloc_size);
+}
+
+void SharedAllocationRecord<Kokkos::Experimental::HIPSpace, void>::deallocate(
+    SharedAllocationRecord<void, void>* arg_rec) {
+  delete static_cast<SharedAllocationRecord*>(arg_rec);
+}
+
+void SharedAllocationRecord<Kokkos::Experimental::HIPHostPinnedSpace, void>::
+    deallocate(SharedAllocationRecord<void, void>* arg_rec) {
+  delete static_cast<SharedAllocationRecord*>(arg_rec);
+}
+
+SharedAllocationRecord<Kokkos::Experimental::HIPSpace,
+                       void>::~SharedAllocationRecord() {
+#if defined(KOKKOS_ENABLE_PROFILING)
+  if (Kokkos::Profiling::profileLibraryLoaded()) {
+    SharedAllocationHeader header;
+    Kokkos::Impl::DeepCopy<Kokkos::Experimental::HIPSpace, HostSpace>(
+        &header, RecordBase::m_alloc_ptr, sizeof(SharedAllocationHeader));
+
+    Kokkos::Profiling::deallocateData(
+        Kokkos::Profiling::SpaceHandle(Kokkos::Experimental::HIPSpace::name()),
+        header.m_label, data(), size());
+  }
+#endif
+
+  m_space.deallocate(SharedAllocationRecord<void, void>::m_alloc_ptr,
+                     SharedAllocationRecord<void, void>::m_alloc_size);
+}
+
+SharedAllocationRecord<Kokkos::Experimental::HIPHostPinnedSpace,
+                       void>::~SharedAllocationRecord() {
+#if defined(KOKKOS_ENABLE_PROFILING)
+  if (Kokkos::Profiling::profileLibraryLoaded()) {
+    Kokkos::Profiling::deallocateData(
+        Kokkos::Profiling::SpaceHandle(
+            Kokkos::Experimental::HIPHostPinnedSpace::name()),
+        RecordBase::m_alloc_ptr->m_label, data(), size());
+  }
+#endif
+
+  m_space.deallocate(SharedAllocationRecord<void, void>::m_alloc_ptr,
+                     SharedAllocationRecord<void, void>::m_alloc_size);
+}
+
+SharedAllocationRecord<Kokkos::Experimental::HIPSpace, void>::
+    SharedAllocationRecord(
+        const Kokkos::Experimental::HIPSpace& arg_space,
+        const std::string& arg_label, const size_t arg_alloc_size,
+        const SharedAllocationRecord<void, void>::function_type arg_dealloc)
+    // Pass through allocated [ SharedAllocationHeader , user_memory ]
+    // Pass through deallocation function
+    : SharedAllocationRecord<void, void>(
+#ifdef KOKKOS_DEBUG
+          &SharedAllocationRecord<Kokkos::Experimental::HIPSpace,
+                                  void>::s_root_record,
+#endif
+          Kokkos::Impl::checked_allocation_with_header(arg_space, arg_label,
+                                                       arg_alloc_size),
+          sizeof(SharedAllocationHeader) + arg_alloc_size, arg_dealloc),
+      m_space(arg_space) {
+#if defined(KOKKOS_ENABLE_PROFILING)
+  if (Kokkos::Profiling::profileLibraryLoaded()) {
+    Kokkos::Profiling::allocateData(
+        Kokkos::Profiling::SpaceHandle(arg_space.name()), arg_label, data(),
+        arg_alloc_size);
+  }
+#endif
+
+  SharedAllocationHeader header;
+
+  // Fill in the Header information
+  header.m_record = static_cast<SharedAllocationRecord<void, void>*>(this);
+
+  strncpy(header.m_label, arg_label.c_str(),
+          SharedAllocationHeader::maximum_label_length);
+  // Set last element zero, in case c_str is too long
+  header.m_label[SharedAllocationHeader::maximum_label_length - 1] = (char)0;
+
+  // Copy to device memory
+  Kokkos::Impl::DeepCopy<Kokkos::Experimental::HIPSpace, HostSpace>(
+      RecordBase::m_alloc_ptr, &header, sizeof(SharedAllocationHeader));
+}
+
+SharedAllocationRecord<Kokkos::Experimental::HIPHostPinnedSpace, void>::
+    SharedAllocationRecord(
+        const Kokkos::Experimental::HIPHostPinnedSpace& arg_space,
+        const std::string& arg_label, const size_t arg_alloc_size,
+        const SharedAllocationRecord<void, void>::function_type arg_dealloc)
+    // Pass through allocated [ SharedAllocationHeader , user_memory ]
+    // Pass through deallocation function
+    : SharedAllocationRecord<void, void>(
+#ifdef KOKKOS_DEBUG
+          &SharedAllocationRecord<Kokkos::Experimental::HIPHostPinnedSpace,
+                                  void>::s_root_record,
+#endif
+          Kokkos::Impl::checked_allocation_with_header(arg_space, arg_label,
+                                                       arg_alloc_size),
+          sizeof(SharedAllocationHeader) + arg_alloc_size, arg_dealloc),
+      m_space(arg_space) {
+#if defined(KOKKOS_ENABLE_PROFILING)
+  if (Kokkos::Profiling::profileLibraryLoaded()) {
+    Kokkos::Profiling::allocateData(
+        Kokkos::Profiling::SpaceHandle(arg_space.name()), arg_label, data(),
+        arg_alloc_size);
+  }
+#endif
+  // Fill in the Header information, directly accessible via host pinned memory
+
+  RecordBase::m_alloc_ptr->m_record = this;
+
+  strncpy(RecordBase::m_alloc_ptr->m_label, arg_label.c_str(),
+          SharedAllocationHeader::maximum_label_length);
+  // Set last element zero, in case c_str is too long
+  RecordBase::m_alloc_ptr
+      ->m_label[SharedAllocationHeader::maximum_label_length - 1] = (char)0;
+}
+
+//----------------------------------------------------------------------------
+
+void* SharedAllocationRecord<Kokkos::Experimental::HIPSpace, void>::
+    allocate_tracked(const Kokkos::Experimental::HIPSpace& arg_space,
+                     const std::string& arg_alloc_label,
+                     const size_t arg_alloc_size) {
+  if (!arg_alloc_size) return (void*)0;
+
+  SharedAllocationRecord* const r =
+      allocate(arg_space, arg_alloc_label, arg_alloc_size);
+
+  RecordBase::increment(r);
+
+  return r->data();
+}
+
+void SharedAllocationRecord<Kokkos::Experimental::HIPSpace,
+                            void>::deallocate_tracked(void* const
+                                                          arg_alloc_ptr) {
+  if (arg_alloc_ptr != 0) {
+    SharedAllocationRecord* const r = get_record(arg_alloc_ptr);
+
+    RecordBase::decrement(r);
+  }
+}
+
+void* SharedAllocationRecord<Kokkos::Experimental::HIPSpace, void>::
+    reallocate_tracked(void* const arg_alloc_ptr, const size_t arg_alloc_size) {
+  SharedAllocationRecord* const r_old = get_record(arg_alloc_ptr);
+  SharedAllocationRecord* const r_new =
+      allocate(r_old->m_space, r_old->get_label(), arg_alloc_size);
+
+  Kokkos::Impl::DeepCopy<Kokkos::Experimental::HIPSpace,
+                         Kokkos::Experimental::HIPSpace>(
+      r_new->data(), r_old->data(), std::min(r_old->size(), r_new->size()));
+
+  RecordBase::increment(r_new);
+  RecordBase::decrement(r_old);
+
+  return r_new->data();
+}
+
+//----------------------------------------------------------------------------
+
+SharedAllocationRecord<Kokkos::Experimental::HIPSpace, void>*
+SharedAllocationRecord<Kokkos::Experimental::HIPSpace, void>::get_record(
+    void* alloc_ptr) {
+  using Header = SharedAllocationHeader;
+  using RecordHIP =
+      SharedAllocationRecord<Kokkos::Experimental::HIPSpace, void>;
+
+  // Copy the header from the allocation
+  Header head;
+
+  Header const* const head_hip =
+      alloc_ptr ? Header::get_header(alloc_ptr) : (Header*)0;
+
+  if (alloc_ptr) {
+    Kokkos::Impl::DeepCopy<HostSpace, Kokkos::Experimental::HIPSpace>(
+        &head, head_hip, sizeof(SharedAllocationHeader));
+  }
+
+  RecordHIP* const record =
+      alloc_ptr ? static_cast<RecordHIP*>(head.m_record) : (RecordHIP*)0;
+
+  if (!alloc_ptr || record->m_alloc_ptr != head_hip) {
+    Kokkos::Impl::throw_runtime_exception(std::string(
+        "Kokkos::Impl::SharedAllocationRecord< Kokkos::Experimental::HIPSpace "
+        ", void >::get_record ERROR"));
+  }
+
+  return record;
+}
+
+// Iterate records to print orphaned memory ...
+void SharedAllocationRecord<Kokkos::Experimental::HIPSpace, void>::
+    print_records(std::ostream& s, const Kokkos::Experimental::HIPSpace& space,
+                  bool detail) {
+#ifdef KOKKOS_DEBUG
+  SharedAllocationRecord<void, void>* r = &s_root_record;
+
+  char buffer[256];
+
+  SharedAllocationHeader head;
+
+  if (detail) {
+    do {
+      if (r->m_alloc_ptr) {
+        Kokkos::Impl::DeepCopy<HostSpace, Kokkos::Experimental::HIPSpace>(
+            &head, r->m_alloc_ptr, sizeof(SharedAllocationHeader));
+      } else {
+        head.m_label[0] = 0;
+      }
+
+      // Formatting dependent on sizeof(uintptr_t)
+      const char* format_string;
+
+      if (sizeof(uintptr_t) == sizeof(unsigned long)) {
+        format_string =
+            "HIP addr( 0x%.12lx ) list( 0x%.12lx 0x%.12lx ) extent[ 0x%.12lx + "
+            "%.8ld ] count(%d) dealloc(0x%.12lx) %s\n";
+      } else if (sizeof(uintptr_t) == sizeof(unsigned long long)) {
+        format_string =
+            "HIP addr( 0x%.12llx ) list( 0x%.12llx 0x%.12llx ) extent[ "
+            "0x%.12llx + %.8ld ] count(%d) dealloc(0x%.12llx) %s\n";
+      }
+
+      snprintf(buffer, 256, format_string, reinterpret_cast<uintptr_t>(r),
+               reinterpret_cast<uintptr_t>(r->m_prev),
+               reinterpret_cast<uintptr_t>(r->m_next),
+               reinterpret_cast<uintptr_t>(r->m_alloc_ptr), r->m_alloc_size,
+               r->m_count, reinterpret_cast<uintptr_t>(r->m_dealloc),
+               head.m_label);
+      std::cout << buffer;
+      r = r->m_next;
+    } while (r != &s_root_record);
+  } else {
+    do {
+      if (r->m_alloc_ptr) {
+        Kokkos::Impl::DeepCopy<HostSpace, Kokkos::Experimental::HIPSpace>(
+            &head, r->m_alloc_ptr, sizeof(SharedAllocationHeader));
+
+        // Formatting dependent on sizeof(uintptr_t)
+        const char* format_string;
+
+        if (sizeof(uintptr_t) == sizeof(unsigned long)) {
+          format_string = "HIP [ 0x%.12lx + %ld ] %s\n";
+        } else if (sizeof(uintptr_t) == sizeof(unsigned long long)) {
+          format_string = "HIP [ 0x%.12llx + %ld ] %s\n";
+        }
+
+        snprintf(buffer, 256, format_string,
+                 reinterpret_cast<uintptr_t>(r->data()), r->size(),
+                 head.m_label);
+      } else {
+        snprintf(buffer, 256, "HIP [ 0 + 0 ]\n");
+      }
+      std::cout << buffer;
+      r = r->m_next;
+    } while (r != &s_root_record);
+  }
+#else
+  (void)s;
+  (void)space;
+  (void)detail;
+  throw_runtime_exception(
+      "Kokkos::Impl::SharedAllocationRecord<HIPSpace>::print_records"
+      " only works with KOKKOS_DEBUG enabled");
+#endif
+}
+
+/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*/
+
+void* hip_resize_scratch_space(size_t bytes, bool force_shrink) {
+  static void* ptr           = NULL;
+  static size_t current_size = 0;
+  if (current_size == 0) {
+    current_size = bytes;
+    ptr          = Kokkos::kokkos_malloc<Kokkos::Experimental::HIPSpace>(
+        "HIPSpace::ScratchMemory", current_size);
+  }
+  if (bytes > current_size) {
+    current_size = bytes;
+    ptr          = Kokkos::kokkos_realloc<Kokkos::Experimental::HIPSpace>(ptr,
+                                                                 current_size);
+  }
+  if ((bytes < current_size) && (force_shrink)) {
+    current_size = bytes;
+    Kokkos::kokkos_free<Kokkos::Experimental::HIPSpace>(ptr);
+    ptr = Kokkos::kokkos_malloc<Kokkos::Experimental::HIPSpace>(
+        "HIPSpace::ScratchMemory", current_size);
+  }
+  return ptr;
+}
+
+}  // namespace Impl
+}  // namespace Kokkos
+
+/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*/
+namespace Kokkos {
+namespace Experimental {
+
+// HIP::size_type HIP::detect_device_count()
+//{ return Impl::HIPInternalDevices::singleton().m_hipDevCount ; }
+
+int HIP::concurrency() {
+  // FIXME_HIP
+  // MI60: ThreadsPerComputeUnit*ComputeUnits/ShaderEngine*ShaderEngines)
+  return 2536 * 16 * 4;
+}
+int HIP::impl_is_initialized() {
+  return Impl::HIPInternal::singleton().is_initialized();
+}
+
+void HIP::impl_initialize(const HIP::SelectDevice config) {
+  Impl::HIPInternal::singleton().initialize(config.hip_device_id);
+
+#if defined(KOKKOS_ENABLE_PROFILING)
+  Kokkos::Profiling::initialize();
+#endif
+}
+
+void HIP::impl_finalize() {
+  Impl::HIPInternal::singleton().finalize();
+
+#if defined(KOKKOS_ENABLE_PROFILING)
+  Kokkos::Profiling::finalize();
+#endif
+}
+
+HIP::HIP() : m_space_instance(&Impl::HIPInternal::singleton()) {
+  Impl::HIPInternal::singleton().verify_is_initialized(
+      "HIP instance constructor");
+}
+
+// HIP::HIP( const int instance_id )
+//  : m_device( Impl::HIPInternal::singleton().m_hipDev )
+//{}
+
+void HIP::print_configuration(std::ostream& s, const bool) {
+  Impl::HIPInternal::singleton().print_configuration(s);
+}
+
+void HIP::fence() const { HIP_SAFE_CALL(hipDeviceSynchronize()); }
+
+int HIP::hip_device() const { return impl_internal_space_instance()->m_hipDev; }
+const char* HIP::name() { return "HIP"; }
+
+}  // namespace Experimental
+}  // namespace Kokkos
diff --git a/kokkos/core/src/HIP/Kokkos_HIP_Team.hpp b/kokkos/core/src/HIP/Kokkos_HIP_Team.hpp
new file mode 100644
index 000000000..b3c4f4609
--- /dev/null
+++ b/kokkos/core/src/HIP/Kokkos_HIP_Team.hpp
@@ -0,0 +1,1106 @@
+/*
+//@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
+*/
+
+#ifndef KOKKOS_HIP_TEAM_HPP
+#define KOKKOS_HIP_TEAM_HPP
+
+#include <Kokkos_Macros.hpp>
+
+#if defined(__HIPCC__)
+
+#include <utility>
+#include <Kokkos_Parallel.hpp>
+
+#include <HIP/Kokkos_HIP_KernelLaunch.hpp>
+#include <HIP/Kokkos_HIP_ReduceScan.hpp>
+#include <HIP/Kokkos_HIP_BlockSize_Deduction.hpp>
+#include <Kokkos_Vectorization.hpp>
+
+//----------------------------------------------------------------------------
+//----------------------------------------------------------------------------
+
+namespace Kokkos {
+namespace Impl {
+
+template <typename Type>
+struct HIPJoinFunctor {
+  typedef Type value_type;
+
+  KOKKOS_INLINE_FUNCTION
+  static void join(volatile value_type& update,
+                   volatile const value_type& input) {
+    update += input;
+  }
+};
+
+/**\brief  Team member_type passed to TeamPolicy or TeamTask closures.
+ *
+ *  HIP thread blocks for team closures are dimensioned as:
+ *    hipBlockDim_x == number of "vector lanes" per "thread"
+ *    hipBlockDim_y == number of "threads" per team
+ *    hipBlockDim_z == number of teams in a block
+ *  where
+ *    A set of teams exactly fill a warp OR a team is the whole block
+ *      ( 0 == WarpSize % ( hipBlockDim_x * hipBlockDim_y ) )
+ *      OR
+ *      ( 1 == hipBlockDim_z )
+
+ *  Thus when 1 < hipBlockDim_z the team is warp-synchronous
+ *  and __syncthreads should not be called in team collectives.
+ *
+ *  When multiple teams are mapped onto a single block then the
+ *  total available shared memory must be partitioned among teams.
+ */
+class HIPTeamMember {
+ public:
+  using execution_space      = Kokkos::Experimental::HIP;
+  using scratch_memory_space = execution_space::scratch_memory_space;
+
+ private:
+  mutable void* m_team_reduce;
+  scratch_memory_space m_team_shared;
+  int m_team_reduce_size;
+  int m_league_rank;
+  int m_league_size;
+
+ public:
+  KOKKOS_INLINE_FUNCTION
+  const execution_space::scratch_memory_space& team_shmem() const {
+    return m_team_shared.set_team_thread_mode(0, 1, 0);
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  const execution_space::scratch_memory_space& team_scratch(
+      const int& level) const {
+    return m_team_shared.set_team_thread_mode(level, 1, 0);
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  const execution_space::scratch_memory_space& thread_scratch(
+      const int& level) const {
+    return m_team_shared.set_team_thread_mode(level, team_size(), team_rank());
+  }
+
+  KOKKOS_INLINE_FUNCTION int league_rank() const { return m_league_rank; }
+  KOKKOS_INLINE_FUNCTION int league_size() const { return m_league_size; }
+  KOKKOS_INLINE_FUNCTION int team_rank() const {
+#ifdef __HIP_DEVICE_COMPILE__
+    return hipThreadIdx_y;
+#else
+    return 0;
+#endif
+  }
+
+  KOKKOS_INLINE_FUNCTION int team_size() const {
+#ifdef __HIP_DEVICE_COMPILE__
+    return hipBlockDim_y;
+#else
+    return 1;
+#endif
+  }
+
+  KOKKOS_INLINE_FUNCTION void team_barrier() const {
+#ifdef __HIP_DEVICE_COMPILE__
+    if (1 == hipBlockDim_z)
+      __syncthreads();  // team == block
+    else
+      __threadfence_block();  // team <= warp
+#endif
+  }
+
+  //--------------------------------------------------------------------------
+
+  template <class ValueType>
+  KOKKOS_INLINE_FUNCTION void team_broadcast(ValueType& val,
+                                             const int& thread_id) const {
+#ifdef __HIP_DEVICE_COMPILE__
+    if (1 == hipBlockDim_z) {  // team == block
+      __syncthreads();
+      // Wait for shared data write until all threads arrive here
+      if (hipThreadIdx_x == 0u &&
+          hipThreadIdx_y == static_cast<uint32_t>(thread_id)) {
+        *(reinterpret_cast<ValueType*>(m_team_reduce)) = val;
+      }
+      __syncthreads();  // Wait for shared data read until root thread writes
+      val = *(reinterpret_cast<ValueType*>(m_team_reduce));
+    } else {               // team <= warp
+      ValueType tmp(val);  // input might not be a register variable
+      ::Kokkos::Experimental::Impl::in_place_shfl(
+          val, tmp, hipBlockDim_x * thread_id, hipBlockDim_x * hipBlockDim_y);
+    }
+#else
+    (void)val;
+    (void)thread_id;
+#endif
+  }
+
+  template <class Closure, class ValueType>
+  KOKKOS_INLINE_FUNCTION void team_broadcast(Closure const& f, ValueType& val,
+                                             const int& thread_id) const {
+#ifdef __HIP_DEVICE_COMPILE__
+    f(val);
+
+    if (1 == hipBlockDim_z) {  // team == block
+      __syncthreads();
+      // Wait for shared data write until all threads arrive here
+      if (hipThreadIdx_x == 0u &&
+          hipThreadIdx_y == static_cast<uint32_t>(thread_id)) {
+        *(reinterpret_cast<ValueType*>(m_team_reduce)) = val;
+      }
+      __syncthreads();  // Wait for shared data read until root thread writes
+      val = *(reinterpret_cast<ValueType*>(m_team_reduce));
+    } else {               // team <= warp
+      ValueType tmp(val);  // input might not be a register variable
+      ::Kokkos::Experimental::Impl::in_place_shfl(
+          val, tmp, hipBlockDim_x * thread_id, hipBlockDim_x * hipBlockDim_y);
+    }
+#else
+    (void)f;
+    (void)val;
+    (void)thread_id;
+#endif
+  }
+
+  //--------------------------------------------------------------------------
+  /**\brief  Reduction across a team
+   *
+   *  Mapping of teams onto blocks:
+   *    hipBlockDim_x  is "vector lanes"
+   *    hipBlockDim_y  is team "threads"
+   *    hipBlockDim_z  is number of teams per block
+   *
+   *  Requires:
+   *    hipBlockDim_x is power two
+   *    hipBlockDim_x <= HIPTraits::WarpSize
+   *    ( 0 == HIPTraits::WarpSize % ( hipBlockDim_x * hipBlockDim_y )
+   *      OR
+   *    ( 1 == hipBlockDim_z )
+   */
+  template <typename ReducerType>
+  KOKKOS_INLINE_FUNCTION
+      typename std::enable_if<is_reducer<ReducerType>::value>::type
+      team_reduce(ReducerType const& reducer) const noexcept {
+    team_reduce(reducer, reducer.reference());
+  }
+
+  template <typename ReducerType>
+  KOKKOS_INLINE_FUNCTION
+      typename std::enable_if<is_reducer<ReducerType>::value>::type
+      team_reduce(ReducerType const& reducer,
+                  typename ReducerType::value_type& value) const noexcept {
+#ifdef __HIP_DEVICE_COMPILE__
+    hip_intra_block_reduction(reducer, value, hipBlockDim_y);
+#else
+    (void)reducer;
+    (void)value;
+#endif
+  }
+
+  //--------------------------------------------------------------------------
+  /** \brief  Intra-team exclusive prefix sum with team_rank() ordering
+   *          with intra-team non-deterministic ordering accumulation.
+   *
+   *  The global inter-team accumulation value will, at the end of the
+   *  league's parallel execution, be the scan's total.
+   *  Parallel execution ordering of the league's teams is non-deterministic.
+   *  As such the base value for each team's scan operation is similarly
+   *  non-deterministic.
+   */
+  template <typename Type>
+  KOKKOS_INLINE_FUNCTION Type team_scan(const Type& value,
+                                        Type* const global_accum) const {
+#ifdef __HIP_DEVICE_COMPILE__
+    Type* const base_data = reinterpret_cast<Type*>(m_team_reduce);
+
+    __syncthreads();  // Don't write in to shared data until all threads have
+                      // entered this function
+
+    if (0 == hipThreadIdx_y) {
+      base_data[0] = 0;
+    }
+
+    base_data[hipThreadIdx_y + 1] = value;
+
+    Impl::hip_intra_block_reduce_scan<true, Impl::HIPJoinFunctor<Type>, void>(
+        Impl::HIPJoinFunctor<Type>(), base_data + 1);
+
+    if (global_accum) {
+      if (hipBlockDim_y == hipThreadIdx_y + 1) {
+        base_data[hipBlockDim_y] =
+            atomic_fetch_add(global_accum, base_data[hipBlockDim_y]);
+      }
+      __syncthreads();  // Wait for atomic
+      base_data[hipThreadIdx_y] += base_data[hipBlockDim_y];
+    }
+
+    return base_data[hipThreadIdx_y];
+#else
+    (void)value;
+    (void)global_accum;
+    return Type();
+#endif
+  }
+
+  /** \brief  Intra-team exclusive prefix sum with team_rank() ordering.
+   *
+   *  The highest rank thread can compute the reduction total as
+   *    reduction_total = dev.team_scan( value ) + value ;
+   */
+  template <typename Type>
+  KOKKOS_INLINE_FUNCTION Type team_scan(const Type& value) const {
+    return this->template team_scan<Type>(value, 0);
+  }
+
+  //----------------------------------------
+
+  template <typename ReducerType>
+  KOKKOS_INLINE_FUNCTION static
+      typename std::enable_if<is_reducer<ReducerType>::value>::type
+      vector_reduce(ReducerType const& reducer) {
+    vector_reduce(reducer, reducer.reference());
+  }
+
+  template <typename ReducerType>
+  KOKKOS_INLINE_FUNCTION static
+      typename std::enable_if<is_reducer<ReducerType>::value>::type
+      vector_reduce(ReducerType const& reducer,
+                    typename ReducerType::value_type& value) {
+#ifdef __HIP_DEVICE_COMPILE__
+    if (hipBlockDim_x == 1) return;
+
+    // Intra vector lane shuffle reduction:
+    typename ReducerType::value_type tmp(value);
+    typename ReducerType::value_type tmp2 = tmp;
+
+    int constexpr warp_size = ::Kokkos::Experimental::Impl::HIPTraits::WarpSize;
+    unsigned mask =
+        hipBlockDim_x == warp_size
+            ? 0xffffffff
+            : ((1 << hipBlockDim_x) - 1)
+                  << ((hipThreadIdx_y % (warp_size / hipBlockDim_x)) *
+                      hipBlockDim_x);
+
+    for (int i = hipBlockDim_x; (i >>= 1);) {
+      ::Kokkos::Experimental::Impl::in_place_shfl_down(tmp2, tmp, i,
+                                                       hipBlockDim_x, mask);
+      if (static_cast<int>(hipThreadIdx_x) < i) {
+        reducer.join(tmp, tmp2);
+      }
+    }
+
+    // Broadcast from root lane to all other lanes.
+    // Cannot use "butterfly" algorithm to avoid the broadcast
+    // because floating point summation is not associative
+    // and thus different threads could have different results.
+
+    ::Kokkos::Experimental::Impl::in_place_shfl(tmp2, tmp, 0, hipBlockDim_x,
+                                                mask);
+    value               = tmp2;
+    reducer.reference() = tmp2;
+#else
+    (void)reducer;
+    (void)value;
+#endif
+  }
+
+  //--------------------------------------------------------------------------
+  /**\brief  Global reduction across all blocks
+   *
+   *  Return !0 if reducer contains the final value
+   */
+  template <typename ReducerType>
+  KOKKOS_INLINE_FUNCTION static
+      typename std::enable_if<is_reducer<ReducerType>::value, int>::type
+      global_reduce(ReducerType const& reducer, int* const global_scratch_flags,
+                    void* const global_scratch_space, void* const shmem,
+                    int const shmem_size) {
+#ifdef __HIP_COMPILE_DEVICE__
+
+    typedef typename ReducerType::value_type value_type;
+    typedef value_type volatile* pointer_type;
+
+    // Number of shared memory entries for the reduction:
+    const int nsh = shmem_size / sizeof(value_type);
+
+    // Number of HIP threads in the block, rank within the block
+    const int nid = hipBlockDim_x * hipBlockDim_y * hipBlockDim_z;
+    const int tid =
+        hipThreadIdx_x +
+        hipBlockDim_x * (hipThreadIdx_y + hipBlockDim_y * hipThreadIdx_z);
+
+    // Reduces within block using all available shared memory
+    // Contributes if it is the root "vector lane"
+
+    // wn == number of warps in the block
+    // wx == which lane within the warp
+    // wy == which warp within the block
+
+    const int wn =
+        (nid + HIPTraits::WarpIndexMask) >> HIPTraits::WarpIndexShift;
+    const int wx = tid & HIPTraits::WarpIndexMask;
+    const int wy = tid >> HIPTraits::WarpIndexShift;
+
+    //------------------------
+    {  // Intra warp shuffle reduction from contributing CUDA threads
+
+      value_type tmp(reducer.reference());
+
+      int constexpr warp_size =
+          ::Kokkos::Experimental::Impl::HIPTraits::WarpSize;
+      for (int i = warp_size; static_cast<int>(hipBlockDim_x) <= (i >>= 1);) {
+        Impl::in_place_shfl_down(reducer.reference(), tmp, i, warp_size);
+
+        // Root of each vector lane reduces "thread" contribution
+        if (0 == hipThreadIdx_x && wx < i) {
+          reducer.join(&tmp, reducer.data());
+        }
+      }
+
+      // Reduce across warps using shared memory.
+      // Number of warps may not be power of two.
+
+      __syncthreads();  // Wait before shared data write
+
+      // Number of shared memory entries for the reduction
+      // is at most one per warp
+      const int nentry = wn < nsh ? wn : nsh;
+
+      if (0 == wx && wy < nentry) {
+        // Root thread of warp 'wy' has warp's value to contribute
+        (reinterpret_cast<value_type*>(shmem))[wy] = tmp;
+      }
+
+      __syncthreads();  // Wait for write to be visible to block
+
+      // When more warps than shared entries
+      // then warps must take turns joining their contribution
+      // to the designated shared memory entry.
+      for (int i = nentry; i < wn; i += nentry) {
+        const int k = wy - i;
+
+        if (0 == wx && i <= wy && k < nentry) {
+          // Root thread of warp 'wy' has warp's value to contribute
+          reducer.join((reinterpret_cast<value_type*>(shmem)) + k, &tmp);
+        }
+
+        __syncthreads();  // Wait for write to be visible to block
+      }
+
+      // One warp performs the inter-warp reduction:
+
+      if (0 == wy) {
+        // Start fan-in at power of two covering nentry
+
+        for (int i = (1 << (32 - __clz(nentry - 1))); (i >>= 1);) {
+          const int k = wx + i;
+          if (wx < i && k < nentry) {
+            reducer.join((reinterpret_cast<pointer_type>(shmem)) + wx,
+                         (reinterpret_cast<pointer_type>(shmem)) + k);
+            __threadfence_block();  // Wait for write to be visible to warp
+          }
+        }
+      }
+    }
+    //------------------------
+    {  // Write block's value to global_scratch_memory
+
+      int last_block = 0;
+
+      if (0 == wx) {
+        reducer.copy((reinterpret_cast<pointer_type>(global_scratch_space)) +
+                         hipBlockIdx_x * reducer.length(),
+                     reducer.data());
+
+        __threadfence();  // Wait until global write is visible.
+
+        last_block = static_cast<int>(hipGridDim_x) ==
+                     1 + Kokkos::atomic_fetch_add(global_scratch_flags, 1);
+
+        // If last block then reset count
+        if (last_block) *global_scratch_flags = 0;
+      }
+
+      // FIXME hip does not support __syncthreads_or so we need to do it by hand
+      // last_block = __syncthreads_or(last_block);
+
+      __shared__ int last_block_shared;
+      if (last_block) last_block_shared = last_block;
+      __threadfence_block();
+
+      if (!last_block_shared) return 0;
+    }
+    //------------------------
+    // Last block reads global_scratch_memory into shared memory.
+
+    const int nentry = nid < hipGridDim_x
+                           ? (nid < nsh ? nid : nsh)
+                           : (hipGridDim_x < nsh ? hipGridDim_x : nsh);
+
+    // nentry = min( nid , nsh , gridDim.x )
+
+    // whole block reads global memory into shared memory:
+
+    if (tid < nentry) {
+      const int offset = tid * reducer.length();
+
+      reducer.copy(
+          (reinterpret_cast<pointer_type>(shmem)) + offset,
+          (reinterpret_cast<pointer_type>(global_scratch_space)) + offset);
+
+      for (int i = nentry + tid; i < static_cast<int>(hipGridDim_x);
+           i += nentry) {
+        reducer.join((reinterpret_cast<pointer_type>(shmem)) + offset,
+                     (reinterpret_cast<pointer_type>(global_scratch_space)) +
+                         i * reducer.length());
+      }
+    }
+
+    __syncthreads();  // Wait for writes to be visible to block
+
+    if (0 == wy) {
+      // Iterate to reduce shared memory to single warp fan-in size
+
+      int constexpr warp_size =
+          ::Kokkos::Experimental::Impl::HIPTraits::WarpSize;
+      const int nreduce = warp_size < nentry ? warp_size : nentry;
+
+      if (wx < nreduce && nreduce < nentry) {
+        for (int i = nreduce + wx; i < nentry; i += nreduce) {
+          reducer.join(((pointer_type)shmem) + wx, ((pointer_type)shmem) + i);
+        }
+        __threadfence_block();  // Wait for writes to be visible to warp
+      }
+
+      // Start fan-in at power of two covering nentry
+
+      for (int i = (1 << (warp_size - __clz(nreduce - 1))); (i >>= 1);) {
+        const int k = wx + i;
+        if (wx < i && k < nreduce) {
+          reducer.join((reinterpret_cast<pointer_type>(shmem)) + wx,
+                       (reinterpret_cast<pointer_type>(shmem)) + k);
+          __threadfence_block();  // Wait for writes to be visible to warp
+        }
+      }
+
+      if (0 == wx) {
+        reducer.copy(reducer.data(), reinterpret_cast<pointer_type>(shmem));
+        return 1;
+      }
+    }
+    return 0;
+
+#else
+    (void)reducer;
+    (void)global_scratch_flags;
+    (void)shmem;
+    (void)global_scratch_space;
+    (void)shmem_size;
+    return 0;
+#endif
+  }
+
+  //----------------------------------------
+  // Private for the driver
+
+  KOKKOS_INLINE_FUNCTION
+  HIPTeamMember(void* shared, const int shared_begin, const int shared_size,
+                void* scratch_level_1_ptr, const int scratch_level_1_size,
+                const int arg_league_rank, const int arg_league_size)
+      : m_team_reduce(shared),
+        m_team_shared(((char*)shared) + shared_begin, shared_size,
+                      scratch_level_1_ptr, scratch_level_1_size),
+        m_team_reduce_size(shared_begin),
+        m_league_rank(arg_league_rank),
+        m_league_size(arg_league_size) {}
+
+ public:
+  // Declare to avoid unused private member warnings which are trigger
+  // when SFINAE excludes the member function which uses these variables
+  // Making another class a friend also surpresses these warnings
+  bool impl_avoid_sfinae_warning() const noexcept {
+    return m_team_reduce_size > 0 && m_team_reduce != nullptr;
+  }
+};
+
+}  // namespace Impl
+}  // namespace Kokkos
+
+//----------------------------------------------------------------------------
+//----------------------------------------------------------------------------
+
+namespace Kokkos {
+namespace Impl {
+
+template <typename iType>
+struct TeamThreadRangeBoundariesStruct<iType, HIPTeamMember> {
+  typedef iType index_type;
+  const HIPTeamMember& member;
+  const iType start;
+  const iType end;
+
+  KOKKOS_INLINE_FUNCTION
+  TeamThreadRangeBoundariesStruct(const HIPTeamMember& thread_, iType count)
+      : member(thread_), start(0), end(count) {}
+
+  KOKKOS_INLINE_FUNCTION
+  TeamThreadRangeBoundariesStruct(const HIPTeamMember& thread_, iType begin_,
+                                  iType end_)
+      : member(thread_), start(begin_), end(end_) {}
+};
+
+template <typename iType>
+struct TeamVectorRangeBoundariesStruct<iType, HIPTeamMember> {
+  typedef iType index_type;
+  const HIPTeamMember& member;
+  const iType start;
+  const iType end;
+
+  KOKKOS_INLINE_FUNCTION
+  TeamVectorRangeBoundariesStruct(const HIPTeamMember& thread_,
+                                  const iType& count)
+      : member(thread_), start(0), end(count) {}
+
+  KOKKOS_INLINE_FUNCTION
+  TeamVectorRangeBoundariesStruct(const HIPTeamMember& thread_,
+                                  const iType& begin_, const iType& end_)
+      : member(thread_), start(begin_), end(end_) {}
+};
+
+template <typename iType>
+struct ThreadVectorRangeBoundariesStruct<iType, HIPTeamMember> {
+  typedef iType index_type;
+  const index_type start;
+  const index_type end;
+
+  KOKKOS_INLINE_FUNCTION
+  ThreadVectorRangeBoundariesStruct(const HIPTeamMember, index_type count)
+      : start(static_cast<index_type>(0)), end(count) {}
+
+  KOKKOS_INLINE_FUNCTION
+  ThreadVectorRangeBoundariesStruct(index_type count)
+      : start(static_cast<index_type>(0)), end(count) {}
+
+  KOKKOS_INLINE_FUNCTION
+  ThreadVectorRangeBoundariesStruct(const HIPTeamMember, index_type arg_begin,
+                                    index_type arg_end)
+      : start(arg_begin), end(arg_end) {}
+
+  KOKKOS_INLINE_FUNCTION
+  ThreadVectorRangeBoundariesStruct(index_type arg_begin, index_type arg_end)
+      : start(arg_begin), end(arg_end) {}
+};
+
+}  // namespace Impl
+
+template <typename iType>
+KOKKOS_INLINE_FUNCTION
+    Impl::TeamThreadRangeBoundariesStruct<iType, Impl::HIPTeamMember>
+    TeamThreadRange(const Impl::HIPTeamMember& thread, iType count) {
+  return Impl::TeamThreadRangeBoundariesStruct<iType, Impl::HIPTeamMember>(
+      thread, count);
+}
+
+template <typename iType1, typename iType2>
+KOKKOS_INLINE_FUNCTION Impl::TeamThreadRangeBoundariesStruct<
+    typename std::common_type<iType1, iType2>::type, Impl::HIPTeamMember>
+TeamThreadRange(const Impl::HIPTeamMember& thread, iType1 begin, iType2 end) {
+  typedef typename std::common_type<iType1, iType2>::type iType;
+  return Impl::TeamThreadRangeBoundariesStruct<iType, Impl::HIPTeamMember>(
+      thread, iType(begin), iType(end));
+}
+
+template <typename iType>
+KOKKOS_INLINE_FUNCTION
+    Impl::TeamVectorRangeBoundariesStruct<iType, Impl::HIPTeamMember>
+    TeamVectorRange(const Impl::HIPTeamMember& thread, const iType& count) {
+  return Impl::TeamVectorRangeBoundariesStruct<iType, Impl::HIPTeamMember>(
+      thread, count);
+}
+
+template <typename iType1, typename iType2>
+KOKKOS_INLINE_FUNCTION Impl::TeamVectorRangeBoundariesStruct<
+    typename std::common_type<iType1, iType2>::type, Impl::HIPTeamMember>
+TeamVectorRange(const Impl::HIPTeamMember& thread, const iType1& begin,
+                const iType2& end) {
+  typedef typename std::common_type<iType1, iType2>::type iType;
+  return Impl::TeamVectorRangeBoundariesStruct<iType, Impl::HIPTeamMember>(
+      thread, iType(begin), iType(end));
+}
+
+template <typename iType>
+KOKKOS_INLINE_FUNCTION
+    Impl::ThreadVectorRangeBoundariesStruct<iType, Impl::HIPTeamMember>
+    ThreadVectorRange(const Impl::HIPTeamMember& thread, iType count) {
+  return Impl::ThreadVectorRangeBoundariesStruct<iType, Impl::HIPTeamMember>(
+      thread, count);
+}
+
+template <typename iType>
+KOKKOS_INLINE_FUNCTION
+    Impl::ThreadVectorRangeBoundariesStruct<iType, Impl::HIPTeamMember>
+    ThreadVectorRange(const Impl::HIPTeamMember& thread, iType arg_begin,
+                      iType arg_end) {
+  return Impl::ThreadVectorRangeBoundariesStruct<iType, Impl::HIPTeamMember>(
+      thread, arg_begin, arg_end);
+}
+
+KOKKOS_INLINE_FUNCTION
+Impl::ThreadSingleStruct<Impl::HIPTeamMember> PerTeam(
+    const Impl::HIPTeamMember& thread) {
+  return Impl::ThreadSingleStruct<Impl::HIPTeamMember>(thread);
+}
+
+KOKKOS_INLINE_FUNCTION
+Impl::VectorSingleStruct<Impl::HIPTeamMember> PerThread(
+    const Impl::HIPTeamMember& thread) {
+  return Impl::VectorSingleStruct<Impl::HIPTeamMember>(thread);
+}
+
+//----------------------------------------------------------------------------
+
+/** \brief  Inter-thread parallel_for.
+ *
+ *  Executes closure(iType i) for each i=[0..N).
+ *
+ * The range [0..N) is mapped to all threads of the the calling thread team.
+ */
+template <typename iType, class Closure>
+KOKKOS_INLINE_FUNCTION void parallel_for(
+    const Impl::TeamThreadRangeBoundariesStruct<iType, Impl::HIPTeamMember>&
+        loop_boundaries,
+    const Closure& closure) {
+#ifdef __HIP_DEVICE_COMPILE__
+  for (iType i = loop_boundaries.start + hipThreadIdx_y;
+       i < loop_boundaries.end; i += hipBlockDim_y)
+    closure(i);
+#else
+  (void)loop_boundaries;
+  (void)closure;
+#endif
+}
+
+//----------------------------------------------------------------------------
+
+/** \brief  Inter-thread parallel_reduce with a reducer.
+ *
+ *  Executes closure(iType i, ValueType & val) for each i=[0..N)
+ *
+ *  The range [0..N) is mapped to all threads of the
+ *  calling thread team and a summation of val is
+ *  performed and put into result.
+ */
+template <typename iType, class Closure, class ReducerType>
+KOKKOS_INLINE_FUNCTION
+    typename std::enable_if<Kokkos::is_reducer<ReducerType>::value>::type
+    parallel_reduce(const Impl::TeamThreadRangeBoundariesStruct<
+                        iType, Impl::HIPTeamMember>& loop_boundaries,
+                    const Closure& closure, const ReducerType& reducer) {
+#ifdef __HIP_DEVICE_COMPILE__
+  typename ReducerType::value_type value;
+  reducer.init(value);
+
+  for (iType i = loop_boundaries.start + hipThreadIdx_y;
+       i < loop_boundaries.end; i += hipBlockDim_y) {
+    closure(i, value);
+  }
+
+  loop_boundaries.member.team_reduce(reducer, value);
+#else
+  (void)loop_boundaries;
+  (void)closure;
+  (void)reducer;
+#endif
+}
+
+/** \brief  Inter-thread parallel_reduce assuming summation.
+ *
+ *  Executes closure(iType i, ValueType & val) for each i=[0..N)
+ *
+ *  The range [0..N) is mapped to all threads of the
+ *  calling thread team and a summation of val is
+ *  performed and put into result.
+ */
+template <typename iType, class Closure, typename ValueType>
+KOKKOS_INLINE_FUNCTION
+    typename std::enable_if<!Kokkos::is_reducer<ValueType>::value>::type
+    parallel_reduce(const Impl::TeamThreadRangeBoundariesStruct<
+                        iType, Impl::HIPTeamMember>& loop_boundaries,
+                    const Closure& closure, ValueType& result) {
+#ifdef __HIP_DEVICE_COMPILE__
+  ValueType val;
+  Kokkos::Sum<ValueType> reducer(val);
+
+  reducer.init(reducer.reference());
+
+  for (iType i = loop_boundaries.start + hipThreadIdx_y;
+       i < loop_boundaries.end; i += hipBlockDim_y) {
+    closure(i, val);
+  }
+
+  loop_boundaries.member.team_reduce(reducer, val);
+  result = reducer.reference();
+#else
+  (void)loop_boundaries;
+  (void)closure;
+  (void)result;
+#endif
+}
+
+template <typename iType, class Closure>
+KOKKOS_INLINE_FUNCTION void parallel_for(
+    const Impl::TeamVectorRangeBoundariesStruct<iType, Impl::HIPTeamMember>&
+        loop_boundaries,
+    const Closure& closure) {
+#ifdef __HIP_DEVICE_COMPILE__
+  for (iType i = loop_boundaries.start + hipThreadIdx_y * hipBlockDim_x +
+                 hipThreadIdx_x;
+       i < loop_boundaries.end; i += hipBlockDim_y * hipBlockDim_x)
+    closure(i);
+#else
+  (void)loop_boundaries;
+  (void)closure;
+#endif
+}
+
+template <typename iType, class Closure, class ReducerType>
+KOKKOS_INLINE_FUNCTION
+    typename std::enable_if<Kokkos::is_reducer<ReducerType>::value>::type
+    parallel_reduce(const Impl::TeamVectorRangeBoundariesStruct<
+                        iType, Impl::HIPTeamMember>& loop_boundaries,
+                    const Closure& closure, const ReducerType& reducer) {
+#ifdef __HIP_DEVICE_COMPILE__
+  typename ReducerType::value_type value;
+  reducer.init(value);
+
+  for (iType i = loop_boundaries.start + hipThreadIdx_y * hipBlockDim_x +
+                 hipThreadIdx_x;
+       i < loop_boundaries.end; i += hipBlockDim_y * hipBlockDim_x) {
+    closure(i, value);
+  }
+
+  loop_boundaries.member.vector_reduce(reducer, value);
+  loop_boundaries.member.team_reduce(reducer, value);
+#else
+  (void)loop_boundaries;
+  (void)closure;
+  (void)reducer;
+#endif
+}
+
+template <typename iType, class Closure, typename ValueType>
+KOKKOS_INLINE_FUNCTION
+    typename std::enable_if<!Kokkos::is_reducer<ValueType>::value>::type
+    parallel_reduce(const Impl::TeamVectorRangeBoundariesStruct<
+                        iType, Impl::HIPTeamMember>& loop_boundaries,
+                    const Closure& closure, ValueType& result) {
+#ifdef __HIP_DEVICE_COMPILE__
+  ValueType val;
+  Kokkos::Sum<ValueType> reducer(val);
+
+  reducer.init(reducer.reference());
+
+  for (iType i = loop_boundaries.start + hipThreadIdx_y * hipBlockDim_x +
+                 hipThreadIdx_x;
+       i < loop_boundaries.end; i += hipBlockDim_y * hipBlockDim_x) {
+    closure(i, val);
+  }
+
+  loop_boundaries.member.vector_reduce(reducer);
+  loop_boundaries.member.team_reduce(reducer);
+  result = reducer.reference();
+#else
+  (void)loop_boundaries;
+  (void)closure;
+  (void)result;
+#endif
+}
+
+//----------------------------------------------------------------------------
+
+/** \brief  Intra-thread vector parallel_for.
+ *
+ *  Executes closure(iType i) for each i=[0..N)
+ *
+ * The range [0..N) is mapped to all vector lanes of the the calling thread.
+ */
+template <typename iType, class Closure>
+KOKKOS_INLINE_FUNCTION void parallel_for(
+    const Impl::ThreadVectorRangeBoundariesStruct<iType, Impl::HIPTeamMember>&
+        loop_boundaries,
+    const Closure& closure) {
+#ifdef __HIP_DEVICE_COMPILE__
+  for (iType i = loop_boundaries.start + hipThreadIdx_x;
+       i < loop_boundaries.end; i += hipBlockDim_x) {
+    closure(i);
+  }
+#else
+  (void)loop_boundaries;
+  (void)closure;
+#endif
+}
+
+//----------------------------------------------------------------------------
+
+/** \brief  Intra-thread vector parallel_reduce.
+ *
+ *  Calls closure(iType i, ValueType & val) for each i=[0..N).
+ *
+ *  The range [0..N) is mapped to all vector lanes of
+ *  the calling thread and a reduction of val is performed using +=
+ *  and output into result.
+ *
+ *  The identity value for the += operator is assumed to be the default
+ *  constructed value.
+ */
+template <typename iType, class Closure, class ReducerType>
+KOKKOS_INLINE_FUNCTION
+    typename std::enable_if<is_reducer<ReducerType>::value>::type
+    parallel_reduce(Impl::ThreadVectorRangeBoundariesStruct<
+                        iType, Impl::HIPTeamMember> const& loop_boundaries,
+                    Closure const& closure, ReducerType const& reducer) {
+#ifdef __HIP_DEVICE_COMPILE__
+  reducer.init(reducer.reference());
+
+  for (iType i = loop_boundaries.start + hipThreadIdx_x;
+       i < loop_boundaries.end; i += hipBlockDim_x) {
+    closure(i, reducer.reference());
+  }
+
+  Impl::HIPTeamMember::vector_reduce(reducer);
+#else
+  (void)loop_boundaries;
+  (void)closure;
+  (void)reducer;
+#endif
+}
+
+/** \brief  Intra-thread vector parallel_reduce.
+ *
+ *  Calls closure(iType i, ValueType & val) for each i=[0..N).
+ *
+ *  The range [0..N) is mapped to all vector lanes of
+ *  the calling thread and a reduction of val is performed using +=
+ *  and output into result.
+ *
+ *  The identity value for the += operator is assumed to be the default
+ *  constructed value.
+ */
+template <typename iType, class Closure, typename ValueType>
+KOKKOS_INLINE_FUNCTION
+    typename std::enable_if<!is_reducer<ValueType>::value>::type
+    parallel_reduce(Impl::ThreadVectorRangeBoundariesStruct<
+                        iType, Impl::HIPTeamMember> const& loop_boundaries,
+                    Closure const& closure, ValueType& result) {
+#ifdef __HIP_DEVICE_COMPILE__
+  result = ValueType();
+
+  for (iType i = loop_boundaries.start + hipThreadIdx_x;
+       i < loop_boundaries.end; i += hipBlockDim_x) {
+    closure(i, result);
+  }
+
+  Impl::HIPTeamMember::vector_reduce(Kokkos::Sum<ValueType>(result));
+#else
+  (void)loop_boundaries;
+  (void)closure;
+  (void)result;
+#endif
+}
+
+//----------------------------------------------------------------------------
+
+/** \brief  Intra-thread vector parallel exclusive prefix sum.
+ *
+ *  Executes closure(iType i, ValueType & val, bool final) for each i=[0..N)
+ *
+ *  The range [0..N) is mapped to all vector lanes in the
+ *  thread and a scan operation is performed.
+ *  The last call to closure has final == true.
+ */
+template <typename iType, class Closure>
+KOKKOS_INLINE_FUNCTION void parallel_scan(
+    const Impl::ThreadVectorRangeBoundariesStruct<iType, Impl::HIPTeamMember>&
+        loop_boundaries,
+    const Closure& closure) {
+#ifdef __HIP_DEVICE_COMPILE__
+  // Extract value_type from closure
+
+  using value_type = typename Kokkos::Impl::FunctorAnalysis<
+      Kokkos::Impl::FunctorPatternInterface::SCAN, void, Closure>::value_type;
+
+  // Loop through boundaries by vector-length chunks
+  // must scan at each iteration
+
+  value_type accum = 0;
+
+  // All thread "lanes" must loop the same number of times.
+  // Determine an loop end for all thread "lanes."
+  // Requires:
+  //   hipBlockDim_x is power of two and thus
+  //     ( end % hipBlockDim_x ) == ( end & ( hipBlockDim_x - 1 ) )
+  //   1 <= hipBlockDim_x <= HIPTraits::WarpSize
+
+  int constexpr warp_size = ::Kokkos::Experimental::Impl::HIPTraits::WarpSize;
+  const int mask          = hipBlockDim_x - 1;
+  const unsigned active_mask =
+      blockDim.x == warp_size
+          ? 0xffffffff
+          : ((1 << hipBlockDim_x) - 1)
+                << (hipThreadIdx_y % (warp_size / hipBlockDim_x)) *
+                       hipBlockDim_x;
+  const int rem = loop_boundaries.end & mask;  // == end % hipBlockDim_x
+  const int end = loop_boundaries.end + (rem ? hipBlockDim_x - rem : 0);
+
+  for (int i = hipThreadIdx_x; i < end; i += hipBlockDim_x) {
+    value_type val = 0;
+
+    // First acquire per-lane contributions:
+    if (i < loop_boundaries.end) closure(i, val, false);
+
+    value_type sval = val;
+
+    // Bottom up inclusive scan in triangular pattern
+    // where each HIP thread is the root of a reduction tree
+    // from the zeroth "lane" to itself.
+    //  [t] += [t-1] if t >= 1
+    //  [t] += [t-2] if t >= 2
+    //  [t] += [t-4] if t >= 4
+    //  ...
+
+    for (int j = 1; j < static_cast<int>(hipBlockDim_x); j <<= 1) {
+      value_type tmp = 0;
+      ::Kokkos::Experimental::Impl::in_place_shfl_up(
+          tmp, sval, j, hipBlockDim_x, active_mask);
+      if (j <= static_cast<int>(hipThreadIdx_x)) {
+        sval += tmp;
+      }
+    }
+
+    // Include accumulation and remove value for exclusive scan:
+    val = accum + sval - val;
+
+    // Provide exclusive scan value:
+    if (i < loop_boundaries.end) closure(i, val, true);
+
+    // Accumulate the last value in the inclusive scan:
+    ::Kokkos::Experimental::Impl::in_place_shfl(sval, sval, mask, blockDim.x,
+                                                active_mask);
+
+    accum += sval;
+  }
+#else
+  (void)loop_boundaries;
+  (void)closure;
+#endif
+}
+
+}  // namespace Kokkos
+
+namespace Kokkos {
+
+template <class FunctorType>
+KOKKOS_INLINE_FUNCTION void single(
+    const Impl::VectorSingleStruct<Impl::HIPTeamMember>&,
+    const FunctorType& lambda) {
+#ifdef __HIP_DEVICE_COMPILE__
+  if (hipThreadIdx_x == 0) lambda();
+#else
+  (void)lambda;
+#endif
+}
+
+template <class FunctorType>
+KOKKOS_INLINE_FUNCTION void single(
+    const Impl::ThreadSingleStruct<Impl::HIPTeamMember>&,
+    const FunctorType& lambda) {
+#ifdef __HIP_DEVICE_COMPILE__
+  if (hipThreadIdx_x == 0 && hipThreadIdx_y == 0) lambda();
+#else
+  (void)lambda;
+#endif
+}
+
+template <class FunctorType, class ValueType>
+KOKKOS_INLINE_FUNCTION void single(
+    const Impl::VectorSingleStruct<Impl::HIPTeamMember>&,
+    const FunctorType& lambda, ValueType& val) {
+#ifdef __HIP_DEVICE_COMPILE__
+  int constexpr warp_size = ::Kokkos::Experimental::Impl::HIPTraits::WarpSize;
+  if (hipThreadIdx_x == 0) lambda(val);
+  unsigned mask = hipBlockDim_x == warp_size
+                      ? 0xffffffff
+                      : ((1 << hipBlockDim_x) - 1)
+                            << ((hipThreadIdx_y % (warp_size / hipBlockDim_x)) *
+                                hipBlockDim_x);
+  ::Kokkos::Experimental::Impl::in_place_shfl(val, val, 0, hipBlockDim_x, mask);
+#else
+  (void)lambda;
+  (void)val;
+#endif
+}
+
+template <class FunctorType, class ValueType>
+KOKKOS_INLINE_FUNCTION void single(
+    const Impl::ThreadSingleStruct<Impl::HIPTeamMember>& single_struct,
+    const FunctorType& lambda, ValueType& val) {
+  (void)single_struct;
+  (void)lambda;
+  (void)val;
+#ifdef __HIP_DEVICE_COMPILE__
+  if (hipThreadIdx_x == 0 && hipThreadIdx_y == 0) {
+    lambda(val);
+  }
+  single_struct.team_member.team_broadcast(val, 0);
+#else
+  (void)single_struct;
+  (void)lambda;
+  (void)val;
+#endif
+}
+
+}  // namespace Kokkos
+
+#endif /* defined( __HIPCC__ ) */
+
+#endif /* #ifndef KOKKOS_CUDA_TEAM_HPP */
diff --git a/kokkos/core/src/HIP/Kokkos_HIP_Vectorization.hpp b/kokkos/core/src/HIP/Kokkos_HIP_Vectorization.hpp
new file mode 100644
index 000000000..58b5abb2e
--- /dev/null
+++ b/kokkos/core/src/HIP/Kokkos_HIP_Vectorization.hpp
@@ -0,0 +1,160 @@
+/*
+//@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
+*/
+
+#ifndef KOKKOS_HIP_VECTORIZATION_HPP
+#define KOKKOS_HIP_VECTORIZATION_HPP
+
+#include <Kokkos_Macros.hpp>
+#include <Kokkos_HIP.hpp>
+
+namespace Kokkos {
+namespace Experimental {
+namespace Impl {
+
+// Include all lanes
+constexpr unsigned shfl_all_mask = 0xffffffff;
+
+//----------------------------------------------------------------------------
+// Shuffle operations require input to be a register (stack) variable
+
+// Derived implements do_shfl_op(unsigned mask, T& in, int lane, int width),
+// which turns in to one of KOKKOS_IMPL_HIP_SHFL(_UP_|_DOWN_|_)MASK
+// Since the logic with respect to value sizes, etc., is the same everywhere,
+// put it all in one place.
+template <class Derived>
+struct in_place_shfl_op {
+  // CRTP boilerplate
+  __device__ KOKKOS_IMPL_FORCEINLINE const Derived& self() const noexcept {
+    return *static_cast<Derived const*>(this);
+  }
+
+  // sizeof(Scalar) == sizeof(int) case
+  template <class Scalar>
+  // requires _assignable_from_bits<Scalar>
+  __device__ inline typename std::enable_if<sizeof(Scalar) == sizeof(int)>::type
+  operator()(Scalar& out, Scalar const& in, int lane_or_delta, int width,
+             unsigned mask = shfl_all_mask) const noexcept {
+    //------------------------------------------------
+    reinterpret_cast<int&>(out) = self().do_shfl_op(
+        mask, reinterpret_cast<int const&>(in), lane_or_delta, width);
+    //------------------------------------------------
+  }
+
+  template <class Scalar>
+  __device__ inline
+      typename std::enable_if<sizeof(Scalar) == sizeof(double)>::type
+      operator()(Scalar& out, Scalar const& in, int lane_or_delta, int width,
+                 unsigned mask = shfl_all_mask) const noexcept {
+    //------------------------------------------------
+    reinterpret_cast<double&>(out) = self().do_shfl_op(
+        mask, *reinterpret_cast<double const*>(&in), lane_or_delta, width);
+    //------------------------------------------------
+  }
+
+  // sizeof(Scalar) > sizeof(double) case
+  template <typename Scalar>
+  __device__ inline
+      typename std::enable_if<(sizeof(Scalar) > sizeof(double))>::type
+      operator()(Scalar& out, const Scalar& val, int lane_or_delta, int width,
+                 unsigned mask = shfl_all_mask) const noexcept {
+    using shuffle_as_t = int;
+    enum : int { N = sizeof(Scalar) / sizeof(shuffle_as_t) };
+
+    for (int i = 0; i < N; ++i) {
+      reinterpret_cast<shuffle_as_t*>(&out)[i] = self().do_shfl_op(
+          mask, reinterpret_cast<shuffle_as_t const*>(&val)[i], lane_or_delta,
+          width);
+    }
+  }
+};
+
+struct in_place_shfl_fn : in_place_shfl_op<in_place_shfl_fn> {
+  template <class T>
+  __device__ KOKKOS_IMPL_FORCEINLINE T do_shfl_op(unsigned mask, T& val,
+                                                  int lane, int width) const
+      noexcept {
+    return KOKKOS_IMPL_HIP_SHFL_MASK(mask, val, lane, width);
+  }
+};
+
+template <class... Args>
+__device__ KOKKOS_IMPL_FORCEINLINE void in_place_shfl(Args&&... args) noexcept {
+  in_place_shfl_fn{}((Args &&) args...);
+}
+
+struct in_place_shfl_up_fn : in_place_shfl_op<in_place_shfl_up_fn> {
+  template <class T>
+  __device__ KOKKOS_IMPL_FORCEINLINE T do_shfl_op(unsigned mask, T& val,
+                                                  int lane, int width) const
+      noexcept {
+    return KOKKOS_IMPL_HIP_SHFL_UP_MASK(mask, val, lane, width);
+  }
+};
+
+template <class... Args>
+__device__ KOKKOS_IMPL_FORCEINLINE void in_place_shfl_up(
+    Args&&... args) noexcept {
+  in_place_shfl_up_fn{}((Args &&) args...);
+}
+
+struct in_place_shfl_down_fn : in_place_shfl_op<in_place_shfl_down_fn> {
+  template <class T>
+  __device__ KOKKOS_IMPL_FORCEINLINE T do_shfl_op(unsigned mask, T& val,
+                                                  int lane, int width) const
+      noexcept {
+    return KOKKOS_IMPL_HIP_SHFL_DOWN_MASK(mask, val, lane, width);
+  }
+};
+
+template <class... Args>
+__device__ KOKKOS_IMPL_FORCEINLINE void in_place_shfl_down(
+    Args&&... args) noexcept {
+  in_place_shfl_down_fn{}((Args &&) args...);
+}
+
+}  // namespace Impl
+}  // namespace Experimental
+}  // namespace Kokkos
+
+#endif
diff --git a/kokkos/core/src/HPX/Kokkos_HPX.cpp b/kokkos/core/src/HPX/Kokkos_HPX.cpp
index 6d7867a06..acbd1074f 100644
--- a/kokkos/core/src/HPX/Kokkos_HPX.cpp
+++ b/kokkos/core/src/HPX/Kokkos_HPX.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -85,6 +85,9 @@ void HPX::impl_initialize(int thread_count) {
     char *argv_hpx[] = {name, nullptr};
     hpx::start(nullptr, argc_hpx, argv_hpx, config);
 
+#if HPX_VERSION_FULL < 0x010400
+    // This has been fixed in HPX 1.4.0.
+    //
     // NOTE: Wait for runtime to start. hpx::start returns as soon as
     // possible, meaning some operations are not allowed immediately
     // after hpx::start. Notably, hpx::stop needs state_running. This
@@ -94,6 +97,7 @@ void HPX::impl_initialize(int thread_count) {
     rt = hpx::get_runtime_ptr();
     hpx::util::yield_while(
         [rt]() { return rt->get_state() < hpx::state_running; });
+#endif
 
     m_hpx_initialized = true;
   }
diff --git a/kokkos/core/src/HPX/Kokkos_HPX_ChunkedRoundRobinExecutor.hpp b/kokkos/core/src/HPX/Kokkos_HPX_ChunkedRoundRobinExecutor.hpp
index 456dd4791..b364b4a6e 100644
--- a/kokkos/core/src/HPX/Kokkos_HPX_ChunkedRoundRobinExecutor.hpp
+++ b/kokkos/core/src/HPX/Kokkos_HPX_ChunkedRoundRobinExecutor.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/HPX/Kokkos_HPX_Task.cpp b/kokkos/core/src/HPX/Kokkos_HPX_Task.cpp
index b4c6cd9fb..8d42589bd 100644
--- a/kokkos/core/src/HPX/Kokkos_HPX_Task.cpp
+++ b/kokkos/core/src/HPX/Kokkos_HPX_Task.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/HPX/Kokkos_HPX_Task.hpp b/kokkos/core/src/HPX/Kokkos_HPX_Task.hpp
index a08825738..803d95591 100644
--- a/kokkos/core/src/HPX/Kokkos_HPX_Task.hpp
+++ b/kokkos/core/src/HPX/Kokkos_HPX_Task.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/HPX/Kokkos_HPX_ViewCopyETIAvail.hpp b/kokkos/core/src/HPX/Kokkos_HPX_ViewCopyETIAvail.hpp
index ea5cf5602..99020a3e0 100644
--- a/kokkos/core/src/HPX/Kokkos_HPX_ViewCopyETIAvail.hpp
+++ b/kokkos/core/src/HPX/Kokkos_HPX_ViewCopyETIAvail.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/HPX/Kokkos_HPX_ViewCopyETIDecl.hpp b/kokkos/core/src/HPX/Kokkos_HPX_ViewCopyETIDecl.hpp
index a119322a4..fae486f4b 100644
--- a/kokkos/core/src/HPX/Kokkos_HPX_ViewCopyETIDecl.hpp
+++ b/kokkos/core/src/HPX/Kokkos_HPX_ViewCopyETIDecl.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/HPX/Kokkos_HPX_WorkGraphPolicy.hpp b/kokkos/core/src/HPX/Kokkos_HPX_WorkGraphPolicy.hpp
index c828c5320..6705005c1 100644
--- a/kokkos/core/src/HPX/Kokkos_HPX_WorkGraphPolicy.hpp
+++ b/kokkos/core/src/HPX/Kokkos_HPX_WorkGraphPolicy.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/KokkosExp_MDRangePolicy.hpp b/kokkos/core/src/KokkosExp_MDRangePolicy.hpp
index 9af8e5481..3195dbded 100644
--- a/kokkos/core/src/KokkosExp_MDRangePolicy.hpp
+++ b/kokkos/core/src/KokkosExp_MDRangePolicy.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -63,6 +63,10 @@
 #include <ROCm/KokkosExp_ROCm_IterateTile_Refactor.hpp>
 #endif
 
+#if defined(__HIPCC__) && defined(KOKKOS_ENABLE_HIP)
+#include <HIP/KokkosExp_HIP_IterateTile.hpp>
+#endif
+
 namespace Kokkos {
 
 // ------------------------------------------------------------------ //
@@ -79,7 +83,8 @@ enum class Iterate
 template <typename ExecSpace>
 struct default_outer_direction {
   using type = Iterate;
-#if defined(KOKKOS_ENABLE_CUDA) || defined(KOKKOS_ENABLE_ROCM)
+#if defined(KOKKOS_ENABLE_CUDA) || defined(KOKKOS_ENABLE_ROCM) || \
+    defined(KOKKOS_ENABLE_HIP)
   static constexpr Iterate value = Iterate::Left;
 #else
   static constexpr Iterate value = Iterate::Right;
@@ -89,7 +94,8 @@ struct default_outer_direction {
 template <typename ExecSpace>
 struct default_inner_direction {
   using type = Iterate;
-#if defined(KOKKOS_ENABLE_CUDA) || defined(KOKKOS_ENABLE_ROCM)
+#if defined(KOKKOS_ENABLE_CUDA) || defined(KOKKOS_ENABLE_ROCM) || \
+    defined(KOKKOS_ENABLE_HIP)
   static constexpr Iterate value = Iterate::Left;
 #else
   static constexpr Iterate value = Iterate::Right;
@@ -256,6 +262,10 @@ struct MDRangePolicy : public Kokkos::Impl::PolicyTraits<Properties...> {
 #if defined(KOKKOS_ENABLE_ROCM)
         && !std::is_same<typename traits::execution_space,
                          Kokkos::Experimental::ROCm>::value
+#endif
+#if defined(KOKKOS_ENABLE_HIP)
+        && !std::is_same<typename traits::execution_space,
+                         Kokkos::Experimental::HIP>::value
 #endif
     ) {
       index_type span;
@@ -275,7 +285,7 @@ struct MDRangePolicy : public Kokkos::Impl::PolicyTraits<Properties...> {
         m_prod_tile_dims *= m_tile[i];
       }
     }
-#if defined(KOKKOS_ENABLE_CUDA)
+#if defined(KOKKOS_ENABLE_CUDA) || defined(KOKKOS_ENABLE_HIP)
     else  // Cuda
     {
       index_type span;
@@ -287,15 +297,21 @@ struct MDRangePolicy : public Kokkos::Impl::PolicyTraits<Properties...> {
         rank_start = rank - 1;
         rank_end   = -1;
       }
+      bool is_cuda_exec_space =
+#if defined(KOKKOS_ENABLE_CUDA)
+          std::is_same<typename traits::execution_space, Kokkos::Cuda>::value;
+#else
+          false;
+#endif
       for (int i = rank_start; i != rank_end; i += increment) {
         span = m_upper[i] - m_lower[i];
         if (m_tile[i] <= 0) {
-          // TODO: determine what is a good default tile size for cuda
+          // TODO: determine what is a good default tile size for cuda and HIP
           // may be rank dependent
           if (((int)inner_direction == (int)Right && (i < rank - 1)) ||
               ((int)inner_direction == (int)Left && (i > 0))) {
             if (m_prod_tile_dims < 256) {
-              m_tile[i] = 2;
+              m_tile[i] = (is_cuda_exec_space) ? 2 : 4;
             } else {
               m_tile[i] = 1;
             }
@@ -311,13 +327,18 @@ struct MDRangePolicy : public Kokkos::Impl::PolicyTraits<Properties...> {
       if (m_prod_tile_dims >
           1024) {  // Match Cuda restriction for ParallelReduce; 1024,1024,64
                    // max per dim (Kepler), but product num_threads < 1024
-        printf(" Tile dimensions exceed Cuda limits\n");
-        Kokkos::abort(
-            " Cuda ExecSpace Error: MDRange tile dims exceed maximum number of "
-            "threads per block - choose smaller tile dims");
-        // Kokkos::Impl::throw_runtime_exception( " Cuda ExecSpace Error:
-        // MDRange tile dims exceed maximum number of threads per block - choose
-        // smaller tile dims");
+        if (is_cuda_exec_space) {
+          printf(" Tile dimensions exceed Cuda limits\n");
+          Kokkos::abort(
+              " Cuda ExecSpace Error: MDRange tile dims exceed maximum number "
+              "of "
+              "threads per block - choose smaller tile dims");
+        } else {
+          printf(" Tile dimensions exceed HIP limits\n");
+          Kokkos::abort(
+              "HIP ExecSpace Error: MDRange tile dims exceed maximum number of "
+              "threads per block - choose smaller tile dims");
+        }
       }
     }
 #endif
@@ -396,6 +417,10 @@ struct MDRangePolicy : public Kokkos::Impl::PolicyTraits<Properties...> {
 #if defined(KOKKOS_ENABLE_ROCM)
         && !std::is_same<typename traits::execution_space,
                          Kokkos::Experimental::ROCm>::value
+#endif
+#if defined(KOKKOS_ENABLE_HIP)
+        && !std::is_same<typename traits::execution_space,
+                         Kokkos::Experimental::HIP>::value
 #endif
     ) {
       index_type span;
@@ -415,8 +440,8 @@ struct MDRangePolicy : public Kokkos::Impl::PolicyTraits<Properties...> {
         m_prod_tile_dims *= m_tile[i];
       }
     }
-#if defined(KOKKOS_ENABLE_CUDA)
-    else  // Cuda
+#if defined(KOKKOS_ENABLE_CUDA) || defined(KOKKOS_ENABLE_HIP)
+    else  // Cuda or HIP
     {
       index_type span;
       int increment  = 1;
@@ -451,13 +476,17 @@ struct MDRangePolicy : public Kokkos::Impl::PolicyTraits<Properties...> {
       if (m_prod_tile_dims >
           1024) {  // Match Cuda restriction for ParallelReduce; 1024,1024,64
                    // max per dim (Kepler), but product num_threads < 1024
+#if defined(KOKKOS_ENABLE_CUDA)
         printf(" Tile dimensions exceed Cuda limits\n");
         Kokkos::abort(
             " Cuda ExecSpace Error: MDRange tile dims exceed maximum number of "
             "threads per block - choose smaller tile dims");
-        // Kokkos::Impl::throw_runtime_exception( " Cuda ExecSpace Error:
-        // MDRange tile dims exceed maximum number of threads per block - choose
-        // smaller tile dims");
+#else
+        printf(" Tile dimensions exceed HIP limits\n");
+        Kokkos::abort(
+            " HIP ExecSpace Error: MDRange tile dims exceed maximum number of "
+            "threads per block - choose smaller tile dims");
+#endif
       }
     }
 #endif
diff --git a/kokkos/core/src/Kokkos_AnonymousSpace.hpp b/kokkos/core/src/Kokkos_AnonymousSpace.hpp
index 02d8ef8ba..a4e887668 100644
--- a/kokkos/core/src/Kokkos_AnonymousSpace.hpp
+++ b/kokkos/core/src/Kokkos_AnonymousSpace.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/Kokkos_Array.hpp b/kokkos/core/src/Kokkos_Array.hpp
index 725a64427..d830616bd 100644
--- a/kokkos/core/src/Kokkos_Array.hpp
+++ b/kokkos/core/src/Kokkos_Array.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -159,22 +159,21 @@ struct Array {
     return &m_internal_implementation_private_member_data[0];
   }
 
-#ifdef KOKKOS_IMPL_ROCM_CLANG_WORKAROUND
+#ifdef KOKKOS_IMPL_HIP_CLANG_WORKAROUND
   // Do not default unless move and move-assignment are also defined
-  KOKKOS_INLINE_FUNCTION
-  ~Array()            = default;
-  Array()             = default;
-  Array(const Array&) = default;
-  Array& operator=(const Array&) = default;
+  KOKKOS_DEFAULTED_FUNCTION ~Array()            = default;
+  KOKKOS_DEFAULTED_FUNCTION Array()             = default;
+  KOKKOS_DEFAULTED_FUNCTION Array(const Array&) = default;
+  KOKKOS_DEFAULTED_FUNCTION Array& operator=(const Array&) = default;
 
   // Some supported compilers are not sufficiently C++11 compliant
   // for default move constructor and move assignment operator.
-  Array(Array&&) = default;
-  Array& operator=(Array&&) = default;
+  KOKKOS_DEFAULTED_FUNCTION Array(Array&&) = default;
+  KOKKOS_DEFAULTED_FUNCTION Array& operator=(Array&&) = default;
 
   KOKKOS_INLINE_FUNCTION
   Array(const std::initializer_list<T>& vals) {
-    for (int i = 0; i < N; i++) {
+    for (size_t i = 0; i < N; i++) {
       m_internal_implementation_private_member_data[i] = vals.begin()[i];
     }
   }
@@ -217,17 +216,10 @@ struct Array<T, 0, Proxy> {
   KOKKOS_INLINE_FUNCTION pointer data() { return pointer(0); }
   KOKKOS_INLINE_FUNCTION const_pointer data() const { return const_pointer(0); }
 
-#ifdef KOKKOS_CUDA_9_DEFAULTED_BUG_WORKAROUND
-  KOKKOS_INLINE_FUNCTION ~Array() {}
-  KOKKOS_INLINE_FUNCTION Array() {}
-  KOKKOS_INLINE_FUNCTION Array(const Array&) {}
-  KOKKOS_INLINE_FUNCTION Array& operator=(const Array&) {}
-#else
-  KOKKOS_INLINE_FUNCTION ~Array()            = default;
-  KOKKOS_INLINE_FUNCTION Array()             = default;
-  KOKKOS_INLINE_FUNCTION Array(const Array&) = default;
-  KOKKOS_INLINE_FUNCTION Array& operator=(const Array&) = default;
-#endif
+  KOKKOS_DEFAULTED_FUNCTION ~Array()            = default;
+  KOKKOS_DEFAULTED_FUNCTION Array()             = default;
+  KOKKOS_DEFAULTED_FUNCTION Array(const Array&) = default;
+  KOKKOS_DEFAULTED_FUNCTION Array& operator=(const Array&) = default;
 
   // Some supported compilers are not sufficiently C++11 compliant
   // for default move constructor and move assignment operator.
@@ -281,13 +273,9 @@ struct Array<T, KOKKOS_INVALID_INDEX, Array<>::contiguous> {
   KOKKOS_INLINE_FUNCTION pointer data() { return m_elem; }
   KOKKOS_INLINE_FUNCTION const_pointer data() const { return m_elem; }
 
-#ifdef KOKKOS_CUDA_9_DEFAULTED_BUG_WORKAROUND
-  KOKKOS_INLINE_FUNCTION ~Array() {}
-#else
-  KOKKOS_INLINE_FUNCTION ~Array()                       = default;
-#endif
-  Array()                 = delete;
-  Array(const Array& rhs) = delete;
+  KOKKOS_DEFAULTED_FUNCTION ~Array()                     = default;
+  KOKKOS_INLINE_FUNCTION_DELETED Array()                 = delete;
+  KOKKOS_INLINE_FUNCTION_DELETED Array(const Array& rhs) = delete;
 
   // Some supported compilers are not sufficiently C++11 compliant
   // for default move constructor and move assignment operator.
@@ -354,13 +342,9 @@ struct Array<T, KOKKOS_INVALID_INDEX, Array<>::strided> {
   KOKKOS_INLINE_FUNCTION pointer data() { return m_elem; }
   KOKKOS_INLINE_FUNCTION const_pointer data() const { return m_elem; }
 
-#ifdef KOKKOS_CUDA_9_DEFAULTED_BUG_WORKAROUND
-  KOKKOS_INLINE_FUNCTION ~Array() {}
-#else
-  KOKKOS_INLINE_FUNCTION ~Array()                       = default;
-#endif
-  Array()             = delete;
-  Array(const Array&) = delete;
+  KOKKOS_DEFAULTED_FUNCTION ~Array()                 = default;
+  KOKKOS_INLINE_FUNCTION_DELETED Array()             = delete;
+  KOKKOS_INLINE_FUNCTION_DELETED Array(const Array&) = delete;
 
   // Some supported compilers are not sufficiently C++11 compliant
   // for default move constructor and move assignment operator.
diff --git a/kokkos/core/src/Kokkos_Atomic.hpp b/kokkos/core/src/Kokkos_Atomic.hpp
index 2f065cd2c..55139d07b 100644
--- a/kokkos/core/src/Kokkos_Atomic.hpp
+++ b/kokkos/core/src/Kokkos_Atomic.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -86,6 +86,10 @@
 
 #define KOKKOS_ENABLE_ROCM_ATOMICS
 
+#elif defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HIP_GPU)
+
+#define KOKKOS_ENABLE_HIP_ATOMICS
+
 #endif
 
 #if !defined(KOKKOS_ENABLE_GNU_ATOMICS) &&    \
@@ -178,11 +182,13 @@ extern KOKKOS_INLINE_FUNCTION void unlock_address_rocm_space(void* ptr);
 }  // namespace Kokkos
 #include <ROCm/Kokkos_ROCm_Atomic.hpp>
 #endif
+#if defined(KOKKOS_ENABLE_HIP)
+#include <HIP/Kokkos_HIP_Atomic.hpp>
+#endif
 
 #ifdef _WIN32
 #include "impl/Kokkos_Atomic_Windows.hpp"
 #else
-
 //----------------------------------------------------------------------------
 // Atomic Assembly
 //
@@ -209,6 +215,11 @@ extern KOKKOS_INLINE_FUNCTION void unlock_address_rocm_space(void* ptr);
 
 #include "impl/Kokkos_Atomic_Compare_Exchange_Strong.hpp"
 
+#endif  //_WIN32
+
+#include "impl/Kokkos_Atomic_Generic.hpp"
+
+#ifndef _WIN32
 //----------------------------------------------------------------------------
 // Atomic fetch and add
 //
@@ -262,6 +273,18 @@ extern KOKKOS_INLINE_FUNCTION void unlock_address_rocm_space(void* ptr);
 // { T tmp = *dest ; *dest = tmp & val ; return tmp ; }
 
 #include "impl/Kokkos_Atomic_Fetch_And.hpp"
+
+//----------------------------------------------------------------------------
+// Atomic MinMax
+//
+// template<class T>
+// T atomic_min(volatile T* const dest, const T val)
+// { T tmp = *dest ; *dest = min(*dest, val); return tmp ; }
+// template<class T>
+// T atomic_max(volatile T* const dest, const T val)
+// { T tmp = *dest ; *dest = max(*dest, val); return tmp ; }
+
+#include "impl/Kokkos_Atomic_MinMax.hpp"
 #endif /*Not _WIN32*/
 
 //----------------------------------------------------------------------------
@@ -284,16 +307,14 @@ extern KOKKOS_INLINE_FUNCTION void unlock_address_rocm_space(void* ptr);
 
 #include "impl/Kokkos_Volatile_Load.hpp"
 
-#ifndef _WIN32
-#include "impl/Kokkos_Atomic_Generic.hpp"
-#endif
-
 //----------------------------------------------------------------------------
 // Provide atomic loads and stores with memory order semantics
 
 #include "impl/Kokkos_Atomic_Load.hpp"
 #include "impl/Kokkos_Atomic_Store.hpp"
 
+// Generic functions using the above defined functions
+#include "impl/Kokkos_Atomic_Generic_Secondary.hpp"
 //----------------------------------------------------------------------------
 // This atomic-style macro should be an inlined function, not a macro
 
diff --git a/kokkos/core/src/Kokkos_Complex.hpp b/kokkos/core/src/Kokkos_Complex.hpp
index dbe2fd988..fec5d62c3 100644
--- a/kokkos/core/src/Kokkos_Complex.hpp
+++ b/kokkos/core/src/Kokkos_Complex.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -73,14 +73,14 @@ class
   using value_type = RealType;
 
   //! Default constructor (initializes both real and imaginary parts to zero).
-  KOKKOS_INLINE_FUNCTION
+  KOKKOS_DEFAULTED_FUNCTION
   complex() noexcept = default;
 
   //! Copy constructor.
-  KOKKOS_INLINE_FUNCTION
+  KOKKOS_DEFAULTED_FUNCTION
   complex(const complex&) noexcept = default;
 
-  KOKKOS_INLINE_FUNCTION
+  KOKKOS_DEFAULTED_FUNCTION
   complex& operator=(const complex&) noexcept = default;
 
   /// \brief Conversion constructor from compatible RType
@@ -219,7 +219,10 @@ class
     // Scale (by the "1-norm" of y) to avoid unwarranted overflow.
     // If the real part is +/-Inf and the imaginary part is -/+Inf,
     // this won't change the result.
-    const RealType s = std::fabs(y.real()) + std::fabs(y.imag());
+#if !defined(__HIP_DEVICE_COMPILE__)  // FIXME_HIP
+    using std::fabs;
+#endif
+    const RealType s = fabs(y.real()) + fabs(y.imag());
 
     // If s is 0, then y is zero, so x/y == real(x)/0 + i*imag(x)/0.
     // In that case, the relation x/y == (x/s) / (y/s) doesn't hold,
@@ -247,7 +250,10 @@ class
     // Scale (by the "1-norm" of y) to avoid unwarranted overflow.
     // If the real part is +/-Inf and the imaginary part is -/+Inf,
     // this won't change the result.
-    const RealType s = std::fabs(y.real()) + std::fabs(y.imag());
+#if !defined(__HIP_DEVICE_COMPILE__)  // FIXME_HIP
+    using std::fabs;
+#endif
+    const RealType s = fabs(y.real()) + fabs(y.imag());
 
     // If s is 0, then y is zero, so x/y == real(x)/0 + i*imag(x)/0.
     // In that case, the relation x/y == (x/s) / (y/s) doesn't hold,
@@ -298,8 +304,21 @@ class
   /// complex& </tt>.  See Kokkos Issue #177 for the
   /// explanation.  In practice, this means that you should not chain
   /// assignments with volatile lvalues.
-  KOKKOS_INLINE_FUNCTION void operator=(
-      const complex<RealType>& src) volatile noexcept {
+  //
+  // Templated, so as not to be a copy assignment operator (Kokkos issue #2577)
+  // Intended to behave as
+  //    void operator=(const complex&) volatile noexcept
+  //
+  // Use cases:
+  //    complex r;
+  //    const complex cr;
+  //    volatile complex vl;
+  //    vl = r;
+  //    vl = cr;
+  template <class Complex,
+            typename std::enable_if<std::is_same<Complex, complex>::value,
+                                    int>::type = 0>
+  KOKKOS_INLINE_FUNCTION void operator=(const Complex& src) volatile noexcept {
     re_ = src.re_;
     im_ = src.im_;
     // We deliberately do not return anything here.  See explanation
@@ -308,16 +327,45 @@ class
 
   //! Assignment operator, volatile LHS and volatile RHS
   // TODO Should this return void like the other volatile assignment operators?
+  //
+  // Templated, so as not to be a copy assignment operator (Kokkos issue #2577)
+  // Intended to behave as
+  //    volatile complex& operator=(const volatile complex&) volatile noexcept
+  //
+  // Use cases:
+  //    volatile complex vr;
+  //    const volatile complex cvr;
+  //    volatile complex vl;
+  //    vl = vr;
+  //    vl = cvr;
+  template <class Complex,
+            typename std::enable_if<std::is_same<Complex, complex>::value,
+                                    int>::type = 0>
   KOKKOS_INLINE_FUNCTION volatile complex& operator=(
-      const volatile complex<RealType>& src) volatile noexcept {
+      const volatile Complex& src) volatile noexcept {
     re_ = src.re_;
     im_ = src.im_;
     return *this;
   }
 
   //! Assignment operator, volatile RHS and non-volatile LHS
+  //
+  // Templated, so as not to be a copy assignment operator (Kokkos issue #2577)
+  // Intended to behave as
+  //    complex& operator=(const volatile complex&) noexcept
+  //
+  // Use cases:
+  //    volatile complex vr;
+  //    const volatile complex cvr;
+  //    complex l;
+  //    l = vr;
+  //    l = cvr;
+  //
+  template <class Complex,
+            typename std::enable_if<std::is_same<Complex, complex>::value,
+                                    int>::type = 0>
   KOKKOS_INLINE_FUNCTION complex& operator=(
-      const volatile complex<RealType>& src) noexcept {
+      const volatile Complex& src) noexcept {
     re_ = src.re_;
     im_ = src.im_;
     return *this;
@@ -650,7 +698,8 @@ KOKKOS_INLINE_FUNCTION RealType real(const complex<RealType>& x) noexcept {
 //! Absolute value (magnitude) of a complex number.
 template <class RealType>
 KOKKOS_INLINE_FUNCTION RealType abs(const complex<RealType>& x) {
-#ifndef __CUDA_ARCH__
+#if !defined(__CUDA_ARCH__) && \
+    !defined(__HIP_DEVICE_COMPILE__)  // FIXME_CUDA FIXME_HIP
   using std::hypot;
 #endif
   return hypot(x.real(), x.imag());
@@ -660,20 +709,32 @@ KOKKOS_INLINE_FUNCTION RealType abs(const complex<RealType>& x) {
 template <class RealType>
 KOKKOS_INLINE_FUNCTION Kokkos::complex<RealType> pow(const complex<RealType>& x,
                                                      const RealType& e) {
-  RealType r   = abs(x);
-  RealType phi = std::atan(x.imag() / x.real());
-  return std::pow(r, e) *
-         Kokkos::complex<RealType>(std::cos(phi * e), std::sin(phi * e));
+  RealType r = abs(x);
+#if !defined(__HIP_DEVICE_COMPILE__)  // FIXME_HIP
+  using std::atan;
+  using std::cos;
+  using std::pow;
+  using std::sin;
+#endif
+  using ::pow;
+  RealType phi = atan(x.imag() / x.real());
+  return pow(r, e) * Kokkos::complex<RealType>(cos(phi * e), sin(phi * e));
 }
 
 //! Square root of a complex number.
 template <class RealType>
 KOKKOS_INLINE_FUNCTION Kokkos::complex<RealType> sqrt(
     const complex<RealType>& x) {
-  RealType r   = abs(x);
-  RealType phi = std::atan(x.imag() / x.real());
-  return std::sqrt(r) *
-         Kokkos::complex<RealType>(std::cos(phi * 0.5), std::sin(phi * 0.5));
+  RealType r = abs(x);
+#if !defined(__HIP_DEVICE_COMPILE__)  // FIXME_HIP
+  using std::atan;
+  using std::cos;
+  using std::sin;
+  using std::sqrt;
+#endif
+  using ::sqrt;
+  RealType phi = atan(x.imag() / x.real());
+  return sqrt(r) * Kokkos::complex<RealType>(cos(phi * 0.5), sin(phi * 0.5));
 }
 
 //! Conjugate of a complex number.
@@ -686,8 +747,14 @@ KOKKOS_INLINE_FUNCTION complex<RealType> conj(
 //! Exponential of a complex number.
 template <class RealType>
 KOKKOS_INLINE_FUNCTION complex<RealType> exp(const complex<RealType>& x) {
-  return std::exp(x.real()) *
-         complex<RealType>(std::cos(x.imag()), std::sin(x.imag()));
+#if !defined(__HIP_DEVICE_COMPILE__)  // FIXME_HIP
+  using std::cos;
+  using std::exp;
+  using std::sin;
+#else
+  using ::exp;
+#endif
+  return exp(x.real()) * complex<RealType>(cos(x.imag()), sin(x.imag()));
 }
 
 /// This function cannot be called in a CUDA device function,
@@ -720,9 +787,12 @@ KOKKOS_INLINE_FUNCTION
   // Scale (by the "1-norm" of y) to avoid unwarranted overflow.
   // If the real part is +/-Inf and the imaginary part is -/+Inf,
   // this won't change the result.
+#if !defined(__HIP_DEVICE_COMPILE__)  // FIXME_HIP
+  using std::fabs;
+#endif
   typedef
       typename std::common_type<RealType1, RealType2>::type common_real_type;
-  const common_real_type s = std::fabs(real(y)) + std::fabs(imag(y));
+  const common_real_type s = fabs(real(y)) + fabs(imag(y));
 
   // If s is 0, then y is zero, so x/y == real(x)/0 + i*imag(x)/0.
   // In that case, the relation x/y == (x/s) / (y/s) doesn't hold,
diff --git a/kokkos/core/src/Kokkos_Concepts.hpp b/kokkos/core/src/Kokkos_Concepts.hpp
index f81705297..13d7925c1 100644
--- a/kokkos/core/src/Kokkos_Concepts.hpp
+++ b/kokkos/core/src/Kokkos_Concepts.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -153,19 +153,17 @@ namespace Kokkos {
     template <typename, typename = std::true_type>                             \
     struct have : std::false_type {};                                          \
     template <typename U>                                                      \
-    struct have<U, typename std::is_base_of<                                   \
-                       typename std::remove_cv<typename U::CONCEPT>::type,     \
-                       typename std::remove_cv<U>::type>::type>                \
+    struct have<U, typename std::is_base_of<typename U::CONCEPT, U>::type>     \
         : std::true_type {};                                                   \
     template <typename U>                                                      \
     struct have<U,                                                             \
-                typename std::is_base_of<                                      \
-                    typename std::remove_cv<typename U::CONCEPT##_type>::type, \
-                    typename std::remove_cv<U>::type>::type>                   \
+                typename std::is_base_of<typename U::CONCEPT##_type, U>::type> \
         : std::true_type {};                                                   \
                                                                                \
    public:                                                                     \
-    enum { value = is_##CONCEPT::template have<T>::value };                    \
+    static constexpr bool value =                                              \
+        is_##CONCEPT::template have<typename std::remove_cv<T>::type>::value;  \
+    constexpr operator bool() const noexcept { return value; }                 \
   };
 
 // Public concept:
@@ -205,6 +203,43 @@ KOKKOS_IMPL_IS_CONCEPT(host_thread_team_member)
 
 }  // namespace Kokkos
 
+namespace Kokkos {
+namespace Impl {
+
+template <class Object>
+class has_member_team_shmem_size {
+  template <typename T>
+  static int32_t test_for_member(decltype(&T::team_shmem_size)) {
+    return int32_t(0);
+  }
+  template <typename T>
+  static int64_t test_for_member(...) {
+    return int64_t(0);
+  }
+
+ public:
+  constexpr static bool value =
+      sizeof(test_for_member<Object>(0)) == sizeof(int32_t);
+};
+
+template <class Object>
+class has_member_shmem_size {
+  template <typename T>
+  static int32_t test_for_member(decltype(&T::shmem_size_me)) {
+    return int32_t(0);
+  }
+  template <typename T>
+  static int64_t test_for_member(...) {
+    return int64_t(0);
+  }
+
+ public:
+  constexpr static bool value =
+      sizeof(test_for_member<Object>(0)) == sizeof(int32_t);
+};
+
+}  // namespace Impl
+}  // namespace Kokkos
 //----------------------------------------------------------------------------
 
 namespace Kokkos {
@@ -220,6 +255,23 @@ struct Device {
   typedef Device<execution_space, memory_space> device_type;
 };
 
+namespace Impl {
+
+template <typename T>
+struct is_device_helper : std::false_type {};
+
+template <typename ExecutionSpace, typename MemorySpace>
+struct is_device_helper<Device<ExecutionSpace, MemorySpace>> : std::true_type {
+};
+
+}  // namespace Impl
+
+template <typename T>
+using is_device =
+    typename Impl::is_device_helper<typename std::remove_cv<T>::type>::type;
+
+//----------------------------------------------------------------------------
+
 template <typename T>
 struct is_space {
  private:
@@ -259,12 +311,17 @@ struct is_space {
     typedef typename U::device_type space;
   };
 
-  typedef typename is_space::template exe<T> is_exe;
-  typedef typename is_space::template mem<T> is_mem;
-  typedef typename is_space::template dev<T> is_dev;
+  typedef typename is_space::template exe<typename std::remove_cv<T>::type>
+      is_exe;
+  typedef typename is_space::template mem<typename std::remove_cv<T>::type>
+      is_mem;
+  typedef typename is_space::template dev<typename std::remove_cv<T>::type>
+      is_dev;
 
  public:
-  enum { value = is_exe::value || is_mem::value || is_dev::value };
+  static constexpr bool value = is_exe::value || is_mem::value || is_dev::value;
+
+  constexpr operator bool() const noexcept { return value; }
 
   typedef typename is_exe::space execution_space;
   typedef typename is_mem::space memory_space;
@@ -300,11 +357,11 @@ struct is_space {
   typedef typename std::conditional<
       std::is_same<execution_space, host_execution_space>::value &&
           std::is_same<memory_space, host_memory_space>::value,
-      T, Kokkos::Device<host_execution_space, host_memory_space> >::type
+      T, Kokkos::Device<host_execution_space, host_memory_space>>::type
       host_mirror_space;
 };
 
-// For backward compatiblity
+// For backward compatibility
 
 namespace Impl {
 
@@ -426,7 +483,7 @@ struct SpaceAccessibility {
       std::is_same<typename AccessSpace::memory_space, MemorySpace>::value ||
           !exe_access::accessible,
       AccessSpace,
-      Kokkos::Device<typename AccessSpace::execution_space, MemorySpace> >::type
+      Kokkos::Device<typename AccessSpace::execution_space, MemorySpace>>::type
       space;
 };
 
diff --git a/kokkos/core/src/Kokkos_CopyViews.hpp b/kokkos/core/src/Kokkos_CopyViews.hpp
index 327cb666c..810b71273 100644
--- a/kokkos/core/src/Kokkos_CopyViews.hpp
+++ b/kokkos/core/src/Kokkos_CopyViews.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -84,7 +84,7 @@ struct ViewFill<ViewType, Layout, ExecSpace, 0, iType, ETIAvail> {
   ViewType a;
   typename ViewType::const_value_type val;
   typedef typename ViewType::non_const_value_type ST;
-  ViewFill(const ViewType&, const ST&);
+  ViewFill(const ViewType&, const ST&, const ExecSpace&);
 };
 
 template <class ViewType, class Layout, class ExecSpace, typename iType,
@@ -93,7 +93,7 @@ struct ViewFill<ViewType, Layout, ExecSpace, 1, iType, ETIAvail> {
   ViewType a;
   typename ViewType::const_value_type val;
   typedef typename ViewType::non_const_value_type ST;
-  ViewFill(const ViewType&, const ST&);
+  ViewFill(const ViewType&, const ST&, const ExecSpace&);
   KOKKOS_INLINE_FUNCTION
   void operator()(const iType&) const;
 };
@@ -104,7 +104,7 @@ struct ViewFill<ViewType, Layout, ExecSpace, 2, iType, ETIAvail> {
   ViewType a;
   typename ViewType::const_value_type val;
   typedef typename ViewType::non_const_value_type ST;
-  ViewFill(const ViewType&, const ST&);
+  ViewFill(const ViewType&, const ST&, const ExecSpace&);
   KOKKOS_INLINE_FUNCTION
   void operator()(const iType&, const iType&) const;
 };
@@ -115,7 +115,7 @@ struct ViewFill<ViewType, Layout, ExecSpace, 3, iType, ETIAvail> {
   ViewType a;
   typename ViewType::const_value_type val;
   typedef typename ViewType::non_const_value_type ST;
-  ViewFill(const ViewType&, const ST&);
+  ViewFill(const ViewType&, const ST&, const ExecSpace&);
   KOKKOS_INLINE_FUNCTION
   void operator()(const iType&, const iType&, const iType&) const;
 };
@@ -126,7 +126,7 @@ struct ViewFill<ViewType, Layout, ExecSpace, 4, iType, ETIAvail> {
   ViewType a;
   typename ViewType::const_value_type val;
   typedef typename ViewType::non_const_value_type ST;
-  ViewFill(const ViewType&, const ST&);
+  ViewFill(const ViewType&, const ST&, const ExecSpace&);
   KOKKOS_INLINE_FUNCTION
   void operator()(const iType&, const iType&, const iType&, const iType&) const;
 };
@@ -137,7 +137,7 @@ struct ViewFill<ViewType, Layout, ExecSpace, 5, iType, ETIAvail> {
   ViewType a;
   typename ViewType::const_value_type val;
   typedef typename ViewType::non_const_value_type ST;
-  ViewFill(const ViewType&, const ST&);
+  ViewFill(const ViewType&, const ST&, const ExecSpace&);
   KOKKOS_INLINE_FUNCTION
   void operator()(const iType&, const iType&, const iType&, const iType&,
                   const iType&) const;
@@ -149,7 +149,7 @@ struct ViewFill<ViewType, Layout, ExecSpace, 6, iType, ETIAvail> {
   ViewType a;
   typename ViewType::const_value_type val;
   typedef typename ViewType::non_const_value_type ST;
-  ViewFill(const ViewType&, const ST&);
+  ViewFill(const ViewType&, const ST&, const ExecSpace&);
   KOKKOS_INLINE_FUNCTION
   void operator()(const iType&, const iType&, const iType&, const iType&,
                   const iType&, const iType&) const;
@@ -161,7 +161,7 @@ struct ViewFill<ViewType, Layout, ExecSpace, 7, iType, ETIAvail> {
   ViewType a;
   typename ViewType::const_value_type val;
   typedef typename ViewType::non_const_value_type ST;
-  ViewFill(const ViewType&, const ST&);
+  ViewFill(const ViewType&, const ST&, const ExecSpace&);
   KOKKOS_INLINE_FUNCTION
   void operator()(const iType&, const iType&, const iType&, const iType&,
                   const iType&, const iType&, const iType&) const;
@@ -173,7 +173,7 @@ struct ViewFill<ViewType, Layout, ExecSpace, 8, iType, ETIAvail> {
   ViewType a;
   typename ViewType::const_value_type val;
   typedef typename ViewType::non_const_value_type ST;
-  ViewFill(const ViewType&, const ST&);
+  ViewFill(const ViewType&, const ST&, const ExecSpace&);
   KOKKOS_INLINE_FUNCTION
   void operator()(const iType&, const iType&, const iType&, const iType&,
                   const iType&, const iType&, const iType&, const iType&) const;
@@ -183,9 +183,9 @@ template <class ViewType, class Layout, class ExecSpace, typename iType>
 struct ViewFill<ViewType, Layout, ExecSpace, 0, iType,
                 KOKKOS_IMPL_COMPILING_LIBRARY> {
   typedef typename ViewType::non_const_value_type ST;
-  ViewFill(const ViewType& a, const ST& val) {
-    Kokkos::Impl::DeepCopy<typename ViewType::memory_space, Kokkos::HostSpace>(
-        a.data(), &val, sizeof(ST));
+  ViewFill(const ViewType& a, const ST& val, const ExecSpace& space) {
+    Kokkos::Impl::DeepCopy<typename ViewType::memory_space, Kokkos::HostSpace,
+                           ExecSpace>(space, a.data(), &val, sizeof(ST));
   }
 };
 
@@ -196,12 +196,11 @@ struct ViewFill<ViewType, Layout, ExecSpace, 1, iType,
   typename ViewType::const_value_type val;
   typedef Kokkos::RangePolicy<ExecSpace, Kokkos::IndexType<iType>> policy_type;
 
-  ViewFill(const ViewType& a_, typename ViewType::const_value_type& val_)
+  ViewFill(const ViewType& a_, typename ViewType::const_value_type& val_,
+           const ExecSpace& space)
       : a(a_), val(val_) {
-    ExecSpace().fence();
-    Kokkos::parallel_for("Kokkos::ViewFill-1D", policy_type(0, a.extent(0)),
-                         *this);
-    ExecSpace().fence();
+    Kokkos::parallel_for("Kokkos::ViewFill-1D",
+                         policy_type(space, 0, a.extent(0)), *this);
   }
 
   KOKKOS_INLINE_FUNCTION
@@ -221,13 +220,12 @@ struct ViewFill<ViewType, Layout, ExecSpace, 2, iType,
                                 Kokkos::IndexType<iType>>
       policy_type;
 
-  ViewFill(const ViewType& a_, typename ViewType::const_value_type& val_)
+  ViewFill(const ViewType& a_, typename ViewType::const_value_type& val_,
+           const ExecSpace& space)
       : a(a_), val(val_) {
-    ExecSpace().fence();
     Kokkos::parallel_for("Kokkos::ViewFill-2D",
-                         policy_type({0, 0}, {a.extent(0), a.extent(1)}),
+                         policy_type(space, {0, 0}, {a.extent(0), a.extent(1)}),
                          *this);
-    ExecSpace().fence();
   }
 
   KOKKOS_INLINE_FUNCTION
@@ -247,13 +245,13 @@ struct ViewFill<ViewType, Layout, ExecSpace, 3, iType,
                                 Kokkos::IndexType<iType>>
       policy_type;
 
-  ViewFill(const ViewType& a_, typename ViewType::const_value_type& val_)
+  ViewFill(const ViewType& a_, typename ViewType::const_value_type& val_,
+           const ExecSpace& space)
       : a(a_), val(val_) {
-    ExecSpace().fence();
     Kokkos::parallel_for(
         "Kokkos::ViewFill-3D",
-        policy_type({0, 0, 0}, {a.extent(0), a.extent(1), a.extent(2)}), *this);
-    ExecSpace().fence();
+        policy_type(space, {0, 0, 0}, {a.extent(0), a.extent(1), a.extent(2)}),
+        *this);
   }
 
   KOKKOS_INLINE_FUNCTION
@@ -275,14 +273,14 @@ struct ViewFill<ViewType, Layout, ExecSpace, 4, iType,
                                 Kokkos::IndexType<iType>>
       policy_type;
 
-  ViewFill(const ViewType& a_, typename ViewType::const_value_type& val_)
+  ViewFill(const ViewType& a_, typename ViewType::const_value_type& val_,
+           const ExecSpace& space)
       : a(a_), val(val_) {
-    ExecSpace().fence();
-    Kokkos::parallel_for("Kokkos::ViewFill-4D",
-                         policy_type({0, 0, 0, 0}, {a.extent(0), a.extent(1),
-                                                    a.extent(2), a.extent(3)}),
-                         *this);
-    ExecSpace().fence();
+    Kokkos::parallel_for(
+        "Kokkos::ViewFill-4D",
+        policy_type(space, {0, 0, 0, 0},
+                    {a.extent(0), a.extent(1), a.extent(2), a.extent(3)}),
+        *this);
   }
 
   KOKKOS_INLINE_FUNCTION
@@ -305,15 +303,14 @@ struct ViewFill<ViewType, Layout, ExecSpace, 5, iType,
                                 Kokkos::IndexType<iType>>
       policy_type;
 
-  ViewFill(const ViewType& a_, typename ViewType::const_value_type& val_)
+  ViewFill(const ViewType& a_, typename ViewType::const_value_type& val_,
+           const ExecSpace& space)
       : a(a_), val(val_) {
-    ExecSpace().fence();
-    Kokkos::parallel_for(
-        "Kokkos::ViewFill-5D",
-        policy_type({0, 0, 0, 0, 0}, {a.extent(0), a.extent(1), a.extent(2),
+    Kokkos::parallel_for("Kokkos::ViewFill-5D",
+                         policy_type(space, {0, 0, 0, 0, 0},
+                                     {a.extent(0), a.extent(1), a.extent(2),
                                       a.extent(3), a.extent(4)}),
-        *this);
-    ExecSpace().fence();
+                         *this);
   }
 
   KOKKOS_INLINE_FUNCTION
@@ -336,15 +333,14 @@ struct ViewFill<ViewType, Layout, ExecSpace, 6, iType,
                                 Kokkos::IndexType<iType>>
       policy_type;
 
-  ViewFill(const ViewType& a_, typename ViewType::const_value_type& val_)
+  ViewFill(const ViewType& a_, typename ViewType::const_value_type& val_,
+           const ExecSpace& space)
       : a(a_), val(val_) {
-    ExecSpace().fence();
     Kokkos::parallel_for("Kokkos::ViewFill-6D",
-                         policy_type({0, 0, 0, 0, 0, 0},
+                         policy_type(space, {0, 0, 0, 0, 0, 0},
                                      {a.extent(0), a.extent(1), a.extent(2),
                                       a.extent(3), a.extent(4), a.extent(5)}),
                          *this);
-    ExecSpace().fence();
   }
 
   KOKKOS_INLINE_FUNCTION
@@ -367,15 +363,14 @@ struct ViewFill<ViewType, Layout, ExecSpace, 7, iType,
                                 Kokkos::IndexType<iType>>
       policy_type;
 
-  ViewFill(const ViewType& a_, typename ViewType::const_value_type& val_)
+  ViewFill(const ViewType& a_, typename ViewType::const_value_type& val_,
+           const ExecSpace& space)
       : a(a_), val(val_) {
-    ExecSpace().fence();
     Kokkos::parallel_for("Kokkos::ViewFill-7D",
-                         policy_type({0, 0, 0, 0, 0, 0},
+                         policy_type(space, {0, 0, 0, 0, 0, 0},
                                      {a.extent(0), a.extent(1), a.extent(2),
                                       a.extent(3), a.extent(5), a.extent(6)}),
                          *this);
-    ExecSpace().fence();
   }
 
   KOKKOS_INLINE_FUNCTION
@@ -399,15 +394,14 @@ struct ViewFill<ViewType, Layout, ExecSpace, 8, iType,
                                 Kokkos::IndexType<iType>>
       policy_type;
 
-  ViewFill(const ViewType& a_, typename ViewType::const_value_type& val_)
+  ViewFill(const ViewType& a_, typename ViewType::const_value_type& val_,
+           const ExecSpace& space)
       : a(a_), val(val_) {
-    ExecSpace().fence();
     Kokkos::parallel_for("Kokkos::ViewFill-8D",
-                         policy_type({0, 0, 0, 0, 0, 0},
+                         policy_type(space, {0, 0, 0, 0, 0, 0},
                                      {a.extent(0), a.extent(1), a.extent(3),
                                       a.extent(5), a.extent(6), a.extent(7)}),
                          *this);
-    ExecSpace().fence();
   }
 
   KOKKOS_INLINE_FUNCTION
@@ -424,7 +418,7 @@ template <class ViewTypeA, class ViewTypeB, class Layout, class ExecSpace,
 struct ViewCopy<ViewTypeA, ViewTypeB, Layout, ExecSpace, 1, iType, ETIAvail> {
   ViewTypeA a;
   ViewTypeB b;
-  ViewCopy(const ViewTypeA&, const ViewTypeB&);
+  ViewCopy(const ViewTypeA&, const ViewTypeB&, const ExecSpace&);
   KOKKOS_INLINE_FUNCTION
   void operator()(const iType& i0) const;
 };
@@ -434,7 +428,7 @@ template <class ViewTypeA, class ViewTypeB, class Layout, class ExecSpace,
 struct ViewCopy<ViewTypeA, ViewTypeB, Layout, ExecSpace, 2, iType, ETIAvail> {
   ViewTypeA a;
   ViewTypeB b;
-  ViewCopy(const ViewTypeA&, const ViewTypeB&);
+  ViewCopy(const ViewTypeA&, const ViewTypeB&, const ExecSpace&);
   KOKKOS_INLINE_FUNCTION
   void operator()(const iType& i0, const iType& i1) const;
 };
@@ -444,7 +438,7 @@ template <class ViewTypeA, class ViewTypeB, class Layout, class ExecSpace,
 struct ViewCopy<ViewTypeA, ViewTypeB, Layout, ExecSpace, 3, iType, ETIAvail> {
   ViewTypeA a;
   ViewTypeB b;
-  ViewCopy(const ViewTypeA&, const ViewTypeB&);
+  ViewCopy(const ViewTypeA&, const ViewTypeB&, const ExecSpace&);
   KOKKOS_INLINE_FUNCTION
   void operator()(const iType& i0, const iType& i1, const iType& i2) const;
 };
@@ -454,7 +448,7 @@ template <class ViewTypeA, class ViewTypeB, class Layout, class ExecSpace,
 struct ViewCopy<ViewTypeA, ViewTypeB, Layout, ExecSpace, 4, iType, ETIAvail> {
   ViewTypeA a;
   ViewTypeB b;
-  ViewCopy(const ViewTypeA&, const ViewTypeB&);
+  ViewCopy(const ViewTypeA&, const ViewTypeB&, const ExecSpace&);
   KOKKOS_INLINE_FUNCTION
   void operator()(const iType& i0, const iType& i1, const iType& i2,
                   const iType& i3) const;
@@ -465,7 +459,7 @@ template <class ViewTypeA, class ViewTypeB, class Layout, class ExecSpace,
 struct ViewCopy<ViewTypeA, ViewTypeB, Layout, ExecSpace, 5, iType, ETIAvail> {
   ViewTypeA a;
   ViewTypeB b;
-  ViewCopy(const ViewTypeA&, const ViewTypeB&);
+  ViewCopy(const ViewTypeA&, const ViewTypeB&, const ExecSpace&);
   KOKKOS_INLINE_FUNCTION
   void operator()(const iType& i0, const iType& i1, const iType& i2,
                   const iType& i3, const iType& i4) const;
@@ -476,7 +470,7 @@ template <class ViewTypeA, class ViewTypeB, class Layout, class ExecSpace,
 struct ViewCopy<ViewTypeA, ViewTypeB, Layout, ExecSpace, 6, iType, ETIAvail> {
   ViewTypeA a;
   ViewTypeB b;
-  ViewCopy(const ViewTypeA&, const ViewTypeB&);
+  ViewCopy(const ViewTypeA&, const ViewTypeB&, const ExecSpace&);
   KOKKOS_INLINE_FUNCTION
   void operator()(const iType& i0, const iType& i1, const iType& i2,
                   const iType& i3, const iType& i4, const iType& i5) const;
@@ -487,7 +481,7 @@ template <class ViewTypeA, class ViewTypeB, class Layout, class ExecSpace,
 struct ViewCopy<ViewTypeA, ViewTypeB, Layout, ExecSpace, 7, iType, ETIAvail> {
   ViewTypeA a;
   ViewTypeB b;
-  ViewCopy(const ViewTypeA&, const ViewTypeB&);
+  ViewCopy(const ViewTypeA&, const ViewTypeB&, const ExecSpace&);
   KOKKOS_INLINE_FUNCTION
   void operator()(const iType& i0, const iType& i1, const iType& i2,
                   const iType& i3, const iType& i4, const iType& i5,
@@ -499,7 +493,7 @@ template <class ViewTypeA, class ViewTypeB, class Layout, class ExecSpace,
 struct ViewCopy<ViewTypeA, ViewTypeB, Layout, ExecSpace, 8, iType, ETIAvail> {
   ViewTypeA a;
   ViewTypeB b;
-  ViewCopy(const ViewTypeA&, const ViewTypeB&);
+  ViewCopy(const ViewTypeA&, const ViewTypeB&, const ExecSpace&);
   KOKKOS_INLINE_FUNCTION
   void operator()(const iType& i0, const iType& i1, const iType& i2,
                   const iType& i3, const iType& i4, const iType& i5,
@@ -515,11 +509,11 @@ struct ViewCopy<ViewTypeA, ViewTypeB, Layout, ExecSpace, 1, iType,
 
   typedef Kokkos::RangePolicy<ExecSpace, Kokkos::IndexType<iType>> policy_type;
 
-  ViewCopy(const ViewTypeA& a_, const ViewTypeB& b_) : a(a_), b(b_) {
-    ExecSpace().fence();
-    Kokkos::parallel_for("Kokkos::ViewCopy-1D", policy_type(0, a.extent(0)),
-                         *this);
-    ExecSpace().fence();
+  ViewCopy(const ViewTypeA& a_, const ViewTypeB& b_,
+           const ExecSpace space = ExecSpace())
+      : a(a_), b(b_) {
+    Kokkos::parallel_for("Kokkos::ViewCopy-1D",
+                         policy_type(space, 0, a.extent(0)), *this);
   }
 
   KOKKOS_INLINE_FUNCTION
@@ -542,12 +536,12 @@ struct ViewCopy<ViewTypeA, ViewTypeB, Layout, ExecSpace, 2, iType,
                                 Kokkos::IndexType<iType>>
       policy_type;
 
-  ViewCopy(const ViewTypeA& a_, const ViewTypeB& b_) : a(a_), b(b_) {
-    ExecSpace().fence();
+  ViewCopy(const ViewTypeA& a_, const ViewTypeB& b_,
+           const ExecSpace space = ExecSpace())
+      : a(a_), b(b_) {
     Kokkos::parallel_for("Kokkos::ViewCopy-2D",
-                         policy_type({0, 0}, {a.extent(0), a.extent(1)}),
+                         policy_type(space, {0, 0}, {a.extent(0), a.extent(1)}),
                          *this);
-    ExecSpace().fence();
   }
 
   KOKKOS_INLINE_FUNCTION
@@ -573,12 +567,13 @@ struct ViewCopy<ViewTypeA, ViewTypeB, Layout, ExecSpace, 3, iType,
                                 Kokkos::IndexType<iType>>
       policy_type;
 
-  ViewCopy(const ViewTypeA& a_, const ViewTypeB& b_) : a(a_), b(b_) {
-    ExecSpace().fence();
+  ViewCopy(const ViewTypeA& a_, const ViewTypeB& b_,
+           const ExecSpace space = ExecSpace())
+      : a(a_), b(b_) {
     Kokkos::parallel_for(
         "Kokkos::ViewCopy-3D",
-        policy_type({0, 0, 0}, {a.extent(0), a.extent(1), a.extent(2)}), *this);
-    ExecSpace().fence();
+        policy_type(space, {0, 0, 0}, {a.extent(0), a.extent(1), a.extent(2)}),
+        *this);
   }
 
   KOKKOS_INLINE_FUNCTION
@@ -604,13 +599,14 @@ struct ViewCopy<ViewTypeA, ViewTypeB, Layout, ExecSpace, 4, iType,
                                 Kokkos::IndexType<iType>>
       policy_type;
 
-  ViewCopy(const ViewTypeA& a_, const ViewTypeB& b_) : a(a_), b(b_) {
-    ExecSpace().fence();
-    Kokkos::parallel_for("Kokkos::ViewCopy-4D",
-                         policy_type({0, 0, 0, 0}, {a.extent(0), a.extent(1),
-                                                    a.extent(2), a.extent(3)}),
-                         *this);
-    ExecSpace().fence();
+  ViewCopy(const ViewTypeA& a_, const ViewTypeB& b_,
+           const ExecSpace space = ExecSpace())
+      : a(a_), b(b_) {
+    Kokkos::parallel_for(
+        "Kokkos::ViewCopy-4D",
+        policy_type(space, {0, 0, 0, 0},
+                    {a.extent(0), a.extent(1), a.extent(2), a.extent(3)}),
+        *this);
   }
 
   KOKKOS_INLINE_FUNCTION
@@ -637,14 +633,14 @@ struct ViewCopy<ViewTypeA, ViewTypeB, Layout, ExecSpace, 5, iType,
                                 Kokkos::IndexType<iType>>
       policy_type;
 
-  ViewCopy(const ViewTypeA& a_, const ViewTypeB& b_) : a(a_), b(b_) {
-    ExecSpace().fence();
-    Kokkos::parallel_for(
-        "Kokkos::ViewCopy-5D",
-        policy_type({0, 0, 0, 0, 0}, {a.extent(0), a.extent(1), a.extent(2),
+  ViewCopy(const ViewTypeA& a_, const ViewTypeB& b_,
+           const ExecSpace space = ExecSpace())
+      : a(a_), b(b_) {
+    Kokkos::parallel_for("Kokkos::ViewCopy-5D",
+                         policy_type(space, {0, 0, 0, 0, 0},
+                                     {a.extent(0), a.extent(1), a.extent(2),
                                       a.extent(3), a.extent(4)}),
-        *this);
-    ExecSpace().fence();
+                         *this);
   }
 
   KOKKOS_INLINE_FUNCTION
@@ -671,14 +667,14 @@ struct ViewCopy<ViewTypeA, ViewTypeB, Layout, ExecSpace, 6, iType,
                                 Kokkos::IndexType<iType>>
       policy_type;
 
-  ViewCopy(const ViewTypeA& a_, const ViewTypeB& b_) : a(a_), b(b_) {
-    ExecSpace().fence();
+  ViewCopy(const ViewTypeA& a_, const ViewTypeB& b_,
+           const ExecSpace space = ExecSpace())
+      : a(a_), b(b_) {
     Kokkos::parallel_for("Kokkos::ViewCopy-6D",
-                         policy_type({0, 0, 0, 0, 0, 0},
+                         policy_type(space, {0, 0, 0, 0, 0, 0},
                                      {a.extent(0), a.extent(1), a.extent(2),
                                       a.extent(3), a.extent(4), a.extent(5)}),
                          *this);
-    ExecSpace().fence();
   }
 
   KOKKOS_INLINE_FUNCTION
@@ -705,14 +701,14 @@ struct ViewCopy<ViewTypeA, ViewTypeB, Layout, ExecSpace, 7, iType,
                                 Kokkos::IndexType<iType>>
       policy_type;
 
-  ViewCopy(const ViewTypeA& a_, const ViewTypeB& b_) : a(a_), b(b_) {
-    ExecSpace().fence();
+  ViewCopy(const ViewTypeA& a_, const ViewTypeB& b_,
+           const ExecSpace space = ExecSpace())
+      : a(a_), b(b_) {
     Kokkos::parallel_for("Kokkos::ViewCopy-7D",
-                         policy_type({0, 0, 0, 0, 0, 0},
+                         policy_type(space, {0, 0, 0, 0, 0, 0},
                                      {a.extent(0), a.extent(1), a.extent(3),
                                       a.extent(4), a.extent(5), a.extent(6)}),
                          *this);
-    ExecSpace().fence();
   }
 
   KOKKOS_INLINE_FUNCTION
@@ -740,14 +736,14 @@ struct ViewCopy<ViewTypeA, ViewTypeB, Layout, ExecSpace, 8, iType,
                                 Kokkos::IndexType<iType>>
       policy_type;
 
-  ViewCopy(const ViewTypeA& a_, const ViewTypeB& b_) : a(a_), b(b_) {
-    ExecSpace().fence();
+  ViewCopy(const ViewTypeA& a_, const ViewTypeB& b_,
+           const ExecSpace space = ExecSpace())
+      : a(a_), b(b_) {
     Kokkos::parallel_for("Kokkos::ViewCopy-8D",
-                         policy_type({0, 0, 0, 0, 0, 0},
+                         policy_type(space, {0, 0, 0, 0, 0, 0},
                                      {a.extent(0), a.extent(1), a.extent(3),
                                       a.extent(5), a.extent(6), a.extent(7)}),
                          *this);
-    ExecSpace().fence();
   }
 
   KOKKOS_INLINE_FUNCTION
@@ -767,6 +763,85 @@ struct ViewCopy<ViewTypeA, ViewTypeB, Layout, ExecSpace, 8, iType,
 namespace Kokkos {
 namespace Impl {
 
+template <class ExecutionSpace, class DstType, class SrcType>
+void view_copy(const ExecutionSpace& space, const DstType& dst,
+               const SrcType& src) {
+  typedef typename DstType::memory_space dst_memory_space;
+  typedef typename SrcType::memory_space src_memory_space;
+
+  enum {
+    ExecCanAccessSrc =
+        Kokkos::Impl::SpaceAccessibility<ExecutionSpace,
+                                         src_memory_space>::accessible
+  };
+  enum {
+    ExecCanAccessDst =
+        Kokkos::Impl::SpaceAccessibility<ExecutionSpace,
+                                         dst_memory_space>::accessible
+  };
+
+  if (!(ExecCanAccessSrc && ExecCanAccessDst)) {
+    Kokkos::Impl::throw_runtime_exception(
+        "Kokkos::Impl::view_copy called with invalid execution space");
+  } else {
+    // Figure out iteration order in case we need it
+    int64_t strides[DstType::Rank + 1];
+    dst.stride(strides);
+    Kokkos::Iterate iterate;
+    if (Kokkos::is_layouttiled<typename DstType::array_layout>::value) {
+      iterate = Kokkos::layout_iterate_type_selector<
+          typename DstType::array_layout>::outer_iteration_pattern;
+    } else if (std::is_same<typename DstType::array_layout,
+                            Kokkos::LayoutRight>::value) {
+      iterate = Kokkos::Iterate::Right;
+    } else if (std::is_same<typename DstType::array_layout,
+                            Kokkos::LayoutLeft>::value) {
+      iterate = Kokkos::Iterate::Left;
+    } else if (std::is_same<typename DstType::array_layout,
+                            Kokkos::LayoutStride>::value) {
+      if (strides[0] > strides[DstType::Rank - 1])
+        iterate = Kokkos::Iterate::Right;
+      else
+        iterate = Kokkos::Iterate::Left;
+    } else {
+      if (std::is_same<typename DstType::execution_space::array_layout,
+                       Kokkos::LayoutRight>::value)
+        iterate = Kokkos::Iterate::Right;
+      else
+        iterate = Kokkos::Iterate::Left;
+    }
+
+    if ((dst.span() >= size_t(std::numeric_limits<int>::max())) ||
+        (src.span() >= size_t(std::numeric_limits<int>::max()))) {
+      if (iterate == Kokkos::Iterate::Right)
+        Kokkos::Impl::ViewCopy<
+            typename DstType::uniform_runtime_nomemspace_type,
+            typename SrcType::uniform_runtime_const_nomemspace_type,
+            Kokkos::LayoutRight, ExecutionSpace, DstType::Rank, int64_t>(
+            dst, src, space);
+      else
+        Kokkos::Impl::ViewCopy<
+            typename DstType::uniform_runtime_nomemspace_type,
+            typename SrcType::uniform_runtime_const_nomemspace_type,
+            Kokkos::LayoutLeft, ExecutionSpace, DstType::Rank, int64_t>(
+            dst, src, space);
+    } else {
+      if (iterate == Kokkos::Iterate::Right)
+        Kokkos::Impl::ViewCopy<
+            typename DstType::uniform_runtime_nomemspace_type,
+            typename SrcType::uniform_runtime_const_nomemspace_type,
+            Kokkos::LayoutRight, ExecutionSpace, DstType::Rank, int>(dst, src,
+                                                                     space);
+      else
+        Kokkos::Impl::ViewCopy<
+            typename DstType::uniform_runtime_nomemspace_type,
+            typename SrcType::uniform_runtime_const_nomemspace_type,
+            Kokkos::LayoutLeft, ExecutionSpace, DstType::Rank, int>(dst, src,
+                                                                    space);
+    }
+  }
+}
+
 template <class DstType, class SrcType>
 void view_copy(const DstType& dst, const SrcType& src) {
   typedef typename DstType::execution_space dst_execution_space;
@@ -1421,21 +1496,22 @@ inline void deep_copy(
     const View<DT, DP...>& dst,
     typename ViewTraits<DT, DP...>::const_value_type& value,
     typename std::enable_if<std::is_same<
-        typename ViewTraits<DT, DP...>::specialize, void>::value>::type* = 0) {
+        typename ViewTraits<DT, DP...>::specialize, void>::value>::type* =
+        nullptr) {
   typedef View<DT, DP...> ViewType;
+  using exec_space_type = typename ViewType::execution_space;
 
 #if defined(KOKKOS_ENABLE_PROFILING)
   if (Kokkos::Profiling::profileLibraryLoaded()) {
     Kokkos::Profiling::beginDeepCopy(
-        Kokkos::Profiling::SpaceHandle(
-            typename ViewType::memory_space().name()),
+        Kokkos::Profiling::SpaceHandle(ViewType::memory_space::name()),
         dst.label(), dst.data(),
-        Kokkos::Profiling::SpaceHandle(Kokkos::HostSpace().name()), "Scalar",
+        Kokkos::Profiling::SpaceHandle(Kokkos::HostSpace::name()), "Scalar",
         &value, dst.span() * sizeof(typename ViewType::value_type));
   }
 #endif
 
-  if (dst.data() == NULL) {
+  if (dst.data() == nullptr) {
     Kokkos::fence();
 #if defined(KOKKOS_ENABLE_PROFILING)
     if (Kokkos::Profiling::profileLibraryLoaded()) {
@@ -1450,7 +1526,7 @@ inline void deep_copy(
                              typename ViewType::value_type>::value,
                 "deep_copy requires non-const type");
 
-  // If contigous we can simply do a 1D flat loop
+  // If contiguous we can simply do a 1D flat loop
   if (dst.span_is_contiguous()) {
     typedef Kokkos::View<
         typename ViewType::value_type*, Kokkos::LayoutRight,
@@ -1463,13 +1539,13 @@ inline void deep_copy(
 
     ViewTypeFlat dst_flat(dst.data(), dst.size());
     if (dst.span() < static_cast<size_t>(std::numeric_limits<int>::max())) {
-      Kokkos::Impl::ViewFill<ViewTypeFlat, Kokkos::LayoutRight,
-                             typename ViewType::execution_space,
-                             ViewTypeFlat::Rank, int>(dst_flat, value);
+      Kokkos::Impl::ViewFill<ViewTypeFlat, Kokkos::LayoutRight, exec_space_type,
+                             ViewTypeFlat::Rank, int>(dst_flat, value,
+                                                      exec_space_type());
     } else
-      Kokkos::Impl::ViewFill<ViewTypeFlat, Kokkos::LayoutRight,
-                             typename ViewType::execution_space,
-                             ViewTypeFlat::Rank, int64_t>(dst_flat, value);
+      Kokkos::Impl::ViewFill<ViewTypeFlat, Kokkos::LayoutRight, exec_space_type,
+                             ViewTypeFlat::Rank, int64_t>(dst_flat, value,
+                                                          exec_space_type());
     Kokkos::fence();
 #if defined(KOKKOS_ENABLE_PROFILING)
     if (Kokkos::Profiling::profileLibraryLoaded()) {
@@ -1511,21 +1587,21 @@ inline void deep_copy(
   if (dst.span() > static_cast<size_t>(std::numeric_limits<int>::max())) {
     if (iterate == Kokkos::Iterate::Right)
       Kokkos::Impl::ViewFill<ViewTypeUniform, Kokkos::LayoutRight,
-                             typename ViewType::execution_space, ViewType::Rank,
-                             int64_t>(dst, value);
+                             exec_space_type, ViewType::Rank, int64_t>(
+          dst, value, exec_space_type());
     else
       Kokkos::Impl::ViewFill<ViewTypeUniform, Kokkos::LayoutLeft,
-                             typename ViewType::execution_space, ViewType::Rank,
-                             int64_t>(dst, value);
+                             exec_space_type, ViewType::Rank, int64_t>(
+          dst, value, exec_space_type());
   } else {
     if (iterate == Kokkos::Iterate::Right)
       Kokkos::Impl::ViewFill<ViewTypeUniform, Kokkos::LayoutRight,
-                             typename ViewType::execution_space, ViewType::Rank,
-                             int>(dst, value);
+                             exec_space_type, ViewType::Rank, int>(
+          dst, value, exec_space_type());
     else
       Kokkos::Impl::ViewFill<ViewTypeUniform, Kokkos::LayoutLeft,
-                             typename ViewType::execution_space, ViewType::Rank,
-                             int>(dst, value);
+                             exec_space_type, ViewType::Rank, int>(
+          dst, value, exec_space_type());
   }
   Kokkos::fence();
 
@@ -1542,7 +1618,8 @@ inline void deep_copy(
     typename ViewTraits<ST, SP...>::non_const_value_type& dst,
     const View<ST, SP...>& src,
     typename std::enable_if<std::is_same<
-        typename ViewTraits<ST, SP...>::specialize, void>::value>::type* = 0) {
+        typename ViewTraits<ST, SP...>::specialize, void>::value>::type* =
+        nullptr) {
   typedef ViewTraits<ST, SP...> src_traits;
   typedef typename src_traits::memory_space src_memory_space;
 
@@ -1552,14 +1629,14 @@ inline void deep_copy(
 #if defined(KOKKOS_ENABLE_PROFILING)
   if (Kokkos::Profiling::profileLibraryLoaded()) {
     Kokkos::Profiling::beginDeepCopy(
-        Kokkos::Profiling::SpaceHandle(Kokkos::HostSpace().name()), "Scalar",
-        &dst, Kokkos::Profiling::SpaceHandle(src_memory_space().name()),
+        Kokkos::Profiling::SpaceHandle(Kokkos::HostSpace::name()), "Scalar",
+        &dst, Kokkos::Profiling::SpaceHandle(src_memory_space::name()),
         src.label(), src.data(),
         src.span() * sizeof(typename src_traits::value_type));
   }
 #endif
 
-  if (src.data() == NULL) {
+  if (src.data() == nullptr) {
     Kokkos::fence();
 #if defined(KOKKOS_ENABLE_PROFILING)
     if (Kokkos::Profiling::profileLibraryLoaded()) {
@@ -1587,7 +1664,8 @@ inline void deep_copy(
         std::is_same<typename ViewTraits<DT, DP...>::specialize, void>::value &&
         std::is_same<typename ViewTraits<ST, SP...>::specialize, void>::value &&
         (unsigned(ViewTraits<DT, DP...>::rank) == unsigned(0) &&
-         unsigned(ViewTraits<ST, SP...>::rank) == unsigned(0)))>::type* = 0) {
+         unsigned(ViewTraits<ST, SP...>::rank) == unsigned(0)))>::type* =
+        nullptr) {
   typedef View<DT, DP...> dst_type;
   typedef View<ST, SP...> src_type;
 
@@ -1602,14 +1680,14 @@ inline void deep_copy(
 #if defined(KOKKOS_ENABLE_PROFILING)
   if (Kokkos::Profiling::profileLibraryLoaded()) {
     Kokkos::Profiling::beginDeepCopy(
-        Kokkos::Profiling::SpaceHandle(dst_memory_space().name()), dst.label(),
-        dst.data(), Kokkos::Profiling::SpaceHandle(src_memory_space().name()),
+        Kokkos::Profiling::SpaceHandle(dst_memory_space::name()), dst.label(),
+        dst.data(), Kokkos::Profiling::SpaceHandle(src_memory_space::name()),
         src.label(), src.data(),
         src.span() * sizeof(typename dst_type::value_type));
   }
 #endif
 
-  if (dst.data() == NULL && src.data() == NULL) {
+  if (dst.data() == nullptr && src.data() == nullptr) {
     Kokkos::fence();
 #if defined(KOKKOS_ENABLE_PROFILING)
     if (Kokkos::Profiling::profileLibraryLoaded()) {
@@ -1643,7 +1721,7 @@ inline void deep_copy(
         std::is_same<typename ViewTraits<DT, DP...>::specialize, void>::value &&
         std::is_same<typename ViewTraits<ST, SP...>::specialize, void>::value &&
         (unsigned(ViewTraits<DT, DP...>::rank) != 0 ||
-         unsigned(ViewTraits<ST, SP...>::rank) != 0))>::type* = 0) {
+         unsigned(ViewTraits<ST, SP...>::rank) != 0))>::type* = nullptr) {
   typedef View<DT, DP...> dst_type;
   typedef View<ST, SP...> src_type;
   typedef typename dst_type::execution_space dst_execution_space;
@@ -1663,14 +1741,14 @@ inline void deep_copy(
 #if defined(KOKKOS_ENABLE_PROFILING)
   if (Kokkos::Profiling::profileLibraryLoaded()) {
     Kokkos::Profiling::beginDeepCopy(
-        Kokkos::Profiling::SpaceHandle(dst_memory_space().name()), dst.label(),
-        dst.data(), Kokkos::Profiling::SpaceHandle(src_memory_space().name()),
+        Kokkos::Profiling::SpaceHandle(dst_memory_space::name()), dst.label(),
+        dst.data(), Kokkos::Profiling::SpaceHandle(src_memory_space::name()),
         src.label(), src.data(),
         src.span() * sizeof(typename dst_type::value_type));
   }
 #endif
 
-  if (dst.data() == NULL || src.data() == NULL) {
+  if (dst.data() == nullptr || src.data() == nullptr) {
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
     // do nothing
 #else
@@ -1874,7 +1952,7 @@ void KOKKOS_INLINE_FUNCTION local_deep_copy(
     const View<ST, SP...>& src,
     typename std::enable_if<(unsigned(ViewTraits<DT, DP...>::rank) == 1 &&
                              unsigned(ViewTraits<ST, SP...>::rank) ==
-                                 1)>::type* = 0) {
+                                 1)>::type* = nullptr) {
   if (dst.data() == nullptr) {
     return;
   }
@@ -1893,7 +1971,7 @@ void KOKKOS_INLINE_FUNCTION local_deep_copy(
     const View<ST, SP...>& src,
     typename std::enable_if<(unsigned(ViewTraits<DT, DP...>::rank) == 2 &&
                              unsigned(ViewTraits<ST, SP...>::rank) ==
-                                 2)>::type* = 0) {
+                                 2)>::type* = nullptr) {
   if (dst.data() == nullptr) {
     return;
   }
@@ -1921,7 +1999,7 @@ void KOKKOS_INLINE_FUNCTION local_deep_copy(
     const View<ST, SP...>& src,
     typename std::enable_if<(unsigned(ViewTraits<DT, DP...>::rank) == 3 &&
                              unsigned(ViewTraits<ST, SP...>::rank) ==
-                                 3)>::type* = 0) {
+                                 3)>::type* = nullptr) {
   if (dst.data() == nullptr) {
     return;
   }
@@ -1951,7 +2029,7 @@ void KOKKOS_INLINE_FUNCTION local_deep_copy(
     const View<ST, SP...>& src,
     typename std::enable_if<(unsigned(ViewTraits<DT, DP...>::rank) == 4 &&
                              unsigned(ViewTraits<ST, SP...>::rank) ==
-                                 4)>::type* = 0) {
+                                 4)>::type* = nullptr) {
   if (dst.data() == nullptr) {
     return;
   }
@@ -1984,7 +2062,7 @@ void KOKKOS_INLINE_FUNCTION local_deep_copy(
     const View<ST, SP...>& src,
     typename std::enable_if<(unsigned(ViewTraits<DT, DP...>::rank) == 5 &&
                              unsigned(ViewTraits<ST, SP...>::rank) ==
-                                 5)>::type* = 0) {
+                                 5)>::type* = nullptr) {
   if (dst.data() == nullptr) {
     return;
   }
@@ -2019,7 +2097,7 @@ void KOKKOS_INLINE_FUNCTION local_deep_copy(
     const View<ST, SP...>& src,
     typename std::enable_if<(unsigned(ViewTraits<DT, DP...>::rank) == 6 &&
                              unsigned(ViewTraits<ST, SP...>::rank) ==
-                                 6)>::type* = 0) {
+                                 6)>::type* = nullptr) {
   if (dst.data() == nullptr) {
     return;
   }
@@ -2056,7 +2134,7 @@ void KOKKOS_INLINE_FUNCTION local_deep_copy(
     const View<ST, SP...>& src,
     typename std::enable_if<(unsigned(ViewTraits<DT, DP...>::rank) == 7 &&
                              unsigned(ViewTraits<ST, SP...>::rank) ==
-                                 7)>::type* = 0) {
+                                 7)>::type* = nullptr) {
   if (dst.data() == nullptr) {
     return;
   }
@@ -2095,7 +2173,7 @@ void KOKKOS_INLINE_FUNCTION local_deep_copy(
     const View<DT, DP...>& dst, const View<ST, SP...>& src,
     typename std::enable_if<(unsigned(ViewTraits<DT, DP...>::rank) == 1 &&
                              unsigned(ViewTraits<ST, SP...>::rank) ==
-                                 1)>::type* = 0) {
+                                 1)>::type* = nullptr) {
   if (dst.data() == nullptr) {
     return;
   }
@@ -2112,7 +2190,7 @@ void KOKKOS_INLINE_FUNCTION local_deep_copy(
     const View<DT, DP...>& dst, const View<ST, SP...>& src,
     typename std::enable_if<(unsigned(ViewTraits<DT, DP...>::rank) == 2 &&
                              unsigned(ViewTraits<ST, SP...>::rank) ==
-                                 2)>::type* = 0) {
+                                 2)>::type* = nullptr) {
   if (dst.data() == nullptr) {
     return;
   }
@@ -2130,7 +2208,7 @@ void KOKKOS_INLINE_FUNCTION local_deep_copy(
     const View<DT, DP...>& dst, const View<ST, SP...>& src,
     typename std::enable_if<(unsigned(ViewTraits<DT, DP...>::rank) == 3 &&
                              unsigned(ViewTraits<ST, SP...>::rank) ==
-                                 3)>::type* = 0) {
+                                 3)>::type* = nullptr) {
   if (dst.data() == nullptr) {
     return;
   }
@@ -2150,7 +2228,7 @@ void KOKKOS_INLINE_FUNCTION local_deep_copy(
     const View<DT, DP...>& dst, const View<ST, SP...>& src,
     typename std::enable_if<(unsigned(ViewTraits<DT, DP...>::rank) == 4 &&
                              unsigned(ViewTraits<ST, SP...>::rank) ==
-                                 4)>::type* = 0) {
+                                 4)>::type* = nullptr) {
   if (dst.data() == nullptr) {
     return;
   }
@@ -2171,7 +2249,7 @@ void KOKKOS_INLINE_FUNCTION local_deep_copy(
     const View<DT, DP...>& dst, const View<ST, SP...>& src,
     typename std::enable_if<(unsigned(ViewTraits<DT, DP...>::rank) == 5 &&
                              unsigned(ViewTraits<ST, SP...>::rank) ==
-                                 5)>::type* = 0) {
+                                 5)>::type* = nullptr) {
   if (dst.data() == nullptr) {
     return;
   }
@@ -2193,7 +2271,7 @@ void KOKKOS_INLINE_FUNCTION local_deep_copy(
     const View<DT, DP...>& dst, const View<ST, SP...>& src,
     typename std::enable_if<(unsigned(ViewTraits<DT, DP...>::rank) == 6 &&
                              unsigned(ViewTraits<ST, SP...>::rank) ==
-                                 6)>::type* = 0) {
+                                 6)>::type* = nullptr) {
   if (dst.data() == nullptr) {
     return;
   }
@@ -2216,7 +2294,7 @@ void KOKKOS_INLINE_FUNCTION local_deep_copy(
     const View<DT, DP...>& dst, const View<ST, SP...>& src,
     typename std::enable_if<(unsigned(ViewTraits<DT, DP...>::rank) == 7 &&
                              unsigned(ViewTraits<ST, SP...>::rank) ==
-                                 7)>::type* = 0) {
+                                 7)>::type* = nullptr) {
   if (dst.data() == nullptr) {
     return;
   }
@@ -2260,7 +2338,7 @@ void KOKKOS_INLINE_FUNCTION local_deep_copy(
     const TeamType& team, const View<DT, DP...>& dst,
     typename ViewTraits<DT, DP...>::const_value_type& value,
     typename std::enable_if<(unsigned(ViewTraits<DT, DP...>::rank) ==
-                             1)>::type* = 0) {
+                             1)>::type* = nullptr) {
   if (dst.data() == nullptr) {
     return;
   }
@@ -2278,7 +2356,7 @@ void KOKKOS_INLINE_FUNCTION local_deep_copy(
     const TeamType& team, const View<DT, DP...>& dst,
     typename ViewTraits<DT, DP...>::const_value_type& value,
     typename std::enable_if<(unsigned(ViewTraits<DT, DP...>::rank) ==
-                             2)>::type* = 0) {
+                             2)>::type* = nullptr) {
   if (dst.data() == nullptr) {
     return;
   }
@@ -2305,7 +2383,7 @@ void KOKKOS_INLINE_FUNCTION local_deep_copy(
     const TeamType& team, const View<DT, DP...>& dst,
     typename ViewTraits<DT, DP...>::const_value_type& value,
     typename std::enable_if<(unsigned(ViewTraits<DT, DP...>::rank) ==
-                             3)>::type* = 0) {
+                             3)>::type* = nullptr) {
   if (dst.data() == nullptr) {
     return;
   }
@@ -2334,7 +2412,7 @@ void KOKKOS_INLINE_FUNCTION local_deep_copy(
     const TeamType& team, const View<DT, DP...>& dst,
     typename ViewTraits<DT, DP...>::const_value_type& value,
     typename std::enable_if<(unsigned(ViewTraits<DT, DP...>::rank) ==
-                             4)>::type* = 0) {
+                             4)>::type* = nullptr) {
   if (dst.data() == nullptr) {
     return;
   }
@@ -2366,7 +2444,7 @@ void KOKKOS_INLINE_FUNCTION local_deep_copy(
     const TeamType& team, const View<DT, DP...>& dst,
     typename ViewTraits<DT, DP...>::const_value_type& value,
     typename std::enable_if<(unsigned(ViewTraits<DT, DP...>::rank) ==
-                             5)>::type* = 0) {
+                             5)>::type* = nullptr) {
   if (dst.data() == nullptr) {
     return;
   }
@@ -2400,7 +2478,7 @@ void KOKKOS_INLINE_FUNCTION local_deep_copy(
     const TeamType& team, const View<DT, DP...>& dst,
     typename ViewTraits<DT, DP...>::const_value_type& value,
     typename std::enable_if<(unsigned(ViewTraits<DT, DP...>::rank) ==
-                             6)>::type* = 0) {
+                             6)>::type* = nullptr) {
   if (dst.data() == nullptr) {
     return;
   }
@@ -2436,7 +2514,7 @@ void KOKKOS_INLINE_FUNCTION local_deep_copy(
     const TeamType& team, const View<DT, DP...>& dst,
     typename ViewTraits<DT, DP...>::const_value_type& value,
     typename std::enable_if<(unsigned(ViewTraits<DT, DP...>::rank) ==
-                             7)>::type* = 0) {
+                             7)>::type* = nullptr) {
   if (dst.data() == nullptr) {
     return;
   }
@@ -2475,7 +2553,7 @@ void KOKKOS_INLINE_FUNCTION local_deep_copy(
     const View<DT, DP...>& dst,
     typename ViewTraits<DT, DP...>::const_value_type& value,
     typename std::enable_if<(unsigned(ViewTraits<DT, DP...>::rank) ==
-                             1)>::type* = 0) {
+                             1)>::type* = nullptr) {
   if (dst.data() == nullptr) {
     return;
   }
@@ -2492,7 +2570,7 @@ void KOKKOS_INLINE_FUNCTION local_deep_copy(
     const View<DT, DP...>& dst,
     typename ViewTraits<DT, DP...>::const_value_type& value,
     typename std::enable_if<(unsigned(ViewTraits<DT, DP...>::rank) ==
-                             2)>::type* = 0) {
+                             2)>::type* = nullptr) {
   if (dst.data() == nullptr) {
     return;
   }
@@ -2510,7 +2588,7 @@ void KOKKOS_INLINE_FUNCTION local_deep_copy(
     const View<DT, DP...>& dst,
     typename ViewTraits<DT, DP...>::const_value_type& value,
     typename std::enable_if<(unsigned(ViewTraits<DT, DP...>::rank) ==
-                             3)>::type* = 0) {
+                             3)>::type* = nullptr) {
   if (dst.data() == nullptr) {
     return;
   }
@@ -2529,7 +2607,7 @@ void KOKKOS_INLINE_FUNCTION local_deep_copy(
     const View<DT, DP...>& dst,
     typename ViewTraits<DT, DP...>::const_value_type& value,
     typename std::enable_if<(unsigned(ViewTraits<DT, DP...>::rank) ==
-                             4)>::type* = 0) {
+                             4)>::type* = nullptr) {
   if (dst.data() == nullptr) {
     return;
   }
@@ -2550,7 +2628,7 @@ void KOKKOS_INLINE_FUNCTION local_deep_copy(
     const View<DT, DP...>& dst,
     typename ViewTraits<DT, DP...>::const_value_type& value,
     typename std::enable_if<(unsigned(ViewTraits<DT, DP...>::rank) ==
-                             5)>::type* = 0) {
+                             5)>::type* = nullptr) {
   if (dst.data() == nullptr) {
     return;
   }
@@ -2572,7 +2650,7 @@ void KOKKOS_INLINE_FUNCTION local_deep_copy(
     const View<DT, DP...>& dst,
     typename ViewTraits<DT, DP...>::const_value_type& value,
     typename std::enable_if<(unsigned(ViewTraits<DT, DP...>::rank) ==
-                             6)>::type* = 0) {
+                             6)>::type* = nullptr) {
   if (dst.data() == nullptr) {
     return;
   }
@@ -2595,7 +2673,7 @@ void KOKKOS_INLINE_FUNCTION local_deep_copy(
     const View<DT, DP...>& dst,
     typename ViewTraits<DT, DP...>::const_value_type& value,
     typename std::enable_if<(unsigned(ViewTraits<DT, DP...>::rank) ==
-                             7)>::type* = 0) {
+                             7)>::type* = nullptr) {
   if (dst.data() == nullptr) {
     return;
   }
@@ -2621,33 +2699,88 @@ void KOKKOS_INLINE_FUNCTION local_deep_copy(
 
 namespace Kokkos {
 
-/** \brief  Deep copy a value from Host memory into a view.  */
+/** \brief  Deep copy a value from Host memory into a view. ExecSpace can access
+ * dst */
 template <class ExecSpace, class DT, class... DP>
 inline void deep_copy(
-    const ExecSpace&, const View<DT, DP...>& dst,
+    const ExecSpace& space, const View<DT, DP...>& dst,
     typename ViewTraits<DT, DP...>::const_value_type& value,
     typename std::enable_if<
         Kokkos::Impl::is_execution_space<ExecSpace>::value &&
-        std::is_same<typename ViewTraits<DT, DP...>::specialize,
-                     void>::value>::type* = 0) {
+        std::is_same<typename ViewTraits<DT, DP...>::specialize, void>::value &&
+        Kokkos::Impl::SpaceAccessibility<
+            ExecSpace,
+            typename ViewTraits<DT, DP...>::memory_space>::accessible>::type* =
+        nullptr) {
   typedef ViewTraits<DT, DP...> dst_traits;
+  static_assert(std::is_same<typename dst_traits::non_const_value_type,
+                             typename dst_traits::value_type>::value,
+                "deep_copy requires non-const type");
+#if defined(KOKKOS_ENABLE_PROFILING)
   typedef typename dst_traits::memory_space dst_memory_space;
+  if (Kokkos::Profiling::profileLibraryLoaded()) {
+    Kokkos::Profiling::beginDeepCopy(
+        Kokkos::Profiling::SpaceHandle(dst_memory_space::name()), dst.label(),
+        dst.data(), Kokkos::Profiling::SpaceHandle(Kokkos::HostSpace::name()),
+        "(none)", &value, dst.span() * sizeof(typename dst_traits::value_type));
+  }
+#endif
+  if (dst.data() == nullptr) {
+    space.fence();
+  } else {
+    using ViewTypeUniform = typename std::conditional<
+        View<DT, DP...>::Rank == 0,
+        typename View<DT, DP...>::uniform_runtime_type,
+        typename View<DT, DP...>::uniform_runtime_nomemspace_type>::type;
+    Kokkos::Impl::ViewFill<ViewTypeUniform, typename dst_traits::array_layout,
+                           ExecSpace>(dst, value, space);
+  }
+#if defined(KOKKOS_ENABLE_PROFILING)
+  if (Kokkos::Profiling::profileLibraryLoaded()) {
+    Kokkos::Profiling::endDeepCopy();
+  }
+#endif
+}
+
+/** \brief  Deep copy a value from Host memory into a view. ExecSpace can not
+ * access dst */
+template <class ExecSpace, class DT, class... DP>
+inline void deep_copy(
+    const ExecSpace& space, const View<DT, DP...>& dst,
+    typename ViewTraits<DT, DP...>::const_value_type& value,
+    typename std::enable_if<
+        Kokkos::Impl::is_execution_space<ExecSpace>::value &&
+        std::is_same<typename ViewTraits<DT, DP...>::specialize, void>::value &&
+        !Kokkos::Impl::SpaceAccessibility<
+            ExecSpace,
+            typename ViewTraits<DT, DP...>::memory_space>::accessible>::type* =
+        nullptr) {
+  typedef ViewTraits<DT, DP...> dst_traits;
   static_assert(std::is_same<typename dst_traits::non_const_value_type,
                              typename dst_traits::value_type>::value,
                 "deep_copy requires non-const type");
 #if defined(KOKKOS_ENABLE_PROFILING)
+  typedef typename dst_traits::memory_space dst_memory_space;
   if (Kokkos::Profiling::profileLibraryLoaded()) {
     Kokkos::Profiling::beginDeepCopy(
-        Kokkos::Profiling::SpaceHandle(dst_memory_space().name()), dst.label(),
-        dst.data(), Kokkos::Profiling::SpaceHandle(Kokkos::HostSpace().name()),
+        Kokkos::Profiling::SpaceHandle(dst_memory_space::name()), dst.label(),
+        dst.data(), Kokkos::Profiling::SpaceHandle(Kokkos::HostSpace::name()),
         "(none)", &value, dst.span() * sizeof(typename dst_traits::value_type));
   }
 #endif
-  ExecSpace().fence();
-  typedef
-      typename View<DT, DP...>::uniform_runtime_nomemspace_type ViewTypeUniform;
-  Kokkos::Impl::ViewFill<ViewTypeUniform>(dst, value);
-  ExecSpace().fence();
+  if (dst.data() == nullptr) {
+    space.fence();
+  } else {
+    space.fence();
+    using ViewTypeUniform = typename std::conditional<
+        View<DT, DP...>::Rank == 0,
+        typename View<DT, DP...>::uniform_runtime_type,
+        typename View<DT, DP...>::uniform_runtime_nomemspace_type>::type;
+    using fill_exec_space = typename dst_traits::memory_space::execution_space;
+    Kokkos::Impl::ViewFill<ViewTypeUniform, typename dst_traits::array_layout,
+                           fill_exec_space>(dst, value, fill_exec_space());
+    fill_exec_space().fence();
+  }
 #if defined(KOKKOS_ENABLE_PROFILING)
   if (Kokkos::Profiling::profileLibraryLoaded()) {
     Kokkos::Profiling::endDeepCopy();
@@ -2672,13 +2805,13 @@ inline void deep_copy(
 #if defined(KOKKOS_ENABLE_PROFILING)
   if (Kokkos::Profiling::profileLibraryLoaded()) {
     Kokkos::Profiling::beginDeepCopy(
-        Kokkos::Profiling::SpaceHandle(Kokkos::HostSpace().name()), "(none)",
-        &dst, Kokkos::Profiling::SpaceHandle(src_memory_space().name()),
+        Kokkos::Profiling::SpaceHandle(Kokkos::HostSpace::name()), "(none)",
+        &dst, Kokkos::Profiling::SpaceHandle(src_memory_space::name()),
         src.label(), src.data(), sizeof(ST));
   }
 #endif
 
-  if (src.data() == NULL) {
+  if (src.data() == nullptr) {
     exec_space.fence();
 #if defined(KOKKOS_ENABLE_PROFILING)
     if (Kokkos::Profiling::profileLibraryLoaded()) {
@@ -2721,13 +2854,13 @@ inline void deep_copy(
 #if defined(KOKKOS_ENABLE_PROFILING)
   if (Kokkos::Profiling::profileLibraryLoaded()) {
     Kokkos::Profiling::beginDeepCopy(
-        Kokkos::Profiling::SpaceHandle(dst_memory_space().name()), dst.label(),
-        dst.data(), Kokkos::Profiling::SpaceHandle(src_memory_space().name()),
+        Kokkos::Profiling::SpaceHandle(dst_memory_space::name()), dst.label(),
+        dst.data(), Kokkos::Profiling::SpaceHandle(src_memory_space::name()),
         src.label(), src.data(), sizeof(DT));
   }
 #endif
 
-  if (dst.data() == NULL && src.data() == NULL) {
+  if (dst.data() == nullptr && src.data() == nullptr) {
     exec_space.fence();
 #if defined(KOKKOS_ENABLE_PROFILING)
     if (Kokkos::Profiling::profileLibraryLoaded()) {
@@ -2737,13 +2870,11 @@ inline void deep_copy(
     return;
   }
 
-  exec_space.fence();
   if (dst.data() != src.data()) {
     Kokkos::Impl::DeepCopy<dst_memory_space, src_memory_space, ExecSpace>(
         exec_space, dst.data(), src.data(),
         sizeof(typename dst_traits::value_type));
   }
-  exec_space.fence();
 #if defined(KOKKOS_ENABLE_PROFILING)
   if (Kokkos::Profiling::profileLibraryLoaded()) {
     Kokkos::Profiling::endDeepCopy();
@@ -2764,7 +2895,7 @@ inline void deep_copy(
         std::is_same<typename ViewTraits<DT, DP...>::specialize, void>::value &&
         std::is_same<typename ViewTraits<ST, SP...>::specialize, void>::value &&
         (unsigned(ViewTraits<DT, DP...>::rank) != 0 ||
-         unsigned(ViewTraits<ST, SP...>::rank) != 0))>::type* = 0) {
+         unsigned(ViewTraits<ST, SP...>::rank) != 0))>::type* = nullptr) {
   typedef View<DT, DP...> dst_type;
   typedef View<ST, SP...> src_type;
 
@@ -2785,13 +2916,21 @@ inline void deep_copy(
 #if defined(KOKKOS_ENABLE_PROFILING)
   if (Kokkos::Profiling::profileLibraryLoaded()) {
     Kokkos::Profiling::beginDeepCopy(
-        Kokkos::Profiling::SpaceHandle(dst_memory_space().name()), dst.label(),
-        dst.data(), Kokkos::Profiling::SpaceHandle(src_memory_space().name()),
+        Kokkos::Profiling::SpaceHandle(dst_memory_space::name()), dst.label(),
+        dst.data(), Kokkos::Profiling::SpaceHandle(src_memory_space::name()),
         src.label(), src.data(), dst.span() * sizeof(dst_value_type));
   }
 #endif
 
-  if (dst.data() == NULL || src.data() == NULL) {
+  dst_value_type* dst_start = dst.data();
+  dst_value_type* dst_end   = dst.data() + dst.span();
+  src_value_type* src_start = src.data();
+  src_value_type* src_end   = src.data() + src.span();
+
+  // Early dropout if identical range
+  if ((dst_start == nullptr || src_start == nullptr) ||
+      ((std::ptrdiff_t(dst_start) == std::ptrdiff_t(src_start)) &&
+       (std::ptrdiff_t(dst_end) == std::ptrdiff_t(src_end)))) {
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
     // do nothing
 #else
@@ -2823,7 +2962,6 @@ inline void deep_copy(
       Kokkos::Impl::throw_runtime_exception(message);
     }
 #endif
-    exec_space.fence();
 #if defined(KOKKOS_ENABLE_PROFILING)
     if (Kokkos::Profiling::profileLibraryLoaded()) {
       Kokkos::Profiling::endDeepCopy();
@@ -2851,11 +2989,7 @@ inline void deep_copy(
                                          dst_memory_space>::accessible
   };
 
-  // Checking for Overlapping Views.
-  dst_value_type* dst_start = dst.data();
-  dst_value_type* dst_end   = dst.data() + dst.span();
-  src_value_type* src_start = src.data();
-  src_value_type* src_end   = src.data() + src.span();
+  // Error out for non-identical overlapping views.
   if ((((std::ptrdiff_t)dst_start < (std::ptrdiff_t)src_end) &&
        ((std::ptrdiff_t)dst_end > (std::ptrdiff_t)src_start)) &&
       ((dst.span_is_contiguous() && src.span_is_contiguous()))) {
@@ -2881,23 +3015,27 @@ inline void deep_copy(
       (src.extent(4) != dst.extent(4)) || (src.extent(5) != dst.extent(5)) ||
       (src.extent(6) != dst.extent(6)) || (src.extent(7) != dst.extent(7))) {
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-    exec_space.fence();
     if (ExecCanAccessSrcDst) {
       Kokkos::Impl::ViewRemap<dst_type, src_type, ExecSpace>(dst, src);
+      exec_space.fence();
     } else if (DstExecCanAccessSrc) {
       // Copying data between views in accessible memory spaces and either
       // non-contiguous or incompatible shape.
-      Kokkos::Impl::ViewRemap<dst_type, src_type>(dst, src);
+      exec_space.fence();
+      Kokkos::Impl::ViewRemap<dst_type, src_type, dst_execution_space>(dst,
+                                                                       src);
+      dst_execution_space().fence();
     } else if (SrcExecCanAccessDst) {
       // Copying data between views in accessible memory spaces and either
       // non-contiguous or incompatible shape.
+      exec_space.fence();
       Kokkos::Impl::ViewRemap<dst_type, src_type, src_execution_space>(dst,
                                                                        src);
+      src_execution_space().fence();
     } else {
       Kokkos::Impl::throw_runtime_exception(
           "deep_copy given views that would require a temporary allocation");
     }
-    exec_space.fence();
 #if defined(KOKKOS_ENABLE_PROFILING)
     if (Kokkos::Profiling::profileLibraryLoaded()) {
       Kokkos::Profiling::endDeepCopy();
@@ -2946,16 +3084,26 @@ inline void deep_copy(
       ((dst_type::rank < 7) || (dst.stride_6() == src.stride_6())) &&
       ((dst_type::rank < 8) || (dst.stride_7() == src.stride_7()))) {
     const size_t nbytes = sizeof(typename dst_type::value_type) * dst.span();
-    exec_space.fence();
     if ((void*)dst.data() != (void*)src.data()) {
       Kokkos::Impl::DeepCopy<dst_memory_space, src_memory_space, ExecSpace>(
           exec_space, dst.data(), src.data(), nbytes);
     }
-    exec_space.fence();
   } else {
-    exec_space.fence();
-    Impl::view_copy(dst, src);
-    exec_space.fence();
+    // Copying data between views in accessible memory spaces and either
+    // non-contiguous or incompatible shape.
+    if (ExecCanAccessSrcDst) {
+      Impl::view_copy(exec_space, dst, src);
+    } else if (DstExecCanAccessSrc || SrcExecCanAccessDst) {
+      using cpy_exec_space =
+          typename std::conditional<DstExecCanAccessSrc, dst_execution_space,
+                                    src_execution_space>::type;
+      exec_space.fence();
+      Impl::view_copy(cpy_exec_space(), dst, src);
+      cpy_exec_space().fence();
+    } else {
+      Kokkos::Impl::throw_runtime_exception(
+          "deep_copy given views that would require a temporary allocation");
+    }
   }
 #if defined(KOKKOS_ENABLE_PROFILING)
   if (Kokkos::Profiling::profileLibraryLoaded()) {
@@ -3285,7 +3433,7 @@ inline typename Kokkos::View<T, P...>::HostMirror create_mirror(
     typename std::enable_if<
         std::is_same<typename ViewTraits<T, P...>::specialize, void>::value &&
         !std::is_same<typename Kokkos::ViewTraits<T, P...>::array_layout,
-                      Kokkos::LayoutStride>::value>::type* = 0) {
+                      Kokkos::LayoutStride>::value>::type* = nullptr) {
   typedef View<T, P...> src_type;
   typedef typename src_type::HostMirror dst_type;
 
@@ -3321,7 +3469,7 @@ inline typename Kokkos::View<T, P...>::HostMirror create_mirror(
     typename std::enable_if<
         std::is_same<typename ViewTraits<T, P...>::specialize, void>::value &&
         std::is_same<typename Kokkos::ViewTraits<T, P...>::array_layout,
-                     Kokkos::LayoutStride>::value>::type* = 0) {
+                     Kokkos::LayoutStride>::value>::type* = nullptr) {
   typedef View<T, P...> src_type;
   typedef typename src_type::HostMirror dst_type;
 
@@ -3353,7 +3501,8 @@ template <class Space, class T, class... P>
 typename Impl::MirrorType<Space, T, P...>::view_type create_mirror(
     const Space&, const Kokkos::View<T, P...>& src,
     typename std::enable_if<std::is_same<
-        typename ViewTraits<T, P...>::specialize, void>::value>::type* = 0) {
+        typename ViewTraits<T, P...>::specialize, void>::value>::type* =
+        nullptr) {
   return typename Impl::MirrorType<Space, T, P...>::view_type(src.label(),
                                                               src.layout());
 }
@@ -3367,7 +3516,7 @@ inline typename Kokkos::View<T, P...>::HostMirror create_mirror_view(
              typename Kokkos::View<T, P...>::HostMirror::memory_space>::value &&
          std::is_same<typename Kokkos::View<T, P...>::data_type,
                       typename Kokkos::View<T, P...>::HostMirror::data_type>::
-             value)>::type* = 0) {
+             value)>::type* = nullptr) {
   return src;
 }
 
@@ -3389,7 +3538,8 @@ template <class Space, class T, class... P>
 typename Impl::MirrorViewType<Space, T, P...>::view_type create_mirror_view(
     const Space&, const Kokkos::View<T, P...>& src,
     typename std::enable_if<
-        Impl::MirrorViewType<Space, T, P...>::is_same_memspace>::type* = 0) {
+        Impl::MirrorViewType<Space, T, P...>::is_same_memspace>::type* =
+        nullptr) {
   return src;
 }
 
@@ -3411,8 +3561,10 @@ create_mirror_view_and_copy(
     const Space&, const Kokkos::View<T, P...>& src,
     std::string const& name = "",
     typename std::enable_if<
-        Impl::MirrorViewType<Space, T, P...>::is_same_memspace>::type* = 0) {
+        Impl::MirrorViewType<Space, T, P...>::is_same_memspace>::type* =
+        nullptr) {
   (void)name;
+  fence();  // same behavior as deep_copy(src, src)
   return src;
 }
 
@@ -3427,7 +3579,8 @@ create_mirror_view_and_copy(
         !Impl::MirrorViewType<Space, T, P...>::is_same_memspace>::type* = 0) {
   using Mirror      = typename Impl::MirrorViewType<Space, T, P...>::view_type;
   std::string label = name.empty() ? src.label() : name;
-  auto mirror = Mirror(ViewAllocateWithoutInitializing(label), src.layout());
+  auto mirror       = typename Mirror::non_const_type{
+      ViewAllocateWithoutInitializing(label), src.layout()};
   deep_copy(mirror, src);
   return mirror;
 }
@@ -3439,7 +3592,8 @@ typename Impl::MirrorViewType<Space, T, P...>::view_type create_mirror_view(
     const Space&, const Kokkos::View<T, P...>& src,
     Kokkos::Impl::WithoutInitializing_t,
     typename std::enable_if<
-        Impl::MirrorViewType<Space, T, P...>::is_same_memspace>::type* = 0) {
+        Impl::MirrorViewType<Space, T, P...>::is_same_memspace>::type* =
+        nullptr) {
   return src;
 }
 
diff --git a/kokkos/core/src/Kokkos_Core.hpp b/kokkos/core/src/Kokkos_Core.hpp
index 7caffd37d..8392f0f3e 100644
--- a/kokkos/core/src/Kokkos_Core.hpp
+++ b/kokkos/core/src/Kokkos_Core.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -58,13 +58,9 @@
 #include <Kokkos_OpenMP.hpp>
 #endif
 
-//#if defined( KOKKOS_ENABLE_OPENMPTARGET )
+#if defined(KOKKOS_ENABLE_OPENMPTARGET)
 #include <Kokkos_OpenMPTarget.hpp>
 #include <Kokkos_OpenMPTargetSpace.hpp>
-//#endif
-
-#if defined(KOKKOS_ENABLE_QTHREADS)
-#include <Kokkos_Qthreads.hpp>
 #endif
 
 #if defined(KOKKOS_ENABLE_HPX)
@@ -82,6 +78,9 @@
 #if defined(KOKKOS_ENABLE_ROCM)
 #include <Kokkos_ROCm.hpp>
 #endif
+#if defined(KOKKOS_ENABLE_HIP)
+#include <Kokkos_HIP.hpp>
+#endif
 
 #include <Kokkos_AnonymousSpace.hpp>
 #include <Kokkos_Pair.hpp>
@@ -93,9 +92,7 @@
 #include <Kokkos_hwloc.hpp>
 #include <Kokkos_Timer.hpp>
 #include <Kokkos_TaskScheduler.hpp>
-
 #include <Kokkos_Complex.hpp>
-
 #include <Kokkos_CopyViews.hpp>
 #include <functional>
 #include <iosfwd>
@@ -123,7 +120,15 @@ struct InitArguments {
 
 void initialize(int& narg, char* arg[]);
 
-void initialize(const InitArguments& args = InitArguments());
+void initialize(InitArguments args = InitArguments());
+
+namespace Impl {
+
+void pre_initialize(const InitArguments& args);
+
+void post_initialize(const InitArguments& args);
+
+}  // namespace Impl
 
 bool is_initialized() noexcept;
 
diff --git a/kokkos/core/src/Kokkos_Core_fwd.hpp b/kokkos/core/src/Kokkos_Core_fwd.hpp
index a904a8173..4828a9577 100644
--- a/kokkos/core/src/Kokkos_Core_fwd.hpp
+++ b/kokkos/core/src/Kokkos_Core_fwd.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -99,10 +99,6 @@ class HBWSpace;  /// Memory space for hbw_malloc from memkind (e.g. for KNL
 class Serial;  ///< Execution space main process on CPU.
 #endif
 
-#if defined(KOKKOS_ENABLE_QTHREADS)
-class Qthreads;  ///< Execution space with Qthreads back-end.
-#endif
-
 #if defined(KOKKOS_ENABLE_HPX)
 namespace Experimental {
 class HPX;  ///< Execution space with HPX back-end.
@@ -124,13 +120,6 @@ class OpenMPTargetSpace;
 }  // namespace Experimental
 #endif
 
-#if defined(KOKKOS_ENABLE_CUDA)
-class CudaSpace;            ///< Memory space on Cuda GPU
-class CudaUVMSpace;         ///< Memory space on Cuda GPU with UVM
-class CudaHostPinnedSpace;  ///< Memory space on Host accessible to Cuda GPU
-class Cuda;                 ///< Execution space for Cuda GPU
-#endif
-
 #if defined(KOKKOS_ENABLE_ROCM)
 namespace Experimental {
 class ROCmSpace;  ///< Memory space on ROCm GPU
@@ -138,11 +127,20 @@ class ROCm;       ///< Execution space for ROCm GPU
 }  // namespace Experimental
 #endif
 
+#if defined(KOKKOS_ENABLE_HIP)
+namespace Experimental {
+class HIPSpace;  ///< Memory space on HIP GPU
+class HIP;       ///< Execution space for HIP GPU
+}  // namespace Experimental
+#endif
+
 template <class ExecutionSpace, class MemorySpace>
 struct Device;
 
 }  // namespace Kokkos
 
+#include "Cuda/Kokkos_Cuda_fwd.hpp"
+
 //----------------------------------------------------------------------------
 // Set the default execution space.
 
@@ -157,44 +155,42 @@ namespace Kokkos {
 typedef Cuda DefaultExecutionSpace;
 #elif defined(KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_OPENMPTARGET)
 typedef Experimental::OpenMPTarget DefaultExecutionSpace;
+#elif defined(KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_HIP)
+typedef Experimental::HIP DefaultExecutionSpace;
 #elif defined(KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_ROCM)
 typedef Experimental::ROCm DefaultExecutionSpace;
 #elif defined(KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_OPENMP)
 typedef OpenMP DefaultExecutionSpace;
 #elif defined(KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_THREADS)
 typedef Threads DefaultExecutionSpace;
-//#elif defined( KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_QTHREADS )
-//  typedef Qthreads DefaultExecutionSpace;
 #elif defined(KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_HPX)
 typedef Kokkos::Experimental::HPX DefaultExecutionSpace;
 #elif defined(KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_SERIAL)
 typedef Serial DefaultExecutionSpace;
 #else
 #error \
-    "At least one of the following execution spaces must be defined in order to use Kokkos: Kokkos::Cuda, Kokkos::Experimental::OpenMPTarget, Kokkos::OpenMP, Kokkos::Threads, Kokkos::Qthreads, or Kokkos::Serial."
+    "At least one of the following execution spaces must be defined in order to use Kokkos: Kokkos::Cuda, Kokkos::Experimental::HIP, Kokkos::Experimental::OpenMPTarget, Kokkos::OpenMP, Kokkos::Threads, Kokkos::Experimental::HPX, or Kokkos::Serial."
 #endif
 
 #if defined(KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_OPENMP)
 typedef OpenMP DefaultHostExecutionSpace;
 #elif defined(KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_THREADS)
 typedef Threads DefaultHostExecutionSpace;
-//#elif defined( KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_QTHREADS )
-//  typedef Qthreads DefaultHostExecutionSpace;
+#elif defined(KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_HPX)
+typedef Kokkos::Experimental::HPX DefaultHostExecutionSpace;
 #elif defined(KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_SERIAL)
 typedef Serial DefaultHostExecutionSpace;
 #elif defined(KOKKOS_ENABLE_OPENMP)
 typedef OpenMP DefaultHostExecutionSpace;
 #elif defined(KOKKOS_ENABLE_THREADS)
 typedef Threads DefaultHostExecutionSpace;
-//#elif defined( KOKKOS_ENABLE_QTHREADS )
-//  typedef Qthreads DefaultHostExecutionSpace;
 #elif defined(KOKKOS_ENABLE_HPX)
 typedef Kokkos::Experimental::HPX DefaultHostExecutionSpace;
 #elif defined(KOKKOS_ENABLE_SERIAL)
 typedef Serial DefaultHostExecutionSpace;
 #else
 #error \
-    "At least one of the following execution spaces must be defined in order to use Kokkos: Kokkos::OpenMP, Kokkos::Threads, Kokkos::Qthreads, or Kokkos::Serial."
+    "At least one of the following execution spaces must be defined in order to use Kokkos: Kokkos::OpenMP, Kokkos::Threads, Kokkos::Experimental::HPX, or Kokkos::Serial."
 #endif
 
 }  // namespace Kokkos
@@ -213,6 +209,8 @@ namespace Impl {
 typedef Kokkos::CudaSpace ActiveExecutionMemorySpace;
 #elif defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_ROCM_GPU)
 typedef Kokkos::HostSpace ActiveExecutionMemorySpace;
+#elif defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HIP_GPU)
+typedef Kokkos::Experimental::HIPSpace ActiveExecutionMemorySpace;
 #elif defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST)
 typedef Kokkos::HostSpace ActiveExecutionMemorySpace;
 #else
diff --git a/kokkos/core/src/Kokkos_Crs.hpp b/kokkos/core/src/Kokkos_Crs.hpp
index 4b209d819..3725ba260 100644
--- a/kokkos/core/src/Kokkos_Crs.hpp
+++ b/kokkos/core/src/Kokkos_Crs.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -105,12 +105,12 @@ class Crs {
   /*
    * Default Constructors, operators and destructor
    */
-  KOKKOS_FUNCTION Crs()           = default;
-  KOKKOS_FUNCTION Crs(Crs const&) = default;
-  KOKKOS_FUNCTION Crs(Crs&&)      = default;
-  KOKKOS_FUNCTION Crs& operator=(Crs const&) = default;
-  KOKKOS_FUNCTION Crs& operator=(Crs&&) = default;
-  KOKKOS_FUNCTION ~Crs()                = default;
+  KOKKOS_DEFAULTED_FUNCTION Crs()           = default;
+  KOKKOS_DEFAULTED_FUNCTION Crs(Crs const&) = default;
+  KOKKOS_DEFAULTED_FUNCTION Crs(Crs&&)      = default;
+  KOKKOS_DEFAULTED_FUNCTION Crs& operator=(Crs const&) = default;
+  KOKKOS_DEFAULTED_FUNCTION Crs& operator=(Crs&&) = default;
+  KOKKOS_DEFAULTED_FUNCTION ~Crs()                = default;
 
   /** \brief Assign to a view of the rhs array.
    *         If the old view is the last view
@@ -313,7 +313,7 @@ struct CountAndFillBase;
 
 template <class CrsType, class Functor, class ExecutionSpace>
 struct CountAndFillBase {
-  using data_type    = typename CrsType::size_type;
+  using data_type    = typename CrsType::data_type;
   using size_type    = typename CrsType::size_type;
   using row_map_type = typename CrsType::row_map_type;
   using counts_type  = row_map_type;
@@ -343,7 +343,7 @@ struct CountAndFillBase {
 #if defined(KOKKOS_ENABLE_CUDA)
 template <class CrsType, class Functor>
 struct CountAndFillBase<CrsType, Functor, Kokkos::Cuda> {
-  using data_type    = typename CrsType::size_type;
+  using data_type    = typename CrsType::data_type;
   using size_type    = typename CrsType::size_type;
   using row_map_type = typename CrsType::row_map_type;
   using counts_type  = row_map_type;
diff --git a/kokkos/core/src/Kokkos_Cuda.hpp b/kokkos/core/src/Kokkos_Cuda.hpp
index b1e565471..ed51e9577 100644
--- a/kokkos/core/src/Kokkos_Cuda.hpp
+++ b/kokkos/core/src/Kokkos_Cuda.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -199,8 +199,7 @@ class Cuda {
   //--------------------------------------------------
   //! \name  Cuda space instances
 
-  KOKKOS_INLINE_FUNCTION
-  ~Cuda() {}
+  ~Cuda() = default;
 
   Cuda();
 
@@ -258,6 +257,7 @@ class Cuda {
 
   cudaStream_t cuda_stream() const;
   int cuda_device() const;
+  const cudaDeviceProp& cuda_device_prop() const;
 
   //@}
   //--------------------------------------------------------------------------
@@ -267,11 +267,21 @@ class Cuda {
   inline Impl::CudaInternal* impl_internal_space_instance() const {
     return m_space_instance;
   }
+  uint32_t impl_instance_id() const noexcept { return 0; }
 
  private:
   Impl::CudaInternal* m_space_instance;
 };
 
+namespace Profiling {
+namespace Experimental {
+template <>
+struct DeviceTypeTraits<Cuda> {
+  /// \brief An ID to differentiate (for example) Serial from OpenMP in Tooling
+  static constexpr DeviceType id = DeviceType::Cuda;
+};
+}  // namespace Experimental
+}  // namespace Profiling
 }  // namespace Kokkos
 
 /*--------------------------------------------------------------------------*/
diff --git a/kokkos/core/src/Kokkos_CudaSpace.hpp b/kokkos/core/src/Kokkos_CudaSpace.hpp
index 42e5bd53d..53e3b7778 100644
--- a/kokkos/core/src/Kokkos_CudaSpace.hpp
+++ b/kokkos/core/src/Kokkos_CudaSpace.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -130,7 +130,7 @@ int* atomic_lock_array_cuda_space_ptr(bool deallocate = false);
 /// global memory.
 ///
 /// Team and Thread private scratch allocations in
-/// global memory are aquired via locks.
+/// global memory are acquired via locks.
 /// This function retrieves the lock array pointer.
 /// If the array is not yet allocated it will do so.
 int* scratch_lock_array_cuda_space_ptr(bool deallocate = false);
@@ -166,7 +166,7 @@ class CudaUVMSpace {
 
   /*--------------------------------*/
   /** \brief  CudaUVMSpace specific routine */
-  static int number_of_allocations();
+  KOKKOS_DEPRECATED static int number_of_allocations();
 
   /*--------------------------------*/
 
@@ -401,6 +401,126 @@ struct DeepCopy<HostSpace, CudaSpace, Cuda> {
   DeepCopy(const Cuda&, void* dst, const void* src, size_t);
 };
 
+template <>
+struct DeepCopy<CudaUVMSpace, CudaUVMSpace, Cuda> {
+  DeepCopy(void* dst, const void* src, size_t n) {
+    (void)DeepCopy<CudaSpace, CudaSpace, Cuda>(dst, src, n);
+  }
+  DeepCopy(const Cuda& instance, void* dst, const void* src, size_t n) {
+    (void)DeepCopy<CudaSpace, CudaSpace, Cuda>(instance, dst, src, n);
+  }
+};
+
+template <>
+struct DeepCopy<CudaUVMSpace, HostSpace, Cuda> {
+  DeepCopy(void* dst, const void* src, size_t n) {
+    (void)DeepCopy<CudaSpace, HostSpace, Cuda>(dst, src, n);
+  }
+  DeepCopy(const Cuda& instance, void* dst, const void* src, size_t n) {
+    (void)DeepCopy<CudaSpace, HostSpace, Cuda>(instance, dst, src, n);
+  }
+};
+
+template <>
+struct DeepCopy<HostSpace, CudaUVMSpace, Cuda> {
+  DeepCopy(void* dst, const void* src, size_t n) {
+    (void)DeepCopy<HostSpace, CudaSpace, Cuda>(dst, src, n);
+  }
+  DeepCopy(const Cuda& instance, void* dst, const void* src, size_t n) {
+    (void)DeepCopy<HostSpace, CudaSpace, Cuda>(instance, dst, src, n);
+  }
+};
+
+template <>
+struct DeepCopy<CudaHostPinnedSpace, CudaHostPinnedSpace, Cuda> {
+  DeepCopy(void* dst, const void* src, size_t n) {
+    (void)DeepCopy<CudaSpace, CudaSpace, Cuda>(dst, src, n);
+  }
+  DeepCopy(const Cuda& instance, void* dst, const void* src, size_t n) {
+    (void)DeepCopy<CudaSpace, CudaSpace, Cuda>(instance, dst, src, n);
+  }
+};
+
+template <>
+struct DeepCopy<CudaHostPinnedSpace, HostSpace, Cuda> {
+  DeepCopy(void* dst, const void* src, size_t n) {
+    (void)DeepCopy<CudaSpace, HostSpace, Cuda>(dst, src, n);
+  }
+  DeepCopy(const Cuda& instance, void* dst, const void* src, size_t n) {
+    (void)DeepCopy<CudaSpace, HostSpace, Cuda>(instance, dst, src, n);
+  }
+};
+
+template <>
+struct DeepCopy<HostSpace, CudaHostPinnedSpace, Cuda> {
+  DeepCopy(void* dst, const void* src, size_t n) {
+    (void)DeepCopy<HostSpace, CudaSpace, Cuda>(dst, src, n);
+  }
+  DeepCopy(const Cuda& instance, void* dst, const void* src, size_t n) {
+    (void)DeepCopy<HostSpace, CudaSpace, Cuda>(instance, dst, src, n);
+  }
+};
+
+template <>
+struct DeepCopy<CudaUVMSpace, CudaSpace, Cuda> {
+  DeepCopy(void* dst, const void* src, size_t n) {
+    (void)DeepCopy<CudaSpace, CudaSpace, Cuda>(dst, src, n);
+  }
+  DeepCopy(const Cuda& instance, void* dst, const void* src, size_t n) {
+    (void)DeepCopy<CudaSpace, CudaSpace, Cuda>(instance, dst, src, n);
+  }
+};
+
+template <>
+struct DeepCopy<CudaSpace, CudaUVMSpace, Cuda> {
+  DeepCopy(void* dst, const void* src, size_t n) {
+    (void)DeepCopy<CudaSpace, CudaSpace, Cuda>(dst, src, n);
+  }
+  DeepCopy(const Cuda& instance, void* dst, const void* src, size_t n) {
+    (void)DeepCopy<CudaSpace, CudaSpace, Cuda>(instance, dst, src, n);
+  }
+};
+
+template <>
+struct DeepCopy<CudaUVMSpace, CudaHostPinnedSpace, Cuda> {
+  DeepCopy(void* dst, const void* src, size_t n) {
+    (void)DeepCopy<CudaSpace, CudaSpace, Cuda>(dst, src, n);
+  }
+  DeepCopy(const Cuda& instance, void* dst, const void* src, size_t n) {
+    (void)DeepCopy<CudaSpace, CudaSpace, Cuda>(instance, dst, src, n);
+  }
+};
+
+template <>
+struct DeepCopy<CudaHostPinnedSpace, CudaUVMSpace, Cuda> {
+  DeepCopy(void* dst, const void* src, size_t n) {
+    (void)DeepCopy<CudaSpace, CudaSpace, Cuda>(dst, src, n);
+  }
+  DeepCopy(const Cuda& instance, void* dst, const void* src, size_t n) {
+    (void)DeepCopy<CudaSpace, CudaSpace, Cuda>(instance, dst, src, n);
+  }
+};
+
+template <>
+struct DeepCopy<CudaSpace, CudaHostPinnedSpace, Cuda> {
+  DeepCopy(void* dst, const void* src, size_t n) {
+    (void)DeepCopy<CudaSpace, CudaSpace, Cuda>(dst, src, n);
+  }
+  DeepCopy(const Cuda& instance, void* dst, const void* src, size_t n) {
+    (void)DeepCopy<CudaSpace, CudaSpace, Cuda>(instance, dst, src, n);
+  }
+};
+
+template <>
+struct DeepCopy<CudaHostPinnedSpace, CudaSpace, Cuda> {
+  DeepCopy(void* dst, const void* src, size_t n) {
+    (void)DeepCopy<CudaSpace, CudaSpace, Cuda>(dst, src, n);
+  }
+  DeepCopy(const Cuda& instance, void* dst, const void* src, size_t n) {
+    (void)DeepCopy<CudaSpace, CudaSpace, Cuda>(instance, dst, src, n);
+  }
+};
+
 template <class ExecutionSpace>
 struct DeepCopy<CudaSpace, CudaSpace, ExecutionSpace> {
   inline DeepCopy(void* dst, const void* src, size_t n) {
@@ -640,8 +760,8 @@ struct VerifyExecutionCanAccessMemorySpace<Kokkos::CudaSpace,
 /** Running in CudaSpace attempting to access an unknown space: error */
 template <class OtherSpace>
 struct VerifyExecutionCanAccessMemorySpace<
-    typename enable_if<!is_same<Kokkos::CudaSpace, OtherSpace>::value,
-                       Kokkos::CudaSpace>::type,
+    typename std::enable_if<!std::is_same<Kokkos::CudaSpace, OtherSpace>::value,
+                            Kokkos::CudaSpace>::type,
     OtherSpace> {
   enum { value = false };
   KOKKOS_INLINE_FUNCTION static void verify(void) {
diff --git a/kokkos/core/src/Kokkos_ExecPolicy.hpp b/kokkos/core/src/Kokkos_ExecPolicy.hpp
index d52c2612e..11910138d 100644
--- a/kokkos/core/src/Kokkos_ExecPolicy.hpp
+++ b/kokkos/core/src/Kokkos_ExecPolicy.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -193,6 +193,7 @@ class RangePolicy : public Impl::PolicyTraits<Properties...> {
   inline void set(const ChunkSize& chunksize, Args... args) {
     m_granularity      = chunksize.value;
     m_granularity_mask = m_granularity - 1;
+    set(args...);
   }
 
  public:
@@ -210,8 +211,8 @@ class RangePolicy : public Impl::PolicyTraits<Properties...> {
  private:
   /** \brief finalize chunk_size if it was set to AUTO*/
   inline void set_auto_chunk_size() {
-    typename traits::index_type concurrency =
-        traits::execution_space::concurrency();
+    int64_t concurrency =
+        static_cast<int64_t>(traits::execution_space::concurrency());
     if (concurrency == 0) concurrency = 1;
 
     if (m_granularity > 0) {
@@ -219,12 +220,14 @@ class RangePolicy : public Impl::PolicyTraits<Properties...> {
         Kokkos::abort("RangePolicy blocking granularity must be power of two");
     }
 
-    member_type new_chunk_size = 1;
-    while (new_chunk_size * 100 * concurrency < m_end - m_begin)
+    int64_t new_chunk_size = 1;
+    while (new_chunk_size * 100 * concurrency <
+           static_cast<int64_t>(m_end - m_begin))
       new_chunk_size *= 2;
     if (new_chunk_size < 128) {
       new_chunk_size = 1;
-      while ((new_chunk_size * 40 * concurrency < m_end - m_begin) &&
+      while ((new_chunk_size * 40 * concurrency <
+              static_cast<int64_t>(m_end - m_begin)) &&
              (new_chunk_size < 128))
         new_chunk_size *= 2;
     }
@@ -483,7 +486,6 @@ struct ScratchRequest {
     level      = level_;
     per_team   = 0;
     per_thread = thread_value.value;
-    ;
   }
 
   inline ScratchRequest(const int& level_, const Impl::PerTeamValue& team_value,
@@ -491,7 +493,6 @@ struct ScratchRequest {
     level      = level_;
     per_team   = team_value.value;
     per_thread = thread_value.value;
-    ;
   }
 
   inline ScratchRequest(const int& level_,
@@ -500,7 +501,6 @@ struct ScratchRequest {
     level      = level_;
     per_team   = team_value.value;
     per_thread = thread_value.value;
-    ;
   }
 };
 
diff --git a/kokkos/core/src/Kokkos_Extents.hpp b/kokkos/core/src/Kokkos_Extents.hpp
index a972993fb..856adf9cf 100644
--- a/kokkos/core/src/Kokkos_Extents.hpp
+++ b/kokkos/core/src/Kokkos_Extents.hpp
@@ -23,10 +23,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -97,36 +97,39 @@ struct _parse_impl {
 // backwards
 template <class T, ptrdiff_t... ExtentSpec>
 struct _parse_impl<
-    T*, Experimental::Extents<ExtentSpec...>,
+    T*, Kokkos::Experimental::Extents<ExtentSpec...>,
     typename std::enable_if<_all_remaining_extents_dynamic<T>::value>::type>
-    : _parse_impl<T, Experimental::Extents<Experimental::dynamic_extent,
-                                           ExtentSpec...>> {};
+    : _parse_impl<T, Kokkos::Experimental::Extents<
+                         Kokkos::Experimental::dynamic_extent, ExtentSpec...>> {
+};
 
 // int*(*[x])[y] should still work also (meaning int[][x][][y])
 template <class T, ptrdiff_t... ExtentSpec>
-struct _parse_impl<T*, Experimental::Extents<ExtentSpec...>,
-                   typename std::enable_if<
-                       not _all_remaining_extents_dynamic<T>::value>::type> {
+struct _parse_impl<
+    T*, Kokkos::Experimental::Extents<ExtentSpec...>,
+    typename std::enable_if<!_all_remaining_extents_dynamic<T>::value>::type> {
   using _next = Kokkos::Experimental::AppendExtent<
-      typename _parse_impl<T, Experimental::Extents<ExtentSpec...>, void>::type,
-      Experimental::dynamic_extent>;
+      typename _parse_impl<T, Kokkos::Experimental::Extents<ExtentSpec...>,
+                           void>::type,
+      Kokkos::Experimental::dynamic_extent>;
   using type = typename _next::type;
 };
 
 template <class T, ptrdiff_t... ExtentSpec, unsigned N>
-struct _parse_impl<T[N], Experimental::Extents<ExtentSpec...>, void>
-    : _parse_impl<T, Experimental::Extents<ExtentSpec...,
+struct _parse_impl<T[N], Kokkos::Experimental::Extents<ExtentSpec...>, void>
+    : _parse_impl<
+          T, Kokkos::Experimental::Extents<ExtentSpec...,
                                            ptrdiff_t(N)>  // TODO @pedantic this
                                                           // could be a
                                                           // narrowing cast
-                  > {};
+          > {};
 
 }  // end namespace _parse_view_extents_impl
 
 template <class DataType>
 struct ParseViewExtents {
   using type = typename _parse_view_extents_impl ::_parse_impl<
-      DataType, Experimental::Extents<>>::type;
+      DataType, Kokkos::Experimental::Extents<>>::type;
 };
 
 template <class ValueType, ptrdiff_t Ext>
@@ -135,7 +138,7 @@ struct ApplyExtent {
 };
 
 template <class ValueType>
-struct ApplyExtent<ValueType, Experimental::dynamic_extent> {
+struct ApplyExtent<ValueType, Kokkos::Experimental::dynamic_extent> {
   using type = ValueType*;
 };
 
@@ -150,15 +153,17 @@ struct ApplyExtent<ValueType*, Ext> {
 };
 
 template <class ValueType>
-struct ApplyExtent<ValueType*, Experimental::dynamic_extent> {
+struct ApplyExtent<ValueType*, Kokkos::Experimental::dynamic_extent> {
   using type =
-      typename ApplyExtent<ValueType, Experimental::dynamic_extent>::type*;
+      typename ApplyExtent<ValueType,
+                           Kokkos::Experimental::dynamic_extent>::type*;
 };
 
 template <class ValueType, unsigned N>
-struct ApplyExtent<ValueType[N], Experimental::dynamic_extent> {
+struct ApplyExtent<ValueType[N], Kokkos::Experimental::dynamic_extent> {
   using type =
-      typename ApplyExtent<ValueType, Experimental::dynamic_extent>::type[N];
+      typename ApplyExtent<ValueType,
+                           Kokkos::Experimental::dynamic_extent>::type[N];
 };
 
 }  // end namespace Impl
diff --git a/kokkos/core/src/Kokkos_Future.hpp b/kokkos/core/src/Kokkos_Future.hpp
index 8ed901b37..1995e2609 100644
--- a/kokkos/core/src/Kokkos_Future.hpp
+++ b/kokkos/core/src/Kokkos_Future.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -296,7 +296,8 @@ class BasicFuture {
 
   task_base* m_task;
 
-  KOKKOS_INLINE_FUNCTION explicit BasicFuture(task_base* task) : m_task(0) {
+  KOKKOS_INLINE_FUNCTION explicit BasicFuture(task_base* task)
+      : m_task(nullptr) {
     if (task) queue_type::assign(&m_task, task);
   }
 
@@ -306,7 +307,7 @@ class BasicFuture {
   //----------------------------------------
 
   KOKKOS_INLINE_FUNCTION
-  bool is_null() const { return 0 == m_task; }
+  bool is_null() const { return nullptr == m_task; }
 
   KOKKOS_INLINE_FUNCTION
   int reference_count() const {
@@ -317,7 +318,7 @@ class BasicFuture {
 
   KOKKOS_INLINE_FUNCTION
   void clear() {
-    if (m_task) queue_type::assign(&m_task, (task_base*)0);
+    if (m_task) queue_type::assign(&m_task, nullptr);
   }
 
   //----------------------------------------
@@ -332,11 +333,11 @@ class BasicFuture {
 
   KOKKOS_INLINE_FUNCTION
   BasicFuture(BasicFuture&& rhs) noexcept : m_task(rhs.m_task) {
-    rhs.m_task = 0;
+    rhs.m_task = nullptr;
   }
 
   KOKKOS_INLINE_FUNCTION
-  BasicFuture(const BasicFuture& rhs) : m_task(0) {
+  BasicFuture(const BasicFuture& rhs) : m_task(nullptr) {
     if (rhs.m_task) queue_type::assign(&m_task, rhs.m_task);
   }
 
@@ -344,7 +345,7 @@ class BasicFuture {
   BasicFuture& operator=(BasicFuture&& rhs) noexcept {
     clear();
     m_task     = rhs.m_task;
-    rhs.m_task = 0;
+    rhs.m_task = nullptr;
     return *this;
   }
 
@@ -420,13 +421,13 @@ class BasicFuture {
 
   KOKKOS_INLINE_FUNCTION
   int is_ready() const noexcept {
-    return (0 == m_task) ||
+    return (nullptr == m_task) ||
            (((task_base*)task_base::LockTag) == m_task->m_wait);
   }
 
   KOKKOS_INLINE_FUNCTION
   const typename Impl::TaskResult<ValueType>::reference_type get() const {
-    if (0 == m_task) {
+    if (nullptr == m_task) {
       Kokkos::abort("Kokkos:::Future::get ERROR: is_null()");
     }
     return Impl::TaskResult<ValueType>::get(m_task);
diff --git a/kokkos/core/src/Kokkos_HBWSpace.hpp b/kokkos/core/src/Kokkos_HBWSpace.hpp
index 5ea3c5622..ce36b018c 100644
--- a/kokkos/core/src/Kokkos_HBWSpace.hpp
+++ b/kokkos/core/src/Kokkos_HBWSpace.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -64,10 +64,10 @@ namespace Impl {
 /// This function initializes the locks to zero (unset).
 void init_lock_array_hbw_space();
 
-/// \brief Aquire a lock for the address
+/// \brief Acquire a lock for the address
 ///
-/// This function tries to aquire the lock for the hash value derived
-/// from the provided ptr. If the lock is successfully aquired the
+/// This function tries to acquire the lock for the hash value derived
+/// from the provided ptr. If the lock is successfully acquired the
 /// function returns true. Otherwise it returns false.
 bool lock_address_hbw_space(void* ptr);
 
@@ -75,7 +75,7 @@ bool lock_address_hbw_space(void* ptr);
 ///
 /// This function releases the lock for the hash value derived
 /// from the provided ptr. This function should only be called
-/// after previously successfully aquiring a lock with
+/// after previously successfully acquiring a lock with
 /// lock_address.
 void unlock_address_hbw_space(void* ptr);
 
@@ -110,19 +110,15 @@ class HBWSpace {
   typedef Kokkos::OpenMP execution_space;
 #elif defined(KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_THREADS)
   typedef Kokkos::Threads execution_space;
-//#elif defined( KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_QTHREADS )
-//  typedef Kokkos::Qthreads  execution_space;
 #elif defined(KOKKOS_ENABLE_OPENMP)
   typedef Kokkos::OpenMP execution_space;
 #elif defined(KOKKOS_ENABLE_THREADS)
   typedef Kokkos::Threads execution_space;
-//#elif defined( KOKKOS_ENABLE_QTHREADS )
-//  typedef Kokkos::Qthreads  execution_space;
 #elif defined(KOKKOS_ENABLE_SERIAL)
   typedef Kokkos::Serial execution_space;
 #else
 #error \
-    "At least one of the following host execution spaces must be defined: Kokkos::OpenMP, Kokkos::Threads, Kokkos::Qhreads, or Kokkos::Serial.  You might be seeing this message if you disabled the Kokkos::Serial device explicitly using the Kokkos_ENABLE_Serial:BOOL=OFF CMake option, but did not enable any of the other host execution space devices."
+    "At least one of the following host execution spaces must be defined: Kokkos::OpenMP, Kokkos::Threads, or Kokkos::Serial.  You might be seeing this message if you disabled the Kokkos::Serial device explicitly using the Kokkos_ENABLE_Serial:BOOL=OFF CMake option, but did not enable any of the other host execution space devices."
 #endif
 
   //! This memory space preferred device_type
@@ -192,7 +188,12 @@ class SharedAllocationRecord<Kokkos::Experimental::HBWSpace, void>
   const Kokkos::Experimental::HBWSpace m_space;
 
  protected:
-  ~SharedAllocationRecord();
+  ~SharedAllocationRecord()
+#if defined( \
+    KOKKOS_IMPL_INTEL_WORKAROUND_NOEXCEPT_SPECIFICATION_VIRTUAL_FUNCTION)
+      noexcept
+#endif
+      ;
   SharedAllocationRecord() = default;
 
   SharedAllocationRecord(
diff --git a/kokkos/core/src/Kokkos_HIP.hpp b/kokkos/core/src/Kokkos_HIP.hpp
new file mode 100644
index 000000000..4e9325c2d
--- /dev/null
+++ b/kokkos/core/src/Kokkos_HIP.hpp
@@ -0,0 +1,65 @@
+/*
+//@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
+*/
+
+#ifndef KOKKOS_HIP_HPP
+#define KOKKOS_HIP_HPP
+
+#include <Kokkos_Core_fwd.hpp>
+
+#if defined(KOKKOS_ENABLE_HIP)
+
+//----------------------------------------------------------------------------
+//----------------------------------------------------------------------------
+
+#include <Kokkos_HIP_Space.hpp>
+#include <Kokkos_Parallel.hpp>
+#include <impl/Kokkos_Tags.hpp>
+
+#include <HIP/Kokkos_HIP_Instance.hpp>
+#include <HIP/Kokkos_HIP_Parallel_Range.hpp>
+#include <HIP/Kokkos_HIP_Parallel_MDRange.hpp>
+#include <HIP/Kokkos_HIP_Parallel_Team.hpp>
+
+#endif
+#endif
diff --git a/kokkos/core/src/Kokkos_HIP_Space.hpp b/kokkos/core/src/Kokkos_HIP_Space.hpp
new file mode 100644
index 000000000..90bdb7b91
--- /dev/null
+++ b/kokkos/core/src/Kokkos_HIP_Space.hpp
@@ -0,0 +1,758 @@
+/*
+//@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
+*/
+
+#ifndef KOKKOS_HIPSPACE_HPP
+#define KOKKOS_HIPSPACE_HPP
+
+#include <Kokkos_Core_fwd.hpp>
+
+#if defined(KOKKOS_ENABLE_HIP)
+
+#include <iosfwd>
+#include <typeinfo>
+#include <string>
+#include <cstddef>
+#include <iosfwd>
+
+#include <Kokkos_HostSpace.hpp>
+#include <Kokkos_Layout.hpp>
+#include <Kokkos_ScratchSpace.hpp>
+
+#include <impl/Kokkos_Profiling_Interface.hpp>
+
+#include <hip/hip_runtime_api.h>
+/*--------------------------------------------------------------------------*/
+
+namespace Kokkos {
+namespace Experimental {
+/** \brief  HIP on-device memory management */
+
+class HIPSpace {
+ public:
+  //! Tag this class as a kokkos memory space
+  using memory_space    = HIPSpace;
+  using execution_space = Kokkos::Experimental::HIP;
+  using device_type     = Kokkos::Device<execution_space, memory_space>;
+
+  using size_type = unsigned int;
+
+  /*--------------------------------*/
+
+  HIPSpace();
+  HIPSpace(HIPSpace&& rhs)      = default;
+  HIPSpace(const HIPSpace& rhs) = default;
+  HIPSpace& operator=(HIPSpace&& rhs) = default;
+  HIPSpace& operator=(const HIPSpace& rhs) = default;
+  ~HIPSpace()                              = default;
+
+  /**\brief  Allocate untracked memory in the hip space */
+  void* allocate(const size_t arg_alloc_size) const;
+
+  /**\brief  Deallocate untracked memory in the hip space */
+  void deallocate(void* const arg_alloc_ptr, const size_t arg_alloc_size) const;
+
+  /**\brief Return Name of the MemorySpace */
+  static constexpr const char* name() { return "HIP"; }
+
+  /*--------------------------------*/
+  /** \brief  Error reporting for HostSpace attempt to access HIPSpace */
+  static void access_error();
+  static void access_error(const void* const);
+
+ private:
+  int m_device;  ///< Which HIP device
+
+  friend class Kokkos::Impl::SharedAllocationRecord<
+      Kokkos::Experimental::HIPSpace, void>;
+};
+
+}  // namespace Experimental
+
+namespace Impl {
+
+/// \brief Initialize lock array for arbitrary size atomics.
+///
+/// Arbitrary atomics are implemented using a hash table of locks
+/// where the hash value is derived from the address of the
+/// object for which an atomic operation is performed.
+/// This function initializes the locks to zero (unset).
+void init_lock_arrays_hip_space();
+
+/// \brief Retrieve the pointer to the lock array for arbitrary size atomics.
+///
+/// Arbitrary atomics are implemented using a hash table of locks
+/// where the hash value is derived from the address of the
+/// object for which an atomic operation is performed.
+/// This function retrieves the lock array pointer.
+/// If the array is not yet allocated it will do so.
+int* atomic_lock_array_hip_space_ptr(bool deallocate = false);
+
+/// \brief Retrieve the pointer to the scratch array for team and thread private
+/// global memory.
+///
+/// Team and Thread private scratch allocations in
+/// global memory are acquired via locks.
+/// This function retrieves the lock array pointer.
+/// If the array is not yet allocated it will do so.
+int* scratch_lock_array_hip_space_ptr(bool deallocate = false);
+
+/// \brief Retrieve the pointer to the scratch array for unique identifiers.
+///
+/// Unique identifiers in the range 0-HIP::concurrency
+/// are provided via locks.
+/// This function retrieves the lock array pointer.
+/// If the array is not yet allocated it will do so.
+int* threadid_lock_array_hip_space_ptr(bool deallocate = false);
+}  // namespace Impl
+}  // namespace Kokkos
+
+/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*/
+
+namespace Kokkos {
+namespace Experimental {
+/** \brief  Host memory that is accessible to HIP execution space
+ *          through HIP's host-pinned memory allocation.
+ */
+class HIPHostPinnedSpace {
+ public:
+  //! Tag this class as a kokkos memory space
+  /** \brief  Memory is in HostSpace so use the HostSpace::execution_space */
+  using execution_space = HostSpace::execution_space;
+  using memory_space    = HIPHostPinnedSpace;
+  using device_type     = Kokkos::Device<execution_space, memory_space>;
+  using size_type       = unsigned int;
+
+  /*--------------------------------*/
+
+  HIPHostPinnedSpace();
+  HIPHostPinnedSpace(HIPHostPinnedSpace&& rhs)      = default;
+  HIPHostPinnedSpace(const HIPHostPinnedSpace& rhs) = default;
+  HIPHostPinnedSpace& operator=(HIPHostPinnedSpace&& rhs) = default;
+  HIPHostPinnedSpace& operator=(const HIPHostPinnedSpace& rhs) = default;
+  ~HIPHostPinnedSpace()                                        = default;
+
+  /**\brief  Allocate untracked memory in the space */
+  void* allocate(const size_t arg_alloc_size) const;
+
+  /**\brief  Deallocate untracked memory in the space */
+  void deallocate(void* const arg_alloc_ptr, const size_t arg_alloc_size) const;
+
+  /**\brief Return Name of the MemorySpace */
+  static constexpr const char* name() { return "HIPHostPinned"; }
+
+  /*--------------------------------*/
+};
+}  // namespace Experimental
+}  // namespace Kokkos
+
+/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*/
+
+namespace Kokkos {
+namespace Impl {
+
+static_assert(
+    Kokkos::Impl::MemorySpaceAccess<Kokkos::Experimental::HIPSpace,
+                                    Kokkos::Experimental::HIPSpace>::assignable,
+    "");
+
+//----------------------------------------
+
+template <>
+struct MemorySpaceAccess<Kokkos::HostSpace, Kokkos::Experimental::HIPSpace> {
+  enum { assignable = false };
+  enum { accessible = false };
+  enum { deepcopy = true };
+};
+
+template <>
+struct MemorySpaceAccess<Kokkos::HostSpace,
+                         Kokkos::Experimental::HIPHostPinnedSpace> {
+  // HostSpace::execution_space == HIPHostPinnedSpace::execution_space
+  enum { assignable = true };
+  enum { accessible = true };
+  enum { deepcopy = true };
+};
+
+//----------------------------------------
+
+template <>
+struct MemorySpaceAccess<Kokkos::Experimental::HIPSpace, Kokkos::HostSpace> {
+  enum { assignable = false };
+  enum { accessible = false };
+  enum { deepcopy = true };
+};
+
+template <>
+struct MemorySpaceAccess<Kokkos::Experimental::HIPSpace,
+                         Kokkos::Experimental::HIPHostPinnedSpace> {
+  // HIPSpace::execution_space != HIPHostPinnedSpace::execution_space
+  enum { assignable = false };
+  enum { accessible = true };  // HIPSpace::execution_space
+  enum { deepcopy = true };
+};
+
+//----------------------------------------
+// HIPHostPinnedSpace::execution_space == HostSpace::execution_space
+// HIPHostPinnedSpace accessible to both HIP and Host
+
+template <>
+struct MemorySpaceAccess<Kokkos::Experimental::HIPHostPinnedSpace,
+                         Kokkos::HostSpace> {
+  enum { assignable = false };  // Cannot access from HIP
+  enum { accessible = true };   // HIPHostPinnedSpace::execution_space
+  enum { deepcopy = true };
+};
+
+template <>
+struct MemorySpaceAccess<Kokkos::Experimental::HIPHostPinnedSpace,
+                         Kokkos::Experimental::HIPSpace> {
+  enum { assignable = false };  // Cannot access from Host
+  enum { accessible = false };
+  enum { deepcopy = true };
+};
+
+};  // namespace Impl
+//----------------------------------------
+
+}  // namespace Kokkos
+
+/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*/
+
+namespace Kokkos {
+namespace Impl {
+
+void DeepCopyAsyncHIP(void* dst, const void* src, size_t n);
+
+template <>
+struct DeepCopy<Kokkos::Experimental::HIPSpace, Kokkos::Experimental::HIPSpace,
+                Kokkos::Experimental::HIP> {
+  DeepCopy(void* dst, const void* src, size_t);
+  DeepCopy(const Kokkos::Experimental::HIP&, void* dst, const void* src,
+           size_t);
+};
+
+template <>
+struct DeepCopy<Kokkos::Experimental::HIPSpace, HostSpace,
+                Kokkos::Experimental::HIP> {
+  DeepCopy(void* dst, const void* src, size_t);
+  DeepCopy(const Kokkos::Experimental::HIP&, void* dst, const void* src,
+           size_t);
+};
+
+template <>
+struct DeepCopy<HostSpace, Kokkos::Experimental::HIPSpace,
+                Kokkos::Experimental::HIP> {
+  DeepCopy(void* dst, const void* src, size_t);
+  DeepCopy(const Kokkos::Experimental::HIP&, void* dst, const void* src,
+           size_t);
+};
+
+template <class ExecutionSpace>
+struct DeepCopy<Kokkos::Experimental::HIPSpace, Kokkos::Experimental::HIPSpace,
+                ExecutionSpace> {
+  inline DeepCopy(void* dst, const void* src, size_t n) {
+    (void)DeepCopy<Kokkos::Experimental::HIPSpace,
+                   Kokkos::Experimental::HIPSpace, Kokkos::Experimental::HIP>(
+        dst, src, n);
+  }
+
+  inline DeepCopy(const ExecutionSpace& exec, void* dst, const void* src,
+                  size_t n) {
+    exec.fence();
+    DeepCopyAsyncHIP(dst, src, n);
+  }
+};
+
+template <class ExecutionSpace>
+struct DeepCopy<Kokkos::Experimental::HIPSpace, HostSpace, ExecutionSpace> {
+  inline DeepCopy(void* dst, const void* src, size_t n) {
+    (void)DeepCopy<Kokkos::Experimental::HIPSpace, HostSpace,
+                   Kokkos::Experimental::HIP>(dst, src, n);
+  }
+
+  inline DeepCopy(const ExecutionSpace& exec, void* dst, const void* src,
+                  size_t n) {
+    exec.fence();
+    DeepCopyAsyncHIP(dst, src, n);
+  }
+};
+
+template <class ExecutionSpace>
+struct DeepCopy<HostSpace, Kokkos::Experimental::HIPSpace, ExecutionSpace> {
+  inline DeepCopy(void* dst, const void* src, size_t n) {
+    (void)DeepCopy<HostSpace, Kokkos::Experimental::HIPSpace,
+                   Kokkos::Experimental::HIP>(dst, src, n);
+  }
+
+  inline DeepCopy(const ExecutionSpace& exec, void* dst, const void* src,
+                  size_t n) {
+    exec.fence();
+    DeepCopyAsyncHIP(dst, src, n);
+  }
+};
+
+template <>
+struct DeepCopy<Kokkos::Experimental::HIPHostPinnedSpace,
+                Kokkos::Experimental::HIPHostPinnedSpace,
+                Kokkos::Experimental::HIP> {
+  DeepCopy(void* dst, const void* src, size_t);
+  DeepCopy(const Kokkos::Experimental::HIP&, void* dst, const void* src,
+           size_t);
+};
+
+template <>
+struct DeepCopy<Kokkos::Experimental::HIPHostPinnedSpace, HostSpace,
+                Kokkos::Experimental::HIP> {
+  DeepCopy(void* dst, const void* src, size_t);
+  DeepCopy(const Kokkos::Experimental::HIP&, void* dst, const void* src,
+           size_t);
+};
+
+template <>
+struct DeepCopy<HostSpace, Kokkos::Experimental::HIPHostPinnedSpace,
+                Kokkos::Experimental::HIP> {
+  DeepCopy(void* dst, const void* src, size_t);
+  DeepCopy(const Kokkos::Experimental::HIP&, void* dst, const void* src,
+           size_t);
+};
+
+template <class ExecutionSpace>
+struct DeepCopy<Kokkos::Experimental::HIPSpace,
+                Kokkos::Experimental::HIPHostPinnedSpace, ExecutionSpace> {
+  inline DeepCopy(void* dst, const void* src, size_t n) {
+    (void)DeepCopy<Kokkos::Experimental::HIPSpace, HostSpace,
+                   Kokkos::Experimental::HIP>(dst, src, n);
+  }
+
+  inline DeepCopy(const ExecutionSpace& exec, void* dst, const void* src,
+                  size_t n) {
+    exec.fence();
+    DeepCopyAsyncHIP(dst, src, n);
+  }
+};
+
+template <class ExecutionSpace>
+struct DeepCopy<Kokkos::Experimental::HIPHostPinnedSpace,
+                Kokkos::Experimental::HIPSpace, ExecutionSpace> {
+  inline DeepCopy(void* dst, const void* src, size_t n) {
+    (void)DeepCopy<HostSpace, Kokkos::Experimental::HIPSpace,
+                   Kokkos::Experimental::HIP>(dst, src, n);
+  }
+
+  inline DeepCopy(const ExecutionSpace& exec, void* dst, const void* src,
+                  size_t n) {
+    exec.fence();
+    DeepCopyAsyncHIP(dst, src, n);
+  }
+};
+
+template <class ExecutionSpace>
+struct DeepCopy<Kokkos::Experimental::HIPHostPinnedSpace,
+                Kokkos::Experimental::HIPHostPinnedSpace, ExecutionSpace> {
+  inline DeepCopy(void* dst, const void* src, size_t n) {
+    (void)DeepCopy<Kokkos::Experimental::HIPHostPinnedSpace,
+                   Kokkos::Experimental::HIPHostPinnedSpace,
+                   Kokkos::Experimental::HIP>(dst, src, n);
+  }
+
+  inline DeepCopy(const ExecutionSpace& exec, void* dst, const void* src,
+                  size_t n) {
+    exec.fence();
+    DeepCopyAsyncHIP(dst, src, n);
+  }
+};
+
+template <class ExecutionSpace>
+struct DeepCopy<Kokkos::Experimental::HIPHostPinnedSpace, HostSpace,
+                ExecutionSpace> {
+  inline DeepCopy(void* dst, const void* src, size_t n) {
+    (void)DeepCopy<Kokkos::Experimental::HIPHostPinnedSpace, HostSpace,
+                   Kokkos::Experimental::HIP>(dst, src, n);
+  }
+
+  inline DeepCopy(const ExecutionSpace& exec, void* dst, const void* src,
+                  size_t n) {
+    exec.fence();
+    DeepCopyAsyncHIP(dst, src, n);
+  }
+};
+
+template <class ExecutionSpace>
+struct DeepCopy<HostSpace, Kokkos::Experimental::HIPHostPinnedSpace,
+                ExecutionSpace> {
+  inline DeepCopy(void* dst, const void* src, size_t n) {
+    (void)DeepCopy<HostSpace, Kokkos::Experimental::HIPHostPinnedSpace,
+                   Kokkos::Experimental::HIP>(dst, src, n);
+  }
+
+  inline DeepCopy(const ExecutionSpace& exec, void* dst, const void* src,
+                  size_t n) {
+    exec.fence();
+    DeepCopyAsyncHIP(dst, src, n);
+  }
+};
+}  // namespace Impl
+}  // namespace Kokkos
+
+//----------------------------------------------------------------------------
+//----------------------------------------------------------------------------
+
+namespace Kokkos {
+namespace Impl {
+
+/** Running in HIPSpace attempting to access HostSpace: error */
+template <>
+struct VerifyExecutionCanAccessMemorySpace<Kokkos::Experimental::HIPSpace,
+                                           Kokkos::HostSpace> {
+  enum { value = false };
+  KOKKOS_INLINE_FUNCTION static void verify(void) {
+    Kokkos::abort("HIP code attempted to access HostSpace memory");
+  }
+
+  KOKKOS_INLINE_FUNCTION static void verify(const void*) {
+    Kokkos::abort("HIP code attempted to access HostSpace memory");
+  }
+};
+
+/** Running in HIPSpace accessing HIPHostPinnedSpace: ok */
+template <>
+struct VerifyExecutionCanAccessMemorySpace<
+    Kokkos::Experimental::HIPSpace, Kokkos::Experimental::HIPHostPinnedSpace> {
+  enum { value = true };
+  KOKKOS_INLINE_FUNCTION static void verify(void) {}
+  KOKKOS_INLINE_FUNCTION static void verify(const void*) {}
+};
+
+/** Running in HIPSpace attempting to access an unknown space: error */
+template <class OtherSpace>
+struct VerifyExecutionCanAccessMemorySpace<
+    typename std::enable_if<
+        !std::is_same<Kokkos::Experimental::HIPSpace, OtherSpace>::value,
+        Kokkos::Experimental::HIPSpace>::type,
+    OtherSpace> {
+  enum { value = false };
+  KOKKOS_INLINE_FUNCTION static void verify(void) {
+    Kokkos::abort("HIP code attempted to access unknown Space memory");
+  }
+
+  KOKKOS_INLINE_FUNCTION static void verify(const void*) {
+    Kokkos::abort("HIP code attempted to access unknown Space memory");
+  }
+};
+
+//----------------------------------------------------------------------------
+/** Running in HostSpace attempting to access HIPSpace */
+template <>
+struct VerifyExecutionCanAccessMemorySpace<Kokkos::HostSpace,
+                                           Kokkos::Experimental::HIPSpace> {
+  enum { value = false };
+  inline static void verify(void) {
+    Kokkos::Experimental::HIPSpace::access_error();
+  }
+  inline static void verify(const void* p) {
+    Kokkos::Experimental::HIPSpace::access_error(p);
+  }
+};
+
+/** Running in HostSpace accessing HIPHostPinnedSpace is OK */
+template <>
+struct VerifyExecutionCanAccessMemorySpace<
+    Kokkos::HostSpace, Kokkos::Experimental::HIPHostPinnedSpace> {
+  enum { value = true };
+  KOKKOS_INLINE_FUNCTION static void verify(void) {}
+  KOKKOS_INLINE_FUNCTION static void verify(const void*) {}
+};
+}  // namespace Impl
+}  // namespace Kokkos
+
+//----------------------------------------------------------------------------
+//----------------------------------------------------------------------------
+
+namespace Kokkos {
+namespace Impl {
+
+template <>
+class SharedAllocationRecord<Kokkos::Experimental::HIPSpace, void>
+    : public SharedAllocationRecord<void, void> {
+ private:
+  typedef SharedAllocationRecord<void, void> RecordBase;
+
+  SharedAllocationRecord(const SharedAllocationRecord&) = delete;
+  SharedAllocationRecord& operator=(const SharedAllocationRecord&) = delete;
+
+  static void deallocate(RecordBase*);
+
+#ifdef KOKKOS_DEBUG
+  static RecordBase s_root_record;
+#endif
+
+  const Kokkos::Experimental::HIPSpace m_space;
+
+ protected:
+  ~SharedAllocationRecord();
+
+  SharedAllocationRecord(
+      const Kokkos::Experimental::HIPSpace& arg_space,
+      const std::string& arg_label, const size_t arg_alloc_size,
+      const RecordBase::function_type arg_dealloc = &deallocate);
+
+ public:
+  std::string get_label() const;
+
+  static SharedAllocationRecord* allocate(
+      const Kokkos::Experimental::HIPSpace& arg_space,
+      const std::string& arg_label, const size_t arg_alloc_size);
+
+  /**\brief  Allocate tracked memory in the space */
+  static void* allocate_tracked(const Kokkos::Experimental::HIPSpace& arg_space,
+                                const std::string& arg_label,
+                                const size_t arg_alloc_size);
+
+  /**\brief  Reallocate tracked memory in the space */
+  static void* reallocate_tracked(void* const arg_alloc_ptr,
+                                  const size_t arg_alloc_size);
+
+  /**\brief  Deallocate tracked memory in the space */
+  static void deallocate_tracked(void* const arg_alloc_ptr);
+
+  static SharedAllocationRecord* get_record(void* arg_alloc_ptr);
+
+  static void print_records(std::ostream&,
+                            const Kokkos::Experimental::HIPSpace&,
+                            bool detail = false);
+};
+
+template <>
+class SharedAllocationRecord<Kokkos::Experimental::HIPHostPinnedSpace, void>
+    : public SharedAllocationRecord<void, void> {
+ private:
+  typedef SharedAllocationRecord<void, void> RecordBase;
+
+  SharedAllocationRecord(const SharedAllocationRecord&) = delete;
+  SharedAllocationRecord& operator=(const SharedAllocationRecord&) = delete;
+
+  static void deallocate(RecordBase*);
+
+#ifdef KOKKOS_DEBUG
+  static RecordBase s_root_record;
+#endif
+
+  const Kokkos::Experimental::HIPHostPinnedSpace m_space;
+
+ protected:
+  ~SharedAllocationRecord();
+  SharedAllocationRecord() : RecordBase(), m_space() {}
+
+  SharedAllocationRecord(
+      const Kokkos::Experimental::HIPHostPinnedSpace& arg_space,
+      const std::string& arg_label, const size_t arg_alloc_size,
+      const RecordBase::function_type arg_dealloc = &deallocate);
+
+ public:
+  std::string get_label() const;
+
+  static SharedAllocationRecord* allocate(
+      const Kokkos::Experimental::HIPHostPinnedSpace& arg_space,
+      const std::string& arg_label, const size_t arg_alloc_size);
+  /**\brief  Allocate tracked memory in the space */
+  static void* allocate_tracked(
+      const Kokkos::Experimental::HIPHostPinnedSpace& arg_space,
+      const std::string& arg_label, const size_t arg_alloc_size);
+
+  /**\brief  Reallocate tracked memory in the space */
+  static void* reallocate_tracked(void* const arg_alloc_ptr,
+                                  const size_t arg_alloc_size);
+
+  /**\brief  Deallocate tracked memory in the space */
+  static void deallocate_tracked(void* const arg_alloc_ptr);
+
+  static SharedAllocationRecord* get_record(void* arg_alloc_ptr);
+
+  static void print_records(std::ostream&,
+                            const Kokkos::Experimental::HIPHostPinnedSpace&,
+                            bool detail = false);
+};
+}  // namespace Impl
+}  // namespace Kokkos
+
+//----------------------------------------------------------------------------
+//----------------------------------------------------------------------------
+
+namespace Kokkos {
+namespace Experimental {
+namespace Impl {
+class HIPInternal;
+}
+/// \class HIP
+/// \brief Kokkos device for multicore processors in the host memory space.
+class HIP {
+ public:
+  //------------------------------------
+  //! \name Type declarations that all Kokkos devices must provide.
+  //@{
+
+  //! Tag this class as a kokkos execution space
+  using execution_space = HIP;
+  using memory_space    = HIPSpace;
+  using device_type     = Kokkos::Device<execution_space, memory_space>;
+
+  using array_layout = LayoutLeft;
+  using size_type    = HIPSpace::size_type;
+
+  using scratch_memory_space = ScratchMemorySpace<HIP>;
+
+  ~HIP() = default;
+  HIP();
+  //  explicit HIP( const int instance_id );
+
+  HIP(HIP&&)      = default;
+  HIP(const HIP&) = default;
+  HIP& operator=(HIP&&) = default;
+  HIP& operator=(const HIP&) = default;
+
+  //@}
+  //------------------------------------
+  //! \name Functions that all Kokkos devices must implement.
+  //@{
+
+  KOKKOS_INLINE_FUNCTION static int in_parallel() {
+#if defined(__HIP_ARCH__)
+    return true;
+#else
+    return false;
+#endif
+  }
+
+  /** \brief Wait until all dispatched functors complete. A noop for OpenMP. */
+  static void impl_static_fence();
+  void fence() const;
+
+  /// \brief Print configuration information to the given output stream.
+  static void print_configuration(std::ostream&, const bool detail = false);
+
+  /// \brief Free any resources being consumed by the device.
+  static void impl_finalize();
+
+  /** \brief  Initialize the device.
+   *
+   */
+  struct SelectDevice {
+    int hip_device_id;
+    SelectDevice() : hip_device_id(0) {}
+    explicit SelectDevice(int id) : hip_device_id(id) {}
+  };
+
+  int hip_device() const;
+
+  static void impl_initialize(const SelectDevice = SelectDevice());
+
+  static int impl_is_initialized();
+
+  //  static size_type device_arch();
+
+  //  static size_type detect_device_count();
+
+  static int concurrency();
+  static const char* name();
+
+  inline Impl::HIPInternal* impl_internal_space_instance() const {
+    return m_space_instance;
+  }
+
+  uint32_t impl_instance_id() const noexcept { return 0; }
+
+ private:
+  Impl::HIPInternal* m_space_instance;
+};
+}  // namespace Experimental
+namespace Profiling {
+namespace Experimental {
+template <>
+struct DeviceTypeTraits<Kokkos::Experimental::HIP> {
+  static constexpr DeviceType id = DeviceType::HIP;
+};
+}  // namespace Experimental
+}  // namespace Profiling
+}  // namespace Kokkos
+
+namespace Kokkos {
+namespace Impl {
+
+template <>
+struct MemorySpaceAccess<Kokkos::Experimental::HIPSpace,
+                         Kokkos::Experimental::HIP::scratch_memory_space> {
+  enum { assignable = false };
+  enum { accessible = true };
+  enum { deepcopy = false };
+};
+
+template <>
+struct VerifyExecutionCanAccessMemorySpace<
+    Kokkos::Experimental::HIP::memory_space,
+    Kokkos::Experimental::HIP::scratch_memory_space> {
+  enum { value = true };
+  KOKKOS_INLINE_FUNCTION static void verify(void) {}
+  KOKKOS_INLINE_FUNCTION static void verify(const void*) {}
+};
+
+template <>
+struct VerifyExecutionCanAccessMemorySpace<
+    Kokkos::HostSpace, Kokkos::Experimental::HIP::scratch_memory_space> {
+  enum { value = false };
+  inline static void verify(void) {
+    Kokkos::Experimental::HIPSpace::access_error();
+  }
+  inline static void verify(const void* p) {
+    Kokkos::Experimental::HIPSpace::access_error(p);
+  }
+};
+
+}  // namespace Impl
+}  // namespace Kokkos
+
+#endif /* #if defined( KOKKOS_ENABLE_HIP ) */
+#endif /* #define KOKKOS_HIPSPACE_HPP */
diff --git a/kokkos/core/src/Kokkos_HPX.hpp b/kokkos/core/src/Kokkos_HPX.hpp
index 5400bad84..10354635c 100644
--- a/kokkos/core/src/Kokkos_HPX.hpp
+++ b/kokkos/core/src/Kokkos_HPX.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -83,6 +83,7 @@
 #include <hpx/runtime.hpp>
 #include <hpx/runtime/threads/run_as_hpx_thread.hpp>
 #include <hpx/runtime/threads/threadmanager.hpp>
+#include <hpx/runtime/thread_pool_helpers.hpp>
 
 #include <iostream>
 #include <memory>
@@ -194,6 +195,7 @@ class HPX {
                                   const bool /* verbose */ = false) {
     std::cout << "HPX backend" << std::endl;
   }
+  uint32_t impl_instance_id() const noexcept { return 0; }
 
   static bool in_parallel(HPX const & = HPX()) noexcept { return false; }
   static void impl_static_fence(HPX const & = HPX())
@@ -228,8 +230,8 @@ class HPX {
   }
 
   template <typename F>
-  static void partition_master(F const &f, int requested_num_partitions = 0,
-                               int requested_partition_size = 0) {
+  static void partition_master(F const &, int requested_num_partitions = 0,
+                               int = 0) {
     if (requested_num_partitions > 1) {
       Kokkos::abort(
           "Kokkos::Experimental::HPX::partition_master: can't partition an "
@@ -297,6 +299,15 @@ class HPX {
 };
 }  // namespace Experimental
 
+namespace Profiling {
+namespace Experimental {
+template <>
+struct DeviceTypeTraits<Kokkos::Experimental::HPX> {
+  constexpr static DeviceType id = DeviceType::HPX;
+};
+}  // namespace Experimental
+}  // namespace Profiling
+
 namespace Impl {
 template <typename Closure>
 inline void dispatch_execute_task(Closure *closure) {
@@ -462,7 +473,7 @@ struct HPXTeamMember {
   template <class ReducerType>
   KOKKOS_INLINE_FUNCTION
       typename std::enable_if<is_reducer<ReducerType>::value>::type
-      team_reduce(const ReducerType &reducer) const {}
+      team_reduce(const ReducerType &) const {}
 
   template <typename Type>
   KOKKOS_INLINE_FUNCTION Type
@@ -590,6 +601,11 @@ class TeamPolicyInternal<Kokkos::Experimental::HPX, Properties...>
   template <class ExecSpace, class... OtherProperties>
   friend class TeamPolicyInternal;
 
+  const typename traits::execution_space &space() const {
+    static typename traits::execution_space m_space;
+    return m_space;
+  }
+
   template <class... OtherProperties>
   TeamPolicyInternal(const TeamPolicyInternal<Kokkos::Experimental::HPX,
                                               OtherProperties...> &p) {
@@ -612,8 +628,7 @@ class TeamPolicyInternal<Kokkos::Experimental::HPX, Properties...>
   }
 
   TeamPolicyInternal(const typename traits::execution_space &,
-                     int league_size_request,
-                     const Kokkos::AUTO_t &team_size_request,
+                     int league_size_request, const Kokkos::AUTO_t &,
                      int /* vector_length_request */ = 1)
       : m_team_scratch_size{0, 0},
         m_thread_scratch_size{0, 0},
@@ -629,8 +644,7 @@ class TeamPolicyInternal<Kokkos::Experimental::HPX, Properties...>
     init(league_size_request, team_size_request);
   }
 
-  TeamPolicyInternal(int league_size_request,
-                     const Kokkos::AUTO_t &team_size_request,
+  TeamPolicyInternal(int league_size_request, const Kokkos::AUTO_t &,
                      int /* vector_length_request */ = 1)
       : m_team_scratch_size{0, 0},
         m_thread_scratch_size{0, 0},
@@ -1169,7 +1183,7 @@ class ParallelReduce<FunctorType, Kokkos::RangePolicy<Traits...>, ReducerType,
       const ViewType &arg_view,
       typename std::enable_if<Kokkos::is_view<ViewType>::value &&
                                   !Kokkos::is_reducer_type<ReducerType>::value,
-                              void *>::type = NULL)
+                              void *>::type = nullptr)
       : m_functor(arg_functor),
         m_policy(arg_policy),
         m_reducer(InvalidType()),
@@ -1359,7 +1373,7 @@ class ParallelReduce<FunctorType, Kokkos::MDRangePolicy<Traits...>, ReducerType,
       const ViewType &arg_view,
       typename std::enable_if<Kokkos::is_view<ViewType>::value &&
                                   !Kokkos::is_reducer_type<ReducerType>::value,
-                              void *>::type = NULL)
+                              void *>::type = nullptr)
       : m_functor(arg_functor),
         m_mdr_policy(arg_policy),
         m_policy(Policy(0, m_mdr_policy.m_num_tiles).set_chunk_size(1)),
@@ -1990,7 +2004,7 @@ class ParallelReduce<FunctorType, Kokkos::TeamPolicy<Properties...>,
       const ViewType &arg_result,
       typename std::enable_if<Kokkos::is_view<ViewType>::value &&
                                   !Kokkos::is_reducer_type<ReducerType>::value,
-                              void *>::type = NULL)
+                              void *>::type = nullptr)
       : m_functor(arg_functor),
         m_league(arg_policy.league_size()),
         m_policy(arg_policy),
@@ -2241,28 +2255,28 @@ KOKKOS_INLINE_FUNCTION void parallel_scan(
 
 template <class FunctorType>
 KOKKOS_INLINE_FUNCTION void single(
-    const Impl::VectorSingleStruct<Impl::HPXTeamMember> &single_struct,
+    const Impl::VectorSingleStruct<Impl::HPXTeamMember> &,
     const FunctorType &lambda) {
   lambda();
 }
 
 template <class FunctorType>
 KOKKOS_INLINE_FUNCTION void single(
-    const Impl::ThreadSingleStruct<Impl::HPXTeamMember> &single_struct,
+    const Impl::ThreadSingleStruct<Impl::HPXTeamMember> &,
     const FunctorType &lambda) {
   lambda();
 }
 
 template <class FunctorType, class ValueType>
 KOKKOS_INLINE_FUNCTION void single(
-    const Impl::VectorSingleStruct<Impl::HPXTeamMember> &single_struct,
+    const Impl::VectorSingleStruct<Impl::HPXTeamMember> &,
     const FunctorType &lambda, ValueType &val) {
   lambda(val);
 }
 
 template <class FunctorType, class ValueType>
 KOKKOS_INLINE_FUNCTION void single(
-    const Impl::ThreadSingleStruct<Impl::HPXTeamMember> &single_struct,
+    const Impl::ThreadSingleStruct<Impl::HPXTeamMember> &,
     const FunctorType &lambda, ValueType &val) {
   lambda(val);
 }
diff --git a/kokkos/core/src/Kokkos_HostSpace.hpp b/kokkos/core/src/Kokkos_HostSpace.hpp
index f5815baec..5bc50c7ff 100644
--- a/kokkos/core/src/Kokkos_HostSpace.hpp
+++ b/kokkos/core/src/Kokkos_HostSpace.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -74,10 +74,10 @@ namespace Impl {
 /// This function initializes the locks to zero (unset).
 void init_lock_array_host_space();
 
-/// \brief Aquire a lock for the address
+/// \brief Acquire a lock for the address
 ///
-/// This function tries to aquire the lock for the hash value derived
-/// from the provided ptr. If the lock is successfully aquired the
+/// This function tries to acquire the lock for the hash value derived
+/// from the provided ptr. If the lock is successfully acquired the
 /// function returns true. Otherwise it returns false.
 bool lock_address_host_space(void* ptr);
 
@@ -85,7 +85,7 @@ bool lock_address_host_space(void* ptr);
 ///
 /// This function releases the lock for the hash value derived
 /// from the provided ptr. This function should only be called
-/// after previously successfully aquiring a lock with
+/// after previously successfully acquiring a lock with
 /// lock_address.
 void unlock_address_host_space(void* ptr);
 
@@ -118,21 +118,17 @@ class HostSpace {
   typedef Kokkos::Threads execution_space;
 #elif defined(KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_HPX)
   typedef Kokkos::Experimental::HPX execution_space;
-//#elif defined( KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_QTHREADS )
-//  typedef Kokkos::Qthreads  execution_space;
 #elif defined(KOKKOS_ENABLE_OPENMP)
   typedef Kokkos::OpenMP execution_space;
 #elif defined(KOKKOS_ENABLE_THREADS)
   typedef Kokkos::Threads execution_space;
-//#elif defined( KOKKOS_ENABLE_QTHREADS )
-//  typedef Kokkos::Qthreads  execution_space;
 #elif defined(KOKKOS_ENABLE_HPX)
   typedef Kokkos::Experimental::HPX execution_space;
 #elif defined(KOKKOS_ENABLE_SERIAL)
   typedef Kokkos::Serial execution_space;
 #else
 #error \
-    "At least one of the following host execution spaces must be defined: Kokkos::OpenMP, Kokkos::Threads, Kokkos::Qthreads, or Kokkos::Serial.  You might be seeing this message if you disabled the Kokkos::Serial device explicitly using the Kokkos_ENABLE_Serial:BOOL=OFF CMake option, but did not enable any of the other host execution space devices."
+    "At least one of the following host execution spaces must be defined: Kokkos::OpenMP, Kokkos::Threads, or Kokkos::Serial.  You might be seeing this message if you disabled the Kokkos::Serial device explicitly using the Kokkos_ENABLE_Serial:BOOL=OFF CMake option, but did not enable any of the other host execution space devices."
 #endif
 
   //! This memory space preferred device_type
@@ -248,7 +244,12 @@ class SharedAllocationRecord<Kokkos::HostSpace, void>
   const Kokkos::HostSpace m_space;
 
  protected:
-  ~SharedAllocationRecord();
+  ~SharedAllocationRecord()
+#if defined( \
+    KOKKOS_IMPL_INTEL_WORKAROUND_NOEXCEPT_SPECIFICATION_VIRTUAL_FUNCTION)
+      noexcept
+#endif
+      ;
   SharedAllocationRecord() = default;
 
   SharedAllocationRecord(
@@ -267,6 +268,9 @@ class SharedAllocationRecord<Kokkos::HostSpace, void>
 #if defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST)
     return new SharedAllocationRecord(arg_space, arg_label, arg_alloc_size);
 #else
+    (void)arg_space;
+    (void)arg_label;
+    (void)arg_alloc_size;
     return (SharedAllocationRecord*)0;
 #endif
   }
diff --git a/kokkos/core/src/Kokkos_Layout.hpp b/kokkos/core/src/Kokkos_Layout.hpp
index 7f6e68a07..d34bdb915 100644
--- a/kokkos/core/src/Kokkos_Layout.hpp
+++ b/kokkos/core/src/Kokkos_Layout.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/Kokkos_Macros.hpp b/kokkos/core/src/Kokkos_Macros.hpp
index 2581bce30..00a07bdcf 100644
--- a/kokkos/core/src/Kokkos_Macros.hpp
+++ b/kokkos/core/src/Kokkos_Macros.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -50,7 +50,6 @@
  *
  *  KOKKOS_ENABLE_CUDA                Kokkos::Cuda execution and memory spaces
  *  KOKKOS_ENABLE_THREADS             Kokkos::Threads execution space
- *  KOKKOS_ENABLE_QTHREADS            Kokkos::Qthreads execution space
  *  KOKKOS_ENABLE_HPX                 Kokkos::Experimental::HPX execution space
  *  KOKKOS_ENABLE_OPENMP              Kokkos::OpenMP execution space
  *  KOKKOS_ENABLE_OPENMPTARGET        Kokkos::Experimental::OpenMPTarget
@@ -80,6 +79,7 @@
  *  KOKKOS_COMPILER_APPLECC
  *  KOKKOS_COMPILER_CLANG
  *  KOKKOS_COMPILER_PGI
+ *  KOKKOS_COMPILER_MSVC
  *
  *  Macros for which compiler extension to use for atomics on intrinsice types
  *
@@ -99,17 +99,17 @@
 
 //----------------------------------------------------------------------------
 
-#if defined(KOKKOS_ENABLE_SERIAL) || defined(KOKKOS_ENABLE_THREADS) ||  \
-    defined(KOKKOS_ENABLE_OPENMP) || defined(KOKKOS_ENABLE_QTHREADS) || \
-    defined(KOKKOS_ENABLE_HPX) || defined(KOKKOS_ENABLE_ROCM) ||        \
-    defined(KOKKOS_ENABLE_OPENMPTARGET)
+#if defined(KOKKOS_ENABLE_SERIAL) || defined(KOKKOS_ENABLE_THREADS) ||    \
+    defined(KOKKOS_ENABLE_OPENMP) || defined(KOKKOS_ENABLE_HPX) ||        \
+    defined(KOKKOS_ENABLE_ROCM) || defined(KOKKOS_ENABLE_OPENMPTARGET) || \
+    defined(KOKKOS_ENABLE_HIP)
 #define KOKKOS_INTERNAL_ENABLE_NON_CUDA_BACKEND
 #endif
 
-#if !defined(KOKKOS_ENABLE_THREADS) && !defined(KOKKOS_ENABLE_CUDA) &&    \
-    !defined(KOKKOS_ENABLE_OPENMP) && !defined(KOKKOS_ENABLE_QTHREADS) && \
-    !defined(KOKKOS_ENABLE_HPX) && !defined(KOKKOS_ENABLE_ROCM) &&        \
-    !defined(KOKKOS_ENABLE_OPENMPTARGET)
+#if !defined(KOKKOS_ENABLE_THREADS) && !defined(KOKKOS_ENABLE_CUDA) &&      \
+    !defined(KOKKOS_ENABLE_OPENMP) && !defined(KOKKOS_ENABLE_HPX) &&        \
+    !defined(KOKKOS_ENABLE_ROCM) && !defined(KOKKOS_ENABLE_OPENMPTARGET) && \
+    !defined(KOKKOS_ENABLE_HIP)
 #define KOKKOS_INTERNAL_NOT_PARALLEL
 #endif
 
@@ -131,37 +131,17 @@
 #error "#include <cuda.h> did not define CUDA_VERSION."
 #endif
 
-#if (CUDA_VERSION < 7000)
-// CUDA supports C++11 in device code starting with version 7.0.
-// This includes auto type and device code internal lambdas.
-#error "Cuda version 7.0 or greater required."
-#endif
-
 #if defined(__CUDA_ARCH__) && (__CUDA_ARCH__ < 300)
 // Compiling with CUDA compiler for device code.
 #error "Cuda device capability >= 3.0 is required."
 #endif
 
 #ifdef KOKKOS_ENABLE_CUDA_LAMBDA
-#if (CUDA_VERSION < 7050)
-// CUDA supports C++11 lambdas generated in host code to be given
-// to the device starting with version 7.5. But the release candidate (7.5.6)
-// still identifies as 7.0.
-#error "Cuda version 7.5 or greater required for host-to-device Lambda support."
-#endif
-
-#if (CUDA_VERSION < 8000) && defined(__NVCC__)
-#define KOKKOS_LAMBDA [=] __device__
-#if defined(KOKKOS_INTERNAL_ENABLE_NON_CUDA_BACKEND)
-#undef KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA
-#endif
-#else
 #define KOKKOS_LAMBDA [=] __host__ __device__
 
 #if defined(KOKKOS_ENABLE_CXX17) || defined(KOKKOS_ENABLE_CXX20)
 #define KOKKOS_CLASS_LAMBDA [ =, *this ] __host__ __device__
 #endif
-#endif
 
 #if defined(__NVCC__)
 #define KOKKOS_IMPL_NEED_FUNCTOR_WRAPPER
@@ -170,12 +150,6 @@
 #undef KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA
 #endif  // !defined(KOKKOS_ENABLE_CUDA_LAMBDA)
 
-#if (9000 <= CUDA_VERSION) && (CUDA_VERSION < 10000)
-// CUDA 9 introduced an incorrect warning,
-// see https://github.com/kokkos/kokkos/issues/1470
-#define KOKKOS_CUDA_9_DEFAULTED_BUG_WORKAROUND
-#endif
-
 #if (10000 > CUDA_VERSION)
 #define KOKKOS_ENABLE_PRE_CUDA_10_DEPRECATION_API
 #endif
@@ -194,6 +168,17 @@
 
 #endif  // #if defined( KOKKOS_ENABLE_CUDA ) && defined( __CUDACC__ )
 
+#if defined(KOKKOS_ENABLE_HIP)
+
+#define KOKKOS_IMPL_HIP_CLANG_WORKAROUND
+
+#define HIP_ENABLE_PRINTF
+#include <hip/hip_runtime.h>
+#include <hip/hip_runtime_api.h>
+
+#define KOKKOS_LAMBDA [=] __host__ __device__
+#endif  // #if defined(KOKKOS_ENABLE_HIP)
+
 //----------------------------------------------------------------------------
 // Mapping compiler built-ins to KOKKOS_COMPILER_*** macros
 
@@ -267,6 +252,10 @@
 #endif
 #endif
 
+#if defined(_MSC_VER) && !defined(KOKKOS_COMPILER_INTEL)
+#define KOKKOS_COMPILER_MSVC _MSC_VER
+#endif
+
 //#endif // #if !defined( __CUDA_ARCH__ )
 //----------------------------------------------------------------------------
 // Language info: C++, CUDA, OPENMP
@@ -283,7 +272,24 @@
 #else
 #define KOKKOS_INLINE_FUNCTION_DELETED __device__ __host__ inline
 #endif
-#endif  // #if defined( __CUDA_ARCH__ )
+#if (CUDA_VERSION < 10000)
+#define KOKKOS_DEFAULTED_FUNCTION __host__ __device__ inline
+#else
+#define KOKKOS_DEFAULTED_FUNCTION inline
+#endif
+#endif
+
+#if defined(KOKKOS_ENABLE_HIP)
+
+#define KOKKOS_FORCEINLINE_FUNCTION __device__ __host__ __forceinline__
+#define KOKKOS_INLINE_FUNCTION __device__ __host__ inline
+#define KOKKOS_DEFAULTED_FUNCTION __device__ __host__ inline
+#define KOKKOS_INLINE_FUNCTION_DELETED __device__ __host__ inline
+#define KOKKOS_FUNCTION __device__ __host__
+#if defined(KOKKOS_ENABLE_CXX17) || defined(KOKKOS_ENABLE_CXX20)
+#define KOKKOS_CLASS_LAMBDA [ =, *this ] __host__ __device__
+#endif
+#endif  // #if defined( KOKKOS_ENABLE_HIP )
 
 #if defined(KOKKOS_ENABLE_ROCM) && defined(__HCC__)
 
@@ -291,6 +297,7 @@
 #define KOKKOS_INLINE_FUNCTION __attribute__((amp, cpu)) inline
 #define KOKKOS_FUNCTION __attribute__((amp, cpu))
 #define KOKKOS_LAMBDA [=] __attribute__((amp, cpu))
+#define KOKKOS_DEFAULTED_FUNCTION __attribute__((amp, cpu)) inline
 #endif
 
 #if defined(_OPENMP)
@@ -355,6 +362,10 @@
 #endif
 #endif
 
+#if (1800 > KOKKOS_COMPILER_INTEL)
+#define KOKKOS_IMPL_INTEL_WORKAROUND_NOEXCEPT_SPECIFICATION_VIRTUAL_FUNCTION
+#endif
+
 #if defined(__MIC__)
 // Compiling for Xeon Phi
 #endif
@@ -470,6 +481,10 @@
 #if !defined(KOKKOS_INLINE_FUNCTION_DELETED)
 #define KOKKOS_INLINE_FUNCTION_DELETED inline
 #endif
+
+#if !defined(KOKKOS_DEFAULTED_FUNCTION)
+#define KOKKOS_DEFAULTED_FUNCTION inline
+#endif
 //----------------------------------------------------------------------------
 // Define empty macro for restrict if necessary:
 
@@ -497,28 +512,30 @@
 // There is zero or one default execution space specified.
 
 #if 1 < ((defined(KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_CUDA) ? 1 : 0) +         \
+         (defined(KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_HIP) ? 1 : 0) +          \
          (defined(KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_ROCM) ? 1 : 0) +         \
          (defined(KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_OPENMPTARGET) ? 1 : 0) + \
          (defined(KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_OPENMP) ? 1 : 0) +       \
          (defined(KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_THREADS) ? 1 : 0) +      \
-         (defined(KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_QTHREADS) ? 1 : 0) +     \
          (defined(KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_HPX) ? 1 : 0) +          \
          (defined(KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_SERIAL) ? 1 : 0))
 #error "More than one KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_* specified."
 #endif
 
 // If default is not specified then chose from enabled execution spaces.
-// Priority: CUDA, OPENMP, THREADS, QTHREADS, HPX, SERIAL
+// Priority: CUDA, HIP, ROCM, OPENMPTARGET, OPENMP, THREADS, HPX, SERIAL
 #if defined(KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_CUDA)
+#elif defined(KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_HIP)
 #elif defined(KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_ROCM)
 #elif defined(KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_OPENMPTARGET)
 #elif defined(KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_OPENMP)
 #elif defined(KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_THREADS)
-//#elif defined( KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_QTHREADS )
 #elif defined(KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_HPX)
 #elif defined(KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_SERIAL)
 #elif defined(KOKKOS_ENABLE_CUDA)
 #define KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_CUDA
+#elif defined(KOKKOS_ENABLE_HIP)
+#define KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_HIP
 #elif defined(KOKKOS_ENABLE_ROCM)
 #define KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_ROCM
 #elif defined(KOKKOS_ENABLE_OPENMPTARGET)
@@ -527,8 +544,6 @@
 #define KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_OPENMP
 #elif defined(KOKKOS_ENABLE_THREADS)
 #define KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_THREADS
-//#elif defined( KOKKOS_ENABLE_QTHREADS )
-//  #define KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_QTHREADS
 #elif defined(KOKKOS_ENABLE_HPX)
 #define KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_HPX
 #else
@@ -543,6 +558,10 @@
 #elif defined(__HCC__) && defined(__HCC_ACCELERATOR__) && \
     defined(KOKKOS_ENABLE_ROCM)
 #define KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_ROCM_GPU
+#elif defined(__HIPCC__) &&                                     \
+    (defined(__HCC_ACCELERATOR__) || defined(__CUDA_ARCH__)) && \
+    defined(KOKKOS_ENABLE_HIP)
+#define KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HIP_GPU
 #else
 #define KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST
 #endif
@@ -557,27 +576,25 @@
 #endif
 
 //----------------------------------------------------------------------------
-// If compiling with CUDA then must be using CUDA 8 or better
-// and use relocateable device code to enable the task policy.
-// nvcc relocatable device code option: --relocatable-device-code=true
+// If compiling with CUDA, we must use relocateable device code
+// to enable the task policy.
 
-#if (defined(KOKKOS_ENABLE_CUDA))
-#if (8000 <= CUDA_VERSION) && \
-    defined(KOKKOS_ENABLE_CUDA_RELOCATABLE_DEVICE_CODE)
+#if defined(KOKKOS_ENABLE_CUDA)
+#if defined(KOKKOS_ENABLE_CUDA_RELOCATABLE_DEVICE_CODE)
 #define KOKKOS_ENABLE_TASKDAG
 #endif
 #else
+#ifndef KOKKOS_ENABLE_HIP
 #define KOKKOS_ENABLE_TASKDAG
 #endif
+#endif
 
 #if defined(KOKKOS_ENABLE_CUDA)
-#if (9000 <= CUDA_VERSION)
 #define KOKKOS_IMPL_CUDA_VERSION_9_WORKAROUND
 #if (__CUDA_ARCH__)
 #define KOKKOS_IMPL_CUDA_SYNCWARP_NEEDS_MASK
 #endif
 #endif
-#endif
 
 #define KOKKOS_INVALID_INDEX (~std::size_t(0))
 
@@ -622,4 +639,17 @@
 #define KOKKOS_IMPL_ENABLE_CXXABI
 #endif
 
+// WORKAROUND for AMD aomp which apparently defines CUDA_ARCH when building for
+// AMD GPUs with OpenMP Target ???
+#if defined(__CUDA_ARCH__) && !defined(__CUDACC__) && \
+    !defined(KOKKOS_ENABLE_HIP) && !defined(KOKKOS_ENABLE_CUDA)
+#undef __CUDA_ARCH__
+#endif
+
+#if defined(KOKKOS_COMPILER_MSVC)
+#define KOKKOS_THREAD_LOCAL __declspec(thread)
+#else
+#define KOKKOS_THREAD_LOCAL __thread
+#endif
+
 #endif  // #ifndef KOKKOS_MACROS_HPP
diff --git a/kokkos/core/src/Kokkos_MasterLock.hpp b/kokkos/core/src/Kokkos_MasterLock.hpp
index 77d776981..3c45e131a 100644
--- a/kokkos/core/src/Kokkos_MasterLock.hpp
+++ b/kokkos/core/src/Kokkos_MasterLock.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/Kokkos_MemoryPool.hpp b/kokkos/core/src/Kokkos_MemoryPool.hpp
index f38e12a1c..da0754470 100644
--- a/kokkos/core/src/Kokkos_MemoryPool.hpp
+++ b/kokkos/core/src/Kokkos_MemoryPool.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -257,61 +257,14 @@ class MemoryPool {
 
   //--------------------------------------------------------------------------
 
-#ifdef KOKKOS_CUDA_9_DEFAULTED_BUG_WORKAROUND
-  KOKKOS_INLINE_FUNCTION MemoryPool(MemoryPool &&rhs)
-      : m_tracker(std::move(rhs.m_tracker)),
-        m_sb_state_array(std::move(rhs.m_sb_state_array)),
-        m_sb_state_size(std::move(rhs.m_sb_state_size)),
-        m_sb_size_lg2(std::move(rhs.m_sb_size_lg2)),
-        m_max_block_size_lg2(std::move(rhs.m_max_block_size_lg2)),
-        m_min_block_size_lg2(std::move(rhs.m_min_block_size_lg2)),
-        m_sb_count(std::move(rhs.m_sb_count)),
-        m_hint_offset(std::move(rhs.m_hint_offset)),
-        m_data_offset(std::move(rhs.m_data_offset)) {}
-  KOKKOS_INLINE_FUNCTION MemoryPool(const MemoryPool &rhs)
-      : m_tracker(rhs.m_tracker),
-        m_sb_state_array(rhs.m_sb_state_array),
-        m_sb_state_size(rhs.m_sb_state_size),
-        m_sb_size_lg2(rhs.m_sb_size_lg2),
-        m_max_block_size_lg2(rhs.m_max_block_size_lg2),
-        m_min_block_size_lg2(rhs.m_min_block_size_lg2),
-        m_sb_count(rhs.m_sb_count),
-        m_hint_offset(rhs.m_hint_offset),
-        m_data_offset(rhs.m_data_offset) {}
-  KOKKOS_INLINE_FUNCTION MemoryPool &operator=(MemoryPool &&rhs) {
-    m_tracker            = std::move(rhs.m_tracker);
-    m_sb_state_array     = std::move(rhs.m_sb_state_array);
-    m_sb_state_size      = std::move(rhs.m_sb_state_size);
-    m_sb_size_lg2        = std::move(rhs.m_sb_size_lg2);
-    m_max_block_size_lg2 = std::move(rhs.m_max_block_size_lg2);
-    m_min_block_size_lg2 = std::move(rhs.m_min_block_size_lg2);
-    m_sb_count           = std::move(rhs.m_sb_count);
-    m_hint_offset        = std::move(rhs.m_hint_offset);
-    m_data_offset        = std::move(rhs.m_data_offset);
-    return *this;
-  }
-  KOKKOS_INLINE_FUNCTION MemoryPool &operator=(const MemoryPool &rhs) {
-    m_tracker            = rhs.m_tracker;
-    m_sb_state_array     = rhs.m_sb_state_array;
-    m_sb_state_size      = rhs.m_sb_state_size;
-    m_sb_size_lg2        = rhs.m_sb_size_lg2;
-    m_max_block_size_lg2 = rhs.m_max_block_size_lg2;
-    m_min_block_size_lg2 = rhs.m_min_block_size_lg2;
-    m_sb_count           = rhs.m_sb_count;
-    m_hint_offset        = rhs.m_hint_offset;
-    m_data_offset        = rhs.m_data_offset;
-    return *this;
-  }
-#else
-  KOKKOS_INLINE_FUNCTION MemoryPool(MemoryPool &&)      = default;
-  KOKKOS_INLINE_FUNCTION MemoryPool(const MemoryPool &) = default;
-  KOKKOS_INLINE_FUNCTION MemoryPool &operator=(MemoryPool &&) = default;
-  KOKKOS_INLINE_FUNCTION MemoryPool &operator=(const MemoryPool &) = default;
-#endif
+  KOKKOS_DEFAULTED_FUNCTION MemoryPool(MemoryPool &&)      = default;
+  KOKKOS_DEFAULTED_FUNCTION MemoryPool(const MemoryPool &) = default;
+  KOKKOS_DEFAULTED_FUNCTION MemoryPool &operator=(MemoryPool &&) = default;
+  KOKKOS_DEFAULTED_FUNCTION MemoryPool &operator=(const MemoryPool &) = default;
 
   KOKKOS_INLINE_FUNCTION MemoryPool()
       : m_tracker(),
-        m_sb_state_array(0),
+        m_sb_state_array(nullptr),
         m_sb_state_size(0),
         m_sb_size_lg2(0),
         m_max_block_size_lg2(0),
@@ -339,7 +292,7 @@ class MemoryPool {
              const size_t min_total_alloc_size, size_t min_block_alloc_size = 0,
              size_t max_block_alloc_size = 0, size_t min_superblock_size = 0)
       : m_tracker(),
-        m_sb_state_array(0),
+        m_sb_state_array(nullptr),
         m_sb_state_size(0),
         m_sb_size_lg2(0),
         m_max_block_size_lg2(0),
@@ -547,9 +500,9 @@ class MemoryPool {
           "allocation size");
     }
 
-    if (0 == alloc_size) return (void *)0;
+    if (0 == alloc_size) return nullptr;
 
-    void *p = 0;
+    void *p = nullptr;
 
     const uint32_t block_size_lg2 = get_block_size_lg2(alloc_size);
 
@@ -590,7 +543,7 @@ class MemoryPool {
 
     int32_t sb_id = -1;
 
-    volatile uint32_t *sb_state_array = 0;
+    volatile uint32_t *sb_state_array = nullptr;
 
     while (attempt_limit) {
       int32_t hint_sb_id = -1;
@@ -784,7 +737,7 @@ class MemoryPool {
    */
   KOKKOS_INLINE_FUNCTION
   void deallocate(void *p, size_t /* alloc_size */) const noexcept {
-    if (0 == p) return;
+    if (nullptr == p) return;
 
     // Determine which superblock and block
     const ptrdiff_t d =
diff --git a/kokkos/core/src/Kokkos_MemoryTraits.hpp b/kokkos/core/src/Kokkos_MemoryTraits.hpp
index b0de42d4c..75d3d4014 100644
--- a/kokkos/core/src/Kokkos_MemoryTraits.hpp
+++ b/kokkos/core/src/Kokkos_MemoryTraits.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/Kokkos_NumericTraits.hpp b/kokkos/core/src/Kokkos_NumericTraits.hpp
index aaa900b52..88040bcba 100644
--- a/kokkos/core/src/Kokkos_NumericTraits.hpp
+++ b/kokkos/core/src/Kokkos_NumericTraits.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -160,8 +160,8 @@ struct reduction_identity<long> {
   KOKKOS_FORCEINLINE_FUNCTION constexpr static long prod() {
     return static_cast<long>(1);
   }
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static long max() { return LLONG_MIN; }
-  KOKKOS_FORCEINLINE_FUNCTION constexpr static long min() { return LLONG_MAX; }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static long max() { return LONG_MIN; }
+  KOKKOS_FORCEINLINE_FUNCTION constexpr static long min() { return LONG_MAX; }
   KOKKOS_FORCEINLINE_FUNCTION constexpr static long bor() {
     return static_cast<long>(0x0);
   }
@@ -368,7 +368,8 @@ struct reduction_identity<double> {
   KOKKOS_FORCEINLINE_FUNCTION constexpr static double min() { return DBL_MAX; }
 };
 
-#if !defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_CUDA)
+#if !defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_CUDA) && \
+    !defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HIP_GPU)
 template <>
 struct reduction_identity<long double> {
   KOKKOS_FORCEINLINE_FUNCTION constexpr static long double sum() {
diff --git a/kokkos/core/src/Kokkos_OpenMP.hpp b/kokkos/core/src/Kokkos_OpenMP.hpp
index 5ced2a067..d9b9077c6 100644
--- a/kokkos/core/src/Kokkos_OpenMP.hpp
+++ b/kokkos/core/src/Kokkos_OpenMP.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -94,9 +94,6 @@ class OpenMP {
   using size_type            = memory_space::size_type;
   using scratch_memory_space = ScratchMemorySpace<OpenMP>;
 
-  /// \brief Get a handle to the default execution space instance
-  inline OpenMP() noexcept;
-
   /// \brief Print configuration information to the given output stream.
   static void print_configuration(std::ostream&, const bool verbose = false);
 
@@ -225,8 +222,17 @@ class OpenMP {
 #endif
 
   static constexpr const char* name() noexcept { return "OpenMP"; }
+  uint32_t impl_instance_id() const noexcept { return 0; }
 };
 
+namespace Profiling {
+namespace Experimental {
+template <>
+struct DeviceTypeTraits<OpenMP> {
+  static constexpr DeviceType id = DeviceType::OpenMP;
+};
+}  // namespace Experimental
+}  // namespace Profiling
 }  // namespace Kokkos
 
 /*--------------------------------------------------------------------------*/
diff --git a/kokkos/core/src/Kokkos_OpenMPTarget.hpp b/kokkos/core/src/Kokkos_OpenMPTarget.hpp
index c17cfa0a0..d113f2442 100644
--- a/kokkos/core/src/Kokkos_OpenMPTarget.hpp
+++ b/kokkos/core/src/Kokkos_OpenMPTarget.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -65,6 +65,10 @@
 
 namespace Kokkos {
 namespace Experimental {
+namespace Impl {
+class OpenMPTargetInternal;
+}
+
 /// \class OpenMPTarget
 /// \brief Kokkos device for multicore processors in the host memory space.
 class OpenMPTarget {
@@ -84,76 +88,47 @@ class OpenMPTarget {
 
   typedef ScratchMemorySpace<OpenMPTarget> scratch_memory_space;
 
-  //@}
-  //------------------------------------
-  //! \name Functions that all Kokkos execution spaces must implement.
-  //@{
-
   inline static bool in_parallel() { return omp_in_parallel(); }
 
-  /** \brief  Set the device in a "sleep" state. A noop for OpenMPTarget.  */
-  static bool sleep();
-
-  /** \brief Wake the device from the 'sleep' state. A noop for OpenMPTarget. */
-  static bool wake();
-
-  /** \brief Wait until all dispatched functors complete. A noop for
-   * OpenMPTarget. */
-  static void fence() {}
-
-  /// \brief Print configuration information to the given output stream.
-  static void print_configuration(std::ostream&, const bool detail = false);
-
-  /// \brief Free any resources being consumed by the device.
-  static void finalize();
-
-  /** \brief  Initialize the device.
-   *
-   *  1) If the hardware locality library is enabled and OpenMPTarget has not
-   *     already bound threads then bind OpenMPTarget threads to maximize
-   *     core utilization and group for memory hierarchy locality.
-   *
-   *  2) Allocate a HostThread for each OpenMPTarget thread to hold its
-   *     topology and fan in/out data.
-   */
-  static void initialize(unsigned thread_count = 0, unsigned use_numa_count = 0,
-                         unsigned use_cores_per_numa = 0);
-
-  static int is_initialized();
+  static void fence();
 
   /** \brief  Return the maximum amount of concurrency.  */
   static int concurrency();
 
-  //@}
-  //------------------------------------
-  /** \brief  This execution space has a topological thread pool which can be
-   * queried.
-   *
-   *  All threads within a pool have a common memory space for which they are
-   * cache coherent. depth = 0  gives the number of threads in the whole pool.
-   *    depth = 1  gives the number of threads in a NUMA region, typically
-   * sharing L3 cache. depth = 2  gives the number of threads at the finest
-   * granularity, typically sharing L1 cache.
-   */
-  inline static int thread_pool_size(int depth = 0);
-
-  /** \brief  The rank of the executing thread in this thread pool */
-  KOKKOS_INLINE_FUNCTION static int thread_pool_rank();
+  //! Print configuration information to the given output stream.
+  void print_configuration(std::ostream&, const bool detail = false);
 
-  //------------------------------------
+  static const char* name();
 
-  inline static unsigned max_hardware_threads() { return thread_pool_size(0); }
+  //! Free any resources being consumed by the device.
+  void impl_finalize();
 
-  KOKKOS_INLINE_FUNCTION static unsigned hardware_thread_id() {
-    return thread_pool_rank();
+  //! Has been initialized
+  static int impl_is_initialized();
+
+  //! Initialize, telling the CUDA run-time library which device to use.
+  void impl_initialize();
+
+  inline Impl::OpenMPTargetInternal* impl_internal_space_instance() const {
+    return m_space_instance;
   }
 
-  static const char* name();
+  OpenMPTarget();
+  uint32_t impl_instance_id() const noexcept { return 0; }
 
  private:
-  static bool m_is_initialized;
+  Impl::OpenMPTargetInternal* m_space_instance;
+};
+}  // namespace Experimental
+
+namespace Profiling {
+namespace Experimental {
+template <>
+struct DeviceTypeTraits<Experimental::OpenMPTarget> {
+  static constexpr DeviceType id = DeviceType::OpenMPTarget;
 };
 }  // namespace Experimental
+}  // namespace Profiling
 }  // namespace Kokkos
 
 /*--------------------------------------------------------------------------*/
@@ -179,6 +154,7 @@ struct VerifyExecutionCanAccessMemorySpace<
 
 #include <OpenMPTarget/Kokkos_OpenMPTarget_Exec.hpp>
 #include <OpenMPTarget/Kokkos_OpenMPTarget_Parallel.hpp>
+#include <OpenMPTarget/Kokkos_OpenMPTarget_Parallel_MDRange.hpp>
 #include <OpenMPTarget/Kokkos_OpenMPTarget_Task.hpp>
 
 /*--------------------------------------------------------------------------*/
diff --git a/kokkos/core/src/Kokkos_OpenMPTargetSpace.hpp b/kokkos/core/src/Kokkos_OpenMPTargetSpace.hpp
index bb698c07f..9d24a342e 100644
--- a/kokkos/core/src/Kokkos_OpenMPTargetSpace.hpp
+++ b/kokkos/core/src/Kokkos_OpenMPTargetSpace.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -69,10 +69,10 @@ namespace Impl {
 /// This function initializes the locks to zero (unset).
 // void init_lock_array_host_space();
 
-/// \brief Aquire a lock for the address
+/// \brief Acquire a lock for the address
 ///
-/// This function tries to aquire the lock for the hash value derived
-/// from the provided ptr. If the lock is successfully aquired the
+/// This function tries to acquire the lock for the hash value derived
+/// from the provided ptr. If the lock is successfully acquired the
 /// function returns true. Otherwise it returns false.
 // bool lock_address_host_space(void* ptr);
 
@@ -80,7 +80,7 @@ namespace Impl {
 ///
 /// This function releases the lock for the hash value derived
 /// from the provided ptr. This function should only be called
-/// after previously successfully aquiring a lock with
+/// after previously successfully acquiring a lock with
 /// lock_address.
 // void unlock_address_host_space(void* ptr);
 
@@ -128,6 +128,8 @@ class OpenMPTargetSpace {
   /**\brief  Deallocate untracked memory in the space */
   void deallocate(void* const arg_alloc_ptr, const size_t arg_alloc_size) const;
 
+  static constexpr const char* name() { return "OpenMPTargetSpace"; }
+
  private:
   friend class Kokkos::Impl::SharedAllocationRecord<
       Kokkos::Experimental::OpenMPTargetSpace, void>;
@@ -174,7 +176,13 @@ class SharedAllocationRecord<Kokkos::Experimental::OpenMPTargetSpace, void>
 
   KOKKOS_INLINE_FUNCTION static SharedAllocationRecord* allocate(
       const Kokkos::Experimental::OpenMPTargetSpace& arg_space,
-      const std::string& arg_label, const size_t arg_alloc_size);
+      const std::string& arg_label, const size_t arg_alloc_size) {
+#if defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST)
+    return new SharedAllocationRecord(arg_space, arg_label, arg_alloc_size);
+#else
+    return nullptr;
+#endif
+  }
 
   /**\brief  Allocate tracked memory in the space */
   static void* allocate_tracked(
diff --git a/kokkos/core/src/Kokkos_Pair.hpp b/kokkos/core/src/Kokkos_Pair.hpp
index 87bda4e41..23bb755e3 100644
--- a/kokkos/core/src/Kokkos_Pair.hpp
+++ b/kokkos/core/src/Kokkos_Pair.hpp
@@ -23,10 +23,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -78,14 +78,7 @@ struct pair {
   /// This calls the default constructors of T1 and T2.  It won't
   /// compile if those default constructors are not defined and
   /// public.
-  KOKKOS_FORCEINLINE_FUNCTION constexpr
-#ifdef KOKKOS_CUDA_9_DEFAULTED_BUG_WORKAROUND
-      pair()
-      : first(), second() {
-  }
-#else
-      pair() = default;
-#endif
+  KOKKOS_DEFAULTED_FUNCTION constexpr pair() = default;
 
   /// \brief Constructor that takes both elements of the pair.
   ///
@@ -439,14 +432,7 @@ struct pair<T1, void> {
   first_type first;
   enum { second = 0 };
 
-  KOKKOS_FORCEINLINE_FUNCTION constexpr
-#ifdef KOKKOS_CUDA_9_DEFAULTED_BUG_WORKAROUND
-      pair()
-      : first() {
-  }
-#else
-      pair() = default;
-#endif
+  KOKKOS_DEFAULTED_FUNCTION constexpr pair() = default;
 
   KOKKOS_FORCEINLINE_FUNCTION constexpr pair(const first_type& f) : first(f) {}
 
diff --git a/kokkos/core/src/Kokkos_Parallel.hpp b/kokkos/core/src/Kokkos_Parallel.hpp
index c3c0b2b5c..775ab9203 100644
--- a/kokkos/core/src/Kokkos_Parallel.hpp
+++ b/kokkos/core/src/Kokkos_Parallel.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -114,7 +114,7 @@ struct FunctorPolicyExecutionSpace<
     Functor, Policy,
     typename enable_if_type<typename Functor::device_type>::type,
     EnablePolicy> {
-  typedef typename Functor::device_type execution_space;
+  typedef typename Functor::device_type::execution_space execution_space;
 };
 
 template <class Functor, class Policy, class EnablePolicy>
@@ -158,16 +158,21 @@ template <class ExecPolicy, class FunctorType>
 inline void parallel_for(
     const ExecPolicy& policy, const FunctorType& functor,
     const std::string& str = "",
-    typename Impl::enable_if<
-        Kokkos::Impl::is_execution_policy<ExecPolicy>::value>::type* = 0) {
+    typename std::enable_if<
+        Kokkos::Impl::is_execution_policy<ExecPolicy>::value>::type* =
+        nullptr) {
 #if defined(KOKKOS_ENABLE_PROFILING)
   uint64_t kpID = 0;
   if (Kokkos::Profiling::profileLibraryLoaded()) {
     Kokkos::Impl::ParallelConstructName<FunctorType,
                                         typename ExecPolicy::work_tag>
         name(str);
-    Kokkos::Profiling::beginParallelFor(name.get(), 0, &kpID);
+    Kokkos::Profiling::beginParallelFor(
+        name.get(), Kokkos::Profiling::Experimental::device_id(policy.space()),
+        &kpID);
   }
+#else
+  (void)str;
 #endif
 
   Kokkos::Impl::shared_allocation_tracking_disable();
@@ -194,8 +199,12 @@ inline void parallel_for(const size_t work_count, const FunctorType& functor,
   uint64_t kpID = 0;
   if (Kokkos::Profiling::profileLibraryLoaded()) {
     Kokkos::Impl::ParallelConstructName<FunctorType, void> name(str);
-    Kokkos::Profiling::beginParallelFor(name.get(), 0, &kpID);
+    Kokkos::Profiling::beginParallelFor(
+        name.get(),
+        Kokkos::Profiling::Experimental::device_id(policy().space()), &kpID);
   }
+#else
+  (void)str;
 #endif
 
   Kokkos::Impl::shared_allocation_tracking_disable();
@@ -403,16 +412,21 @@ template <class ExecutionPolicy, class FunctorType>
 inline void parallel_scan(
     const ExecutionPolicy& policy, const FunctorType& functor,
     const std::string& str = "",
-    typename Impl::enable_if<
-        Kokkos::Impl::is_execution_policy<ExecutionPolicy>::value>::type* = 0) {
+    typename std::enable_if<
+        Kokkos::Impl::is_execution_policy<ExecutionPolicy>::value>::type* =
+        nullptr) {
 #if defined(KOKKOS_ENABLE_PROFILING)
   uint64_t kpID = 0;
   if (Kokkos::Profiling::profileLibraryLoaded()) {
     Kokkos::Impl::ParallelConstructName<FunctorType,
                                         typename ExecutionPolicy::work_tag>
         name(str);
-    Kokkos::Profiling::beginParallelScan(name.get(), 0, &kpID);
+    Kokkos::Profiling::beginParallelScan(
+        name.get(), Kokkos::Profiling::Experimental::device_id(policy.space()),
+        &kpID);
   }
+#else
+  (void)str;
 #endif
 
   Kokkos::Impl::shared_allocation_tracking_disable();
@@ -440,8 +454,12 @@ inline void parallel_scan(const size_t work_count, const FunctorType& functor,
   uint64_t kpID = 0;
   if (Kokkos::Profiling::profileLibraryLoaded()) {
     Kokkos::Impl::ParallelConstructName<FunctorType, void> name(str);
-    Kokkos::Profiling::beginParallelScan(name.get(), 0, &kpID);
+    Kokkos::Profiling::beginParallelScan(
+        name.get(),
+        Kokkos::Profiling::Experimental::device_id(policy().space()), &kpID);
   }
+#else
+  (void)str;
 #endif
 
   Kokkos::Impl::shared_allocation_tracking_disable();
@@ -479,16 +497,21 @@ template <class ExecutionPolicy, class FunctorType, class ReturnType>
 inline void parallel_scan(
     const ExecutionPolicy& policy, const FunctorType& functor,
     ReturnType& return_value, const std::string& str = "",
-    typename Impl::enable_if<
-        Kokkos::Impl::is_execution_policy<ExecutionPolicy>::value>::type* = 0) {
+    typename std::enable_if<
+        Kokkos::Impl::is_execution_policy<ExecutionPolicy>::value>::type* =
+        nullptr) {
 #if defined(KOKKOS_ENABLE_PROFILING)
   uint64_t kpID = 0;
   if (Kokkos::Profiling::profileLibraryLoaded()) {
     Kokkos::Impl::ParallelConstructName<FunctorType,
                                         typename ExecutionPolicy::work_tag>
         name(str);
-    Kokkos::Profiling::beginParallelScan(name.get(), 0, &kpID);
+    Kokkos::Profiling::beginParallelScan(
+        name.get(), Kokkos::Profiling::Experimental::device_id(policy.space()),
+        &kpID);
   }
+#else
+  (void)str;
 #endif
 
   Kokkos::Impl::shared_allocation_tracking_disable();
@@ -503,7 +526,7 @@ inline void parallel_scan(
     Kokkos::Profiling::endParallelScan(kpID);
   }
 #endif
-  Kokkos::fence();
+  policy.space().fence();
 }
 
 template <class FunctorType, class ReturnType>
@@ -519,8 +542,12 @@ inline void parallel_scan(const size_t work_count, const FunctorType& functor,
   uint64_t kpID = 0;
   if (Kokkos::Profiling::profileLibraryLoaded()) {
     Kokkos::Impl::ParallelConstructName<FunctorType, void> name(str);
-    Kokkos::Profiling::beginParallelScan(name.get(), 0, &kpID);
+    Kokkos::Profiling::beginParallelScan(
+        name.get(),
+        Kokkos::Profiling::Experimental::device_id(policy().space()), &kpID);
   }
+#else
+  (void)str;
 #endif
 
   Kokkos::Impl::shared_allocation_tracking_disable();
@@ -535,7 +562,7 @@ inline void parallel_scan(const size_t work_count, const FunctorType& functor,
     Kokkos::Profiling::endParallelScan(kpID);
   }
 #endif
-  Kokkos::fence();
+  execution_space().fence();
 }
 
 template <class ExecutionPolicy, class FunctorType, class ReturnType>
@@ -564,7 +591,10 @@ inline void parallel_scan(const std::string& str, const ExecutionPolicy& policy,
 namespace Kokkos {
 namespace Impl {
 
-template <class FunctorType, class Enable = void>
+template <class FunctorType,
+          bool HasTeamShmemSize =
+              has_member_team_shmem_size<FunctorType>::value,
+          bool HasShmemSize = has_member_shmem_size<FunctorType>::value>
 struct FunctorTeamShmemSize {
   KOKKOS_INLINE_FUNCTION static size_t value(const FunctorType&, int) {
     return 0;
@@ -572,22 +602,27 @@ struct FunctorTeamShmemSize {
 };
 
 template <class FunctorType>
-struct FunctorTeamShmemSize<
-    FunctorType,
-    typename Impl::enable_if<0 < sizeof(&FunctorType::team_shmem_size)>::type> {
+struct FunctorTeamShmemSize<FunctorType, true, false> {
   static inline size_t value(const FunctorType& f, int team_size) {
     return f.team_shmem_size(team_size);
   }
 };
 
 template <class FunctorType>
-struct FunctorTeamShmemSize<
-    FunctorType,
-    typename Impl::enable_if<0 < sizeof(&FunctorType::shmem_size)>::type> {
+struct FunctorTeamShmemSize<FunctorType, false, true> {
   static inline size_t value(const FunctorType& f, int team_size) {
     return f.shmem_size(team_size);
   }
 };
+template <class FunctorType>
+struct FunctorTeamShmemSize<FunctorType, true, true> {
+  static inline size_t value(const FunctorType& /*f*/, int /*team_size*/) {
+    Kokkos::abort(
+        "Functor with both team_shmem_size and shmem_size defined is "
+        "not allowed");
+    return 0;
+  }
+};
 
 }  // namespace Impl
 }  // namespace Kokkos
diff --git a/kokkos/core/src/Kokkos_Parallel_Reduce.hpp b/kokkos/core/src/Kokkos_Parallel_Reduce.hpp
index 3df8d56de..4ef2dbdf0 100644
--- a/kokkos/core/src/Kokkos_Parallel_Reduce.hpp
+++ b/kokkos/core/src/Kokkos_Parallel_Reduce.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -543,7 +543,6 @@ struct MaxLoc {
   KOKKOS_INLINE_FUNCTION
   void init(value_type& val) const {
     val.val = reduction_identity<scalar_type>::max();
-    ;
     val.loc = reduction_identity<index_type>::min();
   }
 
@@ -622,7 +621,6 @@ struct MinMax {
   KOKKOS_INLINE_FUNCTION
   void init(value_type& val) const {
     val.max_val = reduction_identity<scalar_type>::max();
-    ;
     val.min_val = reduction_identity<scalar_type>::min();
   }
 
@@ -711,7 +709,6 @@ struct MinMaxLoc {
   KOKKOS_INLINE_FUNCTION
   void init(value_type& val) const {
     val.max_val = reduction_identity<scalar_type>::max();
-    ;
     val.min_val = reduction_identity<scalar_type>::min();
     val.max_loc = reduction_identity<index_type>::min();
     val.min_loc = reduction_identity<index_type>::min();
@@ -772,7 +769,7 @@ struct ParallelReduceReturnValue<
 
 template <class ReturnType, class FunctorType>
 struct ParallelReduceReturnValue<
-    typename std::enable_if<(is_array<ReturnType>::value ||
+    typename std::enable_if<(std::is_array<ReturnType>::value ||
                              std::is_pointer<ReturnType>::value)>::type,
     ReturnType, FunctorType> {
   typedef Kokkos::View<typename std::remove_const<ReturnType>::type,
@@ -788,7 +785,7 @@ struct ParallelReduceReturnValue<
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
     return return_type(return_val, functor.value_count);
 #else
-    if (is_array<ReturnType>::value)
+    if (std::is_array<ReturnType>::value)
       return return_type(return_val);
     else
       return return_type(return_val, functor.value_count);
@@ -865,6 +862,8 @@ struct ParallelReduceAdaptor {
           name(label);
       Kokkos::Profiling::beginParallelReduce(name.get(), 0, &kpID);
     }
+#else
+    (void)label;
 #endif
 
     Kokkos::Impl::shared_allocation_tracking_disable();
@@ -915,22 +914,25 @@ struct ReducerHasTestReferenceFunction {
   static std::false_type test_func(...);
 
   enum {
-    value = std::is_same<std::true_type, decltype(test_func<T>(0))>::value
+    value = std::is_same<std::true_type, decltype(test_func<T>(nullptr))>::value
   };
 };
 
-template <class T, bool is_reducer = ReducerHasTestReferenceFunction<T>::value>
+template <class ExecutionSpace, class T,
+          bool is_reducer = ReducerHasTestReferenceFunction<T>::value>
 struct ParallelReduceFence {
-  static void fence(const T&) { Kokkos::fence(); }
+  static void fence(const ExecutionSpace& execution_space, const T&) {
+    execution_space.fence();
+  }
 };
-template <class... Args>
-struct ParallelReduceFence<View<Args...>, false> {
-  static void fence(const View<Args...>){};
+template <class ExecutionSpace, class... Args>
+struct ParallelReduceFence<ExecutionSpace, View<Args...>, false> {
+  static void fence(const ExecutionSpace&, const View<Args...>){};
 };
-template <class T>
-struct ParallelReduceFence<T, true> {
-  static void fence(const T& reducer) {
-    if (reducer.references_scalar()) Kokkos::fence();
+template <class ExecutionSpace, class T>
+struct ParallelReduceFence<ExecutionSpace, T, true> {
+  static void fence(const ExecutionSpace& execution_space, const T& reducer) {
+    if (reducer.references_scalar()) execution_space.fence();
   }
 };
 }  // namespace Impl
@@ -976,22 +978,26 @@ template <class PolicyType, class FunctorType, class ReturnType>
 inline void parallel_reduce(
     const std::string& label, const PolicyType& policy,
     const FunctorType& functor, ReturnType& return_value,
-    typename Impl::enable_if<
-        Kokkos::Impl::is_execution_policy<PolicyType>::value>::type* = 0) {
+    typename std::enable_if<
+        Kokkos::Impl::is_execution_policy<PolicyType>::value>::type* =
+        nullptr) {
   Impl::ParallelReduceAdaptor<PolicyType, FunctorType, ReturnType>::execute(
       label, policy, functor, return_value);
-  Impl::ParallelReduceFence<ReturnType>::fence(return_value);
+  Impl::ParallelReduceFence<typename PolicyType::execution_space,
+                            ReturnType>::fence(policy.space(), return_value);
 }
 
 template <class PolicyType, class FunctorType, class ReturnType>
 inline void parallel_reduce(
     const PolicyType& policy, const FunctorType& functor,
     ReturnType& return_value,
-    typename Impl::enable_if<
-        Kokkos::Impl::is_execution_policy<PolicyType>::value>::type* = 0) {
+    typename std::enable_if<
+        Kokkos::Impl::is_execution_policy<PolicyType>::value>::type* =
+        nullptr) {
   Impl::ParallelReduceAdaptor<PolicyType, FunctorType, ReturnType>::execute(
       "", policy, functor, return_value);
-  Impl::ParallelReduceFence<ReturnType>::fence(return_value);
+  Impl::ParallelReduceFence<typename PolicyType::execution_space,
+                            ReturnType>::fence(policy.space(), return_value);
 }
 
 template <class FunctorType, class ReturnType>
@@ -1001,7 +1007,8 @@ inline void parallel_reduce(const size_t& policy, const FunctorType& functor,
       void, size_t, FunctorType>::policy_type policy_type;
   Impl::ParallelReduceAdaptor<policy_type, FunctorType, ReturnType>::execute(
       "", policy_type(0, policy), functor, return_value);
-  Impl::ParallelReduceFence<ReturnType>::fence(return_value);
+  Impl::ParallelReduceFence<typename policy_type::execution_space, ReturnType>::
+      fence(typename policy_type::execution_space(), return_value);
 }
 
 template <class FunctorType, class ReturnType>
@@ -1012,7 +1019,8 @@ inline void parallel_reduce(const std::string& label, const size_t& policy,
       void, size_t, FunctorType>::policy_type policy_type;
   Impl::ParallelReduceAdaptor<policy_type, FunctorType, ReturnType>::execute(
       label, policy_type(0, policy), functor, return_value);
-  Impl::ParallelReduceFence<ReturnType>::fence(return_value);
+  Impl::ParallelReduceFence<typename policy_type::execution_space, ReturnType>::
+      fence(typename policy_type::execution_space(), return_value);
 }
 
 // ReturnValue as View or Reducer: take by copy to allow for inline construction
@@ -1021,24 +1029,28 @@ template <class PolicyType, class FunctorType, class ReturnType>
 inline void parallel_reduce(
     const std::string& label, const PolicyType& policy,
     const FunctorType& functor, const ReturnType& return_value,
-    typename Impl::enable_if<
-        Kokkos::Impl::is_execution_policy<PolicyType>::value>::type* = 0) {
+    typename std::enable_if<
+        Kokkos::Impl::is_execution_policy<PolicyType>::value>::type* =
+        nullptr) {
   ReturnType return_value_impl = return_value;
   Impl::ParallelReduceAdaptor<PolicyType, FunctorType, ReturnType>::execute(
       label, policy, functor, return_value_impl);
-  Impl::ParallelReduceFence<ReturnType>::fence(return_value);
+  Impl::ParallelReduceFence<typename PolicyType::execution_space,
+                            ReturnType>::fence(policy.space(), return_value);
 }
 
 template <class PolicyType, class FunctorType, class ReturnType>
 inline void parallel_reduce(
     const PolicyType& policy, const FunctorType& functor,
     const ReturnType& return_value,
-    typename Impl::enable_if<
-        Kokkos::Impl::is_execution_policy<PolicyType>::value>::type* = 0) {
+    typename std::enable_if<
+        Kokkos::Impl::is_execution_policy<PolicyType>::value>::type* =
+        nullptr) {
   ReturnType return_value_impl = return_value;
   Impl::ParallelReduceAdaptor<PolicyType, FunctorType, ReturnType>::execute(
       "", policy, functor, return_value_impl);
-  Impl::ParallelReduceFence<ReturnType>::fence(return_value);
+  Impl::ParallelReduceFence<typename PolicyType::execution_space,
+                            ReturnType>::fence(policy.space(), return_value);
 }
 
 template <class FunctorType, class ReturnType>
@@ -1049,7 +1061,8 @@ inline void parallel_reduce(const size_t& policy, const FunctorType& functor,
   ReturnType return_value_impl = return_value;
   Impl::ParallelReduceAdaptor<policy_type, FunctorType, ReturnType>::execute(
       "", policy_type(0, policy), functor, return_value_impl);
-  Impl::ParallelReduceFence<ReturnType>::fence(return_value);
+  Impl::ParallelReduceFence<typename policy_type::execution_space, ReturnType>::
+      fence(typename policy_type::execution_space(), return_value);
 }
 
 template <class FunctorType, class ReturnType>
@@ -1061,7 +1074,8 @@ inline void parallel_reduce(const std::string& label, const size_t& policy,
   ReturnType return_value_impl = return_value;
   Impl::ParallelReduceAdaptor<policy_type, FunctorType, ReturnType>::execute(
       label, policy_type(0, policy), functor, return_value_impl);
-  Impl::ParallelReduceFence<ReturnType>::fence(return_value);
+  Impl::ParallelReduceFence<typename policy_type::execution_space, ReturnType>::
+      fence(typename policy_type::execution_space(), return_value);
 }
 
 // No Return Argument
@@ -1070,8 +1084,9 @@ template <class PolicyType, class FunctorType>
 inline void parallel_reduce(
     const std::string& label, const PolicyType& policy,
     const FunctorType& functor,
-    typename Impl::enable_if<
-        Kokkos::Impl::is_execution_policy<PolicyType>::value>::type* = 0) {
+    typename std::enable_if<
+        Kokkos::Impl::is_execution_policy<PolicyType>::value>::type* =
+        nullptr) {
   typedef Kokkos::Impl::FunctorValueTraits<FunctorType, void> ValueTraits;
   typedef typename Kokkos::Impl::if_c<
       (ValueTraits::StaticValueSize != 0), typename ValueTraits::value_type,
@@ -1094,8 +1109,9 @@ inline void parallel_reduce(
 template <class PolicyType, class FunctorType>
 inline void parallel_reduce(
     const PolicyType& policy, const FunctorType& functor,
-    typename Impl::enable_if<
-        Kokkos::Impl::is_execution_policy<PolicyType>::value>::type* = 0) {
+    typename std::enable_if<
+        Kokkos::Impl::is_execution_policy<PolicyType>::value>::type* =
+        nullptr) {
   typedef Kokkos::Impl::FunctorValueTraits<FunctorType, void> ValueTraits;
   typedef typename Kokkos::Impl::if_c<
       (ValueTraits::StaticValueSize != 0), typename ValueTraits::value_type,
@@ -1169,7 +1185,7 @@ inline void parallel_reduce(const std::string& label, const size_t& policy,
 }  // namespace Kokkos
 
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-// backwards compatiblity for Kokkos::Experimental reducers
+// backwards compatibility for Kokkos::Experimental reducers
 namespace Kokkos {
 namespace Experimental {
 using Kokkos::BAnd;
diff --git a/kokkos/core/src/Kokkos_PointerOwnership.hpp b/kokkos/core/src/Kokkos_PointerOwnership.hpp
index 19dad77ef..f1f168c38 100644
--- a/kokkos/core/src/Kokkos_PointerOwnership.hpp
+++ b/kokkos/core/src/Kokkos_PointerOwnership.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/Kokkos_Profiling_ProfileSection.hpp b/kokkos/core/src/Kokkos_Profiling_ProfileSection.hpp
index ac0e6b0ea..3999ccb96 100644
--- a/kokkos/core/src/Kokkos_Profiling_ProfileSection.hpp
+++ b/kokkos/core/src/Kokkos_Profiling_ProfileSection.hpp
@@ -1,46 +1,46 @@
 /*
-//@HEADER
-// ************************************************************************
-//
-//                        Kokkos v. 3.0
+ //@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
-*/
+ //
+ // 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
+ */
 
 #ifndef KOKKOSP_PROFILE_SECTION_HPP
 #define KOKKOSP_PROFILE_SECTION_HPP
diff --git a/kokkos/core/src/Kokkos_Qthreads.hpp b/kokkos/core/src/Kokkos_Qthreads.hpp
deleted file mode 100644
index c7f4f96e5..000000000
--- a/kokkos/core/src/Kokkos_Qthreads.hpp
+++ /dev/null
@@ -1,196 +0,0 @@
-/*
-//@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
-*/
-
-#ifndef KOKKOS_QTHREADS_HPP
-#define KOKKOS_QTHREADS_HPP
-
-#include <Kokkos_Macros.hpp>
-#if defined(KOKKOS_ENABLE_QTHREADS)
-
-#include <Kokkos_Core_fwd.hpp>
-
-// Defines to enable experimental Qthreads functionality.
-#define QTHREAD_LOCAL_PRIORITY
-#define CLONED_TASKS
-
-#include <qthread.h>
-
-#include <cstddef>
-#include <iosfwd>
-
-#include <Kokkos_HostSpace.hpp>
-#include <Kokkos_ScratchSpace.hpp>
-#include <Kokkos_Parallel.hpp>
-//#include <Kokkos_MemoryTraits.hpp>
-//#include <Kokkos_ExecPolicy.hpp>
-//#include <Kokkos_TaskScheduler.hpp> // Uncomment when Tasking working.
-#include <Kokkos_Layout.hpp>
-#include <impl/Kokkos_Tags.hpp>
-#include <KokkosExp_MDRangePolicy.hpp>
-
-/*--------------------------------------------------------------------------*/
-
-namespace Kokkos {
-
-namespace Impl {
-
-class QthreadsExec;
-
-}  // namespace Impl
-
-}  // namespace Kokkos
-
-/*--------------------------------------------------------------------------*/
-
-namespace Kokkos {
-
-/** \brief  Execution space supported by Qthreads */
-class Qthreads {
- public:
-  //! \name Type declarations that all Kokkos devices must provide.
-  //@{
-
-  //! Tag this class as an execution space
-  typedef Qthreads execution_space;
-  typedef Kokkos::HostSpace memory_space;
-  //! This execution space preferred device_type
-  typedef Kokkos::Device<execution_space, memory_space> device_type;
-
-  typedef Kokkos::LayoutRight array_layout;
-  typedef memory_space::size_type size_type;
-
-  typedef ScratchMemorySpace<Qthreads> scratch_memory_space;
-
-  //@}
-  /*------------------------------------------------------------------------*/
-
-  /** \brief  Initialization will construct one or more instances */
-  static Qthreads& instance(int = 0);
-
-  /** \brief  Set the execution space to a "sleep" state.
-   *
-   * This function sets the "sleep" state in which it is not ready for work.
-   * This may consume less resources than in an "ready" state,
-   * but it may also take time to transition to the "ready" state.
-   *
-   * \return True if enters or is in the "sleep" state.
-   *         False if functions are currently executing.
-   */
-  bool sleep();
-
-  /** \brief  Wake from the sleep state.
-   *
-   *  \return True if enters or is in the "ready" state.
-   *          False if functions are currently executing.
-   */
-  static bool wake();
-
-  /** \brief Wait until all dispatched functions to complete.
-   *
-   *  The parallel_for or parallel_reduce dispatch of a functor may
-   *  return asynchronously, before the functor completes.  This
-   *  method does not return until all dispatched functors on this
-   *  device have completed.
-   */
-  static void fence();
-
-  /*------------------------------------------------------------------------*/
-
-  static int in_parallel();
-
-  static int is_initialized();
-
-  /** \brief  Return maximum amount of concurrency */
-  static int concurrency();
-
-  static void initialize(int thread_count);
-  static void finalize();
-
-  /** \brief Print configuration information to the given output stream. */
-  static void print_configuration(std::ostream&, const bool detail = false);
-
-  int shepherd_size() const;
-  int shepherd_worker_size() const;
-
-  static const char* name();
-};
-
-}  // namespace Kokkos
-
-/*--------------------------------------------------------------------------*/
-
-namespace Kokkos {
-
-namespace Impl {
-
-template <>
-struct MemorySpaceAccess<Kokkos::Qthreads::memory_space,
-                         Kokkos::Qthreads::scratch_memory_space> {
-  enum { assignable = false };
-  enum { accessible = true };
-  enum { deepcopy = false };
-};
-
-template <>
-struct VerifyExecutionCanAccessMemorySpace<
-    Kokkos::Qthreads::memory_space, Kokkos::Qthreads::scratch_memory_space> {
-  enum { value = true };
-  inline static void verify(void) {}
-  inline static void verify(const void*) {}
-};
-
-}  // namespace Impl
-
-}  // namespace Kokkos
-
-/*--------------------------------------------------------------------------*/
-
-#include <Qthreads/Kokkos_QthreadsExec.hpp>
-#include <Qthreads/Kokkos_Qthreads_Parallel.hpp>
-//#include <Qthreads/Kokkos_Qthreads_Task.hpp> // Uncomment when Tasking
-// working. #include <Qthreads/Kokkos_Qthreads_TaskQueue.hpp> // Uncomment when
-// Tasking working.
-
-#endif  // #define KOKKOS_ENABLE_QTHREADS
-#endif  // #define KOKKOS_QTHREADS_HPP
diff --git a/kokkos/core/src/Kokkos_ROCm.hpp b/kokkos/core/src/Kokkos_ROCm.hpp
index 93f0ec430..57113452b 100644
--- a/kokkos/core/src/Kokkos_ROCm.hpp
+++ b/kokkos/core/src/Kokkos_ROCm.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/Kokkos_ROCmSpace.hpp b/kokkos/core/src/Kokkos_ROCmSpace.hpp
index 1df5aa5c8..56a1a93b9 100644
--- a/kokkos/core/src/Kokkos_ROCmSpace.hpp
+++ b/kokkos/core/src/Kokkos_ROCmSpace.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -130,7 +130,7 @@ int* atomic_lock_array_rocm_space_ptr(bool deallocate = false);
 /// global memory.
 ///
 /// Team and Thread private scratch allocations in
-/// global memory are aquired via locks.
+/// global memory are acquired via locks.
 /// This function retrieves the lock array pointer.
 /// If the array is not yet allocated it will do so.
 int* scratch_lock_array_rocm_space_ptr(bool deallocate = false);
@@ -481,7 +481,7 @@ struct VerifyExecutionCanAccessMemorySpace<
 /** Running in ROCmSpace attempting to access an unknown space: error */
 template <class OtherSpace>
 struct VerifyExecutionCanAccessMemorySpace<
-    typename enable_if<
+    typename std::enable_if<
         !is_same<Kokkos::Experimental::ROCmSpace, OtherSpace>::value,
         Kokkos::Experimental::ROCmSpace>::type,
     OtherSpace> {
diff --git a/kokkos/core/src/Kokkos_ScratchSpace.hpp b/kokkos/core/src/Kokkos_ScratchSpace.hpp
index d73868a7e..708e0218b 100644
--- a/kokkos/core/src/Kokkos_ScratchSpace.hpp
+++ b/kokkos/core/src/Kokkos_ScratchSpace.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -92,6 +92,8 @@ class ScratchMemorySpace {
   typedef typename ExecSpace::array_layout array_layout;
   typedef typename ExecSpace::size_type size_type;
 
+  static constexpr const char* name() { return "ScratchMemorySpace"; }
+
   template <typename IntType>
   KOKKOS_INLINE_FUNCTION static IntType align(const IntType& size) {
     return (size + MASK) & ~MASK;
@@ -108,13 +110,13 @@ class ScratchMemorySpace {
 #ifdef KOKKOS_DEBUG
         // mfh 23 Jun 2015: printf call consumes 25 registers
         // in a CUDA build, so only print in debug mode.  The
-        // function still returns NULL if not enough memory.
+        // function still returns nullptr if not enough memory.
         printf(
             "ScratchMemorySpace<...>::get_shmem: Failed to allocate "
             "%ld byte(s); remaining capacity is %ld byte(s)\n",
             long(size), long(m_end_L0 - m_iter_L0));
 #endif  // KOKKOS_DEBUG
-        tmp = 0;
+        tmp = nullptr;
       }
       return tmp;
     } else {
@@ -124,13 +126,13 @@ class ScratchMemorySpace {
 #ifdef KOKKOS_DEBUG
         // mfh 23 Jun 2015: printf call consumes 25 registers
         // in a CUDA build, so only print in debug mode.  The
-        // function still returns NULL if not enough memory.
+        // function still returns nullptr if not enough memory.
         printf(
             "ScratchMemorySpace<...>::get_shmem: Failed to allocate "
             "%ld byte(s); remaining capacity is %ld byte(s)\n",
             long(size), long(m_end_L1 - m_iter_L1));
 #endif  // KOKKOS_DEBUG
-        tmp = 0;
+        tmp = nullptr;
       }
       return tmp;
     }
@@ -151,13 +153,13 @@ class ScratchMemorySpace {
 #ifdef KOKKOS_DEBUG
         // mfh 23 Jun 2015: printf call consumes 25 registers
         // in a CUDA build, so only print in debug mode.  The
-        // function still returns NULL if not enough memory.
+        // function still returns nullptr if not enough memory.
         printf(
             "ScratchMemorySpace<...>::get_shmem: Failed to allocate "
             "%ld byte(s); remaining capacity is %ld byte(s)\n",
             long(size), long(m_end_L0 - m_iter_L0));
 #endif  // KOKKOS_DEBUG
-        tmp = 0;
+        tmp = nullptr;
       }
       return tmp;
     } else {
@@ -171,13 +173,13 @@ class ScratchMemorySpace {
 #ifdef KOKKOS_DEBUG
         // mfh 23 Jun 2015: printf call consumes 25 registers
         // in a CUDA build, so only print in debug mode.  The
-        // function still returns NULL if not enough memory.
+        // function still returns nullptr if not enough memory.
         printf(
             "ScratchMemorySpace<...>::get_shmem: Failed to allocate "
             "%ld byte(s); remaining capacity is %ld byte(s)\n",
             long(size), long(m_end_L1 - m_iter_L1));
 #endif  // KOKKOS_DEBUG
-        tmp = 0;
+        tmp = nullptr;
       }
       return tmp;
     }
@@ -186,7 +188,7 @@ class ScratchMemorySpace {
   template <typename IntType>
   KOKKOS_INLINE_FUNCTION ScratchMemorySpace(void* ptr_L0,
                                             const IntType& size_L0,
-                                            void* ptr_L1           = NULL,
+                                            void* ptr_L1           = nullptr,
                                             const IntType& size_L1 = 0)
       : m_iter_L0((char*)ptr_L0),
         m_end_L0(m_iter_L0 + size_L0),
diff --git a/kokkos/core/src/Kokkos_Serial.hpp b/kokkos/core/src/Kokkos_Serial.hpp
index aa2db28d7..1f97998ea 100644
--- a/kokkos/core/src/Kokkos_Serial.hpp
+++ b/kokkos/core/src/Kokkos_Serial.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -181,11 +181,20 @@ class Serial {
     return impl_thread_pool_size(0);
   }
 #endif
+  uint32_t impl_instance_id() const noexcept { return 0; }
 
   static const char* name();
   //--------------------------------------------------------------------------
 };
 
+namespace Profiling {
+namespace Experimental {
+template <>
+struct DeviceTypeTraits<Serial> {
+  static constexpr DeviceType id = DeviceType::Serial;
+};
+}  // namespace Experimental
+}  // namespace Profiling
 }  // namespace Kokkos
 
 /*--------------------------------------------------------------------------*/
@@ -257,6 +266,11 @@ class TeamPolicyInternal<Kokkos::Serial, Properties...>
   //! Execution space of this execution policy:
   typedef Kokkos::Serial execution_space;
 
+  const typename traits::execution_space& space() const {
+    static typename traits::execution_space m_space;
+    return m_space;
+  }
+
   TeamPolicyInternal& operator=(const TeamPolicyInternal& p) {
     m_league_size            = p.m_league_size;
     m_team_scratch_size[0]   = p.m_team_scratch_size[0];
@@ -641,7 +655,7 @@ class ParallelReduce<FunctorType, Kokkos::RangePolicy<Traits...>, ReducerType,
       const HostViewType& arg_result_view,
       typename std::enable_if<Kokkos::is_view<HostViewType>::value &&
                                   !Kokkos::is_reducer_type<ReducerType>::value,
-                              void*>::type = NULL)
+                              void*>::type = nullptr)
       : m_functor(arg_functor),
         m_policy(arg_policy),
         m_reducer(InvalidType()),
@@ -912,7 +926,7 @@ class ParallelReduce<FunctorType, Kokkos::MDRangePolicy<Traits...>, ReducerType,
       const HostViewType& arg_result_view,
       typename std::enable_if<Kokkos::is_view<HostViewType>::value &&
                                   !Kokkos::is_reducer_type<ReducerType>::value,
-                              void*>::type = NULL)
+                              void*>::type = nullptr)
       : m_functor(arg_functor),
         m_mdr_policy(arg_policy),
         m_policy(Policy(0, m_mdr_policy.m_num_tiles).set_chunk_size(1)),
@@ -1087,7 +1101,7 @@ class ParallelReduce<FunctorType, Kokkos::TeamPolicy<Properties...>,
       const ViewType& arg_result,
       typename std::enable_if<Kokkos::is_view<ViewType>::value &&
                                   !Kokkos::is_reducer_type<ReducerType>::value,
-                              void*>::type = NULL)
+                              void*>::type = nullptr)
       : m_functor(arg_functor),
         m_league(arg_policy.league_size()),
         m_reducer(InvalidType()),
diff --git a/kokkos/core/src/Kokkos_TaskPolicy.hpp b/kokkos/core/src/Kokkos_TaskPolicy.hpp
index b27b313a8..91e079a0e 100644
--- a/kokkos/core/src/Kokkos_TaskPolicy.hpp
+++ b/kokkos/core/src/Kokkos_TaskPolicy.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/Kokkos_TaskScheduler.hpp b/kokkos/core/src/Kokkos_TaskScheduler.hpp
index 8fcf73762..6b9608d62 100644
--- a/kokkos/core/src/Kokkos_TaskScheduler.hpp
+++ b/kokkos/core/src/Kokkos_TaskScheduler.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -143,7 +143,7 @@ class BasicTaskScheduler : public Impl::TaskSchedulerBase {
       Kokkos::BasicFuture<typename FunctorType::value_type, scheduler_type>
       _spawn_impl(DepTaskType* arg_predecessor_task, TaskPriority arg_priority,
                   typename task_base::function_type arg_function,
-                  typename task_base::destroy_type arg_destroy,
+                  typename task_base::destroy_type /*arg_destroy*/,
                   FunctorType&& arg_functor) {
     using functor_future_type =
         future_type_for_functor<typename std::decay<FunctorType>::type>;
@@ -203,7 +203,7 @@ class BasicTaskScheduler : public Impl::TaskSchedulerBase {
 
  public:
   KOKKOS_INLINE_FUNCTION
-  BasicTaskScheduler() : m_track(), m_queue(0) {}
+  BasicTaskScheduler() : m_track(), m_queue(nullptr) {}
 
   KOKKOS_INLINE_FUNCTION
   BasicTaskScheduler(BasicTaskScheduler&& rhs) noexcept
@@ -231,7 +231,7 @@ class BasicTaskScheduler : public Impl::TaskSchedulerBase {
   }
 
   explicit BasicTaskScheduler(memory_pool const& arg_memory_pool) noexcept
-      : m_track(), m_queue(0) {
+      : m_track(), m_queue(nullptr) {
     typedef Kokkos::Impl::SharedAllocationRecord<memory_space,
                                                  typename queue_type::Destroy>
         record_type;
@@ -349,7 +349,7 @@ class BasicTaskScheduler : public Impl::TaskSchedulerBase {
 
     task->m_priority = static_cast<int>(arg_priority);
 
-    task->add_dependence((task_base*)0);
+    task->add_dependence(nullptr);
 
     // Postcondition: task is in Executing-Respawn state
   }
@@ -380,8 +380,8 @@ class BasicTaskScheduler : public Impl::TaskSchedulerBase {
         }
       }
 
-      if (q != 0) {  // this should probably handle the queue == 0 case, but
-                     // this is deprecated code anyway
+      if (q != nullptr) {  // this should probably handle the queue == 0 case,
+                           // but this is deprecated code anyway
 
         size_t const alloc_size = q->when_all_allocation_size(narg);
 
@@ -459,7 +459,7 @@ class BasicTaskScheduler : public Impl::TaskSchedulerBase {
 
       for (int i = 0; i < narg; ++i) {
         const input_type arg_f = func(i);
-        if (0 != arg_f.m_task) {
+        if (nullptr != arg_f.m_task) {
           // Not scheduled, so task scheduler is not yet set
           // if ( m_queue != static_cast< BasicTaskScheduler const * >(
           // arg_f.m_task->m_scheduler )->m_queue ) {
diff --git a/kokkos/core/src/Kokkos_TaskScheduler_fwd.hpp b/kokkos/core/src/Kokkos_TaskScheduler_fwd.hpp
index 0716a74af..c5f880775 100644
--- a/kokkos/core/src/Kokkos_TaskScheduler_fwd.hpp
+++ b/kokkos/core/src/Kokkos_TaskScheduler_fwd.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/Kokkos_Threads.hpp b/kokkos/core/src/Kokkos_Threads.hpp
index 2253b8196..9dd644df2 100644
--- a/kokkos/core/src/Kokkos_Threads.hpp
+++ b/kokkos/core/src/Kokkos_Threads.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -56,6 +56,7 @@
 #include <Kokkos_ScratchSpace.hpp>
 #include <Kokkos_Layout.hpp>
 #include <Kokkos_MemoryTraits.hpp>
+#include <impl/Kokkos_Profiling_Interface.hpp>
 #include <impl/Kokkos_Tags.hpp>
 
 /*--------------------------------------------------------------------------*/
@@ -200,11 +201,21 @@ class Threads {
   }
 #endif
 
+  uint32_t impl_instance_id() const noexcept { return 0; }
+
   static const char* name();
   //@}
   //----------------------------------------
 };
 
+namespace Profiling {
+namespace Experimental {
+template <>
+struct DeviceTypeTraits<Threads> {
+  static constexpr DeviceType id = DeviceType::Threads;
+};
+}  // namespace Experimental
+}  // namespace Profiling
 }  // namespace Kokkos
 
 /*--------------------------------------------------------------------------*/
diff --git a/kokkos/core/src/Kokkos_Timer.hpp b/kokkos/core/src/Kokkos_Timer.hpp
index 2b172b4e4..1dab73b44 100644
--- a/kokkos/core/src/Kokkos_Timer.hpp
+++ b/kokkos/core/src/Kokkos_Timer.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -60,7 +60,7 @@ class Timer {
  public:
   inline void reset() { m_old = std::chrono::high_resolution_clock::now(); }
 
-  inline ~Timer() {}
+  inline ~Timer() = default;
 
   inline Timer() { reset(); }
 
diff --git a/kokkos/core/src/Kokkos_UniqueToken.hpp b/kokkos/core/src/Kokkos_UniqueToken.hpp
index 750862378..523ccad94 100644
--- a/kokkos/core/src/Kokkos_UniqueToken.hpp
+++ b/kokkos/core/src/Kokkos_UniqueToken.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/Kokkos_Vectorization.hpp b/kokkos/core/src/Kokkos_Vectorization.hpp
index 4fff69720..cd2473410 100644
--- a/kokkos/core/src/Kokkos_Vectorization.hpp
+++ b/kokkos/core/src/Kokkos_Vectorization.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -49,6 +49,8 @@
 
 #if defined(KOKKOS_ENABLE_CUDA)
 #include <Cuda/Kokkos_Cuda_Vectorization.hpp>
+#elif defined(KOKKOS_ENABLE_HIP)
+#include <HIP/Kokkos_HIP_Vectorization.hpp>
 #endif
 
 #endif
diff --git a/kokkos/core/src/Kokkos_View.hpp b/kokkos/core/src/Kokkos_View.hpp
index ea9516635..3d68d780a 100644
--- a/kokkos/core/src/Kokkos_View.hpp
+++ b/kokkos/core/src/Kokkos_View.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -450,6 +450,70 @@ struct ViewTraits {
 template <class DataType, class... Properties>
 class View;
 
+template <class T1, class T2>
+struct is_always_assignable_impl;
+
+template <class... ViewTDst, class... ViewTSrc>
+struct is_always_assignable_impl<Kokkos::View<ViewTDst...>,
+                                 Kokkos::View<ViewTSrc...>> {
+  using mapping_type = Kokkos::Impl::ViewMapping<
+      typename Kokkos::View<ViewTDst...>::traits,
+      typename Kokkos::View<ViewTSrc...>::traits,
+      typename Kokkos::View<ViewTDst...>::traits::specialize>;
+
+  constexpr static bool value =
+      mapping_type::is_assignable &&
+      static_cast<int>(Kokkos::View<ViewTDst...>::rank_dynamic) >=
+          static_cast<int>(Kokkos::View<ViewTSrc...>::rank_dynamic);
+};
+
+template <class View1, class View2>
+using is_always_assignable = is_always_assignable_impl<
+    typename std::remove_reference<View1>::type,
+    typename std::remove_const<
+        typename std::remove_reference<View2>::type>::type>;
+
+#ifdef KOKKOS_ENABLE_CXX17
+template <class T1, class T2>
+inline constexpr bool is_always_assignable_v =
+    is_always_assignable<T1, T2>::value;
+#endif
+
+template <class... ViewTDst, class... ViewTSrc>
+constexpr bool is_assignable(const Kokkos::View<ViewTDst...>& dst,
+                             const Kokkos::View<ViewTSrc...>& src) {
+  using DstTraits = typename Kokkos::View<ViewTDst...>::traits;
+  using SrcTraits = typename Kokkos::View<ViewTSrc...>::traits;
+  using mapping_type =
+      Kokkos::Impl::ViewMapping<DstTraits, SrcTraits,
+                                typename DstTraits::specialize>;
+
+#ifdef KOKKOS_ENABLE_CXX17
+  return is_always_assignable_v<Kokkos::View<ViewTDst...>,
+                                Kokkos::View<ViewTSrc...>> ||
+#else
+  return is_always_assignable<Kokkos::View<ViewTDst...>,
+                              Kokkos::View<ViewTSrc...>>::value ||
+#endif
+         (mapping_type::is_assignable &&
+          ((DstTraits::dimension::rank_dynamic >= 1) ||
+           (dst.static_extent(0) == src.extent(0))) &&
+          ((DstTraits::dimension::rank_dynamic >= 2) ||
+           (dst.static_extent(1) == src.extent(1))) &&
+          ((DstTraits::dimension::rank_dynamic >= 3) ||
+           (dst.static_extent(2) == src.extent(2))) &&
+          ((DstTraits::dimension::rank_dynamic >= 4) ||
+           (dst.static_extent(3) == src.extent(3))) &&
+          ((DstTraits::dimension::rank_dynamic >= 5) ||
+           (dst.static_extent(4) == src.extent(4))) &&
+          ((DstTraits::dimension::rank_dynamic >= 6) ||
+           (dst.static_extent(5) == src.extent(5))) &&
+          ((DstTraits::dimension::rank_dynamic >= 7) ||
+           (dst.static_extent(6) == src.extent(6))) &&
+          ((DstTraits::dimension::rank_dynamic >= 8) ||
+           (dst.static_extent(7) == src.extent(7))));
+}
+
 } /* namespace Kokkos */
 
 //----------------------------------------------------------------------------
@@ -793,19 +857,18 @@ class View : public ViewTraits<DataType, Properties...> {
   //----------------------------------------
 
  private:
-  enum {
-    is_layout_left =
-        std::is_same<typename traits::array_layout, Kokkos::LayoutLeft>::value,
+  static constexpr bool is_layout_left =
+      std::is_same<typename traits::array_layout, Kokkos::LayoutLeft>::value;
 
-    is_layout_right =
-        std::is_same<typename traits::array_layout, Kokkos::LayoutRight>::value,
+  static constexpr bool is_layout_right =
+      std::is_same<typename traits::array_layout, Kokkos::LayoutRight>::value;
 
-    is_layout_stride = std::is_same<typename traits::array_layout,
-                                    Kokkos::LayoutStride>::value,
+  static constexpr bool is_layout_stride =
+      std::is_same<typename traits::array_layout, Kokkos::LayoutStride>::value;
 
-    is_default_map = std::is_same<typename traits::specialize, void>::value &&
-                     (is_layout_left || is_layout_right || is_layout_stride)
-  };
+  static constexpr bool is_default_map =
+      std::is_same<typename traits::specialize, void>::value &&
+      (is_layout_left || is_layout_right || is_layout_stride);
 
   template <class Space, bool = Kokkos::Impl::MemorySpaceAccess<
                              Space, typename traits::memory_space>::accessible>
@@ -823,6 +886,8 @@ class View : public ViewTraits<DataType, Properties...> {
 
 #if defined(KOKKOS_ENABLE_DEBUG_BOUNDS_CHECK)
 
+#define KOKKOS_IMPL_SINK(ARG) ARG
+
 #define KOKKOS_IMPL_VIEW_OPERATOR_VERIFY(ARG)             \
   View::template verify_space<                            \
       Kokkos::Impl::ActiveExecutionMemorySpace>::check(); \
@@ -830,6 +895,8 @@ class View : public ViewTraits<DataType, Properties...> {
 
 #else
 
+#define KOKKOS_IMPL_SINK(ARG)
+
 #define KOKKOS_IMPL_VIEW_OPERATOR_VERIFY(ARG) \
   View::template verify_space<                \
       Kokkos::Impl::ActiveExecutionMemorySpace>::check();
@@ -1452,8 +1519,9 @@ class View : public ViewTraits<DataType, Properties...> {
       typename std::enable_if<(Kokkos::Impl::are_integral<Args...>::value &&
                                (0 == Rank)),
                               reference_type>::type
-      access(Args... args) const {
-    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY((m_track, m_map, args...))
+      access(Args... KOKKOS_IMPL_SINK(args)) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY(
+        KOKKOS_IMPL_SINK((m_track, m_map, args...)))
     return m_map.reference();
   }
 
@@ -1462,8 +1530,9 @@ class View : public ViewTraits<DataType, Properties...> {
       typename std::enable_if<(Kokkos::Impl::are_integral<I0, Args...>::value &&
                                (1 == Rank) && !is_default_map),
                               reference_type>::type
-      access(const I0& i0, Args... args) const {
-    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY((m_track, m_map, i0, args...))
+      access(const I0& i0, Args... KOKKOS_IMPL_SINK(args)) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY(
+        KOKKOS_IMPL_SINK((m_track, m_map, i0, args...)))
     return m_map.reference(i0);
   }
 
@@ -1473,8 +1542,9 @@ class View : public ViewTraits<DataType, Properties...> {
                                (1 == Rank) && is_default_map &&
                                !is_layout_stride),
                               reference_type>::type
-      access(const I0& i0, Args... args) const {
-    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY((m_track, m_map, i0, args...))
+      access(const I0& i0, Args... KOKKOS_IMPL_SINK(args)) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY(
+        KOKKOS_IMPL_SINK((m_track, m_map, i0, args...)))
     return m_map.m_impl_handle[i0];
   }
 
@@ -1484,8 +1554,9 @@ class View : public ViewTraits<DataType, Properties...> {
                                (1 == Rank) && is_default_map &&
                                is_layout_stride),
                               reference_type>::type
-      access(const I0& i0, Args... args) const {
-    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY((m_track, m_map, i0, args...))
+      access(const I0& i0, Args... KOKKOS_IMPL_SINK(args)) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY(
+        KOKKOS_IMPL_SINK((m_track, m_map, i0, args...)))
     return m_map.m_impl_handle[m_map.m_impl_offset.m_stride.S0 * i0];
   }
 
@@ -1494,8 +1565,9 @@ class View : public ViewTraits<DataType, Properties...> {
       (Kokkos::Impl::are_integral<I0, I1, Args...>::value && (2 == Rank) &&
        !is_default_map),
       reference_type>::type
-  access(const I0& i0, const I1& i1, Args... args) const {
-    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY((m_track, m_map, i0, i1, args...))
+  access(const I0& i0, const I1& i1, Args... KOKKOS_IMPL_SINK(args)) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY(
+        KOKKOS_IMPL_SINK((m_track, m_map, i0, i1, args...)))
     return m_map.reference(i0, i1);
   }
 
@@ -1504,8 +1576,9 @@ class View : public ViewTraits<DataType, Properties...> {
       (Kokkos::Impl::are_integral<I0, I1, Args...>::value && (2 == Rank) &&
        is_default_map && is_layout_left && (traits::rank_dynamic == 0)),
       reference_type>::type
-  access(const I0& i0, const I1& i1, Args... args) const {
-    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY((m_track, m_map, i0, i1, args...))
+  access(const I0& i0, const I1& i1, Args... KOKKOS_IMPL_SINK(args)) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY(
+        KOKKOS_IMPL_SINK((m_track, m_map, i0, i1, args...)))
     return m_map.m_impl_handle[i0 + m_map.m_impl_offset.m_dim.N0 * i1];
   }
 
@@ -1514,8 +1587,9 @@ class View : public ViewTraits<DataType, Properties...> {
       (Kokkos::Impl::are_integral<I0, I1, Args...>::value && (2 == Rank) &&
        is_default_map && is_layout_left && (traits::rank_dynamic != 0)),
       reference_type>::type
-  access(const I0& i0, const I1& i1, Args... args) const {
-    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY((m_track, m_map, i0, i1, args...))
+  access(const I0& i0, const I1& i1, Args... KOKKOS_IMPL_SINK(args)) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY(
+        KOKKOS_IMPL_SINK((m_track, m_map, i0, i1, args...)))
     return m_map.m_impl_handle[i0 + m_map.m_impl_offset.m_stride * i1];
   }
 
@@ -1524,8 +1598,9 @@ class View : public ViewTraits<DataType, Properties...> {
       (Kokkos::Impl::are_integral<I0, I1, Args...>::value && (2 == Rank) &&
        is_default_map && is_layout_right && (traits::rank_dynamic == 0)),
       reference_type>::type
-  access(const I0& i0, const I1& i1, Args... args) const {
-    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY((m_track, m_map, i0, i1, args...))
+  access(const I0& i0, const I1& i1, Args... KOKKOS_IMPL_SINK(args)) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY(
+        KOKKOS_IMPL_SINK((m_track, m_map, i0, i1, args...)))
     return m_map.m_impl_handle[i1 + m_map.m_impl_offset.m_dim.N1 * i0];
   }
 
@@ -1534,8 +1609,9 @@ class View : public ViewTraits<DataType, Properties...> {
       (Kokkos::Impl::are_integral<I0, I1, Args...>::value && (2 == Rank) &&
        is_default_map && is_layout_right && (traits::rank_dynamic != 0)),
       reference_type>::type
-  access(const I0& i0, const I1& i1, Args... args) const {
-    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY((m_track, m_map, i0, i1, args...))
+  access(const I0& i0, const I1& i1, Args... KOKKOS_IMPL_SINK(args)) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY(
+        KOKKOS_IMPL_SINK((m_track, m_map, i0, i1, args...)))
     return m_map.m_impl_handle[i1 + m_map.m_impl_offset.m_stride * i0];
   }
 
@@ -1544,8 +1620,9 @@ class View : public ViewTraits<DataType, Properties...> {
       (Kokkos::Impl::are_integral<I0, I1, Args...>::value && (2 == Rank) &&
        is_default_map && is_layout_stride),
       reference_type>::type
-  access(const I0& i0, const I1& i1, Args... args) const {
-    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY((m_track, m_map, i0, i1, args...))
+  access(const I0& i0, const I1& i1, Args... KOKKOS_IMPL_SINK(args)) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY(
+        KOKKOS_IMPL_SINK((m_track, m_map, i0, i1, args...)))
     return m_map.m_impl_handle[i0 * m_map.m_impl_offset.m_stride.S0 +
                                i1 * m_map.m_impl_offset.m_stride.S1];
   }
@@ -1558,8 +1635,10 @@ class View : public ViewTraits<DataType, Properties...> {
       (Kokkos::Impl::are_integral<I0, I1, I2, Args...>::value && (3 == Rank) &&
        is_default_map),
       reference_type>::type
-  access(const I0& i0, const I1& i1, const I2& i2, Args... args) const {
-    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY((m_track, m_map, i0, i1, i2, args...))
+  access(const I0& i0, const I1& i1, const I2& i2,
+         Args... KOKKOS_IMPL_SINK(args)) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY(
+        KOKKOS_IMPL_SINK((m_track, m_map, i0, i1, i2, args...)))
     return m_map.m_impl_handle[m_map.m_impl_offset(i0, i1, i2)];
   }
 
@@ -1568,8 +1647,10 @@ class View : public ViewTraits<DataType, Properties...> {
       (Kokkos::Impl::are_integral<I0, I1, I2, Args...>::value && (3 == Rank) &&
        !is_default_map),
       reference_type>::type
-  access(const I0& i0, const I1& i1, const I2& i2, Args... args) const {
-    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY((m_track, m_map, i0, i1, i2, args...))
+  access(const I0& i0, const I1& i1, const I2& i2,
+         Args... KOKKOS_IMPL_SINK(args)) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY(
+        KOKKOS_IMPL_SINK((m_track, m_map, i0, i1, i2, args...)))
     return m_map.reference(i0, i1, i2);
   }
 
@@ -1582,8 +1663,9 @@ class View : public ViewTraits<DataType, Properties...> {
        (4 == Rank) && is_default_map),
       reference_type>::type
   access(const I0& i0, const I1& i1, const I2& i2, const I3& i3,
-         Args... args) const {
-    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY((m_track, m_map, i0, i1, i2, i3, args...))
+         Args... KOKKOS_IMPL_SINK(args)) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY(
+        KOKKOS_IMPL_SINK((m_track, m_map, i0, i1, i2, i3, args...)))
     return m_map.m_impl_handle[m_map.m_impl_offset(i0, i1, i2, i3)];
   }
 
@@ -1593,8 +1675,9 @@ class View : public ViewTraits<DataType, Properties...> {
        (4 == Rank) && !is_default_map),
       reference_type>::type
   access(const I0& i0, const I1& i1, const I2& i2, const I3& i3,
-         Args... args) const {
-    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY((m_track, m_map, i0, i1, i2, i3, args...))
+         Args... KOKKOS_IMPL_SINK(args)) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY(
+        KOKKOS_IMPL_SINK((m_track, m_map, i0, i1, i2, i3, args...)))
     return m_map.reference(i0, i1, i2, i3);
   }
 
@@ -1608,9 +1691,9 @@ class View : public ViewTraits<DataType, Properties...> {
        (5 == Rank) && is_default_map),
       reference_type>::type
   access(const I0& i0, const I1& i1, const I2& i2, const I3& i3, const I4& i4,
-         Args... args) const {
+         Args... KOKKOS_IMPL_SINK(args)) const {
     KOKKOS_IMPL_VIEW_OPERATOR_VERIFY(
-        (m_track, m_map, i0, i1, i2, i3, i4, args...))
+        KOKKOS_IMPL_SINK((m_track, m_map, i0, i1, i2, i3, i4, args...)))
     return m_map.m_impl_handle[m_map.m_impl_offset(i0, i1, i2, i3, i4)];
   }
 
@@ -1621,9 +1704,9 @@ class View : public ViewTraits<DataType, Properties...> {
        (5 == Rank) && !is_default_map),
       reference_type>::type
   access(const I0& i0, const I1& i1, const I2& i2, const I3& i3, const I4& i4,
-         Args... args) const {
+         Args... KOKKOS_IMPL_SINK(args)) const {
     KOKKOS_IMPL_VIEW_OPERATOR_VERIFY(
-        (m_track, m_map, i0, i1, i2, i3, i4, args...))
+        KOKKOS_IMPL_SINK((m_track, m_map, i0, i1, i2, i3, i4, args...)))
     return m_map.reference(i0, i1, i2, i3, i4);
   }
 
@@ -1637,9 +1720,9 @@ class View : public ViewTraits<DataType, Properties...> {
        (6 == Rank) && is_default_map),
       reference_type>::type
   access(const I0& i0, const I1& i1, const I2& i2, const I3& i3, const I4& i4,
-         const I5& i5, Args... args) const {
+         const I5& i5, Args... KOKKOS_IMPL_SINK(args)) const {
     KOKKOS_IMPL_VIEW_OPERATOR_VERIFY(
-        (m_track, m_map, i0, i1, i2, i3, i4, i5, args...))
+        KOKKOS_IMPL_SINK((m_track, m_map, i0, i1, i2, i3, i4, i5, args...)))
     return m_map.m_impl_handle[m_map.m_impl_offset(i0, i1, i2, i3, i4, i5)];
   }
 
@@ -1650,9 +1733,9 @@ class View : public ViewTraits<DataType, Properties...> {
        (6 == Rank) && !is_default_map),
       reference_type>::type
   access(const I0& i0, const I1& i1, const I2& i2, const I3& i3, const I4& i4,
-         const I5& i5, Args... args) const {
+         const I5& i5, Args... KOKKOS_IMPL_SINK(args)) const {
     KOKKOS_IMPL_VIEW_OPERATOR_VERIFY(
-        (m_track, m_map, i0, i1, i2, i3, i4, i5, args...))
+        KOKKOS_IMPL_SINK((m_track, m_map, i0, i1, i2, i3, i4, i5, args...)))
     return m_map.reference(i0, i1, i2, i3, i4, i5);
   }
 
@@ -1666,9 +1749,9 @@ class View : public ViewTraits<DataType, Properties...> {
        (7 == Rank) && is_default_map),
       reference_type>::type
   access(const I0& i0, const I1& i1, const I2& i2, const I3& i3, const I4& i4,
-         const I5& i5, const I6& i6, Args... args) const {
+         const I5& i5, const I6& i6, Args... KOKKOS_IMPL_SINK(args)) const {
     KOKKOS_IMPL_VIEW_OPERATOR_VERIFY(
-        (m_track, m_map, i0, i1, i2, i3, i4, i5, i6, args...))
+        KOKKOS_IMPL_SINK((m_track, m_map, i0, i1, i2, i3, i4, i5, i6, args...)))
     return m_map.m_impl_handle[m_map.m_impl_offset(i0, i1, i2, i3, i4, i5, i6)];
   }
 
@@ -1679,9 +1762,9 @@ class View : public ViewTraits<DataType, Properties...> {
        (7 == Rank) && !is_default_map),
       reference_type>::type
   access(const I0& i0, const I1& i1, const I2& i2, const I3& i3, const I4& i4,
-         const I5& i5, const I6& i6, Args... args) const {
+         const I5& i5, const I6& i6, Args... KOKKOS_IMPL_SINK(args)) const {
     KOKKOS_IMPL_VIEW_OPERATOR_VERIFY(
-        (m_track, m_map, i0, i1, i2, i3, i4, i5, i6, args...))
+        KOKKOS_IMPL_SINK((m_track, m_map, i0, i1, i2, i3, i4, i5, i6, args...)))
     return m_map.reference(i0, i1, i2, i3, i4, i5, i6);
   }
 
@@ -1696,9 +1779,10 @@ class View : public ViewTraits<DataType, Properties...> {
        (8 == Rank) && is_default_map),
       reference_type>::type
   access(const I0& i0, const I1& i1, const I2& i2, const I3& i3, const I4& i4,
-         const I5& i5, const I6& i6, const I7& i7, Args... args) const {
-    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY(
-        (m_track, m_map, i0, i1, i2, i3, i4, i5, i6, i7, args...))
+         const I5& i5, const I6& i6, const I7& i7,
+         Args... KOKKOS_IMPL_SINK(args)) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY(KOKKOS_IMPL_SINK(
+        (m_track, m_map, i0, i1, i2, i3, i4, i5, i6, i7, args...)))
     return m_map
         .m_impl_handle[m_map.m_impl_offset(i0, i1, i2, i3, i4, i5, i6, i7)];
   }
@@ -1711,9 +1795,10 @@ class View : public ViewTraits<DataType, Properties...> {
        (8 == Rank) && !is_default_map),
       reference_type>::type
   access(const I0& i0, const I1& i1, const I2& i2, const I3& i3, const I4& i4,
-         const I5& i5, const I6& i6, const I7& i7, Args... args) const {
-    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY(
-        (m_track, m_map, i0, i1, i2, i3, i4, i5, i6, i7, args...))
+         const I5& i5, const I6& i6, const I7& i7,
+         Args... KOKKOS_IMPL_SINK(args)) const {
+    KOKKOS_IMPL_VIEW_OPERATOR_VERIFY(KOKKOS_IMPL_SINK(
+        (m_track, m_map, i0, i1, i2, i3, i4, i5, i6, i7, args...)))
     return m_map.reference(i0, i1, i2, i3, i4, i5, i6, i7);
   }
 
@@ -1722,8 +1807,8 @@ class View : public ViewTraits<DataType, Properties...> {
   //----------------------------------------
   // Standard destructor, constructors, and assignment operators
 
-  KOKKOS_INLINE_FUNCTION
-  ~View() {}
+  KOKKOS_DEFAULTED_FUNCTION
+  ~View() = default;
 
   KOKKOS_INLINE_FUNCTION
   View() : m_track(), m_map() {}
@@ -1759,7 +1844,8 @@ class View : public ViewTraits<DataType, Properties...> {
       const View<RT, RP...>& rhs,
       typename std::enable_if<Kokkos::Impl::ViewMapping<
           traits, typename View<RT, RP...>::traits,
-          typename traits::specialize>::is_assignable_data_type>::type* = 0)
+          typename traits::specialize>::is_assignable_data_type>::type* =
+          nullptr)
       : m_track(rhs.m_track, traits::is_managed), m_map() {
     typedef typename View<RT, RP...>::traits SrcTraits;
     typedef Kokkos::Impl::ViewMapping<traits, SrcTraits,
@@ -1878,8 +1964,8 @@ class View : public ViewTraits<DataType, Properties...> {
     // If allocating in CudaUVMSpace must fence before and after
     // the allocation to protect against possible concurrent access
     // on the CPU and the GPU.
-    // Fence using the trait's executon space (which will be Kokkos::Cuda)
-    // to avoid incomplete type errors from usng Kokkos::Cuda directly.
+    // Fence using the trait's execution space (which will be Kokkos::Cuda)
+    // to avoid incomplete type errors from using Kokkos::Cuda directly.
     if (std::is_same<Kokkos::CudaUVMSpace,
                      typename traits::device_type::memory_space>::value) {
       typename traits::device_type::memory_space::execution_space().fence();
diff --git a/kokkos/core/src/Kokkos_WorkGraphPolicy.hpp b/kokkos/core/src/Kokkos_WorkGraphPolicy.hpp
index c88e0faff..6ff2f0d4b 100644
--- a/kokkos/core/src/Kokkos_WorkGraphPolicy.hpp
+++ b/kokkos/core/src/Kokkos_WorkGraphPolicy.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -199,6 +199,8 @@ class WorkGraphPolicy : public Kokkos::Impl::PolicyTraits<Properties...> {
     if (0 == count_queue[w]) push_work(w);
   }
 
+  execution_space space() const { return execution_space(); }
+
   WorkGraphPolicy(const graph_type& arg_graph)
       : m_graph(arg_graph),
         m_queue(view_alloc("queue", WithoutInitializing),
diff --git a/kokkos/core/src/Kokkos_hwloc.hpp b/kokkos/core/src/Kokkos_hwloc.hpp
index 5431a8442..f343ef80b 100644
--- a/kokkos/core/src/Kokkos_hwloc.hpp
+++ b/kokkos/core/src/Kokkos_hwloc.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/OpenMP/Kokkos_OpenMP_Exec.cpp b/kokkos/core/src/OpenMP/Kokkos_OpenMP_Exec.cpp
index 32ff91827..21151156e 100644
--- a/kokkos/core/src/OpenMP/Kokkos_OpenMP_Exec.cpp
+++ b/kokkos/core/src/OpenMP/Kokkos_OpenMP_Exec.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -149,12 +149,12 @@ void OpenMPExec::clear_thread_data() {
   {
     const int rank = omp_get_thread_num();
 
-    if (0 != m_pool[rank]) {
+    if (nullptr != m_pool[rank]) {
       m_pool[rank]->disband_pool();
 
       space.deallocate(m_pool[rank], old_alloc_bytes);
 
-      m_pool[rank] = 0;
+      m_pool[rank] = nullptr;
     }
   }
   /* END #pragma omp parallel */
@@ -211,7 +211,7 @@ void OpenMPExec::resize_thread_data(size_t pool_reduce_bytes,
     {
       const int rank = omp_get_thread_num();
 
-      if (0 != m_pool[rank]) {
+      if (nullptr != m_pool[rank]) {
         m_pool[rank]->disband_pool();
 
         space.deallocate(m_pool[rank], old_alloc_bytes);
@@ -447,7 +447,7 @@ void OpenMP::impl_finalize()
 
 //----------------------------------------------------------------------------
 
-void OpenMP::print_configuration(std::ostream &s, const bool verbose) {
+void OpenMP::print_configuration(std::ostream &s, const bool /*verbose*/) {
   s << "Kokkos::OpenMP";
 
   const bool is_initialized = Impl::t_openmp_instance != nullptr;
diff --git a/kokkos/core/src/OpenMP/Kokkos_OpenMP_Exec.hpp b/kokkos/core/src/OpenMP/Kokkos_OpenMP_Exec.hpp
index 8260d61fb..6614050f0 100644
--- a/kokkos/core/src/OpenMP/Kokkos_OpenMP_Exec.hpp
+++ b/kokkos/core/src/OpenMP/Kokkos_OpenMP_Exec.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -129,8 +129,6 @@ class OpenMPExec {
 
 namespace Kokkos {
 
-inline OpenMP::OpenMP() noexcept {}
-
 inline
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
     bool
@@ -176,20 +174,24 @@ int OpenMP::impl_thread_pool_rank() noexcept
 #endif
 }
 
-inline void OpenMP::impl_static_fence(OpenMP const& instance) noexcept {}
+inline void OpenMP::impl_static_fence(OpenMP const& /*instance*/) noexcept {}
 
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
 inline void OpenMP::fence(OpenMP const& instance) noexcept {}
 #endif
 
-inline bool OpenMP::is_asynchronous(OpenMP const& instance) noexcept {
+inline bool OpenMP::is_asynchronous(OpenMP const& /*instance*/) noexcept {
   return false;
 }
 
 template <typename F>
 void OpenMP::partition_master(F const& f, int num_partitions,
                               int partition_size) {
-  if (omp_get_nested()) {
+#if _OPENMP >= 201811
+  if (omp_get_max_active_levels() > 1) {
+#else
+  if (omp_get_nested() > 1) {
+#endif
     using Exec = Impl::OpenMPExec;
 
     Exec* prev_instance = Impl::t_openmp_instance;
diff --git a/kokkos/core/src/OpenMP/Kokkos_OpenMP_Parallel.hpp b/kokkos/core/src/OpenMP/Kokkos_OpenMP_Parallel.hpp
index 4607aa944..83773ac30 100644
--- a/kokkos/core/src/OpenMP/Kokkos_OpenMP_Parallel.hpp
+++ b/kokkos/core/src/OpenMP/Kokkos_OpenMP_Parallel.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -389,7 +389,7 @@ class ParallelReduce<FunctorType, Kokkos::RangePolicy<Traits...>, ReducerType,
       const ViewType& arg_view,
       typename std::enable_if<Kokkos::is_view<ViewType>::value &&
                                   !Kokkos::is_reducer_type<ReducerType>::value,
-                              void*>::type = NULL)
+                              void*>::type = nullptr)
       : m_instance(t_openmp_instance),
         m_functor(arg_functor),
         m_policy(arg_policy),
@@ -551,7 +551,7 @@ class ParallelReduce<FunctorType, Kokkos::MDRangePolicy<Traits...>, ReducerType,
       const ViewType& arg_view,
       typename std::enable_if<Kokkos::is_view<ViewType>::value &&
                                   !Kokkos::is_reducer_type<ReducerType>::value,
-                              void*>::type = NULL)
+                              void*>::type = nullptr)
       : m_instance(t_openmp_instance),
         m_functor(arg_functor),
         m_mdr_policy(arg_policy),
@@ -930,7 +930,7 @@ class ParallelFor<FunctorType, Kokkos::TeamPolicy<Properties...>,
 
       if (is_dynamic) {
         // Must synchronize to make sure each team has set its
-        // partition before begining the work stealing loop.
+        // partition before beginning the work stealing loop.
         if (data.pool_rendezvous()) data.pool_rendezvous_release();
       }
 
@@ -1077,7 +1077,7 @@ class ParallelReduce<FunctorType, Kokkos::TeamPolicy<Properties...>,
 
       if (is_dynamic) {
         // Must synchronize to make sure each team has set its
-        // partition before begining the work stealing loop.
+        // partition before beginning the work stealing loop.
         if (data.pool_rendezvous()) data.pool_rendezvous_release();
       }
 
@@ -1146,7 +1146,7 @@ class ParallelReduce<FunctorType, Kokkos::TeamPolicy<Properties...>,
       const ViewType& arg_result,
       typename std::enable_if<Kokkos::is_view<ViewType>::value &&
                                   !Kokkos::is_reducer_type<ReducerType>::value,
-                              void*>::type = NULL)
+                              void*>::type = nullptr)
       : m_instance(t_openmp_instance),
         m_functor(arg_functor),
         m_policy(arg_policy),
diff --git a/kokkos/core/src/OpenMP/Kokkos_OpenMP_Task.cpp b/kokkos/core/src/OpenMP/Kokkos_OpenMP_Task.cpp
index 0deca5830..f7338819a 100644
--- a/kokkos/core/src/OpenMP/Kokkos_OpenMP_Task.cpp
+++ b/kokkos/core/src/OpenMP/Kokkos_OpenMP_Task.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/OpenMP/Kokkos_OpenMP_Task.hpp b/kokkos/core/src/OpenMP/Kokkos_OpenMP_Task.hpp
index 5fd0ce1d4..62f0a77d0 100644
--- a/kokkos/core/src/OpenMP/Kokkos_OpenMP_Task.hpp
+++ b/kokkos/core/src/OpenMP/Kokkos_OpenMP_Task.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -132,14 +132,14 @@ class TaskQueueSpecialization<SimpleTaskScheduler<Kokkos::OpenMP, QueueType> > {
 
         auto current_task = OptionalRef<task_base_type>(nullptr);
 
-        while (not queue.is_done()) {
+        while (!queue.is_done()) {
           // Each team lead attempts to acquire either a thread team task
           // or a single thread task for the team.
           if (team_exec.team_rank() == 0) {
             // loop while both:
             //   - the queue is not done
             //   - the most recently popped task is a single task or empty
-            while (not queue.is_done()) {
+            while (!queue.is_done()) {
               current_task =
                   queue.pop_ready_task(team_scheduler.team_scheduler_info());
 
diff --git a/kokkos/core/src/OpenMP/Kokkos_OpenMP_Team.hpp b/kokkos/core/src/OpenMP/Kokkos_OpenMP_Team.hpp
index 4eddce13f..f54b6e2d5 100644
--- a/kokkos/core/src/OpenMP/Kokkos_OpenMP_Team.hpp
+++ b/kokkos/core/src/OpenMP/Kokkos_OpenMP_Team.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -62,6 +62,11 @@ class TeamPolicyInternal<Kokkos::OpenMP, Properties...>
 
   typedef PolicyTraits<Properties...> traits;
 
+  const typename traits::execution_space& space() const {
+    static typename traits::execution_space m_space;
+    return m_space;
+  }
+
   TeamPolicyInternal& operator=(const TeamPolicyInternal& p) {
     m_league_size            = p.m_league_size;
     m_team_size              = p.m_team_size;
diff --git a/kokkos/core/src/OpenMP/Kokkos_OpenMP_ViewCopyETIAvail.hpp b/kokkos/core/src/OpenMP/Kokkos_OpenMP_ViewCopyETIAvail.hpp
index d15c5ce8a..7bcd515f4 100644
--- a/kokkos/core/src/OpenMP/Kokkos_OpenMP_ViewCopyETIAvail.hpp
+++ b/kokkos/core/src/OpenMP/Kokkos_OpenMP_ViewCopyETIAvail.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/OpenMP/Kokkos_OpenMP_ViewCopyETIDecl.hpp b/kokkos/core/src/OpenMP/Kokkos_OpenMP_ViewCopyETIDecl.hpp
index 6e7edbf7c..b5254e127 100644
--- a/kokkos/core/src/OpenMP/Kokkos_OpenMP_ViewCopyETIDecl.hpp
+++ b/kokkos/core/src/OpenMP/Kokkos_OpenMP_ViewCopyETIDecl.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/OpenMP/Kokkos_OpenMP_WorkGraphPolicy.hpp b/kokkos/core/src/OpenMP/Kokkos_OpenMP_WorkGraphPolicy.hpp
index 77678ce2f..4ff1486c6 100644
--- a/kokkos/core/src/OpenMP/Kokkos_OpenMP_WorkGraphPolicy.hpp
+++ b/kokkos/core/src/OpenMP/Kokkos_OpenMP_WorkGraphPolicy.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTargetSpace.cpp b/kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTargetSpace.cpp
index 43fef7db2..ab833b036 100644
--- a/kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTargetSpace.cpp
+++ b/kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTargetSpace.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -111,14 +111,6 @@ std::string SharedAllocationRecord<Kokkos::Experimental::OpenMPTargetSpace,
   return std::string("OpenMPTargetAllocation");
 }
 
-SharedAllocationRecord<Kokkos::Experimental::OpenMPTargetSpace, void> *
-SharedAllocationRecord<Kokkos::Experimental::OpenMPTargetSpace, void>::allocate(
-    const Kokkos::Experimental::OpenMPTargetSpace &arg_space,
-    const std::string &arg_label, const size_t arg_alloc_size) {
-  return new SharedAllocationRecord<Kokkos::Experimental::OpenMPTargetSpace,
-                                    void>(arg_space, arg_label, arg_alloc_size);
-}
-
 void SharedAllocationRecord<Kokkos::Experimental::OpenMPTargetSpace,
                             void>::deallocate(SharedAllocationRecord<void, void>
                                                   *arg_rec) {
@@ -151,6 +143,8 @@ SharedAllocationRecord<Kokkos::Experimental::OpenMPTargetSpace, void>::
   header.m_label[SharedAllocationHeader::maximum_label_length - 1] = (char)0;
   // TODO DeepCopy
   // DeepCopy
+  Kokkos::Impl::DeepCopy<Experimental::OpenMPTargetSpace, HostSpace>(
+      RecordBase::m_alloc_ptr, &header, sizeof(SharedAllocationHeader));
 }
 
 //----------------------------------------------------------------------------
@@ -203,18 +197,22 @@ SharedAllocationRecord<Kokkos::Experimental::OpenMPTargetSpace, void>
   typedef SharedAllocationRecord<Kokkos::Experimental::OpenMPTargetSpace, void>
       RecordHost;
 
-  SharedAllocationHeader const *const head =
-      alloc_ptr ? Header::get_header(alloc_ptr) : (SharedAllocationHeader *)0;
-  RecordHost *const record =
-      head ? static_cast<RecordHost *>(head->m_record) : (RecordHost *)0;
+  if (alloc_ptr) {
+    Header head;
+    const Header *const head_ompt = Header::get_header(alloc_ptr);
 
-  if (!alloc_ptr || record->m_alloc_ptr != head) {
-    Kokkos::Impl::throw_runtime_exception(std::string(
-        "Kokkos::Experimental::Impl::SharedAllocationRecord< "
-        "Kokkos::Experimental::OpenMPTargetSpace , void >::get_record ERROR"));
-  }
+    Kokkos::Impl::DeepCopy<HostSpace, Experimental::OpenMPTargetSpace>(
+        &head, head_ompt, sizeof(SharedAllocationHeader));
 
-  return record;
+    RecordHost *record = static_cast<RecordHost *>(head.m_record);
+    if (record->m_alloc_ptr == head_ompt) {
+      return record;
+    }
+  }
+  Kokkos::Impl::throw_runtime_exception(std::string(
+      "Kokkos::Experimental::Impl::SharedAllocationRecord< "
+      "Kokkos::Experimental::OpenMPTargetSpace , void >::get_record ERROR"));
+  return nullptr;
 }
 
 // Iterate records to print orphaned memory ...
diff --git a/kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTarget_Exec.cpp b/kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTarget_Exec.cpp
index c70d9611c..b09dbeba3 100644
--- a/kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTarget_Exec.cpp
+++ b/kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTarget_Exec.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -61,17 +61,8 @@ namespace {
 KOKKOS_INLINE_FUNCTION
 int kokkos_omp_in_parallel();
 
-int kokkos_omp_in_critical_region =
-    (Kokkos::HostSpace::register_in_parallel(kokkos_omp_in_parallel), 0);
-
 KOKKOS_INLINE_FUNCTION
-int kokkos_omp_in_parallel() {
-#ifndef __CUDA_ARCH__
-  return omp_in_parallel() && !kokkos_omp_in_critical_region;
-#else
-  return 0;
-#endif
-}
+int kokkos_omp_in_parallel() { return omp_in_parallel(); }
 
 bool s_using_hwloc = false;
 
@@ -79,23 +70,9 @@ bool s_using_hwloc = false;
 }  // namespace Impl
 }  // namespace Kokkos
 
-namespace Kokkos {
-namespace Experimental {
-bool OpenMPTarget::m_is_initialized = false;
-}
-}  // namespace Kokkos
-
 namespace Kokkos {
 namespace Impl {
 
-// int OpenMPTargetExec::m_map_rank[ OpenMPTargetExec::MAX_THREAD_COUNT ] = { 0
-// };
-
-// int OpenMPTargetExec::m_pool_topo[ 4 ] = { 0 };
-
-// OpenMPTargetExec * OpenMPTargetExec::m_pool[
-// OpenMPTargetExec::MAX_THREAD_COUNT ] = { 0 };
-
 void OpenMPTargetExec::verify_is_process(const char* const label) {
   if (omp_in_parallel()) {
     std::string msg(label);
@@ -105,28 +82,21 @@ void OpenMPTargetExec::verify_is_process(const char* const label) {
 }
 
 void OpenMPTargetExec::verify_initialized(const char* const label) {
-  if (0 == Kokkos::Experimental::OpenMPTarget::is_initialized()) {
+  if (0 == Kokkos::Experimental::OpenMPTarget().impl_is_initialized()) {
     std::string msg(label);
     msg.append(" ERROR: not initialized");
     Kokkos::Impl::throw_runtime_exception(msg);
   }
-
-  if (omp_get_max_threads() !=
-      Kokkos::Experimental::OpenMPTarget::thread_pool_size(0)) {
-    std::string msg(label);
-    msg.append(" ERROR: Initialized but threads modified inappropriately");
-    Kokkos::Impl::throw_runtime_exception(msg);
-  }
 }
 
-void* OpenMPTargetExec::m_scratch_ptr    = NULL;
+void* OpenMPTargetExec::m_scratch_ptr    = nullptr;
 int64_t OpenMPTargetExec::m_scratch_size = 0;
 
 void OpenMPTargetExec::clear_scratch() {
   Kokkos::Experimental::OpenMPTargetSpace space;
   space.deallocate(m_scratch_ptr, m_scratch_size);
-  m_scratch_ptr  = NULL;
-  m_scratch_size = NULL;
+  m_scratch_ptr  = nullptr;
+  m_scratch_size = 0;
 }
 
 void* OpenMPTargetExec::get_scratch_ptr() { return m_scratch_ptr; }
@@ -151,122 +121,4 @@ void OpenMPTargetExec::resize_scratch(int64_t reduce_bytes,
 }  // namespace Impl
 }  // namespace Kokkos
 
-//----------------------------------------------------------------------------
-//----------------------------------------------------------------------------
-
-namespace Kokkos {
-namespace Experimental {
-//----------------------------------------------------------------------------
-
-int OpenMPTarget::is_initialized() {
-  return m_is_initialized;
-}  // != Impl::OpenMPTargetExec::m_pool[0]; }
-
-void OpenMPTarget::initialize(unsigned thread_count, unsigned use_numa_count,
-                              unsigned use_cores_per_numa) {
-  // Before any other call to OMP query the maximum number of threads
-  // and save the value for re-initialization unit testing.
-
-  // Init the array for used for arbitrarily sized atomics
-  Kokkos::Impl::init_lock_array_host_space();
-
-#ifdef KOKKOS_ENABLE_PROFILING
-  Kokkos::Profiling::initialize();
-#endif
-  m_is_initialized = true;
-}
-
-//----------------------------------------------------------------------------
-
-void OpenMPTarget::finalize() {
-  Kokkos::Impl::OpenMPTargetExec::verify_initialized("OpenMPTarget::finalize");
-  Kokkos::Impl::OpenMPTargetExec::verify_is_process("OpenMPTarget::finalize");
-
-  m_is_initialized = false;
-
-  omp_set_num_threads(1);
-
-  if (Kokkos::Impl::s_using_hwloc && Kokkos::hwloc::can_bind_threads()) {
-    hwloc::unbind_this_thread();
-  }
-
-#ifdef KOKKOS_ENABLE_PROFILING
-  Kokkos::Profiling::finalize();
-#endif
-}
-
-//----------------------------------------------------------------------------
-
-void OpenMPTarget::print_configuration(std::ostream& s, const bool detail) {
-  Kokkos::Impl::OpenMPTargetExec::verify_is_process(
-      "OpenMPTarget::print_configuration");
-  /*
-    s << "Kokkos::Experimental::OpenMPTarget" ;
-
-  #if defined( KOKKOS_ENABLE_OPENMPTARGET )
-    s << " KOKKOS_ENABLE_OPENMPTARGET" ;
-  #endif
-  #if defined( KOKKOS_ENABLE_HWLOC )
-
-    const unsigned numa_count_       =
-  Kokkos::hwloc::get_available_numa_count(); const unsigned cores_per_numa   =
-  Kokkos::hwloc::get_available_cores_per_numa(); const unsigned threads_per_core
-  = Kokkos::hwloc::get_available_threads_per_core();
-
-    s << " hwloc[" << numa_count_ << "x" << cores_per_numa << "x" <<
-  threads_per_core << "]"
-      << " hwloc_binding_" << ( Impl::s_using_hwloc ? "enabled" : "disabled" )
-      ;
-  #endif
-
-    const bool is_initialized = 0 != Impl::OpenMPTargetExec::m_pool[0] ;
-
-    if ( is_initialized ) {
-      const int numa_count      = Kokkos::Impl::OpenMPTargetExec::m_pool_topo[0]
-  / Kokkos::Impl::OpenMPTargetExec::m_pool_topo[1] ; const int core_per_numa   =
-  Kokkos::Impl::OpenMPTargetExec::m_pool_topo[1] /
-  Kokkos::Impl::OpenMPTargetExec::m_pool_topo[2] ; const int thread_per_core =
-  Kokkos::Impl::OpenMPTargetExec::m_pool_topo[2] ;
-
-      s << " thread_pool_topology[ " << numa_count
-        << " x " << core_per_numa
-        << " x " << thread_per_core
-        << " ]"
-        << std::endl ;
-
-      if ( detail ) {
-        std::vector< std::pair<unsigned,unsigned> > coord(
-  Kokkos::Impl::OpenMPTargetExec::m_pool_topo[0] );
-
-  #pragma omp parallel
-        {
-  #pragma omp critical
-          {
-            coord[ omp_get_thread_num() ] = hwloc::get_this_thread_coordinate();
-          }
-  // END #pragma omp critical
-        }
-  // END #pragma omp parallel
-
-        for ( unsigned i = 0 ; i < coord.size() ; ++i ) {
-          s << "  thread omp_rank[" << i << "]"
-            << " kokkos_rank[" << Impl::OpenMPTargetExec::m_map_rank[ i ] << "]"
-            << " hwloc_coord[" << coord[i].first << "." << coord[i].second <<
-  "]"
-            << std::endl ;
-        }
-      }
-    }
-    else {
-      s << " not initialized" << std::endl ;
-    }
-  */
-}
-
-int OpenMPTarget::concurrency() { return thread_pool_size(0); }
-
-const char* OpenMPTarget::name() { return "OpenMPTarget"; }
-}  // namespace Experimental
-}  // namespace Kokkos
-
 #endif  // KOKKOS_ENABLE_OPENMPTARGET
diff --git a/kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTarget_Exec.hpp b/kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTarget_Exec.hpp
index 5115c3e46..be6ddb5ed 100644
--- a/kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTarget_Exec.hpp
+++ b/kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTarget_Exec.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -341,19 +341,39 @@ class TeamPolicyInternal<Kokkos::Experimental::OpenMPTarget, Properties...>
   //----------------------------------------
 
   template <class FunctorType>
-  inline static int team_size_max(const FunctorType&) {
-    return 1024;
+  inline static int team_size_max(const FunctorType&, const ParallelForTag&) {
+    return 256;
   }
 
   template <class FunctorType>
-  inline static int team_size_recommended(const FunctorType&) {
+  inline static int team_size_max(const FunctorType&,
+                                  const ParallelReduceTag&) {
+    return 256;
+  }
+
+  template <class FunctorType, class ReducerType>
+  inline static int team_size_max(const FunctorType&, const ReducerType&,
+                                  const ParallelReduceTag&) {
     return 256;
   }
 
   template <class FunctorType>
   inline static int team_size_recommended(const FunctorType&,
-                                          const int& vector_length) {
-    return 256 / vector_length;
+                                          const ParallelForTag&) {
+    return 128;
+  }
+
+  template <class FunctorType>
+  inline static int team_size_recommended(const FunctorType&,
+                                          const ParallelReduceTag&) {
+    return 128;
+  }
+
+  template <class FunctorType, class ReducerType>
+  inline static int team_size_recommended(const FunctorType&,
+                                          const ReducerType&,
+                                          const ParallelReduceTag&) {
+    return 128;
   }
 
   //----------------------------------------
@@ -391,6 +411,10 @@ class TeamPolicyInternal<Kokkos::Experimental::OpenMPTarget, Properties...>
            team_size_ * m_thread_scratch_size[level];
   }
 
+  inline Kokkos::Experimental::OpenMPTarget space() const {
+    return Kokkos::Experimental::OpenMPTarget();
+  }
+
   /** \brief  Specify league size, request team size */
   TeamPolicyInternal(typename traits::execution_space&, int league_size_request,
                      int team_size_request, int vector_length_request = 1)
@@ -540,8 +564,8 @@ class TeamPolicyInternal<Kokkos::Experimental::OpenMPTarget, Properties...>
  private:
   /** \brief finalize chunk_size if it was set to AUTO*/
   inline void set_auto_chunk_size() {
-    int concurrency =
-        traits::execution_space::thread_pool_size(0) / m_team_alloc;
+    int concurrency = 2048 * 128;
+
     if (concurrency == 0) concurrency = 1;
 
     if (m_chunk_size > 0) {
@@ -568,23 +592,6 @@ class TeamPolicyInternal<Kokkos::Experimental::OpenMPTarget, Properties...>
 
 }  // namespace Kokkos
 
-//----------------------------------------------------------------------------
-//----------------------------------------------------------------------------
-
-namespace Kokkos {
-namespace Experimental {
-
-inline int OpenMPTarget::thread_pool_size(int depth) {
-  // return Impl::OpenMPTargetExec::pool_size(depth);
-  return omp_get_max_threads();
-}
-
-KOKKOS_INLINE_FUNCTION
-int OpenMPTarget::thread_pool_rank() { return omp_get_thread_num(); }
-
-}  // namespace Experimental
-}  // namespace Kokkos
-
 namespace Kokkos {
 
 template <typename iType>
diff --git a/kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTarget_Instance.cpp b/kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTarget_Instance.cpp
new file mode 100644
index 000000000..011bb1c8e
--- /dev/null
+++ b/kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTarget_Instance.cpp
@@ -0,0 +1,50 @@
+#include <OpenMPTarget/Kokkos_OpenMPTarget_Instance.hpp>
+
+namespace Kokkos {
+namespace Experimental {
+namespace Impl {
+void OpenMPTargetInternal::fence() {}
+int OpenMPTargetInternal::concurrency() { return 128000; }
+const char* OpenMPTargetInternal::name() { return "OpenMPTarget"; }
+void OpenMPTargetInternal::print_configuration(std::ostream& stream,
+                                               const bool) {
+  printf("Using OpenMPTarget\n");
+}
+
+void OpenMPTargetInternal::impl_finalize() { m_is_initialized = false; }
+void OpenMPTargetInternal::impl_initialize() { m_is_initialized = true; }
+int OpenMPTargetInternal::impl_is_initialized() {
+  return m_is_initialized ? 1 : 0;
+}
+
+OpenMPTargetInternal* OpenMPTargetInternal::impl_singleton() {
+  static OpenMPTargetInternal self;
+  return &self;
+}
+}  // Namespace Impl
+
+OpenMPTarget::OpenMPTarget()
+    : m_space_instance(Impl::OpenMPTargetInternal::impl_singleton()) {}
+
+const char* OpenMPTarget::name() {
+  return Impl::OpenMPTargetInternal::impl_singleton()->name();
+}
+void OpenMPTarget::print_configuration(std::ostream& stream,
+                                       const bool detail) {
+  m_space_instance->print_configuration(stream, detail);
+}
+
+int OpenMPTarget::concurrency() {
+  return Impl::OpenMPTargetInternal::impl_singleton()->concurrency();
+}
+void OpenMPTarget::fence() {
+  Impl::OpenMPTargetInternal::impl_singleton()->fence();
+}
+
+void OpenMPTarget::impl_initialize() { m_space_instance->impl_initialize(); }
+void OpenMPTarget::impl_finalize() { m_space_instance->impl_finalize(); }
+int OpenMPTarget::impl_is_initialized() {
+  return Impl::OpenMPTargetInternal::impl_singleton()->impl_is_initialized();
+}
+}  // Namespace Experimental
+}  // Namespace Kokkos
diff --git a/kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTarget_Instance.hpp b/kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTarget_Instance.hpp
new file mode 100644
index 000000000..2087226d7
--- /dev/null
+++ b/kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTarget_Instance.hpp
@@ -0,0 +1,40 @@
+#include <Kokkos_OpenMPTarget.hpp>
+
+namespace Kokkos {
+namespace Experimental {
+namespace Impl {
+
+class OpenMPTargetInternal {
+ private:
+  OpenMPTargetInternal()                            = default;
+  OpenMPTargetInternal(const OpenMPTargetInternal&) = default;
+  OpenMPTargetInternal& operator=(const OpenMPTargetInternal&) = default;
+
+ public:
+  void fence();
+
+  /** \brief  Return the maximum amount of concurrency.  */
+  int concurrency();
+
+  //! Print configuration information to the given output stream.
+  void print_configuration(std::ostream&, const bool detail = false);
+
+  static const char* name();
+
+  //! Free any resources being consumed by the device.
+  void impl_finalize();
+
+  //! Has been initialized
+  int impl_is_initialized();
+
+  //! Initialize, telling the CUDA run-time library which device to use.
+  void impl_initialize();
+
+  static OpenMPTargetInternal* impl_singleton();
+
+ private:
+  bool m_is_initialized = false;
+};
+}  // Namespace Impl
+}  // Namespace Experimental
+}  // Namespace Kokkos
diff --git a/kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTarget_Parallel.hpp b/kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTarget_Parallel.hpp
index 4bcdb7320..d5b62f60b 100644
--- a/kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTarget_Parallel.hpp
+++ b/kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTarget_Parallel.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -57,6 +57,374 @@
 namespace Kokkos {
 namespace Impl {
 
+template <class Reducer>
+struct OpenMPTargetReducerWrapper {
+  typedef typename Reducer::value_type value_type;
+
+  KOKKOS_INLINE_FUNCTION
+  static void join(value_type&, const value_type&) {
+    printf(
+        "Using a generic unknown Reducer for the OpenMPTarget backend is not "
+        "implemented.");
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  static void join(volatile value_type&, const volatile value_type&) {
+    printf(
+        "Using a generic unknown Reducer for the OpenMPTarget backend is not "
+        "implemented.");
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  static void init(value_type&) {
+    printf(
+        "Using a generic unknown Reducer for the OpenMPTarget backend is not "
+        "implemented.");
+  }
+};
+
+template <class Scalar, class Space>
+struct OpenMPTargetReducerWrapper<Sum<Scalar, Space>> {
+ public:
+  // Required
+  typedef typename std::remove_cv<Scalar>::type value_type;
+
+  // Required
+  KOKKOS_INLINE_FUNCTION
+  static void join(value_type& dest, const value_type& src) { dest += src; }
+
+  KOKKOS_INLINE_FUNCTION
+  static void join(volatile value_type& dest, const volatile value_type& src) {
+    dest += src;
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  static void init(value_type& val) {
+    val = reduction_identity<value_type>::sum();
+  }
+};
+
+template <class Scalar, class Space>
+struct OpenMPTargetReducerWrapper<Prod<Scalar, Space>> {
+ public:
+  // Required
+  typedef typename std::remove_cv<Scalar>::type value_type;
+
+  // Required
+  KOKKOS_INLINE_FUNCTION
+  static void join(value_type& dest, const value_type& src) { dest *= src; }
+
+  KOKKOS_INLINE_FUNCTION
+  static void join(volatile value_type& dest, const volatile value_type& src) {
+    dest *= src;
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  static void init(value_type& val) {
+    val = reduction_identity<value_type>::prod();
+  }
+};
+
+template <class Scalar, class Space>
+struct OpenMPTargetReducerWrapper<Min<Scalar, Space>> {
+ public:
+  // Required
+  typedef typename std::remove_cv<Scalar>::type value_type;
+
+  // Required
+  KOKKOS_INLINE_FUNCTION
+  static void join(value_type& dest, const value_type& src) {
+    if (src < dest) dest = src;
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  static void join(volatile value_type& dest, const volatile value_type& src) {
+    if (src < dest) dest = src;
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  static void init(value_type& val) {
+    val = reduction_identity<value_type>::min();
+  }
+};
+
+template <class Scalar, class Space>
+struct OpenMPTargetReducerWrapper<Max<Scalar, Space>> {
+ public:
+  // Required
+  typedef typename std::remove_cv<Scalar>::type value_type;
+
+  // Required
+  KOKKOS_INLINE_FUNCTION
+  static void join(value_type& dest, const value_type& src) {
+    if (src > dest) dest = src;
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  static void join(volatile value_type& dest, const volatile value_type& src) {
+    if (src > dest) dest = src;
+  }
+
+  // Required
+  KOKKOS_INLINE_FUNCTION
+  static void init(value_type& val) {
+    val = reduction_identity<value_type>::max();
+  }
+};
+
+template <class Scalar, class Space>
+struct OpenMPTargetReducerWrapper<LAnd<Scalar, Space>> {
+ public:
+  // Required
+  typedef typename std::remove_cv<Scalar>::type value_type;
+
+  KOKKOS_INLINE_FUNCTION
+  static void join(value_type& dest, const value_type& src) {
+    dest = dest && src;
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  static void join(volatile value_type& dest, const volatile value_type& src) {
+    dest = dest && src;
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  static void init(value_type& val) {
+    val = reduction_identity<value_type>::land();
+  }
+};
+
+template <class Scalar, class Space>
+struct OpenMPTargetReducerWrapper<LOr<Scalar, Space>> {
+ public:
+  // Required
+  typedef typename std::remove_cv<Scalar>::type value_type;
+
+  typedef Kokkos::View<value_type, Space> result_view_type;
+
+  // Required
+  KOKKOS_INLINE_FUNCTION
+  static void join(value_type& dest, const value_type& src) {
+    dest = dest || src;
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  static void join(volatile value_type& dest, const volatile value_type& src) {
+    dest = dest || src;
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  static void init(value_type& val) {
+    val = reduction_identity<value_type>::lor();
+  }
+};
+
+template <class Scalar, class Space>
+struct OpenMPTargetReducerWrapper<BAnd<Scalar, Space>> {
+ public:
+  // Required
+  typedef typename std::remove_cv<Scalar>::type value_type;
+
+  // Required
+  KOKKOS_INLINE_FUNCTION
+  static void join(value_type& dest, const value_type& src) {
+    dest = dest & src;
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  static void join(volatile value_type& dest, const volatile value_type& src) {
+    dest = dest & src;
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  static void init(value_type& val) {
+    val = reduction_identity<value_type>::band();
+  }
+};
+
+template <class Scalar, class Space>
+struct OpenMPTargetReducerWrapper<BOr<Scalar, Space>> {
+ public:
+  // Required
+  typedef typename std::remove_cv<Scalar>::type value_type;
+
+  // Required
+  KOKKOS_INLINE_FUNCTION
+  static void join(value_type& dest, const value_type& src) {
+    dest = dest | src;
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  static void join(volatile value_type& dest, const volatile value_type& src) {
+    dest = dest | src;
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  static void init(value_type& val) {
+    val = reduction_identity<value_type>::bor();
+  }
+};
+
+template <class Scalar, class Index, class Space>
+struct OpenMPTargetReducerWrapper<MinLoc<Scalar, Index, Space>> {
+ private:
+  typedef typename std::remove_cv<Scalar>::type scalar_type;
+  typedef typename std::remove_cv<Index>::type index_type;
+
+ public:
+  // Required
+  typedef ValLocScalar<scalar_type, index_type> value_type;
+
+  // Required
+  KOKKOS_INLINE_FUNCTION
+  static void join(value_type& dest, const value_type& src) {
+    if (src.val < dest.val) dest = src;
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  static void join(volatile value_type& dest, const volatile value_type& src) {
+    if (src.val < dest.val) dest = src;
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  static void init(value_type& val) {
+    val.val = reduction_identity<scalar_type>::min();
+    val.loc = reduction_identity<index_type>::min();
+  }
+};
+
+template <class Scalar, class Index, class Space>
+struct OpenMPTargetReducerWrapper<MaxLoc<Scalar, Index, Space>> {
+ private:
+  typedef typename std::remove_cv<Scalar>::type scalar_type;
+  typedef typename std::remove_cv<Index>::type index_type;
+
+ public:
+  // Required
+  typedef ValLocScalar<scalar_type, index_type> value_type;
+
+  KOKKOS_INLINE_FUNCTION
+  static void join(value_type& dest, const value_type& src) {
+    if (src.val > dest.val) dest = src;
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  static void join(volatile value_type& dest, const volatile value_type& src) {
+    if (src.val > dest.val) dest = src;
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  static void init(value_type& val) {
+    val.val = reduction_identity<scalar_type>::max();
+    val.loc = reduction_identity<index_type>::min();
+  }
+};
+
+template <class Scalar, class Space>
+struct OpenMPTargetReducerWrapper<MinMax<Scalar, Space>> {
+ private:
+  typedef typename std::remove_cv<Scalar>::type scalar_type;
+
+ public:
+  // Required
+  typedef MinMaxScalar<scalar_type> value_type;
+
+  // Required
+  KOKKOS_INLINE_FUNCTION
+  static void join(value_type& dest, const value_type& src) {
+    if (src.min_val < dest.min_val) {
+      dest.min_val = src.min_val;
+    }
+    if (src.max_val > dest.max_val) {
+      dest.max_val = src.max_val;
+    }
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  static void join(volatile value_type& dest, const volatile value_type& src) {
+    if (src.min_val < dest.min_val) {
+      dest.min_val = src.min_val;
+    }
+    if (src.max_val > dest.max_val) {
+      dest.max_val = src.max_val;
+    }
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  static void init(value_type& val) {
+    val.max_val = reduction_identity<scalar_type>::max();
+    val.min_val = reduction_identity<scalar_type>::min();
+  }
+};
+
+template <class Scalar, class Index, class Space>
+struct OpenMPTargetReducerWrapper<MinMaxLoc<Scalar, Index, Space>> {
+ private:
+  typedef typename std::remove_cv<Scalar>::type scalar_type;
+  typedef typename std::remove_cv<Index>::type index_type;
+
+ public:
+  // Required
+  typedef MinMaxLocScalar<scalar_type, index_type> value_type;
+
+  // Required
+  KOKKOS_INLINE_FUNCTION
+  static void join(value_type& dest, const value_type& src) {
+    if (src.min_val < dest.min_val) {
+      dest.min_val = src.min_val;
+      dest.min_loc = src.min_loc;
+    }
+    if (src.max_val > dest.max_val) {
+      dest.max_val = src.max_val;
+      dest.max_loc = src.max_loc;
+    }
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  static void join(volatile value_type& dest, const volatile value_type& src) {
+    if (src.min_val < dest.min_val) {
+      dest.min_val = src.min_val;
+      dest.min_loc = src.min_loc;
+    }
+    if (src.max_val > dest.max_val) {
+      dest.max_val = src.max_val;
+      dest.max_loc = src.max_loc;
+    }
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  static void init(value_type& val) {
+    val.max_val = reduction_identity<scalar_type>::max();
+    val.min_val = reduction_identity<scalar_type>::min();
+    val.max_loc = reduction_identity<index_type>::min();
+    val.min_loc = reduction_identity<index_type>::min();
+  }
+};
+/*
+template<class ReducerType>
+class OpenMPTargetReducerWrapper {
+  public:
+    const ReducerType& reducer;
+    typedef typename ReducerType::value_type value_type;
+    value_type& value;
+
+    KOKKOS_INLINE_FUNCTION
+    void join(const value_type& upd) {
+      reducer.join(value,upd);
+    }
+
+    KOKKOS_INLINE_FUNCTION
+    void init(const value_type& upd) {
+      reducer.init(value,upd);
+    }
+};*/
+
+}  // namespace Impl
+}  // namespace Kokkos
+
+namespace Kokkos {
+namespace Impl {
+
 template <class FunctorType, class... Traits>
 class ParallelFor<FunctorType, Kokkos::RangePolicy<Traits...>,
                   Kokkos::Experimental::OpenMPTarget> {
@@ -71,7 +439,21 @@ class ParallelFor<FunctorType, Kokkos::RangePolicy<Traits...>,
 
  public:
   inline void execute() const { execute_impl<WorkTag>(); }
-
+  /*
+    template <class TagType>
+    inline typename std::enable_if<std::is_same<TagType, void>::value>::type
+    execute_impl() const {
+      OpenMPTargetExec::verify_is_process(
+          "Kokkos::Experimental::OpenMPTarget parallel_for");
+      OpenMPTargetExec::verify_initialized(
+          "Kokkos::Experimental::OpenMPTarget parallel_for");
+      const typename Policy::member_type begin = m_policy.begin();
+      const typename Policy::member_type end   = m_policy.end();
+
+  #pragma omp target teams distribute parallel for map(to: this->m_functor)
+      for (int i = begin; i < end; i++) m_functor(i);
+    }
+  */
   template <class TagType>
   inline typename std::enable_if<std::is_same<TagType, void>::value>::type
   execute_impl() const {
@@ -82,8 +464,12 @@ class ParallelFor<FunctorType, Kokkos::RangePolicy<Traits...>,
     const typename Policy::member_type begin = m_policy.begin();
     const typename Policy::member_type end   = m_policy.end();
 
-#pragma omp target teams distribute parallel for map(to : this->m_functor)
-    for (int i = begin; i < end; i++) m_functor(i);
+    if (end <= begin) return;
+
+    FunctorType a_functor(m_functor);
+
+#pragma omp target teams distribute parallel for map(to : a_functor)
+    for (int i = begin; i < end; i++) a_functor(i);
   }
 
   template <class TagType>
@@ -96,10 +482,13 @@ class ParallelFor<FunctorType, Kokkos::RangePolicy<Traits...>,
     const typename Policy::member_type begin = m_policy.begin();
     const typename Policy::member_type end   = m_policy.end();
 
+    if (end <= begin) return;
+
+    FunctorType a_functor(m_functor);
 #pragma omp target teams distribute parallel for num_threads(128) \
     map(to                                                        \
-        : this->m_functor)
-    for (int i = begin; i < end; i++) m_functor(TagType(), i);
+        : a_functor)
+    for (int i = begin; i < end; i++) a_functor(TagType(), i);
   }
 
   inline ParallelFor(const FunctorType& arg_functor, Policy arg_policy)
@@ -143,8 +532,11 @@ struct ParallelReduceSpecialize<FunctorType, Kokkos::RangePolicy<PolicyArgs...>,
     const typename PolicyType::member_type begin = p.begin();
     const typename PolicyType::member_type end   = p.end();
 
+    if (end <= begin) return;
+
     ValueType result = ValueType();
-#pragma omp target teams distribute parallel for num_teams(512) map(to:f) map(tofrom:result) reduction(+: result)
+#pragma omp target teams distribute parallel for num_teams(512) \
+                map(to:f) map(tofrom:result) reduction(+: result)
     for (int i = begin; i < end; i++) f(i, result);
 
     *result_ptr = result;
@@ -162,8 +554,12 @@ struct ParallelReduceSpecialize<FunctorType, Kokkos::RangePolicy<PolicyArgs...>,
     const typename PolicyType::member_type begin = p.begin();
     const typename PolicyType::member_type end   = p.end();
 
+    if (end <= begin) return;
+
     ValueType result = ValueType();
-#pragma omp target teams distribute parallel for num_teams(512) map(to:f) map(tofrom: result) reduction(+: result)
+#pragma omp target teams distribute parallel for \
+                num_teams(512) map(to:f) map(tofrom: result) \
+                reduction(+: result)
     for (int i = begin; i < end; i++) f(TagType(), i, result);
 
     *result_ptr = result;
@@ -174,62 +570,73 @@ struct ParallelReduceSpecialize<FunctorType, Kokkos::RangePolicy<PolicyArgs...>,
     execute_impl<typename PolicyType::work_tag>(f, p, ptr);
   }
 };
-/*
-template<class FunctorType, class PolicyType, class ReducerType, class
-PointerType, class ValueType> struct ParallelReduceSpecialize<FunctorType,
-PolicyType, ReducerType, PointerType, ValueType, 0,1> {
 
-  #pragma omp declare reduction(custom: ValueType : ReducerType::join(omp_out,
-omp_in)) initializer ( ReducerType::init(omp_priv) )
+template <class FunctorType, class PolicyType, class ReducerType,
+          class PointerType, class ValueType>
+struct ParallelReduceSpecialize<FunctorType, PolicyType, ReducerType,
+                                PointerType, ValueType, 0, 1> {
+#pragma omp declare reduction(                                         \
+    custom:ValueType                                                   \
+    : OpenMPTargetReducerWrapper <ReducerType>::join(omp_out, omp_in)) \
+    initializer(OpenMPTargetReducerWrapper <ReducerType>::init(omp_priv))
 
-  template< class TagType >
+  template <class TagType>
   inline static
-  typename std::enable_if< std::is_same< TagType , void >::value >::type
-  execute_impl(const FunctorType& f, const PolicyType& p, PointerType
-result_ptr)
-    {
-      OpenMPTargetExec::verify_is_process("Kokkos::Experimental::OpenMPTarget
-parallel_for");
-      OpenMPTargetExec::verify_initialized("Kokkos::Experimental::OpenMPTarget
-parallel_for"); const typename PolicyType::member_type begin = p.begin(); const
-typename PolicyType::member_type end = p.end();
-
-      ValueType result = ValueType();
-      #pragma omp target teams distribute parallel for num_teams(512) map(to:f)
-map(tofrom:result) reduction(custom: result) for(int i=begin; i<end; i++)
-        f(i,result);
-
-      *result_ptr=result;
-    }
+      typename std::enable_if<std::is_same<TagType, void>::value>::type
+      execute_impl(const FunctorType& f, const PolicyType& p,
+                   PointerType result_ptr) {
+    OpenMPTargetExec::verify_is_process(
+        "Kokkos::Experimental::OpenMPTarget parallel_for");
+    OpenMPTargetExec::verify_initialized(
+        "Kokkos::Experimental::OpenMPTarget parallel_for");
+    const typename PolicyType::member_type begin = p.begin();
+    const typename PolicyType::member_type end   = p.end();
 
+    if (end <= begin) return;
 
-  template< class TagType >
+    ValueType result = ValueType();
+    OpenMPTargetReducerWrapper<ReducerType>::init(result);
+
+// clang-format off
+#pragma omp target teams distribute parallel for num_teams(512) map(to: f) \
+    map(tofrom: result) reduction(custom: result)
+    for (int i = begin; i < end; i++) f(i, result);
+    // clang-format on
+
+    *result_ptr = result;
+  }
+
+  template <class TagType>
   inline static
-  typename std::enable_if< ! std::is_same< TagType , void >::value >::type
-  execute_impl(const FunctorType& f, const PolicyType& p, PointerType
-result_ptr)
-    {
-      OpenMPTargetExec::verify_is_process("Kokkos::Experimental::OpenMPTarget
-parallel_for");
-      OpenMPTargetExec::verify_initialized("Kokkos::Experimental::OpenMPTarget
-parallel_for"); const typename PolicyType::member_type begin = p.begin(); const
-typename PolicyType::member_type end = p.end();
-
-      ValueType result = ValueType();
-      #pragma omp target teams distribute parallel for num_teams(512) map(to:f)
-map(tofrom: result) reduction(custom: result) for(int i=begin; i<end; i++)
-        f(TagType(),i,result);
-
-      *result_ptr=result;
-    }
+      typename std::enable_if<!std::is_same<TagType, void>::value>::type
+      execute_impl(const FunctorType& f, const PolicyType& p,
+                   PointerType result_ptr) {
+    OpenMPTargetExec::verify_is_process(
+        "Kokkos::Experimental::OpenMPTarget parallel_for");
+    OpenMPTargetExec::verify_initialized(
+        "Kokkos::Experimental::OpenMPTarget parallel_for");
+    const typename PolicyType::member_type begin = p.begin();
+    const typename PolicyType::member_type end   = p.end();
 
+    if (end <= begin) return;
 
-    inline static
-    void execute(const FunctorType& f, const PolicyType& p, PointerType ptr) {
-      execute_impl<typename PolicyType::work_tag>(f,p,ptr);
-    }
+    ValueType result = ValueType();
+    OpenMPTargetReducerWrapper<ReducerType>::init(result);
+
+// clang-format off
+#pragma omp target teams distribute parallel for num_teams(512) map(to: f) \
+    map(tofrom: result) reduction(custom: result)
+    for (int i = begin; i < end; i++) f(TagType(), i, result);
+//clang format on
+
+    *result_ptr = result;
+  }
+
+  inline static void execute(const FunctorType& f, const PolicyType& p,
+                             PointerType ptr) {
+    execute_impl<typename PolicyType::work_tag>(f, p, ptr);
+  }
 };
-*/
 
 template <class FunctorType, class ReducerType, class... Traits>
 class ParallelReduce<FunctorType, Kokkos::RangePolicy<Traits...>, ReducerType,
@@ -265,7 +672,7 @@ class ParallelReduce<FunctorType, Kokkos::RangePolicy<Traits...>, ReducerType,
   typedef ParallelReduceSpecialize<
       FunctorType, Policy, ReducerType, pointer_type,
       typename ValueTraits::value_type, HasJoin, UseReducer>
-      ParForSpecialize;
+      ParReduceSpecialize;
 
   const FunctorType m_functor;
   const Policy m_policy;
@@ -274,7 +681,7 @@ class ParallelReduce<FunctorType, Kokkos::RangePolicy<Traits...>, ReducerType,
 
  public:
   inline void execute() const {
-    ParForSpecialize::execute(m_functor, m_policy, m_result_ptr);
+    ParReduceSpecialize::execute(m_functor, m_policy, m_result_ptr);
   }
 
   template <class ViewType>
@@ -283,28 +690,18 @@ class ParallelReduce<FunctorType, Kokkos::RangePolicy<Traits...>, ReducerType,
       const ViewType& arg_result_view,
       typename std::enable_if<Kokkos::is_view<ViewType>::value &&
                                   !Kokkos::is_reducer_type<ReducerType>::value,
-                              void*>::type = NULL)
+                              void*>::type = nullptr)
       : m_functor(arg_functor),
         m_policy(arg_policy),
         m_reducer(InvalidType()),
-        m_result_ptr(arg_result_view.data()) {
-    /*static_assert( std::is_same< typename ViewType::memory_space
-                                    , Kokkos::HostSpace >::value
-      , "Reduction result on Kokkos::Experimental::OpenMPTarget must be a
-      Kokkos::View in HostSpace" );*/
-  }
+        m_result_ptr(arg_result_view.data()) {}
 
   inline ParallelReduce(const FunctorType& arg_functor, Policy arg_policy,
                         const ReducerType& reducer)
       : m_functor(arg_functor),
         m_policy(arg_policy),
         m_reducer(reducer),
-        m_result_ptr(reducer.result_view().data()) {
-    /*static_assert( std::is_same< typename ViewType::memory_space
-                                    , Kokkos::HostSpace >::value
-      , "Reduction result on Kokkos::Experimental::OpenMPTarget must be a
-      Kokkos::View in HostSpace" );*/
-  }
+        m_result_ptr(reducer.view().data()) {}
 };
 
 }  // namespace Impl
@@ -488,10 +885,11 @@ class ParallelFor<FunctorType, Kokkos::TeamPolicy<Properties...>,
                                      0, 0);
     void* scratch_ptr = OpenMPTargetExec::get_scratch_ptr();
 
+    FunctorType a_functor(m_functor);
 #pragma omp target teams distribute parallel for num_teams(league_size) \
     num_threads(team_size* vector_length) schedule(static, 1)           \
         map(to                                                          \
-            : this->m_functor, scratch_ptr)
+            : a_functor, scratch_ptr)
     for (int i = 0; i < league_size * team_size * vector_length; i++) {
       typename Policy::member_type team(i / (team_size * vector_length),
                                         league_size, team_size, vector_length,
@@ -513,6 +911,7 @@ class ParallelFor<FunctorType, Kokkos::TeamPolicy<Properties...>,
     const int nteams        = OpenMPTargetExec::MAX_ACTIVE_TEAMS < league_size
                            ? OpenMPTargetExec::MAX_ACTIVE_TEAMS
                            : league_size;
+    FunctorType a_functor(m_functor);
 
     OpenMPTargetExec::resize_scratch(0, Policy::member_type::TEAM_REDUCE_SIZE,
                                      0, 0);
@@ -520,7 +919,7 @@ class ParallelFor<FunctorType, Kokkos::TeamPolicy<Properties...>,
 #pragma omp target teams distribute parallel for num_teams(league_size) \
     num_threads(team_size* vector_length) schedule(static, 1)           \
         map(to                                                          \
-            : this->m_functor, scratch_ptr)
+            : a_functor, scratch_ptr)
     for (int i = 0; i < league_size; i++) {
       typename Policy::member_type team(i / (team_size * vector_length),
                                         league_size, team_size, vector_length,
@@ -663,7 +1062,7 @@ class ParallelReduce<FunctorType, Kokkos::TeamPolicy<Properties...>,
 
  public:
   inline void execute() const {
-    ParForSpecialize::execute(m_functor, m_policy, m_result_ptr);
+    // ParForSpecialize::execute(m_functor, m_policy, m_result_ptr);
   }
 
   template <class ViewType>
@@ -672,11 +1071,11 @@ class ParallelReduce<FunctorType, Kokkos::TeamPolicy<Properties...>,
       const ViewType& arg_result,
       typename std::enable_if<Kokkos::is_view<ViewType>::value &&
                                   !Kokkos::is_reducer_type<ReducerType>::value,
-                              void*>::type = NULL)
+                              void*>::type = nullptr)
       : m_functor(arg_functor),
         m_policy(arg_policy),
         m_reducer(InvalidType()),
-        m_result_ptr(arg_result.ptr_on_device()),
+        m_result_ptr(arg_result.data()),
         m_shmem_size(arg_policy.scratch_size(0) + arg_policy.scratch_size(1) +
                      FunctorTeamShmemSize<FunctorType>::value(
                          arg_functor, arg_policy.team_size())) {}
@@ -686,7 +1085,7 @@ class ParallelReduce<FunctorType, Kokkos::TeamPolicy<Properties...>,
       : m_functor(arg_functor),
         m_policy(arg_policy),
         m_reducer(reducer),
-        m_result_ptr(reducer.result_view().data()),
+        m_result_ptr(reducer.view().data()),
         m_shmem_size(arg_policy.scratch_size(0) + arg_policy.scratch_size(1) +
                      FunctorTeamShmemSize<FunctorType>::value(
                          arg_functor, arg_policy.team_size())) {
diff --git a/kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTarget_Parallel_MDRange.hpp b/kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTarget_Parallel_MDRange.hpp
new file mode 100644
index 000000000..4ce2dee12
--- /dev/null
+++ b/kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTarget_Parallel_MDRange.hpp
@@ -0,0 +1,549 @@
+/*
+//@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
+*/
+
+#ifndef KOKKOS_OPENMPTARGET_PARALLEL_MDRANGE_HPP
+#define KOKKOS_OPENMPTARGET_PARALLEL_MDRANGE_HPP
+
+#include <omp.h>
+#include <iostream>
+#include <Kokkos_Parallel.hpp>
+#include <OpenMPTarget/Kokkos_OpenMPTarget_Exec.hpp>
+#include <impl/Kokkos_FunctorAdapter.hpp>
+
+//----------------------------------------------------------------------------
+//----------------------------------------------------------------------------
+
+namespace Kokkos {
+namespace Impl {
+
+template <class FunctorType, class... Traits>
+class ParallelFor<FunctorType, Kokkos::MDRangePolicy<Traits...>,
+                  Kokkos::Experimental::OpenMPTarget> {
+ private:
+  typedef Kokkos::MDRangePolicy<Traits...> Policy;
+  typedef typename Policy::work_tag WorkTag;
+  typedef typename Policy::member_type Member;
+
+  const FunctorType m_functor;
+  const Policy m_policy;
+
+ public:
+  inline void execute() const {
+    OpenMPTargetExec::verify_is_process(
+        "Kokkos::Experimental::OpenMPTarget parallel_for");
+    OpenMPTargetExec::verify_initialized(
+        "Kokkos::Experimental::OpenMPTarget parallel_for");
+    const int64_t begin = 0;
+    const int64_t end   = m_policy.m_num_tiles;
+    FunctorType functor(m_functor);
+    Policy policy = m_policy;
+#pragma omp target teams distribute map(to : functor) num_teams(end - begin)
+    {
+      for (ptrdiff_t tile_idx = begin; tile_idx < end; tile_idx++) {
+#pragma omp parallel
+        {
+          typename Policy::point_type offset;
+          if (Policy::outer_direction == Policy::Left) {
+            for (int i = 0; i < Policy::rank; ++i) {
+              offset[i] = (tile_idx % policy.m_tile_end[i]) * policy.m_tile[i] +
+                          policy.m_lower[i];
+              tile_idx /= policy.m_tile_end[i];
+            }
+          } else {
+            for (int i = Policy::rank - 1; i >= 0; --i) {
+              offset[i] = (tile_idx % policy.m_tile_end[i]) * policy.m_tile[i] +
+                          policy.m_lower[i];
+              tile_idx /= policy.m_tile_end[i];
+            }
+          }
+          execute_tile<Policy::rank>(offset, functor, policy);
+        }
+      }
+    }
+  }
+
+  template <int Rank>
+  inline typename std::enable_if<Rank == 1>::type execute_tile(
+      typename Policy::point_type offset, const FunctorType& functor,
+      const Policy& policy) const {
+    const ptrdiff_t begin_0 = offset[0];
+    ptrdiff_t end_0         = begin_0 + policy.m_tile[0];
+    end_0 = end_0 < policy.m_upper[0] ? end_0 : policy.m_upper[0];
+#pragma omp for
+    for (ptrdiff_t i0 = begin_0; i0 < end_0; i0++) {
+      functor(i0);
+    }
+  }
+
+  template <int Rank>
+  inline typename std::enable_if<Rank == 2>::type execute_tile(
+      typename Policy::point_type offset, const FunctorType& functor,
+      const Policy& policy) const {
+    const ptrdiff_t begin_0 = offset[0];
+    ptrdiff_t end_0         = begin_0 + policy.m_tile[0];
+    end_0 = end_0 < policy.m_upper[0] ? end_0 : policy.m_upper[0];
+
+    const ptrdiff_t begin_1 = offset[1];
+    ptrdiff_t end_1         = begin_1 + policy.m_tile[1];
+    end_1 = end_1 < policy.m_upper[1] ? end_1 : policy.m_upper[1];
+
+#pragma omp for collapse(2)
+    for (ptrdiff_t i0 = begin_0; i0 < end_0; i0++)
+      for (ptrdiff_t i1 = begin_1; i1 < end_1; i1++) functor(i0, i1);
+  }
+
+  template <int Rank>
+  inline typename std::enable_if<Rank == 3>::type execute_tile(
+      typename Policy::point_type offset, const FunctorType& functor,
+      const Policy& policy) const {
+    const ptrdiff_t begin_0 = offset[0];
+    ptrdiff_t end_0         = begin_0 + policy.m_tile[0];
+    end_0 = end_0 < policy.m_upper[0] ? end_0 : policy.m_upper[0];
+
+    const ptrdiff_t begin_1 = offset[1];
+    ptrdiff_t end_1         = begin_1 + policy.m_tile[1];
+    end_1 = end_1 < policy.m_upper[1] ? end_1 : policy.m_upper[1];
+
+    const ptrdiff_t begin_2 = offset[2];
+    ptrdiff_t end_2         = begin_2 + policy.m_tile[2];
+    end_2 = end_2 < policy.m_upper[2] ? end_2 : policy.m_upper[2];
+
+#pragma omp for collapse(3)
+    for (ptrdiff_t i0 = begin_0; i0 < end_0; i0++)
+      for (ptrdiff_t i1 = begin_1; i1 < end_1; i1++)
+        for (ptrdiff_t i2 = begin_2; i2 < end_2; i2++) functor(i0, i1, i2);
+  }
+
+  template <int Rank>
+  inline typename std::enable_if<Rank == 4>::type execute_tile(
+      typename Policy::point_type offset, const FunctorType& functor,
+      const Policy& policy) const {
+    const ptrdiff_t begin_0 = offset[0];
+    ptrdiff_t end_0         = begin_0 + policy.m_tile[0];
+    end_0 = end_0 < policy.m_upper[0] ? end_0 : policy.m_upper[0];
+
+    const ptrdiff_t begin_1 = offset[1];
+    ptrdiff_t end_1         = begin_1 + policy.m_tile[1];
+    end_1 = end_1 < policy.m_upper[1] ? end_1 : policy.m_upper[1];
+
+    const ptrdiff_t begin_2 = offset[2];
+    ptrdiff_t end_2         = begin_2 + policy.m_tile[2];
+    end_2 = end_2 < policy.m_upper[2] ? end_2 : policy.m_upper[2];
+
+    const ptrdiff_t begin_3 = offset[3];
+    ptrdiff_t end_3         = begin_3 + policy.m_tile[3];
+    end_3 = end_3 < policy.m_upper[3] ? end_3 : policy.m_upper[3];
+
+#pragma omp for collapse(4)
+    for (ptrdiff_t i0 = begin_0; i0 < end_0; i0++)
+      for (ptrdiff_t i1 = begin_1; i1 < end_1; i1++)
+        for (ptrdiff_t i2 = begin_2; i2 < end_2; i2++)
+          for (ptrdiff_t i3 = begin_3; i3 < end_3; i3++)
+            functor(i0, i1, i2, i3);
+  }
+
+  template <int Rank>
+  inline typename std::enable_if<Rank == 5>::type execute_tile(
+      typename Policy::point_type offset, const FunctorType& functor,
+      const Policy& policy) const {
+    const ptrdiff_t begin_0 = offset[0];
+    ptrdiff_t end_0         = begin_0 + policy.m_tile[0];
+    end_0 = end_0 < policy.m_upper[0] ? end_0 : policy.m_upper[0];
+
+    const ptrdiff_t begin_1 = offset[1];
+    ptrdiff_t end_1         = begin_1 + policy.m_tile[1];
+    end_1 = end_1 < policy.m_upper[1] ? end_1 : policy.m_upper[1];
+
+    const ptrdiff_t begin_2 = offset[2];
+    ptrdiff_t end_2         = begin_2 + policy.m_tile[2];
+    end_2 = end_2 < policy.m_upper[2] ? end_2 : policy.m_upper[2];
+
+    const ptrdiff_t begin_3 = offset[3];
+    ptrdiff_t end_3         = begin_3 + policy.m_tile[3];
+    end_3 = end_3 < policy.m_upper[3] ? end_3 : policy.m_upper[3];
+
+    const ptrdiff_t begin_4 = offset[4];
+    ptrdiff_t end_4         = begin_4 + policy.m_tile[4];
+    end_4 = end_4 < policy.m_upper[4] ? end_4 : policy.m_upper[4];
+
+#pragma omp for collapse(5)
+    for (ptrdiff_t i0 = begin_0; i0 < end_0; i0++)
+      for (ptrdiff_t i1 = begin_1; i1 < end_1; i1++)
+        for (ptrdiff_t i2 = begin_2; i2 < end_2; i2++)
+          for (ptrdiff_t i3 = begin_3; i3 < end_3; i3++)
+            for (ptrdiff_t i4 = begin_4; i4 < end_4; i4++)
+              functor(i0, i1, i2, i3, i4);
+  }
+
+  template <int Rank>
+  inline typename std::enable_if<Rank == 6>::type execute_tile(
+      typename Policy::point_type offset, const FunctorType& functor,
+      const Policy& policy) const {
+    const ptrdiff_t begin_0 = offset[0];
+    ptrdiff_t end_0         = begin_0 + policy.m_tile[0];
+    end_0 = end_0 < policy.m_upper[0] ? end_0 : policy.m_upper[0];
+
+    const ptrdiff_t begin_1 = offset[1];
+    ptrdiff_t end_1         = begin_1 + policy.m_tile[1];
+    end_1 = end_1 < policy.m_upper[1] ? end_1 : policy.m_upper[1];
+
+    const ptrdiff_t begin_2 = offset[2];
+    ptrdiff_t end_2         = begin_2 + policy.m_tile[2];
+    end_2 = end_2 < policy.m_upper[2] ? end_2 : policy.m_upper[2];
+
+    const ptrdiff_t begin_3 = offset[3];
+    ptrdiff_t end_3         = begin_3 + policy.m_tile[3];
+    end_3 = end_3 < policy.m_upper[3] ? end_3 : policy.m_upper[3];
+
+    const ptrdiff_t begin_4 = offset[4];
+    ptrdiff_t end_4         = begin_4 + policy.m_tile[4];
+    end_4 = end_4 < policy.m_upper[4] ? end_4 : policy.m_upper[4];
+
+    const ptrdiff_t begin_5 = offset[5];
+    ptrdiff_t end_5         = begin_5 + policy.m_tile[5];
+    end_5 = end_5 < policy.m_upper[5] ? end_5 : policy.m_upper[5];
+
+#pragma omp for collapse(6)
+    for (ptrdiff_t i0 = begin_0; i0 < end_0; i0++)
+      for (ptrdiff_t i1 = begin_1; i1 < end_1; i1++)
+        for (ptrdiff_t i2 = begin_2; i2 < end_2; i2++)
+          for (ptrdiff_t i3 = begin_3; i3 < end_3; i3++)
+            for (ptrdiff_t i4 = begin_4; i4 < end_4; i4++)
+              for (ptrdiff_t i5 = begin_5; i5 < end_5; i5++)
+                functor(i0, i1, i2, i3, i4, i5);
+  }
+
+  template <int Rank>
+  inline typename std::enable_if<Rank == 7>::type execute_tile(
+      typename Policy::point_type offset, const FunctorType& functor,
+      const Policy& policy) const {
+    const ptrdiff_t begin_0 = offset[0];
+    ptrdiff_t end_0         = begin_0 + policy.m_tile[0];
+    end_0 = end_0 < policy.m_upper[0] ? end_0 : policy.m_upper[0];
+
+    const ptrdiff_t begin_1 = offset[1];
+    ptrdiff_t end_1         = begin_1 + policy.m_tile[1];
+    end_1 = end_1 < policy.m_upper[1] ? end_1 : policy.m_upper[1];
+
+    const ptrdiff_t begin_2 = offset[2];
+    ptrdiff_t end_2         = begin_2 + policy.m_tile[2];
+    end_2 = end_2 < policy.m_upper[2] ? end_2 : policy.m_upper[2];
+
+    const ptrdiff_t begin_3 = offset[3];
+    ptrdiff_t end_3         = begin_3 + policy.m_tile[3];
+    end_3 = end_3 < policy.m_upper[3] ? end_3 : policy.m_upper[3];
+
+    const ptrdiff_t begin_4 = offset[4];
+    ptrdiff_t end_4         = begin_4 + policy.m_tile[4];
+    end_4 = end_4 < policy.m_upper[4] ? end_4 : policy.m_upper[4];
+
+    const ptrdiff_t begin_5 = offset[5];
+    ptrdiff_t end_5         = begin_5 + policy.m_tile[5];
+    end_5 = end_5 < policy.m_upper[5] ? end_5 : policy.m_upper[5];
+
+    const ptrdiff_t begin_6 = offset[6];
+    ptrdiff_t end_6         = begin_6 + policy.m_tile[6];
+    end_6 = end_6 < policy.m_upper[6] ? end_6 : policy.m_upper[6];
+
+#pragma omp for collapse(7)
+    for (ptrdiff_t i0 = begin_0; i0 < end_0; i0++)
+      for (ptrdiff_t i1 = begin_1; i1 < end_1; i1++)
+        for (ptrdiff_t i2 = begin_2; i2 < end_2; i2++)
+          for (ptrdiff_t i3 = begin_3; i3 < end_3; i3++)
+            for (ptrdiff_t i4 = begin_4; i4 < end_4; i4++)
+              for (ptrdiff_t i5 = begin_5; i5 < end_5; i5++)
+                for (ptrdiff_t i6 = begin_6; i6 < end_6; i6++)
+                  functor(i0, i1, i2, i3, i4, i5, i6);
+  }
+
+  template <int Rank>
+  inline typename std::enable_if<Rank == 8>::type execute_tile(
+      typename Policy::point_type offset, const FunctorType& functor,
+      const Policy& policy) const {
+    const ptrdiff_t begin_0 = offset[0];
+    ptrdiff_t end_0         = begin_0 + policy.m_tile[0];
+    end_0 = end_0 < policy.m_upper[0] ? end_0 : policy.m_upper[0];
+
+    const ptrdiff_t begin_1 = offset[1];
+    ptrdiff_t end_1         = begin_1 + policy.m_tile[1];
+    end_1 = end_1 < policy.m_upper[1] ? end_1 : policy.m_upper[1];
+
+    const ptrdiff_t begin_2 = offset[2];
+    ptrdiff_t end_2         = begin_2 + policy.m_tile[2];
+    end_2 = end_2 < policy.m_upper[2] ? end_2 : policy.m_upper[2];
+
+    const ptrdiff_t begin_3 = offset[3];
+    ptrdiff_t end_3         = begin_3 + policy.m_tile[3];
+    end_3 = end_3 < policy.m_upper[3] ? end_3 : policy.m_upper[3];
+
+    const ptrdiff_t begin_4 = offset[4];
+    ptrdiff_t end_4         = begin_4 + policy.m_tile[4];
+    end_4 = end_4 < policy.m_upper[4] ? end_4 : policy.m_upper[4];
+
+    const ptrdiff_t begin_5 = offset[5];
+    ptrdiff_t end_5         = begin_5 + policy.m_tile[5];
+    end_5 = end_5 < policy.m_upper[5] ? end_5 : policy.m_upper[5];
+
+    const ptrdiff_t begin_6 = offset[6];
+    ptrdiff_t end_6         = begin_6 + policy.m_tile[6];
+    end_6 = end_6 < policy.m_upper[6] ? end_6 : policy.m_upper[6];
+
+    const ptrdiff_t begin_7 = offset[7];
+    ptrdiff_t end_7         = begin_7 + policy.m_tile[7];
+    end_7 = end_7 < policy.m_upper[7] ? end_7 : policy.m_upper[7];
+
+#pragma omp for collapse(8)
+    for (ptrdiff_t i0 = begin_0; i0 < end_0; i0++)
+      for (ptrdiff_t i1 = begin_1; i1 < end_1; i1++)
+        for (ptrdiff_t i2 = begin_2; i2 < end_2; i2++)
+          for (ptrdiff_t i3 = begin_3; i3 < end_3; i3++)
+            for (ptrdiff_t i4 = begin_4; i4 < end_4; i4++)
+              for (ptrdiff_t i5 = begin_5; i5 < end_5; i5++)
+                for (ptrdiff_t i6 = begin_6; i6 < end_6; i6++)
+                  for (ptrdiff_t i7 = begin_7; i7 < end_7; i7++)
+                    functor(i0, i1, i2, i3, i4, i5, i6, i7);
+  }
+
+  inline ParallelFor(const FunctorType& arg_functor, Policy arg_policy)
+      : m_functor(arg_functor), m_policy(arg_policy) {}
+};
+
+}  // namespace Impl
+}  // namespace Kokkos
+
+//----------------------------------------------------------------------------
+//----------------------------------------------------------------------------
+
+namespace Kokkos {
+namespace Impl {
+
+template <class FunctorType, class ReducerType, class PointerType,
+          class ValueType, class... PolicyArgs>
+struct ParallelReduceSpecialize<FunctorType,
+                                Kokkos::MDRangePolicy<PolicyArgs...>,
+                                ReducerType, PointerType, ValueType, 0, 0> {
+  typedef Kokkos::RangePolicy<PolicyArgs...> PolicyType;
+  template <class TagType>
+  inline static
+      typename std::enable_if<std::is_same<TagType, void>::value>::type
+      execute_impl(const FunctorType& f, const PolicyType& p,
+                   PointerType result_ptr) {
+    OpenMPTargetExec::verify_is_process(
+        "Kokkos::Experimental::OpenMPTarget parallel_for");
+    OpenMPTargetExec::verify_initialized(
+        "Kokkos::Experimental::OpenMPTarget parallel_for");
+    const typename PolicyType::member_type begin = p.begin();
+    const typename PolicyType::member_type end   = p.end();
+
+    ValueType result = ValueType();
+#pragma omp target teams distribute parallel for num_teams(512) map(to:f) map(tofrom:result) reduction(+: result)
+    for (int i = begin; i < end; i++) f(i, result);
+
+    *result_ptr = result;
+  }
+
+  template <class TagType>
+  inline static
+      typename std::enable_if<!std::is_same<TagType, void>::value>::type
+      execute_impl(const FunctorType& f, const PolicyType& p,
+                   PointerType result_ptr) {
+    OpenMPTargetExec::verify_is_process(
+        "Kokkos::Experimental::OpenMPTarget parallel_for");
+    OpenMPTargetExec::verify_initialized(
+        "Kokkos::Experimental::OpenMPTarget parallel_for");
+    const typename PolicyType::member_type begin = p.begin();
+    const typename PolicyType::member_type end   = p.end();
+
+    ValueType result = ValueType();
+#pragma omp target teams distribute parallel for num_teams(512) map(to:f) map(tofrom: result) reduction(+: result)
+    for (int i = begin; i < end; i++) f(TagType(), i, result);
+
+    *result_ptr = result;
+  }
+
+  inline static void execute(const FunctorType& f, const PolicyType& p,
+                             PointerType ptr) {
+    execute_impl<typename PolicyType::work_tag>(f, p, ptr);
+  }
+};
+/*
+template<class FunctorType, class PolicyType, class ReducerType, class
+PointerType, class ValueType> struct ParallelReduceSpecialize<FunctorType,
+PolicyType, ReducerType, PointerType, ValueType, 0,1> {
+
+  #pragma omp declare reduction(custom: ValueType : ReducerType::join(omp_out,
+omp_in)) initializer ( ReducerType::init(omp_priv) )
+
+  template< class TagType >
+  inline static
+  typename std::enable_if< std::is_same< TagType , void >::value >::type
+  execute_impl(const FunctorType& f, const PolicyType& p, PointerType
+result_ptr)
+    {
+      OpenMPTargetExec::verify_is_process("Kokkos::Experimental::OpenMPTarget
+parallel_for");
+      OpenMPTargetExec::verify_initialized("Kokkos::Experimental::OpenMPTarget
+parallel_for"); const typename PolicyType::member_type begin = p.begin(); const
+typename PolicyType::member_type end = p.end();
+
+      ValueType result = ValueType();
+      #pragma omp target teams distribute parallel for num_teams(512) map(to:f)
+map(tofrom:result) reduction(custom: result) for(int i=begin; i<end; i++)
+        f(i,result);
+
+      *result_ptr=result;
+    }
+
+
+  template< class TagType >
+  inline static
+  typename std::enable_if< ! std::is_same< TagType , void >::value >::type
+  execute_impl(const FunctorType& f, const PolicyType& p, PointerType
+result_ptr)
+    {
+      OpenMPTargetExec::verify_is_process("Kokkos::Experimental::OpenMPTarget
+parallel_for");
+      OpenMPTargetExec::verify_initialized("Kokkos::Experimental::OpenMPTarget
+parallel_for"); const typename PolicyType::member_type begin = p.begin(); const
+typename PolicyType::member_type end = p.end();
+
+      ValueType result = ValueType();
+      #pragma omp target teams distribute parallel for num_teams(512) map(to:f)
+map(tofrom: result) reduction(custom: result) for(int i=begin; i<end; i++)
+        f(TagType(),i,result);
+
+      *result_ptr=result;
+    }
+
+
+    inline static
+    void execute(const FunctorType& f, const PolicyType& p, PointerType ptr) {
+      execute_impl<typename PolicyType::work_tag>(f,p,ptr);
+    }
+};
+
+
+template <class FunctorType, class ReducerType, class... Traits>
+class ParallelReduce<FunctorType, Kokkos::MDRangePolicy<Traits...>, ReducerType,
+                     Kokkos::Experimental::OpenMPTarget> {
+ private:
+  typedef Kokkos::MDRangePolicy<Traits...> Policy;
+
+  typedef typename Policy::work_tag WorkTag;
+  typedef typename Policy::WorkRange WorkRange;
+  typedef typename Policy::member_type Member;
+
+  typedef Kokkos::Impl::if_c<std::is_same<InvalidType, ReducerType>::value,
+                             FunctorType, ReducerType>
+      ReducerConditional;
+  typedef typename ReducerConditional::type ReducerTypeFwd;
+  typedef
+      typename Kokkos::Impl::if_c<std::is_same<InvalidType, ReducerType>::value,
+                                  WorkTag, void>::type WorkTagFwd;
+
+  // Static Assert WorkTag void if ReducerType not InvalidType
+
+  typedef Kokkos::Impl::FunctorValueTraits<ReducerTypeFwd, WorkTagFwd>
+      ValueTraits;
+  typedef Kokkos::Impl::FunctorValueInit<ReducerTypeFwd, WorkTagFwd> ValueInit;
+  typedef Kokkos::Impl::FunctorValueJoin<ReducerTypeFwd, WorkTagFwd> ValueJoin;
+
+  enum { HasJoin = ReduceFunctorHasJoin<FunctorType>::value };
+  enum { UseReducer = is_reducer_type<ReducerType>::value };
+
+  typedef typename ValueTraits::pointer_type pointer_type;
+  typedef typename ValueTraits::reference_type reference_type;
+
+  typedef ParallelReduceSpecialize<
+      FunctorType, Policy, ReducerType, pointer_type,
+      typename ValueTraits::value_type, HasJoin, UseReducer>
+      ParForSpecialize;
+
+  const FunctorType m_functor;
+  const Policy m_policy;
+  const ReducerType m_reducer;
+  const pointer_type m_result_ptr;
+
+ public:
+  inline void execute() const {
+    ParForSpecialize::execute(m_functor, m_policy, m_result_ptr);
+  }
+
+  template <class ViewType>
+  inline ParallelReduce(
+      const FunctorType& arg_functor, Policy arg_policy,
+      const ViewType& arg_result_view,
+      typename std::enable_if<Kokkos::is_view<ViewType>::value &&
+                                  !Kokkos::is_reducer_type<ReducerType>::value,
+                              void*>::type = NULL)
+      : m_functor(arg_functor),
+        m_policy(arg_policy),
+        m_reducer(InvalidType()),
+        m_result_ptr(arg_result_view.data()) {
+    //static_assert( std::is_same< typename ViewType::memory_space
+    //                                , Kokkos::HostSpace >::value
+    //  , "Reduction result on Kokkos::Experimental::OpenMPTarget must be a
+    //  Kokkos::View in HostSpace" );
+  }
+
+  inline ParallelReduce(const FunctorType& arg_functor, Policy arg_policy,
+                        const ReducerType& reducer)
+      : m_functor(arg_functor),
+        m_policy(arg_policy),
+        m_reducer(reducer),
+        m_result_ptr(reducer.view().data()) {
+    //static_assert( std::is_same< typename ViewType::memory_space
+    //                                , Kokkos::HostSpace >::value
+    //  , "Reduction result on Kokkos::Experimental::OpenMPTarget must be a
+    //  Kokkos::View in HostSpace" );
+  }
+};*/
+
+}  // namespace Impl
+}  // namespace Kokkos
+
+//----------------------------------------------------------------------------
+//----------------------------------------------------------------------------
+
+#endif /* KOKKOS_OPENMPTARGET_PARALLEL_HPP */
diff --git a/kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTarget_Task.cpp b/kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTarget_Task.cpp
index 87361401f..be924ffa6 100644
--- a/kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTarget_Task.cpp
+++ b/kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTarget_Task.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTarget_Task.hpp b/kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTarget_Task.hpp
index dc1dada79..19956dad2 100644
--- a/kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTarget_Task.hpp
+++ b/kokkos/core/src/OpenMPTarget/Kokkos_OpenMPTarget_Task.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -113,7 +113,7 @@ class TaskExec<Kokkos::Experimental::OpenMPTarget> {
  public:
 #if defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST)
   void* team_shared() const {
-    return m_team_exec ? m_team_exec->scratch_thread() : (void*)0;
+    return m_team_exec ? m_team_exec->scratch_thread() : nullptr;
   }
 
   int team_shared_size() const {
diff --git a/kokkos/core/src/Qthreads/Kokkos_QthreadsExec.cpp b/kokkos/core/src/Qthreads/Kokkos_QthreadsExec.cpp
deleted file mode 100644
index 5b4d097d4..000000000
--- a/kokkos/core/src/Qthreads/Kokkos_QthreadsExec.cpp
+++ /dev/null
@@ -1,535 +0,0 @@
-/*
-//@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
-*/
-
-#include <Kokkos_Macros.hpp>
-#if defined(KOKKOS_ENABLE_QTHREADS)
-
-#include <Kokkos_Core_fwd.hpp>
-
-#include <cstdio>
-#include <cstdlib>
-#include <iostream>
-#include <sstream>
-#include <utility>
-
-#include <Kokkos_Qthreads.hpp>
-#include <Kokkos_Atomic.hpp>
-#include <impl/Kokkos_Error.hpp>
-
-// Defines to enable experimental Qthreads functionality.
-//#define QTHREAD_LOCAL_PRIORITY
-//#define CLONED_TASKS
-
-//#include <qthread.h>
-
-//----------------------------------------------------------------------------
-
-namespace Kokkos {
-
-namespace Impl {
-
-namespace {
-
-enum { MAXIMUM_QTHREADS_WORKERS = 1024 };
-
-/** s_exec is indexed by the reverse rank of the workers
- *  for faster fan-in / fan-out lookups
- *  [ n - 1, n - 2, ..., 0 ]
- */
-QthreadsExec *s_exec[MAXIMUM_QTHREADS_WORKERS];
-
-int s_number_shepherds            = 0;
-int s_number_workers_per_shepherd = 0;
-int s_number_workers              = 0;
-
-inline QthreadsExec **worker_exec() {
-  return s_exec + s_number_workers -
-         (qthread_shep() * s_number_workers_per_shepherd +
-          qthread_worker_local(NULL) + 1);
-}
-
-const int s_base_size = QthreadsExec::align_alloc(sizeof(QthreadsExec));
-
-int s_worker_reduce_end   = 0;  // End of worker reduction memory.
-int s_worker_shared_end   = 0;  // Total of worker scratch memory.
-int s_worker_shared_begin = 0;  // Beginning of worker shared memory.
-
-QthreadsExecFunctionPointer volatile s_active_function = 0;
-const void *volatile s_active_function_arg             = 0;
-
-}  // namespace
-
-}  // namespace Impl
-
-}  // namespace Kokkos
-
-//----------------------------------------------------------------------------
-
-namespace Kokkos {
-
-int Qthreads::is_initialized() { return Impl::s_number_workers != 0; }
-
-int Qthreads::concurrency() { return Impl::s_number_workers_per_shepherd; }
-
-int Qthreads::in_parallel() { return Impl::s_active_function != 0; }
-
-void Qthreads::initialize(int thread_count) {
-  // Environment variable: QTHREAD_NUM_SHEPHERDS
-  // Environment variable: QTHREAD_NUM_WORKERS_PER_SHEP
-  // Environment variable: QTHREAD_HWPAR
-
-  {
-    char buffer[256];
-    snprintf(buffer, sizeof(buffer), "QTHREAD_HWPAR=%d", thread_count);
-    putenv(buffer);
-  }
-
-  const bool ok_init =
-      (QTHREAD_SUCCESS == qthread_initialize()) &&
-      (thread_count ==
-       qthread_num_shepherds() * qthread_num_workers_local(NO_SHEPHERD)) &&
-      (thread_count == qthread_num_workers());
-
-  bool ok_symmetry = true;
-
-  if (ok_init) {
-    Impl::s_number_shepherds = qthread_num_shepherds();
-    Impl::s_number_workers_per_shepherd =
-        qthread_num_workers_local(NO_SHEPHERD);
-    Impl::s_number_workers =
-        Impl::s_number_shepherds * Impl::s_number_workers_per_shepherd;
-
-    for (int i = 0; ok_symmetry && i < Impl::s_number_shepherds; ++i) {
-      ok_symmetry =
-          (Impl::s_number_workers_per_shepherd == qthread_num_workers_local(i));
-    }
-  }
-
-  if (!ok_init || !ok_symmetry) {
-    std::ostringstream msg;
-
-    msg << "Kokkos::Qthreads::initialize(" << thread_count << ") FAILED";
-    msg << " : qthread_num_shepherds = " << qthread_num_shepherds();
-    msg << " : qthread_num_workers_per_shepherd = "
-        << qthread_num_workers_local(NO_SHEPHERD);
-    msg << " : qthread_num_workers = " << qthread_num_workers();
-
-    if (!ok_symmetry) {
-      msg << " : qthread_num_workers_local = {";
-      for (int i = 0; i < Impl::s_number_shepherds; ++i) {
-        msg << " " << qthread_num_workers_local(i);
-      }
-      msg << " }";
-    }
-
-    Impl::s_number_workers              = 0;
-    Impl::s_number_shepherds            = 0;
-    Impl::s_number_workers_per_shepherd = 0;
-
-    if (ok_init) {
-      qthread_finalize();
-    }
-
-    Kokkos::Impl::throw_runtime_exception(msg.str());
-  }
-
-  Impl::QthreadsExec::resize_worker_scratch(256, 256);
-
-  // Init the array for used for arbitrarily sized atomics.
-  Impl::init_lock_array_host_space();
-}
-
-void Qthreads::finalize() {
-  Impl::QthreadsExec::clear_workers();
-
-  if (Impl::s_number_workers) {
-    qthread_finalize();
-  }
-
-  Impl::s_number_workers              = 0;
-  Impl::s_number_shepherds            = 0;
-  Impl::s_number_workers_per_shepherd = 0;
-}
-
-void Qthreads::print_configuration(std::ostream &s, const bool detail) {
-  s << "Kokkos::Qthreads {"
-    << " num_shepherds(" << Impl::s_number_shepherds << ")"
-    << " num_workers_per_shepherd(" << Impl::s_number_workers_per_shepherd
-    << ")"
-    << " }" << std::endl;
-}
-
-Qthreads &Qthreads::instance(int) {
-  static Qthreads q;
-  return q;
-}
-
-void Qthreads::fence() {}
-
-int Qthreads::shepherd_size() const { return Impl::s_number_shepherds; }
-int Qthreads::shepherd_worker_size() const {
-  return Impl::s_number_workers_per_shepherd;
-}
-
-const char *Qthreads::name() { return "Qthreads"; }
-
-}  // namespace Kokkos
-
-//----------------------------------------------------------------------------
-
-namespace Kokkos {
-
-namespace Impl {
-
-namespace {
-
-aligned_t driver_exec_all(void *arg) {
-  QthreadsExec &exec = **worker_exec();
-
-  (*s_active_function)(exec, s_active_function_arg);
-
-  /*
-    fprintf( stdout
-           , "QthreadsExec driver worker(%d:%d) shepherd(%d:%d)
-    shepherd_worker(%d:%d) done\n" , exec.worker_rank() , exec.worker_size() ,
-    exec.shepherd_rank() , exec.shepherd_size() , exec.shepherd_worker_rank() ,
-    exec.shepherd_worker_size()
-           );
-    fflush(stdout);
-  */
-
-  return 0;
-}
-
-aligned_t driver_resize_worker_scratch(void *arg) {
-  static volatile int lock_begin = 0;
-  static volatile int lock_end   = 0;
-
-  QthreadsExec **const exec = worker_exec();
-
-  //----------------------------------------
-  // Serialize allocation for thread safety.
-
-  while (!atomic_compare_exchange_strong(&lock_begin, 0, 1))
-    ;  // Spin wait to claim lock.
-
-  const bool ok = 0 == *exec;
-
-  if (ok) {
-    *exec = (QthreadsExec *)malloc(s_base_size + s_worker_shared_end);
-  }
-
-  lock_begin = 0;  // Release lock.
-
-  if (ok) {
-    new (*exec) QthreadsExec();
-  }
-
-  //----------------------------------------
-  // Wait for all calls to complete to insure that each worker has executed.
-
-  if (s_number_workers == 1 + atomic_fetch_add(&lock_end, 1)) {
-    lock_end = 0;
-  }
-
-  while (lock_end)
-    ;
-
-  /*
-    fprintf( stdout
-           , "QthreadsExec resize worker(%d:%d) shepherd(%d:%d)
-    shepherd_worker(%d:%d) done\n" , (**exec).worker_rank() ,
-    (**exec).worker_size() , (**exec).shepherd_rank() , (**exec).shepherd_size()
-           , (**exec).shepherd_worker_rank()
-           , (**exec).shepherd_worker_size()
-           );
-    fflush(stdout);
-  */
-
-  //----------------------------------------
-
-  if (!ok) {
-    fprintf(stderr, "Kokkos::QthreadsExec resize failed\n");
-    fflush(stderr);
-  }
-
-  return 0;
-}
-
-void verify_is_process(const char *const label, bool not_active = false) {
-  const bool not_process =
-      0 != qthread_shep() || 0 != qthread_worker_local(NULL);
-  const bool is_active =
-      not_active && (s_active_function || s_active_function_arg);
-
-  if (not_process || is_active) {
-    std::string msg(label);
-    msg.append(" : FAILED");
-    if (not_process) msg.append(" : not called by main process");
-    if (is_active) msg.append(" : parallel execution in progress");
-    Kokkos::Impl::throw_runtime_exception(msg);
-  }
-}
-
-}  // namespace
-
-int QthreadsExec::worker_per_shepherd() {
-  return s_number_workers_per_shepherd;
-}
-
-QthreadsExec::QthreadsExec() {
-  const int shepherd_rank        = qthread_shep();
-  const int shepherd_worker_rank = qthread_worker_local(NULL);
-  const int worker_rank =
-      shepherd_rank * s_number_workers_per_shepherd + shepherd_worker_rank;
-
-  m_worker_base   = s_exec;
-  m_shepherd_base = s_exec + s_number_workers_per_shepherd *
-                                 ((s_number_shepherds - (shepherd_rank + 1)));
-  m_scratch_alloc        = ((unsigned char *)this) + s_base_size;
-  m_reduce_end           = s_worker_reduce_end;
-  m_shepherd_rank        = shepherd_rank;
-  m_shepherd_size        = s_number_shepherds;
-  m_shepherd_worker_rank = shepherd_worker_rank;
-  m_shepherd_worker_size = s_number_workers_per_shepherd;
-  m_worker_rank          = worker_rank;
-  m_worker_size          = s_number_workers;
-  m_worker_state         = QthreadsExec::Active;
-}
-
-void QthreadsExec::clear_workers() {
-  for (int iwork = 0; iwork < s_number_workers; ++iwork) {
-    QthreadsExec *const exec = s_exec[iwork];
-    s_exec[iwork]            = 0;
-    free(exec);
-  }
-}
-
-void QthreadsExec::shared_reset(Qthreads::scratch_memory_space &space) {
-  new (&space) Qthreads::scratch_memory_space(
-      ((unsigned char *)(**m_shepherd_base).m_scratch_alloc) +
-          s_worker_shared_begin,
-      s_worker_shared_end - s_worker_shared_begin);
-}
-
-void QthreadsExec::resize_worker_scratch(const int reduce_size,
-                                         const int shared_size) {
-  const int exec_all_reduce_alloc = align_alloc(reduce_size);
-  const int shepherd_scan_alloc   = align_alloc(8);
-  const int shepherd_shared_end =
-      exec_all_reduce_alloc + shepherd_scan_alloc + align_alloc(shared_size);
-
-  if (s_worker_reduce_end < exec_all_reduce_alloc ||
-      s_worker_shared_end < shepherd_shared_end) {
-    /*
-      fprintf( stdout, "QthreadsExec::resize\n");
-      fflush(stdout);
-    */
-
-    // Clear current worker memory before allocating new worker memory.
-    clear_workers();
-
-    // Increase the buffers to an aligned allocation.
-    s_worker_reduce_end   = exec_all_reduce_alloc;
-    s_worker_shared_begin = exec_all_reduce_alloc + shepherd_scan_alloc;
-    s_worker_shared_end   = shepherd_shared_end;
-
-    // Need to query which shepherd this main 'process' is running.
-
-    const int main_shep = qthread_shep();
-
-    // Have each worker resize its memory for proper first-touch.
-#if 0
-    for ( int jshep = 0; jshep < s_number_shepherds; ++jshep ) {
-      for ( int i = jshep != main_shep ? 0 : 1; i < s_number_workers_per_shepherd; ++i ) {
-        qthread_fork_to( driver_resize_worker_scratch, NULL, NULL, jshep );
-      }
-    }
-#else
-    // If this function is used before the 'qthreads.task_policy' unit test,
-    // the 'qthreads.task_policy' unit test fails with a seg-fault within
-    // libqthread.so.
-    for (int jshep = 0; jshep < s_number_shepherds; ++jshep) {
-      const int num_clone = jshep != main_shep
-                                ? s_number_workers_per_shepherd
-                                : s_number_workers_per_shepherd - 1;
-
-      if (num_clone) {
-        const int ret = qthread_fork_clones_to_local_priority(
-            driver_resize_worker_scratch  // Function
-            ,
-            NULL  // Function data block
-            ,
-            NULL  // Pointer to return value feb
-            ,
-            jshep  // Shepherd number
-            ,
-            num_clone - 1  // Number of instances - 1
-        );
-
-        assert(ret == QTHREAD_SUCCESS);
-      }
-    }
-#endif
-
-    driver_resize_worker_scratch(NULL);
-
-    // Verify all workers allocated.
-
-    bool ok = true;
-    for (int iwork = 0; ok && iwork < s_number_workers; ++iwork) {
-      ok = 0 != s_exec[iwork];
-    }
-
-    if (!ok) {
-      std::ostringstream msg;
-      msg << "Kokkos::Impl::QthreadsExec::resize : FAILED for workers {";
-      for (int iwork = 0; iwork < s_number_workers; ++iwork) {
-        if (0 == s_exec[iwork]) {
-          msg << " " << (s_number_workers - (iwork + 1));
-        }
-      }
-      msg << " }";
-      Kokkos::Impl::throw_runtime_exception(msg.str());
-    }
-  }
-}
-
-void QthreadsExec::exec_all(Qthreads &, QthreadsExecFunctionPointer func,
-                            const void *arg) {
-  verify_is_process("QthreadsExec::exec_all(...)", true);
-
-  /*
-    fprintf( stdout, "QthreadsExec::exec_all\n");
-    fflush(stdout);
-  */
-
-  s_active_function     = func;
-  s_active_function_arg = arg;
-
-  // Need to query which shepherd this main 'process' is running.
-
-  const int main_shep = qthread_shep();
-
-#if 0
-  for ( int jshep = 0, iwork = 0; jshep < s_number_shepherds; ++jshep ) {
-    for ( int i = jshep != main_shep ? 0 : 1; i < s_number_workers_per_shepherd; ++i, ++iwork ) {
-      qthread_fork_to( driver_exec_all, NULL, NULL, jshep );
-    }
-  }
-#else
-  // If this function is used before the 'qthreads.task_policy' unit test,
-  // the 'qthreads.task_policy' unit test fails with a seg-fault within
-  // libqthread.so.
-  for (int jshep = 0; jshep < s_number_shepherds; ++jshep) {
-    const int num_clone = jshep != main_shep
-                              ? s_number_workers_per_shepherd
-                              : s_number_workers_per_shepherd - 1;
-
-    if (num_clone) {
-      const int ret = qthread_fork_clones_to_local_priority(
-          driver_exec_all  // Function
-          ,
-          NULL  // Function data block
-          ,
-          NULL  // Pointer to return value feb
-          ,
-          jshep  // Shepherd number
-          ,
-          num_clone - 1  // Number of instances - 1
-      );
-
-      assert(ret == QTHREAD_SUCCESS);
-    }
-  }
-#endif
-
-  driver_exec_all(NULL);
-
-  s_active_function     = 0;
-  s_active_function_arg = 0;
-}
-
-void *QthreadsExec::exec_all_reduce_result() {
-  return s_exec[0]->m_scratch_alloc;
-}
-
-}  // namespace Impl
-
-}  // namespace Kokkos
-
-namespace Kokkos {
-
-namespace Impl {
-
-QthreadsTeamPolicyMember::QthreadsTeamPolicyMember()
-    : m_exec(**worker_exec()),
-      m_team_shared(0, 0),
-      m_team_size(1),
-      m_team_rank(0),
-      m_league_size(1),
-      m_league_end(1),
-      m_league_rank(0) {
-  m_exec.shared_reset(m_team_shared);
-}
-
-QthreadsTeamPolicyMember::QthreadsTeamPolicyMember(
-    const QthreadsTeamPolicyMember::TaskTeam &)
-    : m_exec(**worker_exec()),
-      m_team_shared(0, 0),
-      m_team_size(s_number_workers_per_shepherd),
-      m_team_rank(m_exec.shepherd_worker_rank()),
-      m_league_size(1),
-      m_league_end(1),
-      m_league_rank(0) {
-  m_exec.shared_reset(m_team_shared);
-}
-
-}  // namespace Impl
-
-}  // namespace Kokkos
-
-#else
-void KOKKOS_SRC_QTHREADS_EXEC_PREVENT_LINK_ERROR() {}
-#endif  // #if defined( KOKKOS_ENABLE_QTHREADS )
diff --git a/kokkos/core/src/Qthreads/Kokkos_QthreadsExec.hpp b/kokkos/core/src/Qthreads/Kokkos_QthreadsExec.hpp
deleted file mode 100644
index 1e5d61831..000000000
--- a/kokkos/core/src/Qthreads/Kokkos_QthreadsExec.hpp
+++ /dev/null
@@ -1,687 +0,0 @@
-/*
-//@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
-*/
-
-#ifndef KOKKOS_QTHREADSEXEC_HPP
-#define KOKKOS_QTHREADSEXEC_HPP
-
-#include <Kokkos_Macros.hpp>
-#if defined(KOKKOS_ENABLE_QTHREADS)
-
-#include <impl/Kokkos_Spinwait.hpp>
-
-//----------------------------------------------------------------------------
-
-namespace Kokkos {
-
-namespace Impl {
-
-class QthreadsExec;
-
-typedef void (*QthreadsExecFunctionPointer)(QthreadsExec &, const void *);
-
-class QthreadsExec {
- private:
-  enum { Inactive = 0, Active = 1 };
-
-  const QthreadsExec *const *m_worker_base;
-  const QthreadsExec *const *m_shepherd_base;
-
-  void *m_scratch_alloc;  ///< Scratch memory [ reduce, team, shared ]
-  int m_reduce_end;       ///< End of scratch reduction memory
-
-  int m_shepherd_rank;
-  int m_shepherd_size;
-
-  int m_shepherd_worker_rank;
-  int m_shepherd_worker_size;
-
-  /*
-   *  m_worker_rank = m_shepherd_rank * m_shepherd_worker_size +
-   * m_shepherd_worker_rank m_worker_size = m_shepherd_size *
-   * m_shepherd_worker_size
-   */
-  int m_worker_rank;
-  int m_worker_size;
-
-  int mutable volatile m_worker_state;
-
-  friend class Kokkos::Qthreads;
-
-  ~QthreadsExec();
-  QthreadsExec(const QthreadsExec &);
-  QthreadsExec &operator=(const QthreadsExec &);
-
- public:
-  QthreadsExec();
-
-  /** Execute the input function on all available Qthreads workers. */
-  static void exec_all(Qthreads &, QthreadsExecFunctionPointer, const void *);
-
-  /** Barrier across all workers participating in the 'exec_all'. */
-  void exec_all_barrier() const {
-    const int rev_rank = m_worker_size - (m_worker_rank + 1);
-
-    int n, j;
-
-    for (n = 1; (!(rev_rank & n)) && ((j = rev_rank + n) < m_worker_size);
-         n <<= 1) {
-      Impl::spinwait_while_equal(m_worker_base[j]->m_worker_state,
-                                 QthreadsExec::Active);
-    }
-
-    if (rev_rank) {
-      m_worker_state = QthreadsExec::Inactive;
-      Impl::spinwait_while_equal(m_worker_state, QthreadsExec::Inactive);
-    }
-
-    for (n = 1; (!(rev_rank & n)) && ((j = rev_rank + n) < m_worker_size);
-         n <<= 1) {
-      m_worker_base[j]->m_worker_state = QthreadsExec::Active;
-    }
-  }
-
-  /** Barrier across workers within the shepherd with rank < team_rank. */
-  void shepherd_barrier(const int team_size) const {
-    if (m_shepherd_worker_rank < team_size) {
-      const int rev_rank = team_size - (m_shepherd_worker_rank + 1);
-
-      int n, j;
-
-      for (n = 1; (!(rev_rank & n)) && ((j = rev_rank + n) < team_size);
-           n <<= 1) {
-        Impl::spinwait_while_equal(m_shepherd_base[j]->m_worker_state,
-                                   QthreadsExec::Active);
-      }
-
-      if (rev_rank) {
-        m_worker_state = QthreadsExec::Inactive;
-        Impl::spinwait_while_equal(m_worker_state, QthreadsExec::Inactive);
-      }
-
-      for (n = 1; (!(rev_rank & n)) && ((j = rev_rank + n) < team_size);
-           n <<= 1) {
-        m_shepherd_base[j]->m_worker_state = QthreadsExec::Active;
-      }
-    }
-  }
-
-  /** Reduce across all workers participating in the 'exec_all'. */
-  template <class FunctorType, class ReducerType, class ArgTag>
-  inline void exec_all_reduce(const FunctorType &func,
-                              const ReducerType &reduce) const {
-    typedef Kokkos::Impl::if_c<std::is_same<InvalidType, ReducerType>::value,
-                               FunctorType, ReducerType>
-        ReducerConditional;
-    typedef typename ReducerConditional::type ReducerTypeFwd;
-    typedef Kokkos::Impl::FunctorValueJoin<ReducerTypeFwd, ArgTag> ValueJoin;
-
-    const int rev_rank = m_worker_size - (m_worker_rank + 1);
-
-    int n, j;
-
-    for (n = 1; (!(rev_rank & n)) && ((j = rev_rank + n) < m_worker_size);
-         n <<= 1) {
-      const QthreadsExec &fan = *m_worker_base[j];
-
-      Impl::spinwait_while_equal(fan.m_worker_state, QthreadsExec::Active);
-
-      ValueJoin::join(ReducerConditional::select(func, reduce), m_scratch_alloc,
-                      fan.m_scratch_alloc);
-    }
-
-    if (rev_rank) {
-      m_worker_state = QthreadsExec::Inactive;
-      Impl::spinwait_while_equal(m_worker_state, QthreadsExec::Inactive);
-    }
-
-    for (n = 1; (!(rev_rank & n)) && ((j = rev_rank + n) < m_worker_size);
-         n <<= 1) {
-      m_worker_base[j]->m_worker_state = QthreadsExec::Active;
-    }
-  }
-
-  /** Scan across all workers participating in the 'exec_all'. */
-  template <class FunctorType, class ArgTag>
-  inline void exec_all_scan(const FunctorType &func) const {
-    typedef Kokkos::Impl::FunctorValueInit<FunctorType, ArgTag> ValueInit;
-    typedef Kokkos::Impl::FunctorValueJoin<FunctorType, ArgTag> ValueJoin;
-    typedef Kokkos::Impl::FunctorValueOps<FunctorType, ArgTag> ValueOps;
-
-    const int rev_rank = m_worker_size - (m_worker_rank + 1);
-
-    int n, j;
-
-    for (n = 1; (!(rev_rank & n)) && ((j = rev_rank + n) < m_worker_size);
-         n <<= 1) {
-      Impl::spinwait_while_equal(m_worker_base[j]->m_worker_state,
-                                 QthreadsExec::Active);
-    }
-
-    if (rev_rank) {
-      m_worker_state = QthreadsExec::Inactive;
-      Impl::spinwait_while_equal(m_worker_state, QthreadsExec::Inactive);
-    } else {
-      // Root thread scans across values before releasing threads.
-      // Worker data is in reverse order, so m_worker_base[0] is the
-      // highest ranking thread.
-
-      // Copy from lower ranking to higher ranking worker.
-      for (int i = 1; i < m_worker_size; ++i) {
-        ValueOps::copy(func, m_worker_base[i - 1]->m_scratch_alloc,
-                       m_worker_base[i]->m_scratch_alloc);
-      }
-
-      ValueInit::init(func, m_worker_base[m_worker_size - 1]->m_scratch_alloc);
-
-      // Join from lower ranking to higher ranking worker.
-      // Value at m_worker_base[n-1] is zero so skip adding it to
-      // m_worker_base[n-2].
-      for (int i = m_worker_size - 1; --i > 0;) {
-        ValueJoin::join(func, m_worker_base[i - 1]->m_scratch_alloc,
-                        m_worker_base[i]->m_scratch_alloc);
-      }
-    }
-
-    for (n = 1; (!(rev_rank & n)) && ((j = rev_rank + n) < m_worker_size);
-         n <<= 1) {
-      m_worker_base[j]->m_worker_state = QthreadsExec::Active;
-    }
-  }
-
-  //----------------------------------------
-
-  template <class Type>
-  inline volatile Type *shepherd_team_scratch_value() const {
-    return (volatile Type *)(((unsigned char *)m_scratch_alloc) + m_reduce_end);
-  }
-
-  template <class Type>
-  inline void shepherd_broadcast(Type &value, const int team_size,
-                                 const int team_rank) const {
-    if (m_shepherd_base) {
-      Type *const shared_value =
-          m_shepherd_base[0]->shepherd_team_scratch_value<Type>();
-      if (m_shepherd_worker_rank == team_rank) {
-        *shared_value = value;
-      }
-      memory_fence();
-      shepherd_barrier(team_size);
-      value = *shared_value;
-    }
-  }
-
-  template <class Type>
-  inline Type shepherd_reduce(const int team_size, const Type &value) const {
-    volatile Type *const shared_value = shepherd_team_scratch_value<Type>();
-    *shared_value                     = value;
-    //    *shepherd_team_scratch_value<Type>() = value;
-
-    memory_fence();
-
-    const int rev_rank = team_size - (m_shepherd_worker_rank + 1);
-
-    int n, j;
-
-    for (n = 1; (!(rev_rank & n)) && ((j = rev_rank + n) < team_size);
-         n <<= 1) {
-      Impl::spinwait_while_equal(m_shepherd_base[j]->m_worker_state,
-                                 QthreadsExec::Active);
-    }
-
-    if (rev_rank) {
-      m_worker_state = QthreadsExec::Inactive;
-      Impl::spinwait_while_equal(m_worker_state, QthreadsExec::Inactive);
-    } else {
-      Type &accum = *m_shepherd_base[0]->shepherd_team_scratch_value<Type>();
-      for (int i = 1; i < n; ++i) {
-        accum += *m_shepherd_base[i]->shepherd_team_scratch_value<Type>();
-      }
-      for (int i = 1; i < n; ++i) {
-        *m_shepherd_base[i]->shepherd_team_scratch_value<Type>() = accum;
-      }
-
-      memory_fence();
-    }
-
-    for (n = 1; (!(rev_rank & n)) && ((j = rev_rank + n) < team_size);
-         n <<= 1) {
-      m_shepherd_base[j]->m_worker_state = QthreadsExec::Active;
-    }
-
-    return *shepherd_team_scratch_value<Type>();
-  }
-
-  template <class JoinOp>
-  inline typename JoinOp::value_type shepherd_reduce(
-      const int team_size, const typename JoinOp::value_type &value,
-      const JoinOp &op) const {
-    typedef typename JoinOp::value_type Type;
-
-    volatile Type *const shared_value = shepherd_team_scratch_value<Type>();
-    *shared_value                     = value;
-    //    *shepherd_team_scratch_value<Type>() = value;
-
-    memory_fence();
-
-    const int rev_rank = team_size - (m_shepherd_worker_rank + 1);
-
-    int n, j;
-
-    for (n = 1; (!(rev_rank & n)) && ((j = rev_rank + n) < team_size);
-         n <<= 1) {
-      Impl::spinwait_while_equal(m_shepherd_base[j]->m_worker_state,
-                                 QthreadsExec::Active);
-    }
-
-    if (rev_rank) {
-      m_worker_state = QthreadsExec::Inactive;
-      Impl::spinwait_while_equal(m_worker_state, QthreadsExec::Inactive);
-    } else {
-      volatile Type &accum =
-          *m_shepherd_base[0]->shepherd_team_scratch_value<Type>();
-      for (int i = 1; i < team_size; ++i) {
-        op.join(accum,
-                *m_shepherd_base[i]->shepherd_team_scratch_value<Type>());
-      }
-      for (int i = 1; i < team_size; ++i) {
-        *m_shepherd_base[i]->shepherd_team_scratch_value<Type>() = accum;
-      }
-
-      memory_fence();
-    }
-
-    for (n = 1; (!(rev_rank & n)) && ((j = rev_rank + n) < team_size);
-         n <<= 1) {
-      m_shepherd_base[j]->m_worker_state = QthreadsExec::Active;
-    }
-
-    return *shepherd_team_scratch_value<Type>();
-  }
-
-  template <class Type>
-  inline Type shepherd_scan(const int team_size, const Type &value,
-                            Type *const global_value = 0) const {
-    *shepherd_team_scratch_value<Type>() = value;
-
-    memory_fence();
-
-    const int rev_rank = team_size - (m_shepherd_worker_rank + 1);
-
-    int n, j;
-
-    for (n = 1; (!(rev_rank & n)) && ((j = rev_rank + n) < team_size);
-         n <<= 1) {
-      Impl::spinwait_while_equal(m_shepherd_base[j]->m_worker_state,
-                                 QthreadsExec::Active);
-    }
-
-    if (rev_rank) {
-      m_worker_state = QthreadsExec::Inactive;
-      Impl::spinwait_while_equal(m_worker_state, QthreadsExec::Inactive);
-    } else {
-      // Root thread scans across values before releasing threads.
-      // Worker data is in reverse order, so m_shepherd_base[0] is the
-      // highest ranking thread.
-
-      // Copy from lower ranking to higher ranking worker.
-
-      Type accum = *m_shepherd_base[0]->shepherd_team_scratch_value<Type>();
-      for (int i = 1; i < team_size; ++i) {
-        const Type tmp =
-            *m_shepherd_base[i]->shepherd_team_scratch_value<Type>();
-        accum += tmp;
-        *m_shepherd_base[i - 1]->shepherd_team_scratch_value<Type>() = tmp;
-      }
-
-      *m_shepherd_base[team_size - 1]->shepherd_team_scratch_value<Type>() =
-          global_value ? atomic_fetch_add(global_value, accum) : 0;
-
-      // Join from lower ranking to higher ranking worker.
-      for (int i = team_size; --i;) {
-        *m_shepherd_base[i - 1]->shepherd_team_scratch_value<Type>() +=
-            *m_shepherd_base[i]->shepherd_team_scratch_value<Type>();
-      }
-
-      memory_fence();
-    }
-
-    for (n = 1; (!(rev_rank & n)) && ((j = rev_rank + n) < team_size);
-         n <<= 1) {
-      m_shepherd_base[j]->m_worker_state = QthreadsExec::Active;
-    }
-
-    return *shepherd_team_scratch_value<Type>();
-  }
-
-  //----------------------------------------
-
-  static inline int align_alloc(int size) {
-    enum { ALLOC_GRAIN = 1 << 6 /* power of two, 64bytes */ };
-    enum { ALLOC_GRAIN_MASK = ALLOC_GRAIN - 1 };
-    return (size + ALLOC_GRAIN_MASK) & ~ALLOC_GRAIN_MASK;
-  }
-
-  void shared_reset(Qthreads::scratch_memory_space &);
-
-  void *exec_all_reduce_value() const { return m_scratch_alloc; }
-
-  static void *exec_all_reduce_result();
-
-  static void resize_worker_scratch(const int reduce_size,
-                                    const int shared_size);
-  static void clear_workers();
-
-  //----------------------------------------
-
-  inline int worker_rank() const { return m_worker_rank; }
-  inline int worker_size() const { return m_worker_size; }
-  inline int shepherd_worker_rank() const { return m_shepherd_worker_rank; }
-  inline int shepherd_worker_size() const { return m_shepherd_worker_size; }
-  inline int shepherd_rank() const { return m_shepherd_rank; }
-  inline int shepherd_size() const { return m_shepherd_size; }
-
-  static int worker_per_shepherd();
-};
-
-}  // namespace Impl
-
-}  // namespace Kokkos
-
-//----------------------------------------------------------------------------
-
-namespace Kokkos {
-
-namespace Impl {
-
-class QthreadsTeamPolicyMember {
- private:
-  typedef Kokkos::Qthreads execution_space;
-  typedef execution_space::scratch_memory_space scratch_memory_space;
-
-  Impl::QthreadsExec &m_exec;
-  scratch_memory_space m_team_shared;
-  const int m_team_size;
-  const int m_team_rank;
-  const int m_league_size;
-  const int m_league_end;
-  int m_league_rank;
-
- public:
-  KOKKOS_INLINE_FUNCTION
-  const scratch_memory_space &team_shmem() const { return m_team_shared; }
-
-  KOKKOS_INLINE_FUNCTION int league_rank() const { return m_league_rank; }
-  KOKKOS_INLINE_FUNCTION int league_size() const { return m_league_size; }
-  KOKKOS_INLINE_FUNCTION int team_rank() const { return m_team_rank; }
-  KOKKOS_INLINE_FUNCTION int team_size() const { return m_team_size; }
-
-  KOKKOS_INLINE_FUNCTION void team_barrier() const
-#if !defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST)
-  {
-  }
-#else
-  {
-    m_exec.shepherd_barrier(m_team_size);
-  }
-#endif
-
-  template <typename Type>
-  KOKKOS_INLINE_FUNCTION Type team_broadcast(const Type &value, int rank) const
-#if !defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST)
-  {
-    return Type();
-  }
-#else
-  {
-    return m_exec.template shepherd_broadcast<Type>(value, m_team_size, rank);
-  }
-#endif
-
-  template <typename Type>
-  KOKKOS_INLINE_FUNCTION Type team_reduce(const Type &value) const
-#if !defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST)
-  {
-    return Type();
-  }
-#else
-  {
-    return m_exec.template shepherd_reduce<Type>(m_team_size, value);
-  }
-#endif
-
-  template <typename JoinOp>
-  KOKKOS_INLINE_FUNCTION typename JoinOp::value_type team_reduce(
-      const typename JoinOp::value_type &value, const JoinOp &op) const
-#if !defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST)
-  {
-    return typename JoinOp::value_type();
-  }
-#else
-  {
-    return m_exec.template shepherd_reduce<JoinOp>(m_team_size, value, op);
-  }
-#endif
-
-  /** \brief  Intra-team exclusive prefix sum with team_rank() ordering.
-   *
-   *  The highest rank thread can compute the reduction total as
-   *    reduction_total = dev.team_scan( value ) + value;
-   */
-  template <typename Type>
-  KOKKOS_INLINE_FUNCTION Type team_scan(const Type &value) const
-#if !defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST)
-  {
-    return Type();
-  }
-#else
-  {
-    return m_exec.template shepherd_scan<Type>(m_team_size, value);
-  }
-#endif
-
-  /** \brief  Intra-team exclusive prefix sum with team_rank() ordering
-   *          with intra-team non-deterministic ordering accumulation.
-   *
-   *  The global inter-team accumulation value will, at the end of the league's
-   *  parallel execution, be the scan's total.  Parallel execution ordering of
-   *  the league's teams is non-deterministic.  As such the base value for each
-   *  team's scan operation is similarly non-deterministic.
-   */
-  template <typename Type>
-  KOKKOS_INLINE_FUNCTION Type team_scan(const Type &value,
-                                        Type *const global_accum) const
-#if !defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST)
-  {
-    return Type();
-  }
-#else
-  {
-    return m_exec.template shepherd_scan<Type>(m_team_size, value,
-                                               global_accum);
-  }
-#endif
-
-  //----------------------------------------
-  // Private driver for task-team parallel.
-
-  struct TaskTeam {};
-
-  QthreadsTeamPolicyMember();
-  explicit QthreadsTeamPolicyMember(const TaskTeam &);
-
-  //----------------------------------------
-  // Private for the driver ( for ( member_type i( exec, team ); i;
-  // i.next_team() ) { ... }
-
-  // Initialize.
-  template <class... Properties>
-  QthreadsTeamPolicyMember(
-      Impl::QthreadsExec &exec,
-      const Kokkos::Impl::TeamPolicyInternal<Qthreads, Properties...> &team)
-      : m_exec(exec),
-        m_team_shared(0, 0),
-        m_team_size(team.m_team_size),
-        m_team_rank(exec.shepherd_worker_rank()),
-        m_league_size(team.m_league_size),
-        m_league_end(team.m_league_size -
-                     team.m_shepherd_iter *
-                         (exec.shepherd_size() - (exec.shepherd_rank() + 1))),
-        m_league_rank(m_league_end > team.m_shepherd_iter
-                          ? m_league_end - team.m_shepherd_iter
-                          : 0) {
-    m_exec.shared_reset(m_team_shared);
-  }
-
-  // Continue.
-  operator bool() const { return m_league_rank < m_league_end; }
-
-  // Iterate.
-  void next_team() {
-    ++m_league_rank;
-    m_exec.shared_reset(m_team_shared);
-  }
-};
-
-template <class... Properties>
-class TeamPolicyInternal<Kokkos::Qthreads, Properties...>
-    : public PolicyTraits<Properties...> {
- private:
-  const int m_league_size;
-  const int m_team_size;
-  const int m_shepherd_iter;
-
- public:
-  //! Tag this class as a kokkos execution policy.
-  typedef TeamPolicyInternal execution_policy;
-  typedef Qthreads execution_space;
-  typedef PolicyTraits<Properties...> traits;
-
-  //----------------------------------------
-
-  template <class FunctorType>
-  inline static int team_size_max(const FunctorType &) {
-    return Qthreads::instance().shepherd_worker_size();
-  }
-
-  template <class FunctorType>
-  static int team_size_recommended(const FunctorType &f) {
-    return team_size_max(f);
-  }
-
-  template <class FunctorType>
-  inline static int team_size_recommended(const FunctorType &f, const int &) {
-    return team_size_max(f);
-  }
-
-  //----------------------------------------
-
-  inline int team_size() const { return m_team_size; }
-  inline int league_size() const { return m_league_size; }
-
-  // One active team per shepherd.
-  TeamPolicyInternal(Kokkos::Qthreads &q, const int league_size,
-                     const int team_size, const int /* vector_length */ = 0)
-      : m_league_size(league_size),
-        m_team_size(team_size < q.shepherd_worker_size()
-                        ? team_size
-                        : q.shepherd_worker_size()),
-        m_shepherd_iter((league_size + q.shepherd_size() - 1) /
-                        q.shepherd_size()) {}
-
-  // TODO: Make sure this is correct.
-  // One active team per shepherd.
-  TeamPolicyInternal(Kokkos::Qthreads &q, const int league_size,
-                     const Kokkos::AUTO_t & /* team_size_request */
-                     ,
-                     const int /* vector_length */ = 0)
-      : m_league_size(league_size),
-        m_team_size(q.shepherd_worker_size()),
-        m_shepherd_iter((league_size + q.shepherd_size() - 1) /
-                        q.shepherd_size()) {}
-
-  // One active team per shepherd.
-  TeamPolicyInternal(const int league_size, const int team_size,
-                     const int /* vector_length */ = 0)
-      : m_league_size(league_size),
-        m_team_size(team_size < Qthreads::instance().shepherd_worker_size()
-                        ? team_size
-                        : Qthreads::instance().shepherd_worker_size()),
-        m_shepherd_iter(
-            (league_size + Qthreads::instance().shepherd_size() - 1) /
-            Qthreads::instance().shepherd_size()) {}
-
-  // TODO: Make sure this is correct.
-  // One active team per shepherd.
-  TeamPolicyInternal(const int league_size,
-                     const Kokkos::AUTO_t & /* team_size_request */
-                     ,
-                     const int /* vector_length */ = 0)
-      : m_league_size(league_size),
-        m_team_size(Qthreads::instance().shepherd_worker_size()),
-        m_shepherd_iter(
-            (league_size + Qthreads::instance().shepherd_size() - 1) /
-            Qthreads::instance().shepherd_size()) {}
-
-  // TODO: Doesn't do anything yet.  Fix this.
-  /** \brief set chunk_size to a discrete value*/
-  inline TeamPolicyInternal set_chunk_size(
-      typename traits::index_type chunk_size_) const {
-    TeamPolicyInternal p = *this;
-    //    p.m_chunk_size = chunk_size_;
-    return p;
-  }
-
-  typedef Impl::QthreadsTeamPolicyMember member_type;
-
-  friend class Impl::QthreadsTeamPolicyMember;
-};
-
-}  // namespace Impl
-
-}  // namespace Kokkos
-
-//----------------------------------------------------------------------------
-
-#endif
-#endif  // #define KOKKOS_QTHREADSEXEC_HPP
diff --git a/kokkos/core/src/Qthreads/Kokkos_Qthreads_Parallel.hpp b/kokkos/core/src/Qthreads/Kokkos_Qthreads_Parallel.hpp
deleted file mode 100644
index c9b3787c4..000000000
--- a/kokkos/core/src/Qthreads/Kokkos_Qthreads_Parallel.hpp
+++ /dev/null
@@ -1,753 +0,0 @@
-/*
-//@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
-*/
-
-#ifndef KOKKOS_QTHREADS_PARALLEL_HPP
-#define KOKKOS_QTHREADS_PARALLEL_HPP
-
-#include <Kokkos_Macros.hpp>
-#if defined(KOKKOS_ENABLE_QTHREADS)
-
-#include <vector>
-
-#include <Kokkos_Parallel.hpp>
-
-#include <impl/Kokkos_FunctorAdapter.hpp>
-
-#include <Qthreads/Kokkos_QthreadsExec.hpp>
-
-//----------------------------------------------------------------------------
-
-namespace Kokkos {
-namespace Impl {
-
-//----------------------------------------------------------------------------
-
-template <class FunctorType, class... Traits>
-class ParallelFor<FunctorType, Kokkos::RangePolicy<Traits...>,
-                  Kokkos::Qthreads> {
- private:
-  typedef Kokkos::RangePolicy<Traits...> Policy;
-
-  typedef typename Policy::work_tag WorkTag;
-  typedef typename Policy::member_type Member;
-  typedef typename Policy::WorkRange WorkRange;
-
-  const FunctorType m_functor;
-  const Policy m_policy;
-
-  template <class TagType>
-  inline static
-      typename std::enable_if<std::is_same<TagType, void>::value>::type
-      exec_range(const FunctorType& functor, const Member ibeg,
-                 const Member iend) {
-    for (Member i = ibeg; i < iend; ++i) {
-      functor(i);
-    }
-  }
-
-  template <class TagType>
-  inline static
-      typename std::enable_if<!std::is_same<TagType, void>::value>::type
-      exec_range(const FunctorType& functor, const Member ibeg,
-                 const Member iend) {
-    const TagType t{};
-    for (Member i = ibeg; i < iend; ++i) {
-      functor(t, i);
-    }
-  }
-
-  // Function is called once by every concurrent thread.
-  static void exec(QthreadsExec& exec, const void* arg) {
-    const ParallelFor& self = *((const ParallelFor*)arg);
-
-    const WorkRange range(self.m_policy, exec.worker_rank(),
-                          exec.worker_size());
-
-    ParallelFor::template exec_range<WorkTag>(self.m_functor, range.begin(),
-                                              range.end());
-
-    // All threads wait for completion.
-    exec.exec_all_barrier();
-  }
-
- public:
-  inline void execute() const {
-    Impl::QthreadsExec::exec_all(Qthreads::instance(), &ParallelFor::exec,
-                                 this);
-  }
-
-  ParallelFor(const FunctorType& arg_functor, const Policy& arg_policy)
-      : m_functor(arg_functor), m_policy(arg_policy) {}
-};
-
-//----------------------------------------------------------------------------
-
-template <class FunctorType, class ReducerType, class... Traits>
-class ParallelReduce<FunctorType, Kokkos::RangePolicy<Traits...>, ReducerType,
-                     Kokkos::Qthreads> {
- private:
-  typedef Kokkos::RangePolicy<Traits...> Policy;
-
-  typedef typename Policy::work_tag WorkTag;
-  typedef typename Policy::WorkRange WorkRange;
-  typedef typename Policy::member_type Member;
-
-  typedef Kokkos::Impl::if_c<std::is_same<InvalidType, ReducerType>::value,
-                             FunctorType, ReducerType>
-      ReducerConditional;
-  typedef typename ReducerConditional::type ReducerTypeFwd;
-  typedef
-      typename Kokkos::Impl::if_c<std::is_same<InvalidType, ReducerType>::value,
-                                  WorkTag, void>::type WorkTagFwd;
-
-  // Static Assert WorkTag void if ReducerType not InvalidType
-
-  typedef Kokkos::Impl::FunctorValueTraits<ReducerTypeFwd, WorkTagFwd>
-      ValueTraits;
-  typedef Kokkos::Impl::FunctorValueInit<ReducerTypeFwd, WorkTagFwd> ValueInit;
-
-  typedef typename ValueTraits::pointer_type pointer_type;
-  typedef typename ValueTraits::reference_type reference_type;
-
-  const FunctorType m_functor;
-  const Policy m_policy;
-  const ReducerType m_reducer;
-  const pointer_type m_result_ptr;
-
-  template <class TagType>
-  inline static
-      typename std::enable_if<std::is_same<TagType, void>::value>::type
-      exec_range(const FunctorType& functor, const Member ibeg,
-                 const Member iend, reference_type update) {
-    for (Member i = ibeg; i < iend; ++i) {
-      functor(i, update);
-    }
-  }
-
-  template <class TagType>
-  inline static
-      typename std::enable_if<!std::is_same<TagType, void>::value>::type
-      exec_range(const FunctorType& functor, const Member ibeg,
-                 const Member iend, reference_type update) {
-    const TagType t{};
-    for (Member i = ibeg; i < iend; ++i) {
-      functor(t, i, update);
-    }
-  }
-
-  static void exec(QthreadsExec& exec, const void* arg) {
-    const ParallelReduce& self = *((const ParallelReduce*)arg);
-
-    const WorkRange range(self.m_policy, exec.worker_rank(),
-                          exec.worker_size());
-
-    ParallelReduce::template exec_range<WorkTag>(
-        self.m_functor, range.begin(), range.end(),
-        ValueInit::init(
-            ReducerConditional::select(self.m_functor, self.m_reducer),
-            exec.exec_all_reduce_value()));
-
-    exec.template exec_all_reduce<FunctorType, ReducerType, WorkTag>(
-        self.m_functor, self.m_reducer);
-  }
-
- public:
-  inline void execute() const {
-    QthreadsExec::resize_worker_scratch(
-        ValueTraits::value_size(
-            ReducerConditional::select(m_functor, m_reducer)),
-        0);
-    Impl::QthreadsExec::exec_all(Qthreads::instance(), &ParallelReduce::exec,
-                                 this);
-
-    const pointer_type data =
-        (pointer_type)QthreadsExec::exec_all_reduce_result();
-
-    Kokkos::Impl::FunctorFinal<ReducerTypeFwd, WorkTagFwd>::final(
-        ReducerConditional::select(m_functor, m_reducer), data);
-
-    if (m_result_ptr) {
-      const unsigned n = ValueTraits::value_count(
-          ReducerConditional::select(m_functor, m_reducer));
-      for (unsigned i = 0; i < n; ++i) {
-        m_result_ptr[i] = data[i];
-      }
-    }
-  }
-
-  template <class ViewType>
-  ParallelReduce(
-      const FunctorType& arg_functor, const Policy& arg_policy,
-      const ViewType& arg_result_view,
-      typename std::enable_if<Kokkos::is_view<ViewType>::value &&
-                                  !Kokkos::is_reducer_type<ReducerType>::value,
-                              void*>::type = NULL)
-      : m_functor(arg_functor),
-        m_policy(arg_policy),
-        m_reducer(InvalidType()),
-        m_result_ptr(arg_result_view.data()) {}
-
-  ParallelReduce(const FunctorType& arg_functor, Policy arg_policy,
-                 const ReducerType& reducer)
-      : m_functor(arg_functor),
-        m_policy(arg_policy),
-        m_reducer(reducer),
-        m_result_ptr(reducer.result_view().data()) {}
-};
-
-//----------------------------------------------------------------------------
-
-template <class FunctorType, class... Properties>
-class ParallelFor<FunctorType, TeamPolicy<Properties...>, Kokkos::Qthreads> {
- private:
-  typedef Kokkos::Impl::TeamPolicyInternal<Kokkos::Qthreads, Properties...>
-      Policy;
-  typedef typename Policy::member_type Member;
-  typedef typename Policy::work_tag WorkTag;
-
-  const FunctorType m_functor;
-  const Policy m_policy;
-
-  template <class TagType>
-  inline static
-      typename std::enable_if<std::is_same<TagType, void>::value>::type
-      exec_team(const FunctorType& functor, Member member) {
-    while (member) {
-      functor(member);
-      member.team_barrier();
-      member.next_team();
-    }
-  }
-
-  template <class TagType>
-  inline static
-      typename std::enable_if<!std::is_same<TagType, void>::value>::type
-      exec_team(const FunctorType& functor, Member member) {
-    const TagType t{};
-    while (member) {
-      functor(t, member);
-      member.team_barrier();
-      member.next_team();
-    }
-  }
-
-  static void exec(QthreadsExec& exec, const void* arg) {
-    const ParallelFor& self = *((const ParallelFor*)arg);
-
-    ParallelFor::template exec_team<WorkTag>(self.m_functor,
-                                             Member(exec, self.m_policy));
-
-    exec.exec_all_barrier();
-  }
-
- public:
-  inline void execute() const {
-    QthreadsExec::resize_worker_scratch(
-        /* reduction   memory */ 0,
-        /* team shared memory */ FunctorTeamShmemSize<FunctorType>::value(
-            m_functor, m_policy.team_size()));
-    Impl::QthreadsExec::exec_all(Qthreads::instance(), &ParallelFor::exec,
-                                 this);
-  }
-
-  ParallelFor(const FunctorType& arg_functor, const Policy& arg_policy)
-      : m_functor(arg_functor), m_policy(arg_policy) {}
-};
-
-//----------------------------------------------------------------------------
-
-template <class FunctorType, class ReducerType, class... Properties>
-class ParallelReduce<FunctorType, TeamPolicy<Properties...>, ReducerType,
-                     Kokkos::Qthreads> {
- private:
-  typedef Kokkos::Impl::TeamPolicyInternal<Kokkos::Qthreads, Properties...>
-      Policy;
-
-  typedef typename Policy::work_tag WorkTag;
-  typedef typename Policy::member_type Member;
-
-  typedef Kokkos::Impl::if_c<std::is_same<InvalidType, ReducerType>::value,
-                             FunctorType, ReducerType>
-      ReducerConditional;
-  typedef typename ReducerConditional::type ReducerTypeFwd;
-  typedef
-      typename Kokkos::Impl::if_c<std::is_same<InvalidType, ReducerType>::value,
-                                  WorkTag, void>::type WorkTagFwd;
-
-  typedef Kokkos::Impl::FunctorValueTraits<ReducerTypeFwd, WorkTagFwd>
-      ValueTraits;
-  typedef Kokkos::Impl::FunctorValueInit<ReducerTypeFwd, WorkTagFwd> ValueInit;
-
-  typedef typename ValueTraits::pointer_type pointer_type;
-  typedef typename ValueTraits::reference_type reference_type;
-
-  const FunctorType m_functor;
-  const Policy m_policy;
-  const ReducerType m_reducer;
-  const pointer_type m_result_ptr;
-
-  template <class TagType>
-  inline static
-      typename std::enable_if<std::is_same<TagType, void>::value>::type
-      exec_team(const FunctorType& functor, Member member,
-                reference_type update) {
-    while (member) {
-      functor(member, update);
-      member.team_barrier();
-      member.next_team();
-    }
-  }
-
-  template <class TagType>
-  inline static
-      typename std::enable_if<!std::is_same<TagType, void>::value>::type
-      exec_team(const FunctorType& functor, Member member,
-                reference_type update) {
-    const TagType t{};
-    while (member) {
-      functor(t, member, update);
-      member.team_barrier();
-      member.next_team();
-    }
-  }
-
-  static void exec(QthreadsExec& exec, const void* arg) {
-    const ParallelReduce& self = *((const ParallelReduce*)arg);
-
-    ParallelReduce::template exec_team<WorkTag>(
-        self.m_functor, Member(exec, self.m_policy),
-        ValueInit::init(
-            ReducerConditional::select(self.m_functor, self.m_reducer),
-            exec.exec_all_reduce_value()));
-
-    exec.template exec_all_reduce<FunctorType, ReducerType, WorkTag>(
-        self.m_functor, self.m_reducer);
-  }
-
- public:
-  inline void execute() const {
-    QthreadsExec::resize_worker_scratch(
-        /* reduction   memory */ ValueTraits::value_size(
-            ReducerConditional::select(m_functor, m_reducer)),
-        /* team shared memory */ FunctorTeamShmemSize<FunctorType>::value(
-            m_functor, m_policy.team_size()));
-
-    Impl::QthreadsExec::exec_all(Qthreads::instance(), &ParallelReduce::exec,
-                                 this);
-
-    const pointer_type data =
-        (pointer_type)QthreadsExec::exec_all_reduce_result();
-
-    Kokkos::Impl::FunctorFinal<ReducerTypeFwd, WorkTagFwd>::final(
-        ReducerConditional::select(m_functor, m_reducer), data);
-
-    if (m_result_ptr) {
-      const unsigned n = ValueTraits::value_count(
-          ReducerConditional::select(m_functor, m_reducer));
-      for (unsigned i = 0; i < n; ++i) {
-        m_result_ptr[i] = data[i];
-      }
-    }
-  }
-
-  template <class ViewType>
-  ParallelReduce(
-      const FunctorType& arg_functor, const Policy& arg_policy,
-      const ViewType& arg_result,
-      typename std::enable_if<Kokkos::is_view<ViewType>::value &&
-                                  !Kokkos::is_reducer_type<ReducerType>::value,
-                              void*>::type = NULL)
-      : m_functor(arg_functor),
-        m_policy(arg_policy),
-        m_reducer(InvalidType()),
-        m_result_ptr(arg_result.ptr_on_device()) {}
-
-  inline ParallelReduce(const FunctorType& arg_functor, Policy arg_policy,
-                        const ReducerType& reducer)
-      : m_functor(arg_functor),
-        m_policy(arg_policy),
-        m_reducer(reducer),
-        m_result_ptr(reducer.result_view().data()) {}
-};
-
-//----------------------------------------------------------------------------
-//----------------------------------------------------------------------------
-
-template <class FunctorType, class... Traits>
-class ParallelScan<FunctorType, Kokkos::RangePolicy<Traits...>,
-                   Kokkos::Qthreads> {
- private:
-  typedef Kokkos::RangePolicy<Traits...> Policy;
-
-  typedef typename Policy::work_tag WorkTag;
-  typedef typename Policy::WorkRange WorkRange;
-  typedef typename Policy::member_type Member;
-
-  typedef Kokkos::Impl::FunctorValueTraits<FunctorType, WorkTag> ValueTraits;
-  typedef Kokkos::Impl::FunctorValueInit<FunctorType, WorkTag> ValueInit;
-
-  typedef typename ValueTraits::pointer_type pointer_type;
-  typedef typename ValueTraits::reference_type reference_type;
-
-  const FunctorType m_functor;
-  const Policy m_policy;
-
-  template <class TagType>
-  inline static
-      typename std::enable_if<std::is_same<TagType, void>::value>::type
-      exec_range(const FunctorType& functor, const Member ibeg,
-                 const Member iend, reference_type update, const bool final) {
-    for (Member i = ibeg; i < iend; ++i) {
-      functor(i, update, final);
-    }
-  }
-
-  template <class TagType>
-  inline static
-      typename std::enable_if<!std::is_same<TagType, void>::value>::type
-      exec_range(const FunctorType& functor, const Member ibeg,
-                 const Member iend, reference_type update, const bool final) {
-    const TagType t{};
-    for (Member i = ibeg; i < iend; ++i) {
-      functor(t, i, update, final);
-    }
-  }
-
-  static void exec(QthreadsExec& exec, const void* arg) {
-    const ParallelScan& self = *((const ParallelScan*)arg);
-
-    const WorkRange range(self.m_policy, exec.worker_rank(),
-                          exec.worker_size());
-
-    // Initialize thread-local value
-    reference_type update =
-        ValueInit::init(self.m_functor, exec.exec_all_reduce_value());
-
-    ParallelScan::template exec_range<WorkTag>(self.m_functor, range.begin(),
-                                               range.end(), update, false);
-
-    exec.template exec_all_scan<FunctorType, typename Policy::work_tag>(
-        self.m_functor);
-
-    ParallelScan::template exec_range<WorkTag>(self.m_functor, range.begin(),
-                                               range.end(), update, true);
-
-    exec.exec_all_barrier();
-  }
-
- public:
-  inline void execute() const {
-    QthreadsExec::resize_worker_scratch(ValueTraits::value_size(m_functor), 0);
-    Impl::QthreadsExec::exec_all(Qthreads::instance(), &ParallelScan::exec,
-                                 this);
-  }
-
-  ParallelScan(const FunctorType& arg_functor, const Policy& arg_policy)
-      : m_functor(arg_functor), m_policy(arg_policy) {}
-};
-
-}  // namespace Impl
-
-}  // namespace Kokkos
-
-//----------------------------------------------------------------------------
-//----------------------------------------------------------------------------
-
-namespace Kokkos {
-
-template <typename iType>
-KOKKOS_INLINE_FUNCTION
-    Impl::TeamThreadRangeBoundariesStruct<iType, Impl::QthreadsTeamPolicyMember>
-    TeamThreadRange(const Impl::QthreadsTeamPolicyMember& thread,
-                    const iType& count) {
-  return Impl::TeamThreadRangeBoundariesStruct<iType,
-                                               Impl::QthreadsTeamPolicyMember>(
-      thread, count);
-}
-
-template <typename iType1, typename iType2>
-KOKKOS_INLINE_FUNCTION Impl::TeamThreadRangeBoundariesStruct<
-    typename std::common_type<iType1, iType2>::type,
-    Impl::QthreadsTeamPolicyMember>
-TeamThreadRange(const Impl::QthreadsTeamPolicyMember& thread,
-                const iType1& begin, const iType2& end) {
-  typedef typename std::common_type<iType1, iType2>::type iType;
-  return Impl::TeamThreadRangeBoundariesStruct<iType,
-                                               Impl::QthreadsTeamPolicyMember>(
-      thread, iType(begin), iType(end));
-}
-
-template <typename iType>
-KOKKOS_INLINE_FUNCTION Impl::ThreadVectorRangeBoundariesStruct<
-    iType, Impl::QthreadsTeamPolicyMember>
-ThreadVectorRange(const Impl::QthreadsTeamPolicyMember& thread,
-                  const iType& count) {
-  return Impl::ThreadVectorRangeBoundariesStruct<
-      iType, Impl::QthreadsTeamPolicyMember>(thread, count);
-}
-
-template <typename iType>
-KOKKOS_INLINE_FUNCTION Impl::ThreadVectorRangeBoundariesStruct<
-    iType, Impl::QthreadsTeamPolicyMember>
-ThreadVectorRange(const Impl::QthreadsTeamPolicyMember& thread,
-                  const iType& arg_begin, const iType& arg_end) {
-  return Impl::ThreadVectorRangeBoundariesStruct<
-      iType, Impl::QthreadsTeamPolicyMember>(thread, arg_begin, arg_end);
-}
-
-KOKKOS_INLINE_FUNCTION
-Impl::ThreadSingleStruct<Impl::QthreadsTeamPolicyMember> PerTeam(
-    const Impl::QthreadsTeamPolicyMember& thread) {
-  return Impl::ThreadSingleStruct<Impl::QthreadsTeamPolicyMember>(thread);
-}
-
-KOKKOS_INLINE_FUNCTION
-Impl::VectorSingleStruct<Impl::QthreadsTeamPolicyMember> PerThread(
-    const Impl::QthreadsTeamPolicyMember& thread) {
-  return Impl::VectorSingleStruct<Impl::QthreadsTeamPolicyMember>(thread);
-}
-
-/** \brief  Inter-thread parallel_for. Executes lambda(iType i) for each
- * i=0..N-1.
- *
- * The range i=0..N-1 is mapped to all threads of the the calling thread team.
- * This functionality requires C++11 support.*/
-template <typename iType, class Lambda>
-KOKKOS_INLINE_FUNCTION void parallel_for(
-    const Impl::TeamThreadRangeBoundariesStruct<
-        iType, Impl::QthreadsTeamPolicyMember>& loop_boundaries,
-    const Lambda& lambda) {
-  for (iType i = loop_boundaries.start; i < loop_boundaries.end;
-       i += loop_boundaries.increment)
-    lambda(i);
-}
-
-/** \brief  Inter-thread vector parallel_reduce. Executes lambda(iType i,
- * ValueType & val) for each i=0..N-1.
- *
- * The range i=0..N-1 is mapped to all threads of the the calling thread team
- * and a summation of val is performed and put into result. This functionality
- * requires C++11 support.*/
-template <typename iType, class Lambda, typename ValueType>
-KOKKOS_INLINE_FUNCTION void parallel_reduce(
-    const Impl::TeamThreadRangeBoundariesStruct<
-        iType, Impl::QthreadsTeamPolicyMember>& loop_boundaries,
-    const Lambda& lambda, ValueType& result) {
-  result = ValueType();
-
-  for (iType i = loop_boundaries.start; i < loop_boundaries.end;
-       i += loop_boundaries.increment) {
-    ValueType tmp = ValueType();
-    lambda(i, tmp);
-    result += tmp;
-  }
-
-  result =
-      loop_boundaries.thread.team_reduce(result, Impl::JoinAdd<ValueType>());
-}
-
-/** \brief  Intra-thread vector parallel_reduce. Executes lambda(iType i,
- * ValueType & val) for each i=0..N-1.
- *
- * The range i=0..N-1 is mapped to all vector lanes of the the calling thread
- * and a reduction of val is performed using JoinType(ValueType& val, const
- * ValueType& update) and put into init_result. The input value of init_result
- * is used as initializer for temporary variables of ValueType. Therefore the
- * input value should be the neutral element with respect to the join operation
- * (e.g. '0 for +-' or '1 for *'). This functionality requires C++11 support.*/
-template <typename iType, class Lambda, typename ValueType, class JoinType>
-KOKKOS_INLINE_FUNCTION void parallel_reduce(
-    const Impl::TeamThreadRangeBoundariesStruct<
-        iType, Impl::QthreadsTeamPolicyMember>& loop_boundaries,
-    const Lambda& lambda, const JoinType& join, ValueType& init_result) {
-  ValueType result = init_result;
-
-  for (iType i = loop_boundaries.start; i < loop_boundaries.end;
-       i += loop_boundaries.increment) {
-    ValueType tmp = ValueType();
-    lambda(i, tmp);
-    join(result, tmp);
-  }
-
-  init_result = loop_boundaries.thread.team_reduce(
-      result, Impl::JoinLambdaAdapter<ValueType, JoinType>(join));
-}
-
-/** \brief  Intra-thread vector parallel_for. Executes lambda(iType i) for each
- * i=0..N-1.
- *
- * The range i=0..N-1 is mapped to all vector lanes of the the calling thread.
- * This functionality requires C++11 support.*/
-template <typename iType, class Lambda>
-KOKKOS_INLINE_FUNCTION void parallel_for(
-    const Impl::ThreadVectorRangeBoundariesStruct<
-        iType, Impl::QthreadsTeamPolicyMember>& loop_boundaries,
-    const Lambda& lambda) {
-#ifdef KOKKOS_ENABLE_PRAGMA_IVDEP
-#pragma ivdep
-#endif
-  for (iType i = loop_boundaries.start; i < loop_boundaries.end;
-       i += loop_boundaries.increment)
-    lambda(i);
-}
-
-/** \brief  Intra-thread vector parallel_reduce. Executes lambda(iType i,
- * ValueType & val) for each i=0..N-1.
- *
- * The range i=0..N-1 is mapped to all vector lanes of the the calling thread
- * and a summation of val is performed and put into result. This functionality
- * requires C++11 support.*/
-template <typename iType, class Lambda, typename ValueType>
-KOKKOS_INLINE_FUNCTION void parallel_reduce(
-    const Impl::ThreadVectorRangeBoundariesStruct<
-        iType, Impl::QthreadsTeamPolicyMember>& loop_boundaries,
-    const Lambda& lambda, ValueType& result) {
-  result = ValueType();
-#ifdef KOKKOS_ENABLE_PRAGMA_IVDEP
-#pragma ivdep
-#endif
-  for (iType i = loop_boundaries.start; i < loop_boundaries.end;
-       i += loop_boundaries.increment) {
-    ValueType tmp = ValueType();
-    lambda(i, tmp);
-    result += tmp;
-  }
-}
-
-/** \brief  Intra-thread vector parallel_reduce. Executes lambda(iType i,
- * ValueType & val) for each i=0..N-1.
- *
- * The range i=0..N-1 is mapped to all vector lanes of the the calling thread
- * and a reduction of val is performed using JoinType(ValueType& val, const
- * ValueType& update) and put into init_result. The input value of init_result
- * is used as initializer for temporary variables of ValueType. Therefore the
- * input value should be the neutral element with respect to the join operation
- * (e.g. '0 for +-' or '1 for *'). This functionality requires C++11 support.*/
-template <typename iType, class Lambda, typename ValueType, class JoinType>
-KOKKOS_INLINE_FUNCTION void parallel_reduce(
-    const Impl::ThreadVectorRangeBoundariesStruct<
-        iType, Impl::QthreadsTeamPolicyMember>& loop_boundaries,
-    const Lambda& lambda, const JoinType& join, ValueType& init_result) {
-  ValueType result = init_result;
-#ifdef KOKKOS_ENABLE_PRAGMA_IVDEP
-#pragma ivdep
-#endif
-  for (iType i = loop_boundaries.start; i < loop_boundaries.end;
-       i += loop_boundaries.increment) {
-    ValueType tmp = ValueType();
-    lambda(i, tmp);
-    join(result, tmp);
-  }
-  init_result = result;
-}
-
-/** \brief  Intra-thread vector parallel exclusive prefix sum. Executes
- * lambda(iType i, ValueType & val, bool final) for each i=0..N-1.
- *
- * The range i=0..N-1 is mapped to all vector lanes in the thread and a scan
- * operation is performed. Depending on the target execution space the operator
- * might be called twice: once with final=false and once with final=true. When
- * final==true val contains the prefix sum value. The contribution of this "i"
- * needs to be added to val no matter whether final==true or not. In a serial
- * execution (i.e. team_size==1) the operator is only called once with
- * final==true. Scan_val will be set to the final sum value over all vector
- * lanes. This functionality requires C++11 support.*/
-template <typename iType, class FunctorType>
-KOKKOS_INLINE_FUNCTION void parallel_scan(
-    const Impl::ThreadVectorRangeBoundariesStruct<
-        iType, Impl::QthreadsTeamPolicyMember>& loop_boundaries,
-    const FunctorType& lambda) {
-  typedef Kokkos::Impl::FunctorValueTraits<FunctorType, void> ValueTraits;
-  typedef typename ValueTraits::value_type value_type;
-
-  value_type scan_val = value_type();
-
-#ifdef KOKKOS_ENABLE_PRAGMA_IVDEP
-#pragma ivdep
-#endif
-  for (iType i = loop_boundaries.start; i < loop_boundaries.end;
-       i += loop_boundaries.increment) {
-    lambda(i, scan_val, true);
-  }
-}
-
-template <class FunctorType>
-KOKKOS_INLINE_FUNCTION void single(
-    const Impl::VectorSingleStruct<Impl::QthreadsTeamPolicyMember>&
-        single_struct,
-    const FunctorType& lambda) {
-  lambda();
-}
-
-template <class FunctorType>
-KOKKOS_INLINE_FUNCTION void single(
-    const Impl::ThreadSingleStruct<Impl::QthreadsTeamPolicyMember>&
-        single_struct,
-    const FunctorType& lambda) {
-  if (single_struct.team_member.team_rank() == 0) lambda();
-}
-
-template <class FunctorType, class ValueType>
-KOKKOS_INLINE_FUNCTION void single(
-    const Impl::VectorSingleStruct<Impl::QthreadsTeamPolicyMember>&
-        single_struct,
-    const FunctorType& lambda, ValueType& val) {
-  lambda(val);
-}
-
-template <class FunctorType, class ValueType>
-KOKKOS_INLINE_FUNCTION void single(
-    const Impl::ThreadSingleStruct<Impl::QthreadsTeamPolicyMember>&
-        single_struct,
-    const FunctorType& lambda, ValueType& val) {
-  if (single_struct.team_member.team_rank() == 0) {
-    lambda(val);
-  }
-  single_struct.team_member.team_broadcast(val, 0);
-}
-
-}  // namespace Kokkos
-
-#endif
-#endif /* #define KOKKOS_QTHREADS_PARALLEL_HPP */
diff --git a/kokkos/core/src/Qthreads/Kokkos_Qthreads_Task.cpp b/kokkos/core/src/Qthreads/Kokkos_Qthreads_Task.cpp
deleted file mode 100644
index bb037353b..000000000
--- a/kokkos/core/src/Qthreads/Kokkos_Qthreads_Task.cpp
+++ /dev/null
@@ -1,308 +0,0 @@
-/*
-//@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
-*/
-
-#include <Kokkos_Macros.hpp>
-#if defined(KOKKOS_ENABLE_QTHREADS) && defined(KOKKOS_ENABLE_TASKPOLICY)
-
-#include <Kokkos_Core.hpp>
-#include <impl/Kokkos_TaskQueue_impl.hpp>
-
-//----------------------------------------------------------------------------
-//----------------------------------------------------------------------------
-
-namespace Kokkos {
-namespace Impl {
-
-template class TaskQueue<Kokkos::Qthreads>;
-
-//----------------------------------------------------------------------------
-
-TaskExec<Kokkos::Qthreads>::TaskExec()
-    : m_self_exec(0),
-      m_team_exec(0),
-      m_sync_mask(0),
-      m_sync_value(0),
-      m_sync_step(0),
-      m_group_rank(0),
-      m_team_rank(0),
-      m_team_size(1) {}
-
-TaskExec<Kokkos::Qthreads>::TaskExec(Kokkos::Impl::QthreadsExec &arg_exec,
-                                     int const arg_team_size)
-    : m_self_exec(&arg_exec),
-      m_team_exec(arg_exec.pool_rev(arg_exec.pool_rank_rev() / arg_team_size)),
-      m_sync_mask(0),
-      m_sync_value(0),
-      m_sync_step(0),
-      m_group_rank(arg_exec.pool_rank_rev() / arg_team_size),
-      m_team_rank(arg_exec.pool_rank_rev() % arg_team_size),
-      m_team_size(arg_team_size) {
-  // This team spans
-  //    m_self_exec->pool_rev( team_size * group_rank )
-  //    m_self_exec->pool_rev( team_size * ( group_rank + 1 ) - 1 )
-
-  int64_t volatile *const sync = (int64_t *)m_self_exec->scratch_reduce();
-
-  sync[0] = int64_t(0);
-  sync[1] = int64_t(0);
-
-  for (int i = 0; i < m_team_size; ++i) {
-    m_sync_value |= int64_t(1) << (8 * i);
-    m_sync_mask |= int64_t(3) << (8 * i);
-  }
-
-  Kokkos::memory_fence();
-}
-
-#if defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST)
-
-void TaskExec<Kokkos::Qthreads>::team_barrier() const {
-  if (1 < m_team_size) {
-    if (m_team_exec->scratch_reduce_size() < int(2 * sizeof(int64_t))) {
-      Kokkos::abort("TaskQueue<Qthreads> scratch_reduce memory too small");
-    }
-
-    // Use team shared memory to synchronize.
-    // Alternate memory locations between barriers to avoid a sequence
-    // of barriers overtaking one another.
-
-    int64_t volatile *const sync =
-        ((int64_t *)m_team_exec->scratch_reduce()) + (m_sync_step & 0x01);
-
-    // This team member sets one byte within the sync variable
-    int8_t volatile *const sync_self = ((int8_t *)sync) + m_team_rank;
-
-#if 0
-fprintf( stdout,
-         "barrier group(%d) member(%d) step(%d) wait(%lx) : before(%lx)\n",
-         m_group_rank,
-         m_team_rank,
-         m_sync_step,
-         m_sync_value,
-         *sync
-       );
-fflush(stdout);
-#endif
-
-    *sync_self = int8_t(m_sync_value & 0x03);  // signal arrival
-
-    while (m_sync_value != *sync)
-      ;  // wait for team to arrive
-
-#if 0
-fprintf( stdout,
-         "barrier group(%d) member(%d) step(%d) wait(%lx) : after(%lx)\n",
-         m_group_rank,
-         m_team_rank,
-         m_sync_step,
-         m_sync_value,
-         *sync
-       );
-fflush(stdout);
-#endif
-
-    ++m_sync_step;
-
-    if (0 == (0x01 & m_sync_step)) {  // Every other step
-      m_sync_value ^= m_sync_mask;
-      if (1000 < m_sync_step) m_sync_step = 0;
-    }
-  }
-}
-
-#endif
-
-//----------------------------------------------------------------------------
-
-void TaskQueueSpecialization<Kokkos::Qthreads>::execute(
-    TaskQueue<Kokkos::Qthreads> *const queue) {
-  using execution_space = Kokkos::Qthreads;
-  using queue_type      = TaskQueue<execution_space>;
-  using task_root_type  = TaskBase<execution_space, void, void>;
-  using PoolExec        = Kokkos::Impl::QthreadsExec;
-  using Member          = TaskExec<execution_space>;
-
-  task_root_type *const end = (task_root_type *)task_root_type::EndTag;
-
-  // Required:  team_size <= 8
-
-  const int team_size = PoolExec::pool_size(2);  // Threads per core
-  // const int team_size = PoolExec::pool_size(1); // Threads per NUMA
-
-  if (8 < team_size) {
-    Kokkos::abort("TaskQueue<Qthreads> unsupported team size");
-  }
-
-#pragma omp parallel
-  {
-    PoolExec &self = *PoolExec::get_thread_omp();
-
-    Member single_exec;
-    Member team_exec(self, team_size);
-
-    // Team shared memory
-    task_root_type *volatile *const task_shared =
-        (task_root_type **)team_exec.m_team_exec->scratch_thread();
-
-// Barrier across entire Qthreads thread pool to insure initialization
-#pragma omp barrier
-
-    // Loop until all queues are empty and no tasks in flight
-
-    do {
-      // Each team lead attempts to acquire either a thread team task
-      // or collection of single thread tasks for the team.
-
-      if (0 == team_exec.team_rank()) {
-        task_root_type *tmp =
-            0 < *((volatile int *)&queue->m_ready_count) ? end : 0;
-
-        // Loop by priority and then type
-        for (int i = 0; i < queue_type::NumQueue && end == tmp; ++i) {
-          for (int j = 0; j < 2 && end == tmp; ++j) {
-            tmp = queue_type::pop_task(&queue->m_ready[i][j]);
-          }
-        }
-
-        *task_shared = tmp;
-
-        // Fence to be sure shared_task_array is stored
-        Kokkos::memory_fence();
-      }
-
-      // Whole team waits for every team member to reach this statement
-      team_exec.team_barrier();
-
-      Kokkos::memory_fence();
-
-      task_root_type *const task = *task_shared;
-
-#if 0
-fprintf( stdout,
-         "\nexecute group(%d) member(%d) task_shared(0x%lx) task(0x%lx)\n",
-         team_exec.m_group_rank,
-         team_exec.m_team_rank,
-         uintptr_t(task_shared),
-         uintptr_t(task)
-       );
-fflush(stdout);
-#endif
-
-      if (0 == task) break;  // 0 == m_ready_count
-
-      if (end == task) {
-        team_exec.team_barrier();
-      } else if (task_root_type::TaskTeam == task->m_task_type) {
-        // Thread Team Task
-        (*task->m_apply)(task, &team_exec);
-
-        // The m_apply function performs a barrier
-
-        if (0 == team_exec.team_rank()) {
-          // team member #0 completes the task, which may delete the task
-          queue->complete(task);
-        }
-      } else {
-        // Single Thread Task
-
-        if (0 == team_exec.team_rank()) {
-          (*task->m_apply)(task, &single_exec);
-
-          queue->complete(task);
-        }
-
-        // All team members wait for whole team to reach this statement.
-        // Not necessary to complete the task.
-        // Is necessary to prevent task_shared from being updated
-        // before it is read by all threads.
-        team_exec.team_barrier();
-      }
-    } while (1);
-  }
-  // END #pragma omp parallel
-}
-
-void TaskQueueSpecialization<Kokkos::Qthreads>::
-    iff_single_thread_recursive_execute(
-        TaskQueue<Kokkos::Qthreads> *const queue) {
-  using execution_space = Kokkos::Qthreads;
-  using queue_type      = TaskQueue<execution_space>;
-  using task_root_type  = TaskBase<execution_space, void, void>;
-  using Member          = TaskExec<execution_space>;
-
-  if (1 == omp_get_num_threads()) {
-    task_root_type *const end = (task_root_type *)task_root_type::EndTag;
-
-    Member single_exec;
-
-    task_root_type *task = end;
-
-    do {
-      task = end;
-
-      // Loop by priority and then type
-      for (int i = 0; i < queue_type::NumQueue && end == task; ++i) {
-        for (int j = 0; j < 2 && end == task; ++j) {
-          task = queue_type::pop_task(&queue->m_ready[i][j]);
-        }
-      }
-
-      if (end == task) break;
-
-      (*task->m_apply)(task, &single_exec);
-
-      queue->complete(task);
-
-    } while (1);
-  }
-}
-
-}  // namespace Impl
-}  // namespace Kokkos
-
-//----------------------------------------------------------------------------
-#else
-void KOKKOS_SRC_QTHREADS_TASK_PREVENT_LINK_ERROR() {}
-#endif /* #if defined( KOKKOS_ENABLE_QTHREADS ) && defined( \
-          KOKKOS_ENABLE_TASKPOLICY ) */
diff --git a/kokkos/core/src/Qthreads/Kokkos_Qthreads_Task.hpp b/kokkos/core/src/Qthreads/Kokkos_Qthreads_Task.hpp
deleted file mode 100644
index 345664dd8..000000000
--- a/kokkos/core/src/Qthreads/Kokkos_Qthreads_Task.hpp
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
-//@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
-*/
-
-#ifndef KOKKOS_IMPL_QTHREADS_TASK_HPP
-#define KOKKOS_IMPL_QTHREADS_TASK_HPP
-
-#include <Kokkos_Macros.hpp>
-#if defined(KOKKOS_ENABLE_QTHREADS) && defined(KOKKOS_ENABLE_TASKPOLICY)
-
-//----------------------------------------------------------------------------
-//----------------------------------------------------------------------------
-
-namespace Kokkos {
-namespace Impl {
-
-template <>
-class TaskQueueSpecialization<Kokkos::Qthreads> {
- public:
-  using execution_space = Kokkos::Qthreads;
-  using queue_type      = Kokkos::Impl::TaskQueue<execution_space>;
-  using task_base_type  = Kokkos::Impl::TaskBase<execution_space, void, void>;
-
-  // Must specify memory space
-  using memory_space = Kokkos::HostSpace;
-
-  static void iff_single_thread_recursive_execute(queue_type* const);
-
-  // Must provide task queue execution function
-  static void execute(queue_type* const);
-
-  // Must provide mechanism to set function pointer in
-  // execution space from the host process.
-  template <typename FunctorType>
-  static void proc_set_apply(task_base_type::function_type* ptr) {
-    using TaskType = TaskBase<execution_space, typename FunctorType::value_type,
-                              FunctorType>;
-    *ptr           = TaskType::apply;
-  }
-};
-
-extern template class TaskQueue<Kokkos::Qthreads>;
-
-//----------------------------------------------------------------------------
-
-template <>
-class TaskExec<Kokkos::Qthreads> {
- private:
-  TaskExec(TaskExec&&)      = delete;
-  TaskExec(TaskExec const&) = delete;
-  TaskExec& operator=(TaskExec&&) = delete;
-  TaskExec& operator=(TaskExec const&) = delete;
-
-  using PoolExec = Kokkos::Impl::QthreadsExec;
-
-  friend class Kokkos::Impl::TaskQueue<Kokkos::Qthreads>;
-  friend class Kokkos::Impl::TaskQueueSpecialization<Kokkos::Qthreads>;
-
-  PoolExec* const m_self_exec;  ///< This thread's thread pool data structure
-  PoolExec* const m_team_exec;  ///< Team thread's thread pool data structure
-  int64_t m_sync_mask;
-  int64_t mutable m_sync_value;
-  int mutable m_sync_step;
-  int m_group_rank;  ///< Which "team" subset of thread pool
-  int m_team_rank;   ///< Which thread within a team
-  int m_team_size;
-
-  TaskExec();
-  TaskExec(PoolExec& arg_exec, int arg_team_size);
-
- public:
-#if defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST)
-  void* team_shared() const {
-    return m_team_exec ? m_team_exec->scratch_thread() : (void*)0;
-  }
-
-  int team_shared_size() const {
-    return m_team_exec ? m_team_exec->scratch_thread_size() : 0;
-  }
-
-  /**\brief  Whole team enters this function call
-   *         before any teeam member returns from
-   *         this function call.
-   */
-  void team_barrier() const;
-#else
-  KOKKOS_INLINE_FUNCTION void team_barrier() const {}
-  KOKKOS_INLINE_FUNCTION void* team_shared() const { return 0; }
-  KOKKOS_INLINE_FUNCTION int team_shared_size() const { return 0; }
-#endif
-
-  KOKKOS_INLINE_FUNCTION
-  int team_rank() const { return m_team_rank; }
-
-  KOKKOS_INLINE_FUNCTION
-  int team_size() const { return m_team_size; }
-};
-
-}  // namespace Impl
-}  // namespace Kokkos
-
-//----------------------------------------------------------------------------
-//----------------------------------------------------------------------------
-
-//----------------------------------------------------------------------------
-//----------------------------------------------------------------------------
-
-#endif /* #if defined( KOKKOS_ENABLE_TASKPOLICY ) */
-#endif /* #ifndef KOKKOS_IMPL_QTHREADS_TASK_HPP */
diff --git a/kokkos/core/src/Qthreads/Kokkos_Qthreads_TaskPolicy.cpp.old b/kokkos/core/src/Qthreads/Kokkos_Qthreads_TaskPolicy.cpp.old
deleted file mode 100644
index a59afb288..000000000
--- a/kokkos/core/src/Qthreads/Kokkos_Qthreads_TaskPolicy.cpp.old
+++ /dev/null
@@ -1,493 +0,0 @@
-/*
-//@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  H. Carter Edwards (hcedwar@sandia.gov)
-//
-// ************************************************************************
-//@HEADER
-*/
-
-// Experimental unified task-data parallel manycore LDRD.
-
-
-#include <Kokkos_Macros.hpp>
-#if defined( KOKKOS_ENABLE_QTHREADS )
-
-#include <Kokkos_Core_fwd.hpp>
-
-#include <cstdio>
-#include <cstdlib>
-
-#include <stdexcept>
-#include <iostream>
-#include <sstream>
-#include <string>
-
-#include <Kokkos_Atomic.hpp>
-#include <Qthreads/Kokkos_Qthreads_TaskPolicy.hpp>
-
-#if defined( KOKKOS_ENABLE_TASKDAG )
-
-namespace Kokkos {
-namespace Experimental {
-namespace Impl {
-
-typedef TaskMember< Kokkos::Qthreads , void , void > Task ;
-
-namespace {
-
-inline
-unsigned padded_sizeof_derived( unsigned sizeof_derived )
-{
-  return sizeof_derived +
-    ( sizeof_derived % sizeof(Task*) ? sizeof(Task*) - sizeof_derived % sizeof(Task*) : 0 );
-}
-
-// int lock_alloc_dealloc = 0 ;
-
-} // namespace
-
-void Task::deallocate( void * ptr )
-{
-  // Counting on 'free' thread safety so lock/unlock not required.
-  // However, isolate calls here to mitigate future need to introduce lock/unlock.
-
-  // lock
-
-  // while ( ! Kokkos::atomic_compare_exchange_strong( & lock_alloc_dealloc , 0 , 1 ) );
-
-  free( ptr );
-
-  // unlock
-
-  // Kokkos::atomic_compare_exchange_strong( & lock_alloc_dealloc , 1 , 0 );
-}
-
-void * Task::allocate( const unsigned arg_sizeof_derived
-                     , const unsigned arg_dependence_capacity )
-{
-  // Counting on 'malloc' thread safety so lock/unlock not required.
-  // However, isolate calls here to mitigate future need to introduce lock/unlock.
-
-  // lock
-
-  // while ( ! Kokkos::atomic_compare_exchange_strong( & lock_alloc_dealloc , 0 , 1 ) );
-
-  void * const ptr = malloc( padded_sizeof_derived( arg_sizeof_derived ) + arg_dependence_capacity * sizeof(Task*) );
-
-  // unlock
-
-  // Kokkos::atomic_compare_exchange_strong( & lock_alloc_dealloc , 1 , 0 );
-
-  return ptr ;
-}
-
-Task::~TaskMember()
-{
-
-}
-
-
-Task::TaskMember( const function_verify_type   arg_verify
-                , const function_dealloc_type  arg_dealloc
-                , const function_single_type   arg_apply_single
-                , const function_team_type     arg_apply_team
-                , volatile int &               arg_active_count
-                , const unsigned               arg_sizeof_derived
-                , const unsigned               arg_dependence_capacity
-                )
-  : m_dealloc( arg_dealloc )
-  , m_verify(  arg_verify )
-  , m_apply_single( arg_apply_single )
-  , m_apply_team( arg_apply_team )
-  , m_active_count( & arg_active_count )
-  , m_qfeb(0)
-  , m_dep( (Task **)( ((unsigned char *) this) + padded_sizeof_derived( arg_sizeof_derived ) ) )
-  , m_dep_capacity( arg_dependence_capacity )
-  , m_dep_size( 0 )
-  , m_ref_count( 0 )
-  , m_state( Kokkos::Experimental::TASK_STATE_CONSTRUCTING )
-{
-  qthread_empty( & m_qfeb ); // Set to full when complete
-  for ( unsigned i = 0 ; i < arg_dependence_capacity ; ++i ) m_dep[i] = 0 ;
-}
-
-Task::TaskMember( const function_dealloc_type  arg_dealloc
-                , const function_single_type   arg_apply_single
-                , const function_team_type     arg_apply_team
-                , volatile int &               arg_active_count
-                , const unsigned               arg_sizeof_derived
-                , const unsigned               arg_dependence_capacity
-                )
-  : m_dealloc( arg_dealloc )
-  , m_verify(  & Task::verify_type<void> )
-  , m_apply_single( arg_apply_single )
-  , m_apply_team( arg_apply_team )
-  , m_active_count( & arg_active_count )
-  , m_qfeb(0)
-  , m_dep( (Task **)( ((unsigned char *) this) + padded_sizeof_derived( arg_sizeof_derived ) ) )
-  , m_dep_capacity( arg_dependence_capacity )
-  , m_dep_size( 0 )
-  , m_ref_count( 0 )
-  , m_state( Kokkos::Experimental::TASK_STATE_CONSTRUCTING )
-{
-  qthread_empty( & m_qfeb ); // Set to full when complete
-  for ( unsigned i = 0 ; i < arg_dependence_capacity ; ++i ) m_dep[i] = 0 ;
-}
-
-//----------------------------------------------------------------------------
-
-void Task::throw_error_add_dependence() const
-{
-  std::cerr << "TaskMember< Qthreads >::add_dependence ERROR"
-            << " state(" << m_state << ")"
-            << " dep_size(" << m_dep_size << ")"
-            << std::endl ;
-  throw std::runtime_error("TaskMember< Qthreads >::add_dependence ERROR");
-}
-
-void Task::throw_error_verify_type()
-{
-  throw std::runtime_error("TaskMember< Qthreads >::verify_type ERROR");
-}
-
-//----------------------------------------------------------------------------
-
-#if defined( KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST )
-void Task::assign( Task ** const lhs , Task * rhs , const bool no_throw )
-{
-  static const char msg_error_header[]      = "Kokkos::Impl::TaskManager<Kokkos::Qthreads>::assign ERROR" ;
-  static const char msg_error_count[]       = ": negative reference count" ;
-  static const char msg_error_complete[]    = ": destroy task that is not complete" ;
-  static const char msg_error_dependences[] = ": destroy task that has dependences" ;
-  static const char msg_error_exception[]   = ": caught internal exception" ;
-
-  if ( rhs ) { Kokkos::atomic_increment( &(*rhs).m_ref_count ); }
-
-  Task * const lhs_val = Kokkos::atomic_exchange( lhs , rhs );
-
-  if ( lhs_val ) {
-
-    const int count = Kokkos::atomic_fetch_add( & (*lhs_val).m_ref_count , -1 );
-
-    const char * msg_error = 0 ;
-
-    try {
-
-      if ( 1 == count ) {
-
-        // Reference count at zero, delete it
-
-        // Should only be deallocating a completed task
-        if ( (*lhs_val).m_state == Kokkos::Experimental::TASK_STATE_COMPLETE ) {
-
-          // A completed task should not have dependences...
-          for ( int i = 0 ; i < (*lhs_val).m_dep_size && 0 == msg_error ; ++i ) {
-            if ( (*lhs_val).m_dep[i] ) msg_error = msg_error_dependences ;
-          }
-        }
-        else {
-          msg_error = msg_error_complete ;
-        }
-
-        if ( 0 == msg_error ) {
-          // Get deletion function and apply it
-          const Task::function_dealloc_type d = (*lhs_val).m_dealloc ;
-
-          (*d)( lhs_val );
-        }
-      }
-      else if ( count <= 0 ) {
-        msg_error = msg_error_count ;
-      }
-    }
-    catch( ... ) {
-      if ( 0 == msg_error ) msg_error = msg_error_exception ;
-    }
-
-    if ( 0 != msg_error ) {
-      if ( no_throw ) {
-        std::cerr << msg_error_header << msg_error << std::endl ;
-        std::cerr.flush();
-      }
-      else {
-        std::string msg(msg_error_header);
-        msg.append(msg_error);
-        throw std::runtime_error( msg );
-      }
-    }
-  }
-}
-#endif
-
-
-//----------------------------------------------------------------------------
-
-void Task::closeout()
-{
-  enum { RESPAWN = int( Kokkos::Experimental::TASK_STATE_WAITING ) |
-                   int( Kokkos::Experimental::TASK_STATE_EXECUTING ) };
-
-#if 0
-fprintf( stdout
-       , "worker(%d.%d) task 0x%.12lx %s\n"
-       , qthread_shep()
-       , qthread_worker_local(NULL)
-       , reinterpret_cast<unsigned long>(this)
-       , ( m_state == RESPAWN ? "respawn" : "complete" )
-       );
-fflush(stdout);
-#endif
-
-  // When dependent tasks run there would be a race
-  // condition between destroying this task and
-  // querying the active count pointer from this task.
-  int volatile * const active_count = m_active_count ;
-
-  if ( m_state == RESPAWN ) {
-    // Task requests respawn, set state to waiting and reschedule the task
-    m_state = Kokkos::Experimental::TASK_STATE_WAITING ;
-    schedule();
-  }
-  else {
-
-    // Task did not respawn, is complete
-    m_state = Kokkos::Experimental::TASK_STATE_COMPLETE ;
-
-    // Release dependences before allowing dependent tasks to run.
-    // Otherwise there is a thread race condition for removing dependences.
-    for ( int i = 0 ; i < m_dep_size ; ++i ) {
-      assign( & m_dep[i] , 0 );
-    }
-
-    // Set Qthreads FEB to full so that dependent tasks are allowed to execute.
-    // This 'task' may be deleted immediately following this function call.
-    qthread_fill( & m_qfeb );
-
-    // The dependent task could now complete and destroy 'this' task
-    // before the call to 'qthread_fill' returns.  Therefore, for
-    // thread safety assume that 'this' task has now been destroyed.
-  }
-
-  // Decrement active task count before returning.
-  Kokkos::atomic_decrement( active_count );
-}
-
-aligned_t Task::qthread_func( void * arg )
-{
-  Task * const task = reinterpret_cast< Task * >(arg);
-
-  // First member of the team change state to executing.
-  // Use compare-exchange to avoid race condition with a respawn.
-  Kokkos::atomic_compare_exchange_strong( & task->m_state
-                                        , int(Kokkos::Experimental::TASK_STATE_WAITING)
-                                        , int(Kokkos::Experimental::TASK_STATE_EXECUTING)
-                                        );
-
-  if ( task->m_apply_team && ! task->m_apply_single ) {
-    Kokkos::Impl::QthreadsTeamPolicyMember::TaskTeam task_team_tag ;
-
-    // Initialize team size and rank with shephered info
-    Kokkos::Impl::QthreadsTeamPolicyMember member( task_team_tag );
-
-    (*task->m_apply_team)( task , member );
-
-#if 0
-fprintf( stdout
-       , "worker(%d.%d) task 0x%.12lx executed by member(%d:%d)\n"
-       , qthread_shep()
-       , qthread_worker_local(NULL)
-       , reinterpret_cast<unsigned long>(task)
-       , member.team_rank()
-       , member.team_size()
-       );
-fflush(stdout);
-#endif
-
-    member.team_barrier();
-    if ( member.team_rank() == 0 ) task->closeout();
-    member.team_barrier();
-  }
-  else if ( task->m_apply_team && task->m_apply_single == reinterpret_cast<function_single_type>(1) ) {
-    // Team hard-wired to one, no cloning
-    Kokkos::Impl::QthreadsTeamPolicyMember member ;
-    (*task->m_apply_team)( task , member );
-    task->closeout();
-  }
-  else {
-    (*task->m_apply_single)( task );
-    task->closeout();
-  }
-
-#if 0
-fprintf( stdout
-       , "worker(%d.%d) task 0x%.12lx return\n"
-       , qthread_shep()
-       , qthread_worker_local(NULL)
-       , reinterpret_cast<unsigned long>(task)
-       );
-fflush(stdout);
-#endif
-
-  return 0 ;
-}
-
-void Task::respawn()
-{
-  // Change state from pure executing to ( waiting | executing )
-  // to avoid confusion with simply waiting.
-  Kokkos::atomic_compare_exchange_strong( & m_state
-                                        , int(Kokkos::Experimental::TASK_STATE_EXECUTING)
-                                        , int(Kokkos::Experimental::TASK_STATE_WAITING |
-                                              Kokkos::Experimental::TASK_STATE_EXECUTING)
-                                        );
-}
-
-void Task::schedule()
-{
-  // Is waiting for execution
-
-  // Increment active task count before spawning.
-  Kokkos::atomic_increment( m_active_count );
-
-  // spawn in Qthreads.  must malloc the precondition array and give to Qthreads.
-  // Qthreads will eventually free this allocation so memory will not be leaked.
-
-  // concern with thread safety of malloc, does this need to be guarded?
-  aligned_t ** qprecon = (aligned_t **) malloc( ( m_dep_size + 1 ) * sizeof(aligned_t *) );
-
-  qprecon[0] = reinterpret_cast<aligned_t *>( uintptr_t(m_dep_size) );
-
-  for ( int i = 0 ; i < m_dep_size ; ++i ) {
-    qprecon[i+1] = & m_dep[i]->m_qfeb ; // Qthreads precondition flag
-  }
-
-  if ( m_apply_team && ! m_apply_single ) {
-    // If more than one shepherd spawn on a shepherd other than this shepherd
-    const int num_shepherd            = qthread_num_shepherds();
-    const int num_worker_per_shepherd = qthread_num_workers_local(NO_SHEPHERD);
-    const int this_shepherd           = qthread_shep();
-
-    int spawn_shepherd = ( this_shepherd + 1 ) % num_shepherd ;
-
-#if 0
-fprintf( stdout
-       , "worker(%d.%d) task 0x%.12lx spawning on shepherd(%d) clone(%d)\n"
-       , qthread_shep()
-       , qthread_worker_local(NULL)
-       , reinterpret_cast<unsigned long>(this)
-       , spawn_shepherd
-       , num_worker_per_shepherd - 1
-       );
-fflush(stdout);
-#endif
-
-    qthread_spawn_cloneable
-      ( & Task::qthread_func
-      , this
-      , 0
-      , NULL
-      , m_dep_size , qprecon /* dependences */
-      , spawn_shepherd
-      , unsigned( QTHREAD_SPAWN_SIMPLE | QTHREAD_SPAWN_LOCAL_PRIORITY )
-      , num_worker_per_shepherd - 1
-      );
-  }
-  else {
-    qthread_spawn( & Task::qthread_func /* function */
-                 , this                 /* function argument */
-                 , 0
-                 , NULL
-                 , m_dep_size , qprecon /* dependences */
-                 , NO_SHEPHERD
-                 , QTHREAD_SPAWN_SIMPLE /* allows optimization for non-blocking task */
-                 );
-  }
-}
-
-} // namespace Impl
-} // namespace Experimental
-} // namespace Kokkos
-
-namespace Kokkos {
-namespace Experimental {
-
-TaskPolicy< Kokkos::Qthreads >::
-TaskPolicy
-  ( const unsigned /* arg_task_max_count */
-  , const unsigned /* arg_task_max_size */
-  , const unsigned arg_task_default_dependence_capacity
-  , const unsigned arg_task_team_size
-  )
-  : m_default_dependence_capacity( arg_task_default_dependence_capacity )
-  , m_team_size( arg_task_team_size != 0 ? arg_task_team_size : unsigned(qthread_num_workers_local(NO_SHEPHERD)) )
-  , m_active_count_root(0)
-  , m_active_count( m_active_count_root )
-{
-  const unsigned num_worker_per_shepherd = unsigned( qthread_num_workers_local(NO_SHEPHERD) );
-
-  if ( m_team_size != 1 && m_team_size != num_worker_per_shepherd ) {
-    std::ostringstream msg ;
-    msg << "Kokkos::Experimental::TaskPolicy< Kokkos::Qthreads >( "
-        << "default_depedence = " << arg_task_default_dependence_capacity
-        << " , team_size = " << arg_task_team_size
-        << " ) ERROR, valid team_size arguments are { (omitted) , 1 , " << num_worker_per_shepherd << " }" ;
-    Kokkos::Impl::throw_runtime_exception(msg.str());
-  }
-}
-
-TaskPolicy< Kokkos::Qthreads >::member_type &
-TaskPolicy< Kokkos::Qthreads >::member_single()
-{
-  static member_type s ;
-  return s ;
-}
-
-void wait( Kokkos::Experimental::TaskPolicy< Kokkos::Qthreads > & policy )
-{
-  volatile int * const active_task_count = & policy.m_active_count ;
-  while ( *active_task_count ) qthread_yield();
-}
-
-} // namespace Experimental
-} // namespace Kokkos
-
-#else
-void KOKKOS_CORE_SRC_QTHREADS_KOKKOS_QTHREADS_TASKPOLICY_PREVENT_LINK_ERROR() {}
-#endif // #if defined( KOKKOS_ENABLE_TASKDAG )
-#endif // #if defined( KOKKOS_ENABLE_QTHREADS )
-
diff --git a/kokkos/core/src/Qthreads/Kokkos_Qthreads_TaskPolicy.hpp.old b/kokkos/core/src/Qthreads/Kokkos_Qthreads_TaskPolicy.hpp.old
deleted file mode 100644
index adb685976..000000000
--- a/kokkos/core/src/Qthreads/Kokkos_Qthreads_TaskPolicy.hpp.old
+++ /dev/null
@@ -1,666 +0,0 @@
-/*
-//@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  H. Carter Edwards (hcedwar@sandia.gov)
-//
-// ************************************************************************
-//@HEADER
-*/
-
-// Experimental unified task-data parallel manycore LDRD
-
-#ifndef KOKKOS_QTHREADS_TASKSCHEDULER_HPP
-#define KOKKOS_QTHREADS_TASKSCHEDULER_HPP
-
-#include <Kokkos_Macros.hpp>
-#if defined( KOKKOS_ENABLE_TASKDAG )
-
-#include <string>
-#include <typeinfo>
-#include <stdexcept>
-
-//----------------------------------------------------------------------------
-// Defines to enable experimental Qthreads functionality
-
-#define QTHREAD_LOCAL_PRIORITY
-#define CLONED_TASKS
-
-#include <qthread.h>
-
-#undef QTHREAD_LOCAL_PRIORITY
-#undef CLONED_TASKS
-
-//----------------------------------------------------------------------------
-
-#include <Kokkos_Qthreads.hpp>
-#include <Kokkos_TaskScheduler.hpp>
-#include <Kokkos_View.hpp>
-
-#include <impl/Kokkos_FunctorAdapter.hpp>
-
-
-//----------------------------------------------------------------------------
-
-namespace Kokkos {
-namespace Experimental {
-namespace Impl {
-
-template<>
-class TaskMember< Kokkos::Qthreads , void , void >
-{
-public:
-
-  typedef TaskMember * (* function_verify_type) ( TaskMember * );
-  typedef void         (* function_single_type) ( TaskMember * );
-  typedef void         (* function_team_type)   ( TaskMember * , Kokkos::Impl::QthreadsTeamPolicyMember & );
-  typedef void         (* function_dealloc_type)( TaskMember * );
-
-private:
-
-  const function_dealloc_type  m_dealloc ;       ///< Deallocation
-  const function_verify_type   m_verify ;        ///< Result type verification
-  const function_single_type   m_apply_single ;  ///< Apply function
-  const function_team_type     m_apply_team ;    ///< Apply function
-  int volatile * const         m_active_count ;  ///< Count of active tasks on this policy
-  aligned_t                    m_qfeb ;          ///< Qthreads full/empty bit
-  TaskMember ** const          m_dep ;           ///< Dependences
-  const int                    m_dep_capacity ;  ///< Capacity of dependences
-  int                          m_dep_size ;      ///< Actual count of dependences
-  int                          m_ref_count ;     ///< Reference count
-  int                          m_state ;         ///< State of the task
-
-  TaskMember() /* = delete */ ;
-  TaskMember( const TaskMember & ) /* = delete */ ;
-  TaskMember & operator = ( const TaskMember & ) /* = delete */ ;
-
-  static aligned_t qthread_func( void * arg );
-
-  static void * allocate( const unsigned arg_sizeof_derived , const unsigned arg_dependence_capacity );
-  static void   deallocate( void * );
-
-  void throw_error_add_dependence() const ;
-  static void throw_error_verify_type();
-
-  template < class DerivedTaskType >
-  static
-  void deallocate( TaskMember * t )
-    {
-      DerivedTaskType * ptr = static_cast< DerivedTaskType * >(t);
-      ptr->~DerivedTaskType();
-      deallocate( (void *) ptr );
-    }
-
-  void schedule();
-  void closeout();
-
-protected :
-
-  ~TaskMember();
-
-  // Used by TaskMember< Qthreads , ResultType , void >
-  TaskMember( const function_verify_type   arg_verify
-            , const function_dealloc_type  arg_dealloc
-            , const function_single_type   arg_apply_single
-            , const function_team_type     arg_apply_team
-            , volatile int &               arg_active_count
-            , const unsigned               arg_sizeof_derived
-            , const unsigned               arg_dependence_capacity
-            );
-
-  // Used for TaskMember< Qthreads , void , void >
-  TaskMember( const function_dealloc_type  arg_dealloc
-            , const function_single_type   arg_apply_single
-            , const function_team_type     arg_apply_team
-            , volatile int &               arg_active_count
-            , const unsigned               arg_sizeof_derived
-            , const unsigned               arg_dependence_capacity
-            );
-
-public:
-
-  template< typename ResultType >
-  KOKKOS_FUNCTION static
-  TaskMember * verify_type( TaskMember * t )
-    {
-      enum { check_type = ! std::is_same< ResultType , void >::value };
-
-      if ( check_type && t != 0 ) {
-
-        // Verify that t->m_verify is this function
-        const function_verify_type self = & TaskMember::template verify_type< ResultType > ;
-
-        if ( t->m_verify != self ) {
-          t = 0 ;
-#if defined( KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST )
-          throw_error_verify_type();
-#endif
-        }
-      }
-      return t ;
-    }
-
-  //----------------------------------------
-  /*  Inheritence Requirements on task types:
-   *    typedef  FunctorType::value_type  value_type ;
-   *    class DerivedTaskType
-   *      : public TaskMember< Qthreads , value_type , FunctorType >
-   *      { ... };
-   *    class TaskMember< Qthreads , value_type , FunctorType >
-   *      : public TaskMember< Qthreads , value_type , void >
-   *      , public Functor
-   *      { ... };
-   *  If value_type != void
-   *    class TaskMember< Qthreads , value_type , void >
-   *      : public TaskMember< Qthreads , void , void >
-   *
-   *  Allocate space for DerivedTaskType followed by TaskMember*[ dependence_capacity ]
-   *
-   */
-
-  /** \brief  Allocate and construct a single-thread task */
-  template< class DerivedTaskType >
-  static
-  TaskMember * create_single( const typename DerivedTaskType::functor_type &  arg_functor
-                            , volatile int &                                  arg_active_count
-                            , const unsigned                                  arg_dependence_capacity )
-    {
-      typedef typename DerivedTaskType::functor_type  functor_type ;
-      typedef typename functor_type::value_type       value_type ;
-
-      DerivedTaskType * const task =
-        new( allocate( sizeof(DerivedTaskType) , arg_dependence_capacity ) )
-          DerivedTaskType( & TaskMember::template deallocate< DerivedTaskType >
-                         , & TaskMember::template apply_single< functor_type , value_type >
-                         , 0
-                         , arg_active_count
-                         , sizeof(DerivedTaskType)
-                         , arg_dependence_capacity
-                         , arg_functor );
-
-      return static_cast< TaskMember * >( task );
-    }
-
-  /** \brief  Allocate and construct a team-thread task */
-  template< class DerivedTaskType >
-  static
-  TaskMember * create_team( const typename DerivedTaskType::functor_type &  arg_functor
-                          , volatile int &                                  arg_active_count
-                          , const unsigned                                  arg_dependence_capacity
-                          , const bool                                      arg_is_team )
-    {
-      typedef typename DerivedTaskType::functor_type  functor_type ;
-      typedef typename functor_type::value_type       value_type ;
-
-      const function_single_type flag = reinterpret_cast<function_single_type>( arg_is_team ? 0 : 1 );
-
-      DerivedTaskType * const task =
-        new( allocate( sizeof(DerivedTaskType) , arg_dependence_capacity ) )
-          DerivedTaskType( & TaskMember::template deallocate< DerivedTaskType >
-                         , flag
-                         , & TaskMember::template apply_team< functor_type , value_type >
-                         , arg_active_count
-                         , sizeof(DerivedTaskType)
-                         , arg_dependence_capacity
-                         , arg_functor );
-
-      return static_cast< TaskMember * >( task );
-    }
-
-  void respawn();
-  void spawn()
-    {
-       m_state = Kokkos::Experimental::TASK_STATE_WAITING ;
-       schedule();
-    }
-
-  //----------------------------------------
-
-  typedef FutureValueTypeIsVoidError get_result_type ;
-
-  KOKKOS_INLINE_FUNCTION
-  get_result_type get() const { return get_result_type() ; }
-
-  KOKKOS_INLINE_FUNCTION
-  Kokkos::Experimental::TaskState get_state() const { return Kokkos::Experimental::TaskState( m_state ); }
-
-  //----------------------------------------
-
-#if defined( KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST )
-  static
-  void assign( TaskMember ** const lhs , TaskMember * const rhs , const bool no_throw = false );
-#else
-  KOKKOS_INLINE_FUNCTION static
-  void assign( TaskMember ** const lhs , TaskMember * const rhs , const bool no_throw = false ) {}
-#endif
-
-  KOKKOS_INLINE_FUNCTION
-  TaskMember * get_dependence( int i ) const
-    { return ( Kokkos::Experimental::TASK_STATE_EXECUTING == m_state && 0 <= i && i < m_dep_size ) ? m_dep[i] : (TaskMember*) 0 ; }
-
-  KOKKOS_INLINE_FUNCTION
-  int get_dependence() const
-    { return m_dep_size ; }
-
-  KOKKOS_INLINE_FUNCTION
-  void clear_dependence()
-    {
-      for ( int i = 0 ; i < m_dep_size ; ++i ) assign( m_dep + i , 0 );
-      m_dep_size = 0 ;
-    }
-
-  KOKKOS_INLINE_FUNCTION
-  void add_dependence( TaskMember * before )
-    {
-      if ( ( Kokkos::Experimental::TASK_STATE_CONSTRUCTING == m_state ||
-             Kokkos::Experimental::TASK_STATE_EXECUTING    == m_state ) &&
-           m_dep_size < m_dep_capacity ) {
-        assign( m_dep + m_dep_size , before );
-        ++m_dep_size ;
-      }
-      else {
-        throw_error_add_dependence();
-      }
-    }
-
-  //----------------------------------------
-
-  template< class FunctorType , class ResultType >
-  KOKKOS_INLINE_FUNCTION static
-  void apply_single( typename std::enable_if< ! std::is_same< ResultType , void >::value , TaskMember * >::type t )
-    {
-      typedef TaskMember< Kokkos::Qthreads , ResultType , FunctorType > derived_type ;
-
-      // TaskMember< Kokkos::Qthreads , ResultType , FunctorType >
-      //   : public TaskMember< Kokkos::Qthreads , ResultType , void >
-      //   , public FunctorType
-      //   { ... };
-
-      derived_type & m = * static_cast< derived_type * >( t );
-
-      Kokkos::Impl::FunctorApply< FunctorType , void , ResultType & >::apply( (FunctorType &) m , & m.m_result );
-    }
-
-  template< class FunctorType , class ResultType >
-  KOKKOS_INLINE_FUNCTION static
-  void apply_single( typename std::enable_if< std::is_same< ResultType , void >::value , TaskMember * >::type t )
-    {
-      typedef TaskMember< Kokkos::Qthreads , ResultType , FunctorType > derived_type ;
-
-      // TaskMember< Kokkos::Qthreads , ResultType , FunctorType >
-      //   : public TaskMember< Kokkos::Qthreads , ResultType , void >
-      //   , public FunctorType
-      //   { ... };
-
-      derived_type & m = * static_cast< derived_type * >( t );
-
-      Kokkos::Impl::FunctorApply< FunctorType , void , void >::apply( (FunctorType &) m );
-    }
-
-  //----------------------------------------
-
-  template< class FunctorType , class ResultType >
-  KOKKOS_INLINE_FUNCTION static
-  void apply_team( typename std::enable_if< ! std::is_same< ResultType , void >::value , TaskMember * >::type t
-                 , Kokkos::Impl::QthreadsTeamPolicyMember & member )
-    {
-      typedef TaskMember< Kokkos::Qthreads , ResultType , FunctorType > derived_type ;
-
-      derived_type & m = * static_cast< derived_type * >( t );
-
-      m.FunctorType::apply( member , m.m_result );
-    }
-
-  template< class FunctorType , class ResultType >
-  KOKKOS_INLINE_FUNCTION static
-  void apply_team( typename std::enable_if< std::is_same< ResultType , void >::value , TaskMember * >::type t
-                 , Kokkos::Impl::QthreadsTeamPolicyMember & member )
-    {
-      typedef TaskMember< Kokkos::Qthreads , ResultType , FunctorType > derived_type ;
-
-      derived_type & m = * static_cast< derived_type * >( t );
-
-      m.FunctorType::apply( member );
-    }
-};
-
-//----------------------------------------------------------------------------
-/** \brief  Base class for tasks with a result value in the Qthreads execution space.
- *
- *  The FunctorType must be void because this class is accessed by the
- *  Future class for the task and result value.
- *
- *  Must be derived from TaskMember<S,void,void> 'root class' so the Future class
- *  can correctly static_cast from the 'root class' to this class.
- */
-template < class ResultType >
-class TaskMember< Kokkos::Qthreads , ResultType , void >
-  : public TaskMember< Kokkos::Qthreads , void , void >
-{
-public:
-
-  ResultType  m_result ;
-
-  typedef const ResultType & get_result_type ;
-
-  KOKKOS_INLINE_FUNCTION
-  get_result_type get() const { return m_result ; }
-
-protected:
-
-  typedef TaskMember< Kokkos::Qthreads , void , void >  task_root_type ;
-  typedef task_root_type::function_dealloc_type        function_dealloc_type ;
-  typedef task_root_type::function_single_type         function_single_type ;
-  typedef task_root_type::function_team_type           function_team_type ;
-
-  inline
-  TaskMember( const function_dealloc_type  arg_dealloc
-            , const function_single_type   arg_apply_single
-            , const function_team_type     arg_apply_team
-            , volatile int &               arg_active_count
-            , const unsigned               arg_sizeof_derived
-            , const unsigned               arg_dependence_capacity
-            )
-    : task_root_type( & task_root_type::template verify_type< ResultType >
-                    , arg_dealloc
-                    , arg_apply_single
-                    , arg_apply_team
-                    , arg_active_count
-                    , arg_sizeof_derived
-                    , arg_dependence_capacity )
-    , m_result()
-    {}
-};
-
-template< class ResultType , class FunctorType >
-class TaskMember< Kokkos::Qthreads , ResultType , FunctorType >
-  : public TaskMember< Kokkos::Qthreads , ResultType , void >
-  , public FunctorType
-{
-public:
-
-  typedef FunctorType  functor_type ;
-
-  typedef TaskMember< Kokkos::Qthreads , void , void >        task_root_type ;
-  typedef TaskMember< Kokkos::Qthreads , ResultType , void >  task_base_type ;
-  typedef task_root_type::function_dealloc_type              function_dealloc_type ;
-  typedef task_root_type::function_single_type               function_single_type ;
-  typedef task_root_type::function_team_type                 function_team_type ;
-
-  inline
-  TaskMember( const function_dealloc_type  arg_dealloc
-            , const function_single_type   arg_apply_single
-            , const function_team_type     arg_apply_team
-            , volatile int &               arg_active_count
-            , const unsigned               arg_sizeof_derived
-            , const unsigned               arg_dependence_capacity
-            , const functor_type &         arg_functor
-            )
-    : task_base_type( arg_dealloc
-                    , arg_apply_single
-                    , arg_apply_team
-                    , arg_active_count
-                    , arg_sizeof_derived
-                    , arg_dependence_capacity )
-    , functor_type( arg_functor )
-    {}
-};
-
-} /* namespace Impl */
-} /* namespace Experimental */
-} /* namespace Kokkos */
-
-//----------------------------------------------------------------------------
-//----------------------------------------------------------------------------
-
-namespace Kokkos {
-namespace Experimental {
-
-void wait( TaskPolicy< Kokkos::Qthreads > & );
-
-template<>
-class TaskPolicy< Kokkos::Qthreads >
-{
-public:
-
-  typedef Kokkos::Qthreads                        execution_space ;
-  typedef TaskPolicy                             execution_policy ;
-  typedef Kokkos::Impl::QthreadsTeamPolicyMember  member_type ;
-
-private:
-
-  typedef Impl::TaskMember< execution_space , void , void > task_root_type ;
-
-  template< class FunctorType >
-  static inline
-  const task_root_type * get_task_root( const FunctorType * f )
-    {
-      typedef Impl::TaskMember< execution_space , typename FunctorType::value_type , FunctorType > task_type ;
-      return static_cast< const task_root_type * >( static_cast< const task_type * >(f) );
-    }
-
-  template< class FunctorType >
-  static inline
-  task_root_type * get_task_root( FunctorType * f )
-    {
-      typedef Impl::TaskMember< execution_space , typename FunctorType::value_type , FunctorType > task_type ;
-      return static_cast< task_root_type * >( static_cast< task_type * >(f) );
-    }
-
-  unsigned        m_default_dependence_capacity ;
-  unsigned        m_team_size ;
-  volatile int    m_active_count_root ;
-  volatile int &  m_active_count ;
-
-public:
-
-  TaskPolicy
-    ( const unsigned arg_task_max_count
-    , const unsigned arg_task_max_size
-    , const unsigned arg_task_default_dependence_capacity = 4
-    , const unsigned arg_task_team_size = 0 /* choose default */
-    );
-
-  KOKKOS_FUNCTION TaskPolicy() = default ;
-  KOKKOS_FUNCTION TaskPolicy( TaskPolicy && rhs ) = default ;
-  KOKKOS_FUNCTION TaskPolicy( const TaskPolicy & rhs ) = default ;
-  KOKKOS_FUNCTION TaskPolicy & operator = ( TaskPolicy && rhs ) = default ;
-  KOKKOS_FUNCTION TaskPolicy & operator = ( const TaskPolicy & rhs ) = default ;
-
-  //----------------------------------------
-
-  KOKKOS_INLINE_FUNCTION
-  int allocated_task_count() const { return m_active_count ; }
-
-  template< class ValueType >
-  const Future< ValueType , execution_space > &
-    spawn( const Future< ValueType , execution_space > & f
-         , const bool priority = false ) const
-      {
-#if defined( KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST )
-        f.m_task->spawn();
-#endif
-        return f ;
-      }
-
-  // Create single-thread task
-
-  template< class FunctorType >
-  KOKKOS_INLINE_FUNCTION
-  Future< typename FunctorType::value_type , execution_space >
-  task_create( const FunctorType & functor
-             , const unsigned dependence_capacity = ~0u ) const
-    {
-      typedef typename FunctorType::value_type value_type ;
-      typedef Impl::TaskMember< execution_space , value_type , FunctorType >  task_type ;
-      return Future< value_type , execution_space >(
-#if defined( KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST )
-        task_root_type::create_single< task_type >
-          ( functor
-          , m_active_count
-          , ( ~0u == dependence_capacity ? m_default_dependence_capacity : dependence_capacity )
-          )
-#endif
-        );
-    }
-
-  template< class FunctorType >
-  Future< typename FunctorType::value_type , execution_space >
-  proc_create( const FunctorType & functor
-             , const unsigned dependence_capacity = ~0u ) const
-    { return task_create( functor , dependence_capacity ); }
-
-  // Create thread-team task
-
-  template< class FunctorType >
-  KOKKOS_INLINE_FUNCTION
-  Future< typename FunctorType::value_type , execution_space >
-  task_create_team( const FunctorType & functor
-                  , const unsigned dependence_capacity = ~0u ) const
-    {
-      typedef typename FunctorType::value_type  value_type ;
-      typedef Impl::TaskMember< execution_space , value_type , FunctorType >  task_type ;
-
-      return Future< value_type , execution_space >(
-#if defined( KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST )
-        task_root_type::create_team< task_type >
-          ( functor
-          , m_active_count
-          , ( ~0u == dependence_capacity ? m_default_dependence_capacity : dependence_capacity )
-          , 1 < m_team_size
-          )
-#endif
-        );
-    }
-
-  template< class FunctorType >
-  KOKKOS_INLINE_FUNCTION
-  Future< typename FunctorType::value_type , execution_space >
-  proc_create_team( const FunctorType & functor
-                  , const unsigned dependence_capacity = ~0u ) const
-    { return task_create_team( functor , dependence_capacity ); }
-
-  // Add dependence
-  template< class A1 , class A2 , class A3 , class A4 >
-  void add_dependence( const Future<A1,A2> & after
-                     , const Future<A3,A4> & before
-                     , typename std::enable_if
-                        < std::is_same< typename Future<A1,A2>::execution_space , execution_space >::value
-                          &&
-                          std::is_same< typename Future<A3,A4>::execution_space , execution_space >::value
-                        >::type * = 0
-                      )
-    {
-#if defined( KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST )
-      after.m_task->add_dependence( before.m_task );
-#endif
-    }
-
-  //----------------------------------------
-  // Functions for an executing task functor to query dependences,
-  // set new dependences, and respawn itself.
-
-  template< class FunctorType >
-  Future< void , execution_space >
-  get_dependence( const FunctorType * task_functor , int i ) const
-    {
-      return Future<void,execution_space>(
-#if defined( KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST )
-        get_task_root(task_functor)->get_dependence(i)
-#endif
-        );
-    }
-
-  template< class FunctorType >
-  int get_dependence( const FunctorType * task_functor ) const
-#if defined( KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST )
-    { return get_task_root(task_functor)->get_dependence(); }
-#else
-    { return 0 ; }
-#endif
-
-  template< class FunctorType >
-  void clear_dependence( FunctorType * task_functor ) const
-    {
-#if defined( KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST )
-      get_task_root(task_functor)->clear_dependence();
-#endif
-    }
-
-  template< class FunctorType , class A3 , class A4 >
-  void add_dependence( FunctorType * task_functor
-                     , const Future<A3,A4> & before
-                     , typename std::enable_if
-                        < std::is_same< typename Future<A3,A4>::execution_space , execution_space >::value
-                        >::type * = 0
-                      )
-    {
-#if defined( KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST )
-      get_task_root(task_functor)->add_dependence( before.m_task );
-#endif
-    }
-
-  template< class FunctorType >
-  void respawn( FunctorType * task_functor
-              , const bool priority = false ) const
-    {
-#if defined( KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST )
-      get_task_root(task_functor)->respawn();
-#endif
-    }
-
-  template< class FunctorType >
-  void respawn_needing_memory( FunctorType * task_functor ) const
-    {
-#if defined( KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST )
-      get_task_root(task_functor)->respawn();
-#endif
-    }
-
-  static member_type & member_single();
-
-  friend void wait( TaskPolicy< Kokkos::Qthreads > & );
-};
-
-} /* namespace Experimental */
-} // namespace Kokkos
-
-//----------------------------------------------------------------------------
-//----------------------------------------------------------------------------
-
-#endif /* #if defined( KOKKOS_ENABLE_TASKDAG ) */
-#endif /* #define KOKKOS_QTHREADS_TASK_HPP */
-
diff --git a/kokkos/core/src/Qthreads/Kokkos_Qthreads_TaskQueue.hpp b/kokkos/core/src/Qthreads/Kokkos_Qthreads_TaskQueue.hpp
deleted file mode 100644
index 7a4364ab7..000000000
--- a/kokkos/core/src/Qthreads/Kokkos_Qthreads_TaskQueue.hpp
+++ /dev/null
@@ -1,321 +0,0 @@
-/*
-//@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
-*/
-
-#ifndef KOKKOS_QTHREADS_TASKQUEUE_HPP
-#define KOKKOS_QTHREADS_TASKQUEUE_HPP
-
-#include <Kokkos_Macros.hpp>
-#if defined(KOKKOS_ENABLE_QTHREADS) && defined(KOKKOS_ENABLE_TASKPOLICY)
-
-//----------------------------------------------------------------------------
-//----------------------------------------------------------------------------
-
-namespace Kokkos {
-namespace Impl {
-
-/** \brief  Manage task allocation, deallocation, and scheduling.
- *
- *  Task execution is handled here directly for the Qthread implementation.
- */
-template <>
-class TaskQueue<Kokkos::Qthread> {
- private:
-  using execution_space = Kokkos::Qthread;
-  using memory_space    = Kokkos::HostSpace using device_type =
-      Kokkos::Device<execution_space, memory_space>;
-  using memory_pool    = Kokkos::MemoryPool<device_type>;
-  using task_root_type = Kokkos::Impl::TaskBase<execution_space, void, void>;
-
-  friend class Kokkos::TaskScheduler<execution_space>;
-
-  struct Destroy {
-    TaskQueue* m_queue;
-    void destroy_shared_allocation();
-  };
-
-  //----------------------------------------
-
-  enum : int {
-    TASK_STATE_NULL         = 0,  ///<  Does not exist
-    TASK_STATE_CONSTRUCTING = 1,  ///<  Is under construction
-    TASK_STATE_WAITING      = 2,  ///<  Is waiting for execution
-    TASK_STATE_EXECUTING    = 4,  ///<  Is executing
-    TASK_STATE_RESPAWN      = 8,  ///<  Requested respawn
-    TASK_STATE_COMPLETE     = 16  ///<  Execution is complete
-  };
-
-  // Queue is organized as [ priority ][ type ]
-
-  memory_pool m_memory;
-  unsigned m_team_size;  // Number of threads in a team
-  long m_accum_alloc;    // Accumulated number of allocations
-  int m_count_alloc;     // Current number of allocations
-  int m_max_alloc;       // Maximum number of allocations
-  int m_ready_count;     // Number of ready or executing
-
-  //----------------------------------------
-
-  ~TaskQueue();
-  TaskQueue()                 = delete;
-  TaskQueue(TaskQueue&&)      = delete;
-  TaskQueue(TaskQueue const&) = delete;
-  TaskQueue& operator=(TaskQueue&&) = delete;
-  TaskQueue& operator=(TaskQueue const&) = delete;
-
-  TaskQueue(const memory_space& arg_space,
-            unsigned const arg_memory_pool_capacity,
-            unsigned const arg_memory_pool_superblock_capacity_log2);
-
-  // Schedule a task
-  //   Precondition:
-  //     task is not executing
-  //     task->m_next is the dependence or zero
-  //   Postcondition:
-  //     task->m_next is linked list membership
-  KOKKOS_FUNCTION
-  void schedule(task_root_type* const);
-
-  // Reschedule a task
-  //   Precondition:
-  //     task is in Executing state
-  //     task->m_next == LockTag
-  //   Postcondition:
-  //     task is in Executing-Respawn state
-  //     task->m_next == 0 (no dependence)
-  KOKKOS_FUNCTION
-  void reschedule(task_root_type*);
-
-  // Complete a task
-  //   Precondition:
-  //     task is not executing
-  //     task->m_next == LockTag  =>  task is complete
-  //     task->m_next != LockTag  =>  task is respawn
-  //   Postcondition:
-  //     task->m_wait == LockTag  =>  task is complete
-  //     task->m_wait != LockTag  =>  task is waiting
-  KOKKOS_FUNCTION
-  void complete(task_root_type*);
-
- public:
-  // If and only if the execution space is a single thread
-  // then execute ready tasks.
-  KOKKOS_INLINE_FUNCTION
-  void iff_single_thread_recursive_execute() {
-#if defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST)
-    specialization::iff_single_thread_recursive_execute(this);
-#endif
-  }
-
-  void execute() { specialization::execute(this); }
-
-  template <typename FunctorType>
-  void proc_set_apply(typename task_root_type::function_type* ptr) {
-    specialization::template proc_set_apply<FunctorType>(ptr);
-  }
-
-  // Assign task pointer with reference counting of assigned tasks
-  template <typename LV, typename RV>
-  KOKKOS_FUNCTION static void assign(
-      TaskBase<execution_space, LV, void>** const lhs,
-      TaskBase<execution_space, RV, void>* const rhs) {
-    using task_lhs = TaskBase<execution_space, LV, void>;
-#if 0
-  {
-    printf( "assign( 0x%lx { 0x%lx %d %d }, 0x%lx { 0x%lx %d %d } )\n",
-            uintptr_t( lhs ? *lhs : 0 ),
-            uintptr_t( lhs && *lhs ? (*lhs)->m_next : 0 ),
-            int( lhs && *lhs ? (*lhs)->m_task_type : 0 ),
-            int( lhs && *lhs ? (*lhs)->m_ref_count : 0 ),
-            uintptr_t(rhs),
-            uintptr_t( rhs ? rhs->m_next : 0 ),
-            int( rhs ? rhs->m_task_type : 0 ),
-            int( rhs ? rhs->m_ref_count : 0 )
-          );
-    fflush( stdout );
-  }
-#endif
-
-    if (*lhs) {
-      const int count = Kokkos::atomic_fetch_add(&((*lhs)->m_ref_count), -1);
-
-      if ((1 == count) && ((*lhs)->m_state == TASK_STATE_COMPLETE)) {
-        // Reference count is zero and task is complete, deallocate.
-        (*lhs)->m_queue->deallocate(*lhs, (*lhs)->m_alloc_size);
-      } else if (count <= 1) {
-        Kokkos::abort(
-            "TaskScheduler task has negative reference count or is incomplete");
-      }
-
-      // GEM: Should I check that there are no dependences here?  Can the state
-      //      be set to complete while there are still dependences?
-    }
-
-    if (rhs) {
-      Kokkos::atomic_fetch_add(&(rhs->m_ref_count), 1);
-    }
-
-    // Force write of *lhs
-
-    *static_cast<task_lhs* volatile*>(lhs) = rhs;
-
-    Kokkos::memory_fence();
-  }
-
-  KOKKOS_FUNCTION
-  size_t allocate_block_size(size_t n);  ///< Actual block size allocated
-
-  KOKKOS_FUNCTION
-  void* allocate(size_t n);  ///< Allocate from the memory pool
-
-  KOKKOS_FUNCTION
-  void deallocate(void* p, size_t n);  ///< Deallocate to the memory pool
-};
-
-} /* namespace Impl */
-} /* namespace Kokkos */
-
-//----------------------------------------------------------------------------
-//----------------------------------------------------------------------------
-
-namespace Kokkos {
-namespace Impl {
-
-template <>
-class TaskBase<Kokkos::Qthread, void, void> {
- public:
-  enum : int16_t {
-    TaskTeam   = TaskBase<void, void, void>::TaskTeam,
-    TaskSingle = TaskBase<void, void, void>::TaskSingle,
-    Aggregate  = TaskBase<void, void, void>::Aggregate
-  };
-
-  enum : uintptr_t {
-    LockTag = TaskBase<void, void, void>::LockTag,
-    EndTag  = TaskBase<void, void, void>::EndTag
-  };
-
-  using execution_space = Kokkos::Qthread;
-  using queue_type      = TaskQueue<execution_space>;
-
-  template <typename>
-  friend class Kokkos::TaskScheduler;
-
-  typedef void (*function_type)(TaskBase*, void*);
-
-  // sizeof(TaskBase) == 48
-
-  function_type m_apply;  ///< Apply function pointer
-  queue_type* m_queue;    ///< Queue in which this task resides
-  TaskBase* m_dep;        ///< Dependence
-  int32_t m_ref_count;    ///< Reference count
-  int32_t m_alloc_size;   ///< Allocation size
-  int32_t m_dep_count;    ///< Aggregate's number of dependences
-  int16_t m_task_type;    ///< Type of task
-  int16_t m_priority;     ///< Priority of runnable task
-  aligned_t m_qfeb;       ///< Qthread full/empty bit
-  int m_state;            ///< State of the task
-
-  TaskBase(TaskBase&&)      = delete;
-  TaskBase(const TaskBase&) = delete;
-  TaskBase& operator=(TaskBase&&) = delete;
-  TaskBase& operator=(const TaskBase&) = delete;
-
-  KOKKOS_INLINE_FUNCTION ~TaskBase() = default;
-
-  KOKKOS_INLINE_FUNCTION
-  constexpr TaskBase() noexcept
-      : m_apply(0),
-        m_queue(0),
-        m_dep(0),
-        m_ref_count(0),
-        m_alloc_size(0),
-        m_dep_count(0),
-        m_task_type(TaskSingle),
-        m_priority(1 /* TaskRegularPriority */),
-        m_qfeb(0),
-        m_state(queue_type::TASK_STATE_CONSTRUCTING) {
-    qthread_empty(&m_qfeb);  // Set to full when complete
-  }
-
-  //----------------------------------------
-
-  static aligned_t qthread_func(void* arg);
-
-  KOKKOS_INLINE_FUNCTION
-  TaskBase** aggregate_dependences() {
-    return reinterpret_cast<TaskBase**>(this + 1);
-  }
-
-  KOKKOS_INLINE_FUNCTION
-  void requested_respawn() { return m_state == queue_type::TASK_STATE_RESPAWN; }
-
-  KOKKOS_INLINE_FUNCTION
-  void add_dependence(TaskBase* dep) {
-    // Assign dependence to m_dep.  It will be processed in the subsequent
-    // call to schedule.  Error if the dependence is reset.
-    if (0 != Kokkos::atomic_exchange(&m_dep, dep)) {
-      Kokkos::abort("TaskScheduler ERROR: resetting task dependence");
-    }
-
-    if (0 != dep) {
-      // The future may be destroyed upon returning from this call
-      // so increment reference count to track this assignment.
-      Kokkos::atomic_fetch_add(&(dep->m_ref_count), 1);
-    }
-  }
-
-  using get_return_type = void;
-
-  KOKKOS_INLINE_FUNCTION
-  get_return_type get() const {}
-};
-
-} /* namespace Impl */
-} /* namespace Kokkos */
-
-//----------------------------------------------------------------------------
-//----------------------------------------------------------------------------
-
-#endif  /* #if defined( KOKKOS_ENABLE_TASKPOLICY ) */
-#endif  // KOKKOS_QTHREADS_TASKQUEUE_HPP
diff --git a/kokkos/core/src/Qthreads/Kokkos_Qthreads_TaskQueue_impl.hpp b/kokkos/core/src/Qthreads/Kokkos_Qthreads_TaskQueue_impl.hpp
deleted file mode 100644
index 3a7bf1fd4..000000000
--- a/kokkos/core/src/Qthreads/Kokkos_Qthreads_TaskQueue_impl.hpp
+++ /dev/null
@@ -1,398 +0,0 @@
-/*
-//@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
-*/
-
-#ifndef KOKKOS_QTHREADS_TASKQUEUE_IMPL_HPP
-#define KOKKOS_QTHREADS_TASKQUEUE_IMPL_HPP
-
-#include <Kokkos_Macros.hpp>
-#if defined(KOKKOS_ENABLE_QTHREADS) && defined(KOKKOS_ENABLE_TASKPOLICY)
-
-namespace Kokkos {
-namespace Impl {
-
-//----------------------------------------------------------------------------
-
-template <typename ExecSpace>
-void TaskQueue<ExecSpace>::Destroy::destroy_shared_allocation() {
-  m_queue->~TaskQueue();
-}
-
-//----------------------------------------------------------------------------
-
-template <typename ExecSpace>
-TaskQueue<ExecSpace>::TaskQueue(
-    const TaskQueue<ExecSpace>::memory_space &arg_space,
-    unsigned const arg_memory_pool_capacity,
-    unsigned const arg_memory_pool_superblock_capacity_log2)
-    : m_memory(arg_space, arg_memory_pool_capacity,
-               arg_memory_pool_superblock_capacity_log2)
-          m_team_size(unsigned(qthread_num_workers_local(NO_SHEPHERD))),
-      m_accum_alloc(0),
-      m_count_alloc(0),
-      m_max_alloc(0),
-      m_ready_count(0) {}
-
-//----------------------------------------------------------------------------
-
-template <typename ExecSpace>
-TaskQueue<ExecSpace>::~TaskQueue() {
-  // Verify that ready count is zero.
-  if (0 != m_ready_count) {
-    Kokkos::abort("TaskQueue::~TaskQueue ERROR: has ready or executing tasks");
-  }
-}
-
-//----------------------------------------------------------------------------
-
-template <typename ExecSpace>
-KOKKOS_FUNCTION size_t TaskQueue<ExecSpace>::allocate_block_size(size_t n) {
-  return m_memory.allocate_block_size(n);
-}
-
-//----------------------------------------------------------------------------
-
-template <typename ExecSpace>
-KOKKOS_FUNCTION void *TaskQueue<ExecSpace>::allocate(size_t n) {
-  void *const p = m_memory.allocate(n);
-
-  if (p) {
-    Kokkos::atomic_increment(&m_accum_alloc);
-    Kokkos::atomic_increment(&m_count_alloc);
-
-    if (m_max_alloc < m_count_alloc) m_max_alloc = m_count_alloc;
-  }
-
-  return p;
-}
-
-//----------------------------------------------------------------------------
-
-template <typename ExecSpace>
-KOKKOS_FUNCTION void TaskQueue<ExecSpace>::deallocate(void *p, size_t n) {
-  m_memory.deallocate(p, n);
-  Kokkos::atomic_decrement(&m_count_alloc);
-}
-
-//----------------------------------------------------------------------------
-
-template <typename ExecSpace>
-KOKKOS_FUNCTION void TaskQueue<ExecSpace>::schedule(
-    TaskQueue<ExecSpace>::task_root_type *const task) {
-#if 0
-  printf( "schedule( 0x%lx { %d %d %d }\n",
-          uintptr_t(task),
-          task->m_task_type,
-          task->m_priority,
-          task->m_ref_count );
-#endif
-
-  // The task has been constructed and is waiting to be executed.
-  task->m_state = TASK_STATE_WAITING;
-
-  if (task->m_task_type != task_root_type::Aggregate) {
-    // Scheduling a single or team task.
-
-    // Increment active task count before spawning.
-    Kokkos::atomic_increment(m_ready_count);
-
-    if (task->m_dep == 0) {
-      // Schedule a task with no dependences.
-
-      if (task_root_type::TaskTeam == task->m_task_type && m_team_size > 1) {
-        // If more than one shepherd spawn on a shepherd other than this
-        // shepherd
-        const int num_shepherd  = qthread_num_shepherds();
-        const int this_shepherd = qthread_shep();
-        int spawn_shepherd      = (this_shepherd + 1) % num_shepherd;
-
-#if 0
-        fprintf( stdout,
-                 "worker(%d.%d) task 0x%.12lx spawning on shepherd(%d) clone(%d)\n",
-                 qthread_shep(),
-                 qthread_worker_local(NULL),
-                 reinterpret_cast<unsigned long>(this),
-                 spawn_shepherd,
-                 m_team_size - 1
-               );
-        fflush(stdout);
-#endif
-
-        qthread_spawn_cloneable(
-            &task_root_type::qthread_func, task, 0, NULL,
-            0,  // no depenedences
-            0,  // dependences array
-            spawn_shepherd,
-            unsigned(QTHREAD_SPAWN_SIMPLE | QTHREAD_SPAWN_LOCAL_PRIORITY),
-            m_team_size - 1);
-      } else {
-        qthread_spawn(
-            &task_root_type::qthread_func, task, 0, NULL,
-            0,  // no depenedences
-            0,  // dependences array
-            NO_SHEPHERD,
-            QTHREAD_SPAWN_SIMPLE /* allows optimization for non-blocking task */
-        );
-      }
-    } else if (task->m_dep->m_task_type != task_root_type::Aggregate)
-      // Malloc the precondition array to pass to qthread_spawn().  For
-      // non-aggregate tasks, it is a single pointer since there are no
-      // dependences.  Qthreads will eventually free this allocation so memory
-      // will not be leaked. Is malloc thread-safe?  Should this call be
-      // guarded?  The memory can't be allocated from the pool allocator because
-      // Qthreads frees it using free().
-      aligned_t **qprecon = (aligned_t **)malloc(sizeof(aligned_t *));
-
-    *qprecon = reinterpret_cast<aligned_t *>(uintptr_t(m_dep_size));
-
-    if (task->m_task_type == task_root_type::TaskTeam && m_team_size > 1) {
-      // If more than one shepherd spawn on a shepherd other than this shepherd
-      const int num_shepherd  = qthread_num_shepherds();
-      const int this_shepherd = qthread_shep();
-      int spawn_shepherd      = (this_shepherd + 1) % num_shepherd;
-
-#if 0
-  fprintf( stdout,
-           "worker(%d.%d) task 0x%.12lx spawning on shepherd(%d) clone(%d)\n",
-           qthread_shep(),
-           qthread_worker_local(NULL),
-           reinterpret_cast<unsigned long>(this),
-           spawn_shepherd,
-           m_team_size - 1
-         );
-  fflush(stdout);
-#endif
-
-      qthread_spawn_cloneable(
-          &Task::qthread_func, this, 0, NULL, m_dep_size,
-          qprecon, /* dependences */
-          spawn_shepherd,
-          unsigned(QTHREAD_SPAWN_SIMPLE | QTHREAD_SPAWN_LOCAL_PRIORITY),
-          m_team_size - 1);
-    } else {
-      qthread_spawn(
-          &Task::qthread_func,          /* function */
-          this,                         /* function argument */
-          0, NULL, m_dep_size, qprecon, /* dependences */
-          NO_SHEPHERD,
-          QTHREAD_SPAWN_SIMPLE /* allows optimization for non-blocking task */
-      );
-    }
-  } else {
-    // GEM: How do I handle an aggregate (when_all) task?
-  }
-}
-
-//----------------------------------------------------------------------------
-
-template <typename ExecSpace>
-KOKKOS_FUNCTION void TaskQueue<ExecSpace>::reschedule(task_root_type *task) {
-  // Precondition:
-  //   task is in Executing state
-  //   task->m_next == LockTag
-  //
-  // Postcondition:
-  //   task is in Executing-Respawn state
-  //   task->m_next == 0 (no dependence)
-
-  task_root_type *const zero = (task_root_type *)0;
-  task_root_type *const lock = (task_root_type *)task_root_type::LockTag;
-
-  if (lock != Kokkos::atomic_exchange(&task->m_next, zero)) {
-    Kokkos::abort("TaskScheduler::respawn ERROR: already respawned");
-  }
-}
-
-//----------------------------------------------------------------------------
-
-template <typename ExecSpace>
-KOKKOS_FUNCTION void TaskQueue<ExecSpace>::complete(
-    TaskQueue<ExecSpace>::task_root_type *task) {
-  // Complete a runnable task that has finished executing
-  // or a when_all task when all of its dependeneces are complete.
-
-  task_root_type *const zero = (task_root_type *)0;
-  task_root_type *const lock = (task_root_type *)task_root_type::LockTag;
-  task_root_type *const end  = (task_root_type *)task_root_type::EndTag;
-
-#if 0
-  printf( "complete( 0x%lx { 0x%lx 0x%lx %d %d %d }\n",
-          uintptr_t(task),
-          uintptr_t(task->m_wait),
-          uintptr_t(task->m_next),
-          task->m_task_type,
-          task->m_priority,
-          task->m_ref_count
-        );
-  fflush( stdout );
-#endif
-
-  const bool runnable = task_root_type::Aggregate != task->m_task_type;
-
-  //----------------------------------------
-
-  if (runnable && lock != task->m_next) {
-    // Is a runnable task has finished executing and requested respawn.
-    // Schedule the task for subsequent execution.
-
-    schedule(task);
-  }
-  //----------------------------------------
-  else {
-    // Is either an aggregate or a runnable task that executed
-    // and did not respawn.  Transition this task to complete.
-
-    // If 'task' is an aggregate then any of the runnable tasks that
-    // it depends upon may be attempting to complete this 'task'.
-    // Must only transition a task once to complete status.
-    // This is controled by atomically locking the wait queue.
-
-    // Stop other tasks from adding themselves to this task's wait queue
-    // by locking the head of this task's wait queue.
-
-    task_root_type *x = Kokkos::atomic_exchange(&task->m_wait, lock);
-
-    if (x != (task_root_type *)lock) {
-      // This thread has transitioned this 'task' to complete.
-      // 'task' is no longer in a queue and is not executing
-      // so decrement the reference count from 'task's creation.
-      // If no other references to this 'task' then it will be deleted.
-
-      TaskQueue::assign(&task, zero);
-
-      // This thread has exclusive access to the wait list so
-      // the concurrency-safe pop_task function is not needed.
-      // Schedule the tasks that have been waiting on the input 'task',
-      // which may have been deleted.
-
-      while (x != end) {
-        // Set x->m_next = zero  <=  no dependence
-
-        task_root_type *const next =
-            (task_root_type *)Kokkos::atomic_exchange(&x->m_next, zero);
-
-        schedule(x);
-
-        x = next;
-      }
-    }
-  }
-
-  if (runnable) {
-    // A runnable task was popped from a ready queue and executed.
-    // If respawned into a ready queue then the ready count was incremented
-    // so decrement whether respawned or not.
-    Kokkos::atomic_decrement(&m_ready_count);
-  }
-}
-
-//----------------------------------------------------------------------------
-
-template <>
-aligned_t TaskBase<Kokkos::Qthreads, void, void>::qthread_func(void *arg) {
-  using execution_space = Kokkos::Qthreads;
-  using task_root_type  = TaskBase<execution_space, void, void>;
-  using Member          = Kokkos::Impl::QthreadsTeamPolicyMember;
-
-  task_root_type *const task = reinterpret_cast<task_root_type *>(arg);
-
-  // First member of the team change state to executing.
-  // Use compare-exchange to avoid race condition with a respawn.
-  Kokkos::atomic_compare_exchange_strong(&task->m_state,
-                                         queue_type::TASK_STATE_WAITING,
-                                         queue_type::TASK_STATE_EXECUTING);
-
-  if (task_root_type::TaskTeam == task->m_task_type) {
-    if (1 < task->m_queue->m_team_size) {
-      // Team task with team size of more than 1.
-      Member::TaskTeam task_team_tag;
-
-      // Initialize team size and rank with shephered info
-      Member member(task_team_tag);
-
-      (*task->m_apply)(task, &member);
-
-#if 0
-      fprintf( stdout,
-              "worker(%d.%d) task 0x%.12lx executed by member(%d:%d)\n",
-              qthread_shep(),
-              qthread_worker_local(NULL),
-              reinterpret_cast<unsigned long>(task),
-              member.team_rank(),
-              member.team_size()
-            );
-      fflush(stdout);
-#endif
-
-      member.team_barrier();
-      if (member.team_rank() == 0) task->closeout();
-      member.team_barrier();
-    } else {
-      // Team task with team size of 1.
-      Member member;
-      (*task->m_apply)(task, &member);
-      task->closeout();
-    }
-  } else {
-    (*task->m_apply)(task);
-    task->closeout();
-  }
-
-#if 0
-fprintf( stdout
-       , "worker(%d.%d) task 0x%.12lx return\n"
-       , qthread_shep()
-       , qthread_worker_local(NULL)
-       , reinterpret_cast<unsigned long>(task)
-       );
-fflush(stdout);
-#endif
-
-  return 0;
-}
-
-} /* namespace Impl */
-} /* namespace Kokkos */
-
-#endif  /* #if defined( KOKKOS_ENABLE_TASKPOLICY ) */
-#endif  // KOKKOS_QTHREADS_TASKQUEUE_IMPL_HPP
diff --git a/kokkos/core/src/Qthreads/README b/kokkos/core/src/Qthreads/README
deleted file mode 100644
index e35b1f698..000000000
--- a/kokkos/core/src/Qthreads/README
+++ /dev/null
@@ -1,24 +0,0 @@
-
-# This Qthreads back-end uses an experimental branch of the Qthreads repository with special #define options.
-
-# Cloning repository and branch:
-
-git clone git@github.com:Qthreads/qthreads.git qthreads
-
-cd qthreads
-
-# checkout branch with "cloned tasks"
-
-git checkout dev-kokkos
-
-# Configure/autogen
-
-sh autogen.sh
-
-# configure with 'hwloc' installation:
-
-./configure CFLAGS="-DCLONED_TASKS -DQTHREAD_LOCAL_PRIORITY" --with-hwloc=${HWLOCDIR} --prefix=${INSTALLDIR}
-
-# install
-
-make install
diff --git a/kokkos/core/src/ROCm/KokkosExp_ROCm_IterateTile_Refactor.hpp b/kokkos/core/src/ROCm/KokkosExp_ROCm_IterateTile_Refactor.hpp
index 6dbb7d828..608c2ea9f 100644
--- a/kokkos/core/src/ROCm/KokkosExp_ROCm_IterateTile_Refactor.hpp
+++ b/kokkos/core/src/ROCm/KokkosExp_ROCm_IterateTile_Refactor.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/ROCm/Kokkos_ROCm_Atomic.hpp b/kokkos/core/src/ROCm/Kokkos_ROCm_Atomic.hpp
index a22abdd9b..484269f21 100644
--- a/kokkos/core/src/ROCm/Kokkos_ROCm_Atomic.hpp
+++ b/kokkos/core/src/ROCm/Kokkos_ROCm_Atomic.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/ROCm/Kokkos_ROCm_Config.hpp b/kokkos/core/src/ROCm/Kokkos_ROCm_Config.hpp
index ccb88361b..422e425cf 100644
--- a/kokkos/core/src/ROCm/Kokkos_ROCm_Config.hpp
+++ b/kokkos/core/src/ROCm/Kokkos_ROCm_Config.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/ROCm/Kokkos_ROCm_Exec.cpp b/kokkos/core/src/ROCm/Kokkos_ROCm_Exec.cpp
index c3968020a..4c500521b 100644
--- a/kokkos/core/src/ROCm/Kokkos_ROCm_Exec.cpp
+++ b/kokkos/core/src/ROCm/Kokkos_ROCm_Exec.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/ROCm/Kokkos_ROCm_Exec.hpp b/kokkos/core/src/ROCm/Kokkos_ROCm_Exec.hpp
index d90337da6..5f527a19b 100644
--- a/kokkos/core/src/ROCm/Kokkos_ROCm_Exec.hpp
+++ b/kokkos/core/src/ROCm/Kokkos_ROCm_Exec.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/ROCm/Kokkos_ROCm_Impl.cpp b/kokkos/core/src/ROCm/Kokkos_ROCm_Impl.cpp
index c63b201df..aedde5b80 100644
--- a/kokkos/core/src/ROCm/Kokkos_ROCm_Impl.cpp
+++ b/kokkos/core/src/ROCm/Kokkos_ROCm_Impl.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/ROCm/Kokkos_ROCm_Invoke.hpp b/kokkos/core/src/ROCm/Kokkos_ROCm_Invoke.hpp
index 03a41f206..989a4aec9 100644
--- a/kokkos/core/src/ROCm/Kokkos_ROCm_Invoke.hpp
+++ b/kokkos/core/src/ROCm/Kokkos_ROCm_Invoke.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/ROCm/Kokkos_ROCm_Join.hpp b/kokkos/core/src/ROCm/Kokkos_ROCm_Join.hpp
index ad6220bc5..8968663c1 100644
--- a/kokkos/core/src/ROCm/Kokkos_ROCm_Join.hpp
+++ b/kokkos/core/src/ROCm/Kokkos_ROCm_Join.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/ROCm/Kokkos_ROCm_Parallel.hpp b/kokkos/core/src/ROCm/Kokkos_ROCm_Parallel.hpp
index 0cb647de0..8a4d8c07d 100644
--- a/kokkos/core/src/ROCm/Kokkos_ROCm_Parallel.hpp
+++ b/kokkos/core/src/ROCm/Kokkos_ROCm_Parallel.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -293,7 +293,6 @@ class TeamPolicyInternal<Kokkos::Experimental::ROCm, Properties...>
   }
   KOKKOS_INLINE_FUNCTION int team_size() const {
     return (m_team_size > 0) ? m_team_size : Impl::get_max_tile_thread();
-    ;
   }
   KOKKOS_INLINE_FUNCTION int league_size() const { return m_league_size; }
 
@@ -837,7 +836,7 @@ class ParallelFor<F, Kokkos::TeamPolicy<Traits...>,
     if (total_size == 0) return;
 
     const auto shared_size = FunctorTeamShmemSize<F>::value(f, team_size);
-    char* scratch          = NULL;
+    char* scratch          = nullptr;
     char* shared = (char*)rocm_device_allocate(shared_size * league_size +
                                                scratch_size0 * league_size);
     if (0 < scratch_size1)
@@ -889,7 +888,7 @@ class ParallelReduce<FunctorType, Kokkos::RangePolicy<Traits...>, ReducerType,
       const FunctorType& f, const Policy& policy, const ViewType& result_view,
       typename std::enable_if<Kokkos::is_view<ViewType>::value &&
                                   !Kokkos::is_reducer_type<ReducerType>::value,
-                              void*>::type = NULL) {
+                              void*>::type = nullptr) {
     typedef typename Policy::work_tag Tag;
     typedef Kokkos::Impl::FunctorValueTraits<FunctorType, Tag> ValueTraits;
     typedef Kokkos::Impl::FunctorValueInit<FunctorType, Tag> ValueInit;
@@ -1106,7 +1105,7 @@ class ParallelReduce<FunctorType, Kokkos::MDRangePolicy<Traits...>, ReducerType,
   ParallelReduce(const FunctorType& arg_functor, const Policy& arg_policy,
                  const HostViewType& arg_result,
                  typename std::enable_if<Kokkos::is_view<HostViewType>::value,
-                                         void*>::type = NULL)
+                                         void*>::type = nullptr)
       : m_functor(arg_functor),
         m_policy(arg_policy),
         m_reducer(InvalidType()),
@@ -1149,7 +1148,7 @@ class ParallelReduce<FunctorType, Kokkos::TeamPolicy<Traits...>, ReducerType,
       const FunctorType& f, const Policy& policy, const ViewType& result_view,
       typename std::enable_if<Kokkos::is_view<ViewType>::value &&
                                   !Kokkos::is_reducer_type<ReducerType>::value,
-                              void*>::type = NULL) {
+                              void*>::type = nullptr) {
     const int league_size   = policy.league_size();
     const int team_size     = policy.team_size(f);
     const int vector_length = policy.vector_length();
@@ -1172,7 +1171,7 @@ class ParallelReduce<FunctorType, Kokkos::TeamPolicy<Traits...>, ReducerType,
         FunctorTeamShmemSize<FunctorType>::value(f, team_size);
 
     char* shared;
-    char* scratch = NULL;
+    char* scratch = nullptr;
 
     shared = (char*)rocm_device_allocate(league_size *
                                          (shared_size + scratch_size0));
@@ -1223,7 +1222,7 @@ class ParallelReduce<FunctorType, Kokkos::TeamPolicy<Traits...>, ReducerType,
     const int scratch_size1 = policy.scratch_size(1, team_size);
 
     char* shared;
-    char* scratch = NULL;
+    char* scratch = nullptr;
     shared        = (char*)rocm_device_allocate((shared_size + scratch_size0) *
                                          league_size);
     if (0 < scratch_size1)
diff --git a/kokkos/core/src/ROCm/Kokkos_ROCm_Reduce.hpp b/kokkos/core/src/ROCm/Kokkos_ROCm_Reduce.hpp
index 4765f1bbc..59a6a0433 100644
--- a/kokkos/core/src/ROCm/Kokkos_ROCm_Reduce.hpp
+++ b/kokkos/core/src/ROCm/Kokkos_ROCm_Reduce.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/ROCm/Kokkos_ROCm_ReduceScan.hpp b/kokkos/core/src/ROCm/Kokkos_ROCm_ReduceScan.hpp
index c31f569a1..29694a012 100644
--- a/kokkos/core/src/ROCm/Kokkos_ROCm_ReduceScan.hpp
+++ b/kokkos/core/src/ROCm/Kokkos_ROCm_ReduceScan.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/ROCm/Kokkos_ROCm_Scan.hpp b/kokkos/core/src/ROCm/Kokkos_ROCm_Scan.hpp
index a33f26ad2..337550b9f 100644
--- a/kokkos/core/src/ROCm/Kokkos_ROCm_Scan.hpp
+++ b/kokkos/core/src/ROCm/Kokkos_ROCm_Scan.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/ROCm/Kokkos_ROCm_Space.cpp b/kokkos/core/src/ROCm/Kokkos_ROCm_Space.cpp
index 60026cc0a..1a79425f4 100644
--- a/kokkos/core/src/ROCm/Kokkos_ROCm_Space.cpp
+++ b/kokkos/core/src/ROCm/Kokkos_ROCm_Space.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -409,7 +409,7 @@ void* SharedAllocationRecord<Kokkos::Experimental::ROCmSpace, void>::
     allocate_tracked(const Kokkos::Experimental::ROCmSpace& arg_space,
                      const std::string& arg_alloc_label,
                      const size_t arg_alloc_size) {
-  if (!arg_alloc_size) return (void*)0;
+  if (!arg_alloc_size) return nullptr;
 
   SharedAllocationRecord* const r =
       allocate(arg_space, arg_alloc_label, arg_alloc_size);
@@ -621,7 +621,7 @@ namespace Kokkos {
 namespace {
 
 void* rocm_resize_scratch_space(size_t bytes, bool force_shrink) {
-  static void* ptr           = NULL;
+  static void* ptr           = nullptr;
   static size_t current_size = 0;
   if (current_size == 0) {
     current_size = bytes;
diff --git a/kokkos/core/src/ROCm/Kokkos_ROCm_Task.cpp b/kokkos/core/src/ROCm/Kokkos_ROCm_Task.cpp
index 6f5f61f24..53966ca93 100644
--- a/kokkos/core/src/ROCm/Kokkos_ROCm_Task.cpp
+++ b/kokkos/core/src/ROCm/Kokkos_ROCm_Task.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/ROCm/Kokkos_ROCm_Task.hpp b/kokkos/core/src/ROCm/Kokkos_ROCm_Task.hpp
index a4aa41a5a..5b04e9551 100644
--- a/kokkos/core/src/ROCm/Kokkos_ROCm_Task.hpp
+++ b/kokkos/core/src/ROCm/Kokkos_ROCm_Task.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/ROCm/Kokkos_ROCm_Tile.hpp b/kokkos/core/src/ROCm/Kokkos_ROCm_Tile.hpp
index 5ce1d91e0..3d80b4d44 100644
--- a/kokkos/core/src/ROCm/Kokkos_ROCm_Tile.hpp
+++ b/kokkos/core/src/ROCm/Kokkos_ROCm_Tile.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -293,8 +293,9 @@ struct tile_buffer<T[]> {
   }
 
   template <class Action, class Q = T>
-  typename Impl::enable_if<(sizeof(Q) <= 8), void>::type action_at(
-      std::size_t i, Action a) [[hc]] {
+  typename std::enable_if<(sizeof(Q) <= 8), void>::type action_at(std::size_t i,
+                                                                  Action a)
+      [[hc]] {
     element_type* value = (*this)[i];
 #if defined(ROCM15)
     a(value);
@@ -316,7 +317,7 @@ struct tile_buffer<T[]> {
   }
 
   template <class Action, class Q = T>
-  typename Impl::enable_if<!(sizeof(Q) <= 8), void>::type action_at(
+  typename std::enable_if<!(sizeof(Q) <= 8), void>::type action_at(
       std::size_t i, Action a) [[hc]] {
     element_type* value = (*this)[i];
 #if defined(ROCM15)
diff --git a/kokkos/core/src/ROCm/Kokkos_ROCm_Vectorization.hpp b/kokkos/core/src/ROCm/Kokkos_ROCm_Vectorization.hpp
index 9afbf1b53..ae52f8da3 100644
--- a/kokkos/core/src/ROCm/Kokkos_ROCm_Vectorization.hpp
+++ b/kokkos/core/src/ROCm/Kokkos_ROCm_Vectorization.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -163,7 +163,7 @@ float shfl(const float& val, const int& srcLane, const int& width) {
 template <typename Scalar>
 KOKKOS_INLINE_FUNCTION Scalar
 shfl(const Scalar& val, const int& srcLane,
-     const typename Impl::enable_if<(sizeof(Scalar) == 4), int>::type& width) {
+     const typename std::enable_if<(sizeof(Scalar) == 4), int>::type& width) {
   Scalar tmp1 = val;
   float tmp   = *reinterpret_cast<float*>(&tmp1);
   tmp         = __shfl(tmp, srcLane, width);
@@ -182,7 +182,7 @@ double shfl(const double& val, const int& srcLane, const int& width) {
 template <typename Scalar>
 KOKKOS_INLINE_FUNCTION Scalar
 shfl(const Scalar& val, const int& srcLane,
-     const typename Impl::enable_if<(sizeof(Scalar) == 8), int>::type& width) {
+     const typename std::enable_if<(sizeof(Scalar) == 8), int>::type& width) {
   int lo           = __double2loint(*reinterpret_cast<const double*>(&val));
   int hi           = __double2hiint(*reinterpret_cast<const double*>(&val));
   lo               = __shfl(lo, srcLane, width);
@@ -194,7 +194,7 @@ shfl(const Scalar& val, const int& srcLane,
 template <typename Scalar>
 KOKKOS_INLINE_FUNCTION Scalar
 shfl(const Scalar& val, const int& srcLane,
-     const typename Impl::enable_if<(sizeof(Scalar) > 8), int>::type& width) {
+     const typename std::enable_if<(sizeof(Scalar) > 8), int>::type& width) {
   Impl::shfl_union<Scalar> s_val;
   Impl::shfl_union<Scalar> r_val;
   s_val = val;
@@ -217,7 +217,7 @@ float shfl_down(const float& val, const int& delta, const int& width) {
 template <typename Scalar>
 KOKKOS_INLINE_FUNCTION Scalar shfl_down(
     const Scalar& val, const int& delta,
-    const typename Impl::enable_if<(sizeof(Scalar) == 4), int>::type& width) {
+    const typename std::enable_if<(sizeof(Scalar) == 4), int>::type& width) {
   Scalar tmp1 = val;
   float tmp   = *reinterpret_cast<float*>(&tmp1);
   tmp         = __shfl_down(tmp, delta, width);
@@ -245,7 +245,7 @@ double shfl_down(const double& val, const int& delta, const int& width) {
 template <typename Scalar>
 KOKKOS_INLINE_FUNCTION Scalar shfl_down(
     const Scalar& val, const int& delta,
-    const typename Impl::enable_if<(sizeof(Scalar) == 8), int>::type& width) {
+    const typename std::enable_if<(sizeof(Scalar) == 8), int>::type& width) {
   int lo           = __double2loint(*reinterpret_cast<const double*>(&val));
   int hi           = __double2hiint(*reinterpret_cast<const double*>(&val));
   lo               = __shfl_down(lo, delta, width);
@@ -257,7 +257,7 @@ KOKKOS_INLINE_FUNCTION Scalar shfl_down(
 template <typename Scalar>
 KOKKOS_INLINE_FUNCTION Scalar shfl_down(
     const Scalar& val, const int& delta,
-    const typename Impl::enable_if<(sizeof(Scalar) > 8), int>::type& width) {
+    const typename std::enable_if<(sizeof(Scalar) > 8), int>::type& width) {
   Impl::shfl_union<Scalar> s_val;
   Impl::shfl_union<Scalar> r_val;
   s_val = val;
@@ -280,7 +280,7 @@ float shfl_up(const float& val, const int& delta, const int& width) {
 template <typename Scalar>
 KOKKOS_INLINE_FUNCTION Scalar shfl_up(
     const Scalar& val, const int& delta,
-    const typename Impl::enable_if<(sizeof(Scalar) == 4), int>::type& width) {
+    const typename std::enable_if<(sizeof(Scalar) == 4), int>::type& width) {
   Scalar tmp1 = val;
   float tmp   = *reinterpret_cast<float*>(&tmp1);
   tmp         = __shfl_up(tmp, delta, width);
@@ -299,7 +299,7 @@ double shfl_up(const double& val, const int& delta, const int& width) {
 template <typename Scalar>
 KOKKOS_INLINE_FUNCTION Scalar shfl_up(
     const Scalar& val, const int& delta,
-    const typename Impl::enable_if<(sizeof(Scalar) == 8), int>::type& width) {
+    const typename std::enable_if<(sizeof(Scalar) == 8), int>::type& width) {
   int lo           = __double2loint(*reinterpret_cast<const double*>(&val));
   int hi           = __double2hiint(*reinterpret_cast<const double*>(&val));
   lo               = __shfl_up(lo, delta, width);
@@ -309,9 +309,9 @@ KOKKOS_INLINE_FUNCTION Scalar shfl_up(
 }
 
 template <typename Scalar>
-KOKKOS_INLINE_FUNCTION Scalar shfl_up(
-    const Scalar& val, const int& delta,
-    const typename Impl::enable_if<(sizeof(Scalar) > 8), int>::type& width) {
+KOKKOS_INLINE_FUNCTION Scalar
+shfl_up(const Scalar& val, const int& delta,
+        const typename std::enable_if<(sizeof(Scalar) > 8), int>::type& width) {
   Impl::shfl_union<Scalar> s_val;
   Impl::shfl_union<Scalar> r_val;
   s_val = val;
diff --git a/kokkos/core/src/ROCm/Kokkos_ROCm_ViewCopyETIAvail.hpp b/kokkos/core/src/ROCm/Kokkos_ROCm_ViewCopyETIAvail.hpp
index 0ce3dcc6f..018151b30 100644
--- a/kokkos/core/src/ROCm/Kokkos_ROCm_ViewCopyETIAvail.hpp
+++ b/kokkos/core/src/ROCm/Kokkos_ROCm_ViewCopyETIAvail.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/ROCm/Kokkos_ROCm_ViewCopyETIDecl.hpp b/kokkos/core/src/ROCm/Kokkos_ROCm_ViewCopyETIDecl.hpp
index fb8cfef44..db02a49c8 100644
--- a/kokkos/core/src/ROCm/Kokkos_ROCm_ViewCopyETIDecl.hpp
+++ b/kokkos/core/src/ROCm/Kokkos_ROCm_ViewCopyETIDecl.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/Serial/Kokkos_Serial_ViewCopyETIAvail.hpp b/kokkos/core/src/Serial/Kokkos_Serial_ViewCopyETIAvail.hpp
index 4037d90b9..f7d18854d 100644
--- a/kokkos/core/src/Serial/Kokkos_Serial_ViewCopyETIAvail.hpp
+++ b/kokkos/core/src/Serial/Kokkos_Serial_ViewCopyETIAvail.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/Serial/Kokkos_Serial_ViewCopyETIDecl.hpp b/kokkos/core/src/Serial/Kokkos_Serial_ViewCopyETIDecl.hpp
index 42788809d..1410a7eea 100644
--- a/kokkos/core/src/Serial/Kokkos_Serial_ViewCopyETIDecl.hpp
+++ b/kokkos/core/src/Serial/Kokkos_Serial_ViewCopyETIDecl.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/Threads/Kokkos_ThreadsExec.cpp b/kokkos/core/src/Threads/Kokkos_ThreadsExec.cpp
index 8ed7d9b65..7adfd127d 100644
--- a/kokkos/core/src/Threads/Kokkos_ThreadsExec.cpp
+++ b/kokkos/core/src/Threads/Kokkos_ThreadsExec.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -65,7 +65,7 @@ namespace Impl {
 namespace {
 
 ThreadsExec s_threads_process;
-ThreadsExec *s_threads_exec[ThreadsExec::MAX_THREAD_COUNT] = {0};
+ThreadsExec *s_threads_exec[ThreadsExec::MAX_THREAD_COUNT] = {nullptr};
 pthread_t s_threads_pid[ThreadsExec::MAX_THREAD_COUNT]     = {0};
 std::pair<unsigned, unsigned> s_threads_coord[ThreadsExec::MAX_THREAD_COUNT];
 
@@ -75,11 +75,9 @@ unsigned s_current_reduce_size = 0;
 unsigned s_current_shared_size = 0;
 
 void (*volatile s_current_function)(ThreadsExec &, const void *);
-const void *volatile s_current_function_arg = 0;
+const void *volatile s_current_function_arg = nullptr;
 
 struct Sentinel {
-  Sentinel() {}
-
   ~Sentinel() {
     if (s_thread_pool_size[0] || s_thread_pool_size[1] ||
         s_thread_pool_size[2] || s_current_reduce_size ||
@@ -129,8 +127,8 @@ void ThreadsExec::driver(void) {
 }
 
 ThreadsExec::ThreadsExec()
-    : m_pool_base(0),
-      m_scratch(0),
+    : m_pool_base(nullptr),
+      m_scratch(nullptr),
       m_scratch_reduce_end(0),
       m_scratch_thread_end(0),
       m_numa_rank(0),
@@ -142,7 +140,7 @@ ThreadsExec::ThreadsExec()
   if (&s_threads_process != this) {
     // A spawned thread
 
-    ThreadsExec *const nil = 0;
+    ThreadsExec *const nil = nullptr;
 
     // Which entry in 's_threads_exec', possibly determined from hwloc binding
     const int entry =
@@ -192,12 +190,12 @@ ThreadsExec::~ThreadsExec() {
   if (m_scratch) {
     Record *const r = Record::get_record(m_scratch);
 
-    m_scratch = 0;
+    m_scratch = nullptr;
 
     Record::decrement(r);
   }
 
-  m_pool_base          = 0;
+  m_pool_base          = nullptr;
   m_scratch_reduce_end = 0;
   m_scratch_thread_end = 0;
   m_numa_rank          = 0;
@@ -209,7 +207,7 @@ ThreadsExec::~ThreadsExec() {
   m_pool_state = ThreadsExec::Terminating;
 
   if (&s_threads_process != this && entry < MAX_THREAD_COUNT) {
-    ThreadsExec *const nil = 0;
+    ThreadsExec *const nil = nullptr;
 
     atomic_compare_exchange(s_threads_exec + entry, this, nil);
 
@@ -223,13 +221,13 @@ ThreadsExec *ThreadsExec::get_thread(const int init_thread_rank) {
   ThreadsExec *const th =
       init_thread_rank < s_thread_pool_size[0]
           ? s_threads_exec[s_thread_pool_size[0] - (init_thread_rank + 1)]
-          : 0;
+          : nullptr;
 
-  if (0 == th || th->m_pool_rank != init_thread_rank) {
+  if (nullptr == th || th->m_pool_rank != init_thread_rank) {
     std::ostringstream msg;
     msg << "Kokkos::Impl::ThreadsExec::get_thread ERROR : "
         << "thread " << init_thread_rank << " of " << s_thread_pool_size[0];
-    if (0 == th) {
+    if (nullptr == th) {
       msg << " does not exist";
     } else {
       msg << " has wrong thread_rank " << th->m_pool_rank;
@@ -299,8 +297,8 @@ void ThreadsExec::fence() {
                                     ThreadsExec::Active);
   }
 
-  s_current_function     = 0;
-  s_current_function_arg = 0;
+  s_current_function     = nullptr;
+  s_current_function_arg = nullptr;
 
   // Make sure function and arguments are cleared before
   // potentially re-activating threads with a subsequent launch.
@@ -364,7 +362,7 @@ bool ThreadsExec::wake() {
   ThreadsExec::global_unlock();
 
   if (s_threads_process.m_pool_base) {
-    execute_sleep(s_threads_process, 0);
+    execute_sleep(s_threads_process, nullptr);
     s_threads_process.m_pool_state = ThreadsExec::Inactive;
   }
 
@@ -394,12 +392,12 @@ void ThreadsExec::execute_serial(void (*func)(ThreadsExec &, const void *)) {
 
   if (s_threads_process.m_pool_base) {
     s_threads_process.m_pool_state = ThreadsExec::Active;
-    (*func)(s_threads_process, 0);
+    (*func)(s_threads_process, nullptr);
     s_threads_process.m_pool_state = ThreadsExec::Inactive;
   }
 
-  s_current_function_arg = 0;
-  s_current_function     = 0;
+  s_current_function_arg = nullptr;
+  s_current_function     = nullptr;
 
   // Make sure function and arguments are cleared before proceeding.
   memory_fence();
@@ -417,7 +415,7 @@ void ThreadsExec::execute_resize_scratch(ThreadsExec &exec, const void *) {
   if (exec.m_scratch) {
     Record *const r = Record::get_record(exec.m_scratch);
 
-    exec.m_scratch = 0;
+    exec.m_scratch = nullptr;
 
     Record::decrement(r);
   }
@@ -508,7 +506,7 @@ void ThreadsExec::print_configuration(std::ostream &s, const bool detail) {
     s << " threads[" << s_thread_pool_size[0] << "]"
       << " threads_per_numa[" << s_thread_pool_size[1] << "]"
       << " threads_per_core[" << s_thread_pool_size[2] << "]";
-    if (0 == s_threads_process.m_pool_base) {
+    if (nullptr == s_threads_process.m_pool_base) {
       s << " Asynchronous";
     }
     s << " ReduceScratch[" << s_current_reduce_size << "]"
@@ -547,19 +545,20 @@ void ThreadsExec::print_configuration(std::ostream &s, const bool detail) {
 
 //----------------------------------------------------------------------------
 
-int ThreadsExec::is_initialized() { return 0 != s_threads_exec[0]; }
+int ThreadsExec::is_initialized() { return nullptr != s_threads_exec[0]; }
 
 void ThreadsExec::initialize(unsigned thread_count, unsigned use_numa_count,
                              unsigned use_cores_per_numa,
                              bool allow_asynchronous_threadpool) {
-  static const Sentinel sentinel;
+  // need to provide an initializer for Intel compilers
+  static const Sentinel sentinel = {};
 
   const bool is_initialized = 0 != s_thread_pool_size[0];
 
   unsigned thread_spawn_failed = 0;
 
   for (int i = 0; i < ThreadsExec::MAX_THREAD_COUNT; i++)
-    s_threads_exec[i] = NULL;
+    s_threads_exec[i] = nullptr;
 
   if (!is_initialized) {
     // If thread_count, use_numa_count, or use_cores_per_numa are zero
@@ -611,7 +610,7 @@ void ThreadsExec::initialize(unsigned thread_count, unsigned use_numa_count,
 
       // Spawn thread executing the 'driver()' function.
       // Wait until spawned thread has attempted to initialize.
-      // If spawning and initialization is successfull then
+      // If spawning and initialization is successful then
       // an entry in 's_threads_exec' will be assigned.
       if (ThreadsExec::spawn()) {
         wait_yield(s_threads_process.m_pool_state, ThreadsExec::Inactive);
@@ -631,15 +630,15 @@ void ThreadsExec::initialize(unsigned thread_count, unsigned use_numa_count,
       }
     }
 
-    s_current_function             = 0;
-    s_current_function_arg         = 0;
+    s_current_function             = nullptr;
+    s_current_function_arg         = nullptr;
     s_threads_process.m_pool_state = ThreadsExec::Inactive;
 
     memory_fence();
 
     if (!thread_spawn_failed) {
       // Bind process to the core on which it was located before spawning
-      // occured
+      // occurred
       if (hwloc_can_bind) {
         Kokkos::hwloc::bind_this_thread(proc_coord);
       }
@@ -659,7 +658,7 @@ void ThreadsExec::initialize(unsigned thread_count, unsigned use_numa_count,
             s_threads_process.m_pool_rank, s_threads_process.m_pool_size);
         s_threads_pid[s_threads_process.m_pool_rank] = pthread_self();
       } else {
-        s_threads_process.m_pool_base     = 0;
+        s_threads_process.m_pool_base     = nullptr;
         s_threads_process.m_pool_rank     = 0;
         s_threads_process.m_pool_size     = 0;
         s_threads_process.m_pool_fan_size = 0;
@@ -740,7 +739,7 @@ void ThreadsExec::finalize() {
 
   if (s_threads_process.m_pool_base) {
     (&s_threads_process)->~ThreadsExec();
-    s_threads_exec[0] = 0;
+    s_threads_exec[0] = nullptr;
   }
 
   if (Kokkos::hwloc::can_bind_threads()) {
@@ -754,7 +753,7 @@ void ThreadsExec::finalize() {
   // Reset master thread to run solo.
   s_threads_process.m_numa_rank      = 0;
   s_threads_process.m_numa_core_rank = 0;
-  s_threads_process.m_pool_base      = 0;
+  s_threads_process.m_pool_base      = nullptr;
   s_threads_process.m_pool_rank      = 0;
   s_threads_process.m_pool_size      = 1;
   s_threads_process.m_pool_fan_size  = 0;
diff --git a/kokkos/core/src/Threads/Kokkos_ThreadsExec.hpp b/kokkos/core/src/Threads/Kokkos_ThreadsExec.hpp
index cbffdc20d..1b11f45b7 100644
--- a/kokkos/core/src/Threads/Kokkos_ThreadsExec.hpp
+++ b/kokkos/core/src/Threads/Kokkos_ThreadsExec.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/Threads/Kokkos_ThreadsExec_base.cpp b/kokkos/core/src/Threads/Kokkos_ThreadsExec_base.cpp
index 6b0439430..40a09ed22 100644
--- a/kokkos/core/src/Threads/Kokkos_ThreadsExec_base.cpp
+++ b/kokkos/core/src/Threads/Kokkos_ThreadsExec_base.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -52,7 +52,7 @@
 #include <sched.h>
 #include <errno.h>
 
-/* Standard C++ libaries */
+/* Standard C++ libraries */
 
 #include <cstdlib>
 #include <string>
@@ -87,7 +87,7 @@ void* internal_pthread_driver(void*) {
     std::cerr.flush();
     std::abort();
   }
-  return NULL;
+  return nullptr;
 }
 
 }  // namespace
@@ -105,7 +105,7 @@ bool ThreadsExec::spawn() {
       0 == pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED)) {
     pthread_t pt;
 
-    result = 0 == pthread_create(&pt, &attr, internal_pthread_driver, 0);
+    result = 0 == pthread_create(&pt, &attr, internal_pthread_driver, nullptr);
   }
 
   pthread_attr_destroy(&attr);
@@ -153,7 +153,7 @@ void ThreadsExec::wait_yield(volatile int& flag, const int value) {
 #include <windows.h>
 #include <process.h>
 
-/* Standard C++ libaries */
+/* Standard C++ libraries */
 
 #include <cstdlib>
 #include <string>
diff --git a/kokkos/core/src/Threads/Kokkos_ThreadsTeam.hpp b/kokkos/core/src/Threads/Kokkos_ThreadsTeam.hpp
index fda665c4d..fe1a1e8b0 100644
--- a/kokkos/core/src/Threads/Kokkos_ThreadsTeam.hpp
+++ b/kokkos/core/src/Threads/Kokkos_ThreadsTeam.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -169,7 +169,10 @@ class ThreadsExecTeamMember {
   KOKKOS_INLINE_FUNCTION void team_broadcast(ValueType& value,
                                              const int& thread_id) const {
 #if !defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST)
-    {}
+    {
+      (void)value;
+      (void)thread_id;
+    }
 #else
     // Make sure there is enough scratch space:
     typedef typename if_c<sizeof(ValueType) < TEAM_REDUCE_SIZE, ValueType,
@@ -177,6 +180,8 @@ class ThreadsExecTeamMember {
 
     if (m_team_base) {
       type* const local_value = ((type*)m_team_base[0]->scratch_memory());
+      memory_fence();
+      team_barrier();
       if (team_rank() == thread_id) *local_value = value;
       memory_fence();
       team_barrier();
@@ -189,7 +194,11 @@ class ThreadsExecTeamMember {
   KOKKOS_INLINE_FUNCTION void team_broadcast(Closure const& f, ValueType& value,
                                              const int& thread_id) const {
 #if !defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST)
-    {}
+    {
+      (void)f;
+      (void)value;
+      (void)thread_id;
+    }
 #else
     // Make sure there is enough scratch space:
     typedef typename if_c<sizeof(ValueType) < TEAM_REDUCE_SIZE, ValueType,
@@ -197,6 +206,8 @@ class ThreadsExecTeamMember {
     f(value);
     if (m_team_base) {
       type* const local_value = ((type*)m_team_base[0]->scratch_memory());
+      memory_fence();
+      team_barrier();
       if (team_rank() == thread_id) *local_value = value;
       memory_fence();
       team_barrier();
@@ -211,7 +222,7 @@ class ThreadsExecTeamMember {
       team_reduce(const Type& value) const
 #if !defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST)
   {
-    return Type();
+    return value;
   }
 #else
   {
@@ -221,13 +232,15 @@ class ThreadsExecTeamMember {
 
     if (0 == m_exec) return value;
 
-    *((volatile type*)m_exec->scratch_memory()) = value;
+    if (team_rank() != team_size() - 1)
+      *((volatile type*)m_exec->scratch_memory()) = value;
 
     memory_fence();
 
     type& accum = *((type*)m_team_base[0]->scratch_memory());
 
     if (team_fan_in()) {
+      accum = value;
       for (int i = 1; i < m_team_size; ++i) {
         accum += *((type*)m_team_base[i]->scratch_memory());
       }
@@ -267,7 +280,7 @@ class ThreadsExecTeamMember {
     type* const local_value = ((type*)m_exec->scratch_memory());
 
     // Set this thread's contribution
-    *local_value = contribution;
+    if (team_rank() != team_size() - 1) *local_value = contribution;
 
     // Fence to make sure the base team member has access:
     memory_fence();
@@ -277,6 +290,7 @@ class ThreadsExecTeamMember {
       // team_fan_out()
       type* const team_value = ((type*)m_team_base[0]->scratch_memory());
 
+      *team_value = contribution;
       // Join to the team value:
       for (int i = 1; i < m_team_size; ++i) {
         reducer.join(*team_value, *((type*)m_team_base[i]->scratch_memory()));
@@ -313,7 +327,8 @@ class ThreadsExecTeamMember {
                                            ArgType* const global_accum) const
 #if !defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST)
   {
-    return ArgType();
+    (void)global_accum;
+    return value;
   }
 #else
   {
@@ -607,6 +622,11 @@ class TeamPolicyInternal<Kokkos::Threads, Properties...>
 
   typedef PolicyTraits<Properties...> traits;
 
+  const typename traits::execution_space& space() const {
+    static typename traits::execution_space m_space;
+    return m_space;
+  }
+
   TeamPolicyInternal& operator=(const TeamPolicyInternal& p) {
     m_league_size            = p.m_league_size;
     m_team_size              = p.m_team_size;
@@ -1167,7 +1187,8 @@ namespace Kokkos {
 
 template <class FunctorType>
 KOKKOS_INLINE_FUNCTION void single(
-    const Impl::VectorSingleStruct<Impl::ThreadsExecTeamMember>& single_struct,
+    const Impl::VectorSingleStruct<
+        Impl::ThreadsExecTeamMember>& /*single_struct*/,
     const FunctorType& lambda) {
   lambda();
 }
@@ -1181,7 +1202,8 @@ KOKKOS_INLINE_FUNCTION void single(
 
 template <class FunctorType, class ValueType>
 KOKKOS_INLINE_FUNCTION void single(
-    const Impl::VectorSingleStruct<Impl::ThreadsExecTeamMember>& single_struct,
+    const Impl::VectorSingleStruct<
+        Impl::ThreadsExecTeamMember>& /*single_struct*/,
     const FunctorType& lambda, ValueType& val) {
   lambda(val);
 }
diff --git a/kokkos/core/src/Threads/Kokkos_Threads_Parallel.hpp b/kokkos/core/src/Threads/Kokkos_Threads_Parallel.hpp
index 349e4d903..fbc83e9a5 100644
--- a/kokkos/core/src/Threads/Kokkos_Threads_Parallel.hpp
+++ b/kokkos/core/src/Threads/Kokkos_Threads_Parallel.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -492,7 +492,7 @@ class ParallelReduce<FunctorType, Kokkos::RangePolicy<Traits...>, ReducerType,
       const HostViewType &arg_result_view,
       typename std::enable_if<Kokkos::is_view<HostViewType>::value &&
                                   !Kokkos::is_reducer_type<ReducerType>::value,
-                              void *>::type = NULL)
+                              void *>::type = nullptr)
       : m_functor(arg_functor),
         m_policy(arg_policy),
         m_reducer(InvalidType()),
@@ -650,7 +650,7 @@ class ParallelReduce<FunctorType, Kokkos::MDRangePolicy<Traits...>, ReducerType,
       const HostViewType &arg_result_view,
       typename std::enable_if<Kokkos::is_view<HostViewType>::value &&
                                   !Kokkos::is_reducer_type<ReducerType>::value,
-                              void *>::type = NULL)
+                              void *>::type = nullptr)
       : m_functor(arg_functor),
         m_mdr_policy(arg_policy),
         m_policy(Policy(0, m_mdr_policy.m_num_tiles).set_chunk_size(1)),
@@ -774,7 +774,7 @@ class ParallelReduce<FunctorType, Kokkos::TeamPolicy<Properties...>,
       const ViewType &arg_result,
       typename std::enable_if<Kokkos::is_view<ViewType>::value &&
                                   !Kokkos::is_reducer_type<ReducerType>::value,
-                              void *>::type = NULL)
+                              void *>::type = nullptr)
       : m_functor(arg_functor),
         m_policy(arg_policy),
         m_reducer(InvalidType()),
diff --git a/kokkos/core/src/Threads/Kokkos_Threads_ViewCopyETIAvail.hpp b/kokkos/core/src/Threads/Kokkos_Threads_ViewCopyETIAvail.hpp
index ad9f19e6e..c3c416c4c 100644
--- a/kokkos/core/src/Threads/Kokkos_Threads_ViewCopyETIAvail.hpp
+++ b/kokkos/core/src/Threads/Kokkos_Threads_ViewCopyETIAvail.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/Threads/Kokkos_Threads_ViewCopyETIDecl.hpp b/kokkos/core/src/Threads/Kokkos_Threads_ViewCopyETIDecl.hpp
index b73c100f0..eb287c0db 100644
--- a/kokkos/core/src/Threads/Kokkos_Threads_ViewCopyETIDecl.hpp
+++ b/kokkos/core/src/Threads/Kokkos_Threads_ViewCopyETIDecl.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/Threads/Kokkos_Threads_WorkGraphPolicy.hpp b/kokkos/core/src/Threads/Kokkos_Threads_WorkGraphPolicy.hpp
index f250c24d2..7bcd9aaee 100644
--- a/kokkos/core/src/Threads/Kokkos_Threads_WorkGraphPolicy.hpp
+++ b/kokkos/core/src/Threads/Kokkos_Threads_WorkGraphPolicy.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -87,9 +87,10 @@ class ParallelFor<FunctorType, Kokkos::WorkGraphPolicy<Traits...>,
     }
   }
 
-  static inline void thread_main(ThreadsExec&, const void* arg) noexcept {
+  static inline void thread_main(ThreadsExec& exec, const void* arg) noexcept {
     const Self& self = *(static_cast<const Self*>(arg));
     self.exec_one_thread();
+    exec.fan_in();
   }
 
  public:
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank1.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank1.cpp
index 1cde6a5b5..a72781d8a 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank1.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank2.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank2.cpp
index d0e79f452..86600a2d3 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank2.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank3.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank3.cpp
index ccca17e1e..1f4e93ec2 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank3.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank4.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank4.cpp
index f0637eac3..e6d965eb4 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank4.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank5.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank5.cpp
index 4c9e5f383..5bb1ce76e 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank5.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank8.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank8.cpp
index 547b0e46a..cad6e9b67 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank8.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutRight_Rank1.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutRight_Rank1.cpp
index bd5eb79dc..5c31da459 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutRight_Rank1.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutRight_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutRight_Rank2.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutRight_Rank2.cpp
index 8153682e7..7ef6acb4b 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutRight_Rank2.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutRight_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutRight_Rank3.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutRight_Rank3.cpp
index bd58b7ef6..5680b8581 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutRight_Rank3.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutRight_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutRight_Rank4.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutRight_Rank4.cpp
index ee7209a87..bae1ee882 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutRight_Rank4.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutRight_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutRight_Rank5.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutRight_Rank5.cpp
index 4896686e2..9ad5912c0 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutRight_Rank5.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutRight_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutRight_Rank8.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutRight_Rank8.cpp
index e4efb0bec..12806d1c5 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutRight_Rank8.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutRight_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutStride_Rank1.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutStride_Rank1.cpp
index ef3ffc980..0330b205d 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutStride_Rank1.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutStride_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutStride_Rank2.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutStride_Rank2.cpp
index 637a84544..10e894125 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutStride_Rank2.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutStride_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutStride_Rank3.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutStride_Rank3.cpp
index 13279de2b..7cec35266 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutStride_Rank3.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutStride_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutStride_Rank4.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutStride_Rank4.cpp
index 6de1749e0..5bb6913cc 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutStride_Rank4.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutStride_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutStride_Rank5.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutStride_Rank5.cpp
index e67e822c8..f138a2049 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutStride_Rank5.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutStride_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutStride_Rank8.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutStride_Rank8.cpp
index 4e3a981cf..e1901422d 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutStride_Rank8.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_double_LayoutStride_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank1.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank1.cpp
index 41e3f6e3b..c4a52c2de 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank1.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank2.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank2.cpp
index 6fe3fe756..dab83bfb1 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank2.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank3.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank3.cpp
index 98eefffd4..522303b44 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank3.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank4.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank4.cpp
index 075a37310..608b4d4c2 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank4.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank5.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank5.cpp
index 547430ca3..2c33f7fac 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank5.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank8.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank8.cpp
index c59242249..3ad16222e 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank8.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutRight_Rank1.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutRight_Rank1.cpp
index a423d36c1..47f39d7ae 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutRight_Rank1.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutRight_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutRight_Rank2.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutRight_Rank2.cpp
index bb2008b7e..bca253b75 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutRight_Rank2.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutRight_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutRight_Rank3.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutRight_Rank3.cpp
index 5bd714dcb..20fadbd5d 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutRight_Rank3.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutRight_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutRight_Rank4.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutRight_Rank4.cpp
index 992924e94..4d4716510 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutRight_Rank4.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutRight_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutRight_Rank5.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutRight_Rank5.cpp
index 6512df387..42fa2c7b4 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutRight_Rank5.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutRight_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutRight_Rank8.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutRight_Rank8.cpp
index add8d12eb..a3cd8cc99 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutRight_Rank8.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutRight_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutStride_Rank1.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutStride_Rank1.cpp
index 71a033447..9efcc720c 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutStride_Rank1.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutStride_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutStride_Rank2.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutStride_Rank2.cpp
index 5e4f2cf91..c34c6a391 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutStride_Rank2.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutStride_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutStride_Rank3.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutStride_Rank3.cpp
index 61834ccc4..6d7cf16fa 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutStride_Rank3.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutStride_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutStride_Rank4.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutStride_Rank4.cpp
index c570bccd3..ddd65c01a 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutStride_Rank4.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutStride_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutStride_Rank5.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutStride_Rank5.cpp
index 01e4a1e8e..ae41d1939 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutStride_Rank5.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutStride_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutStride_Rank8.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutStride_Rank8.cpp
index 0ea499050..5d349b699 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutStride_Rank8.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_float_LayoutStride_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank1.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank1.cpp
index 1e5dcd105..c60df3767 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank1.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank2.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank2.cpp
index 6f7b062b5..cfce1b791 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank2.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank3.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank3.cpp
index bbc58f46f..659ef1837 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank3.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank4.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank4.cpp
index fbddd5252..84eb99185 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank4.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank5.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank5.cpp
index dd812a4f8..7f98cebd6 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank5.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank8.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank8.cpp
index 76df5a56b..f26ae1e4e 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank8.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank1.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank1.cpp
index 095d015f0..a5167f6fa 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank1.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank2.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank2.cpp
index 881dbed18..60658f0bd 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank2.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank3.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank3.cpp
index 62c0a1a83..f74d41f90 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank3.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank4.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank4.cpp
index 32e2b6616..034596674 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank4.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank5.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank5.cpp
index 98c661ce4..bfbaaaec7 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank5.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank8.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank8.cpp
index 2b7527618..1be20a18f 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank8.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank1.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank1.cpp
index f9d0b211c..51394ca35 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank1.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank2.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank2.cpp
index 2ce87df05..df4ef48e3 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank2.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank3.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank3.cpp
index fb51f35b1..83671a7ca 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank3.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank4.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank4.cpp
index 1003ca4ee..e652e268b 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank4.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank5.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank5.cpp
index fc256368a..2b6b50a89 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank5.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank8.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank8.cpp
index eb96b5c48..072569f7e 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank8.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank1.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank1.cpp
index 43e19744d..b2bb00cb8 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank1.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank2.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank2.cpp
index a936e15ac..39615042e 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank2.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank3.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank3.cpp
index e8efb4864..a98a7aad2 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank3.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank4.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank4.cpp
index d626de437..e557600c6 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank4.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank5.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank5.cpp
index 6d1e45763..0e31670af 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank5.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank8.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank8.cpp
index 3150bc26e..873bcb274 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank8.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutRight_Rank1.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutRight_Rank1.cpp
index 0eb3ea7d7..0cb8e8f22 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutRight_Rank1.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutRight_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutRight_Rank2.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutRight_Rank2.cpp
index 1f6492ef9..120fbd427 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutRight_Rank2.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutRight_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutRight_Rank3.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutRight_Rank3.cpp
index 7205458dd..181c8df8d 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutRight_Rank3.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutRight_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutRight_Rank4.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutRight_Rank4.cpp
index 348f1c1a2..0e7254d25 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutRight_Rank4.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutRight_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutRight_Rank5.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutRight_Rank5.cpp
index 2de8f7c11..e0a383743 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutRight_Rank5.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutRight_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutRight_Rank8.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutRight_Rank8.cpp
index 062dced31..4bcab3263 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutRight_Rank8.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutRight_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutStride_Rank1.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutStride_Rank1.cpp
index 7d88e4908..4fc3ffeac 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutStride_Rank1.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutStride_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutStride_Rank2.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutStride_Rank2.cpp
index aa136bac0..cf63d330b 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutStride_Rank2.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutStride_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutStride_Rank3.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutStride_Rank3.cpp
index 7d3c8a772..e3ec8d7a0 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutStride_Rank3.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutStride_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutStride_Rank4.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutStride_Rank4.cpp
index fce597033..9e8739ba3 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutStride_Rank4.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutStride_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutStride_Rank5.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutStride_Rank5.cpp
index 7c5fc3ccb..30a6e366f 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutStride_Rank5.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutStride_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutStride_Rank8.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutStride_Rank8.cpp
index 0becc936a..1d7eedd9f 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutStride_Rank8.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int64_t_int_LayoutStride_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutLeft_Rank1.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutLeft_Rank1.cpp
index f1a58364c..372bc02c3 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutLeft_Rank1.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutLeft_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutLeft_Rank2.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutLeft_Rank2.cpp
index fee1dd5ec..9c9328f21 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutLeft_Rank2.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutLeft_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutLeft_Rank3.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutLeft_Rank3.cpp
index 442753a9a..86a85d220 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutLeft_Rank3.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutLeft_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutLeft_Rank4.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutLeft_Rank4.cpp
index 18151e8a7..251bf7dd1 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutLeft_Rank4.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutLeft_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutLeft_Rank5.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutLeft_Rank5.cpp
index e38c452e2..f0c0d7939 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutLeft_Rank5.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutLeft_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutLeft_Rank8.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutLeft_Rank8.cpp
index 640c331ac..1b094259f 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutLeft_Rank8.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutLeft_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutRight_Rank1.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutRight_Rank1.cpp
index 25de09625..82b8f87fa 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutRight_Rank1.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutRight_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutRight_Rank2.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutRight_Rank2.cpp
index 6db95d4aa..daf8a4d1e 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutRight_Rank2.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutRight_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutRight_Rank3.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutRight_Rank3.cpp
index c7f3c8933..bbdd48bfd 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutRight_Rank3.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutRight_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutRight_Rank4.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutRight_Rank4.cpp
index 1586f4fb5..093c250d5 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutRight_Rank4.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutRight_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutRight_Rank5.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutRight_Rank5.cpp
index 9cb5814a1..c8472757c 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutRight_Rank5.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutRight_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutRight_Rank8.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutRight_Rank8.cpp
index 597a6c7ac..f8a929113 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutRight_Rank8.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutRight_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutStride_Rank1.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutStride_Rank1.cpp
index fb0c31562..f47423fc1 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutStride_Rank1.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutStride_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutStride_Rank2.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutStride_Rank2.cpp
index e4ccc5033..f9b8d6dba 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutStride_Rank2.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutStride_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutStride_Rank3.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutStride_Rank3.cpp
index e64efc73c..8dd503b5a 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutStride_Rank3.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutStride_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutStride_Rank4.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutStride_Rank4.cpp
index b1121d845..f93171345 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutStride_Rank4.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutStride_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutStride_Rank5.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutStride_Rank5.cpp
index e3a9a8555..9105b908b 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutStride_Rank5.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutStride_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutStride_Rank8.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutStride_Rank8.cpp
index 55a2ebeee..6f92bf8f5 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutStride_Rank8.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_double_LayoutStride_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutLeft_Rank1.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutLeft_Rank1.cpp
index 8aa937e26..6538490fe 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutLeft_Rank1.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutLeft_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutLeft_Rank2.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutLeft_Rank2.cpp
index 884d50a9b..c7a793b3d 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutLeft_Rank2.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutLeft_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutLeft_Rank3.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutLeft_Rank3.cpp
index 7fb378d00..7e5c7b56f 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutLeft_Rank3.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutLeft_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutLeft_Rank4.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutLeft_Rank4.cpp
index 80cace19b..dcf704369 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutLeft_Rank4.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutLeft_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutLeft_Rank5.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutLeft_Rank5.cpp
index 8babd4049..3bd6920f4 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutLeft_Rank5.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutLeft_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutLeft_Rank8.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutLeft_Rank8.cpp
index 4468b6886..d75d3f924 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutLeft_Rank8.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutLeft_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutRight_Rank1.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutRight_Rank1.cpp
index 91f33295c..640fd04e9 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutRight_Rank1.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutRight_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutRight_Rank2.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutRight_Rank2.cpp
index 2fc663053..b17601cf0 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutRight_Rank2.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutRight_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutRight_Rank3.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutRight_Rank3.cpp
index 2a7d0b47d..a039d13f1 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutRight_Rank3.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutRight_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutRight_Rank4.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutRight_Rank4.cpp
index ae44f1b87..0f4ac7de1 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutRight_Rank4.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutRight_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutRight_Rank5.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutRight_Rank5.cpp
index 54677d347..892f51c21 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutRight_Rank5.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutRight_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutRight_Rank8.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutRight_Rank8.cpp
index 08902c18f..ab96396e6 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutRight_Rank8.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutRight_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutStride_Rank1.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutStride_Rank1.cpp
index 7f60564c6..762c1f8f6 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutStride_Rank1.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutStride_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutStride_Rank2.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutStride_Rank2.cpp
index cb85501e4..63c6bdc8a 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutStride_Rank2.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutStride_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutStride_Rank3.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutStride_Rank3.cpp
index 42dff4adf..5f0dc1f6e 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutStride_Rank3.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutStride_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutStride_Rank4.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutStride_Rank4.cpp
index 81781437d..d3eab4fe8 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutStride_Rank4.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutStride_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutStride_Rank5.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutStride_Rank5.cpp
index 4ca0c5f97..36d34aaff 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutStride_Rank5.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutStride_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutStride_Rank8.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutStride_Rank8.cpp
index eb6e1d2fa..1d9022f38 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutStride_Rank8.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_float_LayoutStride_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank1.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank1.cpp
index 0d05e9eb5..89172d0ef 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank1.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank2.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank2.cpp
index 74a56297f..c14394738 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank2.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank3.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank3.cpp
index f01fc7349..395dae627 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank3.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank4.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank4.cpp
index f34eda770..8c192533f 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank4.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank5.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank5.cpp
index 7f3180511..22153b115 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank5.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank8.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank8.cpp
index a11043974..0e5d27687 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank8.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutRight_Rank1.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutRight_Rank1.cpp
index a61fb78f8..d8b91a00f 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutRight_Rank1.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutRight_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutRight_Rank2.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutRight_Rank2.cpp
index 63f8c2bcf..08798db54 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutRight_Rank2.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutRight_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutRight_Rank3.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutRight_Rank3.cpp
index d33b22c9d..f371b9535 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutRight_Rank3.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutRight_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutRight_Rank4.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutRight_Rank4.cpp
index 737399b97..6b29dcd94 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutRight_Rank4.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutRight_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutRight_Rank5.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutRight_Rank5.cpp
index 74e0619db..8deb69b61 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutRight_Rank5.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutRight_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutRight_Rank8.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutRight_Rank8.cpp
index d968fcc06..fbd4a498c 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutRight_Rank8.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutRight_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutStride_Rank1.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutStride_Rank1.cpp
index abda55e27..b3c31de32 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutStride_Rank1.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutStride_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutStride_Rank2.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutStride_Rank2.cpp
index cba5819d8..6fab29106 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutStride_Rank2.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutStride_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutStride_Rank3.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutStride_Rank3.cpp
index 4e07f1740..7be7b4662 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutStride_Rank3.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutStride_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutStride_Rank4.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutStride_Rank4.cpp
index 01fd6d185..9f0f83ba2 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutStride_Rank4.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutStride_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutStride_Rank5.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutStride_Rank5.cpp
index 8c8566633..7fcc5db03 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutStride_Rank5.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutStride_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutStride_Rank8.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutStride_Rank8.cpp
index 2ae8ec4f1..1a7b9933a 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutStride_Rank8.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int64_t_LayoutStride_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutLeft_Rank1.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutLeft_Rank1.cpp
index 3685756a3..c89e60595 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutLeft_Rank1.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutLeft_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutLeft_Rank2.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutLeft_Rank2.cpp
index 5cdbb77c1..1be8bd028 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutLeft_Rank2.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutLeft_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutLeft_Rank3.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutLeft_Rank3.cpp
index 63dae6494..0c61d411b 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutLeft_Rank3.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutLeft_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutLeft_Rank4.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutLeft_Rank4.cpp
index 9e250e1e6..c46bc8268 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutLeft_Rank4.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutLeft_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutLeft_Rank5.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutLeft_Rank5.cpp
index 9cab75cf3..3f430147a 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutLeft_Rank5.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutLeft_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutLeft_Rank8.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutLeft_Rank8.cpp
index 386ac908b..482bf3a6c 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutLeft_Rank8.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutLeft_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutRight_Rank1.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutRight_Rank1.cpp
index 8ee792744..eec32bbc8 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutRight_Rank1.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutRight_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutRight_Rank2.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutRight_Rank2.cpp
index d806f9f82..9d95e5f9d 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutRight_Rank2.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutRight_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutRight_Rank3.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutRight_Rank3.cpp
index 7e835ee83..ca86e10dd 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutRight_Rank3.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutRight_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutRight_Rank4.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutRight_Rank4.cpp
index 82f29e579..3047e380d 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutRight_Rank4.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutRight_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutRight_Rank5.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutRight_Rank5.cpp
index 0c67a21fc..3096ab6d3 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutRight_Rank5.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutRight_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutRight_Rank8.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutRight_Rank8.cpp
index fa492d0c6..88eacdfe8 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutRight_Rank8.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutRight_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutStride_Rank1.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutStride_Rank1.cpp
index c2cba6a45..c800698d3 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutStride_Rank1.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutStride_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutStride_Rank2.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutStride_Rank2.cpp
index 333410137..b2e2cdad4 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutStride_Rank2.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutStride_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutStride_Rank3.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutStride_Rank3.cpp
index 6f051abc7..0dcabb662 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutStride_Rank3.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutStride_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutStride_Rank4.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutStride_Rank4.cpp
index bf61660d8..fd2f9e858 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutStride_Rank4.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutStride_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutStride_Rank5.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutStride_Rank5.cpp
index ea8e2439c..c7b4b9ff8 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutStride_Rank5.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutStride_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutStride_Rank8.cpp b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutStride_Rank8.cpp
index 81e15f5eb..c389a15f7 100644
--- a/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutStride_Rank8.cpp
+++ b/kokkos/core/src/eti/Cuda/Kokkos_Cuda_ViewCopyETIInst_int_int_LayoutStride_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank1.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank1.cpp
index 192d2c03e..1a9a9bf4f 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank1.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank2.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank2.cpp
index a6438f20e..0996ffda1 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank2.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank3.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank3.cpp
index 1503f3aac..08f2651c4 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank3.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank4.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank4.cpp
index 8e2d666d2..8f5ca3185 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank4.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank5.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank5.cpp
index 06ea9660d..7e50c2d58 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank5.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank8.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank8.cpp
index 7c715376d..5caa76cd5 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank8.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutRight_Rank1.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutRight_Rank1.cpp
index e971d0f0d..5427e9f27 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutRight_Rank1.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutRight_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutRight_Rank2.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutRight_Rank2.cpp
index 3f29d4c6f..474855094 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutRight_Rank2.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutRight_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutRight_Rank3.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutRight_Rank3.cpp
index 7e0248e70..db65f3122 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutRight_Rank3.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutRight_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutRight_Rank4.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutRight_Rank4.cpp
index 64d587316..da598b4e5 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutRight_Rank4.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutRight_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutRight_Rank5.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutRight_Rank5.cpp
index 85a088655..8a60373f4 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutRight_Rank5.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutRight_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutRight_Rank8.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutRight_Rank8.cpp
index 3e2d83322..a9531ab8e 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutRight_Rank8.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutRight_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutStride_Rank1.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutStride_Rank1.cpp
index b2de31b87..66c050613 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutStride_Rank1.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutStride_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutStride_Rank2.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutStride_Rank2.cpp
index aa5c584d2..885b2cc04 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutStride_Rank2.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutStride_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutStride_Rank3.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutStride_Rank3.cpp
index 43ed25192..90b19bb66 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutStride_Rank3.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutStride_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutStride_Rank4.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutStride_Rank4.cpp
index 5ca536d98..d62dbf0b4 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutStride_Rank4.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutStride_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutStride_Rank5.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutStride_Rank5.cpp
index 659ab8c7b..2b614aabf 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutStride_Rank5.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutStride_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutStride_Rank8.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutStride_Rank8.cpp
index c1e57d2db..7a1db773e 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutStride_Rank8.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_double_LayoutStride_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank1.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank1.cpp
index 861638ae0..d6a697d60 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank1.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank2.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank2.cpp
index 36373daea..4fe8d07b9 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank2.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank3.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank3.cpp
index 58007533f..c0d5b19de 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank3.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank4.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank4.cpp
index 1ecc0bad6..0c6fbd75b 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank4.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank5.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank5.cpp
index 73d1389b8..379e7e6b7 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank5.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank8.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank8.cpp
index 1f7645908..6c62abcd7 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank8.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutRight_Rank1.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutRight_Rank1.cpp
index 0d9505205..e5b3c3823 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutRight_Rank1.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutRight_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutRight_Rank2.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutRight_Rank2.cpp
index b24a61a36..f90485b60 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutRight_Rank2.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutRight_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutRight_Rank3.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutRight_Rank3.cpp
index c3d120212..7b4ebf21c 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutRight_Rank3.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutRight_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutRight_Rank4.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutRight_Rank4.cpp
index 6a0dc4678..35de800a9 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutRight_Rank4.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutRight_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutRight_Rank5.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutRight_Rank5.cpp
index 4e7f39fac..7aa6a05d3 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutRight_Rank5.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutRight_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutRight_Rank8.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutRight_Rank8.cpp
index 792b803bf..f1b95bbc0 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutRight_Rank8.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutRight_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutStride_Rank1.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutStride_Rank1.cpp
index 549fef232..884570ac6 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutStride_Rank1.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutStride_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutStride_Rank2.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutStride_Rank2.cpp
index 399734817..ae73c5dd3 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutStride_Rank2.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutStride_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutStride_Rank3.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutStride_Rank3.cpp
index 1e641c4e8..f52980716 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutStride_Rank3.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutStride_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutStride_Rank4.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutStride_Rank4.cpp
index 6626ff47c..b3ab97ad7 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutStride_Rank4.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutStride_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutStride_Rank5.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutStride_Rank5.cpp
index 1832b6f91..e5e934e8b 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutStride_Rank5.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutStride_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutStride_Rank8.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutStride_Rank8.cpp
index 319835686..aa1f24ce4 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutStride_Rank8.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_float_LayoutStride_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank1.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank1.cpp
index 83e373419..891aaaa57 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank1.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank2.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank2.cpp
index fc1382582..d5fc48823 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank2.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank3.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank3.cpp
index a95a61206..baa863a40 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank3.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank4.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank4.cpp
index 3dafee86f..b8936f1bc 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank4.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank5.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank5.cpp
index 6460a7e1f..b5c313875 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank5.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank8.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank8.cpp
index 1affdd1ad..0c12c5b47 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank8.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank1.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank1.cpp
index ba382d008..8934c4a6e 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank1.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank2.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank2.cpp
index d9d46059a..9c3046036 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank2.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank3.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank3.cpp
index 62235a495..ae2b1e609 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank3.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank4.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank4.cpp
index c34e570cd..6f721ca78 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank4.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank5.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank5.cpp
index 26dcc5044..4cca974fb 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank5.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank8.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank8.cpp
index 573c8e4e0..747250c59 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank8.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank1.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank1.cpp
index d31644c58..2bcc9dcaa 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank1.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank2.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank2.cpp
index 9ec317af7..cf424725b 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank2.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank3.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank3.cpp
index 07b933077..7c5163c53 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank3.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank4.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank4.cpp
index 36e85a869..275703c22 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank4.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank5.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank5.cpp
index db9a32b08..0b8b6690b 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank5.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank8.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank8.cpp
index 75f823174..dd7cb725e 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank8.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank1.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank1.cpp
index 2d27f5e70..05694106c 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank1.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank2.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank2.cpp
index 2dddeeecd..ce5e6a291 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank2.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank3.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank3.cpp
index d84fd33cc..baf95fb1f 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank3.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank4.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank4.cpp
index 672c126cb..3638c0100 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank4.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank5.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank5.cpp
index a39006a5b..1f964cbdd 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank5.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank8.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank8.cpp
index d2880155c..bc498b350 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank8.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutRight_Rank1.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutRight_Rank1.cpp
index e04355ca9..0e97cd97c 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutRight_Rank1.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutRight_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutRight_Rank2.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutRight_Rank2.cpp
index 7c4e77ddf..e21f05bf5 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutRight_Rank2.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutRight_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutRight_Rank3.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutRight_Rank3.cpp
index 3b88050f1..1ccdc6a36 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutRight_Rank3.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutRight_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutRight_Rank4.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutRight_Rank4.cpp
index e4acf3028..ef1c1f970 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutRight_Rank4.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutRight_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutRight_Rank5.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutRight_Rank5.cpp
index 0b189cd93..2c993914c 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutRight_Rank5.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutRight_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutRight_Rank8.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutRight_Rank8.cpp
index c7cfae16c..c4d120b33 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutRight_Rank8.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutRight_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutStride_Rank1.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutStride_Rank1.cpp
index eaa5243ff..520013db6 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutStride_Rank1.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutStride_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutStride_Rank2.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutStride_Rank2.cpp
index d0c159f50..663110f45 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutStride_Rank2.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutStride_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutStride_Rank3.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutStride_Rank3.cpp
index e0e0b82c1..ab18fdebd 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutStride_Rank3.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutStride_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutStride_Rank4.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutStride_Rank4.cpp
index da6ad1079..232f088e8 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutStride_Rank4.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutStride_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutStride_Rank5.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutStride_Rank5.cpp
index d736cf10d..5a6331b76 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutStride_Rank5.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutStride_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutStride_Rank8.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutStride_Rank8.cpp
index 3f191de4a..c3223ee4d 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutStride_Rank8.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int64_t_int_LayoutStride_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutLeft_Rank1.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutLeft_Rank1.cpp
index ae279b660..50584929a 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutLeft_Rank1.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutLeft_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutLeft_Rank2.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutLeft_Rank2.cpp
index 43718f54e..281784c6a 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutLeft_Rank2.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutLeft_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutLeft_Rank3.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutLeft_Rank3.cpp
index c43f02b2b..8a8220bae 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutLeft_Rank3.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutLeft_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutLeft_Rank4.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutLeft_Rank4.cpp
index ab529d3f3..7c5567b04 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutLeft_Rank4.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutLeft_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutLeft_Rank5.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutLeft_Rank5.cpp
index 86b032806..f2716fef3 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutLeft_Rank5.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutLeft_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutLeft_Rank8.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutLeft_Rank8.cpp
index 96bc3ec4c..db1797304 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutLeft_Rank8.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutLeft_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutRight_Rank1.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutRight_Rank1.cpp
index 93333565d..5c4646817 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutRight_Rank1.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutRight_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutRight_Rank2.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutRight_Rank2.cpp
index b6d740eac..be4e90ccc 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutRight_Rank2.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutRight_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutRight_Rank3.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutRight_Rank3.cpp
index a06b2a287..17200db10 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutRight_Rank3.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutRight_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutRight_Rank4.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutRight_Rank4.cpp
index 8a829449a..89794ad1b 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutRight_Rank4.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutRight_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutRight_Rank5.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutRight_Rank5.cpp
index 04e2026a6..1771edc87 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutRight_Rank5.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutRight_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutRight_Rank8.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutRight_Rank8.cpp
index bbd3af0ea..b118550ac 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutRight_Rank8.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutRight_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutStride_Rank1.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutStride_Rank1.cpp
index 48b52fa1c..887924764 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutStride_Rank1.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutStride_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutStride_Rank2.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutStride_Rank2.cpp
index 8b96319c0..7b078639c 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutStride_Rank2.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutStride_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutStride_Rank3.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutStride_Rank3.cpp
index 6cd006b49..2dc3d8b7c 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutStride_Rank3.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutStride_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutStride_Rank4.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutStride_Rank4.cpp
index ad2696190..c3ff0b212 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutStride_Rank4.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutStride_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutStride_Rank5.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutStride_Rank5.cpp
index ba8f38eb1..737fe0d63 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutStride_Rank5.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutStride_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutStride_Rank8.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutStride_Rank8.cpp
index 62ffacf2a..176a8a576 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutStride_Rank8.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_double_LayoutStride_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutLeft_Rank1.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutLeft_Rank1.cpp
index 9f6ae5edd..e967e8d2b 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutLeft_Rank1.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutLeft_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutLeft_Rank2.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutLeft_Rank2.cpp
index 0a1d7d530..80323d7aa 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutLeft_Rank2.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutLeft_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutLeft_Rank3.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutLeft_Rank3.cpp
index 3408d481f..f68b9720b 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutLeft_Rank3.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutLeft_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutLeft_Rank4.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutLeft_Rank4.cpp
index 94f343c7d..2dd7bf784 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutLeft_Rank4.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutLeft_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutLeft_Rank5.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutLeft_Rank5.cpp
index c9aae852e..c24015769 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutLeft_Rank5.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutLeft_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutLeft_Rank8.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutLeft_Rank8.cpp
index 9d07ec270..008eea27c 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutLeft_Rank8.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutLeft_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutRight_Rank1.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutRight_Rank1.cpp
index 3ed4bae4a..ba10fddcb 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutRight_Rank1.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutRight_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutRight_Rank2.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutRight_Rank2.cpp
index 4ba84b5f6..0bc5851c1 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutRight_Rank2.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutRight_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutRight_Rank3.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutRight_Rank3.cpp
index 8d5262453..14c359c09 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutRight_Rank3.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutRight_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutRight_Rank4.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutRight_Rank4.cpp
index 4eb5b2392..6672b85ce 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutRight_Rank4.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutRight_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutRight_Rank5.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutRight_Rank5.cpp
index 6486f098e..1ec216204 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutRight_Rank5.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutRight_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutRight_Rank8.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutRight_Rank8.cpp
index b88b164d8..1a6f0631b 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutRight_Rank8.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutRight_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutStride_Rank1.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutStride_Rank1.cpp
index 4c342be55..5b90d4c7a 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutStride_Rank1.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutStride_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutStride_Rank2.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutStride_Rank2.cpp
index 928af84bb..3e0e011b0 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutStride_Rank2.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutStride_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutStride_Rank3.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutStride_Rank3.cpp
index ab53ebf69..912cfe66f 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutStride_Rank3.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutStride_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutStride_Rank4.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutStride_Rank4.cpp
index 07f89b3ad..a2cc70ffa 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutStride_Rank4.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutStride_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutStride_Rank5.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutStride_Rank5.cpp
index 8be5df1c5..58772e42d 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutStride_Rank5.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutStride_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutStride_Rank8.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutStride_Rank8.cpp
index bdc9afa83..ce52b3fcf 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutStride_Rank8.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_float_LayoutStride_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank1.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank1.cpp
index 79f420568..9baf307d8 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank1.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank2.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank2.cpp
index e78d209c1..ffc8e2c52 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank2.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank3.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank3.cpp
index 5927dce0f..16aec3709 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank3.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank4.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank4.cpp
index 5d035f536..a2b5e8dff 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank4.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank5.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank5.cpp
index 0f73450d1..f5b7347d3 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank5.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank8.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank8.cpp
index bf9d4aae7..7646c5372 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank8.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutRight_Rank1.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutRight_Rank1.cpp
index 8b5e12aff..e225e99c5 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutRight_Rank1.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutRight_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutRight_Rank2.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutRight_Rank2.cpp
index 2ad504df4..441e8b63e 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutRight_Rank2.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutRight_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutRight_Rank3.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutRight_Rank3.cpp
index cb9bb0e28..8e3bdecf1 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutRight_Rank3.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutRight_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutRight_Rank4.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutRight_Rank4.cpp
index fcbb3b7b0..7662c5a39 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutRight_Rank4.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutRight_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutRight_Rank5.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutRight_Rank5.cpp
index 564ea37a6..db8625bd9 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutRight_Rank5.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutRight_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutRight_Rank8.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutRight_Rank8.cpp
index ae9c052d8..5992b136b 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutRight_Rank8.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutRight_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutStride_Rank1.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutStride_Rank1.cpp
index 0ce0e7605..f862aa4df 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutStride_Rank1.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutStride_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutStride_Rank2.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutStride_Rank2.cpp
index 3b69d00b8..788c411d3 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutStride_Rank2.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutStride_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutStride_Rank3.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutStride_Rank3.cpp
index 13d756ef7..0646c93ac 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutStride_Rank3.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutStride_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutStride_Rank4.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutStride_Rank4.cpp
index 1a4a5e5b5..88299a88b 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutStride_Rank4.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutStride_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutStride_Rank5.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutStride_Rank5.cpp
index ac7b4ea94..aaec87e40 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutStride_Rank5.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutStride_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutStride_Rank8.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutStride_Rank8.cpp
index dcd6ac844..f650c7e4a 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutStride_Rank8.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int64_t_LayoutStride_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutLeft_Rank1.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutLeft_Rank1.cpp
index b43e5c1cd..1cf32f3f5 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutLeft_Rank1.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutLeft_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutLeft_Rank2.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutLeft_Rank2.cpp
index 1abbdf02c..a53f5b304 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutLeft_Rank2.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutLeft_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutLeft_Rank3.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutLeft_Rank3.cpp
index 4bbdf69d3..a679f816b 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutLeft_Rank3.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutLeft_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutLeft_Rank4.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutLeft_Rank4.cpp
index e046b5f2f..dc2efe852 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutLeft_Rank4.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutLeft_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutLeft_Rank5.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutLeft_Rank5.cpp
index c38a5b2c8..f532d1917 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutLeft_Rank5.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutLeft_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutLeft_Rank8.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutLeft_Rank8.cpp
index 7fc5527f2..067d7c341 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutLeft_Rank8.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutLeft_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutRight_Rank1.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutRight_Rank1.cpp
index 540554a7d..fdee4a6f3 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutRight_Rank1.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutRight_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutRight_Rank2.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutRight_Rank2.cpp
index 95d3d645b..4ee505961 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutRight_Rank2.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutRight_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutRight_Rank3.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutRight_Rank3.cpp
index 0e6a0b919..280fd0113 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutRight_Rank3.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutRight_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutRight_Rank4.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutRight_Rank4.cpp
index e7f1f5f1e..84525a004 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutRight_Rank4.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutRight_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutRight_Rank5.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutRight_Rank5.cpp
index f497be645..7ba740043 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutRight_Rank5.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutRight_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutRight_Rank8.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutRight_Rank8.cpp
index b51fae1f2..4a4754948 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutRight_Rank8.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutRight_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutStride_Rank1.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutStride_Rank1.cpp
index 29a160cfe..14773de5d 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutStride_Rank1.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutStride_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutStride_Rank2.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutStride_Rank2.cpp
index 06513c4fe..0f57ae5cb 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutStride_Rank2.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutStride_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutStride_Rank3.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutStride_Rank3.cpp
index 061e6aa59..905bb918f 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutStride_Rank3.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutStride_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutStride_Rank4.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutStride_Rank4.cpp
index 6301b882b..30563fe13 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutStride_Rank4.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutStride_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutStride_Rank5.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutStride_Rank5.cpp
index e1680d211..ed0c45b36 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutStride_Rank5.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutStride_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutStride_Rank8.cpp b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutStride_Rank8.cpp
index 30d2d17ae..1ff4404c9 100644
--- a/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutStride_Rank8.cpp
+++ b/kokkos/core/src/eti/HPX/Kokkos_HPX_ViewCopyETIInst_int_int_LayoutStride_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank1.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank1.cpp
index b32077a27..37d812f98 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank1.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank2.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank2.cpp
index 437a5e2fe..c4ac098ab 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank2.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank3.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank3.cpp
index e989423cc..fc7cc3055 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank3.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank4.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank4.cpp
index 9ed093bb9..f543baf68 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank4.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank5.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank5.cpp
index 87a3d2099..6cff58e36 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank5.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank8.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank8.cpp
index 5715b813a..30ae7d650 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank8.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutRight_Rank1.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutRight_Rank1.cpp
index ac36f38cc..343c09f22 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutRight_Rank1.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutRight_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutRight_Rank2.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutRight_Rank2.cpp
index ea3f168f7..ffe2971e5 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutRight_Rank2.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutRight_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutRight_Rank3.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutRight_Rank3.cpp
index 72ac14e9d..0e9a519c1 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutRight_Rank3.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutRight_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutRight_Rank4.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutRight_Rank4.cpp
index 6ba558cad..cca76dac3 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutRight_Rank4.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutRight_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutRight_Rank5.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutRight_Rank5.cpp
index 9ec7749f2..22a6f0492 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutRight_Rank5.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutRight_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutRight_Rank8.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutRight_Rank8.cpp
index 28fe36eda..32f9b4ec9 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutRight_Rank8.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutRight_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutStride_Rank1.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutStride_Rank1.cpp
index 567ef04a7..9753469e5 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutStride_Rank1.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutStride_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutStride_Rank2.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutStride_Rank2.cpp
index dbe94a9b4..b0d5a3a7c 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutStride_Rank2.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutStride_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutStride_Rank3.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutStride_Rank3.cpp
index ab106740f..f1b981eac 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutStride_Rank3.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutStride_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutStride_Rank4.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutStride_Rank4.cpp
index 13d8708cf..07ebe686a 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutStride_Rank4.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutStride_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutStride_Rank5.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutStride_Rank5.cpp
index bcb11092d..1eefbc9b0 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutStride_Rank5.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutStride_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutStride_Rank8.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutStride_Rank8.cpp
index 637654cd9..87a81639e 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutStride_Rank8.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_double_LayoutStride_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank1.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank1.cpp
index 4efa04b82..401069942 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank1.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank2.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank2.cpp
index 1821d80ec..4e774bec2 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank2.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank3.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank3.cpp
index ca3b30d9a..1b3343dd2 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank3.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank4.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank4.cpp
index 350eaa9b3..ad5421bb5 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank4.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank5.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank5.cpp
index 42ebbb5a5..fde468998 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank5.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank8.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank8.cpp
index 55de751e9..9c1db701c 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank8.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutRight_Rank1.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutRight_Rank1.cpp
index 282bd9192..2536abbed 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutRight_Rank1.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutRight_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutRight_Rank2.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutRight_Rank2.cpp
index e36b38263..8ab48a4f7 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutRight_Rank2.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutRight_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutRight_Rank3.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutRight_Rank3.cpp
index 5ded26404..e4f8d4044 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutRight_Rank3.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutRight_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutRight_Rank4.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutRight_Rank4.cpp
index 69dc320fe..cd482972a 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutRight_Rank4.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutRight_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutRight_Rank5.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutRight_Rank5.cpp
index e4b9431e5..fa7b6211f 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutRight_Rank5.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutRight_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutRight_Rank8.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutRight_Rank8.cpp
index c603124af..aeb191e8c 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutRight_Rank8.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutRight_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutStride_Rank1.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutStride_Rank1.cpp
index cb064ee3f..94ce1eba0 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutStride_Rank1.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutStride_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutStride_Rank2.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutStride_Rank2.cpp
index 6e4b94b80..01c96b436 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutStride_Rank2.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutStride_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutStride_Rank3.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutStride_Rank3.cpp
index 10e8ea607..3067883b2 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutStride_Rank3.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutStride_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutStride_Rank4.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutStride_Rank4.cpp
index 14ec7824d..27ecf522a 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutStride_Rank4.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutStride_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutStride_Rank5.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutStride_Rank5.cpp
index 28240c1c1..2925cbe44 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutStride_Rank5.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutStride_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutStride_Rank8.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutStride_Rank8.cpp
index b43ae0cc7..72672c5bb 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutStride_Rank8.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_float_LayoutStride_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank1.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank1.cpp
index 2cb11f377..d301592da 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank1.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank2.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank2.cpp
index e65ef4917..dca8eeb02 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank2.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank3.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank3.cpp
index 5574a0d41..832bbc0fe 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank3.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank4.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank4.cpp
index 95da90645..45f9c22bc 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank4.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank5.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank5.cpp
index 896532517..7c8c5d80b 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank5.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank8.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank8.cpp
index 13548d173..2fae74f59 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank8.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank1.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank1.cpp
index 5a6856d6d..0523a6e28 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank1.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank2.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank2.cpp
index f173642f6..24d667d7d 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank2.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank3.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank3.cpp
index da2b88542..599d8fc04 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank3.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank4.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank4.cpp
index 663ed84e8..2583f8d6e 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank4.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank5.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank5.cpp
index 99984b1f7..d9e1f774b 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank5.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank8.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank8.cpp
index 7026dd849..8376f1dd3 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank8.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank1.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank1.cpp
index bd051fc54..2b21554c0 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank1.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank2.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank2.cpp
index e59b33282..985e0be47 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank2.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank3.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank3.cpp
index af694a145..f1e37a5c4 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank3.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank4.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank4.cpp
index db0086dc7..ea071ac10 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank4.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank5.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank5.cpp
index a500f11de..ea2da28f1 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank5.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank8.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank8.cpp
index 649b994ac..bac351589 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank8.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank1.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank1.cpp
index b0a2b8bfb..515812fb9 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank1.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank2.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank2.cpp
index 3441ce154..28ebc3505 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank2.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank3.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank3.cpp
index c9e3c9e9e..3bc9254b0 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank3.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank4.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank4.cpp
index 234f171d3..dcba7deea 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank4.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank5.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank5.cpp
index 306f742e2..9aba49991 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank5.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank8.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank8.cpp
index 0b782a170..98d730444 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank8.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutRight_Rank1.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutRight_Rank1.cpp
index b945727f2..2179ba655 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutRight_Rank1.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutRight_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutRight_Rank2.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutRight_Rank2.cpp
index 97ac54d8b..b7eed148d 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutRight_Rank2.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutRight_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutRight_Rank3.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutRight_Rank3.cpp
index b33f23459..58a278321 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutRight_Rank3.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutRight_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutRight_Rank4.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutRight_Rank4.cpp
index 554b65044..7ed2bd0bd 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutRight_Rank4.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutRight_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutRight_Rank5.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutRight_Rank5.cpp
index f42a641ed..0ba5edbc7 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutRight_Rank5.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutRight_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutRight_Rank8.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutRight_Rank8.cpp
index 77c298903..acce37b79 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutRight_Rank8.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutRight_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutStride_Rank1.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutStride_Rank1.cpp
index b349eb9a5..83878113d 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutStride_Rank1.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutStride_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutStride_Rank2.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutStride_Rank2.cpp
index 213c94475..fbbd5edd2 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutStride_Rank2.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutStride_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutStride_Rank3.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutStride_Rank3.cpp
index bd9a56740..f4b2364f6 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutStride_Rank3.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutStride_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutStride_Rank4.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutStride_Rank4.cpp
index c82e00acd..df6db05a8 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutStride_Rank4.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutStride_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutStride_Rank5.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutStride_Rank5.cpp
index 98d808248..14acf8fb2 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutStride_Rank5.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutStride_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutStride_Rank8.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutStride_Rank8.cpp
index 001fddc21..1984598a2 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutStride_Rank8.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int64_t_int_LayoutStride_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutLeft_Rank1.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutLeft_Rank1.cpp
index eb80ca1b2..987980265 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutLeft_Rank1.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutLeft_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutLeft_Rank2.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutLeft_Rank2.cpp
index 5eb174ab6..1283f14a6 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutLeft_Rank2.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutLeft_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutLeft_Rank3.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutLeft_Rank3.cpp
index 73224b270..3addc9913 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutLeft_Rank3.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutLeft_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutLeft_Rank4.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutLeft_Rank4.cpp
index 41836e070..25336a754 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutLeft_Rank4.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutLeft_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutLeft_Rank5.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutLeft_Rank5.cpp
index ba8eb1e6c..b4cca8662 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutLeft_Rank5.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutLeft_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutLeft_Rank8.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutLeft_Rank8.cpp
index 611f4af7e..ffe81fbff 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutLeft_Rank8.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutLeft_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutRight_Rank1.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutRight_Rank1.cpp
index a878cc552..7bb38884b 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutRight_Rank1.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutRight_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutRight_Rank2.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutRight_Rank2.cpp
index 5d75d19c3..f99f79e4f 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutRight_Rank2.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutRight_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutRight_Rank3.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutRight_Rank3.cpp
index bcbb6f84b..cedc1d901 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutRight_Rank3.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutRight_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutRight_Rank4.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutRight_Rank4.cpp
index e6eac8df1..2e101591d 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutRight_Rank4.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutRight_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutRight_Rank5.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutRight_Rank5.cpp
index a1178da93..6451611b6 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutRight_Rank5.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutRight_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutRight_Rank8.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutRight_Rank8.cpp
index 3816365a3..0898be20e 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutRight_Rank8.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutRight_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutStride_Rank1.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutStride_Rank1.cpp
index 80ca4c691..5dc7d5cdd 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutStride_Rank1.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutStride_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutStride_Rank2.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutStride_Rank2.cpp
index e694703c7..dc3c00d42 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutStride_Rank2.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutStride_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutStride_Rank3.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutStride_Rank3.cpp
index 2f7686ff9..52b94e91e 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutStride_Rank3.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutStride_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutStride_Rank4.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutStride_Rank4.cpp
index 55830bf64..3d1359bbf 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutStride_Rank4.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutStride_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutStride_Rank5.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutStride_Rank5.cpp
index 0eb7838f4..54ac13a75 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutStride_Rank5.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutStride_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutStride_Rank8.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutStride_Rank8.cpp
index 2984235dc..8a1e50892 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutStride_Rank8.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_double_LayoutStride_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutLeft_Rank1.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutLeft_Rank1.cpp
index df314005c..f585a6833 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutLeft_Rank1.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutLeft_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutLeft_Rank2.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutLeft_Rank2.cpp
index c332cbfce..f3943c7c6 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutLeft_Rank2.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutLeft_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutLeft_Rank3.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutLeft_Rank3.cpp
index 26f6e2e93..ab16463a3 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutLeft_Rank3.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutLeft_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutLeft_Rank4.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutLeft_Rank4.cpp
index a25c8e324..3adbfa6aa 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutLeft_Rank4.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutLeft_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutLeft_Rank5.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutLeft_Rank5.cpp
index 2e9084c72..32e317e02 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutLeft_Rank5.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutLeft_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutLeft_Rank8.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutLeft_Rank8.cpp
index 78dc8b71e..9a6bf70c9 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutLeft_Rank8.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutLeft_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutRight_Rank1.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutRight_Rank1.cpp
index 07b85cb13..a081f46d4 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutRight_Rank1.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutRight_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutRight_Rank2.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutRight_Rank2.cpp
index 7de9885aa..7175be7bf 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutRight_Rank2.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutRight_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutRight_Rank3.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutRight_Rank3.cpp
index 2a0ab51de..6ad850330 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutRight_Rank3.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutRight_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutRight_Rank4.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutRight_Rank4.cpp
index e27304241..6af17f7c3 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutRight_Rank4.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutRight_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutRight_Rank5.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutRight_Rank5.cpp
index 934ca8511..269785fa7 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutRight_Rank5.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutRight_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutRight_Rank8.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutRight_Rank8.cpp
index 4f0904de4..a3469972d 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutRight_Rank8.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutRight_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutStride_Rank1.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutStride_Rank1.cpp
index a504769bc..d3064fd97 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutStride_Rank1.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutStride_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutStride_Rank2.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutStride_Rank2.cpp
index f7746effa..5ae8d4762 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutStride_Rank2.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutStride_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutStride_Rank3.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutStride_Rank3.cpp
index eb0baab2b..f7b3a5db8 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutStride_Rank3.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutStride_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutStride_Rank4.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutStride_Rank4.cpp
index 10f757c14..d36d2d27c 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutStride_Rank4.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutStride_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutStride_Rank5.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutStride_Rank5.cpp
index a9df84e0a..6a88b0b8e 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutStride_Rank5.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutStride_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutStride_Rank8.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutStride_Rank8.cpp
index 41af198ec..ec459f1bb 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutStride_Rank8.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_float_LayoutStride_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank1.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank1.cpp
index ab9b2e5cf..6e606008d 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank1.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank2.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank2.cpp
index ea958e9fb..086e1effe 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank2.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank3.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank3.cpp
index 15ab132c6..882477486 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank3.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank4.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank4.cpp
index 90c50ecac..e32f7504f 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank4.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank5.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank5.cpp
index ce17ec4ac..d36a5c1be 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank5.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank8.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank8.cpp
index fb19438a3..3389fed4f 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank8.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutRight_Rank1.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutRight_Rank1.cpp
index 6172f917f..c68d3ed81 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutRight_Rank1.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutRight_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutRight_Rank2.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutRight_Rank2.cpp
index b5176f35f..9fc1b47af 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutRight_Rank2.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutRight_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutRight_Rank3.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutRight_Rank3.cpp
index 54192233b..ed9ed4d63 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutRight_Rank3.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutRight_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutRight_Rank4.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutRight_Rank4.cpp
index b4dd93c89..954f9eff6 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutRight_Rank4.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutRight_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutRight_Rank5.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutRight_Rank5.cpp
index d467e5519..46c19786f 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutRight_Rank5.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutRight_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutRight_Rank8.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutRight_Rank8.cpp
index 0af369efd..0fc871882 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutRight_Rank8.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutRight_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutStride_Rank1.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutStride_Rank1.cpp
index a02956d60..13739b99b 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutStride_Rank1.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutStride_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutStride_Rank2.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutStride_Rank2.cpp
index 1f3775d95..9dec2fe8b 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutStride_Rank2.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutStride_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutStride_Rank3.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutStride_Rank3.cpp
index eacd79693..334da5277 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutStride_Rank3.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutStride_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutStride_Rank4.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutStride_Rank4.cpp
index e42fa65e0..05b192152 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutStride_Rank4.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutStride_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutStride_Rank5.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutStride_Rank5.cpp
index 0652a0d31..0e57e83f8 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutStride_Rank5.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutStride_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutStride_Rank8.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutStride_Rank8.cpp
index 1638ee177..89d7c4541 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutStride_Rank8.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int64_t_LayoutStride_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutLeft_Rank1.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutLeft_Rank1.cpp
index bad805dbd..12ad031ee 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutLeft_Rank1.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutLeft_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutLeft_Rank2.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutLeft_Rank2.cpp
index ee73c7631..1b7286cdc 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutLeft_Rank2.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutLeft_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutLeft_Rank3.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutLeft_Rank3.cpp
index afa629829..319755559 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutLeft_Rank3.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutLeft_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutLeft_Rank4.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutLeft_Rank4.cpp
index c5317a87a..b5f1ddcc5 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutLeft_Rank4.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutLeft_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutLeft_Rank5.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutLeft_Rank5.cpp
index ec22e0147..bb490af70 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutLeft_Rank5.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutLeft_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutLeft_Rank8.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutLeft_Rank8.cpp
index 521487c3d..483d0ce3c 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutLeft_Rank8.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutLeft_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutRight_Rank1.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutRight_Rank1.cpp
index 5da88f90a..4f1ae60f4 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutRight_Rank1.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutRight_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutRight_Rank2.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutRight_Rank2.cpp
index e58d58136..5420e3a44 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutRight_Rank2.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutRight_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutRight_Rank3.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutRight_Rank3.cpp
index 46010a921..46269afc2 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutRight_Rank3.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutRight_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutRight_Rank4.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutRight_Rank4.cpp
index 09f0355ca..425220e27 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutRight_Rank4.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutRight_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutRight_Rank5.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutRight_Rank5.cpp
index f73d87e43..6bc2ed733 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutRight_Rank5.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutRight_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutRight_Rank8.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutRight_Rank8.cpp
index 8a21dcc75..91cc8c2af 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutRight_Rank8.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutRight_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutStride_Rank1.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutStride_Rank1.cpp
index 88b30174e..46b97b313 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutStride_Rank1.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutStride_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutStride_Rank2.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutStride_Rank2.cpp
index 8179b159f..1c6c071e3 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutStride_Rank2.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutStride_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutStride_Rank3.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutStride_Rank3.cpp
index 88e1d3e65..adb9f1e94 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutStride_Rank3.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutStride_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutStride_Rank4.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutStride_Rank4.cpp
index 5cbb68df2..5c7fc9917 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutStride_Rank4.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutStride_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutStride_Rank5.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutStride_Rank5.cpp
index 70839316e..f8605287e 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutStride_Rank5.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutStride_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutStride_Rank8.cpp b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutStride_Rank8.cpp
index 41114a165..b47b23c0d 100644
--- a/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutStride_Rank8.cpp
+++ b/kokkos/core/src/eti/OpenMP/Kokkos_OpenMP_ViewCopyETIInst_int_int_LayoutStride_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank1.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank1.cpp
index 7d37ab9dc..936b24983 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank1.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank2.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank2.cpp
index 94fc43e37..7d83d0227 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank2.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank3.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank3.cpp
index b78cbd1b7..50b160c45 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank3.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank4.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank4.cpp
index 9c327fc44..fa4dccf30 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank4.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank5.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank5.cpp
index cb8a2e019..5ed0812c3 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank5.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank8.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank8.cpp
index cf02d8fa5..9bc2faefe 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank8.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutRight_Rank1.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutRight_Rank1.cpp
index e7ddd81f9..35a198cb2 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutRight_Rank1.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutRight_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutRight_Rank2.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutRight_Rank2.cpp
index 43a9fe5c1..a79082c7a 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutRight_Rank2.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutRight_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutRight_Rank3.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutRight_Rank3.cpp
index 1cbe3468e..e344f9424 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutRight_Rank3.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutRight_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutRight_Rank4.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutRight_Rank4.cpp
index b8bea66dd..92e4281ba 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutRight_Rank4.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutRight_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutRight_Rank5.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutRight_Rank5.cpp
index e52711fbf..c25262075 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutRight_Rank5.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutRight_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutRight_Rank8.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutRight_Rank8.cpp
index 894ada67b..c3ce63ccb 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutRight_Rank8.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutRight_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutStride_Rank1.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutStride_Rank1.cpp
index d9ddd1061..443aaa117 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutStride_Rank1.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutStride_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutStride_Rank2.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutStride_Rank2.cpp
index 924428bbc..65d137d62 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutStride_Rank2.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutStride_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutStride_Rank3.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutStride_Rank3.cpp
index efa606d9c..50c66d931 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutStride_Rank3.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutStride_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutStride_Rank4.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutStride_Rank4.cpp
index 9d5423604..78464445e 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutStride_Rank4.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutStride_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutStride_Rank5.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutStride_Rank5.cpp
index 7e7337086..f1085851d 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutStride_Rank5.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutStride_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutStride_Rank8.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutStride_Rank8.cpp
index 2f1423eed..090e77d63 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutStride_Rank8.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_double_LayoutStride_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank1.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank1.cpp
index 5e0a0d761..b82e770ee 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank1.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank2.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank2.cpp
index a4eaeb707..6fbd24842 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank2.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank3.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank3.cpp
index 17380a1ae..a434fc069 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank3.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank4.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank4.cpp
index 8d48baf27..cf7972a44 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank4.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank5.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank5.cpp
index b9c5d70d4..724fa978b 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank5.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank8.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank8.cpp
index 684dd1f56..1910a2024 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank8.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutRight_Rank1.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutRight_Rank1.cpp
index f4194b86d..9e5bf0fa3 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutRight_Rank1.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutRight_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutRight_Rank2.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutRight_Rank2.cpp
index 5ca438e9a..55b67d299 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutRight_Rank2.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutRight_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutRight_Rank3.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutRight_Rank3.cpp
index beadb4d6a..1e7cfd254 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutRight_Rank3.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutRight_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutRight_Rank4.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutRight_Rank4.cpp
index 4c6f4ec59..d374edbd4 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutRight_Rank4.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutRight_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutRight_Rank5.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutRight_Rank5.cpp
index 2ee026b13..7eb20ccab 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutRight_Rank5.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutRight_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutRight_Rank8.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutRight_Rank8.cpp
index afb95566c..cd1371117 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutRight_Rank8.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutRight_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutStride_Rank1.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutStride_Rank1.cpp
index b7d672b72..f36b5353a 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutStride_Rank1.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutStride_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutStride_Rank2.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutStride_Rank2.cpp
index cecb43103..afeeae9b3 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutStride_Rank2.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutStride_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutStride_Rank3.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutStride_Rank3.cpp
index 317f6eb7b..178659600 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutStride_Rank3.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutStride_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutStride_Rank4.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutStride_Rank4.cpp
index 7624472ca..2db4dd794 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutStride_Rank4.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutStride_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutStride_Rank5.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutStride_Rank5.cpp
index f31c3e9d7..85ec8fc2d 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutStride_Rank5.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutStride_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutStride_Rank8.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutStride_Rank8.cpp
index 5ddad7bf7..7b9ef4eed 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutStride_Rank8.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_float_LayoutStride_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank1.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank1.cpp
index ae829ab39..0e37d90d7 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank1.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank2.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank2.cpp
index 01ed36182..aa484fcff 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank2.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank3.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank3.cpp
index dd15ded43..94b5ba470 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank3.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank4.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank4.cpp
index 8627b74a0..f5f88d999 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank4.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank5.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank5.cpp
index 8de0eec37..056fccd67 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank5.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank8.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank8.cpp
index e3a067d7d..00dfe959c 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank8.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank1.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank1.cpp
index 3bb19a417..9d975b184 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank1.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank2.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank2.cpp
index f96cde6c5..c01f76e9e 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank2.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank3.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank3.cpp
index bf381f264..5fc0e1cba 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank3.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank4.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank4.cpp
index 9060ae50c..2124318ad 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank4.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank5.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank5.cpp
index f2afa6b62..1dc1ece2c 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank5.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank8.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank8.cpp
index dbb00631a..2b49fe193 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank8.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank1.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank1.cpp
index bade54342..3cc115467 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank1.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank2.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank2.cpp
index b5413beff..56cb22173 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank2.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank3.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank3.cpp
index 1e544b067..96b4198e0 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank3.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank4.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank4.cpp
index 9d3c42013..3bf36b1c8 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank4.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank5.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank5.cpp
index 1b0b62902..689270a64 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank5.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank8.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank8.cpp
index c1c35d66c..995b49942 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank8.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank1.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank1.cpp
index ac00cc37d..e6f2970a6 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank1.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank2.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank2.cpp
index 7bcfea7de..c4602070e 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank2.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank3.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank3.cpp
index b8a585731..5a52ee9e8 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank3.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank4.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank4.cpp
index ee6b1d95e..9fe37b257 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank4.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank5.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank5.cpp
index 6b060e837..81dd98a95 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank5.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank8.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank8.cpp
index dee1edbe0..1f487edd2 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank8.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutRight_Rank1.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutRight_Rank1.cpp
index fbe7cfb6a..0fe78ecbb 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutRight_Rank1.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutRight_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutRight_Rank2.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutRight_Rank2.cpp
index 1c2b6809b..710bfc182 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutRight_Rank2.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutRight_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutRight_Rank3.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutRight_Rank3.cpp
index 708554816..8f4cf975c 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutRight_Rank3.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutRight_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutRight_Rank4.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutRight_Rank4.cpp
index 9dd837ea3..fcf444ca8 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutRight_Rank4.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutRight_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutRight_Rank5.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutRight_Rank5.cpp
index 13a1d0d86..480c13529 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutRight_Rank5.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutRight_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutRight_Rank8.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutRight_Rank8.cpp
index 7d8e0b171..f09cb89a3 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutRight_Rank8.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutRight_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutStride_Rank1.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutStride_Rank1.cpp
index 413492165..ef36faebd 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutStride_Rank1.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutStride_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutStride_Rank2.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutStride_Rank2.cpp
index efeaf2816..3e3510150 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutStride_Rank2.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutStride_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutStride_Rank3.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutStride_Rank3.cpp
index a162a49d7..b12b8bc9f 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutStride_Rank3.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutStride_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutStride_Rank4.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutStride_Rank4.cpp
index e02e7c4c4..1e2e04276 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutStride_Rank4.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutStride_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutStride_Rank5.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutStride_Rank5.cpp
index 0f3bc4f1c..4539a4087 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutStride_Rank5.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutStride_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutStride_Rank8.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutStride_Rank8.cpp
index 409492081..5af78387d 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutStride_Rank8.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int64_t_int_LayoutStride_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutLeft_Rank1.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutLeft_Rank1.cpp
index 6fbd0f417..96f548905 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutLeft_Rank1.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutLeft_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutLeft_Rank2.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutLeft_Rank2.cpp
index 5ea4ceef8..957741e77 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutLeft_Rank2.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutLeft_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutLeft_Rank3.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutLeft_Rank3.cpp
index 4d336c58e..d1c2254da 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutLeft_Rank3.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutLeft_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutLeft_Rank4.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutLeft_Rank4.cpp
index 4349fb1c7..87b95b943 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutLeft_Rank4.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutLeft_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutLeft_Rank5.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutLeft_Rank5.cpp
index 306a7a67d..fba1027fc 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutLeft_Rank5.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutLeft_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutLeft_Rank8.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutLeft_Rank8.cpp
index b2e6f6824..bbd762f1d 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutLeft_Rank8.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutLeft_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutRight_Rank1.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutRight_Rank1.cpp
index f25223b85..ad31e2c03 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutRight_Rank1.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutRight_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutRight_Rank2.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutRight_Rank2.cpp
index 95f6c5b9d..bc14bbcee 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutRight_Rank2.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutRight_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutRight_Rank3.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutRight_Rank3.cpp
index f221141c5..736781d69 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutRight_Rank3.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutRight_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutRight_Rank4.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutRight_Rank4.cpp
index 68d58c5b1..6b16fbe95 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutRight_Rank4.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutRight_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutRight_Rank5.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutRight_Rank5.cpp
index 3710878be..95ce9c952 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutRight_Rank5.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutRight_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutRight_Rank8.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutRight_Rank8.cpp
index d0d8b8f0a..34888c4e4 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutRight_Rank8.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutRight_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutStride_Rank1.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutStride_Rank1.cpp
index e1320b332..eba5f4acd 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutStride_Rank1.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutStride_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutStride_Rank2.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutStride_Rank2.cpp
index ed6fe0670..bc3ed4dca 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutStride_Rank2.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutStride_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutStride_Rank3.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutStride_Rank3.cpp
index ef32b7848..f7a669c82 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutStride_Rank3.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutStride_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutStride_Rank4.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutStride_Rank4.cpp
index 1db3b2845..084a97323 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutStride_Rank4.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutStride_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutStride_Rank5.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutStride_Rank5.cpp
index e2842d924..d5e1538ca 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutStride_Rank5.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutStride_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutStride_Rank8.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutStride_Rank8.cpp
index 5ca4720d4..c2ffd740a 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutStride_Rank8.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_double_LayoutStride_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutLeft_Rank1.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutLeft_Rank1.cpp
index baa0e582a..c7560e2eb 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutLeft_Rank1.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutLeft_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutLeft_Rank2.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutLeft_Rank2.cpp
index bc022f97b..650e36846 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutLeft_Rank2.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutLeft_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutLeft_Rank3.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutLeft_Rank3.cpp
index 108d3e963..19636e8bf 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutLeft_Rank3.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutLeft_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutLeft_Rank4.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutLeft_Rank4.cpp
index 1a6601500..2d15ad10e 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutLeft_Rank4.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutLeft_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutLeft_Rank5.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutLeft_Rank5.cpp
index fb515774b..477b8e44b 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutLeft_Rank5.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutLeft_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutLeft_Rank8.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutLeft_Rank8.cpp
index 012f2116d..6f4234e70 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutLeft_Rank8.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutLeft_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutRight_Rank1.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutRight_Rank1.cpp
index 2eee054dd..4697b8285 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutRight_Rank1.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutRight_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutRight_Rank2.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutRight_Rank2.cpp
index a35acb3ac..4e15f3651 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutRight_Rank2.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutRight_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutRight_Rank3.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutRight_Rank3.cpp
index 0ba80f1bc..4336ff9ed 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutRight_Rank3.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutRight_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutRight_Rank4.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutRight_Rank4.cpp
index 1e046b521..a93494cb0 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutRight_Rank4.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutRight_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutRight_Rank5.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutRight_Rank5.cpp
index 1a6bd4ed9..0d4303e97 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutRight_Rank5.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutRight_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutRight_Rank8.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutRight_Rank8.cpp
index 5d1c44d0b..02b7f479f 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutRight_Rank8.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutRight_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutStride_Rank1.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutStride_Rank1.cpp
index f356973af..8af29e6d0 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutStride_Rank1.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutStride_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutStride_Rank2.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutStride_Rank2.cpp
index 9f9fb49ec..49787220c 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutStride_Rank2.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutStride_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutStride_Rank3.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutStride_Rank3.cpp
index 2000c9600..a48d561c9 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutStride_Rank3.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutStride_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutStride_Rank4.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutStride_Rank4.cpp
index b3348a37c..f5414d25e 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutStride_Rank4.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutStride_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutStride_Rank5.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutStride_Rank5.cpp
index f2b26ddf6..aa2e44a1c 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutStride_Rank5.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutStride_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutStride_Rank8.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutStride_Rank8.cpp
index 1ea222364..02401e5ec 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutStride_Rank8.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_float_LayoutStride_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank1.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank1.cpp
index f544d4d83..dc48d2350 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank1.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank2.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank2.cpp
index cbe97e793..28be03b8a 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank2.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank3.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank3.cpp
index a5c432ea2..2974698b4 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank3.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank4.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank4.cpp
index 2074c1c9f..bf9678b7d 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank4.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank5.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank5.cpp
index 27ca400c1..7df511d71 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank5.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank8.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank8.cpp
index 7dce168ab..8eec6cae1 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank8.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutRight_Rank1.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutRight_Rank1.cpp
index 999795c08..5422bacac 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutRight_Rank1.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutRight_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutRight_Rank2.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutRight_Rank2.cpp
index 274d9150b..dbb856b8d 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutRight_Rank2.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutRight_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutRight_Rank3.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutRight_Rank3.cpp
index 72c495c99..3944a4671 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutRight_Rank3.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutRight_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutRight_Rank4.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutRight_Rank4.cpp
index 7cb3b3d53..5f490e1a8 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutRight_Rank4.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutRight_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutRight_Rank5.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutRight_Rank5.cpp
index 016567cbc..5c2cf9d56 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutRight_Rank5.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutRight_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutRight_Rank8.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutRight_Rank8.cpp
index e78ae3cc4..6ca32499b 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutRight_Rank8.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutRight_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutStride_Rank1.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutStride_Rank1.cpp
index ce9317111..9c5d40e18 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutStride_Rank1.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutStride_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutStride_Rank2.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutStride_Rank2.cpp
index 5aeec9470..ae111b312 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutStride_Rank2.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutStride_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutStride_Rank3.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutStride_Rank3.cpp
index 3ed1e93e9..ce6c8a9fc 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutStride_Rank3.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutStride_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutStride_Rank4.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutStride_Rank4.cpp
index 3cebf6c87..d56e9e776 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutStride_Rank4.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutStride_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutStride_Rank5.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutStride_Rank5.cpp
index 91cbab881..e1ab19f5f 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutStride_Rank5.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutStride_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutStride_Rank8.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutStride_Rank8.cpp
index 5512f62a0..083cecc07 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutStride_Rank8.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int64_t_LayoutStride_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutLeft_Rank1.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutLeft_Rank1.cpp
index 4f023463f..b345f2ac4 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutLeft_Rank1.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutLeft_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutLeft_Rank2.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutLeft_Rank2.cpp
index 7cc8357cd..7370f284c 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutLeft_Rank2.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutLeft_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutLeft_Rank3.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutLeft_Rank3.cpp
index 228ccae9e..e6892ca01 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutLeft_Rank3.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutLeft_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutLeft_Rank4.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutLeft_Rank4.cpp
index 6c0b33ad8..1560af198 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutLeft_Rank4.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutLeft_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutLeft_Rank5.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutLeft_Rank5.cpp
index 51f76bd84..a7322631a 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutLeft_Rank5.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutLeft_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutLeft_Rank8.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutLeft_Rank8.cpp
index 5f1f763e7..2b5d8178c 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutLeft_Rank8.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutLeft_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutRight_Rank1.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutRight_Rank1.cpp
index c84d95c98..ed476241f 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutRight_Rank1.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutRight_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutRight_Rank2.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutRight_Rank2.cpp
index 245c30957..ee2b6739e 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutRight_Rank2.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutRight_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutRight_Rank3.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutRight_Rank3.cpp
index 78a2bee96..a8b7a8ef1 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutRight_Rank3.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutRight_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutRight_Rank4.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutRight_Rank4.cpp
index 84a3238ec..e11f9b443 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutRight_Rank4.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutRight_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutRight_Rank5.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutRight_Rank5.cpp
index e20c078f1..0e17bc8c5 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutRight_Rank5.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutRight_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutRight_Rank8.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutRight_Rank8.cpp
index 85b89ec8c..a7c9b8585 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutRight_Rank8.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutRight_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutStride_Rank1.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutStride_Rank1.cpp
index bc3e6aa2d..88c9569a9 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutStride_Rank1.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutStride_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutStride_Rank2.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutStride_Rank2.cpp
index e0d741b82..62ec94f71 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutStride_Rank2.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutStride_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutStride_Rank3.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutStride_Rank3.cpp
index 0f5f0f90b..9f86f5200 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutStride_Rank3.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutStride_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutStride_Rank4.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutStride_Rank4.cpp
index 4c54a03a0..a0762ad58 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutStride_Rank4.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutStride_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutStride_Rank5.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutStride_Rank5.cpp
index 20094d4f0..a3ffd6264 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutStride_Rank5.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutStride_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutStride_Rank8.cpp b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutStride_Rank8.cpp
index 93c582363..fbd2fca22 100644
--- a/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutStride_Rank8.cpp
+++ b/kokkos/core/src/eti/ROCm/Kokkos_ROCm_ViewCopyETIInst_int_int_LayoutStride_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank1.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank1.cpp
index 6ebe8606f..a749ec859 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank1.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank2.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank2.cpp
index 3c910b782..7a95f3975 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank2.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank3.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank3.cpp
index 246d468a9..961b788a8 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank3.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank4.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank4.cpp
index d4009f45f..57dbaaf95 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank4.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank5.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank5.cpp
index d1da85a60..33b0b8720 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank5.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank8.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank8.cpp
index c6be74fd3..6ec8b5f29 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank8.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutRight_Rank1.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutRight_Rank1.cpp
index bc27b453e..e4660ae4d 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutRight_Rank1.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutRight_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutRight_Rank2.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutRight_Rank2.cpp
index ee1d1e0ea..d77fb3eb1 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutRight_Rank2.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutRight_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutRight_Rank3.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutRight_Rank3.cpp
index 25e1b3388..c7ae12e85 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutRight_Rank3.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutRight_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutRight_Rank4.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutRight_Rank4.cpp
index 730477a67..7a6ad9b57 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutRight_Rank4.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutRight_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutRight_Rank5.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutRight_Rank5.cpp
index 5f84d0fed..bfe375c6b 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutRight_Rank5.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutRight_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutRight_Rank8.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutRight_Rank8.cpp
index 18fae3669..11c0c4a81 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutRight_Rank8.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutRight_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutStride_Rank1.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutStride_Rank1.cpp
index c970a48a9..8a7323699 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutStride_Rank1.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutStride_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutStride_Rank2.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutStride_Rank2.cpp
index 969e33b65..e2c48e8bb 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutStride_Rank2.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutStride_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutStride_Rank3.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutStride_Rank3.cpp
index 9faf4b4cb..b6a7f488d 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutStride_Rank3.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutStride_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutStride_Rank4.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutStride_Rank4.cpp
index d3b54b07c..2e3313b6e 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutStride_Rank4.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutStride_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutStride_Rank5.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutStride_Rank5.cpp
index 0463bd711..dcb760fbf 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutStride_Rank5.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutStride_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutStride_Rank8.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutStride_Rank8.cpp
index a04226311..9bd7e80e7 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutStride_Rank8.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_double_LayoutStride_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank1.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank1.cpp
index 86f0604e2..dedbd50d8 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank1.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank2.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank2.cpp
index 31bd00896..441d4774c 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank2.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank3.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank3.cpp
index 7d404d67b..b9013da90 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank3.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank4.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank4.cpp
index bc0b4dc57..0b19e4718 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank4.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank5.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank5.cpp
index 49ea254f2..f90164851 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank5.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank8.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank8.cpp
index cbc2c2c84..b8ad2e78b 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank8.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutRight_Rank1.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutRight_Rank1.cpp
index 0e1791442..7bf4b7e77 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutRight_Rank1.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutRight_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutRight_Rank2.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutRight_Rank2.cpp
index b9d3f39f4..39e4d3bb6 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutRight_Rank2.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutRight_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutRight_Rank3.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutRight_Rank3.cpp
index 3419ef64d..4d845c8e1 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutRight_Rank3.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutRight_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutRight_Rank4.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutRight_Rank4.cpp
index fa4428d77..b0d8e00fe 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutRight_Rank4.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutRight_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutRight_Rank5.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutRight_Rank5.cpp
index 191c26260..a8972610c 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutRight_Rank5.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutRight_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutRight_Rank8.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutRight_Rank8.cpp
index 304308a09..c0db2a928 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutRight_Rank8.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutRight_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutStride_Rank1.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutStride_Rank1.cpp
index 7460ca524..44ef5f0ba 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutStride_Rank1.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutStride_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutStride_Rank2.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutStride_Rank2.cpp
index 94b09fdc6..39d0b58af 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutStride_Rank2.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutStride_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutStride_Rank3.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutStride_Rank3.cpp
index 86279850a..1d6eb2fd3 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutStride_Rank3.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutStride_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutStride_Rank4.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutStride_Rank4.cpp
index 5e67be576..b38d19b99 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutStride_Rank4.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutStride_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutStride_Rank5.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutStride_Rank5.cpp
index 2f8a3841d..360c6b411 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutStride_Rank5.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutStride_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutStride_Rank8.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutStride_Rank8.cpp
index 37fe99ef2..f1f1dcde1 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutStride_Rank8.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_float_LayoutStride_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank1.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank1.cpp
index d87ea513a..6cfb563e7 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank1.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank2.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank2.cpp
index aaf2cbb78..abe7810be 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank2.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank3.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank3.cpp
index 49e268fa9..1b6b81e8e 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank3.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank4.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank4.cpp
index a72193ba8..7e50ce7cb 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank4.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank5.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank5.cpp
index dccea68f5..ea944ba15 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank5.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank8.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank8.cpp
index 0b85a413f..d00dd6a33 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank8.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank1.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank1.cpp
index 0072b106d..b7cf7d7fc 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank1.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank2.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank2.cpp
index 5f506973b..343dfc965 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank2.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank3.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank3.cpp
index db7031557..44050f142 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank3.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank4.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank4.cpp
index e5cd3c9e0..4ab602bc3 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank4.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank5.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank5.cpp
index 1f645becb..077314b85 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank5.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank8.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank8.cpp
index d138d3749..009d5afcf 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank8.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank1.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank1.cpp
index 093de6522..24a1e61eb 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank1.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank2.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank2.cpp
index 910b4f31d..bcf66fb16 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank2.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank3.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank3.cpp
index 3d4d4976f..65c075948 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank3.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank4.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank4.cpp
index c51fa8fbd..e30176602 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank4.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank5.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank5.cpp
index 53c150058..4ccabe6b3 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank5.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank8.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank8.cpp
index 808466ab3..161cf27c4 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank8.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank1.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank1.cpp
index 636b97635..0a0bb54bf 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank1.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank2.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank2.cpp
index 3a24b958e..745e67b5b 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank2.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank3.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank3.cpp
index 48030c1ca..40a9d2fe0 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank3.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank4.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank4.cpp
index 6d4184dcc..9436c1d9f 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank4.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank5.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank5.cpp
index 25c4eedf1..a52db2897 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank5.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank8.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank8.cpp
index 634542f9c..66e8b8f33 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank8.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutRight_Rank1.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutRight_Rank1.cpp
index 967df0677..9a32d30e2 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutRight_Rank1.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutRight_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutRight_Rank2.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutRight_Rank2.cpp
index bc6d604ed..1ec25b63b 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutRight_Rank2.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutRight_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutRight_Rank3.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutRight_Rank3.cpp
index fed3bf112..0c96adece 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutRight_Rank3.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutRight_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutRight_Rank4.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutRight_Rank4.cpp
index cfc74fc4d..5771fcf55 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutRight_Rank4.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutRight_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutRight_Rank5.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutRight_Rank5.cpp
index 157acd48f..b0b918d78 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutRight_Rank5.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutRight_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutRight_Rank8.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutRight_Rank8.cpp
index 70aeee279..eae13261e 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutRight_Rank8.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutRight_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutStride_Rank1.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutStride_Rank1.cpp
index 8b579e608..7efc50d45 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutStride_Rank1.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutStride_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutStride_Rank2.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutStride_Rank2.cpp
index 4b94ee597..f6b63e989 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutStride_Rank2.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutStride_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutStride_Rank3.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutStride_Rank3.cpp
index 58a912313..148ed9902 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutStride_Rank3.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutStride_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutStride_Rank4.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutStride_Rank4.cpp
index 3822f5e2c..a9b1b6d40 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutStride_Rank4.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutStride_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutStride_Rank5.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutStride_Rank5.cpp
index 467b3284a..30a20055a 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutStride_Rank5.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutStride_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutStride_Rank8.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutStride_Rank8.cpp
index a81de825f..fa42ed37b 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutStride_Rank8.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int64_t_int_LayoutStride_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutLeft_Rank1.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutLeft_Rank1.cpp
index e317b894e..07d809a29 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutLeft_Rank1.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutLeft_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutLeft_Rank2.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutLeft_Rank2.cpp
index 751e7bc51..e03f4f796 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutLeft_Rank2.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutLeft_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutLeft_Rank3.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutLeft_Rank3.cpp
index 870b5182d..92deaa8a3 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutLeft_Rank3.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutLeft_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutLeft_Rank4.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutLeft_Rank4.cpp
index c22a7ebf1..ec97ca8c5 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutLeft_Rank4.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutLeft_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutLeft_Rank5.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutLeft_Rank5.cpp
index 7691271f8..2693928bd 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutLeft_Rank5.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutLeft_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutLeft_Rank8.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutLeft_Rank8.cpp
index 8c6d1d683..968a40079 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutLeft_Rank8.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutLeft_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutRight_Rank1.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutRight_Rank1.cpp
index c26153ef4..4d7b8bc72 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutRight_Rank1.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutRight_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutRight_Rank2.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutRight_Rank2.cpp
index be167261f..7a97d75c1 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutRight_Rank2.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutRight_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutRight_Rank3.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutRight_Rank3.cpp
index da19b9376..25d9ee82b 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutRight_Rank3.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutRight_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutRight_Rank4.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutRight_Rank4.cpp
index cd6344ec7..b830d1a01 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutRight_Rank4.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutRight_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutRight_Rank5.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutRight_Rank5.cpp
index f90603f84..40f690b78 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutRight_Rank5.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutRight_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutRight_Rank8.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutRight_Rank8.cpp
index ddcdfd880..bf46af97d 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutRight_Rank8.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutRight_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutStride_Rank1.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutStride_Rank1.cpp
index 3f623740f..8abd7cc80 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutStride_Rank1.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutStride_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutStride_Rank2.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutStride_Rank2.cpp
index 14616bcae..e5472cda7 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutStride_Rank2.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutStride_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutStride_Rank3.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutStride_Rank3.cpp
index ef4d84404..a0c1b4efc 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutStride_Rank3.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutStride_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutStride_Rank4.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutStride_Rank4.cpp
index e0998f8be..a59984581 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutStride_Rank4.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutStride_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutStride_Rank5.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutStride_Rank5.cpp
index 04d5e3461..b750ca88c 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutStride_Rank5.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutStride_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutStride_Rank8.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutStride_Rank8.cpp
index 4942b709f..c1223916b 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutStride_Rank8.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_double_LayoutStride_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutLeft_Rank1.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutLeft_Rank1.cpp
index 30d12e003..453960b50 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutLeft_Rank1.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutLeft_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutLeft_Rank2.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutLeft_Rank2.cpp
index 56ea2fbc4..a1c599c76 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutLeft_Rank2.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutLeft_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutLeft_Rank3.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutLeft_Rank3.cpp
index 40793b365..a8f280cf2 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutLeft_Rank3.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutLeft_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutLeft_Rank4.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutLeft_Rank4.cpp
index 4bfaed6cd..e9a6a979c 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutLeft_Rank4.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutLeft_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutLeft_Rank5.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutLeft_Rank5.cpp
index 522cd39cb..0cbac14fb 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutLeft_Rank5.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutLeft_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutLeft_Rank8.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutLeft_Rank8.cpp
index 81bc0d1c3..98e182506 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutLeft_Rank8.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutLeft_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutRight_Rank1.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutRight_Rank1.cpp
index 472455b13..0afd11087 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutRight_Rank1.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutRight_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutRight_Rank2.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutRight_Rank2.cpp
index bde3677a0..14a80d9a9 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutRight_Rank2.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutRight_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutRight_Rank3.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutRight_Rank3.cpp
index 2c088533e..76516c192 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutRight_Rank3.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutRight_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutRight_Rank4.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutRight_Rank4.cpp
index b7671c386..3769ea0aa 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutRight_Rank4.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutRight_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutRight_Rank5.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutRight_Rank5.cpp
index cc751c29e..106f1b9c6 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutRight_Rank5.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutRight_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutRight_Rank8.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutRight_Rank8.cpp
index 467e331e2..44a362d82 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutRight_Rank8.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutRight_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutStride_Rank1.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutStride_Rank1.cpp
index 7d2d04798..5184be607 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutStride_Rank1.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutStride_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutStride_Rank2.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutStride_Rank2.cpp
index d295c925f..50117e94b 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutStride_Rank2.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutStride_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutStride_Rank3.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutStride_Rank3.cpp
index c9674d14d..4ddc4a3e4 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutStride_Rank3.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutStride_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutStride_Rank4.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutStride_Rank4.cpp
index 13c50df27..cf48e0caa 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutStride_Rank4.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutStride_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutStride_Rank5.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutStride_Rank5.cpp
index 98e502454..b1ab7b666 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutStride_Rank5.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutStride_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutStride_Rank8.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutStride_Rank8.cpp
index bae858b7d..02104cfa3 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutStride_Rank8.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_float_LayoutStride_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank1.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank1.cpp
index 2d93eb811..81eab82b0 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank1.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank2.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank2.cpp
index 56ea8d3d8..d5e45a194 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank2.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank3.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank3.cpp
index 8ecf5ed11..7cc00391a 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank3.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank4.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank4.cpp
index 003518c18..70df317f3 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank4.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank5.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank5.cpp
index 0ab3ee300..4c6018db7 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank5.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank8.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank8.cpp
index 471171339..4d48bb32c 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank8.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutRight_Rank1.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutRight_Rank1.cpp
index 9f99aa43d..61b6682ba 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutRight_Rank1.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutRight_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutRight_Rank2.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutRight_Rank2.cpp
index b16cce7b8..dd80db3e2 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutRight_Rank2.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutRight_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutRight_Rank3.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutRight_Rank3.cpp
index e74289b48..bec7b5d95 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutRight_Rank3.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutRight_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutRight_Rank4.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutRight_Rank4.cpp
index b9c1e631b..162915fb2 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutRight_Rank4.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutRight_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutRight_Rank5.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutRight_Rank5.cpp
index b27c36eee..5fe93924d 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutRight_Rank5.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutRight_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutRight_Rank8.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutRight_Rank8.cpp
index e0f9f1b73..284b7c7c0 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutRight_Rank8.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutRight_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutStride_Rank1.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutStride_Rank1.cpp
index 61d2e3ea3..aea751548 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutStride_Rank1.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutStride_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutStride_Rank2.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutStride_Rank2.cpp
index 1fcb6576d..310d949eb 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutStride_Rank2.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutStride_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutStride_Rank3.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutStride_Rank3.cpp
index cd1c3754c..2caeee72a 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutStride_Rank3.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutStride_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutStride_Rank4.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutStride_Rank4.cpp
index 10e03be41..b914f59ed 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutStride_Rank4.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutStride_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutStride_Rank5.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutStride_Rank5.cpp
index 7cbb27c23..601716c99 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutStride_Rank5.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutStride_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutStride_Rank8.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutStride_Rank8.cpp
index 10aaf9078..2c101a355 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutStride_Rank8.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int64_t_LayoutStride_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutLeft_Rank1.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutLeft_Rank1.cpp
index 4dc6af26f..b69c4263e 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutLeft_Rank1.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutLeft_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutLeft_Rank2.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutLeft_Rank2.cpp
index f2c996ade..ae5866022 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutLeft_Rank2.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutLeft_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutLeft_Rank3.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutLeft_Rank3.cpp
index 5ded7103e..1c66b5844 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutLeft_Rank3.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutLeft_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutLeft_Rank4.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutLeft_Rank4.cpp
index 8bf4aeeab..330dc037d 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutLeft_Rank4.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutLeft_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutLeft_Rank5.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutLeft_Rank5.cpp
index 99eba4348..001a67f14 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutLeft_Rank5.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutLeft_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutLeft_Rank8.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutLeft_Rank8.cpp
index d3c5fb20f..247f5a311 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutLeft_Rank8.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutLeft_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutRight_Rank1.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutRight_Rank1.cpp
index ca44c51ca..3fffcddae 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutRight_Rank1.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutRight_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutRight_Rank2.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutRight_Rank2.cpp
index 140913db1..0df3ae643 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutRight_Rank2.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutRight_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutRight_Rank3.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutRight_Rank3.cpp
index e36b44acd..64440939a 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutRight_Rank3.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutRight_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutRight_Rank4.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutRight_Rank4.cpp
index f2cb943ca..9e5ec8364 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutRight_Rank4.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutRight_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutRight_Rank5.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutRight_Rank5.cpp
index 25a7807b6..f5731068c 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutRight_Rank5.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutRight_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutRight_Rank8.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutRight_Rank8.cpp
index d05a48263..4f04907c0 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutRight_Rank8.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutRight_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutStride_Rank1.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutStride_Rank1.cpp
index 79477132d..b0b2b83a3 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutStride_Rank1.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutStride_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutStride_Rank2.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutStride_Rank2.cpp
index 75bca239f..a10911f33 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutStride_Rank2.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutStride_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutStride_Rank3.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutStride_Rank3.cpp
index 2dbf6332c..566f8e4f9 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutStride_Rank3.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutStride_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutStride_Rank4.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutStride_Rank4.cpp
index 4bced9489..e299d3ab7 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutStride_Rank4.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutStride_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutStride_Rank5.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutStride_Rank5.cpp
index 19473fe6f..9a191bf54 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutStride_Rank5.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutStride_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutStride_Rank8.cpp b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutStride_Rank8.cpp
index a4d64c1ea..d07e1e8d7 100644
--- a/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutStride_Rank8.cpp
+++ b/kokkos/core/src/eti/Serial/Kokkos_Serial_ViewCopyETIInst_int_int_LayoutStride_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank1.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank1.cpp
index b1a8a4830..7c84605ed 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank1.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank2.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank2.cpp
index 05d4749f3..3d7313a54 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank2.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank3.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank3.cpp
index 140892b80..72895035b 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank3.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank4.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank4.cpp
index e2122cc8a..69673d51e 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank4.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank5.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank5.cpp
index bcb408f09..d1aff7b82 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank5.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank8.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank8.cpp
index 53e339bae..e617e19b4 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank8.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutLeft_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutRight_Rank1.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutRight_Rank1.cpp
index b3db7f3ba..855e99e06 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutRight_Rank1.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutRight_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutRight_Rank2.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutRight_Rank2.cpp
index ec158b109..b9ffb82a5 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutRight_Rank2.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutRight_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutRight_Rank3.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutRight_Rank3.cpp
index d37a7393d..85a468397 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutRight_Rank3.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutRight_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutRight_Rank4.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutRight_Rank4.cpp
index 89b3e5aef..ba658e7b7 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutRight_Rank4.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutRight_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutRight_Rank5.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutRight_Rank5.cpp
index d049f8ca1..8d413bcb3 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutRight_Rank5.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutRight_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutRight_Rank8.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutRight_Rank8.cpp
index 4e6efdfbf..8a2a06649 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutRight_Rank8.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutRight_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutStride_Rank1.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutStride_Rank1.cpp
index 3c4bcc35c..3a376b91a 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutStride_Rank1.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutStride_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutStride_Rank2.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutStride_Rank2.cpp
index 37c6c7d9b..7a3ca29f4 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutStride_Rank2.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutStride_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutStride_Rank3.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutStride_Rank3.cpp
index 8076314f7..44bf3df6a 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutStride_Rank3.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutStride_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutStride_Rank4.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutStride_Rank4.cpp
index 478fbab08..943a00325 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutStride_Rank4.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutStride_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutStride_Rank5.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutStride_Rank5.cpp
index 46efb268d..b12da7c5b 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutStride_Rank5.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutStride_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutStride_Rank8.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutStride_Rank8.cpp
index b0eee4572..a859379df 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutStride_Rank8.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_double_LayoutStride_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank1.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank1.cpp
index f27584d70..b11ec7758 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank1.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank2.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank2.cpp
index 96c32dc3c..e7fee1b9e 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank2.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank3.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank3.cpp
index e7cc2ad56..f82b4a92b 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank3.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank4.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank4.cpp
index f53de6705..3904c4cb0 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank4.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank5.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank5.cpp
index dd208de02..77d46acfd 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank5.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank8.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank8.cpp
index 02a087379..006fce3cf 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank8.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutLeft_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutRight_Rank1.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutRight_Rank1.cpp
index a10f63ac7..91256cd69 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutRight_Rank1.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutRight_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutRight_Rank2.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutRight_Rank2.cpp
index 07e15c066..d29fbfe79 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutRight_Rank2.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutRight_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutRight_Rank3.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutRight_Rank3.cpp
index 0bb045897..bdf866f3b 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutRight_Rank3.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutRight_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutRight_Rank4.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutRight_Rank4.cpp
index a39d2ff97..aaa00a6f6 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutRight_Rank4.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutRight_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutRight_Rank5.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutRight_Rank5.cpp
index 5ccc397df..db2ab88d2 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutRight_Rank5.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutRight_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutRight_Rank8.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutRight_Rank8.cpp
index 6d7b5f542..3024e4e00 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutRight_Rank8.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutRight_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutStride_Rank1.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutStride_Rank1.cpp
index 60143f398..e6e66d7bb 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutStride_Rank1.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutStride_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutStride_Rank2.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutStride_Rank2.cpp
index c558b3422..28ed80254 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutStride_Rank2.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutStride_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutStride_Rank3.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutStride_Rank3.cpp
index 764e71a7f..4863866aa 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutStride_Rank3.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutStride_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutStride_Rank4.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutStride_Rank4.cpp
index 8b9b5ce8b..e24e9e022 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutStride_Rank4.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutStride_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutStride_Rank5.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutStride_Rank5.cpp
index 07b99e7db..047c078bc 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutStride_Rank5.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutStride_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutStride_Rank8.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutStride_Rank8.cpp
index 2e3bf75f1..78c7496b7 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutStride_Rank8.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_float_LayoutStride_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank1.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank1.cpp
index 600698c5a..33ee50081 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank1.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank2.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank2.cpp
index b87d04673..4c1d4bb58 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank2.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank3.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank3.cpp
index 55760050a..75e4bc4e3 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank3.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank4.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank4.cpp
index 07e984267..3007a4db6 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank4.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank5.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank5.cpp
index 17acc1f50..198e54631 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank5.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank8.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank8.cpp
index c0d316234..c12fa4e7b 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank8.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutLeft_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank1.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank1.cpp
index 5d77aaa5c..82f782ce5 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank1.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank2.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank2.cpp
index 777d302f9..d11bf3dd2 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank2.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank3.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank3.cpp
index ae8fe0b8f..53bd8056d 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank3.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank4.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank4.cpp
index 9a849e5af..44e78041b 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank4.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank5.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank5.cpp
index cf39c66ed..6f54702d2 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank5.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank8.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank8.cpp
index 949025976..141b79110 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank8.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutRight_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank1.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank1.cpp
index 919a46bee..e23e6092e 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank1.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank2.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank2.cpp
index 7083f2d62..f5db8f744 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank2.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank3.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank3.cpp
index a2c041f5f..44ce22318 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank3.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank4.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank4.cpp
index 4f2d22bcb..55fca1118 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank4.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank5.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank5.cpp
index 682f0e24f..31b952913 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank5.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank8.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank8.cpp
index 4c221e5b0..887bfb4c0 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank8.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int64_t_LayoutStride_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank1.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank1.cpp
index 178bca70f..71625e0d8 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank1.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank2.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank2.cpp
index c8b367004..cd045703f 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank2.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank3.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank3.cpp
index 69bf3ff10..abbd0f842 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank3.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank4.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank4.cpp
index fb9fa1087..5ac12d864 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank4.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank5.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank5.cpp
index 8a670ae4b..50ed4f48c 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank5.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank8.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank8.cpp
index 30fbc0b96..f83f5faa2 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank8.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutLeft_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutRight_Rank1.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutRight_Rank1.cpp
index 8e07a6b6e..c99684ef9 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutRight_Rank1.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutRight_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutRight_Rank2.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutRight_Rank2.cpp
index 24dd3bd67..c0c1bb9c8 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutRight_Rank2.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutRight_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutRight_Rank3.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutRight_Rank3.cpp
index f5cbb265f..cfef96b18 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutRight_Rank3.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutRight_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutRight_Rank4.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutRight_Rank4.cpp
index 528f44336..c16e18935 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutRight_Rank4.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutRight_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutRight_Rank5.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutRight_Rank5.cpp
index 8fe7abbc9..3b404d241 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutRight_Rank5.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutRight_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutRight_Rank8.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutRight_Rank8.cpp
index 8890ead8a..21148463c 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutRight_Rank8.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutRight_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutStride_Rank1.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutStride_Rank1.cpp
index e91419c31..8d5eed4f8 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutStride_Rank1.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutStride_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutStride_Rank2.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutStride_Rank2.cpp
index 1f1da4209..7a590129d 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutStride_Rank2.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutStride_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutStride_Rank3.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutStride_Rank3.cpp
index 0bb057e9f..7ad5bfa4d 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutStride_Rank3.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutStride_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutStride_Rank4.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutStride_Rank4.cpp
index 73d48c378..be7a7cb21 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutStride_Rank4.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutStride_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutStride_Rank5.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutStride_Rank5.cpp
index d36407a4e..df2d4b176 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutStride_Rank5.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutStride_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutStride_Rank8.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutStride_Rank8.cpp
index 8ce3ef29d..29b3cc8ee 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutStride_Rank8.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int64_t_int_LayoutStride_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutLeft_Rank1.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutLeft_Rank1.cpp
index b6707b21a..1bbc8c414 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutLeft_Rank1.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutLeft_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutLeft_Rank2.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutLeft_Rank2.cpp
index 18f5f914e..e04cee2c2 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutLeft_Rank2.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutLeft_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutLeft_Rank3.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutLeft_Rank3.cpp
index cebec010c..0849086c3 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutLeft_Rank3.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutLeft_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutLeft_Rank4.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutLeft_Rank4.cpp
index 376e02980..6b50b7ca7 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutLeft_Rank4.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutLeft_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutLeft_Rank5.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutLeft_Rank5.cpp
index 3f3adecbd..a3592caba 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutLeft_Rank5.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutLeft_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutLeft_Rank8.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutLeft_Rank8.cpp
index cbb907626..ce16f2a70 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutLeft_Rank8.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutLeft_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutRight_Rank1.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutRight_Rank1.cpp
index 6720d624e..29c6670a8 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutRight_Rank1.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutRight_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutRight_Rank2.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutRight_Rank2.cpp
index 08ef5ea09..aa343fcb8 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutRight_Rank2.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutRight_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutRight_Rank3.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutRight_Rank3.cpp
index 88c4e2b82..1043a55fd 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutRight_Rank3.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutRight_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutRight_Rank4.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutRight_Rank4.cpp
index 3ae213dc7..9f2d09565 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutRight_Rank4.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutRight_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutRight_Rank5.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutRight_Rank5.cpp
index 4b2e57996..02b4d1087 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutRight_Rank5.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutRight_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutRight_Rank8.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutRight_Rank8.cpp
index 35cf9f739..c83fe0bfb 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutRight_Rank8.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutRight_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutStride_Rank1.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutStride_Rank1.cpp
index 8a438ea74..d97cb633f 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutStride_Rank1.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutStride_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutStride_Rank2.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutStride_Rank2.cpp
index 3950ee1d8..988dd3091 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutStride_Rank2.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutStride_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutStride_Rank3.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutStride_Rank3.cpp
index 5667625ae..b537f31ec 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutStride_Rank3.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutStride_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutStride_Rank4.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutStride_Rank4.cpp
index 77ae3d654..4163489a3 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutStride_Rank4.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutStride_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutStride_Rank5.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutStride_Rank5.cpp
index c9d4fd429..e954a0b03 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutStride_Rank5.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutStride_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutStride_Rank8.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutStride_Rank8.cpp
index 26c02a7b4..7f56eb8d2 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutStride_Rank8.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_double_LayoutStride_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutLeft_Rank1.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutLeft_Rank1.cpp
index dcf6bc2fc..be9a665fb 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutLeft_Rank1.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutLeft_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutLeft_Rank2.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutLeft_Rank2.cpp
index 92bfebaae..c82e8d12a 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutLeft_Rank2.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutLeft_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutLeft_Rank3.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutLeft_Rank3.cpp
index f4e9d4287..0789ace2e 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutLeft_Rank3.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutLeft_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutLeft_Rank4.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutLeft_Rank4.cpp
index 48c0b23a2..1b9f8a615 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutLeft_Rank4.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutLeft_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutLeft_Rank5.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutLeft_Rank5.cpp
index b541c62a5..92ae8f9a9 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutLeft_Rank5.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutLeft_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutLeft_Rank8.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutLeft_Rank8.cpp
index d9489cc4c..1cf105fe5 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutLeft_Rank8.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutLeft_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutRight_Rank1.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutRight_Rank1.cpp
index 44f83ac55..24dc52eef 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutRight_Rank1.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutRight_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutRight_Rank2.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutRight_Rank2.cpp
index 2b0fdd347..7e6619330 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutRight_Rank2.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutRight_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutRight_Rank3.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutRight_Rank3.cpp
index 962f26195..c347f7700 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutRight_Rank3.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutRight_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutRight_Rank4.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutRight_Rank4.cpp
index a38d1fd28..607eeed51 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutRight_Rank4.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutRight_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutRight_Rank5.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutRight_Rank5.cpp
index eb5403d18..86ce1f81a 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutRight_Rank5.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutRight_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutRight_Rank8.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutRight_Rank8.cpp
index 6dbf3ffba..38edea565 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutRight_Rank8.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutRight_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutStride_Rank1.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutStride_Rank1.cpp
index 4eb8dd404..c11ba480b 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutStride_Rank1.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutStride_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutStride_Rank2.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutStride_Rank2.cpp
index 5d2540bcc..12973de44 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutStride_Rank2.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutStride_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutStride_Rank3.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutStride_Rank3.cpp
index 246a2cfbf..57f00f62b 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutStride_Rank3.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutStride_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutStride_Rank4.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutStride_Rank4.cpp
index f79b75d5f..5a73ab7e9 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutStride_Rank4.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutStride_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutStride_Rank5.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutStride_Rank5.cpp
index fedf5785d..1b928f18f 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutStride_Rank5.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutStride_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutStride_Rank8.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutStride_Rank8.cpp
index 7ba9b161a..c3b3949d8 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutStride_Rank8.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_float_LayoutStride_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank1.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank1.cpp
index e5481c07b..c9736ad22 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank1.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank2.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank2.cpp
index 4a73cdebf..93d7a16c9 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank2.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank3.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank3.cpp
index e81242df2..ad9546fa6 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank3.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank4.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank4.cpp
index f85a3bda1..a62946d97 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank4.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank5.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank5.cpp
index 96aa63346..20826a037 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank5.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank8.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank8.cpp
index 6b3f9d6a4..9d629f9ff 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank8.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutLeft_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutRight_Rank1.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutRight_Rank1.cpp
index e33d0d61f..39a7dbef8 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutRight_Rank1.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutRight_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutRight_Rank2.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutRight_Rank2.cpp
index 232b49548..33bb9f577 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutRight_Rank2.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutRight_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutRight_Rank3.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutRight_Rank3.cpp
index 9346cbd34..1d052babb 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutRight_Rank3.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutRight_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutRight_Rank4.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutRight_Rank4.cpp
index 8e64af429..6533f33f5 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutRight_Rank4.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutRight_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutRight_Rank5.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutRight_Rank5.cpp
index 78cd86a81..a8b7a9615 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutRight_Rank5.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutRight_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutRight_Rank8.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutRight_Rank8.cpp
index f21431289..33517ed85 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutRight_Rank8.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutRight_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutStride_Rank1.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutStride_Rank1.cpp
index 5e16f729a..2bd62e560 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutStride_Rank1.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutStride_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutStride_Rank2.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutStride_Rank2.cpp
index b805a21a7..fd1bb8862 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutStride_Rank2.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutStride_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutStride_Rank3.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutStride_Rank3.cpp
index 2955f3d52..33a23913e 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutStride_Rank3.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutStride_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutStride_Rank4.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutStride_Rank4.cpp
index 4cebee02a..1bcab4c13 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutStride_Rank4.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutStride_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutStride_Rank5.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutStride_Rank5.cpp
index 5e881ee44..0a8d0676d 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutStride_Rank5.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutStride_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutStride_Rank8.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutStride_Rank8.cpp
index 003f72a48..47ccf94a8 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutStride_Rank8.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int64_t_LayoutStride_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutLeft_Rank1.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutLeft_Rank1.cpp
index 69d562727..acc4187d9 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutLeft_Rank1.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutLeft_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutLeft_Rank2.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutLeft_Rank2.cpp
index 64decafd9..01a0fd28e 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutLeft_Rank2.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutLeft_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutLeft_Rank3.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutLeft_Rank3.cpp
index df1152c11..b31813ca3 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutLeft_Rank3.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutLeft_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutLeft_Rank4.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutLeft_Rank4.cpp
index b6004c75b..bf52b9f93 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutLeft_Rank4.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutLeft_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutLeft_Rank5.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutLeft_Rank5.cpp
index d0a8dece5..61e5dc06a 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutLeft_Rank5.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutLeft_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutLeft_Rank8.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutLeft_Rank8.cpp
index f63798b45..cb6906991 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutLeft_Rank8.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutLeft_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutRight_Rank1.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutRight_Rank1.cpp
index 45e7638d4..b3afb8f5a 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutRight_Rank1.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutRight_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutRight_Rank2.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutRight_Rank2.cpp
index 026849fc6..f742ae330 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutRight_Rank2.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutRight_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutRight_Rank3.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutRight_Rank3.cpp
index de8959d62..44b772418 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutRight_Rank3.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutRight_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutRight_Rank4.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutRight_Rank4.cpp
index 1f2d20c4d..2a08a72d8 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutRight_Rank4.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutRight_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutRight_Rank5.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutRight_Rank5.cpp
index d2fc1141c..5e9bd50d1 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutRight_Rank5.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutRight_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutRight_Rank8.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutRight_Rank8.cpp
index 98024238e..9d3ebb948 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutRight_Rank8.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutRight_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutStride_Rank1.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutStride_Rank1.cpp
index 17a1279b3..f77e685c7 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutStride_Rank1.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutStride_Rank1.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutStride_Rank2.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutStride_Rank2.cpp
index 129eae82d..57ae0a1fd 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutStride_Rank2.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutStride_Rank2.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutStride_Rank3.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutStride_Rank3.cpp
index d2af7e8af..d86407b2c 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutStride_Rank3.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutStride_Rank3.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutStride_Rank4.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutStride_Rank4.cpp
index 5da25e8d1..0abf26b47 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutStride_Rank4.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutStride_Rank4.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutStride_Rank5.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutStride_Rank5.cpp
index bb10d9eea..6e8cd9f28 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutStride_Rank5.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutStride_Rank5.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutStride_Rank8.cpp b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutStride_Rank8.cpp
index ee5363951..ff91ded36 100644
--- a/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutStride_Rank8.cpp
+++ b/kokkos/core/src/eti/Threads/Kokkos_Threads_ViewCopyETIInst_int_int_LayoutStride_Rank8.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/impl/CMakeLists.txt b/kokkos/core/src/impl/CMakeLists.txt
index 2f6d8e78a..361a85b73 100644
--- a/kokkos/core/src/impl/CMakeLists.txt
+++ b/kokkos/core/src/impl/CMakeLists.txt
@@ -9,7 +9,7 @@ TRIBITS_ADD_LIBRARY(
     kokkoscore_impl
     NOINSTALLHEADERS ${HEADERS}
     SOURCES ${SOURCES}
-    DEPLIBS 
+    DEPLIBS
     )
 
 SET(TRILINOS_INCDIR ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
diff --git a/kokkos/core/src/impl/KokkosExp_Host_IterateTile.hpp b/kokkos/core/src/impl/KokkosExp_Host_IterateTile.hpp
index bdc3d59e1..09ed79a5f 100644
--- a/kokkos/core/src/impl/KokkosExp_Host_IterateTile.hpp
+++ b/kokkos/core/src/impl/KokkosExp_Host_IterateTile.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/impl/KokkosExp_ViewMapping.hpp b/kokkos/core/src/impl/KokkosExp_ViewMapping.hpp
index 9351bcd56..a41ffb1e8 100644
--- a/kokkos/core/src/impl/KokkosExp_ViewMapping.hpp
+++ b/kokkos/core/src/impl/KokkosExp_ViewMapping.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/impl/Kokkos_AnalyzePolicy.hpp b/kokkos/core/src/impl/Kokkos_AnalyzePolicy.hpp
index 6cea1ed63..739e2d4f4 100644
--- a/kokkos/core/src/impl/Kokkos_AnalyzePolicy.hpp
+++ b/kokkos/core/src/impl/Kokkos_AnalyzePolicy.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -177,11 +177,14 @@ struct AnalyzePolicy<Base, T, Traits...>
                                   is_launch_bounds<T>::value,
                                   SetLaunchBounds<Base, T>,
                                   typename std::conditional<
-                                      Experimental::is_work_item_property<
-                                          T>::value,
+                                      Kokkos::Experimental::
+                                          is_work_item_property<T>::value,
                                       SetWorkItemProperty<Base, T>,
-                                      SetWorkTag<Base, T> >::type>::type>::
-                              type>::type>::type>::type>::type::type,
+                                      typename std::conditional<
+                                          !std::is_void<T>::value,
+                                          SetWorkTag<Base, T>, Base>::type>::
+                                      type>::type>::type>::type>::type>::type>::
+              type::type,
           Traits...> {};
 
 template <typename Base>
@@ -201,9 +204,9 @@ struct AnalyzePolicy<Base> {
   using index_type =
       typename std::conditional<is_void<typename Base::index_type>::value,
                                 IndexType<typename execution_space::size_type>,
-                                typename Base::index_type>::type ::
-          type  // nasty hack to make index_type into an integral_type
-      ;  // instead of the wrapped IndexType<T> for backwards compatibility
+                                typename Base::index_type>::type::type;
+  // nasty hack to make index_type into an integral_type
+  // instead of the wrapped IndexType<T> for backwards compatibility
 
   using iteration_pattern = typename std::conditional<
       is_void<typename Base::iteration_pattern>::value,
diff --git a/kokkos/core/src/impl/Kokkos_Atomic_Assembly.hpp b/kokkos/core/src/impl/Kokkos_Atomic_Assembly.hpp
index ae95fd274..a31dd1cf4 100644
--- a/kokkos/core/src/impl/Kokkos_Atomic_Assembly.hpp
+++ b/kokkos/core/src/impl/Kokkos_Atomic_Assembly.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -48,6 +48,8 @@
 namespace Kokkos {
 
 namespace Impl {
+
+#if !defined(_WIN32)
 struct cas128_t {
   uint64_t lower;
   uint64_t upper;
@@ -85,6 +87,7 @@ struct cas128_t {
     upper = a.upper;
   }
 } __attribute__((__aligned__(16)));
+#endif
 
 #if defined(KOKKOS_ENABLE_ASM) && defined(KOKKOS_ENABLE_ISA_X86_64)
 inline cas128_t cas128(volatile cas128_t* ptr, cas128_t cmp, cas128_t swap) {
diff --git a/kokkos/core/src/impl/Kokkos_Atomic_Compare_Exchange_Strong.hpp b/kokkos/core/src/impl/Kokkos_Atomic_Compare_Exchange_Strong.hpp
index dd6f6aa4c..c25b80a82 100644
--- a/kokkos/core/src/impl/Kokkos_Atomic_Compare_Exchange_Strong.hpp
+++ b/kokkos/core/src/impl/Kokkos_Atomic_Compare_Exchange_Strong.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -92,8 +92,7 @@ __inline__ __device__ unsigned long long int atomic_compare_exchange(
 template <typename T>
 __inline__ __device__ T atomic_compare_exchange(
     volatile T* const dest, const T& compare,
-    typename Kokkos::Impl::enable_if<sizeof(T) == sizeof(int), const T&>::type
-        val) {
+    typename std::enable_if<sizeof(T) == sizeof(int), const T&>::type val) {
   const int tmp = atomicCAS((int*)dest, *((int*)&compare), *((int*)&val));
   return *((T*)&tmp);
 }
@@ -101,9 +100,9 @@ __inline__ __device__ T atomic_compare_exchange(
 template <typename T>
 __inline__ __device__ T atomic_compare_exchange(
     volatile T* const dest, const T& compare,
-    typename Kokkos::Impl::enable_if<
-        sizeof(T) != sizeof(int) && sizeof(T) == sizeof(unsigned long long int),
-        const T&>::type val) {
+    typename std::enable_if<sizeof(T) != sizeof(int) &&
+                                sizeof(T) == sizeof(unsigned long long int),
+                            const T&>::type val) {
   typedef unsigned long long int type;
   const type tmp = atomicCAS((type*)dest, *((type*)&compare), *((type*)&val));
   return *((T*)&tmp);
@@ -112,8 +111,8 @@ __inline__ __device__ T atomic_compare_exchange(
 template <typename T>
 __inline__ __device__ T atomic_compare_exchange(
     volatile T* const dest, const T& compare,
-    typename Kokkos::Impl::enable_if<(sizeof(T) != 4) && (sizeof(T) != 8),
-                                     const T>::type& val) {
+    typename std::enable_if<(sizeof(T) != 4) && (sizeof(T) != 8),
+                            const T>::type& val) {
   T return_val;
   // This is a way to (hopefully) avoid dead lock in a warp
   int done = 0;
@@ -147,7 +146,7 @@ __inline__ __device__ T atomic_compare_exchange(
 //----------------------------------------------------------------------------
 // GCC native CAS supports int, long, unsigned int, unsigned long.
 // Intel native CAS support int and long with the same interface as GCC.
-#if !defined(KOKKOS_ENABLE_ROCM_ATOMICS)
+#if !defined(KOKKOS_ENABLE_ROCM_ATOMICS) || !defined(KOKKOS_ENABLE_HIP_ATOMICS)
 #if !defined(__CUDA_ARCH__) || defined(KOKKOS_IMPL_CUDA_CLANG_WORKAROUND)
 #if defined(KOKKOS_ENABLE_GNU_ATOMICS) || defined(KOKKOS_ENABLE_INTEL_ATOMICS)
 
@@ -188,12 +187,11 @@ inline unsigned long atomic_compare_exchange(volatile unsigned long* const dest,
 template <typename T>
 inline T atomic_compare_exchange(
     volatile T* const dest, const T& compare,
-    typename Kokkos::Impl::enable_if<sizeof(T) == sizeof(int), const T&>::type
-        val) {
+    typename std::enable_if<sizeof(T) == sizeof(int), const T&>::type val) {
   union U {
     int i;
     T t;
-    KOKKOS_INLINE_FUNCTION U(){};
+    KOKKOS_INLINE_FUNCTION U() {}
   } tmp;
 
 #if defined(KOKKOS_ENABLE_RFO_PREFETCH)
@@ -208,13 +206,13 @@ inline T atomic_compare_exchange(
 template <typename T>
 inline T atomic_compare_exchange(
     volatile T* const dest, const T& compare,
-    typename Kokkos::Impl::enable_if<sizeof(T) != sizeof(int) &&
-                                         sizeof(T) == sizeof(long),
-                                     const T&>::type val) {
+    typename std::enable_if<sizeof(T) != sizeof(int) &&
+                                sizeof(T) == sizeof(long),
+                            const T&>::type val) {
   union U {
     long i;
     T t;
-    KOKKOS_INLINE_FUNCTION U(){};
+    KOKKOS_INLINE_FUNCTION U() {}
   } tmp;
 
 #if defined(KOKKOS_ENABLE_RFO_PREFETCH)
@@ -230,14 +228,14 @@ inline T atomic_compare_exchange(
 template <typename T>
 inline T atomic_compare_exchange(
     volatile T* const dest, const T& compare,
-    typename Kokkos::Impl::enable_if<sizeof(T) != sizeof(int) &&
-                                         sizeof(T) != sizeof(long) &&
-                                         sizeof(T) == sizeof(Impl::cas128_t),
-                                     const T&>::type val) {
+    typename std::enable_if<sizeof(T) != sizeof(int) &&
+                                sizeof(T) != sizeof(long) &&
+                                sizeof(T) == sizeof(Impl::cas128_t),
+                            const T&>::type val) {
   union U {
     Impl::cas128_t i;
     T t;
-    KOKKOS_INLINE_FUNCTION U(){};
+    KOKKOS_INLINE_FUNCTION U() {}
   } tmp;
 
 #if defined(KOKKOS_ENABLE_RFO_PREFETCH)
@@ -253,12 +251,12 @@ inline T atomic_compare_exchange(
 template <typename T>
 inline T atomic_compare_exchange(
     volatile T* const dest, const T compare,
-    typename Kokkos::Impl::enable_if<(sizeof(T) != 4) && (sizeof(T) != 8)
+    typename std::enable_if<(sizeof(T) != 4) && (sizeof(T) != 8)
 #if defined(KOKKOS_ENABLE_ASM) && defined(KOKKOS_ENABLE_ISA_X86_64)
-                                         && (sizeof(T) != 16)
+                                && (sizeof(T) != 16)
 #endif
-                                         ,
-                                     const T>::type& val) {
+                                ,
+                            const T>::type& val) {
 #if defined(KOKKOS_ENABLE_RFO_PREFETCH)
   _mm_prefetch((const char*)dest, _MM_HINT_ET0);
 #endif
diff --git a/kokkos/core/src/impl/Kokkos_Atomic_Compare_Exchange_Weak.hpp b/kokkos/core/src/impl/Kokkos_Atomic_Compare_Exchange_Weak.hpp
index f947b80a5..e3fd1c53d 100644
--- a/kokkos/core/src/impl/Kokkos_Atomic_Compare_Exchange_Weak.hpp
+++ b/kokkos/core/src/impl/Kokkos_Atomic_Compare_Exchange_Weak.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -226,7 +226,7 @@ bool atomic_compare_exchange_weak(
 
 // GCC native CAS supports int, long, unsigned int, unsigned long.
 // Intel native CAS support int and long with the same interface as GCC.
-#if !defined(KOKKOS_ENABLE_ROCM_ATOMICS)
+#if !defined(KOKKOS_ENABLE_ROCM_ATOMICS) || !defined(KOKKOS_ENABLE_HIP_ATOMICS)
 #if !defined(__CUDA_ARCH__) || defined(KOKKOS_IMPL_CUDA_CLANG_WORKAROUND)
 #if defined(KOKKOS_ENABLE_GNU_ATOMICS) || defined(KOKKOS_ENABLE_INTEL_ATOMICS)
 
@@ -267,12 +267,11 @@ inline unsigned long atomic_compare_exchange(volatile unsigned long* const dest,
 template <typename T>
 inline T atomic_compare_exchange(
     volatile T* const dest, const T& compare,
-    typename Kokkos::Impl::enable_if<sizeof(T) == sizeof(int), const T&>::type
-        val) {
+    typename std::enable_if<sizeof(T) == sizeof(int), const T&>::type val) {
   union U {
     int i;
     T t;
-    KOKKOS_INLINE_FUNCTION U(){};
+    KOKKOS_INLINE_FUNCTION U() {}
   } tmp;
 
 #if defined(KOKKOS_ENABLE_RFO_PREFETCH)
@@ -287,13 +286,13 @@ inline T atomic_compare_exchange(
 template <typename T>
 inline T atomic_compare_exchange(
     volatile T* const dest, const T& compare,
-    typename Kokkos::Impl::enable_if<sizeof(T) != sizeof(int) &&
-                                         sizeof(T) == sizeof(long),
-                                     const T&>::type val) {
+    typename std::enable_if<sizeof(T) != sizeof(int) &&
+                                sizeof(T) == sizeof(long),
+                            const T&>::type val) {
   union U {
     long i;
     T t;
-    KOKKOS_INLINE_FUNCTION U(){};
+    KOKKOS_INLINE_FUNCTION U() {}
   } tmp;
 
 #if defined(KOKKOS_ENABLE_RFO_PREFETCH)
@@ -309,14 +308,14 @@ inline T atomic_compare_exchange(
 template <typename T>
 inline T atomic_compare_exchange(
     volatile T* const dest, const T& compare,
-    typename Kokkos::Impl::enable_if<sizeof(T) != sizeof(int) &&
-                                         sizeof(T) != sizeof(long) &&
-                                         sizeof(T) == sizeof(Impl::cas128_t),
-                                     const T&>::type val) {
+    typename std::enable_if<sizeof(T) != sizeof(int) &&
+                                sizeof(T) != sizeof(long) &&
+                                sizeof(T) == sizeof(Impl::cas128_t),
+                            const T&>::type val) {
   union U {
     Impl::cas128_t i;
     T t;
-    KOKKOS_INLINE_FUNCTION U(){};
+    KOKKOS_INLINE_FUNCTION U() {}
   } tmp;
 
 #if defined(KOKKOS_ENABLE_RFO_PREFETCH)
@@ -332,12 +331,12 @@ inline T atomic_compare_exchange(
 template <typename T>
 inline T atomic_compare_exchange(
     volatile T* const dest, const T compare,
-    typename Kokkos::Impl::enable_if<(sizeof(T) != 4) && (sizeof(T) != 8)
+    typename std::enable_if<(sizeof(T) != 4) && (sizeof(T) != 8)
 #if defined(KOKKOS_ENABLE_ASM) && defined(KOKKOS_ENABLE_ISA_X86_64)
-                                         && (sizeof(T) != 16)
+                                && (sizeof(T) != 16)
 #endif
-                                         ,
-                                     const T>::type& val) {
+                                ,
+                            const T>::type& val) {
 #if defined(KOKKOS_ENABLE_RFO_PREFETCH)
   _mm_prefetch((const char*)dest, _MM_HINT_ET0);
 #endif
diff --git a/kokkos/core/src/impl/Kokkos_Atomic_Decrement.hpp b/kokkos/core/src/impl/Kokkos_Atomic_Decrement.hpp
index 4940ed9c9..47961b5c7 100644
--- a/kokkos/core/src/impl/Kokkos_Atomic_Decrement.hpp
+++ b/kokkos/core/src/impl/Kokkos_Atomic_Decrement.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -54,7 +54,7 @@
 
 namespace Kokkos {
 
-// Atomic increment
+// Atomic decrement
 template <>
 KOKKOS_INLINE_FUNCTION void atomic_decrement<char>(volatile char* a) {
 #if defined(KOKKOS_ENABLE_ASM) && defined(KOKKOS_ENABLE_ISA_X86_64) && \
diff --git a/kokkos/core/src/impl/Kokkos_Atomic_Exchange.hpp b/kokkos/core/src/impl/Kokkos_Atomic_Exchange.hpp
index 11fa4dabb..4a9a786df 100644
--- a/kokkos/core/src/impl/Kokkos_Atomic_Exchange.hpp
+++ b/kokkos/core/src/impl/Kokkos_Atomic_Exchange.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -84,8 +84,7 @@ __inline__ __device__ unsigned long long int atomic_exchange(
 template <typename T>
 __inline__ __device__ T atomic_exchange(
     volatile T* const dest,
-    typename Kokkos::Impl::enable_if<sizeof(T) == sizeof(int), const T&>::type
-        val) {
+    typename std::enable_if<sizeof(T) == sizeof(int), const T&>::type val) {
   // int tmp = __ullAtomicExch( (int*) dest , *((int*)&val) );
 #if defined(KOKKOS_ENABLE_RFO_PREFETCH)
   _mm_prefetch((const char*)dest, _MM_HINT_ET0);
@@ -98,9 +97,9 @@ __inline__ __device__ T atomic_exchange(
 template <typename T>
 __inline__ __device__ T atomic_exchange(
     volatile T* const dest,
-    typename Kokkos::Impl::enable_if<
-        sizeof(T) != sizeof(int) && sizeof(T) == sizeof(unsigned long long int),
-        const T&>::type val) {
+    typename std::enable_if<sizeof(T) != sizeof(int) &&
+                                sizeof(T) == sizeof(unsigned long long int),
+                            const T&>::type val) {
   typedef unsigned long long int type;
 
 #if defined(KOKKOS_ENABLE_RFO_PREFETCH)
@@ -113,10 +112,10 @@ __inline__ __device__ T atomic_exchange(
 }
 
 template <typename T>
-__inline__ __device__ T atomic_exchange(
-    volatile T* const dest,
-    typename Kokkos::Impl::enable_if<(sizeof(T) != 4) && (sizeof(T) != 8),
-                                     const T>::type& val) {
+__inline__ __device__ T
+atomic_exchange(volatile T* const dest,
+                typename std::enable_if<(sizeof(T) != 4) && (sizeof(T) != 8),
+                                        const T>::type& val) {
   T return_val;
   // This is a way to (hopefully) avoid dead lock in a warp
 #if defined(KOKKOS_ENABLE_RFO_PREFETCH)
@@ -152,8 +151,7 @@ __inline__ __device__ T atomic_exchange(
 template <typename T>
 __inline__ __device__ void atomic_assign(
     volatile T* const dest,
-    typename Kokkos::Impl::enable_if<sizeof(T) == sizeof(int), const T&>::type
-        val) {
+    typename std::enable_if<sizeof(T) == sizeof(int), const T&>::type val) {
   // (void) __ullAtomicExch( (int*) dest , *((int*)&val) );
   (void)atomicExch(((int*)dest), *((int*)&val));
 }
@@ -161,9 +159,9 @@ __inline__ __device__ void atomic_assign(
 template <typename T>
 __inline__ __device__ void atomic_assign(
     volatile T* const dest,
-    typename Kokkos::Impl::enable_if<
-        sizeof(T) != sizeof(int) && sizeof(T) == sizeof(unsigned long long int),
-        const T&>::type val) {
+    typename std::enable_if<sizeof(T) != sizeof(int) &&
+                                sizeof(T) == sizeof(unsigned long long int),
+                            const T&>::type val) {
   typedef unsigned long long int type;
   // (void) __ullAtomicExch( (type*) dest , *((type*)&val) );
   (void)atomicExch(((type*)dest), *((type*)&val));
@@ -172,9 +170,9 @@ __inline__ __device__ void atomic_assign(
 template <typename T>
 __inline__ __device__ void atomic_assign(
     volatile T* const dest,
-    typename Kokkos::Impl::enable_if<
-        sizeof(T) != sizeof(int) && sizeof(T) != sizeof(unsigned long long int),
-        const T&>::type val) {
+    typename std::enable_if<sizeof(T) != sizeof(int) &&
+                                sizeof(T) != sizeof(unsigned long long int),
+                            const T&>::type val) {
   (void)atomic_exchange(dest, val);
 }
 
@@ -187,11 +185,10 @@ __inline__ __device__ void atomic_assign(
 #if defined(KOKKOS_ENABLE_GNU_ATOMICS) || defined(KOKKOS_ENABLE_INTEL_ATOMICS)
 
 template <typename T>
-inline T atomic_exchange(
-    volatile T* const dest,
-    typename Kokkos::Impl::enable_if<sizeof(T) == sizeof(int) ||
-                                         sizeof(T) == sizeof(long),
-                                     const T&>::type val) {
+inline T atomic_exchange(volatile T* const dest,
+                         typename std::enable_if<sizeof(T) == sizeof(int) ||
+                                                     sizeof(T) == sizeof(long),
+                                                 const T&>::type val) {
   typedef typename Kokkos::Impl::if_c<sizeof(T) == sizeof(int), int, long>::type
       type;
 #if defined(KOKKOS_ENABLE_RFO_PREFETCH)
@@ -205,7 +202,7 @@ inline T atomic_exchange(
   union U {
     T val_T;
     type val_type;
-    inline U(){};
+    inline U() {}
   } old;
 
   old.val_T = *dest;
@@ -223,8 +220,8 @@ inline T atomic_exchange(
 template <typename T>
 inline T atomic_exchange(
     volatile T* const dest,
-    typename Kokkos::Impl::enable_if<sizeof(T) == sizeof(Impl::cas128_t),
-                                     const T&>::type val) {
+    typename std::enable_if<sizeof(T) == sizeof(Impl::cas128_t), const T&>::type
+        val) {
 #if defined(KOKKOS_ENABLE_RFO_PREFETCH)
   _mm_prefetch((const char*)dest, _MM_HINT_ET0);
 #endif
@@ -232,7 +229,7 @@ inline T atomic_exchange(
   union U {
     Impl::cas128_t i;
     T t;
-    inline U(){};
+    inline U() {}
   } assume, oldval, newval;
 
   oldval.t = *dest;
@@ -252,12 +249,12 @@ inline T atomic_exchange(
 template <typename T>
 inline T atomic_exchange(
     volatile T* const dest,
-    typename Kokkos::Impl::enable_if<(sizeof(T) != 4) && (sizeof(T) != 8)
+    typename std::enable_if<(sizeof(T) != 4) && (sizeof(T) != 8)
 #if defined(KOKKOS_ENABLE_ASM) && defined(KOKKOS_ENABLE_ISA_X86_64)
-                                         && (sizeof(T) != 16)
+                                && (sizeof(T) != 16)
 #endif
-                                         ,
-                                     const T>::type& val) {
+                                ,
+                            const T>::type& val) {
   while (!Impl::lock_address_host_space((void*)dest))
     ;
   T return_val = *dest;
@@ -280,11 +277,10 @@ inline T atomic_exchange(
 }
 
 template <typename T>
-inline void atomic_assign(
-    volatile T* const dest,
-    typename Kokkos::Impl::enable_if<sizeof(T) == sizeof(int) ||
-                                         sizeof(T) == sizeof(long),
-                                     const T&>::type val) {
+inline void atomic_assign(volatile T* const dest,
+                          typename std::enable_if<sizeof(T) == sizeof(int) ||
+                                                      sizeof(T) == sizeof(long),
+                                                  const T&>::type val) {
   typedef typename Kokkos::Impl::if_c<sizeof(T) == sizeof(int), int, long>::type
       type;
 
@@ -299,7 +295,7 @@ inline void atomic_assign(
   union U {
     T val_T;
     type val_type;
-    inline U(){};
+    inline U() {}
   } old;
 
   old.val_T = *dest;
@@ -315,8 +311,8 @@ inline void atomic_assign(
 template <typename T>
 inline void atomic_assign(
     volatile T* const dest,
-    typename Kokkos::Impl::enable_if<sizeof(T) == sizeof(Impl::cas128_t),
-                                     const T&>::type val) {
+    typename std::enable_if<sizeof(T) == sizeof(Impl::cas128_t), const T&>::type
+        val) {
 #if defined(KOKKOS_ENABLE_RFO_PREFETCH)
   _mm_prefetch((const char*)dest, _MM_HINT_ET0);
 #endif
@@ -324,7 +320,7 @@ inline void atomic_assign(
   union U {
     Impl::cas128_t i;
     T t;
-    inline U(){};
+    inline U() {}
   } assume, oldval, newval;
 
   oldval.t = *dest;
@@ -339,12 +335,12 @@ inline void atomic_assign(
 template <typename T>
 inline void atomic_assign(
     volatile T* const dest,
-    typename Kokkos::Impl::enable_if<(sizeof(T) != 4) && (sizeof(T) != 8)
+    typename std::enable_if<(sizeof(T) != 4) && (sizeof(T) != 8)
 #if defined(KOKKOS_ENABLE_ASM) && defined(KOKKOS_ENABLE_ISA_X86_64)
-                                         && (sizeof(T) != 16)
+                                && (sizeof(T) != 16)
 #endif
-                                         ,
-                                     const T>::type& val) {
+                                ,
+                            const T>::type& val) {
   while (!Impl::lock_address_host_space((void*)dest))
     ;
   // This is likely an aggregate type with a defined
diff --git a/kokkos/core/src/impl/Kokkos_Atomic_Fetch_Add.hpp b/kokkos/core/src/impl/Kokkos_Atomic_Fetch_Add.hpp
index fd78b853a..0a6900f84 100644
--- a/kokkos/core/src/impl/Kokkos_Atomic_Fetch_Add.hpp
+++ b/kokkos/core/src/impl/Kokkos_Atomic_Fetch_Add.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -94,14 +94,13 @@ __inline__ __device__ double atomic_fetch_add(volatile double* const dest,
 template <typename T>
 __inline__ __device__ T atomic_fetch_add(
     volatile T* const dest,
-    typename Kokkos::Impl::enable_if<sizeof(T) == sizeof(int), const T>::type
-        val) {
+    typename std::enable_if<sizeof(T) == sizeof(int), const T>::type val) {
   // to work around a bug in the clang cuda compiler, the name here needs to be
   // different from the one internal to the other overloads
   union U1 {
     int i;
     T t;
-    KOKKOS_INLINE_FUNCTION U1(){};
+    KOKKOS_INLINE_FUNCTION U1() {}
   } assume, oldval, newval;
 
   oldval.t = *dest;
@@ -118,15 +117,15 @@ __inline__ __device__ T atomic_fetch_add(
 template <typename T>
 __inline__ __device__ T atomic_fetch_add(
     volatile T* const dest,
-    typename Kokkos::Impl::enable_if<
-        sizeof(T) != sizeof(int) && sizeof(T) == sizeof(unsigned long long int),
-        const T>::type val) {
+    typename std::enable_if<sizeof(T) != sizeof(int) &&
+                                sizeof(T) == sizeof(unsigned long long int),
+                            const T>::type val) {
   // to work around a bug in the clang cuda compiler, the name here needs to be
   // different from the one internal to the other overloads
   union U2 {
     unsigned long long int i;
     T t;
-    KOKKOS_INLINE_FUNCTION U2(){};
+    KOKKOS_INLINE_FUNCTION U2() {}
   } assume, oldval, newval;
 
   oldval.t = *dest;
@@ -143,10 +142,10 @@ __inline__ __device__ T atomic_fetch_add(
 //----------------------------------------------------------------------------
 
 template <typename T>
-__inline__ __device__ T atomic_fetch_add(
-    volatile T* const dest,
-    typename Kokkos::Impl::enable_if<(sizeof(T) != 4) && (sizeof(T) != 8),
-                                     const T>::type& val) {
+__inline__ __device__ T
+atomic_fetch_add(volatile T* const dest,
+                 typename std::enable_if<(sizeof(T) != 4) && (sizeof(T) != 8),
+                                         const T>::type& val) {
   T return_val;
   // This is a way to (hopefully) avoid dead lock in a warp
   int done = 0;
@@ -179,7 +178,7 @@ __inline__ __device__ T atomic_fetch_add(
 #endif
 #endif
 //----------------------------------------------------------------------------
-#if !defined(KOKKOS_ENABLE_ROCM_ATOMICS)
+#if !defined(KOKKOS_ENABLE_ROCM_ATOMICS) || !defined(KOKKOS_ENABLE_HIP_ATOMICS)
 #if !defined(__CUDA_ARCH__) || defined(KOKKOS_IMPL_CUDA_CLANG_WORKAROUND)
 #if defined(KOKKOS_ENABLE_GNU_ATOMICS) || defined(KOKKOS_ENABLE_INTEL_ATOMICS)
 
@@ -239,12 +238,11 @@ inline unsigned long int atomic_fetch_add(
 template <typename T>
 inline T atomic_fetch_add(
     volatile T* const dest,
-    typename Kokkos::Impl::enable_if<sizeof(T) == sizeof(int), const T>::type
-        val) {
+    typename std::enable_if<sizeof(T) == sizeof(int), const T>::type val) {
   union U {
     int i;
     T t;
-    inline U(){};
+    inline U() {}
   } assume, oldval, newval;
 
 #if defined(KOKKOS_ENABLE_RFO_PREFETCH)
@@ -263,15 +261,14 @@ inline T atomic_fetch_add(
 }
 
 template <typename T>
-inline T atomic_fetch_add(
-    volatile T* const dest,
-    typename Kokkos::Impl::enable_if<sizeof(T) != sizeof(int) &&
-                                         sizeof(T) == sizeof(long),
-                                     const T>::type val) {
+inline T atomic_fetch_add(volatile T* const dest,
+                          typename std::enable_if<sizeof(T) != sizeof(int) &&
+                                                      sizeof(T) == sizeof(long),
+                                                  const T>::type val) {
   union U {
     long i;
     T t;
-    inline U(){};
+    inline U() {}
   } assume, oldval, newval;
 
 #if defined(KOKKOS_ENABLE_RFO_PREFETCH)
@@ -293,14 +290,14 @@ inline T atomic_fetch_add(
 template <typename T>
 inline T atomic_fetch_add(
     volatile T* const dest,
-    typename Kokkos::Impl::enable_if<sizeof(T) != sizeof(int) &&
-                                         sizeof(T) != sizeof(long) &&
-                                         sizeof(T) == sizeof(Impl::cas128_t),
-                                     const T>::type val) {
+    typename std::enable_if<sizeof(T) != sizeof(int) &&
+                                sizeof(T) != sizeof(long) &&
+                                sizeof(T) == sizeof(Impl::cas128_t),
+                            const T>::type val) {
   union U {
     Impl::cas128_t i;
     T t;
-    inline U(){};
+    inline U() {}
   } assume, oldval, newval;
 
 #if defined(KOKKOS_ENABLE_RFO_PREFETCH)
@@ -324,12 +321,12 @@ inline T atomic_fetch_add(
 template <typename T>
 inline T atomic_fetch_add(
     volatile T* const dest,
-    typename Kokkos::Impl::enable_if<(sizeof(T) != 4) && (sizeof(T) != 8)
+    typename std::enable_if<(sizeof(T) != 4) && (sizeof(T) != 8)
 #if defined(KOKKOS_ENABLE_ASM) && defined(KOKKOS_ENABLE_ISA_X86_64)
-                                         && (sizeof(T) != 16)
+                                && (sizeof(T) != 16)
 #endif
-                                         ,
-                                     const T>::type& val) {
+                                ,
+                            const T>::type& val) {
   while (!Impl::lock_address_host_space((void*)dest))
     ;
   T return_val = *dest;
@@ -390,11 +387,5 @@ __inline__ __device__ T atomic_fetch_add(volatile T* const,
 }
 #endif
 
-// Simpler version of atomic_fetch_add without the fetch
-template <typename T>
-KOKKOS_INLINE_FUNCTION void atomic_add(volatile T* const dest, const T src) {
-  atomic_fetch_add(dest, src);
-}
-
 }  // namespace Kokkos
 #endif
diff --git a/kokkos/core/src/impl/Kokkos_Atomic_Fetch_And.hpp b/kokkos/core/src/impl/Kokkos_Atomic_Fetch_And.hpp
index ca3467094..1ad54ed3f 100644
--- a/kokkos/core/src/impl/Kokkos_Atomic_Fetch_And.hpp
+++ b/kokkos/core/src/impl/Kokkos_Atomic_Fetch_And.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/impl/Kokkos_Atomic_Fetch_Or.hpp b/kokkos/core/src/impl/Kokkos_Atomic_Fetch_Or.hpp
index 6801c6613..dc567265a 100644
--- a/kokkos/core/src/impl/Kokkos_Atomic_Fetch_Or.hpp
+++ b/kokkos/core/src/impl/Kokkos_Atomic_Fetch_Or.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/impl/Kokkos_Atomic_Fetch_Sub.hpp b/kokkos/core/src/impl/Kokkos_Atomic_Fetch_Sub.hpp
index 316cef85a..c14749f1b 100644
--- a/kokkos/core/src/impl/Kokkos_Atomic_Fetch_Sub.hpp
+++ b/kokkos/core/src/impl/Kokkos_Atomic_Fetch_Sub.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -93,8 +93,7 @@ __inline__ __device__ unsigned int atomic_fetch_sub(volatile double* const dest,
 template <typename T>
 __inline__ __device__ T atomic_fetch_sub(
     volatile T* const dest,
-    typename Kokkos::Impl::enable_if<sizeof(T) == sizeof(int), const T>::type
-        val) {
+    typename std::enable_if<sizeof(T) == sizeof(int), const T>::type val) {
   union U {
     int i;
     T t;
@@ -115,9 +114,9 @@ __inline__ __device__ T atomic_fetch_sub(
 template <typename T>
 __inline__ __device__ T atomic_fetch_sub(
     volatile T* const dest,
-    typename Kokkos::Impl::enable_if<
-        sizeof(T) != sizeof(int) && sizeof(T) == sizeof(unsigned long long int),
-        const T>::type val) {
+    typename std::enable_if<sizeof(T) != sizeof(int) &&
+                                sizeof(T) == sizeof(unsigned long long int),
+                            const T>::type val) {
   union U {
     unsigned long long int i;
     T t;
@@ -138,10 +137,10 @@ __inline__ __device__ T atomic_fetch_sub(
 //----------------------------------------------------------------------------
 
 template <typename T>
-__inline__ __device__ T atomic_fetch_sub(
-    volatile T* const dest,
-    typename Kokkos::Impl::enable_if<(sizeof(T) != 4) && (sizeof(T) != 8),
-                                     const T>::type& val) {
+__inline__ __device__ T
+atomic_fetch_sub(volatile T* const dest,
+                 typename std::enable_if<(sizeof(T) != 4) && (sizeof(T) != 8),
+                                         const T>::type& val) {
   T return_val;
   // This is a way to (hopefully) avoid dead lock in a warp
   int done = 0;
@@ -172,7 +171,7 @@ __inline__ __device__ T atomic_fetch_sub(
 #endif
 #endif
 //----------------------------------------------------------------------------
-#if !defined(KOKKOS_ENABLE_ROCM_ATOMICS)
+#if !defined(KOKKOS_ENABLE_ROCM_ATOMICS) || !defined(KOKKOS_ENABLE_HIP_ATOMICS)
 #if !defined(__CUDA_ARCH__) || defined(KOKKOS_IMPL_CUDA_CLANG_WORKAROUND)
 #if defined(KOKKOS_ENABLE_GNU_ATOMICS) || defined(KOKKOS_ENABLE_INTEL_ATOMICS)
 
@@ -214,8 +213,7 @@ inline unsigned long int atomic_fetch_sub(
 template <typename T>
 inline T atomic_fetch_sub(
     volatile T* const dest,
-    typename Kokkos::Impl::enable_if<sizeof(T) == sizeof(int), const T>::type
-        val) {
+    typename std::enable_if<sizeof(T) == sizeof(int), const T>::type val) {
   union U {
     int i;
     T t;
@@ -238,11 +236,10 @@ inline T atomic_fetch_sub(
 }
 
 template <typename T>
-inline T atomic_fetch_sub(
-    volatile T* const dest,
-    typename Kokkos::Impl::enable_if<sizeof(T) != sizeof(int) &&
-                                         sizeof(T) == sizeof(long),
-                                     const T>::type val) {
+inline T atomic_fetch_sub(volatile T* const dest,
+                          typename std::enable_if<sizeof(T) != sizeof(int) &&
+                                                      sizeof(T) == sizeof(long),
+                                                  const T>::type val) {
 #if defined(KOKKOS_ENABLE_RFO_PREFETCH)
   _mm_prefetch((const char*)dest, _MM_HINT_ET0);
 #endif
@@ -269,8 +266,8 @@ inline T atomic_fetch_sub(
 template <typename T>
 inline T atomic_fetch_sub(
     volatile T* const dest,
-    typename Kokkos::Impl::enable_if<(sizeof(T) != 4) && (sizeof(T) != 8),
-                                     const T>::type& val) {
+    typename std::enable_if<(sizeof(T) != 4) && (sizeof(T) != 8),
+                            const T>::type& val) {
 #if defined(KOKKOS_ENABLE_RFO_PREFETCH)
   _mm_prefetch((const char*)dest, _MM_HINT_ET0);
 #endif
@@ -321,12 +318,6 @@ __inline__ __device__ T atomic_fetch_sub(volatile T* const,
 }
 #endif
 
-// Simpler version of atomic_fetch_sub without the fetch
-template <typename T>
-KOKKOS_INLINE_FUNCTION void atomic_sub(volatile T* const dest, const T src) {
-  atomic_fetch_sub(dest, src);
-}
-
 }  // namespace Kokkos
 
 #include <impl/Kokkos_Atomic_Assembly.hpp>
diff --git a/kokkos/core/src/impl/Kokkos_Atomic_Generic.hpp b/kokkos/core/src/impl/Kokkos_Atomic_Generic.hpp
index a480df5b6..49ee86b2c 100644
--- a/kokkos/core/src/impl/Kokkos_Atomic_Generic.hpp
+++ b/kokkos/core/src/impl/Kokkos_Atomic_Generic.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -155,9 +155,9 @@ struct RShiftOper {
 template <class Oper, typename T>
 KOKKOS_INLINE_FUNCTION T atomic_fetch_oper(
     const Oper& op, volatile T* const dest,
-    typename Kokkos::Impl::enable_if<
-        sizeof(T) != sizeof(int) && sizeof(T) == sizeof(unsigned long long int),
-        const T>::type val) {
+    typename std::enable_if<sizeof(T) != sizeof(int) &&
+                                sizeof(T) == sizeof(unsigned long long int),
+                            const T>::type val) {
   union U {
     unsigned long long int i;
     T t;
@@ -179,9 +179,9 @@ KOKKOS_INLINE_FUNCTION T atomic_fetch_oper(
 template <class Oper, typename T>
 KOKKOS_INLINE_FUNCTION T atomic_oper_fetch(
     const Oper& op, volatile T* const dest,
-    typename Kokkos::Impl::enable_if<
-        sizeof(T) != sizeof(int) && sizeof(T) == sizeof(unsigned long long int),
-        const T>::type val) {
+    typename std::enable_if<sizeof(T) != sizeof(int) &&
+                                sizeof(T) == sizeof(unsigned long long int),
+                            const T>::type val) {
   union U {
     unsigned long long int i;
     T t;
@@ -192,7 +192,7 @@ KOKKOS_INLINE_FUNCTION T atomic_oper_fetch(
 
   do {
     assume.i = oldval.i;
-    newval.t = Oper::apply(assume.t, val);
+    newval.t = op.apply(assume.t, val);
     oldval.i = Kokkos::atomic_compare_exchange((unsigned long long int*)dest,
                                                assume.i, newval.i);
   } while (assume.i != oldval.i);
@@ -203,8 +203,7 @@ KOKKOS_INLINE_FUNCTION T atomic_oper_fetch(
 template <class Oper, typename T>
 KOKKOS_INLINE_FUNCTION T atomic_fetch_oper(
     const Oper& op, volatile T* const dest,
-    typename Kokkos::Impl::enable_if<sizeof(T) == sizeof(int), const T>::type
-        val) {
+    typename std::enable_if<sizeof(T) == sizeof(int), const T>::type val) {
   union U {
     int i;
     T t;
@@ -225,8 +224,7 @@ KOKKOS_INLINE_FUNCTION T atomic_fetch_oper(
 template <class Oper, typename T>
 KOKKOS_INLINE_FUNCTION T atomic_oper_fetch(
     const Oper& op, volatile T* const dest,
-    typename Kokkos::Impl::enable_if<sizeof(T) == sizeof(int), const T>::type
-        val) {
+    typename std::enable_if<sizeof(T) == sizeof(int), const T>::type val) {
   union U {
     int i;
     T t;
@@ -237,7 +235,7 @@ KOKKOS_INLINE_FUNCTION T atomic_oper_fetch(
 
   do {
     assume.i = oldval.i;
-    newval.t = Oper::apply(assume.t, val);
+    newval.t = op.apply(assume.t, val);
     oldval.i = Kokkos::atomic_compare_exchange((int*)dest, assume.i, newval.i);
   } while (assume.i != oldval.i);
 
@@ -247,13 +245,13 @@ KOKKOS_INLINE_FUNCTION T atomic_oper_fetch(
 template <class Oper, typename T>
 KOKKOS_INLINE_FUNCTION T atomic_fetch_oper(
     const Oper& op, volatile T* const dest,
-    typename Kokkos::Impl::enable_if<(sizeof(T) != 4) && (sizeof(T) != 8),
-                                     const T>::type val) {
+    typename std::enable_if<(sizeof(T) != 4) && (sizeof(T) != 8), const T>::type
+        val) {
 #ifdef KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST
   while (!Impl::lock_address_host_space((void*)dest))
     ;
   T return_val = *dest;
-  *dest        = Oper::apply(return_val, val);
+  *dest        = op.apply(return_val, val);
   Impl::unlock_address_host_space((void*)dest);
   return return_val;
 #elif defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_CUDA)
@@ -271,8 +269,7 @@ KOKKOS_INLINE_FUNCTION T atomic_fetch_oper(
     if (!done) {
       if (Impl::lock_address_cuda_space((void*)dest)) {
         return_val = *dest;
-        *dest      = Oper::apply(return_val, val);
-        ;
+        *dest      = op.apply(return_val, val);
         Impl::unlock_address_cuda_space((void*)dest);
         done = 1;
       }
@@ -284,24 +281,44 @@ KOKKOS_INLINE_FUNCTION T atomic_fetch_oper(
 #endif
   }
   return return_val;
+#elif defined(__HIP_DEVICE_COMPILE__)
+  // FIXME_HIP
+  Kokkos::abort("atomic_fetch_oper not implemented for large types.");
+  T return_val             = *dest;
+  int done                 = 0;
+  unsigned int active      = __ballot(1);
+  unsigned int done_active = 0;
+  while (active != done_active) {
+    if (!done) {
+      // if (Impl::lock_address_hip_space((void*)dest))
+      {
+        return_val = *dest;
+        *dest      = op.apply(return_val, val);
+        // Impl::unlock_address_hip_space((void*)dest);
+        done = 1;
+      }
+    }
+    done_active = __ballot(done);
+  }
+  return return_val;
 #endif
 }
 
 template <class Oper, typename T>
-KOKKOS_INLINE_FUNCTION T atomic_oper_fetch(
-    const Oper& op, volatile T* const dest,
-    typename Kokkos::Impl::enable_if<(sizeof(T) != 4) && (sizeof(T) != 8)
+KOKKOS_INLINE_FUNCTION T
+atomic_oper_fetch(const Oper& op, volatile T* const dest,
+                  typename std::enable_if<(sizeof(T) != 4) && (sizeof(T) != 8)
 #if defined(KOKKOS_ENABLE_ASM) && \
     defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST)
-                                         && (sizeof(T) != 16)
+                                              && (sizeof(T) != 16)
 #endif
-                                         ,
-                                     const T>::type& val) {
+                                              ,
+                                          const T>::type& val) {
 
 #ifdef KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST
   while (!Impl::lock_address_host_space((void*)dest))
     ;
-  T return_val = Oper::apply(*dest, val);
+  T return_val = op.apply(*dest, val);
   *dest        = return_val;
   Impl::unlock_address_host_space((void*)dest);
   return return_val;
@@ -319,7 +336,7 @@ KOKKOS_INLINE_FUNCTION T atomic_oper_fetch(
   while (active != done_active) {
     if (!done) {
       if (Impl::lock_address_cuda_space((void*)dest)) {
-        return_val = Oper::apply(*dest, val);
+        return_val = op.apply(*dest, val);
         *dest      = return_val;
         Impl::unlock_address_cuda_space((void*)dest);
         done = 1;
@@ -332,6 +349,26 @@ KOKKOS_INLINE_FUNCTION T atomic_oper_fetch(
 #endif
   }
   return return_val;
+#elif defined(__HIP_DEVICE_COMPILE__)
+  // FIXME_HIP
+  Kokkos::abort("atomic_oper_fetch not implemented for large types.");
+  T return_val;
+  int done                 = 0;
+  unsigned int active      = __ballot(1);
+  unsigned int done_active = 0;
+  while (active != done_active) {
+    if (!done) {
+      // if (Impl::lock_address_hip_space((void*)dest))
+      {
+        return_val = op.apply(*dest, val);
+        *dest      = return_val;
+        // Impl::unlock_address_hip_space((void*)dest);
+        done = 1;
+      }
+    }
+    done_active = __ballot(done);
+  }
+  return return_val;
 #endif
 }
 
@@ -454,5 +491,27 @@ KOKKOS_INLINE_FUNCTION T atomic_rshift_fetch(volatile T* const dest,
                                  dest, val);
 }
 
+#ifdef _WIN32
+template <typename T>
+KOKKOS_INLINE_FUNCTION T atomic_add_fetch(volatile T* const dest, const T val) {
+  return Impl::atomic_oper_fetch(Impl::AddOper<T, const T>(), dest, val);
+}
+
+template <typename T>
+KOKKOS_INLINE_FUNCTION T atomic_sub_fetch(volatile T* const dest, const T val) {
+  return Impl::atomic_oper_fetch(Impl::SubOper<T, const T>(), dest, val);
+}
+
+template <typename T>
+KOKKOS_INLINE_FUNCTION T atomic_fetch_add(volatile T* const dest, const T val) {
+  return Impl::atomic_fetch_oper(Impl::AddOper<T, const T>(), dest, val);
+}
+
+template <typename T>
+KOKKOS_INLINE_FUNCTION T atomic_fetch_sub(volatile T* const dest, const T val) {
+  return Impl::atomic_fetch_oper(Impl::SubOper<T, const T>(), dest, val);
+}
+#endif
+
 }  // namespace Kokkos
 #endif
diff --git a/kokkos/core/src/impl/Kokkos_Atomic_Generic_Secondary.hpp b/kokkos/core/src/impl/Kokkos_Atomic_Generic_Secondary.hpp
new file mode 100644
index 000000000..9d0172b65
--- /dev/null
+++ b/kokkos/core/src/impl/Kokkos_Atomic_Generic_Secondary.hpp
@@ -0,0 +1,76 @@
+/*
+//@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
+*/
+
+#if defined(KOKKOS_ATOMIC_HPP) && !defined(KOKKOS_ATOMIC_GENERIC_SECONDARY_HPP)
+#define KOKKOS_ATOMIC_GENERIC_SECONDARY_HPP
+#include <Kokkos_Macros.hpp>
+
+namespace Kokkos {
+
+#ifndef KOKKOS_ENABLE_SERIAL_ATOMICS
+template <typename T>
+KOKKOS_INLINE_FUNCTION T atomic_exchange(volatile T* const dest, const T val) {
+  T oldval = *dest;
+  T assume;
+  do {
+    assume = oldval;
+    oldval = atomic_compare_exchange(dest, assume, val);
+  } while (assume != oldval);
+
+  return oldval;
+}
+#endif
+
+template <typename T>
+KOKKOS_INLINE_FUNCTION void atomic_add(volatile T* const dest, const T val) {
+  (void)atomic_fetch_add(dest, val);
+}
+
+template <typename T>
+KOKKOS_INLINE_FUNCTION void atomic_sub(volatile T* const dest, const T val) {
+  (void)atomic_fetch_sub(dest, val);
+}
+
+}  // namespace Kokkos
+#endif
diff --git a/kokkos/core/src/impl/Kokkos_Atomic_Increment.hpp b/kokkos/core/src/impl/Kokkos_Atomic_Increment.hpp
index a0be9d975..65630aa84 100644
--- a/kokkos/core/src/impl/Kokkos_Atomic_Increment.hpp
+++ b/kokkos/core/src/impl/Kokkos_Atomic_Increment.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -91,6 +91,7 @@ KOKKOS_INLINE_FUNCTION void atomic_increment<short>(volatile short* a) {
 #endif
 }
 
+#ifndef _WIN32
 template <>
 KOKKOS_INLINE_FUNCTION void atomic_increment<int>(volatile int* a) {
 #if defined(KOKKOS_ENABLE_ASM) && defined(KOKKOS_ENABLE_ISA_X86_64) && \
@@ -109,6 +110,7 @@ KOKKOS_INLINE_FUNCTION void atomic_increment<int>(volatile int* a) {
   Kokkos::atomic_fetch_add(a, int(1));
 #endif
 }
+#endif
 
 template <>
 KOKKOS_INLINE_FUNCTION void atomic_increment<long long int>(
diff --git a/kokkos/core/src/impl/Kokkos_Atomic_Load.hpp b/kokkos/core/src/impl/Kokkos_Atomic_Load.hpp
index 9eb9b874a..f3b77a297 100644
--- a/kokkos/core/src/impl/Kokkos_Atomic_Load.hpp
+++ b/kokkos/core/src/impl/Kokkos_Atomic_Load.hpp
@@ -23,10 +23,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -125,8 +125,7 @@ __device__ __inline__ T _relaxed_atomic_load_impl(
                                     void const**>::type = nullptr) {
   T rv{};
   // TODO remove a copy operation here?
-  Kokkos::Impl::atomic_oper_fetch(NoOpOper<T>{}, &rv, rv);
-  return rv;
+  return Kokkos::Impl::atomic_oper_fetch(NoOpOper<T>{}, ptr, rv);
 }
 
 template <class T>
@@ -168,6 +167,14 @@ inline T _atomic_load(T* ptr, MemoryOrder) {
   return *ptr;
 }
 
+#elif defined(KOKKOS_ENABLE_WINDOWS_ATOMICS)
+
+template <class T, class MemoryOrder>
+inline T _atomic_load(T* ptr, MemoryOrder) {
+  atomic_compare_exchange(ptr, 0, 0);
+  return *ptr;
+}
+
 #endif  // end of all atomic implementations
 
 template <class T>
@@ -189,7 +196,7 @@ KOKKOS_FORCEINLINE_FUNCTION T atomic_load(T* ptr,
 }
 
 template <class T>
-KOKKOS_FORCEINLINE_FUNCTION T atomic_load(T* ptr,
+KOKKOS_FORCEINLINE_FUNCTION T atomic_load(T* /*ptr*/,
                                           Impl::memory_order_release_t) {
   static_assert(
       sizeof(T) == 0,  // just something that will always be false, but only on
@@ -198,7 +205,7 @@ KOKKOS_FORCEINLINE_FUNCTION T atomic_load(T* ptr,
 }
 
 template <class T>
-KOKKOS_FORCEINLINE_FUNCTION T atomic_load(T* ptr,
+KOKKOS_FORCEINLINE_FUNCTION T atomic_load(T* /*ptr*/,
                                           Impl::memory_order_acq_rel_t) {
   static_assert(
       sizeof(T) == 0,  // just something that will always be false, but only on
diff --git a/kokkos/core/src/impl/Kokkos_Atomic_Memory_Order.hpp b/kokkos/core/src/impl/Kokkos_Atomic_Memory_Order.hpp
index 84a5b70ac..72a6dfa9a 100644
--- a/kokkos/core/src/impl/Kokkos_Atomic_Memory_Order.hpp
+++ b/kokkos/core/src/impl/Kokkos_Atomic_Memory_Order.hpp
@@ -23,10 +23,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/impl/Kokkos_Atomic_MinMax.hpp b/kokkos/core/src/impl/Kokkos_Atomic_MinMax.hpp
new file mode 100644
index 000000000..8a886d0a7
--- /dev/null
+++ b/kokkos/core/src/impl/Kokkos_Atomic_MinMax.hpp
@@ -0,0 +1,223 @@
+/*
+//@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
+*/
+
+#include <Kokkos_Macros.hpp>
+#if defined(KOKKOS_ATOMIC_HPP) && !defined(KOKKOS_ATOMIC_MINMAX_HPP)
+#define KOKKOS_ATOMIC_MINMAX_HPP
+
+namespace Kokkos {
+
+//----------------------------------------------------------------------------
+
+#if defined(KOKKOS_ENABLE_CUDA)
+#if defined(__CUDA_ARCH__) || defined(KOKKOS_IMPL_CUDA_CLANG_WORKAROUND)
+
+// Support for int, unsigned int, unsigned long long int, and float
+
+// Atomic_fetch_{min,max}
+
+#ifdef KOKKOS_IMPL_CUDA_CLANG_WORKAROUND
+
+// Host implementations for CLANG compiler
+
+inline __host__ int atomic_fetch_min(volatile int* const dest, const int val) {
+  return Impl::atomic_fetch_oper(Impl::MinOper<const int, const int>(), dest,
+                                 val);
+}
+
+inline __host__ unsigned int atomic_fetch_min(volatile unsigned int* const dest,
+                                              const unsigned int val) {
+  return Impl::atomic_fetch_oper(
+      Impl::MinOper<const unsigned int, const unsigned int>(), dest, val);
+}
+
+inline __host__ unsigned long long int atomic_fetch_min(
+    volatile unsigned long long int* const dest,
+    const unsigned long long int val) {
+  return Impl::atomic_fetch_oper(Impl::MinOper<const unsigned long long int,
+                                               const unsigned long long int>(),
+                                 dest, val);
+}
+
+inline __host__ int atomic_fetch_max(volatile int* const dest, const int val) {
+  return Impl::atomic_fetch_oper(Impl::MaxOper<const int, const int>(), dest,
+                                 val);
+}
+
+inline __host__ unsigned int atomic_fetch_max(volatile unsigned int* const dest,
+                                              const unsigned int val) {
+  return Impl::atomic_fetch_oper(
+      Impl::MaxOper<const unsigned int, const unsigned int>(), dest, val);
+}
+
+inline __host__ unsigned long long int atomic_fetch_max(
+    volatile unsigned long long int* const dest,
+    const unsigned long long int val) {
+  return Impl::atomic_fetch_oper(Impl::MaxOper<const unsigned long long int,
+                                               const unsigned long long int>(),
+                                 dest, val);
+}
+
+#endif
+
+inline __device__ int atomic_fetch_min(volatile int* const dest,
+                                       const int val) {
+  return atomicMin((int*)dest, val);
+}
+
+inline __device__ unsigned int atomic_fetch_min(
+    volatile unsigned int* const dest, const unsigned int val) {
+  return atomicMin((unsigned int*)dest, val);
+}
+
+inline __device__ unsigned long long int atomic_fetch_min(
+    volatile unsigned long long int* const dest,
+    const unsigned long long int val) {
+  return atomicMin((unsigned long long int*)dest, val);
+}
+
+inline __device__ int atomic_fetch_max(volatile int* const dest,
+                                       const int val) {
+  return atomicMax((int*)dest, val);
+}
+
+inline __device__ unsigned int atomic_fetch_max(
+    volatile unsigned int* const dest, const unsigned int val) {
+  return atomicMax((unsigned int*)dest, val);
+}
+
+inline __device__ unsigned long long int atomic_fetch_max(
+    volatile unsigned long long int* const dest,
+    const unsigned long long int val) {
+  return atomicMax((unsigned long long int*)dest, val);
+}
+
+// Atomic_{min,max}_fetch
+
+#ifdef KOKKOS_IMPL_CUDA_CLANG_WORKAROUND
+
+// Host implementations for CLANG compiler
+
+inline __host__ int atomic_min_fetch(volatile int* const dest, const int val) {
+  return Impl::atomic_oper_fetch(Impl::MinOper<const int, const int>(), dest,
+                                 val);
+}
+
+inline __host__ unsigned int atomic_min_fetch(volatile unsigned int* const dest,
+                                              const unsigned int val) {
+  return Impl::atomic_oper_fetch(
+      Impl::MinOper<const unsigned int, const unsigned int>(), dest, val);
+}
+
+inline __host__ unsigned long long int atomic_min_fetch(
+    volatile unsigned long long int* const dest,
+    const unsigned long long int val) {
+  return Impl::atomic_oper_fetch(Impl::MinOper<const unsigned long long int,
+                                               const unsigned long long int>(),
+                                 dest, val);
+}
+
+inline __host__ int atomic_max_fetch(volatile int* const dest, const int val) {
+  return Impl::atomic_oper_fetch(Impl::MaxOper<const int, const int>(), dest,
+                                 val);
+}
+
+inline __host__ unsigned int atomic_max_fetch(volatile unsigned int* const dest,
+                                              const unsigned int val) {
+  return Impl::atomic_oper_fetch(
+      Impl::MaxOper<const unsigned int, const unsigned int>(), dest, val);
+}
+
+inline __host__ unsigned long long int atomic_max_fetch(
+    volatile unsigned long long int* const dest,
+    const unsigned long long int val) {
+  return Impl::atomic_oper_fetch(Impl::MaxOper<const unsigned long long int,
+                                               const unsigned long long int>(),
+                                 dest, val);
+}
+#endif
+
+inline __device__ int atomic_min_fetch(volatile int* const dest,
+                                       const int val) {
+  const int old = atomicMin((int*)dest, val);
+  return old < val ? old : val;
+}
+
+inline __device__ unsigned int atomic_min_fetch(
+    volatile unsigned int* const dest, const unsigned int val) {
+  const unsigned int old = atomicMin((unsigned int*)dest, val);
+  return old < val ? old : val;
+}
+
+inline __device__ unsigned long long int atomic_min_fetch(
+    volatile unsigned long long int* const dest,
+    const unsigned long long int val) {
+  const unsigned long long old = atomicMin((unsigned long long*)dest, val);
+  return old < val ? old : val;
+}
+
+inline __device__ int atomic_max_fetch(volatile int* const dest,
+                                       const int val) {
+  const int old = atomicMax((int*)dest, val);
+  return old >= val ? old : val;
+}
+
+inline __device__ unsigned int atomic_max_fetch(
+    volatile unsigned int* const dest, const unsigned int val) {
+  const unsigned int old = atomicMax((unsigned int*)dest, val);
+  return old >= val ? old : val;
+}
+
+inline __device__ unsigned long long int atomic_max_fetch(
+    volatile unsigned long long int* const dest,
+    const unsigned long long int val) {
+  const unsigned long long old = atomicMax((unsigned long long*)dest, val);
+  return old >= val ? old : val;
+}
+
+#endif
+#endif
+}  // namespace Kokkos
+
+#endif
diff --git a/kokkos/core/src/impl/Kokkos_Atomic_Store.hpp b/kokkos/core/src/impl/Kokkos_Atomic_Store.hpp
index 7d2aaf117..264d6beaf 100644
--- a/kokkos/core/src/impl/Kokkos_Atomic_Store.hpp
+++ b/kokkos/core/src/impl/Kokkos_Atomic_Store.hpp
@@ -23,10 +23,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -164,6 +164,13 @@ inline void _atomic_store(T* ptr, T val, MemoryOrder) {
   *ptr = val;
 }
 
+#elif defined(KOKKOS_ENABLE_WINDOWS_ATOMICS)
+
+template <class T, class MemoryOrder>
+inline void _atomic_store(T* ptr, T val, MemoryOrder) {
+  atomic_exchange(ptr, val);
+}
+
 #endif  // end of all atomic implementations
 
 template <class T>
@@ -185,7 +192,7 @@ KOKKOS_FORCEINLINE_FUNCTION void atomic_store(T* ptr, T val,
 }
 
 template <class T>
-KOKKOS_FORCEINLINE_FUNCTION void atomic_store(T* ptr, T val,
+KOKKOS_FORCEINLINE_FUNCTION void atomic_store(T* /*ptr*/, T /*val*/,
                                               Impl::memory_order_acquire_t) {
   static_assert(
       sizeof(T) == 0,  // just something that will always be false, but only on
@@ -194,7 +201,7 @@ KOKKOS_FORCEINLINE_FUNCTION void atomic_store(T* ptr, T val,
 }
 
 template <class T>
-KOKKOS_FORCEINLINE_FUNCTION void atomic_store(T* ptr, T val,
+KOKKOS_FORCEINLINE_FUNCTION void atomic_store(T* /*ptr*/, T /*val*/,
                                               Impl::memory_order_acq_rel_t) {
   static_assert(
       sizeof(T) == 0,  // just something that will always be false, but only on
@@ -205,7 +212,7 @@ KOKKOS_FORCEINLINE_FUNCTION void atomic_store(T* ptr, T val,
 template <class T>
 KOKKOS_FORCEINLINE_FUNCTION void atomic_store(T* ptr, T val) {
   // relaxed by default!
-  _atomic_store(ptr, Impl::memory_order_relaxed);
+  _atomic_store(ptr, val, Impl::memory_order_relaxed);
 }
 
 }  // end namespace Impl
diff --git a/kokkos/core/src/impl/Kokkos_Atomic_View.hpp b/kokkos/core/src/impl/Kokkos_Atomic_View.hpp
index dbb7445f3..c3719bed2 100644
--- a/kokkos/core/src/impl/Kokkos_Atomic_View.hpp
+++ b/kokkos/core/src/impl/Kokkos_Atomic_View.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -347,7 +347,7 @@ class AtomicViewDataHandle {
   typename ViewTraits::value_type* ptr;
 
   KOKKOS_INLINE_FUNCTION
-  AtomicViewDataHandle() : ptr(NULL) {}
+  AtomicViewDataHandle() : ptr(nullptr) {}
 
   KOKKOS_INLINE_FUNCTION
   AtomicViewDataHandle(typename ViewTraits::value_type* ptr_) : ptr(ptr_) {}
diff --git a/kokkos/core/src/impl/Kokkos_Atomic_Windows.hpp b/kokkos/core/src/impl/Kokkos_Atomic_Windows.hpp
index 5d2e0a7a9..c5d3466c6 100644
--- a/kokkos/core/src/impl/Kokkos_Atomic_Windows.hpp
+++ b/kokkos/core/src/impl/Kokkos_Atomic_Windows.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -52,6 +52,8 @@
 #include <winsock2.h>
 #include <windows.h>
 
+#undef VOID
+
 namespace Kokkos {
 namespace Impl {
 #ifdef _MSC_VER
@@ -74,14 +76,43 @@ __attribute__((aligned(16)))
 template <typename T>
 KOKKOS_INLINE_FUNCTION T atomic_compare_exchange(
     volatile T* const dest, const T& compare,
-    typename Kokkos::Impl::enable_if<sizeof(T) == sizeof(LONG), const T&>::type
-        val) {
+    typename std::enable_if<sizeof(T) == sizeof(CHAR), const T&>::type val) {
   union U {
-    LONG i;
+    CHAR i;
+    T t;
+    KOKKOS_INLINE_FUNCTION U(){};
+  } tmp;
+
+  tmp.i = _InterlockedCompareExchange8((CHAR*)dest, *((CHAR*)&val),
+                                       *((CHAR*)&compare));
+  return tmp.t;
+}
+
+template <typename T>
+KOKKOS_INLINE_FUNCTION T atomic_compare_exchange(
+    volatile T* const dest, const T& compare,
+    typename std::enable_if<sizeof(T) == sizeof(SHORT), const T&>::type val) {
+  union U {
+    SHORT i;
     T t;
     KOKKOS_INLINE_FUNCTION U(){};
   } tmp;
 
+  tmp.i = _InterlockedCompareExchange16((SHORT*)dest, *((SHORT*)&val),
+                                        *((SHORT*)&compare));
+  return tmp.t;
+}
+
+template <typename T>
+KOKKOS_INLINE_FUNCTION T atomic_compare_exchange(
+    volatile T* const dest, const T& compare,
+    typename std::enable_if<sizeof(T) == sizeof(LONG), const T&>::type val) {
+  union U {
+    LONG i;
+    T t;
+    KOKKOS_INLINE_FUNCTION U() {}
+  } tmp;
+
   tmp.i = _InterlockedCompareExchange((LONG*)dest, *((LONG*)&val),
                                       *((LONG*)&compare));
   return tmp.t;
@@ -90,12 +121,12 @@ KOKKOS_INLINE_FUNCTION T atomic_compare_exchange(
 template <typename T>
 KOKKOS_INLINE_FUNCTION T atomic_compare_exchange(
     volatile T* const dest, const T& compare,
-    typename Kokkos::Impl::enable_if<sizeof(T) == sizeof(LONGLONG),
-                                     const T&>::type val) {
+    typename std::enable_if<sizeof(T) == sizeof(LONGLONG), const T&>::type
+        val) {
   union U {
     LONGLONG i;
     T t;
-    KOKKOS_INLINE_FUNCTION U(){};
+    KOKKOS_INLINE_FUNCTION U() {}
   } tmp;
 
   tmp.i = _InterlockedCompareExchange64((LONGLONG*)dest, *((LONGLONG*)&val),
@@ -106,18 +137,19 @@ KOKKOS_INLINE_FUNCTION T atomic_compare_exchange(
 template <typename T>
 KOKKOS_INLINE_FUNCTION T atomic_compare_exchange(
     volatile T* const dest, const T& compare,
-    typename Kokkos::Impl::enable_if<sizeof(T) == sizeof(Impl::cas128_t),
-                                     const T&>::type val) {
+    typename std::enable_if<sizeof(T) == sizeof(Impl::cas128_t), const T&>::type
+        val) {
+  T compare_and_result(compare);
   union U {
     Impl::cas128_t i;
     T t;
     KOKKOS_INLINE_FUNCTION U(){};
-  } tmp, newval;
+  } newval;
   newval.t = val;
   _InterlockedCompareExchange128((LONGLONG*)dest, newval.i.upper,
-                                 newval.i.lower, ((LONGLONG*)&compare));
-  tmp.t = dest;
-  return tmp.t;
+                                 newval.i.lower,
+                                 ((LONGLONG*)&compare_and_result));
+  return compare_and_result;
 }
 
 template <typename T>
@@ -127,117 +159,6 @@ KOKKOS_INLINE_FUNCTION T atomic_compare_exchange_strong(volatile T* const dest,
   return atomic_compare_exchange(dest, compare, val);
 }
 
-template <typename T>
-T atomic_fetch_or(volatile T* const dest, const T val) {
-  T oldval = *dest;
-  T assume;
-  do {
-    assume   = oldval;
-    T newval = val | oldval;
-    oldval   = atomic_compare_exchange(dest, assume, newval);
-  } while (assume != oldval);
-
-  return oldval;
-}
-
-template <typename T>
-T atomic_fetch_and(volatile T* const dest, const T val) {
-  T oldval = *dest;
-  T assume;
-  do {
-    assume   = oldval;
-    T newval = val & oldval;
-    oldval   = atomic_compare_exchange(dest, assume, newval);
-  } while (assume != oldval);
-
-  return oldval;
-}
-
-template <typename T>
-T atomic_fetch_add(volatile T* const dest, const T val) {
-  T oldval = *dest;
-  T assume;
-  do {
-    assume   = oldval;
-    T newval = val + oldval;
-    oldval   = atomic_compare_exchange(dest, assume, newval);
-  } while (assume != oldval);
-
-  return oldval;
-}
-
-template <typename T>
-T atomic_fetch_sub(volatile T* const dest, const T val) {
-  T oldval = *dest;
-  T assume;
-  do {
-    assume   = oldval;
-    T newval = val - oldval;
-    oldval   = atomic_compare_exchange(dest, assume, newval);
-  } while (assume != oldval);
-
-  return oldval;
-}
-
-template <typename T>
-T atomic_exchange(volatile T* const dest, const T val) {
-  T oldval = *dest;
-  T assume;
-  do {
-    assume = oldval;
-    oldval = atomic_compare_exchange(dest, assume, val);
-  } while (assume != oldval);
-
-  return oldval;
-}
-
-template <typename T>
-void atomic_or(volatile T* const dest, const T val) {
-  atomic_fetch_or(dest, val);
-}
-
-template <typename T>
-void atomic_and(volatile T* const dest, const T val) {
-  atomic_fetch_and(dest, val);
-}
-
-template <typename T>
-void atomic_add(volatile T* const dest, const T val) {
-  atomic_fetch_add(dest, val);
-}
-
-template <typename T>
-void atomic_sub(volatile T* const dest, const T val) {
-  atomic_fetch_sub(dest, val);
-}
-
-template <typename T>
-void atomic_assign(volatile T* const dest, const T val) {
-  atomic_fetch_exchange(dest, val);
-}
-
-template <typename T>
-T atomic_increment(volatile T* const dest) {
-  T oldval = *dest;
-  T assume;
-  do {
-    assume   = oldval;
-    T newval = assume++;
-    oldval   = atomic_compare_exchange(dest, assume, newval);
-  } while (assume != oldval);
-}
-
-template <typename T>
-T atomic_decrement(volatile T* const dest) {
-  T oldval = *dest;
-  T assume;
-  do {
-    assume   = oldval;
-    T newval = assume--;
-    oldval   = atomic_compare_exchange(dest, assume, newval);
-  } while (assume != oldval);
-}
-
 }  // namespace Kokkos
 #endif
 #endif
diff --git a/kokkos/core/src/impl/Kokkos_BitOps.hpp b/kokkos/core/src/impl/Kokkos_BitOps.hpp
index 9ffd155c5..7d2cdf0d4 100644
--- a/kokkos/core/src/impl/Kokkos_BitOps.hpp
+++ b/kokkos/core/src/impl/Kokkos_BitOps.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/impl/Kokkos_CPUDiscovery.cpp b/kokkos/core/src/impl/Kokkos_CPUDiscovery.cpp
index 2fb733df3..3b003f84e 100644
--- a/kokkos/core/src/impl/Kokkos_CPUDiscovery.cpp
+++ b/kokkos/core/src/impl/Kokkos_CPUDiscovery.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/impl/Kokkos_CPUDiscovery.hpp b/kokkos/core/src/impl/Kokkos_CPUDiscovery.hpp
index b20edfa6f..6ba14c85b 100644
--- a/kokkos/core/src/impl/Kokkos_CPUDiscovery.hpp
+++ b/kokkos/core/src/impl/Kokkos_CPUDiscovery.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/impl/Kokkos_ChaseLev.hpp b/kokkos/core/src/impl/Kokkos_ChaseLev.hpp
index 6826d1b88..e2283f11f 100644
--- a/kokkos/core/src/impl/Kokkos_ChaseLev.hpp
+++ b/kokkos/core/src/impl/Kokkos_ChaseLev.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -48,8 +48,7 @@
 #define KOKKOS_IMPL_LOCKFREEDEQUE_HPP
 
 #include <Kokkos_Macros.hpp>
-#ifdef KOKKOS_ENABLE_TASKDAG  // Note: implies CUDA_VERSION >= 8000 if using
-                              // CUDA
+#ifdef KOKKOS_ENABLE_TASKDAG
 
 #include <Kokkos_Core_fwd.hpp>
 
@@ -191,11 +190,21 @@ struct ChaseLevDeque {
       return_value = *static_cast<T*>(a[b]);  // relaxed load
       if (t == b) {
         /* single last element in the queue. */
-        if (not Impl::atomic_compare_exchange_strong(
+#ifdef _WIN32
+        Kokkos::memory_fence();
+        bool const success =
+            Kokkos::atomic_compare_exchange_strong(&m_top, t, t + 1);
+        Kokkos::memory_fence();
+        if (!success) {
+          return_value = nullptr;
+        }
+#else
+        if (!Impl::atomic_compare_exchange_strong(
                 &m_top, t, t + 1, memory_order_seq_cst, memory_order_relaxed)) {
           /* failed race, someone else stole it */
           return_value = nullptr;
         }
+#endif
         m_bottom = b + 1;  // memory order relaxed
       }
     } else {
@@ -241,10 +250,20 @@ struct ChaseLevDeque {
       Kokkos::load_fence();  // TODO @tasking @memory_order DSH memory order
                              // instead of fence
       return_value = *static_cast<T*>(a[t]);  // relaxed
-      if (not Impl::atomic_compare_exchange_strong(
+#ifdef _WIN32
+      Kokkos::memory_fence();
+      bool const success =
+          Kokkos::atomic_compare_exchange_strong(&m_top, t, t + 1);
+      Kokkos::memory_fence();
+      if (!success) {
+        return_value = nullptr;
+      }
+#else
+      if (!Impl::atomic_compare_exchange_strong(
               &m_top, t, t + 1, memory_order_seq_cst, memory_order_relaxed)) {
         return_value = nullptr;
       }
+#endif
     }
     return return_value;
   }
diff --git a/kokkos/core/src/impl/Kokkos_ClockTic.hpp b/kokkos/core/src/impl/Kokkos_ClockTic.hpp
index 50e81e50e..386b5918d 100644
--- a/kokkos/core/src/impl/Kokkos_ClockTic.hpp
+++ b/kokkos/core/src/impl/Kokkos_ClockTic.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -75,7 +75,10 @@ uint64_t clock_tic(void) noexcept {
 #elif defined(__HCC_ACCELERATOR__)
   // Get clock register
   return hc::__clock_u64();
-
+#elif defined(KOKKOS_ENABLE_OPENMPTARGET)
+  return (uint64_t)std::chrono::high_resolution_clock::now()
+      .time_since_epoch()
+      .count();
 #elif defined(__i386__) || defined(__x86_64)
 
   // Return value of 64-bit hi-res clock register.
diff --git a/kokkos/core/src/impl/Kokkos_ConcurrentBitset.hpp b/kokkos/core/src/impl/Kokkos_ConcurrentBitset.hpp
index e4f8b69c4..4f10fb141 100644
--- a/kokkos/core/src/impl/Kokkos_ConcurrentBitset.hpp
+++ b/kokkos/core/src/impl/Kokkos_ConcurrentBitset.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/impl/Kokkos_Core.cpp b/kokkos/core/src/impl/Kokkos_Core.cpp
index c9557798b..9640e0fcc 100644
--- a/kokkos/core/src/impl/Kokkos_Core.cpp
+++ b/kokkos/core/src/impl/Kokkos_Core.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -50,19 +50,122 @@
 #include <sstream>
 #include <cstdlib>
 #include <stack>
+#include <functional>
+#include <list>
 #include <cerrno>
+#ifndef _WIN32
 #include <unistd.h>
+#endif
 
 //----------------------------------------------------------------------------
-
 namespace {
 bool g_is_initialized = false;
 bool g_show_warnings  = true;
-std::stack<std::function<void()> > finalize_hooks;
+// When compiling with clang/LLVM and using the GNU (GCC) C++ Standard Library
+// (any recent version between GCC 7.3 and GCC 9.2), std::deque SEGV's during
+// the unwinding of the atexit(3C) handlers at program termination.  However,
+// this bug is not observable when building with GCC.
+// As an added bonus, std::list<T> provides constant insertion and
+// deletion time complexity, which translates to better run-time performance. As
+// opposed to std::deque<T> which does not provide the same constant time
+// complexity for inserts/removals, since std::deque<T> is implemented as a
+// segmented array.
+using hook_function_type = std::function<void()>;
+std::stack<hook_function_type, std::list<hook_function_type>> finalize_hooks;
 }  // namespace
 
 namespace Kokkos {
 namespace Impl {
+
+int get_ctest_gpu(const char* local_rank_str) {
+  auto const* ctest_kokkos_device_type =
+      std::getenv("CTEST_KOKKOS_DEVICE_TYPE");
+  if (!ctest_kokkos_device_type) {
+    return 0;
+  }
+
+  auto const* ctest_resource_group_count_str =
+      std::getenv("CTEST_RESOURCE_GROUP_COUNT");
+  if (!ctest_resource_group_count_str) {
+    return 0;
+  }
+
+  // Make sure rank is within bounds of resource groups specified by CTest
+  auto resource_group_count = std::atoi(ctest_resource_group_count_str);
+  auto local_rank           = std::atoi(local_rank_str);
+  if (local_rank >= resource_group_count) {
+    std::ostringstream ss;
+    ss << "Error: local rank " << local_rank
+       << " is outside the bounds of resource groups provided by CTest. Raised"
+       << " by Kokkos::Impl::get_ctest_gpu().";
+    throw_runtime_exception(ss.str());
+  }
+
+  // Get the resource types allocated to this resource group
+  std::ostringstream ctest_resource_group;
+  ctest_resource_group << "CTEST_RESOURCE_GROUP_" << local_rank;
+  std::string ctest_resource_group_name = ctest_resource_group.str();
+  auto const* ctest_resource_group_str =
+      std::getenv(ctest_resource_group_name.c_str());
+  if (!ctest_resource_group_str) {
+    std::ostringstream ss;
+    ss << "Error: " << ctest_resource_group_name << " is not specified. Raised"
+       << " by Kokkos::Impl::get_ctest_gpu().";
+    throw_runtime_exception(ss.str());
+  }
+
+  // Look for the device type specified in CTEST_KOKKOS_DEVICE_TYPE
+  bool found_device                        = false;
+  std::string ctest_resource_group_cxx_str = ctest_resource_group_str;
+  std::istringstream instream(ctest_resource_group_cxx_str);
+  while (true) {
+    std::string devName;
+    std::getline(instream, devName, ',');
+    if (devName == ctest_kokkos_device_type) {
+      found_device = true;
+      break;
+    }
+    if (instream.eof() || devName.length() == 0) {
+      break;
+    }
+  }
+
+  if (!found_device) {
+    std::ostringstream ss;
+    ss << "Error: device type '" << ctest_kokkos_device_type
+       << "' not included in " << ctest_resource_group_name
+       << ". Raised by Kokkos::Impl::get_ctest_gpu().";
+    throw_runtime_exception(ss.str());
+  }
+
+  // Get the device ID
+  std::string ctest_device_type_upper = ctest_kokkos_device_type;
+  for (auto& c : ctest_device_type_upper) {
+    c = std::toupper(c);
+  }
+  ctest_resource_group << "_" << ctest_device_type_upper;
+
+  std::string ctest_resource_group_id_name = ctest_resource_group.str();
+  auto resource_str = std::getenv(ctest_resource_group_id_name.c_str());
+  if (!resource_str) {
+    std::ostringstream ss;
+    ss << "Error: " << ctest_resource_group_id_name
+       << " is not specified. Raised by Kokkos::Impl::get_ctest_gpu().";
+    throw_runtime_exception(ss.str());
+  }
+
+  auto const* comma = std::strchr(resource_str, ',');
+  if (!comma || strncmp(resource_str, "id:", 3)) {
+    std::ostringstream ss;
+    ss << "Error: invalid value of " << ctest_resource_group_id_name << ": '"
+       << resource_str << "'. Raised by Kokkos::Impl::get_ctest_gpu().";
+    throw_runtime_exception(ss.str());
+  }
+
+  std::string id(resource_str + 3, comma - resource_str - 3);
+  return std::atoi(id.c_str());
+}
+
 namespace {
 
 bool is_unsigned_int(const char* str) {
@@ -74,7 +177,8 @@ bool is_unsigned_int(const char* str) {
   }
   return true;
 }
-void initialize_internal(const InitArguments& args) {
+
+void initialize_backends(const InitArguments& args) {
 // This is an experimental setting
 // For KNL in Flat mode this variable should be set, so that
 // memkind allocates high bandwidth memory correctly.
@@ -82,10 +186,6 @@ void initialize_internal(const InitArguments& args) {
   setenv("MEMKIND_HBW_NODES", "1", 0);
 #endif
 
-  if (args.disable_warnings) {
-    g_show_warnings = false;
-  }
-
   // Protect declarations, to prevent "unused variable" warnings.
 #if defined(KOKKOS_ENABLE_OPENMP) || defined(KOKKOS_ENABLE_THREADS) || \
     defined(KOKKOS_ENABLE_OPENMPTARGET) || defined(KOKKOS_ENABLE_HPX)
@@ -94,25 +194,39 @@ void initialize_internal(const InitArguments& args) {
 #if defined(KOKKOS_ENABLE_THREADS) || defined(KOKKOS_ENABLE_OPENMPTARGET)
   const int use_numa = args.num_numa;
 #endif
-#if defined(KOKKOS_ENABLE_CUDA) || defined(KOKKOS_ENABLE_ROCM)
+#if defined(KOKKOS_ENABLE_CUDA) || defined(KOKKOS_ENABLE_ROCM) || \
+    defined(KOKKOS_ENABLE_HIP)
   int use_gpu           = args.device_id;
   const int ndevices    = args.ndevices;
   const int skip_device = args.skip_device;
   // if the exact device is not set, but ndevices was given, assign round-robin
   // using on-node MPI rank
-  if (use_gpu < 0 && ndevices >= 0) {
-    auto local_rank_str = std::getenv("OMPI_COMM_WORLD_LOCAL_RANK");  // OpenMPI
+  if (use_gpu < 0) {
+    auto const* local_rank_str =
+        std::getenv("OMPI_COMM_WORLD_LOCAL_RANK");  // OpenMPI
     if (!local_rank_str)
       local_rank_str = std::getenv("MV2_COMM_WORLD_LOCAL_RANK");  // MVAPICH2
     if (!local_rank_str)
       local_rank_str = std::getenv("SLURM_LOCALID");  // SLURM
-    if (local_rank_str) {
-      auto local_rank = std::atoi(local_rank_str);
-      use_gpu         = local_rank % ndevices;
-    } else {
-      // user only gave us ndevices, but the MPI environment variable wasn't
-      // set. start with GPU 0 at this point
-      use_gpu = 0;
+
+    auto const* ctest_kokkos_device_type =
+        std::getenv("CTEST_KOKKOS_DEVICE_TYPE");  // CTest
+    auto const* ctest_resource_group_count_str =
+        std::getenv("CTEST_RESOURCE_GROUP_COUNT");  // CTest
+    if (ctest_kokkos_device_type && ctest_resource_group_count_str &&
+        local_rank_str) {
+      // Use the device assigned by CTest
+      use_gpu = get_ctest_gpu(local_rank_str);
+    } else if (ndevices >= 0) {
+      // Use the device assigned by the rank
+      if (local_rank_str) {
+        auto local_rank = std::atoi(local_rank_str);
+        use_gpu         = local_rank % ndevices;
+      } else {
+        // user only gave use ndevices, but the MPI environment variable wasn't
+        // set. start with GPU 0 at this point
+        use_gpu = 0;
+      }
     }
     // shift assignments over by one so no one is assigned to "skip_device"
     if (use_gpu >= skip_device) ++use_gpu;
@@ -199,17 +313,9 @@ void initialize_internal(const InitArguments& args) {
 #endif
 
 #if defined(KOKKOS_ENABLE_OPENMPTARGET)
-  if (Impl::is_same<Kokkos::Experimental::OpenMPTarget,
-                    Kokkos::DefaultExecutionSpace>::value) {
-    if (num_threads > 0) {
-      if (use_numa > 0) {
-        Kokkos::Experimental::OpenMPTarget::initialize(num_threads, use_numa);
-      } else {
-        Kokkos::Experimental::OpenMPTarget::initialize(num_threads);
-      }
-    } else {
-      Kokkos::Experimental::OpenMPTarget::initialize();
-    }
+  if (std::is_same<Kokkos::Experimental::OpenMPTarget,
+                   Kokkos::DefaultExecutionSpace>::value) {
+    Kokkos::Experimental::OpenMPTarget().impl_initialize();
     // std::cout << "Kokkos::initialize() fyi: OpenMP enabled and initialized"
     // << std::endl ;
   } else {
@@ -254,6 +360,23 @@ void initialize_internal(const InitArguments& args) {
   }
 #endif
 
+#if defined(KOKKOS_ENABLE_HIP)
+  if (std::is_same<Kokkos::Experimental::HIP,
+                   Kokkos::DefaultExecutionSpace>::value ||
+      0 < use_gpu) {
+    if (use_gpu > -1) {
+      Kokkos::Experimental::HIP::impl_initialize(
+          Kokkos::Experimental::HIP::SelectDevice(use_gpu));
+    } else {
+      Kokkos::Experimental::HIP::impl_initialize();
+    }
+    std::cout << "Kokkos::initialize() fyi: HIP enabled and initialized"
+              << std::endl;
+  }
+#endif
+}
+
+void initialize_profiling(const InitArguments&) {
 #if defined(KOKKOS_ENABLE_PROFILING)
   Kokkos::Profiling::initialize();
 #else
@@ -263,9 +386,23 @@ void initialize_internal(const InitArguments& args) {
               << std::endl;
   }
 #endif
+}
+
+void pre_initialize_internal(const InitArguments& args) {
+  if (args.disable_warnings) g_show_warnings = false;
+}
+
+void post_initialize_internal(const InitArguments& args) {
+  initialize_profiling(args);
   g_is_initialized = true;
 }
 
+void initialize_internal(const InitArguments& args) {
+  pre_initialize_internal(args);
+  initialize_backends(args);
+  post_initialize_internal(args);
+}
+
 void finalize_internal(const bool all_spaces = false) {
   typename decltype(finalize_hooks)::size_type numSuccessfulCalls = 0;
   while (!finalize_hooks.empty()) {
@@ -320,12 +457,20 @@ void finalize_internal(const bool all_spaces = false) {
   }
 #endif
 
+#if defined(KOKKOS_ENABLE_HIP)
+  if (std::is_same<Kokkos::Experimental::HIP,
+                   Kokkos::DefaultExecutionSpace>::value ||
+      all_spaces) {
+    if (Kokkos::Experimental::HIP::impl_is_initialized())
+      Kokkos::Experimental::HIP::impl_finalize();
+  }
+#endif
 #if defined(KOKKOS_ENABLE_OPENMPTARGET)
   if (std::is_same<Kokkos::Experimental::OpenMPTarget,
                    Kokkos::DefaultExecutionSpace>::value ||
       all_spaces) {
-    if (Kokkos::Experimental::OpenMPTarget::is_initialized())
-      Kokkos::Experimental::OpenMPTarget::finalize();
+    if (Kokkos::Experimental::OpenMPTarget().impl_is_initialized())
+      Kokkos::Experimental::OpenMPTarget().impl_finalize();
   }
 #endif
 
@@ -380,23 +525,19 @@ void finalize_internal(const bool all_spaces = false) {
 
 void fence_internal() {
 #if defined(KOKKOS_ENABLE_CUDA)
-  if (std::is_same<Kokkos::Cuda, Kokkos::DefaultExecutionSpace>::value) {
-    Kokkos::Cuda::impl_static_fence();
-  }
+  Kokkos::Cuda::impl_static_fence();
 #endif
 
 #if defined(KOKKOS_ENABLE_ROCM)
-  if (std::is_same<Kokkos::Experimental::ROCm,
-                   Kokkos::DefaultExecutionSpace>::value) {
-    Kokkos::Experimental::ROCm().fence();
-  }
+  Kokkos::Experimental::ROCm().fence();
+#endif
+
+#if defined(KOKKOS_ENABLE_HIP)
+  Kokkos::Experimental::HIP().fence();
 #endif
 
 #if defined(KOKKOS_ENABLE_OPENMP)
-  if (std::is_same<Kokkos::OpenMP, Kokkos::DefaultExecutionSpace>::value ||
-      std::is_same<Kokkos::OpenMP, Kokkos::HostSpace::execution_space>::value) {
-    Kokkos::OpenMP::impl_static_fence();
-  }
+  Kokkos::OpenMP::impl_static_fence();
 #endif
 
 #if defined(KOKKOS_ENABLE_HPX)
@@ -404,18 +545,11 @@ void fence_internal() {
 #endif
 
 #if defined(KOKKOS_ENABLE_THREADS)
-  if (std::is_same<Kokkos::Threads, Kokkos::DefaultExecutionSpace>::value ||
-      std::is_same<Kokkos::Threads,
-                   Kokkos::HostSpace::execution_space>::value) {
-    Kokkos::Threads::impl_static_fence();
-  }
+  Kokkos::Threads::impl_static_fence();
 #endif
 
 #if defined(KOKKOS_ENABLE_SERIAL)
-  if (std::is_same<Kokkos::Serial, Kokkos::DefaultExecutionSpace>::value ||
-      std::is_same<Kokkos::Serial, Kokkos::HostSpace::execution_space>::value) {
-    Kokkos::Serial::impl_static_fence();
-  }
+  Kokkos::Serial::impl_static_fence();
 #endif
 }
 
@@ -454,22 +588,31 @@ bool check_int_arg(char const* arg, char const* expected, int* value) {
   return true;
 }
 
-}  // namespace
-
-}  // namespace Impl
-}  // namespace Kokkos
-
-//----------------------------------------------------------------------------
+void warn_deprecated_command_line_argument(std::string deprecated,
+                                           std::string valid) {
+  std::cerr
+      << "Warning: command line argument '" << deprecated
+      << "' is deprecated. Use '" << valid
+      << "' instead. Raised by Kokkos::initialize(int narg, char* argc[])."
+      << std::endl;
+}
 
-namespace Kokkos {
+unsigned get_process_id() {
+#ifdef _WIN32
+  return unsigned(GetCurrentProcessId());
+#else
+  return unsigned(getpid());
+#endif
+}
 
-void initialize(int& narg, char* arg[]) {
-  int num_threads       = -1;
-  int numa              = -1;
-  int device            = -1;
-  int ndevices          = -1;
-  int skip_device       = 9999;
-  bool disable_warnings = false;
+void parse_command_line_arguments(int& narg, char* arg[],
+                                  InitArguments& arguments) {
+  auto& num_threads      = arguments.num_threads;
+  auto& numa             = arguments.num_numa;
+  auto& device           = arguments.device_id;
+  auto& ndevices         = arguments.ndevices;
+  auto& skip_device      = arguments.skip_device;
+  auto& disable_warnings = arguments.disable_warnings;
 
   int kokkos_threads_found  = 0;
   int kokkos_numa_found     = 0;
@@ -479,76 +622,97 @@ void initialize(int& narg, char* arg[]) {
   int iarg = 0;
 
   while (iarg < narg) {
-    if (Impl::check_int_arg(arg[iarg], "--kokkos-threads", &num_threads)) {
+    if (check_int_arg(arg[iarg], "--kokkos-threads", &num_threads)) {
       for (int k = iarg; k < narg - 1; k++) {
         arg[k] = arg[k + 1];
       }
       kokkos_threads_found = 1;
       narg--;
     } else if (!kokkos_threads_found &&
-               Impl::check_int_arg(arg[iarg], "--threads", &num_threads)) {
+               check_int_arg(arg[iarg], "--threads", &num_threads)) {
       iarg++;
-    } else if (Impl::check_int_arg(arg[iarg], "--kokkos-numa", &numa)) {
+    } else if (check_int_arg(arg[iarg], "--kokkos-numa", &numa)) {
       for (int k = iarg; k < narg - 1; k++) {
         arg[k] = arg[k + 1];
       }
       kokkos_numa_found = 1;
       narg--;
     } else if (!kokkos_numa_found &&
-               Impl::check_int_arg(arg[iarg], "--numa", &numa)) {
+               check_int_arg(arg[iarg], "--numa", &numa)) {
       iarg++;
-    } else if (Impl::check_int_arg(arg[iarg], "--kokkos-device", &device)) {
+    } else if (check_int_arg(arg[iarg], "--kokkos-device-id", &device) ||
+               check_int_arg(arg[iarg], "--kokkos-device", &device)) {
+      if (check_arg(arg[iarg], "--kokkos-device")) {
+        warn_deprecated_command_line_argument("--kokkos-device",
+                                              "--kokkos-device-id");
+      }
       for (int k = iarg; k < narg - 1; k++) {
         arg[k] = arg[k + 1];
       }
       kokkos_device_found = 1;
       narg--;
     } else if (!kokkos_device_found &&
-               Impl::check_int_arg(arg[iarg], "--device", &device)) {
+               (check_int_arg(arg[iarg], "--device-id", &device) ||
+                check_int_arg(arg[iarg], "--device", &device))) {
+      if (check_arg(arg[iarg], "--device")) {
+        warn_deprecated_command_line_argument("--device", "--device-id");
+      }
       iarg++;
-    } else if (Impl::check_arg(arg[iarg], "--kokkos-ndevices") ||
-               Impl::check_arg(arg[iarg], "--ndevices")) {
+    } else if (check_arg(arg[iarg], "--kokkos-num-devices") ||
+               check_arg(arg[iarg], "--num-devices") ||
+               check_arg(arg[iarg], "--kokkos-ndevices") ||
+               check_arg(arg[iarg], "--ndevices")) {
+      if (check_arg(arg[iarg], "--ndevices")) {
+        warn_deprecated_command_line_argument("--ndevices", "--num-devices");
+      }
+      if (check_arg(arg[iarg], "--kokkos-ndevices")) {
+        warn_deprecated_command_line_argument("--kokkos-ndevices",
+                                              "--kokkos-num-devices");
+      }
       // Find the number of device (expecting --device=XX)
-      if (!((strncmp(arg[iarg], "--kokkos-ndevices=", 18) == 0) ||
+      if (!((strncmp(arg[iarg], "--kokkos-num-devices=", 21) == 0) ||
+            (strncmp(arg[iarg], "--num-ndevices=", 14) == 0) ||
+            (strncmp(arg[iarg], "--kokkos-ndevices=", 18) == 0) ||
             (strncmp(arg[iarg], "--ndevices=", 11) == 0)))
-        Impl::throw_runtime_exception(
+        throw_runtime_exception(
             "Error: expecting an '=INT[,INT]' after command line argument "
-            "'--ndevices/--kokkos-ndevices'. Raised by Kokkos::initialize(int "
-            "narg, char* argc[]).");
+            "'--num-devices/--kokkos-num-devices'. Raised by "
+            "Kokkos::initialize(int narg, char* argc[]).");
 
       char* num1      = strchr(arg[iarg], '=') + 1;
       char* num2      = strpbrk(num1, ",");
-      int num1_len    = num2 == NULL ? strlen(num1) : num2 - num1;
+      int num1_len    = num2 == nullptr ? strlen(num1) : num2 - num1;
       char* num1_only = new char[num1_len + 1];
       strncpy(num1_only, num1, num1_len);
       num1_only[num1_len] = 0;
 
-      if (!Impl::is_unsigned_int(num1_only) || (strlen(num1_only) == 0)) {
-        Impl::throw_runtime_exception(
+      if (!is_unsigned_int(num1_only) || (strlen(num1_only) == 0)) {
+        throw_runtime_exception(
             "Error: expecting an integer number after command line argument "
-            "'--kokkos-ndevices'. Raised by Kokkos::initialize(int narg, char* "
-            "argc[]).");
+            "'--kokkos-numdevices'. Raised by "
+            "Kokkos::initialize(int narg, char* argc[]).");
       }
-      if ((strncmp(arg[iarg], "--kokkos-ndevices", 17) == 0) ||
-          !kokkos_ndevices_found)
+      if (check_arg(arg[iarg], "--kokkos-num-devices") ||
+          check_arg(arg[iarg], "--kokkos-ndevices") || !kokkos_ndevices_found)
         ndevices = atoi(num1_only);
       delete[] num1_only;
 
-      if (num2 != NULL) {
-        if ((!Impl::is_unsigned_int(num2 + 1)) || (strlen(num2) == 1))
-          Impl::throw_runtime_exception(
+      if (num2 != nullptr) {
+        if ((!is_unsigned_int(num2 + 1)) || (strlen(num2) == 1))
+          throw_runtime_exception(
               "Error: expecting an integer number after command line argument "
-              "'--kokkos-ndevices=XX,'. Raised by Kokkos::initialize(int narg, "
-              "char* argc[]).");
+              "'--kokkos-num-devices=XX,'. Raised by "
+              "Kokkos::initialize(int narg, char* argc[]).");
 
-        if ((strncmp(arg[iarg], "--kokkos-ndevices", 17) == 0) ||
-            !kokkos_ndevices_found)
+        if (check_arg(arg[iarg], "--kokkos-num-devices") ||
+            check_arg(arg[iarg], "--kokkos-ndevices") || !kokkos_ndevices_found)
           skip_device = atoi(num2 + 1);
       }
 
-      // Remove the --kokkos-ndevices argument from the list but leave
-      // --ndevices
-      if (strncmp(arg[iarg], "--kokkos-ndevices", 17) == 0) {
+      // Remove the --kokkos-num-devices argument from the list but leave
+      // --num-devices
+      if (check_arg(arg[iarg], "--kokkos-num-devices") ||
+          check_arg(arg[iarg], "--kokkos-ndevices")) {
         for (int k = iarg; k < narg - 1; k++) {
           arg[k] = arg[k + 1];
         }
@@ -557,88 +721,45 @@ void initialize(int& narg, char* arg[]) {
       } else {
         iarg++;
       }
-    } else if (strcmp(arg[iarg], "--kokkos-disable-warnings") == 0) {
+    } else if (check_arg(arg[iarg], "--kokkos-disable-warnings")) {
       disable_warnings = true;
       for (int k = iarg; k < narg - 1; k++) {
         arg[k] = arg[k + 1];
       }
       narg--;
-    } else if ((strcmp(arg[iarg], "--kokkos-help") == 0) ||
-               (strcmp(arg[iarg], "--help") == 0)) {
-      std::cout << std::endl;
-      std::cout << "-----------------------------------------------------------"
-                   "---------------------"
-                << std::endl;
-      std::cout << "-------------Kokkos command line "
-                   "arguments--------------------------------------"
-                << std::endl;
-      std::cout << "-----------------------------------------------------------"
-                   "---------------------"
-                << std::endl;
-      std::cout << "The following arguments exist also without prefix 'kokkos' "
-                   "(e.g. --help)."
-                << std::endl;
-      std::cout << "The prefixed arguments will be removed from the list by "
-                   "Kokkos::initialize(),"
-                << std::endl;
-      std::cout << "the non-prefixed ones are not removed. Prefixed versions "
-                   "take precedence over "
-                << std::endl;
-      std::cout << "non prefixed ones, and the last occurrence of an argument "
-                   "overwrites prior"
-                << std::endl;
-      std::cout << "settings." << std::endl;
-      std::cout << std::endl;
-      std::cout << "--kokkos-help               : print this message"
-                << std::endl;
-      std::cout
-          << "--kokkos-disable-warnings   : disable kokkos warning messages"
-          << std::endl;
-      std::cout
-          << "--kokkos-threads=INT        : specify total number of threads or"
-          << std::endl;
-      std::cout << "                              number of threads per NUMA "
-                   "region if "
-                << std::endl;
-      std::cout << "                              used in conjunction with "
-                   "'--numa' option. "
-                << std::endl;
-      std::cout << "--kokkos-numa=INT           : specify number of NUMA "
-                   "regions used by process."
-                << std::endl;
-      std::cout << "--kokkos-device=INT         : specify device id to be used "
-                   "by Kokkos. "
-                << std::endl;
-      std::cout << "--kokkos-ndevices=INT[,INT] : used when running MPI jobs. "
-                   "Specify number of"
-                << std::endl;
-      std::cout << "                              devices per node to be used. "
-                   "Process to device"
-                << std::endl;
-      std::cout << "                              mapping happens by obtaining "
-                   "the local MPI rank"
-                << std::endl;
-      std::cout << "                              and assigning devices "
-                   "round-robin. The optional"
-                << std::endl;
-      std::cout << "                              second argument allows for "
-                   "an existing device"
-                << std::endl;
-      std::cout << "                              to be ignored. This is most "
-                   "useful on workstations"
-                << std::endl;
-      std::cout << "                              with multiple GPUs of which "
-                   "one is used to drive"
-                << std::endl;
-      std::cout << "                              screen output." << std::endl;
-      std::cout << std::endl;
-      std::cout << "-----------------------------------------------------------"
-                   "---------------------"
-                << std::endl;
-      std::cout << std::endl;
-
-      // Remove the --kokkos-help argument from the list but leave --ndevices
-      if (strcmp(arg[iarg], "--kokkos-help") == 0) {
+    } else if (check_arg(arg[iarg], "--kokkos-help") ||
+               check_arg(arg[iarg], "--help")) {
+      auto const help_message = R"(
+      --------------------------------------------------------------------------------
+      -------------Kokkos command line arguments--------------------------------------
+      --------------------------------------------------------------------------------
+      The following arguments exist also without prefix 'kokkos' (e.g. --help).
+      The prefixed arguments will be removed from the list by Kokkos::initialize(),
+      the non-prefixed ones are not removed. Prefixed versions take precedence over
+      non prefixed ones, and the last occurrence of an argument overwrites prior
+      settings.
+
+      --kokkos-help                  : print this message
+      --kokkos-disable-warnings      : disable kokkos warning messages
+      --kokkos-threads=INT           : specify total number of threads or
+                                       number of threads per NUMA region if
+                                       used in conjunction with '--numa' option.
+      --kokkos-numa=INT              : specify number of NUMA regions used by process.
+      --kokkos-device-id=INT         : specify device id to be used by Kokkos.
+      --kokkos-num-devices=INT[,INT] : used when running MPI jobs. Specify number of
+                                       devices per node to be used. Process to device
+                                       mapping happens by obtaining the local MPI rank
+                                       and assigning devices round-robin. The optional
+                                       second argument allows for an existing device
+                                       to be ignored. This is most useful on workstations
+                                       with multiple GPUs of which one is used to drive
+                                       screen output.
+      --------------------------------------------------------------------------------
+)";
+      std::cout << help_message << std::endl;
+
+      // Remove the --kokkos-help argument from the list but leave --help
+      if (check_arg(arg[iarg], "--kokkos-help")) {
         for (int k = iarg; k < narg - 1; k++) {
           arg[k] = arg[k + 1];
         }
@@ -649,8 +770,16 @@ void initialize(int& narg, char* arg[]) {
     } else
       iarg++;
   }
+}
+
+void parse_environment_variables(InitArguments& arguments) {
+  auto& num_threads      = arguments.num_threads;
+  auto& numa             = arguments.num_numa;
+  auto& device           = arguments.device_id;
+  auto& ndevices         = arguments.ndevices;
+  auto& skip_device      = arguments.skip_device;
+  auto& disable_warnings = arguments.disable_warnings;
 
-  // Read environment variables
   char* endptr;
   auto env_num_threads_str = std::getenv("KOKKOS_NUM_THREADS");
   if (env_num_threads_str != nullptr) {
@@ -783,7 +912,7 @@ void initialize(int& narg, char* arg[]) {
             "Error: cannot KOKKOS_SKIP_DEVICE the only KOKKOS_RAND_DEVICE. "
             "Raised by Kokkos::initialize(int narg, char* argc[]).");
 
-      std::srand(getpid());
+      std::srand(get_process_id());
       while (device < 0) {
         int test_device = std::rand() % rdevices;
         if (test_device != skip_device) device = test_device;
@@ -804,21 +933,40 @@ void initialize(int& narg, char* arg[]) {
           "KOKKOS_DISABLE_WARNINGS if both are set. Raised by "
           "Kokkos::initialize(int narg, char* argc[]).");
   }
+}
 
+}  // namespace
+
+}  // namespace Impl
+}  // namespace Kokkos
+
+//----------------------------------------------------------------------------
+
+namespace Kokkos {
+
+void initialize(int& narg, char* arg[]) {
   InitArguments arguments;
-  arguments.num_threads      = num_threads;
-  arguments.num_numa         = numa;
-  arguments.device_id        = device;
-  arguments.ndevices         = ndevices;
-  arguments.skip_device      = skip_device;
-  arguments.disable_warnings = disable_warnings;
+  Impl::parse_command_line_arguments(narg, arg, arguments);
+  Impl::parse_environment_variables(arguments);
   Impl::initialize_internal(arguments);
 }
 
-void initialize(const InitArguments& arguments) {
+void initialize(InitArguments arguments) {
+  Impl::parse_environment_variables(arguments);
   Impl::initialize_internal(arguments);
 }
 
+namespace Impl {
+
+void pre_initialize(const InitArguments& args) {
+  pre_initialize_internal(args);
+}
+
+void post_initialize(const InitArguments& args) {
+  post_initialize_internal(args);
+}
+}  // namespace Impl
+
 void push_finalize_hook(std::function<void()> f) { finalize_hooks.push(f); }
 
 void finalize() { Impl::finalize_internal(); }
@@ -833,6 +981,10 @@ void fence() { Impl::fence_internal(); }
 void print_configuration(std::ostream& out, const bool detail) {
   std::ostringstream msg;
 
+  msg << "Kokkos Version:" << std::endl;
+  msg << "  " << KOKKOS_VERSION / 10000 << "." << (KOKKOS_VERSION % 10000) / 100
+      << "." << KOKKOS_VERSION % 100 << std::endl;
+
   msg << "Compiler:" << std::endl;
 #ifdef KOKKOS_COMPILER_APPLECC
   msg << "  KOKKOS_COMPILER_APPLECC: " << KOKKOS_COMPILER_APPLECC << std::endl;
@@ -882,6 +1034,12 @@ void print_configuration(std::ostream& out, const bool detail) {
   msg << "yes" << std::endl;
 #else
   msg << "no" << std::endl;
+#endif
+  msg << "  KOKKOS_ENABLE_HIP: ";
+#ifdef KOKKOS_ENABLE_HIP
+  msg << "yes" << std::endl;
+#else
+  msg << "no" << std::endl;
 #endif
   msg << "  KOKKOS_ENABLE_OPENMP: ";
 #ifdef KOKKOS_ENABLE_OPENMP
@@ -900,12 +1058,6 @@ void print_configuration(std::ostream& out, const bool detail) {
   msg << "yes" << std::endl;
 #else
   msg << "no" << std::endl;
-#endif
-  msg << "  KOKKOS_ENABLE_QTHREADS: ";
-#ifdef KOKKOS_ENABLE_QTHREADS
-  msg << "yes" << std::endl;
-#else
-  msg << "no" << std::endl;
 #endif
   msg << "  KOKKOS_ENABLE_SERIAL: ";
 #ifdef KOKKOS_ENABLE_SERIAL
@@ -921,20 +1073,20 @@ void print_configuration(std::ostream& out, const bool detail) {
 #else
   msg << "no" << std::endl;
 #endif
-  msg << "  KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_OPENMP: ";
-#ifdef KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_OPENMP
+  msg << "  KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_HIP: ";
+#ifdef KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_HIP
   msg << "yes" << std::endl;
 #else
   msg << "no" << std::endl;
 #endif
-  msg << "  KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_THREADS: ";
-#ifdef KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_THREADS
+  msg << "  KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_OPENMP: ";
+#ifdef KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_OPENMP
   msg << "yes" << std::endl;
 #else
   msg << "no" << std::endl;
 #endif
-  msg << "  KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_QTHREADS: ";
-#ifdef KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_QTHREADS
+  msg << "  KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_THREADS: ";
+#ifdef KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_THREADS
   msg << "yes" << std::endl;
 #else
   msg << "no" << std::endl;
@@ -1131,12 +1283,25 @@ void print_configuration(std::ostream& out, const bool detail) {
   msg << "no" << std::endl;
 #endif
 
+#endif
+
+#ifdef KOKKOS_ENABLE_HIP
+  msg << "HIP Options:" << std::endl;
+  msg << "  KOKKOS_ENABLE_HIP_RELOCATABLE_DEVICE_CODE: ";
+#ifdef KOKKOS_ENABLE_HIP_RELOCATABLE_DEVICE_CODE
+  msg << "yes" << std::endl;
+#else
+  msg << "no" << std::endl;
+#endif
 #endif
 
   msg << "\nRuntime Configuration:" << std::endl;
 #ifdef KOKKOS_ENABLE_CUDA
   Cuda::print_configuration(msg, detail);
 #endif
+#ifdef KOKKOS_ENABLE_HIP
+  Experimental::HIP::print_configuration(msg, detail);
+#endif
 #ifdef KOKKOS_ENABLE_OPENMP
   OpenMP::print_configuration(msg, detail);
 #endif
@@ -1146,9 +1311,6 @@ void print_configuration(std::ostream& out, const bool detail) {
 #if defined(KOKKOS_ENABLE_THREADS)
   Threads::print_configuration(msg, detail);
 #endif
-#ifdef KOKKOS_ENABLE_QTHREADS
-  Qthreads::print_configuration(msg, detail);
-#endif
 #ifdef KOKKOS_ENABLE_SERIAL
   Serial::print_configuration(msg, detail);
 #endif
diff --git a/kokkos/core/src/impl/Kokkos_EBO.hpp b/kokkos/core/src/impl/Kokkos_EBO.hpp
index fbdaa9d4d..39e855a55 100644
--- a/kokkos/core/src/impl/Kokkos_EBO.hpp
+++ b/kokkos/core/src/impl/Kokkos_EBO.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -117,21 +117,21 @@ struct EBOBaseImpl<T, true, CtorNotOnDevice> {
       : EBOBaseImpl(_constexpr_14_workaround_no_device_tag{},
                     T(std::forward<Args>(args)...)) {}
 
-  KOKKOS_FORCEINLINE_FUNCTION
+  KOKKOS_DEFAULTED_FUNCTION
   constexpr EBOBaseImpl(EBOBaseImpl const&) = default;
 
-  KOKKOS_FORCEINLINE_FUNCTION
+  KOKKOS_DEFAULTED_FUNCTION
   constexpr EBOBaseImpl(EBOBaseImpl&&) = default;
 
-  KOKKOS_FORCEINLINE_FUNCTION
+  KOKKOS_DEFAULTED_FUNCTION
   KOKKOS_CONSTEXPR_14
   EBOBaseImpl& operator=(EBOBaseImpl const&) = default;
 
-  KOKKOS_FORCEINLINE_FUNCTION
+  KOKKOS_DEFAULTED_FUNCTION
   KOKKOS_CONSTEXPR_14
   EBOBaseImpl& operator=(EBOBaseImpl&&) = default;
 
-  KOKKOS_FORCEINLINE_FUNCTION
+  KOKKOS_DEFAULTED_FUNCTION
   ~EBOBaseImpl() = default;
 
   KOKKOS_INLINE_FUNCTION
@@ -184,21 +184,21 @@ struct EBOBaseImpl<T, false, CTorsNotOnDevice> {
 
   // TODO @tasking @minor DSH noexcept in the right places?
 
-  KOKKOS_FORCEINLINE_FUNCTION
+  KOKKOS_DEFAULTED_FUNCTION
   constexpr EBOBaseImpl(EBOBaseImpl const&) = default;
 
-  KOKKOS_FORCEINLINE_FUNCTION
+  KOKKOS_DEFAULTED_FUNCTION
   constexpr EBOBaseImpl(EBOBaseImpl&&) noexcept = default;
 
-  KOKKOS_FORCEINLINE_FUNCTION
+  KOKKOS_DEFAULTED_FUNCTION
   KOKKOS_CONSTEXPR_14
   EBOBaseImpl& operator=(EBOBaseImpl const&) = default;
 
-  KOKKOS_FORCEINLINE_FUNCTION
+  KOKKOS_DEFAULTED_FUNCTION
   KOKKOS_CONSTEXPR_14
   EBOBaseImpl& operator=(EBOBaseImpl&&) = default;
 
-  KOKKOS_FORCEINLINE_FUNCTION
+  KOKKOS_DEFAULTED_FUNCTION
   ~EBOBaseImpl() = default;
 
   KOKKOS_INLINE_FUNCTION
diff --git a/kokkos/core/src/impl/Kokkos_Error.cpp b/kokkos/core/src/impl/Kokkos_Error.cpp
index f456fe756..a42b916f8 100644
--- a/kokkos/core/src/impl/Kokkos_Error.cpp
+++ b/kokkos/core/src/impl/Kokkos_Error.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -129,6 +129,8 @@ void Experimental::RawMemoryAllocationFailure::print_error_message(
       o << "cudaMallocManaged().";
       break;
     case AllocationMechanism::CudaHostAlloc: o << "cudaHostAlloc()."; break;
+    case AllocationMechanism::HIPMalloc: o << "hipMalloc()."; break;
+    case AllocationMechanism::HIPHostMalloc: o << "hipHostMalloc()."; break;
   }
   append_additional_error_information(o);
   o << ")" << std::endl;
diff --git a/kokkos/core/src/impl/Kokkos_Error.hpp b/kokkos/core/src/impl/Kokkos_Error.hpp
index 7bfb961aa..41be6737e 100644
--- a/kokkos/core/src/impl/Kokkos_Error.hpp
+++ b/kokkos/core/src/impl/Kokkos_Error.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -51,6 +51,9 @@
 #ifdef KOKKOS_ENABLE_CUDA
 #include <Cuda/Kokkos_Cuda_abort.hpp>
 #endif
+#ifdef KOKKOS_ENABLE_HIP
+#include <HIP/Kokkos_HIP_Abort.hpp>
+#endif
 
 #ifndef KOKKOS_ABORT_MESSAGE_BUFFER_SIZE
 #define KOKKOS_ABORT_MESSAGE_BUFFER_SIZE 2048
@@ -87,7 +90,9 @@ class RawMemoryAllocationFailure : public std::bad_alloc {
     IntelMMAlloc,
     CudaMalloc,
     CudaMallocManaged,
-    CudaHostAlloc
+    CudaHostAlloc,
+    HIPMalloc,
+    HIPHostMalloc
   };
 
  private:
@@ -124,7 +129,7 @@ class RawMemoryAllocationFailure : public std::bad_alloc {
   const char *what() const noexcept override {
     if (m_failure_mode == FailureMode::OutOfMemoryError) {
       return "Memory allocation error: out of memory";
-    } else if (m_failure_mode == FailureMode::OutOfMemoryError) {
+    } else if (m_failure_mode == FailureMode::AllocationNotAligned) {
       return "Memory allocation error: allocation result was under-aligned";
     }
 
@@ -164,11 +169,11 @@ KOKKOS_INLINE_FUNCTION
 void abort(const char *const message) {
 #if defined(KOKKOS_ENABLE_CUDA) && defined(__CUDA_ARCH__)
   Kokkos::Impl::cuda_abort(message);
-#else
-#if !defined(KOKKOS_ENABLE_OPENMPTARGET) && !defined(__HCC_ACCELERATOR__)
+#elif defined(KOKKOS_ENABLE_HIP) && defined(__HIP_DEVICE_COMPILE__)
+  Kokkos::Impl::hip_abort(message);
+#elif !defined(KOKKOS_ENABLE_OPENMPTARGET) && !defined(__HCC_ACCELERATOR__)
   Kokkos::Impl::host_abort(message);
 #endif
-#endif
 }
 
 }  // namespace Kokkos
diff --git a/kokkos/core/src/impl/Kokkos_ExecPolicy.cpp b/kokkos/core/src/impl/Kokkos_ExecPolicy.cpp
index 0da83f242..eada15fe9 100644
--- a/kokkos/core/src/impl/Kokkos_ExecPolicy.cpp
+++ b/kokkos/core/src/impl/Kokkos_ExecPolicy.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/impl/Kokkos_FixedBufferMemoryPool.hpp b/kokkos/core/src/impl/Kokkos_FixedBufferMemoryPool.hpp
index 8d588d341..2651229a7 100644
--- a/kokkos/core/src/impl/Kokkos_FixedBufferMemoryPool.hpp
+++ b/kokkos/core/src/impl/Kokkos_FixedBufferMemoryPool.hpp
@@ -23,10 +23,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -126,18 +126,19 @@ class FixedBlockSizeMemoryPool
                            actual_size) { /* forwarding ctor, must be empty */
   }
 
-  KOKKOS_INLINE_FUNCTION FixedBlockSizeMemoryPool() = default;
-  KOKKOS_INLINE_FUNCTION FixedBlockSizeMemoryPool(FixedBlockSizeMemoryPool&&) =
-      default;
-  KOKKOS_INLINE_FUNCTION FixedBlockSizeMemoryPool(
-      FixedBlockSizeMemoryPool const&)                     = default;
-  KOKKOS_INLINE_FUNCTION FixedBlockSizeMemoryPool& operator=(
+  KOKKOS_DEFAULTED_FUNCTION FixedBlockSizeMemoryPool() = default;
+  KOKKOS_DEFAULTED_FUNCTION FixedBlockSizeMemoryPool(
       FixedBlockSizeMemoryPool&&) = default;
-  KOKKOS_INLINE_FUNCTION FixedBlockSizeMemoryPool& operator=(
+  KOKKOS_DEFAULTED_FUNCTION FixedBlockSizeMemoryPool(
+      FixedBlockSizeMemoryPool const&)                        = default;
+  KOKKOS_DEFAULTED_FUNCTION FixedBlockSizeMemoryPool& operator=(
+      FixedBlockSizeMemoryPool&&) = default;
+  KOKKOS_DEFAULTED_FUNCTION FixedBlockSizeMemoryPool& operator=(
       FixedBlockSizeMemoryPool const&) = default;
 
   KOKKOS_INLINE_FUNCTION
   void* allocate(size_type alloc_size) const noexcept {
+    (void)alloc_size;
     KOKKOS_EXPECTS(alloc_size <= Size);
     auto free_idx_counter = Kokkos::atomic_fetch_add(
         (volatile size_type*)&m_first_free_idx, size_type(1));
@@ -161,7 +162,7 @@ class FixedBlockSizeMemoryPool
   }
 
   KOKKOS_INLINE_FUNCTION
-  void deallocate(void* ptr, size_type alloc_size) const noexcept {
+  void deallocate(void* ptr, size_type /*alloc_size*/) const noexcept {
     // figure out which block we are
     auto offset = intptr_t(ptr) - intptr_t(m_first_block);
 
@@ -250,11 +251,11 @@ class FixedBlockSizeChaseLevMemoryPool
   ) : FixedBlockSizeMemoryPool(mem_space, mempool_capacity / actual_size)
   { /* forwarding ctor, must be empty */ }
 
-  KOKKOS_INLINE_FUNCTION FixedBlockSizeMemoryPool() = default;
-  KOKKOS_INLINE_FUNCTION FixedBlockSizeMemoryPool(FixedBlockSizeMemoryPool&&) = default;
-  KOKKOS_INLINE_FUNCTION FixedBlockSizeMemoryPool(FixedBlockSizeMemoryPool const&) = default;
-  KOKKOS_INLINE_FUNCTION FixedBlockSizeMemoryPool& operator=(FixedBlockSizeMemoryPool&&) = default;
-  KOKKOS_INLINE_FUNCTION FixedBlockSizeMemoryPool& operator=(FixedBlockSizeMemoryPool const&) = default;
+  KOKKOS_DEFAULTED_FUNCTION FixedBlockSizeMemoryPool() = default;
+  KOKKOS_DEFAULTED_FUNCTION FixedBlockSizeMemoryPool(FixedBlockSizeMemoryPool&&) = default;
+  KOKKOS_DEFAULTED_FUNCTION FixedBlockSizeMemoryPool(FixedBlockSizeMemoryPool const&) = default;
+  KOKKOS_DEFAULTED_FUNCTION FixedBlockSizeMemoryPool& operator=(FixedBlockSizeMemoryPool&&) = default;
+  KOKKOS_DEFAULTED_FUNCTION FixedBlockSizeMemoryPool& operator=(FixedBlockSizeMemoryPool const&) = default;
 
 
   KOKKOS_INLINE_FUNCTION
diff --git a/kokkos/core/src/impl/Kokkos_FunctorAdapter.hpp b/kokkos/core/src/impl/Kokkos_FunctorAdapter.hpp
index 7ff2da461..b777dac02 100644
--- a/kokkos/core/src/impl/Kokkos_FunctorAdapter.hpp
+++ b/kokkos/core/src/impl/Kokkos_FunctorAdapter.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -64,7 +64,7 @@ struct ReduceFunctorHasInit {
 template <class FunctorType>
 struct ReduceFunctorHasInit<
     FunctorType,
-    typename Impl::enable_if<0 < sizeof(&FunctorType::init)>::type> {
+    typename std::enable_if<0 < sizeof(&FunctorType::init)>::type> {
   enum { value = true };
 };
 
@@ -76,7 +76,7 @@ struct ReduceFunctorHasJoin {
 template <class FunctorType>
 struct ReduceFunctorHasJoin<
     FunctorType,
-    typename Impl::enable_if<0 < sizeof(&FunctorType::join)>::type> {
+    typename std::enable_if<0 < sizeof(&FunctorType::join)>::type> {
   enum { value = true };
 };
 
@@ -88,7 +88,7 @@ struct ReduceFunctorHasFinal {
 template <class FunctorType>
 struct ReduceFunctorHasFinal<
     FunctorType,
-    typename Impl::enable_if<0 < sizeof(&FunctorType::final)>::type> {
+    typename std::enable_if<0 < sizeof(&FunctorType::final)>::type> {
   enum { value = true };
 };
 
@@ -100,18 +100,18 @@ struct ReduceFunctorHasShmemSize {
 template <class FunctorType>
 struct ReduceFunctorHasShmemSize<
     FunctorType,
-    typename Impl::enable_if<0 < sizeof(&FunctorType::team_shmem_size)>::type> {
+    typename std::enable_if<0 < sizeof(&FunctorType::team_shmem_size)>::type> {
   enum { value = true };
 };
 
 template <class FunctorType, class ArgTag, class Enable = void>
-struct FunctorDeclaresValueType : public Impl::false_type {};
+struct FunctorDeclaresValueType : public std::false_type {};
 
 template <class FunctorType, class ArgTag>
 struct FunctorDeclaresValueType<
     FunctorType, ArgTag,
     typename Impl::enable_if_type<typename FunctorType::value_type>::type>
-    : public Impl::true_type {};
+    : public std::true_type {};
 
 template <class FunctorType,
           bool Enable = (FunctorDeclaresValueType<FunctorType, void>::value) ||
@@ -174,18 +174,19 @@ struct FunctorValueTraits<void, ArgTag, false> {
 template <class FunctorType, class ArgTag>
 struct FunctorValueTraits<FunctorType, ArgTag,
                           true /* == exists FunctorType::value_type */> {
-  typedef typename Impl::remove_extent<typename FunctorType::value_type>::type
+  typedef typename std::remove_extent<typename FunctorType::value_type>::type
       value_type;
   typedef FunctorType functor_type;
 
-  static_assert(0 == (sizeof(value_type) % sizeof(int)),
+  static_assert((sizeof(value_type) < sizeof(int)) ||
+                    0 == (sizeof(value_type) % sizeof(int)),
                 "Reduction functor's declared value_type requires: 0 == "
                 "sizeof(value_type) % sizeof(int)");
 
   /* this cast to bool is needed for correctness by NVCC */
   enum : bool {
     IsArray = static_cast<bool>(
-        Impl::is_array<typename FunctorType::value_type>::value)
+        std::is_array<typename FunctorType::value_type>::value)
   };
 
   // If not an array then what is the sizeof(value_type)
@@ -202,8 +203,8 @@ struct FunctorValueTraits<FunctorType, ArgTag,
   // Number of values if single value
   template <class F>
   KOKKOS_FORCEINLINE_FUNCTION static
-      typename Impl::enable_if<std::is_same<F, FunctorType>::value && !IsArray,
-                               unsigned>::type
+      typename std::enable_if<std::is_same<F, FunctorType>::value && !IsArray,
+                              unsigned>::type
       value_count(const F&) {
     return 1;
   }
@@ -213,8 +214,8 @@ struct FunctorValueTraits<FunctorType, ArgTag,
   // be an array.
   template <class F>
   KOKKOS_FORCEINLINE_FUNCTION static
-      typename Impl::enable_if<std::is_same<F, FunctorType>::value && IsArray,
-                               unsigned>::type
+      typename std::enable_if<std::is_same<F, FunctorType>::value && IsArray,
+                              unsigned>::type
       value_count(const F& f) {
     return f.value_count;
   }
@@ -1412,8 +1413,10 @@ struct FunctorValueInit<
     // First  substitution failure when FunctorType::init does not exist.
     // Second substitution failure when FunctorType::init is not compatible.
     ,
-    decltype(FunctorValueInitFunction<FunctorType, ArgTag>::enable_if(
-        &FunctorType::init))> {
+    typename std::enable_if<
+        !std::is_same<ArgTag, void>::value,
+        decltype(FunctorValueInitFunction<FunctorType, ArgTag>::enable_if(
+            &FunctorType::init))>::type> {
   KOKKOS_FORCEINLINE_FUNCTION static T& init(const FunctorType& f, void* p) {
     f.init(ArgTag(), *((T*)p));
     return *((T*)p);
@@ -1428,8 +1431,10 @@ struct FunctorValueInit<
     // First  substitution failure when FunctorType::init does not exist.
     // Second substitution failure when FunctorType::init is not compatible
     ,
-    decltype(FunctorValueInitFunction<FunctorType, ArgTag>::enable_if(
-        &FunctorType::init))> {
+    typename std::enable_if<
+        !std::is_same<ArgTag, void>::value,
+        decltype(FunctorValueInitFunction<FunctorType, ArgTag>::enable_if(
+            &FunctorType::init))>::type> {
   KOKKOS_FORCEINLINE_FUNCTION static T* init(const FunctorType& f, void* p) {
     f.init(ArgTag(), (T*)p);
     return (T*)p;
@@ -1525,7 +1530,7 @@ struct FunctorValueJoin<FunctorType, ArgTag, T&, Enable> {
   KOKKOS_FORCEINLINE_FUNCTION
   FunctorValueJoin(const FunctorType&) {}
 
-  KOKKOS_FORCEINLINE_FUNCTION static void join(const FunctorType& f,
+  KOKKOS_FORCEINLINE_FUNCTION static void join(const FunctorType& /*f*/,
                                                volatile void* const lhs,
                                                const volatile void* const rhs) {
     *((volatile T*)lhs) += *((const volatile T*)rhs);
@@ -1760,8 +1765,8 @@ template <typename ValueType>
 struct JoinAdd {
   typedef ValueType value_type;
 
-  KOKKOS_INLINE_FUNCTION
-  JoinAdd() {}
+  KOKKOS_DEFAULTED_FUNCTION
+  JoinAdd() = default;
 
   KOKKOS_INLINE_FUNCTION
   void join(volatile value_type& dst, const volatile value_type& src) const {
diff --git a/kokkos/core/src/impl/Kokkos_FunctorAnalysis.hpp b/kokkos/core/src/impl/Kokkos_FunctorAnalysis.hpp
index 1cc1a2545..827a9f346 100644
--- a/kokkos/core/src/impl/Kokkos_FunctorAnalysis.hpp
+++ b/kokkos/core/src/impl/Kokkos_FunctorAnalysis.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -797,7 +797,7 @@ struct FunctorAnalysis {
     using rebind = Reducer<S>;
 
     KOKKOS_INLINE_FUNCTION explicit constexpr Reducer(
-        Functor const* arg_functor = 0, ValueType* arg_value = 0) noexcept
+        Functor const* arg_functor = 0, ValueType* arg_value = nullptr) noexcept
         : m_functor(arg_functor), m_result(arg_value) {}
   };
 };
diff --git a/kokkos/core/src/impl/Kokkos_HBWSpace.cpp b/kokkos/core/src/impl/Kokkos_HBWSpace.cpp
index 28318d652..9b5bee227 100644
--- a/kokkos/core/src/impl/Kokkos_HBWSpace.cpp
+++ b/kokkos/core/src/impl/Kokkos_HBWSpace.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -136,8 +136,8 @@ void *HBWSpace::allocate(const size_t arg_alloc_size) const {
       case STD_MALLOC: msg << "STD_MALLOC"; break;
     }
     msg << " ]( " << arg_alloc_size << " ) FAILED";
-    if (ptr == NULL) {
-      msg << " NULL";
+    if (ptr == nullptr) {
+      msg << " nullptr";
     } else {
       msg << " NOT ALIGNED " << ptr;
     }
@@ -181,7 +181,12 @@ void SharedAllocationRecord<Kokkos::Experimental::HBWSpace, void>::deallocate(
 }
 
 SharedAllocationRecord<Kokkos::Experimental::HBWSpace,
-                       void>::~SharedAllocationRecord() {
+                       void>::~SharedAllocationRecord()
+#if defined( \
+    KOKKOS_IMPL_INTEL_WORKAROUND_NOEXCEPT_SPECIFICATION_VIRTUAL_FUNCTION)
+    noexcept
+#endif
+{
 #if defined(KOKKOS_ENABLE_PROFILING)
   if (Kokkos::Profiling::profileLibraryLoaded()) {
     Kokkos::Profiling::deallocateData(
diff --git a/kokkos/core/src/impl/Kokkos_HostBarrier.cpp b/kokkos/core/src/impl/Kokkos_HostBarrier.cpp
index eb0a6df7a..55d70985d 100644
--- a/kokkos/core/src/impl/Kokkos_HostBarrier.cpp
+++ b/kokkos/core/src/impl/Kokkos_HostBarrier.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -92,7 +92,7 @@ void HostBarrier::impl_backoff_wait_until_equal(
 #endif
   }
 #else  // _WIN32
-  while (!try_wait()) {
+  while (!test_equal(ptr, v)) {
 #if defined(KOKKOS_ENABLE_ASM)
     for (int j = 0; j < num_nops; ++j) {
       __asm__ __volatile__("nop\n");
diff --git a/kokkos/core/src/impl/Kokkos_HostBarrier.hpp b/kokkos/core/src/impl/Kokkos_HostBarrier.hpp
index 14a53f323..4b9235ab7 100644
--- a/kokkos/core/src/impl/Kokkos_HostBarrier.hpp
+++ b/kokkos/core/src/impl/Kokkos_HostBarrier.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -70,7 +70,7 @@ namespace Impl {
 //    called split_release
 //
 // The purporse of the split functions is to allow the last thread to arrive
-// an opprotunity to perform some actions before releasing the waiting threads
+// an opportunity to perform some actions before releasing the waiting threads
 //
 // If all threads have arrived (and split_release has been call if using
 // split_arrive) before a wait type call, the wait may return quickly
@@ -235,6 +235,7 @@ class HostBarrier {
       impl_backoff_wait_until_equal(ptr, v, active_wait);
     }
 #else
+    (void)active_wait;
     while (!test_equal(ptr, v)) {
     }
 #endif
diff --git a/kokkos/core/src/impl/Kokkos_HostSpace.cpp b/kokkos/core/src/impl/Kokkos_HostSpace.cpp
index e77736ddb..59d14e539 100644
--- a/kokkos/core/src/impl/Kokkos_HostSpace.cpp
+++ b/kokkos/core/src/impl/Kokkos_HostSpace.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -221,18 +221,19 @@ void *HostSpace::allocate(const size_t arg_alloc_size) const {
 
       // read write access to private memory
 
-      ptr = mmap(NULL /* address hint, if NULL OS kernel chooses address */
-                 ,
-                 arg_alloc_size /* size in bytes */
-                 ,
-                 prot /* memory protection */
-                 ,
-                 flags /* visibility of updates */
-                 ,
-                 -1 /* file descriptor */
-                 ,
-                 0 /* offset */
-      );
+      ptr =
+          mmap(nullptr /* address hint, if nullptr OS kernel chooses address */
+               ,
+               arg_alloc_size /* size in bytes */
+               ,
+               prot /* memory protection */
+               ,
+               flags /* visibility of updates */
+               ,
+               -1 /* file descriptor */
+               ,
+               0 /* offset */
+          );
 
       /* Associated reallocation:
              ptr = mremap( old_ptr , old_size , new_size , MREMAP_MAYMOVE );
@@ -325,7 +326,12 @@ void SharedAllocationRecord<Kokkos::HostSpace, void>::deallocate(
   delete static_cast<SharedAllocationRecord *>(arg_rec);
 }
 
-SharedAllocationRecord<Kokkos::HostSpace, void>::~SharedAllocationRecord() {
+SharedAllocationRecord<Kokkos::HostSpace, void>::~SharedAllocationRecord()
+#if defined( \
+    KOKKOS_IMPL_INTEL_WORKAROUND_NOEXCEPT_SPECIFICATION_VIRTUAL_FUNCTION)
+    noexcept
+#endif
+{
 #if defined(KOKKOS_ENABLE_PROFILING)
   if (Kokkos::Profiling::profileLibraryLoaded()) {
     Kokkos::Profiling::deallocateData(
@@ -397,7 +403,7 @@ SharedAllocationRecord<Kokkos::HostSpace, void>::SharedAllocationRecord(
 void *SharedAllocationRecord<Kokkos::HostSpace, void>::allocate_tracked(
     const Kokkos::HostSpace &arg_space, const std::string &arg_alloc_label,
     const size_t arg_alloc_size) {
-  if (!arg_alloc_size) return (void *)nullptr;
+  if (!arg_alloc_size) return nullptr;
 
   SharedAllocationRecord *const r =
       allocate(arg_space, arg_alloc_label, arg_alloc_size);
@@ -409,7 +415,7 @@ void *SharedAllocationRecord<Kokkos::HostSpace, void>::allocate_tracked(
 
 void SharedAllocationRecord<Kokkos::HostSpace, void>::deallocate_tracked(
     void *const arg_alloc_ptr) {
-  if (arg_alloc_ptr != 0) {
+  if (arg_alloc_ptr != nullptr) {
     SharedAllocationRecord *const r = get_record(arg_alloc_ptr);
 
     RecordBase::decrement(r);
@@ -437,9 +443,9 @@ SharedAllocationRecord<Kokkos::HostSpace, void>::get_record(void *alloc_ptr) {
   typedef SharedAllocationRecord<Kokkos::HostSpace, void> RecordHost;
 
   SharedAllocationHeader const *const head =
-      alloc_ptr ? Header::get_header(alloc_ptr) : (SharedAllocationHeader *)0;
+      alloc_ptr ? Header::get_header(alloc_ptr) : nullptr;
   RecordHost *const record =
-      head ? static_cast<RecordHost *>(head->m_record) : (RecordHost *)0;
+      head ? static_cast<RecordHost *>(head->m_record) : nullptr;
 
   if (!alloc_ptr || record->m_alloc_ptr != head) {
     Kokkos::Impl::throw_runtime_exception(
diff --git a/kokkos/core/src/impl/Kokkos_HostSpace_deepcopy.cpp b/kokkos/core/src/impl/Kokkos_HostSpace_deepcopy.cpp
index e5bb2b369..35eee40ab 100644
--- a/kokkos/core/src/impl/Kokkos_HostSpace_deepcopy.cpp
+++ b/kokkos/core/src/impl/Kokkos_HostSpace_deepcopy.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/impl/Kokkos_HostSpace_deepcopy.hpp b/kokkos/core/src/impl/Kokkos_HostSpace_deepcopy.hpp
index f04b1721b..e9e0ef52a 100644
--- a/kokkos/core/src/impl/Kokkos_HostSpace_deepcopy.hpp
+++ b/kokkos/core/src/impl/Kokkos_HostSpace_deepcopy.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/impl/Kokkos_HostThreadTeam.cpp b/kokkos/core/src/impl/Kokkos_HostThreadTeam.cpp
index 62673fee0..2e5587e4a 100644
--- a/kokkos/core/src/impl/Kokkos_HostThreadTeam.cpp
+++ b/kokkos/core/src/impl/Kokkos_HostThreadTeam.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -62,7 +62,8 @@ void HostThreadTeamData::organize_pool(HostThreadTeamData *members[],
 
   // Verify not already a member of a pool:
   for (int rank = 0; rank < size && ok; ++rank) {
-    ok = (nullptr != members[rank]) && (0 == members[rank]->m_pool_scratch);
+    ok = (nullptr != members[rank]) &&
+         (nullptr == members[rank]->m_pool_scratch);
   }
 
   if (ok) {
@@ -106,8 +107,8 @@ void HostThreadTeamData::organize_pool(HostThreadTeamData *members[],
 void HostThreadTeamData::disband_pool() {
   m_work_range.first     = -1;
   m_work_range.second    = -1;
-  m_pool_scratch         = 0;
-  m_team_scratch         = 0;
+  m_pool_scratch         = nullptr;
+  m_team_scratch         = nullptr;
   m_pool_rank            = 0;
   m_pool_size            = 1;
   m_team_base            = 0;
@@ -121,7 +122,7 @@ void HostThreadTeamData::disband_pool() {
 
 int HostThreadTeamData::organize_team(const int team_size) {
   // Pool is initialized
-  const bool ok_pool = 0 != m_pool_scratch;
+  const bool ok_pool = nullptr != m_pool_scratch;
 
   // Team is not set
   const bool ok_team =
@@ -240,7 +241,7 @@ int HostThreadTeamData::get_work_stealing() noexcept {
       HostThreadTeamData *const *const pool =
           (HostThreadTeamData **)(m_pool_scratch + m_pool_members);
 
-      // Attempt from begining failed, try to steal from end of neighbor
+      // Attempt from beginning failed, try to steal from end of neighbor
 
       pair_int_t volatile *steal_range = &(pool[m_steal_rank]->m_work_range);
 
diff --git a/kokkos/core/src/impl/Kokkos_HostThreadTeam.hpp b/kokkos/core/src/impl/Kokkos_HostThreadTeam.hpp
index b48b53caf..9e4dda941 100644
--- a/kokkos/core/src/impl/Kokkos_HostThreadTeam.hpp
+++ b/kokkos/core/src/impl/Kokkos_HostThreadTeam.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -53,7 +53,8 @@
 #include <impl/Kokkos_FunctorAnalysis.hpp>
 #include <impl/Kokkos_HostBarrier.hpp>
 
-#include <limits>  // std::numeric_limits
+#include <limits>     // std::numeric_limits
+#include <algorithm>  // std::max
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
@@ -188,9 +189,9 @@ class HostThreadTeamData {
   constexpr HostThreadTeamData() noexcept
       : m_work_range(-1, -1),
         m_work_end(0),
-        m_scratch(0),
-        m_pool_scratch(0),
-        m_team_scratch(0),
+        m_scratch(nullptr),
+        m_pool_scratch(nullptr),
+        m_team_scratch(nullptr),
         m_pool_rank(0),
         m_pool_size(1),
         m_team_reduce(0),
@@ -538,6 +539,8 @@ class HostThreadTeamMember {
   }
 #else
   {
+    (void)value;
+    (void)source_team_rank;
     Kokkos::abort("HostThreadTeamMember team_broadcast\n");
   }
 #endif
@@ -574,6 +577,9 @@ class HostThreadTeamMember {
   }
 #else
   {
+    (void)f;
+    (void)value;
+    (void)source_team_rank;
     Kokkos::abort("HostThreadTeamMember team_broadcast\n");
   }
 #endif
@@ -640,6 +646,8 @@ class HostThreadTeamMember {
   }
 #else
   {
+    (void)reducer;
+    (void)contribution;
     Kokkos::abort("HostThreadTeamMember team_reduce\n");
   }
 #endif
@@ -693,8 +701,8 @@ class HostThreadTeamMember {
 #endif*/
 
   template <typename T>
-  KOKKOS_INLINE_FUNCTION T team_scan(T const& value, T* const global = 0) const
-      noexcept
+  KOKKOS_INLINE_FUNCTION T team_scan(T const& value,
+                                     T* const global = nullptr) const noexcept
 #if defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST)
   {
     if (0 != m_data.m_team_rank) {
@@ -751,6 +759,8 @@ class HostThreadTeamMember {
   }
 #else
   {
+    (void)value;
+    (void)global;
     Kokkos::abort("HostThreadTeamMember team_scan\n");
     return T();
   }
diff --git a/kokkos/core/src/impl/Kokkos_LIFO.hpp b/kokkos/core/src/impl/Kokkos_LIFO.hpp
index e6a5e1958..683c5c9b1 100644
--- a/kokkos/core/src/impl/Kokkos_LIFO.hpp
+++ b/kokkos/core/src/impl/Kokkos_LIFO.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -48,8 +48,7 @@
 #define KOKKOS_IMPL_LIFO_HPP
 
 #include <Kokkos_Macros.hpp>
-#ifdef KOKKOS_ENABLE_TASKDAG  // Note: implies CUDA_VERSION >= 8000 if using
-                              // CUDA
+#ifdef KOKKOS_ENABLE_TASKDAG
 
 #include <Kokkos_Core_fwd.hpp>
 
@@ -305,7 +304,7 @@ class SingleConsumeOperationLIFO : private LockBasedLIFOCommon<T> {
  public:
   using value_type = typename base_t::value_type;  // = T
 
-  KOKKOS_INLINE_FUNCTION
+  KOKKOS_DEFAULTED_FUNCTION
   SingleConsumeOperationLIFO() noexcept = default;
 
   SingleConsumeOperationLIFO(SingleConsumeOperationLIFO const&) = delete;
@@ -314,7 +313,7 @@ class SingleConsumeOperationLIFO : private LockBasedLIFOCommon<T> {
       delete;
   SingleConsumeOperationLIFO& operator=(SingleConsumeOperationLIFO&&) = delete;
 
-  KOKKOS_INLINE_FUNCTION
+  KOKKOS_DEFAULTED_FUNCTION
   ~SingleConsumeOperationLIFO() = default;
 
   KOKKOS_INLINE_FUNCTION
diff --git a/kokkos/core/src/impl/Kokkos_LinkedListNode.hpp b/kokkos/core/src/impl/Kokkos_LinkedListNode.hpp
index 2a49f5e02..79aeca5da 100644
--- a/kokkos/core/src/impl/Kokkos_LinkedListNode.hpp
+++ b/kokkos/core/src/impl/Kokkos_LinkedListNode.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -48,8 +48,7 @@
 #define KOKKOS_IMPL_LINKEDLISTNODE_HPP
 
 #include <Kokkos_Macros.hpp>
-#ifdef KOKKOS_ENABLE_TASKDAG  // Note: implies CUDA_VERSION >= 8000 if using
-                              // CUDA
+#ifdef KOKKOS_ENABLE_TASKDAG
 
 #include <Kokkos_Core_fwd.hpp>
 
diff --git a/kokkos/core/src/impl/Kokkos_MemoryPool.cpp b/kokkos/core/src/impl/Kokkos_MemoryPool.cpp
index f6a61aec2..d48368f76 100644
--- a/kokkos/core/src/impl/Kokkos_MemoryPool.cpp
+++ b/kokkos/core/src/impl/Kokkos_MemoryPool.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/impl/Kokkos_MemoryPoolAllocator.hpp b/kokkos/core/src/impl/Kokkos_MemoryPoolAllocator.hpp
index e57581797..221840576 100644
--- a/kokkos/core/src/impl/Kokkos_MemoryPoolAllocator.hpp
+++ b/kokkos/core/src/impl/Kokkos_MemoryPoolAllocator.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -65,17 +65,17 @@ class MemoryPoolAllocator {
   memory_pool m_pool;
 
  public:
-  KOKKOS_INLINE_FUNCTION
+  KOKKOS_DEFAULTED_FUNCTION
   MemoryPoolAllocator() = default;
-  KOKKOS_INLINE_FUNCTION
+  KOKKOS_DEFAULTED_FUNCTION
   MemoryPoolAllocator(MemoryPoolAllocator const&) = default;
-  KOKKOS_INLINE_FUNCTION
+  KOKKOS_DEFAULTED_FUNCTION
   MemoryPoolAllocator(MemoryPoolAllocator&&) = default;
-  KOKKOS_INLINE_FUNCTION
+  KOKKOS_DEFAULTED_FUNCTION
   MemoryPoolAllocator& operator=(MemoryPoolAllocator const&) = default;
-  KOKKOS_INLINE_FUNCTION
+  KOKKOS_DEFAULTED_FUNCTION
   MemoryPoolAllocator& operator=(MemoryPoolAllocator&&) = default;
-  KOKKOS_INLINE_FUNCTION
+  KOKKOS_DEFAULTED_FUNCTION
   ~MemoryPoolAllocator() = default;
 
   KOKKOS_INLINE_FUNCTION
diff --git a/kokkos/core/src/impl/Kokkos_MemorySpace.hpp b/kokkos/core/src/impl/Kokkos_MemorySpace.hpp
index 8054bf0d8..650cf8a70 100644
--- a/kokkos/core/src/impl/Kokkos_MemorySpace.hpp
+++ b/kokkos/core/src/impl/Kokkos_MemorySpace.hpp
@@ -23,10 +23,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/impl/Kokkos_Memory_Fence.hpp b/kokkos/core/src/impl/Kokkos_Memory_Fence.hpp
index 2c975aea8..eae14a92d 100644
--- a/kokkos/core/src/impl/Kokkos_Memory_Fence.hpp
+++ b/kokkos/core/src/impl/Kokkos_Memory_Fence.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -55,6 +55,8 @@ void memory_fence() {
   __threadfence();
 #elif defined(KOKKOS_ENABLE_ROCM_ATOMICS)
   amp_barrier(CLK_LOCAL_MEM_FENCE | CLK_GLOBAL_MEM_FENCE);
+#elif defined(KOKKOS_ENABLE_HIP_ATOMICS)
+  __threadfence();
 #elif defined(KOKKOS_ENABLE_ASM) && defined(KOKKOS_ENABLE_ISA_X86_64)
   asm volatile("mfence" ::: "memory");
 #elif defined(KOKKOS_ENABLE_GNU_ATOMICS) || \
diff --git a/kokkos/core/src/impl/Kokkos_MultipleTaskQueue.hpp b/kokkos/core/src/impl/Kokkos_MultipleTaskQueue.hpp
index a3b792722..fe78cfbac 100644
--- a/kokkos/core/src/impl/Kokkos_MultipleTaskQueue.hpp
+++ b/kokkos/core/src/impl/Kokkos_MultipleTaskQueue.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -125,7 +125,7 @@ struct MultipleTaskQueueTeamEntry {
   KOKKOS_INLINE_FUNCTION OptionalRef<task_base_type> _pop_failed_insertion(
       int priority, TaskType type,
       typename std::enable_if<
-          task_queue_traits::ready_queue_insertion_may_fail and
+          task_queue_traits::ready_queue_insertion_may_fail &&
               std::is_void<_always_void>::value,
           void*>::type = nullptr) {
     auto* rv_ptr = m_failed_heads[priority][(int)type];
@@ -142,9 +142,9 @@ struct MultipleTaskQueueTeamEntry {
 
   template <class _always_void = void>
   KOKKOS_INLINE_FUNCTION OptionalRef<task_base_type> _pop_failed_insertion(
-      int priority, TaskType type,
+      int /*priority*/, TaskType /*type*/,
       typename std::enable_if<
-          not task_queue_traits::ready_queue_insertion_may_fail and
+          !task_queue_traits::ready_queue_insertion_may_fail &&
               std::is_void<_always_void>::value,
           void*>::type = nullptr) {
     return OptionalRef<task_base_type>{nullptr};
@@ -181,13 +181,13 @@ struct MultipleTaskQueueTeamEntry {
     auto return_value = OptionalRef<task_base_type>{};
     for (int i_priority = 0; i_priority < NumPriorities; ++i_priority) {
       return_value = _pop_failed_insertion(i_priority, TaskTeam);
-      if (not return_value)
+      if (!return_value)
         return_value = m_ready_queues[i_priority][TaskTeam].pop();
       if (return_value) return return_value;
 
       // Check for a single task with this priority
       return_value = _pop_failed_insertion(i_priority, TaskSingle);
-      if (not return_value)
+      if (!return_value)
         return_value = m_ready_queues[i_priority][TaskSingle].pop();
       if (return_value) return return_value;
     }
@@ -203,7 +203,7 @@ struct MultipleTaskQueueTeamEntry {
   KOKKOS_INLINE_FUNCTION void do_handle_failed_insertion(
       runnable_task_base_type&& task,
       typename std::enable_if<
-          task_queue_traits::ready_queue_insertion_may_fail and
+          task_queue_traits::ready_queue_insertion_may_fail &&
               std::is_void<_always_void>::value,
           void*>::type = nullptr) {
     // failed insertions, if they happen, must be from the only thread that
@@ -217,9 +217,9 @@ struct MultipleTaskQueueTeamEntry {
 
   template <class _always_void = void>
   KOKKOS_INLINE_FUNCTION void do_handle_failed_insertion(
-      runnable_task_base_type&& task,
+      runnable_task_base_type&& /*task*/,
       typename std::enable_if<
-          not task_queue_traits::ready_queue_insertion_may_fail and
+          !task_queue_traits::ready_queue_insertion_may_fail &&
               std::is_void<_always_void>::value,
           void*>::type = nullptr) {
     Kokkos::abort("should be unreachable!");
@@ -229,7 +229,7 @@ struct MultipleTaskQueueTeamEntry {
   KOKKOS_INLINE_FUNCTION void flush_failed_insertions(
       int priority, int task_type,
       typename std::enable_if<
-          task_queue_traits::ready_queue_insertion_may_fail and
+          task_queue_traits::ready_queue_insertion_may_fail &&
               std::is_void<_always_void>::value,  // just to make this dependent
                                                   // on template parameter
           int>::type = 0) {
@@ -258,7 +258,7 @@ struct MultipleTaskQueueTeamEntry {
   KOKKOS_INLINE_FUNCTION void flush_failed_insertions(
       int, int,
       typename std::enable_if<
-          not task_queue_traits::ready_queue_insertion_may_fail and
+          !task_queue_traits::ready_queue_insertion_may_fail &&
               std::is_void<_always_void>::value,  // just to make this dependent
                                                   // on template parameter
           int>::type = 0) {}
@@ -335,22 +335,22 @@ class MultipleTaskQueue final
     constexpr explicit SchedulerInfo(team_queue_id_t association) noexcept
         : team_association(association) {}
 
-    KOKKOS_INLINE_FUNCTION
+    KOKKOS_DEFAULTED_FUNCTION
     SchedulerInfo() = default;
 
-    KOKKOS_INLINE_FUNCTION
+    KOKKOS_DEFAULTED_FUNCTION
     SchedulerInfo(SchedulerInfo const&) = default;
 
-    KOKKOS_INLINE_FUNCTION
+    KOKKOS_DEFAULTED_FUNCTION
     SchedulerInfo(SchedulerInfo&&) = default;
 
-    KOKKOS_INLINE_FUNCTION
+    KOKKOS_DEFAULTED_FUNCTION
     SchedulerInfo& operator=(SchedulerInfo const&) = default;
 
-    KOKKOS_INLINE_FUNCTION
+    KOKKOS_DEFAULTED_FUNCTION
     SchedulerInfo& operator=(SchedulerInfo&&) = default;
 
-    KOKKOS_INLINE_FUNCTION
+    KOKKOS_DEFAULTED_FUNCTION
     ~SchedulerInfo() = default;
   };
 
@@ -438,7 +438,7 @@ class MultipleTaskQueue final
 
     return_value = team_queue_info.pop_ready_task();
 
-    if (not return_value) {
+    if (!return_value) {
       // loop through the rest of the teams and try to steal
       for (auto isteal = (team_association + 1) % this->n_queues();
            isteal != team_association;
@@ -484,32 +484,32 @@ class MultipleTaskQueue final
   // Provide a sensible default that can be overridden
   KOKKOS_INLINE_FUNCTION
   void update_scheduling_info_from_completed_predecessor(
-      runnable_task_base_type& ready_task,
-      runnable_task_base_type const& predecessor) const {
+      runnable_task_base_type& /*ready_task*/,
+      runnable_task_base_type const& /*predecessor*/) const {
     // Do nothing; we're using the extra storage for the failure linked list
   }
 
   // Provide a sensible default that can be overridden
   KOKKOS_INLINE_FUNCTION
   void update_scheduling_info_from_completed_predecessor(
-      aggregate_task_type& aggregate,
-      runnable_task_base_type const& predecessor) const {
+      aggregate_task_type& /*aggregate*/,
+      runnable_task_base_type const& /*predecessor*/) const {
     // Do nothing; we're using the extra storage for the failure linked list
   }
 
   // Provide a sensible default that can be overridden
   KOKKOS_INLINE_FUNCTION
   void update_scheduling_info_from_completed_predecessor(
-      aggregate_task_type& aggregate,
-      aggregate_task_type const& predecessor) const {
+      aggregate_task_type& /*aggregate*/,
+      aggregate_task_type const& /*predecessor*/) const {
     // Do nothing; we're using the extra storage for the failure linked list
   }
 
   // Provide a sensible default that can be overridden
   KOKKOS_INLINE_FUNCTION
   void update_scheduling_info_from_completed_predecessor(
-      runnable_task_base_type& ready_task,
-      aggregate_task_type const& predecessor) const {
+      runnable_task_base_type& /*ready_task*/,
+      aggregate_task_type const& /*predecessor*/) const {
     // Do nothing; we're using the extra storage for the failure linked list
   }
 
diff --git a/kokkos/core/src/impl/Kokkos_OldMacros.hpp b/kokkos/core/src/impl/Kokkos_OldMacros.hpp
index d3de3861b..fbb921d7f 100644
--- a/kokkos/core/src/impl/Kokkos_OldMacros.hpp
+++ b/kokkos/core/src/impl/Kokkos_OldMacros.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -245,12 +245,6 @@
 #endif
 #endif
 
-#ifdef KOKKOS_HAVE_QTHREADS
-#ifndef KOKKOS_ENABLE_QTHREADS
-#define KOKKOS_ENABLE_QTHREADS KOKKOS_HAVE_QTHREADS
-#endif
-#endif
-
 #ifdef KOKKOS_HAVE_SERIAL
 #ifndef KOKKOS_ENABLE_SERIAL
 #define KOKKOS_ENABLE_SERIAL KOKKOS_HAVE_SERIAL
@@ -474,10 +468,6 @@
 #define KOKKOS_HAVE_PTHREAD 1
 #endif
 
-#if (!defined(KOKKOS_HAVE_QTHREADS)) && defined(KOKKOS_ENABLE_QTHREADS)
-#define KOKKOS_HAVE_QTHREADS 1
-#endif
-
 #if (!defined(KOKKOS_HAVE_SERIAL)) && defined(KOKKOS_ENABLE_SERIAL)
 #define KOKKOS_HAVE_SERIAL 1
 #endif
diff --git a/kokkos/core/src/impl/Kokkos_OptionalRef.hpp b/kokkos/core/src/impl/Kokkos_OptionalRef.hpp
index 35635d31d..12f6c9f5f 100644
--- a/kokkos/core/src/impl/Kokkos_OptionalRef.hpp
+++ b/kokkos/core/src/impl/Kokkos_OptionalRef.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -69,17 +69,22 @@ struct OptionalRef {
  public:
   using value_type = T;
 
-  KOKKOS_INLINE_FUNCTION
+  KOKKOS_DEFAULTED_FUNCTION
   OptionalRef() = default;
 
-  KOKKOS_INLINE_FUNCTION
+  KOKKOS_DEFAULTED_FUNCTION
   OptionalRef(OptionalRef const&) = default;
 
-  KOKKOS_INLINE_FUNCTION
+  KOKKOS_DEFAULTED_FUNCTION
   OptionalRef(OptionalRef&&) = default;
 
   KOKKOS_INLINE_FUNCTION
-  OptionalRef& operator=(OptionalRef const&) = default;
+  // MSVC requires that this copy constructor is not defaulted
+  // if there exists a (non-defaulted) volatile one.
+  OptionalRef& operator=(OptionalRef const& other) noexcept {
+    m_value = other.m_value;
+    return *this;
+  }
 
   KOKKOS_INLINE_FUNCTION
   // Can't return a reference to volatile OptionalRef, since GCC issues a
@@ -88,10 +93,10 @@ struct OptionalRef {
     m_value = other.m_value;
   }
 
-  KOKKOS_INLINE_FUNCTION
+  KOKKOS_DEFAULTED_FUNCTION
   OptionalRef& operator=(OptionalRef&&) = default;
 
-  KOKKOS_INLINE_FUNCTION
+  KOKKOS_DEFAULTED_FUNCTION
   ~OptionalRef() = default;
 
   KOKKOS_INLINE_FUNCTION
diff --git a/kokkos/core/src/impl/Kokkos_PhysicalLayout.hpp b/kokkos/core/src/impl/Kokkos_PhysicalLayout.hpp
index 63713a9c6..bc0a7df3e 100644
--- a/kokkos/core/src/impl/Kokkos_PhysicalLayout.hpp
+++ b/kokkos/core/src/impl/Kokkos_PhysicalLayout.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/impl/Kokkos_Profiling_DeviceInfo.hpp b/kokkos/core/src/impl/Kokkos_Profiling_DeviceInfo.hpp
index e3b8997df..51d1446ef 100644
--- a/kokkos/core/src/impl/Kokkos_Profiling_DeviceInfo.hpp
+++ b/kokkos/core/src/impl/Kokkos_Profiling_DeviceInfo.hpp
@@ -1,45 +1,45 @@
 /*
-//@HEADER
-// ************************************************************************
-//
-//                        Kokkos v. 3.0
+ //@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
+ //
+ // 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
 */
 
 #ifndef KOKKOSP_DEVICE_INFO_HPP
diff --git a/kokkos/core/src/impl/Kokkos_Profiling_Interface.cpp b/kokkos/core/src/impl/Kokkos_Profiling_Interface.cpp
index c071a9ae6..cf52caea9 100644
--- a/kokkos/core/src/impl/Kokkos_Profiling_Interface.cpp
+++ b/kokkos/core/src/impl/Kokkos_Profiling_Interface.cpp
@@ -1,46 +1,46 @@
 /*
-//@HEADER
-// ************************************************************************
-//
-//                        Kokkos v. 3.0
+ //@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
-*/
+ //
+ // 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
+ */
 
 #include <Kokkos_Macros.hpp>
 
diff --git a/kokkos/core/src/impl/Kokkos_Profiling_Interface.hpp b/kokkos/core/src/impl/Kokkos_Profiling_Interface.hpp
index 12296ece1..df17501ff 100644
--- a/kokkos/core/src/impl/Kokkos_Profiling_Interface.hpp
+++ b/kokkos/core/src/impl/Kokkos_Profiling_Interface.hpp
@@ -1,46 +1,46 @@
 /*
-//@HEADER
-// ************************************************************************
-//
-//                        Kokkos v. 3.0
+ //@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
-*/
+ //
+ // 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
+ */
 
 #ifndef KOKKOSP_INTERFACE_HPP
 #define KOKKOSP_INTERFACE_HPP
@@ -54,7 +54,37 @@
 #include <iostream>
 #include <cstdlib>
 
+// NOTE: in this Kokkos::Profiling block, do not define anything that shouldn't
+// exist should Profiling be disabled
+
+namespace Kokkos {
+namespace Profiling {
+namespace Experimental {
+enum struct DeviceType {
+  Serial,
+  OpenMP,
+  Cuda,
+  HIP,
+  OpenMPTarget,
+  HPX,
+  Threads
+};
+template <typename ExecutionSpace>
+struct DeviceTypeTraits;
+
+constexpr const size_t device_type_bits = 8;
+constexpr const size_t instance_bits    = 24;
+template <typename ExecutionSpace>
+inline uint32_t device_id(ExecutionSpace const& space) noexcept {
+  auto device_id = static_cast<uint32_t>(DeviceTypeTraits<ExecutionSpace>::id);
+  return (device_id << instance_bits) + space.impl_instance_id();
+}
+}  // namespace Experimental
+}  // namespace Profiling
+}  // end namespace Kokkos
+
 #if defined(KOKKOS_ENABLE_PROFILING)
+// We check at configure time that libdl is available.
 #include <dlfcn.h>
 
 #include <impl/Kokkos_Profiling_DeviceInfo.hpp>
diff --git a/kokkos/core/src/impl/Kokkos_Serial.cpp b/kokkos/core/src/impl/Kokkos_Serial.cpp
index f4a2fabd3..b39f9dfee 100644
--- a/kokkos/core/src/impl/Kokkos_Serial.cpp
+++ b/kokkos/core/src/impl/Kokkos_Serial.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -192,7 +192,7 @@ void Serial::impl_finalize()
     space.deallocate(Impl::g_serial_thread_team_data.scratch_buffer(),
                      Impl::g_serial_thread_team_data.scratch_bytes());
 
-    Impl::g_serial_thread_team_data.scratch_assign((void*)0, 0, 0, 0, 0, 0);
+    Impl::g_serial_thread_team_data.scratch_assign(nullptr, 0, 0, 0, 0, 0);
   }
 
 #if defined(KOKKOS_ENABLE_PROFILING)
diff --git a/kokkos/core/src/impl/Kokkos_Serial_Task.cpp b/kokkos/core/src/impl/Kokkos_Serial_Task.cpp
index a592cee05..179c55b10 100644
--- a/kokkos/core/src/impl/Kokkos_Serial_Task.cpp
+++ b/kokkos/core/src/impl/Kokkos_Serial_Task.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/impl/Kokkos_Serial_Task.hpp b/kokkos/core/src/impl/Kokkos_Serial_Task.hpp
index 07c53a418..3ac3899ac 100644
--- a/kokkos/core/src/impl/Kokkos_Serial_Task.hpp
+++ b/kokkos/core/src/impl/Kokkos_Serial_Task.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -92,7 +92,7 @@ class TaskQueueSpecialization<SimpleTaskScheduler<Kokkos::Serial, QueueType> > {
 
     auto current_task = OptionalRef<task_base_type>(nullptr);
 
-    while (not queue.is_done()) {
+    while (!queue.is_done()) {
       // Each team lead attempts to acquire either a thread team task
       // or a single thread task for the team.
 
diff --git a/kokkos/core/src/impl/Kokkos_Serial_WorkGraphPolicy.hpp b/kokkos/core/src/impl/Kokkos_Serial_WorkGraphPolicy.hpp
index be2b2ecd7..4e26e0b13 100644
--- a/kokkos/core/src/impl/Kokkos_Serial_WorkGraphPolicy.hpp
+++ b/kokkos/core/src/impl/Kokkos_Serial_WorkGraphPolicy.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/impl/Kokkos_SharedAlloc.cpp b/kokkos/core/src/impl/Kokkos_SharedAlloc.cpp
index 349d0928e..6a054f73a 100644
--- a/kokkos/core/src/impl/Kokkos_SharedAlloc.cpp
+++ b/kokkos/core/src/impl/Kokkos_SharedAlloc.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -47,7 +47,8 @@
 namespace Kokkos {
 namespace Impl {
 
-__thread int SharedAllocationRecord<void, void>::t_tracking_enabled = 1;
+KOKKOS_THREAD_LOCAL int SharedAllocationRecord<void, void>::t_tracking_enabled =
+    1;
 
 #ifdef KOKKOS_DEBUG
 bool SharedAllocationRecord<void, void>::is_sane(
@@ -100,7 +101,7 @@ bool SharedAllocationRecord<void, void>::is_sane(
                 reinterpret_cast<uintptr_t>(rec->m_next),
                 reinterpret_cast<uintptr_t>(rec->m_prev),
                 reinterpret_cast<uintptr_t>(
-                    rec->m_next != NULL ? rec->m_next->m_prev : NULL),
+                    rec->m_next != nullptr ? rec->m_next->m_prev : nullptr),
                 reinterpret_cast<uintptr_t>(rec->m_prev != rec->m_root
                                                 ? rec->m_prev->m_next
                                                 : root_next));
@@ -186,7 +187,7 @@ SharedAllocationRecord<void, void>::SharedAllocationRecord(
 #endif
       ,
       m_count(0) {
-  if (0 != arg_alloc_ptr) {
+  if (nullptr != arg_alloc_ptr) {
 #ifdef KOKKOS_DEBUG
     // Insert into the root double-linked list for tracking
     //
@@ -197,7 +198,7 @@ SharedAllocationRecord<void, void>::SharedAllocationRecord(
     m_prev                                        = m_root;
     static constexpr SharedAllocationRecord* zero = nullptr;
 
-    // Read root->m_next and lock by setting to NULL
+    // Read root->m_next and lock by setting to nullptr
     while ((m_next = Kokkos::atomic_exchange(&m_root->m_next, zero)) == nullptr)
       ;
 
@@ -214,7 +215,7 @@ SharedAllocationRecord<void, void>::SharedAllocationRecord(
 
   } else {
     Kokkos::Impl::throw_runtime_exception(
-        "Kokkos::Impl::SharedAllocationRecord given NULL allocation");
+        "Kokkos::Impl::SharedAllocationRecord given nullptr allocation");
   }
 }
 
@@ -288,7 +289,7 @@ SharedAllocationRecord<void, void>* SharedAllocationRecord<
 
     function_type d = arg_record->m_dealloc;
     (*d)(arg_record);
-    arg_record = 0;
+    arg_record = nullptr;
   } else if (old_count < 1) {  // Error
     fprintf(stderr,
             "Kokkos::Impl::SharedAllocationRecord '%s' failed decrement count "
diff --git a/kokkos/core/src/impl/Kokkos_SharedAlloc.hpp b/kokkos/core/src/impl/Kokkos_SharedAlloc.hpp
index ebdaaec10..6e954e8f2 100644
--- a/kokkos/core/src/impl/Kokkos_SharedAlloc.hpp
+++ b/kokkos/core/src/impl/Kokkos_SharedAlloc.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -115,7 +115,7 @@ class SharedAllocationRecord<void, void> {
       SharedAllocationHeader* arg_alloc_ptr, size_t arg_alloc_size,
       function_type arg_dealloc);
  private:
-  static __thread int t_tracking_enabled;
+  static KOKKOS_THREAD_LOCAL int t_tracking_enabled;
 
  public:
   virtual std::string get_label() const { return std::string("Unmanaged"); }
@@ -132,7 +132,7 @@ class SharedAllocationRecord<void, void> {
    */
   static void tracking_enable() { t_tracking_enabled = 1; }
 
-  virtual ~SharedAllocationRecord() {}
+  virtual ~SharedAllocationRecord() = default;
 
   SharedAllocationRecord()
       : m_alloc_ptr(nullptr),
@@ -245,6 +245,9 @@ class SharedAllocationRecord
 #if defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST)
     return new SharedAllocationRecord(arg_space, arg_label, arg_alloc);
 #else
+    (void)arg_space;
+    (void)arg_label;
+    (void)arg_alloc;
     return (SharedAllocationRecord*)0;
 #endif
   }
@@ -267,7 +270,7 @@ union SharedAllocationTracker {
  public:
   // Use macros instead of inline functions to reduce
   // pressure on compiler optimization by reducing
-  // number of symbols and inline functons.
+  // number of symbols and inline functions.
 
 #if defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST)
 
diff --git a/kokkos/core/src/impl/Kokkos_SimpleTaskScheduler.hpp b/kokkos/core/src/impl/Kokkos_SimpleTaskScheduler.hpp
index 18d007835..a01b22e4e 100644
--- a/kokkos/core/src/impl/Kokkos_SimpleTaskScheduler.hpp
+++ b/kokkos/core/src/impl/Kokkos_SimpleTaskScheduler.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -226,13 +226,13 @@ class SimpleTaskScheduler
   }
 
   template <int TaskEnum, class DepTaskType, class FunctorType>
-  KOKKOS_FUNCTION
-      future_type_for_functor<typename std::decay<FunctorType>::type>
-      _spawn_impl(
-          DepTaskType arg_predecessor_task, TaskPriority arg_priority,
-          typename runnable_task_base_type::function_type apply_function_ptr,
-          typename runnable_task_base_type::destroy_type destroy_function_ptr,
-          FunctorType&& functor) {
+  KOKKOS_FUNCTION future_type_for_functor<
+      typename std::decay<FunctorType>::type>
+  _spawn_impl(
+      DepTaskType arg_predecessor_task, TaskPriority arg_priority,
+      typename runnable_task_base_type::function_type apply_function_ptr,
+      typename runnable_task_base_type::destroy_type /*destroy_function_ptr*/,
+      FunctorType&& functor) {
     KOKKOS_EXPECTS(m_queue != nullptr);
 
     using functor_future_type =
@@ -445,7 +445,7 @@ class SimpleTaskScheduler
     KOKKOS_EXPECTS(!task.get_respawn_flag());
 
     task.set_priority(priority);
-    KOKKOS_ASSERT(not task.has_predecessor());
+    KOKKOS_ASSERT(!task.has_predecessor());
     task.set_respawn_flag(true);
   }
 
diff --git a/kokkos/core/src/impl/Kokkos_SingleTaskQueue.hpp b/kokkos/core/src/impl/Kokkos_SingleTaskQueue.hpp
index daf4ca9bc..a0eccffb6 100644
--- a/kokkos/core/src/impl/Kokkos_SingleTaskQueue.hpp
+++ b/kokkos/core/src/impl/Kokkos_SingleTaskQueue.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -154,7 +154,7 @@ class SingleTaskQueue
 
   KOKKOS_FUNCTION
   OptionalRef<task_base_type> pop_ready_task(
-      team_scheduler_info_type const& info) {
+      team_scheduler_info_type const& /*info*/) {
     OptionalRef<task_base_type> return_value;
     // always loop in order of priority first, then prefer team tasks over
     // single tasks
diff --git a/kokkos/core/src/impl/Kokkos_Spinwait.cpp b/kokkos/core/src/impl/Kokkos_Spinwait.cpp
index 57939a56f..2ae5c7863 100644
--- a/kokkos/core/src/impl/Kokkos_Spinwait.cpp
+++ b/kokkos/core/src/impl/Kokkos_Spinwait.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/impl/Kokkos_Spinwait.hpp b/kokkos/core/src/impl/Kokkos_Spinwait.hpp
index 0200fcf85..1c65fb91f 100644
--- a/kokkos/core/src/impl/Kokkos_Spinwait.hpp
+++ b/kokkos/core/src/impl/Kokkos_Spinwait.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/impl/Kokkos_Stacktrace.cpp b/kokkos/core/src/impl/Kokkos_Stacktrace.cpp
index 582f69793..c0c1fdf6b 100644
--- a/kokkos/core/src/impl/Kokkos_Stacktrace.cpp
+++ b/kokkos/core/src/impl/Kokkos_Stacktrace.cpp
@@ -18,7 +18,7 @@ namespace Kokkos {
 namespace Impl {
 #ifndef KOKKOS_IMPL_ENABLE_STACKTRACE
 int backtrace(void**, int) { return 0; }
-char** backtrace_symbols(void* const*, int) { return NULL; }
+char** backtrace_symbols(void* const*, int) { return nullptr; }
 #endif
 
 std::string demangle(const std::string& name) {
diff --git a/kokkos/core/src/impl/Kokkos_Tags.hpp b/kokkos/core/src/impl/Kokkos_Tags.hpp
index 078ba58f5..1b33180ed 100644
--- a/kokkos/core/src/impl/Kokkos_Tags.hpp
+++ b/kokkos/core/src/impl/Kokkos_Tags.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/impl/Kokkos_TaskBase.hpp b/kokkos/core/src/impl/Kokkos_TaskBase.hpp
index 122fe652b..8078c68db 100644
--- a/kokkos/core/src/impl/Kokkos_TaskBase.hpp
+++ b/kokkos/core/src/impl/Kokkos_TaskBase.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -167,11 +167,7 @@ class TaskBase {
   TaskBase& operator=(TaskBase&&) = delete;
   TaskBase& operator=(const TaskBase&) = delete;
 
-#ifdef KOKKOS_CUDA_9_DEFAULTED_BUG_WORKAROUND
-  KOKKOS_INLINE_FUNCTION ~TaskBase(){};
-#else
-  KOKKOS_INLINE_FUNCTION ~TaskBase() = default;
-#endif
+  KOKKOS_DEFAULTED_FUNCTION ~TaskBase() = default;
 
   KOKKOS_INLINE_FUNCTION constexpr TaskBase()
       : m_apply(nullptr),
@@ -211,7 +207,7 @@ class TaskBase {
       Kokkos::abort("TaskScheduler ERROR: resetting task dependence");
     }
 
-    if (0 != dep) {
+    if (nullptr != dep) {
       // The future may be destroyed upon returning from this call
       // so increment reference count to track this assignment.
       Kokkos::atomic_increment(&(dep->m_ref_count));
@@ -226,7 +222,44 @@ class TaskBase {
   }
 };
 
-static_assert(sizeof(TaskBase) == 48, "Verifying expected sizeof(TaskBase)");
+//------------------------------------------------------------------------------
+// <editor-fold desc="Verify the size of TaskBase is as expected"> {{{2
+
+// Workaround: some compilers implement int16_t as 4 bytes, so the size might
+// not actually be 48 bytes.
+// There's not a lot of reason to keep checking this here; the program will
+// work fine if this isn't true. I think this check was originally here to
+// emphasize the fact that adding to the size of TaskBase could have a
+// significant performance penalty, since doing so could substantially decrease
+// the number of full task types that fit into a cache line.  We'll leave it
+// here for now, though, since we're probably going to be ripping all of the
+// old TaskBase stuff out eventually anyway.
+constexpr size_t unpadded_task_base_size = 44 + 2 * sizeof(int16_t);
+// don't forget padding:
+constexpr size_t task_base_misalignment =
+    unpadded_task_base_size % alignof(void*);
+constexpr size_t task_base_padding_size =
+    (alignof(void*) - task_base_misalignment) % alignof(void*);
+constexpr size_t expected_task_base_size =
+    unpadded_task_base_size + task_base_padding_size;
+
+// Produce a more readable compiler error message than the plain static assert
+template <size_t Size>
+struct verify_task_base_size_is_48_note_actual_size_is_ {};
+template <>
+struct verify_task_base_size_is_48_note_actual_size_is_<
+    expected_task_base_size> {
+  using type = int;
+};
+static constexpr
+    typename verify_task_base_size_is_48_note_actual_size_is_<sizeof(
+        TaskBase)>::type verify = {};
+
+static_assert(sizeof(TaskBase) == expected_task_base_size,
+              "Verifying expected sizeof(TaskBase)");
+
+// </editor-fold> end Verify the size of TaskBase is as expected }}}2
+//------------------------------------------------------------------------------
 
 } /* namespace Impl */
 } /* namespace Kokkos */
diff --git a/kokkos/core/src/impl/Kokkos_TaskNode.hpp b/kokkos/core/src/impl/Kokkos_TaskNode.hpp
index 627ee418e..42afa93cd 100644
--- a/kokkos/core/src/impl/Kokkos_TaskNode.hpp
+++ b/kokkos/core/src/impl/Kokkos_TaskNode.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -308,7 +308,7 @@ class TaskNode
 
   template <class Function>
   KOKKOS_INLINE_FUNCTION void consume_wait_queue(Function&& f) {
-    KOKKOS_EXPECTS(not m_wait_queue.is_consumed());
+    KOKKOS_EXPECTS(!m_wait_queue.is_consumed());
     m_wait_queue.consume(std::forward<Function>(f));
   }
 
@@ -499,7 +499,7 @@ class RunnableTaskBase
   void acquire_predecessor_from(runnable_task_type& other) {
     KOKKOS_EXPECTS(m_predecessor == nullptr ||
                    other.m_predecessor == m_predecessor);
-    // since we're transfering, no need to modify the reference count
+    // since we're transferring, no need to modify the reference count
     m_predecessor       = other.m_predecessor;
     other.m_predecessor = nullptr;
   }
@@ -508,7 +508,7 @@ class RunnableTaskBase
   void acquire_predecessor_from(runnable_task_type& other) volatile {
     KOKKOS_EXPECTS(m_predecessor == nullptr ||
                    other.m_predecessor == m_predecessor);
-    // since we're transfering, no need to modify the reference count
+    // since we're transferring, no need to modify the reference count
     m_predecessor       = other.m_predecessor;
     other.m_predecessor = nullptr;
   }
@@ -620,7 +620,7 @@ class alignas(16) RunnableTask
   ~RunnableTask() = delete;
 
   KOKKOS_INLINE_FUNCTION
-  void update_scheduling_info(member_type& member) {
+  void update_scheduling_info(member_type& /*member*/) {
     // TODO @tasking @generalization DSH call a queue-specific hook here; for
     // now, this info is already updated elsewhere this->scheduling_info() =
     // member.scheduler().scheduling_info();
@@ -639,7 +639,7 @@ class alignas(16) RunnableTask
     this->functor_type::operator()(*member, *val);
   }
 
-  KOKKOS_FUNCTION static void destroy(task_base_type* root) {
+  KOKKOS_FUNCTION static void destroy(task_base_type* /*root*/) {
     // TaskResult<result_type>::destroy(root);
   }
 
diff --git a/kokkos/core/src/impl/Kokkos_TaskPolicyData.hpp b/kokkos/core/src/impl/Kokkos_TaskPolicyData.hpp
index 61c5cb49e..09113628a 100644
--- a/kokkos/core/src/impl/Kokkos_TaskPolicyData.hpp
+++ b/kokkos/core/src/impl/Kokkos_TaskPolicyData.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -75,20 +75,20 @@ struct TaskPolicyWithPredecessor {
 
   TaskPolicyWithPredecessor() = delete;
 
-  KOKKOS_INLINE_FUNCTION
+  KOKKOS_DEFAULTED_FUNCTION
   TaskPolicyWithPredecessor(TaskPolicyWithPredecessor const&) = default;
 
-  KOKKOS_INLINE_FUNCTION
+  KOKKOS_DEFAULTED_FUNCTION
   TaskPolicyWithPredecessor(TaskPolicyWithPredecessor&&) = default;
 
-  KOKKOS_INLINE_FUNCTION
+  KOKKOS_DEFAULTED_FUNCTION
   TaskPolicyWithPredecessor& operator=(TaskPolicyWithPredecessor const&) =
       default;
 
-  KOKKOS_INLINE_FUNCTION
+  KOKKOS_DEFAULTED_FUNCTION
   TaskPolicyWithPredecessor& operator=(TaskPolicyWithPredecessor&&) = default;
 
-  KOKKOS_INLINE_FUNCTION
+  KOKKOS_DEFAULTED_FUNCTION
   ~TaskPolicyWithPredecessor() = default;
 
   KOKKOS_INLINE_FUNCTION
@@ -129,19 +129,19 @@ struct TaskPolicyWithScheduler {
 
   TaskPolicyWithScheduler() = delete;
 
-  KOKKOS_INLINE_FUNCTION
+  KOKKOS_DEFAULTED_FUNCTION
   TaskPolicyWithScheduler(TaskPolicyWithScheduler const&) = default;
 
-  KOKKOS_INLINE_FUNCTION
+  KOKKOS_DEFAULTED_FUNCTION
   TaskPolicyWithScheduler(TaskPolicyWithScheduler&&) = default;
 
-  KOKKOS_INLINE_FUNCTION
+  KOKKOS_DEFAULTED_FUNCTION
   TaskPolicyWithScheduler& operator=(TaskPolicyWithScheduler const&) = default;
 
-  KOKKOS_INLINE_FUNCTION
+  KOKKOS_DEFAULTED_FUNCTION
   TaskPolicyWithScheduler& operator=(TaskPolicyWithScheduler&&) = default;
 
-  KOKKOS_INLINE_FUNCTION
+  KOKKOS_DEFAULTED_FUNCTION
   ~TaskPolicyWithScheduler() = default;
 
   KOKKOS_INLINE_FUNCTION
@@ -155,7 +155,7 @@ struct TaskPolicyWithScheduler {
 
   KOKKOS_INLINE_FUNCTION
   static constexpr bool has_predecessor() noexcept {
-    return not std::is_same<PredecessorFuture, std::nullptr_t>::value;
+    return !std::is_same<PredecessorFuture, std::nullptr_t>::value;
   }
 
   KOKKOS_INLINE_FUNCTION
diff --git a/kokkos/core/src/impl/Kokkos_TaskQueue.hpp b/kokkos/core/src/impl/Kokkos_TaskQueue.hpp
index 014992afb..c0d2eca9c 100644
--- a/kokkos/core/src/impl/Kokkos_TaskQueue.hpp
+++ b/kokkos/core/src/impl/Kokkos_TaskQueue.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -168,13 +168,13 @@ class TaskQueue : public TaskQueueBase {
   int allocation_count() const noexcept { return m_count_alloc; }
 
   KOKKOS_INLINE_FUNCTION
-  void initialize_team_queues(int pool_size) const noexcept {}
+  void initialize_team_queues(int /*pool_size*/) const noexcept {}
 
   KOKKOS_INLINE_FUNCTION
   task_root_type* attempt_to_steal_task() const noexcept { return nullptr; }
 
   KOKKOS_INLINE_FUNCTION
-  team_queue_type& get_team_queue(int team_rank) { return *this; }
+  team_queue_type& get_team_queue(int /*team_rank*/) { return *this; }
 
   // void execute() { specialization::execute( this ); }
 
diff --git a/kokkos/core/src/impl/Kokkos_TaskQueueCommon.hpp b/kokkos/core/src/impl/Kokkos_TaskQueueCommon.hpp
index 1598a7902..cd53a81b1 100644
--- a/kokkos/core/src/impl/Kokkos_TaskQueueCommon.hpp
+++ b/kokkos/core/src/impl/Kokkos_TaskQueueCommon.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -259,9 +259,9 @@ class TaskQueueCommonMixin {
       // we've lost exclusive access and should nt touch task again
 
       // If the predecessor is not done, then task is not ready
-      task_is_ready = not predecessor_not_ready;
+      task_is_ready = !predecessor_not_ready;
 
-      if (task_is_ready and predecessor.is_runnable()) {
+      if (task_is_ready && predecessor.is_runnable()) {
         // this is our last chance to update the scheduling info before
         // predecessor is potentially deleted
         _self().update_scheduling_info_from_completed_predecessor(
@@ -299,7 +299,7 @@ class TaskQueueCommonMixin {
       // and enqueue the task
       // (can't move because the task isn't expired unless the push succeeds
       bool push_success = ready_queue.push(task);
-      if (not push_success) {
+      if (!push_success) {
         _self().handle_failed_ready_queue_insertion(std::move(task),
                                                     ready_queue, info);
       }
@@ -312,8 +312,8 @@ class TaskQueueCommonMixin {
   template <class TaskQueueTraits, class ReadyQueueType,
             class TeamSchedulerInfo>
   KOKKOS_INLINE_FUNCTION void handle_failed_ready_queue_insertion(
-      RunnableTaskBase<TaskQueueTraits>&& task, ReadyQueueType& ready_queue,
-      TeamSchedulerInfo const& info) {
+      RunnableTaskBase<TaskQueueTraits>&& /*task*/,
+      ReadyQueueType& /*ready_queue*/, TeamSchedulerInfo const& /*info*/) {
     Kokkos::abort("Unhandled failure of ready task queue insertion!\n");
   }
 
@@ -325,7 +325,7 @@ class TaskQueueCommonMixin {
       AggregateTask<TaskQueueTraits, SchedulingInfo>&& aggregate,
       TeamSchedulerInfo const& info) {
     // Because the aggregate is being scheduled, should not be in any queue
-    KOKKOS_EXPECTS(not aggregate.is_enqueued());
+    KOKKOS_EXPECTS(!aggregate.is_enqueued());
 
     using task_scheduling_info_type =
         typename Derived::task_scheduling_info_type;
@@ -369,7 +369,7 @@ class TaskQueueCommonMixin {
         // ready yet
         incomplete_dependence_found = pred_not_ready;
 
-        if (not pred_not_ready) {
+        if (!pred_not_ready) {
           // A predecessor was done, and we didn't enqueue the aggregate
           // Update the aggregate's scheduling info (we still have exclusive
           // access to it here)
@@ -403,7 +403,7 @@ class TaskQueueCommonMixin {
     // dependence was found, because some other thread could have already popped
     // it off of another waiting queue
 
-    if (not incomplete_dependence_found) {
+    if (!incomplete_dependence_found) {
       // all of the predecessors were completed, so we can complete `task`
       _self().complete(std::move(aggregate), info);
     }
@@ -462,15 +462,16 @@ class TaskQueueCommonMixin {
 
   template <class TaskQueueTraits>
   KOKKOS_INLINE_FUNCTION void initialize_scheduling_info_from_predecessor(
-      TaskNode<TaskQueueTraits>& task,
-      TaskNode<TaskQueueTraits>& predecessor) const {
+      TaskNode<TaskQueueTraits>& /*task*/,
+      TaskNode<TaskQueueTraits>& /*predecessor*/) const {
     /* do nothing by default */
   }
 
   template <class TeamSchedulerInfo, class TaskQueueTraits>
   KOKKOS_INLINE_FUNCTION void
   initialize_scheduling_info_from_team_scheduler_info(
-      TaskNode<TaskQueueTraits>& task, TeamSchedulerInfo const& info) const {
+      TaskNode<TaskQueueTraits>& /*task*/,
+      TeamSchedulerInfo const& /*info*/) const {
     /* do nothing by default */
   }
 
diff --git a/kokkos/core/src/impl/Kokkos_TaskQueueMemoryManager.hpp b/kokkos/core/src/impl/Kokkos_TaskQueueMemoryManager.hpp
index 21e892d4c..6e2481f93 100644
--- a/kokkos/core/src/impl/Kokkos_TaskQueueMemoryManager.hpp
+++ b/kokkos/core/src/impl/Kokkos_TaskQueueMemoryManager.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/impl/Kokkos_TaskQueueMultiple.hpp b/kokkos/core/src/impl/Kokkos_TaskQueueMultiple.hpp
index 4a81e2766..090bffd23 100644
--- a/kokkos/core/src/impl/Kokkos_TaskQueueMultiple.hpp
+++ b/kokkos/core/src/impl/Kokkos_TaskQueueMultiple.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/impl/Kokkos_TaskQueueMultiple_impl.hpp b/kokkos/core/src/impl/Kokkos_TaskQueueMultiple_impl.hpp
index b40356a2b..1af97918b 100644
--- a/kokkos/core/src/impl/Kokkos_TaskQueueMultiple_impl.hpp
+++ b/kokkos/core/src/impl/Kokkos_TaskQueueMultiple_impl.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/impl/Kokkos_TaskQueue_impl.hpp b/kokkos/core/src/impl/Kokkos_TaskQueue_impl.hpp
index cdcc75bdf..fe3cac7bd 100644
--- a/kokkos/core/src/impl/Kokkos_TaskQueue_impl.hpp
+++ b/kokkos/core/src/impl/Kokkos_TaskQueue_impl.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -181,7 +181,7 @@ KOKKOS_FUNCTION bool TaskQueue<ExecSpace, MemorySpace>::push_task(
          task->m_priority, task->m_ref_count);
 #endif
 
-  task_root_type *const zero = (task_root_type *)0;
+  task_root_type *const zero = nullptr;
   task_root_type *const lock = (task_root_type *)task_root_type::LockTag;
 
   task_root_type *volatile &next = task->m_next;
@@ -254,7 +254,7 @@ TaskQueue<ExecSpace, MemorySpace>::pop_ready_task(
     //
     // If queue is locked then just read by guaranteeing the CAS will fail.
 
-    if (lock == task) task = 0;
+    if (lock == task) task = nullptr;
 
     task_root_type *const x = task;
 
@@ -334,7 +334,7 @@ KOKKOS_FUNCTION void TaskQueue<ExecSpace, MemorySpace>::schedule_runnable(
          task->m_priority, task->m_ref_count);
 #endif
 
-  task_root_type *const zero = (task_root_type *)0;
+  task_root_type *const zero = nullptr;
   task_root_type *const lock = (task_root_type *)task_root_type::LockTag;
   task_root_type *const end  = (task_root_type *)task_root_type::EndTag;
 
@@ -382,16 +382,16 @@ KOKKOS_FUNCTION void TaskQueue<ExecSpace, MemorySpace>::schedule_runnable(
   // If we don't have a dependency, or if pushing onto the wait queue of that
   // dependency failed (since the only time that queue should be locked is when
   // the task is transitioning to complete??!?)
-  const bool is_ready = (0 == dep) || (!push_task(&dep->m_wait, task));
+  const bool is_ready = (nullptr == dep) || (!push_task(&dep->m_wait, task));
 
-  if ((0 != dep) && respawn) {
+  if ((nullptr != dep) && respawn) {
     // Reference count for dep was incremented when
     // respawn assigned dependency to task->m_next
     // so that if dep completed prior to the
     // above push_task dep would not be destroyed.
     // dep reference count can now be decremented,
     // which may deallocate the task.
-    TaskQueue::assign(&dep, (task_root_type *)0);
+    TaskQueue::assign(&dep, nullptr);
   }
 
   if (is_ready) {
@@ -452,7 +452,7 @@ KOKKOS_FUNCTION void TaskQueue<ExecSpace, MemorySpace>::schedule_aggregate(
          task->m_ref_count);
 #endif
 
-  task_root_type *const zero = (task_root_type *)0;
+  task_root_type *const zero = nullptr;
   task_root_type *const lock = (task_root_type *)task_root_type::LockTag;
   task_root_type *const end  = (task_root_type *)task_root_type::EndTag;
 
@@ -551,7 +551,7 @@ KOKKOS_FUNCTION void TaskQueue<ExecSpace, MemorySpace>::reschedule(
   //   task is in Executing-Respawn state
   //   task->m_next == 0 (no dependence)
 
-  task_root_type *const zero = (task_root_type *)0;
+  task_root_type *const zero = nullptr;
   task_root_type *const lock = (task_root_type *)task_root_type::LockTag;
 
   if (lock != Kokkos::atomic_exchange(&task->m_next, zero)) {
@@ -567,7 +567,7 @@ KOKKOS_FUNCTION void TaskQueue<ExecSpace, MemorySpace>::complete(
   // Complete a runnable task that has finished executing
   // or a when_all task when all of its dependeneces are complete.
 
-  task_root_type *const zero = (task_root_type *)0;
+  task_root_type *const zero = nullptr;
   task_root_type *const lock = (task_root_type *)task_root_type::LockTag;
   task_root_type *const end  = (task_root_type *)task_root_type::EndTag;
 
@@ -597,7 +597,7 @@ KOKKOS_FUNCTION void TaskQueue<ExecSpace, MemorySpace>::complete(
     // If 'task' is an aggregate then any of the runnable tasks that
     // it depends upon may be attempting to complete this 'task'.
     // Must only transition a task once to complete status.
-    // This is controled by atomically locking the wait queue.
+    // This is controlled by atomically locking the wait queue.
 
     // Stop other tasks from adding themselves to this task's wait queue
     // by locking the head of this task's wait queue.
@@ -624,7 +624,7 @@ KOKKOS_FUNCTION void TaskQueue<ExecSpace, MemorySpace>::complete(
         task_root_type volatile &vx = *x;
 
         task_root_type *const next = vx.m_next;
-        vx.m_next                  = 0;
+        vx.m_next                  = nullptr;
 
         Kokkos::memory_fence();
 
diff --git a/kokkos/core/src/impl/Kokkos_TaskResult.hpp b/kokkos/core/src/impl/Kokkos_TaskResult.hpp
index bffc6b660..40a9c3bf5 100644
--- a/kokkos/core/src/impl/Kokkos_TaskResult.hpp
+++ b/kokkos/core/src/impl/Kokkos_TaskResult.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -113,20 +113,20 @@ struct TaskResult<void> {
   using reference_type = void;
 
   template <class TaskQueueTraits>
-  KOKKOS_INLINE_FUNCTION static void* ptr(TaskNode<TaskQueueTraits>* task) {
+  KOKKOS_INLINE_FUNCTION static void* ptr(TaskNode<TaskQueueTraits>* /*task*/) {
     return nullptr;
   }
 
-  KOKKOS_INLINE_FUNCTION static void* ptr(TaskBase*) { return (void*)nullptr; }
+  KOKKOS_INLINE_FUNCTION static void* ptr(TaskBase*) { return nullptr; }
 
   template <class TaskQueueTraits>
   KOKKOS_INLINE_FUNCTION static reference_type get(
-      TaskNode<TaskQueueTraits>* task) { /* Should never be called */
+      TaskNode<TaskQueueTraits>* /*task*/) { /* Should never be called */
   }
 
   KOKKOS_INLINE_FUNCTION static reference_type get(TaskBase*) {}
 
-  KOKKOS_INLINE_FUNCTION static void destroy(TaskBase* task) {}
+  KOKKOS_INLINE_FUNCTION static void destroy(TaskBase* /*task*/) {}
 
   // template <class TaskQueueTraits>
   // KOKKOS_INLINE_FUNCTION static
diff --git a/kokkos/core/src/impl/Kokkos_TaskTeamMember.hpp b/kokkos/core/src/impl/Kokkos_TaskTeamMember.hpp
index 3f32fc949..2faab5794 100644
--- a/kokkos/core/src/impl/Kokkos_TaskTeamMember.hpp
+++ b/kokkos/core/src/impl/Kokkos_TaskTeamMember.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -90,22 +90,22 @@ class TaskTeamMemberAdapter : public TeamMember {
 
   // (rule of 6 constructors)
 
-  KOKKOS_INLINE_FUNCTION
+  KOKKOS_DEFAULTED_FUNCTION
   TaskTeamMemberAdapter() = default;
 
-  KOKKOS_INLINE_FUNCTION
+  KOKKOS_DEFAULTED_FUNCTION
   TaskTeamMemberAdapter(TaskTeamMemberAdapter const&) = default;
 
-  KOKKOS_INLINE_FUNCTION
+  KOKKOS_DEFAULTED_FUNCTION
   TaskTeamMemberAdapter(TaskTeamMemberAdapter&&) = default;
 
-  KOKKOS_INLINE_FUNCTION
+  KOKKOS_DEFAULTED_FUNCTION
   TaskTeamMemberAdapter& operator=(TaskTeamMemberAdapter const&) = default;
 
-  KOKKOS_INLINE_FUNCTION
+  KOKKOS_DEFAULTED_FUNCTION
   TaskTeamMemberAdapter& operator=(TaskTeamMemberAdapter&&) = default;
 
-  KOKKOS_INLINE_FUNCTION ~TaskTeamMemberAdapter() = default;
+  KOKKOS_DEFAULTED_FUNCTION ~TaskTeamMemberAdapter() = default;
 
   //----------------------------------------
 
diff --git a/kokkos/core/src/impl/Kokkos_Timer.hpp b/kokkos/core/src/impl/Kokkos_Timer.hpp
index 60ec0ead8..e8004ff85 100644
--- a/kokkos/core/src/impl/Kokkos_Timer.hpp
+++ b/kokkos/core/src/impl/Kokkos_Timer.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/impl/Kokkos_Traits.hpp b/kokkos/core/src/impl/Kokkos_Traits.hpp
index b9b446660..32e78b7f5 100644
--- a/kokkos/core/src/impl/Kokkos_Traits.hpp
+++ b/kokkos/core/src/impl/Kokkos_Traits.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -129,7 +129,7 @@ struct are_integral<T, Args...> {
   enum {
     value =
         // Accept std::is_integral OR std::is_enum as an integral value
-        // since a simple enum value is automically convertable to an
+        // since a simple enum value is automically convertible to an
         // integral value.
     (std::is_integral<T>::value || std::is_enum<T>::value) &&
     are_integral<Args...>::value
@@ -137,132 +137,6 @@ struct are_integral<T, Args...> {
 };
 
 //----------------------------------------------------------------------------
-/* C++11 conformal compile-time type traits utilities.
- * Prefer to use C++11 when portably available.
- */
-//----------------------------------------------------------------------------
-// C++11 Helpers:
-
-template <class T, T v>
-struct integral_constant {
-  // Declaration of 'static const' causes an unresolved linker symbol in debug
-  // static const T value = v ;
-  enum { value = T(v) };
-  typedef T value_type;
-  typedef integral_constant<T, v> type;
-  KOKKOS_INLINE_FUNCTION operator T() { return v; }
-};
-
-typedef integral_constant<bool, false> false_type;
-typedef integral_constant<bool, true> true_type;
-
-//----------------------------------------------------------------------------
-// C++11 Type relationships:
-
-template <class X, class Y>
-struct is_same : public false_type {};
-template <class X>
-struct is_same<X, X> : public true_type {};
-
-//----------------------------------------------------------------------------
-// C++11 Type properties:
-
-template <typename T>
-struct is_const : public false_type {};
-template <typename T>
-struct is_const<const T> : public true_type {};
-template <typename T>
-struct is_const<const T&> : public true_type {};
-
-template <typename T>
-struct is_array : public false_type {};
-template <typename T>
-struct is_array<T[]> : public true_type {};
-template <typename T, unsigned N>
-struct is_array<T[N]> : public true_type {};
-
-//----------------------------------------------------------------------------
-// C++11 Type transformations:
-
-template <typename T>
-struct remove_const {
-  typedef T type;
-};
-template <typename T>
-struct remove_const<const T> {
-  typedef T type;
-};
-template <typename T>
-struct remove_const<const T&> {
-  typedef T& type;
-};
-
-template <typename T>
-struct add_const {
-  typedef const T type;
-};
-template <typename T>
-struct add_const<T&> {
-  typedef const T& type;
-};
-template <typename T>
-struct add_const<const T> {
-  typedef const T type;
-};
-template <typename T>
-struct add_const<const T&> {
-  typedef const T& type;
-};
-
-template <typename T>
-struct remove_reference {
-  typedef T type;
-};
-template <typename T>
-struct remove_reference<T&> {
-  typedef T type;
-};
-template <typename T>
-struct remove_reference<const T&> {
-  typedef const T type;
-};
-
-template <typename T>
-struct remove_extent {
-  typedef T type;
-};
-template <typename T>
-struct remove_extent<T[]> {
-  typedef T type;
-};
-template <typename T, unsigned N>
-struct remove_extent<T[N]> {
-  typedef T type;
-};
-
-//----------------------------------------------------------------------------
-// C++11 Other type generators:
-
-template <bool, class T, class F>
-struct condition {
-  typedef F type;
-};
-
-template <class T, class F>
-struct condition<true, T, F> {
-  typedef T type;
-};
-
-template <bool, class = void>
-struct enable_if;
-
-template <class T>
-struct enable_if<true, T> {
-  typedef T type;
-};
-
-//----------------------------------------------------------------------------
-
 }  // namespace Impl
 }  // namespace Kokkos
 
@@ -280,19 +154,6 @@ struct enable_if_type {
   typedef T type;
 };
 
-//----------------------------------------------------------------------------
-
-template <bool B>
-struct bool_ : public integral_constant<bool, B> {};
-
-template <unsigned I>
-struct unsigned_ : public integral_constant<unsigned, I> {};
-
-template <int I>
-struct int_ : public integral_constant<int, I> {};
-
-typedef bool_<true> true_;
-typedef bool_<false> false_;
 //----------------------------------------------------------------------------
 // if_
 
@@ -302,10 +163,10 @@ struct if_c {
 
   typedef FalseType type;
 
-  typedef typename remove_const<typename remove_reference<type>::type>::type
-      value_type;
+  typedef typename std::remove_const<
+      typename std::remove_reference<type>::type>::type value_type;
 
-  typedef typename add_const<value_type>::type const_value_type;
+  typedef typename std::add_const<value_type>::type const_value_type;
 
   static KOKKOS_INLINE_FUNCTION const_value_type& select(const_value_type& v) {
     return v;
@@ -337,10 +198,10 @@ struct if_c<true, TrueType, FalseType> {
 
   typedef TrueType type;
 
-  typedef typename remove_const<typename remove_reference<type>::type>::type
-      value_type;
+  typedef typename std::remove_const<
+      typename std::remove_reference<type>::type>::type value_type;
 
-  typedef typename add_const<value_type>::type const_value_type;
+  typedef typename std::add_const<value_type>::type const_value_type;
 
   static KOKKOS_INLINE_FUNCTION const_value_type& select(const_value_type& v) {
     return v;
@@ -387,50 +248,26 @@ struct if_ : public if_c<Cond::value, TrueType, FalseType> {};
 
 //----------------------------------------------------------------------------
 
-// Allows aliased types:
-template <typename T>
-struct is_integral
-    : public integral_constant<
-          bool,
-          (std::is_same<T, char>::value ||
-           std::is_same<T, unsigned char>::value ||
-           std::is_same<T, short int>::value ||
-           std::is_same<T, unsigned short int>::value ||
-           std::is_same<T, int>::value ||
-           std::is_same<T, unsigned int>::value ||
-           std::is_same<T, long int>::value ||
-           std::is_same<T, unsigned long int>::value ||
-           std::is_same<T, long long int>::value ||
-           std::is_same<T, unsigned long long int>::value ||
-
-           std::is_same<T, int8_t>::value || std::is_same<T, int16_t>::value ||
-           std::is_same<T, int32_t>::value || std::is_same<T, int64_t>::value ||
-           std::is_same<T, uint8_t>::value ||
-           std::is_same<T, uint16_t>::value ||
-           std::is_same<T, uint32_t>::value ||
-           std::is_same<T, uint64_t>::value)> {};
-//----------------------------------------------------------------------------
-
 template <typename T>
-struct is_label : public false_type {};
+struct is_label : public std::false_type {};
 
 template <>
-struct is_label<const char*> : public true_type {};
+struct is_label<const char*> : public std::true_type {};
 
 template <>
-struct is_label<char*> : public true_type {};
+struct is_label<char*> : public std::true_type {};
 
 template <int N>
-struct is_label<const char[N]> : public true_type {};
+struct is_label<const char[N]> : public std::true_type {};
 
 template <int N>
-struct is_label<char[N]> : public true_type {};
+struct is_label<char[N]> : public std::true_type {};
 
 template <>
-struct is_label<const std::string> : public true_type {};
+struct is_label<const std::string> : public std::true_type {};
 
 template <>
-struct is_label<std::string> : public true_type {};
+struct is_label<std::string> : public std::true_type {};
 
 // These 'constexpr'functions can be used as
 // both regular functions and meta-function.
@@ -515,20 +352,6 @@ struct integral_nonzero_constant<T, zero, false> {
 
 //----------------------------------------------------------------------------
 
-template <class C>
-struct is_integral_constant : public false_ {
-  typedef void integral_type;
-  enum { integral_value = 0 };
-};
-
-template <typename T, T v>
-struct is_integral_constant<integral_constant<T, v>> : public true_ {
-  typedef T integral_type;
-  enum { integral_value = v };
-};
-
-//----------------------------------------------------------------------------
-
 template <class...>
 class TypeList;
 
diff --git a/kokkos/core/src/impl/Kokkos_Utilities.hpp b/kokkos/core/src/impl/Kokkos_Utilities.hpp
index a4b49aa1f..1b095248e 100644
--- a/kokkos/core/src/impl/Kokkos_Utilities.hpp
+++ b/kokkos/core/src/impl/Kokkos_Utilities.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/impl/Kokkos_VLAEmulation.hpp b/kokkos/core/src/impl/Kokkos_VLAEmulation.hpp
index 31c60d3ba..9b9086419 100644
--- a/kokkos/core/src/impl/Kokkos_VLAEmulation.hpp
+++ b/kokkos/core/src/impl/Kokkos_VLAEmulation.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -185,7 +185,7 @@ struct ObjectWithVLAEmulation {
 
     // Note: We can't do this at class scope because it unnecessarily requires
     // vla_value_type to be a complete type
-    static_assert(not std::is_abstract<vla_value_type>::value,
+    static_assert(!std::is_abstract<vla_value_type>::value,
                   "Can't use abstract type with VLA emulation");
 
     KOKKOS_EXPECTS(num_entries >= 0);
diff --git a/kokkos/core/src/impl/Kokkos_ViewArray.hpp b/kokkos/core/src/impl/Kokkos_ViewArray.hpp
index 752c91f3c..119ad4ecc 100644
--- a/kokkos/core/src/impl/Kokkos_ViewArray.hpp
+++ b/kokkos/core/src/impl/Kokkos_ViewArray.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -338,7 +338,7 @@ class ViewMapping<Traits, Kokkos::Array<> > {
 
   //----------------------------------------
 
-  KOKKOS_INLINE_FUNCTION ~ViewMapping() {}
+  KOKKOS_DEFAULTED_FUNCTION ~ViewMapping() = default;
   KOKKOS_INLINE_FUNCTION ViewMapping()
       : m_impl_handle(), m_impl_offset(), m_stride(0) {}
   KOKKOS_INLINE_FUNCTION ViewMapping(const ViewMapping &rhs)
@@ -349,7 +349,6 @@ class ViewMapping<Traits, Kokkos::Array<> > {
     m_impl_handle = rhs.m_impl_handle;
     m_impl_offset = rhs.m_impl_offset;
     m_stride      = rhs.m_stride;
-    ;
     return *this;
   }
 
@@ -469,7 +468,7 @@ class ViewMapping<
 
   KOKKOS_INLINE_FUNCTION
   static void assign(DstType &dst, const SrcType &src,
-                     const TrackType &src_track) {
+                     const TrackType & /*src_track*/) {
     static_assert(is_assignable, "Can only convert to array_type");
 
     typedef typename DstType::offset_type dst_offset_type;
diff --git a/kokkos/core/src/impl/Kokkos_ViewCtor.hpp b/kokkos/core/src/impl/Kokkos_ViewCtor.hpp
index 3eb9179cc..93a267ffa 100644
--- a/kokkos/core/src/impl/Kokkos_ViewCtor.hpp
+++ b/kokkos/core/src/impl/Kokkos_ViewCtor.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -238,7 +238,10 @@ struct ViewCtorProp : public ViewCtorProp<void, P>... {
   /* Copy from a matching property subset */
   template <typename... Args>
   ViewCtorProp(ViewCtorProp<Args...> const &arg)
-      : ViewCtorProp<void, Args>(((ViewCtorProp<void, Args> const &)arg))... {}
+      : ViewCtorProp<void, Args>(
+            static_cast<ViewCtorProp<void, Args> const &>(arg))... {
+    (void)arg;
+  }
 };
 
 } /* namespace Impl */
diff --git a/kokkos/core/src/impl/Kokkos_ViewFillCopyETIAvail.hpp b/kokkos/core/src/impl/Kokkos_ViewFillCopyETIAvail.hpp
index 720a36564..b415cb6d5 100644
--- a/kokkos/core/src/impl/Kokkos_ViewFillCopyETIAvail.hpp
+++ b/kokkos/core/src/impl/Kokkos_ViewFillCopyETIAvail.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/impl/Kokkos_ViewFillCopyETIDecl.hpp b/kokkos/core/src/impl/Kokkos_ViewFillCopyETIDecl.hpp
index f61dece0c..e23dabd84 100644
--- a/kokkos/core/src/impl/Kokkos_ViewFillCopyETIDecl.hpp
+++ b/kokkos/core/src/impl/Kokkos_ViewFillCopyETIDecl.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/impl/Kokkos_ViewLayoutTiled.hpp b/kokkos/core/src/impl/Kokkos_ViewLayoutTiled.hpp
index 9d79b4db9..27f4375e5 100644
--- a/kokkos/core/src/impl/Kokkos_ViewLayoutTiled.hpp
+++ b/kokkos/core/src/impl/Kokkos_ViewLayoutTiled.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -601,39 +601,10 @@ struct ViewOffset<
 
   //----------------------------------------
 
-#ifdef KOKKOS_CUDA_9_DEFAULTED_BUG_WORKAROUND
-  KOKKOS_INLINE_FUNCTION ~ViewOffset() {}
-  KOKKOS_INLINE_FUNCTION ViewOffset() {}
-  KOKKOS_INLINE_FUNCTION ViewOffset(const ViewOffset& rhs)
-      : m_dim(rhs.m_dim),
-        m_tile_N0(rhs.m_tile_N0),
-        m_tile_N1(rhs.m_tile_N1),
-        m_tile_N2(rhs.m_tile_N2),
-        m_tile_N3(rhs.m_tile_N3),
-        m_tile_N4(rhs.m_tile_N4),
-        m_tile_N5(rhs.m_tile_N5),
-        m_tile_N6(rhs.m_tile_N6),
-        m_tile_N7(rhs.m_tile_N7) {}
-
-  KOKKOS_INLINE_FUNCTION ViewOffset& operator=(const ViewOffset& rhs) {
-    m_dim     = rhs.m_dim;
-    m_tile_N0 = rhs.m_tile_N0;
-    m_tile_N1 = rhs.m_tile_N1;
-    m_tile_N2 = rhs.m_tile_N2;
-    m_tile_N3 = rhs.m_tile_N3;
-    m_tile_N4 = rhs.m_tile_N4;
-    m_tile_N5 = rhs.m_tile_N5;
-    m_tile_N6 = rhs.m_tile_N6;
-    m_tile_N7 = rhs.m_tile_N7;
-    return *this;
-  }
-
-#else
-  KOKKOS_INLINE_FUNCTION ~ViewOffset()                 = default;
-  KOKKOS_INLINE_FUNCTION ViewOffset()                  = default;
-  KOKKOS_INLINE_FUNCTION ViewOffset(const ViewOffset&) = default;
-  KOKKOS_INLINE_FUNCTION ViewOffset& operator=(const ViewOffset&) = default;
-#endif
+  KOKKOS_DEFAULTED_FUNCTION ~ViewOffset()                 = default;
+  KOKKOS_DEFAULTED_FUNCTION ViewOffset()                  = default;
+  KOKKOS_DEFAULTED_FUNCTION ViewOffset(const ViewOffset&) = default;
+  KOKKOS_DEFAULTED_FUNCTION ViewOffset& operator=(const ViewOffset&) = default;
 
   template <unsigned TrivialScalarSize>
   KOKKOS_INLINE_FUNCTION constexpr ViewOffset(
diff --git a/kokkos/core/src/impl/Kokkos_ViewMapping.hpp b/kokkos/core/src/impl/Kokkos_ViewMapping.hpp
index bdfd7faae..a8dc1fb84 100644
--- a/kokkos/core/src/impl/Kokkos_ViewMapping.hpp
+++ b/kokkos/core/src/impl/Kokkos_ViewMapping.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -252,7 +252,7 @@ template <class A, class B>
 struct ViewDimensionJoin;
 
 template <size_t... A, size_t... B>
-struct ViewDimensionJoin<ViewDimension<A...>, ViewDimension<B...> > {
+struct ViewDimensionJoin<ViewDimension<A...>, ViewDimension<B...>> {
   typedef ViewDimension<A..., B...> type;
 };
 
@@ -263,7 +263,7 @@ struct ViewDimensionAssignable;
 
 template <size_t... DstArgs, size_t... SrcArgs>
 struct ViewDimensionAssignable<ViewDimension<DstArgs...>,
-                               ViewDimension<SrcArgs...> > {
+                               ViewDimension<SrcArgs...>> {
   typedef ViewDimension<DstArgs...> dst;
   typedef ViewDimension<SrcArgs...> src;
 
@@ -327,18 +327,18 @@ struct is_integral_extent_type {
 };
 
 template <class iType>
-struct is_integral_extent_type<std::pair<iType, iType> > {
+struct is_integral_extent_type<std::pair<iType, iType>> {
   enum { value = std::is_integral<iType>::value ? 1 : 0 };
 };
 
 template <class iType>
-struct is_integral_extent_type<Kokkos::pair<iType, iType> > {
+struct is_integral_extent_type<Kokkos::pair<iType, iType>> {
   enum { value = std::is_integral<iType>::value ? 1 : 0 };
 };
 
 // Assuming '2 == initializer_list<iType>::size()'
 template <class iType>
-struct is_integral_extent_type<std::initializer_list<iType> > {
+struct is_integral_extent_type<std::initializer_list<iType>> {
   enum { value = std::is_integral<iType>::value ? 1 : 0 };
 };
 
@@ -641,10 +641,10 @@ struct SubviewExtents {
     error(buf + n, buf_len - n, domain_rank + 1, range_rank + 1, dim, args...);
   }
 
+#if defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST)
   template <size_t... DimArgs, class... Args>
   KOKKOS_FORCEINLINE_FUNCTION void error(const ViewDimension<DimArgs...>& dim,
                                          Args... args) const {
-#if defined(KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST)
     enum { LEN = 1024 };
     char buffer[LEN];
 
@@ -652,10 +652,14 @@ struct SubviewExtents {
     error(buffer + n, LEN - n, 0, 0, dim, args...);
 
     Kokkos::Impl::throw_runtime_exception(std::string(buffer));
+  }
 #else
+  template <size_t... DimArgs, class... Args>
+  KOKKOS_FORCEINLINE_FUNCTION void error(const ViewDimension<DimArgs...>&,
+                                         Args...) const {
     Kokkos::abort("Kokkos::subview bounds error");
-#endif
   }
+#endif
 
 #else
 
@@ -726,18 +730,18 @@ template <class T, class Dim>
 struct ViewDataType;
 
 template <class T>
-struct ViewDataType<T, ViewDimension<> > {
+struct ViewDataType<T, ViewDimension<>> {
   typedef T type;
 };
 
 template <class T, size_t... Args>
-struct ViewDataType<T, ViewDimension<0, Args...> > {
-  typedef typename ViewDataType<T*, ViewDimension<Args...> >::type type;
+struct ViewDataType<T, ViewDimension<0, Args...>> {
+  typedef typename ViewDataType<T*, ViewDimension<Args...>>::type type;
 };
 
 template <class T, size_t N, size_t... Args>
-struct ViewDataType<T, ViewDimension<N, Args...> > {
-  typedef typename ViewDataType<T, ViewDimension<Args...> >::type type[N];
+struct ViewDataType<T, ViewDimension<N, Args...>> {
+  typedef typename ViewDataType<T, ViewDimension<Args...>>::type type[N];
 };
 
 /**\brief  Analysis of View data type.
@@ -2740,7 +2744,7 @@ struct ViewValueFunctor;
 
 template <class ExecSpace, class ValueType>
 struct ViewValueFunctor<ExecSpace, ValueType, false /* is_scalar */> {
-  typedef Kokkos::RangePolicy<ExecSpace> PolicyType;
+  typedef Kokkos::RangePolicy<ExecSpace, Kokkos::IndexType<int64_t>> PolicyType;
   typedef typename ExecSpace::execution_space Exec;
 
   Exec space;
@@ -2778,6 +2782,12 @@ struct ViewValueFunctor<ExecSpace, ValueType, false /* is_scalar */> {
                      : "Kokkos::View::initialization"),
             0, &kpID);
       }
+#endif
+#ifdef KOKKOS_ENABLE_CUDA
+      if (std::is_same<ExecSpace, Kokkos::Cuda>::value) {
+        Kokkos::Impl::cuda_prefetch_pointer(space, ptr, sizeof(ValueType) * n,
+                                            true);
+      }
 #endif
       const Kokkos::Impl::ParallelFor<ViewValueFunctor, PolicyType> closure(
           *this, PolicyType(0, n));
@@ -2800,7 +2810,7 @@ struct ViewValueFunctor<ExecSpace, ValueType, false /* is_scalar */> {
 
 template <class ExecSpace, class ValueType>
 struct ViewValueFunctor<ExecSpace, ValueType, true /* is_scalar */> {
-  typedef Kokkos::RangePolicy<ExecSpace> PolicyType;
+  typedef Kokkos::RangePolicy<ExecSpace, Kokkos::IndexType<int64_t>> PolicyType;
 
   ExecSpace space;
   ValueType* ptr;
@@ -2825,6 +2835,12 @@ struct ViewValueFunctor<ExecSpace, ValueType, true /* is_scalar */> {
         Kokkos::Profiling::beginParallelFor("Kokkos::View::initialization", 0,
                                             &kpID);
       }
+#endif
+#ifdef KOKKOS_ENABLE_CUDA
+      if (std::is_same<ExecSpace, Kokkos::Cuda>::value) {
+        Kokkos::Impl::cuda_prefetch_pointer(space, ptr, sizeof(ValueType) * n,
+                                            true);
+      }
 #endif
       const Kokkos::Impl::ParallelFor<ViewValueFunctor, PolicyType> closure(
           *this, PolicyType(0, n));
@@ -3069,7 +3085,7 @@ class ViewMapping<
 
   //----------------------------------------
 
-  KOKKOS_INLINE_FUNCTION ~ViewMapping() {}
+  KOKKOS_DEFAULTED_FUNCTION ~ViewMapping() = default;
   KOKKOS_INLINE_FUNCTION ViewMapping() : m_impl_handle(), m_impl_offset() {}
   KOKKOS_INLINE_FUNCTION ViewMapping(const ViewMapping& rhs)
       : m_impl_handle(rhs.m_impl_handle), m_impl_offset(rhs.m_impl_offset) {}
@@ -3493,7 +3509,7 @@ struct SubViewDataTypeImpl;
 
 /* base case */
 template <class ValueType>
-struct SubViewDataTypeImpl<void, ValueType, Experimental::Extents<> > {
+struct SubViewDataTypeImpl<void, ValueType, Kokkos::Experimental::Extents<>> {
   using type = ValueType;
 };
 
@@ -3503,16 +3519,17 @@ template <class ValueType, ptrdiff_t Ext, ptrdiff_t... Exts, class Integral,
 struct SubViewDataTypeImpl<
     typename std::enable_if<
         std::is_integral<typename std::decay<Integral>::type>::value>::type,
-    ValueType, Experimental::Extents<Ext, Exts...>, Integral, Args...>
-    : SubViewDataTypeImpl<void, ValueType, Experimental::Extents<Exts...>,
-                          Args...> {};
+    ValueType, Kokkos::Experimental::Extents<Ext, Exts...>, Integral, Args...>
+    : SubViewDataTypeImpl<void, ValueType,
+                          Kokkos::Experimental::Extents<Exts...>, Args...> {};
 
 /* for ALL slice, subview has the same dimension */
 template <class ValueType, ptrdiff_t Ext, ptrdiff_t... Exts, class... Args>
-struct SubViewDataTypeImpl<void, ValueType, Experimental::Extents<Ext, Exts...>,
-                           ALL_t, Args...>
+struct SubViewDataTypeImpl<void, ValueType,
+                           Kokkos::Experimental::Extents<Ext, Exts...>, ALL_t,
+                           Args...>
     : SubViewDataTypeImpl<void, typename ApplyExtent<ValueType, Ext>::type,
-                          Experimental::Extents<Exts...>, Args...> {};
+                          Kokkos::Experimental::Extents<Exts...>, Args...> {};
 
 /* for pair-style slice, subview has dynamic dimension, since pair doesn't give
  * static sizes */
@@ -3522,10 +3539,10 @@ template <class ValueType, ptrdiff_t Ext, ptrdiff_t... Exts, class PairLike,
           class... Args>
 struct SubViewDataTypeImpl<
     typename std::enable_if<is_pair_like<PairLike>::value>::type, ValueType,
-    Experimental::Extents<Ext, Exts...>, PairLike, Args...>
+    Kokkos::Experimental::Extents<Ext, Exts...>, PairLike, Args...>
     : SubViewDataTypeImpl<
           void, typename make_all_extents_into_pointers<ValueType>::type*,
-          Experimental::Extents<Exts...>, Args...> {};
+          Kokkos::Experimental::Extents<Exts...>, Args...> {};
 
 template <class ValueType, class Exts, class... Args>
 struct SubViewDataType : SubViewDataTypeImpl<void, ValueType, Exts, Args...> {};
diff --git a/kokkos/core/src/impl/Kokkos_ViewTile.hpp b/kokkos/core/src/impl/Kokkos_ViewTile.hpp
index 7e6f1b1ae..342927ef7 100644
--- a/kokkos/core/src/impl/Kokkos_ViewTile.hpp
+++ b/kokkos/core/src/impl/Kokkos_ViewTile.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -146,22 +146,10 @@ struct ViewOffset<
 
   //----------------------------------------
 
-#ifdef KOKKOS_CUDA_9_DEFAULTED_BUG_WORKAROUND
-  KOKKOS_INLINE_FUNCTION ~ViewOffset() {}
-  KOKKOS_INLINE_FUNCTION ViewOffset() {}
-  KOKKOS_INLINE_FUNCTION ViewOffset(const ViewOffset& rhs)
-      : m_dim(rhs.m_dim), m_tile_N0(rhs.m_tile_N0) {}
-  KOKKOS_INLINE_FUNCTION ViewOffset& operator=(const ViewOffset& rhs) {
-    m_dim     = rhs.m_dim;
-    m_tile_N0 = rhs.m_tile_N0;
-    return *this;
-  }
-#else
-  KOKKOS_INLINE_FUNCTION ~ViewOffset()                 = default;
-  KOKKOS_INLINE_FUNCTION ViewOffset()                  = default;
-  KOKKOS_INLINE_FUNCTION ViewOffset(const ViewOffset&) = default;
-  KOKKOS_INLINE_FUNCTION ViewOffset& operator=(const ViewOffset&) = default;
-#endif
+  KOKKOS_DEFAULTED_FUNCTION ~ViewOffset()                 = default;
+  KOKKOS_DEFAULTED_FUNCTION ViewOffset()                  = default;
+  KOKKOS_DEFAULTED_FUNCTION ViewOffset(const ViewOffset&) = default;
+  KOKKOS_DEFAULTED_FUNCTION ViewOffset& operator=(const ViewOffset&) = default;
 
   template <unsigned TrivialScalarSize>
   KOKKOS_INLINE_FUNCTION constexpr ViewOffset(
diff --git a/kokkos/core/src/impl/Kokkos_ViewUniformType.hpp b/kokkos/core/src/impl/Kokkos_ViewUniformType.hpp
index feb1b8f2f..7ce3a532b 100644
--- a/kokkos/core/src/impl/Kokkos_ViewUniformType.hpp
+++ b/kokkos/core/src/impl/Kokkos_ViewUniformType.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/impl/Kokkos_Volatile_Load.hpp b/kokkos/core/src/impl/Kokkos_Volatile_Load.hpp
index b3c4233b9..3626a1f17 100644
--- a/kokkos/core/src/impl/Kokkos_Volatile_Load.hpp
+++ b/kokkos/core/src/impl/Kokkos_Volatile_Load.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/impl/Kokkos_hwloc.cpp b/kokkos/core/src/impl/Kokkos_hwloc.cpp
index 3e1a698a9..04507b098 100644
--- a/kokkos/core/src/impl/Kokkos_hwloc.cpp
+++ b/kokkos/core/src/impl/Kokkos_hwloc.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/src/kokkos.pc.in b/kokkos/core/src/kokkos.pc.in
deleted file mode 100644
index 191dd7a4f..000000000
--- a/kokkos/core/src/kokkos.pc.in
+++ /dev/null
@@ -1,71 +0,0 @@
-# 
-#                        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)
-# 
-
-# Add the directory where kokkos.pc got installed to your PKG_CONFIG_PATH
-
-# Use this on commandline with:
-# c++ `pkg-config --cflags --libs kokkos` -o myapp myapp.cpp
-
-# Use this in a Makefile:
-# myapp: myapp.cpp
-#       $(CC) `pkg-config --cflags --libs kokkos` -o $@ $<
-
-# Use this in autotools:
-# configure.ac:
-# PKG_CHECK_MODULES([KOKKOS], [kokkos])
-# Makefile.am:
-# myapp_CFLAGS = $(KOKKOS_CFLAGS)
-# myapp_LDADD = $(KOKKOS_LIBS)
-
-# Use this in CMake:
-# CMakeLists.txt:
-# find_package(PkgConfig)
-# pkg_check_modules(KOKKOS IMPORTED_TARGET kokkos)
-# target_link_libraries(<lib> PkgConfig::KOKKOS)
-
-libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
-
-Name: kokkos
-Description: Kokkos C++ Performance Portability Programming EcoSystem
-URL: https://github.com/kokkos
-Version: @Kokkos_VERSION@
-Requires:
-Libs: -L${libdir} -lkokkos @KOKKOS_EXTRA_LIBS_LIST@ @KOKKOS_LINK_FLAGS@
-Libs.private: -lm
-Cflags: -I${includedir} @KOKKOS_CXXFLAGS@
diff --git a/kokkos/core/unit_test/CMakeLists.txt b/kokkos/core/unit_test/CMakeLists.txt
index c0957e83a..dec2f5e92 100644
--- a/kokkos/core/unit_test/CMakeLists.txt
+++ b/kokkos/core/unit_test/CMakeLists.txt
@@ -12,8 +12,38 @@ KOKKOS_ADD_TEST_LIBRARY(
   HEADERS ${GTEST_SOURCE_DIR}/gtest/gtest.h
   SOURCES ${GTEST_SOURCE_DIR}/gtest/gtest-all.cc
 )
-KOKKOS_TARGET_COMPILE_DEFINITIONS(kokkos_gtest PUBLIC "-DGTEST_HAS_PTHREAD=0")
-KOKKOS_TARGET_INCLUDE_DIRECTORIES(kokkos_gtest PUBLIC ${GTEST_SOURCE_DIR})
+#These can be direct, no need for Tribits or Kokkos wrappers
+
+# WORKAROUND FOR HIPCC
+IF(Kokkos_ENABLE_HIP)
+  TARGET_COMPILE_DEFINITIONS(kokkos_gtest PUBLIC "-DGTEST_HAS_PTHREAD=0 --amdgpu-target=gfx906")
+ELSE()
+  TARGET_COMPILE_DEFINITIONS(kokkos_gtest PUBLIC "-DGTEST_HAS_PTHREAD=0")
+ENDIF()
+
+TARGET_INCLUDE_DIRECTORIES(kokkos_gtest PUBLIC ${GTEST_SOURCE_DIR})
+#Gtest minimally requires C++11
+TARGET_COMPILE_FEATURES(kokkos_gtest PUBLIC cxx_std_11)
+
+#
+# Define Incremental Testing Feature Levels
+# Define Device name mappings (i.e. what comes after Kokkos:: for the ExecSpace)
+#
+
+SET(KOKKOS_CUDA_FEATURE_LEVEL 999)
+SET(KOKKOS_CUDA_NAME Cuda)
+SET(KOKKOS_HIP_FEATURE_LEVEL 12)
+SET(KOKKOS_HIP_NAME Experimental::HIP)
+SET(KOKKOS_HPX_FEATURE_LEVEL 999)
+SET(KOKKOS_HPX_NAME Experimental::HPX)
+SET(KOKKOS_OPENMP_FEATURE_LEVEL 999)
+SET(KOKKOS_OPENMP_NAME OpenMP)
+SET(KOKKOS_OPENMPTARGET_FEATURE_LEVEL 10)
+SET(KOKKOS_OPENMPTARGET_NAME Experimental::OpenMPTarget)
+SET(KOKKOS_SERIAL_FEATURE_LEVEL 999)
+SET(KOKKOS_SERIAL_NAME Serial)
+SET(KOKKOS_THREADS_FEATURE_LEVEL 999)
+SET(KOKKOS_THREADS_NAME Threads)
 
 
 #
@@ -24,7 +54,7 @@ KOKKOS_TARGET_INCLUDE_DIRECTORIES(kokkos_gtest PUBLIC ${GTEST_SOURCE_DIR})
 KOKKOS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
 KOKKOS_INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR})
 
-foreach(Tag Threads;Serial;OpenMP;Cuda;HPX)
+foreach(Tag Threads;Serial;OpenMP;Cuda;HPX;OpenMPTarget;HIP)
   # Because there is always an exception to the rule
   if(Tag STREQUAL "Threads")
     set(DEVICE "PTHREAD")
@@ -46,6 +76,7 @@ foreach(Tag Threads;Serial;OpenMP;Cuda;HPX)
       ${dir}/Test${Tag}_AtomicOperations_complexfloat.cpp
       ${dir}/Test${Tag}_AtomicViews.cpp
       ${dir}/Test${Tag}_Atomics.cpp
+      ${dir}/Test${Tag}_Concepts.cpp
       ${dir}/Test${Tag}_Complex.cpp
       ${dir}/Test${Tag}_Crs.cpp
       ${dir}/Test${Tag}_DeepCopyAlignment.cpp
@@ -59,6 +90,7 @@ foreach(Tag Threads;Serial;OpenMP;Cuda;HPX)
       ${dir}/Test${Tag}_MDRange_e.cpp
       ${dir}/Test${Tag}_Other.cpp
       ${dir}/Test${Tag}_RangePolicy.cpp
+      ${dir}/Test${Tag}_RangePolicyRequire.cpp
       ${dir}/Test${Tag}_Reductions.cpp
       ${dir}/Test${Tag}_Reducers_a.cpp
       ${dir}/Test${Tag}_Reducers_b.cpp
@@ -104,6 +136,30 @@ foreach(Tag Threads;Serial;OpenMP;Cuda;HPX)
   )
 endforeach()
 
+if(Kokkos_ENABLE_OPENMPTARGET)
+  list(REMOVE_ITEM OpenMPTarget_SOURCES
+    openmptarget/TestOpenMPTarget_AtomicOperations_complexdouble.cpp
+    openmptarget/TestOpenMPTarget_MDRange_a.cpp
+    openmptarget/TestOpenMPTarget_MDRange_b.cpp
+    openmptarget/TestOpenMPTarget_MDRange_c.cpp
+    openmptarget/TestOpenMPTarget_MDRange_d.cpp
+    openmptarget/TestOpenMPTarget_MDRange_e.cpp
+    openmptarget/TestOpenMPTarget_Other.cpp
+    openmptarget/TestOpenMPTarget_Scan.cpp
+    openmptarget/TestOpenMPTarget_Team.cpp
+    openmptarget/TestOpenMPTarget_TeamScratch.cpp
+    openmptarget/TestOpenMPTarget_ViewAPI_e.cpp
+    openmptarget/TestOpenMPTarget_ViewMapping_subview.cpp
+    openmptarget/TestOpenMPTarget_ViewOfClass.cpp
+  )
+endif()
+
+if(Kokkos_ENABLE_HIP)
+  # FIXME Linktime error: undefined reference to
+  # Kokkos::Impl::ViewDimensin<0ul, ...>(unsigned int, ...)
+  list(REMOVE_ITEM Serial_SOURCES serial/TestSerial_ViewLayoutStrideAssignment.cpp)
+endif()
+
 if(Kokkos_ENABLE_SERIAL)
   KOKKOS_ADD_EXECUTABLE_AND_TEST(
     UnitTest_Serial
@@ -150,42 +206,11 @@ if(Kokkos_ENABLE_HPX)
   )
 endif()
 
-if(Kokkos_ENABLE_QTHREADS)
+if(Kokkos_ENABLE_OPENMPTARGET)
   KOKKOS_ADD_EXECUTABLE_AND_TEST(
-    UnitTest_Qthreads
+    UnitTest_OpenMPTarget
     SOURCES
-      UnitTestMainInit.cpp
-      qthreads/TestQthreads_Atomics.cpp
-      qthreads/TestQthreads_Complex.cpp
-      qthreads/TestQthreads_DeepCopyAlignment.cpp
-      qthreads/TestQthreads_Other.cpp
-      qthreads/TestQthreads_Reductions.cpp
-      qthreads/TestQthreads_Reducers_a.cpp
-      qthreads/TestQthreads_Reducers_b.cpp
-      qthreads/TestQthreads_Reducers_c.cpp
-      qthreads/TestQthreads_Reducers_d.cpp
-      qthreads/TestQthreads_SubView_a.cpp
-      qthreads/TestQthreads_SubView_b.cpp
-      qthreads/TestQthreads_SubView_c01.cpp
-      qthreads/TestQthreads_SubView_c02.cpp
-      qthreads/TestQthreads_SubView_c03.cpp
-      qthreads/TestQthreads_SubView_c04.cpp
-      qthreads/TestQthreads_SubView_c05.cpp
-      qthreads/TestQthreads_SubView_c06.cpp
-      qthreads/TestQthreads_SubView_c07.cpp
-      qthreads/TestQthreads_SubView_c08.cpp
-      qthreads/TestQthreads_SubView_c09.cpp
-      qthreads/TestQthreads_SubView_c10.cpp
-      qthreads/TestQthreads_SubView_c11.cpp
-      qthreads/TestQthreads_SubView_c12.cpp
-      qthreads/TestQthreads_SubView_c13.cpp
-      qthreads/TestQthreads_Team.cpp
-      qthreads/TestQthreads_View_64bit.cpp
-      qthreads/TestQthreads_ViewAPI_a.cpp
-      qthreads/TestQthreads_ViewAPI_b.cpp
-      qthreads/TestQthreads_ViewAPI_c.cpp
-      qthreads/TestQthreads_ViewAPI_d.cpp
-      qthreads/TestQthreads_ViewAPI_e.cpp
+    ${OpenMPTarget_SOURCES}
   )
 endif()
 
@@ -233,22 +258,66 @@ if(Kokkos_ENABLE_CUDA)
   )
 endif()
 
+if(Kokkos_ENABLE_HIP)
+  # FIXME_HIP
+  LIST(REMOVE_ITEM HIP_SOURCES
+    hip/TestHIP_AtomicOperations_complexdouble.cpp
+    hip/TestHIP_Other.cpp
+    hip/TestHIP_Reductions_DeviceView.cpp
+    hip/TestHIP_Team.cpp
+    hip/TestHIP_TeamReductionScan.cpp
+    hip/TestHIP_TeamScratch.cpp
+    hip/TestHIP_TeamTeamSize.cpp
+    hip/TestHIP_TeamVectorRange.cpp
+    hip/TestHIP_UniqueToken.cpp
+    hip/TestHIP_ViewAPI_a.cpp
+    hip/TestHIP_ViewAPI_b.cpp
+    hip/TestHIP_ViewAPI_e.cpp
+    hip/TestHIP_ViewLayoutStrideAssignment.cpp
+    hip/TestHIP_WorkGraph.cpp
+  )
+
+  KOKKOS_ADD_EXECUTABLE_AND_TEST(
+    UnitTest_HIP
+    SOURCES
+      ${HIP_SOURCES}
+      hip/TestHIPHostPinned_ViewAPI_a.cpp
+      hip/TestHIPHostPinned_ViewAPI_b.cpp
+      hip/TestHIPHostPinned_ViewAPI_c.cpp
+      hip/TestHIPHostPinned_ViewAPI_d.cpp
+      hip/TestHIPHostPinned_ViewAPI_e.cpp
+      hip/TestHIPHostPinned_ViewCopy.cpp
+      hip/TestHIPHostPinned_ViewMapping_a.cpp
+      hip/TestHIPHostPinned_ViewMapping_b.cpp
+      hip/TestHIPHostPinned_ViewMapping_subview.cpp
+  )
+  KOKKOS_ADD_EXECUTABLE_AND_TEST(
+    UnitTest_HIPInterOpInit
+    SOURCES
+      UnitTestMain.cpp
+      hip/TestHIP_InterOp_Init.cpp
+  )
+endif()
+
+SET(DEFAULT_DEVICE_SOURCES
+  UnitTestMainInit.cpp
+  default/TestDefaultDeviceType.cpp
+  default/TestDefaultDeviceType_a1.cpp
+  default/TestDefaultDeviceType_b1.cpp
+  default/TestDefaultDeviceType_c1.cpp
+  default/TestDefaultDeviceType_a2.cpp
+  default/TestDefaultDeviceType_b2.cpp
+  default/TestDefaultDeviceType_c2.cpp
+  default/TestDefaultDeviceType_a3.cpp
+  default/TestDefaultDeviceType_b3.cpp
+  default/TestDefaultDeviceType_c3.cpp
+  default/TestDefaultDeviceType_d.cpp
+  default/TestDefaultDeviceTypeResize.cpp
+)
+
 KOKKOS_ADD_EXECUTABLE_AND_TEST(
   UnitTest_Default
-  SOURCES
-    UnitTestMainInit.cpp
-    default/TestDefaultDeviceType.cpp
-    default/TestDefaultDeviceType_a1.cpp
-    default/TestDefaultDeviceType_b1.cpp
-    default/TestDefaultDeviceType_c1.cpp
-    default/TestDefaultDeviceType_a2.cpp
-    default/TestDefaultDeviceType_b2.cpp
-    default/TestDefaultDeviceType_c2.cpp
-    default/TestDefaultDeviceType_a3.cpp
-    default/TestDefaultDeviceType_b3.cpp
-    default/TestDefaultDeviceType_c3.cpp
-    default/TestDefaultDeviceType_d.cpp
-    default/TestDefaultDeviceTypeResize.cpp
+  SOURCES ${DEFAULT_DEVICE_SOURCES}
 )
 
 KOKKOS_ADD_EXECUTABLE_AND_TEST(
@@ -275,6 +344,7 @@ KOKKOS_ADD_ADVANCED_TEST( UnitTest_PushFinalizeHook_terminate
     ALWAYS_FAIL_ON_ZERO_RETURN
 )
 
+if(NOT KOKKOS_HAS_TRILINOS)
 KOKKOS_ADD_TEST_EXECUTABLE(
   StackTraceTestExec
   SOURCES
@@ -287,20 +357,9 @@ KOKKOS_ADD_TEST_EXECUTABLE(
 )
 # We need -rdynamic on GNU platforms for the stacktrace functionality
 # to work correctly with shared libraries
-if(NOT KOKKOS_HAS_TRILINOS)
-SET_PROPERTY(TARGET StackTraceTestExec PROPERTY ENABLE_EXPORTS 1)
-
-KOKKOS_ADD_TEST( NAME UnitTest_StackTraceTest_normal
-                 EXE  StackTraceTestExec 
-                 FAIL_REGULAR_EXPRESSION "FAILED"
-               )
-
-KOKKOS_ADD_TEST( NAME UnitTest_StackTraceTest_terminate
-                 EXE  StackTraceTestExec
-                 FAIL_REGULAR_EXPRESSION "FAILED"
-               )
+KOKKOS_SET_EXE_PROPERTY(StackTraceTestExec ENABLE_EXPORTS ON)
 
-KOKKOS_ADD_TEST( NAME UnitTest_StackTraceTest_generic_term
+KOKKOS_ADD_TEST( NAME UnitTest_StackTraceTest
                  EXE  StackTraceTestExec
                  FAIL_REGULAR_EXPRESSION "FAILED"
                )
@@ -325,5 +384,52 @@ KOKKOS_ADD_EXECUTABLE_AND_TEST(
   SOURCES UnitTestMain.cpp  TestHostBarrier.cpp
 )
 
+FUNCTION (KOKKOS_ADD_INCREMENTAL_TEST DEVICE)
+  KOKKOS_OPTION( ${DEVICE}_EXCLUDE_TESTS "" STRING "Incremental test exclude list" )
+  # Add unit test main
+  SET(${DEVICE}_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/UnitTestMainInit.cpp)
+
+  # Iterate over incremental tests in directory
 
+  APPEND_GLOB(INCREMENTAL_FILE_LIST ${CMAKE_CURRENT_SOURCE_DIR}/incremental/*.hpp)
 
+  SET(DEVICE_NAME ${KOKKOS_${DEVICE}_NAME})
+  FOREACH (CURRENT_FILE_PATH ${INCREMENTAL_FILE_LIST})
+    GET_FILENAME_COMPONENT( CURRENT_FILE_NAME ${CURRENT_FILE_PATH} NAME )
+    STRING (REPLACE ".hpp" "" CURRENT_TEST_NAME ${CURRENT_FILE_NAME})
+    IF (NOT CURRENT_TEST_NAME IN_LIST Kokkos_${DEVICE}_EXCLUDE_TESTS)
+       SET (CURRENT_TEST_OUTPUT_FILENAME ${CURRENT_TEST_NAME}_${DEVICE})
+       FILE( STRINGS ${CURRENT_FILE_PATH} CURRENT_REQUIRED_FEATURE_LINE REGEX "Kokkos_Feature_Level_Required" )
+       # From each test get level implementation required
+       STRING( REGEX REPLACE ".*Kokkos_Feature_Level_Required:" "" CURRENT_REQUIRED_FEATURE_LEVEL ${CURRENT_REQUIRED_FEATURE_LINE} )
+       # Cross-reference list of dependencies with selected feature list > matching feature test files are added to test applications
+       IF (KOKKOS_${DEVICE}_FEATURE_LEVEL GREATER_EQUAL CURRENT_REQUIRED_FEATURE_LEVEL)
+          CONFIGURE_FILE (IncrementalTest.cpp.in ${CMAKE_BINARY_DIR}/core/unit_test/generated/${CURRENT_TEST_OUTPUT_FILENAME}.cpp )
+          SET(${DEVICE}_SOURCES ${${DEVICE}_SOURCES}; ${CMAKE_BINARY_DIR}/core/unit_test/generated/${CURRENT_TEST_OUTPUT_FILENAME}.cpp)
+       ENDIF()
+     ENDIF()
+  ENDFOREACH()
+
+  STRING(TOUPPER ${DEVICE} UC_DEVICE)
+
+  KOKKOS_OPTION (
+    ENABLE_${UC_DEVICE} ON BOOL "ENABLE ${UC_DEVICE}"
+  )
+
+  KOKKOS_ADD_EXECUTABLE_AND_TEST(
+    IncrementalTest_${DEVICE}
+    SOURCES ${${DEVICE}_SOURCES}
+  )
+
+  TARGET_INCLUDE_DIRECTORIES( ${PACKAGE_NAME}_IncrementalTest_${DEVICE} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/incremental )
+
+ENDFUNCTION()
+
+FOREACH (DEVICE ${KOKKOS_ENABLED_DEVICES})
+  KOKKOS_ADD_INCREMENTAL_TEST(${DEVICE})
+ENDFOREACH()
+
+KOKKOS_ADD_EXECUTABLE_AND_TEST(
+  UnitTest_CTestDevice
+  SOURCES UnitTestMain.cpp  TestCTestDevice.cpp
+)
diff --git a/kokkos/core/unit_test/IncrementalTest.cpp.in b/kokkos/core/unit_test/IncrementalTest.cpp.in
new file mode 100644
index 000000000..e4358efe9
--- /dev/null
+++ b/kokkos/core/unit_test/IncrementalTest.cpp.in
@@ -0,0 +1,58 @@
+//@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
+
+#ifndef KOKKOS_TEST_@BACK_END_NAME@_@CURRENT_TEST_NAME@
+#define KOKKOS_TEST_@BACK_END_NAME@_@CURRENT_TEST_NAME@
+
+#include <gtest/gtest.h>
+#include <Kokkos_Macros.hpp>
+
+#define TEST_CATEGORY @DEVICE@
+#define TEST_EXECSPACE Kokkos::@DEVICE_NAME@
+
+#if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
+#include <@CURRENT_FILE_NAME@>
+#endif
+
+#endif
+
+
diff --git a/kokkos/core/unit_test/Makefile b/kokkos/core/unit_test/Makefile
index cf945bd71..1a386adc4 100644
--- a/kokkos/core/unit_test/Makefile
+++ b/kokkos/core/unit_test/Makefile
@@ -8,7 +8,7 @@ vpath %.cpp ${KOKKOS_PATH}/core/unit_test/serial
 vpath %.cpp ${KOKKOS_PATH}/core/unit_test/threads
 vpath %.cpp ${KOKKOS_PATH}/core/unit_test/openmp
 vpath %.cpp ${KOKKOS_PATH}/core/unit_test/openmptarget
-vpath %.cpp ${KOKKOS_PATH}/core/unit_test/qthreads
+vpath %.cpp ${KOKKOS_PATH}/core/unit_test/hip
 vpath %.cpp ${KOKKOS_PATH}/core/unit_test/hpx
 vpath %.cpp ${KOKKOS_PATH}/core/unit_test/cuda
 vpath %.cpp ${KOKKOS_PATH}/core/unit_test/rocm
@@ -67,7 +67,7 @@ ifeq ($(KOKKOS_INTERNAL_USE_CUDA), 1)
     OBJ_CUDA = UnitTestMainInit.o gtest-all.o
     OBJ_CUDA += TestCuda_Init.o
     OBJ_CUDA += TestCuda_SharedAlloc.o TestCudaUVM_SharedAlloc.o TestCudaHostPinned_SharedAlloc.o
-    OBJ_CUDA += TestCuda_RangePolicy.o
+    OBJ_CUDA += TestCuda_RangePolicy.o TestCuda_RangePolicyRequire.o
     OBJ_CUDA += TestCuda_ViewAPI_a.o TestCuda_ViewAPI_b.o TestCuda_ViewAPI_c.o TestCuda_ViewAPI_d.o TestCuda_ViewAPI_e.o
     OBJ_CUDA += TestCuda_DeepCopyAlignment.o
     OBJ_CUDA += TestCuda_ViewMapping_a.o TestCuda_ViewMapping_b.o TestCuda_ViewMapping_subview.o TestCuda_ViewResize.o TestCuda_ViewLayoutStrideAssignment.o
@@ -103,7 +103,7 @@ ifeq ($(KOKKOS_INTERNAL_USE_CUDA), 1)
     OBJ_CUDA += TestCuda_LocalDeepCopy.o
     OBJ_CUDA += TestCuda_DebugSerialExecution.o
     OBJ_CUDA += TestCuda_DebugPinUVMSpace.o
-  
+
     TARGETS += KokkosCore_UnitTest_Cuda
     TARGETS += KokkosCore_UnitTest_CudaInterOpInit
     TARGETS += KokkosCore_UnitTest_CudaInterOpStreams
@@ -166,7 +166,7 @@ ifeq ($(KOKKOS_INTERNAL_USE_PTHREADS), 1)
     OBJ_THREADS = UnitTestMainInit.o gtest-all.o
     OBJ_THREADS += TestThreads_Init.o
     OBJ_THREADS += TestThreads_SharedAlloc.o
-    OBJ_THREADS += TestThreads_RangePolicy.o
+    OBJ_THREADS += TestThreads_RangePolicy.o TestThreads_RangePolicyRequire.o
     OBJ_THREADS += TestThreads_View_64bit.o
     OBJ_THREADS += TestThreads_ViewAPI_a.o TestThreads_ViewAPI_b.o TestThreads_ViewAPI_c.o TestThreads_ViewAPI_d.o TestThreads_ViewAPI_e.o
     OBJ_THREADS += TestThreads_DeepCopyAlignment.o
@@ -201,7 +201,7 @@ ifeq ($(KOKKOS_INTERNAL_USE_OPENMP), 1)
     OBJ_OPENMP = UnitTestMainInit.o gtest-all.o
     OBJ_OPENMP += TestOpenMP_Init.o
     OBJ_OPENMP += TestOpenMP_SharedAlloc.o
-    OBJ_OPENMP += TestOpenMP_RangePolicy.o
+    OBJ_OPENMP += TestOpenMP_RangePolicy.o TestOpenMP_RangePolicyRequire.o
     OBJ_OPENMP += TestOpenMP_View_64bit.o
     OBJ_OPENMP += TestOpenMP_ViewAPI_a.o TestOpenMP_ViewAPI_b.o TestOpenMP_ViewAPI_c.o TestOpenMP_ViewAPI_d.o TestOpenMP_ViewAPI_e.o
     OBJ_OPENMP += TestOpenMP_DeepCopyAlignment.o
@@ -242,11 +242,12 @@ ifeq ($(KOKKOS_INTERNAL_USE_OPENMPTARGET), 1)
     OBJ_OPENMPTARGET += TestOpenMPTarget_Init.o
     #OBJ_OPENMPTARGET += TestOpenMPTarget_SharedAlloc.o
     OBJ_OPENMPTARGET += TestOpenMPTarget_RangePolicy.o
-    OBJ_OPENMPTARGET += TestOpenMPTarget_ViewAPI_a.o TestOpenMPTarget_ViewAPI_b.o TestOpenMPTarget_ViewAPI_c.o TestOpenMPTarget_ViewAPI_d.o TestOpenMPTarget_ViewAPI_e.o #Some commented out code
+    OBJ_OPENMPTARGET += TestOpenMPTarget_ViewAPI_a.o TestOpenMPTarget_ViewAPI_b.o TestOpenMPTarget_ViewAPI_c.o TestOpenMPTarget_ViewAPI_d.o  #Some commented out code
+    #OBJ_OPENMPTARGET += TestOpenMPTarget_ViewAPI_e.o
     OBJ_OPENMPTARGET += TestOpenMPTarget_DeepCopyAlignment.o
     OBJ_OPENMPTARGET += TestOpenMPTarget_ViewMapping_a.o
     OBJ_OPENMPTARGET += TestOpenMPTarget_ViewMapping_b.o
-    OBJ_OPENMPTARGET += TestOpenMPTarget_ViewMapping_subview.o
+    #OBJ_OPENMPTARGET += TestOpenMPTarget_ViewMapping_subview.o
     #OBJ_OPENMPTARGET += TestOpenMPTarget_ViewOfClass.o
     OBJ_OPENMPTARGET += TestOpenMPTarget_SubView_a.o TestOpenMPTarget_SubView_b.o
     #The following subview tests need something like UVM:
@@ -255,12 +256,13 @@ ifeq ($(KOKKOS_INTERNAL_USE_OPENMPTARGET), 1)
     #OBJ_OPENMPTARGET += TestOpenMPTarget_SubView_c07.o TestOpenMPTarget_SubView_c08.o TestOpenMPTarget_SubView_c09.o
     #OBJ_OPENMPTARGET += TestOpenMPTarget_SubView_c10.o TestOpenMPTarget_SubView_c11.o TestOpenMPTarget_SubView_c12.o
     #OBJ_OPENMPTARGET += TestOpenMPTarget_Reductions.o # Need custom reductions
-    #OBJ_OPENMPTARGET += TestOpenMPTarget_Reducers_a.o TestOpenMPTarget_Reducers_b.o TestOpenMPTarget_Reducers_c.o TestOpenMPTarget_Reducers_d.o
+    OBJ_OPENMPTARGET += TestOpenMPTarget_Reducers_a.o TestOpenMPTarget_Reducers_b.o TestOpenMPTarget_Reducers_c.o TestOpenMPTarget_Reducers_d.o
     #OBJ_OPENMPTARGET += TestOpenMPTarget_Scan.o
     OBJ_OPENMPTARGET += TestOpenMPTarget_Complex.o
     OBJ_OPENMPTARGET += TestOpenMPTarget_AtomicOperations_int.o TestOpenMPTarget_AtomicOperations_unsignedint.o TestOpenMPTarget_AtomicOperations_longint.o
     OBJ_OPENMPTARGET += TestOpenMPTarget_AtomicOperations_unsignedlongint.o TestOpenMPTarget_AtomicOperations_longlongint.o TestOpenMPTarget_AtomicOperations_double.o TestOpenMPTarget_AtomicOperations_float.o
-    OBJ_OPENMPTARGET += TestOpenMPTarget_AtomicOperations_complexfloat.o TestOpenMPTarget_AtomicOperations_complexdouble.o
+    #OBJ_OPENMPTARGET += TestOpenMPTarget_AtomicOperations_complexfloat.o 
+    #OBJ_OPENMPTARGET += TestOpenMPTarget_AtomicOperations_complexdouble.o
     OBJ_OPENMPTARGET += TestOpenMPTarget_AtomicViews.o
     OBJ_OPENMPTARGET += TestOpenMPTarget_Atomics.o # Commented Out Arbitrary Type Atomics
     #OBJ_OPENMPTARGET += TestOpenMPTarget_Team.o # There is still a static function in this
@@ -275,28 +277,26 @@ ifeq ($(KOKKOS_INTERNAL_USE_OPENMPTARGET), 1)
     TEST_TARGETS += test-openmptarget
 endif
 
-ifeq ($(KOKKOS_INTERNAL_USE_QTHREADS), 1)
-    OBJ_QTHREADS = TestQthreads_Other.o TestQthreads_Reductions.o TestQthreads_Atomics.o TestQthreads_Team.o
-    OBJ_QTHREADS += TestQthreads_SubView_a.o TestQthreads_SubView_b.o
-    OBJ_QTHREADS += TestQthreads_SubView_c01.o TestQthreads_SubView_c02.o TestQthreads_SubView_c03.o
-    OBJ_QTHREADS += TestQthreads_SubView_c04.o TestQthreads_SubView_c05.o TestQthreads_SubView_c06.o
-    OBJ_QTHREADS += TestQthreads_SubView_c07.o TestQthreads_SubView_c08.o TestQthreads_SubView_c09.o
-    OBJ_QTHREADS += TestQthreads_SubView_c10.o TestQthreads_SubView_c11.o TestQthreads_SubView_c12.o
-    OBJ_QTHREADS += TestQthreads_ViewAPI_a.o TestQthreads_ViewAPI_b.o TestQthreads_ViewAPI_c.o TestQthreads_ViewAPI_d.o TestQthreads_ViewAPI_e.o UnitTestMain.o gtest-all.o
-    TARGETS += KokkosCore_UnitTest_Qthreads
-
-    OBJ_QTHREADS2 = UnitTestMainInit.o gtest-all.o
-    OBJ_QTHREADS2 += TestQthreads_Complex.o
-    TARGETS += KokkosCore_UnitTest_Qthreads2
-
-    TEST_TARGETS += test-qthreads
+ifeq ($(KOKKOS_INTERNAL_USE_HIP), 1)
+	OBJ_HIP = UnitTestMainInit.o gtest-all.o
+	OBJ_HIP += TestHIP_Init.o
+	OBJ_HIP += TestHIP_Reducers_a.o TestHIP_Reducers_b.o TestHIP_Reducers_c.o TestHIP_Reducers_d.o
+	OBJ_HIP += TestHIP_Reductions.o
+	OBJ_HIP += TestHIP_MDRange_a.o TestHIP_MDRange_b.o TestHIP_MDRange_c.o TestHIP_MDRange_d.o TestHIP_MDRange_e.o
+	OBJ_HIP += TestHIP_Spaces.o
+	OBJ_HIP += TestHIPHostPinned_ViewCopy.o TestHIPHostPinned_ViewAPI_a.o TestHIPHostPinned_ViewAPI_b.o TestHIPHostPinned_ViewAPI_c.o TestHIPHostPinned_ViewAPI_d.o TestHIPHostPinned_ViewAPI_e.o
+	OBJ_HIP += TestHIPHostPinned_ViewMapping_a.o TestHIPHostPinned_ViewMapping_b.o TestHIPHostPinned_ViewMapping_subview.o
+
+	TARGETS += KokkosCore_UnitTest_HIP
+
+	TEST_TARGETS += test-hip
 endif
 
 ifeq ($(KOKKOS_INTERNAL_USE_HPX), 1)
 	OBJ_HPX = UnitTestMainInit.o gtest-all.o
 	OBJ_HPX += TestHPX_Init.o
 	OBJ_HPX += TestHPX_SharedAlloc.o
-	OBJ_HPX += TestHPX_RangePolicy.o
+	OBJ_HPX += TestHPX_RangePolicy.o TestHPX_RangePolicyRequire.o
 	OBJ_HPX += TestHPX_View_64bit.o
 	OBJ_HPX += TestHPX_ViewAPI_a.o TestHPX_ViewAPI_b.o TestHPX_ViewAPI_c.o TestHPX_ViewAPI_d.o TestHPX_ViewAPI_e.o
 	OBJ_HPX += TestHPX_ViewMapping_a.o TestHPX_ViewMapping_b.o TestHPX_ViewMapping_subview.o TestHPX_ViewResize.o
@@ -335,7 +335,7 @@ ifeq ($(KOKKOS_INTERNAL_USE_SERIAL), 1)
     OBJ_SERIAL = UnitTestMainInit.o gtest-all.o
     OBJ_SERIAL += TestSerial_Init.o
     OBJ_SERIAL += TestSerial_SharedAlloc.o
-    OBJ_SERIAL += TestSerial_RangePolicy.o
+    OBJ_SERIAL += TestSerial_RangePolicy.o TestSerial_RangePolicyRequire.o
     OBJ_SERIAL += TestSerial_View_64bit.o
     OBJ_SERIAL += TestSerial_ViewAPI_a.o TestSerial_ViewAPI_b.o TestSerial_ViewAPI_c.o TestSerial_ViewAPI_d.o TestSerial_ViewAPI_e.o
     OBJ_SERIAL += TestSerial_DeepCopyAlignment.o
@@ -414,7 +414,7 @@ TEST_TARGETS += ${INITTESTS_TEST_TARGETS}
 
 KokkosCore_UnitTest_Cuda: $(OBJ_CUDA) $(KOKKOS_LINK_DEPENDS)
 	$(LINK) $(EXTRA_PATH) $(OBJ_CUDA) $(KOKKOS_LIBS) $(LIB) $(KOKKOS_LDFLAGS) $(LDFLAGS) -o KokkosCore_UnitTest_Cuda
-	
+
 KokkosCore_UnitTest_CudaInterOpInit: UnitTestMain.o gtest-all.o TestCuda_InterOp_Init.o $(KOKKOS_LINK_DEPENDS)
 	$(LINK) $(EXTRA_PATH) UnitTestMain.o gtest-all.o TestCuda_InterOp_Init.o $(KOKKOS_LIBS) $(LIB) $(KOKKOS_LDFLAGS) $(LDFLAGS) -o KokkosCore_UnitTest_CudaInterOpInit
 KokkosCore_UnitTest_CudaInterOpStreams: UnitTestMain.o gtest-all.o TestCuda_InterOp_Streams.o $(KOKKOS_LINK_DEPENDS)
@@ -438,11 +438,8 @@ KokkosCore_UnitTest_OpenMPTarget: $(OBJ_OPENMPTARGET) $(KOKKOS_LINK_DEPENDS)
 KokkosCore_UnitTest_Serial: $(OBJ_SERIAL) $(KOKKOS_LINK_DEPENDS)
 	$(LINK) $(EXTRA_PATH) $(OBJ_SERIAL) $(KOKKOS_LIBS) $(LIB) $(KOKKOS_LDFLAGS) $(LDFLAGS) -o KokkosCore_UnitTest_Serial
 
-KokkosCore_UnitTest_Qthreads: $(OBJ_QTHREADS) $(KOKKOS_LINK_DEPENDS)
-	$(LINK) $(EXTRA_PATH) $(OBJ_QTHREADS) $(KOKKOS_LIBS) $(LIB) $(KOKKOS_LDFLAGS) $(LDFLAGS) -o KokkosCore_UnitTest_Qthreads
-
-KokkosCore_UnitTest_Qthreads2: $(OBJ_QTHREADS2) $(KOKKOS_LINK_DEPENDS)
-	$(LINK) $(EXTRA_PATH) $(OBJ_QTHREADS2) $(KOKKOS_LIBS) $(LIB) $(KOKKOS_LDFLAGS) $(LDFLAGS) -o KokkosCore_UnitTest_Qthreads2
+KokkosCore_UnitTest_HIP: $(OBJ_HIP) $(KOKKOS_LINK_DEPENDS)
+	$(LINK) $(EXTRA_PATH) $(OBJ_HIP) $(KOKKOS_LIBS) $(LIB) $(KOKKOS_LDFLAGS) $(LDFLAGS) -o KokkosCore_UnitTest_HIP
 
 KokkosCore_UnitTest_HPX: $(OBJ_HPX) $(KOKKOS_LINK_DEPENDS)
 	$(LINK) $(EXTRA_PATH) $(OBJ_HPX) $(KOKKOS_LIBS) $(LIB) $(KOKKOS_LDFLAGS) $(LDFLAGS) -o KokkosCore_UnitTest_HPX
@@ -496,9 +493,8 @@ test-openmptarget: KokkosCore_UnitTest_OpenMPTarget
 test-serial: KokkosCore_UnitTest_Serial
 	./KokkosCore_UnitTest_Serial
 
-test-qthreads: KokkosCore_UnitTest_Qthreads KokkosCore_UnitTest_Qthreads2
-	./KokkosCore_UnitTest_Qthreads
-	./KokkosCore_UnitTest_Qthreads2
+test-hip: KokkosCore_UnitTest_HIP
+	./KokkosCore_UnitTest_HIP
 
 test-hpx: KokkosCore_UnitTest_HPX
 	./KokkosCore_UnitTest_HPX
diff --git a/kokkos/core/unit_test/TestAggregate.hpp b/kokkos/core/unit_test/TestAggregate.hpp
index 2aab19cfa..1f812cc11 100644
--- a/kokkos/core/unit_test/TestAggregate.hpp
+++ b/kokkos/core/unit_test/TestAggregate.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/TestAtomic.hpp b/kokkos/core/unit_test/TestAtomic.hpp
index f8ed85c28..809f9dc01 100644
--- a/kokkos/core/unit_test/TestAtomic.hpp
+++ b/kokkos/core/unit_test/TestAtomic.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -527,7 +527,19 @@ TEST(TEST_CATEGORY, atomics) {
   ASSERT_TRUE((TestAtomic::Loop<float, TEST_EXECSPACE>(100, 3)));
 
 #ifndef KOKKOS_ENABLE_OPENMPTARGET
-#ifndef KOKKOS_ENABLE_ROCM  // ROCM doesn't yet support atomics for >64bit types
+  ASSERT_TRUE((TestAtomic::Loop<Kokkos::complex<float>, TEST_EXECSPACE>(1, 1)));
+  ASSERT_TRUE((TestAtomic::Loop<Kokkos::complex<float>, TEST_EXECSPACE>(1, 2)));
+  ASSERT_TRUE((TestAtomic::Loop<Kokkos::complex<float>, TEST_EXECSPACE>(1, 3)));
+
+  ASSERT_TRUE(
+      (TestAtomic::Loop<Kokkos::complex<float>, TEST_EXECSPACE>(100, 1)));
+  ASSERT_TRUE(
+      (TestAtomic::Loop<Kokkos::complex<float>, TEST_EXECSPACE>(100, 2)));
+  ASSERT_TRUE(
+      (TestAtomic::Loop<Kokkos::complex<float>, TEST_EXECSPACE>(100, 3)));
+
+  // FIXME_HIP HIP doesn't yet support atomics for >64bit types properly
+#ifndef KOKKOS_ENABLE_HIP
   ASSERT_TRUE(
       (TestAtomic::Loop<Kokkos::complex<double>, TEST_EXECSPACE>(1, 1)));
   ASSERT_TRUE(
@@ -542,17 +554,8 @@ TEST(TEST_CATEGORY, atomics) {
   ASSERT_TRUE(
       (TestAtomic::Loop<Kokkos::complex<double>, TEST_EXECSPACE>(100, 3)));
 
-  ASSERT_TRUE((TestAtomic::Loop<Kokkos::complex<float>, TEST_EXECSPACE>(1, 1)));
-  ASSERT_TRUE((TestAtomic::Loop<Kokkos::complex<float>, TEST_EXECSPACE>(1, 2)));
-  ASSERT_TRUE((TestAtomic::Loop<Kokkos::complex<float>, TEST_EXECSPACE>(1, 3)));
-
-  ASSERT_TRUE(
-      (TestAtomic::Loop<Kokkos::complex<float>, TEST_EXECSPACE>(100, 1)));
-  ASSERT_TRUE(
-      (TestAtomic::Loop<Kokkos::complex<float>, TEST_EXECSPACE>(100, 2)));
-  ASSERT_TRUE(
-      (TestAtomic::Loop<Kokkos::complex<float>, TEST_EXECSPACE>(100, 3)));
-
+// WORKAROUND MSVC
+#ifndef _WIN32
   ASSERT_TRUE(
       (TestAtomic::Loop<TestAtomic::SuperScalar<4>, TEST_EXECSPACE>(100, 1)));
   ASSERT_TRUE(
@@ -561,6 +564,7 @@ TEST(TEST_CATEGORY, atomics) {
       (TestAtomic::Loop<TestAtomic::SuperScalar<4>, TEST_EXECSPACE>(100, 3)));
 #endif
 #endif
+#endif
 }
 
 }  // namespace Test
diff --git a/kokkos/core/unit_test/TestAtomicOperations.hpp b/kokkos/core/unit_test/TestAtomicOperations.hpp
index e9852e2f0..109adaa1b 100644
--- a/kokkos/core/unit_test/TestAtomicOperations.hpp
+++ b/kokkos/core/unit_test/TestAtomicOperations.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/TestAtomicOperations_complexdouble.hpp b/kokkos/core/unit_test/TestAtomicOperations_complexdouble.hpp
index a50da3670..612247d03 100644
--- a/kokkos/core/unit_test/TestAtomicOperations_complexdouble.hpp
+++ b/kokkos/core/unit_test/TestAtomicOperations_complexdouble.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/TestAtomicOperations_complexfloat.hpp b/kokkos/core/unit_test/TestAtomicOperations_complexfloat.hpp
index bb8c5752b..e812d3207 100644
--- a/kokkos/core/unit_test/TestAtomicOperations_complexfloat.hpp
+++ b/kokkos/core/unit_test/TestAtomicOperations_complexfloat.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/TestAtomicOperations_double.hpp b/kokkos/core/unit_test/TestAtomicOperations_double.hpp
index fd6ac6e4d..ba9937e1c 100644
--- a/kokkos/core/unit_test/TestAtomicOperations_double.hpp
+++ b/kokkos/core/unit_test/TestAtomicOperations_double.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/TestAtomicOperations_float.hpp b/kokkos/core/unit_test/TestAtomicOperations_float.hpp
index f12275ef4..aa56b5ff1 100644
--- a/kokkos/core/unit_test/TestAtomicOperations_float.hpp
+++ b/kokkos/core/unit_test/TestAtomicOperations_float.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/TestAtomicOperations_int.hpp b/kokkos/core/unit_test/TestAtomicOperations_int.hpp
index 6b14635d6..f828be622 100644
--- a/kokkos/core/unit_test/TestAtomicOperations_int.hpp
+++ b/kokkos/core/unit_test/TestAtomicOperations_int.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/TestAtomicOperations_longint.hpp b/kokkos/core/unit_test/TestAtomicOperations_longint.hpp
index 39703f137..eee44c957 100644
--- a/kokkos/core/unit_test/TestAtomicOperations_longint.hpp
+++ b/kokkos/core/unit_test/TestAtomicOperations_longint.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/TestAtomicOperations_longlongint.hpp b/kokkos/core/unit_test/TestAtomicOperations_longlongint.hpp
index 5bbc9539e..73d4a61d7 100644
--- a/kokkos/core/unit_test/TestAtomicOperations_longlongint.hpp
+++ b/kokkos/core/unit_test/TestAtomicOperations_longlongint.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/TestAtomicOperations_unsignedint.hpp b/kokkos/core/unit_test/TestAtomicOperations_unsignedint.hpp
index 0c92eb319..02f337c57 100644
--- a/kokkos/core/unit_test/TestAtomicOperations_unsignedint.hpp
+++ b/kokkos/core/unit_test/TestAtomicOperations_unsignedint.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/TestAtomicOperations_unsignedlongint.hpp b/kokkos/core/unit_test/TestAtomicOperations_unsignedlongint.hpp
index 11e4bf66f..f4340475f 100644
--- a/kokkos/core/unit_test/TestAtomicOperations_unsignedlongint.hpp
+++ b/kokkos/core/unit_test/TestAtomicOperations_unsignedlongint.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/TestAtomicViews.hpp b/kokkos/core/unit_test/TestAtomicViews.hpp
index 2a629d970..109598e8c 100644
--- a/kokkos/core/unit_test/TestAtomicViews.hpp
+++ b/kokkos/core/unit_test/TestAtomicViews.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -97,8 +97,8 @@ struct TestViewOperator_LeftAndRight<DataType, DeviceType, 1> {
   right_view right;
   stride_view left_stride;
   stride_view right_stride;
-  long left_alloc;
-  long right_alloc;
+  int64_t left_alloc;
+  int64_t right_alloc;
 
   TestViewOperator_LeftAndRight()
       : left("left"),
@@ -255,11 +255,11 @@ class TestAtomicViewAPI {
     ASSERT_EQ(ax.use_count(), size_t(4));
     ASSERT_EQ(const_ax.use_count(), ax.use_count());
 
-    ASSERT_FALSE(ax.data() == 0);
-    ASSERT_FALSE(const_ax.data() == 0);  // referenceable ptr
-    ASSERT_FALSE(unmanaged_ax.data() == 0);
-    ASSERT_FALSE(unmanaged_ax_from_ptr_dx.data() == 0);
-    ASSERT_FALSE(ay.data() == 0);
+    ASSERT_FALSE(ax.data() == nullptr);
+    ASSERT_FALSE(const_ax.data() == nullptr);  // referenceable ptr
+    ASSERT_FALSE(unmanaged_ax.data() == nullptr);
+    ASSERT_FALSE(unmanaged_ax_from_ptr_dx.data() == nullptr);
+    ASSERT_FALSE(ay.data() == nullptr);
     //    ASSERT_NE( ax, ay );
     //    Above test results in following runtime error from gtest:
     //    Expected: (ax) != (ay), actual: 32-byte object <30-01 D0-A0 D8-7F
@@ -318,13 +318,13 @@ struct InitFunctor_Seq {
   typedef Kokkos::View<T*, execution_space> view_type;
 
   view_type input;
-  const long length;
+  const int64_t length;
 
-  InitFunctor_Seq(view_type& input_, const long length_)
+  InitFunctor_Seq(view_type& input_, const int64_t length_)
       : input(input_), length(length_) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator()(const long i) const {
+  void operator()(const int64_t i) const {
     if (i < length) {
       input(i) = (T)i;
     }
@@ -336,15 +336,15 @@ struct InitFunctor_ModTimes {
   typedef Kokkos::View<T*, execution_space> view_type;
 
   view_type input;
-  const long length;
-  const long remainder;
+  const int64_t length;
+  const int64_t remainder;
 
-  InitFunctor_ModTimes(view_type& input_, const long length_,
-                       const long remainder_)
+  InitFunctor_ModTimes(view_type& input_, const int64_t length_,
+                       const int64_t remainder_)
       : input(input_), length(length_), remainder(remainder_) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator()(const long i) const {
+  void operator()(const int64_t i) const {
     if (i < length) {
       if (i % (remainder + 1) == remainder) {
         input(i) = (T)2;
@@ -360,15 +360,15 @@ struct InitFunctor_ModShift {
   typedef Kokkos::View<T*, execution_space> view_type;
 
   view_type input;
-  const long length;
-  const long remainder;
+  const int64_t length;
+  const int64_t remainder;
 
-  InitFunctor_ModShift(view_type& input_, const long length_,
-                       const long remainder_)
+  InitFunctor_ModShift(view_type& input_, const int64_t length_,
+                       const int64_t remainder_)
       : input(input_), length(length_), remainder(remainder_) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator()(const long i) const {
+  void operator()(const int64_t i) const {
     if (i < length) {
       if (i % (remainder + 1) == remainder) {
         input(i) = 1;
@@ -390,15 +390,15 @@ struct PlusEqualAtomicViewFunctor {
 
   view_type input;
   atomic_view_type even_odd_result;
-  const long length;
+  const int64_t length;
 
   // Wrap the result view in an atomic view, use this for operator
   PlusEqualAtomicViewFunctor(const view_type& input_,
-                             view_type& even_odd_result_, const long length_)
+                             view_type& even_odd_result_, const int64_t length_)
       : input(input_), even_odd_result(even_odd_result_), length(length_) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator()(const long i) const {
+  void operator()(const int64_t i) const {
     if (i < length) {
       if (i % 2 == 0) {
         even_odd_result(0) += input(i);
@@ -410,11 +410,11 @@ struct PlusEqualAtomicViewFunctor {
 };
 
 template <class T, class execution_space>
-T PlusEqualAtomicView(const long input_length) {
+T PlusEqualAtomicView(const int64_t input_length) {
   typedef Kokkos::View<T*, execution_space> view_type;
   typedef typename view_type::HostMirror host_view_type;
 
-  const long length = input_length;
+  const int64_t length = input_length;
 
   view_type input("input_view", length);
   view_type result_view("result_view", 2);
@@ -435,19 +435,19 @@ T PlusEqualAtomicView(const long input_length) {
 }
 
 template <class T>
-T PlusEqualAtomicViewCheck(const long input_length) {
-  const long N = input_length;
+T PlusEqualAtomicViewCheck(const int64_t input_length) {
+  const int64_t N = input_length;
   T result[2];
 
   if (N % 2 == 0) {
-    const long half_sum_end = (N / 2) - 1;
-    const long full_sum_end = N - 1;
+    const int64_t half_sum_end = (N / 2) - 1;
+    const int64_t full_sum_end = N - 1;
     result[0] = half_sum_end * (half_sum_end + 1) / 2;  // Even sum.
     result[1] =
         (full_sum_end * (full_sum_end + 1) / 2) - result[0];  // Odd sum.
   } else {
-    const long half_sum_end = (T)(N / 2);
-    const long full_sum_end = N - 2;
+    const int64_t half_sum_end = (T)(N / 2);
+    const int64_t full_sum_end = N - 2;
     result[0] = half_sum_end * (half_sum_end - 1) / 2;  // Even sum.
     result[1] =
         (full_sum_end * (full_sum_end - 1) / 2) - result[0];  // Odd sum.
@@ -457,7 +457,7 @@ T PlusEqualAtomicViewCheck(const long input_length) {
 }
 
 template <class T, class DeviceType>
-bool PlusEqualAtomicViewTest(long input_length) {
+bool PlusEqualAtomicViewTest(int64_t input_length) {
   T res       = PlusEqualAtomicView<T, DeviceType>(input_length);
   T resSerial = PlusEqualAtomicViewCheck<T>(input_length);
 
@@ -487,15 +487,16 @@ struct MinusEqualAtomicViewFunctor {
 
   view_type input;
   atomic_view_type even_odd_result;
-  const long length;
+  const int64_t length;
 
   // Wrap the result view in an atomic view, use this for operator.
   MinusEqualAtomicViewFunctor(const view_type& input_,
-                              view_type& even_odd_result_, const long length_)
+                              view_type& even_odd_result_,
+                              const int64_t length_)
       : input(input_), even_odd_result(even_odd_result_), length(length_) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator()(const long i) const {
+  void operator()(const int64_t i) const {
     if (i < length) {
       if (i % 2 == 0) {
         even_odd_result(0) -= input(i);
@@ -507,11 +508,11 @@ struct MinusEqualAtomicViewFunctor {
 };
 
 template <class T, class execution_space>
-T MinusEqualAtomicView(const long input_length) {
+T MinusEqualAtomicView(const int64_t input_length) {
   typedef Kokkos::View<T*, execution_space> view_type;
   typedef typename view_type::HostMirror host_view_type;
 
-  const long length = input_length;
+  const int64_t length = input_length;
 
   view_type input("input_view", length);
   view_type result_view("result_view", 2);
@@ -532,19 +533,19 @@ T MinusEqualAtomicView(const long input_length) {
 }
 
 template <class T>
-T MinusEqualAtomicViewCheck(const long input_length) {
-  const long N = input_length;
+T MinusEqualAtomicViewCheck(const int64_t input_length) {
+  const int64_t N = input_length;
   T result[2];
 
   if (N % 2 == 0) {
-    const long half_sum_end = (N / 2) - 1;
-    const long full_sum_end = N - 1;
+    const int64_t half_sum_end = (N / 2) - 1;
+    const int64_t full_sum_end = N - 1;
     result[0] = -1 * (half_sum_end * (half_sum_end + 1) / 2);  // Even sum.
     result[1] =
         -1 * ((full_sum_end * (full_sum_end + 1) / 2) + result[0]);  // Odd sum.
   } else {
-    const long half_sum_end = (long)(N / 2);
-    const long full_sum_end = N - 2;
+    const int64_t half_sum_end = (int64_t)(N / 2);
+    const int64_t full_sum_end = N - 2;
     result[0] = -1 * (half_sum_end * (half_sum_end - 1) / 2);  // Even sum.
     result[1] =
         -1 * ((full_sum_end * (full_sum_end - 1) / 2) + result[0]);  // Odd sum.
@@ -554,7 +555,7 @@ T MinusEqualAtomicViewCheck(const long input_length) {
 }
 
 template <class T, class DeviceType>
-bool MinusEqualAtomicViewTest(long input_length) {
+bool MinusEqualAtomicViewTest(int64_t input_length) {
   T res       = MinusEqualAtomicView<T, DeviceType>(input_length);
   T resSerial = MinusEqualAtomicViewCheck<T>(input_length);
 
@@ -584,15 +585,15 @@ struct TimesEqualAtomicViewFunctor {
 
   view_type input;
   atomic_view_type result;
-  const long length;
+  const int64_t length;
 
   // Wrap the result view in an atomic view, use this for operator
   TimesEqualAtomicViewFunctor(const view_type& input_, view_type& result_,
-                              const long length_)
+                              const int64_t length_)
       : input(input_), result(result_), length(length_) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator()(const long i) const {
+  void operator()(const int64_t i) const {
     if (i < length && i > 0) {
       result(0) *= (double)input(i);
     }
@@ -600,11 +601,11 @@ struct TimesEqualAtomicViewFunctor {
 };
 
 template <class T, class execution_space>
-T TimesEqualAtomicView(const long input_length, const long remainder) {
+T TimesEqualAtomicView(const int64_t input_length, const int64_t remainder) {
   typedef Kokkos::View<T*, execution_space> view_type;
   typedef typename view_type::HostMirror host_view_type;
 
-  const long length = input_length;
+  const int64_t length = input_length;
 
   view_type input("input_view", length);
   view_type result_view("result_view", 1);
@@ -626,12 +627,13 @@ T TimesEqualAtomicView(const long input_length, const long remainder) {
 }
 
 template <class T>
-T TimesEqualAtomicViewCheck(const long input_length, const long remainder) {
+T TimesEqualAtomicViewCheck(const int64_t input_length,
+                            const int64_t remainder) {
   // Analytical result.
-  const long N = input_length;
-  T result     = 1.0;
+  const int64_t N = input_length;
+  T result        = 1.0;
 
-  for (long i = 2; i < N; ++i) {
+  for (int64_t i = 2; i < N; ++i) {
     if (i % (remainder + 1) == remainder) {
       result *= 2.0;
     } else {
@@ -643,8 +645,8 @@ T TimesEqualAtomicViewCheck(const long input_length, const long remainder) {
 }
 
 template <class T, class DeviceType>
-bool TimesEqualAtomicViewTest(const long input_length) {
-  const long remainder = 23;
+bool TimesEqualAtomicViewTest(const int64_t input_length) {
+  const int64_t remainder = 23;
   T res       = TimesEqualAtomicView<T, DeviceType>(input_length, remainder);
   T resSerial = TimesEqualAtomicViewCheck<T>(input_length, remainder);
 
@@ -675,15 +677,15 @@ struct DivEqualAtomicViewFunctor {
 
   view_type input;
   atomic_view_type result;
-  const long length;
+  const int64_t length;
 
   // Wrap the result view in an atomic view, use this for operator.
   DivEqualAtomicViewFunctor(const view_type& input_, scalar_view_type& result_,
-                            const long length_)
+                            const int64_t length_)
       : input(input_), result(result_), length(length_) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator()(const long i) const {
+  void operator()(const int64_t i) const {
     if (i < length && i > 0) {
       result() /= (double)(input(i));
     }
@@ -691,12 +693,12 @@ struct DivEqualAtomicViewFunctor {
 };
 
 template <class T, class execution_space>
-T DivEqualAtomicView(const long input_length, const long remainder) {
+T DivEqualAtomicView(const int64_t input_length, const int64_t remainder) {
   typedef Kokkos::View<T*, execution_space> view_type;
   typedef Kokkos::View<T, execution_space> scalar_view_type;
   typedef typename scalar_view_type::HostMirror host_scalar_view_type;
 
-  const long length = input_length;
+  const int64_t length = input_length;
 
   view_type input("input_view", length);
   scalar_view_type result_view("result_view");
@@ -718,10 +720,10 @@ T DivEqualAtomicView(const long input_length, const long remainder) {
 }
 
 template <class T>
-T DivEqualAtomicViewCheck(const long input_length, const long remainder) {
-  const long N = input_length;
-  T result     = 12121212121.0;
-  for (long i = 2; i < N; ++i) {
+T DivEqualAtomicViewCheck(const int64_t input_length, const int64_t remainder) {
+  const int64_t N = input_length;
+  T result        = 12121212121.0;
+  for (int64_t i = 2; i < N; ++i) {
     if (i % (remainder + 1) == remainder) {
       result /= 1.0;
     } else {
@@ -733,8 +735,8 @@ T DivEqualAtomicViewCheck(const long input_length, const long remainder) {
 }
 
 template <class T, class DeviceType>
-bool DivEqualAtomicViewTest(const long input_length) {
-  const long remainder = 23;
+bool DivEqualAtomicViewTest(const int64_t input_length) {
+  const int64_t remainder = 23;
 
   T res       = DivEqualAtomicView<T, DeviceType>(input_length, remainder);
   T resSerial = DivEqualAtomicViewCheck<T>(input_length, remainder);
@@ -766,15 +768,15 @@ struct ModEqualAtomicViewFunctor {
 
   view_type input;
   atomic_view_type result;
-  const long length;
+  const int64_t length;
 
   // Wrap the result view in an atomic view, use this for operator.
   ModEqualAtomicViewFunctor(const view_type& input_, scalar_view_type& result_,
-                            const long length_)
+                            const int64_t length_)
       : input(input_), result(result_), length(length_) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator()(const long i) const {
+  void operator()(const int64_t i) const {
     if (i < length && i > 0) {
       result() %= (double)(input(i));
     }
@@ -782,12 +784,12 @@ struct ModEqualAtomicViewFunctor {
 };
 
 template <class T, class execution_space>
-T ModEqualAtomicView(const long input_length, const long remainder) {
+T ModEqualAtomicView(const int64_t input_length, const int64_t remainder) {
   typedef Kokkos::View<T*, execution_space> view_type;
   typedef Kokkos::View<T, execution_space> scalar_view_type;
   typedef typename scalar_view_type::HostMirror host_scalar_view_type;
 
-  const long length = input_length;
+  const int64_t length = input_length;
 
   view_type input("input_view", length);
   scalar_view_type result_view("result_view");
@@ -809,10 +811,10 @@ T ModEqualAtomicView(const long input_length, const long remainder) {
 }
 
 template <class T>
-T ModEqualAtomicViewCheck(const long input_length, const long remainder) {
-  const long N = input_length;
-  T result     = 12121212121;
-  for (long i = 2; i < N; ++i) {
+T ModEqualAtomicViewCheck(const int64_t input_length, const int64_t remainder) {
+  const int64_t N = input_length;
+  T result        = 12121212121;
+  for (int64_t i = 2; i < N; ++i) {
     if (i % (remainder + 1) == remainder) {
       result %= 1;
     } else {
@@ -824,12 +826,12 @@ T ModEqualAtomicViewCheck(const long input_length, const long remainder) {
 }
 
 template <class T, class DeviceType>
-bool ModEqualAtomicViewTest(const long input_length) {
+bool ModEqualAtomicViewTest(const int64_t input_length) {
   static_assert(std::is_integral<T>::value,
                 "ModEqualAtomicView Error: Type must be integral type for this "
                 "unit test");
 
-  const long remainder = 23;
+  const int64_t remainder = 23;
 
   T res       = ModEqualAtomicView<T, DeviceType>(input_length, remainder);
   T resSerial = ModEqualAtomicViewCheck<T>(input_length, remainder);
@@ -861,16 +863,16 @@ struct RSEqualAtomicViewFunctor {
 
   const view_type input;
   atomic_view_type result;
-  const long length;
-  const long value;
+  const int64_t length;
+  const int64_t value;
 
   // Wrap the result view in an atomic view, use this for operator.
   RSEqualAtomicViewFunctor(const view_type& input_, result_view_type& result_,
-                           const long& length_, const long& value_)
+                           const int64_t& length_, const int64_t& value_)
       : input(input_), result(result_), length(length_), value(value_) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator()(const long i) const {
+  void operator()(const int64_t i) const {
     if (i < length) {
       if (i % 4 == 0) {
         result(1, 0, 0, 0) >>= input(i);
@@ -886,13 +888,13 @@ struct RSEqualAtomicViewFunctor {
 };
 
 template <class T, class execution_space>
-T RSEqualAtomicView(const long input_length, const long value,
-                    const long remainder) {
+T RSEqualAtomicView(const int64_t input_length, const int64_t value,
+                    const int64_t remainder) {
   typedef Kokkos::View<T*, execution_space> view_type;
   typedef Kokkos::View<T****, execution_space> result_view_type;
   typedef typename result_view_type::HostMirror host_scalar_view_type;
 
-  const long length = input_length;
+  const int64_t length = input_length;
 
   view_type input("input_view", length);
   result_view_type result_view("result_view", 2, 2, 2, 2);
@@ -918,8 +920,8 @@ T RSEqualAtomicView(const long input_length, const long value,
 }
 
 template <class T>
-T RSEqualAtomicViewCheck(const long input_length, const long value,
-                         const long remainder) {
+T RSEqualAtomicViewCheck(const int64_t input_length, const int64_t value,
+                         const int64_t remainder) {
   T result[4];
   result[0] = value;
   result[1] = value;
@@ -927,7 +929,7 @@ T RSEqualAtomicViewCheck(const long input_length, const long value,
   result[3] = value;
 
   T* input = new T[input_length];
-  for (long i = 0; i < input_length; ++i) {
+  for (int64_t i = 0; i < input_length; ++i) {
     if (i % (remainder + 1) == remainder) {
       input[i] = 1;
     } else {
@@ -935,7 +937,7 @@ T RSEqualAtomicViewCheck(const long input_length, const long value,
     }
   }
 
-  for (long i = 0; i < input_length; ++i) {
+  for (int64_t i = 0; i < input_length; ++i) {
     if (i % 4 == 0) {
       result[0] >>= input[i];
     } else if (i % 4 == 1) {
@@ -953,12 +955,12 @@ T RSEqualAtomicViewCheck(const long input_length, const long value,
 }
 
 template <class T, class DeviceType>
-bool RSEqualAtomicViewTest(const long input_length) {
+bool RSEqualAtomicViewTest(const int64_t input_length) {
   static_assert(std::is_integral<T>::value,
                 "RSEqualAtomicViewTest: Must be integral type for test");
 
-  const long remainder = 61042;       // prime - 1
-  const long value     = 1073741825;  //  2^30+1
+  const int64_t remainder = 61042;       // prime - 1
+  const int64_t value     = 1073741825;  //  2^30+1
   T res = RSEqualAtomicView<T, DeviceType>(input_length, value, remainder);
   T resSerial = RSEqualAtomicViewCheck<T>(input_length, value, remainder);
 
@@ -989,16 +991,16 @@ struct LSEqualAtomicViewFunctor {
 
   view_type input;
   atomic_view_type result;
-  const long length;
-  const long value;
+  const int64_t length;
+  const int64_t value;
 
   // Wrap the result view in an atomic view, use this for operator.
   LSEqualAtomicViewFunctor(const view_type& input_, result_view_type& result_,
-                           const long& length_, const long& value_)
+                           const int64_t& length_, const int64_t& value_)
       : input(input_), result(result_), length(length_), value(value_) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator()(const long i) const {
+  void operator()(const int64_t i) const {
     if (i < length) {
       if (i % 4 == 0) {
         result(1, 0, 0, 0) <<= input(i);
@@ -1014,13 +1016,13 @@ struct LSEqualAtomicViewFunctor {
 };
 
 template <class T, class execution_space>
-T LSEqualAtomicView(const long input_length, const long value,
-                    const long remainder) {
+T LSEqualAtomicView(const int64_t input_length, const int64_t value,
+                    const int64_t remainder) {
   typedef Kokkos::View<T*, execution_space> view_type;
   typedef Kokkos::View<T****, execution_space> result_view_type;
   typedef typename result_view_type::HostMirror host_scalar_view_type;
 
-  const long length = input_length;
+  const int64_t length = input_length;
 
   view_type input("input_view", length);
   result_view_type result_view("result_view", 2, 2, 2, 2);
@@ -1046,8 +1048,8 @@ T LSEqualAtomicView(const long input_length, const long value,
 }
 
 template <class T>
-T LSEqualAtomicViewCheck(const long input_length, const long value,
-                         const long remainder) {
+T LSEqualAtomicViewCheck(const int64_t input_length, const int64_t value,
+                         const int64_t remainder) {
   T result[4];
   result[0] = value;
   result[1] = value;
@@ -1055,7 +1057,7 @@ T LSEqualAtomicViewCheck(const long input_length, const long value,
   result[3] = value;
 
   T* input = new T[input_length];
-  for (long i = 0; i < input_length; ++i) {
+  for (int64_t i = 0; i < input_length; ++i) {
     if (i % (remainder + 1) == remainder) {
       input[i] = 1;
     } else {
@@ -1063,7 +1065,7 @@ T LSEqualAtomicViewCheck(const long input_length, const long value,
     }
   }
 
-  for (long i = 0; i < input_length; ++i) {
+  for (int64_t i = 0; i < input_length; ++i) {
     if (i % 4 == 0) {
       result[0] <<= input[i];
     } else if (i % 4 == 1) {
@@ -1081,12 +1083,12 @@ T LSEqualAtomicViewCheck(const long input_length, const long value,
 }
 
 template <class T, class DeviceType>
-bool LSEqualAtomicViewTest(const long input_length) {
+bool LSEqualAtomicViewTest(const int64_t input_length) {
   static_assert(std::is_integral<T>::value,
                 "LSEqualAtomicViewTest: Must be integral type for test");
 
-  const long remainder = 61042;  // prime - 1
-  const long value     = 1;      //  2^30+1
+  const int64_t remainder = 61042;  // prime - 1
+  const int64_t value     = 1;      //  2^30+1
   T res = LSEqualAtomicView<T, DeviceType>(input_length, value, remainder);
   T resSerial = LSEqualAtomicViewCheck<T>(input_length, value, remainder);
 
@@ -1116,15 +1118,15 @@ struct AndEqualAtomicViewFunctor {
 
   view_type input;
   atomic_view_type even_odd_result;
-  const long length;
+  const int64_t length;
 
   // Wrap the result view in an atomic view, use this for operator.
   AndEqualAtomicViewFunctor(const view_type& input_,
-                            view_type& even_odd_result_, const long length_)
+                            view_type& even_odd_result_, const int64_t length_)
       : input(input_), even_odd_result(even_odd_result_), length(length_) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator()(const long i) const {
+  void operator()(const int64_t i) const {
     if (i < length) {
       if (i % 2 == 0) {
         even_odd_result(0) &= input(i);
@@ -1136,11 +1138,11 @@ struct AndEqualAtomicViewFunctor {
 };
 
 template <class T, class execution_space>
-T AndEqualAtomicView(const long input_length) {
+T AndEqualAtomicView(const int64_t input_length) {
   typedef Kokkos::View<T*, execution_space> view_type;
   typedef typename view_type::HostMirror host_view_type;
 
-  const long length = input_length;
+  const int64_t length = input_length;
 
   view_type input("input_view", length);
   view_type result_view("result_view", 2);
@@ -1162,10 +1164,10 @@ T AndEqualAtomicView(const long input_length) {
 }
 
 template <class T>
-T AndEqualAtomicViewCheck(const long input_length) {
-  const long N = input_length;
-  T result[2]  = {1};
-  for (long i = 0; i < N; ++i) {
+T AndEqualAtomicViewCheck(const int64_t input_length) {
+  const int64_t N = input_length;
+  T result[2]     = {1};
+  for (int64_t i = 0; i < N; ++i) {
     if (N % 2 == 0) {
       result[0] &= (T)i;
     } else {
@@ -1177,7 +1179,7 @@ T AndEqualAtomicViewCheck(const long input_length) {
 }
 
 template <class T, class DeviceType>
-bool AndEqualAtomicViewTest(long input_length) {
+bool AndEqualAtomicViewTest(int64_t input_length) {
   static_assert(std::is_integral<T>::value,
                 "AndEqualAtomicViewTest: Must be integral type for test");
 
@@ -1210,15 +1212,15 @@ struct OrEqualAtomicViewFunctor {
 
   view_type input;
   atomic_view_type even_odd_result;
-  const long length;
+  const int64_t length;
 
   // Wrap the result view in an atomic view, use this for operator.
   OrEqualAtomicViewFunctor(const view_type& input_, view_type& even_odd_result_,
-                           const long length_)
+                           const int64_t length_)
       : input(input_), even_odd_result(even_odd_result_), length(length_) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator()(const long i) const {
+  void operator()(const int64_t i) const {
     if (i < length) {
       if (i % 2 == 0) {
         even_odd_result(0) |= input(i);
@@ -1230,11 +1232,11 @@ struct OrEqualAtomicViewFunctor {
 };
 
 template <class T, class execution_space>
-T OrEqualAtomicView(const long input_length) {
+T OrEqualAtomicView(const int64_t input_length) {
   typedef Kokkos::View<T*, execution_space> view_type;
   typedef typename view_type::HostMirror host_view_type;
 
-  const long length = input_length;
+  const int64_t length = input_length;
 
   view_type input("input_view", length);
   view_type result_view("result_view", 2);
@@ -1255,10 +1257,10 @@ T OrEqualAtomicView(const long input_length) {
 }
 
 template <class T>
-T OrEqualAtomicViewCheck(const long input_length) {
-  const long N = input_length;
-  T result[2]  = {0};
-  for (long i = 0; i < N; ++i) {
+T OrEqualAtomicViewCheck(const int64_t input_length) {
+  const int64_t N = input_length;
+  T result[2]     = {0};
+  for (int64_t i = 0; i < N; ++i) {
     if (i % 2 == 0) {
       result[0] |= (T)i;
     } else {
@@ -1270,7 +1272,7 @@ T OrEqualAtomicViewCheck(const long input_length) {
 }
 
 template <class T, class DeviceType>
-bool OrEqualAtomicViewTest(long input_length) {
+bool OrEqualAtomicViewTest(int64_t input_length) {
   static_assert(std::is_integral<T>::value,
                 "OrEqualAtomicViewTest: Must be integral type for test");
 
@@ -1303,15 +1305,15 @@ struct XOrEqualAtomicViewFunctor {
 
   view_type input;
   atomic_view_type even_odd_result;
-  const long length;
+  const int64_t length;
 
   // Wrap the result view in an atomic view, use this for operator.
   XOrEqualAtomicViewFunctor(const view_type& input_,
-                            view_type& even_odd_result_, const long length_)
+                            view_type& even_odd_result_, const int64_t length_)
       : input(input_), even_odd_result(even_odd_result_), length(length_) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator()(const long i) const {
+  void operator()(const int64_t i) const {
     if (i < length) {
       if (i % 2 == 0) {
         even_odd_result(0) ^= input(i);
@@ -1323,11 +1325,11 @@ struct XOrEqualAtomicViewFunctor {
 };
 
 template <class T, class execution_space>
-T XOrEqualAtomicView(const long input_length) {
+T XOrEqualAtomicView(const int64_t input_length) {
   typedef Kokkos::View<T*, execution_space> view_type;
   typedef typename view_type::HostMirror host_view_type;
 
-  const long length = input_length;
+  const int64_t length = input_length;
 
   view_type input("input_view", length);
   view_type result_view("result_view", 2);
@@ -1348,10 +1350,10 @@ T XOrEqualAtomicView(const long input_length) {
 }
 
 template <class T>
-T XOrEqualAtomicViewCheck(const long input_length) {
-  const long N = input_length;
-  T result[2]  = {0};
-  for (long i = 0; i < N; ++i) {
+T XOrEqualAtomicViewCheck(const int64_t input_length) {
+  const int64_t N = input_length;
+  T result[2]     = {0};
+  for (int64_t i = 0; i < N; ++i) {
     if (i % 2 == 0) {
       result[0] ^= (T)i;
     } else {
@@ -1363,7 +1365,7 @@ T XOrEqualAtomicViewCheck(const long input_length) {
 }
 
 template <class T, class DeviceType>
-bool XOrEqualAtomicViewTest(long input_length) {
+bool XOrEqualAtomicViewTest(int64_t input_length) {
   static_assert(std::is_integral<T>::value,
                 "XOrEqualAtomicViewTest: Must be integral type for test");
 
@@ -1426,38 +1428,38 @@ bool AtomicViewsTestNonIntegralType(const int length, int test) {
 namespace Test {
 
 TEST(TEST_CATEGORY, atomic_views_integral) {
-  const long length = 1000000;
+  const int64_t length = 1000000;
   {
     // Integral Types.
     ASSERT_TRUE(
-        (TestAtomicViews::AtomicViewsTestIntegralType<long, TEST_EXECSPACE>(
+        (TestAtomicViews::AtomicViewsTestIntegralType<int64_t, TEST_EXECSPACE>(
             length, 1)));
     ASSERT_TRUE(
-        (TestAtomicViews::AtomicViewsTestIntegralType<long, TEST_EXECSPACE>(
+        (TestAtomicViews::AtomicViewsTestIntegralType<int64_t, TEST_EXECSPACE>(
             length, 2)));
     ASSERT_TRUE(
-        (TestAtomicViews::AtomicViewsTestIntegralType<long, TEST_EXECSPACE>(
+        (TestAtomicViews::AtomicViewsTestIntegralType<int64_t, TEST_EXECSPACE>(
             length, 3)));
     ASSERT_TRUE(
-        (TestAtomicViews::AtomicViewsTestIntegralType<long, TEST_EXECSPACE>(
+        (TestAtomicViews::AtomicViewsTestIntegralType<int64_t, TEST_EXECSPACE>(
             length, 4)));
     ASSERT_TRUE(
-        (TestAtomicViews::AtomicViewsTestIntegralType<long, TEST_EXECSPACE>(
+        (TestAtomicViews::AtomicViewsTestIntegralType<int64_t, TEST_EXECSPACE>(
             length, 5)));
     ASSERT_TRUE(
-        (TestAtomicViews::AtomicViewsTestIntegralType<long, TEST_EXECSPACE>(
+        (TestAtomicViews::AtomicViewsTestIntegralType<int64_t, TEST_EXECSPACE>(
             length, 6)));
     ASSERT_TRUE(
-        (TestAtomicViews::AtomicViewsTestIntegralType<long, TEST_EXECSPACE>(
+        (TestAtomicViews::AtomicViewsTestIntegralType<int64_t, TEST_EXECSPACE>(
             length, 7)));
     ASSERT_TRUE(
-        (TestAtomicViews::AtomicViewsTestIntegralType<long, TEST_EXECSPACE>(
+        (TestAtomicViews::AtomicViewsTestIntegralType<int64_t, TEST_EXECSPACE>(
             length, 8)));
   }
 }
 
 TEST(TEST_CATEGORY, atomic_views_nonintegral) {
-  const long length = 1000000;
+  const int64_t length = 1000000;
   {
     // Non-Integral Types.
     ASSERT_TRUE((
diff --git a/kokkos/core/unit_test/TestCTestDevice.cpp b/kokkos/core/unit_test/TestCTestDevice.cpp
new file mode 100644
index 000000000..b2ee79b85
--- /dev/null
+++ b/kokkos/core/unit_test/TestCTestDevice.cpp
@@ -0,0 +1,138 @@
+#include <gtest/gtest.h>
+
+namespace Kokkos {
+namespace Impl {
+
+int get_ctest_gpu(const char *local_rank_str);
+
+}  // namespace Impl
+}  // namespace Kokkos
+
+#ifdef _WIN32
+int setenv(const char *name, const char *value, int overwrite) {
+  int errcode = 0;
+  if (!overwrite) {
+    size_t envsize = 0;
+    errcode        = getenv_s(&envsize, NULL, 0, name);
+    if (errcode || envsize) return errcode;
+  }
+  return _putenv_s(name, value);
+}
+
+int unsetenv(const char *name) { return _putenv_s(name, ""); }
+#endif
+
+// Needed because https://github.com/google/googletest/issues/952 has not been
+// resolved
+#define EXPECT_THROW_WITH_MESSAGE(stmt, etype, whatstring) \
+  EXPECT_THROW(                                            \
+      try { stmt; } catch (const etype &ex) {              \
+        EXPECT_EQ(whatstring, std::string(ex.what()));     \
+        throw;                                             \
+      },                                                   \
+      etype)
+
+class ctest_environment : public ::testing::Test {
+ protected:
+  void SetUp();
+};
+
+void ctest_environment::SetUp() {
+  setenv("CTEST_KOKKOS_DEVICE_TYPE", "gpus", 1);
+  setenv("CTEST_RESOURCE_GROUP_COUNT", "10", 1);
+  unsetenv("CTEST_RESOURCE_GROUP_0");
+  setenv("CTEST_RESOURCE_GROUP_1", "threads", 1);
+  setenv("CTEST_RESOURCE_GROUP_2", "threads,cores", 1);
+
+  setenv("CTEST_RESOURCE_GROUP_3", "gpus", 1);
+  unsetenv("CTEST_RESOURCE_GROUP_3_GPUS");
+
+  setenv("CTEST_RESOURCE_GROUP_4", "gpus", 1);
+  setenv("CTEST_RESOURCE_GROUP_4_GPUS", "id:2", 1);
+
+  setenv("CTEST_RESOURCE_GROUP_5", "gpus", 1);
+  setenv("CTEST_RESOURCE_GROUP_5_GPUS", "slots:1,id:2", 1);
+
+  setenv("CTEST_RESOURCE_GROUP_6", "gpus", 1);
+  setenv("CTEST_RESOURCE_GROUP_6_GPUS", "id:2,slots:1", 1);
+
+  setenv("CTEST_RESOURCE_GROUP_7", "threads,gpus", 1);
+  setenv("CTEST_RESOURCE_GROUP_7_GPUS", "id:3,slots:1", 1);
+
+  setenv("CTEST_RESOURCE_GROUP_8", "gpus,threads", 1);
+  setenv("CTEST_RESOURCE_GROUP_8_GPUS", "id:1,slots:1", 1);
+
+  setenv("CTEST_RESOURCE_GROUP_9", "cores,gpus,threads", 1);
+  setenv("CTEST_RESOURCE_GROUP_9_GPUS", "id:4,slots:1", 1);
+}
+
+TEST_F(ctest_environment, no_device_type) {
+  unsetenv("CTEST_KOKKOS_DEVICE_TYPE");
+  EXPECT_EQ(Kokkos::Impl::get_ctest_gpu("0"), 0);
+}
+
+TEST_F(ctest_environment, no_process_count) {
+  unsetenv("CTEST_RESOURCE_GROUP_COUNT");
+  EXPECT_EQ(Kokkos::Impl::get_ctest_gpu("0"), 0);
+}
+
+TEST_F(ctest_environment, invalid_rank) {
+  EXPECT_THROW_WITH_MESSAGE(
+      Kokkos::Impl::get_ctest_gpu("10"), std::runtime_error,
+      "Error: local rank 10 is outside the bounds of resource groups provided "
+      "by"
+      " CTest. Raised by Kokkos::Impl::get_ctest_gpu().\nTraceback "
+      "functionality"
+      " not available\n");
+}
+
+TEST_F(ctest_environment, no_type_str) {
+  EXPECT_THROW_WITH_MESSAGE(
+      Kokkos::Impl::get_ctest_gpu("0"), std::runtime_error,
+      "Error: CTEST_RESOURCE_GROUP_0 is not specified. Raised by "
+      "Kokkos::Impl::get_ctest_gpu().\nTraceback functionality not "
+      "available\n");
+}
+
+TEST_F(ctest_environment, missing_type) {
+  EXPECT_THROW_WITH_MESSAGE(
+      Kokkos::Impl::get_ctest_gpu("1"), std::runtime_error,
+      "Error: device type 'gpus' not included in CTEST_RESOURCE_GROUP_1. "
+      "Raised "
+      "by Kokkos::Impl::get_ctest_gpu().\nTraceback functionality not available"
+      "\n");
+  EXPECT_THROW_WITH_MESSAGE(
+      Kokkos::Impl::get_ctest_gpu("2"), std::runtime_error,
+      "Error: device type 'gpus' not included in CTEST_RESOURCE_GROUP_2. "
+      "Raised "
+      "by Kokkos::Impl::get_ctest_gpu().\nTraceback functionality not available"
+      "\n");
+}
+
+TEST_F(ctest_environment, no_id_str) {
+  EXPECT_THROW_WITH_MESSAGE(
+      Kokkos::Impl::get_ctest_gpu("3"), std::runtime_error,
+      "Error: CTEST_RESOURCE_GROUP_3_GPUS is not specified. Raised by "
+      "Kokkos::Impl::get_ctest_gpu().\nTraceback functionality not "
+      "available\n");
+}
+
+TEST_F(ctest_environment, invalid_id_str) {
+  EXPECT_THROW_WITH_MESSAGE(
+      Kokkos::Impl::get_ctest_gpu("4"), std::runtime_error,
+      "Error: invalid value of CTEST_RESOURCE_GROUP_4_GPUS: 'id:2'. Raised by "
+      "Kokkos::Impl::get_ctest_gpu().\nTraceback functionality not "
+      "available\n");
+  EXPECT_THROW_WITH_MESSAGE(
+      Kokkos::Impl::get_ctest_gpu("5"), std::runtime_error,
+      "Error: invalid value of CTEST_RESOURCE_GROUP_5_GPUS: 'slots:1,id:2'. "
+      "Raised by Kokkos::Impl::get_ctest_gpu().\nTraceback functionality not "
+      "available\n");
+}
+
+TEST_F(ctest_environment, good) {
+  EXPECT_EQ(Kokkos::Impl::get_ctest_gpu("6"), 2);
+  EXPECT_EQ(Kokkos::Impl::get_ctest_gpu("7"), 3);
+  EXPECT_EQ(Kokkos::Impl::get_ctest_gpu("8"), 1);
+  EXPECT_EQ(Kokkos::Impl::get_ctest_gpu("9"), 4);
+}
diff --git a/kokkos/core/unit_test/TestCXX11.hpp b/kokkos/core/unit_test/TestCXX11.hpp
index 909ba1a92..405652b29 100644
--- a/kokkos/core/unit_test/TestCXX11.hpp
+++ b/kokkos/core/unit_test/TestCXX11.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -361,6 +361,7 @@ bool Test(int test) {
 
   return passed;
 #else
+  (void)test;
   return true;
 #endif
 }
diff --git a/kokkos/core/unit_test/TestCXX11Deduction.hpp b/kokkos/core/unit_test/TestCXX11Deduction.hpp
index 16c89bba8..0e60d91a8 100644
--- a/kokkos/core/unit_test/TestCXX11Deduction.hpp
+++ b/kokkos/core/unit_test/TestCXX11Deduction.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/TestCompilerMacros.hpp b/kokkos/core/unit_test/TestCompilerMacros.hpp
index d247d7469..c644daca0 100644
--- a/kokkos/core/unit_test/TestCompilerMacros.hpp
+++ b/kokkos/core/unit_test/TestCompilerMacros.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -44,10 +44,7 @@
 
 #include <Kokkos_Core.hpp>
 
-#if defined(KOKKOS_ENABLE_CUDA) &&                                        \
-    (!defined(KOKKOS_ENABLE_CUDA_LAMBDA) ||                               \
-     ((defined(KOKKOS_ENABLE_SERIAL) || defined(KOKKOS_ENABLE_OPENMP)) && \
-      ((CUDA_VERSION < 8000) && defined(__NVCC__))))
+#if defined(KOKKOS_ENABLE_CUDA) && !defined(KOKKOS_ENABLE_CUDA_LAMBDA)
 #if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
 #error "Macro bug: KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA shouldn't be defined"
 #endif
diff --git a/kokkos/core/unit_test/TestComplex.hpp b/kokkos/core/unit_test/TestComplex.hpp
index f441085c6..2bb81052f 100644
--- a/kokkos/core/unit_test/TestComplex.hpp
+++ b/kokkos/core/unit_test/TestComplex.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -84,8 +84,9 @@ struct TestComplexConstruction {
     ASSERT_FLOAT_EQ(h_results(8).real(), double(8));
     ASSERT_FLOAT_EQ(h_results(8).imag(), 0.0);
 
-#ifndef KOKKOS_ENABLE_ROCM  // Copy construction conversion between
-                            // Kokkos::complex and std::complex doesn't compile
+    // Copy construction conversion between
+    // Kokkos::complex and std::complex doesn't compile
+#ifndef KOKKOS_ENABLE_HIP  // FIXME_HIP
     Kokkos::complex<double> a(1.5, 2.5), b(3.25, 5.25), r_kk;
     std::complex<double> sa(a), sb(3.25, 5.25), r;
     r    = a;
@@ -104,7 +105,7 @@ struct TestComplexConstruction {
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()(const int &i) const {
+  void operator()(const int & /*i*/) const {
     Kokkos::complex<double> a(1.5, 2.5);
     d_results(0) = a;
     Kokkos::complex<double> b(a);
@@ -164,8 +165,10 @@ struct TestComplexBasicMath {
     ASSERT_FLOAT_EQ(h_results(2).real(), r.real());
     ASSERT_FLOAT_EQ(h_results(2).imag(), r.imag());
     r = a / b;
+#ifndef KOKKOS_WORKAROUND_OPENMPTARGET_CLANG
     ASSERT_FLOAT_EQ(h_results(3).real(), r.real());
     ASSERT_FLOAT_EQ(h_results(3).imag(), r.imag());
+#endif
     r = d + a;
     ASSERT_FLOAT_EQ(h_results(4).real(), r.real());
     ASSERT_FLOAT_EQ(h_results(4).imag(), r.imag());
@@ -212,8 +215,10 @@ struct TestComplexBasicMath {
     ASSERT_FLOAT_EQ(h_results(18).real(), r.real());
     ASSERT_FLOAT_EQ(h_results(18).imag(), r.imag());
     r = c / a;
+#ifndef KOKKOS_WORKAROUND_OPENMPTARGET_CLANG
     ASSERT_FLOAT_EQ(h_results(19).real(), r.real());
     ASSERT_FLOAT_EQ(h_results(19).imag(), r.imag());
+#endif
 
     r = a;
     /* r = a+e; */ ASSERT_FLOAT_EQ(h_results(20).real(), r.real() + e);
@@ -227,7 +232,7 @@ struct TestComplexBasicMath {
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()(const int &i) const {
+  void operator()(const int & /*i*/) const {
     Kokkos::complex<double> a(1.5, 2.5);
     Kokkos::complex<double> b(3.25, 5.75);
     // Basic math complex / complex
@@ -320,7 +325,7 @@ struct TestComplexSpecialFunctions {
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()(const int &i) const {
+  void operator()(const int & /*i*/) const {
     Kokkos::complex<double> a(1.5, 2.5);
     Kokkos::complex<double> b(3.25, 5.75);
     double c = 9.3;
@@ -356,4 +361,41 @@ TEST(TEST_CATEGORY, complex_special_funtions) {
 
 TEST(TEST_CATEGORY, complex_io) { testComplexIO(); }
 
+TEST(TEST_CATEGORY, complex_trivially_copyable) {
+  using RealType = double;
+
+  // Kokkos::complex<RealType> is trivially copyable when RealType is
+  // trivially copyable
+  // Simply disable the check for IBM's XL compiler since we can't reliably
+  // check for a version that defines relevant functions.
+#if !defined(__ibmxl__)
+  // clang claims compatibility with gcc 4.2.1 but all versions tested know
+  // about std::is_trivially_copyable.
+#if !defined(__clang__)
+#define KOKKOS_COMPILER_GNU_VERSION \
+  __GNUC__ * 100 + __GNUC_MINOR__ * 10 + __GNUC_PATCHLEVEL__
+#endif
+#if KOKKOS_COMPILER_GNU_VERSION == 0 || KOKKOS_COMPILER_GNU_VERSION > 500
+  ASSERT_TRUE(std::is_trivially_copyable<Kokkos::complex<RealType>>::value ||
+              !std::is_trivially_copyable<RealType>::value);
+#elif KOKKOS_COMPILER_GNU_VERSION > 480
+  ASSERT_TRUE(
+      (std::has_trivial_copy_constructor<Kokkos::complex<RealType>>::value &&
+       std::has_trivial_copy_assign<Kokkos::complex<RealType>>::value &&
+       std::is_trivially_destructible<Kokkos::complex<RealType>>::value) ||
+      !(std::has_trivial_copy_constructor<RealType>::value &&
+        std::has_trivial_copy_assign<RealType>::value &&
+        std::is_trivially_destructible<RealType>::value));
+#else
+  ASSERT_TRUE(
+      (std::has_trivial_copy_constructor<Kokkos::complex<RealType>>::value &&
+       std::has_trivial_copy_assign<Kokkos::complex<RealType>>::value &&
+       std::has_trivial_destructor<Kokkos::complex<RealType>>::value) ||
+      !(std::has_trivial_copy_constructor<RealType>::value &&
+        std::has_trivial_copy_assign<RealType>::value &&
+        std::has_trivial_destructor<RealType>::value));
+#endif
+#endif
+}
+
 }  // namespace Test
diff --git a/kokkos/core/unit_test/TestConcepts.hpp b/kokkos/core/unit_test/TestConcepts.hpp
new file mode 100644
index 000000000..dcd4d948a
--- /dev/null
+++ b/kokkos/core/unit_test/TestConcepts.hpp
@@ -0,0 +1,81 @@
+/*
+//@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
+*/
+
+#include <Kokkos_Core.hpp>
+
+namespace TestConcept {
+
+using ExecutionSpace = TEST_EXECSPACE;
+using MemorySpace    = typename ExecutionSpace::memory_space;
+using DeviceType     = typename ExecutionSpace::device_type;
+
+static_assert(Kokkos::is_execution_space<ExecutionSpace>{}, "");
+static_assert(Kokkos::is_execution_space<ExecutionSpace const>{}, "");
+static_assert(!Kokkos::is_execution_space<ExecutionSpace &>{}, "");
+static_assert(!Kokkos::is_execution_space<ExecutionSpace const &>{}, "");
+
+static_assert(Kokkos::is_memory_space<MemorySpace>{}, "");
+static_assert(Kokkos::is_memory_space<MemorySpace const>{}, "");
+static_assert(!Kokkos::is_memory_space<MemorySpace &>{}, "");
+static_assert(!Kokkos::is_memory_space<MemorySpace const &>{}, "");
+
+static_assert(Kokkos::is_device<DeviceType>{}, "");
+static_assert(Kokkos::is_device<DeviceType const>{}, "");
+static_assert(!Kokkos::is_device<DeviceType &>{}, "");
+static_assert(!Kokkos::is_device<DeviceType const &>{}, "");
+
+static_assert(!Kokkos::is_device<ExecutionSpace>{}, "");
+static_assert(!Kokkos::is_device<MemorySpace>{}, "");
+
+static_assert(Kokkos::is_space<ExecutionSpace>{}, "");
+static_assert(Kokkos::is_space<MemorySpace>{}, "");
+static_assert(Kokkos::is_space<DeviceType>{}, "");
+static_assert(Kokkos::is_space<ExecutionSpace const>{}, "");
+static_assert(Kokkos::is_space<MemorySpace const>{}, "");
+static_assert(Kokkos::is_space<DeviceType const>{}, "");
+static_assert(!Kokkos::is_space<ExecutionSpace &>{}, "");
+static_assert(!Kokkos::is_space<MemorySpace &>{}, "");
+static_assert(!Kokkos::is_space<DeviceType &>{}, "");
+
+}  // namespace TestConcept
diff --git a/kokkos/core/unit_test/TestConcurrentBitset.hpp b/kokkos/core/unit_test/TestConcurrentBitset.hpp
index 3a8e7f5e3..db451495b 100644
--- a/kokkos/core/unit_test/TestConcurrentBitset.hpp
+++ b/kokkos/core/unit_test/TestConcurrentBitset.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/TestCrs.hpp b/kokkos/core/unit_test/TestCrs.hpp
index e0d6f3b45..296235aad 100644
--- a/kokkos/core/unit_test/TestCrs.hpp
+++ b/kokkos/core/unit_test/TestCrs.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -53,7 +53,7 @@ namespace {
 template <class ExecSpace>
 struct CountFillFunctor {
   KOKKOS_INLINE_FUNCTION
-  std::int32_t operator()(std::int32_t row, std::int32_t *fill) const {
+  std::int32_t operator()(std::int32_t row, float *fill) const {
     auto n = (row % 4) + 1;
     if (fill) {
       for (std::int32_t j = 0; j < n; ++j) {
@@ -153,7 +153,7 @@ struct RunUpdateCrsTest {
 
 template <class ExecSpace>
 void test_count_fill(std::int32_t nrows) {
-  Kokkos::Crs<std::int32_t, ExecSpace, void, std::int32_t> graph;
+  Kokkos::Crs<float, ExecSpace, void, std::int32_t> graph;
   Kokkos::count_and_fill_crs(graph, nrows, CountFillFunctor<ExecSpace>());
   ASSERT_EQ(graph.numRows(), nrows);
   auto row_map = Kokkos::create_mirror_view(graph.row_map);
@@ -176,12 +176,12 @@ void test_count_fill(std::int32_t nrows) {
 template <class ExecSpace>
 void test_constructor(std::int32_t nrows) {
   for (int nTest = 1; nTest < 5; nTest++) {
-    typedef Kokkos::Crs<std::int32_t, ExecSpace, void, std::int32_t> crs_int32;
-    crs_int32 graph;
+    typedef Kokkos::Crs<float, ExecSpace, void, std::int32_t> crs_type;
+    crs_type graph;
     Kokkos::count_and_fill_crs(graph, nrows, CountFillFunctor<ExecSpace>());
     ASSERT_EQ(graph.numRows(), nrows);
 
-    RunUpdateCrsTest<crs_int32, ExecSpace, std::int32_t> crstest(graph);
+    RunUpdateCrsTest<crs_type, ExecSpace, std::int32_t> crstest(graph);
     crstest.run_test(nTest);
 
     auto row_map = Kokkos::create_mirror_view(graph.row_map);
diff --git a/kokkos/core/unit_test/TestDeepCopy.hpp b/kokkos/core/unit_test/TestDeepCopy.hpp
index a7e80cef3..56c259ff6 100644
--- a/kokkos/core/unit_test/TestDeepCopy.hpp
+++ b/kokkos/core/unit_test/TestDeepCopy.hpp
@@ -2,6 +2,7 @@
 
 namespace Test {
 
+#ifdef KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA
 namespace Impl {
 template <class MemorySpaceA, class MemorySpaceB>
 struct TestDeepCopy {
@@ -210,5 +211,149 @@ TEST(TEST_CATEGORY, deep_copy_alignment) {
                        Kokkos::HostSpace>::run_test(100000);
   }
 }
+#endif
 
+// KOKKOS_IMPL_HIP_CLANG_WORKAROUND
+#ifndef KOKKOS_ENABLE_HIP
+namespace Impl {
+template <class Scalar1, class Scalar2, class Layout1, class Layout2>
+struct TestDeepCopyScalarConversion {
+  struct TagFill {};
+  struct TagCompare {};
+
+  using view_type_s1_1d = Kokkos::View<Scalar1*, Layout1, TEST_EXECSPACE>;
+  using view_type_s2_1d = Kokkos::View<Scalar2*, Layout2, TEST_EXECSPACE>;
+  using view_type_s1_2d = Kokkos::View<Scalar1**, Layout1, TEST_EXECSPACE>;
+  using view_type_s2_2d = Kokkos::View<Scalar2**, Layout2, TEST_EXECSPACE>;
+
+  using base_layout1 = typename std::conditional<
+      std::is_same<Layout1, Kokkos::LayoutStride>::value, Kokkos::LayoutLeft,
+      Layout1>::type;
+  using base_layout2 = typename std::conditional<
+      std::is_same<Layout2, Kokkos::LayoutStride>::value, Kokkos::LayoutLeft,
+      Layout2>::type;
+
+  using base_type_s1_1d = Kokkos::View<Scalar1*, base_layout1, TEST_EXECSPACE>;
+  using base_type_s2_1d = Kokkos::View<Scalar2*, base_layout2, TEST_EXECSPACE>;
+  using base_type_s1_2d = Kokkos::View<Scalar1**, base_layout1, TEST_EXECSPACE>;
+  using base_type_s2_2d = Kokkos::View<Scalar2**, base_layout2, TEST_EXECSPACE>;
+
+  view_type_s1_1d view_s1_1d;
+  view_type_s2_1d view_s2_1d;
+  view_type_s1_2d view_s1_2d;
+  view_type_s2_2d view_s2_2d;
+
+  Kokkos::View<int64_t, TEST_EXECSPACE> error_count;
+
+  void create_views(int64_t N0, int64_t N1) {
+    base_type_s1_1d b_s1_1d("TestDeepCopyConversion::b_s1_1d", N0);
+    base_type_s2_1d b_s2_1d("TestDeepCopyConversion::b_s2_1d", N0);
+    base_type_s1_2d b_s1_2d("TestDeepCopyConversion::b_s1_2d", N0, N1);
+    base_type_s2_2d b_s2_2d("TestDeepCopyConversion::b_s2_2d", N0, N1);
+
+    view_s1_1d = view_type_s1_1d(b_s1_1d, Kokkos::ALL);
+    view_s2_1d = view_type_s2_1d(b_s2_1d, Kokkos::ALL);
+    view_s1_2d = view_type_s1_2d(b_s1_2d, Kokkos::ALL, Kokkos::ALL);
+    view_s2_2d = view_type_s2_2d(b_s2_2d, Kokkos::ALL, Kokkos::ALL);
+
+    error_count = Kokkos::View<int64_t, TEST_EXECSPACE>(
+        "TestDeepCopyConversion::error_count");
+  }
+
+  KOKKOS_FUNCTION
+  void operator()(TagFill, const int64_t i) const {
+    view_s2_1d(i) = static_cast<Scalar2>(i + 1);
+    for (int64_t j = 0; j < static_cast<int64_t>(view_s2_2d.extent(1)); j++)
+      view_s2_2d(i, j) = static_cast<Scalar2>((i + 1) * 1000 + j + 1);
+  }
+
+  KOKKOS_FUNCTION
+  void operator()(TagCompare, const int64_t i) const {
+    int64_t errors = 0;
+    if (view_s1_1d(i) != static_cast<Scalar1>(static_cast<Scalar2>(i + 1)))
+      errors++;
+    for (int64_t j = 0; j < static_cast<int64_t>(view_s1_2d.extent(1)); j++) {
+      if (view_s1_2d(i, j) !=
+          static_cast<Scalar1>(static_cast<Scalar2>((i + 1) * 1000 + j + 1)))
+        errors++;
+    }
+    if (errors > 0) Kokkos::atomic_add(&error_count(), errors);
+  }
+
+  void run_tests(int64_t N0, int64_t N1) {
+    create_views(N0, N1);
+
+    Kokkos::parallel_for("TestDeepCopyConversion::Fill",
+                         Kokkos::RangePolicy<TEST_EXECSPACE, TagFill,
+                                             Kokkos::IndexType<int64_t>>(0, N0),
+                         *this);
+
+    Kokkos::deep_copy(view_s1_1d, view_s2_1d);
+    Kokkos::deep_copy(view_s1_2d, view_s2_2d);
+
+    Kokkos::parallel_for("TestDeepCopyConversion::Compare",
+                         Kokkos::RangePolicy<TEST_EXECSPACE, TagCompare,
+                                             Kokkos::IndexType<int64_t>>(0, N0),
+                         *this);
+
+    int64_t errors = 0;
+    Kokkos::deep_copy(errors, error_count);
+    ASSERT_TRUE(errors == 0);
+
+    Kokkos::deep_copy(view_s1_1d, static_cast<Scalar1>(0));
+    Kokkos::deep_copy(view_s1_2d, static_cast<Scalar1>(0));
+
+    Kokkos::parallel_for("TestDeepCopyConversion::Compare",
+                         Kokkos::RangePolicy<TEST_EXECSPACE, TagCompare,
+                                             Kokkos::IndexType<int64_t>>(0, N0),
+                         *this);
+    Kokkos::deep_copy(errors, error_count);
+    ASSERT_TRUE(errors > 0);
+
+    Kokkos::deep_copy(error_count, 0);
+    Kokkos::deep_copy(TEST_EXECSPACE(), view_s1_1d, view_s2_1d);
+    Kokkos::deep_copy(TEST_EXECSPACE(), view_s1_2d, view_s2_2d);
+
+    Kokkos::parallel_for("TestDeepCopyConversion::Compare",
+                         Kokkos::RangePolicy<TEST_EXECSPACE, TagCompare,
+                                             Kokkos::IndexType<int64_t>>(0, N0),
+                         *this);
+
+    Kokkos::deep_copy(errors, error_count);
+    ASSERT_TRUE(errors == 0);
+  }
+};
+}  // namespace Impl
+
+TEST(TEST_CATEGORY, deep_copy_conversion) {
+  int64_t N0 = 19381;
+  int64_t N1 = 17;
+
+  using right  = Kokkos::LayoutRight;
+  using left   = Kokkos::LayoutLeft;
+  using stride = Kokkos::LayoutStride;
+
+  Impl::TestDeepCopyScalarConversion<double, double, right, right>().run_tests(
+      N0, N1);
+  Impl::TestDeepCopyScalarConversion<double, double, right, left>().run_tests(
+      N0, N1);
+  Impl::TestDeepCopyScalarConversion<double, double, left, right>().run_tests(
+      N0, N1);
+  Impl::TestDeepCopyScalarConversion<double, double, stride, right>().run_tests(
+      N0, N1);
+  Impl::TestDeepCopyScalarConversion<double, double, right, stride>().run_tests(
+      N0, N1);
+
+  Impl::TestDeepCopyScalarConversion<double, float, right, right>().run_tests(
+      N0, N1);
+  Impl::TestDeepCopyScalarConversion<double, float, right, left>().run_tests(
+      N0, N1);
+  Impl::TestDeepCopyScalarConversion<double, float, left, right>().run_tests(
+      N0, N1);
+  Impl::TestDeepCopyScalarConversion<double, float, stride, right>().run_tests(
+      N0, N1);
+  Impl::TestDeepCopyScalarConversion<double, float, right, stride>().run_tests(
+      N0, N1);
+}
+#endif
 }  // namespace Test
diff --git a/kokkos/core/unit_test/TestDefaultDeviceTypeInit.hpp b/kokkos/core/unit_test/TestDefaultDeviceTypeInit.hpp
index 0448db157..33c736c5e 100644
--- a/kokkos/core/unit_test/TestDefaultDeviceTypeInit.hpp
+++ b/kokkos/core/unit_test/TestDefaultDeviceTypeInit.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/TestFunctorAnalysis.hpp b/kokkos/core/unit_test/TestFunctorAnalysis.hpp
index 2025ef2bb..5e72972be 100644
--- a/kokkos/core/unit_test/TestFunctorAnalysis.hpp
+++ b/kokkos/core/unit_test/TestFunctorAnalysis.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/TestHWLOC.cpp b/kokkos/core/unit_test/TestHWLOC.cpp
index 0f060c139..428a67048 100644
--- a/kokkos/core/unit_test/TestHWLOC.cpp
+++ b/kokkos/core/unit_test/TestHWLOC.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/TestInit.hpp b/kokkos/core/unit_test/TestInit.hpp
index ee75c7435..03ceb45d7 100644
--- a/kokkos/core/unit_test/TestInit.hpp
+++ b/kokkos/core/unit_test/TestInit.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/TestLocalDeepCopy.hpp b/kokkos/core/unit_test/TestLocalDeepCopy.hpp
index 7d7b18be8..c776481c7 100644
--- a/kokkos/core/unit_test/TestLocalDeepCopy.hpp
+++ b/kokkos/core/unit_test/TestLocalDeepCopy.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -934,7 +934,6 @@ void impl_test_local_deepcopy_rangepolicy_rank_7(const int N) {
 //-------------------------------------------------------------------------------------------------------------
 
 #if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
-#if !defined(KOKKOS_ENABLE_CUDA) || (8000 <= CUDA_VERSION)
 TEST(TEST_CATEGORY, local_deepcopy_teampolicy_layoutleft) {
   typedef TEST_EXECSPACE ExecSpace;
   typedef Kokkos::View<double********, Kokkos::LayoutLeft, ExecSpace> ViewType;
@@ -1043,5 +1042,73 @@ TEST(TEST_CATEGORY, local_deepcopy_rangepolicy_layoutright) {
   }
 }
 #endif
-#endif
+
+namespace Impl {
+template <typename T, typename SHMEMTYPE>
+using ShMemView =
+    Kokkos::View<T, Kokkos::LayoutRight, SHMEMTYPE, Kokkos::MemoryUnmanaged>;
+
+struct DeepCopyScratchFunctor {
+  DeepCopyScratchFunctor(
+      Kokkos::View<double*, TEST_EXECSPACE::memory_space> check_view_1,
+      Kokkos::View<double*, TEST_EXECSPACE::memory_space> check_view_2)
+      : check_view_1_(check_view_1),
+        check_view_2_(check_view_2),
+        N_(check_view_1.extent(0)) {}
+
+  KOKKOS_INLINE_FUNCTION void operator()(
+      Kokkos::TeamPolicy<TEST_EXECSPACE,
+                         Kokkos::Schedule<Kokkos::Dynamic>>::member_type team)
+      const {
+    using ShmemType = TEST_EXECSPACE::scratch_memory_space;
+    auto shview =
+        Impl::ShMemView<double**, ShmemType>(team.team_scratch(1), N_, 1);
+
+    Kokkos::parallel_for(
+        Kokkos::TeamThreadRange(team, N_), KOKKOS_LAMBDA(const size_t& index) {
+          auto thread_shview = Kokkos::subview(shview, index, Kokkos::ALL());
+          Kokkos::Experimental::local_deep_copy(thread_shview, index);
+        });
+    Kokkos::Experimental::local_deep_copy(
+        team, check_view_1_, Kokkos::subview(shview, Kokkos::ALL(), 0));
+
+    Kokkos::Experimental::local_deep_copy(team, shview, 6.);
+    Kokkos::Experimental::local_deep_copy(
+        team, check_view_2_, Kokkos::subview(shview, Kokkos::ALL(), 0));
+  }
+
+  Kokkos::View<double*, TEST_EXECSPACE::memory_space> check_view_1_;
+  Kokkos::View<double*, TEST_EXECSPACE::memory_space> check_view_2_;
+  int const N_;
+};
+}  // namespace Impl
+
+TEST(TEST_CATEGORY, deep_copy_scratch) {
+  using TestDeviceTeamPolicy = Kokkos::TeamPolicy<TEST_EXECSPACE>;
+
+  const int N = 8;
+  const int bytes_per_team =
+      Impl::ShMemView<double**,
+                      TEST_EXECSPACE::scratch_memory_space>::shmem_size(N, 1);
+
+  TestDeviceTeamPolicy policy(1, Kokkos::AUTO);
+  auto team_exec = policy.set_scratch_size(1, Kokkos::PerTeam(bytes_per_team));
+
+  Kokkos::View<double*, TEST_EXECSPACE::memory_space> check_view_1("check_1",
+                                                                   N);
+  Kokkos::View<double*, TEST_EXECSPACE::memory_space> check_view_2("check_2",
+                                                                   N);
+
+  Kokkos::parallel_for(
+      team_exec, Impl::DeepCopyScratchFunctor{check_view_1, check_view_2});
+  auto host_copy_1 =
+      Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace(), check_view_1);
+  auto host_copy_2 =
+      Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace(), check_view_2);
+
+  for (unsigned int i = 0; i < N; ++i) {
+    ASSERT_EQ(host_copy_1(i), i);
+    ASSERT_EQ(host_copy_2(i), 6.0);
+  }
+}
 }  // namespace Test
diff --git a/kokkos/core/unit_test/TestMDRange.hpp b/kokkos/core/unit_test/TestMDRange.hpp
index b085f0fa0..c4288f21a 100644
--- a/kokkos/core/unit_test/TestMDRange.hpp
+++ b/kokkos/core/unit_test/TestMDRange.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -256,7 +256,6 @@ struct TestMDRange_2D {
 
   static void test_reduce2(const int N0, const int N1) {
 #if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
-#if !defined(KOKKOS_ENABLE_CUDA) || (8000 <= CUDA_VERSION)
     {
       typedef typename Kokkos::MDRangePolicy<ExecSpace, Kokkos::Rank<2>,
                                              Kokkos::IndexType<int> >
@@ -269,13 +268,12 @@ struct TestMDRange_2D {
       double sum = 0.0;
       parallel_reduce(
           range,
-          KOKKOS_LAMBDA(const int i, const int j, double &lsum) {
+          KOKKOS_LAMBDA(const int /*i*/, const int /*j*/, double &lsum) {
             lsum += 1.0;
           },
           sum);
       ASSERT_EQ(sum, N0 * N1);
     }
-#endif
 #endif
 
     {
@@ -361,7 +359,6 @@ struct TestMDRange_2D {
     }
     // Test Min reducer with lambda
 #if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
-#if !defined(KOKKOS_ENABLE_CUDA) || (8000 <= CUDA_VERSION)
     {
       typedef typename Kokkos::MDRangePolicy<ExecSpace, Kokkos::Rank<2>,
                                              Kokkos::IndexType<int> >
@@ -387,7 +384,6 @@ struct TestMDRange_2D {
 
       ASSERT_EQ(min, 4.0);
     }
-#endif
 #endif
     // Tagged operator test
     {
@@ -532,7 +528,6 @@ struct TestMDRange_2D {
 
   static void test_for2(const int N0, const int N1) {
 #if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
-#if !defined(KOKKOS_ENABLE_CUDA) || (8000 <= CUDA_VERSION)
     {
       typedef typename Kokkos::MDRangePolicy<ExecSpace, Kokkos::Rank<2>,
                                              Kokkos::IndexType<int> >
@@ -571,7 +566,6 @@ struct TestMDRange_2D {
 
       ASSERT_EQ(counter, 0);
     }
-#endif
 #endif
 
     {
@@ -909,7 +903,6 @@ struct TestMDRange_3D {
 
   static void test_reduce3(const int N0, const int N1, const int N2) {
 #if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
-#if !defined(KOKKOS_ENABLE_CUDA) || (8000 <= CUDA_VERSION)
     {
       typedef typename Kokkos::MDRangePolicy<ExecSpace, Kokkos::Rank<3>,
                                              Kokkos::IndexType<int> >
@@ -922,13 +915,11 @@ struct TestMDRange_3D {
       double sum = 0.0;
       parallel_reduce(
           range,
-          KOKKOS_LAMBDA(const int i, const int j, const int k, double &lsum) {
-            lsum += 1.0;
-          },
+          KOKKOS_LAMBDA(const int /*i*/, const int /*j*/, const int /*k*/,
+                        double &lsum) { lsum += 1.0; },
           sum);
       ASSERT_EQ(sum, N0 * N1 * N2);
     }
-#endif
 #endif
 
     {
@@ -1013,7 +1004,6 @@ struct TestMDRange_3D {
     }
     // Test Min reducer with lambda
 #if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
-#if !defined(KOKKOS_ENABLE_CUDA) || (8000 <= CUDA_VERSION)
     {
       typedef typename Kokkos::MDRangePolicy<ExecSpace, Kokkos::Rank<3>,
                                              Kokkos::IndexType<int> >
@@ -1046,7 +1036,6 @@ struct TestMDRange_3D {
         ASSERT_EQ(min, min_identity);
       }
     }
-#endif
 #endif
 
     // Tagged operator test
@@ -1193,7 +1182,6 @@ struct TestMDRange_3D {
 
   static void test_for3(const int N0, const int N1, const int N2) {
 #if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
-#if !defined(KOKKOS_ENABLE_CUDA) || (8000 <= CUDA_VERSION)
     {
       typedef typename Kokkos::MDRangePolicy<ExecSpace, Kokkos::Rank<3>,
                                              Kokkos::IndexType<int> >
@@ -1236,7 +1224,6 @@ struct TestMDRange_3D {
 
       ASSERT_EQ(counter, 0);
     }
-#endif
 #endif
 
     {
@@ -1549,7 +1536,6 @@ struct TestMDRange_4D {
   static void test_reduce4(const int N0, const int N1, const int N2,
                            const int N3) {
 #if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
-#if !defined(KOKKOS_ENABLE_CUDA) || (8000 <= CUDA_VERSION)
     {
       typedef typename Kokkos::MDRangePolicy<ExecSpace, Kokkos::Rank<4>,
                                              Kokkos::IndexType<int> >
@@ -1562,12 +1548,11 @@ struct TestMDRange_4D {
       double sum = 0.0;
       parallel_reduce(
           range,
-          KOKKOS_LAMBDA(const int i, const int j, const int k, const int l,
-                        double &lsum) { lsum += 1.0; },
+          KOKKOS_LAMBDA(const int /*i*/, const int /*j*/, const int /*k*/,
+                        const int /*l*/, double &lsum) { lsum += 1.0; },
           sum);
       ASSERT_EQ(sum, N0 * N1 * N2 * N3);
     }
-#endif
 #endif
 
     {
@@ -1656,7 +1641,6 @@ struct TestMDRange_4D {
 
     // Test Min reducer with lambda
 #if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
-#if !defined(KOKKOS_ENABLE_CUDA) || (8000 <= CUDA_VERSION)
     {
       typedef typename Kokkos::MDRangePolicy<ExecSpace, Kokkos::Rank<4>,
                                              Kokkos::IndexType<int> >
@@ -1684,7 +1668,6 @@ struct TestMDRange_4D {
 
       ASSERT_EQ(min, 16.0);
     }
-#endif
 #endif
 
     // Tagged operator test
@@ -1834,7 +1817,6 @@ struct TestMDRange_4D {
   static void test_for4(const int N0, const int N1, const int N2,
                         const int N3) {
 #if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
-#if !defined(KOKKOS_ENABLE_CUDA) || (8000 <= CUDA_VERSION)
     {
       typedef typename Kokkos::MDRangePolicy<ExecSpace, Kokkos::Rank<4>,
                                              Kokkos::IndexType<int> >
@@ -1878,7 +1860,6 @@ struct TestMDRange_4D {
 
       ASSERT_EQ(counter, 0);
     }
-#endif
 #endif
 
     {
@@ -2206,7 +2187,6 @@ struct TestMDRange_5D {
   static void test_reduce5(const int N0, const int N1, const int N2,
                            const int N3, const int N4) {
 #if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
-#if !defined(KOKKOS_ENABLE_CUDA) || (8000 <= CUDA_VERSION)
     {
       typedef typename Kokkos::MDRangePolicy<ExecSpace, Kokkos::Rank<5>,
                                              Kokkos::IndexType<int> >
@@ -2220,12 +2200,12 @@ struct TestMDRange_5D {
       double sum = 0.0;
       parallel_reduce(
           range,
-          KOKKOS_LAMBDA(const int i, const int j, const int k, const int l,
-                        const int m, double &lsum) { lsum += 1.0; },
+          KOKKOS_LAMBDA(const int /*i*/, const int /*j*/, const int /*k*/,
+                        const int /*l*/, const int /*m*/,
+                        double &lsum) { lsum += 1.0; },
           sum);
       ASSERT_EQ(sum, N0 * N1 * N2 * N3 * N4);
     }
-#endif
 #endif
 
     {
@@ -2320,7 +2300,6 @@ struct TestMDRange_5D {
 
     // Test Min reducer with lambda
 #if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
-#if !defined(KOKKOS_ENABLE_CUDA) || (8000 <= CUDA_VERSION)
     {
       typedef typename Kokkos::MDRangePolicy<ExecSpace, Kokkos::Rank<5>,
                                              Kokkos::IndexType<int> >
@@ -2352,7 +2331,6 @@ struct TestMDRange_5D {
 
       ASSERT_EQ(min, 32.0);
     }
-#endif
 #endif
 
     // Tagged operator test
@@ -2404,7 +2382,6 @@ struct TestMDRange_5D {
   static void test_for5(const int N0, const int N1, const int N2, const int N3,
                         const int N4) {
 #if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
-#if !defined(KOKKOS_ENABLE_CUDA) || (8000 <= CUDA_VERSION)
     {
       typedef typename Kokkos::MDRangePolicy<ExecSpace, Kokkos::Rank<5>,
                                              Kokkos::IndexType<int> >
@@ -2452,7 +2429,6 @@ struct TestMDRange_5D {
 
       ASSERT_EQ(counter, 0);
     }
-#endif
 #endif
 
     {
@@ -2798,7 +2774,6 @@ struct TestMDRange_6D {
   static void test_reduce6(const int N0, const int N1, const int N2,
                            const int N3, const int N4, const int N5) {
 #if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
-#if !defined(KOKKOS_ENABLE_CUDA) || (8000 <= CUDA_VERSION)
     {
       typedef typename Kokkos::MDRangePolicy<ExecSpace, Kokkos::Rank<6>,
                                              Kokkos::IndexType<int> >
@@ -2812,13 +2787,12 @@ struct TestMDRange_6D {
       double sum = 0.0;
       parallel_reduce(
           range,
-          KOKKOS_LAMBDA(const int i, const int j, const int k, const int l,
-                        const int m, const int n,
+          KOKKOS_LAMBDA(const int /*i*/, const int /*j*/, const int /*k*/,
+                        const int /*l*/, const int /*m*/, const int /*n*/,
                         double &lsum) { lsum += 1.0; },
           sum);
       ASSERT_EQ(sum, N0 * N1 * N2 * N3 * N4 * N5);
     }
-#endif
 #endif
 
     {
@@ -2914,7 +2888,6 @@ struct TestMDRange_6D {
 
     // Test Min reducer with lambda
 #if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
-#if !defined(KOKKOS_ENABLE_CUDA) || (8000 <= CUDA_VERSION)
     {
       typedef typename Kokkos::MDRangePolicy<ExecSpace, Kokkos::Rank<6>,
                                              Kokkos::IndexType<int> >
@@ -2948,7 +2921,6 @@ struct TestMDRange_6D {
 
       ASSERT_EQ(min, 64.0);
     }
-#endif
 #endif
 
     // Tagged operator test
@@ -3001,7 +2973,6 @@ struct TestMDRange_6D {
   static void test_for6(const int N0, const int N1, const int N2, const int N3,
                         const int N4, const int N5) {
 #if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
-#if !defined(KOKKOS_ENABLE_CUDA) || (8000 <= CUDA_VERSION)
     {
       typedef typename Kokkos::MDRangePolicy<ExecSpace, Kokkos::Rank<6>,
                                              Kokkos::IndexType<int> >
@@ -3051,7 +3022,6 @@ struct TestMDRange_6D {
 
       ASSERT_EQ(counter, 0);
     }
-#endif
 #endif
 
     {
diff --git a/kokkos/core/unit_test/TestMDRange_a.hpp b/kokkos/core/unit_test/TestMDRange_a.hpp
index de7b4540a..3bb9ab089 100644
--- a/kokkos/core/unit_test/TestMDRange_a.hpp
+++ b/kokkos/core/unit_test/TestMDRange_a.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/TestMDRange_b.hpp b/kokkos/core/unit_test/TestMDRange_b.hpp
index f89761bbf..17dcedd42 100644
--- a/kokkos/core/unit_test/TestMDRange_b.hpp
+++ b/kokkos/core/unit_test/TestMDRange_b.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/TestMDRange_c.hpp b/kokkos/core/unit_test/TestMDRange_c.hpp
index 4e3b482aa..c37b25993 100644
--- a/kokkos/core/unit_test/TestMDRange_c.hpp
+++ b/kokkos/core/unit_test/TestMDRange_c.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/TestMDRange_d.hpp b/kokkos/core/unit_test/TestMDRange_d.hpp
index 394f7f82b..75c33caf5 100644
--- a/kokkos/core/unit_test/TestMDRange_d.hpp
+++ b/kokkos/core/unit_test/TestMDRange_d.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/TestMDRange_e.hpp b/kokkos/core/unit_test/TestMDRange_e.hpp
index e092bd204..38746cd78 100644
--- a/kokkos/core/unit_test/TestMDRange_e.hpp
+++ b/kokkos/core/unit_test/TestMDRange_e.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/TestMemoryPool.hpp b/kokkos/core/unit_test/TestMemoryPool.hpp
index 968d6bc25..cc18a9030 100644
--- a/kokkos/core/unit_test/TestMemoryPool.hpp
+++ b/kokkos/core/unit_test/TestMemoryPool.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -162,10 +162,10 @@ void test_host_memory_pool_stats() {
   // Aborts because exceeds max block size:
   // void * p2048 = pool.allocate(2048);
 
-  ASSERT_NE(p0064, (void*)0);
-  ASSERT_NE(p0128, (void*)0);
-  ASSERT_NE(p0256, (void*)0);
-  ASSERT_NE(p1024, (void*)0);
+  ASSERT_NE(p0064, nullptr);
+  ASSERT_NE(p0128, nullptr);
+  ASSERT_NE(p0256, nullptr);
+  ASSERT_NE(p1024, nullptr);
 
   pool.deallocate(p0064, 64);
   pool.deallocate(p0128, 128);
@@ -475,17 +475,15 @@ void test_memory_pool_corners(const bool print_statistics,
 
 template <class DeviceType, class Enable = void>
 struct TestMemoryPoolHuge {
-  TestMemoryPoolHuge() {}
-
   enum : size_t { num_superblock = 0 };
 
   using value_type = long;
 
   KOKKOS_INLINE_FUNCTION
-  void operator()(int i, long& err) const noexcept {}
+  void operator()(int /*i*/, long& /*err*/) const noexcept {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator()(int i) const noexcept {}
+  void operator()(int /*i*/) const noexcept {}
 };
 
 template <class DeviceType>
diff --git a/kokkos/core/unit_test/TestPolicyConstruction.hpp b/kokkos/core/unit_test/TestPolicyConstruction.hpp
index 52d948762..a5ec17320 100644
--- a/kokkos/core/unit_test/TestPolicyConstruction.hpp
+++ b/kokkos/core/unit_test/TestPolicyConstruction.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/TestRange.hpp b/kokkos/core/unit_test/TestRange.hpp
index fb64ae52e..9bd13ad23 100644
--- a/kokkos/core/unit_test/TestRange.hpp
+++ b/kokkos/core/unit_test/TestRange.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -54,9 +54,10 @@ template <class ExecSpace, class ScheduleType>
 struct TestRange {
   typedef int value_type;  ///< typedef required for the parallel_reduce
 
-  typedef Kokkos::View<int *, ExecSpace> view_type;
+  typedef Kokkos::View<value_type *, ExecSpace> view_type;
 
   view_type m_flags;
+  view_type result_view;
 
   struct VerifyInitTag {};
   struct ResetTag {};
@@ -65,9 +66,19 @@ struct TestRange {
   struct VerifyOffsetTag {};
 
   int N;
+#ifndef KOKKOS_WORKAROUND_OPENMPTARGET_GCC
   static const int offset = 13;
+#else
+  int offset;
+#endif
   TestRange(const size_t N_)
-      : m_flags(Kokkos::ViewAllocateWithoutInitializing("flags"), N_), N(N_) {}
+      : m_flags(Kokkos::ViewAllocateWithoutInitializing("flags"), N_),
+        result_view(Kokkos::ViewAllocateWithoutInitializing("results"), N_),
+        N(N_) {
+#ifdef KOKKOS_WORKAROUND_OPENMPTARGET_GCC
+    offset = 13;
+#endif
+  }
 
   void test_for() {
     typename view_type::HostMirror host_flags =
@@ -185,7 +196,7 @@ struct TestRange {
   //----------------------------------------
 
   void test_reduce() {
-    int total = 0;
+    value_type total = 0;
 
     Kokkos::parallel_for(Kokkos::RangePolicy<ExecSpace, ScheduleType>(0, N),
                          *this);
@@ -220,15 +231,31 @@ struct TestRange {
     Kokkos::parallel_for(Kokkos::RangePolicy<ExecSpace, ScheduleType>(0, N),
                          *this);
 
+    auto check_scan_results = [&]() {
+      auto const host_mirror =
+          Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace(), result_view);
+      for (int i = 0; i < N; ++i) {
+        if (((i + 1) * i) / 2 != host_mirror(i)) {
+          std::cout << "Error at " << i << std::endl;
+          EXPECT_EQ(size_t(((i + 1) * i) / 2), size_t(host_mirror(i)));
+        }
+      }
+    };
+
     Kokkos::parallel_scan(
         "TestKernelScan",
         Kokkos::RangePolicy<ExecSpace, ScheduleType, OffsetTag>(0, N), *this);
 
-    int total = 0;
+    check_scan_results();
+
+    value_type total = 0;
     Kokkos::parallel_scan(
         "TestKernelScanWithTotal",
         Kokkos::RangePolicy<ExecSpace, ScheduleType, OffsetTag>(0, N), *this,
         total);
+
+    check_scan_results();
+
     ASSERT_EQ(size_t((N - 1) * (N) / 2), size_t(total));  // sum( 0 .. N-1 )
   }
 
@@ -239,16 +266,16 @@ struct TestRange {
 
     if (final) {
       if (update != (i * (i + 1)) / 2) {
-        printf("TestRange::test_scan error %d : %d != %d\n", i,
-               (i * (i + 1)) / 2, m_flags(i));
+        printf("TestRange::test_scan error (%d,%d) : %d != %d\n", i, m_flags(i),
+               (i * (i + 1)) / 2, update);
       }
+      result_view(i) = update;
     }
   }
 
   void test_dynamic_policy() {
-    auto const N_no_implicit_capture = N;
 #if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
-#if !defined(KOKKOS_ENABLE_CUDA) || (8000 <= CUDA_VERSION)
+    auto const N_no_implicit_capture = N;
     typedef Kokkos::RangePolicy<ExecSpace, Kokkos::Schedule<Kokkos::Dynamic> >
         policy_t;
 
@@ -273,7 +300,7 @@ struct TestRange {
       int error = 0;
       Kokkos::parallel_reduce(
           Kokkos::RangePolicy<ExecSpace>(0, N),
-          KOKKOS_LAMBDA(const int &i, int &lsum) {
+          KOKKOS_LAMBDA(const int &i, value_type &lsum) {
             lsum += (a(i) != (i < N_no_implicit_capture / 2 ? 1 : 10000));
           },
           error);
@@ -300,10 +327,10 @@ struct TestRange {
           count("Count", ExecSpace::concurrency());
       Kokkos::View<int *, ExecSpace> a("A", N);
 
-      int sum = 0;
+      value_type sum = 0;
       Kokkos::parallel_reduce(
           policy_t(0, N),
-          KOKKOS_LAMBDA(const int &i, int &lsum) {
+          KOKKOS_LAMBDA(const int &i, value_type &lsum) {
             for (int k = 0; k < (i < N_no_implicit_capture / 2 ? 1 : 10000);
                  k++) {
               a(i)++;
@@ -321,7 +348,7 @@ struct TestRange {
       int error = 0;
       Kokkos::parallel_reduce(
           Kokkos::RangePolicy<ExecSpace>(0, N),
-          KOKKOS_LAMBDA(const int &i, int &lsum) {
+          KOKKOS_LAMBDA(const int &i, value_type &lsum) {
             lsum += (a(i) != (i < N_no_implicit_capture / 2 ? 1 : 10000));
           },
           error);
@@ -342,7 +369,6 @@ struct TestRange {
         //}
       }
     }
-#endif
 #endif
   }
 };
@@ -417,7 +443,7 @@ TEST(TEST_CATEGORY, range_scan) {
     TestRange<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> > f(0);
     f.test_scan();
   }
-#if !defined(KOKKOS_ENABLE_CUDA) && !defined(KOKKOS_ENABLE_ROCM)
+#if !defined(KOKKOS_ENABLE_CUDA) && !defined(KOKKOS_ENABLE_HIP)
   {
     TestRange<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> > f(0);
     f.test_dynamic_policy();
@@ -432,7 +458,7 @@ TEST(TEST_CATEGORY, range_scan) {
     TestRange<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> > f(3);
     f.test_scan();
   }
-#if !defined(KOKKOS_ENABLE_CUDA) && !defined(KOKKOS_ENABLE_ROCM)
+#if !defined(KOKKOS_ENABLE_CUDA) && !defined(KOKKOS_ENABLE_HIP)
   {
     TestRange<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> > f(3);
     f.test_dynamic_policy();
@@ -447,7 +473,7 @@ TEST(TEST_CATEGORY, range_scan) {
     TestRange<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> > f(1001);
     f.test_scan();
   }
-#if !defined(KOKKOS_ENABLE_CUDA) && !defined(KOKKOS_ENABLE_ROCM)
+#if !defined(KOKKOS_ENABLE_CUDA) && !defined(KOKKOS_ENABLE_HIP)
   {
     TestRange<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> > f(1001);
     f.test_dynamic_policy();
diff --git a/kokkos/core/unit_test/TestRangeRequire.hpp b/kokkos/core/unit_test/TestRangeRequire.hpp
new file mode 100644
index 000000000..a75af0b95
--- /dev/null
+++ b/kokkos/core/unit_test/TestRangeRequire.hpp
@@ -0,0 +1,518 @@
+/*
+//@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
+*/
+
+#include <cstdio>
+
+#include <Kokkos_Core.hpp>
+
+// This file is largely duplicating TestRange.hpp but it applies
+// Kokkos::Experimental require at every place where a parallel
+// operation is executed.
+
+namespace Test {
+
+namespace {
+
+template <class ExecSpace, class ScheduleType, class Property>
+struct TestRangeRequire {
+  typedef int value_type;  ///< typedef required for the parallel_reduce
+
+  typedef Kokkos::View<int *, ExecSpace> view_type;
+
+  view_type m_flags;
+
+  struct VerifyInitTag {};
+  struct ResetTag {};
+  struct VerifyResetTag {};
+  struct OffsetTag {};
+  struct VerifyOffsetTag {};
+
+  int N;
+  static const int offset = 13;
+  TestRangeRequire(const size_t N_)
+      : m_flags(Kokkos::ViewAllocateWithoutInitializing("flags"), N_), N(N_) {}
+
+  void test_for() {
+    typename view_type::HostMirror host_flags =
+        Kokkos::create_mirror_view(m_flags);
+
+    Kokkos::parallel_for(
+        Kokkos::Experimental::require(
+            Kokkos::RangePolicy<ExecSpace, ScheduleType>(0, N), Property()),
+        *this);
+
+#if defined(KOKKOS_ENABLE_PROFILING)
+    {
+      typedef TestRangeRequire<ExecSpace, ScheduleType, Property> ThisType;
+      std::string label("parallel_for");
+      Kokkos::Impl::ParallelConstructName<ThisType, void> pcn(label);
+      ASSERT_EQ(pcn.get(), label);
+      std::string empty_label("");
+      Kokkos::Impl::ParallelConstructName<ThisType, void> empty_pcn(
+          empty_label);
+      ASSERT_EQ(empty_pcn.get(), typeid(ThisType).name());
+    }
+#endif
+
+    Kokkos::parallel_for(
+        Kokkos::Experimental::require(
+            Kokkos::RangePolicy<ExecSpace, ScheduleType, VerifyInitTag>(0, N),
+            Property()),
+        *this);
+
+#if defined(KOKKOS_ENABLE_PROFILING)
+    {
+      typedef TestRangeRequire<ExecSpace, ScheduleType, Property> ThisType;
+      std::string label("parallel_for");
+      Kokkos::Impl::ParallelConstructName<ThisType, VerifyInitTag> pcn(label);
+      ASSERT_EQ(pcn.get(), label);
+      std::string empty_label("");
+      Kokkos::Impl::ParallelConstructName<ThisType, VerifyInitTag> empty_pcn(
+          empty_label);
+      ASSERT_EQ(empty_pcn.get(), std::string(typeid(ThisType).name()) + "/" +
+                                     typeid(VerifyInitTag).name());
+    }
+#endif
+
+    Kokkos::deep_copy(host_flags, m_flags);
+
+    int error_count = 0;
+    for (int i = 0; i < N; ++i) {
+      if (int(i) != host_flags(i)) ++error_count;
+    }
+    ASSERT_EQ(error_count, int(0));
+
+    Kokkos::parallel_for(
+        Kokkos::Experimental::require(
+            Kokkos::RangePolicy<ExecSpace, ScheduleType, ResetTag>(0, N),
+            Property()),
+        *this);
+    Kokkos::parallel_for(
+        std::string("TestKernelFor"),
+        Kokkos::Experimental::require(
+            Kokkos::RangePolicy<ExecSpace, ScheduleType, VerifyResetTag>(0, N),
+            Property()),
+        *this);
+
+    Kokkos::deep_copy(host_flags, m_flags);
+
+    error_count = 0;
+    for (int i = 0; i < N; ++i) {
+      if (int(2 * i) != host_flags(i)) ++error_count;
+    }
+    ASSERT_EQ(error_count, int(0));
+
+    Kokkos::parallel_for(
+        Kokkos::Experimental::require(
+            Kokkos::RangePolicy<ExecSpace, ScheduleType, OffsetTag>(offset,
+                                                                    N + offset),
+            Property()),
+        *this);
+    Kokkos::parallel_for(
+        std::string("TestKernelFor"),
+        Kokkos::Experimental::require(
+            Kokkos::RangePolicy<ExecSpace, ScheduleType,
+                                Kokkos::IndexType<unsigned int>,
+                                VerifyOffsetTag>(0, N),
+            Property()),
+        *this);
+
+    Kokkos::deep_copy(host_flags, m_flags);
+
+    error_count = 0;
+    for (int i = 0; i < N; ++i) {
+      if (i + offset != host_flags(i)) ++error_count;
+    }
+    ASSERT_EQ(error_count, int(0));
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  void operator()(const int i) const { m_flags(i) = i; }
+
+  KOKKOS_INLINE_FUNCTION
+  void operator()(const VerifyInitTag &, const int i) const {
+    if (i != m_flags(i)) {
+      printf("TestRangeRequire::test_for error at %d != %d\n", i, m_flags(i));
+    }
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  void operator()(const ResetTag &, const int i) const {
+    m_flags(i) = 2 * m_flags(i);
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  void operator()(const VerifyResetTag &, const int i) const {
+    if (2 * i != m_flags(i)) {
+      printf("TestRangeRequire::test_for error at %d != %d\n", i, m_flags(i));
+    }
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  void operator()(const OffsetTag &, const int i) const {
+    m_flags(i - offset) = i;
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  void operator()(const VerifyOffsetTag &, const int i) const {
+    if (i + offset != m_flags(i)) {
+      printf("TestRangeRequire::test_for error at %d != %d\n", i + offset,
+             m_flags(i));
+    }
+  }
+
+  //----------------------------------------
+
+  void test_reduce() {
+    int total = 0;
+
+    Kokkos::parallel_for(
+        Kokkos::Experimental::require(
+            Kokkos::RangePolicy<ExecSpace, ScheduleType>(0, N), Property()),
+        *this);
+
+    Kokkos::parallel_reduce(
+        "TestKernelReduce",
+        Kokkos::Experimental::require(
+            Kokkos::RangePolicy<ExecSpace, ScheduleType>(0, N), Property()),
+        *this, total);
+    // sum( 0 .. N-1 )
+    ASSERT_EQ(size_t((N - 1) * (N) / 2), size_t(total));
+
+    Kokkos::parallel_reduce(
+        Kokkos::Experimental::require(
+            Kokkos::RangePolicy<ExecSpace, ScheduleType, OffsetTag>(offset,
+                                                                    N + offset),
+            Property()),
+        *this, total);
+    // sum( 1 .. N )
+    ASSERT_EQ(size_t((N) * (N + 1) / 2), size_t(total));
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  void operator()(const int i, value_type &update) const {
+    update += m_flags(i);
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  void operator()(const OffsetTag &, const int i, value_type &update) const {
+    update += 1 + m_flags(i - offset);
+  }
+
+  //----------------------------------------
+
+  void test_scan() {
+    Kokkos::parallel_for(Kokkos::RangePolicy<ExecSpace, ScheduleType>(0, N),
+                         *this);
+
+    Kokkos::parallel_scan(
+        "TestKernelScan",
+        Kokkos::RangePolicy<ExecSpace, ScheduleType, OffsetTag>(0, N), *this);
+
+    int total = 0;
+    Kokkos::parallel_scan(
+        "TestKernelScanWithTotal",
+        Kokkos::RangePolicy<ExecSpace, ScheduleType, OffsetTag>(0, N), *this,
+        total);
+    ASSERT_EQ(size_t((N - 1) * (N) / 2), size_t(total));  // sum( 0 .. N-1 )
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  void operator()(const OffsetTag &, const int i, value_type &update,
+                  bool final) const {
+    update += m_flags(i);
+
+    if (final) {
+      if (update != (i * (i + 1)) / 2) {
+        printf("TestRangeRequire::test_scan error %d : %d != %d\n", i,
+               (i * (i + 1)) / 2, m_flags(i));
+      }
+    }
+  }
+
+  void test_dynamic_policy() {
+#if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
+    auto const N_no_implicit_capture = N;
+    typedef Kokkos::RangePolicy<ExecSpace, Kokkos::Schedule<Kokkos::Dynamic> >
+        policy_t;
+
+    {
+      Kokkos::View<size_t *, ExecSpace, Kokkos::MemoryTraits<Kokkos::Atomic> >
+          count("Count", ExecSpace::concurrency());
+      Kokkos::View<int *, ExecSpace> a("A", N);
+
+      Kokkos::parallel_for(
+          policy_t(0, N), KOKKOS_LAMBDA(const int &i) {
+            for (int k = 0; k < (i < N_no_implicit_capture / 2 ? 1 : 10000);
+                 k++) {
+              a(i)++;
+            }
+#ifdef KOKKOS_ENABLE_DEPRECATED_CODE
+            count(ExecSpace::hardware_thread_id())++;
+#else
+        count( ExecSpace::impl_hardware_thread_id() )++;
+#endif
+          });
+
+      int error = 0;
+      Kokkos::parallel_reduce(
+          Kokkos::RangePolicy<ExecSpace>(0, N),
+          KOKKOS_LAMBDA(const int &i, int &lsum) {
+            lsum += (a(i) != (i < N_no_implicit_capture / 2 ? 1 : 10000));
+          },
+          error);
+      ASSERT_EQ(error, 0);
+
+      if ((ExecSpace::concurrency() > (int)1) &&
+          (N > static_cast<int>(4 * ExecSpace::concurrency()))) {
+        size_t min = N;
+        size_t max = 0;
+        for (int t = 0; t < ExecSpace::concurrency(); t++) {
+          if (count(t) < min) min = count(t);
+          if (count(t) > max) max = count(t);
+        }
+        ASSERT_TRUE(min < max);
+
+        // if ( ExecSpace::concurrency() > 2 ) {
+        //  ASSERT_TRUE( 2 * min < max );
+        //}
+      }
+    }
+
+    {
+      Kokkos::View<size_t *, ExecSpace, Kokkos::MemoryTraits<Kokkos::Atomic> >
+          count("Count", ExecSpace::concurrency());
+      Kokkos::View<int *, ExecSpace> a("A", N);
+
+      int sum = 0;
+      Kokkos::parallel_reduce(
+          policy_t(0, N),
+          KOKKOS_LAMBDA(const int &i, int &lsum) {
+            for (int k = 0; k < (i < N_no_implicit_capture / 2 ? 1 : 10000);
+                 k++) {
+              a(i)++;
+            }
+#ifdef KOKKOS_ENABLE_DEPRECATED_CODE
+            count(ExecSpace::hardware_thread_id())++;
+#else
+            count(ExecSpace::impl_hardware_thread_id())++;
+#endif
+            lsum++;
+          },
+          sum);
+      ASSERT_EQ(sum, N);
+
+      int error = 0;
+      Kokkos::parallel_reduce(
+          Kokkos::RangePolicy<ExecSpace>(0, N),
+          KOKKOS_LAMBDA(const int &i, int &lsum) {
+            lsum += (a(i) != (i < N_no_implicit_capture / 2 ? 1 : 10000));
+          },
+          error);
+      ASSERT_EQ(error, 0);
+
+      if ((ExecSpace::concurrency() > (int)1) &&
+          (N > static_cast<int>(4 * ExecSpace::concurrency()))) {
+        size_t min = N;
+        size_t max = 0;
+        for (int t = 0; t < ExecSpace::concurrency(); t++) {
+          if (count(t) < min) min = count(t);
+          if (count(t) > max) max = count(t);
+        }
+        ASSERT_TRUE(min < max);
+
+        // if ( ExecSpace::concurrency() > 2 ) {
+        //  ASSERT_TRUE( 2 * min < max );
+        //}
+      }
+    }
+#endif
+  }
+};
+
+}  // namespace
+
+TEST(TEST_CATEGORY, range_for_require) {
+  using Property = Kokkos::Experimental::WorkItemProperty::HintLightWeight_t;
+  {
+    TestRangeRequire<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static>, Property>
+        f(0);
+    f.test_for();
+  }
+  {
+    TestRangeRequire<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic>,
+                     Property>
+        f(0);
+    f.test_for();
+  }
+
+  {
+    TestRangeRequire<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static>, Property>
+        f(2);
+    f.test_for();
+  }
+  {
+    TestRangeRequire<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic>,
+                     Property>
+        f(3);
+    f.test_for();
+  }
+
+  {
+    TestRangeRequire<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static>, Property>
+        f(1000);
+    f.test_for();
+  }
+  {
+    TestRangeRequire<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic>,
+                     Property>
+        f(1001);
+    f.test_for();
+  }
+}
+
+TEST(TEST_CATEGORY, range_reduce_require) {
+  using Property = Kokkos::Experimental::WorkItemProperty::HintLightWeight_t;
+  {
+    TestRangeRequire<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static>, Property>
+        f(0);
+    f.test_reduce();
+  }
+  {
+    TestRangeRequire<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic>,
+                     Property>
+        f(0);
+    f.test_reduce();
+  }
+
+  {
+    TestRangeRequire<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static>, Property>
+        f(2);
+    f.test_reduce();
+  }
+  {
+    TestRangeRequire<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic>,
+                     Property>
+        f(3);
+    f.test_reduce();
+  }
+
+  {
+    TestRangeRequire<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static>, Property>
+        f(1000);
+    f.test_reduce();
+  }
+  {
+    TestRangeRequire<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic>,
+                     Property>
+        f(1001);
+    f.test_reduce();
+  }
+}
+
+#ifndef KOKKOS_ENABLE_OPENMPTARGET
+TEST(TEST_CATEGORY, range_scan_require) {
+  using Property = Kokkos::Experimental::WorkItemProperty::HintLightWeight_t;
+  {
+    TestRangeRequire<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static>, Property>
+        f(0);
+    f.test_scan();
+  }
+  {
+    TestRangeRequire<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic>,
+                     Property>
+        f(0);
+    f.test_scan();
+  }
+#if !defined(KOKKOS_ENABLE_CUDA) && !defined(KOKKOS_ENABLE_HIP)
+  {
+    TestRangeRequire<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic>,
+                     Property>
+        f(0);
+    f.test_dynamic_policy();
+  }
+#endif
+
+  {
+    TestRangeRequire<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static>, Property>
+        f(2);
+    f.test_scan();
+  }
+  {
+    TestRangeRequire<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic>,
+                     Property>
+        f(3);
+    f.test_scan();
+  }
+#if !defined(KOKKOS_ENABLE_CUDA) && !defined(KOKKOS_ENABLE_HIP)
+  {
+    TestRangeRequire<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic>,
+                     Property>
+        f(3);
+    f.test_dynamic_policy();
+  }
+#endif
+
+  {
+    TestRangeRequire<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static>, Property>
+        f(1000);
+    f.test_scan();
+  }
+  {
+    TestRangeRequire<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic>,
+                     Property>
+        f(1001);
+    f.test_scan();
+  }
+#if !defined(KOKKOS_ENABLE_CUDA) && !defined(KOKKOS_ENABLE_HIP)
+  {
+    TestRangeRequire<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic>,
+                     Property>
+        f(1001);
+    f.test_dynamic_policy();
+  }
+#endif
+}
+#endif
+}  // namespace Test
diff --git a/kokkos/core/unit_test/TestReduce.hpp b/kokkos/core/unit_test/TestReduce.hpp
index a0ca88220..d63d5e8d4 100644
--- a/kokkos/core/unit_test/TestReduce.hpp
+++ b/kokkos/core/unit_test/TestReduce.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -95,12 +95,12 @@ class ReduceFunctor {
 };
 
 template <class DeviceType>
-class ReduceFunctorFinal : public ReduceFunctor<long, DeviceType> {
+class ReduceFunctorFinal : public ReduceFunctor<int64_t, DeviceType> {
  public:
-  typedef typename ReduceFunctor<long, DeviceType>::value_type value_type;
+  typedef typename ReduceFunctor<int64_t, DeviceType>::value_type value_type;
 
   KOKKOS_INLINE_FUNCTION
-  ReduceFunctorFinal(const size_t n) : ReduceFunctor<long, DeviceType>(n) {}
+  ReduceFunctorFinal(const size_t n) : ReduceFunctor<int64_t, DeviceType>(n) {}
 
   KOKKOS_INLINE_FUNCTION
   void final(value_type& dst) const {
@@ -198,11 +198,11 @@ class RuntimeReduceMinMax {
 
 template <class DeviceType>
 class RuntimeReduceFunctorFinal
-    : public RuntimeReduceFunctor<long, DeviceType> {
+    : public RuntimeReduceFunctor<int64_t, DeviceType> {
  public:
-  typedef RuntimeReduceFunctor<long, DeviceType> base_type;
+  typedef RuntimeReduceFunctor<int64_t, DeviceType> base_type;
   typedef typename base_type::value_type value_type;
-  typedef long scalar_type;
+  typedef int64_t scalar_type;
 
   RuntimeReduceFunctorFinal(const size_t theNwork, const size_t count)
       : base_type(theNwork, count) {}
@@ -237,9 +237,8 @@ class TestReduce {
 
     value_type result[Repeat];
 
-    const unsigned long nw = nwork;
-    const unsigned long nsum =
-        nw % 2 ? nw * ((nw + 1) / 2) : (nw / 2) * (nw + 1);
+    const uint64_t nw   = nwork;
+    const uint64_t nsum = nw % 2 ? nw * ((nw + 1) / 2) : (nw / 2) * (nw + 1);
 
     for (unsigned i = 0; i < Repeat; ++i) {
       Kokkos::parallel_reduce(nwork, functor_type(nwork), result[i]);
@@ -247,7 +246,7 @@ class TestReduce {
 
     for (unsigned i = 0; i < Repeat; ++i) {
       for (unsigned j = 0; j < Count; ++j) {
-        const unsigned long correct = 0 == j % 3 ? nw : nsum;
+        const uint64_t correct = 0 == j % 3 ? nw : nsum;
         ASSERT_EQ((ScalarType)correct, result[i].value[j]);
       }
     }
@@ -262,9 +261,8 @@ class TestReduce {
 
     value_type result[Repeat];
 
-    const unsigned long nw = nwork;
-    const unsigned long nsum =
-        nw % 2 ? nw * ((nw + 1) / 2) : (nw / 2) * (nw + 1);
+    const uint64_t nw   = nwork;
+    const uint64_t nsum = nw % 2 ? nw * ((nw + 1) / 2) : (nw / 2) * (nw + 1);
 
     for (unsigned i = 0; i < Repeat; ++i) {
       if (i % 2 == 0) {
@@ -277,7 +275,7 @@ class TestReduce {
 
     for (unsigned i = 0; i < Repeat; ++i) {
       for (unsigned j = 0; j < Count; ++j) {
-        const unsigned long correct = 0 == j % 3 ? nw : nsum;
+        const uint64_t correct = 0 == j % 3 ? nw : nsum;
         ASSERT_EQ((ScalarType)correct, -result[i].value[j]);
       }
     }
@@ -305,9 +303,8 @@ class TestReduceDynamic {
 
     ScalarType result[Repeat][Count];
 
-    const unsigned long nw = nwork;
-    const unsigned long nsum =
-        nw % 2 ? nw * ((nw + 1) / 2) : (nw / 2) * (nw + 1);
+    const uint64_t nw   = nwork;
+    const uint64_t nsum = nw % 2 ? nw * ((nw + 1) / 2) : (nw / 2) * (nw + 1);
 
     for (unsigned i = 0; i < Repeat; ++i) {
       if (i % 2 == 0) {
@@ -320,7 +317,7 @@ class TestReduceDynamic {
 
     for (unsigned i = 0; i < Repeat; ++i) {
       for (unsigned j = 0; j < Count; ++j) {
-        const unsigned long correct = 0 == j % 3 ? nw : nsum;
+        const uint64_t correct = 0 == j % 3 ? nw : nsum;
         ASSERT_EQ((ScalarType)correct, result[i][j]);
       }
     }
@@ -351,7 +348,7 @@ class TestReduceDynamic {
           const ScalarType correct = (j % 2) ? amax : amin;
           ASSERT_EQ((ScalarType)correct, result[i][j]);
         } else {
-          const unsigned long correct = j % 2 ? 1 : nwork;
+          const uint64_t correct = j % 2 ? 1 : nwork;
           ASSERT_EQ((ScalarType)correct, result[i][j]);
         }
       }
@@ -366,9 +363,8 @@ class TestReduceDynamic {
 
     typename functor_type::scalar_type result[Repeat][Count];
 
-    const unsigned long nw = nwork;
-    const unsigned long nsum =
-        nw % 2 ? nw * ((nw + 1) / 2) : (nw / 2) * (nw + 1);
+    const uint64_t nw   = nwork;
+    const uint64_t nsum = nw % 2 ? nw * ((nw + 1) / 2) : (nw / 2) * (nw + 1);
 
     for (unsigned i = 0; i < Repeat; ++i) {
       if (i % 2 == 0) {
@@ -381,7 +377,7 @@ class TestReduceDynamic {
 
     for (unsigned i = 0; i < Repeat; ++i) {
       for (unsigned j = 0; j < Count; ++j) {
-        const unsigned long correct = 0 == j % 3 ? nw : nsum;
+        const uint64_t correct = 0 == j % 3 ? nw : nsum;
         ASSERT_EQ((ScalarType)correct, -result[i][j]);
       }
     }
@@ -405,9 +401,8 @@ class TestReduceDynamicView {
 
     const unsigned CountLimit = 23;
 
-    const unsigned long nw = nwork;
-    const unsigned long nsum =
-        nw % 2 ? nw * ((nw + 1) / 2) : (nw / 2) * (nw + 1);
+    const uint64_t nw   = nwork;
+    const uint64_t nsum = nw % 2 ? nw * ((nw + 1) / 2) : (nw / 2) * (nw + 1);
 
     for (unsigned count = 0; count < CountLimit; ++count) {
       result_type result("result", count);
@@ -425,7 +420,7 @@ class TestReduceDynamicView {
       }
 
       for (unsigned j = 0; j < count; ++j) {
-        const unsigned long correct = 0 == j % 3 ? nw : nsum;
+        const uint64_t correct = 0 == j % 3 ? nw : nsum;
         ASSERT_EQ(host_result(j), (ScalarType)correct);
         host_result(j) = 0;
       }
@@ -435,9 +430,9 @@ class TestReduceDynamicView {
 
 }  // namespace
 
-TEST(TEST_CATEGORY, long_reduce) {
-  TestReduce<long, TEST_EXECSPACE>(0);
-  TestReduce<long, TEST_EXECSPACE>(1000000);
+TEST(TEST_CATEGORY, int64_t_reduce) {
+  TestReduce<int64_t, TEST_EXECSPACE>(0);
+  TestReduce<int64_t, TEST_EXECSPACE>(1000000);
 }
 
 TEST(TEST_CATEGORY, double_reduce) {
@@ -445,9 +440,9 @@ TEST(TEST_CATEGORY, double_reduce) {
   TestReduce<double, TEST_EXECSPACE>(1000000);
 }
 
-TEST(TEST_CATEGORY, long_reduce_dynamic) {
-  TestReduceDynamic<long, TEST_EXECSPACE>(0);
-  TestReduceDynamic<long, TEST_EXECSPACE>(1000000);
+TEST(TEST_CATEGORY, int64_t_reduce_dynamic) {
+  TestReduceDynamic<int64_t, TEST_EXECSPACE>(0);
+  TestReduceDynamic<int64_t, TEST_EXECSPACE>(1000000);
 }
 
 TEST(TEST_CATEGORY, double_reduce_dynamic) {
@@ -455,9 +450,9 @@ TEST(TEST_CATEGORY, double_reduce_dynamic) {
   TestReduceDynamic<double, TEST_EXECSPACE>(1000000);
 }
 
-TEST(TEST_CATEGORY, long_reduce_dynamic_view) {
-  TestReduceDynamicView<long, TEST_EXECSPACE>(0);
-  TestReduceDynamicView<long, TEST_EXECSPACE>(1000000);
+TEST(TEST_CATEGORY, int64_t_reduce_dynamic_view) {
+  TestReduceDynamicView<int64_t, TEST_EXECSPACE>(0);
+  TestReduceDynamicView<int64_t, TEST_EXECSPACE>(1000000);
 }
 
 }  // namespace Test
diff --git a/kokkos/core/unit_test/TestReduceCombinatorical.hpp b/kokkos/core/unit_test/TestReduceCombinatorical.hpp
index c785ac7e4..fe85f360c 100644
--- a/kokkos/core/unit_test/TestReduceCombinatorical.hpp
+++ b/kokkos/core/unit_test/TestReduceCombinatorical.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -467,10 +467,10 @@ struct TestReduceCombinatoricalInstantiation {
   }
 
   template <class... Args>
-  static void AddLambdaRange(Kokkos::InvalidType, Args... args) {}
+  static void AddLambdaRange(Kokkos::InvalidType, Args... /*args*/) {}
 
   template <class... Args>
-  static void AddLambdaTeam(Kokkos::InvalidType, Args... args) {}
+  static void AddLambdaTeam(Kokkos::InvalidType, Args... /*args*/) {}
 
   template <int ISTEAM, class... Args>
   static void AddFunctor(Args... args) {
diff --git a/kokkos/core/unit_test/TestReducers.hpp b/kokkos/core/unit_test/TestReducers.hpp
index 28d8286b9..04b4bd373 100644
--- a/kokkos/core/unit_test/TestReducers.hpp
+++ b/kokkos/core/unit_test/TestReducers.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/TestReducers_a.hpp b/kokkos/core/unit_test/TestReducers_a.hpp
index 4bef1d462..4efc4f645 100644
--- a/kokkos/core/unit_test/TestReducers_a.hpp
+++ b/kokkos/core/unit_test/TestReducers_a.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/TestReducers_b.hpp b/kokkos/core/unit_test/TestReducers_b.hpp
index 44ed45822..57aa0f3b7 100644
--- a/kokkos/core/unit_test/TestReducers_b.hpp
+++ b/kokkos/core/unit_test/TestReducers_b.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/TestReducers_c.hpp b/kokkos/core/unit_test/TestReducers_c.hpp
index eef77a12b..d1353b1f6 100644
--- a/kokkos/core/unit_test/TestReducers_c.hpp
+++ b/kokkos/core/unit_test/TestReducers_c.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/TestReducers_d.hpp b/kokkos/core/unit_test/TestReducers_d.hpp
index 3d92aca9d..2dc8ae5b5 100644
--- a/kokkos/core/unit_test/TestReducers_d.hpp
+++ b/kokkos/core/unit_test/TestReducers_d.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/TestResize.hpp b/kokkos/core/unit_test/TestResize.hpp
index aab939cbc..32a85f03e 100644
--- a/kokkos/core/unit_test/TestResize.hpp
+++ b/kokkos/core/unit_test/TestResize.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -71,7 +71,7 @@ void impl_testResize() {
     typedef Kokkos::View<int*, DeviceType> view_type;
     view_type view_1d("view_1d", sizes[0]);
     const int* oldPointer = view_1d.data();
-    EXPECT_TRUE(oldPointer != NULL);
+    EXPECT_TRUE(oldPointer != nullptr);
     resize_dispatch(Tag{}, view_1d, sizes[0]);
     const int* newPointer = view_1d.data();
     EXPECT_TRUE(oldPointer == newPointer);
@@ -80,7 +80,7 @@ void impl_testResize() {
     typedef Kokkos::View<int**, DeviceType> view_type;
     view_type view_2d("view_2d", sizes[0], sizes[1]);
     const int* oldPointer = view_2d.data();
-    EXPECT_TRUE(oldPointer != NULL);
+    EXPECT_TRUE(oldPointer != nullptr);
     resize_dispatch(Tag{}, view_2d, sizes[0], sizes[1]);
     const int* newPointer = view_2d.data();
     EXPECT_TRUE(oldPointer == newPointer);
@@ -89,7 +89,7 @@ void impl_testResize() {
     typedef Kokkos::View<int***, DeviceType> view_type;
     view_type view_3d("view_3d", sizes[0], sizes[1], sizes[2]);
     const int* oldPointer = view_3d.data();
-    EXPECT_TRUE(oldPointer != NULL);
+    EXPECT_TRUE(oldPointer != nullptr);
     resize_dispatch(Tag{}, view_3d, sizes[0], sizes[1], sizes[2]);
     const int* newPointer = view_3d.data();
     EXPECT_TRUE(oldPointer == newPointer);
@@ -98,7 +98,7 @@ void impl_testResize() {
     typedef Kokkos::View<int****, DeviceType> view_type;
     view_type view_4d("view_4d", sizes[0], sizes[1], sizes[2], sizes[3]);
     const int* oldPointer = view_4d.data();
-    EXPECT_TRUE(oldPointer != NULL);
+    EXPECT_TRUE(oldPointer != nullptr);
     resize_dispatch(Tag{}, view_4d, sizes[0], sizes[1], sizes[2], sizes[3]);
     const int* newPointer = view_4d.data();
     EXPECT_TRUE(oldPointer == newPointer);
@@ -108,7 +108,7 @@ void impl_testResize() {
     view_type view_5d("view_5d", sizes[0], sizes[1], sizes[2], sizes[3],
                       sizes[4]);
     const int* oldPointer = view_5d.data();
-    EXPECT_TRUE(oldPointer != NULL);
+    EXPECT_TRUE(oldPointer != nullptr);
     resize_dispatch(Tag{}, view_5d, sizes[0], sizes[1], sizes[2], sizes[3],
                     sizes[4]);
     const int* newPointer = view_5d.data();
@@ -119,7 +119,7 @@ void impl_testResize() {
     view_type view_6d("view_6d", sizes[0], sizes[1], sizes[2], sizes[3],
                       sizes[4], sizes[5]);
     const int* oldPointer = view_6d.data();
-    EXPECT_TRUE(oldPointer != NULL);
+    EXPECT_TRUE(oldPointer != nullptr);
     resize_dispatch(Tag{}, view_6d, sizes[0], sizes[1], sizes[2], sizes[3],
                     sizes[4], sizes[5]);
     const int* newPointer = view_6d.data();
@@ -130,7 +130,7 @@ void impl_testResize() {
     view_type view_7d("view_7d", sizes[0], sizes[1], sizes[2], sizes[3],
                       sizes[4], sizes[5], sizes[6]);
     const int* oldPointer = view_7d.data();
-    EXPECT_TRUE(oldPointer != NULL);
+    EXPECT_TRUE(oldPointer != nullptr);
     resize_dispatch(Tag{}, view_7d, sizes[0], sizes[1], sizes[2], sizes[3],
                     sizes[4], sizes[5], sizes[6]);
     const int* newPointer = view_7d.data();
@@ -141,7 +141,7 @@ void impl_testResize() {
     view_type view_8d("view_8d", sizes[0], sizes[1], sizes[2], sizes[3],
                       sizes[4], sizes[5], sizes[6], sizes[7]);
     const int* oldPointer = view_8d.data();
-    EXPECT_TRUE(oldPointer != NULL);
+    EXPECT_TRUE(oldPointer != nullptr);
     resize_dispatch(Tag{}, view_8d, sizes[0], sizes[1], sizes[2], sizes[3],
                     sizes[4], sizes[5], sizes[6], sizes[7]);
     const int* newPointer = view_8d.data();
diff --git a/kokkos/core/unit_test/TestScan.hpp b/kokkos/core/unit_test/TestScan.hpp
index 8721adfef..f7ebbb62a 100644
--- a/kokkos/core/unit_test/TestScan.hpp
+++ b/kokkos/core/unit_test/TestScan.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -50,7 +50,7 @@ namespace Test {
 template <class Device, class WorkSpec = size_t>
 struct TestScan {
   typedef Device execution_space;
-  typedef long int value_type;
+  typedef int64_t value_type;
 
   Kokkos::View<int, Device, Kokkos::MemoryTraits<Kokkos::Atomic> > errors;
 
@@ -98,10 +98,12 @@ struct TestScan {
 
     Kokkos::parallel_scan(N, *this);
 
-    long long int total = 0;
+    int64_t total = 0;
     Kokkos::parallel_scan(N, *this, total);
 
-    run_check(size_t((N + 1) * N / 2), size_t(total));
+    // We can't return a value in a constructor so use a lambda as wrapper to
+    // ignore it.
+    [&] { ASSERT_EQ(size_t((N + 1) * N / 2), size_t(total)); }();
     check_error();
   }
 
@@ -129,10 +131,6 @@ struct TestScan {
       (void)TestScan(i);
     }
   }
-
-  void run_check(const size_t& expected, const size_t& actual) {
-    ASSERT_EQ(expected, actual);
-  }
 };
 
 TEST(TEST_CATEGORY, scan) {
diff --git a/kokkos/core/unit_test/TestSharedAlloc.hpp b/kokkos/core/unit_test/TestSharedAlloc.hpp
index 59e779ae6..1b67e29d7 100644
--- a/kokkos/core/unit_test/TestSharedAlloc.hpp
+++ b/kokkos/core/unit_test/TestSharedAlloc.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -116,7 +116,7 @@ void test_shared_alloc() {
 #endif
 
     Kokkos::parallel_for(range, [=](size_t i) {
-      while (0 !=
+      while (nullptr !=
              (r[i] = static_cast<RecordMemS*>(RecordBase::decrement(r[i])))) {
 #ifdef KOKKOS_DEBUG
         if (r[i]->use_count() == 1) RecordBase::is_sane(r[i]);
@@ -157,7 +157,7 @@ void test_shared_alloc() {
 #endif
 
     Kokkos::parallel_for(range, [=](size_t i) {
-      while (0 !=
+      while (nullptr !=
              (r[i] = static_cast<RecordMemS*>(RecordBase::decrement(r[i])))) {
 #ifdef KOKKOS_DEBUG
         if (r[i]->use_count() == 1) RecordBase::is_sane(r[i]);
diff --git a/kokkos/core/unit_test/TestStackTrace.cpp b/kokkos/core/unit_test/TestStackTrace.cpp
index 81e5527ff..76ab7e3eb 100644
--- a/kokkos/core/unit_test/TestStackTrace.cpp
+++ b/kokkos/core/unit_test/TestStackTrace.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/TestStackTrace.hpp b/kokkos/core/unit_test/TestStackTrace.hpp
index bbdf8eef3..284332f3f 100644
--- a/kokkos/core/unit_test/TestStackTrace.hpp
+++ b/kokkos/core/unit_test/TestStackTrace.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/TestStackTrace_f0.cpp b/kokkos/core/unit_test/TestStackTrace_f0.cpp
index f29a6ca31..1514600f7 100644
--- a/kokkos/core/unit_test/TestStackTrace_f0.cpp
+++ b/kokkos/core/unit_test/TestStackTrace_f0.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/TestStackTrace_f1.cpp b/kokkos/core/unit_test/TestStackTrace_f1.cpp
index 7a3fdb3d5..b10c574c9 100644
--- a/kokkos/core/unit_test/TestStackTrace_f1.cpp
+++ b/kokkos/core/unit_test/TestStackTrace_f1.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/TestStackTrace_f2.cpp b/kokkos/core/unit_test/TestStackTrace_f2.cpp
index 5e7830459..23c1895e6 100644
--- a/kokkos/core/unit_test/TestStackTrace_f2.cpp
+++ b/kokkos/core/unit_test/TestStackTrace_f2.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/TestStackTrace_f3.cpp b/kokkos/core/unit_test/TestStackTrace_f3.cpp
index 899c75f98..ac004243f 100644
--- a/kokkos/core/unit_test/TestStackTrace_f3.cpp
+++ b/kokkos/core/unit_test/TestStackTrace_f3.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/TestStackTrace_f4.cpp b/kokkos/core/unit_test/TestStackTrace_f4.cpp
index 58118dc09..afae98a2a 100644
--- a/kokkos/core/unit_test/TestStackTrace_f4.cpp
+++ b/kokkos/core/unit_test/TestStackTrace_f4.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/TestTaskScheduler.hpp b/kokkos/core/unit_test/TestTaskScheduler.hpp
index 8eb1e3118..ebfdcf1df 100644
--- a/kokkos/core/unit_test/TestTaskScheduler.hpp
+++ b/kokkos/core/unit_test/TestTaskScheduler.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -843,11 +843,14 @@ struct TestMultipleDependence {
 #undef TEST_SCHEDULER
 #undef TEST_SCHEDULER_SUFFIX
 
+// KOKKOS WORKAROUND WIN32: Theses tests hang with msvc
+#ifndef _WIN32
 #define TEST_SCHEDULER_SUFFIX _chase_lev
 #define TEST_SCHEDULER Kokkos::ChaseLevTaskScheduler<TEST_EXECSPACE>
 #include "TestTaskScheduler_single.hpp"
 #undef TEST_SCHEDULER
 #undef TEST_SCHEDULER_SUFFIX
+#endif
 
 #if 0
 #define TEST_SCHEDULER_SUFFIX _fixed_mempool
diff --git a/kokkos/core/unit_test/TestTaskScheduler_single.hpp b/kokkos/core/unit_test/TestTaskScheduler_single.hpp
index e159995b8..c5d05382f 100644
--- a/kokkos/core/unit_test/TestTaskScheduler_single.hpp
+++ b/kokkos/core/unit_test/TestTaskScheduler_single.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/TestTeam.hpp b/kokkos/core/unit_test/TestTeam.hpp
index 09547281b..d1ee00396 100644
--- a/kokkos/core/unit_test/TestTeam.hpp
+++ b/kokkos/core/unit_test/TestTeam.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -100,7 +100,7 @@ struct TestTeamPolicy {
   struct NoOpTag {};
 
   KOKKOS_INLINE_FUNCTION
-  void operator()(const NoOpTag &, const team_member &member) const {}
+  void operator()(const NoOpTag &, const team_member & /*member*/) const {}
 
   static void test_small_league_size() {
     int bs = 8;   // batch size (number of elements per batch)
@@ -139,7 +139,7 @@ struct TestTeamPolicy {
 
   struct ReduceTag {};
 
-  typedef long value_type;
+  typedef int64_t value_type;
 
   KOKKOS_INLINE_FUNCTION
   void operator()(const team_member &member, value_type &update) const {
@@ -164,9 +164,9 @@ struct TestTeamPolicy {
         policy_type_reduce(league_size, 1)
             .team_size_max(functor, Kokkos::ParallelReduceTag());
 
-    const long N = team_size * league_size;
+    const int64_t N = team_size * league_size;
 
-    long total = 0;
+    int64_t total = 0;
 
     Kokkos::parallel_reduce(policy_type(league_size, team_size), functor,
                             total);
@@ -263,9 +263,8 @@ class TestReduceTeam {
 
     value_type result[Repeat];
 
-    const unsigned long nw = nwork;
-    const unsigned long nsum =
-        nw % 2 ? nw * ((nw + 1) / 2) : (nw / 2) * (nw + 1);
+    const uint64_t nw   = nwork;
+    const uint64_t nsum = nw % 2 ? nw * ((nw + 1) / 2) : (nw / 2) * (nw + 1);
 
     policy_type team_exec(nw, 1);
 
@@ -284,7 +283,7 @@ class TestReduceTeam {
 
     for (unsigned i = 0; i < Repeat; ++i) {
       for (unsigned j = 0; j < Count; ++j) {
-        const unsigned long correct = 0 == j % 3 ? nw : nsum;
+        const uint64_t correct = 0 == j % 3 ? nw : nsum;
         ASSERT_EQ((ScalarType)correct, result[i].value[j]);
       }
     }
@@ -302,7 +301,7 @@ class ScanTeamFunctor {
  public:
   typedef DeviceType execution_space;
   typedef Kokkos::TeamPolicy<ScheduleType, execution_space> policy_type;
-  typedef long int value_type;
+  typedef int64_t value_type;
 
   Kokkos::View<value_type, execution_space> accum;
   Kokkos::View<value_type, execution_space> total;
@@ -319,7 +318,7 @@ class ScanTeamFunctor {
   }
 
   struct JoinMax {
-    typedef long int value_type;
+    typedef int64_t value_type;
 
     KOKKOS_INLINE_FUNCTION
     void join(value_type volatile &dst,
@@ -332,31 +331,31 @@ class ScanTeamFunctor {
   void operator()(const typename policy_type::member_type ind,
                   value_type &error) const {
     if (0 == ind.league_rank() && 0 == ind.team_rank()) {
-      const long int thread_count = ind.league_size() * ind.team_size();
-      total()                     = (thread_count * (thread_count + 1)) / 2;
+      const int64_t thread_count = ind.league_size() * ind.team_size();
+      total()                    = (thread_count * (thread_count + 1)) / 2;
     }
 
     // Team max:
-    int long m = (long int)(ind.league_rank() + ind.team_rank());
-    ind.team_reduce(Kokkos::Max<int long>(m));
+    int64_t m = (int64_t)(ind.league_rank() + ind.team_rank());
+    ind.team_reduce(Kokkos::Max<int64_t>(m));
 
     if (m != ind.league_rank() + (ind.team_size() - 1)) {
       printf(
           "ScanTeamFunctor[%d.%d of %d.%d] reduce_max_answer(%ld) != "
           "reduce_max(%ld)\n",
           ind.league_rank(), ind.team_rank(), ind.league_size(),
-          ind.team_size(),
-          (long int)(ind.league_rank() + (ind.team_size() - 1)), m);
+          ind.team_size(), (int64_t)(ind.league_rank() + (ind.team_size() - 1)),
+          m);
     }
 
     // Scan:
-    const long int answer = (ind.league_rank() + 1) * ind.team_rank() +
-                            (ind.team_rank() * (ind.team_rank() + 1)) / 2;
+    const int64_t answer = (ind.league_rank() + 1) * ind.team_rank() +
+                           (ind.team_rank() * (ind.team_rank() + 1)) / 2;
 
-    const long int result =
+    const int64_t result =
         ind.team_scan(ind.league_rank() + 1 + ind.team_rank() + 1);
 
-    const long int result2 =
+    const int64_t result2 =
         ind.team_scan(ind.league_rank() + 1 + ind.team_rank() + 1);
 
     if (answer != result || answer != result2) {
@@ -369,7 +368,7 @@ class ScanTeamFunctor {
       error = 1;
     }
 
-    const long int thread_rank =
+    const int64_t thread_rank =
         ind.team_rank() + ind.team_size() * ind.league_rank();
     ind.team_scan(1 + thread_rank, accum.data());
   }
@@ -379,14 +378,14 @@ template <class DeviceType, class ScheduleType>
 class TestScanTeam {
  public:
   typedef DeviceType execution_space;
-  typedef long int value_type;
+  typedef int64_t value_type;
   typedef Kokkos::TeamPolicy<ScheduleType, execution_space> policy_type;
   typedef Test::ScanTeamFunctor<DeviceType, ScheduleType> functor_type;
 
   TestScanTeam(const size_t nteam) { run_test(nteam); }
 
   void run_test(const size_t nteam) {
-    typedef Kokkos::View<long int, Kokkos::HostSpace, Kokkos::MemoryUnmanaged>
+    typedef Kokkos::View<int64_t, Kokkos::HostSpace, Kokkos::MemoryUnmanaged>
         result_type;
 
     const unsigned REPEAT = 100000;
@@ -405,9 +404,9 @@ class TestScanTeam {
         nteam, team_exec.team_size_max(functor, Kokkos::ParallelReduceTag()));
 
     for (unsigned i = 0; i < Repeat; ++i) {
-      long int accum = 0;
-      long int total = 0;
-      long int error = 0;
+      int64_t accum = 0;
+      int64_t total = 0;
+      int64_t error = 0;
       Kokkos::deep_copy(functor.accum, total);
 
       Kokkos::parallel_reduce(team_exec, functor, result_type(&error));
@@ -445,7 +444,7 @@ struct SharedTeamFunctor {
       shared_int_array_type;
 
   // Tell how much shared memory will be required by this functor.
-  inline unsigned team_shmem_size(int team_size) const {
+  inline unsigned team_shmem_size(int /*team_size*/) const {
     return shared_int_array_type::shmem_size(SHARED_COUNT) +
            shared_int_array_type::shmem_size(SHARED_COUNT);
   }
@@ -462,7 +461,7 @@ struct SharedTeamFunctor {
           "member( %d/%d , %d/%d ) Failed to allocate shared memory of size "
           "%lu\n",
           ind.league_rank(), ind.league_size(), ind.team_rank(),
-          ind.team_size(), static_cast<unsigned long>(SHARED_COUNT));
+          ind.team_size(), static_cast<uint64_t>(SHARED_COUNT));
 
       ++update;  // Failure to allocate is an error.
     } else {
@@ -523,7 +522,6 @@ struct TestSharedTeam {
 namespace Test {
 
 #if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
-#if !defined(KOKKOS_ENABLE_CUDA) || (8000 <= CUDA_VERSION)
 template <class MemorySpace, class ExecSpace, class ScheduleType>
 struct TestLambdaSharedTeam {
   TestLambdaSharedTeam() { run(); }
@@ -568,7 +566,7 @@ struct TestLambdaSharedTeam {
           if ((shared_A.data() == nullptr && SHARED_COUNT > 0) ||
               (shared_B.data() == nullptr && SHARED_COUNT > 0)) {
             printf("Failed to allocate shared memory of size %lu\n",
-                   static_cast<unsigned long>(SHARED_COUNT));
+                   static_cast<uint64_t>(SHARED_COUNT));
 
             ++update;  // Failure to allocate is an error.
           } else {
@@ -601,7 +599,6 @@ struct TestLambdaSharedTeam {
   }
 };
 #endif
-#endif
 
 }  // namespace Test
 
@@ -636,7 +633,7 @@ struct ScratchTeamFunctor {
         (scratch_A.data() == nullptr && SHARED_TEAM_COUNT > 0) ||
         (scratch_B.data() == nullptr && SHARED_THREAD_COUNT > 0)) {
       printf("Failed to allocate shared memory of size %lu\n",
-             static_cast<unsigned long>(SHARED_TEAM_COUNT));
+             static_cast<uint64_t>(SHARED_TEAM_COUNT));
 
       ++update;  // Failure to allocate is an error.
     } else {
@@ -739,22 +736,22 @@ KOKKOS_INLINE_FUNCTION int test_team_mulit_level_scratch_loop_body(
       a_thread2(team.thread_scratch(0), 16);
 
   Kokkos::View<double *, ExecSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> >
-      b_team1(team.team_scratch(1), 128000);
+      b_team1(team.team_scratch(1), 12800);
   Kokkos::View<double *, ExecSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> >
-      b_thread1(team.thread_scratch(1), 16000);
+      b_thread1(team.thread_scratch(1), 1600);
   Kokkos::View<double *, ExecSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> >
-      b_team2(team.team_scratch(1), 128000);
+      b_team2(team.team_scratch(1), 12800);
   Kokkos::View<double *, ExecSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> >
-      b_thread2(team.thread_scratch(1), 16000);
+      b_thread2(team.thread_scratch(1), 1600);
 
   Kokkos::View<double *, ExecSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> >
       a_team3(team.team_scratch(0), 128);
   Kokkos::View<double *, ExecSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> >
       a_thread3(team.thread_scratch(0), 16);
   Kokkos::View<double *, ExecSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> >
-      b_team3(team.team_scratch(1), 128000);
+      b_team3(team.team_scratch(1), 12800);
   Kokkos::View<double *, ExecSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> >
-      b_thread3(team.thread_scratch(1), 16000);
+      b_thread3(team.thread_scratch(1), 1600);
 
   // The explicit types for 0 and 128 are here to test TeamThreadRange accepting
   // different types for begin and end.
@@ -775,7 +772,7 @@ KOKKOS_INLINE_FUNCTION int test_team_mulit_level_scratch_loop_body(
                    team.league_rank() * 100000;
   });
 
-  Kokkos::parallel_for(Kokkos::TeamThreadRange(team, 0, 128000),
+  Kokkos::parallel_for(Kokkos::TeamThreadRange(team, 0, 12800),
                        [&](const int &i) {
                          b_team1(i) = 1000000 + i + team.league_rank() * 100000;
                          b_team2(i) = 2000000 + i + team.league_rank() * 100000;
@@ -783,7 +780,7 @@ KOKKOS_INLINE_FUNCTION int test_team_mulit_level_scratch_loop_body(
                        });
   team.team_barrier();
 
-  Kokkos::parallel_for(Kokkos::ThreadVectorRange(team, 16000),
+  Kokkos::parallel_for(Kokkos::ThreadVectorRange(team, 1600),
                        [&](const int &i) {
                          b_thread1(i) = 1000000 + 100000 * team.team_rank() +
                                         16 - i + team.league_rank() * 100000;
@@ -817,7 +814,7 @@ KOKKOS_INLINE_FUNCTION int test_team_mulit_level_scratch_loop_body(
   });
 
   Kokkos::parallel_for(
-      Kokkos::TeamThreadRange(team, 0, 128000), [&](const int &i) {
+      Kokkos::TeamThreadRange(team, 0, 12800), [&](const int &i) {
         if (b_team1(i) != 1000000 + i + team.league_rank() * 100000) error++;
         if (b_team2(i) != 2000000 + i + team.league_rank() * 100000) error++;
         if (b_team3(i) != 3000000 + i + team.league_rank() * 100000) error++;
@@ -825,7 +822,7 @@ KOKKOS_INLINE_FUNCTION int test_team_mulit_level_scratch_loop_body(
   team.team_barrier();
 
   Kokkos::parallel_for(
-      Kokkos::ThreadVectorRange(team, 16000), [&](const int &i) {
+      Kokkos::ThreadVectorRange(team, 1600), [&](const int &i) {
         if (b_thread1(i) != 1000000 + 100000 * team.team_rank() + 16 - i +
                                 team.league_rank() * 100000)
           error++;
@@ -879,11 +876,11 @@ struct ClassNoShmemSizeFunction {
     const int per_team1 =
         3 * Kokkos::View<
                 double *, ExecSpace,
-                Kokkos::MemoryTraits<Kokkos::Unmanaged> >::shmem_size(128000);
+                Kokkos::MemoryTraits<Kokkos::Unmanaged> >::shmem_size(12800);
     const int per_thread1 =
         3 * Kokkos::View<
                 double *, ExecSpace,
-                Kokkos::MemoryTraits<Kokkos::Unmanaged> >::shmem_size(16000);
+                Kokkos::MemoryTraits<Kokkos::Unmanaged> >::shmem_size(1600);
 
     int team_size = 8;
     if (team_size > ExecSpace::concurrency())
@@ -952,11 +949,11 @@ struct ClassWithShmemSizeFunction {
     const int per_team1 =
         3 * Kokkos::View<
                 double *, ExecSpace,
-                Kokkos::MemoryTraits<Kokkos::Unmanaged> >::shmem_size(128000);
+                Kokkos::MemoryTraits<Kokkos::Unmanaged> >::shmem_size(12800);
     const int per_thread1 =
         3 * Kokkos::View<
                 double *, ExecSpace,
-                Kokkos::MemoryTraits<Kokkos::Unmanaged> >::shmem_size(16000);
+                Kokkos::MemoryTraits<Kokkos::Unmanaged> >::shmem_size(1600);
 
     int team_size = 8;
     if (team_size > ExecSpace::concurrency())
@@ -1008,7 +1005,6 @@ struct ClassWithShmemSizeFunction {
 template <class ExecSpace, class ScheduleType>
 void test_team_mulit_level_scratch_test_lambda() {
 #ifdef KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA
-#if !defined(KOKKOS_ENABLE_CUDA) || (8000 <= CUDA_VERSION)
   Kokkos::View<int, ExecSpace, Kokkos::MemoryTraits<Kokkos::Atomic> > errors;
   Kokkos::View<int, ExecSpace> d_errors("Errors");
   errors = d_errors;
@@ -1023,13 +1019,13 @@ void test_team_mulit_level_scratch_test_lambda() {
                    Kokkos::MemoryTraits<Kokkos::Unmanaged> >::shmem_size(16);
 
   const int per_team1 =
-      3 * Kokkos::View<
-              double *, ExecSpace,
-              Kokkos::MemoryTraits<Kokkos::Unmanaged> >::shmem_size(128000);
+      3 *
+      Kokkos::View<double *, ExecSpace,
+                   Kokkos::MemoryTraits<Kokkos::Unmanaged> >::shmem_size(12800);
   const int per_thread1 =
       3 *
       Kokkos::View<double *, ExecSpace,
-                   Kokkos::MemoryTraits<Kokkos::Unmanaged> >::shmem_size(16000);
+                   Kokkos::MemoryTraits<Kokkos::Unmanaged> >::shmem_size(1600);
 
   int team_size = 8;
   if (team_size > ExecSpace::concurrency())
@@ -1070,7 +1066,6 @@ void test_team_mulit_level_scratch_test_lambda() {
       error);
   ASSERT_EQ(error, 0);
 #endif
-#endif
 }
 
 }  // namespace Test
@@ -1102,7 +1097,7 @@ struct TestShmemSize {
   TestShmemSize() { run(); }
 
   void run() {
-    typedef Kokkos::View<long ***, ExecSpace> view_type;
+    typedef Kokkos::View<int64_t ***, ExecSpace> view_type;
 
     size_t d1 = 5;
     size_t d2 = 6;
@@ -1110,7 +1105,7 @@ struct TestShmemSize {
 
     size_t size = view_type::shmem_size(d1, d2, d3);
 
-    ASSERT_EQ(size, (d1 * d2 * d3 + 1) * sizeof(long));
+    ASSERT_EQ(size, (d1 * d2 * d3 + 1) * sizeof(int64_t));
 
     test_layout_stride();
   }
@@ -1137,16 +1132,129 @@ namespace Test {
 
 namespace {
 
-template <class ExecSpace, class ScheduleType>
-struct TestTeamBroadcast {
-  typedef typename Kokkos::TeamPolicy<ScheduleType, ExecSpace>::member_type
-      team_member;
+template <class ExecSpace, class ScheduleType, class T, class Enabled = void>
+struct TestTeamBroadcast;
+
+template <class ExecSpace, class ScheduleType, class T>
+struct TestTeamBroadcast<
+    ExecSpace, ScheduleType, T,
+    typename std::enable_if<(sizeof(T) == sizeof(char)), void>::type> {
+  using team_member =
+      typename Kokkos::TeamPolicy<ScheduleType, ExecSpace>::member_type;
+  using memory_space = typename ExecSpace::memory_space;
+  using value_type   = T;
+
+  const value_type offset;
 
-  TestTeamBroadcast(const size_t league_size) {}
+  TestTeamBroadcast(const size_t /*league_size*/, const value_type os_)
+      : offset(os_) {}
 
   struct BroadcastTag {};
 
-  typedef long value_type;
+  KOKKOS_INLINE_FUNCTION
+  void operator()(const team_member &teamMember, value_type &update) const {
+    int lid = teamMember.league_rank();
+    int tid = teamMember.team_rank();
+    int ts  = teamMember.team_size();
+
+    value_type parUpdate = 0;
+    value_type value     = (value_type)(tid % 0xFF) + offset;
+
+    // broadcast boolean and value to team from source thread
+    teamMember.team_broadcast(value, lid % ts);
+
+    Kokkos::parallel_reduce(
+        Kokkos::TeamThreadRange(teamMember, ts),
+        [&](const int /*j*/, value_type &teamUpdate) { teamUpdate |= value; },
+        Kokkos::BOr<value_type, memory_space>(parUpdate));
+
+    if (teamMember.team_rank() == 0) update |= parUpdate;
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  void operator()(const BroadcastTag &, const team_member &teamMember,
+                  value_type &update) const {
+    int lid = teamMember.league_rank();
+    int tid = teamMember.team_rank();
+    int ts  = teamMember.team_size();
+
+    value_type parUpdate = 0;
+    value_type value     = (value_type)(tid % 0xFF) + offset;
+
+    teamMember.team_broadcast([&](value_type &var) { var -= offset; }, value,
+                              lid % ts);
+
+    Kokkos::parallel_reduce(
+        Kokkos::TeamThreadRange(teamMember, ts),
+        [&](const int /*j*/, value_type &teamUpdate) { teamUpdate |= value; },
+        Kokkos::BOr<value_type, memory_space>(parUpdate));
+
+    if (teamMember.team_rank() == 0) update |= parUpdate;
+  }
+
+  static void test_teambroadcast(const size_t league_size,
+                                 const value_type off) {
+    TestTeamBroadcast functor(league_size, off);
+
+    typedef Kokkos::TeamPolicy<ScheduleType, ExecSpace> policy_type;
+    typedef Kokkos::TeamPolicy<ScheduleType, ExecSpace, BroadcastTag>
+        policy_type_f;
+
+    const int team_size =
+        policy_type_f(league_size, 1)
+            .team_size_max(
+                functor,
+                Kokkos::
+                    ParallelReduceTag());  // printf("team_size=%d\n",team_size);
+
+    // team_broadcast with value
+    value_type total = 0;
+
+    Kokkos::parallel_reduce(policy_type(league_size, team_size), functor,
+                            Kokkos::BOr<value_type, Kokkos::HostSpace>(total));
+
+    value_type expected_result = 0;
+    for (unsigned int i = 0; i < league_size; i++) {
+      value_type val = (value_type((i % team_size % 0xFF)) + off);
+      expected_result |= val;
+    }
+    ASSERT_EQ(expected_result, total);
+    // printf("team_broadcast with value --"
+    //"expected_result=%x,"
+    //"total=%x\n",expected_result, total);
+
+    // team_broadcast with function object
+    total = 0;
+
+    Kokkos::parallel_reduce(policy_type_f(league_size, team_size), functor,
+                            Kokkos::BOr<value_type, Kokkos::HostSpace>(total));
+
+    expected_result = 0;
+    for (unsigned int i = 0; i < league_size; i++) {
+      value_type val = ((value_type)((i % team_size % 0xFF)));
+      expected_result |= val;
+    }
+    ASSERT_EQ(expected_result, total);
+    // printf("team_broadcast with function object --"
+    // "expected_result=%x,"
+    // "total=%x\n",expected_result, total);
+  }
+};
+
+template <class ExecSpace, class ScheduleType, class T>
+struct TestTeamBroadcast<
+    ExecSpace, ScheduleType, T,
+    typename std::enable_if<(sizeof(T) > sizeof(char)), void>::type> {
+  using team_member =
+      typename Kokkos::TeamPolicy<ScheduleType, ExecSpace>::member_type;
+  using value_type = T;
+
+  const value_type offset;
+
+  TestTeamBroadcast(const size_t /*league_size*/, const value_type os_)
+      : offset(os_) {}
+
+  struct BroadcastTag {};
 
   KOKKOS_INLINE_FUNCTION
   void operator()(const team_member &teamMember, value_type &update) const {
@@ -1155,16 +1263,26 @@ struct TestTeamBroadcast {
     int ts  = teamMember.team_size();
 
     value_type parUpdate = 0;
-    value_type value     = tid * 3 + 1;
+    value_type value     = (value_type)(tid * 3) + offset;
+
+    // setValue is used to determine if the update should be
+    // performed at the bottom.  The thread id must match the
+    // thread id used to broadcast the value.  It is the
+    // thread id that matches the league rank mod team size
+    // this way each league rank will use a different thread id
+    // which is likely not 0
+    bool setValue = ((lid % ts) == tid);
 
+    // broadcast boolean and value to team from source thread
     teamMember.team_broadcast(value, lid % ts);
+    teamMember.team_broadcast(setValue, lid % ts);
 
     Kokkos::parallel_reduce(
         Kokkos::TeamThreadRange(teamMember, ts),
-        [&](const int j, value_type &teamUpdate) { teamUpdate += value; },
+        [&](const int /*j*/, value_type &teamUpdate) { teamUpdate += value; },
         parUpdate);
 
-    if (teamMember.team_rank() == 0) update += parUpdate;
+    if (teamMember.team_rank() == 0 && setValue) update += parUpdate;
   }
 
   KOKKOS_INLINE_FUNCTION
@@ -1175,21 +1293,53 @@ struct TestTeamBroadcast {
     int ts  = teamMember.team_size();
 
     value_type parUpdate = 0;
-    value_type value     = tid * 3 + 1;
+    value_type value     = (value_type)(tid * 3) + offset;
+
+    // setValue is used to determine if the update should be
+    // performed at the bottom.  The thread id must match the
+    // thread id used to broadcast the value.  It is the
+    // thread id that matches the league rank mod team size
+    // this way each league rank will use a different thread id
+    // which is likely not 0. Note the logic is switched from
+    // above because the functor switches it back.
+    bool setValue = ((lid % ts) != tid);
 
     teamMember.team_broadcast([&](value_type &var) { var *= 2; }, value,
                               lid % ts);
+    teamMember.team_broadcast([&](bool &bVar) { bVar = !bVar; }, setValue,
+                              lid % ts);
 
     Kokkos::parallel_reduce(
         Kokkos::TeamThreadRange(teamMember, ts),
-        [&](const int j, value_type &teamUpdate) { teamUpdate += value; },
+        [&](const int /*j*/, value_type &teamUpdate) { teamUpdate += value; },
         parUpdate);
 
-    if (teamMember.team_rank() == 0) update += parUpdate;
+    if (teamMember.team_rank() == 0 && setValue) update += parUpdate;
+  }
+
+  template <class ScalarType>
+  static inline
+      typename std::enable_if<!std::is_integral<ScalarType>::value, void>::type
+      compare_test(ScalarType A, ScalarType B) {
+    if (std::is_same<ScalarType, double>::value) {
+      ASSERT_DOUBLE_EQ((double)A, (double)B);
+    } else if (std::is_same<ScalarType, float>::value) {
+      ASSERT_FLOAT_EQ((double)A, (double)B);
+    } else {
+      ASSERT_EQ(A, B);
+    }
+  }
+
+  template <class ScalarType>
+  static inline
+      typename std::enable_if<std::is_integral<ScalarType>::value, void>::type
+      compare_test(ScalarType A, ScalarType B) {
+    ASSERT_EQ(A, B);
   }
 
-  static void test_teambroadcast(const size_t league_size) {
-    TestTeamBroadcast functor(league_size);
+  static void test_teambroadcast(const size_t league_size,
+                                 const value_type off) {
+    TestTeamBroadcast functor(league_size, off);
 
     typedef Kokkos::TeamPolicy<ScheduleType, ExecSpace> policy_type;
     typedef Kokkos::TeamPolicy<ScheduleType, ExecSpace, BroadcastTag>
@@ -1203,22 +1353,23 @@ struct TestTeamBroadcast {
                     ParallelReduceTag());  // printf("team_size=%d\n",team_size);
 
     // team_broadcast with value
-    long total = 0;
+    value_type total = 0;
 
     Kokkos::parallel_reduce(policy_type(league_size, team_size), functor,
                             total);
 
     value_type expected_result = 0;
     for (unsigned int i = 0; i < league_size; i++) {
-      value_type val = ((i % team_size) * 3 + 1) * team_size;
+      value_type val =
+          (value_type((i % team_size) * 3) + off) * (value_type)team_size;
       expected_result += val;
     }
-    ASSERT_EQ(size_t(expected_result),
-              size_t(total));  // printf("team_broadcast with value --
-                               // expected_result=%d,
-                               // total=%d\n",expected_result, total);
+    compare_test(expected_result,
+                 total);  // printf("team_broadcast with value --
+                          // expected_result=%d,
+                          // total=%d\n",expected_result, total);
 
-    // team_broadcast with funtion object
+    // team_broadcast with function object
     total = 0;
 
     Kokkos::parallel_reduce(policy_type_f(league_size, team_size), functor,
@@ -1226,13 +1377,14 @@ struct TestTeamBroadcast {
 
     expected_result = 0;
     for (unsigned int i = 0; i < league_size; i++) {
-      value_type val = ((i % team_size) * 3 + 1) * 2 * team_size;
+      value_type val = ((value_type)((i % team_size) * 3) + off) *
+                       (value_type)(2 * team_size);
       expected_result += val;
     }
-    ASSERT_EQ(size_t(expected_result),
-              size_t(total));  // printf("team_broadcast with funtion object --
-                               // expected_result=%d,
-                               // total=%d\n",expected_result, total);
+    compare_test(expected_result,
+                 total);  // printf("team_broadcast with function object --
+                          // expected_result=%d,
+                          // total=%d\n",expected_result, total);
   }
 };
 
diff --git a/kokkos/core/unit_test/TestTeamTeamSize.hpp b/kokkos/core/unit_test/TestTeamTeamSize.hpp
index 1656d100e..0703f90cf 100644
--- a/kokkos/core/unit_test/TestTeamTeamSize.hpp
+++ b/kokkos/core/unit_test/TestTeamTeamSize.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -78,13 +78,13 @@ template <class T, int N, class PolicyType, int S>
 struct FunctorFor {
   double static_array[S];
   KOKKOS_INLINE_FUNCTION
-  void operator()(const typename PolicyType::member_type& team) const {}
+  void operator()(const typename PolicyType::member_type& /*team*/) const {}
 };
 template <class T, int N, class PolicyType, int S>
 struct FunctorReduce {
   double static_array[S];
   KOKKOS_INLINE_FUNCTION
-  void operator()(const typename PolicyType::member_type& team,
+  void operator()(const typename PolicyType::member_type& /*team*/,
                   MyArray<T, N>& lval) const {
     for (int j = 0; j < N; j++) lval.values[j] += 1 + lval.values[0];
   }
@@ -191,7 +191,7 @@ struct PrintFunctor2 {
 };
 
 TEST(TEST_CATEGORY, team_policy_max_scalar_without_plus_equal_k) {
-  using ExecSpace           = Kokkos::DefaultExecutionSpace;
+  using ExecSpace           = TEST_EXECSPACE;
   using ReducerType         = Kokkos::MinMax<double, Kokkos::HostSpace>;
   using ReducerValueType    = typename ReducerType::value_type;
   using DynamicScheduleType = Kokkos::Schedule<Kokkos::Dynamic>;
diff --git a/kokkos/core/unit_test/TestTeamVector.hpp b/kokkos/core/unit_test/TestTeamVector.hpp
index 0e9c26508..c313988ef 100644
--- a/kokkos/core/unit_test/TestTeamVector.hpp
+++ b/kokkos/core/unit_test/TestTeamVector.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -605,7 +605,7 @@ struct functor_vec_single {
 
   KOKKOS_INLINE_FUNCTION
   void operator()(typename policy_type::member_type team) const {
-    // Warning: this test case intentionally violates permissable semantics.
+    // Warning: this test case intentionally violates permissible semantics.
     // It is not valid to get references to members of the enclosing region
     // inside a parallel_for and write to it.
     Scalar value = 0;
@@ -622,7 +622,7 @@ struct functor_vec_single {
     Scalar value2 = 0;
     Kokkos::parallel_reduce(
         Kokkos::ThreadVectorRange(team, nStart, nEnd),
-        [&](int i, Scalar &val) { val += value; }, value2);
+        [&](int /*i*/, Scalar &val) { val += value; }, value2);
 
     if (value2 != (value * (nEnd - nStart))) {
       printf("FAILED vector_single broadcast %i %i %f %f\n", team.league_rank(),
@@ -895,8 +895,7 @@ namespace Test {
 // Computes y^T*A*x
 // ( modified from kokkos-tutorials/GTC2016/Exercises/ThreeLevelPar )
 
-#if (!defined(KOKKOS_ENABLE_CUDA)) || \
-    (defined(KOKKOS_ENABLE_CUDA_LAMBDA) && (8000 <= CUDA_VERSION))
+#if (!defined(KOKKOS_ENABLE_CUDA)) || defined(KOKKOS_ENABLE_CUDA_LAMBDA)
 template <typename ScalarType, class DeviceType>
 class TestTripleNestedReduce {
  public:
diff --git a/kokkos/core/unit_test/TestTeamVectorRange.hpp b/kokkos/core/unit_test/TestTeamVectorRange.hpp
index 278c397d2..cc8378518 100644
--- a/kokkos/core/unit_test/TestTeamVectorRange.hpp
+++ b/kokkos/core/unit_test/TestTeamVectorRange.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -233,7 +233,7 @@ struct functor_teamvector_for {
   typedef typename ExecutionSpace::scratch_memory_space shmem_space;
   typedef Kokkos::View<Scalar*, shmem_space, Kokkos::MemoryUnmanaged>
       shared_int;
-  unsigned team_shmem_size(int team_size) const {
+  unsigned team_shmem_size(int /*team_size*/) const {
     return shared_int::shmem_size(131);
   }
 
diff --git a/kokkos/core/unit_test/TestTemplateMetaFunctions.hpp b/kokkos/core/unit_test/TestTemplateMetaFunctions.hpp
index a751f77b3..b9c16f506 100644
--- a/kokkos/core/unit_test/TestTemplateMetaFunctions.hpp
+++ b/kokkos/core/unit_test/TestTemplateMetaFunctions.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -58,7 +58,7 @@ struct SumPlain {
   SumPlain(type view_) : view(view_) {}
 
   KOKKOS_INLINE_FUNCTION
-  void operator()(int i, Scalar& val) { val += Scalar(); }
+  void operator()(int /*i*/, Scalar& val) { val += Scalar(); }
 };
 
 template <class Scalar, class ExecutionSpace>
@@ -80,7 +80,7 @@ struct SumInitJoinFinalValueType {
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()(int i, value_type& val) const { val += value_type(); }
+  void operator()(int /*i*/, value_type& val) const { val += value_type(); }
 };
 
 template <class Scalar, class ExecutionSpace>
@@ -102,7 +102,7 @@ struct SumInitJoinFinalValueType2 {
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()(int i, value_type& val) const { val += value_type(); }
+  void operator()(int /*i*/, value_type& val) const { val += value_type(); }
 };
 
 template <class Scalar, class ExecutionSpace>
@@ -157,7 +157,7 @@ struct SumWrongInitJoinFinalValueType {
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()(int i, value_type& val) const { val += value_type(); }
+  void operator()(int /*i*/, value_type& val) const { val += value_type(); }
 };
 
 template <class Scalar, class ExecutionSpace>
diff --git a/kokkos/core/unit_test/TestTile.hpp b/kokkos/core/unit_test/TestTile.hpp
index 1531ed630..9e916ef31 100644
--- a/kokkos/core/unit_test/TestTile.hpp
+++ b/kokkos/core/unit_test/TestTile.hpp
@@ -23,10 +23,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/TestUniqueToken.hpp b/kokkos/core/unit_test/TestUniqueToken.hpp
index 140b1be23..c85ba1afc 100644
--- a/kokkos/core/unit_test/TestUniqueToken.hpp
+++ b/kokkos/core/unit_test/TestUniqueToken.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/TestUtilities.hpp b/kokkos/core/unit_test/TestUtilities.hpp
index 16c4b5798..f5f027a55 100644
--- a/kokkos/core/unit_test/TestUtilities.hpp
+++ b/kokkos/core/unit_test/TestUtilities.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/TestViewAPI.hpp b/kokkos/core/unit_test/TestViewAPI.hpp
index 34c84ff84..b9847773b 100644
--- a/kokkos/core/unit_test/TestViewAPI.hpp
+++ b/kokkos/core/unit_test/TestViewAPI.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -841,6 +841,22 @@ struct TestViewMirror {
     ASSERT_EQ(a_org(5), a_h3(5));
   }
 
+  template <typename View>
+  static typename View::const_type view_const_cast(View const &v) {
+    return v;
+  }
+
+  static void test_mirror_copy_const_data_type() {
+    using ExecutionSpace = typename DeviceType::execution_space;
+    int const N          = 100;
+    Kokkos::View<int *, ExecutionSpace> v("v", N);
+    Kokkos::deep_copy(v, 255);
+    auto v_m1 = Kokkos::create_mirror_view_and_copy(
+        Kokkos::DefaultHostExecutionSpace(), view_const_cast(v));
+    auto v_m2 = Kokkos::create_mirror_view_and_copy(ExecutionSpace(),
+                                                    view_const_cast(v));
+  }
+
   template <class MemoryTraits, class Space>
   struct CopyUnInit {
     typedef typename Kokkos::Impl::MirrorViewType<
@@ -896,6 +912,7 @@ struct TestViewMirror {
     test_mirror_view<Kokkos::MemoryTraits<Kokkos::Unmanaged> >();
     test_mirror_copy<Kokkos::MemoryTraits<0> >();
     test_mirror_copy<Kokkos::MemoryTraits<Kokkos::Unmanaged> >();
+    test_mirror_copy_const_data_type();
     test_mirror_no_initialize<Kokkos::MemoryTraits<0> >();
     test_mirror_no_initialize<Kokkos::MemoryTraits<Kokkos::Unmanaged> >();
   }
@@ -920,8 +937,6 @@ class TestViewAPI {
       dView4_unmanaged;
   typedef typename dView0::host_mirror_space host;
 
-  TestViewAPI() {}
-
   static void run_test_view_operator_a() {
     {
       TestViewOperator<T, device> f;
@@ -1034,12 +1049,12 @@ class TestViewAPI {
     dView4 dx, dy, dz;
     hView4 hx, hy, hz;
 
-    ASSERT_TRUE(dx.data() == 0);
-    ASSERT_TRUE(dy.data() == 0);
-    ASSERT_TRUE(dz.data() == 0);
-    ASSERT_TRUE(hx.data() == 0);
-    ASSERT_TRUE(hy.data() == 0);
-    ASSERT_TRUE(hz.data() == 0);
+    ASSERT_TRUE(dx.data() == nullptr);
+    ASSERT_TRUE(dy.data() == nullptr);
+    ASSERT_TRUE(dz.data() == nullptr);
+    ASSERT_TRUE(hx.data() == nullptr);
+    ASSERT_TRUE(hy.data() == nullptr);
+    ASSERT_TRUE(hz.data() == nullptr);
     ASSERT_EQ(dx.extent(0), 0u);
     ASSERT_EQ(dy.extent(0), 0u);
     ASSERT_EQ(dz.extent(0), 0u);
@@ -1096,11 +1111,11 @@ class TestViewAPI {
 
     ASSERT_EQ(dx.use_count(), size_t(2));
 
-    ASSERT_FALSE(dx.data() == 0);
-    ASSERT_FALSE(const_dx.data() == 0);
-    ASSERT_FALSE(unmanaged_dx.data() == 0);
-    ASSERT_FALSE(unmanaged_from_ptr_dx.data() == 0);
-    ASSERT_FALSE(dy.data() == 0);
+    ASSERT_FALSE(dx.data() == nullptr);
+    ASSERT_FALSE(const_dx.data() == nullptr);
+    ASSERT_FALSE(unmanaged_dx.data() == nullptr);
+    ASSERT_FALSE(unmanaged_from_ptr_dx.data() == nullptr);
+    ASSERT_FALSE(dy.data() == nullptr);
     ASSERT_NE(dx, dy);
 
     ASSERT_EQ(dx.extent(0), unsigned(N0));
@@ -1139,6 +1154,7 @@ class TestViewAPI {
       Kokkos::deep_copy(typename hView4::execution_space(), dx, hx);
       Kokkos::deep_copy(typename hView4::execution_space(), dy, dx);
       Kokkos::deep_copy(typename hView4::execution_space(), hy, dy);
+      typename dView4::execution_space().fence();
 
       for (size_t ip = 0; ip < N0; ++ip)
         for (size_t i1 = 0; i1 < N1; ++i1)
@@ -1149,6 +1165,7 @@ class TestViewAPI {
 
       Kokkos::deep_copy(typename hView4::execution_space(), dx, T(0));
       Kokkos::deep_copy(typename hView4::execution_space(), hx, dx);
+      typename dView4::execution_space().fence();
 
       for (size_t ip = 0; ip < N0; ++ip)
         for (size_t i1 = 0; i1 < N1; ++i1)
@@ -1172,6 +1189,7 @@ class TestViewAPI {
       Kokkos::deep_copy(typename dView4::execution_space(), dx, hx);
       Kokkos::deep_copy(typename dView4::execution_space(), dy, dx);
       Kokkos::deep_copy(typename dView4::execution_space(), hy, dy);
+      typename dView4::execution_space().fence();
 
       for (size_t ip = 0; ip < N0; ++ip)
         for (size_t i1 = 0; i1 < N1; ++i1)
@@ -1182,6 +1200,7 @@ class TestViewAPI {
 
       Kokkos::deep_copy(typename dView4::execution_space(), dx, T(0));
       Kokkos::deep_copy(typename dView4::execution_space(), hx, dx);
+      typename dView4::execution_space().fence();
 
       for (size_t ip = 0; ip < N0; ++ip)
         for (size_t i1 = 0; i1 < N1; ++i1)
@@ -1233,19 +1252,19 @@ class TestViewAPI {
     ASSERT_NE(dx, dz);
 
     dx = dView4();
-    ASSERT_TRUE(dx.data() == 0);
-    ASSERT_FALSE(dy.data() == 0);
-    ASSERT_FALSE(dz.data() == 0);
+    ASSERT_TRUE(dx.data() == nullptr);
+    ASSERT_FALSE(dy.data() == nullptr);
+    ASSERT_FALSE(dz.data() == nullptr);
 
     dy = dView4();
-    ASSERT_TRUE(dx.data() == 0);
-    ASSERT_TRUE(dy.data() == 0);
-    ASSERT_FALSE(dz.data() == 0);
+    ASSERT_TRUE(dx.data() == nullptr);
+    ASSERT_TRUE(dy.data() == nullptr);
+    ASSERT_FALSE(dz.data() == nullptr);
 
     dz = dView4();
-    ASSERT_TRUE(dx.data() == 0);
-    ASSERT_TRUE(dy.data() == 0);
-    ASSERT_TRUE(dz.data() == 0);
+    ASSERT_TRUE(dx.data() == nullptr);
+    ASSERT_TRUE(dy.data() == nullptr);
+    ASSERT_TRUE(dz.data() == nullptr);
   }
 
   static void run_test_deep_copy_empty() {
@@ -1450,6 +1469,11 @@ class TestViewAPI {
   }
 
   static void run_test_error() {
+#ifdef KOKKOS_ENABLE_OPENMPTARGET
+    if (std::is_same<typename dView1::memory_space,
+                     Kokkos::Experimental::OpenMPTargetSpace>::value)
+      return;
+#endif
     auto alloc_size = std::numeric_limits<size_t>::max() - 42;
     try {
       auto should_always_fail = dView1("hello_world_failure", alloc_size);
diff --git a/kokkos/core/unit_test/TestViewAPI_a.hpp b/kokkos/core/unit_test/TestViewAPI_a.hpp
index 166df9579..048ba51c1 100644
--- a/kokkos/core/unit_test/TestViewAPI_a.hpp
+++ b/kokkos/core/unit_test/TestViewAPI_a.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/TestViewAPI_b.hpp b/kokkos/core/unit_test/TestViewAPI_b.hpp
index 8aee22fe6..ad9069e39 100644
--- a/kokkos/core/unit_test/TestViewAPI_b.hpp
+++ b/kokkos/core/unit_test/TestViewAPI_b.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/TestViewAPI_c.hpp b/kokkos/core/unit_test/TestViewAPI_c.hpp
index 60b2df0ba..a70792dc6 100644
--- a/kokkos/core/unit_test/TestViewAPI_c.hpp
+++ b/kokkos/core/unit_test/TestViewAPI_c.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/TestViewAPI_d.hpp b/kokkos/core/unit_test/TestViewAPI_d.hpp
index 574a08140..ecb65804b 100644
--- a/kokkos/core/unit_test/TestViewAPI_d.hpp
+++ b/kokkos/core/unit_test/TestViewAPI_d.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/TestViewAPI_e.hpp b/kokkos/core/unit_test/TestViewAPI_e.hpp
index 3f6b8c7fd..40ae08363 100644
--- a/kokkos/core/unit_test/TestViewAPI_e.hpp
+++ b/kokkos/core/unit_test/TestViewAPI_e.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -204,13 +204,13 @@ TEST(TEST_CATEGORY, anonymous_space) { test_anonymous_space(); }
 template <class ExecSpace>
 struct TestViewOverloadResolution {
   // Overload based on value_type and rank
-  static int foo(Kokkos::View<const double**, ExecSpace> a) { return 1; }
-  static int foo(Kokkos::View<const int**, ExecSpace> a) { return 2; }
-  static int foo(Kokkos::View<const double***, ExecSpace> a) { return 3; }
+  static int foo(Kokkos::View<const double**, ExecSpace> /*a*/) { return 1; }
+  static int foo(Kokkos::View<const int**, ExecSpace> /*a*/) { return 2; }
+  static int foo(Kokkos::View<const double***, ExecSpace> /*a*/) { return 3; }
 
   // Overload based on compile time dimensions
-  static int bar(Kokkos::View<double * [3], ExecSpace> a) { return 4; }
-  static int bar(Kokkos::View<double * [4], ExecSpace> a) { return 5; }
+  static int bar(Kokkos::View<double * [3], ExecSpace> /*a*/) { return 4; }
+  static int bar(Kokkos::View<double * [4], ExecSpace> /*a*/) { return 5; }
 
   static void test_function_overload() {
     Kokkos::View<double**, typename ExecSpace::execution_space::array_layout,
@@ -240,3 +240,5 @@ TEST(TEST_CATEGORY, view_overload_resolution) {
   TestViewOverloadResolution<TEST_EXECSPACE>::test_function_overload();
 }
 }  // namespace Test
+
+#include <TestViewIsAssignable.hpp>
diff --git a/kokkos/core/unit_test/TestViewCopy.hpp b/kokkos/core/unit_test/TestViewCopy.hpp
index dc86589cb..6db2d3a4f 100644
--- a/kokkos/core/unit_test/TestViewCopy.hpp
+++ b/kokkos/core/unit_test/TestViewCopy.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -52,124 +52,446 @@ namespace Test {
 
 namespace {
 
-template <typename ExecSpace>
-struct TestViewCopy {
-  using InExecSpace = ExecSpace;
+template <class ViewType>
+struct CheckResult {
+  using value_type = typename ViewType::non_const_value_type;
+  ViewType v;
+  value_type value;
+  CheckResult(ViewType v_, value_type value_) : v(v_), value(value_){};
+  KOKKOS_FUNCTION
+  void operator()(const int i, int& lsum) const {
+    for (int j = 0; j < static_cast<int>(v.extent(1)); j++) {
+      if (v.access(i, j) != value) lsum++;
+    }
+  }
+};
+
+template <class ViewType>
+bool run_check(ViewType v, typename ViewType::value_type value) {
+  using exec_space = typename ViewType::memory_space::execution_space;
+  int errors       = 0;
+  Kokkos::fence();
+  Kokkos::parallel_reduce(Kokkos::RangePolicy<exec_space>(0, v.extent(0)),
+                          CheckResult<ViewType>(v, value), errors);
+  return errors == 0;
+}
+
+}  // namespace
+
+TEST(TEST_CATEGORY, view_copy_tests) {
+  int N = 10000;
+  int M = 10;
 
-  static void test_view_copy(const int dim0, const int dim1, const int dim2) {
-#if defined(KOKKOS_ENABLE_CUDA) || defined(KOKKOS_ENABLE_ROCM)
-    // ExecSpace = CudaUVM, CudaHostPinned
-    // This test will fail at runtime with an illegal memory access if something
-    // goes wrong Test 1: deep_copy from host_mirror_space to ExecSpace and
-    // ExecSpace back to host_mirror_space
+  Kokkos::View<int**, Kokkos::LayoutRight, TEST_EXECSPACE> defaulted;
+  Kokkos::View<int**, Kokkos::LayoutRight, TEST_EXECSPACE> a("A", N, M);
+  Kokkos::View<int**, Kokkos::LayoutRight, TEST_EXECSPACE> b("B", N, M);
+  auto h_a  = Kokkos::create_mirror(a);
+  auto h_b  = Kokkos::create_mirror(b);
+  auto m_a  = Kokkos::create_mirror_view(a);
+  auto s_a  = Kokkos::subview(a, Kokkos::ALL, 1);
+  auto s_b  = Kokkos::subview(b, Kokkos::ALL, 1);
+  auto hs_a = Kokkos::subview(h_a, Kokkos::ALL, 1);
+  auto hs_b = Kokkos::subview(h_b, Kokkos::ALL, 1);
+  auto dev  = typename TEST_EXECSPACE::execution_space();
+  auto host = Kokkos::DefaultHostExecutionSpace();
+
+  constexpr bool DevExecCanAccessHost =
+      Kokkos::Impl::SpaceAccessibility<typename TEST_EXECSPACE::execution_space,
+                                       Kokkos::HostSpace>::accessible;
+
+  constexpr bool HostExecCanAccessDev = Kokkos::Impl::SpaceAccessibility<
+      typename Kokkos::HostSpace::execution_space,
+      typename TEST_EXECSPACE::memory_space>::accessible;
+
+  // Contiguous copies
+  { Kokkos::deep_copy(defaulted, defaulted); }
+  {
+    Kokkos::deep_copy(a, 1);
+    ASSERT_TRUE(run_check(a, 1));
+  }
+  {
+    Kokkos::deep_copy(a, a);
+    ASSERT_TRUE(run_check(a, 1));
+  }
+  {
+    Kokkos::deep_copy(m_a, a);
+    ASSERT_TRUE(run_check(m_a, 1));
+  }
+  {
+    Kokkos::deep_copy(m_a, 2);
+    ASSERT_TRUE(run_check(m_a, 2));
+  }
+  {
+    Kokkos::deep_copy(a, m_a);
+    ASSERT_TRUE(run_check(a, 2));
+  }
+  {
+    Kokkos::deep_copy(b, 3);
+    ASSERT_TRUE(run_check(b, 3));
+  }
+  {
+    Kokkos::deep_copy(h_a, 4);
+    ASSERT_TRUE(run_check(h_a, 4));
+  }
+  {
+    Kokkos::deep_copy(a, b);
+    ASSERT_TRUE(run_check(a, 3));
+  }
+  {
+    Kokkos::deep_copy(h_b, h_a);
+    ASSERT_TRUE(run_check(h_b, 4));
+  }
+  {
+    Kokkos::deep_copy(h_a, a);
+    ASSERT_TRUE(run_check(h_a, 3));
+  }
+  {
+    Kokkos::deep_copy(b, h_b);
+    ASSERT_TRUE(run_check(b, 4));
+  }
+  // Non contiguous copies
+  {
+    Kokkos::deep_copy(s_a, 5);
+    ASSERT_TRUE(run_check(s_a, 5));
+  }
+  {
+    Kokkos::deep_copy(hs_a, 6);
+    ASSERT_TRUE(run_check(hs_a, 6));
+  }
+  {
+    Kokkos::deep_copy(s_b, s_a);
+    ASSERT_TRUE(run_check(s_b, 5));
+  }
+  {
+    Kokkos::deep_copy(hs_b, hs_a);
+    ASSERT_TRUE(run_check(hs_b, 6));
+  }
+  if (DevExecCanAccessHost || HostExecCanAccessDev) {
     {
-      typedef Kokkos::View<double****, InExecSpace> Rank4ViewType;
-      Rank4ViewType view_4;
-      view_4 = Rank4ViewType("view_4", dim0, dim1, dim2, dim2);
-
-      typedef typename Kokkos::Impl::is_space<
-          InExecSpace>::host_mirror_space::execution_space host_space_type;
-      Kokkos::View<double**, Kokkos::LayoutLeft, host_space_type> srcView(
-          "srcView", dim2, dim2);
-
-      // Strided dst view
-      auto dstView =
-          Kokkos::subview(view_4, 0, 0, Kokkos::ALL(), Kokkos::ALL());
-
-      // host_mirror_space to ExecSpace
-      Kokkos::deep_copy(dstView, srcView);
-      Kokkos::fence();
-
-      // ExecSpace to host_mirror_space
-      Kokkos::deep_copy(srcView, dstView);
-      Kokkos::fence();
+      Kokkos::deep_copy(hs_b, s_b);
+      ASSERT_TRUE(run_check(hs_b, 5));
     }
-
-    // Test 2: deep_copy from Cuda to ExecSpace and ExecSpace back to Cuda
     {
-      typedef Kokkos::View<double****, InExecSpace> Rank4ViewType;
-      Rank4ViewType view_4;
-      view_4 = Rank4ViewType("view_4", dim0, dim1, dim2, dim2);
-
-#if defined(KOKKOS_ENABLE_CUDA)
-      typedef typename std::conditional<
-          Kokkos::Impl::MemorySpaceAccess<
-              Kokkos::CudaSpace,
-              typename InExecSpace::memory_space>::accessible,
-          Kokkos::CudaSpace, InExecSpace>::type space_type;
-#endif
-#if defined(KOKKOS_ENABLE_ROCM)
-      typedef typename std::conditional<
-          Kokkos::Impl::MemorySpaceAccess<
-              Kokkos::ROCmSpace,
-              typename InExecSpace::memory_space>::accessible,
-          Kokkos::ROCmSpace, InExecSpace>::type space_type;
-#endif
-      Kokkos::View<double**, Kokkos::LayoutLeft, space_type> srcView(
-          "srcView", dim2, dim2);
-
-      // Strided dst view
-      auto dstView =
-          Kokkos::subview(view_4, 0, 0, Kokkos::ALL(), Kokkos::ALL());
-
-      // Cuda to ExecSpace
-      Kokkos::deep_copy(dstView, srcView);
-      Kokkos::fence();
-
-      // ExecSpace to Cuda
-      Kokkos::deep_copy(srcView, dstView);
-      Kokkos::fence();
+      Kokkos::deep_copy(s_a, hs_a);
+      ASSERT_TRUE(run_check(s_a, 6));
     }
+  }
 
-    // Test 3: deep_copy from host_space to ExecSpace and ExecSpace back to
-    // host_space
+  // Contiguous copies
+  { Kokkos::deep_copy(dev, defaulted, defaulted); }
+  {
+    Kokkos::deep_copy(dev, a, 1);
+    ASSERT_TRUE(run_check(a, 1));
+  }
+  {
+    Kokkos::deep_copy(dev, a, a);
+    ASSERT_TRUE(run_check(a, 1));
+  }
+  {
+    Kokkos::deep_copy(dev, m_a, a);
+    ASSERT_TRUE(run_check(m_a, 1));
+  }
+  {
+    Kokkos::deep_copy(dev, m_a, 2);
+    ASSERT_TRUE(run_check(m_a, 2));
+  }
+  {
+    Kokkos::deep_copy(dev, a, m_a);
+    ASSERT_TRUE(run_check(a, 2));
+  }
+  {
+    Kokkos::deep_copy(dev, b, 3);
+    ASSERT_TRUE(run_check(b, 3));
+  }
+  {
+    Kokkos::deep_copy(dev, h_a, 4);
+    ASSERT_TRUE(run_check(h_a, 4));
+  }
+  {
+    Kokkos::deep_copy(dev, a, b);
+    ASSERT_TRUE(run_check(a, 3));
+  }
+  {
+    Kokkos::deep_copy(dev, h_b, h_a);
+    ASSERT_TRUE(run_check(h_b, 4));
+  }
+  {
+    Kokkos::deep_copy(dev, h_a, a);
+    ASSERT_TRUE(run_check(h_a, 3));
+  }
+  {
+    Kokkos::deep_copy(dev, b, h_b);
+    ASSERT_TRUE(run_check(b, 4));
+  }
+  // Non contiguous copies
+  {
+    Kokkos::deep_copy(dev, s_a, 5);
+    ASSERT_TRUE(run_check(s_a, 5));
+  }
+  {
+    Kokkos::deep_copy(dev, hs_a, 6);
+    ASSERT_TRUE(run_check(hs_a, 6));
+  }
+  {
+    Kokkos::deep_copy(dev, s_b, s_a);
+    ASSERT_TRUE(run_check(s_b, 5));
+  }
+  {
+    Kokkos::deep_copy(dev, hs_b, hs_a);
+    ASSERT_TRUE(run_check(hs_b, 6));
+  }
+  if (DevExecCanAccessHost || HostExecCanAccessDev) {
     {
-      typedef Kokkos::View<double****, InExecSpace> Rank4ViewType;
-      Rank4ViewType view_4;
-      view_4 = Rank4ViewType("view_4", dim0, dim1, dim2, dim2);
-
-      typedef Kokkos::HostSpace host_space_type;
-      Kokkos::View<double**, Kokkos::LayoutLeft, host_space_type> srcView(
-          "srcView", dim2, dim2);
-
-      // Strided dst view
-      auto dstView =
-          Kokkos::subview(view_4, 0, 0, Kokkos::ALL(), Kokkos::ALL());
-
-      // host_space to ExecSpace
-      Kokkos::deep_copy(dstView, srcView);
-      Kokkos::fence();
+      Kokkos::deep_copy(dev, hs_b, s_b);
+      ASSERT_TRUE(run_check(hs_b, 5));
+    }
+    {
+      Kokkos::deep_copy(dev, s_a, hs_a);
+      ASSERT_TRUE(run_check(s_a, 6));
+    }
+  }
 
-      // ExecSpace to host_space
-      Kokkos::deep_copy(srcView, dstView);
-      Kokkos::fence();
+  // Contiguous copies
+  { Kokkos::deep_copy(host, defaulted, defaulted); }
+  {
+    Kokkos::deep_copy(host, a, 1);
+    ASSERT_TRUE(run_check(a, 1));
+  }
+  {
+    Kokkos::deep_copy(host, a, a);
+    ASSERT_TRUE(run_check(a, 1));
+  }
+  {
+    Kokkos::deep_copy(host, m_a, a);
+    ASSERT_TRUE(run_check(m_a, 1));
+  }
+  {
+    Kokkos::deep_copy(host, m_a, 2);
+    ASSERT_TRUE(run_check(m_a, 2));
+  }
+  {
+    Kokkos::deep_copy(host, a, m_a);
+    ASSERT_TRUE(run_check(a, 2));
+  }
+  {
+    Kokkos::deep_copy(host, b, 3);
+    ASSERT_TRUE(run_check(b, 3));
+  }
+  {
+    Kokkos::deep_copy(host, h_a, 4);
+    ASSERT_TRUE(run_check(h_a, 4));
+  }
+  {
+    Kokkos::deep_copy(host, a, b);
+    ASSERT_TRUE(run_check(a, 3));
+  }
+  {
+    Kokkos::deep_copy(host, h_b, h_a);
+    ASSERT_TRUE(run_check(h_b, 4));
+  }
+  {
+    Kokkos::deep_copy(host, h_a, a);
+    ASSERT_TRUE(run_check(h_a, 3));
+  }
+  {
+    Kokkos::deep_copy(host, b, h_b);
+    ASSERT_TRUE(run_check(b, 4));
+  }
+  // Non contiguous copies
+  {
+    Kokkos::deep_copy(host, s_a, 5);
+    ASSERT_TRUE(run_check(s_a, 5));
+  }
+  {
+    Kokkos::deep_copy(host, hs_a, 6);
+    ASSERT_TRUE(run_check(hs_a, 6));
+  }
+  {
+    Kokkos::deep_copy(host, s_b, s_a);
+    ASSERT_TRUE(run_check(s_b, 5));
+  }
+  {
+    Kokkos::deep_copy(host, hs_b, hs_a);
+    ASSERT_TRUE(run_check(hs_b, 6));
+  }
+  if (DevExecCanAccessHost || HostExecCanAccessDev) {
+    {
+      Kokkos::deep_copy(host, hs_b, s_b);
+      ASSERT_TRUE(run_check(hs_b, 5));
+    }
+    {
+      Kokkos::deep_copy(host, s_a, hs_a);
+      ASSERT_TRUE(run_check(s_a, 6));
     }
-#endif
-  }  // end test_view_copy
+  }
+}
 
-};  // end struct
+TEST(TEST_CATEGORY, view_copy_tests_rank_0) {
+  Kokkos::View<int, TEST_EXECSPACE> defaulted;
+  Kokkos::View<int, TEST_EXECSPACE> a("A");
+  Kokkos::View<int, TEST_EXECSPACE> b("B");
+  auto h_a  = Kokkos::create_mirror(a);
+  auto h_b  = Kokkos::create_mirror(b);
+  auto m_a  = Kokkos::create_mirror_view(a);
+  auto dev  = typename TEST_EXECSPACE::execution_space();
+  auto host = Kokkos::DefaultHostExecutionSpace();
 
-}  // namespace
+  // No execution space
+  { Kokkos::deep_copy(defaulted, defaulted); }
+  {
+    Kokkos::deep_copy(a, 1);
+    ASSERT_TRUE(run_check(a, 1));
+  }
+  {
+    Kokkos::deep_copy(a, a);
+    ASSERT_TRUE(run_check(a, 1));
+  }
+  {
+    Kokkos::deep_copy(m_a, a);
+    ASSERT_TRUE(run_check(m_a, 1));
+  }
+  {
+    Kokkos::deep_copy(m_a, 2);
+    ASSERT_TRUE(run_check(m_a, 2));
+  }
+  {
+    Kokkos::deep_copy(a, m_a);
+    ASSERT_TRUE(run_check(a, 2));
+  }
+  {
+    Kokkos::deep_copy(b, 3);
+    ASSERT_TRUE(run_check(b, 3));
+  }
+  {
+    Kokkos::deep_copy(h_a, 4);
+    ASSERT_TRUE(run_check(h_a, 4));
+  }
+  {
+    Kokkos::deep_copy(a, b);
+    ASSERT_TRUE(run_check(a, 3));
+  }
+  {
+    Kokkos::deep_copy(h_b, h_a);
+    ASSERT_TRUE(run_check(h_b, 4));
+  }
+  {
+    Kokkos::deep_copy(h_a, a);
+    ASSERT_TRUE(run_check(h_a, 3));
+  }
+  {
+    Kokkos::deep_copy(b, h_b);
+    ASSERT_TRUE(run_check(b, 4));
+  }
 
-TEST(TEST_CATEGORY, view_copy_tests) {
-  // Only include this file to be compiled with CudaUVM and CudaHostPinned
-  TestViewCopy<TEST_EXECSPACE>::test_view_copy(4, 2, 3);
-  TestViewCopy<TEST_EXECSPACE>::test_view_copy(4, 2, 0);
+  // Device
+  { Kokkos::deep_copy(dev, defaulted, defaulted); }
+  {
+    Kokkos::deep_copy(dev, a, 1);
+    ASSERT_TRUE(run_check(a, 1));
+  }
+  {
+    Kokkos::deep_copy(dev, a, a);
+    ASSERT_TRUE(run_check(a, 1));
+  }
+  {
+    Kokkos::deep_copy(dev, m_a, a);
+    ASSERT_TRUE(run_check(m_a, 1));
+  }
+  {
+    Kokkos::deep_copy(dev, m_a, 2);
+    ASSERT_TRUE(run_check(m_a, 2));
+  }
+  {
+    Kokkos::deep_copy(dev, a, m_a);
+    ASSERT_TRUE(run_check(a, 2));
+  }
+  {
+    Kokkos::deep_copy(dev, b, 3);
+    ASSERT_TRUE(run_check(b, 3));
+  }
+  {
+    Kokkos::deep_copy(dev, h_a, 4);
+    ASSERT_TRUE(run_check(h_a, 4));
+  }
+  {
+    Kokkos::deep_copy(dev, a, b);
+    ASSERT_TRUE(run_check(a, 3));
+  }
+  {
+    Kokkos::deep_copy(dev, h_b, h_a);
+    ASSERT_TRUE(run_check(h_b, 4));
+  }
+  {
+    Kokkos::deep_copy(dev, h_a, a);
+    ASSERT_TRUE(run_check(h_a, 3));
+  }
+  {
+    Kokkos::deep_copy(dev, b, h_b);
+    ASSERT_TRUE(run_check(b, 4));
+  }
+
+  // Host
+  { Kokkos::deep_copy(host, defaulted, defaulted); }
+  {
+    Kokkos::deep_copy(host, a, 1);
+    ASSERT_TRUE(run_check(a, 1));
+  }
+  {
+    Kokkos::deep_copy(host, a, a);
+    ASSERT_TRUE(run_check(a, 1));
+  }
+  {
+    Kokkos::deep_copy(host, m_a, a);
+    ASSERT_TRUE(run_check(m_a, 1));
+  }
+  {
+    Kokkos::deep_copy(host, m_a, 2);
+    ASSERT_TRUE(run_check(m_a, 2));
+  }
+  {
+    Kokkos::deep_copy(host, a, m_a);
+    ASSERT_TRUE(run_check(a, 2));
+  }
+  {
+    Kokkos::deep_copy(host, b, 3);
+    ASSERT_TRUE(run_check(b, 3));
+  }
+  {
+    Kokkos::deep_copy(host, h_a, 4);
+    ASSERT_TRUE(run_check(h_a, 4));
+  }
+  {
+    Kokkos::deep_copy(host, a, b);
+    ASSERT_TRUE(run_check(a, 3));
+  }
+  {
+    Kokkos::deep_copy(host, h_b, h_a);
+    ASSERT_TRUE(run_check(h_b, 4));
+  }
+  {
+    Kokkos::deep_copy(host, h_a, a);
+    ASSERT_TRUE(run_check(h_a, 3));
+  }
+  {
+    Kokkos::deep_copy(host, b, h_b);
+    ASSERT_TRUE(run_check(b, 4));
+  }
 }
 
 TEST(TEST_CATEGORY, view_copy_degenerated) {
-  // Only include this file to be compiled with CudaUVM and CudaHostPinned
-  Kokkos::View<int*, Kokkos::MemoryTraits<Kokkos::Unmanaged>> v_um_def_1;
-  Kokkos::View<int*, Kokkos::MemoryTraits<Kokkos::Unmanaged>> v_um_1(
-      reinterpret_cast<int*>(-1), 0);
-  Kokkos::View<int*> v_m_def_1;
-  Kokkos::View<int*> v_m_1("v_m_1", 0);
-
-  Kokkos::View<int*, Kokkos::MemoryTraits<Kokkos::Unmanaged>> v_um_def_2;
-  Kokkos::View<int*, Kokkos::MemoryTraits<Kokkos::Unmanaged>> v_um_2(
-      reinterpret_cast<int*>(-1), 0);
-  Kokkos::View<int*> v_m_def_2;
-  Kokkos::View<int*> v_m_2("v_m_2", 0);
+  Kokkos::View<int*, TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::Unmanaged>>
+      v_um_def_1;
+  Kokkos::View<int*, TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::Unmanaged>>
+  v_um_1(reinterpret_cast<int*>(-1), 0);
+  Kokkos::View<int*, TEST_EXECSPACE> v_m_def_1;
+  Kokkos::View<int*, TEST_EXECSPACE> v_m_1("v_m_1", 0);
+
+  Kokkos::View<int*, TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::Unmanaged>>
+      v_um_def_2;
+  Kokkos::View<int*, TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::Unmanaged>>
+  v_um_2(reinterpret_cast<int*>(-1), 0);
+  Kokkos::View<int*, TEST_EXECSPACE> v_m_def_2;
+  Kokkos::View<int*, TEST_EXECSPACE> v_m_2("v_m_2", 0);
 
   Kokkos::deep_copy(v_um_def_1, v_um_def_2);
   Kokkos::deep_copy(v_um_def_1, v_um_2);
diff --git a/kokkos/core/unit_test/TestViewCtorPropEmbeddedDim.hpp b/kokkos/core/unit_test/TestViewCtorPropEmbeddedDim.hpp
index 5134f9349..30701b3a4 100644
--- a/kokkos/core/unit_test/TestViewCtorPropEmbeddedDim.hpp
+++ b/kokkos/core/unit_test/TestViewCtorPropEmbeddedDim.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -60,7 +60,7 @@ struct TestViewCtorProp_EmbeddedDim {
   using ViewIntType    = typename Kokkos::View<int**, ExecSpace>;
   using ViewDoubleType = typename Kokkos::View<double*, ExecSpace>;
 
-  // Cuda 7.0 has issues with using a lamda in parallel_for to initialize the
+  // Cuda 7.0 has issues with using a lambda in parallel_for to initialize the
   // view - replace with this functor
   template <class ViewType>
   struct Functor {
diff --git a/kokkos/core/unit_test/TestViewIsAssignable.hpp b/kokkos/core/unit_test/TestViewIsAssignable.hpp
new file mode 100644
index 000000000..fcf9f75f3
--- /dev/null
+++ b/kokkos/core/unit_test/TestViewIsAssignable.hpp
@@ -0,0 +1,145 @@
+#include <Kokkos_Core.hpp>
+
+namespace Test {
+namespace Impl {
+template <class ViewTypeDst, class ViewTypeSrc>
+struct TestAssignability {
+  using mapping_type =
+      Kokkos::Impl::ViewMapping<typename ViewTypeDst::traits,
+                                typename ViewTypeSrc::traits,
+                                typename ViewTypeDst::specialize>;
+
+  template <class MappingType>
+  static void try_assign(
+      ViewTypeDst& dst, ViewTypeSrc& src,
+      typename std::enable_if<MappingType::is_assignable>::type* = nullptr) {
+    dst = src;
+  }
+
+  template <class MappingType>
+  static void try_assign(
+      ViewTypeDst&, ViewTypeSrc&,
+      typename std::enable_if<!MappingType::is_assignable>::type* = nullptr) {
+    Kokkos::Impl::throw_runtime_exception(
+        "TestAssignability::try_assign: Unexpected call path");
+  }
+
+  template <class... Dimensions>
+  static void test(bool always, bool sometimes, Dimensions... dims) {
+    ViewTypeDst dst;
+    ViewTypeSrc src("SRC", dims...);
+
+    bool is_always_assignable =
+        Kokkos::is_always_assignable<ViewTypeDst, ViewTypeSrc>::value;
+    bool is_assignable = Kokkos::is_assignable(dst, src);
+
+    // Print out if there is an error with typeid so you can just filter the
+    // output with c++filt -t to see which assignment causes the error.
+    if (is_always_assignable != always || is_assignable != sometimes)
+      printf(
+          "is_always_assignable: %i (%i), is_assignable: %i (%i) [ %s ] to [ "
+          "%s ]\n",
+          is_always_assignable ? 1 : 0, always ? 1 : 0, is_assignable ? 1 : 0,
+          sometimes ? 1 : 0, typeid(ViewTypeSrc).name(),
+          typeid(ViewTypeDst).name());
+    if (sometimes) {
+      ASSERT_NO_THROW(try_assign<mapping_type>(dst, src));
+    }
+    ASSERT_EQ(always, is_always_assignable);
+    ASSERT_EQ(sometimes, is_assignable);
+  }
+};
+
+}  // namespace Impl
+
+TEST(TEST_CATEGORY, view_is_assignable) {
+  using namespace Kokkos;
+  using h_exec = typename DefaultHostExecutionSpace::memory_space;
+  using d_exec = typename TEST_EXECSPACE::memory_space;
+  using left   = LayoutLeft;
+  using right  = LayoutRight;
+  using stride = LayoutStride;
+  // Static/Dynamic Extents
+  Impl::TestAssignability<View<int*, left, d_exec>,
+                          View<int*, left, d_exec>>::test(true, true, 10);
+  Impl::TestAssignability<View<int[10], left, d_exec>,
+                          View<int*, left, d_exec>>::test(false, true, 10);
+  Impl::TestAssignability<View<int[5], left, d_exec>,
+                          View<int*, left, d_exec>>::test(false, false, 10);
+  Impl::TestAssignability<View<int*, left, d_exec>,
+                          View<int[10], left, d_exec>>::test(true, true);
+  Impl::TestAssignability<View<int[10], left, d_exec>,
+                          View<int[10], left, d_exec>>::test(true, true);
+  Impl::TestAssignability<View<int[5], left, d_exec>,
+                          View<int[10], left, d_exec>>::test(false, false);
+  Impl::TestAssignability<View<int**, left, d_exec>,
+                          View<int**, left, d_exec>>::test(true, true, 10, 10);
+  Impl::TestAssignability<View<int * [10], left, d_exec>,
+                          View<int**, left, d_exec>>::test(false, true, 10, 10);
+  Impl::TestAssignability<View<int * [5], left, d_exec>,
+                          View<int**, left, d_exec>>::test(false, false, 10,
+                                                           10);
+  Impl::TestAssignability<View<int**, left, d_exec>,
+                          View<int * [10], left, d_exec>>::test(true, true, 10);
+  Impl::TestAssignability<View<int * [10], left, d_exec>,
+                          View<int * [10], left, d_exec>>::test(true, true, 10);
+  Impl::TestAssignability<View<int * [5], left, d_exec>,
+                          View<int * [10], left, d_exec>>::test(false, false,
+                                                                10);
+
+  // Mismatch value_type
+  Impl::TestAssignability<View<int*, left, d_exec>,
+                          View<double*, left, d_exec>>::test(false, false, 10);
+
+  // Layout assignment
+  Impl::TestAssignability<View<int*, left, d_exec>,
+                          View<int*, right, d_exec>>::test(true, true, 10);
+
+  // This could be made possible (due to the degenerate nature of the views) but
+  // we do not allow this yet
+  // TestAssignability<View<int**,left,d_exec>,View<int**,right,d_exec>>::test(false,true,10,1);
+  Impl::TestAssignability<View<int**, left, d_exec>,
+                          View<int**, right, d_exec>>::test(false, false, 10,
+                                                            2);
+  Impl::TestAssignability<View<int**, stride, d_exec>,
+                          View<int**, right, d_exec>>::test(true, true, 10, 2);
+  Impl::TestAssignability<View<int**, stride, d_exec>,
+                          View<int**, left, d_exec>>::test(true, true, 10, 2);
+
+  // Space Assignment
+  bool expected = Kokkos::Impl::MemorySpaceAccess<d_exec, h_exec>::assignable;
+  Impl::TestAssignability<View<int*, left, d_exec>,
+                          View<int*, left, h_exec>>::test(expected, expected,
+                                                          10);
+  expected = Kokkos::Impl::MemorySpaceAccess<h_exec, d_exec>::assignable;
+  Impl::TestAssignability<View<int*, left, h_exec>,
+                          View<int*, left, d_exec>>::test(expected, expected,
+                                                          10);
+
+  // reference type and const-qualified types
+  using SomeViewType = View<int*, left, d_exec>;
+#if defined(KOKKOS_ENABLE_CXX17)
+  static_assert(is_always_assignable_v<SomeViewType, SomeViewType>);
+  static_assert(is_always_assignable_v<SomeViewType, SomeViewType&>);
+  static_assert(is_always_assignable_v<SomeViewType, SomeViewType const>);
+  static_assert(is_always_assignable_v<SomeViewType, SomeViewType const&>);
+  static_assert(is_always_assignable_v<SomeViewType&, SomeViewType>);
+  static_assert(is_always_assignable_v<SomeViewType&, SomeViewType&>);
+  static_assert(is_always_assignable_v<SomeViewType&, SomeViewType const>);
+  static_assert(is_always_assignable_v<SomeViewType&, SomeViewType const&>);
+#else
+  static_assert(is_always_assignable<SomeViewType, SomeViewType>::value, "");
+  static_assert(is_always_assignable<SomeViewType, SomeViewType&>::value, "");
+  static_assert(is_always_assignable<SomeViewType, SomeViewType const>::value,
+                "");
+  static_assert(is_always_assignable<SomeViewType, SomeViewType const&>::value,
+                "");
+  static_assert(is_always_assignable<SomeViewType&, SomeViewType>::value, "");
+  static_assert(is_always_assignable<SomeViewType&, SomeViewType&>::value, "");
+  static_assert(is_always_assignable<SomeViewType&, SomeViewType const>::value,
+                "");
+  static_assert(is_always_assignable<SomeViewType&, SomeViewType const&>::value,
+                "");
+#endif
+}
+}  // namespace Test
diff --git a/kokkos/core/unit_test/TestViewLayoutStrideAssignment.hpp b/kokkos/core/unit_test/TestViewLayoutStrideAssignment.hpp
index c0e6cea1f..583d135f3 100644
--- a/kokkos/core/unit_test/TestViewLayoutStrideAssignment.hpp
+++ b/kokkos/core/unit_test/TestViewLayoutStrideAssignment.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -56,7 +56,7 @@ namespace Test {
 TEST(TEST_CATEGORY, view_layoutstride_left_to_layoutleft_assignment) {
   typedef TEST_EXECSPACE exec_space;
 
-  auto t = time(0);
+  auto t = time(nullptr);
   srand(t);  // Use current time as seed for random generator
   printf("view_layoutstride_left_to_layoutleft_assignment: srand(%lu)\n",
          size_t(t));
@@ -338,7 +338,7 @@ TEST(TEST_CATEGORY, view_layoutstride_left_to_layoutleft_assignment) {
 TEST(TEST_CATEGORY, view_layoutstride_right_to_layoutright_assignment) {
   typedef TEST_EXECSPACE exec_space;
 
-  auto t = time(0);
+  auto t = time(nullptr);
   srand(t);  // Use current time as seed for random generator
   printf("view_layoutstride_right_to_layoutright_assignment: srand(%lu)\n",
          size_t(t));
@@ -620,7 +620,7 @@ TEST(TEST_CATEGORY, view_layoutstride_right_to_layoutright_assignment) {
 TEST(TEST_CATEGORY_DEATH, view_layoutstride_right_to_layoutleft_assignment) {
   typedef TEST_EXECSPACE exec_space;
 
-  auto t = time(0);
+  auto t = time(nullptr);
   srand(t);  // Use current time as seed for random generator
   printf("view_layoutstride_right_to_layoutleft_assignment: srand(%lu)\n",
          size_t(t));
@@ -771,7 +771,7 @@ TEST(TEST_CATEGORY_DEATH, view_layoutstride_right_to_layoutleft_assignment) {
 TEST(TEST_CATEGORY_DEATH, view_layoutstride_left_to_layoutright_assignment) {
   typedef TEST_EXECSPACE exec_space;
 
-  auto t = time(0);
+  auto t = time(nullptr);
   srand(t);  // Use current time as seed for random generator
   printf("view_layoutstride_left_to_layoutright_assignment: srand(%lu)\n",
          size_t(t));
diff --git a/kokkos/core/unit_test/TestViewLayoutTiled.hpp b/kokkos/core/unit_test/TestViewLayoutTiled.hpp
index 036f418fb..75eef2d69 100644
--- a/kokkos/core/unit_test/TestViewLayoutTiled.hpp
+++ b/kokkos/core/unit_test/TestViewLayoutTiled.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -112,9 +112,10 @@ struct TestViewLayoutTiled {
       Kokkos::Iterate::Right, Kokkos::Iterate::Right, T0, T1, T2, T3>
       LayoutRR_4D_2x4x4x2;
 
+#if !defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
+  static void test_view_layout_tiled_2d(const int, const int) {
+#else
   static void test_view_layout_tiled_2d(const int N0, const int N1) {
-#if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
-#if !defined(KOKKOS_ENABLE_CUDA) || (8000 <= CUDA_VERSION)
     const int FT = T0 * T1;
 
     const int NT0 = int(std::ceil(N0 / T0));
@@ -382,15 +383,14 @@ struct TestViewLayoutTiled {
       ASSERT_EQ(counter_subview, long(0));
       ASSERT_EQ(counter_inc, long(0));
     }  // end scope
-#endif
 #endif
   }  // end test_view_layout_tiled_2d
 
+#if !defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
+  static void test_view_layout_tiled_3d(const int, const int, const int) {
+#else
   static void test_view_layout_tiled_3d(const int N0, const int N1,
                                         const int N2) {
-#if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
-#if !defined(KOKKOS_ENABLE_CUDA) || (8000 <= CUDA_VERSION)
-
     const int FT = T0 * T1 * T2;
 
     const int NT0 = int(std::ceil(N0 / T0));
@@ -680,14 +680,15 @@ struct TestViewLayoutTiled {
       ASSERT_EQ(counter_subview, long(0));
       ASSERT_EQ(counter_inc, long(0));
     }  // end scope
-#endif
 #endif
   }  // end test_view_layout_tiled_3d
 
+#if !defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
+  static void test_view_layout_tiled_4d(const int, const int, const int,
+                                        const int){
+#else
   static void test_view_layout_tiled_4d(const int N0, const int N1,
                                         const int N2, const int N3) {
-#if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
-#if !defined(KOKKOS_ENABLE_CUDA) || (8000 <= CUDA_VERSION)
     const int FT = T0 * T1 * T2 * T3;
 
     const int NT0 = int(std::ceil(N0 / T0));
@@ -1027,7 +1028,6 @@ struct TestViewLayoutTiled {
       ASSERT_EQ(counter_subview, long(0));
       ASSERT_EQ(counter_inc, long(0));
     }  // end scope
-#endif
 #endif
   }  // end test_view_layout_tiled_4d
 
diff --git a/kokkos/core/unit_test/TestViewMapping_a.hpp b/kokkos/core/unit_test/TestViewMapping_a.hpp
index 08d24ed77..7bd6353c2 100644
--- a/kokkos/core/unit_test/TestViewMapping_a.hpp
+++ b/kokkos/core/unit_test/TestViewMapping_a.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -77,7 +77,9 @@ void test_view_mapping() {
   typedef Kokkos::Impl::ViewDimension<0, 0, 0, 0, 0, 0, 0, 0>
       dim_s0_s0_s0_s0_s0_s0_s0_s0;
 
-  // Fully static dimensions should not be larger than an int.
+// Fully static dimensions should not be larger than an int.
+#ifndef _WIN32  // For some reason on Windows the first test here fails with
+                // size being 7 bytes on windows???
   ASSERT_LE(sizeof(dim_0), sizeof(int));
   ASSERT_LE(sizeof(dim_s2), sizeof(int));
   ASSERT_LE(sizeof(dim_s2_s3), sizeof(int));
@@ -98,7 +100,7 @@ void test_view_mapping() {
   ASSERT_EQ(sizeof(dim_s0_s0_s0_s0_s0_s0), 6 * sizeof(unsigned));
   ASSERT_LE(sizeof(dim_s0_s0_s0_s0_s0_s0_s0), 8 * sizeof(unsigned));
   ASSERT_EQ(sizeof(dim_s0_s0_s0_s0_s0_s0_s0_s0), 8 * sizeof(unsigned));
-
+#endif
   static_assert(int(dim_0::rank) == int(0), "");
   static_assert(int(dim_0::rank_dynamic) == int(0), "");
   static_assert(int(dim_0::ArgN0) == 1, "");
@@ -900,7 +902,7 @@ void test_view_mapping() {
     ASSERT_TRUE(offset.span_is_contiguous());
 
     Kokkos::Impl::ViewMapping<traits_t, void> v(
-        Kokkos::Impl::ViewCtorProp<int*>((int*)0), stride);
+        Kokkos::Impl::ViewCtorProp<int*>(nullptr), stride);
   }
 
   {
@@ -1076,17 +1078,20 @@ void test_view_mapping() {
     typedef typename Kokkos::Impl::HostMirror<Space>::Space::execution_space
         host_exec_space;
 
-    Kokkos::parallel_for(
-        Kokkos::RangePolicy<host_exec_space>(0, 10), KOKKOS_LAMBDA(int) {
-          // 'a' is captured by copy, and the capture mechanism converts 'a' to
+    int errors = 0;
+    Kokkos::parallel_reduce(
+        Kokkos::RangePolicy<host_exec_space>(0, 10),
+        KOKKOS_LAMBDA(int, int& e) {
           // an unmanaged copy.  When the parallel dispatch accepts a move for
           // the lambda, this count should become 1.
 
-          ASSERT_EQ(a.use_count(), 2);
+          if (a.use_count() != 2) ++e;
           V x = a;
-          ASSERT_EQ(a.use_count(), 2);
-          ASSERT_EQ(x.use_count(), 2);
-        });
+          if (a.use_count() != 2) ++e;
+          if (x.use_count() != 2) ++e;
+        },
+        errors);
+    ASSERT_EQ(errors, 0);
 #endif  // #if !defined( KOKKOS_ENABLE_CUDA_LAMBDA )
   }
 }
@@ -1106,7 +1111,7 @@ struct TestViewMapOperator {
 #endif
 
   KOKKOS_INLINE_FUNCTION
-  void test_left(size_t i0, long& error_count) const {
+  void test_left(size_t i0, int64_t& error_count) const {
 #ifdef KOKKOS_ENABLE_DEPPRECATED_CODE
     typename ViewType::value_type* const base_ptr = &v(0, 0, 0, 0, 0, 0, 0, 0);
 #else
@@ -1121,7 +1126,7 @@ struct TestViewMapOperator {
     const size_t n6 = v.extent(6);
     const size_t n7 = v.extent(7);
 
-    long offset = 0;
+    int64_t offset = 0;
 
     for (size_t i7 = 0; i7 < n7; ++i7)
       for (size_t i6 = 0; i6 < n6; ++i6)
@@ -1131,9 +1136,10 @@ struct TestViewMapOperator {
               for (size_t i2 = 0; i2 < n2; ++i2)
                 for (size_t i1 = 0; i1 < n1; ++i1) {
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-                  const long d = &v(i0, i1, i2, i3, i4, i5, i6, i7) - base_ptr;
+                  const int64_t d =
+                      &v(i0, i1, i2, i3, i4, i5, i6, i7) - base_ptr;
 #else
-                  const long d =
+                  const int64_t d =
                       &v.access(i0, i1, i2, i3, i4, i5, i6, i7) - base_ptr;
 #endif
                   if (d < offset) ++error_count;
@@ -1144,7 +1150,7 @@ struct TestViewMapOperator {
   }
 
   KOKKOS_INLINE_FUNCTION
-  void test_right(size_t i0, long& error_count) const {
+  void test_right(size_t i0, int64_t& error_count) const {
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
     typename ViewType::value_type* const base_ptr = &v(0, 0, 0, 0, 0, 0, 0, 0);
 #else
@@ -1159,7 +1165,7 @@ struct TestViewMapOperator {
     const size_t n6 = v.extent(6);
     const size_t n7 = v.extent(7);
 
-    long offset = 0;
+    int64_t offset = 0;
 
     for (size_t i1 = 0; i1 < n1; ++i1)
       for (size_t i2 = 0; i2 < n2; ++i2)
@@ -1169,9 +1175,10 @@ struct TestViewMapOperator {
               for (size_t i6 = 0; i6 < n6; ++i6)
                 for (size_t i7 = 0; i7 < n7; ++i7) {
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
-                  const long d = &v(i0, i1, i2, i3, i4, i5, i6, i7) - base_ptr;
+                  const int64_t d =
+                      &v(i0, i1, i2, i3, i4, i5, i6, i7) - base_ptr;
 #else
-                  const long d =
+                  const int64_t d =
                       &v.access(i0, i1, i2, i3, i4, i5, i6, i7) - base_ptr;
 #endif
                   if (d < offset) ++error_count;
@@ -1182,7 +1189,7 @@ struct TestViewMapOperator {
   }
 
   KOKKOS_INLINE_FUNCTION
-  void operator()(size_t i, long& error_count) const {
+  void operator()(size_t i, int64_t& error_count) const {
     if (std::is_same<typename ViewType::array_layout,
                      Kokkos::LayoutLeft>::value) {
       test_left(i, error_count);
@@ -1245,7 +1252,7 @@ struct TestViewMapOperator {
                   v.extent(4) * v.extent(5) * v.extent(6) * v.extent(7),
               v.span());
 
-    long error_count;
+    int64_t error_count;
     Kokkos::RangePolicy<typename ViewType::execution_space> range(0,
                                                                   v.extent(0));
     Kokkos::parallel_reduce(range, *this, error_count);
diff --git a/kokkos/core/unit_test/TestViewMapping_b.hpp b/kokkos/core/unit_test/TestViewMapping_b.hpp
index 9c3589b12..63ec63532 100644
--- a/kokkos/core/unit_test/TestViewMapping_b.hpp
+++ b/kokkos/core/unit_test/TestViewMapping_b.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/TestViewMapping_subview.hpp b/kokkos/core/unit_test/TestViewMapping_subview.hpp
index 33c51a0bd..d5e9ce7de 100644
--- a/kokkos/core/unit_test/TestViewMapping_subview.hpp
+++ b/kokkos/core/unit_test/TestViewMapping_subview.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/TestViewOfClass.hpp b/kokkos/core/unit_test/TestViewOfClass.hpp
index 5bd0ad86e..634f1da73 100644
--- a/kokkos/core/unit_test/TestViewOfClass.hpp
+++ b/kokkos/core/unit_test/TestViewOfClass.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/TestViewResize.hpp b/kokkos/core/unit_test/TestViewResize.hpp
index b7453e049..0f1e5188c 100644
--- a/kokkos/core/unit_test/TestViewResize.hpp
+++ b/kokkos/core/unit_test/TestViewResize.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/TestViewSpaceAssign.hpp b/kokkos/core/unit_test/TestViewSpaceAssign.hpp
index f33210981..d1dfb7c51 100644
--- a/kokkos/core/unit_test/TestViewSpaceAssign.hpp
+++ b/kokkos/core/unit_test/TestViewSpaceAssign.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/TestViewSubview.hpp b/kokkos/core/unit_test/TestViewSubview.hpp
index 2a92ce0e6..48be58c2e 100644
--- a/kokkos/core/unit_test/TestViewSubview.hpp
+++ b/kokkos/core/unit_test/TestViewSubview.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/TestView_64bit.hpp b/kokkos/core/unit_test/TestView_64bit.hpp
index 283f22350..7dc47ccb0 100644
--- a/kokkos/core/unit_test/TestView_64bit.hpp
+++ b/kokkos/core/unit_test/TestView_64bit.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -55,7 +55,7 @@ void test_64bit() {
     Kokkos::parallel_reduce(
         Kokkos::RangePolicy<typename Device::execution_space,
                             Kokkos::IndexType<int64_t>>(0, N),
-        KOKKOS_LAMBDA(const int64_t& i, int64_t& lsum) { lsum += 1; }, sum);
+        KOKKOS_LAMBDA(const int64_t& /*i*/, int64_t& lsum) { lsum += 1; }, sum);
     ASSERT_EQ(N, sum);
   }
   {
diff --git a/kokkos/core/unit_test/TestWorkGraph.hpp b/kokkos/core/unit_test/TestWorkGraph.hpp
index 80d84a017..548305164 100644
--- a/kokkos/core/unit_test/TestWorkGraph.hpp
+++ b/kokkos/core/unit_test/TestWorkGraph.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -56,7 +56,7 @@ namespace {
    the N-th fibonacci number as follows:
     - Each "task" or "work item" computes the i-th fibonacci number
     - If a task as (i < 2), it will record the known answer ahead of time.
-    - If a taks has (i >= 2), it will "spawn" two more tasks to compute
+    - If a task has (i >= 2), it will "spawn" two more tasks to compute
       the (i - 1) and (i - 2) fibonacci numbers.
       We do NOT do any de-duplication of these tasks.
       De-duplication would result in only (N - 2) tasks which must be run in
diff --git a/kokkos/core/unit_test/UnitTestConfig.make b/kokkos/core/unit_test/UnitTestConfig.make
index 97f4af5a8..5c93bf69f 100644
--- a/kokkos/core/unit_test/UnitTestConfig.make
+++ b/kokkos/core/unit_test/UnitTestConfig.make
@@ -8,7 +8,7 @@ KOKKOS_ARCH_OPTIONS="None AMDAVX ARMv80 ARMv81 ARMv8-ThunderX \
      Maxwell Maxwell50 Maxwell52 Maxwell53 Pascal60 Pascal61"
 #KOKKOS_ARCH_OPTIONS="AMDAVX"
 
-KOKKOS_DEVICE_OPTIONS="Cuda ROCm OpenMP Pthread Serial Qthreads"
+KOKKOS_DEVICE_OPTIONS="Cuda ROCm OpenMP Pthread Serial"
 #KOKKOS_DEVICE_OPTIONS="Cuda"
 
 # Configure paths to enable environment query in Makefile.kokkos to work
diff --git a/kokkos/core/unit_test/UnitTestMain.cpp b/kokkos/core/unit_test/UnitTestMain.cpp
index b58f292c6..a70409105 100644
--- a/kokkos/core/unit_test/UnitTestMain.cpp
+++ b/kokkos/core/unit_test/UnitTestMain.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/UnitTestMainInit.cpp b/kokkos/core/unit_test/UnitTestMainInit.cpp
index 81d7a85e7..140ba418f 100644
--- a/kokkos/core/unit_test/UnitTestMainInit.cpp
+++ b/kokkos/core/unit_test/UnitTestMainInit.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/UnitTest_PushFinalizeHook.cpp b/kokkos/core/unit_test/UnitTest_PushFinalizeHook.cpp
index f9bd93a0e..1b99691e6 100644
--- a/kokkos/core/unit_test/UnitTest_PushFinalizeHook.cpp
+++ b/kokkos/core/unit_test/UnitTest_PushFinalizeHook.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/UnitTest_PushFinalizeHook_terminate.cpp b/kokkos/core/unit_test/UnitTest_PushFinalizeHook_terminate.cpp
index 38ca47671..442310542 100644
--- a/kokkos/core/unit_test/UnitTest_PushFinalizeHook_terminate.cpp
+++ b/kokkos/core/unit_test/UnitTest_PushFinalizeHook_terminate.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/config/cmaketest/CMakeLists.txt b/kokkos/core/unit_test/config/cmaketest/CMakeLists.txt
index 72fef0a3e..5d5901739 100644
--- a/kokkos/core/unit_test/config/cmaketest/CMakeLists.txt
+++ b/kokkos/core/unit_test/config/cmaketest/CMakeLists.txt
@@ -56,20 +56,20 @@ foreach(KOKKOS_HOST_ARCH ${KOKKOS_HOST_ARCH_LIST})
     set(NEWCONFH ${PREFIX}${KOKKOS_CONFIG_HEADER})
     file(RENAME ${KOKKOS_CMAKEFILE} ${NEWCMAKE})
     file(RENAME ${KOKKOS_CONFIG_HEADER} ${NEWCONFH})
-      
-    add_test(NAME ${NEWCMAKE}-test 
+
+    add_test(NAME ${NEWCMAKE}-test
         COMMAND ${KOKKOS_TESTDIR}/testmake.sh ${NEWCMAKE}  ${KOKKOS_HOST_ARCH} ${KOKKOS_DEV}
         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
       )
-    set_tests_properties(${NEWCMAKE}-test 
+    set_tests_properties(${NEWCMAKE}-test
         PROPERTIES PASS_REGULAR_EXPRESSION Passed
         TIMEOUT 15
       )
-   add_test(NAME ${NEWCONFH}-test 
-        COMMAND ${KOKKOS_TESTDIR}/diffconfig.sh ${NEWCONFH} 
+   add_test(NAME ${NEWCONFH}-test
+        COMMAND ${KOKKOS_TESTDIR}/diffconfig.sh ${NEWCONFH}
         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
       )
-   set_tests_properties(${NEWCONFH}-test 
+   set_tests_properties(${NEWCONFH}-test
         PROPERTIES PASS_REGULAR_EXPRESSION Passed
         TIMEOUT 15
       )
diff --git a/kokkos/core/unit_test/config/results/AMDAVX_Qthreads_KokkosCore_config.h b/kokkos/core/unit_test/config/results/AMDAVX_Qthreads_KokkosCore_config.h
deleted file mode 100644
index fb5d21463..000000000
--- a/kokkos/core/unit_test/config/results/AMDAVX_Qthreads_KokkosCore_config.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* ---------------------------------------------
-Makefile constructed configuration:
-Fri Sep 22 17:22:11 MDT 2017
-----------------------------------------------*/
-#if !defined(KOKKOS_MACROS_HPP) || defined(KOKKOS_CORE_CONFIG_H)
-#error "Do not include KokkosCore_config.h directly; include Kokkos_Macros.hpp instead."
-#else
-#define KOKKOS_CORE_CONFIG_H
-#endif
-/* Execution Spaces */
-#define KOKKOS_HAVE_QTHREADS 1
-/* General Settings */
-#define KOKKOS_HAVE_CXX11 1
-#define KOKKOS_ENABLE_PROFILING
-/* Optimization Settings */
-/* Cuda Settings */
-#define KOKKOS_ARCH_AVX 1
diff --git a/kokkos/core/unit_test/config/results/ARMv8-ThunderX_Qthreads_KokkosCore_config.h b/kokkos/core/unit_test/config/results/ARMv8-ThunderX_Qthreads_KokkosCore_config.h
deleted file mode 100644
index 3865bc4a9..000000000
--- a/kokkos/core/unit_test/config/results/ARMv8-ThunderX_Qthreads_KokkosCore_config.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* ---------------------------------------------
-Makefile constructed configuration:
-Fri Sep 22 17:22:20 MDT 2017
-----------------------------------------------*/
-#if !defined(KOKKOS_MACROS_HPP) || defined(KOKKOS_CORE_CONFIG_H)
-#error "Do not include KokkosCore_config.h directly; include Kokkos_Macros.hpp instead."
-#else
-#define KOKKOS_CORE_CONFIG_H
-#endif
-/* Execution Spaces */
-#define KOKKOS_HAVE_QTHREADS 1
-/* General Settings */
-#define KOKKOS_HAVE_CXX11 1
-#define KOKKOS_ENABLE_PROFILING
-/* Optimization Settings */
-/* Cuda Settings */
-#define KOKKOS_ARCH_ARMV80 1
-#define KOKKOS_ARCH_ARMV8_THUNDERX 1
diff --git a/kokkos/core/unit_test/config/results/ARMv80_Qthreads_KokkosCore_config.h b/kokkos/core/unit_test/config/results/ARMv80_Qthreads_KokkosCore_config.h
deleted file mode 100644
index 7259a9e96..000000000
--- a/kokkos/core/unit_test/config/results/ARMv80_Qthreads_KokkosCore_config.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* ---------------------------------------------
-Makefile constructed configuration:
-Fri Sep 22 17:22:14 MDT 2017
-----------------------------------------------*/
-#if !defined(KOKKOS_MACROS_HPP) || defined(KOKKOS_CORE_CONFIG_H)
-#error "Do not include KokkosCore_config.h directly; include Kokkos_Macros.hpp instead."
-#else
-#define KOKKOS_CORE_CONFIG_H
-#endif
-/* Execution Spaces */
-#define KOKKOS_HAVE_QTHREADS 1
-/* General Settings */
-#define KOKKOS_HAVE_CXX11 1
-#define KOKKOS_ENABLE_PROFILING
-/* Optimization Settings */
-/* Cuda Settings */
-#define KOKKOS_ARCH_ARMV80 1
diff --git a/kokkos/core/unit_test/config/results/ARMv81_Qthreads_KokkosCore_config.h b/kokkos/core/unit_test/config/results/ARMv81_Qthreads_KokkosCore_config.h
deleted file mode 100644
index e9fc71ad9..000000000
--- a/kokkos/core/unit_test/config/results/ARMv81_Qthreads_KokkosCore_config.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* ---------------------------------------------
-Makefile constructed configuration:
-Fri Sep 22 17:22:17 MDT 2017
-----------------------------------------------*/
-#if !defined(KOKKOS_MACROS_HPP) || defined(KOKKOS_CORE_CONFIG_H)
-#error "Do not include KokkosCore_config.h directly; include Kokkos_Macros.hpp instead."
-#else
-#define KOKKOS_CORE_CONFIG_H
-#endif
-/* Execution Spaces */
-#define KOKKOS_HAVE_QTHREADS 1
-/* General Settings */
-#define KOKKOS_HAVE_CXX11 1
-#define KOKKOS_ENABLE_PROFILING
-/* Optimization Settings */
-/* Cuda Settings */
-#define KOKKOS_ARCH_ARMV81 1
diff --git a/kokkos/core/unit_test/config/results/BDW_Qthreads_KokkosCore_config.h b/kokkos/core/unit_test/config/results/BDW_Qthreads_KokkosCore_config.h
deleted file mode 100644
index e879e7e1f..000000000
--- a/kokkos/core/unit_test/config/results/BDW_Qthreads_KokkosCore_config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* ---------------------------------------------
-Makefile constructed configuration:
-Fri Sep 22 17:22:39 MDT 2017
-----------------------------------------------*/
-#if !defined(KOKKOS_MACROS_HPP) || defined(KOKKOS_CORE_CONFIG_H)
-#error "Do not include KokkosCore_config.h directly; include Kokkos_Macros.hpp instead."
-#else
-#define KOKKOS_CORE_CONFIG_H
-#endif
-/* Execution Spaces */
-#define KOKKOS_HAVE_QTHREADS 1
-#ifndef __CUDA_ARCH__
-#define KOKKOS_ENABLE_TM
-#endif
-#ifndef __CUDA_ARCH__
-#define KOKKOS_USE_ISA_X86_64
-#endif
-/* General Settings */
-#define KOKKOS_HAVE_CXX11 1
-#define KOKKOS_ENABLE_PROFILING
-/* Optimization Settings */
-/* Cuda Settings */
-#define KOKKOS_ARCH_AVX2 1
diff --git a/kokkos/core/unit_test/config/results/BGQ_Qthreads_KokkosCore_config.h b/kokkos/core/unit_test/config/results/BGQ_Qthreads_KokkosCore_config.h
deleted file mode 100644
index 60c7ddcdb..000000000
--- a/kokkos/core/unit_test/config/results/BGQ_Qthreads_KokkosCore_config.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* ---------------------------------------------
-Makefile constructed configuration:
-Tue Sep 26 15:19:44 MDT 2017
-----------------------------------------------*/
-#if !defined(KOKKOS_MACROS_HPP) || defined(KOKKOS_CORE_CONFIG_H)
-#error "Do not include KokkosCore_config.h directly; include Kokkos_Macros.hpp instead."
-#else
-#define KOKKOS_CORE_CONFIG_H
-#endif
-/* Execution Spaces */
-#define KOKKOS_HAVE_QTHREADS 1
-/* General Settings */
-#define KOKKOS_HAVE_CXX11 1
-#define KOKKOS_ENABLE_PROFILING
-/* Optimization Settings */
-/* Cuda Settings */
diff --git a/kokkos/core/unit_test/config/results/HSW_Qthreads_KokkosCore_config.h b/kokkos/core/unit_test/config/results/HSW_Qthreads_KokkosCore_config.h
deleted file mode 100644
index 253dc35bd..000000000
--- a/kokkos/core/unit_test/config/results/HSW_Qthreads_KokkosCore_config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* ---------------------------------------------
-Makefile constructed configuration:
-Fri Sep 22 17:22:36 MDT 2017
-----------------------------------------------*/
-#if !defined(KOKKOS_MACROS_HPP) || defined(KOKKOS_CORE_CONFIG_H)
-#error "Do not include KokkosCore_config.h directly; include Kokkos_Macros.hpp instead."
-#else
-#define KOKKOS_CORE_CONFIG_H
-#endif
-/* Execution Spaces */
-#define KOKKOS_HAVE_QTHREADS 1
-#ifndef __CUDA_ARCH__
-#define KOKKOS_USE_ISA_X86_64
-#endif
-/* General Settings */
-#define KOKKOS_HAVE_CXX11 1
-#define KOKKOS_ENABLE_PROFILING
-/* Optimization Settings */
-/* Cuda Settings */
-#define KOKKOS_ARCH_AVX2 1
diff --git a/kokkos/core/unit_test/config/results/KNC_Qthreads_KokkosCore_config.h b/kokkos/core/unit_test/config/results/KNC_Qthreads_KokkosCore_config.h
deleted file mode 100644
index 5f95a83c2..000000000
--- a/kokkos/core/unit_test/config/results/KNC_Qthreads_KokkosCore_config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* ---------------------------------------------
-Makefile constructed configuration:
-Fri Sep 22 17:22:45 MDT 2017
-----------------------------------------------*/
-#if !defined(KOKKOS_MACROS_HPP) || defined(KOKKOS_CORE_CONFIG_H)
-#error "Do not include KokkosCore_config.h directly; include Kokkos_Macros.hpp instead."
-#else
-#define KOKKOS_CORE_CONFIG_H
-#endif
-/* Execution Spaces */
-#define KOKKOS_HAVE_QTHREADS 1
-#ifndef __CUDA_ARCH__
-#define KOKKOS_USE_ISA_KNC
-#endif
-/* General Settings */
-#define KOKKOS_HAVE_CXX11 1
-#define KOKKOS_ENABLE_PROFILING
-/* Optimization Settings */
-/* Cuda Settings */
-#define KOKKOS_ARCH_KNC 1
diff --git a/kokkos/core/unit_test/config/results/KNL_Qthreads_KokkosCore_config.h b/kokkos/core/unit_test/config/results/KNL_Qthreads_KokkosCore_config.h
deleted file mode 100644
index 6d179d82f..000000000
--- a/kokkos/core/unit_test/config/results/KNL_Qthreads_KokkosCore_config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* ---------------------------------------------
-Makefile constructed configuration:
-Fri Sep 22 17:22:48 MDT 2017
-----------------------------------------------*/
-#if !defined(KOKKOS_MACROS_HPP) || defined(KOKKOS_CORE_CONFIG_H)
-#error "Do not include KokkosCore_config.h directly; include Kokkos_Macros.hpp instead."
-#else
-#define KOKKOS_CORE_CONFIG_H
-#endif
-/* Execution Spaces */
-#define KOKKOS_HAVE_QTHREADS 1
-#ifndef __CUDA_ARCH__
-#define KOKKOS_USE_ISA_X86_64
-#endif
-/* General Settings */
-#define KOKKOS_HAVE_CXX11 1
-#define KOKKOS_ENABLE_PROFILING
-/* Optimization Settings */
-/* Cuda Settings */
-#define KOKKOS_ARCH_AVX512MIC 1
diff --git a/kokkos/core/unit_test/config/results/Kepler30_Qthreads_KokkosCore_config.h b/kokkos/core/unit_test/config/results/Kepler30_Qthreads_KokkosCore_config.h
deleted file mode 100644
index 410ba5ea1..000000000
--- a/kokkos/core/unit_test/config/results/Kepler30_Qthreads_KokkosCore_config.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* ---------------------------------------------
-Makefile constructed configuration:
-Fri Sep 22 17:22:50 MDT 2017
-----------------------------------------------*/
-#if !defined(KOKKOS_MACROS_HPP) || defined(KOKKOS_CORE_CONFIG_H)
-#error "Do not include KokkosCore_config.h directly; include Kokkos_Macros.hpp instead."
-#else
-#define KOKKOS_CORE_CONFIG_H
-#endif
-/* Execution Spaces */
-#define KOKKOS_HAVE_QTHREADS 1
-/* General Settings */
-#define KOKKOS_HAVE_CXX11 1
-#define KOKKOS_ENABLE_PROFILING
-/* Optimization Settings */
-/* Cuda Settings */
diff --git a/kokkos/core/unit_test/config/results/Kepler32_Qthreads_KokkosCore_config.h b/kokkos/core/unit_test/config/results/Kepler32_Qthreads_KokkosCore_config.h
deleted file mode 100644
index f42d0cc5f..000000000
--- a/kokkos/core/unit_test/config/results/Kepler32_Qthreads_KokkosCore_config.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* ---------------------------------------------
-Makefile constructed configuration:
-Fri Sep 22 17:22:53 MDT 2017
-----------------------------------------------*/
-#if !defined(KOKKOS_MACROS_HPP) || defined(KOKKOS_CORE_CONFIG_H)
-#error "Do not include KokkosCore_config.h directly; include Kokkos_Macros.hpp instead."
-#else
-#define KOKKOS_CORE_CONFIG_H
-#endif
-/* Execution Spaces */
-#define KOKKOS_HAVE_QTHREADS 1
-/* General Settings */
-#define KOKKOS_HAVE_CXX11 1
-#define KOKKOS_ENABLE_PROFILING
-/* Optimization Settings */
-/* Cuda Settings */
diff --git a/kokkos/core/unit_test/config/results/Kepler35_Qthreads_KokkosCore_config.h b/kokkos/core/unit_test/config/results/Kepler35_Qthreads_KokkosCore_config.h
deleted file mode 100644
index 429f5e9e2..000000000
--- a/kokkos/core/unit_test/config/results/Kepler35_Qthreads_KokkosCore_config.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* ---------------------------------------------
-Makefile constructed configuration:
-Fri Sep 22 17:22:55 MDT 2017
-----------------------------------------------*/
-#if !defined(KOKKOS_MACROS_HPP) || defined(KOKKOS_CORE_CONFIG_H)
-#error "Do not include KokkosCore_config.h directly; include Kokkos_Macros.hpp instead."
-#else
-#define KOKKOS_CORE_CONFIG_H
-#endif
-/* Execution Spaces */
-#define KOKKOS_HAVE_QTHREADS 1
-/* General Settings */
-#define KOKKOS_HAVE_CXX11 1
-#define KOKKOS_ENABLE_PROFILING
-/* Optimization Settings */
-/* Cuda Settings */
diff --git a/kokkos/core/unit_test/config/results/Kepler37_Qthreads_KokkosCore_config.h b/kokkos/core/unit_test/config/results/Kepler37_Qthreads_KokkosCore_config.h
deleted file mode 100644
index 2b8a7f818..000000000
--- a/kokkos/core/unit_test/config/results/Kepler37_Qthreads_KokkosCore_config.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* ---------------------------------------------
-Makefile constructed configuration:
-Fri Sep 22 17:22:59 MDT 2017
-----------------------------------------------*/
-#if !defined(KOKKOS_MACROS_HPP) || defined(KOKKOS_CORE_CONFIG_H)
-#error "Do not include KokkosCore_config.h directly; include Kokkos_Macros.hpp instead."
-#else
-#define KOKKOS_CORE_CONFIG_H
-#endif
-/* Execution Spaces */
-#define KOKKOS_HAVE_QTHREADS 1
-/* General Settings */
-#define KOKKOS_HAVE_CXX11 1
-#define KOKKOS_ENABLE_PROFILING
-/* Optimization Settings */
-/* Cuda Settings */
diff --git a/kokkos/core/unit_test/config/results/Kepler_Qthreads_KokkosCore_config.h b/kokkos/core/unit_test/config/results/Kepler_Qthreads_KokkosCore_config.h
deleted file mode 100644
index 021d18c00..000000000
--- a/kokkos/core/unit_test/config/results/Kepler_Qthreads_KokkosCore_config.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* ---------------------------------------------
-Makefile constructed configuration:
-Tue Sep 26 15:19:51 MDT 2017
-----------------------------------------------*/
-#if !defined(KOKKOS_MACROS_HPP) || defined(KOKKOS_CORE_CONFIG_H)
-#error "Do not include KokkosCore_config.h directly; include Kokkos_Macros.hpp instead."
-#else
-#define KOKKOS_CORE_CONFIG_H
-#endif
-/* Execution Spaces */
-#define KOKKOS_HAVE_QTHREADS 1
-/* General Settings */
-#define KOKKOS_HAVE_CXX11 1
-#define KOKKOS_ENABLE_PROFILING
-/* Optimization Settings */
-/* Cuda Settings */
diff --git a/kokkos/core/unit_test/config/results/Maxwell50_Qthreads_KokkosCore_config.h b/kokkos/core/unit_test/config/results/Maxwell50_Qthreads_KokkosCore_config.h
deleted file mode 100644
index be1353365..000000000
--- a/kokkos/core/unit_test/config/results/Maxwell50_Qthreads_KokkosCore_config.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* ---------------------------------------------
-Makefile constructed configuration:
-Fri Sep 22 17:23:02 MDT 2017
-----------------------------------------------*/
-#if !defined(KOKKOS_MACROS_HPP) || defined(KOKKOS_CORE_CONFIG_H)
-#error "Do not include KokkosCore_config.h directly; include Kokkos_Macros.hpp instead."
-#else
-#define KOKKOS_CORE_CONFIG_H
-#endif
-/* Execution Spaces */
-#define KOKKOS_HAVE_QTHREADS 1
-/* General Settings */
-#define KOKKOS_HAVE_CXX11 1
-#define KOKKOS_ENABLE_PROFILING
-/* Optimization Settings */
-/* Cuda Settings */
diff --git a/kokkos/core/unit_test/config/results/Maxwell52_Qthreads_KokkosCore_config.h b/kokkos/core/unit_test/config/results/Maxwell52_Qthreads_KokkosCore_config.h
deleted file mode 100644
index 58a043c6a..000000000
--- a/kokkos/core/unit_test/config/results/Maxwell52_Qthreads_KokkosCore_config.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* ---------------------------------------------
-Makefile constructed configuration:
-Fri Sep 22 17:23:05 MDT 2017
-----------------------------------------------*/
-#if !defined(KOKKOS_MACROS_HPP) || defined(KOKKOS_CORE_CONFIG_H)
-#error "Do not include KokkosCore_config.h directly; include Kokkos_Macros.hpp instead."
-#else
-#define KOKKOS_CORE_CONFIG_H
-#endif
-/* Execution Spaces */
-#define KOKKOS_HAVE_QTHREADS 1
-/* General Settings */
-#define KOKKOS_HAVE_CXX11 1
-#define KOKKOS_ENABLE_PROFILING
-/* Optimization Settings */
-/* Cuda Settings */
diff --git a/kokkos/core/unit_test/config/results/Maxwell53_Qthreads_KokkosCore_config.h b/kokkos/core/unit_test/config/results/Maxwell53_Qthreads_KokkosCore_config.h
deleted file mode 100644
index 96fdbef3d..000000000
--- a/kokkos/core/unit_test/config/results/Maxwell53_Qthreads_KokkosCore_config.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* ---------------------------------------------
-Makefile constructed configuration:
-Fri Sep 22 17:23:08 MDT 2017
-----------------------------------------------*/
-#if !defined(KOKKOS_MACROS_HPP) || defined(KOKKOS_CORE_CONFIG_H)
-#error "Do not include KokkosCore_config.h directly; include Kokkos_Macros.hpp instead."
-#else
-#define KOKKOS_CORE_CONFIG_H
-#endif
-/* Execution Spaces */
-#define KOKKOS_HAVE_QTHREADS 1
-/* General Settings */
-#define KOKKOS_HAVE_CXX11 1
-#define KOKKOS_ENABLE_PROFILING
-/* Optimization Settings */
-/* Cuda Settings */
diff --git a/kokkos/core/unit_test/config/results/Maxwell_Qthreads_KokkosCore_config.h b/kokkos/core/unit_test/config/results/Maxwell_Qthreads_KokkosCore_config.h
deleted file mode 100644
index a7f1fd380..000000000
--- a/kokkos/core/unit_test/config/results/Maxwell_Qthreads_KokkosCore_config.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* ---------------------------------------------
-Makefile constructed configuration:
-Tue Sep 26 15:20:01 MDT 2017
-----------------------------------------------*/
-#if !defined(KOKKOS_MACROS_HPP) || defined(KOKKOS_CORE_CONFIG_H)
-#error "Do not include KokkosCore_config.h directly; include Kokkos_Macros.hpp instead."
-#else
-#define KOKKOS_CORE_CONFIG_H
-#endif
-/* Execution Spaces */
-#define KOKKOS_HAVE_QTHREADS 1
-/* General Settings */
-#define KOKKOS_HAVE_CXX11 1
-#define KOKKOS_ENABLE_PROFILING
-/* Optimization Settings */
-/* Cuda Settings */
diff --git a/kokkos/core/unit_test/config/results/None_Qthreads_KokkosCore_config.h b/kokkos/core/unit_test/config/results/None_Qthreads_KokkosCore_config.h
deleted file mode 100644
index 6bd8addd9..000000000
--- a/kokkos/core/unit_test/config/results/None_Qthreads_KokkosCore_config.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* ---------------------------------------------
-Makefile constructed configuration:
-Tue Sep 26 15:19:23 MDT 2017
-----------------------------------------------*/
-#if !defined(KOKKOS_MACROS_HPP) || defined(KOKKOS_CORE_CONFIG_H)
-#error "Do not include KokkosCore_config.h directly; include Kokkos_Macros.hpp instead."
-#else
-#define KOKKOS_CORE_CONFIG_H
-#endif
-/* Execution Spaces */
-#define KOKKOS_HAVE_QTHREADS 1
-/* General Settings */
-#define KOKKOS_HAVE_CXX11 1
-#define KOKKOS_ENABLE_PROFILING
-/* Optimization Settings */
-/* Cuda Settings */
diff --git a/kokkos/core/unit_test/config/results/Pascal60_Qthreads_KokkosCore_config.h b/kokkos/core/unit_test/config/results/Pascal60_Qthreads_KokkosCore_config.h
deleted file mode 100644
index c5a2d1d70..000000000
--- a/kokkos/core/unit_test/config/results/Pascal60_Qthreads_KokkosCore_config.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* ---------------------------------------------
-Makefile constructed configuration:
-Fri Sep 22 17:23:10 MDT 2017
-----------------------------------------------*/
-#if !defined(KOKKOS_MACROS_HPP) || defined(KOKKOS_CORE_CONFIG_H)
-#error "Do not include KokkosCore_config.h directly; include Kokkos_Macros.hpp instead."
-#else
-#define KOKKOS_CORE_CONFIG_H
-#endif
-/* Execution Spaces */
-#define KOKKOS_HAVE_QTHREADS 1
-/* General Settings */
-#define KOKKOS_HAVE_CXX11 1
-#define KOKKOS_ENABLE_PROFILING
-/* Optimization Settings */
-/* Cuda Settings */
diff --git a/kokkos/core/unit_test/config/results/Pascal61_Qthreads_KokkosCore_config.h b/kokkos/core/unit_test/config/results/Pascal61_Qthreads_KokkosCore_config.h
deleted file mode 100644
index 958aac11d..000000000
--- a/kokkos/core/unit_test/config/results/Pascal61_Qthreads_KokkosCore_config.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* ---------------------------------------------
-Makefile constructed configuration:
-Fri Sep 22 17:23:13 MDT 2017
-----------------------------------------------*/
-#if !defined(KOKKOS_MACROS_HPP) || defined(KOKKOS_CORE_CONFIG_H)
-#error "Do not include KokkosCore_config.h directly; include Kokkos_Macros.hpp instead."
-#else
-#define KOKKOS_CORE_CONFIG_H
-#endif
-/* Execution Spaces */
-#define KOKKOS_HAVE_QTHREADS 1
-/* General Settings */
-#define KOKKOS_HAVE_CXX11 1
-#define KOKKOS_ENABLE_PROFILING
-/* Optimization Settings */
-/* Cuda Settings */
diff --git a/kokkos/core/unit_test/config/results/Power7_Qthreads_KokkosCore_config.h b/kokkos/core/unit_test/config/results/Power7_Qthreads_KokkosCore_config.h
deleted file mode 100644
index dffa8a3f5..000000000
--- a/kokkos/core/unit_test/config/results/Power7_Qthreads_KokkosCore_config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* ---------------------------------------------
-Makefile constructed configuration:
-Fri Sep 22 17:22:22 MDT 2017
-----------------------------------------------*/
-#if !defined(KOKKOS_MACROS_HPP) || defined(KOKKOS_CORE_CONFIG_H)
-#error "Do not include KokkosCore_config.h directly; include Kokkos_Macros.hpp instead."
-#else
-#define KOKKOS_CORE_CONFIG_H
-#endif
-/* Execution Spaces */
-#define KOKKOS_HAVE_QTHREADS 1
-#ifndef __CUDA_ARCH__
-#define KOKKOS_USE_ISA_POWERPCBE
-#endif
-/* General Settings */
-#define KOKKOS_HAVE_CXX11 1
-#define KOKKOS_ENABLE_PROFILING
-/* Optimization Settings */
-/* Cuda Settings */
-#define KOKKOS_ARCH_POWER7 1
diff --git a/kokkos/core/unit_test/config/results/Power8_Qthreads_KokkosCore_config.h b/kokkos/core/unit_test/config/results/Power8_Qthreads_KokkosCore_config.h
deleted file mode 100644
index 9da90f4f7..000000000
--- a/kokkos/core/unit_test/config/results/Power8_Qthreads_KokkosCore_config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* ---------------------------------------------
-Makefile constructed configuration:
-Fri Sep 22 17:22:25 MDT 2017
-----------------------------------------------*/
-#if !defined(KOKKOS_MACROS_HPP) || defined(KOKKOS_CORE_CONFIG_H)
-#error "Do not include KokkosCore_config.h directly; include Kokkos_Macros.hpp instead."
-#else
-#define KOKKOS_CORE_CONFIG_H
-#endif
-/* Execution Spaces */
-#define KOKKOS_HAVE_QTHREADS 1
-#ifndef __CUDA_ARCH__
-#define KOKKOS_USE_ISA_POWERPCLE
-#endif
-/* General Settings */
-#define KOKKOS_HAVE_CXX11 1
-#define KOKKOS_ENABLE_PROFILING
-/* Optimization Settings */
-/* Cuda Settings */
-#define KOKKOS_ARCH_POWER8 1
diff --git a/kokkos/core/unit_test/config/results/Power9_Qthreads_KokkosCore_config.h b/kokkos/core/unit_test/config/results/Power9_Qthreads_KokkosCore_config.h
deleted file mode 100644
index 5c5be2ed3..000000000
--- a/kokkos/core/unit_test/config/results/Power9_Qthreads_KokkosCore_config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* ---------------------------------------------
-Makefile constructed configuration:
-Fri Sep 22 17:22:28 MDT 2017
-----------------------------------------------*/
-#if !defined(KOKKOS_MACROS_HPP) || defined(KOKKOS_CORE_CONFIG_H)
-#error "Do not include KokkosCore_config.h directly; include Kokkos_Macros.hpp instead."
-#else
-#define KOKKOS_CORE_CONFIG_H
-#endif
-/* Execution Spaces */
-#define KOKKOS_HAVE_QTHREADS 1
-#ifndef __CUDA_ARCH__
-#define KOKKOS_USE_ISA_POWERPCLE
-#endif
-/* General Settings */
-#define KOKKOS_HAVE_CXX11 1
-#define KOKKOS_ENABLE_PROFILING
-/* Optimization Settings */
-/* Cuda Settings */
-#define KOKKOS_ARCH_POWER9 1
diff --git a/kokkos/core/unit_test/config/results/SKX_Qthreads_KokkosCore_config.h b/kokkos/core/unit_test/config/results/SKX_Qthreads_KokkosCore_config.h
deleted file mode 100644
index 2e4b1d61e..000000000
--- a/kokkos/core/unit_test/config/results/SKX_Qthreads_KokkosCore_config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* ---------------------------------------------
-Makefile constructed configuration:
-Fri Sep 22 17:22:42 MDT 2017
-----------------------------------------------*/
-#if !defined(KOKKOS_MACROS_HPP) || defined(KOKKOS_CORE_CONFIG_H)
-#error "Do not include KokkosCore_config.h directly; include Kokkos_Macros.hpp instead."
-#else
-#define KOKKOS_CORE_CONFIG_H
-#endif
-/* Execution Spaces */
-#define KOKKOS_HAVE_QTHREADS 1
-#ifndef __CUDA_ARCH__
-#define KOKKOS_ENABLE_TM
-#endif
-#ifndef __CUDA_ARCH__
-#define KOKKOS_USE_ISA_X86_64
-#endif
-/* General Settings */
-#define KOKKOS_HAVE_CXX11 1
-#define KOKKOS_ENABLE_PROFILING
-/* Optimization Settings */
-/* Cuda Settings */
-#define KOKKOS_ARCH_AVX512XEON 1
diff --git a/kokkos/core/unit_test/config/results/SNB_Qthreads_KokkosCore_config.h b/kokkos/core/unit_test/config/results/SNB_Qthreads_KokkosCore_config.h
deleted file mode 100644
index 2f0216f9c..000000000
--- a/kokkos/core/unit_test/config/results/SNB_Qthreads_KokkosCore_config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* ---------------------------------------------
-Makefile constructed configuration:
-Fri Sep 22 17:22:34 MDT 2017
-----------------------------------------------*/
-#if !defined(KOKKOS_MACROS_HPP) || defined(KOKKOS_CORE_CONFIG_H)
-#error "Do not include KokkosCore_config.h directly; include Kokkos_Macros.hpp instead."
-#else
-#define KOKKOS_CORE_CONFIG_H
-#endif
-/* Execution Spaces */
-#define KOKKOS_HAVE_QTHREADS 1
-#ifndef __CUDA_ARCH__
-#define KOKKOS_USE_ISA_X86_64
-#endif
-/* General Settings */
-#define KOKKOS_HAVE_CXX11 1
-#define KOKKOS_ENABLE_PROFILING
-/* Optimization Settings */
-/* Cuda Settings */
-#define KOKKOS_ARCH_AVX 1
diff --git a/kokkos/core/unit_test/config/results/WSM_Qthreads_KokkosCore_config.h b/kokkos/core/unit_test/config/results/WSM_Qthreads_KokkosCore_config.h
deleted file mode 100644
index d4a78790e..000000000
--- a/kokkos/core/unit_test/config/results/WSM_Qthreads_KokkosCore_config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* ---------------------------------------------
-Makefile constructed configuration:
-Fri Sep 22 17:22:31 MDT 2017
-----------------------------------------------*/
-#if !defined(KOKKOS_MACROS_HPP) || defined(KOKKOS_CORE_CONFIG_H)
-#error "Do not include KokkosCore_config.h directly; include Kokkos_Macros.hpp instead."
-#else
-#define KOKKOS_CORE_CONFIG_H
-#endif
-/* Execution Spaces */
-#define KOKKOS_HAVE_QTHREADS 1
-#ifndef __CUDA_ARCH__
-#define KOKKOS_USE_ISA_X86_64
-#endif
-/* General Settings */
-#define KOKKOS_HAVE_CXX11 1
-#define KOKKOS_ENABLE_PROFILING
-/* Optimization Settings */
-/* Cuda Settings */
-#define KOKKOS_ARCH_SSE42 1
diff --git a/kokkos/core/unit_test/configuration/test-code/test_config_run.bash b/kokkos/core/unit_test/configuration/test-code/test_config_run.bash
index f6b60fa9f..4750c843c 100755
--- a/kokkos/core/unit_test/configuration/test-code/test_config_run.bash
+++ b/kokkos/core/unit_test/configuration/test-code/test_config_run.bash
@@ -74,7 +74,7 @@ find cmake/kokkos -name KokkosTargets.cmake -exec grep -h INTERFACE_COMPILE_OPTI
 
 #-I flags and -std= flags are not part of CMake's compile options
 #that's fine, let's ignore thse below
-#redunant lines - tail the last one
+#redundant lines - tail the last one
 #awk print each on new line
 #grep out blank lines
 #grep out include flags
diff --git a/kokkos/core/unit_test/cuda/TestCudaHostPinned_Category.hpp b/kokkos/core/unit_test/cuda/TestCudaHostPinned_Category.hpp
index ef4044944..3f8ec6bac 100644
--- a/kokkos/core/unit_test/cuda/TestCudaHostPinned_Category.hpp
+++ b/kokkos/core/unit_test/cuda/TestCudaHostPinned_Category.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCudaHostPinned_SharedAlloc.cpp b/kokkos/core/unit_test/cuda/TestCudaHostPinned_SharedAlloc.cpp
index 58382032a..18780c09a 100644
--- a/kokkos/core/unit_test/cuda/TestCudaHostPinned_SharedAlloc.cpp
+++ b/kokkos/core/unit_test/cuda/TestCudaHostPinned_SharedAlloc.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewAPI_a.cpp b/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewAPI_a.cpp
index b366a136c..eeb9f3fa3 100644
--- a/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewAPI_a.cpp
+++ b/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewAPI_a.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewAPI_b.cpp b/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewAPI_b.cpp
index 0221a9b7f..04949cf57 100644
--- a/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewAPI_b.cpp
+++ b/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewAPI_b.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewAPI_c.cpp b/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewAPI_c.cpp
index 046837669..bf259ef73 100644
--- a/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewAPI_c.cpp
+++ b/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewAPI_c.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewAPI_d.cpp b/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewAPI_d.cpp
index 7da03135e..84d81e3b4 100644
--- a/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewAPI_d.cpp
+++ b/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewAPI_d.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewAPI_e.cpp b/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewAPI_e.cpp
index b6db12fcf..db9e990ae 100644
--- a/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewAPI_e.cpp
+++ b/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewAPI_e.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewCopy.cpp b/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewCopy.cpp
index 29649e8dc..04b43cf9a 100644
--- a/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewCopy.cpp
+++ b/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewCopy.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewMapping_a.cpp b/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewMapping_a.cpp
index 4541e071b..923f4df96 100644
--- a/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewMapping_a.cpp
+++ b/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewMapping_a.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewMapping_b.cpp b/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewMapping_b.cpp
index d271da43d..1efe65b21 100644
--- a/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewMapping_b.cpp
+++ b/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewMapping_b.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewMapping_subview.cpp b/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewMapping_subview.cpp
index 8fc44ac6b..9e1034c5b 100644
--- a/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewMapping_subview.cpp
+++ b/kokkos/core/unit_test/cuda/TestCudaHostPinned_ViewMapping_subview.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCudaUVM_Category.hpp b/kokkos/core/unit_test/cuda/TestCudaUVM_Category.hpp
index 55d9fc493..ff53e5a71 100644
--- a/kokkos/core/unit_test/cuda/TestCudaUVM_Category.hpp
+++ b/kokkos/core/unit_test/cuda/TestCudaUVM_Category.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCudaUVM_SharedAlloc.cpp b/kokkos/core/unit_test/cuda/TestCudaUVM_SharedAlloc.cpp
index 0530e694a..81e43da34 100644
--- a/kokkos/core/unit_test/cuda/TestCudaUVM_SharedAlloc.cpp
+++ b/kokkos/core/unit_test/cuda/TestCudaUVM_SharedAlloc.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCudaUVM_ViewAPI_a.cpp b/kokkos/core/unit_test/cuda/TestCudaUVM_ViewAPI_a.cpp
index c33125312..3a48b2495 100644
--- a/kokkos/core/unit_test/cuda/TestCudaUVM_ViewAPI_a.cpp
+++ b/kokkos/core/unit_test/cuda/TestCudaUVM_ViewAPI_a.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCudaUVM_ViewAPI_b.cpp b/kokkos/core/unit_test/cuda/TestCudaUVM_ViewAPI_b.cpp
index 01d5dd2d2..7f0effb5e 100644
--- a/kokkos/core/unit_test/cuda/TestCudaUVM_ViewAPI_b.cpp
+++ b/kokkos/core/unit_test/cuda/TestCudaUVM_ViewAPI_b.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCudaUVM_ViewAPI_c.cpp b/kokkos/core/unit_test/cuda/TestCudaUVM_ViewAPI_c.cpp
index 58ed9b583..9d8cbf0c7 100644
--- a/kokkos/core/unit_test/cuda/TestCudaUVM_ViewAPI_c.cpp
+++ b/kokkos/core/unit_test/cuda/TestCudaUVM_ViewAPI_c.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCudaUVM_ViewAPI_d.cpp b/kokkos/core/unit_test/cuda/TestCudaUVM_ViewAPI_d.cpp
index 940a01c97..8d2b5268b 100644
--- a/kokkos/core/unit_test/cuda/TestCudaUVM_ViewAPI_d.cpp
+++ b/kokkos/core/unit_test/cuda/TestCudaUVM_ViewAPI_d.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCudaUVM_ViewAPI_e.cpp b/kokkos/core/unit_test/cuda/TestCudaUVM_ViewAPI_e.cpp
index 7fabb26e4..5c11b2a32 100644
--- a/kokkos/core/unit_test/cuda/TestCudaUVM_ViewAPI_e.cpp
+++ b/kokkos/core/unit_test/cuda/TestCudaUVM_ViewAPI_e.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCudaUVM_ViewCopy.cpp b/kokkos/core/unit_test/cuda/TestCudaUVM_ViewCopy.cpp
index 035f025f0..774bf010d 100644
--- a/kokkos/core/unit_test/cuda/TestCudaUVM_ViewCopy.cpp
+++ b/kokkos/core/unit_test/cuda/TestCudaUVM_ViewCopy.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCudaUVM_ViewMapping_a.cpp b/kokkos/core/unit_test/cuda/TestCudaUVM_ViewMapping_a.cpp
index 719f9501b..aa9b513d7 100644
--- a/kokkos/core/unit_test/cuda/TestCudaUVM_ViewMapping_a.cpp
+++ b/kokkos/core/unit_test/cuda/TestCudaUVM_ViewMapping_a.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCudaUVM_ViewMapping_b.cpp b/kokkos/core/unit_test/cuda/TestCudaUVM_ViewMapping_b.cpp
index 16d11c08a..f24e9ba4f 100644
--- a/kokkos/core/unit_test/cuda/TestCudaUVM_ViewMapping_b.cpp
+++ b/kokkos/core/unit_test/cuda/TestCudaUVM_ViewMapping_b.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCudaUVM_ViewMapping_subview.cpp b/kokkos/core/unit_test/cuda/TestCudaUVM_ViewMapping_subview.cpp
index 290a038a2..47b7d1f46 100644
--- a/kokkos/core/unit_test/cuda/TestCudaUVM_ViewMapping_subview.cpp
+++ b/kokkos/core/unit_test/cuda/TestCudaUVM_ViewMapping_subview.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_complexdouble.cpp b/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_complexdouble.cpp
index 0af8a9071..813eb919c 100644
--- a/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_complexdouble.cpp
+++ b/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_complexdouble.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_complexfloat.cpp b/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_complexfloat.cpp
index c15eb0443..ea8447cb2 100644
--- a/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_complexfloat.cpp
+++ b/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_complexfloat.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_double.cpp b/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_double.cpp
index dfb7f3d7d..008dcdcad 100644
--- a/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_double.cpp
+++ b/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_double.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_float.cpp b/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_float.cpp
index adb9f4cb7..3fde849b3 100644
--- a/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_float.cpp
+++ b/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_float.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_int.cpp b/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_int.cpp
index 209aa26d5..8746add7b 100644
--- a/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_int.cpp
+++ b/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_int.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_longint.cpp b/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_longint.cpp
index 6ead084b4..9cd133b3b 100644
--- a/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_longint.cpp
+++ b/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_longint.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_longlongint.cpp b/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_longlongint.cpp
index d75100e24..658374ac6 100644
--- a/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_longlongint.cpp
+++ b/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_longlongint.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_unsignedint.cpp b/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_unsignedint.cpp
index 9b321f9e2..7d79f589e 100644
--- a/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_unsignedint.cpp
+++ b/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_unsignedint.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_unsignedlongint.cpp b/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_unsignedlongint.cpp
index c5b2819f7..29335d0f5 100644
--- a/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_unsignedlongint.cpp
+++ b/kokkos/core/unit_test/cuda/TestCuda_AtomicOperations_unsignedlongint.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCuda_AtomicViews.cpp b/kokkos/core/unit_test/cuda/TestCuda_AtomicViews.cpp
index 07d504ac8..56c5fe6f3 100644
--- a/kokkos/core/unit_test/cuda/TestCuda_AtomicViews.cpp
+++ b/kokkos/core/unit_test/cuda/TestCuda_AtomicViews.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCuda_Atomics.cpp b/kokkos/core/unit_test/cuda/TestCuda_Atomics.cpp
index cab3a49d3..e68222ca3 100644
--- a/kokkos/core/unit_test/cuda/TestCuda_Atomics.cpp
+++ b/kokkos/core/unit_test/cuda/TestCuda_Atomics.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCuda_Category.hpp b/kokkos/core/unit_test/cuda/TestCuda_Category.hpp
index 5c6c7d6b6..7e7b7c77e 100644
--- a/kokkos/core/unit_test/cuda/TestCuda_Category.hpp
+++ b/kokkos/core/unit_test/cuda/TestCuda_Category.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCuda_Complex.cpp b/kokkos/core/unit_test/cuda/TestCuda_Complex.cpp
index 5acefba17..af4431048 100644
--- a/kokkos/core/unit_test/cuda/TestCuda_Complex.cpp
+++ b/kokkos/core/unit_test/cuda/TestCuda_Complex.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/containers/unit_tests/cuda/TestCuda_Vector.cpp b/kokkos/core/unit_test/cuda/TestCuda_Concepts.cpp
similarity index 92%
rename from kokkos/containers/unit_tests/cuda/TestCuda_Vector.cpp
rename to kokkos/core/unit_test/cuda/TestCuda_Concepts.cpp
index d352f31ab..31b36cbd8 100644
--- a/kokkos/containers/unit_tests/cuda/TestCuda_Vector.cpp
+++ b/kokkos/core/unit_test/cuda/TestCuda_Concepts.cpp
@@ -1,4 +1,3 @@
-
 /*
 //@HEADER
 // ************************************************************************
@@ -25,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -44,4 +43,4 @@
 */
 
 #include <cuda/TestCuda_Category.hpp>
-#include <TestVector.hpp>
+#include <TestConcepts.hpp>
diff --git a/kokkos/core/unit_test/cuda/TestCuda_Crs.cpp b/kokkos/core/unit_test/cuda/TestCuda_Crs.cpp
index 8827bc797..2ae1ee138 100644
--- a/kokkos/core/unit_test/cuda/TestCuda_Crs.cpp
+++ b/kokkos/core/unit_test/cuda/TestCuda_Crs.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCuda_DebugPinUVMSpace.cpp b/kokkos/core/unit_test/cuda/TestCuda_DebugPinUVMSpace.cpp
index cef18818f..4313cece0 100644
--- a/kokkos/core/unit_test/cuda/TestCuda_DebugPinUVMSpace.cpp
+++ b/kokkos/core/unit_test/cuda/TestCuda_DebugPinUVMSpace.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCuda_DebugSerialExecution.cpp b/kokkos/core/unit_test/cuda/TestCuda_DebugSerialExecution.cpp
index c0b4b2e42..5472ef9fd 100644
--- a/kokkos/core/unit_test/cuda/TestCuda_DebugSerialExecution.cpp
+++ b/kokkos/core/unit_test/cuda/TestCuda_DebugSerialExecution.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCuda_DeepCopyAlignment.cpp b/kokkos/core/unit_test/cuda/TestCuda_DeepCopyAlignment.cpp
index eba936f75..e8ce7381b 100644
--- a/kokkos/core/unit_test/cuda/TestCuda_DeepCopyAlignment.cpp
+++ b/kokkos/core/unit_test/cuda/TestCuda_DeepCopyAlignment.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -43,6 +43,4 @@
 */
 
 #include <cuda/TestCuda_Category.hpp>
-#if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
 #include <TestDeepCopy.hpp>
-#endif
diff --git a/kokkos/core/unit_test/cuda/TestCuda_FunctorAnalysis.cpp b/kokkos/core/unit_test/cuda/TestCuda_FunctorAnalysis.cpp
index 0c06ebb19..036806d8d 100644
--- a/kokkos/core/unit_test/cuda/TestCuda_FunctorAnalysis.cpp
+++ b/kokkos/core/unit_test/cuda/TestCuda_FunctorAnalysis.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCuda_Init.cpp b/kokkos/core/unit_test/cuda/TestCuda_Init.cpp
index 5375b23e8..bc5f6cf9e 100644
--- a/kokkos/core/unit_test/cuda/TestCuda_Init.cpp
+++ b/kokkos/core/unit_test/cuda/TestCuda_Init.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCuda_InterOp_Init.cpp b/kokkos/core/unit_test/cuda/TestCuda_InterOp_Init.cpp
index b7b1c9656..6073b9cd7 100644
--- a/kokkos/core/unit_test/cuda/TestCuda_InterOp_Init.cpp
+++ b/kokkos/core/unit_test/cuda/TestCuda_InterOp_Init.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCuda_InterOp_Streams.cpp b/kokkos/core/unit_test/cuda/TestCuda_InterOp_Streams.cpp
index 968a7440f..3753ad9ae 100644
--- a/kokkos/core/unit_test/cuda/TestCuda_InterOp_Streams.cpp
+++ b/kokkos/core/unit_test/cuda/TestCuda_InterOp_Streams.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCuda_LocalDeepCopy.cpp b/kokkos/core/unit_test/cuda/TestCuda_LocalDeepCopy.cpp
index d2525e9bf..20e32ff38 100644
--- a/kokkos/core/unit_test/cuda/TestCuda_LocalDeepCopy.cpp
+++ b/kokkos/core/unit_test/cuda/TestCuda_LocalDeepCopy.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCuda_MDRange_a.cpp b/kokkos/core/unit_test/cuda/TestCuda_MDRange_a.cpp
index 4292f8270..5e339b9a0 100644
--- a/kokkos/core/unit_test/cuda/TestCuda_MDRange_a.cpp
+++ b/kokkos/core/unit_test/cuda/TestCuda_MDRange_a.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCuda_MDRange_b.cpp b/kokkos/core/unit_test/cuda/TestCuda_MDRange_b.cpp
index fe5a391cd..16974ed26 100644
--- a/kokkos/core/unit_test/cuda/TestCuda_MDRange_b.cpp
+++ b/kokkos/core/unit_test/cuda/TestCuda_MDRange_b.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCuda_MDRange_c.cpp b/kokkos/core/unit_test/cuda/TestCuda_MDRange_c.cpp
index 069b39a98..ebc4dfee6 100644
--- a/kokkos/core/unit_test/cuda/TestCuda_MDRange_c.cpp
+++ b/kokkos/core/unit_test/cuda/TestCuda_MDRange_c.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCuda_MDRange_d.cpp b/kokkos/core/unit_test/cuda/TestCuda_MDRange_d.cpp
index 01b642c77..2e7392613 100644
--- a/kokkos/core/unit_test/cuda/TestCuda_MDRange_d.cpp
+++ b/kokkos/core/unit_test/cuda/TestCuda_MDRange_d.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCuda_MDRange_e.cpp b/kokkos/core/unit_test/cuda/TestCuda_MDRange_e.cpp
index d6a712008..92ec05a47 100644
--- a/kokkos/core/unit_test/cuda/TestCuda_MDRange_e.cpp
+++ b/kokkos/core/unit_test/cuda/TestCuda_MDRange_e.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCuda_Other.cpp b/kokkos/core/unit_test/cuda/TestCuda_Other.cpp
index 48a07822a..155226178 100644
--- a/kokkos/core/unit_test/cuda/TestCuda_Other.cpp
+++ b/kokkos/core/unit_test/cuda/TestCuda_Other.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCuda_RangePolicy.cpp b/kokkos/core/unit_test/cuda/TestCuda_RangePolicy.cpp
index eeba7724a..730978c35 100644
--- a/kokkos/core/unit_test/cuda/TestCuda_RangePolicy.cpp
+++ b/kokkos/core/unit_test/cuda/TestCuda_RangePolicy.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/containers/unit_tests/cuda/TestCuda_BitSet.cpp b/kokkos/core/unit_test/cuda/TestCuda_RangePolicyRequire.cpp
similarity index 92%
rename from kokkos/containers/unit_tests/cuda/TestCuda_BitSet.cpp
rename to kokkos/core/unit_test/cuda/TestCuda_RangePolicyRequire.cpp
index 3dbe9b7ac..131770539 100644
--- a/kokkos/containers/unit_tests/cuda/TestCuda_BitSet.cpp
+++ b/kokkos/core/unit_test/cuda/TestCuda_RangePolicyRequire.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -44,4 +44,4 @@
 */
 
 #include <cuda/TestCuda_Category.hpp>
-#include <TestBitset.hpp>
+#include <TestRangeRequire.hpp>
diff --git a/kokkos/core/unit_test/cuda/TestCuda_Reducers_a.cpp b/kokkos/core/unit_test/cuda/TestCuda_Reducers_a.cpp
index 125434c19..ab4446f96 100644
--- a/kokkos/core/unit_test/cuda/TestCuda_Reducers_a.cpp
+++ b/kokkos/core/unit_test/cuda/TestCuda_Reducers_a.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCuda_Reducers_b.cpp b/kokkos/core/unit_test/cuda/TestCuda_Reducers_b.cpp
index 21448c22a..4c7f11182 100644
--- a/kokkos/core/unit_test/cuda/TestCuda_Reducers_b.cpp
+++ b/kokkos/core/unit_test/cuda/TestCuda_Reducers_b.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCuda_Reducers_c.cpp b/kokkos/core/unit_test/cuda/TestCuda_Reducers_c.cpp
index 56bbc6736..0e10c7093 100644
--- a/kokkos/core/unit_test/cuda/TestCuda_Reducers_c.cpp
+++ b/kokkos/core/unit_test/cuda/TestCuda_Reducers_c.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCuda_Reducers_d.cpp b/kokkos/core/unit_test/cuda/TestCuda_Reducers_d.cpp
index b0493cf42..ba2ae6233 100644
--- a/kokkos/core/unit_test/cuda/TestCuda_Reducers_d.cpp
+++ b/kokkos/core/unit_test/cuda/TestCuda_Reducers_d.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCuda_Reductions.cpp b/kokkos/core/unit_test/cuda/TestCuda_Reductions.cpp
index d365103ce..afa361c48 100644
--- a/kokkos/core/unit_test/cuda/TestCuda_Reductions.cpp
+++ b/kokkos/core/unit_test/cuda/TestCuda_Reductions.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCuda_Reductions_DeviceView.cpp b/kokkos/core/unit_test/cuda/TestCuda_Reductions_DeviceView.cpp
index cdc63da24..e2abf881a 100644
--- a/kokkos/core/unit_test/cuda/TestCuda_Reductions_DeviceView.cpp
+++ b/kokkos/core/unit_test/cuda/TestCuda_Reductions_DeviceView.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCuda_Scan.cpp b/kokkos/core/unit_test/cuda/TestCuda_Scan.cpp
index 226ecd3c4..e8364464e 100644
--- a/kokkos/core/unit_test/cuda/TestCuda_Scan.cpp
+++ b/kokkos/core/unit_test/cuda/TestCuda_Scan.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCuda_SharedAlloc.cpp b/kokkos/core/unit_test/cuda/TestCuda_SharedAlloc.cpp
index 4f50a1e92..a09ea3f1b 100644
--- a/kokkos/core/unit_test/cuda/TestCuda_SharedAlloc.cpp
+++ b/kokkos/core/unit_test/cuda/TestCuda_SharedAlloc.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCuda_Spaces.cpp b/kokkos/core/unit_test/cuda/TestCuda_Spaces.cpp
index 9ae32a7b0..d68ffb086 100644
--- a/kokkos/core/unit_test/cuda/TestCuda_Spaces.cpp
+++ b/kokkos/core/unit_test/cuda/TestCuda_Spaces.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -280,73 +280,6 @@ TEST(cuda, uvm) {
   }
 }
 
-/* Removing UVM Allocs Test due to added time to complete overall unit test
- * The issue verified with this unit test appears to no longer be an
- * problem.  Refer to github issue 1880 for more details
- *
-TEST( cuda, uvm_num_allocs )
-{
-  // The max number of UVM allocations allowed is 65536.
-  #define MAX_NUM_ALLOCS 65536
-
-  if ( Kokkos::CudaUVMSpace::available() ) {
-    struct TestMaxUVMAllocs {
-
-      using view_type         = Kokkos::View< double*, Kokkos::CudaUVMSpace >;
-      using view_of_view_type = Kokkos::View< view_type[ MAX_NUM_ALLOCS ]
-                                            , Kokkos::CudaUVMSpace >;
-
-      TestMaxUVMAllocs() : view_allocs_test( "view_allocs_test" )
-      {
-        for ( auto i = 0; i < MAX_NUM_ALLOCS; ++i ) {
-
-          // Kokkos will throw a runtime exception if an attempt is made to
-          // allocate more than the maximum number of uvm allocations.
-
-          // In this test, the max num of allocs occurs when i = MAX_NUM_ALLOCS
-- 1
-          // since the 'outer' view counts as one UVM allocation, leaving
-          // 65535 possible UVM allocations, that is 'i in [0, 65535)'.
-
-          // The test will catch the exception thrown in this case and continue.
-
-          if ( i == ( MAX_NUM_ALLOCS - 1 ) ) {
-            EXPECT_ANY_THROW( { view_allocs_test( i ) = view_type( "inner_view",
-1 ); } );
-          }
-          else {
-            if ( i < MAX_NUM_ALLOCS - 1000 ) {
-              EXPECT_NO_THROW( { view_allocs_test( i ) = view_type(
-"inner_view", 1 ); } ); } else { // This might or might not throw depending on
-compilation options. try { view_allocs_test( i ) = view_type( "inner_view", 1 );
-              }
-              catch ( ... ) {}
-            }
-          }
-
-        } // End allocation for loop.
-
-        for ( auto i = 0; i < MAX_NUM_ALLOCS - 1; ++i ) {
-
-          view_allocs_test( i ) = view_type();
-
-        } // End deallocation for loop.
-
-        view_allocs_test = view_of_view_type(); // Deallocate the view of views.
-      }
-
-      // Member.
-      view_of_view_type view_allocs_test;
-    };
-
-    // Trigger the test via the TestMaxUVMAllocs constructor.
-    TestMaxUVMAllocs();
-  }
-
-  #undef MAX_NUM_ALLOCS
-}
-*/
-
 template <class MemSpace, class ExecSpace>
 struct TestViewCudaAccessible {
   enum { N = 1000 };
diff --git a/kokkos/core/unit_test/cuda/TestCuda_SubView_a.cpp b/kokkos/core/unit_test/cuda/TestCuda_SubView_a.cpp
index c4c998aa2..6ac2fa8f0 100644
--- a/kokkos/core/unit_test/cuda/TestCuda_SubView_a.cpp
+++ b/kokkos/core/unit_test/cuda/TestCuda_SubView_a.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCuda_SubView_b.cpp b/kokkos/core/unit_test/cuda/TestCuda_SubView_b.cpp
index 549af99ad..c53904559 100644
--- a/kokkos/core/unit_test/cuda/TestCuda_SubView_b.cpp
+++ b/kokkos/core/unit_test/cuda/TestCuda_SubView_b.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCuda_SubView_c01.cpp b/kokkos/core/unit_test/cuda/TestCuda_SubView_c01.cpp
index d087b2563..2a1286281 100644
--- a/kokkos/core/unit_test/cuda/TestCuda_SubView_c01.cpp
+++ b/kokkos/core/unit_test/cuda/TestCuda_SubView_c01.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCuda_SubView_c02.cpp b/kokkos/core/unit_test/cuda/TestCuda_SubView_c02.cpp
index 36b401524..d34a3ab59 100644
--- a/kokkos/core/unit_test/cuda/TestCuda_SubView_c02.cpp
+++ b/kokkos/core/unit_test/cuda/TestCuda_SubView_c02.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCuda_SubView_c03.cpp b/kokkos/core/unit_test/cuda/TestCuda_SubView_c03.cpp
index 5fce4b6af..79235f96a 100644
--- a/kokkos/core/unit_test/cuda/TestCuda_SubView_c03.cpp
+++ b/kokkos/core/unit_test/cuda/TestCuda_SubView_c03.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCuda_SubView_c04.cpp b/kokkos/core/unit_test/cuda/TestCuda_SubView_c04.cpp
index ea1ec7adc..d0f5a7bc0 100644
--- a/kokkos/core/unit_test/cuda/TestCuda_SubView_c04.cpp
+++ b/kokkos/core/unit_test/cuda/TestCuda_SubView_c04.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCuda_SubView_c05.cpp b/kokkos/core/unit_test/cuda/TestCuda_SubView_c05.cpp
index 4e4556291..2ae07aa17 100644
--- a/kokkos/core/unit_test/cuda/TestCuda_SubView_c05.cpp
+++ b/kokkos/core/unit_test/cuda/TestCuda_SubView_c05.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCuda_SubView_c06.cpp b/kokkos/core/unit_test/cuda/TestCuda_SubView_c06.cpp
index c7844f96a..973ecb57e 100644
--- a/kokkos/core/unit_test/cuda/TestCuda_SubView_c06.cpp
+++ b/kokkos/core/unit_test/cuda/TestCuda_SubView_c06.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCuda_SubView_c07.cpp b/kokkos/core/unit_test/cuda/TestCuda_SubView_c07.cpp
index 2674ecab9..268ffd975 100644
--- a/kokkos/core/unit_test/cuda/TestCuda_SubView_c07.cpp
+++ b/kokkos/core/unit_test/cuda/TestCuda_SubView_c07.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCuda_SubView_c08.cpp b/kokkos/core/unit_test/cuda/TestCuda_SubView_c08.cpp
index c3ed99580..37a5cc0af 100644
--- a/kokkos/core/unit_test/cuda/TestCuda_SubView_c08.cpp
+++ b/kokkos/core/unit_test/cuda/TestCuda_SubView_c08.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCuda_SubView_c09.cpp b/kokkos/core/unit_test/cuda/TestCuda_SubView_c09.cpp
index e76c65391..7a60168b9 100644
--- a/kokkos/core/unit_test/cuda/TestCuda_SubView_c09.cpp
+++ b/kokkos/core/unit_test/cuda/TestCuda_SubView_c09.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCuda_SubView_c10.cpp b/kokkos/core/unit_test/cuda/TestCuda_SubView_c10.cpp
index fb9399850..705899567 100644
--- a/kokkos/core/unit_test/cuda/TestCuda_SubView_c10.cpp
+++ b/kokkos/core/unit_test/cuda/TestCuda_SubView_c10.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCuda_SubView_c11.cpp b/kokkos/core/unit_test/cuda/TestCuda_SubView_c11.cpp
index 99c75339a..2a2c4ceb0 100644
--- a/kokkos/core/unit_test/cuda/TestCuda_SubView_c11.cpp
+++ b/kokkos/core/unit_test/cuda/TestCuda_SubView_c11.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCuda_SubView_c12.cpp b/kokkos/core/unit_test/cuda/TestCuda_SubView_c12.cpp
index da7aa69cd..747df8836 100644
--- a/kokkos/core/unit_test/cuda/TestCuda_SubView_c12.cpp
+++ b/kokkos/core/unit_test/cuda/TestCuda_SubView_c12.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCuda_SubView_c13.cpp b/kokkos/core/unit_test/cuda/TestCuda_SubView_c13.cpp
index 7da8f35a7..3de6595f3 100644
--- a/kokkos/core/unit_test/cuda/TestCuda_SubView_c13.cpp
+++ b/kokkos/core/unit_test/cuda/TestCuda_SubView_c13.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCuda_Task.cpp b/kokkos/core/unit_test/cuda/TestCuda_Task.cpp
index ca30ad940..e2591c9b1 100644
--- a/kokkos/core/unit_test/cuda/TestCuda_Task.cpp
+++ b/kokkos/core/unit_test/cuda/TestCuda_Task.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCuda_Team.cpp b/kokkos/core/unit_test/cuda/TestCuda_Team.cpp
index 456d92e94..fe5743798 100644
--- a/kokkos/core/unit_test/cuda/TestCuda_Team.cpp
+++ b/kokkos/core/unit_test/cuda/TestCuda_Team.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -79,26 +79,100 @@ TEST(TEST_CATEGORY, team_reduce) {
                  Kokkos::Schedule<Kokkos::Dynamic> >::test_reduce(1000);
 }
 
-TEST(TEST_CATEGORY, team_broadcast) {
-  TestTeamBroadcast<TEST_EXECSPACE,
-                    Kokkos::Schedule<Kokkos::Static> >::test_teambroadcast(0);
-  TestTeamBroadcast<TEST_EXECSPACE,
-                    Kokkos::Schedule<Kokkos::Dynamic> >::test_teambroadcast(0);
-
-  TestTeamBroadcast<TEST_EXECSPACE,
-                    Kokkos::Schedule<Kokkos::Static> >::test_teambroadcast(2);
-  TestTeamBroadcast<TEST_EXECSPACE,
-                    Kokkos::Schedule<Kokkos::Dynamic> >::test_teambroadcast(2);
-
-  TestTeamBroadcast<TEST_EXECSPACE,
-                    Kokkos::Schedule<Kokkos::Static> >::test_teambroadcast(16);
-  TestTeamBroadcast<TEST_EXECSPACE,
-                    Kokkos::Schedule<Kokkos::Dynamic> >::test_teambroadcast(16);
-
-  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::
-      test_teambroadcast(1000);
-  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::
-      test_teambroadcast(1000);
+TEST(TEST_CATEGORY, team_broadcast_long) {
+  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static>,
+                    long>::test_teambroadcast(0, 1);
+  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic>,
+                    long>::test_teambroadcast(0, 1);
+
+  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static>,
+                    long>::test_teambroadcast(2, 1);
+  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic>,
+                    long>::test_teambroadcast(2, 1);
+
+  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static>,
+                    long>::test_teambroadcast(16, 1);
+  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic>,
+                    long>::test_teambroadcast(16, 1);
+
+  //  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static>, long
+  //  >::
+  //      test_teambroadcast(1000, 1);
+  //  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic>, long
+  //  >::
+  //      test_teambroadcast(1000, 1);
+}
+
+TEST(TEST_CATEGORY, team_broadcast_char) {
+  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static>,
+                    unsigned char>::test_teambroadcast(0, 1);
+  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic>,
+                    unsigned char>::test_teambroadcast(0, 1);
+
+  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static>,
+                    unsigned char>::test_teambroadcast(2, 1);
+  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic>,
+                    unsigned char>::test_teambroadcast(2, 1);
+
+  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static>,
+                    unsigned char>::test_teambroadcast(16, 1);
+  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic>,
+                    unsigned char>::test_teambroadcast(16, 1);
+
+  //  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static>, long
+  //  >::
+  //      test_teambroadcast(1000, 1);
+  //  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic>, long
+  //  >::
+  //      test_teambroadcast(1000, 1);
+}
+
+TEST(TEST_CATEGORY, team_broadcast_float) {
+  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static>,
+                    float>::test_teambroadcast(0, 1.3);
+  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic>,
+                    float>::test_teambroadcast(0, 1.3);
+
+  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static>,
+                    float>::test_teambroadcast(2, 1.3);
+  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic>,
+                    float>::test_teambroadcast(2, 1.3);
+
+  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static>,
+                    float>::test_teambroadcast(16, 1.3);
+  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic>,
+                    float>::test_teambroadcast(16, 1.3);
+
+  //  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static>, float
+  //  >::
+  //      test_teambroadcast(1000, 1.3);
+  //  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic>, float
+  //  >::
+  //      test_teambroadcast(1000, 1.3);
+}
+
+TEST(TEST_CATEGORY, team_broadcast_double) {
+  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static>,
+                    double>::test_teambroadcast(0, 1.3);
+  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic>,
+                    double>::test_teambroadcast(0, 1.3);
+
+  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static>,
+                    double>::test_teambroadcast(2, 1.3);
+  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic>,
+                    double>::test_teambroadcast(2, 1.3);
+
+  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static>,
+                    double>::test_teambroadcast(16, 1.3);
+  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic>,
+                    double>::test_teambroadcast(16, 1.3);
+
+  //  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static>, double
+  //  >::
+  //      test_teambroadcast(1000, 1.3);
+  //  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic>,
+  //  double >::
+  //      test_teambroadcast(1000, 1.3);
 }
 
 }  // namespace Test
diff --git a/kokkos/core/unit_test/cuda/TestCuda_TeamReductionScan.cpp b/kokkos/core/unit_test/cuda/TestCuda_TeamReductionScan.cpp
index 8fa2d40bb..4495108dc 100644
--- a/kokkos/core/unit_test/cuda/TestCuda_TeamReductionScan.cpp
+++ b/kokkos/core/unit_test/cuda/TestCuda_TeamReductionScan.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCuda_TeamScratch.cpp b/kokkos/core/unit_test/cuda/TestCuda_TeamScratch.cpp
index d7eda3bb6..63291dbbb 100644
--- a/kokkos/core/unit_test/cuda/TestCuda_TeamScratch.cpp
+++ b/kokkos/core/unit_test/cuda/TestCuda_TeamScratch.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -58,7 +58,6 @@ TEST(TEST_CATEGORY, team_scratch_request) {
 }
 
 #if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
-#if !defined(KOKKOS_ENABLE_CUDA) || (8000 <= CUDA_VERSION)
 TEST(TEST_CATEGORY, team_lambda_shared_request) {
   TestLambdaSharedTeam<Kokkos::HostSpace, TEST_EXECSPACE,
                        Kokkos::Schedule<Kokkos::Static> >();
@@ -68,7 +67,6 @@ TEST(TEST_CATEGORY, team_lambda_shared_request) {
 
 TEST(TEST_CATEGORY, scratch_align) { TestScratchAlignment<TEST_EXECSPACE>(); }
 #endif
-#endif
 
 TEST(TEST_CATEGORY, shmem_size) { TestShmemSize<TEST_EXECSPACE>(); }
 
diff --git a/kokkos/core/unit_test/cuda/TestCuda_TeamTeamSize.cpp b/kokkos/core/unit_test/cuda/TestCuda_TeamTeamSize.cpp
index 832dc7b13..1d60d2727 100644
--- a/kokkos/core/unit_test/cuda/TestCuda_TeamTeamSize.cpp
+++ b/kokkos/core/unit_test/cuda/TestCuda_TeamTeamSize.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCuda_TeamVectorRange.cpp b/kokkos/core/unit_test/cuda/TestCuda_TeamVectorRange.cpp
index da8311256..f0b7496ed 100644
--- a/kokkos/core/unit_test/cuda/TestCuda_TeamVectorRange.cpp
+++ b/kokkos/core/unit_test/cuda/TestCuda_TeamVectorRange.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCuda_UniqueToken.cpp b/kokkos/core/unit_test/cuda/TestCuda_UniqueToken.cpp
index 07188f7ed..186e9e155 100644
--- a/kokkos/core/unit_test/cuda/TestCuda_UniqueToken.cpp
+++ b/kokkos/core/unit_test/cuda/TestCuda_UniqueToken.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCuda_ViewAPI_a.cpp b/kokkos/core/unit_test/cuda/TestCuda_ViewAPI_a.cpp
index cf02295bc..ed9089f4c 100644
--- a/kokkos/core/unit_test/cuda/TestCuda_ViewAPI_a.cpp
+++ b/kokkos/core/unit_test/cuda/TestCuda_ViewAPI_a.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCuda_ViewAPI_b.cpp b/kokkos/core/unit_test/cuda/TestCuda_ViewAPI_b.cpp
index 9056ac82f..1a9056462 100644
--- a/kokkos/core/unit_test/cuda/TestCuda_ViewAPI_b.cpp
+++ b/kokkos/core/unit_test/cuda/TestCuda_ViewAPI_b.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCuda_ViewAPI_c.cpp b/kokkos/core/unit_test/cuda/TestCuda_ViewAPI_c.cpp
index 6d56d499e..0feca1b1c 100644
--- a/kokkos/core/unit_test/cuda/TestCuda_ViewAPI_c.cpp
+++ b/kokkos/core/unit_test/cuda/TestCuda_ViewAPI_c.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCuda_ViewAPI_d.cpp b/kokkos/core/unit_test/cuda/TestCuda_ViewAPI_d.cpp
index 55b2191a3..fd5ff1198 100644
--- a/kokkos/core/unit_test/cuda/TestCuda_ViewAPI_d.cpp
+++ b/kokkos/core/unit_test/cuda/TestCuda_ViewAPI_d.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCuda_ViewAPI_e.cpp b/kokkos/core/unit_test/cuda/TestCuda_ViewAPI_e.cpp
index 501a25e07..754b90aca 100644
--- a/kokkos/core/unit_test/cuda/TestCuda_ViewAPI_e.cpp
+++ b/kokkos/core/unit_test/cuda/TestCuda_ViewAPI_e.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -44,3 +44,4 @@
 
 #include <cuda/TestCuda_Category.hpp>
 #include <TestViewAPI_e.hpp>
+#include <TestViewCopy.hpp>
diff --git a/kokkos/core/unit_test/cuda/TestCuda_ViewLayoutStrideAssignment.cpp b/kokkos/core/unit_test/cuda/TestCuda_ViewLayoutStrideAssignment.cpp
index 84ad1ca34..9b14ed7e8 100644
--- a/kokkos/core/unit_test/cuda/TestCuda_ViewLayoutStrideAssignment.cpp
+++ b/kokkos/core/unit_test/cuda/TestCuda_ViewLayoutStrideAssignment.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCuda_ViewMapping_a.cpp b/kokkos/core/unit_test/cuda/TestCuda_ViewMapping_a.cpp
index c02b3adef..5eaa95a59 100644
--- a/kokkos/core/unit_test/cuda/TestCuda_ViewMapping_a.cpp
+++ b/kokkos/core/unit_test/cuda/TestCuda_ViewMapping_a.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCuda_ViewMapping_b.cpp b/kokkos/core/unit_test/cuda/TestCuda_ViewMapping_b.cpp
index 809469484..5cd8f6c39 100644
--- a/kokkos/core/unit_test/cuda/TestCuda_ViewMapping_b.cpp
+++ b/kokkos/core/unit_test/cuda/TestCuda_ViewMapping_b.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCuda_ViewMapping_subview.cpp b/kokkos/core/unit_test/cuda/TestCuda_ViewMapping_subview.cpp
index 9b4b56b33..2f8888a05 100644
--- a/kokkos/core/unit_test/cuda/TestCuda_ViewMapping_subview.cpp
+++ b/kokkos/core/unit_test/cuda/TestCuda_ViewMapping_subview.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCuda_ViewOfClass.cpp b/kokkos/core/unit_test/cuda/TestCuda_ViewOfClass.cpp
index 3c935daa7..86315de37 100644
--- a/kokkos/core/unit_test/cuda/TestCuda_ViewOfClass.cpp
+++ b/kokkos/core/unit_test/cuda/TestCuda_ViewOfClass.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCuda_ViewResize.cpp b/kokkos/core/unit_test/cuda/TestCuda_ViewResize.cpp
index fec5a5470..49b8b17de 100644
--- a/kokkos/core/unit_test/cuda/TestCuda_ViewResize.cpp
+++ b/kokkos/core/unit_test/cuda/TestCuda_ViewResize.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCuda_View_64bit.cpp b/kokkos/core/unit_test/cuda/TestCuda_View_64bit.cpp
index e6723df8a..ead4c29be 100644
--- a/kokkos/core/unit_test/cuda/TestCuda_View_64bit.cpp
+++ b/kokkos/core/unit_test/cuda/TestCuda_View_64bit.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/cuda/TestCuda_WorkGraph.cpp b/kokkos/core/unit_test/cuda/TestCuda_WorkGraph.cpp
index 042763200..0ae3a6619 100644
--- a/kokkos/core/unit_test/cuda/TestCuda_WorkGraph.cpp
+++ b/kokkos/core/unit_test/cuda/TestCuda_WorkGraph.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/default/TestDefaultDeviceType.cpp b/kokkos/core/unit_test/default/TestDefaultDeviceType.cpp
index 001b8dfc3..02f3f7272 100644
--- a/kokkos/core/unit_test/default/TestDefaultDeviceType.cpp
+++ b/kokkos/core/unit_test/default/TestDefaultDeviceType.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/default/TestDefaultDeviceTypeResize.cpp b/kokkos/core/unit_test/default/TestDefaultDeviceTypeResize.cpp
index 1d4154d0a..df2bc44aa 100644
--- a/kokkos/core/unit_test/default/TestDefaultDeviceTypeResize.cpp
+++ b/kokkos/core/unit_test/default/TestDefaultDeviceTypeResize.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/default/TestDefaultDeviceType_Category.hpp b/kokkos/core/unit_test/default/TestDefaultDeviceType_Category.hpp
index 7c5b54eac..57a0e0ee0 100644
--- a/kokkos/core/unit_test/default/TestDefaultDeviceType_Category.hpp
+++ b/kokkos/core/unit_test/default/TestDefaultDeviceType_Category.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/default/TestDefaultDeviceType_a1.cpp b/kokkos/core/unit_test/default/TestDefaultDeviceType_a1.cpp
index e220cacad..a49ff677d 100644
--- a/kokkos/core/unit_test/default/TestDefaultDeviceType_a1.cpp
+++ b/kokkos/core/unit_test/default/TestDefaultDeviceType_a1.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/default/TestDefaultDeviceType_a2.cpp b/kokkos/core/unit_test/default/TestDefaultDeviceType_a2.cpp
index ffc541cff..816ec60ec 100644
--- a/kokkos/core/unit_test/default/TestDefaultDeviceType_a2.cpp
+++ b/kokkos/core/unit_test/default/TestDefaultDeviceType_a2.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/default/TestDefaultDeviceType_a3.cpp b/kokkos/core/unit_test/default/TestDefaultDeviceType_a3.cpp
index c7335a55d..49c98268f 100644
--- a/kokkos/core/unit_test/default/TestDefaultDeviceType_a3.cpp
+++ b/kokkos/core/unit_test/default/TestDefaultDeviceType_a3.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/default/TestDefaultDeviceType_b1.cpp b/kokkos/core/unit_test/default/TestDefaultDeviceType_b1.cpp
index 212c708ab..fae6a72e7 100644
--- a/kokkos/core/unit_test/default/TestDefaultDeviceType_b1.cpp
+++ b/kokkos/core/unit_test/default/TestDefaultDeviceType_b1.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/default/TestDefaultDeviceType_b2.cpp b/kokkos/core/unit_test/default/TestDefaultDeviceType_b2.cpp
index 5cbba21b5..8a1d4eff2 100644
--- a/kokkos/core/unit_test/default/TestDefaultDeviceType_b2.cpp
+++ b/kokkos/core/unit_test/default/TestDefaultDeviceType_b2.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/default/TestDefaultDeviceType_b3.cpp b/kokkos/core/unit_test/default/TestDefaultDeviceType_b3.cpp
index 94db29ad8..6a980c492 100644
--- a/kokkos/core/unit_test/default/TestDefaultDeviceType_b3.cpp
+++ b/kokkos/core/unit_test/default/TestDefaultDeviceType_b3.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/default/TestDefaultDeviceType_c1.cpp b/kokkos/core/unit_test/default/TestDefaultDeviceType_c1.cpp
index b718a4b7f..2c807582b 100644
--- a/kokkos/core/unit_test/default/TestDefaultDeviceType_c1.cpp
+++ b/kokkos/core/unit_test/default/TestDefaultDeviceType_c1.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/default/TestDefaultDeviceType_c2.cpp b/kokkos/core/unit_test/default/TestDefaultDeviceType_c2.cpp
index 64c1e06a9..f940810a5 100644
--- a/kokkos/core/unit_test/default/TestDefaultDeviceType_c2.cpp
+++ b/kokkos/core/unit_test/default/TestDefaultDeviceType_c2.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/default/TestDefaultDeviceType_c3.cpp b/kokkos/core/unit_test/default/TestDefaultDeviceType_c3.cpp
index 742e253b1..c03d84302 100644
--- a/kokkos/core/unit_test/default/TestDefaultDeviceType_c3.cpp
+++ b/kokkos/core/unit_test/default/TestDefaultDeviceType_c3.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/default/TestDefaultDeviceType_d.cpp b/kokkos/core/unit_test/default/TestDefaultDeviceType_d.cpp
index bed98a82e..ff87b7802 100644
--- a/kokkos/core/unit_test/default/TestDefaultDeviceType_d.cpp
+++ b/kokkos/core/unit_test/default/TestDefaultDeviceType_d.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -61,7 +61,7 @@ TEST(defaultdevicetype, malloc) {
   Kokkos::kokkos_free(data);
 
   int* data2 = (int*)Kokkos::kokkos_malloc(0);
-  ASSERT_TRUE(data2 == NULL);
+  ASSERT_TRUE(data2 == nullptr);
   Kokkos::kokkos_free(data2);
 }
 
diff --git a/kokkos/core/unit_test/qthreads/TestQthreads_Category.hpp b/kokkos/core/unit_test/hip/TestHIPHostPinned_Category.hpp
similarity index 85%
rename from kokkos/core/unit_test/qthreads/TestQthreads_Category.hpp
rename to kokkos/core/unit_test/hip/TestHIPHostPinned_Category.hpp
index a68f8ae8a..12c69926c 100644
--- a/kokkos/core/unit_test/qthreads/TestQthreads_Category.hpp
+++ b/kokkos/core/unit_test/hip/TestHIPHostPinned_Category.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -42,13 +42,12 @@
 //@HEADER
 */
 
-#ifndef KOKKOS_TEST_QTHREADS_HPP
-#define KOKKOS_TEST_QTHREADS_HPP
+#ifndef KOKKOS_TEST_HIPHOSTPINNED_HPP
+#define KOKKOS_TEST_HIPHOSTPINNED_HPP
 
 #include <gtest/gtest.h>
 
-#define TEST_CATEGORY qthreads
-#define TEST_CATEGORY_DEATH qthreads_DeathTest
-#define TEST_EXECSPACE Kokkos::Qthreads
+#define TEST_CATEGORY hip_hostpinned
+#define TEST_EXECSPACE Kokkos::Experimental::HIPHostPinnedSpace
 
 #endif
diff --git a/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c10.cpp b/kokkos/core/unit_test/hip/TestHIPHostPinned_SharedAlloc.cpp
similarity index 86%
rename from kokkos/core/unit_test/qthreads/TestQthreads_SubView_c10.cpp
rename to kokkos/core/unit_test/hip/TestHIPHostPinned_SharedAlloc.cpp
index 78642bce8..7b2db4f8b 100644
--- a/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c10.cpp
+++ b/kokkos/core/unit_test/hip/TestHIPHostPinned_SharedAlloc.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -42,14 +42,13 @@
 //@HEADER
 */
 
-#include <qthreads/TestQthreads.hpp>
+#include <hip/TestHIPHostPinned_Category.hpp>
+#include <TestSharedAlloc.hpp>
 
 namespace Test {
 
-TEST_F(qthreads, view_subview_3d_from_5d_right) {
-#if 0
-  TestViewSubview::test_3d_subview_5d_right< Kokkos::Qthreads >();
-#endif
+TEST(TEST_CATEGORY, impl_shared_alloc) {
+  test_shared_alloc<TEST_EXECSPACE, Kokkos::DefaultHostExecutionSpace>();
 }
 
 }  // namespace Test
diff --git a/kokkos/core/unit_test/qthreads/TestQqthreads_ViewAPI_a.cpp b/kokkos/core/unit_test/hip/TestHIPHostPinned_ViewAPI_a.cpp
similarity index 91%
rename from kokkos/core/unit_test/qthreads/TestQqthreads_ViewAPI_a.cpp
rename to kokkos/core/unit_test/hip/TestHIPHostPinned_ViewAPI_a.cpp
index 22f8161eb..53f0371b2 100644
--- a/kokkos/core/unit_test/qthreads/TestQqthreads_ViewAPI_a.cpp
+++ b/kokkos/core/unit_test/hip/TestHIPHostPinned_ViewAPI_a.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -42,5 +42,5 @@
 //@HEADER
 */
 
-#include <qthreads/TestQqthreads_Category.hpp>
+#include <hip/TestHIPHostPinned_Category.hpp>
 #include <TestViewAPI_a.hpp>
diff --git a/kokkos/core/unit_test/qthreads/TestQqthreads_ViewAPI_b.cpp b/kokkos/core/unit_test/hip/TestHIPHostPinned_ViewAPI_b.cpp
similarity index 91%
rename from kokkos/core/unit_test/qthreads/TestQqthreads_ViewAPI_b.cpp
rename to kokkos/core/unit_test/hip/TestHIPHostPinned_ViewAPI_b.cpp
index 66ecdbf12..2e3685d61 100644
--- a/kokkos/core/unit_test/qthreads/TestQqthreads_ViewAPI_b.cpp
+++ b/kokkos/core/unit_test/hip/TestHIPHostPinned_ViewAPI_b.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -42,5 +42,5 @@
 //@HEADER
 */
 
-#include <qthreads/TestQqthreads_Category.hpp>
+#include <hip/TestHIPHostPinned_Category.hpp>
 #include <TestViewAPI_b.hpp>
diff --git a/kokkos/core/unit_test/qthreads/TestQqthreads_ViewAPI_c.cpp b/kokkos/core/unit_test/hip/TestHIPHostPinned_ViewAPI_c.cpp
similarity index 91%
rename from kokkos/core/unit_test/qthreads/TestQqthreads_ViewAPI_c.cpp
rename to kokkos/core/unit_test/hip/TestHIPHostPinned_ViewAPI_c.cpp
index 51e17bf5c..079a244d4 100644
--- a/kokkos/core/unit_test/qthreads/TestQqthreads_ViewAPI_c.cpp
+++ b/kokkos/core/unit_test/hip/TestHIPHostPinned_ViewAPI_c.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -42,5 +42,5 @@
 //@HEADER
 */
 
-#include <qthreads/TestQqthreads_Category.hpp>
+#include <hip/TestHIPHostPinned_Category.hpp>
 #include <TestViewAPI_c.hpp>
diff --git a/kokkos/core/unit_test/qthreads/TestQqthreads_ViewAPI_d.cpp b/kokkos/core/unit_test/hip/TestHIPHostPinned_ViewAPI_d.cpp
similarity index 91%
rename from kokkos/core/unit_test/qthreads/TestQqthreads_ViewAPI_d.cpp
rename to kokkos/core/unit_test/hip/TestHIPHostPinned_ViewAPI_d.cpp
index 30b605a64..bc3843b2c 100644
--- a/kokkos/core/unit_test/qthreads/TestQqthreads_ViewAPI_d.cpp
+++ b/kokkos/core/unit_test/hip/TestHIPHostPinned_ViewAPI_d.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -42,5 +42,5 @@
 //@HEADER
 */
 
-#include <qthreads/TestQqthreads_Category.hpp>
+#include <hip/TestHIPHostPinned_Category.hpp>
 #include <TestViewAPI_d.hpp>
diff --git a/kokkos/core/unit_test/qthreads/TestQqthreads_ViewAPI_e.cpp b/kokkos/core/unit_test/hip/TestHIPHostPinned_ViewAPI_e.cpp
similarity index 91%
rename from kokkos/core/unit_test/qthreads/TestQqthreads_ViewAPI_e.cpp
rename to kokkos/core/unit_test/hip/TestHIPHostPinned_ViewAPI_e.cpp
index 1f83502ab..1c80e05fe 100644
--- a/kokkos/core/unit_test/qthreads/TestQqthreads_ViewAPI_e.cpp
+++ b/kokkos/core/unit_test/hip/TestHIPHostPinned_ViewAPI_e.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -42,5 +42,5 @@
 //@HEADER
 */
 
-#include <qthreads/TestQqthreads_Category.hpp>
+#include <hip/TestHIPHostPinned_Category.hpp>
 #include <TestViewAPI_e.hpp>
diff --git a/kokkos/core/unit_test/hip/TestHIPHostPinned_ViewCopy.cpp b/kokkos/core/unit_test/hip/TestHIPHostPinned_ViewCopy.cpp
new file mode 100644
index 000000000..59674ad22
--- /dev/null
+++ b/kokkos/core/unit_test/hip/TestHIPHostPinned_ViewCopy.cpp
@@ -0,0 +1,46 @@
+/*
+//@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
+*/
+
+#include <hip/TestHIPHostPinned_Category.hpp>
+#include <TestViewCopy.hpp>
diff --git a/kokkos/core/unit_test/hip/TestHIPHostPinned_ViewMapping_a.cpp b/kokkos/core/unit_test/hip/TestHIPHostPinned_ViewMapping_a.cpp
new file mode 100644
index 000000000..f9b5608d1
--- /dev/null
+++ b/kokkos/core/unit_test/hip/TestHIPHostPinned_ViewMapping_a.cpp
@@ -0,0 +1,46 @@
+/*
+//@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
+*/
+
+#include <hip/TestHIPHostPinned_Category.hpp>
+#include <TestViewMapping_a.hpp>
diff --git a/kokkos/core/unit_test/hip/TestHIPHostPinned_ViewMapping_b.cpp b/kokkos/core/unit_test/hip/TestHIPHostPinned_ViewMapping_b.cpp
new file mode 100644
index 000000000..bff68fc07
--- /dev/null
+++ b/kokkos/core/unit_test/hip/TestHIPHostPinned_ViewMapping_b.cpp
@@ -0,0 +1,46 @@
+/*
+//@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
+*/
+
+#include <hip/TestHIPHostPinned_Category.hpp>
+#include <TestViewMapping_b.hpp>
diff --git a/kokkos/core/unit_test/hip/TestHIPHostPinned_ViewMapping_subview.cpp b/kokkos/core/unit_test/hip/TestHIPHostPinned_ViewMapping_subview.cpp
new file mode 100644
index 000000000..cfa9da549
--- /dev/null
+++ b/kokkos/core/unit_test/hip/TestHIPHostPinned_ViewMapping_subview.cpp
@@ -0,0 +1,46 @@
+/*
+//@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
+*/
+
+#include <hip/TestHIPHostPinned_Category.hpp>
+#include <TestViewMapping_subview.hpp>
diff --git a/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_complexdouble.cpp b/kokkos/core/unit_test/hip/TestHIP_AtomicOperations_complexdouble.cpp
similarity index 91%
rename from kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_complexdouble.cpp
rename to kokkos/core/unit_test/hip/TestHIP_AtomicOperations_complexdouble.cpp
index fe46c7747..644a825bf 100644
--- a/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_complexdouble.cpp
+++ b/kokkos/core/unit_test/hip/TestHIP_AtomicOperations_complexdouble.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -42,5 +42,5 @@
 //@HEADER
 */
 
-#include <qthreads/TestQqthreads_Category.hpp>
+#include <hip/TestHIP_Category.hpp>
 #include <TestAtomicOperations_complexdouble.hpp>
diff --git a/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_complexfloat.cpp b/kokkos/core/unit_test/hip/TestHIP_AtomicOperations_complexfloat.cpp
similarity index 91%
rename from kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_complexfloat.cpp
rename to kokkos/core/unit_test/hip/TestHIP_AtomicOperations_complexfloat.cpp
index 7962924b3..f8aaed88c 100644
--- a/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_complexfloat.cpp
+++ b/kokkos/core/unit_test/hip/TestHIP_AtomicOperations_complexfloat.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -42,5 +42,5 @@
 //@HEADER
 */
 
-#include <qthreads/TestQqthreads_Category.hpp>
+#include <hip/TestHIP_Category.hpp>
 #include <TestAtomicOperations_complexfloat.hpp>
diff --git a/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_double.cpp b/kokkos/core/unit_test/hip/TestHIP_AtomicOperations_double.cpp
similarity index 91%
rename from kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_double.cpp
rename to kokkos/core/unit_test/hip/TestHIP_AtomicOperations_double.cpp
index b5c7fe829..9adeaa76b 100644
--- a/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_double.cpp
+++ b/kokkos/core/unit_test/hip/TestHIP_AtomicOperations_double.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -42,5 +42,5 @@
 //@HEADER
 */
 
-#include <qthreads/TestQqthreads_Category.hpp>
+#include <hip/TestHIP_Category.hpp>
 #include <TestAtomicOperations_double.hpp>
diff --git a/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_float.cpp b/kokkos/core/unit_test/hip/TestHIP_AtomicOperations_float.cpp
similarity index 91%
rename from kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_float.cpp
rename to kokkos/core/unit_test/hip/TestHIP_AtomicOperations_float.cpp
index ecd563166..ba7c6d9bc 100644
--- a/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_float.cpp
+++ b/kokkos/core/unit_test/hip/TestHIP_AtomicOperations_float.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -42,5 +42,5 @@
 //@HEADER
 */
 
-#include <qthreads/TestQqthreads_Category.hpp>
+#include <hip/TestHIP_Category.hpp>
 #include <TestAtomicOperations_float.hpp>
diff --git a/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_int.cpp b/kokkos/core/unit_test/hip/TestHIP_AtomicOperations_int.cpp
similarity index 91%
rename from kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_int.cpp
rename to kokkos/core/unit_test/hip/TestHIP_AtomicOperations_int.cpp
index 905388c76..840f2dbd0 100644
--- a/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_int.cpp
+++ b/kokkos/core/unit_test/hip/TestHIP_AtomicOperations_int.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -42,5 +42,5 @@
 //@HEADER
 */
 
-#include <qthreads/TestQqthreads_Category.hpp>
+#include <hip/TestHIP_Category.hpp>
 #include <TestAtomicOperations_int.hpp>
diff --git a/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_longint.cpp b/kokkos/core/unit_test/hip/TestHIP_AtomicOperations_longint.cpp
similarity index 91%
rename from kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_longint.cpp
rename to kokkos/core/unit_test/hip/TestHIP_AtomicOperations_longint.cpp
index 4cb34f729..be3050766 100644
--- a/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_longint.cpp
+++ b/kokkos/core/unit_test/hip/TestHIP_AtomicOperations_longint.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -42,5 +42,5 @@
 //@HEADER
 */
 
-#include <qthreads/TestQqthreads_Category.hpp>
+#include <hip/TestHIP_Category.hpp>
 #include <TestAtomicOperations_longint.hpp>
diff --git a/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_longlongint.cpp b/kokkos/core/unit_test/hip/TestHIP_AtomicOperations_longlongint.cpp
similarity index 91%
rename from kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_longlongint.cpp
rename to kokkos/core/unit_test/hip/TestHIP_AtomicOperations_longlongint.cpp
index 7dc313a59..85f54dee1 100644
--- a/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_longlongint.cpp
+++ b/kokkos/core/unit_test/hip/TestHIP_AtomicOperations_longlongint.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -42,5 +42,5 @@
 //@HEADER
 */
 
-#include <qthreads/TestQqthreads_Category.hpp>
+#include <hip/TestHIP_Category.hpp>
 #include <TestAtomicOperations_longlongint.hpp>
diff --git a/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_unsignedint.cpp b/kokkos/core/unit_test/hip/TestHIP_AtomicOperations_unsignedint.cpp
similarity index 91%
rename from kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_unsignedint.cpp
rename to kokkos/core/unit_test/hip/TestHIP_AtomicOperations_unsignedint.cpp
index 95c8950a0..d738b608c 100644
--- a/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_unsignedint.cpp
+++ b/kokkos/core/unit_test/hip/TestHIP_AtomicOperations_unsignedint.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -42,5 +42,5 @@
 //@HEADER
 */
 
-#include <qthreads/TestQqthreads_Category.hpp>
+#include <hip/TestHIP_Category.hpp>
 #include <TestAtomicOperations_unsignedint.hpp>
diff --git a/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_unsignedlongint.cpp b/kokkos/core/unit_test/hip/TestHIP_AtomicOperations_unsignedlongint.cpp
similarity index 91%
rename from kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_unsignedlongint.cpp
rename to kokkos/core/unit_test/hip/TestHIP_AtomicOperations_unsignedlongint.cpp
index cb8ce6980..ab25f5d14 100644
--- a/kokkos/core/unit_test/qthreads/TestQqthreads_AtomicOperations_unsignedlongint.cpp
+++ b/kokkos/core/unit_test/hip/TestHIP_AtomicOperations_unsignedlongint.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -42,5 +42,5 @@
 //@HEADER
 */
 
-#include <qthreads/TestQqthreads_Category.hpp>
+#include <hip/TestHIP_Category.hpp>
 #include <TestAtomicOperations_unsignedlongint.hpp>
diff --git a/kokkos/containers/unit_tests/hpx/TestHPX_DualView.cpp b/kokkos/core/unit_test/hip/TestHIP_AtomicViews.cpp
similarity index 90%
rename from kokkos/containers/unit_tests/hpx/TestHPX_DualView.cpp
rename to kokkos/core/unit_test/hip/TestHIP_AtomicViews.cpp
index 33180e9a0..0dae0cb9e 100644
--- a/kokkos/containers/unit_tests/hpx/TestHPX_DualView.cpp
+++ b/kokkos/core/unit_test/hip/TestHIP_AtomicViews.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -43,5 +43,5 @@
 //@HEADER
 */
 
-#include <hpx/TestHPX_Category.hpp>
-#include <TestDualView.hpp>
+#include <hip/TestHIP_Category.hpp>
+#include <TestAtomicViews.hpp>
diff --git a/kokkos/core/unit_test/hip/TestHIP_Atomics.cpp b/kokkos/core/unit_test/hip/TestHIP_Atomics.cpp
new file mode 100644
index 000000000..dda138823
--- /dev/null
+++ b/kokkos/core/unit_test/hip/TestHIP_Atomics.cpp
@@ -0,0 +1,46 @@
+/*
+//@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
+*/
+
+#include <hip/TestHIP_Category.hpp>
+#include <TestAtomic.hpp>
diff --git a/kokkos/containers/unit_tests/rocm/TestROCm_Category.hpp b/kokkos/core/unit_test/hip/TestHIP_Category.hpp
similarity index 87%
rename from kokkos/containers/unit_tests/rocm/TestROCm_Category.hpp
rename to kokkos/core/unit_test/hip/TestHIP_Category.hpp
index 2db3ed633..8cae165c3 100644
--- a/kokkos/containers/unit_tests/rocm/TestROCm_Category.hpp
+++ b/kokkos/core/unit_test/hip/TestHIP_Category.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -42,10 +42,12 @@
 //@HEADER
 */
 
-#ifndef KOKKOS_TEST_ROCM_HPP
-#define KOKKOS_TEST_ROCM_HPP
+#ifndef KOKKOS_TEST_HIP_HPP
+#define KOKKOS_TEST_HIP_HPP
 
-#define TEST_CATEGORY rocm
-#define TEST_EXECSPACE Kokkos::Experimental::ROCm
+#include <gtest/gtest.h>
+
+#define TEST_CATEGORY hip
+#define TEST_EXECSPACE Kokkos::Experimental::HIP
 
 #endif
diff --git a/kokkos/core/unit_test/hip/TestHIP_Complex.cpp b/kokkos/core/unit_test/hip/TestHIP_Complex.cpp
new file mode 100644
index 000000000..f628fb834
--- /dev/null
+++ b/kokkos/core/unit_test/hip/TestHIP_Complex.cpp
@@ -0,0 +1,47 @@
+
+/*
+//@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
+*/
+
+#include <hip/TestHIP_Category.hpp>
+#include <TestComplex.hpp>
diff --git a/kokkos/core/unit_test/hip/TestHIP_Concepts.cpp b/kokkos/core/unit_test/hip/TestHIP_Concepts.cpp
new file mode 100644
index 000000000..bfdfda15d
--- /dev/null
+++ b/kokkos/core/unit_test/hip/TestHIP_Concepts.cpp
@@ -0,0 +1,46 @@
+/*
+//@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
+*/
+
+#include <hip/TestHIP_Category.hpp>
+#include <TestConcepts.hpp>
diff --git a/kokkos/core/unit_test/hip/TestHIP_Crs.cpp b/kokkos/core/unit_test/hip/TestHIP_Crs.cpp
new file mode 100644
index 000000000..b01b78774
--- /dev/null
+++ b/kokkos/core/unit_test/hip/TestHIP_Crs.cpp
@@ -0,0 +1,46 @@
+/*
+//@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
+*/
+
+#include <hip/TestHIP_Category.hpp>
+#include <TestCrs.hpp>
diff --git a/kokkos/core/unit_test/qthreads/TestQthreads_DeepCopyAlignment.cpp b/kokkos/core/unit_test/hip/TestHIP_DeepCopyAlignment.cpp
similarity index 91%
rename from kokkos/core/unit_test/qthreads/TestQthreads_DeepCopyAlignment.cpp
rename to kokkos/core/unit_test/hip/TestHIP_DeepCopyAlignment.cpp
index ada18af0c..43f9d4b5c 100644
--- a/kokkos/core/unit_test/qthreads/TestQthreads_DeepCopyAlignment.cpp
+++ b/kokkos/core/unit_test/hip/TestHIP_DeepCopyAlignment.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -42,5 +42,5 @@
 //@HEADER
 */
 
-#include <qthreads/TestQthreads_Category.hpp>
+#include <hip/TestHIP_Category.hpp>
 #include <TestDeepCopy.hpp>
diff --git a/kokkos/core/unit_test/hip/TestHIP_FunctorAnalysis.cpp b/kokkos/core/unit_test/hip/TestHIP_FunctorAnalysis.cpp
new file mode 100644
index 000000000..f3ae5f47c
--- /dev/null
+++ b/kokkos/core/unit_test/hip/TestHIP_FunctorAnalysis.cpp
@@ -0,0 +1,47 @@
+
+/*
+//@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
+*/
+
+#include <hip/TestHIP_Category.hpp>
+#include <TestFunctorAnalysis.hpp>
diff --git a/kokkos/containers/unit_tests/cuda/TestCuda_DynRankViewAPI_rank12345.cpp b/kokkos/core/unit_test/hip/TestHIP_Init.cpp
similarity index 88%
rename from kokkos/containers/unit_tests/cuda/TestCuda_DynRankViewAPI_rank12345.cpp
rename to kokkos/core/unit_test/hip/TestHIP_Init.cpp
index 1c97d53de..16a73293b 100644
--- a/kokkos/containers/unit_tests/cuda/TestCuda_DynRankViewAPI_rank12345.cpp
+++ b/kokkos/core/unit_test/hip/TestHIP_Init.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -43,5 +43,7 @@
 //@HEADER
 */
 
-#include <cuda/TestCuda_Category.hpp>
-#include <TestDynViewAPI_rank12345.hpp>
+#include <hip/TestHIP_Category.hpp>
+#include <TestInit.hpp>
+#include <TestCompilerMacros.hpp>
+#include <TestPolicyConstruction.hpp>
diff --git a/kokkos/core/unit_test/hip/TestHIP_InterOp_Init.cpp b/kokkos/core/unit_test/hip/TestHIP_InterOp_Init.cpp
new file mode 100644
index 000000000..0dc279fc7
--- /dev/null
+++ b/kokkos/core/unit_test/hip/TestHIP_InterOp_Init.cpp
@@ -0,0 +1,85 @@
+/*
+//@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
+*/
+
+#include <Kokkos_Core.hpp>
+#include <hip/TestHIP_Category.hpp>
+
+namespace Test {
+
+__global__ void offset(int* p) {
+  int idx = hipBlockIdx_x * hipBlockDim_x + hipThreadIdx_x;
+  if (idx < 100) {
+    p[idx] += idx;
+  }
+}
+
+// Test whether allocations survive Kokkos initialize/finalize if done via Raw
+// HIP.
+TEST(hip, raw_hip_interop) {
+  int* p;
+  hipMalloc(&p, sizeof(int) * 100);
+  Kokkos::InitArguments arguments{-1, -1, -1, false};
+  Kokkos::initialize(arguments);
+
+  Kokkos::View<int*, Kokkos::MemoryTraits<Kokkos::Unmanaged>> v(p, 100);
+  Kokkos::deep_copy(v, 5);
+
+  Kokkos::finalize();
+
+  hipLaunchKernelGGL(offset, dim3(100), dim3(100), 0, 0, p);
+  HIP_SAFE_CALL(hipDeviceSynchronize());
+
+  int* h_p = new int[100];
+  hipMemcpy(h_p, p, sizeof(int) * 100, hipMemcpyDefault);
+  HIP_SAFE_CALL(hipDeviceSynchronize());
+  int64_t sum        = 0;
+  int64_t sum_expect = 0;
+  for (int i = 0; i < 100; i++) {
+    sum += h_p[i];
+    sum_expect += 5 + i;
+  }
+
+  ASSERT_EQ(sum, sum_expect);
+}
+}  // namespace Test
diff --git a/kokkos/core/unit_test/hip/TestHIP_LocalDeepCopy.cpp b/kokkos/core/unit_test/hip/TestHIP_LocalDeepCopy.cpp
new file mode 100644
index 000000000..4fc7ca680
--- /dev/null
+++ b/kokkos/core/unit_test/hip/TestHIP_LocalDeepCopy.cpp
@@ -0,0 +1,46 @@
+/*
+//@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
+*/
+
+#include <hip/TestHIP_Category.hpp>
+#include <TestLocalDeepCopy.hpp>
diff --git a/kokkos/core/unit_test/qthreads/TestQqthreads_MDRange_a.cpp b/kokkos/core/unit_test/hip/TestHIP_MDRange_a.cpp
similarity index 91%
rename from kokkos/core/unit_test/qthreads/TestQqthreads_MDRange_a.cpp
rename to kokkos/core/unit_test/hip/TestHIP_MDRange_a.cpp
index 241352322..6bf23f1b2 100644
--- a/kokkos/core/unit_test/qthreads/TestQqthreads_MDRange_a.cpp
+++ b/kokkos/core/unit_test/hip/TestHIP_MDRange_a.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -43,5 +43,5 @@
 //@HEADER
 */
 
-#include <qthreads/TestQqthreads_Category.hpp>
+#include <hip/TestHIP_Category.hpp>
 #include <TestMDRange_a.hpp>
diff --git a/kokkos/core/unit_test/qthreads/TestQqthreads_MDRange_b.cpp b/kokkos/core/unit_test/hip/TestHIP_MDRange_b.cpp
similarity index 91%
rename from kokkos/core/unit_test/qthreads/TestQqthreads_MDRange_b.cpp
rename to kokkos/core/unit_test/hip/TestHIP_MDRange_b.cpp
index de88404c9..d820fa02c 100644
--- a/kokkos/core/unit_test/qthreads/TestQqthreads_MDRange_b.cpp
+++ b/kokkos/core/unit_test/hip/TestHIP_MDRange_b.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -43,5 +43,5 @@
 //@HEADER
 */
 
-#include <qthreads/TestQqthreads_Category.hpp>
+#include <hip/TestHIP_Category.hpp>
 #include <TestMDRange_b.hpp>
diff --git a/kokkos/core/unit_test/qthreads/TestQqthreads_MDRange_c.cpp b/kokkos/core/unit_test/hip/TestHIP_MDRange_c.cpp
similarity index 91%
rename from kokkos/core/unit_test/qthreads/TestQqthreads_MDRange_c.cpp
rename to kokkos/core/unit_test/hip/TestHIP_MDRange_c.cpp
index e68787743..5c70cf6c6 100644
--- a/kokkos/core/unit_test/qthreads/TestQqthreads_MDRange_c.cpp
+++ b/kokkos/core/unit_test/hip/TestHIP_MDRange_c.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -43,5 +43,5 @@
 //@HEADER
 */
 
-#include <qthreads/TestQqthreads_Category.hpp>
+#include <hip/TestHIP_Category.hpp>
 #include <TestMDRange_c.hpp>
diff --git a/kokkos/core/unit_test/qthreads/TestQqthreads_MDRange_d.cpp b/kokkos/core/unit_test/hip/TestHIP_MDRange_d.cpp
similarity index 91%
rename from kokkos/core/unit_test/qthreads/TestQqthreads_MDRange_d.cpp
rename to kokkos/core/unit_test/hip/TestHIP_MDRange_d.cpp
index 50f90aa3a..a18fc24d1 100644
--- a/kokkos/core/unit_test/qthreads/TestQqthreads_MDRange_d.cpp
+++ b/kokkos/core/unit_test/hip/TestHIP_MDRange_d.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -43,5 +43,5 @@
 //@HEADER
 */
 
-#include <qthreads/TestQqthreads_Category.hpp>
+#include <hip/TestHIP_Category.hpp>
 #include <TestMDRange_d.hpp>
diff --git a/kokkos/core/unit_test/qthreads/TestQqthreads_MDRange_e.cpp b/kokkos/core/unit_test/hip/TestHIP_MDRange_e.cpp
similarity index 91%
rename from kokkos/core/unit_test/qthreads/TestQqthreads_MDRange_e.cpp
rename to kokkos/core/unit_test/hip/TestHIP_MDRange_e.cpp
index 5b691dc35..fe011213d 100644
--- a/kokkos/core/unit_test/qthreads/TestQqthreads_MDRange_e.cpp
+++ b/kokkos/core/unit_test/hip/TestHIP_MDRange_e.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -43,5 +43,5 @@
 //@HEADER
 */
 
-#include <qthreads/TestQqthreads_Category.hpp>
+#include <hip/TestHIP_Category.hpp>
 #include <TestMDRange_e.hpp>
diff --git a/kokkos/core/unit_test/hip/TestHIP_RangePolicy.cpp b/kokkos/core/unit_test/hip/TestHIP_RangePolicy.cpp
new file mode 100644
index 000000000..5c8741820
--- /dev/null
+++ b/kokkos/core/unit_test/hip/TestHIP_RangePolicy.cpp
@@ -0,0 +1,47 @@
+
+/*
+//@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
+*/
+
+#include <hip/TestHIP_Category.hpp>
+#include <TestRange.hpp>
diff --git a/kokkos/core/unit_test/hip/TestHIP_RangePolicyRequire.cpp b/kokkos/core/unit_test/hip/TestHIP_RangePolicyRequire.cpp
new file mode 100644
index 000000000..6cf9a36f9
--- /dev/null
+++ b/kokkos/core/unit_test/hip/TestHIP_RangePolicyRequire.cpp
@@ -0,0 +1,47 @@
+
+/*
+//@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
+*/
+
+#include <hip/TestHIP_Category.hpp>
+#include <TestRangeRequire.hpp>
diff --git a/kokkos/core/unit_test/hip/TestHIP_Reducers_a.cpp b/kokkos/core/unit_test/hip/TestHIP_Reducers_a.cpp
new file mode 100644
index 000000000..ec9331d50
--- /dev/null
+++ b/kokkos/core/unit_test/hip/TestHIP_Reducers_a.cpp
@@ -0,0 +1,46 @@
+/*
+//@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
+*/
+
+#include <hip/TestHIP_Category.hpp>
+#include <TestReducers_a.hpp>
diff --git a/kokkos/core/unit_test/hip/TestHIP_Reducers_b.cpp b/kokkos/core/unit_test/hip/TestHIP_Reducers_b.cpp
new file mode 100644
index 000000000..c51c76ae2
--- /dev/null
+++ b/kokkos/core/unit_test/hip/TestHIP_Reducers_b.cpp
@@ -0,0 +1,46 @@
+/*
+//@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
+*/
+
+#include <hip/TestHIP_Category.hpp>
+#include <TestReducers_b.hpp>
diff --git a/kokkos/core/unit_test/hip/TestHIP_Reducers_c.cpp b/kokkos/core/unit_test/hip/TestHIP_Reducers_c.cpp
new file mode 100644
index 000000000..42c21390a
--- /dev/null
+++ b/kokkos/core/unit_test/hip/TestHIP_Reducers_c.cpp
@@ -0,0 +1,46 @@
+/*
+//@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
+*/
+
+#include <hip/TestHIP_Category.hpp>
+#include <TestReducers_c.hpp>
diff --git a/kokkos/core/unit_test/hip/TestHIP_Reducers_d.cpp b/kokkos/core/unit_test/hip/TestHIP_Reducers_d.cpp
new file mode 100644
index 000000000..6014405c3
--- /dev/null
+++ b/kokkos/core/unit_test/hip/TestHIP_Reducers_d.cpp
@@ -0,0 +1,46 @@
+/*
+//@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
+*/
+
+#include <hip/TestHIP_Category.hpp>
+#include <TestReducers_d.hpp>
diff --git a/kokkos/containers/unit_tests/cuda/TestCuda_OffsetView.cpp b/kokkos/core/unit_test/hip/TestHIP_Reductions.cpp
similarity index 89%
rename from kokkos/containers/unit_tests/cuda/TestCuda_OffsetView.cpp
rename to kokkos/core/unit_test/hip/TestHIP_Reductions.cpp
index eab933c6d..8bf8cc63a 100644
--- a/kokkos/containers/unit_tests/cuda/TestCuda_OffsetView.cpp
+++ b/kokkos/core/unit_test/hip/TestHIP_Reductions.cpp
@@ -1,4 +1,3 @@
-
 /*
 //@HEADER
 // ************************************************************************
@@ -25,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -43,5 +42,6 @@
 //@HEADER
 */
 
-#include <cuda/TestCuda_Category.hpp>
-#include <TestOffsetView.hpp>
+#include <hip/TestHIP_Category.hpp>
+#include <TestReduce.hpp>
+#include <TestCXX11Deduction.hpp>
diff --git a/kokkos/core/unit_test/hip/TestHIP_Scan.cpp b/kokkos/core/unit_test/hip/TestHIP_Scan.cpp
new file mode 100644
index 000000000..8dc06c706
--- /dev/null
+++ b/kokkos/core/unit_test/hip/TestHIP_Scan.cpp
@@ -0,0 +1,47 @@
+
+/*
+//@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
+*/
+
+#include <hip/TestHIP_Category.hpp>
+#include <TestScan.hpp>
diff --git a/kokkos/core/unit_test/hip/TestHIP_ScanUnit.cpp b/kokkos/core/unit_test/hip/TestHIP_ScanUnit.cpp
new file mode 100644
index 000000000..ea3859688
--- /dev/null
+++ b/kokkos/core/unit_test/hip/TestHIP_ScanUnit.cpp
@@ -0,0 +1,97 @@
+
+/*
+//@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
+*/
+
+#include <Kokkos_Core.hpp>
+#include <hip/TestHIP_Category.hpp>
+
+struct DummyFunctor {
+  using value_type = int;
+  void operator()(const int, value_type &, bool) const {}
+};
+
+template <int N>
+__global__ void start_intra_block_scan() {
+  __shared__ DummyFunctor::value_type values[N];
+  const int i = hipThreadIdx_y;
+  values[i]   = i + 1;
+  __syncthreads();
+
+  DummyFunctor f;
+  Kokkos::Impl::hip_intra_block_reduce_scan<true, DummyFunctor, void>(f,
+                                                                      values);
+
+  __syncthreads();
+  if (values[i] != ((i + 2) * (i + 1)) / 2) {
+    printf("Value for %d should be %d but is %d\n", i, ((i + 2) * (i + 1)) / 2,
+           values[i]);
+    Kokkos::abort("Test for intra_block_reduce_scan failed!");
+  }
+}
+
+template <int N>
+void test_intra_block_scan() {
+  dim3 grid(1, 1, 1);
+  dim3 block(1, N, 1);
+  hipLaunchKernelGGL(start_intra_block_scan<N>, grid, block, 0, 0);
+}
+
+TEST(TEST_CATEGORY, scan_unit) {
+  if (std::is_same<
+          TEST_EXECSPACE,
+          typename Kokkos::Experimental::HIPSpace::execution_space>::value) {
+    test_intra_block_scan<1>();
+    test_intra_block_scan<2>();
+    test_intra_block_scan<4>();
+    test_intra_block_scan<8>();
+    test_intra_block_scan<16>();
+    test_intra_block_scan<32>();
+    test_intra_block_scan<64>();
+    test_intra_block_scan<128>();
+    test_intra_block_scan<256>();
+    // FIXME_HIP block sizes larger than 256 give wrong results.
+    // test_intra_block_scan<512>();
+    // test_intra_block_scan<1024>();
+  }
+}
diff --git a/kokkos/core/unit_test/hip/TestHIP_SharedAlloc.cpp b/kokkos/core/unit_test/hip/TestHIP_SharedAlloc.cpp
new file mode 100644
index 000000000..c66e01fe0
--- /dev/null
+++ b/kokkos/core/unit_test/hip/TestHIP_SharedAlloc.cpp
@@ -0,0 +1,55 @@
+/*
+//@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
+*/
+
+#include <hip/TestHIP_Category.hpp>
+#include <TestSharedAlloc.hpp>
+
+namespace Test {
+
+TEST(TEST_CATEGORY, impl_shared_alloc) {
+  test_shared_alloc<Kokkos::Experimental::HIPSpace,
+                    Kokkos::DefaultHostExecutionSpace>();
+}
+
+}  // namespace Test
diff --git a/kokkos/core/unit_test/hip/TestHIP_Spaces.cpp b/kokkos/core/unit_test/hip/TestHIP_Spaces.cpp
new file mode 100644
index 000000000..f13400d09
--- /dev/null
+++ b/kokkos/core/unit_test/hip/TestHIP_Spaces.cpp
@@ -0,0 +1,233 @@
+/*
+//@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
+*/
+
+#include <Kokkos_Core.hpp>
+#include <hip/TestHIP_Category.hpp>
+
+namespace Test {
+
+__global__ void test_abort() { Kokkos::abort("test_abort"); }
+
+__global__ void test_hip_spaces_int_value(int *ptr) {
+  if (*ptr == 42) {
+    *ptr = 2 * 42;
+  }
+}
+
+TEST(hip, space_access) {
+  static_assert(Kokkos::Impl::MemorySpaceAccess<Kokkos::HostSpace,
+                                                Kokkos::HostSpace>::assignable,
+                "");
+
+  static_assert(Kokkos::Impl::MemorySpaceAccess<
+                    Kokkos::HostSpace,
+                    Kokkos::Experimental::HIPHostPinnedSpace>::assignable,
+                "");
+
+  static_assert(
+      !Kokkos::Impl::MemorySpaceAccess<
+          Kokkos::HostSpace, Kokkos::Experimental::HIPSpace>::assignable,
+      "");
+
+  static_assert(
+      !Kokkos::Impl::MemorySpaceAccess<
+          Kokkos::HostSpace, Kokkos::Experimental::HIPSpace>::accessible,
+      "");
+
+  //--------------------------------------
+
+  static_assert(Kokkos::Impl::MemorySpaceAccess<
+                    Kokkos::Experimental::HIPSpace,
+                    Kokkos::Experimental::HIPSpace>::assignable,
+                "");
+
+  static_assert(!Kokkos::Impl::MemorySpaceAccess<
+                    Kokkos::Experimental::HIPSpace,
+                    Kokkos::Experimental::HIPHostPinnedSpace>::assignable,
+                "");
+
+  static_assert(Kokkos::Impl::MemorySpaceAccess<
+                    Kokkos::Experimental::HIPSpace,
+                    Kokkos::Experimental::HIPHostPinnedSpace>::accessible,
+                "");
+
+  static_assert(!Kokkos::Impl::MemorySpaceAccess<Kokkos::Experimental::HIPSpace,
+                                                 Kokkos::HostSpace>::assignable,
+                "");
+
+  static_assert(!Kokkos::Impl::MemorySpaceAccess<Kokkos::Experimental::HIPSpace,
+                                                 Kokkos::HostSpace>::accessible,
+                "");
+
+  //--------------------------------------
+
+  static_assert(Kokkos::Impl::MemorySpaceAccess<
+                    Kokkos::Experimental::HIPHostPinnedSpace,
+                    Kokkos::Experimental::HIPHostPinnedSpace>::assignable,
+                "");
+
+  static_assert(
+      !Kokkos::Impl::MemorySpaceAccess<Kokkos::Experimental::HIPHostPinnedSpace,
+                                       Kokkos::HostSpace>::assignable,
+      "");
+
+  static_assert(
+      Kokkos::Impl::MemorySpaceAccess<Kokkos::Experimental::HIPHostPinnedSpace,
+                                      Kokkos::HostSpace>::accessible,
+      "");
+
+  static_assert(!Kokkos::Impl::MemorySpaceAccess<
+                    Kokkos::Experimental::HIPHostPinnedSpace,
+                    Kokkos::Experimental::HIPSpace>::assignable,
+                "");
+
+  static_assert(!Kokkos::Impl::MemorySpaceAccess<
+                    Kokkos::Experimental::HIPHostPinnedSpace,
+                    Kokkos::Experimental::HIPSpace>::accessible,
+                "");
+
+  //--------------------------------------
+
+  static_assert(
+      !Kokkos::Impl::SpaceAccessibility<Kokkos::Experimental::HIP,
+                                        Kokkos::HostSpace>::accessible,
+      "");
+
+  static_assert(Kokkos::Impl::SpaceAccessibility<
+                    Kokkos::Experimental::HIP,
+                    Kokkos::Experimental::HIPSpace>::accessible,
+                "");
+
+  static_assert(Kokkos::Impl::SpaceAccessibility<
+                    Kokkos::Experimental::HIP,
+                    Kokkos::Experimental::HIPHostPinnedSpace>::accessible,
+                "");
+
+  static_assert(
+      !Kokkos::Impl::SpaceAccessibility<
+          Kokkos::HostSpace, Kokkos::Experimental::HIPSpace>::accessible,
+      "");
+
+  static_assert(Kokkos::Impl::SpaceAccessibility<
+                    Kokkos::HostSpace,
+                    Kokkos::Experimental::HIPHostPinnedSpace>::accessible,
+                "");
+
+  static_assert(
+      std::is_same<
+          Kokkos::Impl::HostMirror<Kokkos::Experimental::HIPSpace>::Space,
+          Kokkos::HostSpace>::value,
+      "");
+
+  static_assert(
+      std::is_same<Kokkos::Impl::HostMirror<
+                       Kokkos::Experimental::HIPHostPinnedSpace>::Space,
+                   Kokkos::Experimental::HIPHostPinnedSpace>::value,
+      "");
+
+  static_assert(Kokkos::Impl::SpaceAccessibility<
+                    Kokkos::Impl::HostMirror<Kokkos::Experimental::HIP>::Space,
+                    Kokkos::HostSpace>::accessible,
+                "");
+
+  static_assert(
+      Kokkos::Impl::SpaceAccessibility<
+          Kokkos::Impl::HostMirror<Kokkos::Experimental::HIPSpace>::Space,
+          Kokkos::HostSpace>::accessible,
+      "");
+
+  static_assert(Kokkos::Impl::SpaceAccessibility<
+                    Kokkos::Impl::HostMirror<
+                        Kokkos::Experimental::HIPHostPinnedSpace>::Space,
+                    Kokkos::HostSpace>::accessible,
+                "");
+}
+
+template <class MemSpace, class ExecSpace>
+struct TestViewHIPAccessible {
+  enum { N = 1000 };
+
+  using V = Kokkos::View<double *, MemSpace>;
+
+  V m_base;
+
+  struct TagInit {};
+  struct TagTest {};
+
+  KOKKOS_INLINE_FUNCTION
+  void operator()(const TagInit &, const int i) const { m_base[i] = i + 1; }
+
+  KOKKOS_INLINE_FUNCTION
+  void operator()(const TagTest &, const int i, long &error_count) const {
+    if (m_base[i] != i + 1) ++error_count;
+  }
+
+  TestViewHIPAccessible() : m_base("base", N) {}
+
+  static void run() {
+    TestViewHIPAccessible self;
+    Kokkos::parallel_for(
+        Kokkos::RangePolicy<typename MemSpace::execution_space, TagInit>(0, N),
+        self);
+    typename MemSpace::execution_space().fence();
+
+    // Next access is a different execution space, must complete prior kernel.
+    long error_count = -1;
+    Kokkos::parallel_reduce(Kokkos::RangePolicy<ExecSpace, TagTest>(0, N), self,
+                            error_count);
+    EXPECT_EQ(error_count, 0);
+  }
+};
+
+TEST(hip, impl_view_accessible) {
+  TestViewHIPAccessible<Kokkos::Experimental::HIPSpace,
+                        Kokkos::Experimental::HIP>::run();
+
+  TestViewHIPAccessible<Kokkos::Experimental::HIPHostPinnedSpace,
+                        Kokkos::Experimental::HIP>::run();
+  TestViewHIPAccessible<Kokkos::Experimental::HIPHostPinnedSpace,
+                        Kokkos::HostSpace::execution_space>::run();
+}
+
+}  // namespace Test
diff --git a/kokkos/core/unit_test/qthreads/TestQthreads_SubView_a.cpp b/kokkos/core/unit_test/hip/TestHIP_SubView_a.cpp
similarity index 53%
rename from kokkos/core/unit_test/qthreads/TestQthreads_SubView_a.cpp
rename to kokkos/core/unit_test/hip/TestHIP_SubView_a.cpp
index 41b1b1c90..df7b474af 100644
--- a/kokkos/core/unit_test/qthreads/TestQthreads_SubView_a.cpp
+++ b/kokkos/core/unit_test/hip/TestHIP_SubView_a.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -42,74 +42,61 @@
 //@HEADER
 */
 
-#include <qthreads/TestQthreads.hpp>
+#include <hip/TestHIP_Category.hpp>
+#include <TestViewSubview.hpp>
 
 namespace Test {
 
-TEST_F(qthreads, view_subview_auto_1d_left) {
-#if 0
-  TestViewSubview::test_auto_1d< Kokkos::LayoutLeft, Kokkos::Qthreads >();
-#endif
+TEST(TEST_CATEGORY, view_subview_auto_1d_left) {
+  TestViewSubview::test_auto_1d<Kokkos::LayoutLeft, TEST_EXECSPACE>();
 }
 
-TEST_F(qthreads, view_subview_auto_1d_right) {
-#if 0
-  TestViewSubview::test_auto_1d< Kokkos::LayoutRight, Kokkos::Qthreads >();
-#endif
+TEST(TEST_CATEGORY, view_subview_auto_1d_right) {
+  TestViewSubview::test_auto_1d<Kokkos::LayoutRight, TEST_EXECSPACE>();
 }
 
-TEST_F(qthreads, view_subview_auto_1d_stride) {
-#if 0
-  TestViewSubview::test_auto_1d< Kokkos::LayoutStride, Kokkos::Qthreads >();
-#endif
+TEST(TEST_CATEGORY, view_subview_auto_1d_stride) {
+  TestViewSubview::test_auto_1d<Kokkos::LayoutStride, TEST_EXECSPACE>();
 }
 
-TEST_F(qthreads, view_subview_assign_strided) {
-#if 0
-  TestViewSubview::test_1d_strided_assignment< Kokkos::Qthreads >();
-#endif
+TEST(TEST_CATEGORY, view_subview_assign_strided) {
+  TestViewSubview::test_1d_strided_assignment<TEST_EXECSPACE>();
 }
 
-TEST_F(qthreads, view_subview_left_0) {
-#if 0
-  TestViewSubview::test_left_0< Kokkos::Qthreads >();
-#endif
+TEST(TEST_CATEGORY, view_subview_left_0) {
+  TestViewSubview::test_left_0<TEST_EXECSPACE>();
 }
 
-TEST_F(qthreads, view_subview_left_1) {
-#if 0
-  TestViewSubview::test_left_1< Kokkos::Qthreads >();
-#endif
+TEST(TEST_CATEGORY, view_subview_left_1) {
+  TestViewSubview::test_left_1<TEST_EXECSPACE>();
 }
 
-TEST_F(qthreads, view_subview_left_2) {
-#if 0
-  TestViewSubview::test_left_2< Kokkos::Qthreads >();
-#endif
+TEST(TEST_CATEGORY, view_subview_left_2) {
+  TestViewSubview::test_left_2<TEST_EXECSPACE>();
 }
 
-TEST_F(qthreads, view_subview_left_3) {
-#if 0
-  TestViewSubview::test_left_3< Kokkos::Qthreads >();
-#endif
+TEST(TEST_CATEGORY, view_subview_left_3) {
+  TestViewSubview::test_left_3<TEST_EXECSPACE>();
 }
 
-TEST_F(qthreads, view_subview_right_0) {
-#if 0
-  TestViewSubview::test_right_0< Kokkos::Qthreads >();
-#endif
+TEST(TEST_CATEGORY, view_subview_right_0) {
+  TestViewSubview::test_right_0<TEST_EXECSPACE>();
 }
 
-TEST_F(qthreads, view_subview_right_1) {
-#if 0
-  TestViewSubview::test_right_1< Kokkos::Qthreads >();
-#endif
+TEST(TEST_CATEGORY, view_subview_right_1) {
+  TestViewSubview::test_right_1<TEST_EXECSPACE>();
 }
 
-TEST_F(qthreads, view_subview_right_3) {
-#if 0
-  TestViewSubview::test_right_3< Kokkos::Qthreads >();
-#endif
+TEST(TEST_CATEGORY, view_subview_right_3) {
+  TestViewSubview::test_right_3<TEST_EXECSPACE>();
+}
+
+TEST(TEST_CATEGORY, view_static_tests) {
+  TestViewSubview::TestSubviewStaticSizes<TEST_EXECSPACE,
+                                          Kokkos::LayoutLeft>()();
+  TestViewSubview::TestSubviewStaticSizes<TEST_EXECSPACE,
+                                          Kokkos::LayoutRight>()();
+  TestViewSubview::TestExtentsStaticTests<TEST_EXECSPACE>();
 }
 
 }  // namespace Test
diff --git a/kokkos/core/unit_test/hip/TestHIP_SubView_b.cpp b/kokkos/core/unit_test/hip/TestHIP_SubView_b.cpp
new file mode 100644
index 000000000..5fdaefcf2
--- /dev/null
+++ b/kokkos/core/unit_test/hip/TestHIP_SubView_b.cpp
@@ -0,0 +1,66 @@
+/*
+//@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
+*/
+
+#include <hip/TestHIP_Category.hpp>
+#include <TestViewSubview.hpp>
+
+namespace Test {
+
+TEST(TEST_CATEGORY, view_subview_layoutleft_to_layoutleft) {
+  TestViewSubview::test_layoutleft_to_layoutleft<TEST_EXECSPACE>();
+  TestViewSubview::test_layoutleft_to_layoutleft<
+      TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::Atomic> >();
+  TestViewSubview::test_layoutleft_to_layoutleft<
+      TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
+}
+
+TEST(TEST_CATEGORY, view_subview_layoutright_to_layoutright) {
+  TestViewSubview::test_layoutright_to_layoutright<TEST_EXECSPACE>();
+  TestViewSubview::test_layoutright_to_layoutright<
+      TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::Atomic> >();
+  TestViewSubview::test_layoutright_to_layoutright<
+      TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
+}
+
+}  // namespace Test
diff --git a/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c01.cpp b/kokkos/core/unit_test/hip/TestHIP_SubView_c01.cpp
similarity index 86%
rename from kokkos/core/unit_test/qthreads/TestQthreads_SubView_c01.cpp
rename to kokkos/core/unit_test/hip/TestHIP_SubView_c01.cpp
index 3d419f7a6..79bb42bc5 100644
--- a/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c01.cpp
+++ b/kokkos/core/unit_test/hip/TestHIP_SubView_c01.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -42,14 +42,13 @@
 //@HEADER
 */
 
-#include <qthreads/TestQthreads.hpp>
+#include <hip/TestHIPHostPinned_Category.hpp>
+#include <TestViewSubview.hpp>
 
 namespace Test {
 
-TEST_F(qthreads, view_subview_1d_assign) {
-#if 0
-  TestViewSubview::test_1d_assign< Kokkos::Qthreads >();
-#endif
+TEST(TEST_CATEGORY, view_subview_1d_assign) {
+  TestViewSubview::test_1d_assign<TEST_EXECSPACE>();
 }
 
 }  // namespace Test
diff --git a/kokkos/core/unit_test/hip/TestHIP_SubView_c02.cpp b/kokkos/core/unit_test/hip/TestHIP_SubView_c02.cpp
new file mode 100644
index 000000000..c38dee484
--- /dev/null
+++ b/kokkos/core/unit_test/hip/TestHIP_SubView_c02.cpp
@@ -0,0 +1,55 @@
+/*
+//@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
+*/
+
+#include <hip/TestHIPHostPinned_Category.hpp>
+#include <TestViewSubview.hpp>
+
+namespace Test {
+
+TEST(TEST_CATEGORY, view_subview_1d_assign_atomic) {
+  TestViewSubview::test_1d_assign<TEST_EXECSPACE,
+                                  Kokkos::MemoryTraits<Kokkos::Atomic> >();
+}
+
+}  // namespace Test
diff --git a/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c03.cpp b/kokkos/core/unit_test/hip/TestHIP_SubView_c03.cpp
similarity index 84%
rename from kokkos/core/unit_test/qthreads/TestQthreads_SubView_c03.cpp
rename to kokkos/core/unit_test/hip/TestHIP_SubView_c03.cpp
index df309453c..c35f786d3 100644
--- a/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c03.cpp
+++ b/kokkos/core/unit_test/hip/TestHIP_SubView_c03.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -42,14 +42,14 @@
 //@HEADER
 */
 
-#include <qthreads/TestQthreads.hpp>
+#include <hip/TestHIPHostPinned_Category.hpp>
+#include <TestViewSubview.hpp>
 
 namespace Test {
 
-TEST_F(qthreads, view_subview_1d_assign_randomaccess) {
-#if 0
-  TestViewSubview::test_1d_assign< Kokkos::Qthreads, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
-#endif
+TEST(TEST_CATEGORY, view_subview_1d_assign_randomaccess) {
+  TestViewSubview::test_1d_assign<
+      TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
 }
 
 }  // namespace Test
diff --git a/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c04.cpp b/kokkos/core/unit_test/hip/TestHIP_SubView_c04.cpp
similarity index 86%
rename from kokkos/core/unit_test/qthreads/TestQthreads_SubView_c04.cpp
rename to kokkos/core/unit_test/hip/TestHIP_SubView_c04.cpp
index 5d6a84a65..3a0cafdbe 100644
--- a/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c04.cpp
+++ b/kokkos/core/unit_test/hip/TestHIP_SubView_c04.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -42,14 +42,13 @@
 //@HEADER
 */
 
-#include <qthreads/TestQthreads.hpp>
+#include <hip/TestHIPHostPinned_Category.hpp>
+#include <TestViewSubview.hpp>
 
 namespace Test {
 
-TEST_F(qthreads, view_subview_2d_from_3d) {
-#if 0
-  TestViewSubview::test_2d_subview_3d< Kokkos::Qthreads >();
-#endif
+TEST(TEST_CATEGORY, view_subview_2d_from_3d) {
+  TestViewSubview::test_2d_subview_3d<TEST_EXECSPACE>();
 }
 
 }  // namespace Test
diff --git a/kokkos/core/unit_test/hip/TestHIP_SubView_c05.cpp b/kokkos/core/unit_test/hip/TestHIP_SubView_c05.cpp
new file mode 100644
index 000000000..7b3710f42
--- /dev/null
+++ b/kokkos/core/unit_test/hip/TestHIP_SubView_c05.cpp
@@ -0,0 +1,55 @@
+/*
+//@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
+*/
+
+#include <hip/TestHIPHostPinned_Category.hpp>
+#include <TestViewSubview.hpp>
+
+namespace Test {
+
+TEST(TEST_CATEGORY, view_subview_2d_from_3d_atomic) {
+  TestViewSubview::test_2d_subview_3d<TEST_EXECSPACE,
+                                      Kokkos::MemoryTraits<Kokkos::Atomic> >();
+}
+
+}  // namespace Test
diff --git a/kokkos/core/unit_test/hip/TestHIP_SubView_c06.cpp b/kokkos/core/unit_test/hip/TestHIP_SubView_c06.cpp
new file mode 100644
index 000000000..f0ac19f2c
--- /dev/null
+++ b/kokkos/core/unit_test/hip/TestHIP_SubView_c06.cpp
@@ -0,0 +1,55 @@
+/*
+//@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
+*/
+
+#include <hip/TestHIPHostPinned_Category.hpp>
+#include <TestViewSubview.hpp>
+
+namespace Test {
+
+TEST(TEST_CATEGORY, view_subview_2d_from_3d_randomaccess) {
+  TestViewSubview::test_2d_subview_3d<
+      TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
+}
+
+}  // namespace Test
diff --git a/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c07.cpp b/kokkos/core/unit_test/hip/TestHIP_SubView_c07.cpp
similarity index 86%
rename from kokkos/core/unit_test/qthreads/TestQthreads_SubView_c07.cpp
rename to kokkos/core/unit_test/hip/TestHIP_SubView_c07.cpp
index 243edc109..b9743ab0a 100644
--- a/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c07.cpp
+++ b/kokkos/core/unit_test/hip/TestHIP_SubView_c07.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -42,14 +42,13 @@
 //@HEADER
 */
 
-#include <qthreads/TestQthreads.hpp>
+#include <hip/TestHIPHostPinned_Category.hpp>
+#include <TestViewSubview.hpp>
 
 namespace Test {
 
-TEST_F(qthreads, view_subview_3d_from_5d_left) {
-#if 0
-  TestViewSubview::test_3d_subview_5d_left< Kokkos::Qthreads >();
-#endif
+TEST(TEST_CATEGORY, view_subview_3d_from_5d_left) {
+  TestViewSubview::test_3d_subview_5d_left<TEST_EXECSPACE>();
 }
 
 }  // namespace Test
diff --git a/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c02.cpp b/kokkos/core/unit_test/hip/TestHIP_SubView_c08.cpp
similarity index 84%
rename from kokkos/core/unit_test/qthreads/TestQthreads_SubView_c02.cpp
rename to kokkos/core/unit_test/hip/TestHIP_SubView_c08.cpp
index f87c3ab5e..30bef76d7 100644
--- a/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c02.cpp
+++ b/kokkos/core/unit_test/hip/TestHIP_SubView_c08.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -42,14 +42,14 @@
 //@HEADER
 */
 
-#include <qthreads/TestQthreads.hpp>
+#include <hip/TestHIPHostPinned_Category.hpp>
+#include <TestViewSubview.hpp>
 
 namespace Test {
 
-TEST_F(qthreads, view_subview_1d_assign_atomic) {
-#if 0
-  TestViewSubview::test_1d_assign< Kokkos::Qthreads, Kokkos::MemoryTraits<Kokkos::Atomic> >();
-#endif
+TEST(TEST_CATEGORY, view_subview_3d_from_5d_left_atomic) {
+  TestViewSubview::test_3d_subview_5d_left<
+      TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::Atomic> >();
 }
 
 }  // namespace Test
diff --git a/kokkos/core/unit_test/hip/TestHIP_SubView_c09.cpp b/kokkos/core/unit_test/hip/TestHIP_SubView_c09.cpp
new file mode 100644
index 000000000..2e63849f3
--- /dev/null
+++ b/kokkos/core/unit_test/hip/TestHIP_SubView_c09.cpp
@@ -0,0 +1,55 @@
+/*
+//@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
+*/
+
+#include <hip/TestHIPHostPinned_Category.hpp>
+#include <TestViewSubview.hpp>
+
+namespace Test {
+
+TEST(TEST_CATEGORY, view_subview_3d_from_5d_left_randomaccess) {
+  TestViewSubview::test_3d_subview_5d_left<
+      TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
+}
+
+}  // namespace Test
diff --git a/kokkos/core/unit_test/hip/TestHIP_SubView_c10.cpp b/kokkos/core/unit_test/hip/TestHIP_SubView_c10.cpp
new file mode 100644
index 000000000..dae65a4d3
--- /dev/null
+++ b/kokkos/core/unit_test/hip/TestHIP_SubView_c10.cpp
@@ -0,0 +1,54 @@
+/*
+//@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
+*/
+
+#include <hip/TestHIPHostPinned_Category.hpp>
+#include <TestViewSubview.hpp>
+
+namespace Test {
+
+TEST(TEST_CATEGORY, view_subview_3d_from_5d_right) {
+  TestViewSubview::test_3d_subview_5d_right<TEST_EXECSPACE>();
+}
+
+}  // namespace Test
diff --git a/kokkos/core/unit_test/hip/TestHIP_SubView_c11.cpp b/kokkos/core/unit_test/hip/TestHIP_SubView_c11.cpp
new file mode 100644
index 000000000..570658bf5
--- /dev/null
+++ b/kokkos/core/unit_test/hip/TestHIP_SubView_c11.cpp
@@ -0,0 +1,55 @@
+/*
+//@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
+*/
+
+#include <hip/TestHIPHostPinned_Category.hpp>
+#include <TestViewSubview.hpp>
+
+namespace Test {
+
+TEST(TEST_CATEGORY, view_subview_3d_from_5d_right_atomic) {
+  TestViewSubview::test_3d_subview_5d_right<
+      TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::Atomic> >();
+}
+
+}  // namespace Test
diff --git a/kokkos/core/unit_test/hip/TestHIP_SubView_c12.cpp b/kokkos/core/unit_test/hip/TestHIP_SubView_c12.cpp
new file mode 100644
index 000000000..4e943c68f
--- /dev/null
+++ b/kokkos/core/unit_test/hip/TestHIP_SubView_c12.cpp
@@ -0,0 +1,55 @@
+/*
+//@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
+*/
+
+#include <hip/TestHIPHostPinned_Category.hpp>
+#include <TestViewSubview.hpp>
+
+namespace Test {
+
+TEST(TEST_CATEGORY, view_subview_3d_from_5d_right_randomaccess) {
+  TestViewSubview::test_3d_subview_5d_right<
+      TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
+}
+
+}  // namespace Test
diff --git a/kokkos/core/unit_test/hip/TestHIP_SubView_c13.cpp b/kokkos/core/unit_test/hip/TestHIP_SubView_c13.cpp
new file mode 100644
index 000000000..52a065f2b
--- /dev/null
+++ b/kokkos/core/unit_test/hip/TestHIP_SubView_c13.cpp
@@ -0,0 +1,54 @@
+/*
+//@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
+*/
+
+#include <hip/TestHIPHostPinned_Category.hpp>
+#include <TestViewSubview.hpp>
+
+namespace Test {
+
+TEST(TEST_CATEGORY, view_test_unmanaged_subview_reset) {
+  TestViewSubview::test_unmanaged_subview_reset<TEST_EXECSPACE>();
+}
+
+}  // namespace Test
diff --git a/kokkos/core/unit_test/hip/TestHIP_ViewAPI_c.cpp b/kokkos/core/unit_test/hip/TestHIP_ViewAPI_c.cpp
new file mode 100644
index 000000000..4dc72a078
--- /dev/null
+++ b/kokkos/core/unit_test/hip/TestHIP_ViewAPI_c.cpp
@@ -0,0 +1,46 @@
+/*
+//@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
+*/
+
+#include <hip/TestHIP_Category.hpp>
+#include <TestViewAPI_c.hpp>
diff --git a/kokkos/core/unit_test/hip/TestHIP_ViewAPI_d.cpp b/kokkos/core/unit_test/hip/TestHIP_ViewAPI_d.cpp
new file mode 100644
index 000000000..c96d39fee
--- /dev/null
+++ b/kokkos/core/unit_test/hip/TestHIP_ViewAPI_d.cpp
@@ -0,0 +1,46 @@
+/*
+//@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
+*/
+
+#include <hip/TestHIP_Category.hpp>
+#include <TestViewAPI_d.hpp>
diff --git a/kokkos/core/unit_test/hip/TestHIP_ViewMapping_a.cpp b/kokkos/core/unit_test/hip/TestHIP_ViewMapping_a.cpp
new file mode 100644
index 000000000..146f06fc6
--- /dev/null
+++ b/kokkos/core/unit_test/hip/TestHIP_ViewMapping_a.cpp
@@ -0,0 +1,46 @@
+/*
+//@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
+*/
+
+#include <hip/TestHIP_Category.hpp>
+#include <TestViewMapping_a.hpp>
diff --git a/kokkos/core/unit_test/hip/TestHIP_ViewMapping_b.cpp b/kokkos/core/unit_test/hip/TestHIP_ViewMapping_b.cpp
new file mode 100644
index 000000000..00f931ce9
--- /dev/null
+++ b/kokkos/core/unit_test/hip/TestHIP_ViewMapping_b.cpp
@@ -0,0 +1,46 @@
+/*
+//@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
+*/
+
+#include <hip/TestHIP_Category.hpp>
+#include <TestViewMapping_b.hpp>
diff --git a/kokkos/core/unit_test/hip/TestHIP_ViewMapping_subview.cpp b/kokkos/core/unit_test/hip/TestHIP_ViewMapping_subview.cpp
new file mode 100644
index 000000000..f0e76e040
--- /dev/null
+++ b/kokkos/core/unit_test/hip/TestHIP_ViewMapping_subview.cpp
@@ -0,0 +1,46 @@
+/*
+//@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
+*/
+
+#include <hip/TestHIP_Category.hpp>
+#include <TestViewMapping_subview.hpp>
diff --git a/kokkos/core/unit_test/hip/TestHIP_ViewOfClass.cpp b/kokkos/core/unit_test/hip/TestHIP_ViewOfClass.cpp
new file mode 100644
index 000000000..c673ffb35
--- /dev/null
+++ b/kokkos/core/unit_test/hip/TestHIP_ViewOfClass.cpp
@@ -0,0 +1,46 @@
+/*
+//@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
+*/
+
+#include <hip/TestHIP_Category.hpp>
+#include <TestViewOfClass.hpp>
diff --git a/kokkos/core/unit_test/hip/TestHIP_ViewResize.cpp b/kokkos/core/unit_test/hip/TestHIP_ViewResize.cpp
new file mode 100644
index 000000000..35e312591
--- /dev/null
+++ b/kokkos/core/unit_test/hip/TestHIP_ViewResize.cpp
@@ -0,0 +1,46 @@
+/*
+//@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
+*/
+
+#include <hip/TestHIP_Category.hpp>
+#include <TestViewResize.hpp>
diff --git a/kokkos/core/unit_test/hip/TestHIP_View_64bit.cpp b/kokkos/core/unit_test/hip/TestHIP_View_64bit.cpp
new file mode 100644
index 000000000..fed256043
--- /dev/null
+++ b/kokkos/core/unit_test/hip/TestHIP_View_64bit.cpp
@@ -0,0 +1,46 @@
+/*
+//@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
+*/
+
+#include <hip/TestHIP_Category.hpp>
+#include <TestView_64bit.hpp>
diff --git a/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_complexdouble.cpp b/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_complexdouble.cpp
index 8dc9e2cd0..51007d7b6 100644
--- a/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_complexdouble.cpp
+++ b/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_complexdouble.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_complexfloat.cpp b/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_complexfloat.cpp
index efac2eaf8..3bc357312 100644
--- a/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_complexfloat.cpp
+++ b/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_complexfloat.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_double.cpp b/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_double.cpp
index d13554c37..f0eb44759 100644
--- a/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_double.cpp
+++ b/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_double.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_float.cpp b/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_float.cpp
index db595dac7..38551eabb 100644
--- a/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_float.cpp
+++ b/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_float.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_int.cpp b/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_int.cpp
index 49e1cd99a..3005c3691 100644
--- a/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_int.cpp
+++ b/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_int.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_longint.cpp b/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_longint.cpp
index 5c22605c3..4bbc1e071 100644
--- a/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_longint.cpp
+++ b/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_longint.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_longlongint.cpp b/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_longlongint.cpp
index dbef878c4..9abc860c7 100644
--- a/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_longlongint.cpp
+++ b/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_longlongint.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_unsignedint.cpp b/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_unsignedint.cpp
index 649bdca23..6195d493e 100644
--- a/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_unsignedint.cpp
+++ b/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_unsignedint.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_unsignedlongint.cpp b/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_unsignedlongint.cpp
index b1e813c31..a488983ec 100644
--- a/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_unsignedlongint.cpp
+++ b/kokkos/core/unit_test/hpx/TestHPX_AtomicOperations_unsignedlongint.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/hpx/TestHPX_AtomicViews.cpp b/kokkos/core/unit_test/hpx/TestHPX_AtomicViews.cpp
index b70f24c2d..723f513d8 100644
--- a/kokkos/core/unit_test/hpx/TestHPX_AtomicViews.cpp
+++ b/kokkos/core/unit_test/hpx/TestHPX_AtomicViews.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/hpx/TestHPX_Atomics.cpp b/kokkos/core/unit_test/hpx/TestHPX_Atomics.cpp
index 049679d4c..71729e961 100644
--- a/kokkos/core/unit_test/hpx/TestHPX_Atomics.cpp
+++ b/kokkos/core/unit_test/hpx/TestHPX_Atomics.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/hpx/TestHPX_Category.hpp b/kokkos/core/unit_test/hpx/TestHPX_Category.hpp
index 6e543c7f5..bbdcfba5c 100644
--- a/kokkos/core/unit_test/hpx/TestHPX_Category.hpp
+++ b/kokkos/core/unit_test/hpx/TestHPX_Category.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/hpx/TestHPX_Complex.cpp b/kokkos/core/unit_test/hpx/TestHPX_Complex.cpp
index e4b6ee61d..91de03dcc 100644
--- a/kokkos/core/unit_test/hpx/TestHPX_Complex.cpp
+++ b/kokkos/core/unit_test/hpx/TestHPX_Complex.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/containers/unit_tests/hpx/TestHPX_Vector.cpp b/kokkos/core/unit_test/hpx/TestHPX_Concepts.cpp
similarity index 92%
rename from kokkos/containers/unit_tests/hpx/TestHPX_Vector.cpp
rename to kokkos/core/unit_test/hpx/TestHPX_Concepts.cpp
index 896c9814b..197a99a1e 100644
--- a/kokkos/containers/unit_tests/hpx/TestHPX_Vector.cpp
+++ b/kokkos/core/unit_test/hpx/TestHPX_Concepts.cpp
@@ -1,4 +1,3 @@
-
 /*
 //@HEADER
 // ************************************************************************
@@ -25,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -44,4 +43,4 @@
 */
 
 #include <hpx/TestHPX_Category.hpp>
-#include <TestVector.hpp>
+#include <TestConcepts.hpp>
diff --git a/kokkos/core/unit_test/hpx/TestHPX_Crs.cpp b/kokkos/core/unit_test/hpx/TestHPX_Crs.cpp
index 7704a8c09..d82f449c8 100644
--- a/kokkos/core/unit_test/hpx/TestHPX_Crs.cpp
+++ b/kokkos/core/unit_test/hpx/TestHPX_Crs.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/hpx/TestHPX_DeepCopyAlignment.cpp b/kokkos/core/unit_test/hpx/TestHPX_DeepCopyAlignment.cpp
index 0191adfc9..29e04eda1 100644
--- a/kokkos/core/unit_test/hpx/TestHPX_DeepCopyAlignment.cpp
+++ b/kokkos/core/unit_test/hpx/TestHPX_DeepCopyAlignment.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/hpx/TestHPX_FunctorAnalysis.cpp b/kokkos/core/unit_test/hpx/TestHPX_FunctorAnalysis.cpp
index d311154fa..fa66cb49f 100644
--- a/kokkos/core/unit_test/hpx/TestHPX_FunctorAnalysis.cpp
+++ b/kokkos/core/unit_test/hpx/TestHPX_FunctorAnalysis.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/hpx/TestHPX_Init.cpp b/kokkos/core/unit_test/hpx/TestHPX_Init.cpp
index 76f7e0100..9a320c637 100644
--- a/kokkos/core/unit_test/hpx/TestHPX_Init.cpp
+++ b/kokkos/core/unit_test/hpx/TestHPX_Init.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/hpx/TestHPX_InterOp.cpp b/kokkos/core/unit_test/hpx/TestHPX_InterOp.cpp
index c0d490fff..872d1a038 100644
--- a/kokkos/core/unit_test/hpx/TestHPX_InterOp.cpp
+++ b/kokkos/core/unit_test/hpx/TestHPX_InterOp.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/hpx/TestHPX_LocalDeepCopy.cpp b/kokkos/core/unit_test/hpx/TestHPX_LocalDeepCopy.cpp
index 8f46f2953..da48849b9 100644
--- a/kokkos/core/unit_test/hpx/TestHPX_LocalDeepCopy.cpp
+++ b/kokkos/core/unit_test/hpx/TestHPX_LocalDeepCopy.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/hpx/TestHPX_MDRange_a.cpp b/kokkos/core/unit_test/hpx/TestHPX_MDRange_a.cpp
index 6d72e5a7f..59f97ef34 100644
--- a/kokkos/core/unit_test/hpx/TestHPX_MDRange_a.cpp
+++ b/kokkos/core/unit_test/hpx/TestHPX_MDRange_a.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/hpx/TestHPX_MDRange_b.cpp b/kokkos/core/unit_test/hpx/TestHPX_MDRange_b.cpp
index bac18449d..eb2c9a04e 100644
--- a/kokkos/core/unit_test/hpx/TestHPX_MDRange_b.cpp
+++ b/kokkos/core/unit_test/hpx/TestHPX_MDRange_b.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/hpx/TestHPX_MDRange_c.cpp b/kokkos/core/unit_test/hpx/TestHPX_MDRange_c.cpp
index 23a0648ce..8cbe4d56e 100644
--- a/kokkos/core/unit_test/hpx/TestHPX_MDRange_c.cpp
+++ b/kokkos/core/unit_test/hpx/TestHPX_MDRange_c.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/hpx/TestHPX_MDRange_d.cpp b/kokkos/core/unit_test/hpx/TestHPX_MDRange_d.cpp
index 0d46bb244..0ee7e7f64 100644
--- a/kokkos/core/unit_test/hpx/TestHPX_MDRange_d.cpp
+++ b/kokkos/core/unit_test/hpx/TestHPX_MDRange_d.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/hpx/TestHPX_MDRange_e.cpp b/kokkos/core/unit_test/hpx/TestHPX_MDRange_e.cpp
index 2f2444924..a731f97f2 100644
--- a/kokkos/core/unit_test/hpx/TestHPX_MDRange_e.cpp
+++ b/kokkos/core/unit_test/hpx/TestHPX_MDRange_e.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/hpx/TestHPX_Other.cpp b/kokkos/core/unit_test/hpx/TestHPX_Other.cpp
index 18d53c9ca..34153174b 100644
--- a/kokkos/core/unit_test/hpx/TestHPX_Other.cpp
+++ b/kokkos/core/unit_test/hpx/TestHPX_Other.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/hpx/TestHPX_RangePolicy.cpp b/kokkos/core/unit_test/hpx/TestHPX_RangePolicy.cpp
index 01f4df2a2..009f4cbbc 100644
--- a/kokkos/core/unit_test/hpx/TestHPX_RangePolicy.cpp
+++ b/kokkos/core/unit_test/hpx/TestHPX_RangePolicy.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/containers/unit_tests/hpx/TestHPX_BitSet.cpp b/kokkos/core/unit_test/hpx/TestHPX_RangePolicyRequire.cpp
similarity index 92%
rename from kokkos/containers/unit_tests/hpx/TestHPX_BitSet.cpp
rename to kokkos/core/unit_test/hpx/TestHPX_RangePolicyRequire.cpp
index 3094f09df..c76750e8f 100644
--- a/kokkos/containers/unit_tests/hpx/TestHPX_BitSet.cpp
+++ b/kokkos/core/unit_test/hpx/TestHPX_RangePolicyRequire.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -44,4 +44,4 @@
 */
 
 #include <hpx/TestHPX_Category.hpp>
-#include <TestBitset.hpp>
+#include <TestRangeRequire.hpp>
diff --git a/kokkos/core/unit_test/hpx/TestHPX_Reducers_a.cpp b/kokkos/core/unit_test/hpx/TestHPX_Reducers_a.cpp
index b35abc9ee..9c10dc0aa 100644
--- a/kokkos/core/unit_test/hpx/TestHPX_Reducers_a.cpp
+++ b/kokkos/core/unit_test/hpx/TestHPX_Reducers_a.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/hpx/TestHPX_Reducers_b.cpp b/kokkos/core/unit_test/hpx/TestHPX_Reducers_b.cpp
index a879b09dc..1b3bdb53b 100644
--- a/kokkos/core/unit_test/hpx/TestHPX_Reducers_b.cpp
+++ b/kokkos/core/unit_test/hpx/TestHPX_Reducers_b.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/hpx/TestHPX_Reducers_c.cpp b/kokkos/core/unit_test/hpx/TestHPX_Reducers_c.cpp
index ffb4febc8..385b2ccf9 100644
--- a/kokkos/core/unit_test/hpx/TestHPX_Reducers_c.cpp
+++ b/kokkos/core/unit_test/hpx/TestHPX_Reducers_c.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/hpx/TestHPX_Reducers_d.cpp b/kokkos/core/unit_test/hpx/TestHPX_Reducers_d.cpp
index d35ca42c8..e5460792e 100644
--- a/kokkos/core/unit_test/hpx/TestHPX_Reducers_d.cpp
+++ b/kokkos/core/unit_test/hpx/TestHPX_Reducers_d.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/hpx/TestHPX_Reductions.cpp b/kokkos/core/unit_test/hpx/TestHPX_Reductions.cpp
index 80233af88..e10b1761a 100644
--- a/kokkos/core/unit_test/hpx/TestHPX_Reductions.cpp
+++ b/kokkos/core/unit_test/hpx/TestHPX_Reductions.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/hpx/TestHPX_Reductions_DeviceView.cpp b/kokkos/core/unit_test/hpx/TestHPX_Reductions_DeviceView.cpp
index cdd70d6af..7363c21b1 100644
--- a/kokkos/core/unit_test/hpx/TestHPX_Reductions_DeviceView.cpp
+++ b/kokkos/core/unit_test/hpx/TestHPX_Reductions_DeviceView.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/hpx/TestHPX_Scan.cpp b/kokkos/core/unit_test/hpx/TestHPX_Scan.cpp
index e7b482bbd..66bd71db5 100644
--- a/kokkos/core/unit_test/hpx/TestHPX_Scan.cpp
+++ b/kokkos/core/unit_test/hpx/TestHPX_Scan.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/hpx/TestHPX_SharedAlloc.cpp b/kokkos/core/unit_test/hpx/TestHPX_SharedAlloc.cpp
index fe00fd6e2..48a40aaae 100644
--- a/kokkos/core/unit_test/hpx/TestHPX_SharedAlloc.cpp
+++ b/kokkos/core/unit_test/hpx/TestHPX_SharedAlloc.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/hpx/TestHPX_SubView_a.cpp b/kokkos/core/unit_test/hpx/TestHPX_SubView_a.cpp
index dec02a186..9f697c16e 100644
--- a/kokkos/core/unit_test/hpx/TestHPX_SubView_a.cpp
+++ b/kokkos/core/unit_test/hpx/TestHPX_SubView_a.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/hpx/TestHPX_SubView_b.cpp b/kokkos/core/unit_test/hpx/TestHPX_SubView_b.cpp
index 92698655a..eb625fd83 100644
--- a/kokkos/core/unit_test/hpx/TestHPX_SubView_b.cpp
+++ b/kokkos/core/unit_test/hpx/TestHPX_SubView_b.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/hpx/TestHPX_SubView_c01.cpp b/kokkos/core/unit_test/hpx/TestHPX_SubView_c01.cpp
index 420fbb183..7bd179ba6 100644
--- a/kokkos/core/unit_test/hpx/TestHPX_SubView_c01.cpp
+++ b/kokkos/core/unit_test/hpx/TestHPX_SubView_c01.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/hpx/TestHPX_SubView_c02.cpp b/kokkos/core/unit_test/hpx/TestHPX_SubView_c02.cpp
index b64761355..b490503b3 100644
--- a/kokkos/core/unit_test/hpx/TestHPX_SubView_c02.cpp
+++ b/kokkos/core/unit_test/hpx/TestHPX_SubView_c02.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/hpx/TestHPX_SubView_c03.cpp b/kokkos/core/unit_test/hpx/TestHPX_SubView_c03.cpp
index 36fdf3cfd..f36a25e8e 100644
--- a/kokkos/core/unit_test/hpx/TestHPX_SubView_c03.cpp
+++ b/kokkos/core/unit_test/hpx/TestHPX_SubView_c03.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/hpx/TestHPX_SubView_c04.cpp b/kokkos/core/unit_test/hpx/TestHPX_SubView_c04.cpp
index 6e8e46c0d..3bc96cd57 100644
--- a/kokkos/core/unit_test/hpx/TestHPX_SubView_c04.cpp
+++ b/kokkos/core/unit_test/hpx/TestHPX_SubView_c04.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/hpx/TestHPX_SubView_c05.cpp b/kokkos/core/unit_test/hpx/TestHPX_SubView_c05.cpp
index c4cc4a759..a102141b7 100644
--- a/kokkos/core/unit_test/hpx/TestHPX_SubView_c05.cpp
+++ b/kokkos/core/unit_test/hpx/TestHPX_SubView_c05.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/hpx/TestHPX_SubView_c06.cpp b/kokkos/core/unit_test/hpx/TestHPX_SubView_c06.cpp
index bb1a6b6c9..18ba86111 100644
--- a/kokkos/core/unit_test/hpx/TestHPX_SubView_c06.cpp
+++ b/kokkos/core/unit_test/hpx/TestHPX_SubView_c06.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/hpx/TestHPX_SubView_c07.cpp b/kokkos/core/unit_test/hpx/TestHPX_SubView_c07.cpp
index 06471dcfd..d1e136fdf 100644
--- a/kokkos/core/unit_test/hpx/TestHPX_SubView_c07.cpp
+++ b/kokkos/core/unit_test/hpx/TestHPX_SubView_c07.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/hpx/TestHPX_SubView_c08.cpp b/kokkos/core/unit_test/hpx/TestHPX_SubView_c08.cpp
index 09bb81009..6bee531a7 100644
--- a/kokkos/core/unit_test/hpx/TestHPX_SubView_c08.cpp
+++ b/kokkos/core/unit_test/hpx/TestHPX_SubView_c08.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/hpx/TestHPX_SubView_c09.cpp b/kokkos/core/unit_test/hpx/TestHPX_SubView_c09.cpp
index 75c8fee26..a9c88d0e7 100644
--- a/kokkos/core/unit_test/hpx/TestHPX_SubView_c09.cpp
+++ b/kokkos/core/unit_test/hpx/TestHPX_SubView_c09.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/hpx/TestHPX_SubView_c10.cpp b/kokkos/core/unit_test/hpx/TestHPX_SubView_c10.cpp
index 5a9a1d6ac..c2b9d4ffd 100644
--- a/kokkos/core/unit_test/hpx/TestHPX_SubView_c10.cpp
+++ b/kokkos/core/unit_test/hpx/TestHPX_SubView_c10.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/hpx/TestHPX_SubView_c11.cpp b/kokkos/core/unit_test/hpx/TestHPX_SubView_c11.cpp
index 05971955f..429564d91 100644
--- a/kokkos/core/unit_test/hpx/TestHPX_SubView_c11.cpp
+++ b/kokkos/core/unit_test/hpx/TestHPX_SubView_c11.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/hpx/TestHPX_SubView_c12.cpp b/kokkos/core/unit_test/hpx/TestHPX_SubView_c12.cpp
index dd9733013..bb7f69b1f 100644
--- a/kokkos/core/unit_test/hpx/TestHPX_SubView_c12.cpp
+++ b/kokkos/core/unit_test/hpx/TestHPX_SubView_c12.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/hpx/TestHPX_SubView_c13.cpp b/kokkos/core/unit_test/hpx/TestHPX_SubView_c13.cpp
index b06438492..6f1e2cd0a 100644
--- a/kokkos/core/unit_test/hpx/TestHPX_SubView_c13.cpp
+++ b/kokkos/core/unit_test/hpx/TestHPX_SubView_c13.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/hpx/TestHPX_Task.cpp b/kokkos/core/unit_test/hpx/TestHPX_Task.cpp
index 59b8fa411..4e059beef 100644
--- a/kokkos/core/unit_test/hpx/TestHPX_Task.cpp
+++ b/kokkos/core/unit_test/hpx/TestHPX_Task.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/hpx/TestHPX_Team.cpp b/kokkos/core/unit_test/hpx/TestHPX_Team.cpp
index 3c76fd933..f5278971b 100644
--- a/kokkos/core/unit_test/hpx/TestHPX_Team.cpp
+++ b/kokkos/core/unit_test/hpx/TestHPX_Team.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/hpx/TestHPX_TeamReductionScan.cpp b/kokkos/core/unit_test/hpx/TestHPX_TeamReductionScan.cpp
index e025517fb..971e12f3f 100644
--- a/kokkos/core/unit_test/hpx/TestHPX_TeamReductionScan.cpp
+++ b/kokkos/core/unit_test/hpx/TestHPX_TeamReductionScan.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/hpx/TestHPX_TeamScratch.cpp b/kokkos/core/unit_test/hpx/TestHPX_TeamScratch.cpp
index 86a858510..232bed509 100644
--- a/kokkos/core/unit_test/hpx/TestHPX_TeamScratch.cpp
+++ b/kokkos/core/unit_test/hpx/TestHPX_TeamScratch.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -58,7 +58,6 @@ TEST(TEST_CATEGORY, team_scratch_request) {
 }
 
 #if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
-#if !defined(KOKKOS_ENABLE_CUDA) || (8000 <= CUDA_VERSION)
 TEST(TEST_CATEGORY, team_lambda_shared_request) {
   TestLambdaSharedTeam<Kokkos::HostSpace, TEST_EXECSPACE,
                        Kokkos::Schedule<Kokkos::Static> >();
@@ -66,7 +65,6 @@ TEST(TEST_CATEGORY, team_lambda_shared_request) {
                        Kokkos::Schedule<Kokkos::Dynamic> >();
 }
 #endif
-#endif
 
 TEST(TEST_CATEGORY, shmem_size) { TestShmemSize<TEST_EXECSPACE>(); }
 
diff --git a/kokkos/core/unit_test/hpx/TestHPX_TeamTeamSize.cpp b/kokkos/core/unit_test/hpx/TestHPX_TeamTeamSize.cpp
index 6ee688daa..68577d065 100644
--- a/kokkos/core/unit_test/hpx/TestHPX_TeamTeamSize.cpp
+++ b/kokkos/core/unit_test/hpx/TestHPX_TeamTeamSize.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/hpx/TestHPX_TeamVectorRange.cpp b/kokkos/core/unit_test/hpx/TestHPX_TeamVectorRange.cpp
index a276cf19d..2bf586ec2 100644
--- a/kokkos/core/unit_test/hpx/TestHPX_TeamVectorRange.cpp
+++ b/kokkos/core/unit_test/hpx/TestHPX_TeamVectorRange.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/hpx/TestHPX_UniqueToken.cpp b/kokkos/core/unit_test/hpx/TestHPX_UniqueToken.cpp
index 108dc5359..9e88419e7 100644
--- a/kokkos/core/unit_test/hpx/TestHPX_UniqueToken.cpp
+++ b/kokkos/core/unit_test/hpx/TestHPX_UniqueToken.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/hpx/TestHPX_ViewAPI_a.cpp b/kokkos/core/unit_test/hpx/TestHPX_ViewAPI_a.cpp
index 1d4bdb8ac..7342cfac8 100644
--- a/kokkos/core/unit_test/hpx/TestHPX_ViewAPI_a.cpp
+++ b/kokkos/core/unit_test/hpx/TestHPX_ViewAPI_a.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/hpx/TestHPX_ViewAPI_b.cpp b/kokkos/core/unit_test/hpx/TestHPX_ViewAPI_b.cpp
index 442fc43db..82fd177ad 100644
--- a/kokkos/core/unit_test/hpx/TestHPX_ViewAPI_b.cpp
+++ b/kokkos/core/unit_test/hpx/TestHPX_ViewAPI_b.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/hpx/TestHPX_ViewAPI_c.cpp b/kokkos/core/unit_test/hpx/TestHPX_ViewAPI_c.cpp
index 91f529422..e5d920de4 100644
--- a/kokkos/core/unit_test/hpx/TestHPX_ViewAPI_c.cpp
+++ b/kokkos/core/unit_test/hpx/TestHPX_ViewAPI_c.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/hpx/TestHPX_ViewAPI_d.cpp b/kokkos/core/unit_test/hpx/TestHPX_ViewAPI_d.cpp
index dc2b77974..56bfb6ffc 100644
--- a/kokkos/core/unit_test/hpx/TestHPX_ViewAPI_d.cpp
+++ b/kokkos/core/unit_test/hpx/TestHPX_ViewAPI_d.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/hpx/TestHPX_ViewAPI_e.cpp b/kokkos/core/unit_test/hpx/TestHPX_ViewAPI_e.cpp
index 88847fe35..3dc492355 100644
--- a/kokkos/core/unit_test/hpx/TestHPX_ViewAPI_e.cpp
+++ b/kokkos/core/unit_test/hpx/TestHPX_ViewAPI_e.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/hpx/TestHPX_ViewLayoutStrideAssignment.cpp b/kokkos/core/unit_test/hpx/TestHPX_ViewLayoutStrideAssignment.cpp
index b937f4b45..eb91b558e 100644
--- a/kokkos/core/unit_test/hpx/TestHPX_ViewLayoutStrideAssignment.cpp
+++ b/kokkos/core/unit_test/hpx/TestHPX_ViewLayoutStrideAssignment.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/hpx/TestHPX_ViewMapping_a.cpp b/kokkos/core/unit_test/hpx/TestHPX_ViewMapping_a.cpp
index 8751484fc..5ad3d9719 100644
--- a/kokkos/core/unit_test/hpx/TestHPX_ViewMapping_a.cpp
+++ b/kokkos/core/unit_test/hpx/TestHPX_ViewMapping_a.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/hpx/TestHPX_ViewMapping_b.cpp b/kokkos/core/unit_test/hpx/TestHPX_ViewMapping_b.cpp
index c1e728e34..10f49a93d 100644
--- a/kokkos/core/unit_test/hpx/TestHPX_ViewMapping_b.cpp
+++ b/kokkos/core/unit_test/hpx/TestHPX_ViewMapping_b.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/hpx/TestHPX_ViewMapping_subview.cpp b/kokkos/core/unit_test/hpx/TestHPX_ViewMapping_subview.cpp
index be935c03c..e79965acf 100644
--- a/kokkos/core/unit_test/hpx/TestHPX_ViewMapping_subview.cpp
+++ b/kokkos/core/unit_test/hpx/TestHPX_ViewMapping_subview.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/hpx/TestHPX_ViewOfClass.cpp b/kokkos/core/unit_test/hpx/TestHPX_ViewOfClass.cpp
index 42952e95e..cfc9ea23a 100644
--- a/kokkos/core/unit_test/hpx/TestHPX_ViewOfClass.cpp
+++ b/kokkos/core/unit_test/hpx/TestHPX_ViewOfClass.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/hpx/TestHPX_ViewResize.cpp b/kokkos/core/unit_test/hpx/TestHPX_ViewResize.cpp
index 0564c2a60..cc14030dc 100644
--- a/kokkos/core/unit_test/hpx/TestHPX_ViewResize.cpp
+++ b/kokkos/core/unit_test/hpx/TestHPX_ViewResize.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/hpx/TestHPX_View_64bit.cpp b/kokkos/core/unit_test/hpx/TestHPX_View_64bit.cpp
index 0a70dcf27..8672c23d7 100644
--- a/kokkos/core/unit_test/hpx/TestHPX_View_64bit.cpp
+++ b/kokkos/core/unit_test/hpx/TestHPX_View_64bit.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/hpx/TestHPX_WorkGraph.cpp b/kokkos/core/unit_test/hpx/TestHPX_WorkGraph.cpp
index 79c3fb3bb..1e497b344 100644
--- a/kokkos/core/unit_test/hpx/TestHPX_WorkGraph.cpp
+++ b/kokkos/core/unit_test/hpx/TestHPX_WorkGraph.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/incremental/Test01_execspace.hpp b/kokkos/core/unit_test/incremental/Test01_execspace.hpp
new file mode 100644
index 000000000..9f118bfb4
--- /dev/null
+++ b/kokkos/core/unit_test/incremental/Test01_execspace.hpp
@@ -0,0 +1,111 @@
+/*
+//@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
+*/
+
+/// @Kokkos_Feature_Level_Required:1
+
+#include <Kokkos_Core.hpp>
+#include <cstdio>
+#include <sstream>
+#include <type_traits>
+#include <gtest/gtest.h>
+
+namespace Test {
+
+// Unit test for Execution Space
+// Test1 - testing for memory_space, execution_space, scratch space and
+// array_layout of an execution space
+// Test2 - Test if the is_execution_space evaluation is working correctly
+
+template <class ExecSpace>
+struct TestIncrExecSpaceTypedef {
+  void testit() {
+    const bool passed =
+        (!std::is_same<void, typename ExecSpace::memory_space>::value) &&
+        std::is_same<ExecSpace, typename ExecSpace::execution_space>::value &&
+        !std::is_same<void, typename ExecSpace::scratch_memory_space>::value &&
+        !std::is_same<void, typename ExecSpace::array_layout>::value;
+    static_assert(passed == true,
+                  "The memory and execution spaces are defined");
+  }
+};
+
+template <class ExecSpace>
+struct TestIncrExecSpace {
+  void testit() {
+    typedef typename ExecSpace::device_type device_type;
+    typedef typename device_type::memory_space memory_space;
+    typedef typename device_type::execution_space execution_space;
+
+    const bool passed =
+        std::is_same<device_type,
+                     Kokkos::Device<execution_space, memory_space>>::value;
+
+    static_assert(passed == true,
+                  "Checking if the is_execution_space is evaluated correctly");
+
+    ExecSpace().print_configuration(std::cout);
+    ExecSpace().fence();
+
+    auto concurrency = ExecSpace().concurrency();
+    ASSERT_TRUE(concurrency > 0);
+
+    int in_parallel = ExecSpace::in_parallel();
+    ASSERT_FALSE(in_parallel);
+
+    const char* name = ExecSpace::name();
+    std::cout << name << std::endl;
+  }
+};
+
+TEST(TEST_CATEGORY, IncrTest_01_execspace_typedef) {
+  TestIncrExecSpaceTypedef<TEST_EXECSPACE> test;
+  test.testit();
+}
+
+TEST(TEST_CATEGORY, IncrTest_01_execspace) {
+  ASSERT_TRUE(Kokkos::is_execution_space<TEST_EXECSPACE>::value);
+  ASSERT_FALSE(Kokkos::is_execution_space<
+               TestIncrExecSpaceTypedef<TEST_EXECSPACE>>::value);
+}
+}  // namespace Test
diff --git a/kokkos/core/unit_test/incremental/Test02_atomic_host.hpp b/kokkos/core/unit_test/incremental/Test02_atomic_host.hpp
new file mode 100644
index 000000000..4617ede99
--- /dev/null
+++ b/kokkos/core/unit_test/incremental/Test02_atomic_host.hpp
@@ -0,0 +1,97 @@
+/*
+//@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
+*/
+
+/// @Kokkos_Feature_Level_Required:2
+// Unit test for atomic exchange, atomic add and atomic sub.
+// Atomic exchange test : we interchange value1 with value2 and check for
+// correctness. Atomic add test : we add value2 to value1 and check for
+// correctness. Atomic sub test : we subtract value2 from value1 and check for
+// correctmess.
+
+#include <Kokkos_Core.hpp>
+#include <gtest/gtest.h>
+
+using value_type = double;
+
+namespace Test {
+
+struct TestIncrAtomic {
+  value_type value1 = 1.5, value2 = 0.5;
+
+  void testExchange() {
+    value_type ret_value = Kokkos::atomic_exchange(&value1, value2);
+
+    ASSERT_EQ(value1, 0.5);
+    ASSERT_EQ(ret_value, 1.5);
+  }
+
+  void testAdd() {
+    Kokkos::atomic_add(&value1, value2);
+
+    ASSERT_EQ(value1, 2.0);
+  }
+
+  void testSub() {
+    Kokkos::atomic_sub(&value1, value2);
+
+    ASSERT_EQ(value1, 1.0);
+  }
+};
+
+TEST(TEST_CATEGORY, IncrTest_01_AtomicExchange) {
+  TestIncrAtomic test;
+  test.testExchange();
+}
+
+TEST(TEST_CATEGORY, IncrTest_02_AtomicAdd) {
+  TestIncrAtomic test;
+  test.testAdd();
+}
+
+TEST(TEST_CATEGORY, IncrTest_02_AtomicSub) {
+  TestIncrAtomic test;
+  test.testSub();
+}
+
+}  // namespace Test
diff --git a/kokkos/core/unit_test/qthreads/TestQthreads_SubView_b.cpp b/kokkos/core/unit_test/incremental/Test03a_MemorySpace_malloc.hpp
similarity index 65%
rename from kokkos/core/unit_test/qthreads/TestQthreads_SubView_b.cpp
rename to kokkos/core/unit_test/incremental/Test03a_MemorySpace_malloc.hpp
index 180934701..da808be21 100644
--- a/kokkos/core/unit_test/qthreads/TestQthreads_SubView_b.cpp
+++ b/kokkos/core/unit_test/incremental/Test03a_MemorySpace_malloc.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -42,24 +42,39 @@
 //@HEADER
 */
 
-#include <qthreads/TestQthreads.hpp>
+#include <Kokkos_Core.hpp>
+#include <gtest/gtest.h>
+
+/// @Kokkos_Feature_Level_Required:3
+// Unit Test for Kokkos malloc.
+// Allocate memory to a pointer and check if the allocation has not returned a
+// null pointer.
 
 namespace Test {
 
-TEST_F(qthreads, view_subview_layoutleft_to_layoutleft) {
-#if 0
-  TestViewSubview::test_layoutleft_to_layoutleft< Kokkos::Qthreads >();
-  TestViewSubview::test_layoutleft_to_layoutleft< Kokkos::Qthreads, Kokkos::MemoryTraits<Kokkos::Atomic> >();
-  TestViewSubview::test_layoutleft_to_layoutleft< Kokkos::Qthreads, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
-#endif
-}
+using value_type       = double;
+const int num_elements = 10;
+
+template <class ExecSpace>
+struct TestIncrMemorySpace_malloc {
+  using memory_space = typename ExecSpace::memory_space;
+
+  void test_malloc() {
+    // Allocate memory
+    auto *data = static_cast<value_type *>(Kokkos::kokkos_malloc<memory_space>(
+        "data", num_elements * sizeof(value_type)));
+
+    // Check if the allocated memory has not returned a NULL
+    ASSERT_NE(data, nullptr);
+
+    // Free the allocated memory
+    Kokkos::kokkos_free<memory_space>(data);
+  }
+};
 
-TEST_F(qthreads, view_subview_layoutright_to_layoutright) {
-#if 0
-  TestViewSubview::test_layoutright_to_layoutright< Kokkos::Qthreads >();
-  TestViewSubview::test_layoutright_to_layoutright< Kokkos::Qthreads, Kokkos::MemoryTraits<Kokkos::Atomic> >();
-  TestViewSubview::test_layoutright_to_layoutright< Kokkos::Qthreads, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
-#endif
+TEST(TEST_CATEGORY, IncrTest_03a_memspace_malloc) {
+  TestIncrMemorySpace_malloc<TEST_EXECSPACE> test;
+  test.test_malloc();
 }
 
 }  // namespace Test
diff --git a/kokkos/core/unit_test/incremental/Test03b_MemorySpace_free.hpp b/kokkos/core/unit_test/incremental/Test03b_MemorySpace_free.hpp
new file mode 100644
index 000000000..f7ee76ec9
--- /dev/null
+++ b/kokkos/core/unit_test/incremental/Test03b_MemorySpace_free.hpp
@@ -0,0 +1,83 @@
+/*
+//@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
+*/
+
+/// @Kokkos_Feature_Level_Required:3
+// Unit test for Kokkos free.
+// We constantly allocate and free the memory.
+// If the kokkos_free does not free the allocated memory,
+// we will exceed the available space.
+
+#include <Kokkos_Core.hpp>
+#include <gtest/gtest.h>
+
+namespace Test {
+
+using value_type = double;
+
+// Allocate M number of value_type elements N number of times.
+const int N = 100000;
+const int M = 100000;
+
+template <class ExecSpace>
+struct TestIncrMemorySpace_free {
+  using memory_space = typename ExecSpace::memory_space;
+
+  void test_free() {
+    for (int i = 0; i < N; ++i) {
+      auto *data = static_cast<value_type *>(
+          Kokkos::kokkos_malloc<memory_space>("data", M * sizeof(value_type)));
+
+      ASSERT_NE(data, nullptr);
+
+      Kokkos::kokkos_free<memory_space>(data);
+    }
+  }
+};
+
+TEST(TEST_CATEGORY, IncrTest_03b_memspace_free) {
+  TestIncrMemorySpace_free<TEST_EXECSPACE> test;
+  test.test_free();
+}
+
+}  // namespace Test
diff --git a/kokkos/core/unit_test/incremental/Test04_ParallelFor_RangePolicy.hpp b/kokkos/core/unit_test/incremental/Test04_ParallelFor_RangePolicy.hpp
new file mode 100644
index 000000000..5e50b51dd
--- /dev/null
+++ b/kokkos/core/unit_test/incremental/Test04_ParallelFor_RangePolicy.hpp
@@ -0,0 +1,169 @@
+/*
+//@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
+*/
+
+#include <Kokkos_Core.hpp>
+#include <gtest/gtest.h>
+
+/// @Kokkos_Feature_Level_Required:4
+// parallel-for unit test.
+// In this test, different elements of an array are updated by different
+// threads.
+
+namespace Test {
+
+using value_type       = double;
+int num_elements       = 10;
+const value_type value = 0.5;
+
+struct ParallelForFunctor {
+  value_type *_data;
+
+  ParallelForFunctor(value_type *data) : _data(data) {}
+
+  KOKKOS_INLINE_FUNCTION
+  void operator()(const int i) const { _data[i] = (i + 1) * value; }
+};
+
+template <class ExecSpace>
+struct TestParallel_For {
+  // Memory space type for Device and Host data
+  using d_memspace_type = typename ExecSpace::memory_space;
+  using h_memspace_type = Kokkos::HostSpace;
+
+  value_type *deviceData, *hostData;
+
+  // Check if the array values are updated correctly.
+  void correctness_check(value_type *data) {
+    for (int i = 0; i < num_elements; ++i) {
+      ASSERT_EQ((i + 1) * value, data[i])
+          << "Values in index " << i << " are incorrect";
+    }
+  }
+
+  // Routine to allocate memory in a specific memory space.
+  template <class MemSpace>
+  value_type *allocate_mem(int N) {
+    return (static_cast<value_type *>(
+        Kokkos::kokkos_malloc<MemSpace>("deviceData", N * sizeof(value_type))));
+  }
+
+  // Routine to free the memory from a specific memory space.
+  template <class MemSpace>
+  void free_mem(value_type *data) {
+    Kokkos::kokkos_free<MemSpace>(data);
+  }
+
+  void init() {
+    // Allocate memory on Device space.
+    deviceData = allocate_mem<d_memspace_type>(num_elements);
+    ASSERT_NE(deviceData, nullptr);
+
+    // Allocate memory on Host space.
+    hostData = allocate_mem<h_memspace_type>(num_elements);
+    ASSERT_NE(hostData, nullptr);
+  }
+
+  void check_correctness_and_cleanup() {
+    // Copy the data back to Host memory space
+    Kokkos::Impl::DeepCopy<h_memspace_type, d_memspace_type>(
+        hostData, deviceData, num_elements * sizeof(value_type));
+
+    // Check if all data has been update correctly
+    correctness_check(hostData);
+
+    // free the allocated memory
+    free_mem<d_memspace_type>(deviceData);
+    free_mem<h_memspace_type>(hostData);
+  }
+
+  // A simple parallel for test with functors
+  void simple_test() {
+    // Allocates memory for num_elements number of value_type elements in the
+    // host and device memory spaces.
+    init();
+
+    // parallel-for functor called for num_elements number of iterations.
+    Kokkos::parallel_for("parallel_for", num_elements,
+                         ParallelForFunctor(deviceData));
+
+    Kokkos::fence();
+    // Checks if parallel_for gave the correct results.
+    // Frees the allocated memory in init().
+    check_correctness_and_cleanup();
+  }
+
+  // A parallel_for test with user defined RangePolicy
+  void range_policy() {
+    // Allocates memory for num_elements number of value_type elements in the
+    // host and device memory spaces.
+    init();
+
+    // Creates a range policy that uses dynamic scheduling.
+    typedef Kokkos::RangePolicy<ExecSpace, Kokkos::Schedule<Kokkos::Dynamic> >
+        range_policy_t;
+
+    // parallel-for functor with range-policy from 0 to num_elements iterations.
+    Kokkos::parallel_for("RangePolicy_ParallelFor",
+                         range_policy_t(0, num_elements),
+                         ParallelForFunctor(deviceData));
+
+    // Checks if parallel_for gave the correct results.
+    // Free the allocated memory in init().
+    check_correctness_and_cleanup();
+  }
+};
+
+TEST(TEST_CATEGORY, IncrTest_04_simple_parallelFor) {
+  if (std::is_same<Kokkos::DefaultExecutionSpace, TEST_EXECSPACE>::value) {
+    TestParallel_For<TEST_EXECSPACE> test;
+    test.simple_test();
+  }
+}
+
+TEST(TEST_CATEGORY, IncrTest_04_RangePolicy_parallelFor) {
+  TestParallel_For<TEST_EXECSPACE> test;
+  test.range_policy();
+}
+
+}  // namespace Test
diff --git a/kokkos/core/unit_test/incremental/Test05_ParallelReduce_RangePolicy.hpp b/kokkos/core/unit_test/incremental/Test05_ParallelReduce_RangePolicy.hpp
new file mode 100644
index 000000000..7c147e47c
--- /dev/null
+++ b/kokkos/core/unit_test/incremental/Test05_ParallelReduce_RangePolicy.hpp
@@ -0,0 +1,154 @@
+/*
+//@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
+*/
+
+#include <Kokkos_Core.hpp>
+#include <gtest/gtest.h>
+
+/// @Kokkos_Feature_Level_Required:5
+// Unit test for reduction of native data type.
+// Assigns an index based value to elements of an array.
+// Performs an reduction over the addition operation.
+
+namespace Test {
+
+using value_type       = double;
+const double value     = 0.5;
+const int num_elements = 10;
+
+struct ReduceFunctor {
+  value_type *_data;
+
+  ReduceFunctor(value_type *data) : _data(data) {}
+
+  KOKKOS_INLINE_FUNCTION
+  void operator()(const int i, double &UpdateSum) const {
+    _data[i] = (i + 1) * value;
+    UpdateSum += _data[i];
+  }
+};
+
+template <class ExecSpace>
+struct TestReduction {
+  // Memory space type for Device and Host data
+  using d_memspace_type = typename ExecSpace::memory_space;
+  using h_memspace_type = Kokkos::HostSpace;
+
+  value_type *deviceData, *hostData;
+  value_type sum = 0.0;
+
+  // compare and equal
+  void check_correctness() {
+    int sum_local = 0;
+    for (int i = 0; i < num_elements; ++i) sum_local += (i + 1);
+
+    ASSERT_EQ(sum, sum_local * value)
+        << "The reduced value does not match the expected answer";
+  }
+
+  // Routine to allocate memory in a specific memory space.
+  template <class MemSpace>
+  value_type *allocate_mem(int N) {
+    return (static_cast<value_type *>(
+        Kokkos::kokkos_malloc<MemSpace>("deviceData", N * sizeof(value_type))));
+  }
+
+  // Routine to free the memory from a specific memory space.
+  template <class MemSpace>
+  void free_mem(value_type *data) {
+    Kokkos::kokkos_free<MemSpace>(data);
+  }
+
+  // Free the allocated memory
+  void free_mem() {
+    Kokkos::kokkos_free<d_memspace_type>(deviceData);
+    Kokkos::kokkos_free<h_memspace_type>(hostData);
+  }
+
+  // Allocate Memory for both device and host memory spaces
+  void init() {
+    // Allocate memory on Device space.
+    deviceData = allocate_mem<d_memspace_type>(num_elements);
+    ASSERT_NE(deviceData, nullptr);
+
+    // Allocate memory on Host space.
+    hostData = allocate_mem<h_memspace_type>(num_elements);
+    ASSERT_NE(hostData, nullptr);
+
+    // Initialize the sum value to zero.
+    sum = 0.0;
+  }
+
+  void check_correctness_and_cleanup() {
+    // Check if reduction has produced correct results
+    check_correctness();
+
+    // free the allocated memory
+    free_mem<d_memspace_type>(deviceData);
+    free_mem<h_memspace_type>(hostData);
+  }
+
+  void sum_reduction() {
+    // Allocates memory for num_elements number of value_type elements in the
+    // host and device memory spaces.
+    init();
+
+    // Creates a range policy that uses dynamic schedule.
+    typedef Kokkos::RangePolicy<ExecSpace, Kokkos::Schedule<Kokkos::Dynamic> >
+        range_policy;
+
+    // parallel_reduce call with range policy over num_elements number of
+    // iterations
+    Kokkos::parallel_reduce("Reduction", range_policy(0, num_elements),
+                            ReduceFunctor(deviceData), sum);
+
+    check_correctness_and_cleanup();
+  }
+};
+
+TEST(TEST_CATEGORY, IncrTest_05_reduction) {
+  TestReduction<TEST_EXECSPACE> test;
+  test.sum_reduction();
+}
+
+}  // namespace Test
diff --git a/kokkos/core/unit_test/incremental/Test06_ParallelFor_MDRangePolicy.hpp b/kokkos/core/unit_test/incremental/Test06_ParallelFor_MDRangePolicy.hpp
new file mode 100644
index 000000000..d9e5a37b5
--- /dev/null
+++ b/kokkos/core/unit_test/incremental/Test06_ParallelFor_MDRangePolicy.hpp
@@ -0,0 +1,263 @@
+/*
+//@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
+*/
+
+#include <Kokkos_Core.hpp>
+#include <gtest/gtest.h>
+
+/// @Kokkos_Feature_Level_Required:6
+// Unit Test for MDRangePolicy without Views uptil 4 ranks.
+// For each of the MDRangePolicy test from 2-to-4 ranks, we create an equivalent
+// dimensional array implemented in 1D. In each of these arrays we update the
+// elements as a product of iterator indexes and a constant. At the end, we
+// check for correctness.
+
+namespace Test04 {
+
+using value_type       = double;
+const int N            = 10;
+const int M            = 10;
+const value_type delta = 0.5;
+
+struct MDFunctor {
+  value_type *_data;
+
+  MDFunctor(value_type *data) : _data(data) {}
+
+  // 2D
+  KOKKOS_INLINE_FUNCTION
+  void operator()(const int i, const int j) const {
+    _data[i * M + j] = i * j * delta;
+  }
+
+  // 3D
+  KOKKOS_INLINE_FUNCTION
+  void operator()(const int i, const int j, const int k) const {
+    _data[i * M * N + j * M + k] = i * j * k * delta;
+  }
+
+  // 4D
+  KOKKOS_INLINE_FUNCTION
+  void operator()(const int i, const int j, const int k, const int l) const {
+    _data[i * M * N * M + j * M * N + k * M + l] = i * j * k * l * delta;
+  }
+};
+
+template <class ExecSpace>
+struct TestMDRangePolicy {
+  // Memory space type for Device and Host data
+  using d_memspace_type = typename ExecSpace::memory_space;
+  using h_memspace_type = Kokkos::HostSpace;
+
+  // Index Type for the iterator
+  using int_index = Kokkos::IndexType<int>;
+
+  // An MDRangePolicy for 2 nested loops
+  using MDPolicyType_2D = typename Kokkos::Experimental::MDRangePolicy<
+      ExecSpace, Kokkos::Experimental::Rank<2>, int_index>;
+
+  // An MDRangePolicy for 3 nested loops
+  using MDPolicyType_3D = typename Kokkos::Experimental::MDRangePolicy<
+      ExecSpace, Kokkos::Experimental::Rank<3>, int_index>;
+
+  // An MDRangePolicy for 4 nested loops
+  using MDPolicyType_4D = typename Kokkos::Experimental::MDRangePolicy<
+      ExecSpace, Kokkos::Experimental::Rank<4>, int_index>;
+
+  // Device and Host Data structure pointer
+  value_type *deviceData, *hostData;
+
+  // Routine to allocate memory in a specific memory space.
+  template <class MemSpace>
+  value_type *allocate_mem(int N_) {
+    return (static_cast<value_type *>(
+        Kokkos::kokkos_malloc<MemSpace>("Data", N_ * sizeof(value_type))));
+  }
+
+  // Routine to free the memory from a specific memory space.
+  template <class MemSpace>
+  void free_mem(value_type *data) {
+    Kokkos::kokkos_free<MemSpace>(data);
+  }
+
+  // compare and equal
+  void compare_equal_2D() {
+    for (int i = 0; i < N; ++i)
+      for (int j = 0; j < M; ++j) ASSERT_EQ(hostData[i * M + j], i * j * delta);
+  }
+
+  // compare and equal
+  void compare_equal_3D() {
+    for (int i = 0; i < N; ++i)
+      for (int j = 0; j < M; ++j)
+        for (int k = 0; k < N; ++k)
+          ASSERT_EQ(hostData[i * M * N + j * M + k], i * j * k * delta);
+  }
+
+  // compare and equal
+  void compare_equal_4D() {
+    for (int i = 0; i < N; ++i)
+      for (int j = 0; j < M; ++j)
+        for (int k = 0; k < N; ++k)
+          for (int l = 0; l < M; ++l)
+            ASSERT_EQ(hostData[i * M * N * M + j * M * N + k * M + l],
+                      i * j * k * l * delta);
+  }
+
+  // A 2-D MDRangePolicy
+  void mdRange2D() {
+    MDPolicyType_2D mdPolicy_2D({0, 0}, {N, M});
+
+    // Total number of elements
+    int num_elements = N * M;
+
+    // Allocate Memory for both device and host memory spaces
+    // Data[M*N]
+    deviceData = allocate_mem<d_memspace_type>(num_elements);
+    ASSERT_NE(deviceData, nullptr);
+
+    hostData = allocate_mem<h_memspace_type>(num_elements);
+    ASSERT_NE(hostData, nullptr);
+
+    // parallel_for call
+    MDFunctor Functor_2D(deviceData);
+    Kokkos::parallel_for("MDRange2D", mdPolicy_2D, Functor_2D);
+
+    // Copy the data back to Host memory space
+    Kokkos::Impl::DeepCopy<h_memspace_type, d_memspace_type>(
+        hostData, deviceData, num_elements * sizeof(value_type));
+
+    // Check if all data has been update correctly
+    compare_equal_2D();
+
+    // free the allocated memory
+    free_mem<d_memspace_type>(deviceData);
+    free_mem<h_memspace_type>(hostData);
+  }
+
+  // A 3-D MDRangePolicy
+  void mdRange3D() {
+    MDPolicyType_3D mdPolicy_3D({0, 0, 0}, {N, M, N});
+
+    // Total number of elements
+    int num_elements = N * M * N;
+
+    // Allocate Memory for both device and host memory spaces
+    // Data[M*N*N]
+    deviceData = allocate_mem<d_memspace_type>(num_elements);
+    ASSERT_NE(deviceData, nullptr);
+
+    hostData = allocate_mem<h_memspace_type>(num_elements);
+    ASSERT_NE(hostData, nullptr);
+
+    // parallel_for call
+    MDFunctor Functor_3D(deviceData);
+    Kokkos::parallel_for("MDRange3D", mdPolicy_3D, Functor_3D);
+
+    // Copy the data back to Host memory space
+    Kokkos::Impl::DeepCopy<h_memspace_type, d_memspace_type>(
+        hostData, deviceData, num_elements * sizeof(value_type));
+
+    // Check if all data has been update correctly
+    compare_equal_3D();
+
+    // free the allocated memory
+    free_mem<d_memspace_type>(deviceData);
+    free_mem<h_memspace_type>(hostData);
+  }
+
+  // A 4-D MDRangePolicy
+  void mdRange4D() {
+    MDPolicyType_4D mdPolicy_4D({0, 0, 0, 0}, {N, M, N, M});
+
+    // Total number of elements
+    int num_elements = N * M * N * M;
+
+    // Allocate Memory for both device and host memory spaces
+    // Data[M*N*N*M]
+    deviceData = allocate_mem<d_memspace_type>(num_elements);
+    ASSERT_NE(deviceData, nullptr);
+
+    hostData = allocate_mem<h_memspace_type>(num_elements);
+    ASSERT_NE(hostData, nullptr);
+
+    // parallel_for call
+    MDFunctor Functor_4D(deviceData);
+    Kokkos::parallel_for("MDRange4D", mdPolicy_4D, Functor_4D);
+
+    // Copy the data back to Host memory space
+    Kokkos::Impl::DeepCopy<h_memspace_type, d_memspace_type>(
+        hostData, deviceData, num_elements * sizeof(value_type));
+
+    // Check if all data has been update correctly
+    compare_equal_4D();
+
+    // free the allocated memory
+    free_mem<d_memspace_type>(deviceData);
+    free_mem<h_memspace_type>(hostData);
+  }
+};
+
+}  // namespace Test04
+
+namespace Test {
+
+// 2D MDRangePolicy
+TEST(TEST_CATEGORY, IncrTest_06_mdrange2D) {
+  Test04::TestMDRangePolicy<TEST_EXECSPACE> test;
+  test.mdRange2D();
+}
+
+// 3D MDRangePolicy
+TEST(TEST_CATEGORY, IncrTest_06_mdrange3D) {
+  Test04::TestMDRangePolicy<TEST_EXECSPACE> test;
+  test.mdRange3D();
+}
+
+// 4D MDRangePolicy
+TEST(TEST_CATEGORY, IncrTest_06_mdrange4D) {
+  Test04::TestMDRangePolicy<TEST_EXECSPACE> test;
+  test.mdRange4D();
+}
+
+}  // namespace Test
diff --git a/kokkos/core/unit_test/incremental/Test08_deep_copy.hpp b/kokkos/core/unit_test/incremental/Test08_deep_copy.hpp
new file mode 100644
index 000000000..5166f5a9f
--- /dev/null
+++ b/kokkos/core/unit_test/incremental/Test08_deep_copy.hpp
@@ -0,0 +1,207 @@
+/*
+//@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
+*/
+
+#include <Kokkos_Core.hpp>
+#include <gtest/gtest.h>
+
+/// @Kokkos_Feature_Level_Required:8
+// Unit Test for MDRangePolicy without Views uptil 4 ranks.
+// For each of the MDRangePolicy test from 2-to-4 ranks, we create an equivalent
+// dimensional view. In each of these views we update the
+// elements as a product of iterator indexes and a constant inside a
+// parallel_for lambda. At the end, we check for correctness.
+
+namespace Test05 {
+
+using value_type = double;
+const int N      = 10;
+const int M      = 10;
+
+template <class ExecSpace>
+struct TestMDRangePolicy {
+  // 2D View
+  using View_2D      = typename Kokkos::View<value_type **, ExecSpace>;
+  using Host_View_2D = typename View_2D::HostMirror;
+  Host_View_2D hostDataView_2D;
+
+  // 3D View
+  using View_3D      = typename Kokkos::View<value_type ***, ExecSpace>;
+  using Host_View_3D = typename View_3D::HostMirror;
+  Host_View_3D hostDataView_3D;
+
+  // 4D View
+  using View_4D      = typename Kokkos::View<value_type ****, ExecSpace>;
+  using Host_View_4D = typename View_4D::HostMirror;
+  Host_View_4D hostDataView_4D;
+
+  // Memory space type for Device and Host data
+  using d_memspace_type = typename ExecSpace::memory_space;
+  using h_memspace_type = Kokkos::HostSpace;
+
+  // Index Type for the iterator
+  using int_index = Kokkos::IndexType<int>;
+
+  // An MDRangePolicy for 2 nested loops
+  using MDPolicyType_2D = typename Kokkos::Experimental::MDRangePolicy<
+      ExecSpace, Kokkos::Experimental::Rank<2>, int_index>;
+
+  // An MDRangePolicy for 3 nested loops
+  using MDPolicyType_3D = typename Kokkos::Experimental::MDRangePolicy<
+      ExecSpace, Kokkos::Experimental::Rank<3>, int_index>;
+
+  // An MDRangePolicy for 4 nested loops
+  using MDPolicyType_4D = typename Kokkos::Experimental::MDRangePolicy<
+      ExecSpace, Kokkos::Experimental::Rank<4>, int_index>;
+
+  // compare and equal
+  void compare_equal_2D() {
+    for (int i = 0; i < N; ++i)
+      for (int j = 0; j < M; ++j) ASSERT_EQ(hostDataView_2D(i, j), i * M + j);
+  }
+
+  // compare and equal
+  void compare_equal_3D() {
+    for (int i = 0; i < N; ++i)
+      for (int j = 0; j < M; ++j)
+        for (int k = 0; k < N; ++k)
+          ASSERT_EQ(hostDataView_3D(i, j, k), i * M * N + j * N + k);
+  }
+
+  // compare and equal
+  void compare_equal_4D() {
+    for (int i = 0; i < N; ++i)
+      for (int j = 0; j < M; ++j)
+        for (int k = 0; k < N; ++k)
+          for (int l = 0; l < M; ++l)
+            ASSERT_EQ(hostDataView_4D(i, j, k, l),
+                      i * M * N * M + j * N * M + k * M + l);
+  }
+
+  // A 2-D MDRangePolicy
+  void mdRange2D() {
+    View_2D deviceDataView_2D("deviceData_2D", N, M);
+    hostDataView_2D = create_mirror_view(deviceDataView_2D);
+
+    MDPolicyType_2D mdPolicy_2D({0, 0}, {N, M});
+
+    Kokkos::parallel_for(
+        mdPolicy_2D, KOKKOS_LAMBDA(const int i, const int j) {
+          deviceDataView_2D(i, j) = i * M + j;
+        });
+
+    // Copy data back to host view.
+    Kokkos::deep_copy(hostDataView_2D, deviceDataView_2D);
+
+    // Check if all data has been update correctly
+    compare_equal_2D();
+  }
+
+  // A 3-D MDRangePolicy
+  void mdRange3D() {
+    View_3D deviceDataView_3D("deviceData_3D", N, M, N);
+    hostDataView_3D = create_mirror_view(deviceDataView_3D);
+
+    MDPolicyType_3D mdPolicy_3D({0, 0, 0}, {N, M, N});
+
+    Kokkos::parallel_for(
+        mdPolicy_3D, KOKKOS_LAMBDA(const int i, const int j, const int k) {
+          deviceDataView_3D(i, j, k) = i * M * N + j * N + k;
+        });
+
+    // Copy data back to host view.
+    Kokkos::deep_copy(hostDataView_3D, deviceDataView_3D);
+
+    // Check if all data has been update correctly
+    compare_equal_3D();
+  }
+
+  // A 4-D MDRangePolicy
+  void mdRange4D() {
+    View_4D deviceDataView_4D("deviceData_4D", N, M, N, M);
+    hostDataView_4D = create_mirror_view(deviceDataView_4D);
+
+    MDPolicyType_4D mdPolicy_4D({0, 0, 0, 0}, {N, M, N, M});
+
+    Kokkos::parallel_for(
+        mdPolicy_4D,
+        KOKKOS_LAMBDA(const int i, const int j, const int k, const int l) {
+          deviceDataView_4D(i, j, k, l) = i * M * N * M + j * N * M + k * M + l;
+        });
+
+    Kokkos::deep_copy(hostDataView_4D, deviceDataView_4D);
+
+    // Check if all data has been update correctly
+    compare_equal_4D();
+  }
+};
+
+}  // namespace Test05
+
+namespace Test {
+
+// 2D MDRangePolicy
+TEST(TEST_CATEGORY, IncrTest_08_deep_copy_2D) {
+  {
+    Test05::TestMDRangePolicy<TEST_EXECSPACE> test;
+    test.mdRange2D();
+  }
+}
+
+// 3D MDRangePolicy
+TEST(TEST_CATEGORY, IncrTest_08_deep_copy_3D) {
+  {
+    Test05::TestMDRangePolicy<TEST_EXECSPACE> test;
+    test.mdRange3D();
+  }
+}
+
+// 4D MDRangePolicy
+TEST(TEST_CATEGORY, IncrTest_08_deep_copy_4D) {
+  {
+    Test05::TestMDRangePolicy<TEST_EXECSPACE> test;
+    test.mdRange4D();
+  }
+}
+
+}  // namespace Test
diff --git a/kokkos/core/unit_test/incremental/Test10_HierarchicalBasics.hpp b/kokkos/core/unit_test/incremental/Test10_HierarchicalBasics.hpp
new file mode 100644
index 000000000..a5e478c30
--- /dev/null
+++ b/kokkos/core/unit_test/incremental/Test10_HierarchicalBasics.hpp
@@ -0,0 +1,101 @@
+/*
+//@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
+*/
+
+// @Kokkos_Feature_Level_Required:10
+// Unit test for hierarchical parallelism
+// Create concurrent work hierarchically and verify if
+// contributions of paticipating processing units corresponds to expected value
+
+#include <gtest/gtest.h>
+#include <Kokkos_Core.hpp>
+
+namespace Test {
+
+template <class ExecSpace>
+struct HierarchicalBasics {
+  using policy_t = Kokkos::TeamPolicy<ExecSpace>;
+  using team_t   = typename policy_t::member_type;
+
+  void run(const int nP, int nT) {
+    if (nT > ExecSpace::concurrency()) nT = ExecSpace::concurrency();
+
+    policy_t pol(nP, nT);
+
+    ASSERT_EQ(pol.league_size(), nP);
+    ASSERT_LE(pol.team_size(), nT);
+    nT = pol.team_size();
+
+    Kokkos::View<int **, ExecSpace> v("Array_A", nP, nT);
+    Kokkos::parallel_for(
+        "Teams", pol, KOKKOS_LAMBDA(const team_t &team) {
+          const int tR = team.team_rank();
+          const int tS = team.team_size();
+          const int lR = team.league_rank();
+          const int lS = team.league_size();
+          if (lR < lS) {
+            v(lR, tR) = lR * tS + tR;
+          } else {
+            v(lR, tR) = 100000;
+          }
+        });
+    Kokkos::fence();
+    auto h_v = Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace(), v);
+
+    size_t check = 0;
+    size_t ref   = nP * nT;
+    for (int i = 0; i < nP; ++i)
+      for (int j = 0; j < nT; ++j) check += h_v(i, j);
+
+    ASSERT_EQ(check, ref * (ref - 1) / 2);
+  }
+};
+
+TEST(TEST_CATEGORY, IncrTest_10_Hierarchical_Basics) {
+  HierarchicalBasics<TEST_EXECSPACE> test;
+  test.run(1, 4);
+  test.run(8, 16);
+  test.run(11, 13);
+}
+
+}  // namespace Test
diff --git a/kokkos/core/unit_test/incremental/Test11a_ParallelFor_TeamThreadRange.hpp b/kokkos/core/unit_test/incremental/Test11a_ParallelFor_TeamThreadRange.hpp
new file mode 100644
index 000000000..e36b8f9d3
--- /dev/null
+++ b/kokkos/core/unit_test/incremental/Test11a_ParallelFor_TeamThreadRange.hpp
@@ -0,0 +1,99 @@
+/*
+//@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
+*/
+
+// @Kokkos_Feature_Level_Required:11
+// Unit test for hierarchical parallelism
+// Create concurrent work hierarchically and verify if
+// contributions of paticipating processing units corresponds to expected value
+
+#include <gtest/gtest.h>
+#include <Kokkos_Core.hpp>
+
+namespace Test {
+
+template <class ExecSpace>
+struct Hierarchical_ForLoop_A {
+  void run(const int pN, const int sX, const int sY) {
+    typedef Kokkos::TeamPolicy<ExecSpace> team_policy;
+    typedef typename Kokkos::TeamPolicy<ExecSpace>::member_type member_type;
+
+    typedef Kokkos::View<int **, ExecSpace> viewDataType;
+    viewDataType v("Matrix", sX, sY);
+
+    Kokkos::parallel_for(
+        "Team", team_policy(pN, Kokkos::AUTO),
+        KOKKOS_LAMBDA(const member_type &team) {
+          const int n  = team.league_rank();
+          const int ls = team.league_size();
+
+          const int startDim1 = n * (int)(sX / ls);
+          const int modDim1   = n == ls - 1 ? sX % ls : 0;
+
+          Kokkos::parallel_for(
+              Kokkos::TeamThreadRange(team, v.extent(1)), [&](const int m) {
+                for (int i = startDim1;
+                     i < (startDim1 + (int)(sX / ls) + modDim1); ++i)
+                  v(i, m) = i * v.extent(1) + m;
+              });
+        });
+
+    Kokkos::fence();
+    auto v_H = Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace(), v);
+
+    int check   = 0;
+    const int s = sY * sX;
+    for (int i = 0; i < sX; ++i)
+      for (int j = 0; j < sY; ++j) check += v_H(i, j);
+    ASSERT_EQ(check, s * (s - 1) / 2);
+  }
+};
+
+TEST(TEST_CATEGORY, IncrTest_11a_Hierarchical_ForLoop) {
+  Hierarchical_ForLoop_A<TEST_EXECSPACE> test;
+  test.run(4, 5, 200);
+  test.run(4, 7, 19);
+  test.run(14, 277, 321);
+}
+
+}  // namespace Test
diff --git a/kokkos/core/unit_test/incremental/Test11b_ParallelFor_TeamVectorRange.hpp b/kokkos/core/unit_test/incremental/Test11b_ParallelFor_TeamVectorRange.hpp
new file mode 100644
index 000000000..7e4bb2aa3
--- /dev/null
+++ b/kokkos/core/unit_test/incremental/Test11b_ParallelFor_TeamVectorRange.hpp
@@ -0,0 +1,99 @@
+/*
+//@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
+*/
+
+// @Kokkos_Feature_Level_Required:11
+// Unit test for hierarchical parallelism
+// Create concurrent work hierarchically and verify if
+// contributions of paticipating processing units corresponds to expected value
+
+#include <gtest/gtest.h>
+#include <Kokkos_Core.hpp>
+
+namespace Test {
+
+template <class ExecSpace>
+struct Hierarchical_ForLoop_B {
+  void run(const int pN, const int sX, const int sY) {
+    typedef Kokkos::TeamPolicy<ExecSpace> team_policy;
+    typedef typename Kokkos::TeamPolicy<ExecSpace>::member_type member_type;
+
+    typedef Kokkos::View<int **, ExecSpace> viewDataType;
+    viewDataType v("Matrix", sX, sY);
+
+    Kokkos::parallel_for(
+        "Team", team_policy(pN, Kokkos::AUTO),
+        KOKKOS_LAMBDA(const member_type &team) {
+          const int n  = team.league_rank();
+          const int ls = team.league_size();
+
+          const int startDim1 = n * (int)(sX / ls);
+          const int modDim1   = n == ls - 1 ? sX % ls : 0;
+
+          Kokkos::parallel_for(
+              Kokkos::TeamVectorRange(team, v.extent(1)), [&](const int m) {
+                for (int i = startDim1;
+                     i < (startDim1 + (int)(sX / ls) + modDim1); ++i)
+                  v(i, m) = i * v.extent(1) + m;
+              });
+        });
+
+    Kokkos::fence();
+    auto v_H = Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace(), v);
+
+    int check   = 0;
+    const int s = sY * sX;
+    for (int i = 0; i < sX; ++i)
+      for (int j = 0; j < sY; ++j) check += v_H(i, j);
+    ASSERT_EQ(check, s * (s - 1) / 2);
+  }
+};
+
+TEST(TEST_CATEGORY, IncrTest_11b_Hierarchical_ForLoop) {
+  Hierarchical_ForLoop_B<TEST_EXECSPACE> test;
+  test.run(1, 6, 400);
+  test.run(6, 7, 19);
+  test.run(12, 277, 321);
+}
+
+}  // namespace Test
diff --git a/kokkos/core/unit_test/incremental/Test11c_ParallelFor_ThreadVectorRange.hpp b/kokkos/core/unit_test/incremental/Test11c_ParallelFor_ThreadVectorRange.hpp
new file mode 100644
index 000000000..c6998a578
--- /dev/null
+++ b/kokkos/core/unit_test/incremental/Test11c_ParallelFor_ThreadVectorRange.hpp
@@ -0,0 +1,105 @@
+/*
+//@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
+*/
+
+// @Kokkos_Feature_Level_Required:11
+// Unit test for hierarchical parallelism
+// Create concurrent work hierarchically and verify if
+// contributions of paticipating processing units corresponds to expected value
+
+#include <gtest/gtest.h>
+#include <Kokkos_Core.hpp>
+
+namespace Test {
+
+template <class ExecSpace>
+struct Hierarchical_ForLoop_C {
+  void run(const int pN, const int sX, const int sY, const int sZ) {
+    typedef Kokkos::TeamPolicy<ExecSpace> team_policy;
+    typedef typename Kokkos::TeamPolicy<ExecSpace>::member_type member_type;
+
+    typedef Kokkos::View<size_t ***, ExecSpace> viewDataType;
+    viewDataType v("Matrix", sX, sY, sZ);
+
+    Kokkos::parallel_for(
+        "Team", team_policy(pN, Kokkos::AUTO),
+        KOKKOS_LAMBDA(const member_type &team) {
+          int n  = team.league_rank();
+          int ls = team.league_size();
+
+          int startDim1 = n * (int)(sX / ls);
+          int modDim1   = n == ls - 1 ? sX % ls : 0;
+
+          Kokkos::parallel_for(
+              Kokkos::TeamThreadRange(team, v.extent(1)), [&](const int m) {
+                Kokkos::parallel_for(
+                    Kokkos::ThreadVectorRange(team, v.extent(2)),
+                    [&](const int k) {
+                      for (int i = startDim1;
+                           i < (startDim1 + (int)(sX / ls) + modDim1); ++i)
+                        v(i, m, k) =
+                            i * v.extent(1) * v.extent(2) + m * v.extent(2) + k;
+                    });
+              });
+        });
+
+    Kokkos::fence();
+    auto v_H = Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace(), v);
+
+    size_t check   = 0;
+    const size_t s = sX * sY * sZ;
+    for (int i = 0; i < sX; ++i)
+      for (int j = 0; j < sY; ++j)
+        for (int k = 0; k < sZ; ++k) check += v_H(i, j, k);
+    ASSERT_EQ(check, s * (s - 1) / 2);
+  }
+};
+
+TEST(TEST_CATEGORY, IncrTest_11c_Hierarchical_ForLoop) {
+  Hierarchical_ForLoop_C<TEST_EXECSPACE> test;
+  test.run(4, 16, 16, 16);
+  test.run(8, 12, 333, 16);
+  test.run(12, 277, 321, 345);
+}
+
+}  // namespace Test
diff --git a/kokkos/core/unit_test/incremental/Test12a_ThreadScratch.hpp b/kokkos/core/unit_test/incremental/Test12a_ThreadScratch.hpp
new file mode 100644
index 000000000..8eb1c243c
--- /dev/null
+++ b/kokkos/core/unit_test/incremental/Test12a_ThreadScratch.hpp
@@ -0,0 +1,125 @@
+/*
+//@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
+*/
+
+// @Kokkos_Feature_Level_Required:12
+// Unit test for hierarchical parallelism
+// Create concurrent work hierarchically and verify if
+// contributions of paticipating processing units corresponds to expected value
+// Use a scratch pad memory for each team
+#include <gtest/gtest.h>
+#include <Kokkos_Core.hpp>
+
+namespace Test {
+
+template <class ExecSpace>
+struct ThreadScratch {
+  using policy_t = Kokkos::TeamPolicy<ExecSpace>;
+  using team_t   = typename Kokkos::TeamPolicy<ExecSpace>::member_type;
+  using data_t   = Kokkos::View<size_t **, ExecSpace>;
+
+  using scratch_t = Kokkos::View<size_t *, ExecSpace,
+                                 Kokkos::MemoryTraits<Kokkos::Unmanaged> >;
+
+  int sX, sY;
+  data_t v;
+  KOKKOS_FUNCTION
+  void operator()(const team_t &team) const {
+    // Allocate and use scratch pad memory
+    scratch_t v_S(team.thread_scratch(1), sY);
+    int n = team.league_rank();
+
+    for (int i = 0; i < sY; ++i) v_S(i) = 0;
+
+    Kokkos::parallel_for(Kokkos::TeamThreadRange(team, sX), [&](const int m) {
+      Kokkos::parallel_for(
+          Kokkos::ThreadVectorRange(team, sY),
+          [&](const int k) { v_S(k) += sX * sY * n + sY * m + k; });
+    });
+
+    team.team_barrier();
+
+    for (int i = 0; i < sY; ++i) {
+      v(n, team.team_rank()) += v_S(i);
+    }
+  }
+
+  void run(const int pN, const int sX_, const int sY_) {
+    sX = sX_;
+    sY = sY_;
+
+    int scratchSize = scratch_t::shmem_size(sY);
+    // So this works with deprecated code enabled:
+    policy_t policy = policy_t(pN, Kokkos::AUTO)
+                          .set_scratch_size(1, Kokkos::PerThread(scratchSize));
+
+    int max_team_size = policy.team_size_max(*this, Kokkos::ParallelForTag());
+    v                 = data_t("Matrix", pN, max_team_size);
+
+    Kokkos::parallel_for(
+        "Test12a_ThreadScratch",
+        policy_t(pN, max_team_size)
+            .set_scratch_size(1, Kokkos::PerThread(scratchSize)),
+        *this);
+
+    Kokkos::fence();
+    auto v_H = Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace(), v);
+
+    size_t check   = 0;
+    const size_t s = pN * sX * sY;
+    for (int n = 0; n < pN; ++n)
+      for (int m = 0; m < max_team_size; ++m) {
+        check += v_H(n, m);
+      }
+    ASSERT_EQ(s * (s - 1) / 2, check);
+  }
+};
+
+TEST(TEST_CATEGORY, IncrTest_12a_ThreadScratch) {
+  ThreadScratch<TEST_EXECSPACE> test;
+  test.run(1, 55, 9);
+  test.run(2, 4, 22);
+  test.run(14, 277, 321);
+}
+
+}  // namespace Test
diff --git a/kokkos/core/unit_test/incremental/Test12b_TeamScratch.hpp b/kokkos/core/unit_test/incremental/Test12b_TeamScratch.hpp
new file mode 100644
index 000000000..169491af3
--- /dev/null
+++ b/kokkos/core/unit_test/incremental/Test12b_TeamScratch.hpp
@@ -0,0 +1,113 @@
+/*
+//@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
+*/
+
+// @Kokkos_Feature_Level_Required:12
+// Unit test for hierarchical parallelism
+// Create concurrent work hierarchically and verify if
+// contributions of paticipating processing units corresponds to expected value
+// Use a scratch pad memory for each team
+#include <gtest/gtest.h>
+#include <Kokkos_Core.hpp>
+
+namespace Test {
+
+template <class ExecSpace>
+struct TeamScratch {
+  void run(const int pN, const int sX, const int sY) {
+    using policy_t = Kokkos::TeamPolicy<ExecSpace>;
+    using team_t   = typename Kokkos::TeamPolicy<ExecSpace>::member_type;
+    using data_t   = Kokkos::View<size_t **, ExecSpace>;
+    data_t v("Matrix", pN, sX);
+
+    using scratch_t = Kokkos::View<size_t **, ExecSpace,
+                                   Kokkos::MemoryTraits<Kokkos::Unmanaged> >;
+    int scratchSize = scratch_t::shmem_size(sX, sY);
+
+    Kokkos::parallel_for(
+        "Team",
+        policy_t(pN, Kokkos::AUTO)
+            .set_scratch_size(1, Kokkos::PerTeam(scratchSize)),
+        KOKKOS_LAMBDA(const team_t &team) {
+          // Allocate and use scratch pad memory
+          scratch_t v_S(team.team_scratch(1), sX, sY);
+          int n = team.league_rank();
+
+          Kokkos::parallel_for(
+              Kokkos::TeamThreadRange(team, sX), [&](const int m) {
+                Kokkos::parallel_for(
+                    Kokkos::ThreadVectorRange(team, sY), [&](const int k) {
+                      v_S(m, k) = v_S.extent(0) * v_S.extent(1) * n +
+                                  v_S.extent(1) * m + k;
+                    });
+              });
+
+          team.team_barrier();
+
+          // Sum up contributions and reduce by one dimension
+          Kokkos::parallel_for(Kokkos::TeamThreadRange(team, sX),
+                               [&](const int m) {
+                                 for (int i = 0; i < sY; ++i)
+                                   v(n, m) += v_S(m, i);
+                               });
+        });
+
+    Kokkos::fence();
+    auto v_H = Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace(), v);
+
+    size_t check   = 0;
+    const size_t s = pN * sX * sY;
+    for (int n = 0; n < pN; ++n)
+      for (int m = 0; m < sX; ++m) check += v_H(n, m);
+    ASSERT_EQ(check, s * (s - 1) / 2);
+  }
+};
+
+TEST(TEST_CATEGORY, IncrTest_12b_TeamScratch) {
+  TeamScratch<TEST_EXECSPACE> test;
+  test.run(1, 4, 4);
+  test.run(4, 7, 10);
+  test.run(14, 277, 321);
+}
+
+}  // namespace Test
diff --git a/kokkos/core/unit_test/incremental/Test13a_ParallelRed_TeamThreadRange.hpp b/kokkos/core/unit_test/incremental/Test13a_ParallelRed_TeamThreadRange.hpp
new file mode 100644
index 000000000..b5467da92
--- /dev/null
+++ b/kokkos/core/unit_test/incremental/Test13a_ParallelRed_TeamThreadRange.hpp
@@ -0,0 +1,105 @@
+/*
+//@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
+*/
+
+// @Kokkos_Feature_Level_Required:13
+// Unit test for hierarchical parallelism
+// Create concurrent work hierarchically and verify if
+// sum of created processing units corresponds to expected value
+
+#include <gtest/gtest.h>
+#include <Kokkos_Core.hpp>
+
+// Degrees of concurrency per nesting level
+
+using SCALAR_TYPE = int;
+
+namespace Test {
+
+template <class ExecSpace>
+struct Hierarchical_Red_A {
+  void run(const int pN, const int sX) {
+    typedef Kokkos::TeamPolicy<ExecSpace> team_policy;
+    typedef typename Kokkos::TeamPolicy<ExecSpace>::member_type member_type;
+
+    typedef Kokkos::View<SCALAR_TYPE *, ExecSpace> viewDataType;
+    viewDataType v("Vector", pN);
+
+    Kokkos::parallel_for(
+        "Team", team_policy(pN, Kokkos::AUTO),
+        KOKKOS_LAMBDA(const member_type &team) {
+          const int n     = team.league_rank();
+          SCALAR_TYPE out = 0;
+
+          Kokkos::parallel_reduce(
+              Kokkos::TeamThreadRange(team, sX),
+              [=](const int i, SCALAR_TYPE &tmp) {
+                tmp += n * v.extent(0) + i;
+              },
+              out);
+
+          Kokkos::single(Kokkos::PerTeam(team), [&]() { v(n) += out; });
+        });
+
+    Kokkos::fence();
+    auto v_H = Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace(), v);
+
+    SCALAR_TYPE check = 0;
+    SCALAR_TYPE ref   = 0;
+    for (int i = 0; i < pN; ++i) {
+      check += v_H(i);
+      ref +=
+          (sX + i * pN) * (sX + i * pN - 1) / 2 - ((i * pN) * (i * pN - 1) / 2);
+    }
+    ASSERT_EQ(check, ref);
+  }
+};
+
+TEST(TEST_CATEGORY, IncrTest_13a_Hierarchical_Red) {
+  Hierarchical_Red_A<TEST_EXECSPACE> test;
+  test.run(4, 16);
+  test.run(2, 39);
+  test.run(39, 3);
+}
+
+}  // namespace Test
diff --git a/kokkos/core/unit_test/qthreads/TestQthreads.hpp b/kokkos/core/unit_test/incremental/Test13b_ParallelRed_TeamVectorRange.hpp
similarity index 54%
rename from kokkos/core/unit_test/qthreads/TestQthreads.hpp
rename to kokkos/core/unit_test/incremental/Test13b_ParallelRed_TeamVectorRange.hpp
index ae5febb36..ada295591 100644
--- a/kokkos/core/unit_test/qthreads/TestQthreads.hpp
+++ b/kokkos/core/unit_test/incremental/Test13b_ParallelRed_TeamVectorRange.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -42,68 +42,61 @@
 //@HEADER
 */
 
-#ifndef KOKKOS_TEST_QTHREADS_HPP
-#define KOKKOS_TEST_QTHREADS_HPP
+// @Kokkos_Feature_Level_Required:13
+// Unit test for hierarchical parallelism
+// Create concurrent work hierarchically and verify if
+// sum of created processing units corresponds to expected value
 
 #include <gtest/gtest.h>
+#include <Kokkos_Core.hpp>
 
-#include <Kokkos_Macros.hpp>
+using SCALAR_TYPE = int;
 
-#ifdef KOKKOS_LAMBDA
-#undef KOKKOS_LAMBDA
-#endif
-#define KOKKOS_LAMBDA [=]
+namespace Test {
 
-#include <Kokkos_Core.hpp>
+template <class ExecSpace>
+struct Hierarchical_Red_B {
+  void run(const int pN, const int sX) {
+    typedef Kokkos::TeamPolicy<ExecSpace> team_policy;
+    typedef typename Kokkos::TeamPolicy<ExecSpace>::member_type member_type;
 
-#include <TestTile.hpp>
-#include <TestSharedAlloc.hpp>
-#include <TestViewMapping.hpp>
-#include <TestViewAPI.hpp>
-#include <TestViewOfClass.hpp>
-#include <TestViewSubview.hpp>
-#include <TestAtomic.hpp>
-#include <TestAtomicOperations.hpp>
-#include <TestAtomicViews.hpp>
-#include <TestRange.hpp>
-#include <TestTeam.hpp>
-#include <TestReduce.hpp>
-#include <TestScan.hpp>
-#include <TestAggregate.hpp>
-#include <TestCompilerMacros.hpp>
-#include <TestTaskScheduler.hpp>
-#include <TestMemoryPool.hpp>
-#include <TestCXX11.hpp>
-#include <TestCXX11Deduction.hpp>
-#include <TestTeamVector.hpp>
-#include <TestTemplateMetaFunctions.hpp>
-#include <TestPolicyConstruction.hpp>
-#include <TestMDRange.hpp>
+    typedef Kokkos::View<SCALAR_TYPE *, ExecSpace> viewDataType;
+    viewDataType v("Vector", pN);
 
-namespace Test {
+    Kokkos::parallel_for(
+        "Team", team_policy(pN, Kokkos::AUTO),
+        KOKKOS_LAMBDA(const member_type &team) {
+          const int n     = team.league_rank();
+          SCALAR_TYPE out = 0;
 
-class qthreads : public ::testing::Test {
- protected:
-  static void SetUpTestCase() {
-    const unsigned numa_count = Kokkos::hwloc::get_available_numa_count();
-    const unsigned cores_per_numa =
-        Kokkos::hwloc::get_available_cores_per_numa();
-    const unsigned threads_per_core =
-        Kokkos::hwloc::get_available_threads_per_core();
+          Kokkos::parallel_reduce(
+              Kokkos::TeamVectorRange(team, sX),
+              [=](const int i, SCALAR_TYPE &tmp) {
+                tmp += n * v.extent(0) + i;
+              },
+              out);
 
-    const unsigned threads_count =
-        std::max(1u, numa_count) *
-        std::max(2u, (cores_per_numa * threads_per_core) / 2);
+          Kokkos::single(Kokkos::PerTeam(team), [&]() { v(n) += out; });
+        });
 
-    Kokkos::Qthreads::initialize(threads_count);
-    Kokkos::print_configuration(std::cout, true);
+    Kokkos::fence();
+    auto v_H = Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace(), v);
 
-    srand(10231);
+    SCALAR_TYPE check = 0;
+    SCALAR_TYPE ref   = 0;
+    for (int i = 0; i < pN; ++i) {
+      check += v_H(i);
+      ref += ((sX + i * pN) * (sX + i * pN - 1) - (i * pN * (i * pN - 1))) / 2;
+    }
+    ASSERT_EQ(check, ref);
   }
-
-  static void TearDownTestCase() { Kokkos::Qthreads::finalize(); }
 };
 
-}  // namespace Test
+TEST(TEST_CATEGORY, IncrTest_13b_Hierarchical_Red) {
+  Hierarchical_Red_B<TEST_EXECSPACE> test;
+  test.run(4, 16);
+  test.run(2, 39);
+  test.run(39, 3);
+}
 
-#endif
+}  // namespace Test
diff --git a/kokkos/core/unit_test/incremental/Test13c_ParallelRed_ThreadVectorRange.hpp b/kokkos/core/unit_test/incremental/Test13c_ParallelRed_ThreadVectorRange.hpp
new file mode 100644
index 000000000..7df940c58
--- /dev/null
+++ b/kokkos/core/unit_test/incremental/Test13c_ParallelRed_ThreadVectorRange.hpp
@@ -0,0 +1,112 @@
+/*
+//@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
+*/
+
+// @Kokkos_Feature_Level_Required:13
+// Unit test for hierarchical parallelism
+// Create concurrent work hierarchically and verify if
+// sum of created processing units corresponds to expected value
+
+#include <gtest/gtest.h>
+#include <Kokkos_Core.hpp>
+
+using SCALAR_TYPE = int;
+
+namespace Test {
+
+template <class ExecSpace>
+struct Hierarchical_Red_C {
+  void run(const int pN, const int sX, const int sY) {
+    typedef Kokkos::TeamPolicy<ExecSpace> team_policy;
+    typedef typename Kokkos::TeamPolicy<ExecSpace>::member_type member_type;
+
+    typedef Kokkos::View<SCALAR_TYPE *, ExecSpace> viewDataType;
+    viewDataType v("Vector", pN);
+
+    Kokkos::parallel_for(
+        "Team", team_policy(pN, Kokkos::AUTO),
+        KOKKOS_LAMBDA(const member_type &team) {
+          int n           = team.league_rank();
+          SCALAR_TYPE out = 0;
+
+          Kokkos::parallel_reduce(
+              Kokkos::TeamThreadRange(team, sX),
+              [=](const int i, SCALAR_TYPE &tmp) {
+                SCALAR_TYPE out_inner = 0;
+                Kokkos::parallel_reduce(
+                    Kokkos::ThreadVectorRange(team, sY),
+                    [=](const int k, int &tmp_inner) {
+                      tmp_inner += n * sX * v.extent(0) + sX * i + k;
+                    },
+                    out_inner);
+
+                Kokkos::single(Kokkos::PerThread(team),
+                               [&]() { tmp += out_inner; });
+              },
+              out);
+
+          Kokkos::single(Kokkos::PerTeam(team), [&]() { v(n) += out; });
+        });
+
+    Kokkos::fence();
+    auto v_H = Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace(), v);
+
+    SCALAR_TYPE check = 0;
+    SCALAR_TYPE ref   = 0;
+    for (int i = 0; i < pN; ++i) {
+      check += v_H(i);
+      for (int j = 0; j < sX; ++j)
+        for (int k = 0; k < sY; ++k) ref += i * sX * pN + sX * j + k;
+    }
+    ASSERT_EQ(check, ref);
+  }
+};
+
+TEST(TEST_CATEGORY, IncrTest_13c_Hierarchical_Red) {
+  Hierarchical_Red_C<TEST_EXECSPACE> test;
+  test.run(1, 4, 8);
+  test.run(2, 39, 12);
+  test.run(39, 3, 235);
+}
+
+}  // namespace Test
diff --git a/kokkos/core/unit_test/openmp/TestOpenMP.hpp b/kokkos/core/unit_test/openmp/TestOpenMP.hpp
index 4b7d76972..082657c28 100644
--- a/kokkos/core/unit_test/openmp/TestOpenMP.hpp
+++ b/kokkos/core/unit_test/openmp/TestOpenMP.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_complexdouble.cpp b/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_complexdouble.cpp
index e0d0cdd2f..50514e350 100644
--- a/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_complexdouble.cpp
+++ b/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_complexdouble.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_complexfloat.cpp b/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_complexfloat.cpp
index 9b1cb39ec..a9decbad9 100644
--- a/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_complexfloat.cpp
+++ b/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_complexfloat.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_double.cpp b/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_double.cpp
index 74237f266..9de85e155 100644
--- a/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_double.cpp
+++ b/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_double.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_float.cpp b/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_float.cpp
index 39f2b1f74..8248ee68c 100644
--- a/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_float.cpp
+++ b/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_float.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_int.cpp b/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_int.cpp
index e395d6ff7..524305f3a 100644
--- a/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_int.cpp
+++ b/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_int.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_longint.cpp b/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_longint.cpp
index 71a6a3d61..06375942e 100644
--- a/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_longint.cpp
+++ b/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_longint.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_longlongint.cpp b/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_longlongint.cpp
index ab663b5e0..4e72e6433 100644
--- a/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_longlongint.cpp
+++ b/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_longlongint.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_unsignedint.cpp b/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_unsignedint.cpp
index a40425da5..485770898 100644
--- a/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_unsignedint.cpp
+++ b/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_unsignedint.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_unsignedlongint.cpp b/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_unsignedlongint.cpp
index d3b5fabe7..c0922e784 100644
--- a/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_unsignedlongint.cpp
+++ b/kokkos/core/unit_test/openmp/TestOpenMP_AtomicOperations_unsignedlongint.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmp/TestOpenMP_AtomicViews.cpp b/kokkos/core/unit_test/openmp/TestOpenMP_AtomicViews.cpp
index 0749b6850..8b495b962 100644
--- a/kokkos/core/unit_test/openmp/TestOpenMP_AtomicViews.cpp
+++ b/kokkos/core/unit_test/openmp/TestOpenMP_AtomicViews.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmp/TestOpenMP_Atomics.cpp b/kokkos/core/unit_test/openmp/TestOpenMP_Atomics.cpp
index e6bf6c89d..123f6f156 100644
--- a/kokkos/core/unit_test/openmp/TestOpenMP_Atomics.cpp
+++ b/kokkos/core/unit_test/openmp/TestOpenMP_Atomics.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmp/TestOpenMP_Category.hpp b/kokkos/core/unit_test/openmp/TestOpenMP_Category.hpp
index c1ea4097d..2cdb378e0 100644
--- a/kokkos/core/unit_test/openmp/TestOpenMP_Category.hpp
+++ b/kokkos/core/unit_test/openmp/TestOpenMP_Category.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmp/TestOpenMP_Complex.cpp b/kokkos/core/unit_test/openmp/TestOpenMP_Complex.cpp
index 9d01d3e71..e702a2508 100644
--- a/kokkos/core/unit_test/openmp/TestOpenMP_Complex.cpp
+++ b/kokkos/core/unit_test/openmp/TestOpenMP_Complex.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/containers/unit_tests/openmp/TestOpenMP_BitSet.cpp b/kokkos/core/unit_test/openmp/TestOpenMP_Concepts.cpp
similarity index 92%
rename from kokkos/containers/unit_tests/openmp/TestOpenMP_BitSet.cpp
rename to kokkos/core/unit_test/openmp/TestOpenMP_Concepts.cpp
index 6393a20fa..5480af5aa 100644
--- a/kokkos/containers/unit_tests/openmp/TestOpenMP_BitSet.cpp
+++ b/kokkos/core/unit_test/openmp/TestOpenMP_Concepts.cpp
@@ -1,4 +1,3 @@
-
 /*
 //@HEADER
 // ************************************************************************
@@ -25,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -44,4 +43,4 @@
 */
 
 #include <openmp/TestOpenMP_Category.hpp>
-#include <TestBitset.hpp>
+#include <TestConcepts.hpp>
diff --git a/kokkos/core/unit_test/openmp/TestOpenMP_Crs.cpp b/kokkos/core/unit_test/openmp/TestOpenMP_Crs.cpp
index e8d13925a..49615f955 100644
--- a/kokkos/core/unit_test/openmp/TestOpenMP_Crs.cpp
+++ b/kokkos/core/unit_test/openmp/TestOpenMP_Crs.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmp/TestOpenMP_DeepCopyAlignment.cpp b/kokkos/core/unit_test/openmp/TestOpenMP_DeepCopyAlignment.cpp
index 4785296f8..a15f5dcf1 100644
--- a/kokkos/core/unit_test/openmp/TestOpenMP_DeepCopyAlignment.cpp
+++ b/kokkos/core/unit_test/openmp/TestOpenMP_DeepCopyAlignment.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmp/TestOpenMP_FunctorAnalysis.cpp b/kokkos/core/unit_test/openmp/TestOpenMP_FunctorAnalysis.cpp
index a1917a56e..ae4b1d0b2 100644
--- a/kokkos/core/unit_test/openmp/TestOpenMP_FunctorAnalysis.cpp
+++ b/kokkos/core/unit_test/openmp/TestOpenMP_FunctorAnalysis.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmp/TestOpenMP_Init.cpp b/kokkos/core/unit_test/openmp/TestOpenMP_Init.cpp
index fed5f7258..8c49b6692 100644
--- a/kokkos/core/unit_test/openmp/TestOpenMP_Init.cpp
+++ b/kokkos/core/unit_test/openmp/TestOpenMP_Init.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmp/TestOpenMP_InterOp.cpp b/kokkos/core/unit_test/openmp/TestOpenMP_InterOp.cpp
index bb2fb7640..083c94860 100644
--- a/kokkos/core/unit_test/openmp/TestOpenMP_InterOp.cpp
+++ b/kokkos/core/unit_test/openmp/TestOpenMP_InterOp.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmp/TestOpenMP_LocalDeepCopy.cpp b/kokkos/core/unit_test/openmp/TestOpenMP_LocalDeepCopy.cpp
index e1e244292..6670faf0c 100644
--- a/kokkos/core/unit_test/openmp/TestOpenMP_LocalDeepCopy.cpp
+++ b/kokkos/core/unit_test/openmp/TestOpenMP_LocalDeepCopy.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmp/TestOpenMP_MDRange_a.cpp b/kokkos/core/unit_test/openmp/TestOpenMP_MDRange_a.cpp
index ded9c0ee8..6f421e1ac 100644
--- a/kokkos/core/unit_test/openmp/TestOpenMP_MDRange_a.cpp
+++ b/kokkos/core/unit_test/openmp/TestOpenMP_MDRange_a.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmp/TestOpenMP_MDRange_b.cpp b/kokkos/core/unit_test/openmp/TestOpenMP_MDRange_b.cpp
index 10ebea107..4119ed8a5 100644
--- a/kokkos/core/unit_test/openmp/TestOpenMP_MDRange_b.cpp
+++ b/kokkos/core/unit_test/openmp/TestOpenMP_MDRange_b.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmp/TestOpenMP_MDRange_c.cpp b/kokkos/core/unit_test/openmp/TestOpenMP_MDRange_c.cpp
index ca3598d8b..b1d5dd43d 100644
--- a/kokkos/core/unit_test/openmp/TestOpenMP_MDRange_c.cpp
+++ b/kokkos/core/unit_test/openmp/TestOpenMP_MDRange_c.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmp/TestOpenMP_MDRange_d.cpp b/kokkos/core/unit_test/openmp/TestOpenMP_MDRange_d.cpp
index 4630c83f1..52c807255 100644
--- a/kokkos/core/unit_test/openmp/TestOpenMP_MDRange_d.cpp
+++ b/kokkos/core/unit_test/openmp/TestOpenMP_MDRange_d.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmp/TestOpenMP_MDRange_e.cpp b/kokkos/core/unit_test/openmp/TestOpenMP_MDRange_e.cpp
index 0df3ed92d..011579b55 100644
--- a/kokkos/core/unit_test/openmp/TestOpenMP_MDRange_e.cpp
+++ b/kokkos/core/unit_test/openmp/TestOpenMP_MDRange_e.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmp/TestOpenMP_Other.cpp b/kokkos/core/unit_test/openmp/TestOpenMP_Other.cpp
index 25612ad16..704343251 100644
--- a/kokkos/core/unit_test/openmp/TestOpenMP_Other.cpp
+++ b/kokkos/core/unit_test/openmp/TestOpenMP_Other.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -63,7 +63,7 @@ TEST(openmp, partition_master) {
   Mutex mtx;
   int errors = 0;
 
-  auto master = [&errors, &mtx](int partition_id, int num_partitions) {
+  auto master = [&errors, &mtx](int /*partition_id*/, int /*num_partitions*/) {
 
 #ifdef KOKKOS_ENABLE_DEPRECATED_CODE
     const int pool_size = Kokkos::OpenMP::thread_pool_size();
diff --git a/kokkos/core/unit_test/openmp/TestOpenMP_RangePolicy.cpp b/kokkos/core/unit_test/openmp/TestOpenMP_RangePolicy.cpp
index 386f12acc..a19697393 100644
--- a/kokkos/core/unit_test/openmp/TestOpenMP_RangePolicy.cpp
+++ b/kokkos/core/unit_test/openmp/TestOpenMP_RangePolicy.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/containers/unit_tests/openmp/TestOpenMP_Vector.cpp b/kokkos/core/unit_test/openmp/TestOpenMP_RangePolicyRequire.cpp
similarity index 92%
rename from kokkos/containers/unit_tests/openmp/TestOpenMP_Vector.cpp
rename to kokkos/core/unit_test/openmp/TestOpenMP_RangePolicyRequire.cpp
index 2e4c84990..284a65a21 100644
--- a/kokkos/containers/unit_tests/openmp/TestOpenMP_Vector.cpp
+++ b/kokkos/core/unit_test/openmp/TestOpenMP_RangePolicyRequire.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -44,4 +44,4 @@
 */
 
 #include <openmp/TestOpenMP_Category.hpp>
-#include <TestVector.hpp>
+#include <TestRangeRequire.hpp>
diff --git a/kokkos/core/unit_test/openmp/TestOpenMP_Reducers_a.cpp b/kokkos/core/unit_test/openmp/TestOpenMP_Reducers_a.cpp
index 21d7dd117..539720c7a 100644
--- a/kokkos/core/unit_test/openmp/TestOpenMP_Reducers_a.cpp
+++ b/kokkos/core/unit_test/openmp/TestOpenMP_Reducers_a.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmp/TestOpenMP_Reducers_b.cpp b/kokkos/core/unit_test/openmp/TestOpenMP_Reducers_b.cpp
index 9fc9082ad..e4a7b029c 100644
--- a/kokkos/core/unit_test/openmp/TestOpenMP_Reducers_b.cpp
+++ b/kokkos/core/unit_test/openmp/TestOpenMP_Reducers_b.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmp/TestOpenMP_Reducers_c.cpp b/kokkos/core/unit_test/openmp/TestOpenMP_Reducers_c.cpp
index 121f0020f..62f3a1c96 100644
--- a/kokkos/core/unit_test/openmp/TestOpenMP_Reducers_c.cpp
+++ b/kokkos/core/unit_test/openmp/TestOpenMP_Reducers_c.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmp/TestOpenMP_Reducers_d.cpp b/kokkos/core/unit_test/openmp/TestOpenMP_Reducers_d.cpp
index 93c16d64e..c8a34e543 100644
--- a/kokkos/core/unit_test/openmp/TestOpenMP_Reducers_d.cpp
+++ b/kokkos/core/unit_test/openmp/TestOpenMP_Reducers_d.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmp/TestOpenMP_Reductions.cpp b/kokkos/core/unit_test/openmp/TestOpenMP_Reductions.cpp
index 52b99830c..1eb20ea09 100644
--- a/kokkos/core/unit_test/openmp/TestOpenMP_Reductions.cpp
+++ b/kokkos/core/unit_test/openmp/TestOpenMP_Reductions.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmp/TestOpenMP_Reductions_DeviceView.cpp b/kokkos/core/unit_test/openmp/TestOpenMP_Reductions_DeviceView.cpp
index b40699879..bd3a05957 100644
--- a/kokkos/core/unit_test/openmp/TestOpenMP_Reductions_DeviceView.cpp
+++ b/kokkos/core/unit_test/openmp/TestOpenMP_Reductions_DeviceView.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmp/TestOpenMP_Scan.cpp b/kokkos/core/unit_test/openmp/TestOpenMP_Scan.cpp
index 3ae5d2023..f8c58ecfd 100644
--- a/kokkos/core/unit_test/openmp/TestOpenMP_Scan.cpp
+++ b/kokkos/core/unit_test/openmp/TestOpenMP_Scan.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmp/TestOpenMP_SharedAlloc.cpp b/kokkos/core/unit_test/openmp/TestOpenMP_SharedAlloc.cpp
index 4e97a3ab1..8e386391a 100644
--- a/kokkos/core/unit_test/openmp/TestOpenMP_SharedAlloc.cpp
+++ b/kokkos/core/unit_test/openmp/TestOpenMP_SharedAlloc.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmp/TestOpenMP_SubView_a.cpp b/kokkos/core/unit_test/openmp/TestOpenMP_SubView_a.cpp
index cbecfd08d..a12095720 100644
--- a/kokkos/core/unit_test/openmp/TestOpenMP_SubView_a.cpp
+++ b/kokkos/core/unit_test/openmp/TestOpenMP_SubView_a.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmp/TestOpenMP_SubView_b.cpp b/kokkos/core/unit_test/openmp/TestOpenMP_SubView_b.cpp
index e5d1575a1..fc34c149f 100644
--- a/kokkos/core/unit_test/openmp/TestOpenMP_SubView_b.cpp
+++ b/kokkos/core/unit_test/openmp/TestOpenMP_SubView_b.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c01.cpp b/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c01.cpp
index 3a2e7c74b..402072b68 100644
--- a/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c01.cpp
+++ b/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c01.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c02.cpp b/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c02.cpp
index 370b44c89..9aba989f5 100644
--- a/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c02.cpp
+++ b/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c02.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c03.cpp b/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c03.cpp
index f0b7f4d35..49db066f4 100644
--- a/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c03.cpp
+++ b/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c03.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c04.cpp b/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c04.cpp
index 99472f00f..a4112f442 100644
--- a/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c04.cpp
+++ b/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c04.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c05.cpp b/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c05.cpp
index db398a64f..691ddbb96 100644
--- a/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c05.cpp
+++ b/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c05.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c06.cpp b/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c06.cpp
index 6e509af3a..b65b1e228 100644
--- a/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c06.cpp
+++ b/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c06.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c07.cpp b/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c07.cpp
index 8087d1be5..1b81dc945 100644
--- a/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c07.cpp
+++ b/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c07.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c08.cpp b/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c08.cpp
index 7bef1126b..5dd92f1c0 100644
--- a/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c08.cpp
+++ b/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c08.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c09.cpp b/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c09.cpp
index 166ec4ab8..9216956ed 100644
--- a/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c09.cpp
+++ b/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c09.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c10.cpp b/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c10.cpp
index a25c1b1a1..b8252d3cb 100644
--- a/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c10.cpp
+++ b/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c10.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c11.cpp b/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c11.cpp
index cf9e108f4..4b9485357 100644
--- a/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c11.cpp
+++ b/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c11.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c12.cpp b/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c12.cpp
index 29801a54d..c1a7250eb 100644
--- a/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c12.cpp
+++ b/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c12.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c13.cpp b/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c13.cpp
index 7cf7c0c28..ab9f668e6 100644
--- a/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c13.cpp
+++ b/kokkos/core/unit_test/openmp/TestOpenMP_SubView_c13.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmp/TestOpenMP_Task.cpp b/kokkos/core/unit_test/openmp/TestOpenMP_Task.cpp
index 8958999bc..5e67a3471 100644
--- a/kokkos/core/unit_test/openmp/TestOpenMP_Task.cpp
+++ b/kokkos/core/unit_test/openmp/TestOpenMP_Task.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmp/TestOpenMP_Team.cpp b/kokkos/core/unit_test/openmp/TestOpenMP_Team.cpp
index 12fc2d544..240930738 100644
--- a/kokkos/core/unit_test/openmp/TestOpenMP_Team.cpp
+++ b/kokkos/core/unit_test/openmp/TestOpenMP_Team.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -80,25 +80,25 @@ TEST(TEST_CATEGORY, team_reduce) {
 }
 
 TEST(TEST_CATEGORY, team_broadcast) {
-  TestTeamBroadcast<TEST_EXECSPACE,
-                    Kokkos::Schedule<Kokkos::Static> >::test_teambroadcast(0);
-  TestTeamBroadcast<TEST_EXECSPACE,
-                    Kokkos::Schedule<Kokkos::Dynamic> >::test_teambroadcast(0);
+  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static>,
+                    long>::test_teambroadcast(0, 1);
+  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic>,
+                    long>::test_teambroadcast(0, 1);
 
-  TestTeamBroadcast<TEST_EXECSPACE,
-                    Kokkos::Schedule<Kokkos::Static> >::test_teambroadcast(2);
-  TestTeamBroadcast<TEST_EXECSPACE,
-                    Kokkos::Schedule<Kokkos::Dynamic> >::test_teambroadcast(2);
+  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static>,
+                    long>::test_teambroadcast(2, 1);
+  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic>,
+                    long>::test_teambroadcast(2, 1);
 
-  TestTeamBroadcast<TEST_EXECSPACE,
-                    Kokkos::Schedule<Kokkos::Static> >::test_teambroadcast(16);
-  TestTeamBroadcast<TEST_EXECSPACE,
-                    Kokkos::Schedule<Kokkos::Dynamic> >::test_teambroadcast(16);
+  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static>,
+                    long>::test_teambroadcast(16, 1);
+  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic>,
+                    long>::test_teambroadcast(16, 1);
 
-  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::
-      test_teambroadcast(1000);
-  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::
-      test_teambroadcast(1000);
+  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static>,
+                    long>::test_teambroadcast(1000, 1);
+  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic>,
+                    long>::test_teambroadcast(1000, 1);
 }
 }  // namespace Test
 
diff --git a/kokkos/core/unit_test/openmp/TestOpenMP_TeamReductionScan.cpp b/kokkos/core/unit_test/openmp/TestOpenMP_TeamReductionScan.cpp
index 5b1a7da3f..f6f386032 100644
--- a/kokkos/core/unit_test/openmp/TestOpenMP_TeamReductionScan.cpp
+++ b/kokkos/core/unit_test/openmp/TestOpenMP_TeamReductionScan.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmp/TestOpenMP_TeamScratch.cpp b/kokkos/core/unit_test/openmp/TestOpenMP_TeamScratch.cpp
index 52dc9fdd5..b42bdf754 100644
--- a/kokkos/core/unit_test/openmp/TestOpenMP_TeamScratch.cpp
+++ b/kokkos/core/unit_test/openmp/TestOpenMP_TeamScratch.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -58,7 +58,6 @@ TEST(TEST_CATEGORY, team_scratch_request) {
 }
 
 #if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
-#if !defined(KOKKOS_ENABLE_CUDA) || (8000 <= CUDA_VERSION)
 TEST(TEST_CATEGORY, team_lambda_shared_request) {
   TestLambdaSharedTeam<Kokkos::HostSpace, TEST_EXECSPACE,
                        Kokkos::Schedule<Kokkos::Static> >();
@@ -67,7 +66,6 @@ TEST(TEST_CATEGORY, team_lambda_shared_request) {
 }
 TEST(TEST_CATEGORY, scratch_align) { TestScratchAlignment<TEST_EXECSPACE>(); }
 #endif
-#endif
 
 TEST(TEST_CATEGORY, shmem_size) { TestShmemSize<TEST_EXECSPACE>(); }
 
diff --git a/kokkos/core/unit_test/openmp/TestOpenMP_TeamTeamSize.cpp b/kokkos/core/unit_test/openmp/TestOpenMP_TeamTeamSize.cpp
index 72bbdc669..df935a0ad 100644
--- a/kokkos/core/unit_test/openmp/TestOpenMP_TeamTeamSize.cpp
+++ b/kokkos/core/unit_test/openmp/TestOpenMP_TeamTeamSize.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmp/TestOpenMP_TeamVectorRange.cpp b/kokkos/core/unit_test/openmp/TestOpenMP_TeamVectorRange.cpp
index d11a19239..9fe7a0c0c 100644
--- a/kokkos/core/unit_test/openmp/TestOpenMP_TeamVectorRange.cpp
+++ b/kokkos/core/unit_test/openmp/TestOpenMP_TeamVectorRange.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmp/TestOpenMP_UniqueToken.cpp b/kokkos/core/unit_test/openmp/TestOpenMP_UniqueToken.cpp
index 8e996d710..eed863e5f 100644
--- a/kokkos/core/unit_test/openmp/TestOpenMP_UniqueToken.cpp
+++ b/kokkos/core/unit_test/openmp/TestOpenMP_UniqueToken.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmp/TestOpenMP_ViewAPI_a.cpp b/kokkos/core/unit_test/openmp/TestOpenMP_ViewAPI_a.cpp
index 8aa53d5e5..f0066d82d 100644
--- a/kokkos/core/unit_test/openmp/TestOpenMP_ViewAPI_a.cpp
+++ b/kokkos/core/unit_test/openmp/TestOpenMP_ViewAPI_a.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmp/TestOpenMP_ViewAPI_b.cpp b/kokkos/core/unit_test/openmp/TestOpenMP_ViewAPI_b.cpp
index bbc7de78f..d9eb1b905 100644
--- a/kokkos/core/unit_test/openmp/TestOpenMP_ViewAPI_b.cpp
+++ b/kokkos/core/unit_test/openmp/TestOpenMP_ViewAPI_b.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmp/TestOpenMP_ViewAPI_c.cpp b/kokkos/core/unit_test/openmp/TestOpenMP_ViewAPI_c.cpp
index 13dd73dce..ecdb7318f 100644
--- a/kokkos/core/unit_test/openmp/TestOpenMP_ViewAPI_c.cpp
+++ b/kokkos/core/unit_test/openmp/TestOpenMP_ViewAPI_c.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmp/TestOpenMP_ViewAPI_d.cpp b/kokkos/core/unit_test/openmp/TestOpenMP_ViewAPI_d.cpp
index 05aedc329..4a9a6513c 100644
--- a/kokkos/core/unit_test/openmp/TestOpenMP_ViewAPI_d.cpp
+++ b/kokkos/core/unit_test/openmp/TestOpenMP_ViewAPI_d.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmp/TestOpenMP_ViewAPI_e.cpp b/kokkos/core/unit_test/openmp/TestOpenMP_ViewAPI_e.cpp
index e5efc3cbd..e5ddee77d 100644
--- a/kokkos/core/unit_test/openmp/TestOpenMP_ViewAPI_e.cpp
+++ b/kokkos/core/unit_test/openmp/TestOpenMP_ViewAPI_e.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmp/TestOpenMP_ViewLayoutStrideAssignment.cpp b/kokkos/core/unit_test/openmp/TestOpenMP_ViewLayoutStrideAssignment.cpp
index 7544e879d..90e90139c 100644
--- a/kokkos/core/unit_test/openmp/TestOpenMP_ViewLayoutStrideAssignment.cpp
+++ b/kokkos/core/unit_test/openmp/TestOpenMP_ViewLayoutStrideAssignment.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmp/TestOpenMP_ViewMapping_a.cpp b/kokkos/core/unit_test/openmp/TestOpenMP_ViewMapping_a.cpp
index ceb1bd993..0f2dd07e5 100644
--- a/kokkos/core/unit_test/openmp/TestOpenMP_ViewMapping_a.cpp
+++ b/kokkos/core/unit_test/openmp/TestOpenMP_ViewMapping_a.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmp/TestOpenMP_ViewMapping_b.cpp b/kokkos/core/unit_test/openmp/TestOpenMP_ViewMapping_b.cpp
index 5558adeb9..13be94042 100644
--- a/kokkos/core/unit_test/openmp/TestOpenMP_ViewMapping_b.cpp
+++ b/kokkos/core/unit_test/openmp/TestOpenMP_ViewMapping_b.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmp/TestOpenMP_ViewMapping_subview.cpp b/kokkos/core/unit_test/openmp/TestOpenMP_ViewMapping_subview.cpp
index 46cd0e278..47250070b 100644
--- a/kokkos/core/unit_test/openmp/TestOpenMP_ViewMapping_subview.cpp
+++ b/kokkos/core/unit_test/openmp/TestOpenMP_ViewMapping_subview.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmp/TestOpenMP_ViewOfClass.cpp b/kokkos/core/unit_test/openmp/TestOpenMP_ViewOfClass.cpp
index a099d6a46..78315c45a 100644
--- a/kokkos/core/unit_test/openmp/TestOpenMP_ViewOfClass.cpp
+++ b/kokkos/core/unit_test/openmp/TestOpenMP_ViewOfClass.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmp/TestOpenMP_ViewResize.cpp b/kokkos/core/unit_test/openmp/TestOpenMP_ViewResize.cpp
index f8bf1d7dc..cacd2b3e8 100644
--- a/kokkos/core/unit_test/openmp/TestOpenMP_ViewResize.cpp
+++ b/kokkos/core/unit_test/openmp/TestOpenMP_ViewResize.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmp/TestOpenMP_View_64bit.cpp b/kokkos/core/unit_test/openmp/TestOpenMP_View_64bit.cpp
index 153cf6b34..80f52abaf 100644
--- a/kokkos/core/unit_test/openmp/TestOpenMP_View_64bit.cpp
+++ b/kokkos/core/unit_test/openmp/TestOpenMP_View_64bit.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmp/TestOpenMP_WorkGraph.cpp b/kokkos/core/unit_test/openmp/TestOpenMP_WorkGraph.cpp
index 4a1300040..f76f612f2 100644
--- a/kokkos/core/unit_test/openmp/TestOpenMP_WorkGraph.cpp
+++ b/kokkos/core/unit_test/openmp/TestOpenMP_WorkGraph.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget.hpp b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget.hpp
index 4daa3893e..0e9ad3e24 100644
--- a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget.hpp
+++ b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_complexdouble.cpp b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_complexdouble.cpp
index 55e834ec0..e323124a6 100644
--- a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_complexdouble.cpp
+++ b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_complexdouble.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_complexfloat.cpp b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_complexfloat.cpp
index 617cef61e..c45d6fd5d 100644
--- a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_complexfloat.cpp
+++ b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_complexfloat.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_double.cpp b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_double.cpp
index 735bbfd16..54d4670e0 100644
--- a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_double.cpp
+++ b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_double.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_float.cpp b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_float.cpp
index b4dad835a..399bf0fca 100644
--- a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_float.cpp
+++ b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_float.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_int.cpp b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_int.cpp
index b27b8e6ea..6091ff0f7 100644
--- a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_int.cpp
+++ b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_int.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_longint.cpp b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_longint.cpp
index f55fd3bf0..b877ff011 100644
--- a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_longint.cpp
+++ b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_longint.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_longlongint.cpp b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_longlongint.cpp
index cce081585..8234e356f 100644
--- a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_longlongint.cpp
+++ b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_longlongint.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_unsignedint.cpp b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_unsignedint.cpp
index 8bb7577e7..86cfac901 100644
--- a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_unsignedint.cpp
+++ b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_unsignedint.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_unsignedlongint.cpp b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_unsignedlongint.cpp
index 46bcafefa..fe5c3f085 100644
--- a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_unsignedlongint.cpp
+++ b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicOperations_unsignedlongint.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicViews.cpp b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicViews.cpp
index 47cb4cfe3..b38c7cafb 100644
--- a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicViews.cpp
+++ b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_AtomicViews.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Atomics.cpp b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Atomics.cpp
index 151b83316..1bcbd3a62 100644
--- a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Atomics.cpp
+++ b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Atomics.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Category.hpp b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Category.hpp
index 625fa59f4..58aa0cc78 100644
--- a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Category.hpp
+++ b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Category.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Complex.cpp b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Complex.cpp
index 9f4690cb4..5e62bc85b 100644
--- a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Complex.cpp
+++ b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Complex.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Concepts.cpp b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Concepts.cpp
new file mode 100644
index 000000000..8896339f9
--- /dev/null
+++ b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Concepts.cpp
@@ -0,0 +1,46 @@
+/*
+//@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
+*/
+
+#include <openmptarget/TestOpenMPTarget_Category.hpp>
+#include <TestConcepts.hpp>
diff --git a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Crs.cpp b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Crs.cpp
new file mode 100644
index 000000000..e69de29bb
diff --git a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_DeepCopyAlignment.cpp b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_DeepCopyAlignment.cpp
index e0ff55d4a..01885d0d8 100644
--- a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_DeepCopyAlignment.cpp
+++ b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_DeepCopyAlignment.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_FunctorAnalysis.cpp b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_FunctorAnalysis.cpp
new file mode 100644
index 000000000..e69de29bb
diff --git a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Init.cpp b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Init.cpp
index 5863f6106..ebcbbb3ae 100644
--- a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Init.cpp
+++ b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Init.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_LocalDeepCopy.cpp b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_LocalDeepCopy.cpp
new file mode 100644
index 000000000..e69de29bb
diff --git a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_MDRange_a.cpp b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_MDRange_a.cpp
index 4c7513c2d..4f4f8b06c 100644
--- a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_MDRange_a.cpp
+++ b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_MDRange_a.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_MDRange_b.cpp b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_MDRange_b.cpp
index 06977c603..1032d8221 100644
--- a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_MDRange_b.cpp
+++ b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_MDRange_b.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_MDRange_c.cpp b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_MDRange_c.cpp
index 94230d627..59d165ab4 100644
--- a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_MDRange_c.cpp
+++ b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_MDRange_c.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_MDRange_d.cpp b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_MDRange_d.cpp
index 7b5ade89d..49603de6f 100644
--- a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_MDRange_d.cpp
+++ b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_MDRange_d.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_MDRange_e.cpp b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_MDRange_e.cpp
index 9570a5f65..dd6d96630 100644
--- a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_MDRange_e.cpp
+++ b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_MDRange_e.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Other.cpp b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Other.cpp
index e89a0f1ec..aba91aee2 100644
--- a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Other.cpp
+++ b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Other.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_RangePolicy.cpp b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_RangePolicy.cpp
index ddff79bcf..d9a5bac68 100644
--- a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_RangePolicy.cpp
+++ b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_RangePolicy.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_RangePolicyRequire.cpp b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_RangePolicyRequire.cpp
new file mode 100644
index 000000000..e69de29bb
diff --git a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Reducers_a.cpp b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Reducers_a.cpp
index 2605d621f..311c7a93b 100644
--- a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Reducers_a.cpp
+++ b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Reducers_a.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Reducers_b.cpp b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Reducers_b.cpp
index b78fb3eb6..d5f6b8bc4 100644
--- a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Reducers_b.cpp
+++ b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Reducers_b.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Reducers_c.cpp b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Reducers_c.cpp
index 281074904..e421033e0 100644
--- a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Reducers_c.cpp
+++ b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Reducers_c.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Reducers_d.cpp b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Reducers_d.cpp
index 9bdae00a1..ec30e97d3 100644
--- a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Reducers_d.cpp
+++ b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Reducers_d.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Reductions.cpp b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Reductions.cpp
index 5405aebbb..af1d06f0c 100644
--- a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Reductions.cpp
+++ b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Reductions.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Reductions_DeviceView.cpp b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Reductions_DeviceView.cpp
new file mode 100644
index 000000000..e69de29bb
diff --git a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Scan.cpp b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Scan.cpp
index 5bf1773f2..50cc88914 100644
--- a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Scan.cpp
+++ b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Scan.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SharedAlloc.cpp b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SharedAlloc.cpp
index 1e11094d2..6d5645547 100644
--- a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SharedAlloc.cpp
+++ b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SharedAlloc.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -47,7 +47,7 @@
 
 namespace Test {
 
-TEST_F(TEST_CATEGORY, impl_shared_alloc) {
+TEST(TEST_CATEGORY, impl_shared_alloc) {
   test_shared_alloc<Kokkos::Experimental::OpenMPTargetSpace,
                     Kokkos::DefaultHostExecutionSpace>();
 }
diff --git a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_a.cpp b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_a.cpp
index c9fd773e3..4be6218e2 100644
--- a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_a.cpp
+++ b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_a.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -47,51 +47,51 @@
 
 namespace Test {
 
-TEST_F(TEST_CATEGORY, view_subview_auto_1d_left) {
+TEST(TEST_CATEGORY, view_subview_auto_1d_left) {
   TestViewSubview::test_auto_1d<Kokkos::LayoutLeft, TEST_EXECSPACE>();
 }
 
-TEST_F(TEST_CATEGORY, view_subview_auto_1d_right) {
+TEST(TEST_CATEGORY, view_subview_auto_1d_right) {
   TestViewSubview::test_auto_1d<Kokkos::LayoutRight, TEST_EXECSPACE>();
 }
 
-TEST_F(TEST_CATEGORY, view_subview_auto_1d_stride) {
+TEST(TEST_CATEGORY, view_subview_auto_1d_stride) {
   TestViewSubview::test_auto_1d<Kokkos::LayoutStride, TEST_EXECSPACE>();
 }
 
-TEST_F(TEST_CATEGORY, view_subview_assign_strided) {
+TEST(TEST_CATEGORY, view_subview_assign_strided) {
   TestViewSubview::test_1d_strided_assignment<TEST_EXECSPACE>();
 }
 
-TEST_F(TEST_CATEGORY, view_subview_left_0) {
+TEST(TEST_CATEGORY, view_subview_left_0) {
   TestViewSubview::test_left_0<TEST_EXECSPACE>();
 }
 
-TEST_F(TEST_CATEGORY, view_subview_left_1) {
+TEST(TEST_CATEGORY, view_subview_left_1) {
   TestViewSubview::test_left_1<TEST_EXECSPACE>();
 }
 
-TEST_F(TEST_CATEGORY, view_subview_left_2) {
+TEST(TEST_CATEGORY, view_subview_left_2) {
   TestViewSubview::test_left_2<TEST_EXECSPACE>();
 }
 
-TEST_F(TEST_CATEGORY, view_subview_left_3) {
+TEST(TEST_CATEGORY, view_subview_left_3) {
   TestViewSubview::test_left_3<TEST_EXECSPACE>();
 }
 
-TEST_F(TEST_CATEGORY, view_subview_right_0) {
+TEST(TEST_CATEGORY, view_subview_right_0) {
   TestViewSubview::test_right_0<TEST_EXECSPACE>();
 }
 
-TEST_F(TEST_CATEGORY, view_subview_right_1) {
+TEST(TEST_CATEGORY, view_subview_right_1) {
   TestViewSubview::test_right_1<TEST_EXECSPACE>();
 }
 
-TEST_F(TEST_CATEGORY, view_subview_right_3) {
+TEST(TEST_CATEGORY, view_subview_right_3) {
   TestViewSubview::test_right_3<TEST_EXECSPACE>();
 }
 
-TEST_F(TEST_CATEGORY, view_static_tests) {
+TEST(TEST_CATEGORY, view_static_tests) {
   TestViewSubview::TestSubviewStaticSizes<TEST_EXECSPACE,
                                           Kokkos::LayoutLeft>()();
   TestViewSubview::TestSubviewStaticSizes<TEST_EXECSPACE,
diff --git a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_b.cpp b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_b.cpp
index 0e4503bb1..b6488bced 100644
--- a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_b.cpp
+++ b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_b.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -47,7 +47,7 @@
 
 namespace Test {
 
-TEST_F(TEST_CATEGORY, view_subview_layoutleft_to_layoutleft) {
+TEST(TEST_CATEGORY, view_subview_layoutleft_to_layoutleft) {
   TestViewSubview::test_layoutleft_to_layoutleft<TEST_EXECSPACE>();
   TestViewSubview::test_layoutleft_to_layoutleft<
       TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::Atomic> >();
@@ -55,7 +55,7 @@ TEST_F(TEST_CATEGORY, view_subview_layoutleft_to_layoutleft) {
       TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
 }
 
-TEST_F(TEST_CATEGORY, view_subview_layoutright_to_layoutright) {
+TEST(TEST_CATEGORY, view_subview_layoutright_to_layoutright) {
   TestViewSubview::test_layoutright_to_layoutright<TEST_EXECSPACE>();
   TestViewSubview::test_layoutright_to_layoutright<
       TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::Atomic> >();
diff --git a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c01.cpp b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c01.cpp
index 143adb3ea..3361efcc1 100644
--- a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c01.cpp
+++ b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c01.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -47,7 +47,7 @@
 
 namespace Test {
 
-TEST_F(TEST_CATEGORY, view_subview_1d_assign) {
+TEST(TEST_CATEGORY, view_subview_1d_assign) {
   TestViewSubview::test_1d_assign<TEST_EXECSPACE>();
 }
 
diff --git a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c02.cpp b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c02.cpp
index 97b27b155..c4887cf3d 100644
--- a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c02.cpp
+++ b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c02.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -47,7 +47,7 @@
 
 namespace Test {
 
-TEST_F(TEST_CATEGORY, view_subview_1d_assign_atomic) {
+TEST(TEST_CATEGORY, view_subview_1d_assign_atomic) {
   TestViewSubview::test_1d_assign<TEST_EXECSPACE,
                                   Kokkos::MemoryTraits<Kokkos::Atomic> >();
 }
diff --git a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c03.cpp b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c03.cpp
index 250d46bb4..b172b0c61 100644
--- a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c03.cpp
+++ b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c03.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -47,7 +47,7 @@
 
 namespace Test {
 
-TEST_F(TEST_CATEGORY, view_subview_1d_assign_randomaccess) {
+TEST(TEST_CATEGORY, view_subview_1d_assign_randomaccess) {
   TestViewSubview::test_1d_assign<
       TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
 }
diff --git a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c04.cpp b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c04.cpp
index 1da9b7b4a..faf0ef7a4 100644
--- a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c04.cpp
+++ b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c04.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -47,7 +47,7 @@
 
 namespace Test {
 
-TEST_F(TEST_CATEGORY, view_subview_2d_from_3d) {
+TEST(TEST_CATEGORY, view_subview_2d_from_3d) {
   TestViewSubview::test_2d_subview_3d<TEST_EXECSPACE>();
 }
 
diff --git a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c05.cpp b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c05.cpp
index c02c38cfc..a3fb95fbe 100644
--- a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c05.cpp
+++ b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c05.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -47,7 +47,7 @@
 
 namespace Test {
 
-TEST_F(openmptarget, view_subview_2d_from_3d_atomic) {
+TEST(openmptarget, view_subview_2d_from_3d_atomic) {
   TestViewSubview::test_2d_subview_3d<TEST_EXECSPACE,
                                       Kokkos::MemoryTraits<Kokkos::Atomic> >();
 }
diff --git a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c06.cpp b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c06.cpp
index 42eb75213..056b392cd 100644
--- a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c06.cpp
+++ b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c06.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -47,7 +47,7 @@
 
 namespace Test {
 
-TEST_F(TEST_CATEGORY, view_subview_2d_from_3d_randomaccess) {
+TEST(TEST_CATEGORY, view_subview_2d_from_3d_randomaccess) {
   TestViewSubview::test_2d_subview_3d<
       TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
 }
diff --git a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c07.cpp b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c07.cpp
index bec4fd6ab..033bce863 100644
--- a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c07.cpp
+++ b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c07.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -47,7 +47,7 @@
 
 namespace Test {
 
-TEST_F(TEST_CATEGORY, view_subview_3d_from_5d_left) {
+TEST(TEST_CATEGORY, view_subview_3d_from_5d_left) {
   TestViewSubview::test_3d_subview_5d_left<TEST_EXECSPACE>();
 }
 
diff --git a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c08.cpp b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c08.cpp
index 6b10d7b58..58ef42360 100644
--- a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c08.cpp
+++ b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c08.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -47,7 +47,7 @@
 
 namespace Test {
 
-TEST_F(TEST_CATEGORY, view_subview_3d_from_5d_left_atomic) {
+TEST(TEST_CATEGORY, view_subview_3d_from_5d_left_atomic) {
   TestViewSubview::test_3d_subview_5d_left<
       TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::Atomic> >();
 }
diff --git a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c09.cpp b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c09.cpp
index 4271303e3..6e6c2af8e 100644
--- a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c09.cpp
+++ b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c09.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -47,7 +47,7 @@
 
 namespace Test {
 
-TEST_F(TEST_CATEGORY, view_subview_3d_from_5d_left_randomaccess) {
+TEST(TEST_CATEGORY, view_subview_3d_from_5d_left_randomaccess) {
   TestViewSubview::test_3d_subview_5d_left<
       TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
 }
diff --git a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c10.cpp b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c10.cpp
index 9a8dddbcd..2ad95d38c 100644
--- a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c10.cpp
+++ b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c10.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -47,7 +47,7 @@
 
 namespace Test {
 
-TEST_F(TEST_CATEGORY, view_subview_3d_from_5d_right) {
+TEST(TEST_CATEGORY, view_subview_3d_from_5d_right) {
   TestViewSubview::test_3d_subview_5d_right<TEST_EXECSPACE>();
 }
 
diff --git a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c11.cpp b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c11.cpp
index 44522f4cd..da8684d21 100644
--- a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c11.cpp
+++ b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c11.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -47,7 +47,7 @@
 
 namespace Test {
 
-TEST_F(TEST_CATEGORY, view_subview_3d_from_5d_right_atomic) {
+TEST(TEST_CATEGORY, view_subview_3d_from_5d_right_atomic) {
   TestViewSubview::test_3d_subview_5d_right<
       TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::Atomic> >();
 }
diff --git a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c12.cpp b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c12.cpp
index 279fdac42..dde7d5176 100644
--- a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c12.cpp
+++ b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c12.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -47,7 +47,7 @@
 
 namespace Test {
 
-TEST_F(TEST_CATEGORY, view_subview_3d_from_5d_right_randomaccess) {
+TEST(TEST_CATEGORY, view_subview_3d_from_5d_right_randomaccess) {
   TestViewSubview::test_3d_subview_5d_right<
       TEST_EXECSPACE, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
 }
diff --git a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c13.cpp b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_SubView_c13.cpp
new file mode 100644
index 000000000..e69de29bb
diff --git a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Team.cpp b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Team.cpp
index c86748b83..74b74d784 100644
--- a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Team.cpp
+++ b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_Team.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -47,7 +47,7 @@
 
 namespace Test {
 
-TEST_F(TEST_CATEGORY, team_for) {
+TEST(TEST_CATEGORY, team_for) {
   TestTeamPolicy<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::test_for(
       0);
   TestTeamPolicy<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::test_for(
@@ -64,7 +64,7 @@ TEST_F(TEST_CATEGORY, team_for) {
       1000);
 }
 
-TEST_F(TEST_CATEGORY, team_reduce) {
+TEST(TEST_CATEGORY, team_reduce) {
   TestTeamPolicy<TEST_EXECSPACE,
                  Kokkos::Schedule<Kokkos::Static> >::test_reduce(0);
   TestTeamPolicy<TEST_EXECSPACE,
diff --git a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_TeamReductionScan.cpp b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_TeamReductionScan.cpp
index 03ff05ba7..e882cd1b2 100644
--- a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_TeamReductionScan.cpp
+++ b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_TeamReductionScan.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -47,7 +47,7 @@
 
 namespace Test {
 
-TEST_F(TEST_CATEGORY, team_scan) {
+TEST(TEST_CATEGORY, team_scan) {
   TestScanTeam<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >(0);
   TestScanTeam<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >(0);
   TestScanTeam<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >(10);
@@ -56,7 +56,7 @@ TEST_F(TEST_CATEGORY, team_scan) {
   TestScanTeam<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >(10000);
 }
 
-TEST_F(TEST_CATEGORY, team_long_reduce) {
+TEST(TEST_CATEGORY, team_long_reduce) {
   TestReduceTeam<long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >(0);
   TestReduceTeam<long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >(0);
   TestReduceTeam<long, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >(3);
@@ -67,7 +67,7 @@ TEST_F(TEST_CATEGORY, team_long_reduce) {
       100000);
 }
 
-TEST_F(TEST_CATEGORY, team_double_reduce) {
+TEST(TEST_CATEGORY, team_double_reduce) {
   TestReduceTeam<double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >(0);
   TestReduceTeam<double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >(0);
   TestReduceTeam<double, TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >(3);
diff --git a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_TeamScratch.cpp b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_TeamScratch.cpp
index ca10cda30..729e35918 100644
--- a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_TeamScratch.cpp
+++ b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_TeamScratch.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -47,18 +47,17 @@
 
 namespace Test {
 
-TEST_F(TEST_CATEGORY, team_shared_request) {
+TEST(TEST_CATEGORY, team_shared_request) {
   TestSharedTeam<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >();
   TestSharedTeam<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >();
 }
 
-TEST_F(TEST_CATEGORY, team_scratch_request) {
+TEST(TEST_CATEGORY, team_scratch_request) {
   TestScratchTeam<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >();
   TestScratchTeam<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >();
 }
 
 #if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
-#if !defined(KOKKOS_ENABLE_CUDA) || (8000 <= CUDA_VERSION)
 TEST_F(TEST_CATEGORY, team_lambda_shared_request) {
   TestLambdaSharedTeam<Kokkos::HostSpace, TEST_EXECSPACE,
                        Kokkos::Schedule<Kokkos::Static> >();
@@ -66,11 +65,10 @@ TEST_F(TEST_CATEGORY, team_lambda_shared_request) {
                        Kokkos::Schedule<Kokkos::Dynamic> >();
 }
 #endif
-#endif
 
-TEST_F(TEST_CATEGORY, shmem_size) { TestShmemSize<TEST_EXECSPACE>(); }
+TEST(TEST_CATEGORY, shmem_size) { TestShmemSize<TEST_EXECSPACE>(); }
 
-TEST_F(TEST_CATEGORY, multi_level_scratch) {
+TEST(TEST_CATEGORY, multi_level_scratch) {
   TestMultiLevelScratchTeam<TEST_EXECSPACE,
                             Kokkos::Schedule<Kokkos::Static> >();
   TestMultiLevelScratchTeam<TEST_EXECSPACE,
diff --git a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_TeamTeamSize.cpp b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_TeamTeamSize.cpp
new file mode 100644
index 000000000..e69de29bb
diff --git a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_TeamVectorRange.cpp b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_TeamVectorRange.cpp
new file mode 100644
index 000000000..e69de29bb
diff --git a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_UniqueToken.cpp b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_UniqueToken.cpp
new file mode 100644
index 000000000..e69de29bb
diff --git a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewAPI_a.cpp b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewAPI_a.cpp
index 5a6257bee..697c374b8 100644
--- a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewAPI_a.cpp
+++ b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewAPI_a.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewAPI_b.cpp b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewAPI_b.cpp
index baaaccd86..5290d9e7b 100644
--- a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewAPI_b.cpp
+++ b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewAPI_b.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewAPI_c.cpp b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewAPI_c.cpp
index 64cd5ae8f..b882c5e42 100644
--- a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewAPI_c.cpp
+++ b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewAPI_c.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewAPI_d.cpp b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewAPI_d.cpp
index 97152f6a0..7f85ddbc5 100644
--- a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewAPI_d.cpp
+++ b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewAPI_d.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewAPI_e.cpp b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewAPI_e.cpp
index 330bb5d95..ff9d7fe2b 100644
--- a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewAPI_e.cpp
+++ b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewAPI_e.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewLayoutStrideAssignment.cpp b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewLayoutStrideAssignment.cpp
new file mode 100644
index 000000000..e69de29bb
diff --git a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewMapping_a.cpp b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewMapping_a.cpp
index a9ccef970..bbacbeda7 100644
--- a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewMapping_a.cpp
+++ b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewMapping_a.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewMapping_b.cpp b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewMapping_b.cpp
index 03dd02193..87ce96359 100644
--- a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewMapping_b.cpp
+++ b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewMapping_b.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewMapping_subview.cpp b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewMapping_subview.cpp
index 58336f023..b187afe40 100644
--- a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewMapping_subview.cpp
+++ b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewMapping_subview.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewOfClass.cpp b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewOfClass.cpp
index 51a7df0e3..c2b40a302 100644
--- a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewOfClass.cpp
+++ b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewOfClass.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewResize.cpp b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_ViewResize.cpp
new file mode 100644
index 000000000..e69de29bb
diff --git a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_View_64bit.cpp b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_View_64bit.cpp
new file mode 100644
index 000000000..e69de29bb
diff --git a/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_WorkGraph.cpp b/kokkos/core/unit_test/openmptarget/TestOpenMPTarget_WorkGraph.cpp
new file mode 100644
index 000000000..e69de29bb
diff --git a/kokkos/core/unit_test/qthreads/TestQthreads_Atomics.cpp b/kokkos/core/unit_test/qthreads/TestQthreads_Atomics.cpp
deleted file mode 100644
index 55da03ede..000000000
--- a/kokkos/core/unit_test/qthreads/TestQthreads_Atomics.cpp
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
-//@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
-*/
-
-#include <qthreads/TestQthreads.hpp>
-
-namespace Test {
-
-TEST_F(qthreads, atomics) {
-#if 0
-  const int loop_count = 1e4;
-
-  ASSERT_TRUE( ( TestAtomic::Loop< int, Kokkos::Qthreads >( loop_count, 1 ) ) );
-  ASSERT_TRUE( ( TestAtomic::Loop< int, Kokkos::Qthreads >( loop_count, 2 ) ) );
-  ASSERT_TRUE( ( TestAtomic::Loop< int, Kokkos::Qthreads >( loop_count, 3 ) ) );
-
-  ASSERT_TRUE( ( TestAtomic::Loop< unsigned int, Kokkos::Qthreads >( loop_count, 1 ) ) );
-  ASSERT_TRUE( ( TestAtomic::Loop< unsigned int, Kokkos::Qthreads >( loop_count, 2 ) ) );
-  ASSERT_TRUE( ( TestAtomic::Loop< unsigned int, Kokkos::Qthreads >( loop_count, 3 ) ) );
-
-  ASSERT_TRUE( ( TestAtomic::Loop< long int, Kokkos::Qthreads >( loop_count, 1 ) ) );
-  ASSERT_TRUE( ( TestAtomic::Loop< long int, Kokkos::Qthreads >( loop_count, 2 ) ) );
-  ASSERT_TRUE( ( TestAtomic::Loop< long int, Kokkos::Qthreads >( loop_count, 3 ) ) );
-
-  ASSERT_TRUE( ( TestAtomic::Loop< unsigned long int, Kokkos::Qthreads >( loop_count, 1 ) ) );
-  ASSERT_TRUE( ( TestAtomic::Loop< unsigned long int, Kokkos::Qthreads >( loop_count, 2 ) ) );
-  ASSERT_TRUE( ( TestAtomic::Loop< unsigned long int, Kokkos::Qthreads >( loop_count, 3 ) ) );
-
-  ASSERT_TRUE( ( TestAtomic::Loop< long long int, Kokkos::Qthreads >( loop_count, 1 ) ) );
-  ASSERT_TRUE( ( TestAtomic::Loop< long long int, Kokkos::Qthreads >( loop_count, 2 ) ) );
-  ASSERT_TRUE( ( TestAtomic::Loop< long long int, Kokkos::Qthreads >( loop_count, 3 ) ) );
-
-  ASSERT_TRUE( ( TestAtomic::Loop< double, Kokkos::Qthreads >( loop_count, 1 ) ) );
-  ASSERT_TRUE( ( TestAtomic::Loop< double, Kokkos::Qthreads >( loop_count, 2 ) ) );
-  ASSERT_TRUE( ( TestAtomic::Loop< double, Kokkos::Qthreads >( loop_count, 3 ) ) );
-
-  ASSERT_TRUE( ( TestAtomic::Loop< float, Kokkos::Qthreads >( 100, 1 ) ) );
-  ASSERT_TRUE( ( TestAtomic::Loop< float, Kokkos::Qthreads >( 100, 2 ) ) );
-  ASSERT_TRUE( ( TestAtomic::Loop< float, Kokkos::Qthreads >( 100, 3 ) ) );
-
-  ASSERT_TRUE( ( TestAtomic::Loop< Kokkos::complex<double>, Kokkos::Qthreads >( 100, 1 ) ) );
-  ASSERT_TRUE( ( TestAtomic::Loop< Kokkos::complex<double>, Kokkos::Qthreads >( 100, 2 ) ) );
-  ASSERT_TRUE( ( TestAtomic::Loop< Kokkos::complex<double>, Kokkos::Qthreads >( 100, 3 ) ) );
-
-  ASSERT_TRUE( ( TestAtomic::Loop< TestAtomic::SuperScalar<4>, Kokkos::Qthreads >( 100, 1 ) ) );
-  ASSERT_TRUE( ( TestAtomic::Loop< TestAtomic::SuperScalar<4>, Kokkos::Qthreads >( 100, 2 ) ) );
-  ASSERT_TRUE( ( TestAtomic::Loop< TestAtomic::SuperScalar<4>, Kokkos::Qthreads >( 100, 3 ) ) );
-#endif
-}
-
-TEST_F(qthreads, atomic_operations) {
-#if 0
-  const int start = 1; // Avoid zero for division.
-  const int end = 11;
-
-  for ( int i = start; i < end; ++i )
-  {
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< int, Kokkos::Qthreads >( start, end - i, 1 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< int, Kokkos::Qthreads >( start, end - i, 2 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< int, Kokkos::Qthreads >( start, end - i, 3 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< int, Kokkos::Qthreads >( start, end - i, 4 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< int, Kokkos::Qthreads >( start, end - i, 5 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< int, Kokkos::Qthreads >( start, end - i, 6 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< int, Kokkos::Qthreads >( start, end - i, 7 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< int, Kokkos::Qthreads >( start, end - i, 8 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< int, Kokkos::Qthreads >( start, end - i, 9 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< int, Kokkos::Qthreads >( start, end - i, 11 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< int, Kokkos::Qthreads >( start, end - i, 12 ) ) );
-
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< unsigned int, Kokkos::Qthreads >( start, end - i, 1 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< unsigned int, Kokkos::Qthreads >( start, end - i, 2 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< unsigned int, Kokkos::Qthreads >( start, end - i, 3 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< unsigned int, Kokkos::Qthreads >( start, end - i, 4 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< unsigned int, Kokkos::Qthreads >( start, end - i, 5 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< unsigned int, Kokkos::Qthreads >( start, end - i, 6 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< unsigned int, Kokkos::Qthreads >( start, end - i, 7 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< unsigned int, Kokkos::Qthreads >( start, end - i, 8 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< unsigned int, Kokkos::Qthreads >( start, end - i, 9 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< unsigned int, Kokkos::Qthreads >( start, end - i, 11 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< unsigned int, Kokkos::Qthreads >( start, end - i, 12 ) ) );
-
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< long int, Kokkos::Qthreads >( start, end - i, 1 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< long int, Kokkos::Qthreads >( start, end - i, 2 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< long int, Kokkos::Qthreads >( start, end - i, 3 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< long int, Kokkos::Qthreads >( start, end - i, 4 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< long int, Kokkos::Qthreads >( start, end - i, 5 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< long int, Kokkos::Qthreads >( start, end - i, 6 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< long int, Kokkos::Qthreads >( start, end - i, 7 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< long int, Kokkos::Qthreads >( start, end - i, 8 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< long int, Kokkos::Qthreads >( start, end - i, 9 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< long int, Kokkos::Qthreads >( start, end - i, 11 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< long int, Kokkos::Qthreads >( start, end - i, 12 ) ) );
-
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< unsigned long int, Kokkos::Qthreads >( start, end - i, 1 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< unsigned long int, Kokkos::Qthreads >( start, end - i, 2 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< unsigned long int, Kokkos::Qthreads >( start, end - i, 3 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< unsigned long int, Kokkos::Qthreads >( start, end - i, 4 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< unsigned long int, Kokkos::Qthreads >( start, end - i, 5 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< unsigned long int, Kokkos::Qthreads >( start, end - i, 6 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< unsigned long int, Kokkos::Qthreads >( start, end - i, 7 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< unsigned long int, Kokkos::Qthreads >( start, end - i, 8 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< unsigned long int, Kokkos::Qthreads >( start, end - i, 9 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< unsigned long int, Kokkos::Qthreads >( start, end - i, 11 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< unsigned long int, Kokkos::Qthreads >( start, end - i, 12 ) ) );
-
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< long long int, Kokkos::Qthreads >( start, end - i, 1 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< long long int, Kokkos::Qthreads >( start, end - i, 2 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< long long int, Kokkos::Qthreads >( start, end - i, 3 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< long long int, Kokkos::Qthreads >( start, end - i, 4 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< long long int, Kokkos::Qthreads >( start, end - i, 5 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< long long int, Kokkos::Qthreads >( start, end - i, 6 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< long long int, Kokkos::Qthreads >( start, end - i, 7 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< long long int, Kokkos::Qthreads >( start, end - i, 8 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< long long int, Kokkos::Qthreads >( start, end - i, 9 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< long long int, Kokkos::Qthreads >( start, end - i, 11 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestIntegralType< long long int, Kokkos::Qthreads >( start, end - i, 12 ) ) );
-
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestNonIntegralType< double, Kokkos::Qthreads >( start, end - i, 1 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestNonIntegralType< double, Kokkos::Qthreads >( start, end - i, 2 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestNonIntegralType< double, Kokkos::Qthreads >( start, end - i, 3 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestNonIntegralType< double, Kokkos::Qthreads >( start, end - i, 4 ) ) );
-
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestNonIntegralType< float, Kokkos::Qthreads >( start, end - i, 1 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestNonIntegralType< float, Kokkos::Qthreads >( start, end - i, 2 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestNonIntegralType< float, Kokkos::Qthreads >( start, end - i, 3 ) ) );
-    ASSERT_TRUE( ( TestAtomicOperations::AtomicOperationsTestNonIntegralType< float, Kokkos::Qthreads >( start, end - i, 4 ) ) );
-  }
-#endif
-}
-
-TEST_F(qthreads, atomic_views_integral) {
-#if 0
-  const long length = 1000000;
-
-  {
-    // Integral Types.
-    ASSERT_TRUE( ( TestAtomicViews::AtomicViewsTestIntegralType< long, Kokkos::Qthreads >( length, 1 ) ) );
-    ASSERT_TRUE( ( TestAtomicViews::AtomicViewsTestIntegralType< long, Kokkos::Qthreads >( length, 2 ) ) );
-    ASSERT_TRUE( ( TestAtomicViews::AtomicViewsTestIntegralType< long, Kokkos::Qthreads >( length, 3 ) ) );
-    ASSERT_TRUE( ( TestAtomicViews::AtomicViewsTestIntegralType< long, Kokkos::Qthreads >( length, 4 ) ) );
-    ASSERT_TRUE( ( TestAtomicViews::AtomicViewsTestIntegralType< long, Kokkos::Qthreads >( length, 5 ) ) );
-    ASSERT_TRUE( ( TestAtomicViews::AtomicViewsTestIntegralType< long, Kokkos::Qthreads >( length, 6 ) ) );
-    ASSERT_TRUE( ( TestAtomicViews::AtomicViewsTestIntegralType< long, Kokkos::Qthreads >( length, 7 ) ) );
-    ASSERT_TRUE( ( TestAtomicViews::AtomicViewsTestIntegralType< long, Kokkos::Qthreads >( length, 8 ) ) );
-  }
-#endif
-}
-
-TEST_F(qthreads, atomic_views_nonintegral) {
-#if 0
-  const long length = 1000000;
-
-  {
-    // Non-Integral Types.
-    ASSERT_TRUE( ( TestAtomicViews::AtomicViewsTestNonIntegralType< double, Kokkos::Qthreads >( length, 1 ) ) );
-    ASSERT_TRUE( ( TestAtomicViews::AtomicViewsTestNonIntegralType< double, Kokkos::Qthreads >( length, 2 ) ) );
-    ASSERT_TRUE( ( TestAtomicViews::AtomicViewsTestNonIntegralType< double, Kokkos::Qthreads >( length, 3 ) ) );
-    ASSERT_TRUE( ( TestAtomicViews::AtomicViewsTestNonIntegralType< double, Kokkos::Qthreads >( length, 4 ) ) );
-  }
-#endif
-}
-
-TEST_F(qthreads, atomic_view_api) {
-#if 0
-  TestAtomicViews::TestAtomicViewAPI< int, Kokkos::Qthreads >();
-#endif
-}
-
-}  // namespace Test
diff --git a/kokkos/core/unit_test/qthreads/TestQthreads_Complex.cpp b/kokkos/core/unit_test/qthreads/TestQthreads_Complex.cpp
deleted file mode 100644
index 09e1ca3e2..000000000
--- a/kokkos/core/unit_test/qthreads/TestQthreads_Complex.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <qthreads/TestQthreads_Category.hpp>
-#include <TestComplex.hpp>
diff --git a/kokkos/core/unit_test/qthreads/TestQthreads_Other.cpp b/kokkos/core/unit_test/qthreads/TestQthreads_Other.cpp
deleted file mode 100644
index 0a22415b7..000000000
--- a/kokkos/core/unit_test/qthreads/TestQthreads_Other.cpp
+++ /dev/null
@@ -1,196 +0,0 @@
-/*
-//@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
-*/
-
-#include <qthreads/TestQthreads.hpp>
-
-namespace Test {
-
-TEST_F(qthreads, init) { ; }
-
-TEST_F(qthreads, md_range) {
-#if 0
-  TestMDRange_2D< Kokkos::Qthreads >::test_for2( 100, 100 );
-  TestMDRange_3D< Kokkos::Qthreads >::test_for3( 100, 100, 100 );
-#endif
-}
-
-TEST_F(qthreads, policy_construction) {
-#if 0
-  TestRangePolicyConstruction< Kokkos::Qthreads >();
-  TestTeamPolicyConstruction< Kokkos::Qthreads >();
-#endif
-}
-
-TEST_F(qthreads, range_tag) {
-#if 0
-  TestRange< Kokkos::Qthreads, Kokkos::Schedule<Kokkos::Static> >::test_for( 0 );
-  TestRange< Kokkos::Qthreads, Kokkos::Schedule<Kokkos::Static> >::test_reduce( 0 );
-  TestRange< Kokkos::Qthreads, Kokkos::Schedule<Kokkos::Static> >::test_scan( 0 );
-  TestRange< Kokkos::Qthreads, Kokkos::Schedule<Kokkos::Dynamic> >::test_for( 0 );
-  TestRange< Kokkos::Qthreads, Kokkos::Schedule<Kokkos::Dynamic> >::test_reduce( 0 );
-  TestRange< Kokkos::Qthreads, Kokkos::Schedule<Kokkos::Dynamic> >::test_scan( 0 );
-  TestRange< Kokkos::Qthreads, Kokkos::Schedule<Kokkos::Dynamic> >::test_dynamic_policy( 0 );
-
-  TestRange< Kokkos::Qthreads, Kokkos::Schedule<Kokkos::Static> >::test_for( 2 );
-  TestRange< Kokkos::Qthreads, Kokkos::Schedule<Kokkos::Static> >::test_reduce( 2 );
-  TestRange< Kokkos::Qthreads, Kokkos::Schedule<Kokkos::Static> >::test_scan( 2 );
-
-  TestRange< Kokkos::Qthreads, Kokkos::Schedule<Kokkos::Dynamic> >::test_for( 3 );
-  TestRange< Kokkos::Qthreads, Kokkos::Schedule<Kokkos::Dynamic> >::test_reduce( 3 );
-  TestRange< Kokkos::Qthreads, Kokkos::Schedule<Kokkos::Dynamic> >::test_scan( 3 );
-  TestRange< Kokkos::Qthreads, Kokkos::Schedule<Kokkos::Dynamic> >::test_dynamic_policy( 3 );
-
-  TestRange< Kokkos::Qthreads, Kokkos::Schedule<Kokkos::Static> >::test_for( 1000 );
-  TestRange< Kokkos::Qthreads, Kokkos::Schedule<Kokkos::Static> >::test_reduce( 1000 );
-  TestRange< Kokkos::Qthreads, Kokkos::Schedule<Kokkos::Static> >::test_scan( 1000 );
-
-  TestRange< Kokkos::Qthreads, Kokkos::Schedule<Kokkos::Dynamic> >::test_for( 1001 );
-  TestRange< Kokkos::Qthreads, Kokkos::Schedule<Kokkos::Dynamic> >::test_reduce( 1001 );
-  TestRange< Kokkos::Qthreads, Kokkos::Schedule<Kokkos::Dynamic> >::test_scan( 1001 );
-  TestRange< Kokkos::Qthreads, Kokkos::Schedule<Kokkos::Dynamic> >::test_dynamic_policy( 1000 );
-#endif
-}
-
-//----------------------------------------------------------------------------
-
-TEST_F(qthreads, compiler_macros) {
-#if 0
-  ASSERT_TRUE( ( TestCompilerMacros::Test< Kokkos::Qthreads >() ) );
-#endif
-}
-
-//----------------------------------------------------------------------------
-
-TEST_F(qthreads, memory_pool) {
-#if 0
-
-#endif
-}
-
-//----------------------------------------------------------------------------
-
-#if defined(KOKKOS_ENABLE_TASKDAG)
-
-TEST_F(qthreads, task_fib) {
-#if 0
-  const int N = 24 ; // 25 triggers tbd bug on Cuda/Pascal
-  for ( int i = 0; i < N; ++i ) {
-    TestTaskScheduler::TestFib< Kokkos::Qthreads >::run( i, ( i + 1 ) * ( i + 1 ) * 10000 );
-  }
-#endif
-}
-
-TEST_F(qthreads, task_depend) {
-#if 0
-  for ( int i = 0; i < 25; ++i ) {
-    TestTaskScheduler::TestTaskDependence< Kokkos::Qthreads >::run( i );
-  }
-#endif
-}
-
-TEST_F(qthreads, task_team) {
-#if 0
-  TestTaskScheduler::TestTaskTeam< Kokkos::Qthreads >::run( 1000 );
-  //TestTaskScheduler::TestTaskTeamValue< Kokkos::Qthreads >::run( 1000 ); // Put back after testing.
-#endif
-}
-
-#endif  // #if defined( KOKKOS_ENABLE_TASKDAG )
-
-//----------------------------------------------------------------------------
-
-#if defined(KOKKOS_ENABLE_DEFAULT_DEVICE_TYPE_QTHREADS)
-
-TEST_F(qthreads, cxx11) {
-#if 0
-  if ( std::is_same< Kokkos::DefaultExecutionSpace, Kokkos::Qthreads >::value ) {
-    ASSERT_TRUE( ( TestCXX11::Test< Kokkos::Qthreads >( 1 ) ) );
-    ASSERT_TRUE( ( TestCXX11::Test< Kokkos::Qthreads >( 2 ) ) );
-    ASSERT_TRUE( ( TestCXX11::Test< Kokkos::Qthreads >( 3 ) ) );
-    ASSERT_TRUE( ( TestCXX11::Test< Kokkos::Qthreads >( 4 ) ) );
-  }
-#endif
-}
-
-#endif
-
-TEST_F(qthreads, tile_layout) {
-#if 0
-  TestTile::test< Kokkos::Qthreads, 1, 1 >( 1, 1 );
-  TestTile::test< Kokkos::Qthreads, 1, 1 >( 2, 3 );
-  TestTile::test< Kokkos::Qthreads, 1, 1 >( 9, 10 );
-
-  TestTile::test< Kokkos::Qthreads, 2, 2 >( 1, 1 );
-  TestTile::test< Kokkos::Qthreads, 2, 2 >( 2, 3 );
-  TestTile::test< Kokkos::Qthreads, 2, 2 >( 4, 4 );
-  TestTile::test< Kokkos::Qthreads, 2, 2 >( 9, 9 );
-
-  TestTile::test< Kokkos::Qthreads, 2, 4 >( 9, 9 );
-  TestTile::test< Kokkos::Qthreads, 4, 2 >( 9, 9 );
-
-  TestTile::test< Kokkos::Qthreads, 4, 4 >( 1, 1 );
-  TestTile::test< Kokkos::Qthreads, 4, 4 >( 4, 4 );
-  TestTile::test< Kokkos::Qthreads, 4, 4 >( 9, 9 );
-  TestTile::test< Kokkos::Qthreads, 4, 4 >( 9, 11 );
-
-  TestTile::test< Kokkos::Qthreads, 8, 8 >( 1, 1 );
-  TestTile::test< Kokkos::Qthreads, 8, 8 >( 4, 4 );
-  TestTile::test< Kokkos::Qthreads, 8, 8 >( 9, 9 );
-  TestTile::test< Kokkos::Qthreads, 8, 8 >( 9, 11 );
-#endif
-}
-
-TEST_F(qthreads, dispatch) {
-#if 0
-  const int repeat = 100;
-  for ( int i = 0; i < repeat; ++i ) {
-    for ( int j = 0; j < repeat; ++j ) {
-      Kokkos::parallel_for( Kokkos::RangePolicy< Kokkos::Qthreads >( 0, j )
-                          , KOKKOS_LAMBDA( int ) {} );
-    }
-  }
-#endif
-}
-
-}  // namespace Test
diff --git a/kokkos/core/unit_test/qthreads/TestQthreads_Reductions.cpp b/kokkos/core/unit_test/qthreads/TestQthreads_Reductions.cpp
deleted file mode 100644
index be3675447..000000000
--- a/kokkos/core/unit_test/qthreads/TestQthreads_Reductions.cpp
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
-//@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
-*/
-
-#include <qthreads/TestQthreads.hpp>
-
-namespace Test {
-
-TEST_F(qthreads, long_reduce) {
-#if 0
-  TestReduce< long, Kokkos::Qthreads >( 0 );
-  TestReduce< long, Kokkos::Qthreads >( 1000000 );
-#endif
-}
-
-TEST_F(qthreads, double_reduce) {
-#if 0
-  TestReduce< double, Kokkos::Qthreads >( 0 );
-  TestReduce< double, Kokkos::Qthreads >( 1000000 );
-#endif
-}
-
-TEST_F(qthreads, reducers) {
-#if 0
-  TestReducers< int, Kokkos::Qthreads >::execute_integer();
-  TestReducers< size_t, Kokkos::Qthreads >::execute_integer();
-  TestReducers< double, Kokkos::Qthreads >::execute_float();
-  TestReducers< Kokkos::complex<double >, Kokkos::Qthreads>::execute_basic();
-#endif
-}
-
-TEST_F(qthreads, long_reduce_dynamic) {
-#if 0
-  TestReduceDynamic< long, Kokkos::Qthreads >( 0 );
-  TestReduceDynamic< long, Kokkos::Qthreads >( 1000000 );
-#endif
-}
-
-TEST_F(qthreads, double_reduce_dynamic) {
-#if 0
-  TestReduceDynamic< double, Kokkos::Qthreads >( 0 );
-  TestReduceDynamic< double, Kokkos::Qthreads >( 1000000 );
-#endif
-}
-
-TEST_F(qthreads, long_reduce_dynamic_view) {
-#if 0
-  TestReduceDynamicView< long, Kokkos::Qthreads >( 0 );
-  TestReduceDynamicView< long, Kokkos::Qthreads >( 1000000 );
-#endif
-}
-
-TEST_F(qthreads, scan) {
-#if 0
-  TestScan< Kokkos::Qthreads >::test_range( 1, 1000 );
-  TestScan< Kokkos::Qthreads >( 0 );
-  TestScan< Kokkos::Qthreads >( 100000 );
-  TestScan< Kokkos::Qthreads >( 10000000 );
-  Kokkos::Qthreads().fence();
-#endif
-}
-
-TEST_F(qthreads, scan_small) {
-#if 0
-  typedef TestScan< Kokkos::Qthreads, Kokkos::Impl::QthreadsExecUseScanSmall > TestScanFunctor;
-
-  for ( int i = 0; i < 1000; ++i ) {
-    TestScanFunctor( 10 );
-    TestScanFunctor( 10000 );
-  }
-  TestScanFunctor( 1000000 );
-  TestScanFunctor( 10000000 );
-
-  Kokkos::Qthreads().fence();
-#endif
-}
-
-TEST_F(qthreads, team_scan) {
-#if 0
-  TestScanTeam< Kokkos::Qthreads, Kokkos::Schedule<Kokkos::Static> >( 0 );
-  TestScanTeam< Kokkos::Qthreads, Kokkos::Schedule<Kokkos::Dynamic> >( 0 );
-  TestScanTeam< Kokkos::Qthreads, Kokkos::Schedule<Kokkos::Static> >( 10 );
-  TestScanTeam< Kokkos::Qthreads, Kokkos::Schedule<Kokkos::Dynamic> >( 10 );
-  TestScanTeam< Kokkos::Qthreads, Kokkos::Schedule<Kokkos::Static> >( 10000 );
-  TestScanTeam< Kokkos::Qthreads, Kokkos::Schedule<Kokkos::Dynamic> >( 10000 );
-#endif
-}
-
-TEST_F(qthreads, team_long_reduce) {
-#if 0
-  TestReduceTeam< long, Kokkos::Qthreads, Kokkos::Schedule<Kokkos::Static> >( 0 );
-  TestReduceTeam< long, Kokkos::Qthreads, Kokkos::Schedule<Kokkos::Dynamic> >( 0 );
-  TestReduceTeam< long, Kokkos::Qthreads, Kokkos::Schedule<Kokkos::Static> >( 3 );
-  TestReduceTeam< long, Kokkos::Qthreads, Kokkos::Schedule<Kokkos::Dynamic> >( 3 );
-  TestReduceTeam< long, Kokkos::Qthreads, Kokkos::Schedule<Kokkos::Static> >( 100000 );
-  TestReduceTeam< long, Kokkos::Qthreads, Kokkos::Schedule<Kokkos::Dynamic> >( 100000 );
-#endif
-}
-
-TEST_F(qthreads, team_double_reduce) {
-#if 0
-  TestReduceTeam< double, Kokkos::Qthreads, Kokkos::Schedule<Kokkos::Static> >( 0 );
-  TestReduceTeam< double, Kokkos::Qthreads, Kokkos::Schedule<Kokkos::Dynamic> >( 0 );
-  TestReduceTeam< double, Kokkos::Qthreads, Kokkos::Schedule<Kokkos::Static> >( 3 );
-  TestReduceTeam< double, Kokkos::Qthreads, Kokkos::Schedule<Kokkos::Dynamic> >( 3 );
-  TestReduceTeam< double, Kokkos::Qthreads, Kokkos::Schedule<Kokkos::Static> >( 100000 );
-  TestReduceTeam< double, Kokkos::Qthreads, Kokkos::Schedule<Kokkos::Dynamic> >( 100000 );
-#endif
-}
-
-TEST_F(qthreads, reduction_deduction) {
-#if 0
-  TestCXX11::test_reduction_deduction< Kokkos::Qthreads >();
-#endif
-}
-
-}  // namespace Test
diff --git a/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c05.cpp b/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c05.cpp
deleted file mode 100644
index 3cf600f14..000000000
--- a/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c05.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
-//@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
-*/
-
-#include <qthreads/TestQthreads.hpp>
-
-namespace Test {
-
-TEST_F(qthreads, view_subview_2d_from_3d_atomic) {
-#if 0
-  TestViewSubview::test_2d_subview_3d< Kokkos::Qthreads, Kokkos::MemoryTraits<Kokkos::Atomic> >();
-#endif
-}
-
-}  // namespace Test
diff --git a/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c06.cpp b/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c06.cpp
deleted file mode 100644
index 9812f7a56..000000000
--- a/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c06.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
-//@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
-*/
-
-#include <qthreads/TestQthreads.hpp>
-
-namespace Test {
-
-TEST_F(qthreads, view_subview_2d_from_3d_randomaccess) {
-#if 0
-  TestViewSubview::test_2d_subview_3d< Kokkos::Qthreads, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
-#endif
-}
-
-}  // namespace Test
diff --git a/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c08.cpp b/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c08.cpp
deleted file mode 100644
index b56d895a4..000000000
--- a/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c08.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
-//@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
-*/
-
-#include <qthreads/TestQthreads.hpp>
-
-namespace Test {
-
-TEST_F(qthreads, view_subview_3d_from_5d_left_atomic) {
-#if 0
-  TestViewSubview::test_3d_subview_5d_left< Kokkos::Qthreads, Kokkos::MemoryTraits<Kokkos::Atomic> >();
-#endif
-}
-
-}  // namespace Test
diff --git a/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c09.cpp b/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c09.cpp
deleted file mode 100644
index 2983a705f..000000000
--- a/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c09.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
-//@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
-*/
-
-#include <qthreads/TestQthreads.hpp>
-
-namespace Test {
-
-TEST_F(qthreads, view_subview_3d_from_5d_left_randomaccess) {
-#if 0
-  TestViewSubview::test_3d_subview_5d_left< Kokkos::Qthreads, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
-#endif
-}
-
-}  // namespace Test
diff --git a/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c11.cpp b/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c11.cpp
deleted file mode 100644
index 37715a148..000000000
--- a/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c11.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
-//@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
-*/
-
-#include <qthreads/TestQthreads.hpp>
-
-namespace Test {
-
-TEST_F(qthreads, view_subview_3d_from_5d_right_atomic) {
-#if 0
-  TestViewSubview::test_3d_subview_5d_right< Kokkos::Qthreads, Kokkos::MemoryTraits<Kokkos::Atomic> >();
-#endif
-}
-
-}  // namespace Test
diff --git a/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c12.cpp b/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c12.cpp
deleted file mode 100644
index 16eca1c29..000000000
--- a/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c12.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
-//@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
-*/
-
-#include <qthreads/TestQthreads.hpp>
-
-namespace Test {
-
-TEST_F(qthreads, view_subview_3d_from_5d_right_randomaccess) {
-#if 0
-  TestViewSubview::test_3d_subview_5d_right< Kokkos::Qthreads, Kokkos::MemoryTraits<Kokkos::RandomAccess> >();
-#endif
-}
-
-}  // namespace Test
diff --git a/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c13.cpp b/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c13.cpp
deleted file mode 100644
index 5f3cd9180..000000000
--- a/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c13.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
-//@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
-*/
-
-#include <qthreads/TestQthreads.hpp>
-
-namespace Test {
-
-TEST_F(qthreads, view_test_unmanaged_subview_reset) {
-#if 0
-  TestViewSubview::test_unmanaged_subview_reset< TEST_EXECSPACE >();
-#endif
-}
-
-}  // namespace Test
diff --git a/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c_all.cpp b/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c_all.cpp
deleted file mode 100644
index d8ea958a5..000000000
--- a/kokkos/core/unit_test/qthreads/TestQthreads_SubView_c_all.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-#include <qthreads/TestQthreads_SubView_c01.cpp>
-#include <qthreads/TestQthreads_SubView_c02.cpp>
-#include <qthreads/TestQthreads_SubView_c03.cpp>
-#include <qthreads/TestQthreads_SubView_c04.cpp>
-#include <qthreads/TestQthreads_SubView_c05.cpp>
-#include <qthreads/TestQthreads_SubView_c06.cpp>
-#include <qthreads/TestQthreads_SubView_c07.cpp>
-#include <qthreads/TestQthreads_SubView_c08.cpp>
-#include <qthreads/TestQthreads_SubView_c09.cpp>
-#include <qthreads/TestQthreads_SubView_c10.cpp>
-#include <qthreads/TestQthreads_SubView_c11.cpp>
-#include <qthreads/TestQthreads_SubView_c12.cpp>
-#include <qthreads/TestQthreads_SubView_c13.cpp>
diff --git a/kokkos/core/unit_test/qthreads/TestQthreads_Team.cpp b/kokkos/core/unit_test/qthreads/TestQthreads_Team.cpp
deleted file mode 100644
index 162b0625b..000000000
--- a/kokkos/core/unit_test/qthreads/TestQthreads_Team.cpp
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
-//@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
-*/
-
-#include <qthreads/TestQthreads.hpp>
-
-namespace Test {
-
-TEST_F(qthreads, team_tag) {
-#if 0
-  TestTeamPolicy< Kokkos::Qthreads, Kokkos::Schedule<Kokkos::Static> >::test_for( 0 );
-  TestTeamPolicy< Kokkos::Qthreads, Kokkos::Schedule<Kokkos::Static> >::test_reduce( 0 );
-  TestTeamPolicy< Kokkos::Qthreads, Kokkos::Schedule<Kokkos::Dynamic> >::test_for( 0 );
-  TestTeamPolicy< Kokkos::Qthreads, Kokkos::Schedule<Kokkos::Dynamic> >::test_reduce( 0 );
-
-  TestTeamPolicy< Kokkos::Qthreads, Kokkos::Schedule<Kokkos::Static> >::test_for( 2 );
-  TestTeamPolicy< Kokkos::Qthreads, Kokkos::Schedule<Kokkos::Static> >::test_reduce( 2 );
-  TestTeamPolicy< Kokkos::Qthreads, Kokkos::Schedule<Kokkos::Dynamic> >::test_for( 2 );
-  TestTeamPolicy< Kokkos::Qthreads, Kokkos::Schedule<Kokkos::Dynamic> >::test_reduce( 2 );
-
-  TestTeamPolicy< Kokkos::Qthreads, Kokkos::Schedule<Kokkos::Static> >::test_for( 1000 );
-  TestTeamPolicy< Kokkos::Qthreads, Kokkos::Schedule<Kokkos::Static> >::test_reduce( 1000 );
-  TestTeamPolicy< Kokkos::Qthreads, Kokkos::Schedule<Kokkos::Dynamic> >::test_for( 1000 );
-  TestTeamPolicy< Kokkos::Qthreads, Kokkos::Schedule<Kokkos::Dynamic> >::test_reduce( 1000 );
-#endif
-}
-
-TEST_F(qthreads, team_shared_request) {
-#if 0
-  TestSharedTeam< Kokkos::Qthreads, Kokkos::Schedule<Kokkos::Static> >();
-  TestSharedTeam< Kokkos::Qthreads, Kokkos::Schedule<Kokkos::Dynamic> >();
-#endif
-}
-
-TEST_F(qthreads, team_scratch_request) {
-#if 0
-  TestScratchTeam< Kokkos::Qthreads, Kokkos::Schedule<Kokkos::Static> >();
-  TestScratchTeam< Kokkos::Qthreads, Kokkos::Schedule<Kokkos::Dynamic> >();
-#endif
-}
-
-#if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
-TEST_F(qthreads, team_lambda_shared_request) {
-#if 0
-  TestLambdaSharedTeam< Kokkos::HostSpace, Kokkos::Qthreads, Kokkos::Schedule<Kokkos::Static> >();
-  TestLambdaSharedTeam< Kokkos::HostSpace, Kokkos::Qthreads, Kokkos::Schedule<Kokkos::Dynamic> >();
-#endif
-}
-#endif
-
-TEST_F(qthreads, shmem_size) {
-#if 0
-  TestShmemSize< Kokkos::Qthreads >();
-#endif
-}
-
-TEST_F(qthreads, multi_level_scratch) {
-#if 0
-  TestMultiLevelScratchTeam< Kokkos::Qthreads, Kokkos::Schedule<Kokkos::Static> >();
-  TestMultiLevelScratchTeam< Kokkos::Qthreads, Kokkos::Schedule<Kokkos::Dynamic> >();
-#endif
-}
-
-TEST_F(qthreads, team_vector) {
-#if 0
-  ASSERT_TRUE( ( TestTeamVector::Test< Kokkos::Qthreads >( 0 ) ) );
-  ASSERT_TRUE( ( TestTeamVector::Test< Kokkos::Qthreads >( 1 ) ) );
-  ASSERT_TRUE( ( TestTeamVector::Test< Kokkos::Qthreads >( 2 ) ) );
-  ASSERT_TRUE( ( TestTeamVector::Test< Kokkos::Qthreads >( 3 ) ) );
-  ASSERT_TRUE( ( TestTeamVector::Test< Kokkos::Qthreads >( 4 ) ) );
-  ASSERT_TRUE( ( TestTeamVector::Test< Kokkos::Qthreads >( 5 ) ) );
-  ASSERT_TRUE( ( TestTeamVector::Test< Kokkos::Qthreads >( 6 ) ) );
-  ASSERT_TRUE( ( TestTeamVector::Test< Kokkos::Qthreads >( 7 ) ) );
-  ASSERT_TRUE( ( TestTeamVector::Test< Kokkos::Qthreads >( 8 ) ) );
-  ASSERT_TRUE( ( TestTeamVector::Test< Kokkos::Qthreads >( 9 ) ) );
-  ASSERT_TRUE( ( TestTeamVector::Test< Kokkos::Qthreads >( 10 ) ) );
-#endif
-}
-
-#ifdef KOKKOS_COMPILER_GNU
-#if (KOKKOS_COMPILER_GNU == 472)
-#define SKIP_TEST
-#endif
-#endif
-
-#ifndef SKIP_TEST
-TEST_F(qthreads, triple_nested_parallelism) {
-#if 0
-  TestTripleNestedReduce< double, Kokkos::Qthreads >( 8192, 2048, 32, 32 );
-  TestTripleNestedReduce< double, Kokkos::Qthreads >( 8192, 2048, 32, 16 );
-  TestTripleNestedReduce< double, Kokkos::Qthreads >( 8192, 2048, 16, 16 );
-#endif
-}
-#endif
-
-}  // namespace Test
diff --git a/kokkos/core/unit_test/qthreads/TestQthreads_ViewAPI_a.cpp b/kokkos/core/unit_test/qthreads/TestQthreads_ViewAPI_a.cpp
deleted file mode 100644
index 5c0bca1cc..000000000
--- a/kokkos/core/unit_test/qthreads/TestQthreads_ViewAPI_a.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
-//@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
-*/
-
-#include <qthreads/TestQthreads.hpp>
-
-namespace Test {
-
-TEST_F(qthreads, impl_view_mapping_a) {
-#if 0
-  test_view_mapping< Kokkos::Qthreads >();
-  test_view_mapping_operator< Kokkos::Qthreads >();
-#endif
-}
-
-}  // namespace Test
diff --git a/kokkos/core/unit_test/qthreads/TestQthreads_ViewAPI_b.cpp b/kokkos/core/unit_test/qthreads/TestQthreads_ViewAPI_b.cpp
deleted file mode 100644
index 838173877..000000000
--- a/kokkos/core/unit_test/qthreads/TestQthreads_ViewAPI_b.cpp
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
-//@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
-*/
-
-#include <qthreads/TestQthreads.hpp>
-
-namespace Test {
-
-TEST_F(qthreads, impl_shared_alloc) {
-#if 0
-  test_shared_alloc< Kokkos::HostSpace, Kokkos::Qthreads >();
-#endif
-}
-
-TEST_F(qthreads, impl_view_mapping_b) {
-#if 0
-  test_view_mapping_subview< Kokkos::Qthreads >();
-  TestViewMappingAtomic< Kokkos::Qthreads >::run();
-#endif
-}
-
-TEST_F(qthreads, view_api) {
-#if 0
-  TestViewAPI< double, Kokkos::Qthreads >();
-#endif
-}
-
-TEST_F(qthreads, view_nested_view) {
-#if 0
-  ::Test::view_nested_view< Kokkos::Qthreads >();
-#endif
-}
-
-TEST_F(qthreads, view_remap) {
-#if 0
-  enum { N0 = 3, N1 = 2, N2 = 8, N3 = 9 };
-
-  typedef Kokkos::View< double*[N1][N2][N3],
-                        Kokkos::LayoutRight,
-                        Kokkos::Qthreads > output_type;
-
-  typedef Kokkos::View< int**[N2][N3],
-                        Kokkos::LayoutLeft,
-                        Kokkos::Qthreads > input_type;
-
-  typedef Kokkos::View< int*[N0][N2][N3],
-                        Kokkos::LayoutLeft,
-                        Kokkos::Qthreads > diff_type;
-
-  output_type output( "output", N0 );
-  input_type  input ( "input", N0, N1 );
-  diff_type   diff  ( "diff", N0 );
-
-  int value = 0;
-
-  for ( size_t i3 = 0; i3 < N3; ++i3 )
-  for ( size_t i2 = 0; i2 < N2; ++i2 )
-  for ( size_t i1 = 0; i1 < N1; ++i1 )
-  for ( size_t i0 = 0; i0 < N0; ++i0 )
-  {
-    input( i0, i1, i2, i3 ) = ++value;
-  }
-
-  // Kokkos::deep_copy( diff, input ); // Throw with incompatible shape.
-  Kokkos::deep_copy( output, input );
-
-  value = 0;
-
-  for ( size_t i3 = 0; i3 < N3; ++i3 )
-  for ( size_t i2 = 0; i2 < N2; ++i2 )
-  for ( size_t i1 = 0; i1 < N1; ++i1 )
-  for ( size_t i0 = 0; i0 < N0; ++i0 )
-  {
-    ++value;
-    ASSERT_EQ( value, ( (int) output( i0, i1, i2, i3 ) ) );
-  }
-#endif
-}
-
-TEST_F(qthreads, view_aggregate) {
-#if 0
-  TestViewAggregate< Kokkos::Qthreads >();
-#endif
-}
-
-TEST_F(qthreads, template_meta_functions) {
-#if 0
-  TestTemplateMetaFunctions< int, Kokkos::Qthreads >();
-#endif
-}
-
-}  // namespace Test
diff --git a/kokkos/core/unit_test/rocm/TestROCmHostPinned_Category.hpp b/kokkos/core/unit_test/rocm/TestROCmHostPinned_Category.hpp
index f39b07725..fc74d52b4 100644
--- a/kokkos/core/unit_test/rocm/TestROCmHostPinned_Category.hpp
+++ b/kokkos/core/unit_test/rocm/TestROCmHostPinned_Category.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/rocm/TestROCmHostPinned_SharedAlloc.cpp b/kokkos/core/unit_test/rocm/TestROCmHostPinned_SharedAlloc.cpp
index cbe1f80b3..091cd7499 100644
--- a/kokkos/core/unit_test/rocm/TestROCmHostPinned_SharedAlloc.cpp
+++ b/kokkos/core/unit_test/rocm/TestROCmHostPinned_SharedAlloc.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewAPI_a.cpp b/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewAPI_a.cpp
index 865fb2fa3..b3cce0daf 100644
--- a/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewAPI_a.cpp
+++ b/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewAPI_a.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewAPI_b.cpp b/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewAPI_b.cpp
index 47e55be07..edebed696 100644
--- a/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewAPI_b.cpp
+++ b/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewAPI_b.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewAPI_c.cpp b/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewAPI_c.cpp
index 263019256..e2ffbd16a 100644
--- a/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewAPI_c.cpp
+++ b/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewAPI_c.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewAPI_d.cpp b/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewAPI_d.cpp
index 8c6fd634b..c88b1ecd3 100644
--- a/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewAPI_d.cpp
+++ b/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewAPI_d.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewAPI_e.cpp b/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewAPI_e.cpp
index 72ff85065..216f72bd6 100644
--- a/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewAPI_e.cpp
+++ b/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewAPI_e.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewCopy.cpp b/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewCopy.cpp
index fd3d1b4a1..197c4c679 100644
--- a/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewCopy.cpp
+++ b/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewCopy.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewMapping_a.cpp b/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewMapping_a.cpp
index c3dc802cb..d1cb384b1 100644
--- a/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewMapping_a.cpp
+++ b/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewMapping_a.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewMapping_b.cpp b/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewMapping_b.cpp
index 05c2a3d4c..cde6d7450 100644
--- a/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewMapping_b.cpp
+++ b/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewMapping_b.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewMapping_subview.cpp b/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewMapping_subview.cpp
index 3649a1df3..77deaedde 100644
--- a/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewMapping_subview.cpp
+++ b/kokkos/core/unit_test/rocm/TestROCmHostPinned_ViewMapping_subview.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/rocm/TestROCmHostPinned_View_64bit.cpp b/kokkos/core/unit_test/rocm/TestROCmHostPinned_View_64bit.cpp
index ab95ca5bb..e21aeafe7 100644
--- a/kokkos/core/unit_test/rocm/TestROCmHostPinned_View_64bit.cpp
+++ b/kokkos/core/unit_test/rocm/TestROCmHostPinned_View_64bit.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_double.cpp b/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_double.cpp
index 32abd5ce1..98bda0627 100644
--- a/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_double.cpp
+++ b/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_double.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_float.cpp b/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_float.cpp
index 5ac18ae78..c8f85dccf 100644
--- a/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_float.cpp
+++ b/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_float.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_int.cpp b/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_int.cpp
index 6aa06234e..83d36857e 100644
--- a/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_int.cpp
+++ b/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_int.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_longint.cpp b/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_longint.cpp
index ead0ab132..a0e02160f 100644
--- a/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_longint.cpp
+++ b/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_longint.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_longlongint.cpp b/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_longlongint.cpp
index 2ca88273b..d7dac704e 100644
--- a/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_longlongint.cpp
+++ b/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_longlongint.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_unsignedint.cpp b/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_unsignedint.cpp
index f551bf16d..b3c4cf271 100644
--- a/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_unsignedint.cpp
+++ b/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_unsignedint.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_unsignedlongint.cpp b/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_unsignedlongint.cpp
index 21ca5489f..0e6873ed4 100644
--- a/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_unsignedlongint.cpp
+++ b/kokkos/core/unit_test/rocm/TestROCm_AtomicOperations_unsignedlongint.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/rocm/TestROCm_AtomicViews.cpp b/kokkos/core/unit_test/rocm/TestROCm_AtomicViews.cpp
index cceb16faf..393562b88 100644
--- a/kokkos/core/unit_test/rocm/TestROCm_AtomicViews.cpp
+++ b/kokkos/core/unit_test/rocm/TestROCm_AtomicViews.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/rocm/TestROCm_Atomics.cpp b/kokkos/core/unit_test/rocm/TestROCm_Atomics.cpp
index b7c4078cf..2de70cd9f 100644
--- a/kokkos/core/unit_test/rocm/TestROCm_Atomics.cpp
+++ b/kokkos/core/unit_test/rocm/TestROCm_Atomics.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/rocm/TestROCm_Category.hpp b/kokkos/core/unit_test/rocm/TestROCm_Category.hpp
index 28d66c608..f89b18f49 100644
--- a/kokkos/core/unit_test/rocm/TestROCm_Category.hpp
+++ b/kokkos/core/unit_test/rocm/TestROCm_Category.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/rocm/TestROCm_Complex.cpp b/kokkos/core/unit_test/rocm/TestROCm_Complex.cpp
index b42d18a26..0e9e92add 100644
--- a/kokkos/core/unit_test/rocm/TestROCm_Complex.cpp
+++ b/kokkos/core/unit_test/rocm/TestROCm_Complex.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/rocm/TestROCm_Crs.cpp b/kokkos/core/unit_test/rocm/TestROCm_Crs.cpp
index 5b7b3b2fe..7dc9f71b7 100644
--- a/kokkos/core/unit_test/rocm/TestROCm_Crs.cpp
+++ b/kokkos/core/unit_test/rocm/TestROCm_Crs.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/rocm/TestROCm_DeepCopyAlignment.cpp b/kokkos/core/unit_test/rocm/TestROCm_DeepCopyAlignment.cpp
index f36f4ee9a..e31c21980 100644
--- a/kokkos/core/unit_test/rocm/TestROCm_DeepCopyAlignment.cpp
+++ b/kokkos/core/unit_test/rocm/TestROCm_DeepCopyAlignment.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/rocm/TestROCm_Init.cpp b/kokkos/core/unit_test/rocm/TestROCm_Init.cpp
index 3c3b72e6f..d3a4addc1 100644
--- a/kokkos/core/unit_test/rocm/TestROCm_Init.cpp
+++ b/kokkos/core/unit_test/rocm/TestROCm_Init.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/rocm/TestROCm_MDRangeReduce_a.cpp b/kokkos/core/unit_test/rocm/TestROCm_MDRangeReduce_a.cpp
index 93fd63af6..13b1b7385 100644
--- a/kokkos/core/unit_test/rocm/TestROCm_MDRangeReduce_a.cpp
+++ b/kokkos/core/unit_test/rocm/TestROCm_MDRangeReduce_a.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/rocm/TestROCm_MDRangeReduce_b.cpp b/kokkos/core/unit_test/rocm/TestROCm_MDRangeReduce_b.cpp
index 27b16a1cc..9181caaaf 100644
--- a/kokkos/core/unit_test/rocm/TestROCm_MDRangeReduce_b.cpp
+++ b/kokkos/core/unit_test/rocm/TestROCm_MDRangeReduce_b.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/rocm/TestROCm_MDRangeReduce_c.cpp b/kokkos/core/unit_test/rocm/TestROCm_MDRangeReduce_c.cpp
index e8b9aee2b..e9cdb6fe9 100644
--- a/kokkos/core/unit_test/rocm/TestROCm_MDRangeReduce_c.cpp
+++ b/kokkos/core/unit_test/rocm/TestROCm_MDRangeReduce_c.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/rocm/TestROCm_MDRangeReduce_d.cpp b/kokkos/core/unit_test/rocm/TestROCm_MDRangeReduce_d.cpp
index c54317038..ecff8c39b 100644
--- a/kokkos/core/unit_test/rocm/TestROCm_MDRangeReduce_d.cpp
+++ b/kokkos/core/unit_test/rocm/TestROCm_MDRangeReduce_d.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/rocm/TestROCm_MDRangeReduce_e.cpp b/kokkos/core/unit_test/rocm/TestROCm_MDRangeReduce_e.cpp
index c4928c1ff..a773ca17b 100644
--- a/kokkos/core/unit_test/rocm/TestROCm_MDRangeReduce_e.cpp
+++ b/kokkos/core/unit_test/rocm/TestROCm_MDRangeReduce_e.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/rocm/TestROCm_MDRange_a.cpp b/kokkos/core/unit_test/rocm/TestROCm_MDRange_a.cpp
index ca1bd67cd..8f3c6544b 100644
--- a/kokkos/core/unit_test/rocm/TestROCm_MDRange_a.cpp
+++ b/kokkos/core/unit_test/rocm/TestROCm_MDRange_a.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/rocm/TestROCm_MDRange_b.cpp b/kokkos/core/unit_test/rocm/TestROCm_MDRange_b.cpp
index 527b751b2..40efabf2a 100644
--- a/kokkos/core/unit_test/rocm/TestROCm_MDRange_b.cpp
+++ b/kokkos/core/unit_test/rocm/TestROCm_MDRange_b.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/rocm/TestROCm_MDRange_c.cpp b/kokkos/core/unit_test/rocm/TestROCm_MDRange_c.cpp
index 9214b94ea..63c02857d 100644
--- a/kokkos/core/unit_test/rocm/TestROCm_MDRange_c.cpp
+++ b/kokkos/core/unit_test/rocm/TestROCm_MDRange_c.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/rocm/TestROCm_MDRange_d.cpp b/kokkos/core/unit_test/rocm/TestROCm_MDRange_d.cpp
index 69d6c2d4f..ff559b66f 100644
--- a/kokkos/core/unit_test/rocm/TestROCm_MDRange_d.cpp
+++ b/kokkos/core/unit_test/rocm/TestROCm_MDRange_d.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/rocm/TestROCm_MDRange_e.cpp b/kokkos/core/unit_test/rocm/TestROCm_MDRange_e.cpp
index fa4b32495..57c383d11 100644
--- a/kokkos/core/unit_test/rocm/TestROCm_MDRange_e.cpp
+++ b/kokkos/core/unit_test/rocm/TestROCm_MDRange_e.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/rocm/TestROCm_Other.cpp b/kokkos/core/unit_test/rocm/TestROCm_Other.cpp
index 2f603b194..b6240a1b5 100644
--- a/kokkos/core/unit_test/rocm/TestROCm_Other.cpp
+++ b/kokkos/core/unit_test/rocm/TestROCm_Other.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/rocm/TestROCm_RangePolicy.cpp b/kokkos/core/unit_test/rocm/TestROCm_RangePolicy.cpp
index 6bbc747f5..bd85458b6 100644
--- a/kokkos/core/unit_test/rocm/TestROCm_RangePolicy.cpp
+++ b/kokkos/core/unit_test/rocm/TestROCm_RangePolicy.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/rocm/TestROCm_Reducers_a.cpp b/kokkos/core/unit_test/rocm/TestROCm_Reducers_a.cpp
index 0d91199a3..28cffad68 100644
--- a/kokkos/core/unit_test/rocm/TestROCm_Reducers_a.cpp
+++ b/kokkos/core/unit_test/rocm/TestROCm_Reducers_a.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/rocm/TestROCm_Reducers_b.cpp b/kokkos/core/unit_test/rocm/TestROCm_Reducers_b.cpp
index c2f3c5888..0efece4d0 100644
--- a/kokkos/core/unit_test/rocm/TestROCm_Reducers_b.cpp
+++ b/kokkos/core/unit_test/rocm/TestROCm_Reducers_b.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/rocm/TestROCm_Reducers_c.cpp b/kokkos/core/unit_test/rocm/TestROCm_Reducers_c.cpp
index 60996cf3a..929bf35a1 100644
--- a/kokkos/core/unit_test/rocm/TestROCm_Reducers_c.cpp
+++ b/kokkos/core/unit_test/rocm/TestROCm_Reducers_c.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/rocm/TestROCm_Reducers_d.cpp b/kokkos/core/unit_test/rocm/TestROCm_Reducers_d.cpp
index 35eda65a0..4a63aa024 100644
--- a/kokkos/core/unit_test/rocm/TestROCm_Reducers_d.cpp
+++ b/kokkos/core/unit_test/rocm/TestROCm_Reducers_d.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/rocm/TestROCm_Reductions.cpp b/kokkos/core/unit_test/rocm/TestROCm_Reductions.cpp
index e79e91ef3..6b79b9592 100644
--- a/kokkos/core/unit_test/rocm/TestROCm_Reductions.cpp
+++ b/kokkos/core/unit_test/rocm/TestROCm_Reductions.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/rocm/TestROCm_Scan.cpp b/kokkos/core/unit_test/rocm/TestROCm_Scan.cpp
index 701fc1094..798744725 100644
--- a/kokkos/core/unit_test/rocm/TestROCm_Scan.cpp
+++ b/kokkos/core/unit_test/rocm/TestROCm_Scan.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/rocm/TestROCm_SharedAlloc.cpp b/kokkos/core/unit_test/rocm/TestROCm_SharedAlloc.cpp
index fb2937289..041d0a82b 100644
--- a/kokkos/core/unit_test/rocm/TestROCm_SharedAlloc.cpp
+++ b/kokkos/core/unit_test/rocm/TestROCm_SharedAlloc.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/rocm/TestROCm_Spaces.cpp b/kokkos/core/unit_test/rocm/TestROCm_Spaces.cpp
index 0e6abb95a..fe84da591 100644
--- a/kokkos/core/unit_test/rocm/TestROCm_Spaces.cpp
+++ b/kokkos/core/unit_test/rocm/TestROCm_Spaces.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/rocm/TestROCm_SubView_a.cpp b/kokkos/core/unit_test/rocm/TestROCm_SubView_a.cpp
index 1b0121239..f766921ff 100644
--- a/kokkos/core/unit_test/rocm/TestROCm_SubView_a.cpp
+++ b/kokkos/core/unit_test/rocm/TestROCm_SubView_a.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/rocm/TestROCm_SubView_b.cpp b/kokkos/core/unit_test/rocm/TestROCm_SubView_b.cpp
index f277d1966..798ff06b7 100644
--- a/kokkos/core/unit_test/rocm/TestROCm_SubView_b.cpp
+++ b/kokkos/core/unit_test/rocm/TestROCm_SubView_b.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/rocm/TestROCm_SubView_c01.cpp b/kokkos/core/unit_test/rocm/TestROCm_SubView_c01.cpp
index 30cf309af..b70923027 100644
--- a/kokkos/core/unit_test/rocm/TestROCm_SubView_c01.cpp
+++ b/kokkos/core/unit_test/rocm/TestROCm_SubView_c01.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/rocm/TestROCm_SubView_c02.cpp b/kokkos/core/unit_test/rocm/TestROCm_SubView_c02.cpp
index fc0e874a9..e28dfed7f 100644
--- a/kokkos/core/unit_test/rocm/TestROCm_SubView_c02.cpp
+++ b/kokkos/core/unit_test/rocm/TestROCm_SubView_c02.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/rocm/TestROCm_SubView_c03.cpp b/kokkos/core/unit_test/rocm/TestROCm_SubView_c03.cpp
index 6e0b9f9d1..bd8afc472 100644
--- a/kokkos/core/unit_test/rocm/TestROCm_SubView_c03.cpp
+++ b/kokkos/core/unit_test/rocm/TestROCm_SubView_c03.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/rocm/TestROCm_SubView_c04.cpp b/kokkos/core/unit_test/rocm/TestROCm_SubView_c04.cpp
index c8eb7a452..f2c5c3674 100644
--- a/kokkos/core/unit_test/rocm/TestROCm_SubView_c04.cpp
+++ b/kokkos/core/unit_test/rocm/TestROCm_SubView_c04.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/rocm/TestROCm_SubView_c05.cpp b/kokkos/core/unit_test/rocm/TestROCm_SubView_c05.cpp
index 7a2ea48f4..43ef57350 100644
--- a/kokkos/core/unit_test/rocm/TestROCm_SubView_c05.cpp
+++ b/kokkos/core/unit_test/rocm/TestROCm_SubView_c05.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/rocm/TestROCm_SubView_c06.cpp b/kokkos/core/unit_test/rocm/TestROCm_SubView_c06.cpp
index 1dfb2cdfd..985c22843 100644
--- a/kokkos/core/unit_test/rocm/TestROCm_SubView_c06.cpp
+++ b/kokkos/core/unit_test/rocm/TestROCm_SubView_c06.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/rocm/TestROCm_SubView_c07.cpp b/kokkos/core/unit_test/rocm/TestROCm_SubView_c07.cpp
index fae45966d..1ddcec570 100644
--- a/kokkos/core/unit_test/rocm/TestROCm_SubView_c07.cpp
+++ b/kokkos/core/unit_test/rocm/TestROCm_SubView_c07.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/rocm/TestROCm_SubView_c08.cpp b/kokkos/core/unit_test/rocm/TestROCm_SubView_c08.cpp
index 652ff36d7..a641bdbdf 100644
--- a/kokkos/core/unit_test/rocm/TestROCm_SubView_c08.cpp
+++ b/kokkos/core/unit_test/rocm/TestROCm_SubView_c08.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/rocm/TestROCm_SubView_c09.cpp b/kokkos/core/unit_test/rocm/TestROCm_SubView_c09.cpp
index dbcc721b7..bc2a2d599 100644
--- a/kokkos/core/unit_test/rocm/TestROCm_SubView_c09.cpp
+++ b/kokkos/core/unit_test/rocm/TestROCm_SubView_c09.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/rocm/TestROCm_SubView_c10.cpp b/kokkos/core/unit_test/rocm/TestROCm_SubView_c10.cpp
index 18ce9f027..59f3bb22d 100644
--- a/kokkos/core/unit_test/rocm/TestROCm_SubView_c10.cpp
+++ b/kokkos/core/unit_test/rocm/TestROCm_SubView_c10.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/rocm/TestROCm_SubView_c11.cpp b/kokkos/core/unit_test/rocm/TestROCm_SubView_c11.cpp
index b1504aff6..29c6f181f 100644
--- a/kokkos/core/unit_test/rocm/TestROCm_SubView_c11.cpp
+++ b/kokkos/core/unit_test/rocm/TestROCm_SubView_c11.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/rocm/TestROCm_SubView_c12.cpp b/kokkos/core/unit_test/rocm/TestROCm_SubView_c12.cpp
index 2e8ac0ee4..4fcdcc397 100644
--- a/kokkos/core/unit_test/rocm/TestROCm_SubView_c12.cpp
+++ b/kokkos/core/unit_test/rocm/TestROCm_SubView_c12.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/rocm/TestROCm_SubView_c13.cpp b/kokkos/core/unit_test/rocm/TestROCm_SubView_c13.cpp
index f77127164..f8d52f243 100644
--- a/kokkos/core/unit_test/rocm/TestROCm_SubView_c13.cpp
+++ b/kokkos/core/unit_test/rocm/TestROCm_SubView_c13.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/rocm/TestROCm_Team.cpp b/kokkos/core/unit_test/rocm/TestROCm_Team.cpp
index 310335416..85aeb6637 100644
--- a/kokkos/core/unit_test/rocm/TestROCm_Team.cpp
+++ b/kokkos/core/unit_test/rocm/TestROCm_Team.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/rocm/TestROCm_TeamReductionScan.cpp b/kokkos/core/unit_test/rocm/TestROCm_TeamReductionScan.cpp
index 4f5cc7e15..b82fbf911 100644
--- a/kokkos/core/unit_test/rocm/TestROCm_TeamReductionScan.cpp
+++ b/kokkos/core/unit_test/rocm/TestROCm_TeamReductionScan.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/rocm/TestROCm_TeamScratch.cpp b/kokkos/core/unit_test/rocm/TestROCm_TeamScratch.cpp
index 14a7bb14a..8ec583c23 100644
--- a/kokkos/core/unit_test/rocm/TestROCm_TeamScratch.cpp
+++ b/kokkos/core/unit_test/rocm/TestROCm_TeamScratch.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/rocm/TestROCm_TeamTeamSize.cpp b/kokkos/core/unit_test/rocm/TestROCm_TeamTeamSize.cpp
index a1fc94da4..3ddbe901b 100644
--- a/kokkos/core/unit_test/rocm/TestROCm_TeamTeamSize.cpp
+++ b/kokkos/core/unit_test/rocm/TestROCm_TeamTeamSize.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/rocm/TestROCm_ViewAPI_a.cpp b/kokkos/core/unit_test/rocm/TestROCm_ViewAPI_a.cpp
index 86c91410a..5740dedf3 100644
--- a/kokkos/core/unit_test/rocm/TestROCm_ViewAPI_a.cpp
+++ b/kokkos/core/unit_test/rocm/TestROCm_ViewAPI_a.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/rocm/TestROCm_ViewAPI_b.cpp b/kokkos/core/unit_test/rocm/TestROCm_ViewAPI_b.cpp
index 37f1efcd0..775908043 100644
--- a/kokkos/core/unit_test/rocm/TestROCm_ViewAPI_b.cpp
+++ b/kokkos/core/unit_test/rocm/TestROCm_ViewAPI_b.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/rocm/TestROCm_ViewAPI_c.cpp b/kokkos/core/unit_test/rocm/TestROCm_ViewAPI_c.cpp
index 287195ad3..bf28aff30 100644
--- a/kokkos/core/unit_test/rocm/TestROCm_ViewAPI_c.cpp
+++ b/kokkos/core/unit_test/rocm/TestROCm_ViewAPI_c.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/rocm/TestROCm_ViewAPI_d.cpp b/kokkos/core/unit_test/rocm/TestROCm_ViewAPI_d.cpp
index d5f66de78..3dabcdfab 100644
--- a/kokkos/core/unit_test/rocm/TestROCm_ViewAPI_d.cpp
+++ b/kokkos/core/unit_test/rocm/TestROCm_ViewAPI_d.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/rocm/TestROCm_ViewAPI_e.cpp b/kokkos/core/unit_test/rocm/TestROCm_ViewAPI_e.cpp
index 0d9f3b5e9..45633ebab 100644
--- a/kokkos/core/unit_test/rocm/TestROCm_ViewAPI_e.cpp
+++ b/kokkos/core/unit_test/rocm/TestROCm_ViewAPI_e.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/rocm/TestROCm_ViewMapping_a.cpp b/kokkos/core/unit_test/rocm/TestROCm_ViewMapping_a.cpp
index 6cb0a6eb1..0ecaacaea 100644
--- a/kokkos/core/unit_test/rocm/TestROCm_ViewMapping_a.cpp
+++ b/kokkos/core/unit_test/rocm/TestROCm_ViewMapping_a.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/rocm/TestROCm_ViewMapping_b.cpp b/kokkos/core/unit_test/rocm/TestROCm_ViewMapping_b.cpp
index 3e3e4ae78..7af6e2ff4 100644
--- a/kokkos/core/unit_test/rocm/TestROCm_ViewMapping_b.cpp
+++ b/kokkos/core/unit_test/rocm/TestROCm_ViewMapping_b.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/rocm/TestROCm_ViewMapping_subview.cpp b/kokkos/core/unit_test/rocm/TestROCm_ViewMapping_subview.cpp
index 4e0729bcb..f8f2e4097 100644
--- a/kokkos/core/unit_test/rocm/TestROCm_ViewMapping_subview.cpp
+++ b/kokkos/core/unit_test/rocm/TestROCm_ViewMapping_subview.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/rocm/TestROCm_ViewOfClass.cpp b/kokkos/core/unit_test/rocm/TestROCm_ViewOfClass.cpp
index 1eb08263a..2f917ac61 100644
--- a/kokkos/core/unit_test/rocm/TestROCm_ViewOfClass.cpp
+++ b/kokkos/core/unit_test/rocm/TestROCm_ViewOfClass.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_complexdouble.cpp b/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_complexdouble.cpp
index 4b600f0d8..fc26bb578 100644
--- a/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_complexdouble.cpp
+++ b/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_complexdouble.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_complexfloat.cpp b/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_complexfloat.cpp
index f06b30bb0..db5a4a000 100644
--- a/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_complexfloat.cpp
+++ b/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_complexfloat.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_double.cpp b/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_double.cpp
index 134e071ba..2ce675afd 100644
--- a/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_double.cpp
+++ b/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_double.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_float.cpp b/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_float.cpp
index 031689302..328bc37f7 100644
--- a/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_float.cpp
+++ b/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_float.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_int.cpp b/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_int.cpp
index 0b8a9585d..5da7f7c3f 100644
--- a/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_int.cpp
+++ b/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_int.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_longint.cpp b/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_longint.cpp
index deef86625..12cfb1d34 100644
--- a/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_longint.cpp
+++ b/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_longint.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_longlongint.cpp b/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_longlongint.cpp
index 9128fbcdc..884a75e17 100644
--- a/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_longlongint.cpp
+++ b/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_longlongint.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_unsignedint.cpp b/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_unsignedint.cpp
index cff85fdc7..771730d70 100644
--- a/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_unsignedint.cpp
+++ b/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_unsignedint.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_unsignedlongint.cpp b/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_unsignedlongint.cpp
index 45d6b27e1..7eeea84f7 100644
--- a/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_unsignedlongint.cpp
+++ b/kokkos/core/unit_test/serial/TestSerial_AtomicOperations_unsignedlongint.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/serial/TestSerial_AtomicViews.cpp b/kokkos/core/unit_test/serial/TestSerial_AtomicViews.cpp
index 2057c8e21..be0b58d33 100644
--- a/kokkos/core/unit_test/serial/TestSerial_AtomicViews.cpp
+++ b/kokkos/core/unit_test/serial/TestSerial_AtomicViews.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/serial/TestSerial_Atomics.cpp b/kokkos/core/unit_test/serial/TestSerial_Atomics.cpp
index 96dd133c1..88e3d0b92 100644
--- a/kokkos/core/unit_test/serial/TestSerial_Atomics.cpp
+++ b/kokkos/core/unit_test/serial/TestSerial_Atomics.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/serial/TestSerial_Category.hpp b/kokkos/core/unit_test/serial/TestSerial_Category.hpp
index 39ab00178..0989af7f5 100644
--- a/kokkos/core/unit_test/serial/TestSerial_Category.hpp
+++ b/kokkos/core/unit_test/serial/TestSerial_Category.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/serial/TestSerial_Complex.cpp b/kokkos/core/unit_test/serial/TestSerial_Complex.cpp
index 316b88482..f0cce7a72 100644
--- a/kokkos/core/unit_test/serial/TestSerial_Complex.cpp
+++ b/kokkos/core/unit_test/serial/TestSerial_Complex.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/containers/unit_tests/serial/TestSerial_BitSet.cpp b/kokkos/core/unit_test/serial/TestSerial_Concepts.cpp
similarity index 92%
rename from kokkos/containers/unit_tests/serial/TestSerial_BitSet.cpp
rename to kokkos/core/unit_test/serial/TestSerial_Concepts.cpp
index 435b75e37..aa2c1577c 100644
--- a/kokkos/containers/unit_tests/serial/TestSerial_BitSet.cpp
+++ b/kokkos/core/unit_test/serial/TestSerial_Concepts.cpp
@@ -1,4 +1,3 @@
-
 /*
 //@HEADER
 // ************************************************************************
@@ -25,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -44,4 +43,4 @@
 */
 
 #include <serial/TestSerial_Category.hpp>
-#include <TestBitset.hpp>
+#include <TestConcepts.hpp>
diff --git a/kokkos/core/unit_test/serial/TestSerial_Crs.cpp b/kokkos/core/unit_test/serial/TestSerial_Crs.cpp
index 93dd74ca0..cac55fe01 100644
--- a/kokkos/core/unit_test/serial/TestSerial_Crs.cpp
+++ b/kokkos/core/unit_test/serial/TestSerial_Crs.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/serial/TestSerial_DeepCopyAlignment.cpp b/kokkos/core/unit_test/serial/TestSerial_DeepCopyAlignment.cpp
index b829882d0..812a4fd99 100644
--- a/kokkos/core/unit_test/serial/TestSerial_DeepCopyAlignment.cpp
+++ b/kokkos/core/unit_test/serial/TestSerial_DeepCopyAlignment.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/serial/TestSerial_FunctorAnalysis.cpp b/kokkos/core/unit_test/serial/TestSerial_FunctorAnalysis.cpp
index d5d0f1075..403bdb922 100644
--- a/kokkos/core/unit_test/serial/TestSerial_FunctorAnalysis.cpp
+++ b/kokkos/core/unit_test/serial/TestSerial_FunctorAnalysis.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/serial/TestSerial_Init.cpp b/kokkos/core/unit_test/serial/TestSerial_Init.cpp
index 6dbe35ae2..2cda827a5 100644
--- a/kokkos/core/unit_test/serial/TestSerial_Init.cpp
+++ b/kokkos/core/unit_test/serial/TestSerial_Init.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/serial/TestSerial_LocalDeepCopy.cpp b/kokkos/core/unit_test/serial/TestSerial_LocalDeepCopy.cpp
index d3af6b3f8..809473487 100644
--- a/kokkos/core/unit_test/serial/TestSerial_LocalDeepCopy.cpp
+++ b/kokkos/core/unit_test/serial/TestSerial_LocalDeepCopy.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/serial/TestSerial_MDRange_a.cpp b/kokkos/core/unit_test/serial/TestSerial_MDRange_a.cpp
index 00327cb16..863c91006 100644
--- a/kokkos/core/unit_test/serial/TestSerial_MDRange_a.cpp
+++ b/kokkos/core/unit_test/serial/TestSerial_MDRange_a.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/serial/TestSerial_MDRange_b.cpp b/kokkos/core/unit_test/serial/TestSerial_MDRange_b.cpp
index 1047c6914..defe86f10 100644
--- a/kokkos/core/unit_test/serial/TestSerial_MDRange_b.cpp
+++ b/kokkos/core/unit_test/serial/TestSerial_MDRange_b.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/serial/TestSerial_MDRange_c.cpp b/kokkos/core/unit_test/serial/TestSerial_MDRange_c.cpp
index bdd501cef..30f7af2bc 100644
--- a/kokkos/core/unit_test/serial/TestSerial_MDRange_c.cpp
+++ b/kokkos/core/unit_test/serial/TestSerial_MDRange_c.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/serial/TestSerial_MDRange_d.cpp b/kokkos/core/unit_test/serial/TestSerial_MDRange_d.cpp
index 7ec23b29a..c9341ccb5 100644
--- a/kokkos/core/unit_test/serial/TestSerial_MDRange_d.cpp
+++ b/kokkos/core/unit_test/serial/TestSerial_MDRange_d.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/serial/TestSerial_MDRange_e.cpp b/kokkos/core/unit_test/serial/TestSerial_MDRange_e.cpp
index 5621b9d64..ad12bb26c 100644
--- a/kokkos/core/unit_test/serial/TestSerial_MDRange_e.cpp
+++ b/kokkos/core/unit_test/serial/TestSerial_MDRange_e.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/serial/TestSerial_Other.cpp b/kokkos/core/unit_test/serial/TestSerial_Other.cpp
index 68902c58a..ea4ac4e4c 100644
--- a/kokkos/core/unit_test/serial/TestSerial_Other.cpp
+++ b/kokkos/core/unit_test/serial/TestSerial_Other.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/serial/TestSerial_RangePolicy.cpp b/kokkos/core/unit_test/serial/TestSerial_RangePolicy.cpp
index 91c48c9ca..f92daad51 100644
--- a/kokkos/core/unit_test/serial/TestSerial_RangePolicy.cpp
+++ b/kokkos/core/unit_test/serial/TestSerial_RangePolicy.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/containers/unit_tests/serial/TestSerial_Vector.cpp b/kokkos/core/unit_test/serial/TestSerial_RangePolicyRequire.cpp
similarity index 92%
rename from kokkos/containers/unit_tests/serial/TestSerial_Vector.cpp
rename to kokkos/core/unit_test/serial/TestSerial_RangePolicyRequire.cpp
index 7f54968f8..dcc77054d 100644
--- a/kokkos/containers/unit_tests/serial/TestSerial_Vector.cpp
+++ b/kokkos/core/unit_test/serial/TestSerial_RangePolicyRequire.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -44,4 +44,4 @@
 */
 
 #include <serial/TestSerial_Category.hpp>
-#include <TestVector.hpp>
+#include <TestRangeRequire.hpp>
diff --git a/kokkos/core/unit_test/serial/TestSerial_Reducers_a.cpp b/kokkos/core/unit_test/serial/TestSerial_Reducers_a.cpp
index 8fdd69b10..2dc48e98e 100644
--- a/kokkos/core/unit_test/serial/TestSerial_Reducers_a.cpp
+++ b/kokkos/core/unit_test/serial/TestSerial_Reducers_a.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/serial/TestSerial_Reducers_b.cpp b/kokkos/core/unit_test/serial/TestSerial_Reducers_b.cpp
index 1802ce9fe..2cd85bee1 100644
--- a/kokkos/core/unit_test/serial/TestSerial_Reducers_b.cpp
+++ b/kokkos/core/unit_test/serial/TestSerial_Reducers_b.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/serial/TestSerial_Reducers_c.cpp b/kokkos/core/unit_test/serial/TestSerial_Reducers_c.cpp
index f86ca504f..979ea8b41 100644
--- a/kokkos/core/unit_test/serial/TestSerial_Reducers_c.cpp
+++ b/kokkos/core/unit_test/serial/TestSerial_Reducers_c.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/serial/TestSerial_Reducers_d.cpp b/kokkos/core/unit_test/serial/TestSerial_Reducers_d.cpp
index a4608cda8..a6bdb8129 100644
--- a/kokkos/core/unit_test/serial/TestSerial_Reducers_d.cpp
+++ b/kokkos/core/unit_test/serial/TestSerial_Reducers_d.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/serial/TestSerial_Reductions.cpp b/kokkos/core/unit_test/serial/TestSerial_Reductions.cpp
index 829e5ac6b..a5961fbdf 100644
--- a/kokkos/core/unit_test/serial/TestSerial_Reductions.cpp
+++ b/kokkos/core/unit_test/serial/TestSerial_Reductions.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/serial/TestSerial_Reductions_DeviceView.cpp b/kokkos/core/unit_test/serial/TestSerial_Reductions_DeviceView.cpp
index 4bbe5a299..6e6c47024 100644
--- a/kokkos/core/unit_test/serial/TestSerial_Reductions_DeviceView.cpp
+++ b/kokkos/core/unit_test/serial/TestSerial_Reductions_DeviceView.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/serial/TestSerial_Scan.cpp b/kokkos/core/unit_test/serial/TestSerial_Scan.cpp
index ebc522170..287c05e17 100644
--- a/kokkos/core/unit_test/serial/TestSerial_Scan.cpp
+++ b/kokkos/core/unit_test/serial/TestSerial_Scan.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/serial/TestSerial_SharedAlloc.cpp b/kokkos/core/unit_test/serial/TestSerial_SharedAlloc.cpp
index c9ddd2e7e..1b5f2f2dd 100644
--- a/kokkos/core/unit_test/serial/TestSerial_SharedAlloc.cpp
+++ b/kokkos/core/unit_test/serial/TestSerial_SharedAlloc.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/serial/TestSerial_SubView_a.cpp b/kokkos/core/unit_test/serial/TestSerial_SubView_a.cpp
index 11bea2df0..b2a33a7bd 100644
--- a/kokkos/core/unit_test/serial/TestSerial_SubView_a.cpp
+++ b/kokkos/core/unit_test/serial/TestSerial_SubView_a.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/serial/TestSerial_SubView_b.cpp b/kokkos/core/unit_test/serial/TestSerial_SubView_b.cpp
index e3c4c7e74..5ea7c7e91 100644
--- a/kokkos/core/unit_test/serial/TestSerial_SubView_b.cpp
+++ b/kokkos/core/unit_test/serial/TestSerial_SubView_b.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/serial/TestSerial_SubView_c01.cpp b/kokkos/core/unit_test/serial/TestSerial_SubView_c01.cpp
index e98d1f80a..bced0bf2e 100644
--- a/kokkos/core/unit_test/serial/TestSerial_SubView_c01.cpp
+++ b/kokkos/core/unit_test/serial/TestSerial_SubView_c01.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/serial/TestSerial_SubView_c02.cpp b/kokkos/core/unit_test/serial/TestSerial_SubView_c02.cpp
index 7003b5971..d2a3d035b 100644
--- a/kokkos/core/unit_test/serial/TestSerial_SubView_c02.cpp
+++ b/kokkos/core/unit_test/serial/TestSerial_SubView_c02.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/serial/TestSerial_SubView_c03.cpp b/kokkos/core/unit_test/serial/TestSerial_SubView_c03.cpp
index 699f1d8fe..7b531b9f7 100644
--- a/kokkos/core/unit_test/serial/TestSerial_SubView_c03.cpp
+++ b/kokkos/core/unit_test/serial/TestSerial_SubView_c03.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/serial/TestSerial_SubView_c04.cpp b/kokkos/core/unit_test/serial/TestSerial_SubView_c04.cpp
index 389ff4376..215fa645b 100644
--- a/kokkos/core/unit_test/serial/TestSerial_SubView_c04.cpp
+++ b/kokkos/core/unit_test/serial/TestSerial_SubView_c04.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/serial/TestSerial_SubView_c05.cpp b/kokkos/core/unit_test/serial/TestSerial_SubView_c05.cpp
index ed457306e..4e066f945 100644
--- a/kokkos/core/unit_test/serial/TestSerial_SubView_c05.cpp
+++ b/kokkos/core/unit_test/serial/TestSerial_SubView_c05.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/serial/TestSerial_SubView_c06.cpp b/kokkos/core/unit_test/serial/TestSerial_SubView_c06.cpp
index bc793e81f..803fa75aa 100644
--- a/kokkos/core/unit_test/serial/TestSerial_SubView_c06.cpp
+++ b/kokkos/core/unit_test/serial/TestSerial_SubView_c06.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/serial/TestSerial_SubView_c07.cpp b/kokkos/core/unit_test/serial/TestSerial_SubView_c07.cpp
index 271e1aada..6bf64ba06 100644
--- a/kokkos/core/unit_test/serial/TestSerial_SubView_c07.cpp
+++ b/kokkos/core/unit_test/serial/TestSerial_SubView_c07.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/serial/TestSerial_SubView_c08.cpp b/kokkos/core/unit_test/serial/TestSerial_SubView_c08.cpp
index e5f6d43e8..691fe1a96 100644
--- a/kokkos/core/unit_test/serial/TestSerial_SubView_c08.cpp
+++ b/kokkos/core/unit_test/serial/TestSerial_SubView_c08.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/serial/TestSerial_SubView_c09.cpp b/kokkos/core/unit_test/serial/TestSerial_SubView_c09.cpp
index 817b937e8..cfbe075c8 100644
--- a/kokkos/core/unit_test/serial/TestSerial_SubView_c09.cpp
+++ b/kokkos/core/unit_test/serial/TestSerial_SubView_c09.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/serial/TestSerial_SubView_c10.cpp b/kokkos/core/unit_test/serial/TestSerial_SubView_c10.cpp
index 61cca3ad2..188653212 100644
--- a/kokkos/core/unit_test/serial/TestSerial_SubView_c10.cpp
+++ b/kokkos/core/unit_test/serial/TestSerial_SubView_c10.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/serial/TestSerial_SubView_c11.cpp b/kokkos/core/unit_test/serial/TestSerial_SubView_c11.cpp
index 984067fcc..264d919e2 100644
--- a/kokkos/core/unit_test/serial/TestSerial_SubView_c11.cpp
+++ b/kokkos/core/unit_test/serial/TestSerial_SubView_c11.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/serial/TestSerial_SubView_c12.cpp b/kokkos/core/unit_test/serial/TestSerial_SubView_c12.cpp
index 13e36f32f..53dd79c1e 100644
--- a/kokkos/core/unit_test/serial/TestSerial_SubView_c12.cpp
+++ b/kokkos/core/unit_test/serial/TestSerial_SubView_c12.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/serial/TestSerial_SubView_c13.cpp b/kokkos/core/unit_test/serial/TestSerial_SubView_c13.cpp
index 280f95932..a0b1f36a0 100644
--- a/kokkos/core/unit_test/serial/TestSerial_SubView_c13.cpp
+++ b/kokkos/core/unit_test/serial/TestSerial_SubView_c13.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/serial/TestSerial_Task.cpp b/kokkos/core/unit_test/serial/TestSerial_Task.cpp
index 9254341f4..02f686e06 100644
--- a/kokkos/core/unit_test/serial/TestSerial_Task.cpp
+++ b/kokkos/core/unit_test/serial/TestSerial_Task.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/serial/TestSerial_Team.cpp b/kokkos/core/unit_test/serial/TestSerial_Team.cpp
index 495ba1d5e..1ee694681 100644
--- a/kokkos/core/unit_test/serial/TestSerial_Team.cpp
+++ b/kokkos/core/unit_test/serial/TestSerial_Team.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -79,26 +79,87 @@ TEST(TEST_CATEGORY, team_reduce) {
                  Kokkos::Schedule<Kokkos::Dynamic> >::test_reduce(1000);
 }
 
-TEST(TEST_CATEGORY, team_broadcast) {
-  TestTeamBroadcast<TEST_EXECSPACE,
-                    Kokkos::Schedule<Kokkos::Static> >::test_teambroadcast(0);
-  TestTeamBroadcast<TEST_EXECSPACE,
-                    Kokkos::Schedule<Kokkos::Dynamic> >::test_teambroadcast(0);
-
-  TestTeamBroadcast<TEST_EXECSPACE,
-                    Kokkos::Schedule<Kokkos::Static> >::test_teambroadcast(2);
-  TestTeamBroadcast<TEST_EXECSPACE,
-                    Kokkos::Schedule<Kokkos::Dynamic> >::test_teambroadcast(2);
-
-  TestTeamBroadcast<TEST_EXECSPACE,
-                    Kokkos::Schedule<Kokkos::Static> >::test_teambroadcast(16);
-  TestTeamBroadcast<TEST_EXECSPACE,
-                    Kokkos::Schedule<Kokkos::Dynamic> >::test_teambroadcast(16);
-
-  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::
-      test_teambroadcast(1000);
-  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::
-      test_teambroadcast(1000);
+TEST(TEST_CATEGORY, team_broadcast_long) {
+  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static>,
+                    long>::test_teambroadcast(0, 1);
+  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic>,
+                    long>::test_teambroadcast(0, 1);
+
+  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static>,
+                    long>::test_teambroadcast(2, 1);
+  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic>,
+                    long>::test_teambroadcast(2, 1);
+
+  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static>,
+                    long>::test_teambroadcast(16, 1);
+  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic>,
+                    long>::test_teambroadcast(16, 1);
+
+  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static>,
+                    long>::test_teambroadcast(1000, 1);
+  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic>,
+                    long>::test_teambroadcast(1000, 1);
+}
+
+TEST(TEST_CATEGORY, team_broadcast_char) {
+  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static>,
+                    unsigned char>::test_teambroadcast(0, 1);
+  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic>,
+                    unsigned char>::test_teambroadcast(0, 1);
+
+  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static>,
+                    unsigned char>::test_teambroadcast(2, 1);
+  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic>,
+                    unsigned char>::test_teambroadcast(2, 1);
+
+  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static>,
+                    unsigned char>::test_teambroadcast(16, 1);
+  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic>,
+                    unsigned char>::test_teambroadcast(16, 1);
+}
+
+TEST(TEST_CATEGORY, team_broadcast_float) {
+  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static>,
+                    float>::test_teambroadcast(0, 1.3);
+  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic>,
+                    float>::test_teambroadcast(0, 1.3);
+
+  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static>,
+                    float>::test_teambroadcast(2, 1.3);
+  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic>,
+                    float>::test_teambroadcast(2, 1.3);
+
+  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static>,
+                    float>::test_teambroadcast(16, 1.3);
+  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic>,
+                    float>::test_teambroadcast(16, 1.3);
+
+  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static>,
+                    float>::test_teambroadcast(1000, 1.3);
+  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic>,
+                    float>::test_teambroadcast(1000, 1.3);
+}
+
+TEST(TEST_CATEGORY, team_broadcast_double) {
+  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static>,
+                    double>::test_teambroadcast(0, 1.3);
+  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic>,
+                    double>::test_teambroadcast(0, 1.3);
+
+  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static>,
+                    double>::test_teambroadcast(2, 1.3);
+  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic>,
+                    double>::test_teambroadcast(2, 1.3);
+
+  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static>,
+                    double>::test_teambroadcast(16, 1.3);
+  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic>,
+                    double>::test_teambroadcast(16, 1.3);
+
+  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static>,
+                    double>::test_teambroadcast(1000, 1.3);
+  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic>,
+                    double>::test_teambroadcast(1000, 1.3);
 }
 }  // namespace Test
 
diff --git a/kokkos/core/unit_test/serial/TestSerial_TeamReductionScan.cpp b/kokkos/core/unit_test/serial/TestSerial_TeamReductionScan.cpp
index 18a64b44e..29f77d35a 100644
--- a/kokkos/core/unit_test/serial/TestSerial_TeamReductionScan.cpp
+++ b/kokkos/core/unit_test/serial/TestSerial_TeamReductionScan.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/serial/TestSerial_TeamScratch.cpp b/kokkos/core/unit_test/serial/TestSerial_TeamScratch.cpp
index 05660933b..5d10c0c5e 100644
--- a/kokkos/core/unit_test/serial/TestSerial_TeamScratch.cpp
+++ b/kokkos/core/unit_test/serial/TestSerial_TeamScratch.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -58,7 +58,6 @@ TEST(TEST_CATEGORY, team_scratch_request) {
 }
 
 #if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
-#if !defined(KOKKOS_ENABLE_CUDA) || (8000 <= CUDA_VERSION)
 TEST(TEST_CATEGORY, team_lambda_shared_request) {
   TestLambdaSharedTeam<Kokkos::HostSpace, TEST_EXECSPACE,
                        Kokkos::Schedule<Kokkos::Static> >();
@@ -68,7 +67,6 @@ TEST(TEST_CATEGORY, team_lambda_shared_request) {
 
 TEST(TEST_CATEGORY, scratch_align) { TestScratchAlignment<TEST_EXECSPACE>(); }
 #endif
-#endif
 
 TEST(TEST_CATEGORY, shmem_size) { TestShmemSize<TEST_EXECSPACE>(); }
 
diff --git a/kokkos/core/unit_test/serial/TestSerial_TeamTeamSize.cpp b/kokkos/core/unit_test/serial/TestSerial_TeamTeamSize.cpp
index 18fe63d38..82f90b13b 100644
--- a/kokkos/core/unit_test/serial/TestSerial_TeamTeamSize.cpp
+++ b/kokkos/core/unit_test/serial/TestSerial_TeamTeamSize.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/serial/TestSerial_TeamVectorRange.cpp b/kokkos/core/unit_test/serial/TestSerial_TeamVectorRange.cpp
index 529ba5fa8..a41f71c95 100644
--- a/kokkos/core/unit_test/serial/TestSerial_TeamVectorRange.cpp
+++ b/kokkos/core/unit_test/serial/TestSerial_TeamVectorRange.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/serial/TestSerial_UniqueToken.cpp b/kokkos/core/unit_test/serial/TestSerial_UniqueToken.cpp
index 7fc7eba43..859918a7a 100644
--- a/kokkos/core/unit_test/serial/TestSerial_UniqueToken.cpp
+++ b/kokkos/core/unit_test/serial/TestSerial_UniqueToken.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/serial/TestSerial_ViewAPI_a.cpp b/kokkos/core/unit_test/serial/TestSerial_ViewAPI_a.cpp
index 7cce7bd11..872944f88 100644
--- a/kokkos/core/unit_test/serial/TestSerial_ViewAPI_a.cpp
+++ b/kokkos/core/unit_test/serial/TestSerial_ViewAPI_a.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/serial/TestSerial_ViewAPI_b.cpp b/kokkos/core/unit_test/serial/TestSerial_ViewAPI_b.cpp
index a1a386199..2a63f94fa 100644
--- a/kokkos/core/unit_test/serial/TestSerial_ViewAPI_b.cpp
+++ b/kokkos/core/unit_test/serial/TestSerial_ViewAPI_b.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/serial/TestSerial_ViewAPI_c.cpp b/kokkos/core/unit_test/serial/TestSerial_ViewAPI_c.cpp
index 1216ba04e..f4420ae77 100644
--- a/kokkos/core/unit_test/serial/TestSerial_ViewAPI_c.cpp
+++ b/kokkos/core/unit_test/serial/TestSerial_ViewAPI_c.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/serial/TestSerial_ViewAPI_d.cpp b/kokkos/core/unit_test/serial/TestSerial_ViewAPI_d.cpp
index 3d7839832..ede25aa6e 100644
--- a/kokkos/core/unit_test/serial/TestSerial_ViewAPI_d.cpp
+++ b/kokkos/core/unit_test/serial/TestSerial_ViewAPI_d.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/serial/TestSerial_ViewAPI_e.cpp b/kokkos/core/unit_test/serial/TestSerial_ViewAPI_e.cpp
index d5d7f8d8e..eca9c3f9f 100644
--- a/kokkos/core/unit_test/serial/TestSerial_ViewAPI_e.cpp
+++ b/kokkos/core/unit_test/serial/TestSerial_ViewAPI_e.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/serial/TestSerial_ViewLayoutStrideAssignment.cpp b/kokkos/core/unit_test/serial/TestSerial_ViewLayoutStrideAssignment.cpp
index 8fcb6a082..37c3126c5 100644
--- a/kokkos/core/unit_test/serial/TestSerial_ViewLayoutStrideAssignment.cpp
+++ b/kokkos/core/unit_test/serial/TestSerial_ViewLayoutStrideAssignment.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/serial/TestSerial_ViewMapping_a.cpp b/kokkos/core/unit_test/serial/TestSerial_ViewMapping_a.cpp
index 59671867f..431485a31 100644
--- a/kokkos/core/unit_test/serial/TestSerial_ViewMapping_a.cpp
+++ b/kokkos/core/unit_test/serial/TestSerial_ViewMapping_a.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/serial/TestSerial_ViewMapping_b.cpp b/kokkos/core/unit_test/serial/TestSerial_ViewMapping_b.cpp
index 8baf563fd..1e5ce9432 100644
--- a/kokkos/core/unit_test/serial/TestSerial_ViewMapping_b.cpp
+++ b/kokkos/core/unit_test/serial/TestSerial_ViewMapping_b.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/serial/TestSerial_ViewMapping_subview.cpp b/kokkos/core/unit_test/serial/TestSerial_ViewMapping_subview.cpp
index 6643ad98d..9178b054c 100644
--- a/kokkos/core/unit_test/serial/TestSerial_ViewMapping_subview.cpp
+++ b/kokkos/core/unit_test/serial/TestSerial_ViewMapping_subview.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/serial/TestSerial_ViewOfClass.cpp b/kokkos/core/unit_test/serial/TestSerial_ViewOfClass.cpp
index fe14df9e4..a3813eaff 100644
--- a/kokkos/core/unit_test/serial/TestSerial_ViewOfClass.cpp
+++ b/kokkos/core/unit_test/serial/TestSerial_ViewOfClass.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/serial/TestSerial_ViewResize.cpp b/kokkos/core/unit_test/serial/TestSerial_ViewResize.cpp
index d023fa7a8..46f1deb1e 100644
--- a/kokkos/core/unit_test/serial/TestSerial_ViewResize.cpp
+++ b/kokkos/core/unit_test/serial/TestSerial_ViewResize.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/serial/TestSerial_View_64bit.cpp b/kokkos/core/unit_test/serial/TestSerial_View_64bit.cpp
index f800b61e0..98e836db0 100644
--- a/kokkos/core/unit_test/serial/TestSerial_View_64bit.cpp
+++ b/kokkos/core/unit_test/serial/TestSerial_View_64bit.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/serial/TestSerial_WorkGraph.cpp b/kokkos/core/unit_test/serial/TestSerial_WorkGraph.cpp
index 7a996b74c..1192e1fa9 100644
--- a/kokkos/core/unit_test/serial/TestSerial_WorkGraph.cpp
+++ b/kokkos/core/unit_test/serial/TestSerial_WorkGraph.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/standalone/Makefile b/kokkos/core/unit_test/standalone/Makefile
index c910cc5fd..d60422233 100644
--- a/kokkos/core/unit_test/standalone/Makefile
+++ b/kokkos/core/unit_test/standalone/Makefile
@@ -9,7 +9,6 @@ ifndef KOKKOS_PATH
 endif
 
 SRC = $(wildcard $(MAKEFILE_PATH)*.cpp)
-SRC += $(MAKEFILE_PATH)/../TestStackTrace.cpp
 HEADERS = $(wildcard $(MAKEFILE_PATH)*.hpp)
 HEADERS = $(wildcard $(MAKEFILE_PATH)/../*.hpp)
 
@@ -42,7 +41,7 @@ include $(KOKKOS_PATH)/Makefile.kokkos
 build: $(EXE)
 
 $(EXE): $(OBJ) $(KOKKOS_LINK_DEPENDS) gtest-all.o
-	$(LINK) $(KOKKOS_LDFLAGS) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(KOKKOS_LIBS) $(LIB) gtest-all.o  -o $(EXE)
+	$(LINK) $(KOKKOS_LDFLAGS) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(KOKKOS_LIBS) $(LIB) gtest-all.o -lpthread -o $(EXE)
 
 clean: kokkos-clean
 	rm -f *.o *.cuda *.host
diff --git a/kokkos/core/unit_test/standalone/UnitTestMainInit.cpp b/kokkos/core/unit_test/standalone/UnitTestMainInit.cpp
index 42a49cc11..c5d4a3667 100644
--- a/kokkos/core/unit_test/standalone/UnitTestMainInit.cpp
+++ b/kokkos/core/unit_test/standalone/UnitTestMainInit.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -62,12 +62,15 @@
 #ifdef KOKKOS_ENABLE_HPX
 #include <hpx/TestHPX_Category.hpp>
 #endif
+#ifdef KOKKOS_ENABLE_OPENMPTARGET
+#include <openmptarget/TestOpenMPTarget_Category.hpp>
+#endif
 #ifndef TEST_EXECSPACE
 #ifdef KOKKOS_ENABLE_SERIAL
 #include <serial/TestSerial_Category.hpp>
 #endif
 #endif
-#include <TestStackTrace.hpp>
+#include <TestReducers_d.hpp>
 
 int main(int argc, char *argv[]) {
   Kokkos::initialize(argc, argv);
diff --git a/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_complexdouble.cpp b/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_complexdouble.cpp
index c716bb59a..7fe140573 100644
--- a/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_complexdouble.cpp
+++ b/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_complexdouble.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_complexfloat.cpp b/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_complexfloat.cpp
index e5aa0451c..7cac4fa6b 100644
--- a/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_complexfloat.cpp
+++ b/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_complexfloat.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_double.cpp b/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_double.cpp
index f1ed95e58..c6136e9d2 100644
--- a/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_double.cpp
+++ b/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_double.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_float.cpp b/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_float.cpp
index 518cd2d06..e3bca7e3c 100644
--- a/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_float.cpp
+++ b/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_float.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_int.cpp b/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_int.cpp
index a50322917..0acc4c543 100644
--- a/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_int.cpp
+++ b/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_int.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_longint.cpp b/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_longint.cpp
index c0e69028d..ffd2e17d0 100644
--- a/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_longint.cpp
+++ b/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_longint.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_longlongint.cpp b/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_longlongint.cpp
index e3c34449d..8c73b8fc2 100644
--- a/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_longlongint.cpp
+++ b/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_longlongint.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_unsignedint.cpp b/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_unsignedint.cpp
index e1311dee1..5b304f138 100644
--- a/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_unsignedint.cpp
+++ b/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_unsignedint.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_unsignedlongint.cpp b/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_unsignedlongint.cpp
index e0780c4d4..06f99f54e 100644
--- a/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_unsignedlongint.cpp
+++ b/kokkos/core/unit_test/threads/TestThreads_AtomicOperations_unsignedlongint.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/threads/TestThreads_AtomicViews.cpp b/kokkos/core/unit_test/threads/TestThreads_AtomicViews.cpp
index 6f90def17..162543448 100644
--- a/kokkos/core/unit_test/threads/TestThreads_AtomicViews.cpp
+++ b/kokkos/core/unit_test/threads/TestThreads_AtomicViews.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/threads/TestThreads_Atomics.cpp b/kokkos/core/unit_test/threads/TestThreads_Atomics.cpp
index 75de69090..84b3a1782 100644
--- a/kokkos/core/unit_test/threads/TestThreads_Atomics.cpp
+++ b/kokkos/core/unit_test/threads/TestThreads_Atomics.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/threads/TestThreads_Category.hpp b/kokkos/core/unit_test/threads/TestThreads_Category.hpp
index d51925793..800772b42 100644
--- a/kokkos/core/unit_test/threads/TestThreads_Category.hpp
+++ b/kokkos/core/unit_test/threads/TestThreads_Category.hpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/threads/TestThreads_Complex.cpp b/kokkos/core/unit_test/threads/TestThreads_Complex.cpp
index d825e1c31..1322a4170 100644
--- a/kokkos/core/unit_test/threads/TestThreads_Complex.cpp
+++ b/kokkos/core/unit_test/threads/TestThreads_Complex.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/containers/unit_tests/threads/TestThreads_BitSet.cpp b/kokkos/core/unit_test/threads/TestThreads_Concepts.cpp
similarity index 92%
rename from kokkos/containers/unit_tests/threads/TestThreads_BitSet.cpp
rename to kokkos/core/unit_test/threads/TestThreads_Concepts.cpp
index 8611cf8c2..ed2d61ed3 100644
--- a/kokkos/containers/unit_tests/threads/TestThreads_BitSet.cpp
+++ b/kokkos/core/unit_test/threads/TestThreads_Concepts.cpp
@@ -1,4 +1,3 @@
-
 /*
 //@HEADER
 // ************************************************************************
@@ -25,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -44,4 +43,4 @@
 */
 
 #include <threads/TestThreads_Category.hpp>
-#include <TestBitset.hpp>
+#include <TestConcepts.hpp>
diff --git a/kokkos/core/unit_test/threads/TestThreads_Crs.cpp b/kokkos/core/unit_test/threads/TestThreads_Crs.cpp
index 847815788..61468d874 100644
--- a/kokkos/core/unit_test/threads/TestThreads_Crs.cpp
+++ b/kokkos/core/unit_test/threads/TestThreads_Crs.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/threads/TestThreads_DeepCopyAlignment.cpp b/kokkos/core/unit_test/threads/TestThreads_DeepCopyAlignment.cpp
index f4a32a372..8013087d6 100644
--- a/kokkos/core/unit_test/threads/TestThreads_DeepCopyAlignment.cpp
+++ b/kokkos/core/unit_test/threads/TestThreads_DeepCopyAlignment.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/threads/TestThreads_FunctorAnalysis.cpp b/kokkos/core/unit_test/threads/TestThreads_FunctorAnalysis.cpp
index 7fe71715e..5dd1cdde1 100644
--- a/kokkos/core/unit_test/threads/TestThreads_FunctorAnalysis.cpp
+++ b/kokkos/core/unit_test/threads/TestThreads_FunctorAnalysis.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/threads/TestThreads_Init.cpp b/kokkos/core/unit_test/threads/TestThreads_Init.cpp
index 8eaffe750..8a3300929 100644
--- a/kokkos/core/unit_test/threads/TestThreads_Init.cpp
+++ b/kokkos/core/unit_test/threads/TestThreads_Init.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/threads/TestThreads_LocalDeepCopy.cpp b/kokkos/core/unit_test/threads/TestThreads_LocalDeepCopy.cpp
index fefeef729..32735603a 100644
--- a/kokkos/core/unit_test/threads/TestThreads_LocalDeepCopy.cpp
+++ b/kokkos/core/unit_test/threads/TestThreads_LocalDeepCopy.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/threads/TestThreads_MDRange_a.cpp b/kokkos/core/unit_test/threads/TestThreads_MDRange_a.cpp
index 9702702ed..3d0ee3430 100644
--- a/kokkos/core/unit_test/threads/TestThreads_MDRange_a.cpp
+++ b/kokkos/core/unit_test/threads/TestThreads_MDRange_a.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/threads/TestThreads_MDRange_b.cpp b/kokkos/core/unit_test/threads/TestThreads_MDRange_b.cpp
index 02db00385..0fa4fcf62 100644
--- a/kokkos/core/unit_test/threads/TestThreads_MDRange_b.cpp
+++ b/kokkos/core/unit_test/threads/TestThreads_MDRange_b.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/threads/TestThreads_MDRange_c.cpp b/kokkos/core/unit_test/threads/TestThreads_MDRange_c.cpp
index b517eda06..0b21cda75 100644
--- a/kokkos/core/unit_test/threads/TestThreads_MDRange_c.cpp
+++ b/kokkos/core/unit_test/threads/TestThreads_MDRange_c.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/threads/TestThreads_MDRange_d.cpp b/kokkos/core/unit_test/threads/TestThreads_MDRange_d.cpp
index d7eea24cd..04bc98b04 100644
--- a/kokkos/core/unit_test/threads/TestThreads_MDRange_d.cpp
+++ b/kokkos/core/unit_test/threads/TestThreads_MDRange_d.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/threads/TestThreads_MDRange_e.cpp b/kokkos/core/unit_test/threads/TestThreads_MDRange_e.cpp
index ede23644a..5267ae847 100644
--- a/kokkos/core/unit_test/threads/TestThreads_MDRange_e.cpp
+++ b/kokkos/core/unit_test/threads/TestThreads_MDRange_e.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/threads/TestThreads_Other.cpp b/kokkos/core/unit_test/threads/TestThreads_Other.cpp
index c381919f5..01a07896b 100644
--- a/kokkos/core/unit_test/threads/TestThreads_Other.cpp
+++ b/kokkos/core/unit_test/threads/TestThreads_Other.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/threads/TestThreads_RangePolicy.cpp b/kokkos/core/unit_test/threads/TestThreads_RangePolicy.cpp
index 10d5f54cf..785469346 100644
--- a/kokkos/core/unit_test/threads/TestThreads_RangePolicy.cpp
+++ b/kokkos/core/unit_test/threads/TestThreads_RangePolicy.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/containers/unit_tests/threads/TestThreads_Vector.cpp b/kokkos/core/unit_test/threads/TestThreads_RangePolicyRequire.cpp
similarity index 92%
rename from kokkos/containers/unit_tests/threads/TestThreads_Vector.cpp
rename to kokkos/core/unit_test/threads/TestThreads_RangePolicyRequire.cpp
index f470f0c99..7a10b8265 100644
--- a/kokkos/containers/unit_tests/threads/TestThreads_Vector.cpp
+++ b/kokkos/core/unit_test/threads/TestThreads_RangePolicyRequire.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -44,4 +44,4 @@
 */
 
 #include <threads/TestThreads_Category.hpp>
-#include <TestVector.hpp>
+#include <TestRangeRequire.hpp>
diff --git a/kokkos/core/unit_test/threads/TestThreads_Reducers_a.cpp b/kokkos/core/unit_test/threads/TestThreads_Reducers_a.cpp
index 6ef139237..8b79d74e8 100644
--- a/kokkos/core/unit_test/threads/TestThreads_Reducers_a.cpp
+++ b/kokkos/core/unit_test/threads/TestThreads_Reducers_a.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/threads/TestThreads_Reducers_b.cpp b/kokkos/core/unit_test/threads/TestThreads_Reducers_b.cpp
index af56b1372..b556c4394 100644
--- a/kokkos/core/unit_test/threads/TestThreads_Reducers_b.cpp
+++ b/kokkos/core/unit_test/threads/TestThreads_Reducers_b.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/threads/TestThreads_Reducers_c.cpp b/kokkos/core/unit_test/threads/TestThreads_Reducers_c.cpp
index e5772075e..e2c23030a 100644
--- a/kokkos/core/unit_test/threads/TestThreads_Reducers_c.cpp
+++ b/kokkos/core/unit_test/threads/TestThreads_Reducers_c.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/threads/TestThreads_Reducers_d.cpp b/kokkos/core/unit_test/threads/TestThreads_Reducers_d.cpp
index 525f74910..aa37b6eb5 100644
--- a/kokkos/core/unit_test/threads/TestThreads_Reducers_d.cpp
+++ b/kokkos/core/unit_test/threads/TestThreads_Reducers_d.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/threads/TestThreads_Reductions.cpp b/kokkos/core/unit_test/threads/TestThreads_Reductions.cpp
index 42bc067c3..9384590dc 100644
--- a/kokkos/core/unit_test/threads/TestThreads_Reductions.cpp
+++ b/kokkos/core/unit_test/threads/TestThreads_Reductions.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/threads/TestThreads_Reductions_DeviceView.cpp b/kokkos/core/unit_test/threads/TestThreads_Reductions_DeviceView.cpp
index d659f6f98..e5ebb6e8a 100644
--- a/kokkos/core/unit_test/threads/TestThreads_Reductions_DeviceView.cpp
+++ b/kokkos/core/unit_test/threads/TestThreads_Reductions_DeviceView.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/threads/TestThreads_Scan.cpp b/kokkos/core/unit_test/threads/TestThreads_Scan.cpp
index 0bb189bf8..12648bf30 100644
--- a/kokkos/core/unit_test/threads/TestThreads_Scan.cpp
+++ b/kokkos/core/unit_test/threads/TestThreads_Scan.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/threads/TestThreads_SharedAlloc.cpp b/kokkos/core/unit_test/threads/TestThreads_SharedAlloc.cpp
index 2394fc719..837334c99 100644
--- a/kokkos/core/unit_test/threads/TestThreads_SharedAlloc.cpp
+++ b/kokkos/core/unit_test/threads/TestThreads_SharedAlloc.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/threads/TestThreads_SubView_a.cpp b/kokkos/core/unit_test/threads/TestThreads_SubView_a.cpp
index f61b4649e..7298d4cde 100644
--- a/kokkos/core/unit_test/threads/TestThreads_SubView_a.cpp
+++ b/kokkos/core/unit_test/threads/TestThreads_SubView_a.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/threads/TestThreads_SubView_b.cpp b/kokkos/core/unit_test/threads/TestThreads_SubView_b.cpp
index 81d54e84d..a6f22a082 100644
--- a/kokkos/core/unit_test/threads/TestThreads_SubView_b.cpp
+++ b/kokkos/core/unit_test/threads/TestThreads_SubView_b.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/threads/TestThreads_SubView_c01.cpp b/kokkos/core/unit_test/threads/TestThreads_SubView_c01.cpp
index 2f28d71e1..a568569b4 100644
--- a/kokkos/core/unit_test/threads/TestThreads_SubView_c01.cpp
+++ b/kokkos/core/unit_test/threads/TestThreads_SubView_c01.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/threads/TestThreads_SubView_c02.cpp b/kokkos/core/unit_test/threads/TestThreads_SubView_c02.cpp
index 61bec4019..3ea141576 100644
--- a/kokkos/core/unit_test/threads/TestThreads_SubView_c02.cpp
+++ b/kokkos/core/unit_test/threads/TestThreads_SubView_c02.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/threads/TestThreads_SubView_c03.cpp b/kokkos/core/unit_test/threads/TestThreads_SubView_c03.cpp
index a46856350..eaaf11f1b 100644
--- a/kokkos/core/unit_test/threads/TestThreads_SubView_c03.cpp
+++ b/kokkos/core/unit_test/threads/TestThreads_SubView_c03.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/threads/TestThreads_SubView_c04.cpp b/kokkos/core/unit_test/threads/TestThreads_SubView_c04.cpp
index 1f01e9aa4..5a5a7962c 100644
--- a/kokkos/core/unit_test/threads/TestThreads_SubView_c04.cpp
+++ b/kokkos/core/unit_test/threads/TestThreads_SubView_c04.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/threads/TestThreads_SubView_c05.cpp b/kokkos/core/unit_test/threads/TestThreads_SubView_c05.cpp
index c56bd03d8..3ab975ebc 100644
--- a/kokkos/core/unit_test/threads/TestThreads_SubView_c05.cpp
+++ b/kokkos/core/unit_test/threads/TestThreads_SubView_c05.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/threads/TestThreads_SubView_c06.cpp b/kokkos/core/unit_test/threads/TestThreads_SubView_c06.cpp
index bc607917f..bcc9c11ad 100644
--- a/kokkos/core/unit_test/threads/TestThreads_SubView_c06.cpp
+++ b/kokkos/core/unit_test/threads/TestThreads_SubView_c06.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/threads/TestThreads_SubView_c07.cpp b/kokkos/core/unit_test/threads/TestThreads_SubView_c07.cpp
index aa822c7c2..2b07bd5d6 100644
--- a/kokkos/core/unit_test/threads/TestThreads_SubView_c07.cpp
+++ b/kokkos/core/unit_test/threads/TestThreads_SubView_c07.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/threads/TestThreads_SubView_c08.cpp b/kokkos/core/unit_test/threads/TestThreads_SubView_c08.cpp
index fd92132ae..02f68015a 100644
--- a/kokkos/core/unit_test/threads/TestThreads_SubView_c08.cpp
+++ b/kokkos/core/unit_test/threads/TestThreads_SubView_c08.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/threads/TestThreads_SubView_c09.cpp b/kokkos/core/unit_test/threads/TestThreads_SubView_c09.cpp
index 49b589210..cd8fbe8bb 100644
--- a/kokkos/core/unit_test/threads/TestThreads_SubView_c09.cpp
+++ b/kokkos/core/unit_test/threads/TestThreads_SubView_c09.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/threads/TestThreads_SubView_c10.cpp b/kokkos/core/unit_test/threads/TestThreads_SubView_c10.cpp
index 9adb28e56..6f0995bc5 100644
--- a/kokkos/core/unit_test/threads/TestThreads_SubView_c10.cpp
+++ b/kokkos/core/unit_test/threads/TestThreads_SubView_c10.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/threads/TestThreads_SubView_c11.cpp b/kokkos/core/unit_test/threads/TestThreads_SubView_c11.cpp
index ffd01d657..7ba93d051 100644
--- a/kokkos/core/unit_test/threads/TestThreads_SubView_c11.cpp
+++ b/kokkos/core/unit_test/threads/TestThreads_SubView_c11.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/threads/TestThreads_SubView_c12.cpp b/kokkos/core/unit_test/threads/TestThreads_SubView_c12.cpp
index 3f3736609..91b7d67aa 100644
--- a/kokkos/core/unit_test/threads/TestThreads_SubView_c12.cpp
+++ b/kokkos/core/unit_test/threads/TestThreads_SubView_c12.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/threads/TestThreads_SubView_c13.cpp b/kokkos/core/unit_test/threads/TestThreads_SubView_c13.cpp
index df4da7a37..4814f206d 100644
--- a/kokkos/core/unit_test/threads/TestThreads_SubView_c13.cpp
+++ b/kokkos/core/unit_test/threads/TestThreads_SubView_c13.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/threads/TestThreads_Team.cpp b/kokkos/core/unit_test/threads/TestThreads_Team.cpp
index d4fb2df4e..5d2e36073 100644
--- a/kokkos/core/unit_test/threads/TestThreads_Team.cpp
+++ b/kokkos/core/unit_test/threads/TestThreads_Team.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -80,25 +80,25 @@ TEST(TEST_CATEGORY, team_reduce) {
 }
 
 TEST(TEST_CATEGORY, team_broadcast) {
-  TestTeamBroadcast<TEST_EXECSPACE,
-                    Kokkos::Schedule<Kokkos::Static> >::test_teambroadcast(0);
-  TestTeamBroadcast<TEST_EXECSPACE,
-                    Kokkos::Schedule<Kokkos::Dynamic> >::test_teambroadcast(0);
+  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static>,
+                    long>::test_teambroadcast(0, 1);
+  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic>,
+                    long>::test_teambroadcast(0, 1);
 
-  TestTeamBroadcast<TEST_EXECSPACE,
-                    Kokkos::Schedule<Kokkos::Static> >::test_teambroadcast(2);
-  TestTeamBroadcast<TEST_EXECSPACE,
-                    Kokkos::Schedule<Kokkos::Dynamic> >::test_teambroadcast(2);
+  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static>,
+                    long>::test_teambroadcast(2, 1);
+  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic>,
+                    long>::test_teambroadcast(2, 1);
 
-  TestTeamBroadcast<TEST_EXECSPACE,
-                    Kokkos::Schedule<Kokkos::Static> >::test_teambroadcast(16);
-  TestTeamBroadcast<TEST_EXECSPACE,
-                    Kokkos::Schedule<Kokkos::Dynamic> >::test_teambroadcast(16);
+  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static>,
+                    long>::test_teambroadcast(16, 1);
+  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic>,
+                    long>::test_teambroadcast(16, 1);
 
-  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static> >::
-      test_teambroadcast(1000);
-  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic> >::
-      test_teambroadcast(1000);
+  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Static>,
+                    long>::test_teambroadcast(1000, 1);
+  TestTeamBroadcast<TEST_EXECSPACE, Kokkos::Schedule<Kokkos::Dynamic>,
+                    long>::test_teambroadcast(1000, 1);
 }
 }  // namespace Test
 
diff --git a/kokkos/core/unit_test/threads/TestThreads_TeamReductionScan.cpp b/kokkos/core/unit_test/threads/TestThreads_TeamReductionScan.cpp
index b80c3d795..2c382c80a 100644
--- a/kokkos/core/unit_test/threads/TestThreads_TeamReductionScan.cpp
+++ b/kokkos/core/unit_test/threads/TestThreads_TeamReductionScan.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/threads/TestThreads_TeamScratch.cpp b/kokkos/core/unit_test/threads/TestThreads_TeamScratch.cpp
index 12fbbe7ee..a37369fc0 100644
--- a/kokkos/core/unit_test/threads/TestThreads_TeamScratch.cpp
+++ b/kokkos/core/unit_test/threads/TestThreads_TeamScratch.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -58,7 +58,6 @@ TEST(TEST_CATEGORY, team_scratch_request) {
 }
 
 #if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA)
-#if !defined(KOKKOS_ENABLE_CUDA) || (8000 <= CUDA_VERSION)
 TEST(TEST_CATEGORY, team_lambda_shared_request) {
   TestLambdaSharedTeam<Kokkos::HostSpace, TEST_EXECSPACE,
                        Kokkos::Schedule<Kokkos::Static> >();
@@ -68,7 +67,6 @@ TEST(TEST_CATEGORY, team_lambda_shared_request) {
 
 TEST(TEST_CATEGORY, scratch_align) { TestScratchAlignment<TEST_EXECSPACE>(); }
 #endif
-#endif
 
 TEST(TEST_CATEGORY, shmem_size) { TestShmemSize<TEST_EXECSPACE>(); }
 
diff --git a/kokkos/core/unit_test/threads/TestThreads_TeamTeamSize.cpp b/kokkos/core/unit_test/threads/TestThreads_TeamTeamSize.cpp
index cbf9618a8..d5e16dcbd 100644
--- a/kokkos/core/unit_test/threads/TestThreads_TeamTeamSize.cpp
+++ b/kokkos/core/unit_test/threads/TestThreads_TeamTeamSize.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/threads/TestThreads_TeamVectorRange.cpp b/kokkos/core/unit_test/threads/TestThreads_TeamVectorRange.cpp
index c5e24424c..4e216d75d 100644
--- a/kokkos/core/unit_test/threads/TestThreads_TeamVectorRange.cpp
+++ b/kokkos/core/unit_test/threads/TestThreads_TeamVectorRange.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/threads/TestThreads_UniqueToken.cpp b/kokkos/core/unit_test/threads/TestThreads_UniqueToken.cpp
index d0ded3bc5..f8391af88 100644
--- a/kokkos/core/unit_test/threads/TestThreads_UniqueToken.cpp
+++ b/kokkos/core/unit_test/threads/TestThreads_UniqueToken.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/threads/TestThreads_ViewAPI_a.cpp b/kokkos/core/unit_test/threads/TestThreads_ViewAPI_a.cpp
index cc39ac5e4..91bbd2d16 100644
--- a/kokkos/core/unit_test/threads/TestThreads_ViewAPI_a.cpp
+++ b/kokkos/core/unit_test/threads/TestThreads_ViewAPI_a.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/threads/TestThreads_ViewAPI_b.cpp b/kokkos/core/unit_test/threads/TestThreads_ViewAPI_b.cpp
index 80121bb73..aaee8e579 100644
--- a/kokkos/core/unit_test/threads/TestThreads_ViewAPI_b.cpp
+++ b/kokkos/core/unit_test/threads/TestThreads_ViewAPI_b.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/threads/TestThreads_ViewAPI_c.cpp b/kokkos/core/unit_test/threads/TestThreads_ViewAPI_c.cpp
index 160d27c2c..074344d12 100644
--- a/kokkos/core/unit_test/threads/TestThreads_ViewAPI_c.cpp
+++ b/kokkos/core/unit_test/threads/TestThreads_ViewAPI_c.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/threads/TestThreads_ViewAPI_d.cpp b/kokkos/core/unit_test/threads/TestThreads_ViewAPI_d.cpp
index 1a96532f1..995bb5666 100644
--- a/kokkos/core/unit_test/threads/TestThreads_ViewAPI_d.cpp
+++ b/kokkos/core/unit_test/threads/TestThreads_ViewAPI_d.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/threads/TestThreads_ViewAPI_e.cpp b/kokkos/core/unit_test/threads/TestThreads_ViewAPI_e.cpp
index f803c45fa..879f075db 100644
--- a/kokkos/core/unit_test/threads/TestThreads_ViewAPI_e.cpp
+++ b/kokkos/core/unit_test/threads/TestThreads_ViewAPI_e.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/threads/TestThreads_ViewLayoutStrideAssignment.cpp b/kokkos/core/unit_test/threads/TestThreads_ViewLayoutStrideAssignment.cpp
index 877157d62..0b54784d9 100644
--- a/kokkos/core/unit_test/threads/TestThreads_ViewLayoutStrideAssignment.cpp
+++ b/kokkos/core/unit_test/threads/TestThreads_ViewLayoutStrideAssignment.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/threads/TestThreads_ViewMapping_a.cpp b/kokkos/core/unit_test/threads/TestThreads_ViewMapping_a.cpp
index 658aec977..22f849a0c 100644
--- a/kokkos/core/unit_test/threads/TestThreads_ViewMapping_a.cpp
+++ b/kokkos/core/unit_test/threads/TestThreads_ViewMapping_a.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/threads/TestThreads_ViewMapping_b.cpp b/kokkos/core/unit_test/threads/TestThreads_ViewMapping_b.cpp
index e0a014951..d18b9b899 100644
--- a/kokkos/core/unit_test/threads/TestThreads_ViewMapping_b.cpp
+++ b/kokkos/core/unit_test/threads/TestThreads_ViewMapping_b.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/threads/TestThreads_ViewMapping_subview.cpp b/kokkos/core/unit_test/threads/TestThreads_ViewMapping_subview.cpp
index 3c7d42de6..3e9ce2102 100644
--- a/kokkos/core/unit_test/threads/TestThreads_ViewMapping_subview.cpp
+++ b/kokkos/core/unit_test/threads/TestThreads_ViewMapping_subview.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/threads/TestThreads_ViewOfClass.cpp b/kokkos/core/unit_test/threads/TestThreads_ViewOfClass.cpp
index 7cb81ca0f..3018023cb 100644
--- a/kokkos/core/unit_test/threads/TestThreads_ViewOfClass.cpp
+++ b/kokkos/core/unit_test/threads/TestThreads_ViewOfClass.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/threads/TestThreads_ViewResize.cpp b/kokkos/core/unit_test/threads/TestThreads_ViewResize.cpp
index 6bd67d174..a143e3f4d 100644
--- a/kokkos/core/unit_test/threads/TestThreads_ViewResize.cpp
+++ b/kokkos/core/unit_test/threads/TestThreads_ViewResize.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/threads/TestThreads_View_64bit.cpp b/kokkos/core/unit_test/threads/TestThreads_View_64bit.cpp
index c5f80760b..b347b441e 100644
--- a/kokkos/core/unit_test/threads/TestThreads_View_64bit.cpp
+++ b/kokkos/core/unit_test/threads/TestThreads_View_64bit.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/core/unit_test/threads/TestThreads_WorkGraph.cpp b/kokkos/core/unit_test/threads/TestThreads_WorkGraph.cpp
index c0cb3c22c..1ebc7d896 100644
--- a/kokkos/core/unit_test/threads/TestThreads_WorkGraph.cpp
+++ b/kokkos/core/unit_test/threads/TestThreads_WorkGraph.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/doc/design_notes_space_instances.md b/kokkos/doc/design_notes_space_instances.md
index 0124dfbc8..ce3d24299 100644
--- a/kokkos/doc/design_notes_space_instances.md
+++ b/kokkos/doc/design_notes_space_instances.md
@@ -3,21 +3,21 @@
 ## Objective
 
  * Enable Kokkos interoperability with coarse-grain tasking models
- 
+
 ## Requirements
 
- * Backwards compatable with existing Kokkos API
- * Support existing Host execution spaces (Serial, Threads, OpenMP, maybe Qthreads)
+ * Backwards compatible with existing Kokkos API
+ * Support existing Host execution spaces (Serial, Threads, OpenMP)
  * Support DARMA threading model (may require a new Host execution space)
  * Support Uintah threading model, i.e. indepentant worker threadpools working of of shared task queues
- 
-  
+
+
 ## Execution Space
 
   * Parallel work is *dispatched* on an execution space instance
-  
-  * Execution space instances are conceptually disjoint/independant from each other 
-  
+
+  * Execution space instances are conceptually disjoint/independent from each other
+
 
 ## Host Execution Space Instances
 
@@ -35,7 +35,7 @@
 
   *  The control thread is a member of the instance
 
-  *  The pool of threads associated with an instances is not mutatable during that instance existance
+  *  The pool of threads associated with an instances is not mutatable during that instance existence
 
   *  The pool of threads associated with an instance may be masked
 
@@ -44,8 +44,8 @@
     -  Example: only one hyperthread per core of the instance
 
     -  A mask can be applied during the policy creation of a parallel algorithm
- 
-    -  Masking is portable by defining it as ceiling of fraction between [0.0, 1.0] 
+
+    -  Masking is portable by defining it as ceiling of fraction between [0.0, 1.0]
        of the available resources
 
 ```
@@ -57,75 +57,75 @@ public:
   using array_layout = ...;
   using size_type = ...;
   using scratch_memory_space = ...;
-  
-  
+
+
   class Instance
   {
     int thread_pool_size( int depth = 0 );
     ...
   };
-  
+
   class InstanceRequest
   {
   public:
     using Control = std::function< void( Instance * )>;
-    
+
     InstanceRequest( Control control
                    , unsigned thread_count
                    , unsigned use_numa_count = 0
                    , unsigned use_cores_per_numa = 0
-                   );    
-  
+                   );
+
   };
-  
+
   static bool in_parallel();
-  
+
   static bool sleep();
   static bool wake();
-  
+
   static void fence();
-  
+
   static void print_configuration( std::ostream &, const bool detailed = false );
-  
+
   static void initialize( unsigned thread_count = 0
                         , unsigned use_numa_count = 0
                         , unsigned use_cores_per_numa = 0
                         );
-  
+
   // Partition the current instance into the requested instances
   // and run the given functions on the cooresponding instances
-  // will block until all the partitioned instances complete and 
-  // the original instance will be restored 
+  // will block until all the partitioned instances complete and
+  // the original instance will be restored
   //
   // Requires that the space has already been initialized
   // Requires that the request can be statisfied by the current instance
-  //   i.e. the sum of number of requested threads must be less than the 
+  //   i.e. the sum of number of requested threads must be less than the
   //   max_hardware_threads
   //
   // Each control functor will accept a handle to its new default instance
-  // Each instance must be independant of all other instances 
+  // Each instance must be independent of all other instances
   //   i.e. no assumption on scheduling between instances
   // The user is responible for checking the return code for errors
   static int run_instances( std::vector< InstanceRequest> const& requests );
-  
+
   static void finalize();
 
   static int is_initialized();
-  
+
   static int concurrency();
-  
+
   static int thread_pool_size( int depth = 0 );
-  
+
   static int thread_pool_rank();
-  
+
   static int max_hardware_threads();
-  
+
   static int hardware_thread_id();
-                        
+
  };
 
 ```
- 
+
 
 
 
diff --git a/kokkos/doc/develop_builds.md b/kokkos/doc/develop_builds.md
index 9a211fa77..080e43e11 100644
--- a/kokkos/doc/develop_builds.md
+++ b/kokkos/doc/develop_builds.md
@@ -26,7 +26,7 @@ grouping by platform.
 ### generate_makefile.sh
 
 The bash code does not do any error checking on the `--arch=`  or `--device=`
-arguments thus strictly speaking you do not *need* to do anything to add a 
+arguments thus strictly speaking you do not *need* to do anything to add a
 device or architecture; however, you should add it to the help menu.  For the
 archictectures, please group by one of the platforms listed above.
 
@@ -37,7 +37,7 @@ The options for the CMake build system are: `-DKOKKOS_HOST_ARCH:STRING=` and
 `-DKOKKOS_ENABLE_<device>:BOOL=`.  Although any string can be passed into
 KOKKOS_HOST_ARCH option, it is checked against an accepted list.  Likewise, the
 KOKKOS_ENABLE_<device> must have the option added AND it is formed using the
-list. Thus: 
+list. Thus:
   + A new architecture should be added to the KOKKOS_HOST_ARCH_LIST variable.
   + A new device should be added to the KOKKOS_DEVICES_LIST variable **AND** a
     KOKKOS_ENABLE_<newdevice> option specified (see KOKKOS_ENABLE_CUDA for
@@ -46,7 +46,7 @@ list. Thus:
 
 The translation from option to the `KOKKOS_SETTINGS` is done in
 `kokkos_settings.cmake`.  This translation is automated for some types if you ad
-to the list, but for others, it may need to be hand coded. 
+to the list, but for others, it may need to be hand coded.
 
 
 ### Makefile.kokkos
@@ -62,7 +62,7 @@ the Kokkos development team.
 
 This file is used to check the build system in a platform-independent way.  It
 works by looping over available architectures and devices; thus, you should add
-your new architecure to KOKKOS_ARCH_OPTIONS and your new device to 
+your new architecure to KOKKOS_ARCH_OPTIONS and your new device to
 KOKKOS_DEVICE_OPTIONS to be tested.  The build system tests work by grepping the
 generated build files (automatically).  The header file tests work by diffing
 the generated file with results that are stored in
diff --git a/kokkos/doc/hardware_identification/query_cuda_arch.cpp b/kokkos/doc/hardware_identification/query_cuda_arch.cpp
index 86efee2ab..879b3ca1e 100644
--- a/kokkos/doc/hardware_identification/query_cuda_arch.cpp
+++ b/kokkos/doc/hardware_identification/query_cuda_arch.cpp
@@ -13,7 +13,7 @@ int main() {
     case 5: printf("Maxwell"); break;
     case 6: printf("Pascal"); break;
     default:
-      fprintf(stderr, "Unspported Device %d%d\n", (int)prop.major,
+      fprintf(stderr, "Unsupported Device %d%d\n", (int)prop.major,
               (int)prop.minor);
       return -1;
   }
diff --git a/kokkos/doc/kokkos-promotion.txt b/kokkos/doc/kokkos-promotion.txt
index e36a6c98e..81489e6e1 100644
--- a/kokkos/doc/kokkos-promotion.txt
+++ b/kokkos/doc/kokkos-promotion.txt
@@ -71,18 +71,18 @@ supported compilers. Those machines are:
 // -------------------------------------------------------------------------------- //
 
 Step 2:
-  2.1. Build and test Trilinos with the following configurations: 
+  2.1. Build and test Trilinos with the following configurations:
        a) serial, openmp, and cuda via the testing scripts in kokkos-kernels/scripts/trilinos-integration (automates the process)
        b) various ATDM-supported builds via Trilinos configuration scripts located in kokkos{-kernels}/scripts/trilinos-integration/ATDM_configurations (not yet automated)
-       
-       Run scripts for automated testing on white (openmp and cuda) and blake (seral) that are provided in kokkos{-kernels}/scripts/trilinos-integration. 
+
+       Run scripts for automated testing on white (openmp and cuda) and blake (seral) that are provided in kokkos{-kernels}/scripts/trilinos-integration.
        These scripts load their own modules/environment, so don't require preparation. You can run all four at the same time, use separate directories for each.
 
          mkdir serial
          cd serial
          nohup KOKKOSKERNELS_PATH/scripts/trilinos-integration/blake_jenkins_run_script_serial_intel &
 
-       Use scripts to configure Trilinos for waterman (cuda, cuda-debug) and ride (cuda-rdc) that are provided in kokkos-kernels/scripts/trilinos-integration/ATDM_configurations. 
+       Use scripts to configure Trilinos for waterman (cuda, cuda-debug) and ride (cuda-rdc) that are provided in kokkos-kernels/scripts/trilinos-integration/ATDM_configurations.
 
        These scripts load their own modules/environment, so don't require preparation of the system environment. You can run them all at the same time, just use separate directories for each. Instructions for compute node allocation, building, and testing are included in the scripts.
 
@@ -97,12 +97,12 @@ Step 2:
 // -------------------------------------------------------------------------------- //
 
 Step 3: Close all issues labeled "InDevelop"
-      
+
        Use the GitHub web interface: https://github.com/kokkos/kokkos/issues?q=is%3Aopen+is%3Aissue+label%3AInDevelop
-       Select all with checkbox in upper left, "Mark as closed" 
+       Select all with checkbox in upper left, "Mark as closed"
 
        Use the GitHub web interface: https://github.com/kokkos/kokkos-kernels/issues?q=is%3Aopen+is%3Aissue+label%3AInDevelop
-       Select all with checkbox in upper left, "Mark as closed" 
+       Select all with checkbox in upper left, "Mark as closed"
 
 // -------------------------------------------------------------------------------- //
 
@@ -183,7 +183,7 @@ Step 4: This step should be run on kokkos-dev
        # Append to scripts/master_history.txt:
 
        tag:  2.03.13    date: 07:27:2017    master: da314444    develop: 29ccb58a
-       
+
        git commit --amend -a
 
        Keep the merge commit as described in 4.6
@@ -210,7 +210,7 @@ Step 5: This step can be done on any SEMS machine (e.g. kokkos-dev).
          git clone -b kokkos-promotion git@github.com:trilinos/Trilinos.git
          TRILINOS_PATH=$PWD/Trilinos
 
-  5.2. Snapshot Kokkos into Trilinos - this requires python/2.7.9 and that both Trilinos and Kokkos be clean - no untracked or modified files. Run the following outside of the Kokkos and Trilinos source trees. 
+  5.2. Snapshot Kokkos into Trilinos - this requires python/2.7.9 and that both Trilinos and Kokkos be clean - no untracked or modified files. Run the following outside of the Kokkos and Trilinos source trees.
 
       * Use the master branch of Kokkos for this.
 
@@ -244,24 +244,24 @@ Step 5: This step can be done on any SEMS machine (e.g. kokkos-dev).
 // -------------------------------------------------------------------------------- //
 
 Step 6: Push Kokkos + KokkosKernels master and develop branches to respective GitHub repos (requires Owner permission).
-      
+
   6.1. Master branch:
        cd $KOKKOS_PATH
        git checkout master
-       git push --follow-tags origin master 
+       git push --follow-tags origin master
 
        cd $KOKKOSKERNELS_PATH
        git checkout master
-       git push --follow-tags origin master 
+       git push --follow-tags origin master
 
   6.2. Develop branch: First merge (--no-ff) master back into develop
        cd $KOKKOS_PATH
        git checkout develop
        git merge --no-ff master
-       git push origin develop 
+       git push origin develop
 
        cd $KOKKOSKERNELS_PATH
        git checkout develop
        git merge --no-ff master
-       git push origin develop 
+       git push origin develop
 
diff --git a/kokkos/example/CMakeLists.txt b/kokkos/example/CMakeLists.txt
index c7d609954..34157329d 100644
--- a/kokkos/example/CMakeLists.txt
+++ b/kokkos/example/CMakeLists.txt
@@ -2,19 +2,11 @@
 
 # Subpackage name must match what appears in kokkos/cmake/Dependencies.cmake
 #
-#KOKKOS_SUBPACKAGE(Example)
+KOKKOS_SUBPACKAGE(Example)
 
-#KOKKOS_ADD_EXAMPLE_DIRECTORIES(query_device)
-#KOKKOS_ADD_EXAMPLE_DIRECTORIES(fixture)
-#KOKKOS_ADD_EXAMPLE_DIRECTORIES(feint)
-#KOKKOS_ADD_EXAMPLE_DIRECTORIES(fenl)
-#KOKKOS_ADD_EXAMPLE_DIRECTORIES(multi_fem)
-#KOKKOS_ADD_EXAMPLE_DIRECTORIES(md_skeleton)
-#KOKKOS_ADD_EXAMPLE_DIRECTORIES(global_2_local_ids)
-#KOKKOS_ADD_EXAMPLE_DIRECTORIES(grow_array)
-#KOKKOS_ADD_EXAMPLE_DIRECTORIES(sort_array)
-#if(NOT Kokkos_ENABLE_CUDA)
-#KOKKOS_ADD_EXAMPLE_DIRECTORIES(tutorial)
-#endif()
-#KOKKOS_SUBPACKAGE_POSTPROCESS()
+KOKKOS_ADD_EXAMPLE_DIRECTORIES(query_device)
+if(NOT Kokkos_ENABLE_CUDA)
+  KOKKOS_ADD_EXAMPLE_DIRECTORIES(tutorial)
+endif()
+KOKKOS_SUBPACKAGE_POSTPROCESS()
 
diff --git a/kokkos/example/README b/kokkos/example/README
index ec6400484..668605124 100644
--- a/kokkos/example/README
+++ b/kokkos/example/README
@@ -5,12 +5,5 @@ Tpetra.
 
 MANIFEST:
 
-  - common:  Header files used by different examples
-  - feint:   Unstructured finite-element method
-  - fixture: Some other finite-element method example
-  - global_2_local_ids: Example of global-to-local index lookup
-  - grow_array:   Parallel dynamic memory allocation
-  - md_skeleton:  Molecular dynamics
   - query_device: Kokkos' HWLOC wrapper for querying device topology
-  - sort_array:   Parallel sort
   - tutorial:     Kokkos tutorial (START HERE)
diff --git a/kokkos/example/build_cmake_in_tree/cmake_example.cpp b/kokkos/example/build_cmake_in_tree/cmake_example.cpp
index 503587141..63875d013 100644
--- a/kokkos/example/build_cmake_in_tree/cmake_example.cpp
+++ b/kokkos/example/build_cmake_in_tree/cmake_example.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -57,7 +57,7 @@ int main(int argc, char* argv[]) {
     exit(1);
   }
 
-  const long n = strtol(argv[1], NULL, 10);
+  const long n = strtol(argv[1], nullptr, 10);
 
   printf("Number of even integers from 0 to %ld\n", n - 1);
 
diff --git a/kokkos/example/build_cmake_installed/cmake_example.cpp b/kokkos/example/build_cmake_installed/cmake_example.cpp
index 503587141..63875d013 100644
--- a/kokkos/example/build_cmake_installed/cmake_example.cpp
+++ b/kokkos/example/build_cmake_installed/cmake_example.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -57,7 +57,7 @@ int main(int argc, char* argv[]) {
     exit(1);
   }
 
-  const long n = strtol(argv[1], NULL, 10);
+  const long n = strtol(argv[1], nullptr, 10);
 
   printf("Number of even integers from 0 to %ld\n", n - 1);
 
diff --git a/kokkos/example/cmake/Dependencies.cmake b/kokkos/example/cmake/Dependencies.cmake
deleted file mode 100644
index 741db6a0c..000000000
--- a/kokkos/example/cmake/Dependencies.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-TRIBITS_PACKAGE_DEFINE_DEPENDENCIES(
-  TEST_OPTIONAL_TPLS CUSPARSE MKL HPX
-  )
diff --git a/kokkos/example/query_device/query_device.cpp b/kokkos/example/query_device/query_device.cpp
index 68959cabe..a563b06b2 100644
--- a/kokkos/example/query_device/query_device.cpp
+++ b/kokkos/example/query_device/query_device.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -59,6 +59,8 @@
 int main(int argc, char** argv) {
   std::ostringstream msg;
 
+  (void)argc;
+  (void)argv;
 #if defined(KOKKOS_ENABLE_MPI)
 
   MPI_Init(&argc, &argv);
diff --git a/kokkos/example/tutorial/01_hello_world/hello_world.cpp b/kokkos/example/tutorial/01_hello_world/hello_world.cpp
index 93a571f6b..00adbc78b 100644
--- a/kokkos/example/tutorial/01_hello_world/hello_world.cpp
+++ b/kokkos/example/tutorial/01_hello_world/hello_world.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/example/tutorial/01_hello_world_lambda/hello_world_lambda.cpp b/kokkos/example/tutorial/01_hello_world_lambda/hello_world_lambda.cpp
index fecb5b87f..c3bd00e7d 100644
--- a/kokkos/example/tutorial/01_hello_world_lambda/hello_world_lambda.cpp
+++ b/kokkos/example/tutorial/01_hello_world_lambda/hello_world_lambda.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/example/tutorial/02_simple_reduce/simple_reduce.cpp b/kokkos/example/tutorial/02_simple_reduce/simple_reduce.cpp
index 9eacafa73..01abd3d3b 100644
--- a/kokkos/example/tutorial/02_simple_reduce/simple_reduce.cpp
+++ b/kokkos/example/tutorial/02_simple_reduce/simple_reduce.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/example/tutorial/02_simple_reduce_lambda/simple_reduce_lambda.cpp b/kokkos/example/tutorial/02_simple_reduce_lambda/simple_reduce_lambda.cpp
index cc94ef946..7f4c356e0 100644
--- a/kokkos/example/tutorial/02_simple_reduce_lambda/simple_reduce_lambda.cpp
+++ b/kokkos/example/tutorial/02_simple_reduce_lambda/simple_reduce_lambda.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/example/tutorial/03_simple_view/Makefile b/kokkos/example/tutorial/03_simple_view/Makefile
index de994a8df..c9dc3a0fd 100644
--- a/kokkos/example/tutorial/03_simple_view/Makefile
+++ b/kokkos/example/tutorial/03_simple_view/Makefile
@@ -43,7 +43,7 @@ include $(KOKKOS_PATH)/Makefile.kokkos
 
 build: $(EXE)
 
-#for unit testing only, for best preformance with OpenMP 4.0 or better
+#for unit testing only, for best performance with OpenMP 4.0 or better
 test: $(EXE)
 	./$(EXE)
 
diff --git a/kokkos/example/tutorial/03_simple_view/simple_view.cpp b/kokkos/example/tutorial/03_simple_view/simple_view.cpp
index 8493e5f7b..f4924c71f 100644
--- a/kokkos/example/tutorial/03_simple_view/simple_view.cpp
+++ b/kokkos/example/tutorial/03_simple_view/simple_view.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/example/tutorial/03_simple_view_lambda/simple_view_lambda.cpp b/kokkos/example/tutorial/03_simple_view_lambda/simple_view_lambda.cpp
index 1ca2cd678..d5590e5cc 100644
--- a/kokkos/example/tutorial/03_simple_view_lambda/simple_view_lambda.cpp
+++ b/kokkos/example/tutorial/03_simple_view_lambda/simple_view_lambda.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/example/tutorial/04_simple_memoryspaces/simple_memoryspaces.cpp b/kokkos/example/tutorial/04_simple_memoryspaces/simple_memoryspaces.cpp
index 8fcaf8e3c..603d139df 100644
--- a/kokkos/example/tutorial/04_simple_memoryspaces/simple_memoryspaces.cpp
+++ b/kokkos/example/tutorial/04_simple_memoryspaces/simple_memoryspaces.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/example/tutorial/05_simple_atomics/simple_atomics.cpp b/kokkos/example/tutorial/05_simple_atomics/simple_atomics.cpp
index 0d01f1f52..396b39687 100644
--- a/kokkos/example/tutorial/05_simple_atomics/simple_atomics.cpp
+++ b/kokkos/example/tutorial/05_simple_atomics/simple_atomics.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/example/tutorial/06_simple_mdrangepolicy/simple_mdrangepolicy.cpp b/kokkos/example/tutorial/06_simple_mdrangepolicy/simple_mdrangepolicy.cpp
index 0610f66d3..62c087c32 100644
--- a/kokkos/example/tutorial/06_simple_mdrangepolicy/simple_mdrangepolicy.cpp
+++ b/kokkos/example/tutorial/06_simple_mdrangepolicy/simple_mdrangepolicy.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/example/tutorial/Advanced_Views/01_data_layouts/data_layouts.cpp b/kokkos/example/tutorial/Advanced_Views/01_data_layouts/data_layouts.cpp
index f6de2a279..9bfa49456 100644
--- a/kokkos/example/tutorial/Advanced_Views/01_data_layouts/data_layouts.cpp
+++ b/kokkos/example/tutorial/Advanced_Views/01_data_layouts/data_layouts.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/example/tutorial/Advanced_Views/02_memory_traits/memory_traits.cpp b/kokkos/example/tutorial/Advanced_Views/02_memory_traits/memory_traits.cpp
index 36bdced67..da6478a02 100644
--- a/kokkos/example/tutorial/Advanced_Views/02_memory_traits/memory_traits.cpp
+++ b/kokkos/example/tutorial/Advanced_Views/02_memory_traits/memory_traits.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/example/tutorial/Advanced_Views/03_subviews/subviews.cpp b/kokkos/example/tutorial/Advanced_Views/03_subviews/subviews.cpp
index 4f241c3c7..df6a09f82 100644
--- a/kokkos/example/tutorial/Advanced_Views/03_subviews/subviews.cpp
+++ b/kokkos/example/tutorial/Advanced_Views/03_subviews/subviews.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/example/tutorial/Advanced_Views/04_dualviews/dual_view.cpp b/kokkos/example/tutorial/Advanced_Views/04_dualviews/dual_view.cpp
index 42b97a596..86fe01620 100644
--- a/kokkos/example/tutorial/Advanced_Views/04_dualviews/dual_view.cpp
+++ b/kokkos/example/tutorial/Advanced_Views/04_dualviews/dual_view.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/example/tutorial/Advanced_Views/05_NVIDIA_UVM/uvm_example.cpp b/kokkos/example/tutorial/Advanced_Views/05_NVIDIA_UVM/uvm_example.cpp
index 58d16dbbf..51b84cf18 100644
--- a/kokkos/example/tutorial/Advanced_Views/05_NVIDIA_UVM/uvm_example.cpp
+++ b/kokkos/example/tutorial/Advanced_Views/05_NVIDIA_UVM/uvm_example.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/example/tutorial/Advanced_Views/07_Overlapping_DeepCopy/overlapping_deepcopy.cpp b/kokkos/example/tutorial/Advanced_Views/07_Overlapping_DeepCopy/overlapping_deepcopy.cpp
index 03516ccce..4dac1c26e 100644
--- a/kokkos/example/tutorial/Advanced_Views/07_Overlapping_DeepCopy/overlapping_deepcopy.cpp
+++ b/kokkos/example/tutorial/Advanced_Views/07_Overlapping_DeepCopy/overlapping_deepcopy.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/example/tutorial/Algorithms/01_random_numbers/random_numbers.cpp b/kokkos/example/tutorial/Algorithms/01_random_numbers/random_numbers.cpp
index fbf8f3a15..a0771c4fc 100644
--- a/kokkos/example/tutorial/Algorithms/01_random_numbers/random_numbers.cpp
+++ b/kokkos/example/tutorial/Algorithms/01_random_numbers/random_numbers.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
@@ -64,10 +64,10 @@ typedef Kokkos::HostSpace::execution_space DefaultHostType;
 // threads can grep their own. On CPU architectures the pool size is equal to
 // the thread number, on CUDA about 128k states are generated (enough to give
 // every potentially simultaneously running thread its own state). With a kernel
-// a thread is required to aquire a state from the pool and later return it. On
+// a thread is required to acquire a state from the pool and later return it. On
 // CPUs the Random number generator is deterministic if using the same number of
 // threads. On GPUs (i.e. using the CUDA backend it is not deterministic because
-// threads aquire states via atomics.
+// threads acquire states via atomics.
 
 // A Functor for generating uint64_t random numbers templated on the
 // GeneratorPool type
@@ -97,7 +97,7 @@ struct generate_random {
     for (int k = 0; k < samples; k++)
       vals(i * samples + k) = rand_gen.urand64();
 
-    // Give the state back, which will allow another thread to aquire it
+    // Give the state back, which will allow another thread to acquire it
     rand_pool.free_state(rand_gen);
   }
 };
diff --git a/kokkos/example/tutorial/CMakeLists.txt b/kokkos/example/tutorial/CMakeLists.txt
index 2d8259506..fd471fa6b 100644
--- a/kokkos/example/tutorial/CMakeLists.txt
+++ b/kokkos/example/tutorial/CMakeLists.txt
@@ -8,11 +8,9 @@ KOKKOS_ADD_EXAMPLE_DIRECTORIES(06_simple_mdrangepolicy)
 KOKKOS_ADD_EXAMPLE_DIRECTORIES(Advanced_Views)
 KOKKOS_ADD_EXAMPLE_DIRECTORIES(Hierarchical_Parallelism)
 
-IF (Kokkos_ENABLE_CXX11)
-  KOKKOS_ADD_EXAMPLE_DIRECTORIES(01_hello_world_lambda)
-  KOKKOS_ADD_EXAMPLE_DIRECTORIES(02_simple_reduce_lambda)
-  KOKKOS_ADD_EXAMPLE_DIRECTORIES(03_simple_view_lambda)
-ENDIF ()
+KOKKOS_ADD_EXAMPLE_DIRECTORIES(01_hello_world_lambda)
+KOKKOS_ADD_EXAMPLE_DIRECTORIES(02_simple_reduce_lambda)
+KOKKOS_ADD_EXAMPLE_DIRECTORIES(03_simple_view_lambda)
 
 
 
diff --git a/kokkos/example/tutorial/Hierarchical_Parallelism/01_thread_teams/thread_teams.cpp b/kokkos/example/tutorial/Hierarchical_Parallelism/01_thread_teams/thread_teams.cpp
index df83be870..77a5b4ce9 100644
--- a/kokkos/example/tutorial/Hierarchical_Parallelism/01_thread_teams/thread_teams.cpp
+++ b/kokkos/example/tutorial/Hierarchical_Parallelism/01_thread_teams/thread_teams.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/example/tutorial/Hierarchical_Parallelism/01_thread_teams_lambda/thread_teams_lambda.cpp b/kokkos/example/tutorial/Hierarchical_Parallelism/01_thread_teams_lambda/thread_teams_lambda.cpp
index 818df598f..6e29d5c3d 100644
--- a/kokkos/example/tutorial/Hierarchical_Parallelism/01_thread_teams_lambda/thread_teams_lambda.cpp
+++ b/kokkos/example/tutorial/Hierarchical_Parallelism/01_thread_teams_lambda/thread_teams_lambda.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/example/tutorial/Hierarchical_Parallelism/02_nested_parallel_for/nested_parallel_for.cpp b/kokkos/example/tutorial/Hierarchical_Parallelism/02_nested_parallel_for/nested_parallel_for.cpp
index befca5eb0..1c0b531c5 100644
--- a/kokkos/example/tutorial/Hierarchical_Parallelism/02_nested_parallel_for/nested_parallel_for.cpp
+++ b/kokkos/example/tutorial/Hierarchical_Parallelism/02_nested_parallel_for/nested_parallel_for.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/example/tutorial/Hierarchical_Parallelism/03_vectorization/vectorization.cpp b/kokkos/example/tutorial/Hierarchical_Parallelism/03_vectorization/vectorization.cpp
index 94fe681dd..cb679f7f5 100644
--- a/kokkos/example/tutorial/Hierarchical_Parallelism/03_vectorization/vectorization.cpp
+++ b/kokkos/example/tutorial/Hierarchical_Parallelism/03_vectorization/vectorization.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/example/tutorial/Hierarchical_Parallelism/04_team_scan/team_scan.cpp b/kokkos/example/tutorial/Hierarchical_Parallelism/04_team_scan/team_scan.cpp
index 331fa9cbd..10c8971e5 100644
--- a/kokkos/example/tutorial/Hierarchical_Parallelism/04_team_scan/team_scan.cpp
+++ b/kokkos/example/tutorial/Hierarchical_Parallelism/04_team_scan/team_scan.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/example/tutorial/README b/kokkos/example/tutorial/README
index 4ba0b3a5d..c46ace0d1 100644
--- a/kokkos/example/tutorial/README
+++ b/kokkos/example/tutorial/README
@@ -2,16 +2,11 @@ Build the examples by typing in each directory:
 make -j 16
 
 To specify a target device:
-make openmp -j 16
-make pthreads -j 16
-make serial -j 16
-make cuda -j 16
+KOKKOS_DEVICES=OpenMP  make -j 16
+KOKKOS_DEVICES=Pthread make -j 16
+KOKKOS_DEVICES=Serial  make -j 16
+KOKKOS_DEVICES=Cuda    make -j 16
 
-The lambda variants can not be build with CUDA=yes at the moment, since
-CUDA does not support lambdas from the host. 
 Some of the advanced topics try to highlight performance impacts by timing 
 different variants of doing the same thing.
-Also some of the advanced topics (in particular hierarchical parallelism)
-require C++11 even with out using host side lambdas. CUDA 6.5 can be used 
-to compile those. 
 
diff --git a/kokkos/example/tutorial/launch_bounds/launch_bounds_reduce.cpp b/kokkos/example/tutorial/launch_bounds/launch_bounds_reduce.cpp
index a781ff175..800904dbc 100644
--- a/kokkos/example/tutorial/launch_bounds/launch_bounds_reduce.cpp
+++ b/kokkos/example/tutorial/launch_bounds/launch_bounds_reduce.cpp
@@ -24,10 +24,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/example/virtual_functions/Makefile b/kokkos/example/virtual_functions/Makefile
index 06186786c..fbc54510d 100644
--- a/kokkos/example/virtual_functions/Makefile
+++ b/kokkos/example/virtual_functions/Makefile
@@ -1,5 +1,5 @@
 KOKKOS_DEVICES=Cuda
-KOKKOS_CUDA_OPTIONS=enable_lambda
+KOKKOS_CUDA_OPTIONS=enable_lambda,rdc
 KOKKOS_ARCH = "SNB,Kepler35"
 
 #KOKKOS_DEVICES=OpenMP
diff --git a/kokkos/generate_makefile.bash b/kokkos/generate_makefile.bash
index 7ef477b9f..555f0b30a 100755
--- a/kokkos/generate_makefile.bash
+++ b/kokkos/generate_makefile.bash
@@ -1,6 +1,166 @@
 #!/bin/bash
 
-KOKKOS_DEVICES=""
+update_kokkos_devices() {
+   SEARCH_TEXT="*$1*"
+   if [[ $KOKKOS_DEVICES == $SEARCH_TEXT ]]; then
+      echo kokkos devices already includes $SEARCH_TEXT
+   else
+      if [ "$KOKKOS_DEVICES" = "" ]; then
+         KOKKOS_DEVICES="$1"
+         echo reseting kokkos devices to $KOKKOS_DEVICES
+      else
+         KOKKOS_DEVICES="${KOKKOS_DEVICES},$1"
+         echo appending to kokkos devices $KOKKOS_DEVICES
+      fi
+   fi
+}
+
+get_kokkos_device_list() {
+  KOKKOS_DEVICE_CMD=
+  PARSE_DEVICES_LST=$(echo $KOKKOS_DEVICES | tr "," "\n")
+  PARSE_DEVICES_LST=$(echo $PARSE_DEVICES_LST | tr "_" "\n")
+  for DEVICE_ in $PARSE_DEVICES_LST
+  do 
+     UC_DEVICE=$(echo $DEVICE_ | tr "[:lower:]" "[:upper:]")
+     KOKKOS_DEVICE_CMD="-DKokkos_ENABLE_${UC_DEVICE}=ON ${KOKKOS_DEVICE_CMD}"
+  done
+}
+
+get_kokkos_arch_list() {
+  KOKKOS_ARCH_CMD=
+  PARSE_ARCH_LST=$(echo $KOKKOS_ARCH | tr "," "\n")
+  for ARCH_ in $PARSE_ARCH_LST
+  do 
+     UC_ARCH=$(echo $ARCH_ | tr "[:lower:]" "[:upper:]")
+     KOKKOS_ARCH_CMD="-DKokkos_ARCH_${UC_ARCH}=ON ${KOKKOS_ARCH_CMD}"
+  done
+}
+
+get_kokkos_cuda_option_list() {
+  echo parsing KOKKOS_CUDA_OPTIONS=$KOKKOS_CUDA_OPTIONS
+  KOKKOS_CUDA_OPTION_CMD=
+  PARSE_CUDA_LST=$(echo $KOKKOS_CUDA_OPTIONS | tr "," "\n")
+  for CUDA_ in $PARSE_CUDA_LST
+  do 
+     CUDA_OPT_NAME=
+     if [ "${CUDA_}" == "enable_lambda" ]; then
+        CUDA_OPT_NAME=CUDA_LAMBDA
+     elif  [ "${CUDA_}" == "rdc" ]; then	
+        CUDA_OPT_NAME=CUDA_RELOCATABLE_DEVICE_CODE
+     elif  [ "${CUDA_}" == "force_uvm" ]; then
+        CUDA_OPT_NAME=CUDA_UVM
+     elif  [ "${CUDA_}" == "use_ldg" ]; then
+        CUDA_OPT_NAME=CUDA_LDG_INTRINSIC
+     else
+        echo "${CUDA_} is not a valid cuda options..."
+     fi
+     if [ "${CUDA_OPT_NAME}" != "" ]; then
+        KOKKOS_CUDA_OPTION_CMD="-DKokkos_ENABLE_${CUDA_OPT_NAME}=ON ${KOKKOS_CUDA_OPTION_CMD}"
+     fi
+  done
+}
+
+get_kokkos_option_list() {
+  echo parsing KOKKOS_OPTIONS=$KOKKOS_OPTIONS
+  KOKKOS_OPTION_CMD=
+  PARSE_OPTIONS_LST=$(echo $KOKKOS_OPTIONS | tr "," "\n")
+  for OPT_ in $PARSE_OPTIONS_LST
+  do 
+     UC_OPT_=$(echo $OPT_ | tr "[:lower:]" "[:upper:]")
+     if [[ "$UC_OPT_" == *DISABLE* ]]; then
+        FLIP_OPT_=${UC_OPT_/DISABLE/ENABLE}
+        KOKKOS_OPTION_CMD="-DKokkos_${FLIP_OPT_}=OFF ${KOKKOS_OPTION_CMD}"
+     elif [[ "$UC_OPT_" == *ENABLE* ]]; then
+        KOKKOS_OPTION_CMD="-DKokkos_${UC_OPT_}=ON ${KOKKOS_OPTION_CMD}"
+     else
+        KOKKOS_OPTION_CMD="-DKokkos_ENABLE_${UC_OPT_}=ON ${KOKKOS_OPTION_CMD}"
+     fi
+  done
+}
+
+display_help_text() {
+
+      echo "Kokkos configure options:"
+      echo ""
+      echo "--kokkos-path=/Path/To/Kokkos:        Path to the Kokkos root directory."
+      echo "--prefix=/Install/Path:               Path to install the Kokkos library."
+      echo ""
+      echo "--with-cuda[=/Path/To/Cuda]:          Enable Cuda and set path to Cuda Toolkit."
+      echo "--with-openmp:                        Enable OpenMP backend."
+      echo "--with-pthread:                       Enable Pthreads backend."
+      echo "--with-serial:                        Enable Serial backend."
+      echo "--with-devices:                       Explicitly add a set of backends."
+      echo ""
+      echo "--arch=[OPT]:  Set target architectures. Options are:"
+      echo "               [AMD]"
+      echo "                 AMDAVX          = AMD CPU"
+      echo "                 EPYC            = AMD EPYC Zen-Core CPU"
+      echo "               [ARM]"
+      echo "                 ARMv80          = ARMv8.0 Compatible CPU"
+      echo "                 ARMv81          = ARMv8.1 Compatible CPU"
+      echo "                 ARMv8-ThunderX  = ARMv8 Cavium ThunderX CPU"
+      echo "                 ARMv8-TX2       = ARMv8 Cavium ThunderX2 CPU"
+      echo "               [IBM]"
+      echo "                 BGQ             = IBM Blue Gene Q"
+      echo "                 Power7          = IBM POWER7 and POWER7+ CPUs"
+      echo "                 Power8          = IBM POWER8 CPUs"
+      echo "                 Power9          = IBM POWER9 CPUs"
+      echo "               [Intel]"
+      echo "                 WSM             = Intel Westmere CPUs"
+      echo "                 SNB             = Intel Sandy/Ivy Bridge CPUs"
+      echo "                 HSW             = Intel Haswell CPUs"
+      echo "                 BDW             = Intel Broadwell Xeon E-class CPUs"
+      echo "                 SKX             = Intel Sky Lake Xeon E-class HPC CPUs (AVX512)"
+      echo "               [Intel Xeon Phi]"
+      echo "                 KNC             = Intel Knights Corner Xeon Phi"
+      echo "                 KNL             = Intel Knights Landing Xeon Phi"
+      echo "               [NVIDIA]"
+      echo "                 Kepler30        = NVIDIA Kepler generation CC 3.0"
+      echo "                 Kepler32        = NVIDIA Kepler generation CC 3.2"
+      echo "                 Kepler35        = NVIDIA Kepler generation CC 3.5"
+      echo "                 Kepler37        = NVIDIA Kepler generation CC 3.7"
+      echo "                 Maxwell50       = NVIDIA Maxwell generation CC 5.0"
+      echo "                 Maxwell52       = NVIDIA Maxwell generation CC 5.2"
+      echo "                 Maxwell53       = NVIDIA Maxwell generation CC 5.3"
+      echo "                 Pascal60        = NVIDIA Pascal generation CC 6.0"
+      echo "                 Pascal61        = NVIDIA Pascal generation CC 6.1"
+      echo "                 Volta70         = NVIDIA Volta generation CC 7.0"
+      echo "                 Volta72         = NVIDIA Volta generation CC 7.2"
+      echo ""
+      echo "--compiler=/Path/To/Compiler  Set the compiler."
+      echo "--debug,-dbg:                 Enable Debugging."
+      echo "--disable-tests               Disable compilation of unit tests (enabled by default)"
+      echo "--cxxflags=[FLAGS]            Overwrite CXXFLAGS for library build and test"
+      echo "                                build.  This will still set certain required"
+      echo "                                flags via KOKKOS_CXXFLAGS (such as -fopenmp,"
+      echo "                                --std=c++11, etc.)."
+      echo "--cxxstandard=[FLAGS]         Overwrite KOKKOS_CXX_STANDARD for library build and test"
+      echo "                                c++11 (default), c++14, c++17, c++1y, c++1z, c++2a"
+      echo "--ldflags=[FLAGS]             Overwrite LDFLAGS for library build and test"
+      echo "                                build. This will still set certain required"
+      echo "                                flags via KOKKOS_LDFLAGS (such as -fopenmp,"
+      echo "                                -lpthread, etc.)."
+      echo "--with-gtest=/Path/To/Gtest:  Set path to gtest.  (Used in unit and performance"
+      echo "                                tests.)"
+      echo "--with-hwloc=/Path/To/Hwloc:  Set path to hwloc library."
+      echo "--with-memkind=/Path/To/MemKind:  Set path to memkind library."
+      echo "--with-options=[OPT]:         Additional options to Kokkos:"
+      echo "                                compiler_warnings"
+      echo "                                aggressive_vectorization = add ivdep on loops"
+      echo "                                disable_profiling = do not compile with profiling hooks"
+      echo "                                "
+      echo "--with-cuda-options=[OPT]:    Additional options to CUDA:"
+      echo "                                force_uvm, use_ldg, enable_lambda, rdc"
+      echo "--with-hpx-options=[OPT]:     Additional options to HPX:"
+      echo "                                enable_async_dispatch"
+      echo "--gcc-toolchain=/Path/To/GccRoot:  Set the gcc toolchain to use with clang (e.g. /usr)" 
+      echo "--make-j=[NUM]:               DEPRECATED: call make with appropriate"
+      echo "                                -j flag"
+
+}
+
+KOKKOS_DO_TESTS=ON
+KOKKOS_DO_EXAMPLES=OFF
 
 while [[ $# > 0 ]]
 do
@@ -17,68 +177,84 @@ do
       PREFIX="${key#*=}"
       ;;
     --with-cuda)
-      KOKKOS_DEVICES="${KOKKOS_DEVICES},Cuda"
+      update_kokkos_devices Cuda
       CUDA_PATH_NVCC=$(command -v nvcc)
       CUDA_PATH=${CUDA_PATH_NVCC%/bin/nvcc}
       ;;
     # Catch this before '--with-cuda*'
     --with-cuda-options*)
-      KOKKOS_CUDA_OPT="${key#*=}"
+      KOKKOS_CUDA_OPTIONS="${key#*=}"
       ;;
     --with-cuda*)
-      KOKKOS_DEVICES="${KOKKOS_DEVICES},Cuda"
+      update_kokkos_devices Cuda
       CUDA_PATH="${key#*=}"
       ;;
     --with-openmp)
-      KOKKOS_DEVICES="${KOKKOS_DEVICES},OpenMP"
+      update_kokkos_devices OpenMP
       ;;
     --with-pthread)
-      KOKKOS_DEVICES="${KOKKOS_DEVICES},Pthread"
+      update_kokkos_devices Pthread
       ;;
     --with-serial)
-      KOKKOS_DEVICES="${KOKKOS_DEVICES},Serial"
+      update_kokkos_devices Serial
       ;;
     --with-hpx-options*)
       KOKKOS_HPX_OPT="${key#*=}"
       ;;
     --with-hpx*)
-      KOKKOS_DEVICES="${KOKKOS_DEVICES},HPX"
+      update_kokkos_devices HPX
       if [ -z "$HPX_PATH" ]; then
         HPX_PATH="${key#*=}"
       fi
       ;;
     --with-devices*)
       DEVICES="${key#*=}"
-      KOKKOS_DEVICES="${KOKKOS_DEVICES},${DEVICES}"
+      PARSE_DEVICES=$(echo $DEVICES | tr "," "\n")
+      for DEVICE_ in $PARSE_DEVICES
+      do 
+         update_kokkos_devices $DEVICE_
+      done
       ;;
     --with-gtest*)
       GTEST_PATH="${key#*=}"
       ;;
     --with-hwloc*)
+      KOKKOS_HWLOC=ON
       HWLOC_PATH="${key#*=}"
       ;;
     --with-memkind*)
+      KOKKOS_MEMKIND=ON
       MEMKIND_PATH="${key#*=}"
       ;;
     --arch*)
       KOKKOS_ARCH="${key#*=}"
       ;;
     --cxxflags*)
-      CXXFLAGS="${key#*=}"
+      KOKKOS_CXXFLAGS="${key#*=}"
+      KOKKOS_CXXFLAGS=${KOKKOS_CXXFLAGS//,/ }
       ;;
     --cxxstandard*)
       KOKKOS_CXX_STANDARD="${key#*=}"
       ;;
     --ldflags*)
-      LDFLAGS="${key#*=}"
+      KOKKOS_LDFLAGS="${key#*=}"
       ;;
     --debug|-dbg)
-      KOKKOS_DEBUG=yes
+      KOKKOS_DEBUG=ON
       ;;
     --make-j*)
       echo "Warning: ${key} is deprecated"
       echo "Call make with appropriate -j flag"
       ;;
+    --disable-tests)
+      KOKKOS_DO_TESTS=OFF
+      ;;
+    --no-examples)
+      KOKKOS_DO_EXAMPLES=OFF
+      ;;
+    --enable-examples)
+      KOKKOS_DO_EXAMPLES=ON
+      ;;
     --compiler*)
       COMPILER="${key#*=}"
       CNUM=$(command -v ${COMPILER} 2>&1 >/dev/null | grep "no ${COMPILER}" | wc -l)
@@ -102,87 +278,13 @@ do
       COMPILER=${COMPDIR}/${COMPNAME}
       ;;
     --with-options*)
-      KOKKOS_OPT="${key#*=}"
+      KOKKOS_OPTIONS="${key#*=}"
       ;;
     --gcc-toolchain*)
       KOKKOS_GCC_TOOLCHAIN="${key#*=}"
       ;;
     --help)
-      echo "Kokkos configure options:"
-      echo ""
-      echo "--kokkos-path=/Path/To/Kokkos:        Path to the Kokkos root directory."
-      echo "--prefix=/Install/Path:               Path to install the Kokkos library."
-      echo ""
-      echo "--with-cuda[=/Path/To/Cuda]:          Enable Cuda and set path to Cuda Toolkit."
-      echo "--with-openmp:                        Enable OpenMP backend."
-      echo "--with-pthread:                       Enable Pthreads backend."
-      echo "--with-serial:                        Enable Serial backend."
-      echo "--with-devices:                       Explicitly add a set of backends."
-      echo ""
-      echo "--arch=[OPT]:  Set target architectures. Options are:"
-      echo "               [AMD]"
-      echo "                 AMDAVX          = AMD CPU"
-      echo "                 EPYC            = AMD EPYC Zen-Core CPU"
-      echo "               [ARM]"
-      echo "                 ARMv80          = ARMv8.0 Compatible CPU"
-      echo "                 ARMv81          = ARMv8.1 Compatible CPU"
-      echo "                 ARMv8-ThunderX  = ARMv8 Cavium ThunderX CPU"
-      echo "                 ARMv8-TX2       = ARMv8 Cavium ThunderX2 CPU"
-      echo "               [IBM]"
-      echo "                 BGQ             = IBM Blue Gene Q"
-      echo "                 Power7          = IBM POWER7 and POWER7+ CPUs"
-      echo "                 Power8          = IBM POWER8 CPUs"
-      echo "                 Power9          = IBM POWER9 CPUs"
-      echo "               [Intel]"
-      echo "                 WSM             = Intel Westmere CPUs"
-      echo "                 SNB             = Intel Sandy/Ivy Bridge CPUs"
-      echo "                 HSW             = Intel Haswell CPUs"
-      echo "                 BDW             = Intel Broadwell Xeon E-class CPUs"
-      echo "                 SKX             = Intel Sky Lake Xeon E-class HPC CPUs (AVX512)"
-      echo "               [Intel Xeon Phi]"
-      echo "                 KNC             = Intel Knights Corner Xeon Phi"
-      echo "                 KNL             = Intel Knights Landing Xeon Phi"
-      echo "               [NVIDIA]"
-      echo "                 Kepler30        = NVIDIA Kepler generation CC 3.0"
-      echo "                 Kepler32        = NVIDIA Kepler generation CC 3.2"
-      echo "                 Kepler35        = NVIDIA Kepler generation CC 3.5"
-      echo "                 Kepler37        = NVIDIA Kepler generation CC 3.7"
-      echo "                 Maxwell50       = NVIDIA Maxwell generation CC 5.0"
-      echo "                 Maxwell52       = NVIDIA Maxwell generation CC 5.2"
-      echo "                 Maxwell53       = NVIDIA Maxwell generation CC 5.3"
-      echo "                 Pascal60        = NVIDIA Pascal generation CC 6.0"
-      echo "                 Pascal61        = NVIDIA Pascal generation CC 6.1"
-      echo "                 Volta70         = NVIDIA Volta generation CC 7.0"
-      echo "                 Volta72         = NVIDIA Volta generation CC 7.2"
-      echo ""
-      echo "--compiler=/Path/To/Compiler  Set the compiler."
-      echo "--debug,-dbg:                 Enable Debugging."
-      echo "--cxxflags=[FLAGS]            Overwrite CXXFLAGS for library build and test"
-      echo "                                build.  This will still set certain required"
-      echo "                                flags via KOKKOS_CXXFLAGS (such as -fopenmp,"
-      echo "                                --std=c++11, etc.)."
-      echo "--cxxstandard=[FLAGS]         Overwrite KOKKOS_CXX_STANDARD for library build and test"
-      echo "                                c++11 (default), c++14, c++17, c++1y, c++1z, c++2a"
-      echo "--ldflags=[FLAGS]             Overwrite LDFLAGS for library build and test"
-      echo "                                build. This will still set certain required"
-      echo "                                flags via KOKKOS_LDFLAGS (such as -fopenmp,"
-      echo "                                -lpthread, etc.)."
-      echo "--with-gtest=/Path/To/Gtest:  Set path to gtest.  (Used in unit and performance"
-      echo "                                tests.)"
-      echo "--with-hwloc=/Path/To/Hwloc:  Set path to hwloc library."
-      echo "--with-memkind=/Path/To/MemKind:  Set path to memkind library."
-      echo "--with-options=[OPT]:         Additional options to Kokkos:"
-      echo "                                compiler_warnings"
-      echo "                                aggressive_vectorization = add ivdep on loops"
-      echo "                                disable_profiling = do not compile with profiling hooks"
-      echo "                                "
-      echo "--with-cuda-options=[OPT]:    Additional options to CUDA:"
-      echo "                                force_uvm, use_ldg, enable_lambda, rdc, enable_constexpr"
-      echo "--with-hpx-options=[OPT]:     Additional options to HPX:"
-      echo "                                enable_async_dispatch"
-      echo "--gcc-toolchain=/Path/To/GccRoot:  Set the gcc toolchain to use with clang (e.g. /usr)" 
-      echo "--make-j=[NUM]:               DEPRECATED: call make with appropriate"
-      echo "                                -j flag"
+      display_help_text
       exit 0
       ;;
     *)
@@ -193,265 +295,79 @@ do
   shift
 done
 
-# Remove leading ',' from KOKKOS_DEVICES.
-KOKKOS_DEVICES=$(echo $KOKKOS_DEVICES | sed 's/^,//')
 
-# If KOKKOS_PATH undefined, assume parent dir of this script is the KOKKOS_PATH.
-if [ -z "$KOKKOS_PATH" ]; then
-  KOKKOS_PATH=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
+if [ "$COMPILER" == "" ]; then
+    COMPILER_CMD=
 else
-  # Ensure KOKKOS_PATH is abs path
-  KOKKOS_PATH=$( cd $KOKKOS_PATH && pwd )
-fi
-
-if [ "${KOKKOS_PATH}"  = "${PWD}" ] || [ "${KOKKOS_PATH}"  = "${PWD}/" ]; then
-  echo "Running generate_makefile.bash in the Kokkos root directory is not allowed"
-  exit
-fi
-
-KOKKOS_SRC_PATH=${KOKKOS_PATH}
-
-KOKKOS_SETTINGS="KOKKOS_SRC_PATH=${KOKKOS_SRC_PATH}"
-
-# The double [[  ]] in the elif branch is not a typo
-if [ ${#COMPILER} -gt 0 ]; then
-  KOKKOS_SETTINGS="${KOKKOS_SETTINGS} CXX=${COMPILER}"
-elif
-   [ ${#COMPILER} -eq 0 ] && [[ ${KOKKOS_DEVICES} =~ .*Cuda.* ]]; then
-  COMPILER="${KOKKOS_PATH}/bin/nvcc_wrapper"
-  KOKKOS_SETTINGS="${KOKKOS_SETTINGS} CXX=${COMPILER}"   
-fi
-
-if [ ${#KOKKOS_DEVICES} -gt 0 ]; then
-  KOKKOS_SETTINGS="${KOKKOS_SETTINGS} KOKKOS_DEVICES=${KOKKOS_DEVICES}"
-fi
-
-if [ ${#KOKKOS_ARCH} -gt 0 ]; then
-  KOKKOS_SETTINGS="${KOKKOS_SETTINGS} KOKKOS_ARCH=${KOKKOS_ARCH}"
-fi
-
-if [ ${#KOKKOS_DEBUG} -gt 0 ]; then
-  KOKKOS_SETTINGS="${KOKKOS_SETTINGS} KOKKOS_DEBUG=${KOKKOS_DEBUG}"
-fi
-
-if [ ${#CUDA_PATH} -gt 0 ]; then
-  KOKKOS_SETTINGS="${KOKKOS_SETTINGS} CUDA_PATH=${CUDA_PATH}"
-fi
-
-if [ ${#CXXFLAGS} -gt 0 ]; then
-  KOKKOS_SETTINGS="${KOKKOS_SETTINGS} CXXFLAGS=\"${CXXFLAGS}\""
-fi
-
-if [ ${#KOKKOS_CXX_STANDARD} -gt 0 ]; then
-  KOKKOS_SETTINGS="${KOKKOS_SETTINGS} KOKKOS_CXX_STANDARD=\"${KOKKOS_CXX_STANDARD}\""
-fi
-
-if [ ${#LDFLAGS} -gt 0 ]; then
-  KOKKOS_SETTINGS="${KOKKOS_SETTINGS} LDFLAGS=\"${LDFLAGS}\""
+    COMPILER_CMD=-DCMAKE_CXX_COMPILER=$COMPILER
 fi
 
-if [ ${#GTEST_PATH} -gt 0 ]; then
-  KOKKOS_SETTINGS="${KOKKOS_SETTINGS} GTEST_PATH=${GTEST_PATH}"
+if [ "$KOKKOS_DEBUG" == "ON" ]; then
+    KOKKOS_DEBUG_CMD=-DCMAKE_BUILD_TYPE=DEBUG
 else
-  GTEST_PATH=${KOKKOS_PATH}/tpls/gtest
-  KOKKOS_SETTINGS="${KOKKOS_SETTINGS} GTEST_PATH=${GTEST_PATH}"
+    KOKKOS_DEBUG_CMD=-DCMAKE_BUILD_TYPE=RELEASE
 fi
 
-if [ ${#HWLOC_PATH} -gt 0 ]; then
-  KOKKOS_SETTINGS="${KOKKOS_SETTINGS} HWLOC_PATH=${HWLOC_PATH}"
-  KOKKOS_USE_TPLS="${KOKKOS_USE_TPLS},hwloc"
+if [ "$KOKKOS_HWLOC" == "ON" ]; then
+    KOKKOS_HWLOC_CMD=-DKokkos_ENABLE_HWLOC=ON
+    if [ "$HWLOC_PATH" != "" ]; then
+      KOKKOS_HWLOC_PATH_CMD=-DHWLOC_ROOT=$HWLOC_PATH
+    fi
+else
+    KOKKOS_HWLOC_CMD=
 fi
 
-if [ ${#MEMKIND_PATH} -gt 0 ]; then
-  KOKKOS_SETTINGS="${KOKKOS_SETTINGS} MEMKIND_PATH=${MEMKIND_PATH}" 
-  KOKKOS_USE_TPLS="${KOKKOS_USE_TPLS},experimental_memkind"
+if [ "$KOKKOS_MEMKIND" == "ON" ]; then
+    KOKKOS_MEMKIND_CMD=-DKokkos_ENABLE_MEMKIND=ON
+    if [ "$MEMKIND_PATH" != "" ]; then
+      KOKKOS_MEMKIND_PATH_CMD=-DMEMKIND_ROOT=$MEMKIND_PATH
+    fi
+else
+    KOKKOS_MEMKIND_CMD=
 fi
 
-if [ ${#KOKKOS_USE_TPLS} -gt 0 ]; then
-  KOKKOS_SETTINGS="${KOKKOS_SETTINGS} KOKKOS_USE_TPLS=${KOKKOS_USE_TPLS}"
+if [ ! -e ${KOKKOS_PATH}/CMakeLists.txt ]; then
+   if [ "${KOKKOS_PATH}" == "" ]; then
+      CM_SCRIPT=$0
+      KOKKOS_PATH=`dirname $CM_SCRIPT`
+      if [ ! -e ${KOKKOS_PATH}/CMakeLists.txt ]; then
+         echo "${KOKKOS_PATH} repository appears to not be complete.  please verify and try again"
+         exit 0
+      fi
+   else
+      echo "KOKKOS_PATH does not appear to be set properly. please specify in location of CMakeLists.txt"   
+      display_help_text
+      exit 0
+   fi
 fi
 
-if [ ${#HPX_PATH} -gt 0 ]; then
-    KOKKOS_SETTINGS="${KOKKOS_SETTINGS} HPX_PATH=${HPX_PATH}"
+get_kokkos_device_list
+get_kokkos_option_list
+get_kokkos_arch_list
+get_kokkos_cuda_option_list
+
+## if HPX is enabled, we need to enforce cxx standard = 14
+if [[ ${KOKKOS_DEVICE_CMD} == *Kokkos_ENABLE_HPX* ]]; then
+   if [ "${KOKKOS_CXX_STANDARD}" == "" ] || [ ${#KOKKOS_CXX_STANDARD} -lt 14 ]; then
+      echo CXX Standard must be 14 or higher for HPX to work.
+      KOKKOS_CXX_STANDARD=14
+   fi
 fi
 
-if [ ${#KOKKOS_OPT} -gt 0 ]; then
-  KOKKOS_SETTINGS="${KOKKOS_SETTINGS} KOKKOS_OPTIONS=${KOKKOS_OPT}"
+if [ "$KOKKOS_CXX_STANDARD" == "" ]; then
+    STANDARD_CMD=
+else
+    STANDARD_CMD=-DKokkos_CXX_STANDARD=${KOKKOS_CXX_STANDARD}
 fi
 
-if [ ${#KOKKOS_CUDA_OPT} -gt 0 ]; then
-  KOKKOS_SETTINGS="${KOKKOS_SETTINGS} KOKKOS_CUDA_OPTIONS=${KOKKOS_CUDA_OPT}"
-fi
+if [[ ${COMPILER} == *clang* ]]; then
+   gcc_path=$(which g++ | awk --field-separator='/bin/g++' '{printf $1}' )
+   KOKKOS_CXXFLAGS="${KOKKOS_CXXFLAGS} --gcc-toolchain=${gcc_path}"
 
-if [ ${#KOKKOS_HPX_OPT} -gt 0 ]; then
-    KOKKOS_SETTINGS="${KOKKOS_SETTINGS} KOKKOS_HPX_OPTIONS=${KOKKOS_HPX_OPT}"
+   if [ ! "${CUDA_PATH}" == "" ]; then
+      KOKKOS_CXXFLAGS="${KOKKOS_CXXFLAGS} --cuda-path=${CUDA_PATH}"
+   fi 
 fi
-
-if [ ${#KOKKOS_GCC_TOOLCHAIN} -gt 0 ]; then
-  KOKKOS_SETTINGS="${KOKKOS_SETTINGS} KOKKOS_INTERNAL_GCC_TOOLCHAIN=${KOKKOS_GCC_TOOLCHAIN}"
-fi
-
-KOKKOS_SETTINGS_NO_KOKKOS_PATH="${KOKKOS_SETTINGS}"
-
-
-gen_makefile=Makefile.kokkos
-mkdir -p core
-mkdir -p core/unit_test
-mkdir -p core/perf_test
-mkdir -p containers
-mkdir -p containers/unit_tests
-mkdir -p containers/performance_tests
-mkdir -p algorithms
-mkdir -p algorithms/unit_tests
-mkdir -p algorithms/performance_tests
-mkdir -p example
-mkdir -p example/fixture
-mkdir -p example/feint
-mkdir -p example/fenl
-mkdir -p example/make_buildlink
-mkdir -p example/tutorial
-
-KOKKOS_SETTINGS="${KOKKOS_SETTINGS_NO_KOKKOS_PATH} KOKKOS_PATH=${KOKKOS_PATH}"
-
-# Generate subdirectory makefiles.
-echo "KOKKOS_SETTINGS=${KOKKOS_SETTINGS}" > core/unit_test/Makefile
-echo "" >> core/unit_test/Makefile
-echo "all:" >> core/unit_test/Makefile
-echo -e "\t\$(MAKE) -f ${KOKKOS_PATH}/core/unit_test/Makefile ${KOKKOS_SETTINGS}" >> core/unit_test/Makefile
-echo "" >> core/unit_test/Makefile
-echo "test: all" >> core/unit_test/Makefile
-echo -e "\t\$(MAKE) -f ${KOKKOS_PATH}/core/unit_test/Makefile ${KOKKOS_SETTINGS} test" >> core/unit_test/Makefile
-echo "" >> core/unit_test/Makefile
-echo "clean:" >> core/unit_test/Makefile
-echo -e "\t\$(MAKE) -f ${KOKKOS_PATH}/core/unit_test/Makefile ${KOKKOS_SETTINGS} clean" >> core/unit_test/Makefile
-
-echo "KOKKOS_SETTINGS=${KOKKOS_SETTINGS}" > core/perf_test/Makefile
-echo "" >> core/perf_test/Makefile
-echo "all:" >> core/perf_test/Makefile
-echo -e "\t\$(MAKE) -f ${KOKKOS_PATH}/core/perf_test/Makefile ${KOKKOS_SETTINGS}" >> core/perf_test/Makefile
-echo "" >> core/perf_test/Makefile
-echo "test: all" >> core/perf_test/Makefile
-echo -e "\t\$(MAKE) -f ${KOKKOS_PATH}/core/perf_test/Makefile ${KOKKOS_SETTINGS} test" >> core/perf_test/Makefile
-echo "" >> core/perf_test/Makefile
-echo "clean:" >> core/perf_test/Makefile
-echo -e "\t\$(MAKE) -f ${KOKKOS_PATH}/core/perf_test/Makefile ${KOKKOS_SETTINGS} clean" >> core/perf_test/Makefile
-
-echo "KOKKOS_SETTINGS=${KOKKOS_SETTINGS}" > containers/unit_tests/Makefile
-echo "" >> containers/unit_tests/Makefile
-echo "all:" >> containers/unit_tests/Makefile
-echo -e "\t\$(MAKE) -f ${KOKKOS_PATH}/containers/unit_tests/Makefile ${KOKKOS_SETTINGS}" >> containers/unit_tests/Makefile
-echo "" >> containers/unit_tests/Makefile
-echo "test: all" >> containers/unit_tests/Makefile
-echo -e "\t\$(MAKE) -f ${KOKKOS_PATH}/containers/unit_tests/Makefile ${KOKKOS_SETTINGS} test" >> containers/unit_tests/Makefile
-echo "" >> containers/unit_tests/Makefile
-echo "clean:" >> containers/unit_tests/Makefile
-echo -e "\t\$(MAKE) -f ${KOKKOS_PATH}/containers/unit_tests/Makefile ${KOKKOS_SETTINGS} clean" >> containers/unit_tests/Makefile
-
-echo "KOKKOS_SETTINGS=${KOKKOS_SETTINGS}" > containers/performance_tests/Makefile
-echo "" >> containers/performance_tests/Makefile
-echo "all:" >> containers/performance_tests/Makefile
-echo -e "\t\$(MAKE) -f ${KOKKOS_PATH}/containers/performance_tests/Makefile ${KOKKOS_SETTINGS}" >> containers/performance_tests/Makefile
-echo "" >> containers/performance_tests/Makefile
-echo "test: all" >> containers/performance_tests/Makefile
-echo -e "\t\$(MAKE) -f ${KOKKOS_PATH}/containers/performance_tests/Makefile ${KOKKOS_SETTINGS} test" >> containers/performance_tests/Makefile
-echo "" >> containers/performance_tests/Makefile
-echo "clean:" >> containers/performance_tests/Makefile
-echo -e "\t\$(MAKE) -f ${KOKKOS_PATH}/containers/performance_tests/Makefile ${KOKKOS_SETTINGS} clean" >> containers/performance_tests/Makefile
-
-echo "KOKKOS_SETTINGS=${KOKKOS_SETTINGS}" > algorithms/unit_tests/Makefile
-echo "" >> algorithms/unit_tests/Makefile
-echo "all:" >> algorithms/unit_tests/Makefile
-echo -e "\t\$(MAKE) -f ${KOKKOS_PATH}/algorithms/unit_tests/Makefile ${KOKKOS_SETTINGS}" >> algorithms/unit_tests/Makefile
-echo "" >> algorithms/unit_tests/Makefile
-echo "test: all" >> algorithms/unit_tests/Makefile
-echo -e "\t\$(MAKE) -f ${KOKKOS_PATH}/algorithms/unit_tests/Makefile ${KOKKOS_SETTINGS} test" >> algorithms/unit_tests/Makefile
-echo "" >> algorithms/unit_tests/Makefile
-echo "clean:" >> algorithms/unit_tests/Makefile
-echo -e "\t\$(MAKE) -f ${KOKKOS_PATH}/algorithms/unit_tests/Makefile ${KOKKOS_SETTINGS} clean" >> algorithms/unit_tests/Makefile
-
-echo "KOKKOS_SETTINGS=${KOKKOS_SETTINGS}" > example/fixture/Makefile
-echo "" >> example/fixture/Makefile
-echo "all:" >> example/fixture/Makefile
-echo -e "\t\$(MAKE) -f ${KOKKOS_PATH}/example/fixture/Makefile ${KOKKOS_SETTINGS}" >> example/fixture/Makefile
-echo "" >> example/fixture/Makefile
-echo "test: all" >> example/fixture/Makefile
-echo -e "\t\$(MAKE) -f ${KOKKOS_PATH}/example/fixture/Makefile ${KOKKOS_SETTINGS} test" >> example/fixture/Makefile
-echo "" >> example/fixture/Makefile
-echo "clean:" >> example/fixture/Makefile
-echo -e "\t\$(MAKE) -f ${KOKKOS_PATH}/example/fixture/Makefile ${KOKKOS_SETTINGS} clean" >> example/fixture/Makefile
-
-echo "KOKKOS_SETTINGS=${KOKKOS_SETTINGS}" > example/feint/Makefile
-echo "" >> example/feint/Makefile
-echo "all:" >> example/feint/Makefile
-echo -e "\t\$(MAKE) -f ${KOKKOS_PATH}/example/feint/Makefile ${KOKKOS_SETTINGS}" >> example/feint/Makefile
-echo "" >> example/feint/Makefile
-echo "test: all" >> example/feint/Makefile
-echo -e "\t\$(MAKE) -f ${KOKKOS_PATH}/example/feint/Makefile ${KOKKOS_SETTINGS} test" >> example/feint/Makefile
-echo "" >> example/feint/Makefile
-echo "clean:" >> example/feint/Makefile
-echo -e "\t\$(MAKE) -f ${KOKKOS_PATH}/example/feint/Makefile ${KOKKOS_SETTINGS} clean" >> example/feint/Makefile
-
-echo "KOKKOS_SETTINGS=${KOKKOS_SETTINGS}" > example/fenl/Makefile
-echo "" >> example/fenl/Makefile
-echo "all:" >> example/fenl/Makefile
-echo -e "\t\$(MAKE) -f ${KOKKOS_PATH}/example/fenl/Makefile ${KOKKOS_SETTINGS}" >> example/fenl/Makefile
-echo "" >> example/fenl/Makefile
-echo "test: all" >> example/fenl/Makefile
-echo -e "\t\$(MAKE) -f ${KOKKOS_PATH}/example/fenl/Makefile ${KOKKOS_SETTINGS} test" >> example/fenl/Makefile
-echo "" >> example/fenl/Makefile
-echo "clean:" >> example/fenl/Makefile
-echo -e "\t\$(MAKE) -f ${KOKKOS_PATH}/example/fenl/Makefile ${KOKKOS_SETTINGS} clean" >> example/fenl/Makefile
-
-echo "KOKKOS_SETTINGS=${KOKKOS_SETTINGS}" > example/make_buildlink/Makefile
-echo "" >> example/make_buildlink/Makefile
-echo "build:" >> example/make_buildlink/Makefile
-echo -e "\t\$(MAKE) -f ${KOKKOS_PATH}/example/make_buildlink/Makefile ${KOKKOS_SETTINGS} build" >> example/make_buildlink/Makefile
-echo "" >> example/make_buildlink/Makefile
-echo "test: build" >> example/make_buildlink/Makefile
-echo -e "\t\$(MAKE) -f ${KOKKOS_PATH}/example/make_buildlink/Makefile ${KOKKOS_SETTINGS} test" >> example/make_buildlink/Makefile
-echo "" >> example/make_buildlink/Makefile
-echo "clean:" >> example/make_buildlink/Makefile
-echo -e "\t\$(MAKE) -f ${KOKKOS_PATH}/example/make_buildlink/Makefile ${KOKKOS_SETTINGS} clean" >> example/make_buildlink/Makefile
-
-echo "KOKKOS_SETTINGS=${KOKKOS_SETTINGS}" > example/tutorial/Makefile
-echo "" >> example/tutorial/Makefile
-echo "build:" >> example/tutorial/Makefile
-echo -e "\t\$(MAKE) -f ${KOKKOS_PATH}/example/tutorial/Makefile KOKKOS_SETTINGS='${KOKKOS_SETTINGS}' KOKKOS_PATH=${KOKKOS_PATH} build">> example/tutorial/Makefile
-echo "" >> example/tutorial/Makefile
-echo "test: build" >> example/tutorial/Makefile
-echo -e "\t\$(MAKE) -f ${KOKKOS_PATH}/example/tutorial/Makefile KOKKOS_SETTINGS='${KOKKOS_SETTINGS}' KOKKOS_PATH=${KOKKOS_PATH} test" >> example/tutorial/Makefile
-echo "" >> example/tutorial/Makefile
-echo "clean:" >> example/tutorial/Makefile
-echo -e "\t\$(MAKE) -f ${KOKKOS_PATH}/example/tutorial/Makefile KOKKOS_SETTINGS='${KOKKOS_SETTINGS}' KOKKOS_PATH=${KOKKOS_PATH} clean" >> example/tutorial/Makefile
-
-# Generate top level directory makefile.
-echo "Generating Makefiles with options " ${KOKKOS_SETTINGS}
-echo "KOKKOS_SETTINGS=${KOKKOS_SETTINGS}" > Makefile
-echo "" >> Makefile
-echo "build-test:" >> Makefile
-echo -e "\t\$(MAKE) -C core/unit_test" >> Makefile
-echo -e "\t\$(MAKE) -C core/perf_test" >> Makefile
-echo -e "\t\$(MAKE) -C containers/unit_tests" >> Makefile
-echo -e "\t\$(MAKE) -C containers/performance_tests" >> Makefile
-echo -e "\t\$(MAKE) -C algorithms/unit_tests" >> Makefile
-echo "" >> Makefile
-echo "test: build-test" >> Makefile
-echo -e "\t\$(MAKE) -C core/unit_test test" >> Makefile
-echo -e "\t\$(MAKE) -C core/perf_test test" >> Makefile
-echo -e "\t\$(MAKE) -C containers/unit_tests test" >> Makefile
-echo -e "\t\$(MAKE) -C containers/performance_tests test" >> Makefile
-echo -e "\t\$(MAKE) -C algorithms/unit_tests test" >> Makefile
-echo "" >> Makefile
-echo "unit-tests-only:" >> Makefile
-echo -e "\t\$(MAKE) -C core/unit_test test" >> Makefile
-echo -e "\t\$(MAKE) -C containers/unit_tests test" >> Makefile
-echo -e "\t\$(MAKE) -C algorithms/unit_tests test" >> Makefile
-echo "" >> Makefile
-
-echo "clean:" >> Makefile
-echo -e "\t\$(MAKE) -C core/unit_test clean" >> Makefile
-echo -e "\t\$(MAKE) -C core/perf_test clean" >> Makefile
-echo -e "\t\$(MAKE) -C containers/unit_tests clean" >> Makefile
-echo -e "\t\$(MAKE) -C containers/performance_tests clean" >> Makefile
-echo -e "\t\$(MAKE) -C algorithms/unit_tests clean" >> Makefile
-
+ 
+echo cmake $COMPILER_CMD  -DCMAKE_CXX_FLAGS="${KOKKOS_CXXFLAGS}" -DCMAKE_EXE_LINKER_FLAGS="${KOKKOS_LDFLAGS}" -DCMAKE_INSTALL_PREFIX=${PREFIX} ${KOKKOS_DEVICE_CMD} ${KOKKOS_ARCH_CMD} -DKokkos_ENABLE_TESTS=${KOKKOS_DO_TESTS} -DKokkos_ENABLE_EXAMPLES=${KOKKOS_DO_EXAMPLES} ${KOKKOS_OPTION_CMD} ${KOKKOS_CUDA_OPTION_CMD} -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_CXX_EXTENSIONS=OFF ${STANDARD_CMD} ${KOKKOS_DEBUG_CMD} ${KOKKOS_HWLOC_CMD} ${KOKKOS_HWLOC_PATH_CMD} ${KOKKOS_MEMKIND_CMD} ${KOKKOS_MEMKIND_PATH_CMD} ${KOKKOS_PATH}
+cmake $COMPILER_CMD  -DCMAKE_CXX_FLAGS="${KOKKOS_CXXFLAGS//\"}" -DCMAKE_EXE_LINKER_FLAGS="${KOKKOS_LDFLAGS//\"}" -DCMAKE_INSTALL_PREFIX=${PREFIX} ${KOKKOS_DEVICE_CMD} ${KOKKOS_ARCH_CMD} -DKokkos_ENABLE_TESTS=${KOKKOS_DO_TESTS} -DKokkos_ENABLE_EXAMPLES=${KOKKOS_DO_EXAMPLES} ${KOKKOS_OPTION_CMD} ${KOKKOS_CUDA_OPTION_CMD} -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_CXX_EXTENSIONS=OFF ${STANDARD_CMD} ${KOKKOS_DEBUG_CMD} ${KOKKOS_HWLOC_CMD} ${KOKKOS_HWLOC_PATH_CMD} ${KOKKOS_MEMKIND_CMD} ${KOKKOS_MEMKIND_PATH_CMD} ${KOKKOS_PATH}
diff --git a/kokkos/gnu_generate_makefile.bash b/kokkos/gnu_generate_makefile.bash
new file mode 100755
index 000000000..42b26bf4a
--- /dev/null
+++ b/kokkos/gnu_generate_makefile.bash
@@ -0,0 +1,484 @@
+#!/bin/bash
+
+KOKKOS_DEVICES=""
+
+KOKKOS_DO_EXAMPLES="1"
+
+while [[ $# > 0 ]]
+do
+  key="$1"
+
+  case $key in
+    --kokkos-path*)
+      KOKKOS_PATH="${key#*=}"
+      ;;
+    --hpx-path*)
+      HPX_PATH="${key#*=}"
+      ;;
+    --prefix*)
+      PREFIX="${key#*=}"
+      ;;
+    --with-cuda)
+      KOKKOS_DEVICES="${KOKKOS_DEVICES},Cuda"
+      CUDA_PATH_NVCC=$(command -v nvcc)
+      CUDA_PATH=${CUDA_PATH_NVCC%/bin/nvcc}
+      ;;
+    # Catch this before '--with-cuda*'
+    --with-cuda-options*)
+      KOKKOS_CUDA_OPT="${key#*=}"
+      ;;
+    --with-cuda*)
+      KOKKOS_DEVICES="${KOKKOS_DEVICES},Cuda"
+      CUDA_PATH="${key#*=}"
+      ;;
+    --with-openmp)
+      KOKKOS_DEVICES="${KOKKOS_DEVICES},OpenMP"
+      ;;
+    --with-pthread)
+      KOKKOS_DEVICES="${KOKKOS_DEVICES},Pthread"
+      ;;
+    --with-serial)
+      KOKKOS_DEVICES="${KOKKOS_DEVICES},Serial"
+      ;;
+    --with-hpx-options*)
+      KOKKOS_HPX_OPT="${key#*=}"
+      ;;
+    --with-hpx*)
+      KOKKOS_DEVICES="${KOKKOS_DEVICES},HPX"
+      if [ -z "$HPX_PATH" ]; then
+        HPX_PATH="${key#*=}"
+      fi
+      ;;
+    --with-devices*)
+      DEVICES="${key#*=}"
+      KOKKOS_DEVICES="${KOKKOS_DEVICES},${DEVICES}"
+      ;;
+    --with-gtest*)
+      GTEST_PATH="${key#*=}"
+      ;;
+    --with-hwloc*)
+      HWLOC_PATH="${key#*=}"
+      ;;
+    --with-memkind*)
+      MEMKIND_PATH="${key#*=}"
+      ;;
+    --arch*)
+      KOKKOS_ARCH="${key#*=}"
+      ;;
+    --cxxflags*)
+      CXXFLAGS="${key#*=}"
+      ;;
+    --cxxstandard*)
+      KOKKOS_CXX_STANDARD="${key#*=}"
+      ;;
+    --ldflags*)
+      LDFLAGS="${key#*=}"
+      ;;
+    --debug|-dbg)
+      KOKKOS_DEBUG=yes
+      ;;
+    --make-j*)
+      echo "Warning: ${key} is deprecated"
+      echo "Call make with appropriate -j flag"
+      ;;
+    --no-examples)
+      KOKKOS_DO_EXAMPLES="0"
+      ;;
+    --compiler*)
+      COMPILER="${key#*=}"
+      CNUM=$(command -v ${COMPILER} 2>&1 >/dev/null | grep "no ${COMPILER}" | wc -l)
+      if [ ${CNUM} -gt 0 ]; then
+        echo "Invalid compiler by --compiler command: '${COMPILER}'"
+        exit
+      fi
+      if [[ ! -n  ${COMPILER} ]]; then
+        echo "Empty compiler specified by --compiler command."
+        exit
+      fi
+      CNUM=$(command -v ${COMPILER} | grep ${COMPILER} | wc -l)
+      if [ ${CNUM} -eq 0 ]; then
+        echo "Invalid compiler by --compiler command: '${COMPILER}'"
+        exit
+      fi
+      # ... valid compiler, ensure absolute path set 
+      WCOMPATH=$(command -v $COMPILER)
+      COMPDIR=$(dirname $WCOMPATH)
+      COMPNAME=$(basename $WCOMPATH)
+      COMPILER=${COMPDIR}/${COMPNAME}
+      ;;
+    --with-options*)
+      KOKKOS_OPT="${key#*=}"
+      ;;
+    --gcc-toolchain*)
+      KOKKOS_GCC_TOOLCHAIN="${key#*=}"
+      ;;
+    --help)
+      echo "Kokkos configure options:"
+      echo ""
+      echo "--kokkos-path=/Path/To/Kokkos:        Path to the Kokkos root directory."
+      echo "--prefix=/Install/Path:               Path to install the Kokkos library."
+      echo ""
+      echo "--with-cuda[=/Path/To/Cuda]:          Enable Cuda and set path to Cuda Toolkit."
+      echo "--with-openmp:                        Enable OpenMP backend."
+      echo "--with-pthread:                       Enable Pthreads backend."
+      echo "--with-serial:                        Enable Serial backend."
+      echo "--with-devices:                       Explicitly add a set of backends."
+      echo ""
+      echo "--arch=[OPT]:  Set target architectures. Options are:"
+      echo "               [AMD]"
+      echo "                 AMDAVX          = AMD CPU"
+      echo "                 EPYC            = AMD EPYC Zen-Core CPU"
+      echo "               [ARM]"
+      echo "                 ARMv80          = ARMv8.0 Compatible CPU"
+      echo "                 ARMv81          = ARMv8.1 Compatible CPU"
+      echo "                 ARMv8-ThunderX  = ARMv8 Cavium ThunderX CPU"
+      echo "                 ARMv8-TX2       = ARMv8 Cavium ThunderX2 CPU"
+      echo "               [IBM]"
+      echo "                 BGQ             = IBM Blue Gene Q"
+      echo "                 Power7          = IBM POWER7 and POWER7+ CPUs"
+      echo "                 Power8          = IBM POWER8 CPUs"
+      echo "                 Power9          = IBM POWER9 CPUs"
+      echo "               [Intel]"
+      echo "                 WSM             = Intel Westmere CPUs"
+      echo "                 SNB             = Intel Sandy/Ivy Bridge CPUs"
+      echo "                 HSW             = Intel Haswell CPUs"
+      echo "                 BDW             = Intel Broadwell Xeon E-class CPUs"
+      echo "                 SKX             = Intel Sky Lake Xeon E-class HPC CPUs (AVX512)"
+      echo "               [Intel Xeon Phi]"
+      echo "                 KNC             = Intel Knights Corner Xeon Phi"
+      echo "                 KNL             = Intel Knights Landing Xeon Phi"
+      echo "               [NVIDIA]"
+      echo "                 Kepler30        = NVIDIA Kepler generation CC 3.0"
+      echo "                 Kepler32        = NVIDIA Kepler generation CC 3.2"
+      echo "                 Kepler35        = NVIDIA Kepler generation CC 3.5"
+      echo "                 Kepler37        = NVIDIA Kepler generation CC 3.7"
+      echo "                 Maxwell50       = NVIDIA Maxwell generation CC 5.0"
+      echo "                 Maxwell52       = NVIDIA Maxwell generation CC 5.2"
+      echo "                 Maxwell53       = NVIDIA Maxwell generation CC 5.3"
+      echo "                 Pascal60        = NVIDIA Pascal generation CC 6.0"
+      echo "                 Pascal61        = NVIDIA Pascal generation CC 6.1"
+      echo "                 Volta70         = NVIDIA Volta generation CC 7.0"
+      echo "                 Volta72         = NVIDIA Volta generation CC 7.2"
+      echo ""
+      echo "--compiler=/Path/To/Compiler  Set the compiler."
+      echo "--debug,-dbg:                 Enable Debugging."
+      echo "--cxxflags=[FLAGS]            Overwrite CXXFLAGS for library build and test"
+      echo "                                build.  This will still set certain required"
+      echo "                                flags via KOKKOS_CXXFLAGS (such as -fopenmp,"
+      echo "                                --std=c++11, etc.)."
+      echo "--cxxstandard=[FLAGS]         Overwrite KOKKOS_CXX_STANDARD for library build and test"
+      echo "                                c++11 (default), c++14, c++17, c++1y, c++1z, c++2a"
+      echo "--ldflags=[FLAGS]             Overwrite LDFLAGS for library build and test"
+      echo "                                build. This will still set certain required"
+      echo "                                flags via KOKKOS_LDFLAGS (such as -fopenmp,"
+      echo "                                -lpthread, etc.)."
+      echo "--with-gtest=/Path/To/Gtest:  Set path to gtest.  (Used in unit and performance"
+      echo "                                tests.)"
+      echo "--with-hwloc=/Path/To/Hwloc:  Set path to hwloc library."
+      echo "--with-memkind=/Path/To/MemKind:  Set path to memkind library."
+      echo "--with-options=[OPT]:         Additional options to Kokkos:"
+      echo "                                compiler_warnings"
+      echo "                                aggressive_vectorization = add ivdep on loops"
+      echo "                                disable_profiling = do not compile with profiling hooks"
+      echo "                                "
+      echo "--with-cuda-options=[OPT]:    Additional options to CUDA:"
+      echo "                                force_uvm, use_ldg, enable_lambda, rdc, enable_constexpr"
+      echo "--with-hpx-options=[OPT]:     Additional options to HPX:"
+      echo "                                enable_async_dispatch"
+      echo "--gcc-toolchain=/Path/To/GccRoot:  Set the gcc toolchain to use with clang (e.g. /usr)" 
+      echo "--make-j=[NUM]:               DEPRECATED: call make with appropriate"
+      echo "                                -j flag"
+      exit 0
+      ;;
+    *)
+      echo "warning: ignoring unknown option $key"
+      ;;
+  esac
+
+  shift
+done
+
+# Remove leading ',' from KOKKOS_DEVICES.
+KOKKOS_DEVICES=$(echo $KOKKOS_DEVICES | sed 's/^,//')
+
+# If KOKKOS_PATH undefined, assume parent dir of this script is the KOKKOS_PATH.
+if [ -z "$KOKKOS_PATH" ]; then
+  KOKKOS_PATH=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
+else
+  # Ensure KOKKOS_PATH is abs path
+  KOKKOS_PATH=$( cd $KOKKOS_PATH && pwd )
+fi
+
+if [ "${KOKKOS_PATH}"  = "${PWD}" ] || [ "${KOKKOS_PATH}"  = "${PWD}/" ]; then
+  echo "Running generate_makefile.bash in the Kokkos root directory is not allowed"
+  exit
+fi
+
+KOKKOS_SRC_PATH=${KOKKOS_PATH}
+
+KOKKOS_SETTINGS="KOKKOS_SRC_PATH=${KOKKOS_SRC_PATH}"
+
+# The double [[  ]] in the elif branch is not a typo
+if [ ${#COMPILER} -gt 0 ]; then
+  KOKKOS_SETTINGS="${KOKKOS_SETTINGS} CXX=${COMPILER}"
+elif
+   [ ${#COMPILER} -eq 0 ] && [[ ${KOKKOS_DEVICES} =~ .*Cuda.* ]]; then
+  COMPILER="${KOKKOS_PATH}/bin/nvcc_wrapper"
+  KOKKOS_SETTINGS="${KOKKOS_SETTINGS} CXX=${COMPILER}"   
+fi
+
+if [ ${#KOKKOS_DEVICES} -gt 0 ]; then
+  KOKKOS_SETTINGS="${KOKKOS_SETTINGS} KOKKOS_DEVICES=${KOKKOS_DEVICES}"
+fi
+
+if [ ${#KOKKOS_ARCH} -gt 0 ]; then
+  KOKKOS_SETTINGS="${KOKKOS_SETTINGS} KOKKOS_ARCH=${KOKKOS_ARCH}"
+fi
+
+if [ ${#KOKKOS_DEBUG} -gt 0 ]; then
+  KOKKOS_SETTINGS="${KOKKOS_SETTINGS} KOKKOS_DEBUG=${KOKKOS_DEBUG}"
+fi
+
+if [ ${#CUDA_PATH} -gt 0 ]; then
+  KOKKOS_SETTINGS="${KOKKOS_SETTINGS} CUDA_PATH=${CUDA_PATH}"
+fi
+
+if [ ${#CXXFLAGS} -gt 0 ]; then
+  KOKKOS_SETTINGS="${KOKKOS_SETTINGS} CXXFLAGS=\"${CXXFLAGS}\""
+fi
+
+if [ ${#KOKKOS_CXX_STANDARD} -gt 0 ]; then
+  KOKKOS_SETTINGS="${KOKKOS_SETTINGS} KOKKOS_CXX_STANDARD=\"${KOKKOS_CXX_STANDARD}\""
+fi
+
+if [ ${#LDFLAGS} -gt 0 ]; then
+  KOKKOS_SETTINGS="${KOKKOS_SETTINGS} LDFLAGS=\"${LDFLAGS}\""
+fi
+
+if [ ${#GTEST_PATH} -gt 0 ]; then
+  KOKKOS_SETTINGS="${KOKKOS_SETTINGS} GTEST_PATH=${GTEST_PATH}"
+else
+  GTEST_PATH=${KOKKOS_PATH}/tpls/gtest
+  KOKKOS_SETTINGS="${KOKKOS_SETTINGS} GTEST_PATH=${GTEST_PATH}"
+fi
+
+if [ ${#HWLOC_PATH} -gt 0 ]; then
+  KOKKOS_SETTINGS="${KOKKOS_SETTINGS} HWLOC_PATH=${HWLOC_PATH}"
+  KOKKOS_USE_TPLS="${KOKKOS_USE_TPLS},hwloc"
+fi
+
+if [ ${#MEMKIND_PATH} -gt 0 ]; then
+  KOKKOS_SETTINGS="${KOKKOS_SETTINGS} MEMKIND_PATH=${MEMKIND_PATH}" 
+  KOKKOS_USE_TPLS="${KOKKOS_USE_TPLS},experimental_memkind"
+fi
+
+if [ ${#KOKKOS_USE_TPLS} -gt 0 ]; then
+  KOKKOS_SETTINGS="${KOKKOS_SETTINGS} KOKKOS_USE_TPLS=${KOKKOS_USE_TPLS}"
+fi
+
+if [ ${#HPX_PATH} -gt 0 ]; then
+    KOKKOS_SETTINGS="${KOKKOS_SETTINGS} HPX_PATH=${HPX_PATH}"
+fi
+
+if [ ${#KOKKOS_OPT} -gt 0 ]; then
+  KOKKOS_SETTINGS="${KOKKOS_SETTINGS} KOKKOS_OPTIONS=${KOKKOS_OPT}"
+fi
+
+if [ ${#KOKKOS_CUDA_OPT} -gt 0 ]; then
+  KOKKOS_SETTINGS="${KOKKOS_SETTINGS} KOKKOS_CUDA_OPTIONS=${KOKKOS_CUDA_OPT}"
+fi
+
+if [ ${#KOKKOS_HPX_OPT} -gt 0 ]; then
+    KOKKOS_SETTINGS="${KOKKOS_SETTINGS} KOKKOS_HPX_OPTIONS=${KOKKOS_HPX_OPT}"
+fi
+
+if [ ${#KOKKOS_GCC_TOOLCHAIN} -gt 0 ]; then
+  KOKKOS_SETTINGS="${KOKKOS_SETTINGS} KOKKOS_INTERNAL_GCC_TOOLCHAIN=${KOKKOS_GCC_TOOLCHAIN}"
+fi
+
+KOKKOS_SETTINGS_NO_KOKKOS_PATH="${KOKKOS_SETTINGS}"
+
+
+gen_makefile=Makefile.kokkos
+mkdir -p core
+mkdir -p core/unit_test
+mkdir -p core/perf_test
+mkdir -p containers
+mkdir -p containers/unit_tests
+mkdir -p containers/performance_tests
+mkdir -p algorithms
+mkdir -p algorithms/unit_tests
+mkdir -p algorithms/performance_tests
+mkdir -p example
+mkdir -p example/fixture
+mkdir -p example/feint
+mkdir -p example/fenl
+mkdir -p example/make_buildlink
+mkdir -p example/tutorial
+
+KOKKOS_SETTINGS="${KOKKOS_SETTINGS_NO_KOKKOS_PATH} KOKKOS_PATH=${KOKKOS_PATH}"
+
+# Generate subdirectory makefiles.
+echo "KOKKOS_SETTINGS=${KOKKOS_SETTINGS}" > core/unit_test/Makefile
+echo "" >> core/unit_test/Makefile
+echo "all:" >> core/unit_test/Makefile
+echo -e "\t\$(MAKE) -f ${KOKKOS_PATH}/core/unit_test/Makefile ${KOKKOS_SETTINGS}" >> core/unit_test/Makefile
+echo "" >> core/unit_test/Makefile
+echo "test: all" >> core/unit_test/Makefile
+echo -e "\t\$(MAKE) -f ${KOKKOS_PATH}/core/unit_test/Makefile ${KOKKOS_SETTINGS} test" >> core/unit_test/Makefile
+echo "" >> core/unit_test/Makefile
+echo "clean:" >> core/unit_test/Makefile
+echo -e "\t\$(MAKE) -f ${KOKKOS_PATH}/core/unit_test/Makefile ${KOKKOS_SETTINGS} clean" >> core/unit_test/Makefile
+
+echo "KOKKOS_SETTINGS=${KOKKOS_SETTINGS}" > core/perf_test/Makefile
+echo "" >> core/perf_test/Makefile
+echo "all:" >> core/perf_test/Makefile
+echo -e "\t\$(MAKE) -f ${KOKKOS_PATH}/core/perf_test/Makefile ${KOKKOS_SETTINGS}" >> core/perf_test/Makefile
+echo "" >> core/perf_test/Makefile
+echo "test: all" >> core/perf_test/Makefile
+echo -e "\t\$(MAKE) -f ${KOKKOS_PATH}/core/perf_test/Makefile ${KOKKOS_SETTINGS} test" >> core/perf_test/Makefile
+echo "" >> core/perf_test/Makefile
+echo "clean:" >> core/perf_test/Makefile
+echo -e "\t\$(MAKE) -f ${KOKKOS_PATH}/core/perf_test/Makefile ${KOKKOS_SETTINGS} clean" >> core/perf_test/Makefile
+
+echo "KOKKOS_SETTINGS=${KOKKOS_SETTINGS}" > containers/unit_tests/Makefile
+echo "" >> containers/unit_tests/Makefile
+echo "all:" >> containers/unit_tests/Makefile
+echo -e "\t\$(MAKE) -f ${KOKKOS_PATH}/containers/unit_tests/Makefile ${KOKKOS_SETTINGS}" >> containers/unit_tests/Makefile
+echo "" >> containers/unit_tests/Makefile
+echo "test: all" >> containers/unit_tests/Makefile
+echo -e "\t\$(MAKE) -f ${KOKKOS_PATH}/containers/unit_tests/Makefile ${KOKKOS_SETTINGS} test" >> containers/unit_tests/Makefile
+echo "" >> containers/unit_tests/Makefile
+echo "clean:" >> containers/unit_tests/Makefile
+echo -e "\t\$(MAKE) -f ${KOKKOS_PATH}/containers/unit_tests/Makefile ${KOKKOS_SETTINGS} clean" >> containers/unit_tests/Makefile
+
+echo "KOKKOS_SETTINGS=${KOKKOS_SETTINGS}" > containers/performance_tests/Makefile
+echo "" >> containers/performance_tests/Makefile
+echo "all:" >> containers/performance_tests/Makefile
+echo -e "\t\$(MAKE) -f ${KOKKOS_PATH}/containers/performance_tests/Makefile ${KOKKOS_SETTINGS}" >> containers/performance_tests/Makefile
+echo "" >> containers/performance_tests/Makefile
+echo "test: all" >> containers/performance_tests/Makefile
+echo -e "\t\$(MAKE) -f ${KOKKOS_PATH}/containers/performance_tests/Makefile ${KOKKOS_SETTINGS} test" >> containers/performance_tests/Makefile
+echo "" >> containers/performance_tests/Makefile
+echo "clean:" >> containers/performance_tests/Makefile
+echo -e "\t\$(MAKE) -f ${KOKKOS_PATH}/containers/performance_tests/Makefile ${KOKKOS_SETTINGS} clean" >> containers/performance_tests/Makefile
+
+echo "KOKKOS_SETTINGS=${KOKKOS_SETTINGS}" > algorithms/unit_tests/Makefile
+echo "" >> algorithms/unit_tests/Makefile
+echo "all:" >> algorithms/unit_tests/Makefile
+echo -e "\t\$(MAKE) -f ${KOKKOS_PATH}/algorithms/unit_tests/Makefile ${KOKKOS_SETTINGS}" >> algorithms/unit_tests/Makefile
+echo "" >> algorithms/unit_tests/Makefile
+echo "test: all" >> algorithms/unit_tests/Makefile
+echo -e "\t\$(MAKE) -f ${KOKKOS_PATH}/algorithms/unit_tests/Makefile ${KOKKOS_SETTINGS} test" >> algorithms/unit_tests/Makefile
+echo "" >> algorithms/unit_tests/Makefile
+echo "clean:" >> algorithms/unit_tests/Makefile
+echo -e "\t\$(MAKE) -f ${KOKKOS_PATH}/algorithms/unit_tests/Makefile ${KOKKOS_SETTINGS} clean" >> algorithms/unit_tests/Makefile
+
+echo "KOKKOS_SETTINGS=${KOKKOS_SETTINGS}" > example/fixture/Makefile
+echo "" >> example/fixture/Makefile
+echo "all:" >> example/fixture/Makefile
+echo -e "\t\$(MAKE) -f ${KOKKOS_PATH}/example/fixture/Makefile ${KOKKOS_SETTINGS}" >> example/fixture/Makefile
+echo "" >> example/fixture/Makefile
+echo "test: all" >> example/fixture/Makefile
+echo -e "\t\$(MAKE) -f ${KOKKOS_PATH}/example/fixture/Makefile ${KOKKOS_SETTINGS} test" >> example/fixture/Makefile
+echo "" >> example/fixture/Makefile
+echo "clean:" >> example/fixture/Makefile
+echo -e "\t\$(MAKE) -f ${KOKKOS_PATH}/example/fixture/Makefile ${KOKKOS_SETTINGS} clean" >> example/fixture/Makefile
+
+echo "KOKKOS_SETTINGS=${KOKKOS_SETTINGS}" > example/feint/Makefile
+echo "" >> example/feint/Makefile
+echo "all:" >> example/feint/Makefile
+echo -e "\t\$(MAKE) -f ${KOKKOS_PATH}/example/feint/Makefile ${KOKKOS_SETTINGS}" >> example/feint/Makefile
+echo "" >> example/feint/Makefile
+echo "test: all" >> example/feint/Makefile
+echo -e "\t\$(MAKE) -f ${KOKKOS_PATH}/example/feint/Makefile ${KOKKOS_SETTINGS} test" >> example/feint/Makefile
+echo "" >> example/feint/Makefile
+echo "clean:" >> example/feint/Makefile
+echo -e "\t\$(MAKE) -f ${KOKKOS_PATH}/example/feint/Makefile ${KOKKOS_SETTINGS} clean" >> example/feint/Makefile
+
+echo "KOKKOS_SETTINGS=${KOKKOS_SETTINGS}" > example/fenl/Makefile
+echo "" >> example/fenl/Makefile
+echo "all:" >> example/fenl/Makefile
+echo -e "\t\$(MAKE) -f ${KOKKOS_PATH}/example/fenl/Makefile ${KOKKOS_SETTINGS}" >> example/fenl/Makefile
+echo "" >> example/fenl/Makefile
+echo "test: all" >> example/fenl/Makefile
+echo -e "\t\$(MAKE) -f ${KOKKOS_PATH}/example/fenl/Makefile ${KOKKOS_SETTINGS} test" >> example/fenl/Makefile
+echo "" >> example/fenl/Makefile
+echo "clean:" >> example/fenl/Makefile
+echo -e "\t\$(MAKE) -f ${KOKKOS_PATH}/example/fenl/Makefile ${KOKKOS_SETTINGS} clean" >> example/fenl/Makefile
+
+echo "KOKKOS_SETTINGS=${KOKKOS_SETTINGS}" > example/make_buildlink/Makefile
+echo "" >> example/make_buildlink/Makefile
+echo "build:" >> example/make_buildlink/Makefile
+echo -e "\t\$(MAKE) -f ${KOKKOS_PATH}/example/make_buildlink/Makefile ${KOKKOS_SETTINGS} build" >> example/make_buildlink/Makefile
+echo "" >> example/make_buildlink/Makefile
+echo "test: build" >> example/make_buildlink/Makefile
+echo -e "\t\$(MAKE) -f ${KOKKOS_PATH}/example/make_buildlink/Makefile ${KOKKOS_SETTINGS} test" >> example/make_buildlink/Makefile
+echo "" >> example/make_buildlink/Makefile
+echo "clean:" >> example/make_buildlink/Makefile
+echo -e "\t\$(MAKE) -f ${KOKKOS_PATH}/example/make_buildlink/Makefile ${KOKKOS_SETTINGS} clean" >> example/make_buildlink/Makefile
+
+echo "KOKKOS_SETTINGS=${KOKKOS_SETTINGS}" > example/tutorial/Makefile
+echo "" >> example/tutorial/Makefile
+echo "build:" >> example/tutorial/Makefile
+echo -e "\t\$(MAKE) -f ${KOKKOS_PATH}/example/tutorial/Makefile KOKKOS_SETTINGS='${KOKKOS_SETTINGS}' KOKKOS_PATH=${KOKKOS_PATH} build">> example/tutorial/Makefile
+echo "" >> example/tutorial/Makefile
+echo "test: build" >> example/tutorial/Makefile
+echo -e "\t\$(MAKE) -f ${KOKKOS_PATH}/example/tutorial/Makefile KOKKOS_SETTINGS='${KOKKOS_SETTINGS}' KOKKOS_PATH=${KOKKOS_PATH} test" >> example/tutorial/Makefile
+echo "" >> example/tutorial/Makefile
+echo "clean:" >> example/tutorial/Makefile
+echo -e "\t\$(MAKE) -f ${KOKKOS_PATH}/example/tutorial/Makefile KOKKOS_SETTINGS='${KOKKOS_SETTINGS}' KOKKOS_PATH=${KOKKOS_PATH} clean" >> example/tutorial/Makefile
+
+# Generate top level directory makefile.
+echo "Generating Makefiles with options " ${KOKKOS_SETTINGS}
+echo "KOKKOS_SETTINGS=${KOKKOS_SETTINGS}" > Makefile
+echo "" >> Makefile
+echo "build-test:" >> Makefile
+echo -e "\t\$(MAKE) -C core/unit_test" >> Makefile
+echo -e "\t\$(MAKE) -C core/perf_test" >> Makefile
+echo -e "\t\$(MAKE) -C containers/unit_tests" >> Makefile
+echo -e "\t\$(MAKE) -C containers/performance_tests" >> Makefile
+echo -e "\t\$(MAKE) -C algorithms/unit_tests" >> Makefile
+if [ ${KOKKOS_DO_EXAMPLES} -gt 0 ]; then
+$()
+echo -e "\t\$(MAKE) -C example/fixture" >> Makefile
+echo -e "\t\$(MAKE) -C example/feint" >> Makefile
+echo -e "\t\$(MAKE) -C example/fenl" >> Makefile
+echo -e "\t\$(MAKE) -C example/make_buildlink build" >> Makefile
+echo -e "\t\$(MAKE) -C example/tutorial build" >> Makefile
+fi
+echo "" >> Makefile
+echo "test: build-test" >> Makefile
+echo -e "\t\$(MAKE) -C core/unit_test test" >> Makefile
+echo -e "\t\$(MAKE) -C core/perf_test test" >> Makefile
+echo -e "\t\$(MAKE) -C containers/unit_tests test" >> Makefile
+echo -e "\t\$(MAKE) -C containers/performance_tests test" >> Makefile
+echo -e "\t\$(MAKE) -C algorithms/unit_tests test" >> Makefile
+if [ ${KOKKOS_DO_EXAMPLES} -gt 0 ]; then
+echo -e "\t\$(MAKE) -C example/fixture test" >> Makefile
+echo -e "\t\$(MAKE) -C example/feint test" >> Makefile
+echo -e "\t\$(MAKE) -C example/fenl test" >> Makefile
+echo -e "\t\$(MAKE) -C example/make_buildlink test" >> Makefile
+echo -e "\t\$(MAKE) -C example/tutorial test" >> Makefile
+fi
+echo "" >> Makefile
+echo "unit-tests-only:" >> Makefile
+echo -e "\t\$(MAKE) -C core/unit_test test" >> Makefile
+echo -e "\t\$(MAKE) -C containers/unit_tests test" >> Makefile
+echo -e "\t\$(MAKE) -C algorithms/unit_tests test" >> Makefile
+echo "" >> Makefile
+
+echo "clean:" >> Makefile
+echo -e "\t\$(MAKE) -C core/unit_test clean" >> Makefile
+echo -e "\t\$(MAKE) -C core/perf_test clean" >> Makefile
+echo -e "\t\$(MAKE) -C containers/unit_tests clean" >> Makefile
+echo -e "\t\$(MAKE) -C containers/performance_tests clean" >> Makefile
+echo -e "\t\$(MAKE) -C algorithms/unit_tests clean" >> Makefile
+if [ ${KOKKOS_DO_EXAMPLES} -gt 0 ]; then
+echo -e "\t\$(MAKE) -C example/fixture clean" >> Makefile
+echo -e "\t\$(MAKE) -C example/feint clean" >> Makefile
+echo -e "\t\$(MAKE) -C example/fenl clean" >> Makefile
+echo -e "\t\$(MAKE) -C example/make_buildlink clean" >> Makefile
+echo -e "\t\$(MAKE) -C example/tutorial clean" >> Makefile
+fi
+
diff --git a/kokkos/master_history.txt b/kokkos/master_history.txt
index ee5238be8..f6eb95292 100644
--- a/kokkos/master_history.txt
+++ b/kokkos/master_history.txt
@@ -18,3 +18,4 @@ tag:  2.7.24     date: 11:04:2018    master: d3a94192    develop: 7a06fc81
 tag:  2.8.00     date: 02:05:2019    master: 34931a36    develop: d1659d1d
 tag:  2.9.00     date: 06:24:2019    master: 5d6e7fb3    develop: 4c6cb80a
 tag:  3.0.00     date: 01:31:2020    master: 2983b80d    release-candidate-3.0: fdc904a6
+tag:  3.1.00     date: 04:14:2020    master: cd1b1d0a    develop: fd90af43
diff --git a/kokkos/scripts/apply-clang-format b/kokkos/scripts/apply-clang-format
index fb804205a..c70cd3118 100755
--- a/kokkos/scripts/apply-clang-format
+++ b/kokkos/scripts/apply-clang-format
@@ -20,3 +20,11 @@ if [ "${CLANG_FORMAT_MAJOR_VERSION}" -ne 8 ] || [ "${CLANG_FORMAT_MINOR_VERSION}
 fi
 
 find . -name '*.cpp' -o -name '*.hpp' | xargs ${CLANG_FORMAT_EXECUTABLE} -i
+
+# Now also check for trailing whitspace. Mac OSX creates backup files
+# that we need to delete manually.
+find . -type f \( -name "*.md" -o -name "*.cc" -o -name "*.h" -o -name "*.txt" -o -name "*.cmake" \) |
+  xargs -n 1 -P 10 -I {} bash -c "sed -i -e 's/\s\+$//g' {} && rm -f '{}-e'"
+
+# Check that we do not introduce any file with the old copyright
+./scripts/update-copyright
diff --git a/kokkos/scripts/docker/Dockerfile.clang b/kokkos/scripts/docker/Dockerfile.clang
index cd96094fb..680502f86 100644
--- a/kokkos/scripts/docker/Dockerfile.clang
+++ b/kokkos/scripts/docker/Dockerfile.clang
@@ -42,6 +42,3 @@ RUN LLVM_VERSION=8.0.0 && \
     rm -rf /root/.gnupg && \
     rm -rf ${SCRATCH_DIR}
 ENV PATH=${LLVM_DIR}/bin:$PATH
-
-# Workaround to find libcudart
-ENV LD_LIBRARY_PATH=/usr/local/cuda/targets/x86_64-linux/lib:${LD_LIBRARY_PATH}
diff --git a/kokkos/scripts/docker/Dockerfile.hipcc b/kokkos/scripts/docker/Dockerfile.hipcc
new file mode 100644
index 000000000..597db7794
--- /dev/null
+++ b/kokkos/scripts/docker/Dockerfile.hipcc
@@ -0,0 +1,29 @@
+ARG BASE=rocm/dev-ubuntu-18.04:3.0
+FROM $BASE
+
+RUN apt-get update && apt-get install -y \
+        kmod \
+        wget \
+        ccache \
+        && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV PATH=/opt/rocm/bin:$PATH
+
+ARG CMAKE_VERSION=3.10.3
+ENV CMAKE_DIR=/opt/cmake
+RUN CMAKE_KEY=2D2CEF1034921684 && \
+    CMAKE_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION} && \
+    CMAKE_SCRIPT=cmake-${CMAKE_VERSION}-Linux-x86_64.sh && \
+    CMAKE_SHA256=cmake-${CMAKE_VERSION}-SHA-256.txt && \
+    wget --quiet ${CMAKE_URL}/${CMAKE_SHA256} && \
+    wget --quiet ${CMAKE_URL}/${CMAKE_SHA256}.asc && \
+    wget --quiet ${CMAKE_URL}/${CMAKE_SCRIPT} && \
+    gpg --keyserver hkps.pool.sks-keyservers.net --recv-keys ${CMAKE_KEY} && \
+    gpg --verify ${CMAKE_SHA256}.asc ${CMAKE_SHA256} && \
+    grep ${CMAKE_SCRIPT} ${CMAKE_SHA256} | sha256sum --check && \
+    mkdir -p ${CMAKE_DIR} && \
+    sh ${CMAKE_SCRIPT} --skip-license --prefix=${CMAKE_DIR} && \
+    rm ${CMAKE_SCRIPT}
+ENV PATH=${CMAKE_DIR}/bin:$PATH
diff --git a/kokkos/scripts/docker/check_format_cpp.sh b/kokkos/scripts/docker/check_format_cpp.sh
index f96e8027d..c054c67a3 100755
--- a/kokkos/scripts/docker/check_format_cpp.sh
+++ b/kokkos/scripts/docker/check_format_cpp.sh
@@ -1,75 +1,4 @@
 #!/usr/bin/env bash
 
-clang_format_executable=${CLANG_FORMAT_EXE:-clang-format}
-
-this_program=$(basename "$0")
-usage="Usage:
-  $this_program [options] -- check format of the C++ source files
-
-Options:
-    -h --help         Print help and exit
-    -q --quiet        Quiet mode (do not print the diff)
-    -p --apply-patch  Apply diff patch to the source files"
-
-verbose=1
-apply_patch=0
-
-#echo "Arguments: $# $@"
-
-while [ $# -gt 0 ]
-do
-  case $1 in
-  -p|--apply-patch)
-      apply_patch=1
-      ;;
-  -q|--quiet)
-      verbose=0
-      ;;
-  -h|--help)
-      echo "$usage"
-      exit 0
-      ;;
-  *)
-      echo "$this_program: Unknown argument '$1'. See '$this_program --help'."
-      exit -1
-      ;;
-  esac
-
-  shift
-done
-
-# stop right here if clang-format does not exist in $PATH
-command -v $clang_format_executable >/dev/null 2>&1 || { echo >&2 "clang-format executable '$clang_format_executable' not found.  Aborting."; exit 1; }
-
-# shamelessy redirecting everything to /dev/null in quiet mode
-if [ $verbose -eq 0 ]; then
-    exec &>/dev/null
-fi
-
-cpp_source_files=$(git ls-files | grep -E "\.hpp$|\.cpp$|\.h$|\.c$" | grep -v -f .clang-format-ignore)
-
-unformatted_files=()
-for file in $cpp_source_files; do
-    diff -u \
-        <(cat $file) \
-        --label a/$file \
-        <($clang_format_executable $file) \
-        --label b/$file >&1
-    if [ $? -eq 1 ]; then
-        unformatted_files+=($file)
-    fi
-done
-
-n_unformatted_files=${#unformatted_files[@]}
-if [ $n_unformatted_files -ne 0 ]; then
-    echo "${#unformatted_files[@]} file(s) not formatted properly:"
-    for file in ${unformatted_files[@]}; do
-        echo "    $file"
-        if [ $apply_patch -eq 1 ]; then
-            $clang_format_executable -i $file
-        fi
-    done
-else
-    echo "OK"
-fi
-exit $n_unformatted_files
+./scripts/apply-clang-format || exit $?
+git diff --exit-code
diff --git a/kokkos/scripts/snapshot.py b/kokkos/scripts/snapshot.py
index bfa97bf48..b964e2b67 100755
--- a/kokkos/scripts/snapshot.py
+++ b/kokkos/scripts/snapshot.py
@@ -214,7 +214,7 @@ def find_git_commit_information(options):
 
 def do_git_commit(message, options):
   if options.verbose_mode:
-    print "Commiting to destination repository."
+    print "Committing to destination repository."
 
   git_add_cmd = ["git", "add", "-A"]
   run_cmd(git_add_cmd, options, options.destination)
@@ -283,7 +283,7 @@ def main(options):
     options = parse_cmdline(__doc__)
     main(options)
   except RuntimeError, e:
-    print "Error occured:", e
+    print "Error occurred:", e
     if "--debug" in sys.argv:
       traceback.print_exc()
     sys.exit(1)
diff --git a/kokkos/scripts/testing_scripts/TestEXEC_TEST.cpp b/kokkos/scripts/testing_scripts/TestEXEC_TEST.cpp
index a87918eea..f2d33eb26 100644
--- a/kokkos/scripts/testing_scripts/TestEXEC_TEST.cpp
+++ b/kokkos/scripts/testing_scripts/TestEXEC_TEST.cpp
@@ -25,10 +25,10 @@
 // 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
+// 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 SANDIA CORPORATION OR THE
+// 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
diff --git a/kokkos/scripts/testing_scripts/generate_makefile.bash b/kokkos/scripts/testing_scripts/generate_makefile.bash
index e685a0f3c..e3614c574 100755
--- a/kokkos/scripts/testing_scripts/generate_makefile.bash
+++ b/kokkos/scripts/testing_scripts/generate_makefile.bash
@@ -2,6 +2,8 @@
 
 KOKKOS_DEVICES=""
 
+KOKKOS_DO_EXAMPLES="1"
+
 while [[ $# > 0 ]]
 do
   key="$1"
@@ -79,6 +81,9 @@ do
       echo "Warning: ${key} is deprecated"
       echo "Call make with appropriate -j flag"
       ;;
+    --no-examples)
+      KOKKOS_DO_EXAMPLES="0"
+      ;;
     --compiler*)
       COMPILER="${key#*=}"
       CNUM=$(command -v ${COMPILER} 2>&1 >/dev/null | grep "no ${COMPILER}" | wc -l)
@@ -271,10 +276,6 @@ if [ ${#KOKKOS_USE_TPLS} -gt 0 ]; then
   KOKKOS_SETTINGS="${KOKKOS_SETTINGS} KOKKOS_USE_TPLS=${KOKKOS_USE_TPLS}"
 fi
 
-if [ ${#QTHREADS_PATH} -gt 0 ]; then
-  KOKKOS_SETTINGS="${KOKKOS_SETTINGS} QTHREADS_PATH=${QTHREADS_PATH}"
-fi
-
 if [ ${#HPX_PATH} -gt 0 ]; then
     KOKKOS_SETTINGS="${KOKKOS_SETTINGS} HPX_PATH=${HPX_PATH}"
 fi
@@ -441,6 +442,14 @@ echo -e "\t\$(MAKE) -C core/perf_test" >> Makefile
 echo -e "\t\$(MAKE) -C containers/unit_tests" >> Makefile
 echo -e "\t\$(MAKE) -C containers/performance_tests" >> Makefile
 echo -e "\t\$(MAKE) -C algorithms/unit_tests" >> Makefile
+if [ ${KOKKOS_DO_EXAMPLES} -gt 0 ]; then
+$()
+echo -e "\t\$(MAKE) -C example/fixture" >> Makefile
+echo -e "\t\$(MAKE) -C example/feint" >> Makefile
+echo -e "\t\$(MAKE) -C example/fenl" >> Makefile
+echo -e "\t\$(MAKE) -C example/make_buildlink build" >> Makefile
+echo -e "\t\$(MAKE) -C example/tutorial build" >> Makefile
+fi
 echo "" >> Makefile
 echo "test: build-test" >> Makefile
 echo -e "\t\$(MAKE) -C core/unit_test test" >> Makefile
@@ -448,6 +457,13 @@ echo -e "\t\$(MAKE) -C core/perf_test test" >> Makefile
 echo -e "\t\$(MAKE) -C containers/unit_tests test" >> Makefile
 echo -e "\t\$(MAKE) -C containers/performance_tests test" >> Makefile
 echo -e "\t\$(MAKE) -C algorithms/unit_tests test" >> Makefile
+if [ ${KOKKOS_DO_EXAMPLES} -gt 0 ]; then
+echo -e "\t\$(MAKE) -C example/fixture test" >> Makefile
+echo -e "\t\$(MAKE) -C example/feint test" >> Makefile
+echo -e "\t\$(MAKE) -C example/fenl test" >> Makefile
+echo -e "\t\$(MAKE) -C example/make_buildlink test" >> Makefile
+echo -e "\t\$(MAKE) -C example/tutorial test" >> Makefile
+fi
 echo "" >> Makefile
 echo "unit-tests-only:" >> Makefile
 echo -e "\t\$(MAKE) -C core/unit_test test" >> Makefile
@@ -461,4 +477,11 @@ echo -e "\t\$(MAKE) -C core/perf_test clean" >> Makefile
 echo -e "\t\$(MAKE) -C containers/unit_tests clean" >> Makefile
 echo -e "\t\$(MAKE) -C containers/performance_tests clean" >> Makefile
 echo -e "\t\$(MAKE) -C algorithms/unit_tests clean" >> Makefile
+if [ ${KOKKOS_DO_EXAMPLES} -gt 0 ]; then
+echo -e "\t\$(MAKE) -C example/fixture clean" >> Makefile
+echo -e "\t\$(MAKE) -C example/feint clean" >> Makefile
+echo -e "\t\$(MAKE) -C example/fenl clean" >> Makefile
+echo -e "\t\$(MAKE) -C example/make_buildlink clean" >> Makefile
+echo -e "\t\$(MAKE) -C example/tutorial clean" >> Makefile
+fi
 
diff --git a/kokkos/scripts/testing_scripts/cm_test_all_sandia b/kokkos/scripts/testing_scripts/gnu_test_all_sandia
similarity index 80%
rename from kokkos/scripts/testing_scripts/cm_test_all_sandia
rename to kokkos/scripts/testing_scripts/gnu_test_all_sandia
index b6d032f2f..eea23f53e 100755
--- a/kokkos/scripts/testing_scripts/cm_test_all_sandia
+++ b/kokkos/scripts/testing_scripts/gnu_test_all_sandia
@@ -8,65 +8,9 @@ set -o pipefail
 
 # Determine current machine.
 
-print_help() {
-  echo "test_all_sandia <ARGS> <OPTIONS>:"
-  echo "--kokkos-path=/Path/To/Kokkos: Path to the Kokkos root directory"
-  echo "    Defaults to root repo containing this script"
-  echo "--debug: Run tests in debug. Defaults to False"
-  echo "--test-script: Test this script, not Kokkos"
-  echo "--skip-hwloc: Do not do hwloc tests"
-  echo "--num=N: Number of jobs to run in parallel"
-  echo "--spot-check: Minimal test set to issue pull request"
-  echo "--dry-run: Just print what would be executed"
-  echo "--build-only: Just do builds, don't run anything"
-  echo "--opt-flag=FLAG: Optimization flag (default: -O3)"
-  echo "--cxxflags-extra=FLAGS: Extra flags to be added to CXX_FLAGS"
-  echo "--ldflags-extra=FLAGS: Extra flags to be added to LD_FLAGS"
-  echo "--arch=ARCHITECTURE: overwrite architecture flags"
-  echo "--with-cuda-options=OPT: set KOKKOS_CUDA_OPTIONS"
-  echo "--with-options=OPT: set KOKKOS_OPTIONS"
-  echo "--build-list=BUILD,BUILD,BUILD..."
-  echo "    Provide a comma-separated list of builds instead of running all builds"
-  echo "    Valid items:"
-  echo "      OpenMP, Pthread, Serial, OpenMP_Serial, Pthread_Serial"
-  echo "      Cuda_OpenMP, Cuda_Pthread, Cuda_Serial"
-  echo ""
-
-  echo "ARGS: list of expressions matching compilers to test"
-  echo "  supported compilers sems"
-  for COMPILER_DATA in "${COMPILERS[@]}"; do
-    ARR=($COMPILER_DATA)
-    COMPILER=${ARR[0]}
-    echo "    $COMPILER"
-  done
-  echo ""
-
-  echo "Examples:"
-  echo "  Run all tests"
-  echo "  % test_all_sandia"
-  echo ""
-  echo "  Run all gcc tests"
-  echo "  % test_all_sandia gcc"
-  echo ""
-  echo "  Run all gcc/4.8.4 and all intel tests"
-  echo "  % test_all_sandia gcc/4.8.4 intel"
-  echo ""
-  echo "  Run all tests in debug"
-  echo "  % test_all_sandia --debug"
-  echo ""
-  echo "  Run gcc/4.8.4 and only do OpenMP and OpenMP_Serial builds"
-  echo "  % test_all_sandia gcc/4.8.4 --build-list=OpenMP,OpenMP_Serial"
-  echo ""
-  echo "If you want to kill the tests, do:"
-  echo "  hit ctrl-z"
-  echo "  % kill -9 %1"
-  echo
-}
-
 MACHINE=""
 HOSTNAME=$(hostname)
 PROCESSOR=`uname -p`
-CUDA_ENABLE_CMD=
 
 if [[ "$HOSTNAME" =~ (white|ride).* ]]; then
   MACHINE=white
@@ -126,12 +70,12 @@ CLANG_BUILD_LIST="Pthread,Serial,Pthread_Serial"
 CUDA_BUILD_LIST="Cuda_OpenMP,Cuda_Pthread,Cuda_Serial"
 CUDA_IBM_BUILD_LIST="Cuda_OpenMP,Cuda_Serial"
 
-GCC_WARNING_FLAGS="-Wall,-Wshadow,-pedantic,-Werror,-Wsign-compare,-Wtype-limits,-Wignored-qualifiers,-Wempty-body,-Wclobbered,-Wuninitialized"
-IBM_WARNING_FLAGS="-Wall,-Wshadow,-pedantic,-Wsign-compare,-Wtype-limits,-Wuninitialized"
-CLANG_WARNING_FLAGS="-Wall,-Wshadow,-pedantic,-Werror,-Wsign-compare,-Wtype-limits,-Wuninitialized"
-INTEL_WARNING_FLAGS="-Wall,-Wshadow,-pedantic,-Werror,-Wsign-compare,-Wtype-limits,-Wuninitialized"
-CUDA_WARNING_FLAGS="-Wall,-Wshadow,-pedantic,-Werror,-Wsign-compare,-Wtype-limits,-Wuninitialized"
-#CUDA_WARNING_FLAGS="-Wall,-Wshadow,-pedantic,-Wsign-compare,-Wtype-limits,-Wuninitialized"
+GCC_WARNING_FLAGS="-Wall,-Wunused-parameter,-Wshadow,-pedantic,-Werror,-Wsign-compare,-Wtype-limits,-Wignored-qualifiers,-Wempty-body,-Wclobbered,-Wuninitialized"
+IBM_WARNING_FLAGS="-Wall,-Wunused-parameter,-Wshadow,-pedantic,-Wsign-compare,-Wtype-limits,-Wuninitialized"
+CLANG_WARNING_FLAGS="-Wall,-Wunused-parameter,-Wshadow,-pedantic,-Werror,-Wsign-compare,-Wtype-limits,-Wuninitialized"
+INTEL_WARNING_FLAGS="-Wall,-Wunused-parameter,-Wshadow,-pedantic,-Werror,-Wsign-compare,-Wtype-limits,-Wuninitialized"
+CUDA_WARNING_FLAGS="-Wall,-Wunused-parameter,-Wshadow,-pedantic,-Werror,-Wsign-compare,-Wtype-limits,-Wuninitialized"
+#CUDA_WARNING_FLAGS="-Wunused-parameter,-Wall,-Wshadow,-pedantic,-Wsign-compare,-Wtype-limits,-Wuninitialized"
 PGI_WARNING_FLAGS=""
 
 # Default. Machine specific can override.
@@ -151,7 +95,7 @@ CXX_FLAGS_EXTRA=""
 LD_FLAGS_EXTRA=""
 KOKKOS_OPTIONS=""
 
-CXX_STANDARD="11"
+CXX_STANDARD="c++11"
 
 #
 # Handle arguments.
@@ -196,23 +140,16 @@ do
       OPT_FLAG="${key#*=}"
       ;;
     --with-cuda-options*)
-      KOKKOS_CUDA_OPTIONS="${key#*=}"
-      export KOKKOS_CUDA_OPTIONS
+      KOKKOS_CUDA_OPTIONS="--with-cuda-options=${key#*=}"
       ;;
     --with-options*)
-      KOKKOS_OPTIONS="${key#*=}"
-      export KOKKOS_OPTIONS
+      KOKKOS_OPTIONS="--with-options=${key#*=}"
       ;;
     --cxxflags-extra*)
       CXX_FLAGS_EXTRA="${key#*=}"
       ;;
     --cxxstandard*)
-      FULL_CXX_STANDARD="${key#*=}"
-      if [[ ${FULL_CXX_STANDARD} == *++* ]]; then
-         CXX_STANDARD="${FULL_CXX_STANDARD#*++}"
-      else
-         CXX_STANDARD="${FULL_CXX_STANDARD}"
-      fi
+      CXX_STANDARD="${key#*=}"
       ;;
     --ldflags-extra*)
       LD_FLAGS_EXTRA="${key#*=}"
@@ -239,7 +176,17 @@ else
   KOKKOS_PATH=$( cd $KOKKOS_PATH && pwd )
 fi
 
+UNCOMMITTED=`cd ${KOKKOS_PATH}; git status --porcelain 2>/dev/null`
+if ! [ -z "$UNCOMMITTED" ]; then
+  echo "WARNING!! THE FOLLOWING CHANGES ARE UNCOMMITTED!! :"
+  echo "$UNCOMMITTED"
+  echo ""
+fi
 
+GITSTATUS=`cd ${KOKKOS_PATH}; git log -n 1 --format=oneline`
+echo "Repository Status: " ${GITSTATUS}
+echo ""
+echo ""
 
 #
 # Machine specific config.
@@ -289,13 +236,10 @@ if [ "$MACHINE" = "sems" ]; then
 elif [ "$MACHINE" = "kokkos-dev" ]; then
   source /projects/sems/modulefiles/utils/sems-modules-init.sh
 
-  module load sems-cmake/3.12.2
-  BASE_MODULE_LIST="sems-env,sems-cmake/3.12.2,kokkos-env,kokkos-hwloc/1.10.1/base,sems-<COMPILER_NAME>/<COMPILER_VERSION>"
-  CUDA9_MODULE_LIST="sems-env,sems-cmake/3.12.2,kokkos-env,sems-<COMPILER_NAME>/<COMPILER_VERSION>,sems-gcc/6.1.0,kokkos-hwloc/1.10.1/base"
-  CLANG7_MODULE_LIST="sems-env,sems-cmake/3.12.2,kokkos-env,kokkos-hwloc/1.10.1/base,sems-<COMPILER_NAME>/<COMPILER_VERSION>,sems-cuda/9.2"
+  BASE_MODULE_LIST="sems-env,kokkos-env,kokkos-hwloc/1.10.1/base,sems-<COMPILER_NAME>/<COMPILER_VERSION>"
 
   if [ -z "$ARCH_FLAG" ]; then
-    ARCH_FLAG="--arch=Kepler35"
+    ARCH_FLAG=""
   fi
 
   if [ "$SPOT_CHECK" = "True" ]; then
@@ -304,8 +248,6 @@ elif [ "$MACHINE" = "kokkos-dev" ]; then
                "gcc/7.3.0 $BASE_MODULE_LIST "Serial" g++ $GCC_WARNING_FLAGS"
                "intel/17.0.1 $BASE_MODULE_LIST "OpenMP" icpc $INTEL_WARNING_FLAGS"
                "clang/4.0.1 $BASE_MODULE_LIST "Pthread_Serial" clang++ $CLANG_WARNING_FLAGS"
-               "clang/7.0.1 $CLANG7_MODULE_LIST "Cuda_OpenMP" clang++ $CLANG_WARNING_FLAGS"
-               "cuda/9.2 $CUDA9_MODULE_LIST "Cuda_OpenMP" $KOKKOS_PATH/bin/nvcc_wrapper $CUDA_WARNING_FLAGS"
     )
   else
     # Format: (compiler module-list build-list exe-name warning-flag)
@@ -322,8 +264,6 @@ elif [ "$MACHINE" = "kokkos-dev" ]; then
                "clang/3.8.1 $BASE_MODULE_LIST $CLANG_BUILD_LIST clang++ $CLANG_WARNING_FLAGS"
                "clang/3.9.0 $BASE_MODULE_LIST $CLANG_BUILD_LIST clang++ $CLANG_WARNING_FLAGS"
                "clang/4.0.1 $BASE_MODULE_LIST $CLANG_BUILD_LIST clang++ $CLANG_WARNING_FLAGS"
-               "clang/7.0.1 $CLANG7_MODULE_LIST $CLANG_BUILD_LIST clang++ $CLANG_WARNING_FLAGS"
-               "cuda/9.2 $CUDA9_MODULE_LIST $CUDA_BUILD_LIST $KOKKOS_PATH/bin/nvcc_wrapper $CUDA_WARNING_FLAGS"
     )
   fi
 elif [ "$MACHINE" = "white" ]; then
@@ -331,10 +271,10 @@ elif [ "$MACHINE" = "white" ]; then
   SKIP_HWLOC=True
   export SLURM_TASKS_PER_NODE=32
 
-  BASE_MODULE_LIST="cmake/3.12.3,<COMPILER_NAME>/<COMPILER_VERSION>"
-  IBM_MODULE_LIST="cmake/3.12.3,<COMPILER_NAME>/xl/<COMPILER_VERSION>,gcc/7.2.0"
-  CUDA_MODULE_LIST="cmake/3.12.3,<COMPILER_NAME>/<COMPILER_VERSION>,gcc/7.2.0,ibm/xl/16.1.0"
-  CUDA10_MODULE_LIST="cmake/3.12.3,<COMPILER_NAME>/<COMPILER_VERSION>,gcc/7.4.0,ibm/xl/16.1.0"
+  BASE_MODULE_LIST="<COMPILER_NAME>/<COMPILER_VERSION>"
+  IBM_MODULE_LIST="<COMPILER_NAME>/xl/<COMPILER_VERSION>,gcc/7.2.0"
+  CUDA_MODULE_LIST="<COMPILER_NAME>/<COMPILER_VERSION>,gcc/7.2.0,ibm/xl/16.1.0"
+  CUDA10_MODULE_LIST="<COMPILER_NAME>/<COMPILER_VERSION>,gcc/7.4.0,ibm/xl/16.1.0"
 
   # Don't do pthread on white.
   GCC_BUILD_LIST="OpenMP,Serial,OpenMP_Serial"
@@ -366,7 +306,7 @@ elif [ "$MACHINE" = "bowman" ]; then
   SKIP_HWLOC=True
   export SLURM_TASKS_PER_NODE=32
 
-  BASE_MODULE_LIST="cmake/3.12.3,<COMPILER_NAME>/compilers/<COMPILER_VERSION>"
+  BASE_MODULE_LIST="<COMPILER_NAME>/compilers/<COMPILER_VERSION>"
 
   OLD_INTEL_BUILD_LIST="Pthread,Serial,Pthread_Serial"
 
@@ -384,8 +324,8 @@ elif [ "$MACHINE" = "mayer" ]; then
   SKIP_HWLOC=True
   export SLURM_TASKS_PER_NODE=96
 
-  BASE_MODULE_LIST="cmake/3.12.2,<COMPILER_NAME>/<COMPILER_VERSION>"
-#  ARM_MODULE_LIST="cmake/3.12.2,<COMPILER_NAME>/<COMPILER_VERSION>"
+  BASE_MODULE_LIST="<COMPILER_NAME>/<COMPILER_VERSION>"
+#  ARM_MODULE_LIST="<COMPILER_NAME>/compilers/<COMPILER_VERSION>"
 
   # Format: (compiler module-list build-list exe-name warning-flag)
   COMPILERS=("gnu7/7.2.0 $BASE_MODULE_LIST $ARM_GCC_BUILD_LIST g++ $GCC_WARNING_FLAGS"
@@ -400,8 +340,6 @@ elif [ "$MACHINE" = "blake" ]; then
   SKIP_HWLOC=True
   export SLURM_TASKS_PER_NODE=32
 
-  module load cmake/3.12.3
-
   BASE_MODULE_LIST="<COMPILER_NAME>/<COMPILER_VERSION>"
   BASE_MODULE_LIST_INTEL="<COMPILER_NAME>/compilers/<COMPILER_VERSION>"
 
@@ -434,22 +372,22 @@ elif [ "$MACHINE" = "apollo" ]; then
 
   module load sems-git
   module load sems-tex
-  module load sems-cmake/3.12.2
+  module load sems-cmake/3.5.2
   module load sems-gdb
   module load binutils
 
   SKIP_HWLOC=True
 
-  BASE_MODULE_LIST="sems-env,sems-cmake/3.12.2,kokkos-env,kokkos-hwloc/1.10.1/base,sems-<COMPILER_NAME>/<COMPILER_VERSION>"
-  CUDA_MODULE_LIST="sems-env,sems-cmake/3.12.2,kokkos-env,kokkos-<COMPILER_NAME>/<COMPILER_VERSION>,sems-gcc/4.8.4,kokkos-hwloc/1.10.1/base"
-  CUDA9_MODULE_LIST="sems-env,sems-cmake/3.12.2,kokkos-env,kokkos-<COMPILER_NAME>/<COMPILER_VERSION>,sems-gcc/5.3.0,kokkos-hwloc/1.10.1/base"
-  CUDA10_MODULE_LIST="sems-env,sems-cmake/3.12.2,kokkos-env,<COMPILER_NAME>/<COMPILER_VERSION>,sems-gcc/5.3.0,kokkos-hwloc/1.10.1/base"
+  GCC_MODULE_LIST="sems-env,kokkos-env,kokkos-hwloc/1.10.1/base,sems-<COMPILER_NAME>/<COMPILER_VERSION>"
+  NONGCC_MODULE_LIST="sems-env,kokkos-env,sems-gcc/5.3.0,sems-<COMPILER_NAME>/<COMPILER_VERSION>,kokkos-hwloc/1.10.1/base"
+  CUDA_MODULE_LIST="sems-env,kokkos-env,kokkos-<COMPILER_NAME>/<COMPILER_VERSION>,sems-gcc/4.8.4,kokkos-hwloc/1.10.1/base"
+  CUDA8_MODULE_LIST="sems-env,kokkos-env,kokkos-<COMPILER_NAME>/<COMPILER_VERSION>,sems-gcc/5.3.0,kokkos-hwloc/1.10.1/base"
+  CUDA10_MODULE_LIST="sems-env,kokkos-env,<COMPILER_NAME>/<COMPILER_VERSION>,sems-gcc/5.3.0,kokkos-hwloc/1.10.1/base"
 
-  CLANG_MODULE_LIST="sems-env,sems-cmake/3.12.2,kokkos-env,<COMPILER_NAME>/<COMPILER_VERSION>,cuda/9.0.69"
-  CLANG7_MODULE_LIST="sems-env,sems-cmake/3.12.2,kokkos-env,sems-gcc/6.1.0,<COMPILER_NAME>/<COMPILER_VERSION>,cuda/9.1"
-  NVCC_MODULE_LIST="sems-env,sems-cmake/3.12.2,kokkos-env,<COMPILER_NAME>/<COMPILER_VERSION>,sems-gcc/5.3.0"
-  HPX_MODULE_LIST="sems-env,sems-cmake/3.12.2,kokkos-env,hpx/1.2.1,sems-gcc/6.1.0,binutils"
-  HPX3_MODULE_LIST="sems-env,sems-cmake/3.12.2,kokkos-env,compilers/hpx/1.3.0,sems-gcc/6.1.0,binutils"
+  CLANG_MODULE_LIST="sems-env,kokkos-env,<COMPILER_NAME>/<COMPILER_VERSION>,cuda/9.0.69"
+  CLANG7_MODULE_LIST="sems-env,kokkos-env,<COMPILER_NAME>/<COMPILER_VERSION>,cuda/9.1"
+  NVCC_MODULE_LIST="sems-env,kokkos-env,<COMPILER_NAME>/<COMPILER_VERSION>,sems-gcc/5.3.0"
+  HPX_MODULE_LIST="sems-env,kokkos-env,hpx/1.2.1,sems-gcc/6.1.0,binutils"
 
   BUILD_LIST_CUDA_NVCC="Cuda_Serial,Cuda_OpenMP"
   BUILD_LIST_CUDA_CLANG="Cuda_Serial,Cuda_Pthread"
@@ -457,32 +395,30 @@ elif [ "$MACHINE" = "apollo" ]; then
 
   if [ "$SPOT_CHECK" = "True" ]; then
     # Format: (compiler module-list build-list exe-name warning-flag)
-    COMPILERS=("gcc/4.8.4 $BASE_MODULE_LIST "OpenMP,Pthread" g++ $GCC_WARNING_FLAGS"
-               "gcc/5.3.0 $BASE_MODULE_LIST "Serial" g++ $GCC_WARNING_FLAGS"
-               "intel/16.0.1 $BASE_MODULE_LIST "OpenMP" icpc $INTEL_WARNING_FLAGS"
-               "clang/3.9.0 $BASE_MODULE_LIST "Pthread_Serial" clang++ $CLANG_WARNING_FLAGS"
+    COMPILERS=("gcc/4.8.4 $GCC_MODULE_LIST "OpenMP,Pthread" g++ $GCC_WARNING_FLAGS"
+               "gcc/5.3.0 $GCC_MODULE_LIST "Serial" g++ $GCC_WARNING_FLAGS"
+               "intel/16.0.1 $NONGCC_MODULE_LIST "OpenMP" icpc $INTEL_WARNING_FLAGS"
+               "clang/3.9.0 $NONGCC_MODULE_LIST "Pthread_Serial" clang++ $CLANG_WARNING_FLAGS"
                "clang/6.0 $CLANG_MODULE_LIST "Cuda_Pthread,OpenMP" clang++ $CUDA_WARNING_FLAGS"
                "cuda/9.1 $CUDA_MODULE_LIST "Cuda_OpenMP" $KOKKOS_PATH/bin/nvcc_wrapper $CUDA_WARNING_FLAGS"
-               "hpx/1.3.0 $HPX3_MODULE_LIST "HPX" g++ $PGI_WARNING_FLAGS"
+               "hpx/1.2.1 $HPX_MODULE_LIST "HPX" g++ $PGI_WARNING_FLAGS"
     )
   else
     # Format: (compiler module-list build-list exe-name warning-flag)
-    COMPILERS=("cuda/9.1 $CUDA9_MODULE_LIST $BUILD_LIST_CUDA_NVCC $KOKKOS_PATH/bin/nvcc_wrapper $CUDA_WARNING_FLAGS"
+    COMPILERS=("cuda/9.1 $CUDA8_MODULE_LIST $BUILD_LIST_CUDA_NVCC $KOKKOS_PATH/bin/nvcc_wrapper $CUDA_WARNING_FLAGS"
                "cuda/10.0 $CUDA10_MODULE_LIST $BUILD_LIST_CUDA_NVCC $KOKKOS_PATH/bin/nvcc_wrapper $CUDA_WARNING_FLAGS"
                "clang/6.0 $CLANG_MODULE_LIST $BUILD_LIST_CUDA_CLANG clang++ $CUDA_WARNING_FLAGS"
                "clang/7.0 $CLANG7_MODULE_LIST $BUILD_LIST_CUDA_CLANG clang++ $CUDA_WARNING_FLAGS"
                "clang/3.9.0 $CLANG_MODULE_LIST $BUILD_LIST_CLANG clang++ $CLANG_WARNING_FLAGS"
-               "gcc/4.8.4 $BASE_MODULE_LIST $GCC_BUILD_LIST g++ $GCC_WARNING_FLAGS"
-               "gcc/4.9.3 $BASE_MODULE_LIST $GCC_BUILD_LIST g++ $GCC_WARNING_FLAGS"
-               "gcc/5.3.0 $BASE_MODULE_LIST $GCC_BUILD_LIST g++ $GCC_WARNING_FLAGS"
-               "gcc/6.1.0 $BASE_MODULE_LIST $GCC_BUILD_LIST g++ $GCC_WARNING_FLAGS"
-               "intel/15.0.2 $BASE_MODULE_LIST $INTEL_BUILD_LIST icpc $INTEL_WARNING_FLAGS"
-               "intel/16.0.1 $BASE_MODULE_LIST $INTEL_BUILD_LIST icpc $INTEL_WARNING_FLAGS"
-               "intel/17.0.1 $BASE_MODULE_LIST $INTEL_BUILD_LIST icpc $INTEL_WARNING_FLAGS"
-               "clang/3.5.2 $BASE_MODULE_LIST $CLANG_BUILD_LIST clang++ $CLANG_WARNING_FLAGS"
-               "clang/3.6.1 $BASE_MODULE_LIST $CLANG_BUILD_LIST clang++ $CLANG_WARNING_FLAGS"
-               "hpx/1.2.1 $HPX_MODULE_LIST "HPX" g++ $PGI_WARNING_FLAGS"
-               "hpx/1.3.0 $HPX3_MODULE_LIST "HPX" g++ $PGI_WARNING_FLAGS"
+               "gcc/4.8.4 $GCC_MODULE_LIST $GCC_BUILD_LIST g++ $GCC_WARNING_FLAGS"
+               "gcc/4.9.3 $GCC_MODULE_LIST $GCC_BUILD_LIST g++ $GCC_WARNING_FLAGS"
+               "gcc/5.3.0 $GCC_MODULE_LIST $GCC_BUILD_LIST g++ $GCC_WARNING_FLAGS"
+               "gcc/6.1.0 $GCC_MODULE_LIST $GCC_BUILD_LIST g++ $GCC_WARNING_FLAGS"
+               "intel/15.0.2 $NONGCC_MODULE_LIST $INTEL_BUILD_LIST icpc $INTEL_WARNING_FLAGS"
+               "intel/16.0.1 $NONGCC_MODULE_LIST $INTEL_BUILD_LIST icpc $INTEL_WARNING_FLAGS"
+               "intel/17.0.1 $NONGCC_MODULE_LIST $INTEL_BUILD_LIST icpc $INTEL_WARNING_FLAGS"
+               "clang/3.5.2 $NONGCC_MODULE_LIST $CLANG_BUILD_LIST clang++ $CLANG_WARNING_FLAGS"
+               "clang/3.6.1 $NONGCC_MODULE_LIST $CLANG_BUILD_LIST clang++ $CLANG_WARNING_FLAGS"
     )
   fi
 
@@ -519,6 +455,7 @@ elif [ "$MACHINE" = "kokkos-dev-2" ]; then
   if [ "$SPOT_CHECK" = "True" ]; then
     # Format: (compiler module-list build-list exe-name warning-flag)
     COMPILERS=("gcc/7.3.0 $BASE_MODULE_LIST "OpenMP,Pthread" g++ $GCC_WARNING_FLAGS"
+               "gcc/8.3.0 $BASE_MODULE_LIST "OpenMP" g++ $GCC_WARNING_FLAGS"
                "gcc/9.1 $GCC91_MODULE_LIST "OpenMP,Serial" g++ $GCC_WARNING_FLAGS"
                "intel/18.0.5 $BASE_MODULE_LIST "OpenMP" icpc $INTEL_WARNING_FLAGS"
                "clang/8.0 $CLANG8_MODULE_LIST "Cuda_OpenMP,Pthread_Serial" clang++ $CLANG_WARNING_FLAGS"
@@ -535,7 +472,9 @@ elif [ "$MACHINE" = "kokkos-dev-2" ]; then
                "gcc/5.3.0 $BASE_MODULE_LIST $GCC_BUILD_LIST g++ $GCC_WARNING_FLAGS"
                "gcc/6.1.0 $BASE_MODULE_LIST $GCC_BUILD_LIST g++ $GCC_WARNING_FLAGS"
                "gcc/7.3.0 $BASE_MODULE_LIST $GCC_BUILD_LIST g++ $GCC_WARNING_FLAGS"
-               "gcc/9.1 $GCC91_MODULE_LIST "OpenMP,Serial" g++ $GCC_WARNING_FLAGS"
+               "gcc/8.3.0 $BASE_MODULE_LIST $GCC_BUILD_LIST g++ $GCC_WARNING_FLAGS"
+               "gcc/9.1 $GCC91_MODULE_LIST "$GCC_BUILD_LIST" g++ $GCC_WARNING_FLAGS"
+               "gcc/9.2.0 $BASE_MODULE_LIST "$GCC_BUILD_LIST" g++ $GCC_WARNING_FLAGS"
                "intel/15.0.2 $BASE_MODULE_LIST $INTEL_BUILD_LIST icpc $INTEL_WARNING_FLAGS"
                "intel/16.0.1 $BASE_MODULE_LIST $INTEL_BUILD_LIST icpc $INTEL_WARNING_FLAGS"
                "intel/17.0.1 $BASE_MODULE_LIST $INTEL_BUILD_LIST icpc $INTEL_WARNING_FLAGS"
@@ -544,6 +483,7 @@ elif [ "$MACHINE" = "kokkos-dev-2" ]; then
                "clang/3.5.2 $BASE_MODULE_LIST $CLANG_BUILD_LIST clang++ $CLANG_WARNING_FLAGS"
                "clang/5.0.1 $BASE_MODULE_LIST $CLANG_BUILD_LIST clang++ $CLANG_WARNING_FLAGS"
                "clang/7.0.1 $BASE_MODULE_LIST $CLANG_BUILD_LIST clang++ $CLANG_WARNING_FLAGS"
+               "clang/9.0.0 $BASE_MODULE_LIST $CLANG_BUILD_LIST clang++ $CLANG_WARNING_FLAGS"
                "pgi/19.4 $PGI_MODULE_LIST $GCC_BUILD_LIST pgc++ $PGI_WARNING_FLAGS"
     )
   fi
@@ -566,21 +506,60 @@ declare -i NUM_RESULTS_TO_KEEP=7
 RESULT_ROOT_PREFIX=TestAll
 
 if [ "$PRINT_HELP" = "True" ]; then
-  print_help
-  exit 0
-fi
+  echo "test_all_sandia <ARGS> <OPTIONS>:"
+  echo "--kokkos-path=/Path/To/Kokkos: Path to the Kokkos root directory"
+  echo "    Defaults to root repo containing this script"
+  echo "--debug: Run tests in debug. Defaults to False"
+  echo "--test-script: Test this script, not Kokkos"
+  echo "--skip-hwloc: Do not do hwloc tests"
+  echo "--num=N: Number of jobs to run in parallel"
+  echo "--spot-check: Minimal test set to issue pull request"
+  echo "--dry-run: Just print what would be executed"
+  echo "--build-only: Just do builds, don't run anything"
+  echo "--opt-flag=FLAG: Optimization flag (default: -O3)"
+  echo "--cxxflags-extra=FLAGS: Extra flags to be added to CXX_FLAGS"
+  echo "--cxxstandard=OPT: c++11 (default), c++14, c++17, c++1y, c++1z, c++2a"
+  echo "--ldflags-extra=FLAGS: Extra flags to be added to LD_FLAGS"
+  echo "--arch=ARCHITECTURE: overwrite architecture flags"
+  echo "--with-cuda-options=OPT: set KOKKOS_CUDA_OPTIONS"
+  echo "--build-list=BUILD,BUILD,BUILD..."
+  echo "    Provide a comma-separated list of builds instead of running all builds"
+  echo "    Valid items:"
+  echo "      OpenMP, Pthread, Serial, OpenMP_Serial, Pthread_Serial"
+  echo "      Cuda_OpenMP, Cuda_Pthread, Cuda_Serial"
+  echo ""
 
-UNCOMMITTED=`cd ${KOKKOS_PATH}; git status --porcelain 2>/dev/null`
-if ! [ -z "$UNCOMMITTED" ]; then
-  echo "WARNING!! THE FOLLOWING CHANGES ARE UNCOMMITTED!! :"
-  echo "$UNCOMMITTED"
+  echo "ARGS: list of expressions matching compilers to test"
+  echo "  supported compilers sems"
+  for COMPILER_DATA in "${COMPILERS[@]}"; do
+    ARR=($COMPILER_DATA)
+    COMPILER=${ARR[0]}
+    echo "    $COMPILER"
+  done
   echo ""
-fi
 
-GITSTATUS=`cd ${KOKKOS_PATH}; git log -n 1 --format=oneline`
-echo "Repository Status: " ${GITSTATUS}
-echo ""
-echo ""
+  echo "Examples:"
+  echo "  Run all tests"
+  echo "  % test_all_sandia"
+  echo ""
+  echo "  Run all gcc tests"
+  echo "  % test_all_sandia gcc"
+  echo ""
+  echo "  Run all gcc/4.8.4 and all intel tests"
+  echo "  % test_all_sandia gcc/4.8.4 intel"
+  echo ""
+  echo "  Run all tests in debug"
+  echo "  % test_all_sandia --debug"
+  echo ""
+  echo "  Run gcc/4.8.4 and only do OpenMP and OpenMP_Serial builds"
+  echo "  % test_all_sandia gcc/4.8.4 --build-list=OpenMP,OpenMP_Serial"
+  echo ""
+  echo "If you want to kill the tests, do:"
+  echo "  hit ctrl-z"
+  echo "  % kill -9 %1"
+  echo
+  exit 0
+fi
 
 # Set build type.
 if [ "$DEBUG" = "True" ]; then
@@ -608,18 +587,10 @@ for ARG in $ARGS; do
       else
         echo "Tried to add $COMPILER twice"
       fi
-     fi
+    fi
   done
 done
 
-if [ "$COMPILERS_TO_TEST" == "" ]; then
-   echo "-----------------------------------------------"
-   echo "   !!!! Invalid Compiler provided  '$ARGS' !!!!"
-   echo "-----------------------------------------------"
-   print_help
-   exit 0
-fi
-
 #
 # Functions.
 #
@@ -715,10 +686,6 @@ setup_env() {
     module list 2>&1 | grep "$mod" >& /dev/null || return 1
   done
 
-  if [ -e ${CM_ALL_SCRIPT_PATH}/update_lib.sh ]; then
-     echo calling ${CM_ALL_SCRIPT_PATH}/update_lib.sh $MACHINE
-     source ${CM_ALL_SCRIPT_PATH}/update_lib.sh $MACHINE
-  fi
   return 0
 }
 
@@ -737,14 +704,8 @@ single_build_and_test() {
   local compiler_warning_flags=$(get_compiler_warning_flags $compiler)
   local compiler_exe=$(get_compiler_exe_name $compiler)
 
-  if [[ "$KOKKOS_OPTIONS" == "" ]]; then
-    local extra_args="--with-options=enable_large_mem_tests"
-  else 
-    local extra_args=
-  fi    
-
   if [[ "$build_type" = hwloc* ]]; then
-    local extra_args="$extra_args --with-hwloc=$(dirname $(dirname $(which hwloc-info)))"
+    local extra_args=--with-hwloc=$(dirname $(dirname $(which hwloc-info)))
   fi
 
   if [[ "$OPT_FLAG" = "" ]]; then
@@ -754,15 +715,25 @@ single_build_and_test() {
   if [[ "$build_type" = *debug* ]]; then
     local extra_args="$extra_args --debug"
     local cxxflags="-g $compiler_warning_flags"
+    local ldflags="-g"
   else
     local cxxflags="$OPT_FLAG $compiler_warning_flags"
+    local ldflags="${OPT_FLAG}"
   fi
 
   local cxxflags="${cxxflags} ${CXX_FLAGS_EXTRA}"
-  local ldflags="${LD_FLAGS_EXTRA}"
+  local ldflags="${ldflags} ${LD_FLAGS_EXTRA}"
 
   local cxx_standard="${CXX_STANDARD}"
 
+  if [[ "$KOKKOS_CUDA_OPTIONS" != "" ]]; then
+    local extra_args="$extra_args $KOKKOS_CUDA_OPTIONS"
+  fi
+  if [[ "$KOKKOS_OPTIONS" != "" ]]; then
+    local extra_args="$extra_args $KOKKOS_OPTIONS"
+  else
+    local extra_args="$extra_args --with-options=enable_large_mem_tests"
+  fi    
 
   echo "  Starting job $desc"
 
@@ -776,16 +747,9 @@ single_build_and_test() {
       run_cmd ls fake_problem >& ${desc}.configure.log || { report_and_log_test_result 1 $desc configure && return 0; }
     fi
   else
-    LOCAL_KOKKOS_DEVICES=${build//_/,}
-    if [[ "$LOCAL_KOKKOS_DEVICES" = *Cuda* ]]; then
-       CUDA_ENABLE_CMD="--with-cuda=$CUDA_ROOT"
-    fi
-    echo "kokkos options: ${KOKKOS_OPTIONS}"
-    echo "kokkos devices: ${LOCAL_KOKKOS_DEVICES}"
-    echo "kokkos cxx: ${cxxflags}"
-    run_cmd ${KOKKOS_PATH}/cm_generate_makefile.bash --with-devices=$LOCAL_KOKKOS_DEVICES $ARCH_FLAG --compiler=$(which $compiler_exe) --cxxflags=\"$cxxflags\" --cxxstandard=\"$cxx_standard\" --ldflags=\"$ldflags\" $CUDA_ENABLE_CMD --kokkos-path=${KOKKOS_PATH} --no-examples $extra_args &>> ${desc}.configure.log || { report_and_log_test_result 1 ${desc} configure && return 0; }
+    run_cmd ${KOKKOS_PATH}/scripts/testing_scripts/gnu_generate_makefile.bash --with-devices=$build $ARCH_FLAG --compiler=$(which $compiler_exe) --cxxflags=\"$cxxflags\" --cxxstandard=\"$cxx_standard\" --ldflags=\"$ldflags\" $extra_args &>> ${desc}.configure.log || { report_and_log_test_result 1 ${desc} configure && return 0; }
     local -i build_start_time=$(date +%s)
-    run_cmd make -j 48 all >& ${desc}.build.log || { report_and_log_test_result 1 ${desc} build && return 0; }
+    run_cmd make -j 48 build-test >& ${desc}.build.log || { report_and_log_test_result 1 ${desc} build && return 0; }
     local -i build_end_time=$(date +%s)
     comment="build_time=$(($build_end_time-$build_start_time))"
 
@@ -905,10 +869,6 @@ wait_summarize_and_exit() {
 # Main.
 #
 
-CM_ALL_SCRIPT=$0
-CM_ALL_SCRIPT_PATH=`pwd`
-CM_ALL_SCRIPT_PATH=${CM_ALL_SCRIPT_PATH}/`dirname $CM_ALL_SCRIPT`
-
 ROOT_DIR=$(get_test_root_dir)
 mkdir -p $ROOT_DIR
 cd $ROOT_DIR
diff --git a/kokkos/scripts/testing_scripts/test_all_sandia b/kokkos/scripts/testing_scripts/test_all_sandia
index 7113a4913..c41a83641 100755
--- a/kokkos/scripts/testing_scripts/test_all_sandia
+++ b/kokkos/scripts/testing_scripts/test_all_sandia
@@ -8,15 +8,77 @@ set -o pipefail
 
 # Determine current machine.
 
+print_help() {
+  echo "test_all_sandia <ARGS> <OPTIONS>:"
+  echo "--kokkos-path=/Path/To/Kokkos: Path to the Kokkos root directory"
+  echo "    Defaults to root repo containing this script"
+  echo "--debug: Run tests in debug. Defaults to False"
+  echo "--test-script: Test this script, not Kokkos"
+  echo "--skip-hwloc: Do not do hwloc tests"
+  echo "--num=N: Number of jobs to run in parallel"
+  echo "--spot-check: Minimal test set to issue pull request"
+  echo "--dry-run: Just print what would be executed"
+  echo "--build-only: Just do builds, don't run anything"
+  echo "--opt-flag=FLAG: Optimization flag (default: -O3)"
+  echo "--cxxflags-extra=FLAGS: Extra flags to be added to CXX_FLAGS"
+  echo "--cxxstandard=OPT: c++11 (default), c++14, c++17, c++1y, c++1z, c++2a"
+  echo "--ldflags-extra=FLAGS: Extra flags to be added to LD_FLAGS"
+  echo "--arch=ARCHITECTURE: overwrite architecture flags"
+  echo "--with-cuda-options=OPT: set KOKKOS_CUDA_OPTIONS"
+  echo "--with-options=OPT: set KOKKOS_OPTIONS"
+  echo "--build-list=BUILD,BUILD,BUILD..."
+  echo "    Provide a comma-separated list of builds instead of running all builds"
+  echo "    Valid items:"
+  echo "      OpenMP, Pthread, Serial, OpenMP_Serial, Pthread_Serial"
+  echo "      Cuda_OpenMP, Cuda_Pthread, Cuda_Serial"
+  echo ""
+
+  echo "ARGS: list of expressions matching compilers to test"
+  echo "  supported compilers sems"
+  for COMPILER_DATA in "${COMPILERS[@]}"; do
+    ARR=($COMPILER_DATA)
+    COMPILER=${ARR[0]}
+    echo "    $COMPILER"
+  done
+  echo ""
+
+  echo "Examples:"
+  echo "  Run all tests"
+  echo "  % test_all_sandia"
+  echo ""
+  echo "  Run all gcc tests"
+  echo "  % test_all_sandia gcc"
+  echo ""
+  echo "  Run all gcc/4.8.4 and all intel tests"
+  echo "  % test_all_sandia gcc/4.8.4 intel"
+  echo ""
+  echo "  Run all tests in debug"
+  echo "  % test_all_sandia --debug"
+  echo ""
+  echo "  Run gcc/4.8.4 and only do OpenMP and OpenMP_Serial builds"
+  echo "  % test_all_sandia gcc/4.8.4 --build-list=OpenMP,OpenMP_Serial"
+  echo ""
+  echo "If you want to kill the tests, do:"
+  echo "  hit ctrl-z"
+  echo "  % kill -9 %1"
+  echo
+}
+
 MACHINE=""
 HOSTNAME=$(hostname)
 PROCESSOR=`uname -p`
+CUDA_ENABLE_CMD=
 
 if [[ "$HOSTNAME" =~ (white|ride).* ]]; then
   MACHINE=white
   module load git
 fi
 
+if [[ "$HOSTNAME" =~ waterman.* ]]; then
+  MACHINE=waterman
+  module load git
+fi
+
 if [[ "$HOSTNAME" =~ .*bowman.* ]]; then
   MACHINE=bowman
   module load git
@@ -70,12 +132,13 @@ CLANG_BUILD_LIST="Pthread,Serial,Pthread_Serial"
 CUDA_BUILD_LIST="Cuda_OpenMP,Cuda_Pthread,Cuda_Serial"
 CUDA_IBM_BUILD_LIST="Cuda_OpenMP,Cuda_Serial"
 
-GCC_WARNING_FLAGS="-Wall,-Wshadow,-pedantic,-Werror,-Wsign-compare,-Wtype-limits,-Wignored-qualifiers,-Wempty-body,-Wclobbered,-Wuninitialized"
-IBM_WARNING_FLAGS="-Wall,-Wshadow,-pedantic,-Wsign-compare,-Wtype-limits,-Wuninitialized"
-CLANG_WARNING_FLAGS="-Wall,-Wshadow,-pedantic,-Werror,-Wsign-compare,-Wtype-limits,-Wuninitialized"
-INTEL_WARNING_FLAGS="-Wall,-Wshadow,-pedantic,-Werror,-Wsign-compare,-Wtype-limits,-Wuninitialized"
-CUDA_WARNING_FLAGS="-Wall,-Wshadow,-pedantic,-Werror,-Wsign-compare,-Wtype-limits,-Wuninitialized"
-#CUDA_WARNING_FLAGS="-Wall,-Wshadow,-pedantic,-Wsign-compare,-Wtype-limits,-Wuninitialized"
+GCC_WARNING_FLAGS="-Wall,-Wunused-parameter,-Wshadow,-pedantic,-Werror,-Wsign-compare,-Wtype-limits,-Wignored-qualifiers,-Wempty-body,-Wclobbered,-Wuninitialized"
+IBM_WARNING_FLAGS="-Wall,-Wunused-parameter,-Wshadow,-pedantic,-Wsign-compare,-Wtype-limits,-Wuninitialized"
+CLANG_WARNING_FLAGS="-Wall,-Wunused-parameter,-Wshadow,-pedantic,-Werror,-Wsign-compare,-Wtype-limits,-Wuninitialized"
+INTEL_WARNING_FLAGS="-Wall,-Wunused-parameter,-Wshadow,-pedantic,-Werror,-Wsign-compare,-Wtype-limits,-Wuninitialized"
+INTEL15_WARNING_FLAGS="-Wall,-Wno-unused-variable,-Wshadow,-pedantic,-Werror,-Wsign-compare,-Wtype-limits,-Wuninitialized"
+CUDA_WARNING_FLAGS="-Wall,-Wunused-parameter,-Wshadow,-pedantic,-Werror,-Wsign-compare,-Wtype-limits,-Wuninitialized"
+#CUDA_WARNING_FLAGS="-Wall,-Wunused-parameter,-Wshadow,-pedantic,-Wsign-compare,-Wtype-limits,-Wuninitialized"
 PGI_WARNING_FLAGS=""
 
 # Default. Machine specific can override.
@@ -95,7 +158,7 @@ CXX_FLAGS_EXTRA=""
 LD_FLAGS_EXTRA=""
 KOKKOS_OPTIONS=""
 
-CXX_STANDARD="c++11"
+CXX_STANDARD="11"
 
 #
 # Handle arguments.
@@ -140,16 +203,23 @@ do
       OPT_FLAG="${key#*=}"
       ;;
     --with-cuda-options*)
-      KOKKOS_CUDA_OPTIONS="--with-cuda-options=${key#*=}"
+      KOKKOS_CUDA_OPTIONS="${key#*=}"
+      export KOKKOS_CUDA_OPTIONS
       ;;
     --with-options*)
-      KOKKOS_OPTIONS="--with-options=${key#*=}"
+      KOKKOS_OPTIONS="${key#*=}"
+      export KOKKOS_OPTIONS
       ;;
     --cxxflags-extra*)
       CXX_FLAGS_EXTRA="${key#*=}"
       ;;
     --cxxstandard*)
-      CXX_STANDARD="${key#*=}"
+      FULL_CXX_STANDARD="${key#*=}"
+      if [[ ${FULL_CXX_STANDARD} == *++* ]]; then
+         CXX_STANDARD="${FULL_CXX_STANDARD#*++}"
+      else
+         CXX_STANDARD="${FULL_CXX_STANDARD}"
+      fi
       ;;
     --ldflags-extra*)
       LD_FLAGS_EXTRA="${key#*=}"
@@ -176,17 +246,7 @@ else
   KOKKOS_PATH=$( cd $KOKKOS_PATH && pwd )
 fi
 
-UNCOMMITTED=`cd ${KOKKOS_PATH}; git status --porcelain 2>/dev/null`
-if ! [ -z "$UNCOMMITTED" ]; then
-  echo "WARNING!! THE FOLLOWING CHANGES ARE UNCOMMITTED!! :"
-  echo "$UNCOMMITTED"
-  echo ""
-fi
 
-GITSTATUS=`cd ${KOKKOS_PATH}; git log -n 1 --format=oneline`
-echo "Repository Status: " ${GITSTATUS}
-echo ""
-echo ""
 
 #
 # Machine specific config.
@@ -199,8 +259,9 @@ if [ "$MACHINE" = "sems" ]; then
   # On rhel7 sems machines gcc/7.3.0, clang/4.0.1, and intel/16.0.3 are missing
   # Remove kokkkos-env module use
 
-  BASE_MODULE_LIST="sems-env,sems-<COMPILER_NAME>/<COMPILER_VERSION>"
-  CUDA9_MODULE_LIST="sems-env,sems-<COMPILER_NAME>/<COMPILER_VERSION>,sems-gcc/7.2.0"
+  module load sems-cmake/3.12.2
+  BASE_MODULE_LIST="sems-env,sems-cmake/3.12.2,sems-<COMPILER_NAME>/<COMPILER_VERSION>"
+  CUDA9_MODULE_LIST="sems-env,sems-cmake/3.12.2,sems-<COMPILER_NAME>/<COMPILER_VERSION>,sems-gcc/7.2.0"
   SKIP_HWLOC=True
   # No sems hwloc module
 
@@ -223,7 +284,7 @@ if [ "$MACHINE" = "sems" ]; then
                "gcc/5.3.0 $BASE_MODULE_LIST $GCC_BUILD_LIST g++ $GCC_WARNING_FLAGS"
                "gcc/6.1.0 $BASE_MODULE_LIST $GCC_BUILD_LIST g++ $GCC_WARNING_FLAGS"
                "gcc/7.2.0 $BASE_MODULE_LIST $GCC_BUILD_LIST g++ $GCC_WARNING_FLAGS"
-               "intel/15.0.2 $BASE_MODULE_LIST $INTEL_BUILD_LIST icpc $INTEL_WARNING_FLAGS"
+               "intel/15.0.2 $BASE_MODULE_LIST $INTEL_BUILD_LIST icpc $INTEL15_WARNING_FLAGS"
                "intel/16.0.1 $BASE_MODULE_LIST $INTEL_BUILD_LIST icpc $INTEL_WARNING_FLAGS"
                "intel/17.0.1 $BASE_MODULE_LIST $INTEL_BUILD_LIST icpc $INTEL_WARNING_FLAGS"
                "clang/3.6.1 $BASE_MODULE_LIST $CLANG_BUILD_LIST clang++ $CLANG_WARNING_FLAGS"
@@ -236,10 +297,13 @@ if [ "$MACHINE" = "sems" ]; then
 elif [ "$MACHINE" = "kokkos-dev" ]; then
   source /projects/sems/modulefiles/utils/sems-modules-init.sh
 
-  BASE_MODULE_LIST="sems-env,kokkos-env,kokkos-hwloc/1.10.1/base,sems-<COMPILER_NAME>/<COMPILER_VERSION>"
+  module load sems-cmake/3.12.2
+  BASE_MODULE_LIST="sems-env,sems-cmake/3.12.2,kokkos-env,kokkos-hwloc/1.10.1/base,sems-<COMPILER_NAME>/<COMPILER_VERSION>"
+  CUDA9_MODULE_LIST="sems-env,sems-cmake/3.12.2,kokkos-env,sems-<COMPILER_NAME>/<COMPILER_VERSION>,sems-gcc/6.1.0,kokkos-hwloc/1.10.1/base"
+  CLANG7_MODULE_LIST="sems-env,sems-cmake/3.12.2,kokkos-env,kokkos-hwloc/1.10.1/base,sems-<COMPILER_NAME>/<COMPILER_VERSION>,sems-cuda/9.2"
 
   if [ -z "$ARCH_FLAG" ]; then
-    ARCH_FLAG=""
+    ARCH_FLAG="--arch=Kepler35"
   fi
 
   if [ "$SPOT_CHECK" = "True" ]; then
@@ -248,6 +312,8 @@ elif [ "$MACHINE" = "kokkos-dev" ]; then
                "gcc/7.3.0 $BASE_MODULE_LIST "Serial" g++ $GCC_WARNING_FLAGS"
                "intel/17.0.1 $BASE_MODULE_LIST "OpenMP" icpc $INTEL_WARNING_FLAGS"
                "clang/4.0.1 $BASE_MODULE_LIST "Pthread_Serial" clang++ $CLANG_WARNING_FLAGS"
+               "clang/7.0.1 $CLANG7_MODULE_LIST "Cuda_OpenMP" clang++ $CLANG_WARNING_FLAGS"
+               "cuda/9.2 $CUDA9_MODULE_LIST "Cuda_OpenMP" $KOKKOS_PATH/bin/nvcc_wrapper $CUDA_WARNING_FLAGS"
     )
   else
     # Format: (compiler module-list build-list exe-name warning-flag)
@@ -256,7 +322,7 @@ elif [ "$MACHINE" = "kokkos-dev" ]; then
                "gcc/5.3.0 $BASE_MODULE_LIST $GCC_BUILD_LIST g++ $GCC_WARNING_FLAGS"
                "gcc/6.1.0 $BASE_MODULE_LIST $GCC_BUILD_LIST g++ $GCC_WARNING_FLAGS"
                "gcc/7.3.0 $BASE_MODULE_LIST $GCC_BUILD_LIST g++ $GCC_WARNING_FLAGS"
-               "intel/15.0.2 $BASE_MODULE_LIST $INTEL_BUILD_LIST icpc $INTEL_WARNING_FLAGS"
+               "intel/15.0.2 $BASE_MODULE_LIST $INTEL_BUILD_LIST icpc $INTEL15_WARNING_FLAGS"
                "intel/16.0.3 $BASE_MODULE_LIST $INTEL_BUILD_LIST icpc $INTEL_WARNING_FLAGS"
                "intel/17.0.1 $BASE_MODULE_LIST $INTEL_BUILD_LIST icpc $INTEL_WARNING_FLAGS"
                "clang/3.6.1 $BASE_MODULE_LIST $CLANG_BUILD_LIST clang++ $CLANG_WARNING_FLAGS"
@@ -264,6 +330,8 @@ elif [ "$MACHINE" = "kokkos-dev" ]; then
                "clang/3.8.1 $BASE_MODULE_LIST $CLANG_BUILD_LIST clang++ $CLANG_WARNING_FLAGS"
                "clang/3.9.0 $BASE_MODULE_LIST $CLANG_BUILD_LIST clang++ $CLANG_WARNING_FLAGS"
                "clang/4.0.1 $BASE_MODULE_LIST $CLANG_BUILD_LIST clang++ $CLANG_WARNING_FLAGS"
+               "clang/7.0.1 $CLANG7_MODULE_LIST $CLANG_BUILD_LIST clang++ $CLANG_WARNING_FLAGS"
+               "cuda/9.2 $CUDA9_MODULE_LIST $CUDA_BUILD_LIST $KOKKOS_PATH/bin/nvcc_wrapper $CUDA_WARNING_FLAGS"
     )
   fi
 elif [ "$MACHINE" = "white" ]; then
@@ -271,10 +339,10 @@ elif [ "$MACHINE" = "white" ]; then
   SKIP_HWLOC=True
   export SLURM_TASKS_PER_NODE=32
 
-  BASE_MODULE_LIST="<COMPILER_NAME>/<COMPILER_VERSION>"
-  IBM_MODULE_LIST="<COMPILER_NAME>/xl/<COMPILER_VERSION>,gcc/7.2.0"
-  CUDA_MODULE_LIST="<COMPILER_NAME>/<COMPILER_VERSION>,gcc/7.2.0,ibm/xl/16.1.0"
-  CUDA10_MODULE_LIST="<COMPILER_NAME>/<COMPILER_VERSION>,gcc/7.4.0,ibm/xl/16.1.0"
+  BASE_MODULE_LIST="cmake/3.12.3,<COMPILER_NAME>/<COMPILER_VERSION>"
+  IBM_MODULE_LIST="cmake/3.12.3,<COMPILER_NAME>/xl/<COMPILER_VERSION>,gcc/7.2.0"
+  CUDA_MODULE_LIST="cmake/3.12.3,<COMPILER_NAME>/<COMPILER_VERSION>,gcc/7.2.0,ibm/xl/16.1.1"
+  CUDA10_MODULE_LIST="cmake/3.12.3,<COMPILER_NAME>/<COMPILER_VERSION>,gcc/7.4.0,ibm/xl/16.1.1"
 
   # Don't do pthread on white.
   GCC_BUILD_LIST="OpenMP,Serial,OpenMP_Serial"
@@ -283,17 +351,19 @@ elif [ "$MACHINE" = "white" ]; then
     # Format: (compiler module-list build-list exe-name warning-flag)
     COMPILERS=("gcc/6.4.0 $BASE_MODULE_LIST "OpenMP_Serial" g++ $GCC_WARNING_FLAGS"
                "gcc/7.2.0 $BASE_MODULE_LIST $IBM_BUILD_LIST g++ $GCC_WARNING_FLAGS"
-               "ibm/16.1.0 $IBM_MODULE_LIST $IBM_BUILD_LIST xlC $IBM_WARNING_FLAGS"
+               "ibm/16.1.1 $IBM_MODULE_LIST $IBM_BUILD_LIST xlC $IBM_WARNING_FLAGS"
                "cuda/9.2.88 $CUDA_MODULE_LIST $CUDA_IBM_BUILD_LIST ${KOKKOS_PATH}/bin/nvcc_wrapper $CUDA_WARNING_FLAGS"
+               "cuda/10.1.105 $CUDA10_MODULE_LIST $CUDA_IBM_BUILD_LIST ${KOKKOS_PATH}/bin/nvcc_wrapper $CUDA_WARNING_FLAGS"
     )
   else
     # Format: (compiler module-list build-list exe-name warning-flag)
     COMPILERS=("gcc/6.4.0 $BASE_MODULE_LIST $IBM_BUILD_LIST g++ $GCC_WARNING_FLAGS"
                "gcc/7.2.0 $BASE_MODULE_LIST $IBM_BUILD_LIST g++ $GCC_WARNING_FLAGS"
-               "ibm/16.1.0 $IBM_MODULE_LIST $IBM_BUILD_LIST xlC $IBM_WARNING_FLAGS"
+               "gcc/7.4.0 $BASE_MODULE_LIST $IBM_BUILD_LIST g++ $GCC_WARNING_FLAGS"
                "ibm/16.1.1 $IBM_MODULE_LIST $IBM_BUILD_LIST xlC $IBM_WARNING_FLAGS"
                "cuda/9.2.88 $CUDA_MODULE_LIST $CUDA_IBM_BUILD_LIST ${KOKKOS_PATH}/bin/nvcc_wrapper $CUDA_WARNING_FLAGS"
                "cuda/10.0.130 $CUDA10_MODULE_LIST $CUDA_IBM_BUILD_LIST ${KOKKOS_PATH}/bin/nvcc_wrapper $CUDA_WARNING_FLAGS"
+               "cuda/10.1.105 $CUDA10_MODULE_LIST $CUDA_IBM_BUILD_LIST ${KOKKOS_PATH}/bin/nvcc_wrapper $CUDA_WARNING_FLAGS"
     )
   fi
 
@@ -301,12 +371,49 @@ elif [ "$MACHINE" = "white" ]; then
     ARCH_FLAG="--arch=Power8,Kepler37"
   fi
 
+elif [ "$MACHINE" = "waterman" ]; then
+  source /etc/profile.d/modules.sh
+  SKIP_HWLOC=True
+
+  BASE_MODULE_LIST="cmake/3.12.3,<COMPILER_NAME>/<COMPILER_VERSION>"
+  IBM_MODULE_LIST="cmake/3.12.3,<COMPILER_NAME>/xl/<COMPILER_VERSION>,gcc/7.2.0"
+  CUDA_MODULE_LIST="cmake/3.12.3,<COMPILER_NAME>/<COMPILER_VERSION>,gcc/7.2.0,ibm/xl/16.1.1"
+  CUDA10_MODULE_LIST="cmake/3.12.3,<COMPILER_NAME>/<COMPILER_VERSION>,gcc/7.4.0,ibm/xl/16.1.1"
+
+  # Don't do pthread on white.
+  GCC_BUILD_LIST="OpenMP,Serial,OpenMP_Serial"
+
+  if [ "$SPOT_CHECK" = "True" ]; then
+    # Format: (compiler module-list build-list exe-name warning-flag)
+    COMPILERS=("gcc/6.4.0 $BASE_MODULE_LIST "OpenMP_Serial" g++ $GCC_WARNING_FLAGS"
+               "gcc/7.2.0 $BASE_MODULE_LIST $IBM_BUILD_LIST g++ $GCC_WARNING_FLAGS"
+               "ibm/16.1.1 $IBM_MODULE_LIST "Serial" xlC $IBM_WARNING_FLAGS"
+               "cuda/9.2.88 $CUDA_MODULE_LIST $CUDA_IBM_BUILD_LIST ${KOKKOS_PATH}/bin/nvcc_wrapper $CUDA_WARNING_FLAGS"
+               "cuda/10.1.243 $CUDA10_MODULE_LIST $CUDA_IBM_BUILD_LIST ${KOKKOS_PATH}/bin/nvcc_wrapper $CUDA_WARNING_FLAGS"
+    )
+  else
+    # Format: (compiler module-list build-list exe-name warning-flag)
+    COMPILERS=("gcc/6.4.0 $BASE_MODULE_LIST $IBM_BUILD_LIST g++ $GCC_WARNING_FLAGS"
+               "gcc/7.2.0 $BASE_MODULE_LIST $IBM_BUILD_LIST g++ $GCC_WARNING_FLAGS"
+               "gcc/7.4.0 $BASE_MODULE_LIST $IBM_BUILD_LIST g++ $GCC_WARNING_FLAGS"
+               "ibm/16.1.1 $IBM_MODULE_LIST $IBM_BUILD_LIST xlC $IBM_WARNING_FLAGS"
+               "cuda/9.2.88 $CUDA_MODULE_LIST $CUDA_IBM_BUILD_LIST ${KOKKOS_PATH}/bin/nvcc_wrapper $CUDA_WARNING_FLAGS"
+               "cuda/10.0.130 $CUDA10_MODULE_LIST $CUDA_IBM_BUILD_LIST ${KOKKOS_PATH}/bin/nvcc_wrapper $CUDA_WARNING_FLAGS"
+               "cuda/10.1.105 $CUDA10_MODULE_LIST $CUDA_IBM_BUILD_LIST ${KOKKOS_PATH}/bin/nvcc_wrapper $CUDA_WARNING_FLAGS"
+               "cuda/10.1.243 $CUDA10_MODULE_LIST $CUDA_IBM_BUILD_LIST ${KOKKOS_PATH}/bin/nvcc_wrapper $CUDA_WARNING_FLAGS"
+    )
+  fi
+
+  if [ -z "$ARCH_FLAG" ]; then
+    ARCH_FLAG="--arch=Power9,Volta70"
+  fi
+
 elif [ "$MACHINE" = "bowman" ]; then
   source /etc/profile.d/modules.sh
   SKIP_HWLOC=True
   export SLURM_TASKS_PER_NODE=32
 
-  BASE_MODULE_LIST="<COMPILER_NAME>/compilers/<COMPILER_VERSION>"
+  BASE_MODULE_LIST="cmake/3.12.3,<COMPILER_NAME>/compilers/<COMPILER_VERSION>"
 
   OLD_INTEL_BUILD_LIST="Pthread,Serial,Pthread_Serial"
 
@@ -324,12 +431,12 @@ elif [ "$MACHINE" = "mayer" ]; then
   SKIP_HWLOC=True
   export SLURM_TASKS_PER_NODE=96
 
-  BASE_MODULE_LIST="<COMPILER_NAME>/<COMPILER_VERSION>"
-#  ARM_MODULE_LIST="<COMPILER_NAME>/compilers/<COMPILER_VERSION>"
+  BASE_MODULE_LIST="cmake/3.14.5,<COMPILER_NAME>/<COMPILER_VERSION>"
+#  ARM_MODULE_LIST="cmake/3.12.2,<COMPILER_NAME>/<COMPILER_VERSION>"
 
   # Format: (compiler module-list build-list exe-name warning-flag)
   COMPILERS=("gnu7/7.2.0 $BASE_MODULE_LIST $ARM_GCC_BUILD_LIST g++ $GCC_WARNING_FLAGS"
-             "arm/19.2 $BASE_MODULE_LIST $ARM_GCC_BUILD_LIST armclang++ $CLANG_WARNING_FLAGS")
+             "arm/20.0 $BASE_MODULE_LIST $ARM_GCC_BUILD_LIST armclang++ $CLANG_WARNING_FLAGS")
 
   if [ -z "$ARCH_FLAG" ]; then
     ARCH_FLAG="--arch=ARMv8-TX2"
@@ -340,6 +447,8 @@ elif [ "$MACHINE" = "blake" ]; then
   SKIP_HWLOC=True
   export SLURM_TASKS_PER_NODE=32
 
+  module load cmake/3.12.3
+
   BASE_MODULE_LIST="<COMPILER_NAME>/<COMPILER_VERSION>"
   BASE_MODULE_LIST_INTEL="<COMPILER_NAME>/compilers/<COMPILER_VERSION>"
 
@@ -372,22 +481,22 @@ elif [ "$MACHINE" = "apollo" ]; then
 
   module load sems-git
   module load sems-tex
-  module load sems-cmake/3.5.2
+  module load sems-cmake/3.12.2
   module load sems-gdb
   module load binutils
 
   SKIP_HWLOC=True
 
-  GCC_MODULE_LIST="sems-env,kokkos-env,kokkos-hwloc/1.10.1/base,sems-<COMPILER_NAME>/<COMPILER_VERSION>"
-  NONGCC_MODULE_LIST="sems-env,kokkos-env,sems-gcc/5.3.0,sems-<COMPILER_NAME>/<COMPILER_VERSION>,kokkos-hwloc/1.10.1/base"
-  CUDA_MODULE_LIST="sems-env,kokkos-env,kokkos-<COMPILER_NAME>/<COMPILER_VERSION>,sems-gcc/4.8.4,kokkos-hwloc/1.10.1/base"
-  CUDA8_MODULE_LIST="sems-env,kokkos-env,kokkos-<COMPILER_NAME>/<COMPILER_VERSION>,sems-gcc/5.3.0,kokkos-hwloc/1.10.1/base"
-  CUDA10_MODULE_LIST="sems-env,kokkos-env,<COMPILER_NAME>/<COMPILER_VERSION>,sems-gcc/5.3.0,kokkos-hwloc/1.10.1/base"
+  BASE_MODULE_LIST="sems-env,sems-cmake/3.12.2,kokkos-env,kokkos-hwloc/1.10.1/base,sems-<COMPILER_NAME>/<COMPILER_VERSION>"
+  CUDA_MODULE_LIST="sems-env,sems-cmake/3.12.2,kokkos-env,kokkos-<COMPILER_NAME>/<COMPILER_VERSION>,sems-gcc/4.8.4,kokkos-hwloc/1.10.1/base"
+  CUDA9_MODULE_LIST="sems-env,sems-cmake/3.12.2,kokkos-env,kokkos-<COMPILER_NAME>/<COMPILER_VERSION>,sems-gcc/5.3.0,kokkos-hwloc/1.10.1/base"
+  CUDA10_MODULE_LIST="sems-env,sems-cmake/3.12.2,kokkos-env,<COMPILER_NAME>/<COMPILER_VERSION>,sems-gcc/5.3.0,kokkos-hwloc/1.10.1/base"
 
-  CLANG_MODULE_LIST="sems-env,kokkos-env,<COMPILER_NAME>/<COMPILER_VERSION>,cuda/9.0.69"
-  CLANG7_MODULE_LIST="sems-env,kokkos-env,<COMPILER_NAME>/<COMPILER_VERSION>,cuda/9.1"
-  NVCC_MODULE_LIST="sems-env,kokkos-env,<COMPILER_NAME>/<COMPILER_VERSION>,sems-gcc/5.3.0"
-  HPX_MODULE_LIST="sems-env,kokkos-env,hpx/1.2.1,sems-gcc/6.1.0,binutils"
+  CLANG_MODULE_LIST="sems-env,sems-cmake/3.12.2,kokkos-env,<COMPILER_NAME>/<COMPILER_VERSION>,cuda/9.0.69"
+  CLANG7_MODULE_LIST="sems-env,sems-cmake/3.12.2,kokkos-env,sems-gcc/6.1.0,<COMPILER_NAME>/<COMPILER_VERSION>,cuda/9.1"
+  NVCC_MODULE_LIST="sems-env,sems-cmake/3.12.2,kokkos-env,<COMPILER_NAME>/<COMPILER_VERSION>,sems-gcc/5.3.0"
+  HPX_MODULE_LIST="sems-env,sems-cmake/3.12.2,kokkos-env,hpx/1.2.1,sems-gcc/6.1.0,binutils"
+  HPX3_MODULE_LIST="sems-env,sems-cmake/3.12.2,kokkos-env,compilers/hpx/1.3.0,sems-gcc/6.1.0,binutils"
 
   BUILD_LIST_CUDA_NVCC="Cuda_Serial,Cuda_OpenMP"
   BUILD_LIST_CUDA_CLANG="Cuda_Serial,Cuda_Pthread"
@@ -395,30 +504,32 @@ elif [ "$MACHINE" = "apollo" ]; then
 
   if [ "$SPOT_CHECK" = "True" ]; then
     # Format: (compiler module-list build-list exe-name warning-flag)
-    COMPILERS=("gcc/4.8.4 $GCC_MODULE_LIST "OpenMP,Pthread" g++ $GCC_WARNING_FLAGS"
-               "gcc/5.3.0 $GCC_MODULE_LIST "Serial" g++ $GCC_WARNING_FLAGS"
-               "intel/16.0.1 $NONGCC_MODULE_LIST "OpenMP" icpc $INTEL_WARNING_FLAGS"
-               "clang/3.9.0 $NONGCC_MODULE_LIST "Pthread_Serial" clang++ $CLANG_WARNING_FLAGS"
+    COMPILERS=("gcc/4.8.4 $BASE_MODULE_LIST "OpenMP,Pthread" g++ $GCC_WARNING_FLAGS"
+               "gcc/5.3.0 $BASE_MODULE_LIST "Serial" g++ $GCC_WARNING_FLAGS"
+               "intel/16.0.1 $BASE_MODULE_LIST "OpenMP" icpc $INTEL_WARNING_FLAGS"
+               "clang/3.9.0 $BASE_MODULE_LIST "Pthread_Serial" clang++ $CLANG_WARNING_FLAGS"
                "clang/6.0 $CLANG_MODULE_LIST "Cuda_Pthread,OpenMP" clang++ $CUDA_WARNING_FLAGS"
                "cuda/9.1 $CUDA_MODULE_LIST "Cuda_OpenMP" $KOKKOS_PATH/bin/nvcc_wrapper $CUDA_WARNING_FLAGS"
-               "hpx/1.2.1 $HPX_MODULE_LIST "HPX" g++ $PGI_WARNING_FLAGS"
+               "hpx/1.3.0 $HPX3_MODULE_LIST "HPX" g++ $PGI_WARNING_FLAGS"
     )
   else
     # Format: (compiler module-list build-list exe-name warning-flag)
-    COMPILERS=("cuda/9.1 $CUDA8_MODULE_LIST $BUILD_LIST_CUDA_NVCC $KOKKOS_PATH/bin/nvcc_wrapper $CUDA_WARNING_FLAGS"
+    COMPILERS=("cuda/9.1 $CUDA9_MODULE_LIST $BUILD_LIST_CUDA_NVCC $KOKKOS_PATH/bin/nvcc_wrapper $CUDA_WARNING_FLAGS"
                "cuda/10.0 $CUDA10_MODULE_LIST $BUILD_LIST_CUDA_NVCC $KOKKOS_PATH/bin/nvcc_wrapper $CUDA_WARNING_FLAGS"
                "clang/6.0 $CLANG_MODULE_LIST $BUILD_LIST_CUDA_CLANG clang++ $CUDA_WARNING_FLAGS"
                "clang/7.0 $CLANG7_MODULE_LIST $BUILD_LIST_CUDA_CLANG clang++ $CUDA_WARNING_FLAGS"
                "clang/3.9.0 $CLANG_MODULE_LIST $BUILD_LIST_CLANG clang++ $CLANG_WARNING_FLAGS"
-               "gcc/4.8.4 $GCC_MODULE_LIST $GCC_BUILD_LIST g++ $GCC_WARNING_FLAGS"
-               "gcc/4.9.3 $GCC_MODULE_LIST $GCC_BUILD_LIST g++ $GCC_WARNING_FLAGS"
-               "gcc/5.3.0 $GCC_MODULE_LIST $GCC_BUILD_LIST g++ $GCC_WARNING_FLAGS"
-               "gcc/6.1.0 $GCC_MODULE_LIST $GCC_BUILD_LIST g++ $GCC_WARNING_FLAGS"
-               "intel/15.0.2 $NONGCC_MODULE_LIST $INTEL_BUILD_LIST icpc $INTEL_WARNING_FLAGS"
-               "intel/16.0.1 $NONGCC_MODULE_LIST $INTEL_BUILD_LIST icpc $INTEL_WARNING_FLAGS"
-               "intel/17.0.1 $NONGCC_MODULE_LIST $INTEL_BUILD_LIST icpc $INTEL_WARNING_FLAGS"
-               "clang/3.5.2 $NONGCC_MODULE_LIST $CLANG_BUILD_LIST clang++ $CLANG_WARNING_FLAGS"
-               "clang/3.6.1 $NONGCC_MODULE_LIST $CLANG_BUILD_LIST clang++ $CLANG_WARNING_FLAGS"
+               "gcc/4.8.4 $BASE_MODULE_LIST $GCC_BUILD_LIST g++ $GCC_WARNING_FLAGS"
+               "gcc/4.9.3 $BASE_MODULE_LIST $GCC_BUILD_LIST g++ $GCC_WARNING_FLAGS"
+               "gcc/5.3.0 $BASE_MODULE_LIST $GCC_BUILD_LIST g++ $GCC_WARNING_FLAGS"
+               "gcc/6.1.0 $BASE_MODULE_LIST $GCC_BUILD_LIST g++ $GCC_WARNING_FLAGS"
+               "intel/15.0.2 $BASE_MODULE_LIST $INTEL_BUILD_LIST icpc $INTEL15_WARNING_FLAGS"
+               "intel/16.0.1 $BASE_MODULE_LIST $INTEL_BUILD_LIST icpc $INTEL_WARNING_FLAGS"
+               "intel/17.0.1 $BASE_MODULE_LIST $INTEL_BUILD_LIST icpc $INTEL_WARNING_FLAGS"
+               "clang/3.5.2 $BASE_MODULE_LIST $CLANG_BUILD_LIST clang++ $CLANG_WARNING_FLAGS"
+               "clang/3.6.1 $BASE_MODULE_LIST $CLANG_BUILD_LIST clang++ $CLANG_WARNING_FLAGS"
+               "hpx/1.2.1 $HPX_MODULE_LIST "HPX" g++ $PGI_WARNING_FLAGS"
+               "hpx/1.3.0 $HPX3_MODULE_LIST "HPX" g++ $PGI_WARNING_FLAGS"
     )
   fi
 
@@ -455,6 +566,7 @@ elif [ "$MACHINE" = "kokkos-dev-2" ]; then
   if [ "$SPOT_CHECK" = "True" ]; then
     # Format: (compiler module-list build-list exe-name warning-flag)
     COMPILERS=("gcc/7.3.0 $BASE_MODULE_LIST "OpenMP,Pthread" g++ $GCC_WARNING_FLAGS"
+               "gcc/8.3.0 $BASE_MODULE_LIST "OpenMP" g++ $GCC_WARNING_FLAGS"
                "gcc/9.1 $GCC91_MODULE_LIST "OpenMP,Serial" g++ $GCC_WARNING_FLAGS"
                "intel/18.0.5 $BASE_MODULE_LIST "OpenMP" icpc $INTEL_WARNING_FLAGS"
                "clang/8.0 $CLANG8_MODULE_LIST "Cuda_OpenMP,Pthread_Serial" clang++ $CLANG_WARNING_FLAGS"
@@ -471,15 +583,21 @@ elif [ "$MACHINE" = "kokkos-dev-2" ]; then
                "gcc/5.3.0 $BASE_MODULE_LIST $GCC_BUILD_LIST g++ $GCC_WARNING_FLAGS"
                "gcc/6.1.0 $BASE_MODULE_LIST $GCC_BUILD_LIST g++ $GCC_WARNING_FLAGS"
                "gcc/7.3.0 $BASE_MODULE_LIST $GCC_BUILD_LIST g++ $GCC_WARNING_FLAGS"
-               "gcc/9.1 $GCC91_MODULE_LIST "OpenMP,Serial" g++ $GCC_WARNING_FLAGS"
-               "intel/15.0.2 $BASE_MODULE_LIST $INTEL_BUILD_LIST icpc $INTEL_WARNING_FLAGS"
+               "gcc/8.3.0 $BASE_MODULE_LIST $GCC_BUILD_LIST g++ $GCC_WARNING_FLAGS"
+               "gcc/9.1 $GCC91_MODULE_LIST "$GCC_BUILD_LIST" g++ $GCC_WARNING_FLAGS"
+               "gcc/9.2.0 $BASE_MODULE_LIST "$GCC_BUILD_LIST" g++ $GCC_WARNING_FLAGS"
+               "intel/15.0.2 $BASE_MODULE_LIST $INTEL_BUILD_LIST icpc $INTEL15_WARNING_FLAGS"
                "intel/16.0.1 $BASE_MODULE_LIST $INTEL_BUILD_LIST icpc $INTEL_WARNING_FLAGS"
                "intel/17.0.1 $BASE_MODULE_LIST $INTEL_BUILD_LIST icpc $INTEL_WARNING_FLAGS"
                "intel/18.0.5 $BASE_MODULE_LIST $INTEL_BUILD_LIST icpc $INTEL_WARNING_FLAGS"
                "intel/19.0.5 $BASE_MODULE_LIST $INTEL_BUILD_LIST icpc $INTEL_WARNING_FLAGS"
-               "clang/3.5.2 $BASE_MODULE_LIST $CLANG_BUILD_LIST clang++ $CLANG_WARNING_FLAGS"
+               "clang/3.6.1 $BASE_MODULE_LIST $CLANG_BUILD_LIST clang++ $CLANG_WARNING_FLAGS"
+               "clang/3.7.1 $BASE_MODULE_LIST $CLANG_BUILD_LIST clang++ $CLANG_WARNING_FLAGS"
+               "clang/3.8.1 $BASE_MODULE_LIST $CLANG_BUILD_LIST clang++ $CLANG_WARNING_FLAGS"
+               "clang/3.9.0 $BASE_MODULE_LIST $CLANG_BUILD_LIST clang++ $CLANG_WARNING_FLAGS"
                "clang/5.0.1 $BASE_MODULE_LIST $CLANG_BUILD_LIST clang++ $CLANG_WARNING_FLAGS"
                "clang/7.0.1 $BASE_MODULE_LIST $CLANG_BUILD_LIST clang++ $CLANG_WARNING_FLAGS"
+               "clang/9.0.0 $BASE_MODULE_LIST $CLANG_BUILD_LIST clang++ $CLANG_WARNING_FLAGS"
                "pgi/19.4 $PGI_MODULE_LIST $GCC_BUILD_LIST pgc++ $PGI_WARNING_FLAGS"
     )
   fi
@@ -502,60 +620,22 @@ declare -i NUM_RESULTS_TO_KEEP=7
 RESULT_ROOT_PREFIX=TestAll
 
 if [ "$PRINT_HELP" = "True" ]; then
-  echo "test_all_sandia <ARGS> <OPTIONS>:"
-  echo "--kokkos-path=/Path/To/Kokkos: Path to the Kokkos root directory"
-  echo "    Defaults to root repo containing this script"
-  echo "--debug: Run tests in debug. Defaults to False"
-  echo "--test-script: Test this script, not Kokkos"
-  echo "--skip-hwloc: Do not do hwloc tests"
-  echo "--num=N: Number of jobs to run in parallel"
-  echo "--spot-check: Minimal test set to issue pull request"
-  echo "--dry-run: Just print what would be executed"
-  echo "--build-only: Just do builds, don't run anything"
-  echo "--opt-flag=FLAG: Optimization flag (default: -O3)"
-  echo "--cxxflags-extra=FLAGS: Extra flags to be added to CXX_FLAGS"
-  echo "--ldflags-extra=FLAGS: Extra flags to be added to LD_FLAGS"
-  echo "--arch=ARCHITECTURE: overwrite architecture flags"
-  echo "--with-cuda-options=OPT: set KOKKOS_CUDA_OPTIONS"
-  echo "--build-list=BUILD,BUILD,BUILD..."
-  echo "    Provide a comma-separated list of builds instead of running all builds"
-  echo "    Valid items:"
-  echo "      OpenMP, Pthread, Serial, OpenMP_Serial, Pthread_Serial"
-  echo "      Cuda_OpenMP, Cuda_Pthread, Cuda_Serial"
-  echo ""
-
-  echo "ARGS: list of expressions matching compilers to test"
-  echo "  supported compilers sems"
-  for COMPILER_DATA in "${COMPILERS[@]}"; do
-    ARR=($COMPILER_DATA)
-    COMPILER=${ARR[0]}
-    echo "    $COMPILER"
-  done
-  echo ""
+  print_help
+  exit 0
+fi
 
-  echo "Examples:"
-  echo "  Run all tests"
-  echo "  % test_all_sandia"
-  echo ""
-  echo "  Run all gcc tests"
-  echo "  % test_all_sandia gcc"
-  echo ""
-  echo "  Run all gcc/4.8.4 and all intel tests"
-  echo "  % test_all_sandia gcc/4.8.4 intel"
-  echo ""
-  echo "  Run all tests in debug"
-  echo "  % test_all_sandia --debug"
-  echo ""
-  echo "  Run gcc/4.8.4 and only do OpenMP and OpenMP_Serial builds"
-  echo "  % test_all_sandia gcc/4.8.4 --build-list=OpenMP,OpenMP_Serial"
+UNCOMMITTED=`cd ${KOKKOS_PATH}; git status --porcelain 2>/dev/null`
+if ! [ -z "$UNCOMMITTED" ]; then
+  echo "WARNING!! THE FOLLOWING CHANGES ARE UNCOMMITTED!! :"
+  echo "$UNCOMMITTED"
   echo ""
-  echo "If you want to kill the tests, do:"
-  echo "  hit ctrl-z"
-  echo "  % kill -9 %1"
-  echo
-  exit 0
 fi
 
+GITSTATUS=`cd ${KOKKOS_PATH}; git log -n 1 --format=oneline`
+echo "Repository Status: " ${GITSTATUS}
+echo ""
+echo ""
+
 # Set build type.
 if [ "$DEBUG" = "True" ]; then
   BUILD_TYPE=debug
@@ -582,10 +662,18 @@ for ARG in $ARGS; do
       else
         echo "Tried to add $COMPILER twice"
       fi
-    fi
+     fi
   done
 done
 
+if [ "$COMPILERS_TO_TEST" == "" ]; then
+   echo "-----------------------------------------------"
+   echo "   !!!! Invalid Compiler provided  '$ARGS' !!!!"
+   echo "-----------------------------------------------"
+   print_help
+   exit 0
+fi
+
 #
 # Functions.
 #
@@ -681,6 +769,10 @@ setup_env() {
     module list 2>&1 | grep "$mod" >& /dev/null || return 1
   done
 
+  if [ -e ${CM_ALL_SCRIPT_PATH}/update_lib.sh ]; then
+     echo calling ${CM_ALL_SCRIPT_PATH}/update_lib.sh $MACHINE
+     source ${CM_ALL_SCRIPT_PATH}/update_lib.sh $MACHINE
+  fi
   return 0
 }
 
@@ -692,6 +784,13 @@ single_build_and_test() {
   # Set up env.
   mkdir -p $ROOT_DIR/$compiler/"${build}-$build_type"
   cd $ROOT_DIR/$compiler/"${build}-$build_type"
+
+  local compiler_modules_list=$(get_compiler_modules $compiler)
+  echo "  #   Load modules:" &> reload_modules.sh
+  echo "        module load $compiler_modules_list" &>> reload_modules.sh
+  echo "" &>> reload_modules.sh
+  chmod +x reload_modules.sh
+
   local desc=$(echo "${compiler}-${build}-${build_type}" | sed 's:/:-:g')
   setup_env $compiler >& ${desc}.configure.log || { report_and_log_test_result 1 ${desc} configure && return 0; }
 
@@ -699,8 +798,14 @@ single_build_and_test() {
   local compiler_warning_flags=$(get_compiler_warning_flags $compiler)
   local compiler_exe=$(get_compiler_exe_name $compiler)
 
+  if [[ "$KOKKOS_OPTIONS" == "" ]]; then
+    local extra_args="--with-options=enable_large_mem_tests"
+  else 
+    local extra_args=
+  fi    
+
   if [[ "$build_type" = hwloc* ]]; then
-    local extra_args=--with-hwloc=$(dirname $(dirname $(which hwloc-info)))
+    local extra_args="$extra_args --with-hwloc=$(dirname $(dirname $(which hwloc-info)))"
   fi
 
   if [[ "$OPT_FLAG" = "" ]]; then
@@ -710,25 +815,15 @@ single_build_and_test() {
   if [[ "$build_type" = *debug* ]]; then
     local extra_args="$extra_args --debug"
     local cxxflags="-g $compiler_warning_flags"
-    local ldflags="-g"
   else
     local cxxflags="$OPT_FLAG $compiler_warning_flags"
-    local ldflags="${OPT_FLAG}"
   fi
 
   local cxxflags="${cxxflags} ${CXX_FLAGS_EXTRA}"
-  local ldflags="${ldflags} ${LD_FLAGS_EXTRA}"
+  local ldflags="${LD_FLAGS_EXTRA}"
 
   local cxx_standard="${CXX_STANDARD}"
 
-  if [[ "$KOKKOS_CUDA_OPTIONS" != "" ]]; then
-    local extra_args="$extra_args $KOKKOS_CUDA_OPTIONS"
-  fi
-  if [[ "$KOKKOS_OPTIONS" != "" ]]; then
-    local extra_args="$extra_args $KOKKOS_OPTIONS"
-  else
-    local extra_args="$extra_args --with-options=enable_large_mem_tests"
-  fi    
 
   echo "  Starting job $desc"
 
@@ -742,14 +837,25 @@ single_build_and_test() {
       run_cmd ls fake_problem >& ${desc}.configure.log || { report_and_log_test_result 1 $desc configure && return 0; }
     fi
   else
-    run_cmd ${KOKKOS_PATH}/scripts/testing_scripts/generate_makefile.bash --with-devices=$build $ARCH_FLAG --compiler=$(which $compiler_exe) --cxxflags=\"$cxxflags\" --cxxstandard=\"$cxx_standard\" --ldflags=\"$ldflags\" $extra_args &>> ${desc}.configure.log || { report_and_log_test_result 1 ${desc} configure && return 0; }
+    LOCAL_KOKKOS_DEVICES=${build//_/,}
+    if [[ "$LOCAL_KOKKOS_DEVICES" = *Cuda* ]]; then
+       CUDA_ENABLE_CMD="--with-cuda=$CUDA_ROOT"
+    fi
+    echo "kokkos options: ${KOKKOS_OPTIONS}"
+    echo "kokkos devices: ${LOCAL_KOKKOS_DEVICES}"
+    echo "kokkos cxx: ${cxxflags}"
+
+    echo "  #   Use generate_makefile line below to call cmake which generates makefile for this build:" &> call_generate_makefile.sh
+    echo "        ${KOKKOS_PATH}/generate_makefile.bash --with-devices=$LOCAL_KOKKOS_DEVICES $ARCH_FLAG --compiler=$(which $compiler_exe) --cxxflags=\"$cxxflags\" --cxxstandard=\"$cxx_standard\" --ldflags=\"$ldflags\" $CUDA_ENABLE_CMD --kokkos-path=${KOKKOS_PATH} --no-examples $extra_args" &>> call_generate_makefile.sh
+
+    run_cmd ${KOKKOS_PATH}/generate_makefile.bash --with-devices=$LOCAL_KOKKOS_DEVICES $ARCH_FLAG --compiler=$(which $compiler_exe) --cxxflags=\"$cxxflags\" --cxxstandard=\"$cxx_standard\" --ldflags=\"$ldflags\" $CUDA_ENABLE_CMD --kokkos-path=${KOKKOS_PATH} --no-examples $extra_args &>> ${desc}.configure.log || { report_and_log_test_result 1 ${desc} configure && return 0; }
     local -i build_start_time=$(date +%s)
-    run_cmd make -j 48 build-test >& ${desc}.build.log || { report_and_log_test_result 1 ${desc} build && return 0; }
+    run_cmd make -j 48 all >& ${desc}.build.log || { report_and_log_test_result 1 ${desc} build && return 0; }
     local -i build_end_time=$(date +%s)
     comment="build_time=$(($build_end_time-$build_start_time))"
 
     if [[ "$BUILD_ONLY" == False ]]; then
-      run_cmd make test >& ${desc}.test.log || { report_and_log_test_result 1 ${desc} test && return 0; }
+      run_cmd ctest -V  --output-on-failure >& ${desc}.test.log || { report_and_log_test_result 1 ${desc} test && return 0; }
       local -i run_end_time=$(date +%s)
       comment="$comment run_time=$(($run_end_time-$build_end_time))"
     fi
@@ -854,6 +960,32 @@ wait_summarize_and_exit() {
     do
       echo $failed_test "("$(cat $FAILED_DIR/$failed_test)" failed)"
       rv=$rv+1
+
+      local str=$failed_test
+      local comp=$(echo "$str" | cut -d- -f1)
+      local vers=$(echo "$str" | cut -d- -f2)
+      local lbuild=$(echo "$str" | cut -d- -f3-)
+      # Generate reproducer instructions
+      #local filename=reproducer_instructions-$comp-$vers-$lbuild
+      local faildir=$ROOT_DIR/$comp/$vers/$lbuild
+      # Output reproducer instructions
+      echo "#######################################################"
+      echo "  # Reproducer instructions:"
+      cat $faildir/reload_modules.sh
+      cat $faildir/call_generate_makefile.sh
+      echo ""
+      echo "  #  To reload modules, reconfigure, rebuild, and retest directly from this failing build do the following:"
+      echo "      # Move to the build directory"
+      echo "        cd $faildir"
+      echo "      # To reload modules"
+      echo "        source ./reload_modules.sh"
+      echo "      # To reconfigure"
+      echo "        ./call_generate_makefile.sh"
+      echo "      # To rebuild"
+      echo "        make -j"
+      echo "      # To retest"
+      echo "        ctest -V"
+      echo "#######################################################"
     done
   fi
 
@@ -864,6 +996,10 @@ wait_summarize_and_exit() {
 # Main.
 #
 
+CM_ALL_SCRIPT=$0
+CM_ALL_SCRIPT_PATH=`pwd`
+CM_ALL_SCRIPT_PATH=${CM_ALL_SCRIPT_PATH}/`dirname $CM_ALL_SCRIPT`
+
 ROOT_DIR=$(get_test_root_dir)
 mkdir -p $ROOT_DIR
 cd $ROOT_DIR
diff --git a/kokkos/scripts/update-copyright b/kokkos/scripts/update-copyright
index 2454bc678..04224f9ec 100755
--- a/kokkos/scripts/update-copyright
+++ b/kokkos/scripts/update-copyright
@@ -1,5 +1,6 @@
 files=`find . -name '*.cpp' -o -name '*.pc.in' -o -name '*.hpp' -o -name 'LICENSE' -o -name 'Copyright.txt' -o -name '*.cc'`
 for file in $files; do
 awk '{if($2=="Copyright" && $3=="(2014)" && $4=="Sandia" && $5=="Corporation") {print "//       Copyright (2020) National Technology & Engineering"; print "//               Solutions of Sandia, LLC (NTESS).";} else {print $0}}' $file | sed 's/DE-AC04-94AL85000 with Sandia Corporation/DE-NA0003525 with NTESS/g' | sed 's|Kokkos v. 2.0|Kokkos v. 3.0|g' &> tmp
+sed -i 's|SANDIA CORPORATION|NTESS|g' tmp
 cp tmp $file
 done
diff --git a/kokkos/scripts/update-version b/kokkos/scripts/update-version
new file mode 100755
index 000000000..3cc10b331
--- /dev/null
+++ b/kokkos/scripts/update-version
@@ -0,0 +1,35 @@
+
+NEW_MAJOR=$1
+NEW_MINOR=$2
+NEW_PATCH=$3
+
+GNU_MAJOR=`grep "KOKKOS_VERSION_MAJOR =" Makefile.kokkos | awk '{print $3}'`
+CMAKE_MAJOR=`grep "Kokkos_VERSION_MAJOR " CMakeLists.txt | awk '{print $2}' | sed 's|)||'`
+
+GNU_MINOR=`grep "KOKKOS_VERSION_MINOR =" Makefile.kokkos | awk '{print $3}'`
+CMAKE_MINOR=`grep "Kokkos_VERSION_MINOR " CMakeLists.txt | awk '{print $2}' | sed 's|)||'`
+
+GNU_PATCH=`grep "KOKKOS_VERSION_PATCH =" Makefile.kokkos | awk '{print $3}'`
+CMAKE_PATCH=`grep "Kokkos_VERSION_PATCH " CMakeLists.txt | awk '{print $2}' | sed 's|)||'`
+
+if [ $GNU_MAJOR -ne $CMAKE_MAJOR ]
+then
+  echo 'MAJOR Versions do not agree GNU' $GNU_MAJOR 'vs CMAKE' $CMAKE_MAJOR
+fi
+if [ $GNU_MINOR -ne $CMAKE_MINOR ]
+then
+  echo 'MINOR Versions do not agree GNU' $GNU_MINOR 'vs CMAKE' $CMAKE_MINOR
+fi
+if [ $GNU_PATCH -ne $CMAKE_PATCH ]
+then
+  echo 'PATCH Versions do not agree GNU' $GNU_PATCH 'vs CMAKE' $CMAKE_PATCH
+fi
+
+sed -i.bak 's|KOKKOS_VERSION_MAJOR = '$GNU_MAJOR'|KOKKOS_VERSION_MAJOR = '$NEW_MAJOR'|g' Makefile.kokkos
+sed -i.bak 's|KOKKOS_VERSION_MINOR = '$GNU_MINOR'|KOKKOS_VERSION_MINOR = '$NEW_MINOR'|g' Makefile.kokkos
+sed -i.bak 's|KOKKOS_VERSION_PATCH = '$GNU_PATCH'|KOKKOS_VERSION_PATCH = '$NEW_PATCH'|g' Makefile.kokkos
+rm Makefile.kokkos.bak
+sed -i.bak 's|Kokkos_VERSION_MAJOR '$GNU_MAJOR')|Kokkos_VERSION_MAJOR '$NEW_MAJOR')|g' CMakeLists.txt
+sed -i.bak 's|Kokkos_VERSION_MINOR '$GNU_MINOR')|Kokkos_VERSION_MINOR '$NEW_MINOR')|g' CMakeLists.txt
+sed -i.bak 's|Kokkos_VERSION_PATCH '$GNU_PATCH')|Kokkos_VERSION_PATCH '$NEW_PATCH')|g' CMakeLists.txt
+rm CMakeLists.txt.bak
diff --git a/kokkos/tpls/gtest/gtest/gtest-all.cc b/kokkos/tpls/gtest/gtest/gtest-all.cc
index 735f581c9..7c544a382 100644
--- a/kokkos/tpls/gtest/gtest/gtest-all.cc
+++ b/kokkos/tpls/gtest/gtest/gtest-all.cc
@@ -912,9 +912,9 @@ class GTEST_API_ UnitTestImpl {
   virtual ~UnitTestImpl();
 
   // There are two different ways to register your own TestPartResultReporter.
-  // You can register your own repoter to listen either only for test results
+  // You can register your own reporter to listen either only for test results
   // from the current thread or for results from all threads.
-  // By default, each per-thread test result repoter just passes a new
+  // By default, each per-thread test result reporter just passes a new
   // TestPartResult to the global test result reporter, which registers the
   // test part result for the currently running test.
 
diff --git a/kokkos/tpls/gtest/gtest/gtest.h b/kokkos/tpls/gtest/gtest/gtest.h
index 8f98f330e..f39d0b87c 100644
--- a/kokkos/tpls/gtest/gtest/gtest.h
+++ b/kokkos/tpls/gtest/gtest/gtest.h
@@ -2192,7 +2192,7 @@ inline void FlushInfoLog() { fflush(NULL); }
 // const Foo*).  When you use ImplicitCast_, the compiler checks that
 // the cast is safe.  Such explicit ImplicitCast_s are necessary in
 // surprisingly many situations where C++ demands an exact type match
-// instead of an argument type convertable to a target type.
+// instead of an argument type convertible to a target type.
 //
 // The syntax for using ImplicitCast_ is the same as for static_cast:
 //
@@ -9945,7 +9945,7 @@ void UniversalTersePrint(const T& value, ::std::ostream* os) {
 // NUL-terminated string.
 template <typename T>
 void UniversalPrint(const T& value, ::std::ostream* os) {
-  // A workarond for the bug in VC++ 7.1 that prevents us from instantiating
+  // A workaround for the bug in VC++ 7.1 that prevents us from instantiating
   // UniversalPrinter with T directly.
   typedef T T1;
   UniversalPrinter<T1>::Print(value, os);
@@ -18672,7 +18672,7 @@ class GTEST_API_ UnitTest {
   internal::UnitTestImpl* impl() { return impl_; }
   const internal::UnitTestImpl* impl() const { return impl_; }
 
-  // These classes and funcions are friends as they need to access private
+  // These classes and functions are friends as they need to access private
   // members of UnitTest.
   friend class Test;
   friend class internal::AssertHelper;

From d809fde70c15d64ae9e78fd457f0eab05ec8ee48 Mon Sep 17 00:00:00 2001
From: Paul Kuberry <pakuber@sandia.gov>
Date: Thu, 23 Sep 2021 19:26:51 -0600
Subject: [PATCH 04/40] Add conversion from neighbor list accessor to 2D array

---
 src/Compadre_NeighborLists.hpp    | 48 ++++++++++++++++++++++++++++
 src/Compadre_PointCloudSearch.hpp | 52 ++++++++++++++++++++++++++-----
 2 files changed, 93 insertions(+), 7 deletions(-)

diff --git a/src/Compadre_NeighborLists.hpp b/src/Compadre_NeighborLists.hpp
index 73f51dd2a..20a6912db 100644
--- a/src/Compadre_NeighborLists.hpp
+++ b/src/Compadre_NeighborLists.hpp
@@ -374,6 +374,54 @@ NeighborLists<view_type_1d> Convert2DToCompressedRowNeighborLists(view_type_2d n
     return nla;
 }
 
+//! Converts compressed row neighbor lists to 2D neighbor lists
+//  neighbor_lists_2d should be passed as empty rank-2 and will be populated
+template <typename view_type_1d, typename view_type_2d>
+void ConvertCompressedRowNeighborListsTo2D(NeighborLists<view_type_1d> nla, view_type_2d& neighbor_lists_2d) {
+
+    auto max_neighbors = nla.getMaxNumNeighbors();
+    auto num_targets   = nla.getNumberOfTargets();
+
+    // copy data form nla to neighbor_lists_2d using device space,
+    // if it can accesss neighbor_lists_2d memory space, otherwise host
+    // could allocate on device and copy there, then copy back, but leads
+    // to too much IO which is likely undesired by user
+
+    typedef typename view_type_2d::value_type value_type;
+    Kokkos::View<value_type**, typename view_type_2d::array_layout, device_memory_space> 
+        new_neighbor_lists_2d(
+            Kokkos::view_alloc(neighbor_lists_2d.label(), typename view_type_2d::memory_space()), 
+            (max_neighbors+1)*num_targets);
+
+    // if device_execution_space can access this view, then write directly into the view
+    if (Kokkos::SpaceAccessibility<device_execution_space, typename view_type_2d::memory_space>::accessible==1) {
+        Kokkos::parallel_for("copy compressed row to neighbor lists 2d", Kokkos::RangePolicy<typename view_type_2d::execution_space>(0, num_targets), 
+                KOKKOS_LAMBDA(const int i) {
+            for (int j=0; j<nla.getNumberOfNeighborsDevice(i); ++j) {
+                new_neighbor_lists_2d(i,  0) = nla.getNumberOfNeighborsDevice(i);
+                new_neighbor_lists_2d(i,j+1) = nla.getNeighborDevice(i,j);
+            }
+        });
+        Kokkos::fence();
+        nla.copyDeviceDataToHost(); // has a fence at the end
+    }
+    // otherwise we are writing to a view that can't be seen from device (must be host space), 
+    // and d_neighbor_lists was already made to be a view_type that is accessible from view_type_1d's execution_space 
+    // (which we know is host) so we can do a parallel_for over the host_execution_space
+    else {
+        Kokkos::parallel_for("copy compressed row to neighbor lists 2d", Kokkos::RangePolicy<host_execution_space>(0, num_targets), 
+                KOKKOS_LAMBDA(const int i) {
+            for (int j=0; j<nla.getNumberOfNeighborsHost(i); ++j) {
+                new_neighbor_lists_2d(i,  0) = nla.getNumberOfNeighborsHost(i);
+                new_neighbor_lists_2d(i,j+1) = nla.getNeighborHost(i,j);
+            }
+        });
+        Kokkos::fence();
+    }
+
+    neighbor_lists_2d = new_neighbor_lists_2d;
+}
+
 } // Compadre namespace
 
 #endif
diff --git a/src/Compadre_PointCloudSearch.hpp b/src/Compadre_PointCloudSearch.hpp
index db809c0c9..2c4923955 100644
--- a/src/Compadre_PointCloudSearch.hpp
+++ b/src/Compadre_PointCloudSearch.hpp
@@ -140,7 +140,7 @@ class PointCloudSearch {
                 neighbor_lists_view_type neighbor_lists, epsilons_view_type epsilons, 
                 const double uniform_radius = 0.0, double max_search_radius = 0.0) {
 
-            //// function does not populate epsilons, they must be prepopulated
+            // function does not populate epsilons, they must be prepopulated
 
             //compadre_assert_release((Kokkos::SpaceAccessibility<host_execution_space, typename trg_view_type::memory_space>::accessible==1) &&
             //        "Target coordinates view passed to generate2DNeighborListsFromRadiusSearch should be accessible from the host.");
@@ -151,6 +151,49 @@ class PointCloudSearch {
             //        "Views passed to generate2DNeighborListsFromRadiusSearch should be accessible from the host.");
             //compadre_assert_release((Kokkos::SpaceAccessibility<host_execution_space, typename epsilons_view_type::memory_space>::accessible==1) &&
             //        "Views passed to generate2DNeighborListsFromRadiusSearch should be accessible from the host.");
+            
+            const int num_target_sites = trg_pts_view.extent(0);
+ 
+            // check neighbor lists and epsilons view sizes
+            compadre_assert_release((neighbor_lists.extent(0)==(size_t)num_target_sites 
+                        && neighbor_lists.extent(1)>=1)
+                        && "neighbor lists View does not have large enough dimensions");
+            compadre_assert_release((neighbor_lists_view_type::rank==2) && "neighbor_lists must be a 2D Kokkos view.");
+
+
+            // temporary 1D array for cr_neighbor_lists
+            typedef typename decltype(neighbor_lists)::value_type value_type;
+            size_t cr_neighbor_entries =  (is_dry_run) ? 0 : num_target_sites * neighbor_lists.extent(1);
+            Kokkos::View<value_type*, typename decltype(neighbor_lists)::memory_space> 
+                cr_neighbor_lists(
+                    Kokkos::view_alloc(neighbor_lists.label(), 
+                        typename decltype(neighbor_lists)::memory_space()), 
+                    cr_neighbor_entries);
+
+            typedef typename decltype(neighbor_lists)::value_type value_type;
+            Kokkos::View<value_type*, typename decltype(neighbor_lists)::memory_space> 
+                number_of_neighbors_list(
+                    Kokkos::view_alloc("number of neighbors list", 
+                        typename decltype(neighbor_lists)::memory_space()), 
+                    num_target_sites);
+            
+            generateCRNeighborListsFromRadiusSearch(is_dry_run, trg_pts_view,
+                cr_neighbor_lists, number_of_neighbors_list, epsilons, uniform_radius, max_search_radius);
+            for (int i=0; i<num_target_sites; ++i) {
+                printf("%d: %d\n", i, number_of_neighbors_list(i));
+            }
+
+            size_t max_num_neighbors = 0;
+            if (!is_dry_run) {
+                auto nla = CreateNeighborLists(cr_neighbor_lists, number_of_neighbors_list);
+                ConvertCompressedRowNeighborListsTo2D(nla, neighbor_lists);
+                max_num_neighbors = nla.getMaxNumNeighbors();
+            } else {
+                auto nla = CreateNeighborLists(number_of_neighbors_list);
+                max_num_neighbors = nla.getMaxNumNeighbors();
+            }
+            printf("max_num_neighbors: %lu\n", max_num_neighbors);
+
 
             //// loop size
             //const int num_target_sites = trg_pts_view.extent(0);
@@ -159,11 +202,6 @@ class PointCloudSearch {
             ////    this->generateKDTree();
             ////}
 
-            //// check neighbor lists and epsilons view sizes
-            //compadre_assert_release((neighbor_lists.extent(0)==(size_t)num_target_sites 
-            //            && neighbor_lists.extent(1)>=1)
-            //            && "neighbor lists View does not have large enough dimensions");
-            //compadre_assert_release((neighbor_lists_view_type::rank==2) && "neighbor_lists must be a 2D Kokkos view.");
 
             //compadre_assert_release((epsilons.extent(0)==(size_t)num_target_sites)
             //            && "epsilons View does not have the correct dimension");
@@ -257,7 +295,7 @@ class PointCloudSearch {
             //compadre_assert_release((neighbor_lists.extent(1) >= (max_num_neighbors+1) || is_dry_run) 
             //        && "neighbor_lists does not contain enough columns for the maximum number of neighbors needing to be stored.");
 
-            return 0;//max_num_neighbors;
+            return max_num_neighbors;
         }
 
         /*! \brief Generates compressed row neighbor lists by performing a radius search 

From 6ce7bdeffe7ff6bba9714dea5305c5fb534708df Mon Sep 17 00:00:00 2001
From: Paul Kuberry <pakuber@sandia.gov>
Date: Fri, 24 Sep 2021 07:14:45 -0600
Subject: [PATCH 05/40] Two phase radius neighbor search completed for 2D array
 fill

---
 examples/NeighborSearchTest.cpp   |   6 +-
 src/Compadre_NeighborLists.hpp    |  28 +++--
 src/Compadre_PointCloudSearch.hpp | 178 +++---------------------------
 3 files changed, 37 insertions(+), 175 deletions(-)

diff --git a/examples/NeighborSearchTest.cpp b/examples/NeighborSearchTest.cpp
index 7006d3535..f71f7fd8a 100644
--- a/examples/NeighborSearchTest.cpp
+++ b/examples/NeighborSearchTest.cpp
@@ -198,7 +198,7 @@ bool all_passed = true;
             auto nla(CreateNeighborLists(neighbor_lists, number_neighbors_list));
 
             double radius_search_time = timer.seconds();
-            printf("nanoflann search time: %f s\n", radius_search_time);
+            printf("arborx search time: %f s\n", radius_search_time);
 
             // convert point cloud search to vector of maps
             timer.reset();
@@ -314,7 +314,7 @@ bool all_passed = true;
                 target_coords, neighbor_lists, epsilon);
 
             double radius_search_time = timer.seconds();
-            printf("nanoflann search time: %f s\n", radius_search_time);
+            printf("arborx search time: %f s\n", radius_search_time);
 
             // convert point cloud search to vector of maps
             timer.reset();
@@ -432,7 +432,7 @@ bool all_passed = true;
             auto nla = Convert2DToCompressedRowNeighborLists(neighbor_lists);
 
             double radius_search_time = timer.seconds();
-            printf("nanoflann search time: %f s\n", radius_search_time);
+            printf("arborx search time: %f s\n", radius_search_time);
 
             // convert point cloud search to vector of maps
             timer.reset();
diff --git a/src/Compadre_NeighborLists.hpp b/src/Compadre_NeighborLists.hpp
index 20a6912db..b987ee80b 100644
--- a/src/Compadre_NeighborLists.hpp
+++ b/src/Compadre_NeighborLists.hpp
@@ -377,7 +377,7 @@ NeighborLists<view_type_1d> Convert2DToCompressedRowNeighborLists(view_type_2d n
 //! Converts compressed row neighbor lists to 2D neighbor lists
 //  neighbor_lists_2d should be passed as empty rank-2 and will be populated
 template <typename view_type_1d, typename view_type_2d>
-void ConvertCompressedRowNeighborListsTo2D(NeighborLists<view_type_1d> nla, view_type_2d& neighbor_lists_2d) {
+void ConvertCompressedRowNeighborListsTo2D(const NeighborLists<view_type_1d>& nla, view_type_2d& neighbor_lists_2d) {
 
     auto max_neighbors = nla.getMaxNumNeighbors();
     auto num_targets   = nla.getNumberOfTargets();
@@ -387,23 +387,28 @@ void ConvertCompressedRowNeighborListsTo2D(NeighborLists<view_type_1d> nla, view
     // could allocate on device and copy there, then copy back, but leads
     // to too much IO which is likely undesired by user
 
-    typedef typename view_type_2d::value_type value_type;
-    Kokkos::View<value_type**, typename view_type_2d::array_layout, device_memory_space> 
-        new_neighbor_lists_2d(
-            Kokkos::view_alloc(neighbor_lists_2d.label(), typename view_type_2d::memory_space()), 
-            (max_neighbors+1)*num_targets);
+    if (view_type_2d::rank!=2 || 
+            neighbor_lists_2d.extent_int(0)!=num_targets ||
+            neighbor_lists_2d.extent_int(1)<max_neighbors+1) {
+        typedef typename view_type_2d::value_type value_type;
+        Kokkos::View<value_type**, typename view_type_2d::array_layout, device_memory_space> 
+            new_neighbor_lists_2d(
+                Kokkos::view_alloc(neighbor_lists_2d.label(), typename view_type_2d::memory_space()), 
+                num_targets, max_neighbors+1);
+        neighbor_lists_2d = new_neighbor_lists_2d;
+    }
+
 
     // if device_execution_space can access this view, then write directly into the view
     if (Kokkos::SpaceAccessibility<device_execution_space, typename view_type_2d::memory_space>::accessible==1) {
         Kokkos::parallel_for("copy compressed row to neighbor lists 2d", Kokkos::RangePolicy<typename view_type_2d::execution_space>(0, num_targets), 
                 KOKKOS_LAMBDA(const int i) {
             for (int j=0; j<nla.getNumberOfNeighborsDevice(i); ++j) {
-                new_neighbor_lists_2d(i,  0) = nla.getNumberOfNeighborsDevice(i);
-                new_neighbor_lists_2d(i,j+1) = nla.getNeighborDevice(i,j);
+                neighbor_lists_2d(i,  0) = nla.getNumberOfNeighborsDevice(i);
+                neighbor_lists_2d(i,j+1) = nla.getNeighborDevice(i,j);
             }
         });
         Kokkos::fence();
-        nla.copyDeviceDataToHost(); // has a fence at the end
     }
     // otherwise we are writing to a view that can't be seen from device (must be host space), 
     // and d_neighbor_lists was already made to be a view_type that is accessible from view_type_1d's execution_space 
@@ -412,14 +417,13 @@ void ConvertCompressedRowNeighborListsTo2D(NeighborLists<view_type_1d> nla, view
         Kokkos::parallel_for("copy compressed row to neighbor lists 2d", Kokkos::RangePolicy<host_execution_space>(0, num_targets), 
                 KOKKOS_LAMBDA(const int i) {
             for (int j=0; j<nla.getNumberOfNeighborsHost(i); ++j) {
-                new_neighbor_lists_2d(i,  0) = nla.getNumberOfNeighborsHost(i);
-                new_neighbor_lists_2d(i,j+1) = nla.getNeighborHost(i,j);
+                neighbor_lists_2d(i,  0) = nla.getNumberOfNeighborsHost(i);
+                neighbor_lists_2d(i,j+1) = nla.getNeighborHost(i,j);
             }
         });
         Kokkos::fence();
     }
 
-    neighbor_lists_2d = new_neighbor_lists_2d;
 }
 
 } // Compadre namespace
diff --git a/src/Compadre_PointCloudSearch.hpp b/src/Compadre_PointCloudSearch.hpp
index 2c4923955..42424d475 100644
--- a/src/Compadre_PointCloudSearch.hpp
+++ b/src/Compadre_PointCloudSearch.hpp
@@ -78,26 +78,6 @@ class PointCloudSearch {
             if (dimension==1) multiplier = 2;
             return multiplier * 2.0 * unisolvency_size * std::pow(epsilon_multiplier, dimension) + 1; // +1 is for the number of neighbors entry needed in the first entry of each row
         }
-    
-        //! Bounding box query method required by Nanoflann.
-        template <class BBOX> bool kdtree_get_bbox(BBOX& bb) const {return false;}
-
-        //! Returns the number of source sites
-        inline int kdtree_get_point_count() const {return _src_pts_view.extent(0);}
-
-        //! Returns the coordinate value of a point
-        inline double kdtree_get_pt(const int idx, int dim) const {return _src_pts_view(idx,dim);}
-
-        //! Returns the distance between a point and a source site, given its index
-        inline double kdtree_distance(const double* queryPt, const int idx, long long sz) const {
-
-            double distance = 0;
-            for (int i=0; i<_dim; ++i) {
-                distance += (_src_pts_view(idx,i)-queryPt[i])*(_src_pts_view(idx,i)-queryPt[i]);
-            }
-            return std::sqrt(distance);
-
-        }
 
         //! Returns the distance between a point and a source site, given its index
         inline double kdtreeDistance(const double* queryPt, const int idx) const {
@@ -110,20 +90,6 @@ class PointCloudSearch {
 
         }
 
-        //void generateKDTree() {
-            //if (_dim==1) {
-            //    //_tree_1d = std::make_shared<tree_type_1d>(1, *this, nanoflann::KDTreeSingleIndexAdaptorParams(_max_leaf));
-            //    //_tree_1d->buildIndex();
-            //    _tree_1d = std::make_shared<BVH>();//(1, *this, nanoflann::KDTreeSingleIndexAdaptorParams(_max_leaf));
-            //} else if (_dim==2) {
-            //    _tree_2d = std::make_shared<BVH>();//std::make_shared<tree_type_2d>(2, *this, nanoflann::KDTreeSingleIndexAdaptorParams(_max_leaf));
-            //    _tree_2d->buildIndex();
-            //} else if (_dim==3) {
-            //    _tree_3d = std::make_shared<BVH>();//std::make_shared<tree_type_3d>(3, *this, nanoflann::KDTreeSingleIndexAdaptorParams(_max_leaf));
-            //    //_tree_3d->buildIndex();
-            //}
-        //}
-
         /*! \brief Generates neighbor lists of 2D view by performing a radius search 
             where the radius to be searched is in the epsilons view.
             If uniform_radius is given, then this overrides the epsilons view radii sizes.
@@ -137,21 +103,10 @@ class PointCloudSearch {
         */
         template <typename trg_view_type, typename neighbor_lists_view_type, typename epsilons_view_type>
         size_t generate2DNeighborListsFromRadiusSearch(bool is_dry_run, trg_view_type trg_pts_view, 
-                neighbor_lists_view_type neighbor_lists, epsilons_view_type epsilons, 
+                neighbor_lists_view_type& neighbor_lists, epsilons_view_type epsilons, 
                 const double uniform_radius = 0.0, double max_search_radius = 0.0) {
 
             // function does not populate epsilons, they must be prepopulated
-
-            //compadre_assert_release((Kokkos::SpaceAccessibility<host_execution_space, typename trg_view_type::memory_space>::accessible==1) &&
-            //        "Target coordinates view passed to generate2DNeighborListsFromRadiusSearch should be accessible from the host.");
-            //compadre_assert_release((((int)trg_pts_view.extent(1))>=_dim) &&
-            //        "Target coordinates view passed to generate2DNeighborListsFromRadiusSearch must have \
-            //        second dimension as large as _dim.");
-            //compadre_assert_release((Kokkos::SpaceAccessibility<host_execution_space, typename neighbor_lists_view_type::memory_space>::accessible==1) &&
-            //        "Views passed to generate2DNeighborListsFromRadiusSearch should be accessible from the host.");
-            //compadre_assert_release((Kokkos::SpaceAccessibility<host_execution_space, typename epsilons_view_type::memory_space>::accessible==1) &&
-            //        "Views passed to generate2DNeighborListsFromRadiusSearch should be accessible from the host.");
-            
             const int num_target_sites = trg_pts_view.extent(0);
  
             // check neighbor lists and epsilons view sizes
@@ -162,26 +117,32 @@ class PointCloudSearch {
 
 
             // temporary 1D array for cr_neighbor_lists
-            typedef typename decltype(neighbor_lists)::value_type value_type;
+            typedef typename neighbor_lists_view_type::value_type value_type;
             size_t cr_neighbor_entries =  (is_dry_run) ? 0 : num_target_sites * neighbor_lists.extent(1);
-            Kokkos::View<value_type*, typename decltype(neighbor_lists)::memory_space> 
+            Kokkos::View<value_type*, typename neighbor_lists_view_type::memory_space> 
                 cr_neighbor_lists(
                     Kokkos::view_alloc(neighbor_lists.label(), 
-                        typename decltype(neighbor_lists)::memory_space()), 
+                        typename neighbor_lists_view_type::memory_space()), 
                     cr_neighbor_entries);
 
-            typedef typename decltype(neighbor_lists)::value_type value_type;
-            Kokkos::View<value_type*, typename decltype(neighbor_lists)::memory_space> 
+            // temporary 1D array for number_of_neighbors_list
+            typedef typename neighbor_lists_view_type::value_type value_type;
+            Kokkos::View<value_type*, typename neighbor_lists_view_type::memory_space> 
                 number_of_neighbors_list(
                     Kokkos::view_alloc("number of neighbors list", 
-                        typename decltype(neighbor_lists)::memory_space()), 
+                        typename neighbor_lists_view_type::memory_space()), 
                     num_target_sites);
+
+            if (!is_dry_run) { 
+                // number_of_neighbors_list not populated when !is_dry_run
+                Kokkos::parallel_for(num_target_sites, KOKKOS_LAMBDA(int i) {
+                    number_of_neighbors_list(i) = neighbor_lists(i,0);
+                });
+            }
             
+            // doesn't fill number_of_neighbors_list when !is_dry_run
             generateCRNeighborListsFromRadiusSearch(is_dry_run, trg_pts_view,
                 cr_neighbor_lists, number_of_neighbors_list, epsilons, uniform_radius, max_search_radius);
-            for (int i=0; i<num_target_sites; ++i) {
-                printf("%d: %d\n", i, number_of_neighbors_list(i));
-            }
 
             size_t max_num_neighbors = 0;
             if (!is_dry_run) {
@@ -192,108 +153,6 @@ class PointCloudSearch {
                 auto nla = CreateNeighborLists(number_of_neighbors_list);
                 max_num_neighbors = nla.getMaxNumNeighbors();
             }
-            printf("max_num_neighbors: %lu\n", max_num_neighbors);
-
-
-            //// loop size
-            //const int num_target_sites = trg_pts_view.extent(0);
-
-            ////if ((!_tree_1d && _dim==1) || (!_tree_2d && _dim==2) || (!_tree_3d && _dim==3)) {
-            ////    this->generateKDTree();
-            ////}
-
-
-            //compadre_assert_release((epsilons.extent(0)==(size_t)num_target_sites)
-            //            && "epsilons View does not have the correct dimension");
-
-            //typedef Kokkos::View<double*, Kokkos::HostSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> > 
-            //        scratch_double_view;
-
-            //typedef Kokkos::View<size_t*, Kokkos::HostSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> > 
-            //        scratch_int_view;
-
-            //// determine scratch space size needed
-            //int team_scratch_size = 0;
-            //team_scratch_size += scratch_double_view::shmem_size(neighbor_lists.extent(1)); // distances
-            //team_scratch_size += scratch_int_view::shmem_size(neighbor_lists.extent(1)); // indices
-            //team_scratch_size += scratch_double_view::shmem_size(_dim); // target coordinate
-
-            //// maximum number of neighbors found over all target sites' neighborhoods
-            //size_t max_num_neighbors = 0;
-            //// part 2. do radius search using window size from knn search
-            //// each row of neighbor lists is a neighbor list for the target site corresponding to that row
-            //Kokkos::parallel_reduce("radius search", host_team_policy(num_target_sites, Kokkos::AUTO)
-            //        .set_scratch_size(0 /*shared memory level*/, Kokkos::PerTeam(team_scratch_size)), 
-            //        KOKKOS_LAMBDA(const host_member_type& teamMember, size_t& t_max_num_neighbors) {
-
-            //    // make unmanaged scratch views
-            //    scratch_double_view neighbor_distances(teamMember.team_scratch(0 /*shared memory*/), neighbor_lists.extent(1));
-            //    scratch_int_view neighbor_indices(teamMember.team_scratch(0 /*shared memory*/), neighbor_lists.extent(1));
-            //    scratch_double_view this_target_coord(teamMember.team_scratch(0 /*shared memory*/), _dim);
-
-            //    size_t neighbors_found = 0;
-
-            //    const int i = teamMember.league_rank();
-
-            //    // set epsilons if radius is specified
-            //    if (uniform_radius > 0) epsilons(i) = uniform_radius;
-
-            //    // needs furthest neighbor's distance for next portion
-            //    compadre_kernel_assert_release((epsilons(i)<=max_search_radius || max_search_radius==0) && "max_search_radius given (generally derived from the size of a halo region), and search radius needed would exceed this max_search_radius.");
-
-            //    Kokkos::parallel_for(Kokkos::TeamThreadRange(teamMember, neighbor_lists.extent(1)), [&](const int j) { 
-            //        neighbor_indices(j) = 0;
-            //        neighbor_distances(j) = -1.0;
-            //    });
-            //    teamMember.team_barrier();
-
-            //    Kokkos::single(Kokkos::PerTeam(teamMember), [&] () {
-            //        // target_coords is LayoutLeft on device and its HostMirror, so giving a pointer to 
-            //        // this data would lead to a wrong result if the device is a GPU
-
-            //        for (int j=0; j<_dim; ++j) {
-            //            this_target_coord(j) = trg_pts_view(i,j);
-            //        }
-
-            //        nanoflann::SearchParams sp; // default parameters
-            //        Compadre::RadiusResultSet<double> rrs(epsilons(i)*epsilons(i), neighbor_distances.data(), neighbor_indices.data(), neighbor_lists.extent(1));
-            //        if (_dim==1) {
-            //            neighbors_found = _tree_1d->template radiusSearchCustomCallback<Compadre::RadiusResultSet<double> >(this_target_coord.data(), rrs, sp) ;
-
-            //        } else if (_dim==2) {
-            //            neighbors_found = _tree_2d->template radiusSearchCustomCallback<Compadre::RadiusResultSet<double> >(this_target_coord.data(), rrs, sp) ;
-
-            //        } else if (_dim==3) {
-            //            neighbors_found = _tree_3d->template radiusSearchCustomCallback<Compadre::RadiusResultSet<double> >(this_target_coord.data(), rrs, sp) ;
-
-            //        }
-
-            //        t_max_num_neighbors = (neighbors_found > t_max_num_neighbors) ? neighbors_found : t_max_num_neighbors;
-            //
-            //        // the number of neighbors is stored in column zero of the neighbor lists 2D array
-            //        neighbor_lists(i,0) = neighbors_found;
-
-            //        // epsilons already scaled and then set by search radius
-            //    });
-            //    teamMember.team_barrier();
-
-            //    // loop_bound so that we don't write into memory we don't have allocated
-            //    int loop_bound = (neighbors_found < neighbor_lists.extent(1)-1) ? neighbors_found : neighbor_lists.extent(1)-1;
-            //    // loop over each neighbor index and fill with a value
-            //    if (!is_dry_run) {
-            //        Kokkos::parallel_for(Kokkos::TeamThreadRange(teamMember, loop_bound), [&](const int j) {
-            //            // cast to an whatever data type the 2D array of neighbor lists is using
-            //            neighbor_lists(i,j+1) = static_cast<typename std::remove_pointer<typename std::remove_pointer<typename neighbor_lists_view_type::data_type>::type>::type>(neighbor_indices(j));
-            //        });
-            //        teamMember.team_barrier();
-            //    }
-
-            //}, Kokkos::Max<size_t>(max_num_neighbors) );
-            //Kokkos::fence();
-
-            //// check if max_num_neighbors will fit onto pre-allocated space
-            //compadre_assert_release((neighbor_lists.extent(1) >= (max_num_neighbors+1) || is_dry_run) 
-            //        && "neighbor_lists does not contain enough columns for the maximum number of neighbors needing to be stored.");
 
             return max_num_neighbors;
         }
@@ -382,12 +241,11 @@ class PointCloudSearch {
                 } else {
                     neighbors_found_for_target_i = offsets(i+1) - offsets(i);
                 }
-                if (is_dry_run || uniform_radius!=0.0) {
-                    number_of_neighbors_list(i) = neighbors_found_for_target_i;
-                } else {
+                if (!is_dry_run) { // check it is as expected before overwriting
                     compadre_kernel_assert_debug((neighbors_found==(size_t)number_of_neighbors_list(i)) 
                             && "Number of neighbors found changed since dry-run.");
                 }
+                number_of_neighbors_list(i) = neighbors_found_for_target_i;
             });
             Kokkos::fence();
 

From a4b47b62a40eb2023c77a620ce4acd7ff48a4864 Mon Sep 17 00:00:00 2001
From: Paul Kuberry <pakuber@sandia.gov>
Date: Fri, 24 Sep 2021 19:30:14 -0600
Subject: [PATCH 06/40] Switch to AccessTraits for ArborX BVH initialization

---
 src/Compadre_PointCloudSearch.hpp | 148 ++++++++++++++++++++++++------
 1 file changed, 118 insertions(+), 30 deletions(-)

diff --git a/src/Compadre_PointCloudSearch.hpp b/src/Compadre_PointCloudSearch.hpp
index 42424d475..f7e964aa1 100644
--- a/src/Compadre_PointCloudSearch.hpp
+++ b/src/Compadre_PointCloudSearch.hpp
@@ -6,8 +6,98 @@
 #include <Kokkos_Core.hpp>
 #include <ArborX_LinearBVH.hpp>
 
-template <typename memory_space>
-using BVH = ArborX::BoundingVolumeHierarchy<memory_space>;
+template <typename view_type_1>
+struct Points {
+    view_type_1 _pts;
+    Points(view_type_1 pts): 
+                _pts(pts) {}
+};
+
+template <typename view_type>
+struct ArborX::AccessTraits<Points<view_type>, ArborX::PrimitivesTag>
+{
+    static KOKKOS_FUNCTION std::size_t size(Points<view_type> const &cloud)
+    {
+        return cloud._pts.extent(0);
+    }
+    static KOKKOS_FUNCTION ArborX::Point get(Points<view_type> const &cloud, std::size_t i)
+    {
+        switch (cloud._pts.extent(1)) {
+        case 3:
+            return ArborX::Point(cloud._pts(i,0), cloud._pts(i,1), cloud._pts(i,2));
+        case 2:
+            return ArborX::Point(cloud._pts(i,0), cloud._pts(i,1),             0.0);
+        case 1:
+            return ArborX::Point(cloud._pts(i,0),             0.0,             0.0);
+        default:
+            compadre_assert_release(false && "Invalid dimension for cloud.");
+        }
+    }
+    using memory_space = device_memory_space;
+};
+//
+//template <typename view_type_1, typename view_type_2>
+//struct Radius {
+//
+//    view_type_1 _pts;
+//    view_type_2 _radii;
+//    double _uniform_radius;
+//    double _max_search_radius;
+//
+//    Radius(view_type_1 pts, view_type_2 radii, const double uniform_radius, 
+//            const double max_search_radius) : 
+//                _pts(pts), _radii(radii),
+//                _uniform_radius(uniform_radius), 
+//                _max_search_radius(max_search_radius) 
+//    {}
+//};
+//
+//struct NearestToOrigin
+//{
+//  int k;
+//};
+//
+//template <typename view_type_1, typename view_type_2>
+//struct ArborX::AccessTraits<Radius<view_type_1, view_type_2>, ArborX::PredicatesTag>
+//{
+//  static KOKKOS_FUNCTION std::size_t size(Radius<view_type_1, view_type_2> const &cloud)
+//  {
+//      return cloud._pts.extent(0);
+//  }
+//  static KOKKOS_FUNCTION ArborX::Intersects<ArborX::Sphere> 
+//      get(Radius<view_type_1, view_type_2> const &cloud, std::size_t i)
+//  {
+//      double radius = (cloud._uniform_radius != 0) ? cloud._uniform_radius : cloud._radii(i);
+//      compadre_kernel_assert_release((cloud._epsilons(i)<=cloud._max_search_radius || cloud._max_search_radius==0) 
+//              && "max_search_radius given (generally derived from the size of a halo region), \
+//              and search radius needed would exceed this max_search_radius.");
+//      switch (cloud._pts.extent(1)) {
+//      case 3:
+//          return ArborX::intersects(ArborX::Sphere({{{cloud._pts(i,0), cloud._pts(i,1), cloud._pts(i,2)}}, radius}));
+//      case 2:
+//          return ArborX::intersects(ArborX::Sphere({{{cloud._pts(i,0), cloud._pts(i,1),             0.0}}, radius}));
+//      case 1:
+//          return ArborX::intersects(ArborX::Sphere({{{cloud._pts(i,0),             0.0,             0.0}}, radius}));
+//      default:
+//          compadre_assert_release(false && "Invalid dimension for cloud.");
+//      }
+//  }
+//  using memory_space = device_memory_space;
+//};
+
+//template <>
+//struct ArborX::AccessTraits<NearestToOrigin, ArborX::PredicatesTag>
+//{
+//  static KOKKOS_FUNCTION std::size_t size(NearestToOrigin const &)
+//  {
+//    return 1;
+//  }
+//  static KOKKOS_FUNCTION auto get(NearestToOrigin const &d, std::size_t)
+//  {
+//    return ArborX::nearest(ArborX::Point{{0, 0, 0}}, d.k);
+//  }
+//  using memory_space = device_memory_space();
+//};
 
 namespace Compadre {
 
@@ -38,7 +128,7 @@ class PointCloudSearch {
         local_index_type _dim;
         local_index_type _max_leaf;
 
-        BVH<device_memory_space> _tree;
+        ArborX::BVH<device_memory_space> _tree;
 
     public:
 
@@ -50,21 +140,22 @@ class PointCloudSearch {
             compadre_assert_release((Kokkos::SpaceAccessibility<host_execution_space, typename view_type::memory_space>::accessible==1)
                     && "Views passed to PointCloudSearch at construction should be accessible from the host.");
 
-            { //TODO: Add check here to see if _tree is populated
-                // if not, populate
-                Kokkos::View<ArborX::Point *> cloud("point_cloud", _src_pts_view.extent(0));
-                Kokkos::parallel_for(_src_pts_view.extent(0), KOKKOS_LAMBDA(int i) {
-                  if (_dim==1) {
-                      cloud(i) = {{_src_pts_view(i,0),0,0}};
-                  }
-                  if (_dim==2) {
-                      cloud(i) = {{_src_pts_view(i,0),_src_pts_view(i,1),0}};
-                  }
-                  if (_dim==3) {
-                      cloud(i) = {{_src_pts_view(i,0),_src_pts_view(i,1),_src_pts_view(i,2)}};
-                  }
-                });
-                _tree = BVH<device_memory_space>(device_execution_space(), cloud);
+            {
+                //Kokkos::View<ArborX::Point *> cloud("point_cloud", _src_pts_view.extent(0));
+                //Kokkos::parallel_for("make source cloud", _src_pts_view.extent(0), KOKKOS_LAMBDA(int i) {
+                //  if (_dim==1) {
+                //      cloud(i) = {{_src_pts_view(i,0),0,0}};
+                //  }
+                //  if (_dim==2) {
+                //      cloud(i) = {{_src_pts_view(i,0),_src_pts_view(i,1),0}};
+                //  }
+                //  if (_dim==3) {
+                //      cloud(i) = {{_src_pts_view(i,0),_src_pts_view(i,1),_src_pts_view(i,2)}};
+                //  }
+                //});
+                //_tree = ArborX::BVH<device_memory_space>(device_execution_space(), cloud);
+                _tree = ArborX::BVH<device_memory_space>(device_execution_space(), 
+                            Points<view_type>(_src_pts_view));
             }
         };
     
@@ -196,8 +287,6 @@ class PointCloudSearch {
             compadre_assert_release((epsilons.extent(0)==(size_t)num_target_sites)
                         && "epsilons View does not have the correct dimension");
 
-            typedef Kokkos::View<double*, Kokkos::HostSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> > 
-                    scratch_double_view;
 
             // build target points into a cloud of sphere with radius given as epsilons(i)
             Kokkos::View<ArborX::Sphere *> cloud("trg_point_cloud", trg_pts_view.extent(0));
@@ -215,7 +304,6 @@ class PointCloudSearch {
                 }
             });
             Kokkos::fence();
-
             // build queries
             Kokkos::View<ArborX::Intersects<ArborX::Sphere> *, device_memory_space> 
                 queries("queries", num_target_sites);
@@ -228,21 +316,19 @@ class PointCloudSearch {
             // perform tree search
             Kokkos::View<int *, device_memory_space> values("values", 0);
             Kokkos::View<int *, device_memory_space> offsets("offsets", 0);
+            //auto predicates = Radius<trg_view_type,epsilons_view_type>(trg_pts_view, epsilons,
+            //        uniform_radius, max_search_size);
+            //_tree.query(device_execution_space(), predicates, values, offsets);
             _tree.query(device_execution_space(), queries, values, offsets);
 
-
             // set number of neighbors list (how many neighbors for each target site) based
             // on results on tree query
             Kokkos::parallel_for(Kokkos::RangePolicy<device_execution_space>(0, num_target_sites),
             KOKKOS_LAMBDA(int i) {
-                size_t neighbors_found_for_target_i = 0;
-                if (i==num_target_sites-1) {
-                    neighbors_found_for_target_i = values.extent(0) - offsets(i);
-                } else {
-                    neighbors_found_for_target_i = offsets(i+1) - offsets(i);
-                }
+                size_t neighbors_found_for_target_i = offsets(i+1) - offsets(i);
                 if (!is_dry_run) { // check it is as expected before overwriting
-                    compadre_kernel_assert_debug((neighbors_found==(size_t)number_of_neighbors_list(i)) 
+                    compadre_kernel_assert_debug(
+                            (neighbors_found_for_target_i==(size_t)number_of_neighbors_list(i)) 
                             && "Number of neighbors found changed since dry-run.");
                 }
                 number_of_neighbors_list(i) = neighbors_found_for_target_i;
@@ -266,9 +352,11 @@ class PointCloudSearch {
             }
 
             // sort to put closest neighbor first (other neighbors are not affected)
+            typedef Kokkos::View<double*, Kokkos::HostSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> > 
+                    scratch_double_view;
             int team_scratch_size = 0;
             team_scratch_size += scratch_double_view::shmem_size(trg_pts_view.extent(1)); // distances
-            Kokkos::parallel_for("radius search", host_team_policy(num_target_sites, Kokkos::AUTO)
+            Kokkos::parallel_for("first entry sort", host_team_policy(num_target_sites, Kokkos::AUTO)
                     .set_scratch_size(0 /*shared memory level*/, Kokkos::PerTeam(team_scratch_size)), 
                     KOKKOS_LAMBDA(const host_member_type& teamMember) {
 

From 41df68a168a69862b29a32c128fbbe5dba7c339b Mon Sep 17 00:00:00 2001
From: Paul Kuberry <pakuber@sandia.gov>
Date: Fri, 24 Sep 2021 19:53:23 -0600
Subject: [PATCH 07/40] Switch to AccessTraits for ArborX query

---
 src/Compadre_PointCloudSearch.hpp | 151 ++++++++++++------------------
 1 file changed, 59 insertions(+), 92 deletions(-)

diff --git a/src/Compadre_PointCloudSearch.hpp b/src/Compadre_PointCloudSearch.hpp
index f7e964aa1..6251d56ec 100644
--- a/src/Compadre_PointCloudSearch.hpp
+++ b/src/Compadre_PointCloudSearch.hpp
@@ -35,55 +35,62 @@ struct ArborX::AccessTraits<Points<view_type>, ArborX::PrimitivesTag>
     }
     using memory_space = device_memory_space;
 };
-//
-//template <typename view_type_1, typename view_type_2>
-//struct Radius {
-//
-//    view_type_1 _pts;
-//    view_type_2 _radii;
-//    double _uniform_radius;
-//    double _max_search_radius;
-//
-//    Radius(view_type_1 pts, view_type_2 radii, const double uniform_radius, 
-//            const double max_search_radius) : 
-//                _pts(pts), _radii(radii),
-//                _uniform_radius(uniform_radius), 
-//                _max_search_radius(max_search_radius) 
-//    {}
-//};
-//
-//struct NearestToOrigin
-//{
-//  int k;
-//};
-//
-//template <typename view_type_1, typename view_type_2>
-//struct ArborX::AccessTraits<Radius<view_type_1, view_type_2>, ArborX::PredicatesTag>
-//{
-//  static KOKKOS_FUNCTION std::size_t size(Radius<view_type_1, view_type_2> const &cloud)
-//  {
-//      return cloud._pts.extent(0);
-//  }
-//  static KOKKOS_FUNCTION ArborX::Intersects<ArborX::Sphere> 
-//      get(Radius<view_type_1, view_type_2> const &cloud, std::size_t i)
-//  {
-//      double radius = (cloud._uniform_radius != 0) ? cloud._uniform_radius : cloud._radii(i);
-//      compadre_kernel_assert_release((cloud._epsilons(i)<=cloud._max_search_radius || cloud._max_search_radius==0) 
-//              && "max_search_radius given (generally derived from the size of a halo region), \
-//              and search radius needed would exceed this max_search_radius.");
-//      switch (cloud._pts.extent(1)) {
-//      case 3:
-//          return ArborX::intersects(ArborX::Sphere({{{cloud._pts(i,0), cloud._pts(i,1), cloud._pts(i,2)}}, radius}));
-//      case 2:
-//          return ArborX::intersects(ArborX::Sphere({{{cloud._pts(i,0), cloud._pts(i,1),             0.0}}, radius}));
-//      case 1:
-//          return ArborX::intersects(ArborX::Sphere({{{cloud._pts(i,0),             0.0,             0.0}}, radius}));
-//      default:
-//          compadre_assert_release(false && "Invalid dimension for cloud.");
-//      }
-//  }
-//  using memory_space = device_memory_space;
-//};
+
+template <typename view_type_1, typename view_type_2>
+struct Radius {
+
+    view_type_1 _pts;
+    view_type_2 _radii;
+    double _uniform_radius;
+    double _max_search_radius;
+
+    Radius(view_type_1 pts, view_type_2 radii, const double uniform_radius, 
+            const double max_search_radius) : 
+                _pts(pts), _radii(radii),
+                _uniform_radius(uniform_radius), 
+                _max_search_radius(max_search_radius) 
+    {}
+};
+
+template <typename view_type_1, typename view_type_2>
+struct ArborX::AccessTraits<Radius<view_type_1, view_type_2>, ArborX::PredicatesTag>
+{
+  static KOKKOS_FUNCTION std::size_t size(Radius<view_type_1, view_type_2> const &cloud)
+  {
+      return cloud._pts.extent(0);
+  }
+  static KOKKOS_FUNCTION ArborX::Intersects<ArborX::Sphere> 
+      get(Radius<view_type_1, view_type_2> const &cloud, std::size_t i)
+  {
+      double radius = (cloud._uniform_radius != 0) ? cloud._uniform_radius : cloud._radii(i);
+      compadre_kernel_assert_release((cloud._radii(i)<=cloud._max_search_radius || cloud._max_search_radius==0) 
+              && "max_search_radius given (generally derived from the size of a halo region), \
+              and search radius needed would exceed this max_search_radius.");
+      switch (cloud._pts.extent(1)) {
+      case 3:
+          return ArborX::intersects(ArborX::Sphere(
+                      ArborX::Point(cloud._pts(i,0), cloud._pts(i,1), cloud._pts(i,2)), 
+                      radius));
+      case 2:
+          return ArborX::intersects(ArborX::Sphere(
+                      ArborX::Point(cloud._pts(i,0), cloud._pts(i,1),             0.0), 
+                      radius));
+      case 1:
+          return ArborX::intersects(ArborX::Sphere(
+                      ArborX::Point(cloud._pts(i,0),             0.0,             0.0), 
+                      radius));
+      default:
+          compadre_assert_release(false && "Invalid dimension for cloud.");
+      }
+  }
+  using memory_space = device_memory_space;
+};
+
+struct NearestToOrigin
+{
+  int k;
+};
+
 
 //template <>
 //struct ArborX::AccessTraits<NearestToOrigin, ArborX::PredicatesTag>
@@ -141,19 +148,6 @@ class PointCloudSearch {
                     && "Views passed to PointCloudSearch at construction should be accessible from the host.");
 
             {
-                //Kokkos::View<ArborX::Point *> cloud("point_cloud", _src_pts_view.extent(0));
-                //Kokkos::parallel_for("make source cloud", _src_pts_view.extent(0), KOKKOS_LAMBDA(int i) {
-                //  if (_dim==1) {
-                //      cloud(i) = {{_src_pts_view(i,0),0,0}};
-                //  }
-                //  if (_dim==2) {
-                //      cloud(i) = {{_src_pts_view(i,0),_src_pts_view(i,1),0}};
-                //  }
-                //  if (_dim==3) {
-                //      cloud(i) = {{_src_pts_view(i,0),_src_pts_view(i,1),_src_pts_view(i,2)}};
-                //  }
-                //});
-                //_tree = ArborX::BVH<device_memory_space>(device_execution_space(), cloud);
                 _tree = ArborX::BVH<device_memory_space>(device_execution_space(), 
                             Points<view_type>(_src_pts_view));
             }
@@ -287,39 +281,12 @@ class PointCloudSearch {
             compadre_assert_release((epsilons.extent(0)==(size_t)num_target_sites)
                         && "epsilons View does not have the correct dimension");
 
-
-            // build target points into a cloud of sphere with radius given as epsilons(i)
-            Kokkos::View<ArborX::Sphere *> cloud("trg_point_cloud", trg_pts_view.extent(0));
-            Kokkos::parallel_for(num_target_sites, KOKKOS_LAMBDA(int i) {
-                compadre_kernel_assert_release((epsilons(i)<=max_search_radius || max_search_radius==0) && "max_search_radius given (generally derived from the size of a halo region), and search radius needed would exceed this max_search_radius.");
-                if (uniform_radius > 0) epsilons(i) = uniform_radius;
-                if (_dim==1) {
-                    cloud(i) = {{{trg_pts_view(i,0),0,0}}, epsilons(i)};
-                }
-                if (_dim==2) {
-                    cloud(i) = {{{trg_pts_view(i,0),trg_pts_view(i,1),0}}, epsilons(i)};
-                }
-                if (_dim==3) {
-                    cloud(i) = {{{trg_pts_view(i,0),trg_pts_view(i,1),trg_pts_view(i,2)}}, epsilons(i)};
-                }
-            });
-            Kokkos::fence();
-            // build queries
-            Kokkos::View<ArborX::Intersects<ArborX::Sphere> *, device_memory_space> 
-                queries("queries", num_target_sites);
-            Kokkos::parallel_for(Kokkos::RangePolicy<device_execution_space>(0, num_target_sites),
-            KOKKOS_LAMBDA(int i) {
-                queries(i) = ArborX::intersects(cloud(i));
-            });
-            Kokkos::fence();
-
             // perform tree search
             Kokkos::View<int *, device_memory_space> values("values", 0);
             Kokkos::View<int *, device_memory_space> offsets("offsets", 0);
-            //auto predicates = Radius<trg_view_type,epsilons_view_type>(trg_pts_view, epsilons,
-            //        uniform_radius, max_search_size);
-            //_tree.query(device_execution_space(), predicates, values, offsets);
-            _tree.query(device_execution_space(), queries, values, offsets);
+            auto predicates = Radius<trg_view_type,epsilons_view_type>(trg_pts_view, epsilons,
+                    uniform_radius, max_search_radius);
+            _tree.query(device_execution_space(), predicates, values, offsets);
 
             // set number of neighbors list (how many neighbors for each target site) based
             // on results on tree query

From 531540798db5bdc73e86285597eda606a6ed0110 Mon Sep 17 00:00:00 2001
From: Paul Kuberry <pakuber@sandia.gov>
Date: Fri, 24 Sep 2021 20:26:06 -0600
Subject: [PATCH 08/40] Clean up unused variables and assertions

---
 src/Compadre_NeighborLists.hpp    |  6 ++++--
 src/Compadre_PointCloudSearch.hpp | 17 +++++++++++------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/Compadre_NeighborLists.hpp b/src/Compadre_NeighborLists.hpp
index b987ee80b..7e520fee3 100644
--- a/src/Compadre_NeighborLists.hpp
+++ b/src/Compadre_NeighborLists.hpp
@@ -391,9 +391,11 @@ void ConvertCompressedRowNeighborListsTo2D(const NeighborLists<view_type_1d>& nl
             neighbor_lists_2d.extent_int(0)!=num_targets ||
             neighbor_lists_2d.extent_int(1)<max_neighbors+1) {
         typedef typename view_type_2d::value_type value_type;
-        Kokkos::View<value_type**, typename view_type_2d::array_layout, device_memory_space> 
+        typedef typename view_type_2d::array_layout layout;
+        typedef typename view_type_2d::memory_space memory_space;
+        Kokkos::View<value_type**, layout, memory_space> 
             new_neighbor_lists_2d(
-                Kokkos::view_alloc(neighbor_lists_2d.label(), typename view_type_2d::memory_space()), 
+                Kokkos::view_alloc(neighbor_lists_2d.label(), memory_space()), 
                 num_targets, max_neighbors+1);
         neighbor_lists_2d = new_neighbor_lists_2d;
     }
diff --git a/src/Compadre_PointCloudSearch.hpp b/src/Compadre_PointCloudSearch.hpp
index 6251d56ec..ef780b6ea 100644
--- a/src/Compadre_PointCloudSearch.hpp
+++ b/src/Compadre_PointCloudSearch.hpp
@@ -30,7 +30,8 @@ struct ArborX::AccessTraits<Points<view_type>, ArborX::PrimitivesTag>
         case 1:
             return ArborX::Point(cloud._pts(i,0),             0.0,             0.0);
         default:
-            compadre_assert_release(false && "Invalid dimension for cloud.");
+            compadre_kernel_assert_release(false && "Invalid dimension for cloud.");
+            return ArborX::Point(           0.0,             0.0,             0.0);
         }
     }
     using memory_space = device_memory_space;
@@ -80,7 +81,10 @@ struct ArborX::AccessTraits<Radius<view_type_1, view_type_2>, ArborX::Predicates
                       ArborX::Point(cloud._pts(i,0),             0.0,             0.0), 
                       radius));
       default:
-          compadre_assert_release(false && "Invalid dimension for cloud.");
+          compadre_kernel_assert_release(false && "Invalid dimension for cloud.");
+          return ArborX::intersects(ArborX::Sphere(
+                      ArborX::Point(            0.0,             0.0,             0.0),
+                      radius));
       }
   }
   using memory_space = device_memory_space;
@@ -148,8 +152,11 @@ class PointCloudSearch {
                     && "Views passed to PointCloudSearch at construction should be accessible from the host.");
 
             {
-                _tree = ArborX::BVH<device_memory_space>(device_execution_space(), 
-                            Points<view_type>(_src_pts_view));
+                //if (Kokkos::SpaceAccessibility<device_execution_space, 
+                //        typename trg_view_type::memory_space>::accessible==1) {
+                    _tree = ArborX::BVH<device_memory_space>(device_execution_space(), 
+                                Points<view_type>(_src_pts_view));
+                //}
             }
         };
     
@@ -306,10 +313,8 @@ class PointCloudSearch {
             typedef Kokkos::View<global_index_type*, typename neighbor_lists_view_type::array_layout,
                     typename neighbor_lists_view_type::memory_space, typename neighbor_lists_view_type::memory_traits> row_offsets_view_type;
             row_offsets_view_type row_offsets;
-            int max_neighbor_list_row_storage_size = 1;
             if (!is_dry_run) {
                 auto nla = CreateNeighborLists(neighbor_lists, number_of_neighbors_list);
-                max_neighbor_list_row_storage_size = nla.getMaxNumNeighbors();
                 Kokkos::resize(row_offsets, num_target_sites);
                 Kokkos::fence();
                 Kokkos::parallel_for(Kokkos::RangePolicy<host_execution_space>(0,num_target_sites), [&](const int i) {

From 7c44d2c36b60b63b8b42c8253fe3013df5bedb36 Mon Sep 17 00:00:00 2001
From: Paul Kuberry <pakuber@sandia.gov>
Date: Fri, 24 Sep 2021 20:38:02 -0600
Subject: [PATCH 09/40] Changed spaces to host so that neighbor search works on
 host with GPU

---
 arborx/CMakeLists.txt             |  6 +++---
 src/Compadre_PointCloudSearch.hpp | 21 +++++++++++----------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/arborx/CMakeLists.txt b/arborx/CMakeLists.txt
index 3181f1f93..bd6bda66b 100644
--- a/arborx/CMakeLists.txt
+++ b/arborx/CMakeLists.txt
@@ -2,9 +2,9 @@ cmake_minimum_required(VERSION 3.16)
 project(ArborX CXX)
 
 #find_package(Kokkos 3.1 REQUIRED)
-if(Kokkos_ENABLE_CUDA)
-  kokkos_check(OPTIONS CUDA_LAMBDA)
-endif()
+#if(Kokkos_ENABLE_CUDA)
+#  kokkos_check(OPTIONS CUDA_LAMBDA)
+#endif()
 
 add_library(ArborX INTERFACE)
 target_link_libraries(ArborX INTERFACE Kokkos::kokkos)
diff --git a/src/Compadre_PointCloudSearch.hpp b/src/Compadre_PointCloudSearch.hpp
index ef780b6ea..e4490787a 100644
--- a/src/Compadre_PointCloudSearch.hpp
+++ b/src/Compadre_PointCloudSearch.hpp
@@ -34,7 +34,7 @@ struct ArborX::AccessTraits<Points<view_type>, ArborX::PrimitivesTag>
             return ArborX::Point(           0.0,             0.0,             0.0);
         }
     }
-    using memory_space = device_memory_space;
+    using memory_space = host_memory_space;
 };
 
 template <typename view_type_1, typename view_type_2>
@@ -87,7 +87,7 @@ struct ArborX::AccessTraits<Radius<view_type_1, view_type_2>, ArborX::Predicates
                       radius));
       }
   }
-  using memory_space = device_memory_space;
+  using memory_space = host_memory_space;
 };
 
 struct NearestToOrigin
@@ -139,7 +139,7 @@ class PointCloudSearch {
         local_index_type _dim;
         local_index_type _max_leaf;
 
-        ArborX::BVH<device_memory_space> _tree;
+        ArborX::BVH<host_memory_space> _tree;
 
     public:
 
@@ -154,7 +154,7 @@ class PointCloudSearch {
             {
                 //if (Kokkos::SpaceAccessibility<device_execution_space, 
                 //        typename trg_view_type::memory_space>::accessible==1) {
-                    _tree = ArborX::BVH<device_memory_space>(device_execution_space(), 
+                    _tree = ArborX::BVH<host_memory_space>(host_execution_space(), 
                                 Points<view_type>(_src_pts_view));
                 //}
             }
@@ -227,7 +227,8 @@ class PointCloudSearch {
 
             if (!is_dry_run) { 
                 // number_of_neighbors_list not populated when !is_dry_run
-                Kokkos::parallel_for(num_target_sites, KOKKOS_LAMBDA(int i) {
+                Kokkos::parallel_for(Kokkos::RangePolicy<host_execution_space>(0, num_target_sites),
+                KOKKOS_LAMBDA(int i) {
                     number_of_neighbors_list(i) = neighbor_lists(i,0);
                 });
             }
@@ -289,15 +290,15 @@ class PointCloudSearch {
                         && "epsilons View does not have the correct dimension");
 
             // perform tree search
-            Kokkos::View<int *, device_memory_space> values("values", 0);
-            Kokkos::View<int *, device_memory_space> offsets("offsets", 0);
+            Kokkos::View<int *, host_memory_space> values("values", 0);
+            Kokkos::View<int *, host_memory_space> offsets("offsets", 0);
             auto predicates = Radius<trg_view_type,epsilons_view_type>(trg_pts_view, epsilons,
                     uniform_radius, max_search_radius);
-            _tree.query(device_execution_space(), predicates, values, offsets);
+            _tree.query(host_execution_space(), predicates, values, offsets);
 
             // set number of neighbors list (how many neighbors for each target site) based
             // on results on tree query
-            Kokkos::parallel_for(Kokkos::RangePolicy<device_execution_space>(0, num_target_sites),
+            Kokkos::parallel_for(Kokkos::RangePolicy<host_execution_space>(0, num_target_sites),
             KOKKOS_LAMBDA(int i) {
                 size_t neighbors_found_for_target_i = offsets(i+1) - offsets(i);
                 if (!is_dry_run) { // check it is as expected before overwriting
@@ -363,7 +364,7 @@ class PointCloudSearch {
 
             // copy neighbor list values over from tree query
             if (!is_dry_run) {
-                Kokkos::parallel_for(Kokkos::RangePolicy<device_execution_space>(0, num_target_sites),
+                Kokkos::parallel_for(Kokkos::RangePolicy<host_execution_space>(0, num_target_sites),
                 KOKKOS_LAMBDA(int i) {
                     for (int j=0; j<number_of_neighbors_list(i); ++j) {
                         neighbor_lists(row_offsets(i)+j) = values(offsets(i)+j);

From 7a4a5f9c09acfc443d9a06687ea5a6e604af9ef1 Mon Sep 17 00:00:00 2001
From: Paul Kuberry <pakuber@sandia.gov>
Date: Sun, 26 Sep 2021 19:24:06 -0600
Subject: [PATCH 10/40] Switched KNN search over to ArborX

---
 src/Compadre_PointCloudSearch.hpp | 182 +++++++++++++++++-------------
 1 file changed, 105 insertions(+), 77 deletions(-)

diff --git a/src/Compadre_PointCloudSearch.hpp b/src/Compadre_PointCloudSearch.hpp
index e4490787a..4ca0b2e2b 100644
--- a/src/Compadre_PointCloudSearch.hpp
+++ b/src/Compadre_PointCloudSearch.hpp
@@ -64,6 +64,7 @@ struct ArborX::AccessTraits<Radius<view_type_1, view_type_2>, ArborX::Predicates
       get(Radius<view_type_1, view_type_2> const &cloud, std::size_t i)
   {
       double radius = (cloud._uniform_radius != 0) ? cloud._uniform_radius : cloud._radii(i);
+      cloud._radii(i) = radius;
       compadre_kernel_assert_release((cloud._radii(i)<=cloud._max_search_radius || cloud._max_search_radius==0) 
               && "max_search_radius given (generally derived from the size of a halo region), \
               and search radius needed would exceed this max_search_radius.");
@@ -90,11 +91,49 @@ struct ArborX::AccessTraits<Radius<view_type_1, view_type_2>, ArborX::Predicates
   using memory_space = host_memory_space;
 };
 
-struct NearestToOrigin
-{
-  int k;
+template <typename view_type_1>
+struct NearestNeighbor {
+
+    view_type_1 _pts;
+    int _neighbors_needed;
+
+    NearestNeighbor(view_type_1 pts, const int neighbors_needed) :
+                _pts(pts), _neighbors_needed(neighbors_needed)
+    {}
 };
 
+template <typename view_type_1>
+struct ArborX::AccessTraits<NearestNeighbor<view_type_1>, ArborX::PredicatesTag>
+{
+  static KOKKOS_FUNCTION std::size_t size(NearestNeighbor<view_type_1> const &cloud)
+  {
+      return cloud._pts.extent(0);
+  }
+  static KOKKOS_FUNCTION ArborX::Nearest<ArborX::Point> 
+      get(NearestNeighbor<view_type_1> const &cloud, std::size_t i)
+  {
+      switch (cloud._pts.extent(1)) {
+      case 3:
+          return ArborX::nearest(
+                      ArborX::Point(cloud._pts(i,0), cloud._pts(i,1), cloud._pts(i,2)), 
+                      cloud._neighbors_needed);
+      case 2:
+          return ArborX::nearest(
+                      ArborX::Point(cloud._pts(i,0), cloud._pts(i,1),             0.0), 
+                      cloud._neighbors_needed);
+      case 1:
+          return ArborX::nearest(
+                      ArborX::Point(cloud._pts(i,0),             0.0,             0.0), 
+                      cloud._neighbors_needed);
+      default:
+          compadre_kernel_assert_release(false && "Invalid dimension for cloud.");
+          return ArborX::nearest(
+                      ArborX::Point(            0.0,             0.0,             0.0),
+                      cloud._neighbors_needed);
+      }
+  }
+  using memory_space = host_memory_space;
+};
 
 //template <>
 //struct ArborX::AccessTraits<NearestToOrigin, ArborX::PredicatesTag>
@@ -285,7 +324,6 @@ class PointCloudSearch {
             compadre_assert_release((number_of_neighbors_list.extent(0)==(size_t)num_target_sites)
                         && "number_of_neighbors_list or neighbor lists View does not have large enough dimensions");
             compadre_assert_release((neighbor_lists_view_type::rank==1) && "neighbor_lists must be a 1D Kokkos view.");
-
             compadre_assert_release((epsilons.extent(0)==(size_t)num_target_sites)
                         && "epsilons View does not have the correct dimension");
 
@@ -551,87 +589,77 @@ class PointCloudSearch {
             // loop size
             const int num_target_sites = trg_pts_view.extent(0);
 
-            //if ((!_tree_1d && _dim==1) || (!_tree_2d && _dim==2) || (!_tree_3d && _dim==3)) {
-            //    this->generateKDTree();
-            //}
-            //Kokkos::fence();
-
-            //compadre_assert_release((number_of_neighbors_list.extent(0)==(size_t)num_target_sites ) 
-            //            && "number_of_neighbors_list or neighbor lists View does not have large enough dimensions");
-            //compadre_assert_release((neighbor_lists_view_type::rank==1) && "neighbor_lists must be a 1D Kokkos view.");
-
-            //// if dry-run, neighbors_needed, else max over previous dry-run
-            //int max_neighbor_list_row_storage_size = neighbors_needed;
-            //if (!is_dry_run) {
-            //    auto nla = CreateNeighborLists(neighbor_lists, number_of_neighbors_list);
-            //    max_neighbor_list_row_storage_size = nla.getMaxNumNeighbors();
-            //}
-
-            //compadre_assert_release((epsilons.extent(0)==(size_t)num_target_sites)
-            //            && "epsilons View does not have the correct dimension");
-
-            //typedef Kokkos::View<double*, Kokkos::HostSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> > 
-            //        scratch_double_view;
-
-            //typedef Kokkos::View<size_t*, Kokkos::HostSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> > 
-            //        scratch_int_view;
-
-            //// determine scratch space size needed
-            //int team_scratch_size = 0;
-            //team_scratch_size += scratch_double_view::shmem_size(max_neighbor_list_row_storage_size); // distances
-            //team_scratch_size += scratch_int_view::shmem_size(max_neighbor_list_row_storage_size); // indices
-            //team_scratch_size += scratch_double_view::shmem_size(_dim); // target coordinate
+            compadre_assert_release((number_of_neighbors_list.extent(0)==(size_t)num_target_sites)
+                        && "number_of_neighbors_list or neighbor lists View does not have large enough dimensions");
+            compadre_assert_release((neighbor_lists_view_type::rank==1) && "neighbor_lists must be a 1D Kokkos view.");
+            compadre_assert_release((epsilons.extent(0)==(size_t)num_target_sites)
+                        && "epsilons View does not have the correct dimension");
 
-            //// minimum number of neighbors found over all target sites' neighborhoods
-            //size_t min_num_neighbors = 0;
-            ////
-            //// part 1. do knn search for neighbors needed for unisolvency
-            //// each row of neighbor lists is a neighbor list for the target site corresponding to that row
-            ////
-            //// as long as neighbor_lists can hold the number of neighbors_needed, we don't need to check
-            //// that the maximum number of neighbors will fit into neighbor_lists
-            ////
-            //Kokkos::parallel_reduce("knn search", host_team_policy(num_target_sites, Kokkos::AUTO)
-            //        .set_scratch_size(0 /*shared memory level*/, Kokkos::PerTeam(team_scratch_size)), 
-            //        KOKKOS_LAMBDA(const host_member_type& teamMember, size_t& t_min_num_neighbors) {
+            // perform tree search
+            Kokkos::View<int *, host_memory_space> values("values", 0);
+            Kokkos::View<int *, host_memory_space> offsets("offsets", 0);
+            auto predicates = NearestNeighbor<trg_view_type>(trg_pts_view, neighbors_needed);
+            _tree.query(host_execution_space(), predicates, values, offsets);
 
-            //    // make unmanaged scratch views
-            //    scratch_double_view neighbor_distances(teamMember.team_scratch(0 /*shared memory*/), max_neighbor_list_row_storage_size);
-            //    scratch_int_view neighbor_indices(teamMember.team_scratch(0 /*shared memory*/), max_neighbor_list_row_storage_size);
-            //    scratch_double_view this_target_coord(teamMember.team_scratch(0 /*shared memory*/), _dim);
+            size_t min_num_neighbors = 0;
+            // if no target sites, then min_num_neighbors is set to neighbors_needed
+            if (num_target_sites==0) min_num_neighbors = neighbors_needed;
 
-            //    size_t neighbors_found = 0;
+            // get min_num_neighbors
+            typedef Kokkos::View<double*, Kokkos::HostSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> > 
+                    scratch_double_view;
+            int team_scratch_size = 0;
+            team_scratch_size += scratch_double_view::shmem_size(trg_pts_view.extent(1)); // distances
+            //Kokkos::parallel_reduce(Kokkos::RangePolicy<host_execution_space>(0, num_target_sites),
+            //KOKKOS_LAMBDA(int i, size_t& t_min_num_neighbors) {
+            Kokkos::parallel_reduce("knn inspect", host_team_policy(num_target_sites, Kokkos::AUTO)
+                    .set_scratch_size(0 /*shared memory level*/, Kokkos::PerTeam(team_scratch_size)), 
+                    KOKKOS_LAMBDA(const host_member_type& teamMember, size_t& t_min_num_neighbors) {
 
-            //    const int i = teamMember.league_rank();
+                const int i = teamMember.league_rank();
 
-            //    Kokkos::parallel_for(Kokkos::TeamThreadRange(teamMember, max_neighbor_list_row_storage_size), [=](const int j) {
-            //        neighbor_indices(j) = 0;
-            //        neighbor_distances(j) = -1.0;
-            //    });
-            //
-            //    teamMember.team_barrier();
-            //    Kokkos::single(Kokkos::PerTeam(teamMember), [&] () {
-            //        // target_coords is LayoutLeft on device and its HostMirror, so giving a pointer to 
-            //        // this data would lead to a wrong result if the device is a GPU
+                size_t num_neighbors = offsets(i+1) - offsets(i);
+                t_min_num_neighbors = (num_neighbors < t_min_num_neighbors) ?
+                                        num_neighbors : t_min_num_neighbors;
 
-            //        for (int j=0; j<_dim; ++j) { 
-            //            this_target_coord(j) = trg_pts_view(i,j);
-            //        }
+                // make unmanaged scratch views
+                scratch_double_view trg_pt(teamMember.team_scratch(0 /*shared memory*/), trg_pts_view.extent(1));
+                for (int j=0; j<trg_pts_view.extent(1); ++j) {
+                    trg_pt(j) = trg_pts_view(i,j);
+                }
+                double last_neighbor_distance = kdtreeDistance(trg_pt.data(), values(offsets(i)+num_neighbors-1));
+
+                // scale by epsilon_multiplier to window from location where the last neighbor was found
+                epsilons(i) = (last_neighbor_distance > 0) ? 
+                                    last_neighbor_distance*epsilon_multiplier
+                                  : 1e-14*epsilon_multiplier;
+                // the only time the second case using 1e-14 is used is when either zero neighbors or exactly one 
+                // neighbor (neighbor is target site) is found.  when the follow on radius search is conducted, the one
+                // neighbor (target site) will not be found if left at 0, so any positive amount will do, however 1e-14 
+                // should be small enough to ensure that other neighbors are not found
+
+                compadre_kernel_assert_release((epsilons(i)<=max_search_radius || max_search_radius==0 || is_dry_run) 
+                        && "max_search_radius given (generally derived from the size of a halo region), \
+                            and search radius needed would exceed this max_search_radius.");
+
+#ifdef COMPADRE_DEBUG
+                Kokkos::parallel_for(Kokkos::TeamThreadRange(teamMember, num_neighbors-1), [=](const int j) {
+                    double this_distance = kdtreeDistance(trg_pt.data(), values(offsets(i)+j  ));
+                    double next_distance = kdtreeDistance(trg_pt.data(), values(offsets(i)+j+1));
+                    compadre_kernel_assert_debug((this_distance<=next_distance) 
+                        && "Neighbors returned by KD tree search are not ordered.");
+                });
+#endif
+            }, Kokkos::Min<size_t>(min_num_neighbors));
 
-            //        if (_dim==1) {
-            //            neighbors_found = _tree_1d->knnSearch(this_target_coord.data(), neighbors_needed, 
-            //                    neighbor_indices.data(), neighbor_distances.data()) ;
-            //        } else if (_dim==2) {
-            //            neighbors_found = _tree_2d->knnSearch(this_target_coord.data(), neighbors_needed, 
-            //                    neighbor_indices.data(), neighbor_distances.data()) ;
-            //        } else if (_dim==3) {
-            //            neighbors_found = _tree_3d->knnSearch(this_target_coord.data(), neighbors_needed, 
-            //                    neighbor_indices.data(), neighbor_distances.data()) ;
-            //        }
+            // Next, check that we found the neighbors_needed number that we require for unisolvency
+            compadre_assert_release((num_target_sites==0 || (min_num_neighbors>=(size_t)neighbors_needed))
+                    && "Neighbor search failed to find number of neighbors needed for unisolvency.");
+            
+            // call a radius search using values now stored in epsilons
+            generateCRNeighborListsFromRadiusSearch(is_dry_run, trg_pts_view, neighbor_lists, 
+                    number_of_neighbors_list, epsilons, 0.0 /*don't set uniform radius*/, max_search_radius);
 
-            //        // get minimum number of neighbors found over all target sites' neighborhoods
-            //        t_min_num_neighbors = (neighbors_found < t_min_num_neighbors) ? neighbors_found : t_min_num_neighbors;
-            //
             //        // scale by epsilon_multiplier to window from location where the last neighbor was found
             //        epsilons(i) = (neighbor_distances(neighbors_found-1) > 0) ?
             //            std::sqrt(neighbor_distances(neighbors_found-1))*epsilon_multiplier : 1e-14*epsilon_multiplier;

From 84582c99c97442c41987144f342ced8984ef75c8 Mon Sep 17 00:00:00 2001
From: Paul Kuberry <pakuber@sandia.gov>
Date: Mon, 27 Sep 2021 10:00:36 -0600
Subject: [PATCH 11/40] Add check_same option to neighbor search

- Option check_same=true by default now, as the dry-run,
  then allocating, then re-running approach checks if the same
  number of neighbors are found for each target, in each search.

- For searches without a dry-run, this check would previously
  always fail, so this allows a disable of that check.
---
 examples/GMLS_Multiple_Evaluation_Sites.cpp |   2 +-
 examples/GMLS_NeumannGradScalar.cpp         |   2 +-
 examples/GMLS_SmallBatchReuse_Device.cpp    |   3 +-
 examples/GMLS_Staggered.cpp                 |   2 +-
 examples/GMLS_Staggered_Manifold.cpp        |   2 +-
 examples/GMLS_Vector.cpp                    |   2 +-
 examples/NeighborSearchTest.cpp             |   6 +-
 src/Compadre_PointCloudSearch.hpp           | 229 ++++++--------------
 8 files changed, 79 insertions(+), 169 deletions(-)

diff --git a/examples/GMLS_Multiple_Evaluation_Sites.cpp b/examples/GMLS_Multiple_Evaluation_Sites.cpp
index 782c51177..d96625916 100644
--- a/examples/GMLS_Multiple_Evaluation_Sites.cpp
+++ b/examples/GMLS_Multiple_Evaluation_Sites.cpp
@@ -243,7 +243,7 @@ bool all_passed = true;
     // to each target site, adding (epsilon_multiplier-1)*100% to whatever the distance away the further neighbor used is from
     // each target to the view for epsilon
     point_cloud_search.generate2DNeighborListsFromKNNSearch(false /*not dry run*/, target_coords, neighbor_lists, 
-            epsilon, min_neighbors, epsilon_multiplier);
+            epsilon, min_neighbors, epsilon_multiplier, 0.0 /* max search radius */, false);
     
     
     //! [Performing Neighbor Search]
diff --git a/examples/GMLS_NeumannGradScalar.cpp b/examples/GMLS_NeumannGradScalar.cpp
index 468269c11..d3481e6e1 100644
--- a/examples/GMLS_NeumannGradScalar.cpp
+++ b/examples/GMLS_NeumannGradScalar.cpp
@@ -215,7 +215,7 @@ bool all_passed = true;
     // to each target site, adding (epsilon_multiplier-1)*100% to whatever the distance away the further neighbor used is from
     // each target to the view for epsilon
     point_cloud_search.generate2DNeighborListsFromKNNSearch(false /*not dry run*/, target_coords, neighbor_lists, 
-            epsilon, min_neighbors, epsilon_multiplier);
+            epsilon, min_neighbors, epsilon_multiplier, 0.0 /* max search radius */, false);
     
     //! [Performing Neighbor Search]
     
diff --git a/examples/GMLS_SmallBatchReuse_Device.cpp b/examples/GMLS_SmallBatchReuse_Device.cpp
index 8dd13cd44..09f98b4cd 100644
--- a/examples/GMLS_SmallBatchReuse_Device.cpp
+++ b/examples/GMLS_SmallBatchReuse_Device.cpp
@@ -271,7 +271,8 @@ bool all_passed = true;
         // to each target site, adding (epsilon_multiplier-1)*100% to whatever the distance away the further neighbor used is from
         // each target to the view for epsilon
         point_cloud_search.generate2DNeighborListsFromKNNSearch(false /*not dry run*/, single_target_coords, 
-                single_neighbor_lists, single_epsilon, min_neighbors, epsilon_multiplier);
+                single_neighbor_lists, single_epsilon, min_neighbors, epsilon_multiplier,
+                0.0 /* max search radius */, false);
         
         //! [Performing Neighbor Search]
         
diff --git a/examples/GMLS_Staggered.cpp b/examples/GMLS_Staggered.cpp
index d22c94ca6..7df5bf044 100644
--- a/examples/GMLS_Staggered.cpp
+++ b/examples/GMLS_Staggered.cpp
@@ -209,7 +209,7 @@ bool all_passed = true;
     // to each target site, adding (epsilon_multiplier-1)*100% to whatever the distance away the further neighbor used is from
     // each target to the view for epsilon
     point_cloud_search.generate2DNeighborListsFromKNNSearch(false /*not dry run*/, target_coords, neighbor_lists, 
-            epsilon, min_neighbors, epsilon_multiplier);
+            epsilon, min_neighbors, epsilon_multiplier, 0.0 /* max search radius */, false);
 
     //! [Performing Neighbor Search]
 
diff --git a/examples/GMLS_Staggered_Manifold.cpp b/examples/GMLS_Staggered_Manifold.cpp
index 9e808deb0..828960cde 100644
--- a/examples/GMLS_Staggered_Manifold.cpp
+++ b/examples/GMLS_Staggered_Manifold.cpp
@@ -199,7 +199,7 @@ Kokkos::initialize(argc, args);
     // to each target site, adding (epsilon_multiplier-1)*100% to whatever the distance away the further neighbor used is from
     // each target to the view for epsilon
     point_cloud_search.generate2DNeighborListsFromKNNSearch(false /*not dry run*/, target_coords, neighbor_lists, 
-            epsilon, min_neighbors, epsilon_multiplier);
+            epsilon, min_neighbors, epsilon_multiplier, 0.0 /* max search radius */, false);
 
 
     //! [Performing Neighbor Search]
diff --git a/examples/GMLS_Vector.cpp b/examples/GMLS_Vector.cpp
index fdb9da747..140b862fe 100644
--- a/examples/GMLS_Vector.cpp
+++ b/examples/GMLS_Vector.cpp
@@ -222,7 +222,7 @@ bool all_passed = true;
     // to each target site, adding (epsilon_multiplier-1)*100% to whatever the distance away the further neighbor used is from
     // each target to the view for epsilon
     point_cloud_search.generate2DNeighborListsFromKNNSearch(false /*not dry run*/, target_coords, neighbor_lists, 
-            epsilon, min_neighbors, epsilon_multiplier);
+            epsilon, min_neighbors, epsilon_multiplier, 0.0 /* max search radius */, false);
     
     
     //! [Performing Neighbor Search]
diff --git a/examples/NeighborSearchTest.cpp b/examples/NeighborSearchTest.cpp
index f71f7fd8a..481e3debd 100644
--- a/examples/NeighborSearchTest.cpp
+++ b/examples/NeighborSearchTest.cpp
@@ -306,8 +306,7 @@ bool all_passed = true;
             printf("max num neighbors: %lu\n", max_num_neighbors);
 
             // resize neighbor lists to be large enough to hold the results
-            neighbor_lists = Kokkos::View<int**, Kokkos::DefaultHostExecutionSpace>("neighbor lists", 
-                number_target_coords, 1+max_num_neighbors); // first column is # of neighbors
+            Kokkos::resize(neighbor_lists, neighbor_lists.extent(0), 1+max_num_neighbors);
 
             // search again, now that we know that there is enough room to store the results
             max_num_neighbors = point_cloud_search.generate2DNeighborListsFromRadiusSearch(false /* dry run */,
@@ -422,8 +421,7 @@ bool all_passed = true;
             printf("max num neighbors: %lu\n", max_num_neighbors);
 
             // resize neighbor lists to be large enough to hold the results
-            neighbor_lists = Kokkos::View<int**, Kokkos::DefaultHostExecutionSpace>("neighbor lists", 
-                number_target_coords, 1+max_num_neighbors); // first column is # of neighbors
+            Kokkos::resize(neighbor_lists, neighbor_lists.extent(0), 1+max_num_neighbors);
 
             // search again, now that we know that there is enough room to store the results
             max_num_neighbors = point_cloud_search.generate2DNeighborListsFromRadiusSearch(false /* dry run */,
diff --git a/src/Compadre_PointCloudSearch.hpp b/src/Compadre_PointCloudSearch.hpp
index 4ca0b2e2b..03a8d8ff5 100644
--- a/src/Compadre_PointCloudSearch.hpp
+++ b/src/Compadre_PointCloudSearch.hpp
@@ -235,7 +235,8 @@ class PointCloudSearch {
         template <typename trg_view_type, typename neighbor_lists_view_type, typename epsilons_view_type>
         size_t generate2DNeighborListsFromRadiusSearch(bool is_dry_run, trg_view_type trg_pts_view, 
                 neighbor_lists_view_type& neighbor_lists, epsilons_view_type epsilons, 
-                const double uniform_radius = 0.0, double max_search_radius = 0.0) {
+                const double uniform_radius = 0.0, double max_search_radius = 0.0,
+                bool check_same = true) {
 
             // function does not populate epsilons, they must be prepopulated
             const int num_target_sites = trg_pts_view.extent(0);
@@ -270,11 +271,13 @@ class PointCloudSearch {
                 KOKKOS_LAMBDA(int i) {
                     number_of_neighbors_list(i) = neighbor_lists(i,0);
                 });
+                Kokkos::fence();
             }
             
             // doesn't fill number_of_neighbors_list when !is_dry_run
             generateCRNeighborListsFromRadiusSearch(is_dry_run, trg_pts_view,
-                cr_neighbor_lists, number_of_neighbors_list, epsilons, uniform_radius, max_search_radius);
+                cr_neighbor_lists, number_of_neighbors_list, epsilons, uniform_radius, 
+                max_search_radius, check_same);
 
             size_t max_num_neighbors = 0;
             if (!is_dry_run) {
@@ -282,10 +285,15 @@ class PointCloudSearch {
                 ConvertCompressedRowNeighborListsTo2D(nla, neighbor_lists);
                 max_num_neighbors = nla.getMaxNumNeighbors();
             } else {
+                Kokkos::parallel_for(Kokkos::RangePolicy<host_execution_space>(0, num_target_sites),
+                KOKKOS_LAMBDA(int i) {
+                    neighbor_lists(i,0) = number_of_neighbors_list(i);
+                });
+                Kokkos::fence();
                 auto nla = CreateNeighborLists(number_of_neighbors_list);
                 max_num_neighbors = nla.getMaxNumNeighbors();
             }
-
+            
             return max_num_neighbors;
         }
 
@@ -304,7 +312,8 @@ class PointCloudSearch {
         template <typename trg_view_type, typename neighbor_lists_view_type, typename epsilons_view_type>
         size_t generateCRNeighborListsFromRadiusSearch(bool is_dry_run, trg_view_type trg_pts_view, 
                 neighbor_lists_view_type neighbor_lists, neighbor_lists_view_type number_of_neighbors_list, 
-                epsilons_view_type epsilons, const double uniform_radius = 0.0, double max_search_radius = 0.0) {
+                epsilons_view_type epsilons, const double uniform_radius = 0.0, 
+                double max_search_radius = 0.0, bool check_same = true) {
 
             // function does not populate epsilons, they must be prepopulated
 
@@ -339,7 +348,7 @@ class PointCloudSearch {
             Kokkos::parallel_for(Kokkos::RangePolicy<host_execution_space>(0, num_target_sites),
             KOKKOS_LAMBDA(int i) {
                 size_t neighbors_found_for_target_i = offsets(i+1) - offsets(i);
-                if (!is_dry_run) { // check it is as expected before overwriting
+                if (!is_dry_run && check_same) { // check it is as expected before overwriting
                     compadre_kernel_assert_debug(
                             (neighbors_found_for_target_i==(size_t)number_of_neighbors_list(i)) 
                             && "Number of neighbors found changed since dry-run.");
@@ -430,131 +439,62 @@ class PointCloudSearch {
         size_t generate2DNeighborListsFromKNNSearch(bool is_dry_run, trg_view_type trg_pts_view, 
                 neighbor_lists_view_type neighbor_lists, epsilons_view_type epsilons, 
                 const int neighbors_needed, const double epsilon_multiplier = 1.6, 
-                double max_search_radius = 0.0) {
+                double max_search_radius = 0.0, bool check_same = true) {
 
-            // First, do a knn search (removes need for guessing initial search radius)
+            const int num_target_sites = trg_pts_view.extent(0);
+ 
+            // check neighbor lists and epsilons view sizes
+            compadre_assert_release((neighbor_lists.extent(0)==(size_t)num_target_sites 
+                        && neighbor_lists.extent(1)>=1)
+                        && "neighbor lists View does not have large enough dimensions");
+            compadre_assert_release((neighbor_lists_view_type::rank==2) && "neighbor_lists must be a 2D Kokkos view.");
 
-            compadre_assert_release((Kokkos::SpaceAccessibility<host_execution_space, typename trg_view_type::memory_space>::accessible==1) &&
-                    "Target coordinates view passed to generate2DNeighborListsFromKNNSearch should be accessible from the host.");
-            compadre_assert_release((((int)trg_pts_view.extent(1))>=_dim) &&
-                    "Target coordinates view passed to generate2DNeighborListsFromRadiusSearch must have \
-                    second dimension as large as _dim.");
-            compadre_assert_release((Kokkos::SpaceAccessibility<host_execution_space, typename neighbor_lists_view_type::memory_space>::accessible==1) &&
-                    "Views passed to generate2DNeighborListsFromKNNSearch should be accessible from the host.");
-            compadre_assert_release((Kokkos::SpaceAccessibility<host_execution_space, typename epsilons_view_type::memory_space>::accessible==1) &&
-                    "Views passed to generate2DNeighborListsFromKNNSearch should be accessible from the host.");
+            // temporary 1D array for cr_neighbor_lists
+            typedef typename neighbor_lists_view_type::value_type value_type;
+            size_t cr_neighbor_entries =  (is_dry_run) ? 0 : num_target_sites * neighbor_lists.extent(1);
+            Kokkos::View<value_type*, typename neighbor_lists_view_type::memory_space> 
+                cr_neighbor_lists(
+                    Kokkos::view_alloc(neighbor_lists.label(), 
+                        typename neighbor_lists_view_type::memory_space()), 
+                    cr_neighbor_entries);
 
-            // loop size
-            const int num_target_sites = trg_pts_view.extent(0);
+            // temporary 1D array for number_of_neighbors_list
+            typedef typename neighbor_lists_view_type::value_type value_type;
+            Kokkos::View<value_type*, typename neighbor_lists_view_type::memory_space> 
+                number_of_neighbors_list(
+                    Kokkos::view_alloc("number of neighbors list", 
+                        typename neighbor_lists_view_type::memory_space()), 
+                    num_target_sites);
+
+            if (!is_dry_run) { 
+                // number_of_neighbors_list not populated when !is_dry_run
+                Kokkos::parallel_for(Kokkos::RangePolicy<host_execution_space>(0, num_target_sites),
+                KOKKOS_LAMBDA(int i) {
+                    number_of_neighbors_list(i) = neighbor_lists(i,0);
+                });
+            }
+            
+            // doesn't fill number_of_neighbors_list when !is_dry_run
+            generateCRNeighborListsFromKNNSearch(is_dry_run, trg_pts_view,
+                cr_neighbor_lists, number_of_neighbors_list, epsilons, 
+                neighbors_needed, epsilon_multiplier, max_search_radius,
+                check_same);
 
-            //if ((!_tree_1d && _dim==1) || (!_tree_2d && _dim==2) || (!_tree_3d && _dim==3)) {
-            //    this->generateKDTree();
-            //}
-            //Kokkos::fence();
-
-            //compadre_assert_release((num_target_sites==0 || // sizes don't matter when there are no targets
-            //        (neighbor_lists.extent(0)==(size_t)num_target_sites 
-            //            && neighbor_lists.extent(1)>=(size_t)(neighbors_needed+1)))
-            //            && "neighbor lists View does not have large enough dimensions");
-            //compadre_assert_release((neighbor_lists_view_type::rank==2) && "neighbor_lists must be a 2D Kokkos view.");
-
-            //compadre_assert_release((epsilons.extent(0)==(size_t)num_target_sites)
-            //            && "epsilons View does not have the correct dimension");
-
-            //typedef Kokkos::View<double*, Kokkos::HostSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> > 
-            //        scratch_double_view;
-
-            //typedef Kokkos::View<size_t*, Kokkos::HostSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> > 
-            //        scratch_int_view;
-
-            //// determine scratch space size needed
-            //int team_scratch_size = 0;
-            //team_scratch_size += scratch_double_view::shmem_size(neighbor_lists.extent(1)); // distances
-            //team_scratch_size += scratch_int_view::shmem_size(neighbor_lists.extent(1)); // indices
-            //team_scratch_size += scratch_double_view::shmem_size(_dim); // target coordinate
-
-            //// minimum number of neighbors found over all target sites' neighborhoods
-            //size_t min_num_neighbors = 0;
-            ////
-            //// part 1. do knn search for neighbors needed for unisolvency
-            //// each row of neighbor lists is a neighbor list for the target site corresponding to that row
-            ////
-            //// as long as neighbor_lists can hold the number of neighbors_needed, we don't need to check
-            //// that the maximum number of neighbors will fit into neighbor_lists
-            ////
-            //Kokkos::parallel_reduce("knn search", host_team_policy(num_target_sites, Kokkos::AUTO)
-            //        .set_scratch_size(0 /*shared memory level*/, Kokkos::PerTeam(team_scratch_size)), 
-            //        KOKKOS_LAMBDA(const host_member_type& teamMember, size_t& t_min_num_neighbors) {
-
-            //    // make unmanaged scratch views
-            //    scratch_double_view neighbor_distances(teamMember.team_scratch(0 /*shared memory*/), neighbor_lists.extent(1));
-            //    scratch_int_view neighbor_indices(teamMember.team_scratch(0 /*shared memory*/), neighbor_lists.extent(1));
-            //    scratch_double_view this_target_coord(teamMember.team_scratch(0 /*shared memory*/), _dim);
-
-            //    size_t neighbors_found = 0;
-
-            //    const int i = teamMember.league_rank();
-
-            //    Kokkos::parallel_for(Kokkos::TeamThreadRange(teamMember, neighbor_lists.extent(1)), [=](const int j) {
-            //        neighbor_indices(j) = 0;
-            //        neighbor_distances(j) = -1.0;
-            //    });
-            //
-            //    teamMember.team_barrier();
-            //    Kokkos::single(Kokkos::PerTeam(teamMember), [&] () {
-            //        // target_coords is LayoutLeft on device and its HostMirror, so giving a pointer to 
-            //        // this data would lead to a wrong result if the device is a GPU
-
-            //        for (int j=0; j<_dim; ++j) { 
-            //            this_target_coord(j) = trg_pts_view(i,j);
-            //        }
-
-            //        if (_dim==1) {
-            //            neighbors_found = _tree_1d->knnSearch(this_target_coord.data(), neighbors_needed, 
-            //                    neighbor_indices.data(), neighbor_distances.data()) ;
-            //        } else if (_dim==2) {
-            //            neighbors_found = _tree_2d->knnSearch(this_target_coord.data(), neighbors_needed, 
-            //                    neighbor_indices.data(), neighbor_distances.data()) ;
-            //        } else if (_dim==3) {
-            //            neighbors_found = _tree_3d->knnSearch(this_target_coord.data(), neighbors_needed, 
-            //                    neighbor_indices.data(), neighbor_distances.data()) ;
-            //        }
-
-            //        // get minimum number of neighbors found over all target sites' neighborhoods
-            //        t_min_num_neighbors = (neighbors_found < t_min_num_neighbors) ? neighbors_found : t_min_num_neighbors;
-            //
-            //        // scale by epsilon_multiplier to window from location where the last neighbor was found
-            //        epsilons(i) = (neighbor_distances(neighbors_found-1) > 0) ?
-            //            std::sqrt(neighbor_distances(neighbors_found-1))*epsilon_multiplier : 1e-14*epsilon_multiplier;
-            //        // the only time the second case using 1e-14 is used is when either zero neighbors or exactly one 
-            //        // neighbor (neighbor is target site) is found.  when the follow on radius search is conducted, the one
-            //        // neighbor (target site) will not be found if left at 0, so any positive amount will do, however 1e-14 
-            //        // should is small enough to ensure that other neighbors are not found
-
-            //        // needs furthest neighbor's distance for next portion
-            //        compadre_kernel_assert_release((neighbors_found<neighbor_lists.extent(1) || is_dry_run) 
-            //                && "Neighbors found exceeded storage capacity in neighbor list.");
-            //        compadre_kernel_assert_release((epsilons(i)<=max_search_radius || max_search_radius==0 || is_dry_run) 
-            //                && "max_search_radius given (generally derived from the size of a halo region), \
-            //                    and search radius needed would exceed this max_search_radius.");
-            //        // neighbor_distances stores squared distances from neighbor to target, as returned by nanoflann
-            //    });
-            //}, Kokkos::Min<size_t>(min_num_neighbors) );
-            //Kokkos::fence();
-            //
-            //// if no target sites, then min_num_neighbors is set to neighbors_needed
-            //// which also avoids min_num_neighbors being improperly set by min reduction
-            //if (num_target_sites==0) min_num_neighbors = neighbors_needed;
-
-            //// Next, check that we found the neighbors_needed number that we require for unisolvency
-            //compadre_assert_release((num_target_sites==0 || (min_num_neighbors>=(size_t)neighbors_needed))
-            //        && "Neighbor search failed to find number of neighbors needed for unisolvency.");
-            //
-            //// call a radius search using values now stored in epsilons
-            //size_t max_num_neighbors = generate2DNeighborListsFromRadiusSearch(is_dry_run, trg_pts_view, neighbor_lists, 
-            //        epsilons, 0.0 /*don't set uniform radius*/, max_search_radius);
-
-            return 0;//max_num_neighbors;
+            size_t max_num_neighbors = 0;
+            if (!is_dry_run) {
+                auto nla = CreateNeighborLists(cr_neighbor_lists, number_of_neighbors_list);
+                ConvertCompressedRowNeighborListsTo2D(nla, neighbor_lists);
+                max_num_neighbors = nla.getMaxNumNeighbors();
+            } else {
+                Kokkos::parallel_for(Kokkos::RangePolicy<host_execution_space>(0, num_target_sites),
+                KOKKOS_LAMBDA(int i) {
+                    neighbor_lists(i,0) = number_of_neighbors_list(i);
+                });
+                Kokkos::fence();
+                auto nla = CreateNeighborLists(number_of_neighbors_list);
+                max_num_neighbors = nla.getMaxNumNeighbors();
+            }
+            return max_num_neighbors;
         }
 
         /*! \brief Generates compressed row neighbor lists by performing a k-nearest neighbor search
@@ -572,7 +512,7 @@ class PointCloudSearch {
         size_t generateCRNeighborListsFromKNNSearch(bool is_dry_run, trg_view_type trg_pts_view, 
                 neighbor_lists_view_type neighbor_lists, neighbor_lists_view_type number_of_neighbors_list,
                 epsilons_view_type epsilons, const int neighbors_needed, const double epsilon_multiplier = 1.6, 
-                double max_search_radius = 0.0) {
+                double max_search_radius = 0.0, bool check_same = true) {
 
             // First, do a knn search (removes need for guessing initial search radius)
 
@@ -610,8 +550,6 @@ class PointCloudSearch {
                     scratch_double_view;
             int team_scratch_size = 0;
             team_scratch_size += scratch_double_view::shmem_size(trg_pts_view.extent(1)); // distances
-            //Kokkos::parallel_reduce(Kokkos::RangePolicy<host_execution_space>(0, num_target_sites),
-            //KOKKOS_LAMBDA(int i, size_t& t_min_num_neighbors) {
             Kokkos::parallel_reduce("knn inspect", host_team_policy(num_target_sites, Kokkos::AUTO)
                     .set_scratch_size(0 /*shared memory level*/, Kokkos::PerTeam(team_scratch_size)), 
                     KOKKOS_LAMBDA(const host_member_type& teamMember, size_t& t_min_num_neighbors) {
@@ -646,7 +584,7 @@ class PointCloudSearch {
                 Kokkos::parallel_for(Kokkos::TeamThreadRange(teamMember, num_neighbors-1), [=](const int j) {
                     double this_distance = kdtreeDistance(trg_pt.data(), values(offsets(i)+j  ));
                     double next_distance = kdtreeDistance(trg_pt.data(), values(offsets(i)+j+1));
-                    compadre_kernel_assert_debug((this_distance<=next_distance) 
+                    compadre_kernel_assert_debug((this_distance-next_distance<1e-14) 
                         && "Neighbors returned by KD tree search are not ordered.");
                 });
 #endif
@@ -658,35 +596,8 @@ class PointCloudSearch {
             
             // call a radius search using values now stored in epsilons
             generateCRNeighborListsFromRadiusSearch(is_dry_run, trg_pts_view, neighbor_lists, 
-                    number_of_neighbors_list, epsilons, 0.0 /*don't set uniform radius*/, max_search_radius);
-
-            //        // scale by epsilon_multiplier to window from location where the last neighbor was found
-            //        epsilons(i) = (neighbor_distances(neighbors_found-1) > 0) ?
-            //            std::sqrt(neighbor_distances(neighbors_found-1))*epsilon_multiplier : 1e-14*epsilon_multiplier;
-            //        // the only time the second case using 1e-14 is used is when either zero neighbors or exactly one 
-            //        // neighbor (neighbor is target site) is found.  when the follow on radius search is conducted, the one
-            //        // neighbor (target site) will not be found if left at 0, so any positive amount will do, however 1e-14 
-            //        // should is small enough to ensure that other neighbors are not found
-
-            //        compadre_kernel_assert_release((epsilons(i)<=max_search_radius || max_search_radius==0 || is_dry_run) 
-            //                && "max_search_radius given (generally derived from the size of a halo region), \
-            //                    and search radius needed would exceed this max_search_radius.");
-            //        // neighbor_distances stores squared distances from neighbor to target, as returned by nanoflann
-            //    });
-            //}, Kokkos::Min<size_t>(min_num_neighbors) );
-            //Kokkos::fence();
-            //
-            //// if no target sites, then min_num_neighbors is set to neighbors_needed
-            //// which also avoids min_num_neighbors being improperly set by min reduction
-            //if (num_target_sites==0) min_num_neighbors = neighbors_needed;
-
-            //// Next, check that we found the neighbors_needed number that we require for unisolvency
-            //compadre_assert_release((num_target_sites==0 || (min_num_neighbors>=(size_t)neighbors_needed))
-            //        && "Neighbor search failed to find number of neighbors needed for unisolvency.");
-            //
-            //// call a radius search using values now stored in epsilons
-            //generateCRNeighborListsFromRadiusSearch(is_dry_run, trg_pts_view, neighbor_lists, 
-            //        number_of_neighbors_list, epsilons, 0.0 /*don't set uniform radius*/, max_search_radius);
+                    number_of_neighbors_list, epsilons, 0.0 /*don't set uniform radius*/, 
+                    max_search_radius, check_same);
 
             auto nla = CreateNeighborLists(number_of_neighbors_list);
             return nla.getTotalNeighborsOverAllListsHost();

From 4f24ba241cf3683e9ec6ad60c026f52965edf901 Mon Sep 17 00:00:00 2001
From: Paul Kuberry <pakuber@sandia.gov>
Date: Mon, 27 Sep 2021 13:26:43 -0600
Subject: [PATCH 12/40] Added Compadre_USE_ARBORX option to CMake

- If Compadre_USE_ARBORX is not set to on, then default back to
  nanoflann search routine
---
 CMakeLists.txt                              |   8 +-
 examples/NeighborSearchTest.cpp             |  13 +-
 src/CMakeLists.txt                          |   4 +-
 src/Compadre_PointCloudSearch.hpp           | 603 +--------------
 src/Compadre_PointCloudSearch_ArborX.hpp    | 595 +++++++++++++++
 src/Compadre_PointCloudSearch_Nanoflann.hpp | 787 ++++++++++++++++++++
 6 files changed, 1409 insertions(+), 601 deletions(-)
 create mode 100644 src/Compadre_PointCloudSearch_ArborX.hpp
 create mode 100644 src/Compadre_PointCloudSearch_Nanoflann.hpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 78c2e58cf..88c5bebd1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -351,8 +351,11 @@ else() # Raw CMake Project
     set(Compadre_EXT_DEPS Kokkos KokkosKernels)
   endif()
 
-  option(ARBORX_ENABLE_MPI "" "${Compadre_USE_MPI}")
-  add_subdirectory(arborx)
+  bob_option(Compadre_USE_ARBORX "Use ArborX for neighbor search" OFF)
+  if (Compadre_USE_ARBORX)
+    option(ARBORX_ENABLE_MPI "" "${Compadre_USE_MPI}")
+    add_subdirectory(arborx)
+  endif()
 
 
   #MPI (Not really needed, only used so that if a kokkos-tool was built with MPI, it won't segfault)
@@ -402,6 +405,7 @@ set(Compadre_KEY_BOOLS
     Compadre_USE_CUDA
     Compadre_USE_MPI
     Compadre_USE_PYTHON
+    Compadre_USE_ARBORX
    )
 
 set(Compadre_KEY_INTS
diff --git a/examples/NeighborSearchTest.cpp b/examples/NeighborSearchTest.cpp
index 481e3debd..ebc51e9c7 100644
--- a/examples/NeighborSearchTest.cpp
+++ b/examples/NeighborSearchTest.cpp
@@ -198,8 +198,11 @@ bool all_passed = true;
             auto nla(CreateNeighborLists(neighbor_lists, number_neighbors_list));
 
             double radius_search_time = timer.seconds();
+#ifdef COMPADRE_USE_ARBORX
             printf("arborx search time: %f s\n", radius_search_time);
-
+#else
+            printf("nanoflann search time: %f s\n", radius_search_time);
+#endif
             // convert point cloud search to vector of maps
             timer.reset();
             std::vector<std::map<int, double> > point_cloud_neighbor_list(number_target_coords, std::map<int, double>());
@@ -313,7 +316,11 @@ bool all_passed = true;
                 target_coords, neighbor_lists, epsilon);
 
             double radius_search_time = timer.seconds();
+#ifdef COMPADRE_USE_ARBORX
             printf("arborx search time: %f s\n", radius_search_time);
+#else
+            printf("nanoflann search time: %f s\n", radius_search_time);
+#endif
 
             // convert point cloud search to vector of maps
             timer.reset();
@@ -430,7 +437,11 @@ bool all_passed = true;
             auto nla = Convert2DToCompressedRowNeighborLists(neighbor_lists);
 
             double radius_search_time = timer.seconds();
+#ifdef COMPADRE_USE_ARBORX
             printf("arborx search time: %f s\n", radius_search_time);
+#else
+            printf("nanoflann search time: %f s\n", radius_search_time);
+#endif
 
             // convert point cloud search to vector of maps
             timer.reset();
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 03102ae3b..48d41a719 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -55,7 +55,9 @@ elseif (KOKKOSKERNELS_BUILT_FOR_USER) # Kokkos-Kernels built for user by this pr
   target_link_libraries(compadre PUBLIC Kokkos::kokkoskernels)
 endif()
 
-target_link_libraries(compadre PUBLIC ArborX::ArborX)
+if (Compadre_USE_ARBORX)
+  target_link_libraries(compadre PUBLIC ArborX::ArborX)
+endif()
 
 # link to MPI
 if (Compadre_USE_MPI)
diff --git a/src/Compadre_PointCloudSearch.hpp b/src/Compadre_PointCloudSearch.hpp
index 03a8d8ff5..54dc1ccd4 100644
--- a/src/Compadre_PointCloudSearch.hpp
+++ b/src/Compadre_PointCloudSearch.hpp
@@ -3,606 +3,15 @@
 
 #include "Compadre_Typedefs.hpp"
 #include "Compadre_NeighborLists.hpp"
-#include <Kokkos_Core.hpp>
-#include <ArborX_LinearBVH.hpp>
-
-template <typename view_type_1>
-struct Points {
-    view_type_1 _pts;
-    Points(view_type_1 pts): 
-                _pts(pts) {}
-};
-
-template <typename view_type>
-struct ArborX::AccessTraits<Points<view_type>, ArborX::PrimitivesTag>
-{
-    static KOKKOS_FUNCTION std::size_t size(Points<view_type> const &cloud)
-    {
-        return cloud._pts.extent(0);
-    }
-    static KOKKOS_FUNCTION ArborX::Point get(Points<view_type> const &cloud, std::size_t i)
-    {
-        switch (cloud._pts.extent(1)) {
-        case 3:
-            return ArborX::Point(cloud._pts(i,0), cloud._pts(i,1), cloud._pts(i,2));
-        case 2:
-            return ArborX::Point(cloud._pts(i,0), cloud._pts(i,1),             0.0);
-        case 1:
-            return ArborX::Point(cloud._pts(i,0),             0.0,             0.0);
-        default:
-            compadre_kernel_assert_release(false && "Invalid dimension for cloud.");
-            return ArborX::Point(           0.0,             0.0,             0.0);
-        }
-    }
-    using memory_space = host_memory_space;
-};
-
-template <typename view_type_1, typename view_type_2>
-struct Radius {
-
-    view_type_1 _pts;
-    view_type_2 _radii;
-    double _uniform_radius;
-    double _max_search_radius;
-
-    Radius(view_type_1 pts, view_type_2 radii, const double uniform_radius, 
-            const double max_search_radius) : 
-                _pts(pts), _radii(radii),
-                _uniform_radius(uniform_radius), 
-                _max_search_radius(max_search_radius) 
-    {}
-};
-
-template <typename view_type_1, typename view_type_2>
-struct ArborX::AccessTraits<Radius<view_type_1, view_type_2>, ArborX::PredicatesTag>
-{
-  static KOKKOS_FUNCTION std::size_t size(Radius<view_type_1, view_type_2> const &cloud)
-  {
-      return cloud._pts.extent(0);
-  }
-  static KOKKOS_FUNCTION ArborX::Intersects<ArborX::Sphere> 
-      get(Radius<view_type_1, view_type_2> const &cloud, std::size_t i)
-  {
-      double radius = (cloud._uniform_radius != 0) ? cloud._uniform_radius : cloud._radii(i);
-      cloud._radii(i) = radius;
-      compadre_kernel_assert_release((cloud._radii(i)<=cloud._max_search_radius || cloud._max_search_radius==0) 
-              && "max_search_radius given (generally derived from the size of a halo region), \
-              and search radius needed would exceed this max_search_radius.");
-      switch (cloud._pts.extent(1)) {
-      case 3:
-          return ArborX::intersects(ArborX::Sphere(
-                      ArborX::Point(cloud._pts(i,0), cloud._pts(i,1), cloud._pts(i,2)), 
-                      radius));
-      case 2:
-          return ArborX::intersects(ArborX::Sphere(
-                      ArborX::Point(cloud._pts(i,0), cloud._pts(i,1),             0.0), 
-                      radius));
-      case 1:
-          return ArborX::intersects(ArborX::Sphere(
-                      ArborX::Point(cloud._pts(i,0),             0.0,             0.0), 
-                      radius));
-      default:
-          compadre_kernel_assert_release(false && "Invalid dimension for cloud.");
-          return ArborX::intersects(ArborX::Sphere(
-                      ArborX::Point(            0.0,             0.0,             0.0),
-                      radius));
-      }
-  }
-  using memory_space = host_memory_space;
-};
-
-template <typename view_type_1>
-struct NearestNeighbor {
-
-    view_type_1 _pts;
-    int _neighbors_needed;
-
-    NearestNeighbor(view_type_1 pts, const int neighbors_needed) :
-                _pts(pts), _neighbors_needed(neighbors_needed)
-    {}
-};
-
-template <typename view_type_1>
-struct ArborX::AccessTraits<NearestNeighbor<view_type_1>, ArborX::PredicatesTag>
-{
-  static KOKKOS_FUNCTION std::size_t size(NearestNeighbor<view_type_1> const &cloud)
-  {
-      return cloud._pts.extent(0);
-  }
-  static KOKKOS_FUNCTION ArborX::Nearest<ArborX::Point> 
-      get(NearestNeighbor<view_type_1> const &cloud, std::size_t i)
-  {
-      switch (cloud._pts.extent(1)) {
-      case 3:
-          return ArborX::nearest(
-                      ArborX::Point(cloud._pts(i,0), cloud._pts(i,1), cloud._pts(i,2)), 
-                      cloud._neighbors_needed);
-      case 2:
-          return ArborX::nearest(
-                      ArborX::Point(cloud._pts(i,0), cloud._pts(i,1),             0.0), 
-                      cloud._neighbors_needed);
-      case 1:
-          return ArborX::nearest(
-                      ArborX::Point(cloud._pts(i,0),             0.0,             0.0), 
-                      cloud._neighbors_needed);
-      default:
-          compadre_kernel_assert_release(false && "Invalid dimension for cloud.");
-          return ArborX::nearest(
-                      ArborX::Point(            0.0,             0.0,             0.0),
-                      cloud._neighbors_needed);
-      }
-  }
-  using memory_space = host_memory_space;
-};
-
-//template <>
-//struct ArborX::AccessTraits<NearestToOrigin, ArborX::PredicatesTag>
-//{
-//  static KOKKOS_FUNCTION std::size_t size(NearestToOrigin const &)
-//  {
-//    return 1;
-//  }
-//  static KOKKOS_FUNCTION auto get(NearestToOrigin const &d, std::size_t)
-//  {
-//    return ArborX::nearest(ArborX::Point{{0, 0, 0}}, d.k);
-//  }
-//  using memory_space = device_memory_space();
-//};
-
-namespace Compadre {
-
-//!  PointCloudSearch generates neighbor lists and window sizes for each target site
-/*!
-*  Search methods can be run in dry-run mode, or not.
-*
-*  #### When in dry-run mode:
-*                                                                                                                         
-*    `neighbors_list` will be populated with number of neighbors found for each target site.
-*
-*    This allows a user to know memory allocation needed before storage of neighbor indices.
-*                                                                                                                         
-*  #### When not in dry-run mode:
-*
-*    `neighbors_list_offsets` will be populated with offsets for values (dependent on method) determined by neighbor_list.
-*    If a 2D view for `neighbors_list` is used, then \f$ N(i,j+1) \f$ will store the \f$ j^{th} \f$ neighbor of \f$ i \f$,
-*    and \f$ N(i,0) \f$ will store the number of neighbors for target \f$ i \f$.
-*
-*/
-template <typename view_type>
-class PointCloudSearch {
-
-    protected:
-
-        //! source site coordinates
-        view_type _src_pts_view;
-        local_index_type _dim;
-        local_index_type _max_leaf;
-
-        ArborX::BVH<host_memory_space> _tree;
-
-    public:
-
-        PointCloudSearch(view_type src_pts_view, const local_index_type dimension = -1,
-                const local_index_type max_leaf = -1) 
-                : _src_pts_view(src_pts_view), 
-                  _dim((dimension < 0) ? src_pts_view.extent(1) : dimension),
-                  _max_leaf((max_leaf < 0) ? 10 : max_leaf) {
-            compadre_assert_release((Kokkos::SpaceAccessibility<host_execution_space, typename view_type::memory_space>::accessible==1)
-                    && "Views passed to PointCloudSearch at construction should be accessible from the host.");
-
-            {
-                //if (Kokkos::SpaceAccessibility<device_execution_space, 
-                //        typename trg_view_type::memory_space>::accessible==1) {
-                    _tree = ArborX::BVH<host_memory_space>(host_execution_space(), 
-                                Points<view_type>(_src_pts_view));
-                //}
-            }
-        };
-    
-        ~PointCloudSearch() {};
-
-        //! Returns a liberal estimated upper bound on number of neighbors to be returned by a neighbor search
-        //! for a given choice of dimension, basis size, and epsilon_multiplier. Assumes quasiuniform distribution
-        //! of points. This result can be used to size a preallocated neighbor_lists kokkos view.
-        static inline int getEstimatedNumberNeighborsUpperBound(int unisolvency_size, const int dimension, const double epsilon_multiplier) {
-            int multiplier = 1;
-            if (dimension==1) multiplier = 2;
-            return multiplier * 2.0 * unisolvency_size * std::pow(epsilon_multiplier, dimension) + 1; // +1 is for the number of neighbors entry needed in the first entry of each row
-        }
-
-        //! Returns the distance between a point and a source site, given its index
-        inline double kdtreeDistance(const double* queryPt, const int idx) const {
-
-            double distance = 0;
-            for (int i=0; i<_dim; ++i) {
-                distance += (_src_pts_view(idx,i)-queryPt[i])*(_src_pts_view(idx,i)-queryPt[i]);
-            }
-            return std::sqrt(distance);
-
-        }
-
-        /*! \brief Generates neighbor lists of 2D view by performing a radius search 
-            where the radius to be searched is in the epsilons view.
-            If uniform_radius is given, then this overrides the epsilons view radii sizes.
-            Accepts 2D neighbor_lists without number_of_neighbors_list.
-            \param is_dry_run               [in] - whether to do a dry-run (find neighbors, but don't store)
-            \param trg_pts_view             [in] - target coordinates from which to seek neighbors
-            \param neighbor_lists           [out] - 2D view of neighbor lists to be populated from search
-            \param epsilons                 [in/out] - radius to search, overwritten if uniform_radius != 0
-            \param uniform_radius           [in] - double != 0 determines whether to overwrite all epsilons for uniform search
-            \param max_search_radius        [in] - largest valid search (useful only for MPI jobs if halo size exists)
-        */
-        template <typename trg_view_type, typename neighbor_lists_view_type, typename epsilons_view_type>
-        size_t generate2DNeighborListsFromRadiusSearch(bool is_dry_run, trg_view_type trg_pts_view, 
-                neighbor_lists_view_type& neighbor_lists, epsilons_view_type epsilons, 
-                const double uniform_radius = 0.0, double max_search_radius = 0.0,
-                bool check_same = true) {
-
-            // function does not populate epsilons, they must be prepopulated
-            const int num_target_sites = trg_pts_view.extent(0);
- 
-            // check neighbor lists and epsilons view sizes
-            compadre_assert_release((neighbor_lists.extent(0)==(size_t)num_target_sites 
-                        && neighbor_lists.extent(1)>=1)
-                        && "neighbor lists View does not have large enough dimensions");
-            compadre_assert_release((neighbor_lists_view_type::rank==2) && "neighbor_lists must be a 2D Kokkos view.");
-
-
-            // temporary 1D array for cr_neighbor_lists
-            typedef typename neighbor_lists_view_type::value_type value_type;
-            size_t cr_neighbor_entries =  (is_dry_run) ? 0 : num_target_sites * neighbor_lists.extent(1);
-            Kokkos::View<value_type*, typename neighbor_lists_view_type::memory_space> 
-                cr_neighbor_lists(
-                    Kokkos::view_alloc(neighbor_lists.label(), 
-                        typename neighbor_lists_view_type::memory_space()), 
-                    cr_neighbor_entries);
-
-            // temporary 1D array for number_of_neighbors_list
-            typedef typename neighbor_lists_view_type::value_type value_type;
-            Kokkos::View<value_type*, typename neighbor_lists_view_type::memory_space> 
-                number_of_neighbors_list(
-                    Kokkos::view_alloc("number of neighbors list", 
-                        typename neighbor_lists_view_type::memory_space()), 
-                    num_target_sites);
-
-            if (!is_dry_run) { 
-                // number_of_neighbors_list not populated when !is_dry_run
-                Kokkos::parallel_for(Kokkos::RangePolicy<host_execution_space>(0, num_target_sites),
-                KOKKOS_LAMBDA(int i) {
-                    number_of_neighbors_list(i) = neighbor_lists(i,0);
-                });
-                Kokkos::fence();
-            }
-            
-            // doesn't fill number_of_neighbors_list when !is_dry_run
-            generateCRNeighborListsFromRadiusSearch(is_dry_run, trg_pts_view,
-                cr_neighbor_lists, number_of_neighbors_list, epsilons, uniform_radius, 
-                max_search_radius, check_same);
-
-            size_t max_num_neighbors = 0;
-            if (!is_dry_run) {
-                auto nla = CreateNeighborLists(cr_neighbor_lists, number_of_neighbors_list);
-                ConvertCompressedRowNeighborListsTo2D(nla, neighbor_lists);
-                max_num_neighbors = nla.getMaxNumNeighbors();
-            } else {
-                Kokkos::parallel_for(Kokkos::RangePolicy<host_execution_space>(0, num_target_sites),
-                KOKKOS_LAMBDA(int i) {
-                    neighbor_lists(i,0) = number_of_neighbors_list(i);
-                });
-                Kokkos::fence();
-                auto nla = CreateNeighborLists(number_of_neighbors_list);
-                max_num_neighbors = nla.getMaxNumNeighbors();
-            }
-            
-            return max_num_neighbors;
-        }
-
-        /*! \brief Generates compressed row neighbor lists by performing a radius search 
-            where the radius to be searched is in the epsilons view.
-            If uniform_radius is given, then this overrides the epsilons view radii sizes.
-            Accepts 1D neighbor_lists with 1D number_of_neighbors_list.
-            \param is_dry_run               [in] - whether to do a dry-run (find neighbors, but don't store)
-            \param trg_pts_view             [in] - target coordinates from which to seek neighbors
-            \param neighbor_lists           [out] - 1D view of neighbor lists to be populated from search
-            \param number_of_neighbors_list [in/out] - number of neighbors for each target site
-            \param epsilons                 [in/out] - radius to search, overwritten if uniform_radius != 0
-            \param uniform_radius           [in] - double != 0 determines whether to overwrite all epsilons for uniform search
-            \param max_search_radius        [in] - largest valid search (useful only for MPI jobs if halo size exists)
-        */
-        template <typename trg_view_type, typename neighbor_lists_view_type, typename epsilons_view_type>
-        size_t generateCRNeighborListsFromRadiusSearch(bool is_dry_run, trg_view_type trg_pts_view, 
-                neighbor_lists_view_type neighbor_lists, neighbor_lists_view_type number_of_neighbors_list, 
-                epsilons_view_type epsilons, const double uniform_radius = 0.0, 
-                double max_search_radius = 0.0, bool check_same = true) {
-
-            // function does not populate epsilons, they must be prepopulated
 
-            compadre_assert_release((Kokkos::SpaceAccessibility<host_execution_space, typename trg_view_type::memory_space>::accessible==1) &&
-                    "Target coordinates view passed to generateCRNeighborListsFromRadiusSearch should be accessible from the host.");
-            compadre_assert_release((((int)trg_pts_view.extent(1))>=_dim) &&
-                    "Target coordinates view passed to generateCRNeighborListsFromRadiusSearch must have \
-                    second dimension as large as _dim.");
-            compadre_assert_release((Kokkos::SpaceAccessibility<host_execution_space, typename neighbor_lists_view_type::memory_space>::accessible==1) &&
-                    "Views passed to generateCRNeighborListsFromRadiusSearch should be accessible from the host.");
-            compadre_assert_release((Kokkos::SpaceAccessibility<host_execution_space, typename epsilons_view_type::memory_space>::accessible==1) &&
-                    "Views passed to generateCRNeighborListsFromRadiusSearch should be accessible from the host.");
-
-            // loop size
-            const int num_target_sites = trg_pts_view.extent(0);
-
-            compadre_assert_release((number_of_neighbors_list.extent(0)==(size_t)num_target_sites)
-                        && "number_of_neighbors_list or neighbor lists View does not have large enough dimensions");
-            compadre_assert_release((neighbor_lists_view_type::rank==1) && "neighbor_lists must be a 1D Kokkos view.");
-            compadre_assert_release((epsilons.extent(0)==(size_t)num_target_sites)
-                        && "epsilons View does not have the correct dimension");
-
-            // perform tree search
-            Kokkos::View<int *, host_memory_space> values("values", 0);
-            Kokkos::View<int *, host_memory_space> offsets("offsets", 0);
-            auto predicates = Radius<trg_view_type,epsilons_view_type>(trg_pts_view, epsilons,
-                    uniform_radius, max_search_radius);
-            _tree.query(host_execution_space(), predicates, values, offsets);
-
-            // set number of neighbors list (how many neighbors for each target site) based
-            // on results on tree query
-            Kokkos::parallel_for(Kokkos::RangePolicy<host_execution_space>(0, num_target_sites),
-            KOKKOS_LAMBDA(int i) {
-                size_t neighbors_found_for_target_i = offsets(i+1) - offsets(i);
-                if (!is_dry_run && check_same) { // check it is as expected before overwriting
-                    compadre_kernel_assert_debug(
-                            (neighbors_found_for_target_i==(size_t)number_of_neighbors_list(i)) 
-                            && "Number of neighbors found changed since dry-run.");
-                }
-                number_of_neighbors_list(i) = neighbors_found_for_target_i;
-            });
-            Kokkos::fence();
-
-            // build a row offsets object (only if not a dry run)
-            typedef Kokkos::View<global_index_type*, typename neighbor_lists_view_type::array_layout,
-                    typename neighbor_lists_view_type::memory_space, typename neighbor_lists_view_type::memory_traits> row_offsets_view_type;
-            row_offsets_view_type row_offsets;
-            if (!is_dry_run) {
-                auto nla = CreateNeighborLists(neighbor_lists, number_of_neighbors_list);
-                Kokkos::resize(row_offsets, num_target_sites);
-                Kokkos::fence();
-                Kokkos::parallel_for(Kokkos::RangePolicy<host_execution_space>(0,num_target_sites), [&](const int i) {
-                    row_offsets(i) = nla.getRowOffsetHost(i); 
-                });
-                Kokkos::fence();
-            }
-
-            // sort to put closest neighbor first (other neighbors are not affected)
-            typedef Kokkos::View<double*, Kokkos::HostSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> > 
-                    scratch_double_view;
-            int team_scratch_size = 0;
-            team_scratch_size += scratch_double_view::shmem_size(trg_pts_view.extent(1)); // distances
-            Kokkos::parallel_for("first entry sort", host_team_policy(num_target_sites, Kokkos::AUTO)
-                    .set_scratch_size(0 /*shared memory level*/, Kokkos::PerTeam(team_scratch_size)), 
-                    KOKKOS_LAMBDA(const host_member_type& teamMember) {
-
-                const int i = teamMember.league_rank();
-
-                // make unmanaged scratch views
-                scratch_double_view trg_pt(teamMember.team_scratch(0 /*shared memory*/), trg_pts_view.extent(1));
-                for (int j=0; j<trg_pts_view.extent(1); ++j) {
-                    trg_pt(j) = trg_pts_view(i,j);
-                }
-
-                // find swap index
-                int min_distance_ind = 0;
-                double first_neighbor_distance = kdtreeDistance(trg_pt.data(), values(offsets(i)));
-                for (int j=1; j<number_of_neighbors_list(i); ++j) {
-                    // distance to neighbor
-                    double neighbor_distance = kdtreeDistance(trg_pt.data(), values(offsets(i)+j));
-                    if (neighbor_distance < first_neighbor_distance) {
-                        first_neighbor_distance = neighbor_distance;
-                        min_distance_ind = j;
-                    }
-                }
-                // do the swap
-                if (min_distance_ind != 0) {
-                    int tmp = values(offsets(i));
-                    values(offsets(i)) = values(offsets(i)+min_distance_ind);
-                    values(offsets(i)+min_distance_ind) = tmp;
-
-                }
-            });
-            Kokkos::fence();
-
-            // copy neighbor list values over from tree query
-            if (!is_dry_run) {
-                Kokkos::parallel_for(Kokkos::RangePolicy<host_execution_space>(0, num_target_sites),
-                KOKKOS_LAMBDA(int i) {
-                    for (int j=0; j<number_of_neighbors_list(i); ++j) {
-                        neighbor_lists(row_offsets(i)+j) = values(offsets(i)+j);
-                    }
-                });
-                Kokkos::fence();
-            }
-
-            auto nla = CreateNeighborLists(number_of_neighbors_list);
-            return nla.getTotalNeighborsOverAllListsHost();
-        }
-
-
-        /*! \brief Generates neighbor lists as 2D view by performing a k-nearest neighbor search
-            Only accepts 2D neighbor_lists without number_of_neighbors_list.
-            \param is_dry_run               [in] - whether to do a dry-run (find neighbors, but don't store)
-            \param trg_pts_view             [in] - target coordinates from which to seek neighbors
-            \param neighbor_lists           [out] - 2D view of neighbor lists to be populated from search
-            \param epsilons                 [in/out] - radius to search, overwritten if uniform_radius != 0
-            \param neighbors_needed         [in] - k neighbors needed as a minimum
-            \param epsilon_multiplier       [in] - distance to kth neighbor multiplied by epsilon_multiplier for follow-on radius search
-            \param max_search_radius        [in] - largest valid search (useful only for MPI jobs if halo size exists)
-        */
-        template <typename trg_view_type, typename neighbor_lists_view_type, typename epsilons_view_type>
-        size_t generate2DNeighborListsFromKNNSearch(bool is_dry_run, trg_view_type trg_pts_view, 
-                neighbor_lists_view_type neighbor_lists, epsilons_view_type epsilons, 
-                const int neighbors_needed, const double epsilon_multiplier = 1.6, 
-                double max_search_radius = 0.0, bool check_same = true) {
-
-            const int num_target_sites = trg_pts_view.extent(0);
- 
-            // check neighbor lists and epsilons view sizes
-            compadre_assert_release((neighbor_lists.extent(0)==(size_t)num_target_sites 
-                        && neighbor_lists.extent(1)>=1)
-                        && "neighbor lists View does not have large enough dimensions");
-            compadre_assert_release((neighbor_lists_view_type::rank==2) && "neighbor_lists must be a 2D Kokkos view.");
-
-            // temporary 1D array for cr_neighbor_lists
-            typedef typename neighbor_lists_view_type::value_type value_type;
-            size_t cr_neighbor_entries =  (is_dry_run) ? 0 : num_target_sites * neighbor_lists.extent(1);
-            Kokkos::View<value_type*, typename neighbor_lists_view_type::memory_space> 
-                cr_neighbor_lists(
-                    Kokkos::view_alloc(neighbor_lists.label(), 
-                        typename neighbor_lists_view_type::memory_space()), 
-                    cr_neighbor_entries);
-
-            // temporary 1D array for number_of_neighbors_list
-            typedef typename neighbor_lists_view_type::value_type value_type;
-            Kokkos::View<value_type*, typename neighbor_lists_view_type::memory_space> 
-                number_of_neighbors_list(
-                    Kokkos::view_alloc("number of neighbors list", 
-                        typename neighbor_lists_view_type::memory_space()), 
-                    num_target_sites);
-
-            if (!is_dry_run) { 
-                // number_of_neighbors_list not populated when !is_dry_run
-                Kokkos::parallel_for(Kokkos::RangePolicy<host_execution_space>(0, num_target_sites),
-                KOKKOS_LAMBDA(int i) {
-                    number_of_neighbors_list(i) = neighbor_lists(i,0);
-                });
-            }
-            
-            // doesn't fill number_of_neighbors_list when !is_dry_run
-            generateCRNeighborListsFromKNNSearch(is_dry_run, trg_pts_view,
-                cr_neighbor_lists, number_of_neighbors_list, epsilons, 
-                neighbors_needed, epsilon_multiplier, max_search_radius,
-                check_same);
-
-            size_t max_num_neighbors = 0;
-            if (!is_dry_run) {
-                auto nla = CreateNeighborLists(cr_neighbor_lists, number_of_neighbors_list);
-                ConvertCompressedRowNeighborListsTo2D(nla, neighbor_lists);
-                max_num_neighbors = nla.getMaxNumNeighbors();
-            } else {
-                Kokkos::parallel_for(Kokkos::RangePolicy<host_execution_space>(0, num_target_sites),
-                KOKKOS_LAMBDA(int i) {
-                    neighbor_lists(i,0) = number_of_neighbors_list(i);
-                });
-                Kokkos::fence();
-                auto nla = CreateNeighborLists(number_of_neighbors_list);
-                max_num_neighbors = nla.getMaxNumNeighbors();
-            }
-            return max_num_neighbors;
-        }
-
-        /*! \brief Generates compressed row neighbor lists by performing a k-nearest neighbor search
-            Only accepts 1D neighbor_lists with 1D number_of_neighbors_list.
-            \param is_dry_run               [in] - whether to do a dry-run (find neighbors, but don't store)
-            \param trg_pts_view             [in] - target coordinates from which to seek neighbors
-            \param neighbor_lists           [out] - 1D view of neighbor lists to be populated from search
-            \param number_of_neighbors_list [in/out] - number of neighbors for each target site
-            \param epsilons                 [in/out] - radius to search, overwritten if uniform_radius != 0
-            \param neighbors_needed         [in] - k neighbors needed as a minimum
-            \param epsilon_multiplier       [in] - distance to kth neighbor multiplied by epsilon_multiplier for follow-on radius search
-            \param max_search_radius        [in] - largest valid search (useful only for MPI jobs if halo size exists)
-        */
-        template <typename trg_view_type, typename neighbor_lists_view_type, typename epsilons_view_type>
-        size_t generateCRNeighborListsFromKNNSearch(bool is_dry_run, trg_view_type trg_pts_view, 
-                neighbor_lists_view_type neighbor_lists, neighbor_lists_view_type number_of_neighbors_list,
-                epsilons_view_type epsilons, const int neighbors_needed, const double epsilon_multiplier = 1.6, 
-                double max_search_radius = 0.0, bool check_same = true) {
-
-            // First, do a knn search (removes need for guessing initial search radius)
-
-            compadre_assert_release((Kokkos::SpaceAccessibility<host_execution_space, typename trg_view_type::memory_space>::accessible==1) &&
-                    "Target coordinates view passed to generateCRNeighborListsFromKNNSearch should be accessible from the host.");
-            compadre_assert_release((((int)trg_pts_view.extent(1))>=_dim) &&
-                    "Target coordinates view passed to generateCRNeighborListsFromRadiusSearch must have \
-                    second dimension as large as _dim.");
-            compadre_assert_release((Kokkos::SpaceAccessibility<host_execution_space, typename neighbor_lists_view_type::memory_space>::accessible==1) &&
-                    "Views passed to generateCRNeighborListsFromKNNSearch should be accessible from the host.");
-            compadre_assert_release((Kokkos::SpaceAccessibility<host_execution_space, typename epsilons_view_type::memory_space>::accessible==1) &&
-                    "Views passed to generateCRNeighborListsFromKNNSearch should be accessible from the host.");
-
-            // loop size
-            const int num_target_sites = trg_pts_view.extent(0);
-
-            compadre_assert_release((number_of_neighbors_list.extent(0)==(size_t)num_target_sites)
-                        && "number_of_neighbors_list or neighbor lists View does not have large enough dimensions");
-            compadre_assert_release((neighbor_lists_view_type::rank==1) && "neighbor_lists must be a 1D Kokkos view.");
-            compadre_assert_release((epsilons.extent(0)==(size_t)num_target_sites)
-                        && "epsilons View does not have the correct dimension");
-
-            // perform tree search
-            Kokkos::View<int *, host_memory_space> values("values", 0);
-            Kokkos::View<int *, host_memory_space> offsets("offsets", 0);
-            auto predicates = NearestNeighbor<trg_view_type>(trg_pts_view, neighbors_needed);
-            _tree.query(host_execution_space(), predicates, values, offsets);
-
-            size_t min_num_neighbors = 0;
-            // if no target sites, then min_num_neighbors is set to neighbors_needed
-            if (num_target_sites==0) min_num_neighbors = neighbors_needed;
-
-            // get min_num_neighbors
-            typedef Kokkos::View<double*, Kokkos::HostSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> > 
-                    scratch_double_view;
-            int team_scratch_size = 0;
-            team_scratch_size += scratch_double_view::shmem_size(trg_pts_view.extent(1)); // distances
-            Kokkos::parallel_reduce("knn inspect", host_team_policy(num_target_sites, Kokkos::AUTO)
-                    .set_scratch_size(0 /*shared memory level*/, Kokkos::PerTeam(team_scratch_size)), 
-                    KOKKOS_LAMBDA(const host_member_type& teamMember, size_t& t_min_num_neighbors) {
-
-                const int i = teamMember.league_rank();
-
-                size_t num_neighbors = offsets(i+1) - offsets(i);
-                t_min_num_neighbors = (num_neighbors < t_min_num_neighbors) ?
-                                        num_neighbors : t_min_num_neighbors;
-
-                // make unmanaged scratch views
-                scratch_double_view trg_pt(teamMember.team_scratch(0 /*shared memory*/), trg_pts_view.extent(1));
-                for (int j=0; j<trg_pts_view.extent(1); ++j) {
-                    trg_pt(j) = trg_pts_view(i,j);
-                }
-                double last_neighbor_distance = kdtreeDistance(trg_pt.data(), values(offsets(i)+num_neighbors-1));
-
-                // scale by epsilon_multiplier to window from location where the last neighbor was found
-                epsilons(i) = (last_neighbor_distance > 0) ? 
-                                    last_neighbor_distance*epsilon_multiplier
-                                  : 1e-14*epsilon_multiplier;
-                // the only time the second case using 1e-14 is used is when either zero neighbors or exactly one 
-                // neighbor (neighbor is target site) is found.  when the follow on radius search is conducted, the one
-                // neighbor (target site) will not be found if left at 0, so any positive amount will do, however 1e-14 
-                // should be small enough to ensure that other neighbors are not found
-
-                compadre_kernel_assert_release((epsilons(i)<=max_search_radius || max_search_radius==0 || is_dry_run) 
-                        && "max_search_radius given (generally derived from the size of a halo region), \
-                            and search radius needed would exceed this max_search_radius.");
-
-#ifdef COMPADRE_DEBUG
-                Kokkos::parallel_for(Kokkos::TeamThreadRange(teamMember, num_neighbors-1), [=](const int j) {
-                    double this_distance = kdtreeDistance(trg_pt.data(), values(offsets(i)+j  ));
-                    double next_distance = kdtreeDistance(trg_pt.data(), values(offsets(i)+j+1));
-                    compadre_kernel_assert_debug((this_distance-next_distance<1e-14) 
-                        && "Neighbors returned by KD tree search are not ordered.");
-                });
+#ifdef COMPADRE_USE_ARBORX
+  #include "Compadre_PointCloudSearch_ArborX.hpp"
+#else
+  #include "Compadre_PointCloudSearch_Nanoflann.hpp"
 #endif
-            }, Kokkos::Min<size_t>(min_num_neighbors));
-
-            // Next, check that we found the neighbors_needed number that we require for unisolvency
-            compadre_assert_release((num_target_sites==0 || (min_num_neighbors>=(size_t)neighbors_needed))
-                    && "Neighbor search failed to find number of neighbors needed for unisolvency.");
-            
-            // call a radius search using values now stored in epsilons
-            generateCRNeighborListsFromRadiusSearch(is_dry_run, trg_pts_view, neighbor_lists, 
-                    number_of_neighbors_list, epsilons, 0.0 /*don't set uniform radius*/, 
-                    max_search_radius, check_same);
+#include <Kokkos_Core.hpp>
 
-            auto nla = CreateNeighborLists(number_of_neighbors_list);
-            return nla.getTotalNeighborsOverAllListsHost();
-        }
-}; // PointCloudSearch
+namespace Compadre {
 
 //! CreatePointCloudSearch allows for the construction of an object of type PointCloudSearch with template deduction
 template <typename view_type>
diff --git a/src/Compadre_PointCloudSearch_ArborX.hpp b/src/Compadre_PointCloudSearch_ArborX.hpp
new file mode 100644
index 000000000..8a43b1564
--- /dev/null
+++ b/src/Compadre_PointCloudSearch_ArborX.hpp
@@ -0,0 +1,595 @@
+#ifndef _COMPADRE_POINTCLOUDSEARCHARBORX_HPP_
+#define _COMPADRE_POINTCLOUDSEARCHARBORX_HPP_
+
+#include "Compadre_Typedefs.hpp"
+#include "Compadre_NeighborLists.hpp"
+#include <Kokkos_Core.hpp>
+#include <ArborX_LinearBVH.hpp>
+
+template <typename view_type_1>
+struct Points {
+    view_type_1 _pts;
+    Points(view_type_1 pts): 
+                _pts(pts) {}
+};
+
+template <typename view_type>
+struct ArborX::AccessTraits<Points<view_type>, ArborX::PrimitivesTag>
+{
+    static KOKKOS_FUNCTION std::size_t size(Points<view_type> const &cloud)
+    {
+        return cloud._pts.extent(0);
+    }
+    static KOKKOS_FUNCTION ArborX::Point get(Points<view_type> const &cloud, std::size_t i)
+    {
+        switch (cloud._pts.extent(1)) {
+        case 3:
+            return ArborX::Point(cloud._pts(i,0), cloud._pts(i,1), cloud._pts(i,2));
+        case 2:
+            return ArborX::Point(cloud._pts(i,0), cloud._pts(i,1),             0.0);
+        case 1:
+            return ArborX::Point(cloud._pts(i,0),             0.0,             0.0);
+        default:
+            compadre_kernel_assert_release(false && "Invalid dimension for cloud.");
+            return ArborX::Point(           0.0,             0.0,             0.0);
+        }
+    }
+    using memory_space = host_memory_space;
+};
+
+template <typename view_type_1, typename view_type_2>
+struct Radius {
+
+    view_type_1 _pts;
+    view_type_2 _radii;
+    double _uniform_radius;
+    double _max_search_radius;
+
+    Radius(view_type_1 pts, view_type_2 radii, const double uniform_radius, 
+            const double max_search_radius) : 
+                _pts(pts), _radii(radii),
+                _uniform_radius(uniform_radius), 
+                _max_search_radius(max_search_radius) 
+    {}
+};
+
+template <typename view_type_1, typename view_type_2>
+struct ArborX::AccessTraits<Radius<view_type_1, view_type_2>, ArborX::PredicatesTag>
+{
+  static KOKKOS_FUNCTION std::size_t size(Radius<view_type_1, view_type_2> const &cloud)
+  {
+      return cloud._pts.extent(0);
+  }
+  static KOKKOS_FUNCTION ArborX::Intersects<ArborX::Sphere> 
+      get(Radius<view_type_1, view_type_2> const &cloud, std::size_t i)
+  {
+      double radius = (cloud._uniform_radius != 0) ? cloud._uniform_radius : cloud._radii(i);
+      cloud._radii(i) = radius;
+      compadre_kernel_assert_release((cloud._radii(i)<=cloud._max_search_radius || cloud._max_search_radius==0) 
+              && "max_search_radius given (generally derived from the size of a halo region), \
+              and search radius needed would exceed this max_search_radius.");
+      switch (cloud._pts.extent(1)) {
+      case 3:
+          return ArborX::intersects(ArborX::Sphere(
+                      ArborX::Point(cloud._pts(i,0), cloud._pts(i,1), cloud._pts(i,2)), 
+                      radius));
+      case 2:
+          return ArborX::intersects(ArborX::Sphere(
+                      ArborX::Point(cloud._pts(i,0), cloud._pts(i,1),             0.0), 
+                      radius));
+      case 1:
+          return ArborX::intersects(ArborX::Sphere(
+                      ArborX::Point(cloud._pts(i,0),             0.0,             0.0), 
+                      radius));
+      default:
+          compadre_kernel_assert_release(false && "Invalid dimension for cloud.");
+          return ArborX::intersects(ArborX::Sphere(
+                      ArborX::Point(            0.0,             0.0,             0.0),
+                      radius));
+      }
+  }
+  using memory_space = host_memory_space;
+};
+
+template <typename view_type_1>
+struct NearestNeighbor {
+
+    view_type_1 _pts;
+    int _neighbors_needed;
+
+    NearestNeighbor(view_type_1 pts, const int neighbors_needed) :
+                _pts(pts), _neighbors_needed(neighbors_needed)
+    {}
+};
+
+template <typename view_type_1>
+struct ArborX::AccessTraits<NearestNeighbor<view_type_1>, ArborX::PredicatesTag>
+{
+  static KOKKOS_FUNCTION std::size_t size(NearestNeighbor<view_type_1> const &cloud)
+  {
+      return cloud._pts.extent(0);
+  }
+  static KOKKOS_FUNCTION ArborX::Nearest<ArborX::Point> 
+      get(NearestNeighbor<view_type_1> const &cloud, std::size_t i)
+  {
+      switch (cloud._pts.extent(1)) {
+      case 3:
+          return ArborX::nearest(
+                      ArborX::Point(cloud._pts(i,0), cloud._pts(i,1), cloud._pts(i,2)), 
+                      cloud._neighbors_needed);
+      case 2:
+          return ArborX::nearest(
+                      ArborX::Point(cloud._pts(i,0), cloud._pts(i,1),             0.0), 
+                      cloud._neighbors_needed);
+      case 1:
+          return ArborX::nearest(
+                      ArborX::Point(cloud._pts(i,0),             0.0,             0.0), 
+                      cloud._neighbors_needed);
+      default:
+          compadre_kernel_assert_release(false && "Invalid dimension for cloud.");
+          return ArborX::nearest(
+                      ArborX::Point(            0.0,             0.0,             0.0),
+                      cloud._neighbors_needed);
+      }
+  }
+  using memory_space = host_memory_space;
+};
+
+namespace Compadre {
+
+//!  PointCloudSearch generates neighbor lists and window sizes for each target site
+/*!
+*  Search methods can be run in dry-run mode, or not.
+*
+*  #### When in dry-run mode:
+*                                                                                                                         
+*    `neighbors_list` will be populated with number of neighbors found for each target site.
+*
+*    This allows a user to know memory allocation needed before storage of neighbor indices.
+*                                                                                                                         
+*  #### When not in dry-run mode:
+*
+*    `neighbors_list_offsets` will be populated with offsets for values (dependent on method) determined by neighbor_list.
+*    If a 2D view for `neighbors_list` is used, then \f$ N(i,j+1) \f$ will store the \f$ j^{th} \f$ neighbor of \f$ i \f$,
+*    and \f$ N(i,0) \f$ will store the number of neighbors for target \f$ i \f$.
+*
+*/
+template <typename view_type>
+class PointCloudSearch {
+
+    protected:
+
+        //! source site coordinates
+        view_type _src_pts_view;
+        local_index_type _dim;
+        local_index_type _max_leaf;
+
+        ArborX::BVH<host_memory_space> _tree;
+
+    public:
+
+        PointCloudSearch(view_type src_pts_view, const local_index_type dimension = -1,
+                const local_index_type max_leaf = -1) 
+                : _src_pts_view(src_pts_view), 
+                  _dim((dimension < 0) ? src_pts_view.extent(1) : dimension),
+                  _max_leaf((max_leaf < 0) ? 10 : max_leaf) {
+            compadre_assert_release((Kokkos::SpaceAccessibility<host_execution_space, typename view_type::memory_space>::accessible==1)
+                    && "Views passed to PointCloudSearch at construction should be accessible from the host.");
+
+            {
+                //if (Kokkos::SpaceAccessibility<device_execution_space, 
+                //        typename trg_view_type::memory_space>::accessible==1) {
+                    _tree = ArborX::BVH<host_memory_space>(host_execution_space(), 
+                                Points<view_type>(_src_pts_view));
+                //}
+            }
+        };
+    
+        ~PointCloudSearch() {};
+
+        //! Returns a liberal estimated upper bound on number of neighbors to be returned by a neighbor search
+        //! for a given choice of dimension, basis size, and epsilon_multiplier. Assumes quasiuniform distribution
+        //! of points. This result can be used to size a preallocated neighbor_lists kokkos view.
+        static inline int getEstimatedNumberNeighborsUpperBound(int unisolvency_size, const int dimension, const double epsilon_multiplier) {
+            int multiplier = 1;
+            if (dimension==1) multiplier = 2;
+            return multiplier * 2.0 * unisolvency_size * std::pow(epsilon_multiplier, dimension) + 1; // +1 is for the number of neighbors entry needed in the first entry of each row
+        }
+
+        //! Returns the distance between a point and a source site, given its index
+        inline double kdtreeDistance(const double* queryPt, const int idx) const {
+
+            double distance = 0;
+            for (int i=0; i<_dim; ++i) {
+                distance += (_src_pts_view(idx,i)-queryPt[i])*(_src_pts_view(idx,i)-queryPt[i]);
+            }
+            return std::sqrt(distance);
+
+        }
+
+        /*! \brief Generates neighbor lists of 2D view by performing a radius search 
+            where the radius to be searched is in the epsilons view.
+            If uniform_radius is given, then this overrides the epsilons view radii sizes.
+            Accepts 2D neighbor_lists without number_of_neighbors_list.
+            \param is_dry_run               [in] - whether to do a dry-run (find neighbors, but don't store)
+            \param trg_pts_view             [in] - target coordinates from which to seek neighbors
+            \param neighbor_lists           [out] - 2D view of neighbor lists to be populated from search
+            \param epsilons                 [in/out] - radius to search, overwritten if uniform_radius != 0
+            \param uniform_radius           [in] - double != 0 determines whether to overwrite all epsilons for uniform search
+            \param max_search_radius        [in] - largest valid search (useful only for MPI jobs if halo size exists)
+        */
+        template <typename trg_view_type, typename neighbor_lists_view_type, typename epsilons_view_type>
+        size_t generate2DNeighborListsFromRadiusSearch(bool is_dry_run, trg_view_type trg_pts_view, 
+                neighbor_lists_view_type& neighbor_lists, epsilons_view_type epsilons, 
+                const double uniform_radius = 0.0, double max_search_radius = 0.0,
+                bool check_same = true) {
+
+            // function does not populate epsilons, they must be prepopulated
+            const int num_target_sites = trg_pts_view.extent(0);
+ 
+            // check neighbor lists and epsilons view sizes
+            compadre_assert_release((neighbor_lists.extent(0)==(size_t)num_target_sites 
+                        && neighbor_lists.extent(1)>=1)
+                        && "neighbor lists View does not have large enough dimensions");
+            compadre_assert_release((neighbor_lists_view_type::rank==2) && "neighbor_lists must be a 2D Kokkos view.");
+
+
+            // temporary 1D array for cr_neighbor_lists
+            typedef typename neighbor_lists_view_type::value_type value_type;
+            size_t cr_neighbor_entries =  (is_dry_run) ? 0 : num_target_sites * neighbor_lists.extent(1);
+            Kokkos::View<value_type*, typename neighbor_lists_view_type::memory_space> 
+                cr_neighbor_lists(
+                    Kokkos::view_alloc(neighbor_lists.label(), 
+                        typename neighbor_lists_view_type::memory_space()), 
+                    cr_neighbor_entries);
+
+            // temporary 1D array for number_of_neighbors_list
+            typedef typename neighbor_lists_view_type::value_type value_type;
+            Kokkos::View<value_type*, typename neighbor_lists_view_type::memory_space> 
+                number_of_neighbors_list(
+                    Kokkos::view_alloc("number of neighbors list", 
+                        typename neighbor_lists_view_type::memory_space()), 
+                    num_target_sites);
+
+            if (!is_dry_run) { 
+                // number_of_neighbors_list not populated when !is_dry_run
+                Kokkos::parallel_for(Kokkos::RangePolicy<host_execution_space>(0, num_target_sites),
+                KOKKOS_LAMBDA(int i) {
+                    number_of_neighbors_list(i) = neighbor_lists(i,0);
+                });
+                Kokkos::fence();
+            }
+            
+            // doesn't fill number_of_neighbors_list when !is_dry_run
+            generateCRNeighborListsFromRadiusSearch(is_dry_run, trg_pts_view,
+                cr_neighbor_lists, number_of_neighbors_list, epsilons, uniform_radius, 
+                max_search_radius, check_same);
+
+            size_t max_num_neighbors = 0;
+            if (!is_dry_run) {
+                auto nla = CreateNeighborLists(cr_neighbor_lists, number_of_neighbors_list);
+                ConvertCompressedRowNeighborListsTo2D(nla, neighbor_lists);
+                max_num_neighbors = nla.getMaxNumNeighbors();
+            } else {
+                Kokkos::parallel_for(Kokkos::RangePolicy<host_execution_space>(0, num_target_sites),
+                KOKKOS_LAMBDA(int i) {
+                    neighbor_lists(i,0) = number_of_neighbors_list(i);
+                });
+                Kokkos::fence();
+                auto nla = CreateNeighborLists(number_of_neighbors_list);
+                max_num_neighbors = nla.getMaxNumNeighbors();
+            }
+            
+            return max_num_neighbors;
+        }
+
+        /*! \brief Generates compressed row neighbor lists by performing a radius search 
+            where the radius to be searched is in the epsilons view.
+            If uniform_radius is given, then this overrides the epsilons view radii sizes.
+            Accepts 1D neighbor_lists with 1D number_of_neighbors_list.
+            \param is_dry_run               [in] - whether to do a dry-run (find neighbors, but don't store)
+            \param trg_pts_view             [in] - target coordinates from which to seek neighbors
+            \param neighbor_lists           [out] - 1D view of neighbor lists to be populated from search
+            \param number_of_neighbors_list [in/out] - number of neighbors for each target site
+            \param epsilons                 [in/out] - radius to search, overwritten if uniform_radius != 0
+            \param uniform_radius           [in] - double != 0 determines whether to overwrite all epsilons for uniform search
+            \param max_search_radius        [in] - largest valid search (useful only for MPI jobs if halo size exists)
+        */
+        template <typename trg_view_type, typename neighbor_lists_view_type, typename epsilons_view_type>
+        size_t generateCRNeighborListsFromRadiusSearch(bool is_dry_run, trg_view_type trg_pts_view, 
+                neighbor_lists_view_type neighbor_lists, neighbor_lists_view_type number_of_neighbors_list, 
+                epsilons_view_type epsilons, const double uniform_radius = 0.0, 
+                double max_search_radius = 0.0, bool check_same = true) {
+
+            // function does not populate epsilons, they must be prepopulated
+
+            compadre_assert_release((Kokkos::SpaceAccessibility<host_execution_space, typename trg_view_type::memory_space>::accessible==1) &&
+                    "Target coordinates view passed to generateCRNeighborListsFromRadiusSearch should be accessible from the host.");
+            compadre_assert_release((((int)trg_pts_view.extent(1))>=_dim) &&
+                    "Target coordinates view passed to generateCRNeighborListsFromRadiusSearch must have \
+                    second dimension as large as _dim.");
+            compadre_assert_release((Kokkos::SpaceAccessibility<host_execution_space, typename neighbor_lists_view_type::memory_space>::accessible==1) &&
+                    "Views passed to generateCRNeighborListsFromRadiusSearch should be accessible from the host.");
+            compadre_assert_release((Kokkos::SpaceAccessibility<host_execution_space, typename epsilons_view_type::memory_space>::accessible==1) &&
+                    "Views passed to generateCRNeighborListsFromRadiusSearch should be accessible from the host.");
+
+            // loop size
+            const int num_target_sites = trg_pts_view.extent(0);
+
+            compadre_assert_release((number_of_neighbors_list.extent(0)==(size_t)num_target_sites)
+                        && "number_of_neighbors_list or neighbor lists View does not have large enough dimensions");
+            compadre_assert_release((neighbor_lists_view_type::rank==1) && "neighbor_lists must be a 1D Kokkos view.");
+            compadre_assert_release((epsilons.extent(0)==(size_t)num_target_sites)
+                        && "epsilons View does not have the correct dimension");
+
+            // perform tree search
+            Kokkos::View<int *, host_memory_space> values("values", 0);
+            Kokkos::View<int *, host_memory_space> offsets("offsets", 0);
+            auto predicates = Radius<trg_view_type,epsilons_view_type>(trg_pts_view, epsilons,
+                    uniform_radius, max_search_radius);
+            _tree.query(host_execution_space(), predicates, values, offsets);
+
+            // set number of neighbors list (how many neighbors for each target site) based
+            // on results on tree query
+            Kokkos::parallel_for(Kokkos::RangePolicy<host_execution_space>(0, num_target_sites),
+            KOKKOS_LAMBDA(int i) {
+                size_t neighbors_found_for_target_i = offsets(i+1) - offsets(i);
+                if (!is_dry_run && check_same) { // check it is as expected before overwriting
+                    compadre_kernel_assert_debug(
+                            (neighbors_found_for_target_i==(size_t)number_of_neighbors_list(i)) 
+                            && "Number of neighbors found changed since dry-run.");
+                }
+                number_of_neighbors_list(i) = neighbors_found_for_target_i;
+            });
+            Kokkos::fence();
+
+            // build a row offsets object (only if not a dry run)
+            typedef Kokkos::View<global_index_type*, typename neighbor_lists_view_type::array_layout,
+                    typename neighbor_lists_view_type::memory_space, typename neighbor_lists_view_type::memory_traits> row_offsets_view_type;
+            row_offsets_view_type row_offsets;
+            if (!is_dry_run) {
+                auto nla = CreateNeighborLists(neighbor_lists, number_of_neighbors_list);
+                Kokkos::resize(row_offsets, num_target_sites);
+                Kokkos::fence();
+                Kokkos::parallel_for(Kokkos::RangePolicy<host_execution_space>(0,num_target_sites), [&](const int i) {
+                    row_offsets(i) = nla.getRowOffsetHost(i); 
+                });
+                Kokkos::fence();
+            }
+
+            // sort to put closest neighbor first (other neighbors are not affected)
+            typedef Kokkos::View<double*, Kokkos::HostSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> > 
+                    scratch_double_view;
+            int team_scratch_size = 0;
+            team_scratch_size += scratch_double_view::shmem_size(trg_pts_view.extent(1)); // distances
+            Kokkos::parallel_for("first entry sort", host_team_policy(num_target_sites, Kokkos::AUTO)
+                    .set_scratch_size(0 /*shared memory level*/, Kokkos::PerTeam(team_scratch_size)), 
+                    KOKKOS_LAMBDA(const host_member_type& teamMember) {
+
+                const int i = teamMember.league_rank();
+
+                // make unmanaged scratch views
+                scratch_double_view trg_pt(teamMember.team_scratch(0 /*shared memory*/), trg_pts_view.extent(1));
+                for (int j=0; j<trg_pts_view.extent(1); ++j) {
+                    trg_pt(j) = trg_pts_view(i,j);
+                }
+
+                // find swap index
+                int min_distance_ind = 0;
+                double first_neighbor_distance = kdtreeDistance(trg_pt.data(), values(offsets(i)));
+                for (int j=1; j<number_of_neighbors_list(i); ++j) {
+                    // distance to neighbor
+                    double neighbor_distance = kdtreeDistance(trg_pt.data(), values(offsets(i)+j));
+                    if (neighbor_distance < first_neighbor_distance) {
+                        first_neighbor_distance = neighbor_distance;
+                        min_distance_ind = j;
+                    }
+                }
+                // do the swap
+                if (min_distance_ind != 0) {
+                    int tmp = values(offsets(i));
+                    values(offsets(i)) = values(offsets(i)+min_distance_ind);
+                    values(offsets(i)+min_distance_ind) = tmp;
+
+                }
+            });
+            Kokkos::fence();
+
+            // copy neighbor list values over from tree query
+            if (!is_dry_run) {
+                Kokkos::parallel_for(Kokkos::RangePolicy<host_execution_space>(0, num_target_sites),
+                KOKKOS_LAMBDA(int i) {
+                    for (int j=0; j<number_of_neighbors_list(i); ++j) {
+                        neighbor_lists(row_offsets(i)+j) = values(offsets(i)+j);
+                    }
+                });
+                Kokkos::fence();
+            }
+
+            auto nla = CreateNeighborLists(number_of_neighbors_list);
+            return nla.getTotalNeighborsOverAllListsHost();
+        }
+
+
+        /*! \brief Generates neighbor lists as 2D view by performing a k-nearest neighbor search
+            Only accepts 2D neighbor_lists without number_of_neighbors_list.
+            \param is_dry_run               [in] - whether to do a dry-run (find neighbors, but don't store)
+            \param trg_pts_view             [in] - target coordinates from which to seek neighbors
+            \param neighbor_lists           [out] - 2D view of neighbor lists to be populated from search
+            \param epsilons                 [in/out] - radius to search, overwritten if uniform_radius != 0
+            \param neighbors_needed         [in] - k neighbors needed as a minimum
+            \param epsilon_multiplier       [in] - distance to kth neighbor multiplied by epsilon_multiplier for follow-on radius search
+            \param max_search_radius        [in] - largest valid search (useful only for MPI jobs if halo size exists)
+        */
+        template <typename trg_view_type, typename neighbor_lists_view_type, typename epsilons_view_type>
+        size_t generate2DNeighborListsFromKNNSearch(bool is_dry_run, trg_view_type trg_pts_view, 
+                neighbor_lists_view_type neighbor_lists, epsilons_view_type epsilons, 
+                const int neighbors_needed, const double epsilon_multiplier = 1.6, 
+                double max_search_radius = 0.0, bool check_same = true) {
+
+            const int num_target_sites = trg_pts_view.extent(0);
+ 
+            // check neighbor lists and epsilons view sizes
+            compadre_assert_release((neighbor_lists.extent(0)==(size_t)num_target_sites 
+                        && neighbor_lists.extent(1)>=1)
+                        && "neighbor lists View does not have large enough dimensions");
+            compadre_assert_release((neighbor_lists_view_type::rank==2) && "neighbor_lists must be a 2D Kokkos view.");
+
+            // temporary 1D array for cr_neighbor_lists
+            typedef typename neighbor_lists_view_type::value_type value_type;
+            size_t cr_neighbor_entries =  (is_dry_run) ? 0 : num_target_sites * neighbor_lists.extent(1);
+            Kokkos::View<value_type*, typename neighbor_lists_view_type::memory_space> 
+                cr_neighbor_lists(
+                    Kokkos::view_alloc(neighbor_lists.label(), 
+                        typename neighbor_lists_view_type::memory_space()), 
+                    cr_neighbor_entries);
+
+            // temporary 1D array for number_of_neighbors_list
+            typedef typename neighbor_lists_view_type::value_type value_type;
+            Kokkos::View<value_type*, typename neighbor_lists_view_type::memory_space> 
+                number_of_neighbors_list(
+                    Kokkos::view_alloc("number of neighbors list", 
+                        typename neighbor_lists_view_type::memory_space()), 
+                    num_target_sites);
+
+            if (!is_dry_run) { 
+                // number_of_neighbors_list not populated when !is_dry_run
+                Kokkos::parallel_for(Kokkos::RangePolicy<host_execution_space>(0, num_target_sites),
+                KOKKOS_LAMBDA(int i) {
+                    number_of_neighbors_list(i) = neighbor_lists(i,0);
+                });
+            }
+            
+            // doesn't fill number_of_neighbors_list when !is_dry_run
+            generateCRNeighborListsFromKNNSearch(is_dry_run, trg_pts_view,
+                cr_neighbor_lists, number_of_neighbors_list, epsilons, 
+                neighbors_needed, epsilon_multiplier, max_search_radius,
+                check_same);
+
+            size_t max_num_neighbors = 0;
+            if (!is_dry_run) {
+                auto nla = CreateNeighborLists(cr_neighbor_lists, number_of_neighbors_list);
+                ConvertCompressedRowNeighborListsTo2D(nla, neighbor_lists);
+                max_num_neighbors = nla.getMaxNumNeighbors();
+            } else {
+                Kokkos::parallel_for(Kokkos::RangePolicy<host_execution_space>(0, num_target_sites),
+                KOKKOS_LAMBDA(int i) {
+                    neighbor_lists(i,0) = number_of_neighbors_list(i);
+                });
+                Kokkos::fence();
+                auto nla = CreateNeighborLists(number_of_neighbors_list);
+                max_num_neighbors = nla.getMaxNumNeighbors();
+            }
+            return max_num_neighbors;
+        }
+
+        /*! \brief Generates compressed row neighbor lists by performing a k-nearest neighbor search
+            Only accepts 1D neighbor_lists with 1D number_of_neighbors_list.
+            \param is_dry_run               [in] - whether to do a dry-run (find neighbors, but don't store)
+            \param trg_pts_view             [in] - target coordinates from which to seek neighbors
+            \param neighbor_lists           [out] - 1D view of neighbor lists to be populated from search
+            \param number_of_neighbors_list [in/out] - number of neighbors for each target site
+            \param epsilons                 [in/out] - radius to search, overwritten if uniform_radius != 0
+            \param neighbors_needed         [in] - k neighbors needed as a minimum
+            \param epsilon_multiplier       [in] - distance to kth neighbor multiplied by epsilon_multiplier for follow-on radius search
+            \param max_search_radius        [in] - largest valid search (useful only for MPI jobs if halo size exists)
+        */
+        template <typename trg_view_type, typename neighbor_lists_view_type, typename epsilons_view_type>
+        size_t generateCRNeighborListsFromKNNSearch(bool is_dry_run, trg_view_type trg_pts_view, 
+                neighbor_lists_view_type neighbor_lists, neighbor_lists_view_type number_of_neighbors_list,
+                epsilons_view_type epsilons, const int neighbors_needed, const double epsilon_multiplier = 1.6, 
+                double max_search_radius = 0.0, bool check_same = true) {
+
+            // First, do a knn search (removes need for guessing initial search radius)
+
+            compadre_assert_release((Kokkos::SpaceAccessibility<host_execution_space, typename trg_view_type::memory_space>::accessible==1) &&
+                    "Target coordinates view passed to generateCRNeighborListsFromKNNSearch should be accessible from the host.");
+            compadre_assert_release((((int)trg_pts_view.extent(1))>=_dim) &&
+                    "Target coordinates view passed to generateCRNeighborListsFromRadiusSearch must have \
+                    second dimension as large as _dim.");
+            compadre_assert_release((Kokkos::SpaceAccessibility<host_execution_space, typename neighbor_lists_view_type::memory_space>::accessible==1) &&
+                    "Views passed to generateCRNeighborListsFromKNNSearch should be accessible from the host.");
+            compadre_assert_release((Kokkos::SpaceAccessibility<host_execution_space, typename epsilons_view_type::memory_space>::accessible==1) &&
+                    "Views passed to generateCRNeighborListsFromKNNSearch should be accessible from the host.");
+
+            // loop size
+            const int num_target_sites = trg_pts_view.extent(0);
+
+            compadre_assert_release((number_of_neighbors_list.extent(0)==(size_t)num_target_sites)
+                        && "number_of_neighbors_list or neighbor lists View does not have large enough dimensions");
+            compadre_assert_release((neighbor_lists_view_type::rank==1) && "neighbor_lists must be a 1D Kokkos view.");
+            compadre_assert_release((epsilons.extent(0)==(size_t)num_target_sites)
+                        && "epsilons View does not have the correct dimension");
+
+            // perform tree search
+            Kokkos::View<int *, host_memory_space> values("values", 0);
+            Kokkos::View<int *, host_memory_space> offsets("offsets", 0);
+            auto predicates = NearestNeighbor<trg_view_type>(trg_pts_view, neighbors_needed);
+            _tree.query(host_execution_space(), predicates, values, offsets);
+
+            size_t min_num_neighbors = 0;
+            // if no target sites, then min_num_neighbors is set to neighbors_needed
+            if (num_target_sites==0) min_num_neighbors = neighbors_needed;
+
+            // get min_num_neighbors
+            typedef Kokkos::View<double*, Kokkos::HostSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> > 
+                    scratch_double_view;
+            int team_scratch_size = 0;
+            team_scratch_size += scratch_double_view::shmem_size(trg_pts_view.extent(1)); // distances
+            Kokkos::parallel_reduce("knn inspect", host_team_policy(num_target_sites, Kokkos::AUTO)
+                    .set_scratch_size(0 /*shared memory level*/, Kokkos::PerTeam(team_scratch_size)), 
+                    KOKKOS_LAMBDA(const host_member_type& teamMember, size_t& t_min_num_neighbors) {
+
+                const int i = teamMember.league_rank();
+
+                size_t num_neighbors = offsets(i+1) - offsets(i);
+                t_min_num_neighbors = (num_neighbors < t_min_num_neighbors) ?
+                                        num_neighbors : t_min_num_neighbors;
+
+                // make unmanaged scratch views
+                scratch_double_view trg_pt(teamMember.team_scratch(0 /*shared memory*/), trg_pts_view.extent(1));
+                for (int j=0; j<trg_pts_view.extent(1); ++j) {
+                    trg_pt(j) = trg_pts_view(i,j);
+                }
+                double last_neighbor_distance = kdtreeDistance(trg_pt.data(), values(offsets(i)+num_neighbors-1));
+
+                // scale by epsilon_multiplier to window from location where the last neighbor was found
+                epsilons(i) = (last_neighbor_distance > 0) ? 
+                                    last_neighbor_distance*epsilon_multiplier
+                                  : 1e-14*epsilon_multiplier;
+                // the only time the second case using 1e-14 is used is when either zero neighbors or exactly one 
+                // neighbor (neighbor is target site) is found.  when the follow on radius search is conducted, the one
+                // neighbor (target site) will not be found if left at 0, so any positive amount will do, however 1e-14 
+                // should be small enough to ensure that other neighbors are not found
+
+                compadre_kernel_assert_release((epsilons(i)<=max_search_radius || max_search_radius==0 || is_dry_run) 
+                        && "max_search_radius given (generally derived from the size of a halo region), \
+                            and search radius needed would exceed this max_search_radius.");
+
+#ifdef COMPADRE_DEBUG
+                Kokkos::parallel_for(Kokkos::TeamThreadRange(teamMember, num_neighbors-1), [=](const int j) {
+                    double this_distance = kdtreeDistance(trg_pt.data(), values(offsets(i)+j  ));
+                    double next_distance = kdtreeDistance(trg_pt.data(), values(offsets(i)+j+1));
+                    compadre_kernel_assert_debug((this_distance-next_distance<1e-14) 
+                        && "Neighbors returned by KD tree search are not ordered.");
+                });
+#endif
+            }, Kokkos::Min<size_t>(min_num_neighbors));
+
+            // Next, check that we found the neighbors_needed number that we require for unisolvency
+            compadre_assert_release((num_target_sites==0 || (min_num_neighbors>=(size_t)neighbors_needed))
+                    && "Neighbor search failed to find number of neighbors needed for unisolvency.");
+            
+            // call a radius search using values now stored in epsilons
+            generateCRNeighborListsFromRadiusSearch(is_dry_run, trg_pts_view, neighbor_lists, 
+                    number_of_neighbors_list, epsilons, 0.0 /*don't set uniform radius*/, 
+                    max_search_radius, check_same);
+
+            auto nla = CreateNeighborLists(number_of_neighbors_list);
+            return nla.getTotalNeighborsOverAllListsHost();
+        }
+}; // ArborX's PointCloudSearch
+
+} // Compadre
+
+#endif
diff --git a/src/Compadre_PointCloudSearch_Nanoflann.hpp b/src/Compadre_PointCloudSearch_Nanoflann.hpp
new file mode 100644
index 000000000..3c138a7e5
--- /dev/null
+++ b/src/Compadre_PointCloudSearch_Nanoflann.hpp
@@ -0,0 +1,787 @@
+#ifndef _COMPADRE_POINTCLOUDSEARCHNANOFLANN_HPP_
+#define _COMPADRE_POINTCLOUDSEARCHNANOFLANN_HPP_
+
+#include "Compadre_Typedefs.hpp"
+#include "Compadre_NeighborLists.hpp"
+#include "nanoflann.hpp"
+#include <Kokkos_Core.hpp>
+#include <memory>
+
+namespace Compadre {
+
+//! Custom RadiusResultSet for nanoflann that uses pre-allocated space for indices and radii
+//! instead of using std::vec for std::pairs
+template <typename _DistanceType, typename _IndexType = size_t>
+class RadiusResultSet {
+
+  public:
+
+    typedef _DistanceType DistanceType;
+    typedef _IndexType IndexType;
+
+    const DistanceType radius;
+    IndexType count;
+    DistanceType* r_dist;
+    IndexType* i_dist;
+    const IndexType max_size;
+
+    RadiusResultSet(
+        DistanceType radius_,
+        DistanceType* r_dist_, IndexType* i_dist_, const IndexType max_size_)
+        : radius(radius_), count(0), r_dist(r_dist_), i_dist(i_dist_), max_size(max_size_) {
+        init();
+    }
+
+    void init() {}
+
+    void clear() { count = 0; }
+
+    size_t size() const { return count; }
+
+    bool full() const { return true; }
+
+    bool addPoint(DistanceType dist, IndexType index) {
+
+        if (dist < radius) {
+            // would throw an exception here if count>=max_size, but this code is 
+            // called inside of a parallel region so only an abort is possible, 
+            // but this situation is recoverable 
+            //
+            // instead, we increase count, but there is nowhere to store neighbors
+            // since we are working with pre-allocated space
+            // this will be discovered after returning from the search by comparing
+            // the count against the pre-allocate space dimensions
+            if (count<max_size) {
+                i_dist[count] = index;
+                r_dist[count] = dist;
+            }
+            count++;
+        }
+        return true;
+
+    }
+
+    DistanceType worstDist() const { return radius; }
+
+    std::pair<IndexType, DistanceType> worst_item() const {
+        // just to verify this isn't ever called
+        compadre_kernel_assert_release(false && "worst_item() should not be called.");
+    }
+
+    void sort() { 
+        // puts closest neighbor as the first entry in the neighbor list
+        // leaves the rest unsorted
+ 
+        if (count > 0) {
+
+            // alternate sort for every entry, not currently being used
+            //int indices[count];
+            //for (int i=0; i<count; ++i) {
+            //    indices[i] = i;
+            //}
+            //std::sort(indices, indices+count, sort_indices(r_dist));
+            //std::vector<IndexType> tmp_indices(count);
+            //std::vector<DistanceType> tmp_r(count);
+            //for (int i=0; i<count; ++i) {
+            //    tmp_indices[i] = i_dist[indices[i]];
+            //    tmp_r[i] = r_dist[indices[i]];
+            //}
+            //for (int i=0; i<count; ++i) {
+            //    i_dist[i] = tmp_indices[i];
+            //    r_dist[i] = tmp_r[i];
+            //}
+            IndexType loop_max = (count < max_size) ? count : max_size;
+
+            DistanceType best_distance = std::numeric_limits<DistanceType>::max();
+            IndexType best_distance_index = 0;
+            int best_index = -1;
+            for (IndexType i=0; i<loop_max; ++i) {
+                if (r_dist[i] < best_distance) {
+                    best_distance = r_dist[i];
+                    best_distance_index = i_dist[i];
+                    best_index = i;
+                }
+            }
+
+            if (best_index != 0) {
+                auto tmp_ind = i_dist[0];
+                i_dist[0] = best_distance_index;
+                i_dist[best_index] = tmp_ind;
+            }
+        }
+    }
+};
+
+
+//!  PointCloudSearch generates neighbor lists and window sizes for each target site
+/*!
+*  Search methods can be run in dry-run mode, or not.
+*
+*  #### When in dry-run mode:
+*                                                                                                                         
+*    `neighbors_list` will be populated with number of neighbors found for each target site.
+*
+*    This allows a user to know memory allocation needed before storage of neighbor indices.
+*                                                                                                                         
+*  #### When not in dry-run mode:
+*
+*    `neighbors_list_offsets` will be populated with offsets for values (dependent on method) determined by neighbor_list.
+*    If a 2D view for `neighbors_list` is used, then \f$ N(i,j+1) \f$ will store the \f$ j^{th} \f$ neighbor of \f$ i \f$,
+*    and \f$ N(i,0) \f$ will store the number of neighbors for target \f$ i \f$.
+*
+*/
+template <typename view_type>
+class PointCloudSearch {
+
+    public:
+
+        typedef nanoflann::KDTreeSingleIndexAdaptor<nanoflann::L2_Simple_Adaptor<double, PointCloudSearch<view_type> >, 
+                PointCloudSearch<view_type>, 1> tree_type_1d;
+        typedef nanoflann::KDTreeSingleIndexAdaptor<nanoflann::L2_Simple_Adaptor<double, PointCloudSearch<view_type> >, 
+                PointCloudSearch<view_type>, 2> tree_type_2d;
+        typedef nanoflann::KDTreeSingleIndexAdaptor<nanoflann::L2_Simple_Adaptor<double, PointCloudSearch<view_type> >, 
+                PointCloudSearch<view_type>, 3> tree_type_3d;
+
+    protected:
+
+        //! source site coordinates
+        view_type _src_pts_view;
+        local_index_type _dim;
+        local_index_type _max_leaf;
+
+        std::shared_ptr<tree_type_1d> _tree_1d;
+        std::shared_ptr<tree_type_2d> _tree_2d;
+        std::shared_ptr<tree_type_3d> _tree_3d;
+
+    public:
+
+        PointCloudSearch(view_type src_pts_view, const local_index_type dimension = -1,
+                const local_index_type max_leaf = -1) 
+                : _src_pts_view(src_pts_view), 
+                  _dim((dimension < 0) ? src_pts_view.extent(1) : dimension),
+                  _max_leaf((max_leaf < 0) ? 10 : max_leaf) {
+            compadre_assert_release((Kokkos::SpaceAccessibility<host_execution_space, typename view_type::memory_space>::accessible==1)
+                    && "Views passed to PointCloudSearch at construction should be accessible from the host.");
+        };
+    
+        ~PointCloudSearch() {};
+
+        //! Returns a liberal estimated upper bound on number of neighbors to be returned by a neighbor search
+        //! for a given choice of dimension, basis size, and epsilon_multiplier. Assumes quasiuniform distribution
+        //! of points. This result can be used to size a preallocated neighbor_lists kokkos view.
+        static inline int getEstimatedNumberNeighborsUpperBound(int unisolvency_size, const int dimension, const double epsilon_multiplier) {
+            int multiplier = 1;
+            if (dimension==1) multiplier = 2;
+            return multiplier * 2.0 * unisolvency_size * std::pow(epsilon_multiplier, dimension) + 1; // +1 is for the number of neighbors entry needed in the first entry of each row
+        }
+    
+        //! Bounding box query method required by Nanoflann.
+        template <class BBOX> bool kdtree_get_bbox(BBOX& bb) const {return false;}
+
+        //! Returns the number of source sites
+        inline int kdtree_get_point_count() const {return _src_pts_view.extent(0);}
+
+        //! Returns the coordinate value of a point
+        inline double kdtree_get_pt(const int idx, int dim) const {return _src_pts_view(idx,dim);}
+
+        //! Returns the distance between a point and a source site, given its index
+        inline double kdtree_distance(const double* queryPt, const int idx, long long sz) const {
+
+            double distance = 0;
+            for (int i=0; i<_dim; ++i) {
+                distance += (_src_pts_view(idx,i)-queryPt[i])*(_src_pts_view(idx,i)-queryPt[i]);
+            }
+            return std::sqrt(distance);
+
+        }
+
+        void generateKDTree() {
+            if (_dim==1) {
+                _tree_1d = std::make_shared<tree_type_1d>(1, *this, nanoflann::KDTreeSingleIndexAdaptorParams(_max_leaf));
+                _tree_1d->buildIndex();
+            } else if (_dim==2) {
+                _tree_2d = std::make_shared<tree_type_2d>(2, *this, nanoflann::KDTreeSingleIndexAdaptorParams(_max_leaf));
+                _tree_2d->buildIndex();
+            } else if (_dim==3) {
+                _tree_3d = std::make_shared<tree_type_3d>(3, *this, nanoflann::KDTreeSingleIndexAdaptorParams(_max_leaf));
+                _tree_3d->buildIndex();
+            }
+        }
+
+        /*! \brief Generates neighbor lists of 2D view by performing a radius search 
+            where the radius to be searched is in the epsilons view.
+            If uniform_radius is given, then this overrides the epsilons view radii sizes.
+            Accepts 2D neighbor_lists without number_of_neighbors_list.
+            \param is_dry_run               [in] - whether to do a dry-run (find neighbors, but don't store)
+            \param trg_pts_view             [in] - target coordinates from which to seek neighbors
+            \param neighbor_lists           [out] - 2D view of neighbor lists to be populated from search
+            \param epsilons                 [in/out] - radius to search, overwritten if uniform_radius != 0
+            \param uniform_radius           [in] - double != 0 determines whether to overwrite all epsilons for uniform search
+            \param max_search_radius        [in] - largest valid search (useful only for MPI jobs if halo size exists)
+        */
+        template <typename trg_view_type, typename neighbor_lists_view_type, typename epsilons_view_type>
+        size_t generate2DNeighborListsFromRadiusSearch(bool is_dry_run, trg_view_type trg_pts_view, 
+                neighbor_lists_view_type neighbor_lists, epsilons_view_type epsilons, 
+                const double uniform_radius = 0.0, double max_search_radius = 0.0,
+                bool check_same = true) {
+
+            // function does not populate epsilons, they must be prepopulated
+
+            compadre_assert_release((Kokkos::SpaceAccessibility<host_execution_space, typename trg_view_type::memory_space>::accessible==1) &&
+                    "Target coordinates view passed to generate2DNeighborListsFromRadiusSearch should be accessible from the host.");
+            compadre_assert_release((((int)trg_pts_view.extent(1))>=_dim) &&
+                    "Target coordinates view passed to generate2DNeighborListsFromRadiusSearch must have \
+                    second dimension as large as _dim.");
+            compadre_assert_release((Kokkos::SpaceAccessibility<host_execution_space, typename neighbor_lists_view_type::memory_space>::accessible==1) &&
+                    "Views passed to generate2DNeighborListsFromRadiusSearch should be accessible from the host.");
+            compadre_assert_release((Kokkos::SpaceAccessibility<host_execution_space, typename epsilons_view_type::memory_space>::accessible==1) &&
+                    "Views passed to generate2DNeighborListsFromRadiusSearch should be accessible from the host.");
+
+            // loop size
+            const int num_target_sites = trg_pts_view.extent(0);
+
+            if ((!_tree_1d && _dim==1) || (!_tree_2d && _dim==2) || (!_tree_3d && _dim==3)) {
+                this->generateKDTree();
+            }
+
+            // check neighbor lists and epsilons view sizes
+            compadre_assert_release((neighbor_lists.extent(0)==(size_t)num_target_sites 
+                        && neighbor_lists.extent(1)>=1)
+                        && "neighbor lists View does not have large enough dimensions");
+            compadre_assert_release((neighbor_lists_view_type::rank==2) && "neighbor_lists must be a 2D Kokkos view.");
+
+            compadre_assert_release((epsilons.extent(0)==(size_t)num_target_sites)
+                        && "epsilons View does not have the correct dimension");
+
+            typedef Kokkos::View<double*, Kokkos::HostSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> > 
+                    scratch_double_view;
+
+            typedef Kokkos::View<size_t*, Kokkos::HostSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> > 
+                    scratch_int_view;
+
+            // determine scratch space size needed
+            int team_scratch_size = 0;
+            team_scratch_size += scratch_double_view::shmem_size(neighbor_lists.extent(1)); // distances
+            team_scratch_size += scratch_int_view::shmem_size(neighbor_lists.extent(1)); // indices
+            team_scratch_size += scratch_double_view::shmem_size(_dim); // target coordinate
+
+            // maximum number of neighbors found over all target sites' neighborhoods
+            size_t max_num_neighbors = 0;
+            // part 2. do radius search using window size from knn search
+            // each row of neighbor lists is a neighbor list for the target site corresponding to that row
+            Kokkos::parallel_reduce("radius search", host_team_policy(num_target_sites, Kokkos::AUTO)
+                    .set_scratch_size(0 /*shared memory level*/, Kokkos::PerTeam(team_scratch_size)), 
+                    KOKKOS_LAMBDA(const host_member_type& teamMember, size_t& t_max_num_neighbors) {
+
+                // make unmanaged scratch views
+                scratch_double_view neighbor_distances(teamMember.team_scratch(0 /*shared memory*/), neighbor_lists.extent(1));
+                scratch_int_view neighbor_indices(teamMember.team_scratch(0 /*shared memory*/), neighbor_lists.extent(1));
+                scratch_double_view this_target_coord(teamMember.team_scratch(0 /*shared memory*/), _dim);
+
+                size_t neighbors_found = 0;
+
+                const int i = teamMember.league_rank();
+
+                // set epsilons if radius is specified
+                if (uniform_radius > 0) epsilons(i) = uniform_radius;
+
+                // needs furthest neighbor's distance for next portion
+                compadre_kernel_assert_release((epsilons(i)<=max_search_radius || max_search_radius==0) && "max_search_radius given (generally derived from the size of a halo region), and search radius needed would exceed this max_search_radius.");
+
+                Kokkos::parallel_for(Kokkos::TeamThreadRange(teamMember, neighbor_lists.extent(1)), [&](const int j) { 
+                    neighbor_indices(j) = 0;
+                    neighbor_distances(j) = -1.0;
+                });
+                teamMember.team_barrier();
+
+                Kokkos::single(Kokkos::PerTeam(teamMember), [&] () {
+                    // target_coords is LayoutLeft on device and its HostMirror, so giving a pointer to 
+                    // this data would lead to a wrong result if the device is a GPU
+
+                    for (int j=0; j<_dim; ++j) {
+                        this_target_coord(j) = trg_pts_view(i,j);
+                    }
+
+                    nanoflann::SearchParams sp; // default parameters
+                    Compadre::RadiusResultSet<double> rrs(epsilons(i)*epsilons(i), neighbor_distances.data(), neighbor_indices.data(), neighbor_lists.extent(1));
+                    if (_dim==1) {
+                        neighbors_found = _tree_1d->template radiusSearchCustomCallback<Compadre::RadiusResultSet<double> >(this_target_coord.data(), rrs, sp) ;
+                    } else if (_dim==2) {
+                        neighbors_found = _tree_2d->template radiusSearchCustomCallback<Compadre::RadiusResultSet<double> >(this_target_coord.data(), rrs, sp) ;
+                    } else if (_dim==3) {
+                        neighbors_found = _tree_3d->template radiusSearchCustomCallback<Compadre::RadiusResultSet<double> >(this_target_coord.data(), rrs, sp) ;
+                    }
+
+                    t_max_num_neighbors = (neighbors_found > t_max_num_neighbors) ? neighbors_found : t_max_num_neighbors;
+            
+                    // the number of neighbors is stored in column zero of the neighbor lists 2D array
+                    if (check_same) {
+                        compadre_kernel_assert_debug((neighbors_found==(size_t)neighbor_lists(i,0)) 
+                                && "Number of neighbors found changed since dry-run.");
+                    }
+                    neighbor_lists(i,0) = neighbors_found;
+
+                    // epsilons already scaled and then set by search radius
+                });
+                teamMember.team_barrier();
+
+                // loop_bound so that we don't write into memory we don't have allocated
+                int loop_bound = (neighbors_found < neighbor_lists.extent(1)-1) ? neighbors_found : neighbor_lists.extent(1)-1;
+                // loop over each neighbor index and fill with a value
+                if (!is_dry_run) {
+                    Kokkos::parallel_for(Kokkos::TeamThreadRange(teamMember, loop_bound), [&](const int j) {
+                        // cast to an whatever data type the 2D array of neighbor lists is using
+                        neighbor_lists(i,j+1) = static_cast<typename std::remove_pointer<typename std::remove_pointer<typename neighbor_lists_view_type::data_type>::type>::type>(neighbor_indices(j));
+                    });
+                    teamMember.team_barrier();
+                }
+
+            }, Kokkos::Max<size_t>(max_num_neighbors) );
+            Kokkos::fence();
+
+            // check if max_num_neighbors will fit onto pre-allocated space
+            compadre_assert_release((neighbor_lists.extent(1) >= (max_num_neighbors+1) || is_dry_run) 
+                    && "neighbor_lists does not contain enough columns for the maximum number of neighbors needing to be stored.");
+
+            return max_num_neighbors;
+        }
+
+        /*! \brief Generates compressed row neighbor lists by performing a radius search 
+            where the radius to be searched is in the epsilons view.
+            If uniform_radius is given, then this overrides the epsilons view radii sizes.
+            Accepts 1D neighbor_lists with 1D number_of_neighbors_list.
+            \param is_dry_run               [in] - whether to do a dry-run (find neighbors, but don't store)
+            \param trg_pts_view             [in] - target coordinates from which to seek neighbors
+            \param neighbor_lists           [out] - 1D view of neighbor lists to be populated from search
+            \param number_of_neighbors_list [in/out] - number of neighbors for each target site
+            \param epsilons                 [in/out] - radius to search, overwritten if uniform_radius != 0
+            \param uniform_radius           [in] - double != 0 determines whether to overwrite all epsilons for uniform search
+            \param max_search_radius        [in] - largest valid search (useful only for MPI jobs if halo size exists)
+        */
+        template <typename trg_view_type, typename neighbor_lists_view_type, typename epsilons_view_type>
+        size_t generateCRNeighborListsFromRadiusSearch(bool is_dry_run, trg_view_type trg_pts_view, 
+                neighbor_lists_view_type neighbor_lists, neighbor_lists_view_type number_of_neighbors_list, 
+                epsilons_view_type epsilons, const double uniform_radius = 0.0, 
+                double max_search_radius = 0.0, bool check_same = true) {
+
+            // function does not populate epsilons, they must be prepopulated
+
+            compadre_assert_release((Kokkos::SpaceAccessibility<host_execution_space, typename trg_view_type::memory_space>::accessible==1) &&
+                    "Target coordinates view passed to generateCRNeighborListsFromRadiusSearch should be accessible from the host.");
+            compadre_assert_release((((int)trg_pts_view.extent(1))>=_dim) &&
+                    "Target coordinates view passed to generateCRNeighborListsFromRadiusSearch must have \
+                    second dimension as large as _dim.");
+            compadre_assert_release((Kokkos::SpaceAccessibility<host_execution_space, typename neighbor_lists_view_type::memory_space>::accessible==1) &&
+                    "Views passed to generateCRNeighborListsFromRadiusSearch should be accessible from the host.");
+            compadre_assert_release((Kokkos::SpaceAccessibility<host_execution_space, typename epsilons_view_type::memory_space>::accessible==1) &&
+                    "Views passed to generateCRNeighborListsFromRadiusSearch should be accessible from the host.");
+
+            // loop size
+            const int num_target_sites = trg_pts_view.extent(0);
+
+            if ((!_tree_1d && _dim==1) || (!_tree_2d && _dim==2) || (!_tree_3d && _dim==3)) {
+                this->generateKDTree();
+            }
+
+            compadre_assert_release((number_of_neighbors_list.extent(0)==(size_t)num_target_sites)
+                        && "number_of_neighbors_list or neighbor lists View does not have large enough dimensions");
+            compadre_assert_release((neighbor_lists_view_type::rank==1) && "neighbor_lists must be a 1D Kokkos view.");
+
+            typedef Kokkos::View<global_index_type*, typename neighbor_lists_view_type::array_layout,
+                    typename neighbor_lists_view_type::memory_space, typename neighbor_lists_view_type::memory_traits> row_offsets_view_type;
+            row_offsets_view_type row_offsets;
+            int max_neighbor_list_row_storage_size = 1;
+            if (!is_dry_run) {
+                auto nla = CreateNeighborLists(neighbor_lists, number_of_neighbors_list);
+                max_neighbor_list_row_storage_size = nla.getMaxNumNeighbors();
+                Kokkos::resize(row_offsets, num_target_sites);
+                Kokkos::fence();
+                Kokkos::parallel_for(Kokkos::RangePolicy<host_execution_space>(0,num_target_sites), [&](const int i) {
+                    row_offsets(i) = nla.getRowOffsetHost(i); 
+                });
+                Kokkos::fence();
+            }
+
+            compadre_assert_release((epsilons.extent(0)==(size_t)num_target_sites)
+                        && "epsilons View does not have the correct dimension");
+
+            typedef Kokkos::View<double*, Kokkos::HostSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> > 
+                    scratch_double_view;
+
+            typedef Kokkos::View<size_t*, Kokkos::HostSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> > 
+                    scratch_int_view;
+
+            // determine scratch space size needed
+            int team_scratch_size = 0;
+            team_scratch_size += scratch_double_view::shmem_size(max_neighbor_list_row_storage_size); // distances
+            team_scratch_size += scratch_int_view::shmem_size(max_neighbor_list_row_storage_size); // indices
+            team_scratch_size += scratch_double_view::shmem_size(_dim); // target coordinate
+
+            // part 2. do radius search using window size from knn search
+            // each row of neighbor lists is a neighbor list for the target site corresponding to that row
+            Kokkos::parallel_for("radius search", host_team_policy(num_target_sites, Kokkos::AUTO)
+                    .set_scratch_size(0 /*shared memory level*/, Kokkos::PerTeam(team_scratch_size)), 
+                    KOKKOS_LAMBDA(const host_member_type& teamMember) {
+
+                // make unmanaged scratch views
+                scratch_double_view neighbor_distances(teamMember.team_scratch(0 /*shared memory*/), max_neighbor_list_row_storage_size);
+                scratch_int_view neighbor_indices(teamMember.team_scratch(0 /*shared memory*/), max_neighbor_list_row_storage_size);
+                scratch_double_view this_target_coord(teamMember.team_scratch(0 /*shared memory*/), _dim);
+
+                size_t neighbors_found = 0;
+
+                const int i = teamMember.league_rank();
+
+                // set epsilons if radius is specified
+                if (uniform_radius > 0) epsilons(i) = uniform_radius;
+
+                // needs furthest neighbor's distance for next portion
+                compadre_kernel_assert_release((epsilons(i)<=max_search_radius || max_search_radius==0) && "max_search_radius given (generally derived from the size of a halo region), and search radius needed would exceed this max_search_radius.");
+
+                Kokkos::parallel_for(Kokkos::TeamThreadRange(teamMember, max_neighbor_list_row_storage_size), [&](const int j) { 
+                    neighbor_indices(j) = 0;
+                    neighbor_distances(j) = -1.0;
+                });
+                teamMember.team_barrier();
+
+                Kokkos::single(Kokkos::PerTeam(teamMember), [&] () {
+                    // target_coords is LayoutLeft on device and its HostMirror, so giving a pointer to 
+                    // this data would lead to a wrong result if the device is a GPU
+
+                    for (int j=0; j<_dim; ++j) {
+                        this_target_coord(j) = trg_pts_view(i,j);
+                    }
+
+                    nanoflann::SearchParams sp; // default parameters
+                    Compadre::RadiusResultSet<double> rrs(epsilons(i)*epsilons(i), neighbor_distances.data(), neighbor_indices.data(), max_neighbor_list_row_storage_size);
+                    if (_dim==1) {
+                        neighbors_found = _tree_1d->template radiusSearchCustomCallback<Compadre::RadiusResultSet<double> >(this_target_coord.data(), rrs, sp) ;
+                    } else if (_dim==2) {
+                        neighbors_found = _tree_2d->template radiusSearchCustomCallback<Compadre::RadiusResultSet<double> >(this_target_coord.data(), rrs, sp) ;
+                    } else if (_dim==3) {
+                        neighbors_found = _tree_3d->template radiusSearchCustomCallback<Compadre::RadiusResultSet<double> >(this_target_coord.data(), rrs, sp) ;
+                    }
+            
+                    // we check that neighbors found doesn't differ from dry-run or we store neighbors_found
+                    // no check that neighbors found stay the same if uniform_radius specified (!=0)
+                    if (is_dry_run || uniform_radius!=0.0) {
+                        number_of_neighbors_list(i) = neighbors_found;
+                    } else if (check_same) {
+                        compadre_kernel_assert_debug((neighbors_found==(size_t)number_of_neighbors_list(i)) 
+                                && "Number of neighbors found changed since dry-run.");
+                    }
+
+                    // epsilons already scaled and then set by search radius
+                });
+                teamMember.team_barrier();
+
+                // loop_bound so that we don't write into memory we don't have allocated
+                int loop_bound = neighbors_found;
+                // loop over each neighbor index and fill with a value
+                if (!is_dry_run) {
+                    Kokkos::parallel_for(Kokkos::TeamThreadRange(teamMember, loop_bound), [&](const int j) {
+                        // cast to an whatever data type the 2D array of neighbor lists is using
+                        neighbor_lists(row_offsets(i)+j) = static_cast<typename std::remove_pointer<typename std::remove_pointer<typename neighbor_lists_view_type::data_type>::type>::type>(neighbor_indices(j));
+                    });
+                    teamMember.team_barrier();
+                }
+
+            });
+            Kokkos::fence();
+            auto nla = CreateNeighborLists(number_of_neighbors_list);
+            return nla.getTotalNeighborsOverAllListsHost();
+        }
+
+
+        /*! \brief Generates neighbor lists as 2D view by performing a k-nearest neighbor search
+            Only accepts 2D neighbor_lists without number_of_neighbors_list.
+            \param is_dry_run               [in] - whether to do a dry-run (find neighbors, but don't store)
+            \param trg_pts_view             [in] - target coordinates from which to seek neighbors
+            \param neighbor_lists           [out] - 2D view of neighbor lists to be populated from search
+            \param epsilons                 [in/out] - radius to search, overwritten if uniform_radius != 0
+            \param neighbors_needed         [in] - k neighbors needed as a minimum
+            \param epsilon_multiplier       [in] - distance to kth neighbor multiplied by epsilon_multiplier for follow-on radius search
+            \param max_search_radius        [in] - largest valid search (useful only for MPI jobs if halo size exists)
+        */
+        template <typename trg_view_type, typename neighbor_lists_view_type, typename epsilons_view_type>
+        size_t generate2DNeighborListsFromKNNSearch(bool is_dry_run, trg_view_type trg_pts_view, 
+                neighbor_lists_view_type neighbor_lists, epsilons_view_type epsilons, 
+                const int neighbors_needed, const double epsilon_multiplier = 1.6, 
+                double max_search_radius = 0.0, bool check_same = true) {
+
+            // First, do a knn search (removes need for guessing initial search radius)
+
+            compadre_assert_release((Kokkos::SpaceAccessibility<host_execution_space, typename trg_view_type::memory_space>::accessible==1) &&
+                    "Target coordinates view passed to generate2DNeighborListsFromKNNSearch should be accessible from the host.");
+            compadre_assert_release((((int)trg_pts_view.extent(1))>=_dim) &&
+                    "Target coordinates view passed to generate2DNeighborListsFromRadiusSearch must have \
+                    second dimension as large as _dim.");
+            compadre_assert_release((Kokkos::SpaceAccessibility<host_execution_space, typename neighbor_lists_view_type::memory_space>::accessible==1) &&
+                    "Views passed to generate2DNeighborListsFromKNNSearch should be accessible from the host.");
+            compadre_assert_release((Kokkos::SpaceAccessibility<host_execution_space, typename epsilons_view_type::memory_space>::accessible==1) &&
+                    "Views passed to generate2DNeighborListsFromKNNSearch should be accessible from the host.");
+
+            // loop size
+            const int num_target_sites = trg_pts_view.extent(0);
+
+            if ((!_tree_1d && _dim==1) || (!_tree_2d && _dim==2) || (!_tree_3d && _dim==3)) {
+                this->generateKDTree();
+            }
+            Kokkos::fence();
+
+            compadre_assert_release((num_target_sites==0 || // sizes don't matter when there are no targets
+                    (neighbor_lists.extent(0)==(size_t)num_target_sites 
+                        && neighbor_lists.extent(1)>=(size_t)(neighbors_needed+1)))
+                        && "neighbor lists View does not have large enough dimensions");
+            compadre_assert_release((neighbor_lists_view_type::rank==2) && "neighbor_lists must be a 2D Kokkos view.");
+
+            compadre_assert_release((epsilons.extent(0)==(size_t)num_target_sites)
+                        && "epsilons View does not have the correct dimension");
+
+            typedef Kokkos::View<double*, Kokkos::HostSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> > 
+                    scratch_double_view;
+
+            typedef Kokkos::View<size_t*, Kokkos::HostSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> > 
+                    scratch_int_view;
+
+            // determine scratch space size needed
+            int team_scratch_size = 0;
+            team_scratch_size += scratch_double_view::shmem_size(neighbor_lists.extent(1)); // distances
+            team_scratch_size += scratch_int_view::shmem_size(neighbor_lists.extent(1)); // indices
+            team_scratch_size += scratch_double_view::shmem_size(_dim); // target coordinate
+
+            // minimum number of neighbors found over all target sites' neighborhoods
+            size_t min_num_neighbors = 0;
+            //
+            // part 1. do knn search for neighbors needed for unisolvency
+            // each row of neighbor lists is a neighbor list for the target site corresponding to that row
+            //
+            // as long as neighbor_lists can hold the number of neighbors_needed, we don't need to check
+            // that the maximum number of neighbors will fit into neighbor_lists
+            //
+            Kokkos::parallel_reduce("knn search", host_team_policy(num_target_sites, Kokkos::AUTO)
+                    .set_scratch_size(0 /*shared memory level*/, Kokkos::PerTeam(team_scratch_size)), 
+                    KOKKOS_LAMBDA(const host_member_type& teamMember, size_t& t_min_num_neighbors) {
+
+                // make unmanaged scratch views
+                scratch_double_view neighbor_distances(teamMember.team_scratch(0 /*shared memory*/), neighbor_lists.extent(1));
+                scratch_int_view neighbor_indices(teamMember.team_scratch(0 /*shared memory*/), neighbor_lists.extent(1));
+                scratch_double_view this_target_coord(teamMember.team_scratch(0 /*shared memory*/), _dim);
+
+                size_t neighbors_found = 0;
+
+                const int i = teamMember.league_rank();
+
+                Kokkos::parallel_for(Kokkos::TeamThreadRange(teamMember, neighbor_lists.extent(1)), [=](const int j) {
+                    neighbor_indices(j) = 0;
+                    neighbor_distances(j) = -1.0;
+                });
+            
+                teamMember.team_barrier();
+                Kokkos::single(Kokkos::PerTeam(teamMember), [&] () {
+                    // target_coords is LayoutLeft on device and its HostMirror, so giving a pointer to 
+                    // this data would lead to a wrong result if the device is a GPU
+
+                    for (int j=0; j<_dim; ++j) { 
+                        this_target_coord(j) = trg_pts_view(i,j);
+                    }
+
+                    if (_dim==1) {
+                        neighbors_found = _tree_1d->knnSearch(this_target_coord.data(), neighbors_needed, 
+                                neighbor_indices.data(), neighbor_distances.data()) ;
+                    } else if (_dim==2) {
+                        neighbors_found = _tree_2d->knnSearch(this_target_coord.data(), neighbors_needed, 
+                                neighbor_indices.data(), neighbor_distances.data()) ;
+                    } else if (_dim==3) {
+                        neighbors_found = _tree_3d->knnSearch(this_target_coord.data(), neighbors_needed, 
+                                neighbor_indices.data(), neighbor_distances.data()) ;
+                    }
+
+                    // get minimum number of neighbors found over all target sites' neighborhoods
+                    t_min_num_neighbors = (neighbors_found < t_min_num_neighbors) ? neighbors_found : t_min_num_neighbors;
+            
+                    // scale by epsilon_multiplier to window from location where the last neighbor was found
+                    epsilons(i) = (neighbor_distances(neighbors_found-1) > 0) ?
+                        std::sqrt(neighbor_distances(neighbors_found-1))*epsilon_multiplier : 1e-14*epsilon_multiplier;
+                    // the only time the second case using 1e-14 is used is when either zero neighbors or exactly one 
+                    // neighbor (neighbor is target site) is found.  when the follow on radius search is conducted, the one
+                    // neighbor (target site) will not be found if left at 0, so any positive amount will do, however 1e-14 
+                    // should is small enough to ensure that other neighbors are not found
+
+                    // needs furthest neighbor's distance for next portion
+                    compadre_kernel_assert_release((neighbors_found<neighbor_lists.extent(1) || is_dry_run) 
+                            && "Neighbors found exceeded storage capacity in neighbor list.");
+                    compadre_kernel_assert_release((epsilons(i)<=max_search_radius || max_search_radius==0 || is_dry_run) 
+                            && "max_search_radius given (generally derived from the size of a halo region), \
+                                and search radius needed would exceed this max_search_radius.");
+                    // neighbor_distances stores squared distances from neighbor to target, as returned by nanoflann
+                });
+            }, Kokkos::Min<size_t>(min_num_neighbors) );
+            Kokkos::fence();
+            
+            // if no target sites, then min_num_neighbors is set to neighbors_needed
+            // which also avoids min_num_neighbors being improperly set by min reduction
+            if (num_target_sites==0) min_num_neighbors = neighbors_needed;
+
+            // Next, check that we found the neighbors_needed number that we require for unisolvency
+            compadre_assert_release((num_target_sites==0 || (min_num_neighbors>=(size_t)neighbors_needed))
+                    && "Neighbor search failed to find number of neighbors needed for unisolvency.");
+            
+            // call a radius search using values now stored in epsilons
+            size_t max_num_neighbors = generate2DNeighborListsFromRadiusSearch(is_dry_run, trg_pts_view, neighbor_lists, 
+                    epsilons, 0.0 /*don't set uniform radius*/, max_search_radius, check_same);
+
+            return max_num_neighbors;
+        }
+
+        /*! \brief Generates compressed row neighbor lists by performing a k-nearest neighbor search
+            Only accepts 1D neighbor_lists with 1D number_of_neighbors_list.
+            \param is_dry_run               [in] - whether to do a dry-run (find neighbors, but don't store)
+            \param trg_pts_view             [in] - target coordinates from which to seek neighbors
+            \param neighbor_lists           [out] - 1D view of neighbor lists to be populated from search
+            \param number_of_neighbors_list [in/out] - number of neighbors for each target site
+            \param epsilons                 [in/out] - radius to search, overwritten if uniform_radius != 0
+            \param neighbors_needed         [in] - k neighbors needed as a minimum
+            \param epsilon_multiplier       [in] - distance to kth neighbor multiplied by epsilon_multiplier for follow-on radius search
+            \param max_search_radius        [in] - largest valid search (useful only for MPI jobs if halo size exists)
+        */
+        template <typename trg_view_type, typename neighbor_lists_view_type, typename epsilons_view_type>
+        size_t generateCRNeighborListsFromKNNSearch(bool is_dry_run, trg_view_type trg_pts_view, 
+                neighbor_lists_view_type neighbor_lists, neighbor_lists_view_type number_of_neighbors_list,
+                epsilons_view_type epsilons, const int neighbors_needed, 
+                const double epsilon_multiplier = 1.6, double max_search_radius = 0.0, 
+                bool check_same = true) {
+
+            // First, do a knn search (removes need for guessing initial search radius)
+
+            compadre_assert_release((Kokkos::SpaceAccessibility<host_execution_space, typename trg_view_type::memory_space>::accessible==1) &&
+                    "Target coordinates view passed to generateCRNeighborListsFromKNNSearch should be accessible from the host.");
+            compadre_assert_release((((int)trg_pts_view.extent(1))>=_dim) &&
+                    "Target coordinates view passed to generateCRNeighborListsFromRadiusSearch must have \
+                    second dimension as large as _dim.");
+            compadre_assert_release((Kokkos::SpaceAccessibility<host_execution_space, typename neighbor_lists_view_type::memory_space>::accessible==1) &&
+                    "Views passed to generateCRNeighborListsFromKNNSearch should be accessible from the host.");
+            compadre_assert_release((Kokkos::SpaceAccessibility<host_execution_space, typename epsilons_view_type::memory_space>::accessible==1) &&
+                    "Views passed to generateCRNeighborListsFromKNNSearch should be accessible from the host.");
+
+            // loop size
+            const int num_target_sites = trg_pts_view.extent(0);
+
+            if ((!_tree_1d && _dim==1) || (!_tree_2d && _dim==2) || (!_tree_3d && _dim==3)) {
+                this->generateKDTree();
+            }
+            Kokkos::fence();
+
+            compadre_assert_release((number_of_neighbors_list.extent(0)==(size_t)num_target_sites ) 
+                        && "number_of_neighbors_list or neighbor lists View does not have large enough dimensions");
+            compadre_assert_release((neighbor_lists_view_type::rank==1) && "neighbor_lists must be a 1D Kokkos view.");
+
+            // if dry-run, neighbors_needed, else max over previous dry-run
+            int max_neighbor_list_row_storage_size = neighbors_needed;
+            if (!is_dry_run) {
+                auto nla = CreateNeighborLists(neighbor_lists, number_of_neighbors_list);
+                max_neighbor_list_row_storage_size = nla.getMaxNumNeighbors();
+            }
+
+            compadre_assert_release((epsilons.extent(0)==(size_t)num_target_sites)
+                        && "epsilons View does not have the correct dimension");
+
+            typedef Kokkos::View<double*, Kokkos::HostSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> > 
+                    scratch_double_view;
+
+            typedef Kokkos::View<size_t*, Kokkos::HostSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> > 
+                    scratch_int_view;
+
+            // determine scratch space size needed
+            int team_scratch_size = 0;
+            team_scratch_size += scratch_double_view::shmem_size(max_neighbor_list_row_storage_size); // distances
+            team_scratch_size += scratch_int_view::shmem_size(max_neighbor_list_row_storage_size); // indices
+            team_scratch_size += scratch_double_view::shmem_size(_dim); // target coordinate
+
+            // minimum number of neighbors found over all target sites' neighborhoods
+            size_t min_num_neighbors = 0;
+            //
+            // part 1. do knn search for neighbors needed for unisolvency
+            // each row of neighbor lists is a neighbor list for the target site corresponding to that row
+            //
+            // as long as neighbor_lists can hold the number of neighbors_needed, we don't need to check
+            // that the maximum number of neighbors will fit into neighbor_lists
+            //
+            Kokkos::parallel_reduce("knn search", host_team_policy(num_target_sites, Kokkos::AUTO)
+                    .set_scratch_size(0 /*shared memory level*/, Kokkos::PerTeam(team_scratch_size)), 
+                    KOKKOS_LAMBDA(const host_member_type& teamMember, size_t& t_min_num_neighbors) {
+
+                // make unmanaged scratch views
+                scratch_double_view neighbor_distances(teamMember.team_scratch(0 /*shared memory*/), max_neighbor_list_row_storage_size);
+                scratch_int_view neighbor_indices(teamMember.team_scratch(0 /*shared memory*/), max_neighbor_list_row_storage_size);
+                scratch_double_view this_target_coord(teamMember.team_scratch(0 /*shared memory*/), _dim);
+
+                size_t neighbors_found = 0;
+
+                const int i = teamMember.league_rank();
+
+                Kokkos::parallel_for(Kokkos::TeamThreadRange(teamMember, max_neighbor_list_row_storage_size), [=](const int j) {
+                    neighbor_indices(j) = 0;
+                    neighbor_distances(j) = -1.0;
+                });
+            
+                teamMember.team_barrier();
+                Kokkos::single(Kokkos::PerTeam(teamMember), [&] () {
+                    // target_coords is LayoutLeft on device and its HostMirror, so giving a pointer to 
+                    // this data would lead to a wrong result if the device is a GPU
+
+                    for (int j=0; j<_dim; ++j) { 
+                        this_target_coord(j) = trg_pts_view(i,j);
+                    }
+
+                    if (_dim==1) {
+                        neighbors_found = _tree_1d->knnSearch(this_target_coord.data(), neighbors_needed, 
+                                neighbor_indices.data(), neighbor_distances.data()) ;
+                    } else if (_dim==2) {
+                        neighbors_found = _tree_2d->knnSearch(this_target_coord.data(), neighbors_needed, 
+                                neighbor_indices.data(), neighbor_distances.data()) ;
+                    } else if (_dim==3) {
+                        neighbors_found = _tree_3d->knnSearch(this_target_coord.data(), neighbors_needed, 
+                                neighbor_indices.data(), neighbor_distances.data()) ;
+                    }
+
+                    // get minimum number of neighbors found over all target sites' neighborhoods
+                    t_min_num_neighbors = (neighbors_found < t_min_num_neighbors) ? neighbors_found : t_min_num_neighbors;
+            
+                    // scale by epsilon_multiplier to window from location where the last neighbor was found
+                    epsilons(i) = (neighbor_distances(neighbors_found-1) > 0) ?
+                        std::sqrt(neighbor_distances(neighbors_found-1))*epsilon_multiplier : 1e-14*epsilon_multiplier;
+                    // the only time the second case using 1e-14 is used is when either zero neighbors or exactly one 
+                    // neighbor (neighbor is target site) is found.  when the follow on radius search is conducted, the one
+                    // neighbor (target site) will not be found if left at 0, so any positive amount will do, however 1e-14 
+                    // should is small enough to ensure that other neighbors are not found
+
+                    compadre_kernel_assert_release((epsilons(i)<=max_search_radius || max_search_radius==0 || is_dry_run) 
+                            && "max_search_radius given (generally derived from the size of a halo region), \
+                                and search radius needed would exceed this max_search_radius.");
+                    // neighbor_distances stores squared distances from neighbor to target, as returned by nanoflann
+                });
+            }, Kokkos::Min<size_t>(min_num_neighbors) );
+            Kokkos::fence();
+            
+            // if no target sites, then min_num_neighbors is set to neighbors_needed
+            // which also avoids min_num_neighbors being improperly set by min reduction
+            if (num_target_sites==0) min_num_neighbors = neighbors_needed;
+
+            // Next, check that we found the neighbors_needed number that we require for unisolvency
+            compadre_assert_release((num_target_sites==0 || (min_num_neighbors>=(size_t)neighbors_needed))
+                    && "Neighbor search failed to find number of neighbors needed for unisolvency.");
+            
+            // call a radius search using values now stored in epsilons
+            generateCRNeighborListsFromRadiusSearch(is_dry_run, trg_pts_view, neighbor_lists, 
+                    number_of_neighbors_list, epsilons, 0.0 /*don't set uniform radius*/, 
+                    max_search_radius, check_same);
+
+            auto nla = CreateNeighborLists(number_of_neighbors_list);
+            return nla.getTotalNeighborsOverAllListsHost();
+        }
+}; // Nanoflann's PointCloudSearch
+
+} // Compadre
+
+#endif

From 57b5ae402ef9b9e82f295ad0b811cdf1ca33d5d0 Mon Sep 17 00:00:00 2001
From: Paul Kuberry <pakuber@sandia.gov>
Date: Mon, 27 Sep 2021 16:17:31 -0600
Subject: [PATCH 13/40] Fix bug in checking neighbors are same between dry-run
 and real search

---
 src/Compadre_PointCloudSearch_Nanoflann.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Compadre_PointCloudSearch_Nanoflann.hpp b/src/Compadre_PointCloudSearch_Nanoflann.hpp
index 3c138a7e5..45694b247 100644
--- a/src/Compadre_PointCloudSearch_Nanoflann.hpp
+++ b/src/Compadre_PointCloudSearch_Nanoflann.hpp
@@ -315,7 +315,7 @@ class PointCloudSearch {
                     t_max_num_neighbors = (neighbors_found > t_max_num_neighbors) ? neighbors_found : t_max_num_neighbors;
             
                     // the number of neighbors is stored in column zero of the neighbor lists 2D array
-                    if (check_same) {
+                    if (!is_dry_run && check_same) {
                         compadre_kernel_assert_debug((neighbors_found==(size_t)neighbor_lists(i,0)) 
                                 && "Number of neighbors found changed since dry-run.");
                     }

From 9da28807c7b1e21d61c3fc65b926ab81fbf3a90a Mon Sep 17 00:00:00 2001
From: Paul Kuberry <pakuber@sandia.gov>
Date: Tue, 28 Sep 2021 06:57:43 -0600
Subject: [PATCH 14/40] Add debugging statement to neighbor search to expose
 that ArborX uses floats

---
 examples/NeighborSearchTest.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/examples/NeighborSearchTest.cpp b/examples/NeighborSearchTest.cpp
index ebc51e9c7..83aa9eb65 100644
--- a/examples/NeighborSearchTest.cpp
+++ b/examples/NeighborSearchTest.cpp
@@ -385,6 +385,8 @@ bool all_passed = true;
                 for (int j=1; j<=neighbor_lists(i,0); ++j) {
                     if (brute_force_neighbor_list[i].count(neighbor_lists(i,j))!=1) {
                         all_found = false;
+                        //double trg_coord[3] = {target_coords(i,0), target_coords(i,1), target_coords(i,2)};
+                        //printf("pcn: %d:%.18f,%.18f\n", neighbor_lists(i,j),point_cloud_search.kdtreeDistance(trg_coord,neighbor_lists(i,j)), (h_multiplier + random_vec(i))*h_spacing);
                     }
                 }
                 if (all_found) t_num_passed++;

From 1c876036f62bfaf347dfc233811aadc433e54894 Mon Sep 17 00:00:00 2001
From: Paul Kuberry <pakuber@sandia.gov>
Date: Tue, 28 Sep 2021 07:22:56 -0600
Subject: [PATCH 15/40] Prune unneeded ArborX files/directories

---
 arborx/CONTRIBUTING.md                        |  12 -
 arborx/README.md                              |  57 --
 arborx/benchmarks/CMakeLists.txt              |   7 -
 arborx/benchmarks/bvh_driver/CMakeLists.txt   |  16 -
 .../bvh_driver/benchmark_registration.hpp     | 441 -----------
 arborx/benchmarks/bvh_driver/bvh_driver.cpp   | 295 --------
 .../distributed_tree_driver/CMakeLists.txt    |   4 -
 .../distributed_tree_driver.cpp               | 637 ----------------
 .../execution_space_instances/CMakeLists.txt  |   4 -
 .../execution_space_instances_driver.cpp      | 225 ------
 .../benchmarks/point_clouds/point_clouds.hpp  | 216 ------
 arborx/docker/.env                            |   2 -
 arborx/docker/Dockerfile                      | 145 ----
 arborx/docker/Dockerfile.hipcc                | 110 ---
 arborx/docker/Dockerfile.pgi                  | 122 ---
 arborx/docker/Dockerfile.sycl                 | 132 ----
 arborx/docker/README.md                       |  18 -
 arborx/docker/docker-compose.yml              |  20 -
 arborx/docs/LICENSE.ECL                       |  36 -
 arborx/docs/logos/arborx_logo_v1.0.png        | Bin 79458 -> 0 bytes
 arborx/docs/logos/arborx_logo_v1.0.svg        | 357 ---------
 arborx/docs/logos/arborx_logo_v1.0_nobg.png   | Bin 81640 -> 0 bytes
 arborx/examples/CMakeLists.txt                |  20 -
 arborx/examples/access_traits/CMakeLists.txt  |   9 -
 .../example_cuda_access_traits.cpp            |  98 ---
 .../example_host_access_traits.cpp            |  52 --
 arborx/examples/brute_force/CMakeLists.txt    |   3 -
 arborx/examples/brute_force/brute_force.cpp   | 124 ----
 arborx/examples/callback/CMakeLists.txt       |   3 -
 arborx/examples/callback/example_callback.cpp | 145 ----
 .../dbscan/ArborX_DBSCANVerification.hpp      | 320 --------
 arborx/examples/dbscan/CMakeLists.txt         |  11 -
 arborx/examples/dbscan/README.md              |  62 --
 arborx/examples/dbscan/converter.cpp          | 472 ------------
 arborx/examples/dbscan/dbscan.cpp             | 504 -------------
 arborx/examples/dbscan/input.txt              |   9 -
 arborx/examples/raytracing/CMakeLists.txt     |   3 -
 .../raytracing/example_raytracing.cpp         | 200 -----
 .../simple_intersection/CMakeLists.txt        |   3 -
 .../example_intersection.cpp                  | 168 -----
 arborx/examples/viz/CMakeLists.txt            |   7 -
 arborx/examples/viz/arborx_query_sort.py      | 121 ---
 arborx/examples/viz/leaf_cloud.txt            |  59 --
 arborx/examples/viz/requirements.txt          |   3 -
 arborx/examples/viz/tree_visualization.cpp    | 182 -----
 arborx/scripts/benchmark.py                   | 101 ---
 arborx/scripts/benchmark_plot.py              | 199 -----
 arborx/scripts/check_format_cpp.sh            |  75 --
 arborx/scripts/docker_cmake                   |  25 -
 arborx/scripts/requirements.txt               |   3 -
 arborx/test/ArborXTest_TreeTypeTraits.hpp     |  85 ---
 arborx/test/ArborX_BoostGeometryAdapters.hpp  |  97 ---
 arborx/test/ArborX_BoostRTreeHelpers.hpp      | 337 ---------
 arborx/test/ArborX_BoostRangeAdapters.hpp     | 135 ----
 arborx/test/ArborX_EnableDeviceTypes.hpp.in   |  21 -
 arborx/test/ArborX_EnableViewComparison.hpp   |  71 --
 .../test/BoostTest_CUDA_clang_workarounds.hpp |  24 -
 arborx/test/CMakeLists.txt                    | 186 -----
 arborx/test/Search_UnitTestHelpers.hpp        | 276 -------
 .../boost_ext/CompressedStorageComparison.hpp | 110 ---
 .../test/boost_ext/KokkosPairComparison.hpp   |  46 --
 arborx/test/boost_ext/TupleComparison.hpp     |  62 --
 .../headers_self_contained/CMakeLists.txt     |  15 -
 .../test/headers_self_contained/tstHeader.cpp |  27 -
 arborx/test/tstBoostGeometryAdapters.cpp      | 241 ------
 arborx/test/tstBoostRangeAdapters.cpp         |  78 --
 arborx/test/tstCompileOnlyAccessTraits.cpp    |  87 ---
 arborx/test/tstCompileOnlyCallbacks.cpp       | 150 ----
 arborx/test/tstCompileOnlyConcepts.cpp        |  23 -
 arborx/test/tstCompileOnlyMain.cpp            |  12 -
 .../test/tstCompileOnlyTypeRequirements.cpp   |  64 --
 arborx/test/tstContainerAdaptors.cpp          |  73 --
 arborx/test/tstDBSCAN.cpp                     | 270 -------
 arborx/test/tstDetailsAlgorithms.cpp          | 234 ------
 arborx/test/tstDetailsBatchedQueries.cpp      |  69 --
 arborx/test/tstDetailsCrsGraphWrapperImpl.cpp |  95 ---
 arborx/test/tstDetailsDistributedTreeImpl.cpp | 418 -----------
 arborx/test/tstDetailsTreeConstruction.cpp    | 294 --------
 arborx/test/tstDetailsUtils.cpp               | 268 -------
 arborx/test/tstDistributedTree.cpp            | 693 ------------------
 arborx/test/tstException.cpp                  |  37 -
 arborx/test/tstHeapOperations.cpp             | 208 ------
 arborx/test/tstKDOP.cpp                       | 143 ----
 arborx/test/tstKokkosToolsAnnotations.cpp     | 249 -------
 .../tstKokkosToolsDistributedAnnotations.cpp  | 197 -----
 arborx/test/tstPriorityQueueMiscellaneous.cpp | 144 ----
 arborx/test/tstQueryTreeCallbacks.cpp         | 343 ---------
 .../test/tstQueryTreeComparisonWithBoost.cpp  | 269 -------
 arborx/test/tstQueryTreeDegenerate.cpp        | 403 ----------
 arborx/test/tstQueryTreeIntersectsKDOP.cpp    |  82 ---
 .../test/tstQueryTreeManufacturedSolution.cpp | 257 -------
 arborx/test/tstQueryTreeTraversalPolicy.cpp   | 177 -----
 arborx/test/tstRay.cpp                        | 259 -------
 arborx/test/tstScopedProfileRegion.cpp        |  97 ---
 arborx/test/tstSequenceContainers.cpp         | 146 ----
 arborx/test/utf_main.cpp                      |  45 --
 96 files changed, 13454 deletions(-)
 delete mode 100644 arborx/CONTRIBUTING.md
 delete mode 100644 arborx/README.md
 delete mode 100644 arborx/benchmarks/CMakeLists.txt
 delete mode 100644 arborx/benchmarks/bvh_driver/CMakeLists.txt
 delete mode 100644 arborx/benchmarks/bvh_driver/benchmark_registration.hpp
 delete mode 100644 arborx/benchmarks/bvh_driver/bvh_driver.cpp
 delete mode 100644 arborx/benchmarks/distributed_tree_driver/CMakeLists.txt
 delete mode 100644 arborx/benchmarks/distributed_tree_driver/distributed_tree_driver.cpp
 delete mode 100644 arborx/benchmarks/execution_space_instances/CMakeLists.txt
 delete mode 100644 arborx/benchmarks/execution_space_instances/execution_space_instances_driver.cpp
 delete mode 100644 arborx/benchmarks/point_clouds/point_clouds.hpp
 delete mode 100644 arborx/docker/.env
 delete mode 100644 arborx/docker/Dockerfile
 delete mode 100644 arborx/docker/Dockerfile.hipcc
 delete mode 100644 arborx/docker/Dockerfile.pgi
 delete mode 100644 arborx/docker/Dockerfile.sycl
 delete mode 100644 arborx/docker/README.md
 delete mode 100644 arborx/docker/docker-compose.yml
 delete mode 100644 arborx/docs/LICENSE.ECL
 delete mode 100644 arborx/docs/logos/arborx_logo_v1.0.png
 delete mode 100644 arborx/docs/logos/arborx_logo_v1.0.svg
 delete mode 100644 arborx/docs/logos/arborx_logo_v1.0_nobg.png
 delete mode 100644 arborx/examples/CMakeLists.txt
 delete mode 100644 arborx/examples/access_traits/CMakeLists.txt
 delete mode 100644 arborx/examples/access_traits/example_cuda_access_traits.cpp
 delete mode 100644 arborx/examples/access_traits/example_host_access_traits.cpp
 delete mode 100644 arborx/examples/brute_force/CMakeLists.txt
 delete mode 100644 arborx/examples/brute_force/brute_force.cpp
 delete mode 100644 arborx/examples/callback/CMakeLists.txt
 delete mode 100644 arborx/examples/callback/example_callback.cpp
 delete mode 100644 arborx/examples/dbscan/ArborX_DBSCANVerification.hpp
 delete mode 100644 arborx/examples/dbscan/CMakeLists.txt
 delete mode 100644 arborx/examples/dbscan/README.md
 delete mode 100644 arborx/examples/dbscan/converter.cpp
 delete mode 100644 arborx/examples/dbscan/dbscan.cpp
 delete mode 100644 arborx/examples/dbscan/input.txt
 delete mode 100644 arborx/examples/raytracing/CMakeLists.txt
 delete mode 100644 arborx/examples/raytracing/example_raytracing.cpp
 delete mode 100644 arborx/examples/simple_intersection/CMakeLists.txt
 delete mode 100644 arborx/examples/simple_intersection/example_intersection.cpp
 delete mode 100644 arborx/examples/viz/CMakeLists.txt
 delete mode 100755 arborx/examples/viz/arborx_query_sort.py
 delete mode 100644 arborx/examples/viz/leaf_cloud.txt
 delete mode 100644 arborx/examples/viz/requirements.txt
 delete mode 100644 arborx/examples/viz/tree_visualization.cpp
 delete mode 100644 arborx/scripts/benchmark.py
 delete mode 100755 arborx/scripts/benchmark_plot.py
 delete mode 100755 arborx/scripts/check_format_cpp.sh
 delete mode 100644 arborx/scripts/docker_cmake
 delete mode 100644 arborx/scripts/requirements.txt
 delete mode 100644 arborx/test/ArborXTest_TreeTypeTraits.hpp
 delete mode 100644 arborx/test/ArborX_BoostGeometryAdapters.hpp
 delete mode 100644 arborx/test/ArborX_BoostRTreeHelpers.hpp
 delete mode 100644 arborx/test/ArborX_BoostRangeAdapters.hpp
 delete mode 100644 arborx/test/ArborX_EnableDeviceTypes.hpp.in
 delete mode 100644 arborx/test/ArborX_EnableViewComparison.hpp
 delete mode 100644 arborx/test/BoostTest_CUDA_clang_workarounds.hpp
 delete mode 100644 arborx/test/CMakeLists.txt
 delete mode 100644 arborx/test/Search_UnitTestHelpers.hpp
 delete mode 100644 arborx/test/boost_ext/CompressedStorageComparison.hpp
 delete mode 100644 arborx/test/boost_ext/KokkosPairComparison.hpp
 delete mode 100644 arborx/test/boost_ext/TupleComparison.hpp
 delete mode 100644 arborx/test/headers_self_contained/CMakeLists.txt
 delete mode 100644 arborx/test/headers_self_contained/tstHeader.cpp
 delete mode 100644 arborx/test/tstBoostGeometryAdapters.cpp
 delete mode 100644 arborx/test/tstBoostRangeAdapters.cpp
 delete mode 100644 arborx/test/tstCompileOnlyAccessTraits.cpp
 delete mode 100644 arborx/test/tstCompileOnlyCallbacks.cpp
 delete mode 100644 arborx/test/tstCompileOnlyConcepts.cpp
 delete mode 100644 arborx/test/tstCompileOnlyMain.cpp
 delete mode 100644 arborx/test/tstCompileOnlyTypeRequirements.cpp
 delete mode 100644 arborx/test/tstContainerAdaptors.cpp
 delete mode 100644 arborx/test/tstDBSCAN.cpp
 delete mode 100644 arborx/test/tstDetailsAlgorithms.cpp
 delete mode 100644 arborx/test/tstDetailsBatchedQueries.cpp
 delete mode 100644 arborx/test/tstDetailsCrsGraphWrapperImpl.cpp
 delete mode 100644 arborx/test/tstDetailsDistributedTreeImpl.cpp
 delete mode 100644 arborx/test/tstDetailsTreeConstruction.cpp
 delete mode 100644 arborx/test/tstDetailsUtils.cpp
 delete mode 100644 arborx/test/tstDistributedTree.cpp
 delete mode 100644 arborx/test/tstException.cpp
 delete mode 100644 arborx/test/tstHeapOperations.cpp
 delete mode 100644 arborx/test/tstKDOP.cpp
 delete mode 100644 arborx/test/tstKokkosToolsAnnotations.cpp
 delete mode 100644 arborx/test/tstKokkosToolsDistributedAnnotations.cpp
 delete mode 100644 arborx/test/tstPriorityQueueMiscellaneous.cpp
 delete mode 100644 arborx/test/tstQueryTreeCallbacks.cpp
 delete mode 100644 arborx/test/tstQueryTreeComparisonWithBoost.cpp
 delete mode 100644 arborx/test/tstQueryTreeDegenerate.cpp
 delete mode 100644 arborx/test/tstQueryTreeIntersectsKDOP.cpp
 delete mode 100644 arborx/test/tstQueryTreeManufacturedSolution.cpp
 delete mode 100644 arborx/test/tstQueryTreeTraversalPolicy.cpp
 delete mode 100644 arborx/test/tstRay.cpp
 delete mode 100644 arborx/test/tstScopedProfileRegion.cpp
 delete mode 100644 arborx/test/tstSequenceContainers.cpp
 delete mode 100644 arborx/test/utf_main.cpp

diff --git a/arborx/CONTRIBUTING.md b/arborx/CONTRIBUTING.md
deleted file mode 100644
index ab273435c..000000000
--- a/arborx/CONTRIBUTING.md
+++ /dev/null
@@ -1,12 +0,0 @@
-Contributing
-------------
-
-Contributing to ArborX is easy. Just send us a [pull
-request](https://help.github.com/articles/using-pull-requests/). When you send
-your request, make `master` the destination branch on the [ArborX
-repository](https://github.com/ArborX/ArborX). Please allow edits from
-maintainers in the pull request.
-
-Your pull request must pass ArborX's tests. It is also desired that it follows
-the coding style used in ArborX (see
-[wiki](https://github.com/arborx/ArborX/wiki/CodeStyle)).
diff --git a/arborx/README.md b/arborx/README.md
deleted file mode 100644
index 79f4432e7..000000000
--- a/arborx/README.md
+++ /dev/null
@@ -1,57 +0,0 @@
-<img src="docs/logos/arborx_logo_v1.0.png" width="192">
-
-ArborX
-======
-ArborX is an open-source library designed to provide performance portable
-algorithms for geometric search, similarly to nanoflann and Boost Geometry.
-
-Installation
-------------
-The installation instructions can be found [here](https://github.com/arborx/ArborX/wiki/Build).
-
-Using ArborX
-------------
-The interface is described [here](https://github.com/arborx/ArborX/wiki/ArborX%3A%3ABoundingVolumeHierarchy).
-
-Examples
---------
-Examples can be found in the [examples directory](https://github.com/arborx/ArborX/examples).
-
-Questions, Bug Reporting, and Issue Tracking
---------------------------------------------
-Questions, bug reporting and issue tracking are provided by GitHub. Please
-report all bugs by creating a new issue with the "bug" tag. You can ask
-questions by creating a new issue with the "question" tag.
-
-Contributing
-------------
-We encourage you to contribute to ArborX! Please check out the
-[guidelines](CONTRIBUTING.md) about how to proceed.
-
-Citing ArborX
--------------
-If you publish work which mentions ArborX, please cite the following paper:
-
-```BibTeX
-@article{arborx2020,
-  author = {Lebrun-Grandi\'{e}, D. and Prokopenko, A. and Turcksin, B. and Slattery, S. R.},
-  title = {{ArborX}: A Performance Portable Geometric Search Library},
-  year = {2020},
-  issue_date = {December 2020},
-  publisher = {Association for Computing Machinery},
-  address = {New York, NY, USA},
-  volume = {47},
-  number = {1},
-  issn = {0098-3500},
-  url = {https://doi.org/10.1145/3412558},
-  doi = {10.1145/3412558},
-  journal = {ACM Trans. Math. Softw.},
-  month = dec,
-  articleno = {2},
-  numpages = {15}
-}
-```
-
-License
--------
-ArborX has a [BSD 3-clause open-source license](LICENSE).
diff --git a/arborx/benchmarks/CMakeLists.txt b/arborx/benchmarks/CMakeLists.txt
deleted file mode 100644
index 58796651a..000000000
--- a/arborx/benchmarks/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-find_package(Boost 1.56.0 REQUIRED COMPONENTS program_options)
-
-add_subdirectory(bvh_driver)
-add_subdirectory(execution_space_instances)
-if (ARBORX_ENABLE_MPI)
-  add_subdirectory(distributed_tree_driver)
-endif()
diff --git a/arborx/benchmarks/bvh_driver/CMakeLists.txt b/arborx/benchmarks/bvh_driver/CMakeLists.txt
deleted file mode 100644
index 2fcd9a43f..000000000
--- a/arborx/benchmarks/bvh_driver/CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-set(POINT_CLOUDS_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/benchmarks/point_clouds)
-set(UNIT_TESTS_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/test)
-
-# We require version 1.4.0 or higher but the format used by Google benchmark is
-# wrong and thus, we cannot check the version during the configuration step.
-find_package(benchmark REQUIRED)
-
-find_package(Threads REQUIRED)
-
-add_executable(ArborX_BoundingVolumeHierarchy.exe bvh_driver.cpp)
-target_link_libraries(ArborX_BoundingVolumeHierarchy.exe ArborX::ArborX benchmark::benchmark Boost::program_options Threads::Threads)
-target_include_directories(ArborX_BoundingVolumeHierarchy.exe PRIVATE ${POINT_CLOUDS_INCLUDE_DIR} ${UNIT_TESTS_INCLUDE_DIR})
-add_test(NAME ArborX_BoundingVolumeHierarchy_Benchmark COMMAND ./ArborX_BoundingVolumeHierarchy.exe --buffer=0 --benchmark_color=true)
-if(ARBORX_PERFORMANCE_TESTING)
-  target_compile_definitions(ArborX_BoundingVolumeHierarchy.exe PRIVATE ARBORX_PERFORMANCE_TESTING)
-endif()
diff --git a/arborx/benchmarks/bvh_driver/benchmark_registration.hpp b/arborx/benchmarks/bvh_driver/benchmark_registration.hpp
deleted file mode 100644
index eceb38158..000000000
--- a/arborx/benchmarks/bvh_driver/benchmark_registration.hpp
+++ /dev/null
@@ -1,441 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2017-2021 by the ArborX authors                            *
- * All rights reserved.                                                     *
- *                                                                          *
- * This file is part of the ArborX library. ArborX is                       *
- * distributed under a BSD 3-clause license. For the licensing terms see    *
- * the LICENSE file in the top-level directory.                             *
- *                                                                          *
- * SPDX-License-Identifier: BSD-3-Clause                                    *
- ****************************************************************************/
-
-#ifndef BENCHMARK_REGISTRATION_HPP
-#define BENCHMARK_REGISTRATION_HPP
-
-#include <ArborX_Point.hpp>
-#include <ArborX_Predicates.hpp>
-
-#include <Kokkos_Core.hpp>
-
-#include <chrono>
-#include <cmath> // cbrt
-
-#include <benchmark/benchmark.h>
-#include <point_clouds.hpp>
-
-struct Spec
-{
-  std::string backends;
-  int n_values;
-  int n_queries;
-  int n_neighbors;
-  bool sort_predicates;
-  int buffer_size;
-  PointCloudType source_point_cloud_type;
-  PointCloudType target_point_cloud_type;
-
-  Spec() = default;
-  Spec(std::string const &spec_string)
-  {
-    std::istringstream ss(spec_string);
-    std::string token;
-
-    // clang-format off
-    getline(ss, token, '/');  backends = token;
-    getline(ss, token, '/');  n_values = std::stoi(token);
-    getline(ss, token, '/');  n_queries = std::stoi(token);
-    getline(ss, token, '/');  n_neighbors = std::stoi(token);
-    getline(ss, token, '/');  sort_predicates = static_cast<bool>(std::stoi(token));
-    getline(ss, token, '/');  buffer_size = std::stoi(token);
-    getline(ss, token, '/');  source_point_cloud_type = static_cast<PointCloudType>(std::stoi(token));
-    getline(ss, token, '/');  target_point_cloud_type = static_cast<PointCloudType>(std::stoi(token));
-    // clang-format on
-
-    if (!(backends == "all" || backends == "serial" || backends == "openmp" ||
-          backends == "threads" || backends == "cuda" || backends == "rtree" ||
-          backends == "hip" || backends == "sycl" ||
-          backends == "openmptarget"))
-      throw std::runtime_error("Backend " + backends + " invalid!");
-  }
-
-  std::string create_label_construction(std::string const &tree_name) const
-  {
-    std::string s = std::string("BM_construction<") + tree_name + ">";
-    for (auto const &var :
-         {n_values, static_cast<int>(source_point_cloud_type)})
-      s += "/" + std::to_string(var);
-    return s;
-  }
-
-  std::string create_label_radius_search(std::string const &tree_name,
-                                         std::string const &flavor = "") const
-  {
-    std::string s = std::string("BM_radius_") +
-                    (flavor.empty() ? "" : flavor + "_") + "search<" +
-                    tree_name + ">";
-    for (auto const &var :
-         {n_values, n_queries, n_neighbors, static_cast<int>(sort_predicates),
-          buffer_size, static_cast<int>(source_point_cloud_type),
-          static_cast<int>(target_point_cloud_type)})
-      s += "/" + std::to_string(var);
-    return s;
-  };
-
-  std::string create_label_knn_search(std::string const &tree_name,
-                                      std::string const &flavor = "") const
-  {
-    std::string s = std::string("BM_knn_") +
-                    (flavor.empty() ? "" : flavor + "_") + "search<" +
-                    tree_name + ">";
-    for (auto const &var :
-         {n_values, n_queries, n_neighbors, static_cast<int>(sort_predicates),
-          static_cast<int>(source_point_cloud_type),
-          static_cast<int>(target_point_cloud_type)})
-      s += "/" + std::to_string(var);
-    return s;
-  };
-};
-
-template <typename DeviceType>
-Kokkos::View<ArborX::Point *, DeviceType>
-constructPoints(int n_values, PointCloudType point_cloud_type)
-{
-  Kokkos::View<ArborX::Point *, DeviceType> random_points(
-      Kokkos::view_alloc(Kokkos::WithoutInitializing, "random_points"),
-      n_values);
-  // Generate random points uniformly distributed within a box.  The edge
-  // length of the box chosen such that object density (here objects will be
-  // boxes 2x2x2 centered around a random point) will remain constant as
-  // problem size is changed.
-  auto const a = std::cbrt(n_values);
-  generatePointCloud(point_cloud_type, a, random_points);
-
-  return random_points;
-}
-
-template <typename DeviceType>
-Kokkos::View<decltype(ArborX::intersects(ArborX::Sphere{})) *, DeviceType>
-makeSpatialQueries(int n_values, int n_queries, int n_neighbors,
-                   PointCloudType target_point_cloud_type)
-{
-  Kokkos::View<ArborX::Point *, DeviceType> random_points(
-      Kokkos::view_alloc(Kokkos::WithoutInitializing, "random_points"),
-      n_queries);
-  auto const a = std::cbrt(n_values);
-  generatePointCloud(target_point_cloud_type, a, random_points);
-
-  Kokkos::View<decltype(ArborX::intersects(ArborX::Sphere{})) *, DeviceType>
-      queries(Kokkos::view_alloc(Kokkos::WithoutInitializing, "queries"),
-              n_queries);
-  // Radius is computed so that the number of results per query for a uniformly
-  // distributed points in a [-a,a]^3 box is approximately n_neighbors.
-  // Calculation: n_values*(4/3*M_PI*r^3)/(2a)^3 = n_neighbors
-  double const r = std::cbrt(static_cast<double>(n_neighbors) * 6. / M_PI);
-  using ExecutionSpace = typename DeviceType::execution_space;
-  Kokkos::parallel_for(
-      "bvh_driver:setup_radius_search_queries",
-      Kokkos::RangePolicy<ExecutionSpace>(0, n_queries), KOKKOS_LAMBDA(int i) {
-        queries(i) = ArborX::intersects(ArborX::Sphere{random_points(i), r});
-      });
-  return queries;
-}
-
-template <typename DeviceType>
-Kokkos::View<ArborX::Nearest<ArborX::Point> *, DeviceType>
-makeNearestQueries(int n_values, int n_queries, int n_neighbors,
-                   PointCloudType target_point_cloud_type)
-{
-  Kokkos::View<ArborX::Point *, DeviceType> random_points(
-      Kokkos::view_alloc(Kokkos::WithoutInitializing, "random_points"),
-      n_queries);
-  auto const a = std::cbrt(n_values);
-  generatePointCloud(target_point_cloud_type, a, random_points);
-
-  Kokkos::View<ArborX::Nearest<ArborX::Point> *, DeviceType> queries(
-      Kokkos::view_alloc(Kokkos::WithoutInitializing, "queries"), n_queries);
-  using ExecutionSpace = typename DeviceType::execution_space;
-  Kokkos::parallel_for(
-      "bvh_driver:setup_knn_search_queries",
-      Kokkos::RangePolicy<ExecutionSpace>(0, n_queries), KOKKOS_LAMBDA(int i) {
-        queries(i) =
-            ArborX::nearest<ArborX::Point>(random_points(i), n_neighbors);
-      });
-  return queries;
-}
-
-template <typename Queries>
-struct QueriesWithIndex
-{
-  Queries _queries;
-};
-
-template <typename Queries>
-struct ArborX::AccessTraits<QueriesWithIndex<Queries>, ArborX::PredicatesTag>
-{
-  using memory_space = typename Queries::memory_space;
-  static size_t size(QueriesWithIndex<Queries> const &q)
-  {
-    return q._queries.extent(0);
-  }
-  static KOKKOS_FUNCTION auto get(QueriesWithIndex<Queries> const &q, size_t i)
-  {
-    return attach(q._queries(i), (int)i);
-  }
-};
-
-template <typename DeviceType>
-struct CountCallback
-{
-  Kokkos::View<int *, DeviceType> count_;
-
-  template <typename Query>
-  KOKKOS_FUNCTION void operator()(Query const &query, int) const
-  {
-    auto const i = ArborX::getData(query);
-    Kokkos::atomic_fetch_add(&count_(i), 1);
-  }
-};
-
-template <typename ExecutionSpace, class TreeType>
-void BM_construction(benchmark::State &state, Spec const &spec)
-{
-  using DeviceType =
-      Kokkos::Device<ExecutionSpace, typename TreeType::memory_space>;
-
-  auto const points =
-      constructPoints<DeviceType>(spec.n_values, spec.source_point_cloud_type);
-
-  ExecutionSpace exec_space;
-
-  for (auto _ : state)
-  {
-    exec_space.fence();
-    auto const start = std::chrono::high_resolution_clock::now();
-
-    TreeType index(exec_space, points);
-
-    exec_space.fence();
-    auto const end = std::chrono::high_resolution_clock::now();
-    std::chrono::duration<double> elapsed_seconds = end - start;
-    state.SetIterationTime(elapsed_seconds.count());
-  }
-  // In Benchmark 1.5.0, it could be rewritten as
-  //   state.counters["rate"] = benchmark::Counter(
-  //     spec.n_values, benchmark::Counter::kIsIterationInvariantRate);
-  // Benchmark 1.4 does not support kIsIterationInvariantRate, however.
-  state.counters["rate"] = benchmark::Counter(
-      spec.n_values * state.iterations(), benchmark::Counter::kIsRate);
-}
-
-template <typename ExecutionSpace, class TreeType>
-void BM_radius_search(benchmark::State &state, Spec const &spec)
-{
-  using DeviceType =
-      Kokkos::Device<ExecutionSpace, typename TreeType::memory_space>;
-
-  ExecutionSpace exec_space;
-
-  TreeType index(exec_space, constructPoints<DeviceType>(
-                                 spec.n_values, spec.source_point_cloud_type));
-  auto const queries = makeSpatialQueries<DeviceType>(
-      spec.n_values, spec.n_queries, spec.n_neighbors,
-      spec.target_point_cloud_type);
-
-  for (auto _ : state)
-  {
-    Kokkos::View<int *, DeviceType> offset("offset", 0);
-    Kokkos::View<int *, DeviceType> indices("indices", 0);
-
-    exec_space.fence();
-    auto const start = std::chrono::high_resolution_clock::now();
-
-    ArborX::query(index, exec_space, queries, indices, offset,
-                  ArborX::Experimental::TraversalPolicy()
-                      .setPredicateSorting(spec.sort_predicates)
-                      .setBufferSize(spec.buffer_size));
-
-    exec_space.fence();
-    auto const end = std::chrono::high_resolution_clock::now();
-    std::chrono::duration<double> elapsed_seconds = end - start;
-    state.SetIterationTime(elapsed_seconds.count());
-  }
-  state.counters["rate"] = benchmark::Counter(
-      spec.n_queries * state.iterations(), benchmark::Counter::kIsRate);
-}
-
-template <typename ExecutionSpace, class TreeType>
-void BM_radius_callback_search(benchmark::State &state, Spec const &spec)
-{
-  using DeviceType =
-      Kokkos::Device<ExecutionSpace, typename TreeType::memory_space>;
-
-  ExecutionSpace exec_space;
-
-  TreeType index(
-      ExecutionSpace{},
-      constructPoints<DeviceType>(spec.n_values, spec.source_point_cloud_type));
-  auto const queries_no_index = makeSpatialQueries<DeviceType>(
-      spec.n_values, spec.n_queries, spec.n_neighbors,
-      spec.target_point_cloud_type);
-  QueriesWithIndex<decltype(queries_no_index)> queries{queries_no_index};
-
-  for (auto _ : state)
-  {
-    Kokkos::View<int *, DeviceType> num_neigh("Testing::num_neigh",
-                                              spec.n_queries);
-    CountCallback<DeviceType> callback{num_neigh};
-
-    exec_space.fence();
-    auto const start = std::chrono::high_resolution_clock::now();
-
-    index.query(exec_space, queries, callback,
-                ArborX::Experimental::TraversalPolicy().setPredicateSorting(
-                    spec.sort_predicates));
-
-    exec_space.fence();
-    auto const end = std::chrono::high_resolution_clock::now();
-    std::chrono::duration<double> elapsed_seconds = end - start;
-    state.SetIterationTime(elapsed_seconds.count());
-  }
-  state.counters["rate"] = benchmark::Counter(
-      spec.n_queries * state.iterations(), benchmark::Counter::kIsRate);
-}
-
-template <typename ExecutionSpace, class TreeType>
-void BM_knn_search(benchmark::State &state, Spec const &spec)
-{
-  using DeviceType =
-      Kokkos::Device<ExecutionSpace, typename TreeType::memory_space>;
-
-  ExecutionSpace exec_space;
-
-  TreeType index(exec_space, constructPoints<DeviceType>(
-                                 spec.n_values, spec.source_point_cloud_type));
-  auto const queries = makeNearestQueries<DeviceType>(
-      spec.n_values, spec.n_queries, spec.n_neighbors,
-      spec.target_point_cloud_type);
-
-  for (auto _ : state)
-  {
-    Kokkos::View<int *, DeviceType> offset("offset", 0);
-    Kokkos::View<int *, DeviceType> indices("indices", 0);
-
-    exec_space.fence();
-    auto const start = std::chrono::high_resolution_clock::now();
-
-    ArborX::query(index, exec_space, queries, indices, offset,
-                  ArborX::Experimental::TraversalPolicy().setPredicateSorting(
-                      spec.sort_predicates));
-
-    exec_space.fence();
-    auto const end = std::chrono::high_resolution_clock::now();
-    std::chrono::duration<double> elapsed_seconds = end - start;
-    state.SetIterationTime(elapsed_seconds.count());
-  }
-  state.counters["rate"] = benchmark::Counter(
-      spec.n_queries * state.iterations(), benchmark::Counter::kIsRate);
-}
-
-template <typename ExecutionSpace, class TreeType>
-void BM_knn_callback_search(benchmark::State &state, Spec const &spec)
-{
-  using DeviceType =
-      Kokkos::Device<ExecutionSpace, typename TreeType::memory_space>;
-
-  ExecutionSpace exec_space;
-
-  TreeType index(exec_space, constructPoints<DeviceType>(
-                                 spec.n_values, spec.source_point_cloud_type));
-  auto const queries_no_index = makeNearestQueries<DeviceType>(
-      spec.n_values, spec.n_queries, spec.n_neighbors,
-      spec.target_point_cloud_type);
-  QueriesWithIndex<decltype(queries_no_index)> queries{queries_no_index};
-
-  for (auto _ : state)
-  {
-    Kokkos::View<int *, DeviceType> num_neigh("Testing::num_neigh",
-                                              spec.n_queries);
-    CountCallback<DeviceType> callback{num_neigh};
-
-    exec_space.fence();
-    auto const start = std::chrono::high_resolution_clock::now();
-
-    index.query(exec_space, queries, callback,
-                ArborX::Experimental::TraversalPolicy().setPredicateSorting(
-                    spec.sort_predicates));
-
-    exec_space.fence();
-    auto const end = std::chrono::high_resolution_clock::now();
-    std::chrono::duration<double> elapsed_seconds = end - start;
-    state.SetIterationTime(elapsed_seconds.count());
-  }
-  state.counters["rate"] = benchmark::Counter(
-      spec.n_queries * state.iterations(), benchmark::Counter::kIsRate);
-}
-
-template <typename ExecutionSpace, typename TreeType>
-void register_benchmark_construction(Spec const &spec,
-                                     std::string const &description)
-{
-  benchmark::RegisterBenchmark(
-      spec.create_label_construction(description).c_str(),
-      [=](benchmark::State &state) {
-        BM_construction<ExecutionSpace, TreeType>(state, spec);
-      })
-      ->UseManualTime()
-      ->Unit(benchmark::kMicrosecond);
-}
-
-template <typename ExecutionSpace, typename TreeType>
-void register_benchmark_spatial_query_no_callback(
-    Spec const &spec, std::string const &description)
-{
-  benchmark::RegisterBenchmark(
-      spec.create_label_radius_search(description).c_str(),
-      [=](benchmark::State &state) {
-        BM_radius_search<ExecutionSpace, TreeType>(state, spec);
-      })
-      ->UseManualTime()
-      ->Unit(benchmark::kMicrosecond);
-}
-
-template <typename ExecutionSpace, typename TreeType>
-void register_benchmark_spatial_query_callback(Spec const &spec,
-                                               std::string const &description)
-{
-  benchmark::RegisterBenchmark(
-      spec.create_label_radius_search(description, "callback").c_str(),
-      [=](benchmark::State &state) {
-        BM_radius_callback_search<ExecutionSpace, TreeType>(state, spec);
-      })
-      ->UseManualTime()
-      ->Unit(benchmark::kMicrosecond);
-}
-
-template <typename ExecutionSpace, typename TreeType>
-void register_benchmark_nearest_query_no_callback(
-    Spec const &spec, std::string const &description)
-{
-  benchmark::RegisterBenchmark(
-      spec.create_label_knn_search(description).c_str(),
-      [=](benchmark::State &state) {
-        BM_knn_search<ExecutionSpace, TreeType>(state, spec);
-      })
-      ->UseManualTime()
-      ->Unit(benchmark::kMicrosecond);
-}
-
-template <typename ExecutionSpace, typename TreeType>
-void register_benchmark_nearest_query_callback(Spec const &spec,
-                                               std::string const &description)
-{
-  benchmark::RegisterBenchmark(
-      spec.create_label_knn_search(description, "callback").c_str(),
-      [=](benchmark::State &state) {
-        BM_knn_callback_search<ExecutionSpace, TreeType>(state, spec);
-      })
-      ->UseManualTime()
-      ->Unit(benchmark::kMicrosecond);
-}
-
-#endif
diff --git a/arborx/benchmarks/bvh_driver/bvh_driver.cpp b/arborx/benchmarks/bvh_driver/bvh_driver.cpp
deleted file mode 100644
index ce29a42dc..000000000
--- a/arborx/benchmarks/bvh_driver/bvh_driver.cpp
+++ /dev/null
@@ -1,295 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2017-2021 by the ArborX authors                            *
- * All rights reserved.                                                     *
- *                                                                          *
- * This file is part of the ArborX library. ArborX is                       *
- * distributed under a BSD 3-clause license. For the licensing terms see    *
- * the LICENSE file in the top-level directory.                             *
- *                                                                          *
- * SPDX-License-Identifier: BSD-3-Clause                                    *
- ****************************************************************************/
-
-#include <ArborX_BoostRTreeHelpers.hpp>
-#include <ArborX_LinearBVH.hpp>
-#include <ArborX_Version.hpp>
-
-#include <Kokkos_Core.hpp>
-
-#include <boost/program_options.hpp>
-
-#include <cstdlib>
-
-#include "benchmark_registration.hpp"
-
-#ifdef ARBORX_PERFORMANCE_TESTING
-#include <mpi.h>
-#endif
-
-#include <benchmark/benchmark.h>
-
-template <typename ExecutionSpace, typename TreeType>
-struct BenchmarkRegistration
-{
-  BenchmarkRegistration(Spec const &, std::string const &) {}
-};
-
-template <typename ExecutionSpace, typename MemorySpace>
-struct BenchmarkRegistration<ExecutionSpace, ArborX::BVH<MemorySpace>>
-{
-  using TreeType = ArborX::BVH<MemorySpace>;
-  BenchmarkRegistration(Spec const &spec, std::string const &description)
-  {
-    register_benchmark_construction<ExecutionSpace, TreeType>(spec,
-                                                              description);
-    register_benchmark_spatial_query_no_callback<ExecutionSpace, TreeType>(
-        spec, description);
-    register_benchmark_spatial_query_callback<ExecutionSpace, TreeType>(
-        spec, description);
-    register_benchmark_nearest_query_no_callback<ExecutionSpace, TreeType>(
-        spec, description);
-    register_benchmark_nearest_query_callback<ExecutionSpace, TreeType>(
-        spec, description);
-  }
-};
-
-template <typename ExecutionSpace>
-struct BenchmarkRegistration<ExecutionSpace, BoostExt::RTree<ArborX::Point>>
-{
-  using TreeType = BoostExt::RTree<ArborX::Point>;
-  BenchmarkRegistration(Spec const &spec, std::string const &description)
-  {
-    register_benchmark_construction<ExecutionSpace, TreeType>(spec,
-                                                              description);
-    register_benchmark_spatial_query_no_callback<ExecutionSpace, TreeType>(
-        spec, description);
-    register_benchmark_nearest_query_no_callback<ExecutionSpace, TreeType>(
-        spec, description);
-  }
-};
-
-template <typename ExecutionSpace>
-using BVHBenchmarkRegistration =
-    BenchmarkRegistration<ExecutionSpace,
-                          ArborX::BVH<typename ExecutionSpace::memory_space>>;
-void register_bvh_benchmarks(Spec const &spec)
-{
-#ifdef KOKKOS_ENABLE_SERIAL
-  if (spec.backends == "all" || spec.backends == "serial")
-    BVHBenchmarkRegistration<Kokkos::Serial>(spec, "ArborX::BVH<Serial>");
-#else
-  if (spec.backends == "serial")
-    throw std::runtime_error("Serial backend not available!");
-#endif
-
-#ifdef KOKKOS_ENABLE_OPENMP
-  if (spec.backends == "all" || spec.backends == "openmp")
-    BVHBenchmarkRegistration<Kokkos::OpenMP>(spec, "ArborX::BVH<OpenMP>");
-#else
-  if (spec.backends == "openmp")
-    throw std::runtime_error("OpenMP backend not available!");
-#endif
-
-#ifdef KOKKOS_ENABLE_THREADS
-  if (spec.backends == "all" || spec.backends == "threads")
-    BVHBenchmarkRegistration<Kokkos::Threads>(spec, "ArborX::BVH<Threads>");
-#else
-  if (spec.backends == "threads")
-    throw std::runtime_error("Threads backend not available!");
-#endif
-
-#ifdef KOKKOS_ENABLE_CUDA
-  if (spec.backends == "all" || spec.backends == "cuda")
-    BVHBenchmarkRegistration<Kokkos::Cuda>(spec, "ArborX::BVH<Cuda>");
-#else
-  if (spec.backends == "cuda")
-    throw std::runtime_error("CUDA backend not available!");
-#endif
-
-#ifdef KOKKOS_ENABLE_HIP
-  if (spec.backends == "all" || spec.backends == "hip")
-    BVHBenchmarkRegistration<Kokkos::Experimental::HIP>(spec,
-                                                        "ArborX::BVH<HIP>");
-#else
-  if (spec.backends == "hip")
-    throw std::runtime_error("HIP backend not available!");
-#endif
-
-#ifdef KOKKOS_ENABLE_OPENMPTARGET
-  if (spec.backends == "all" || spec.backends == "openmptarget")
-    BVHBenchmarkRegistration<Kokkos::Experimental::OpenMPTarget>(
-        spec, "ArborX::BVH<OpenMPTarget>");
-#else
-  if (spec.backends == "openmptarget")
-    throw std::runtime_error("OpenMPTarget backend not available!");
-#endif
-
-#ifdef KOKKOS_ENABLE_SYCL
-  if (spec.backends == "all" || spec.backends == "sycl")
-    BVHBenchmarkRegistration<Kokkos::Experimental::SYCL>(spec,
-                                                         "ArborX::BVH<SYCL>");
-#else
-  if (spec.backends == "sycl")
-    throw std::runtime_error("SYCL backend not available!");
-#endif
-}
-
-void register_boostrtree_benchmarks(Spec const &spec)
-{
-#ifdef KOKKOS_ENABLE_SERIAL
-  if (spec.backends == "all" || spec.backends == "rtree")
-    BenchmarkRegistration<Kokkos::Serial, BoostExt::RTree<ArborX::Point>>(
-        spec, "BoostRTree");
-#else
-  std::ignore = spec;
-#endif
-}
-
-// NOTE Motivation for this class that stores the argument count and values is
-// I could not figure out how to make the parser consume arguments with
-// Boost.Program_options
-// Benchmark removes its own arguments from the command line arguments. This
-// means, that by virtue of returning references to internal data members in
-// argc() and argv() function, it will necessarily modify the members. It will
-// decrease _argc, and "reduce" _argv data. Hence, we must keep a copy of _argv
-// that is not modified from the outside to release memory in the destructor
-// correctly.
-class CmdLineArgs
-{
-private:
-  int _argc;
-  std::vector<char *> _argv;
-  std::vector<char *> _owner_ptrs;
-
-public:
-  CmdLineArgs(std::vector<std::string> const &args, char const *exe)
-      : _argc(args.size() + 1)
-      , _owner_ptrs{new char[std::strlen(exe) + 1]}
-  {
-    std::strcpy(_owner_ptrs[0], exe);
-    _owner_ptrs.reserve(_argc);
-    for (auto const &s : args)
-    {
-      _owner_ptrs.push_back(new char[s.size() + 1]);
-      std::strcpy(_owner_ptrs.back(), s.c_str());
-    }
-    _argv = _owner_ptrs;
-  }
-
-  ~CmdLineArgs()
-  {
-    for (auto *p : _owner_ptrs)
-    {
-      delete[] p;
-    }
-  }
-
-  int &argc() { return _argc; }
-
-  char **argv() { return _argv.data(); }
-};
-
-int main(int argc, char *argv[])
-{
-#ifdef ARBORX_PERFORMANCE_TESTING
-  MPI_Init(&argc, &argv);
-#endif
-  Kokkos::initialize(argc, argv);
-
-  namespace bpo = boost::program_options;
-  bpo::options_description desc("Allowed options");
-  Spec single_spec;
-  std::string source_pt_cloud;
-  std::string target_pt_cloud;
-  std::vector<std::string> exact_specs;
-  // clang-format off
-    desc.add_options()
-        ( "help", "produce help message" )
-        ( "values", bpo::value<int>(&single_spec.n_values)->default_value(50000), "number of indexable values (source)" )
-        ( "queries", bpo::value<int>(&single_spec.n_queries)->default_value(20000), "number of queries (target)" )
-        ( "predicate-sort", bpo::value<bool>(&single_spec.sort_predicates)->default_value(true), "sort predicates" )
-        ( "neighbors", bpo::value<int>(&single_spec.n_neighbors)->default_value(10), "desired number of results per query" )
-        ( "buffer", bpo::value<int>(&single_spec.buffer_size)->default_value(0), "size for buffer optimization in radius search" )
-        ( "source-point-cloud-type", bpo::value<std::string>(&source_pt_cloud)->default_value("filled_box"), "shape of the source point cloud"  )
-        ( "target-point-cloud-type", bpo::value<std::string>(&target_pt_cloud)->default_value("filled_box"), "shape of the target point cloud"  )
-        ( "exact-spec", bpo::value<std::vector<std::string>>(&exact_specs)->multitoken(), "exact specification (can be specified multiple times for batch)" )
-    ;
-  // clang-format on
-  bpo::variables_map vm;
-  bpo::parsed_options parsed = bpo::command_line_parser(argc, argv)
-                                   .options(desc)
-                                   .allow_unregistered()
-                                   .run();
-  bpo::store(parsed, vm);
-  CmdLineArgs pass_further{
-      bpo::collect_unrecognized(parsed.options, bpo::include_positional),
-      argv[0]};
-  bpo::notify(vm);
-
-  std::cout << "ArborX version: " << ArborX::version() << std::endl;
-  std::cout << "ArborX hash   : " << ArborX::gitCommitHash() << std::endl;
-
-  if (vm.count("help") > 0)
-  {
-    // Full list of options consists of Kokkos + Boost.Program_options +
-    // Google Benchmark and we still need to call benchmark::Initialize() to
-    // get those printed to the standard output.
-    std::cout << desc << "\n";
-    int ac = 2;
-    char *av[] = {(char *)"ignored", (char *)"--help"};
-    // benchmark::Initialize() calls exit(0) when `--help` so register
-    // Kokkos::finalize() to be called on normal program termination.
-    std::atexit(Kokkos::finalize);
-    benchmark::Initialize(&ac, av);
-    return 1;
-  }
-
-  if (vm.count("exact-spec") > 0)
-  {
-    for (std::string option :
-         {"values", "queries", "predicate-sort", "neighbors", "buffer",
-          "source-point-cloud-type", "target-point-cloud-type"})
-    {
-      if (!vm[option].defaulted())
-      {
-        std::cout << "Conflicting options: 'exact-spec' and '" << option
-                  << "', exiting..." << std::endl;
-        return EXIT_FAILURE;
-      }
-    }
-  }
-
-  benchmark::Initialize(&pass_further.argc(), pass_further.argv());
-  // Throw if some of the arguments have not been recognized.
-  std::ignore =
-      bpo::command_line_parser(pass_further.argc(), pass_further.argv())
-          .options(bpo::options_description(""))
-          .run();
-
-  std::vector<Spec> specs;
-  specs.reserve(exact_specs.size());
-  for (auto const &spec_string : exact_specs)
-    specs.emplace_back(spec_string);
-
-  if (vm.count("exact-spec") == 0)
-  {
-    single_spec.backends = "all";
-    single_spec.source_point_cloud_type = to_point_cloud_enum(source_pt_cloud);
-    single_spec.target_point_cloud_type = to_point_cloud_enum(target_pt_cloud);
-    specs.push_back(single_spec);
-  }
-
-  for (auto const &spec : specs)
-  {
-    register_bvh_benchmarks(spec);
-    register_boostrtree_benchmarks(spec);
-  }
-
-  benchmark::RunSpecifiedBenchmarks();
-
-  Kokkos::finalize();
-#ifdef ARBORX_PERFORMANCE_TESTING
-  MPI_Finalize();
-#endif
-
-  return EXIT_SUCCESS;
-}
diff --git a/arborx/benchmarks/distributed_tree_driver/CMakeLists.txt b/arborx/benchmarks/distributed_tree_driver/CMakeLists.txt
deleted file mode 100644
index f0ccc61b8..000000000
--- a/arborx/benchmarks/distributed_tree_driver/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-add_executable(ArborX_DistributedTree_Benchmark.exe distributed_tree_driver.cpp)
-target_link_libraries(ArborX_DistributedTree_Benchmark.exe ArborX::ArborX Boost::program_options)
-target_include_directories(ArborX_DistributedTree_Benchmark.exe PRIVATE ${CMAKE_SOURCE_DIR}/benchmarks/point_clouds)
-add_test(NAME ArborX_DistributedTree_Benchmark COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} ./ArborX_DistributedTree_Benchmark.exe ${MPIEXEC_POSTFLAGS})
diff --git a/arborx/benchmarks/distributed_tree_driver/distributed_tree_driver.cpp b/arborx/benchmarks/distributed_tree_driver/distributed_tree_driver.cpp
deleted file mode 100644
index 150b88100..000000000
--- a/arborx/benchmarks/distributed_tree_driver/distributed_tree_driver.cpp
+++ /dev/null
@@ -1,637 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2017-2021 by the ArborX authors                            *
- * All rights reserved.                                                     *
- *                                                                          *
- * This file is part of the ArborX library. ArborX is                       *
- * distributed under a BSD 3-clause license. For the licensing terms see    *
- * the LICENSE file in the top-level directory.                             *
- *                                                                          *
- * SPDX-License-Identifier: BSD-3-Clause                                    *
- ****************************************************************************/
-
-#include <ArborX_DistributedTree.hpp>
-#include <ArborX_Version.hpp>
-
-#include <Kokkos_Core.hpp>
-
-#include <boost/program_options.hpp>
-
-#include <algorithm>
-#include <chrono>
-#include <cmath> // sqrt, cbrt
-#include <iomanip>
-#include <numeric>
-#include <random>
-#include <utility>
-#include <vector>
-
-#include <mpi.h>
-
-struct HelpPrinted
-{
-};
-
-// The TimeMonitor class can be used to measure for a series of events, i.e. it
-// represents a set of timers of type Timer. It is a poor man's drop-in
-// replacement for Teuchos::TimeMonitor
-class TimeMonitor
-{
-  using container_type = std::vector<std::pair<std::string, double>>;
-  using entry_reference_type = container_type::reference;
-  container_type _data;
-
-public:
-  class Timer
-  {
-    entry_reference_type _entry;
-    bool _started;
-    std::chrono::high_resolution_clock::time_point _tick;
-
-  public:
-    Timer(entry_reference_type ref)
-        : _entry{ref}
-        , _started{false}
-    {
-    }
-    void start()
-    {
-      assert(!_started);
-      _tick = std::chrono::high_resolution_clock::now();
-      _started = true;
-    }
-    void stop()
-    {
-      assert(_started);
-      std::chrono::duration<double> duration =
-          std::chrono::high_resolution_clock::now() - _tick;
-      // NOTE I have put much thought into whether we should use the
-      // operator+= and keep track of how many times the timer was
-      // restarted.  To be honest I have not even looked was the original
-      // TimeMonitor behavior is :)
-      _entry.second = duration.count();
-      _started = false;
-    }
-  };
-  // NOTE Original code had the pointer semantics.  Can change in the future.
-  // The smart pointer is a distraction.  The main problem here is that the
-  // reference stored by the timer is invalidated if the time monitor gets
-  // out of scope.
-  std::unique_ptr<Timer> getNewTimer(std::string name)
-  {
-    // FIXME Consider searching whether there already is an entry with the
-    // same name.
-    _data.emplace_back(std::move(name), 0.);
-    return std::make_unique<Timer>(_data.back());
-  }
-
-  void summarize(MPI_Comm comm, std::ostream &os = std::cout)
-  {
-    int comm_size;
-    MPI_Comm_size(comm, &comm_size);
-    int comm_rank;
-    MPI_Comm_rank(comm, &comm_rank);
-    int n_timers = _data.size();
-
-    os << std::left << std::scientific;
-
-    // Initialize with length of "Timer Name"
-    std::string const timer_name = "Timer Name";
-    std::size_t const max_section_length = std::accumulate(
-        _data.begin(), _data.end(), timer_name.size(),
-        [](std::size_t current_max, entry_reference_type section) {
-          return std::max(current_max, section.first.size());
-        });
-
-    if (comm_size == 1)
-    {
-      std::string const header_without_timer_name = " | GlobalTime";
-      std::stringstream dummy_string_stream;
-      dummy_string_stream << std::setprecision(os.precision())
-                          << std::scientific << " | " << 1.;
-      int const header_width =
-          max_section_length + std::max<int>(header_without_timer_name.size(),
-                                             dummy_string_stream.str().size());
-
-      os << std::string(header_width, '=') << "\n\n";
-      os << "TimeMonitor results over 1 processor\n\n";
-      os << std::setw(max_section_length) << timer_name
-         << header_without_timer_name << '\n';
-      os << std::string(header_width, '-') << '\n';
-      for (int i = 0; i < n_timers; ++i)
-      {
-        os << std::setw(max_section_length) << _data[i].first << " | "
-           << _data[i].second << '\n';
-      }
-      os << std::string(header_width, '=') << '\n';
-      return;
-    }
-    std::vector<double> all_entries(comm_size * n_timers);
-    std::transform(
-        _data.begin(), _data.end(), all_entries.begin() + comm_rank * n_timers,
-        [](std::pair<std::string, double> const &x) { return x.second; });
-    // FIXME No guarantee that all processors have the same timers!
-    MPI_Allgather(MPI_IN_PLACE, 0, MPI_DATATYPE_NULL, all_entries.data(),
-                  n_timers, MPI_DOUBLE, comm);
-    std::string const header_without_timer_name =
-        " | MinOverProcs | MeanOverProcs | MaxOverProcs";
-    if (comm_rank == 0)
-    {
-      os << std::string(max_section_length + header_without_timer_name.size(),
-                        '=')
-         << "\n\n";
-      os << "TimeMonitor results over " << comm_size << " processors\n";
-      os << std::setw(max_section_length) << timer_name
-         << header_without_timer_name << '\n';
-      os << std::string(max_section_length + header_without_timer_name.size(),
-                        '-')
-         << '\n';
-    }
-    std::vector<double> tmp(comm_size);
-    for (int i = 0; i < n_timers; ++i)
-    {
-      for (int j = 0; j < comm_size; ++j)
-      {
-        tmp[j] = all_entries[j * n_timers + i];
-      }
-      auto min = *std::min_element(tmp.begin(), tmp.end());
-      auto max = *std::max_element(tmp.begin(), tmp.end());
-      auto mean = std::accumulate(tmp.begin(), tmp.end(), 0.) / comm_size;
-      if (comm_rank == 0)
-      {
-        os << std::setw(max_section_length) << _data[i].first << " | " << min
-           << " |  " << mean << " | " << max << '\n';
-      }
-    }
-    if (comm_rank == 0)
-    {
-      os << std::string(max_section_length + header_without_timer_name.size(),
-                        '=')
-         << '\n';
-    }
-  }
-};
-
-template <typename DeviceType>
-struct NearestNeighborsSearches
-{
-  Kokkos::View<ArborX::Point *, DeviceType> points;
-  int k;
-};
-template <typename DeviceType>
-struct RadiusSearches
-{
-  Kokkos::View<ArborX::Point *, DeviceType> points;
-  double radius;
-};
-
-template <typename DeviceType>
-struct ArborX::AccessTraits<RadiusSearches<DeviceType>, ArborX::PredicatesTag>
-{
-  using memory_space = typename DeviceType::memory_space;
-  static KOKKOS_FUNCTION std::size_t
-  size(RadiusSearches<DeviceType> const &pred)
-  {
-    return pred.points.extent(0);
-  }
-  static KOKKOS_FUNCTION auto get(RadiusSearches<DeviceType> const &pred,
-                                  std::size_t i)
-  {
-    return ArborX::intersects(ArborX::Sphere{pred.points(i), pred.radius});
-  }
-};
-
-template <typename DeviceType>
-struct ArborX::AccessTraits<NearestNeighborsSearches<DeviceType>,
-                            ArborX::PredicatesTag>
-{
-  using memory_space = typename DeviceType::memory_space;
-  static KOKKOS_FUNCTION std::size_t
-  size(NearestNeighborsSearches<DeviceType> const &pred)
-  {
-    return pred.points.extent(0);
-  }
-  static KOKKOS_FUNCTION auto
-  get(NearestNeighborsSearches<DeviceType> const &pred, std::size_t i)
-  {
-    return ArborX::nearest(pred.points(i), pred.k);
-  }
-};
-
-namespace bpo = boost::program_options;
-
-template <class NO>
-int main_(std::vector<std::string> const &args, const MPI_Comm comm)
-{
-  TimeMonitor time_monitor;
-
-  using DeviceType = typename NO::device_type;
-  using ExecutionSpace = typename DeviceType::execution_space;
-  using MemorySpace = typename DeviceType::memory_space;
-
-  int n_values;
-  int n_queries;
-  int n_neighbors;
-  double shift;
-  int partition_dim;
-  bool perform_knn_search = true;
-  bool perform_radius_search = true;
-  bool shift_queries = false;
-
-  bpo::options_description desc("Allowed options");
-  // clang-format off
-    desc.add_options()
-        ( "help", "produce help message" )
-        ( "values", bpo::value<int>(&n_values)->default_value(20000), "Number of indexable values (source) per MPI rank." )
-        ( "queries", bpo::value<int>(&n_queries)->default_value(5000), "Number of queries (target) per MPI rank." )
-        ( "neighbors", bpo::value<int>(&n_neighbors)->default_value(10), "Desired number of results per query." )
-        ( "shift", bpo::value<double>(&shift)->default_value(1.), "Shift of the point clouds. '0' means the clouds are built "
-	                                                          "at the same place, while '1' places the clouds next to each"
-								  "other. Negative values and values larger than one "
-                                                                  "mean that the clouds are separated." )
-        ( "partition_dim", bpo::value<int>(&partition_dim)->default_value(3), "Number of dimension used by the partitioning of the global "
-                                                                              "point cloud. 1 -> local clouds are aligned on a line, 2 -> "
-                                                                              "local clouds form a board, 3 -> local clouds form a box." )
-        ( "do-not-perform-knn-search", "skip kNN search" )
-        ( "do-not-perform-radius-search", "skip radius search" )
-        ( "shift-queries" , "By default, points are reused for the queries. Enabling this option shrinks the local box queries are created "
-                            "in to a third of its size and moves it to the center of the global box. The result is a huge imbalance for the "
-                            "number of queries that need to be processed by each processor.")
-        ;
-  // clang-format on
-  bpo::variables_map vm;
-  bpo::store(bpo::command_line_parser(args).options(desc).run(), vm);
-  bpo::notify(vm);
-
-  int comm_rank;
-  MPI_Comm_rank(comm, &comm_rank);
-  int comm_size;
-  MPI_Comm_size(comm, &comm_size);
-
-  if (vm.count("help") > 0)
-  {
-    if (comm_rank == 0)
-      std::cout << desc << '\n';
-    throw HelpPrinted();
-  }
-
-  if (vm.count("do-not-perform-knn-search") > 0)
-    perform_knn_search = false;
-  if (vm.count("do-not-perform-radius-search") > 0)
-    perform_radius_search = false;
-  if (vm.count("shift-queries") > 0)
-    shift_queries = true;
-
-  if (comm_rank == 0)
-  {
-    std::cout << std::boolalpha;
-    std::cout << "\nRunning with arguments:\n"
-              << "perform knn search      : " << perform_knn_search << '\n'
-              << "perform radius search   : " << perform_radius_search << '\n'
-              << "#points/MPI process     : " << n_values << '\n'
-              << "#queries/MPI process    : " << n_queries << '\n'
-              << "size of shift           : " << shift << '\n'
-              << "dimension               : " << partition_dim << '\n'
-              << "shift-queries           : " << shift_queries << '\n'
-              << '\n';
-  }
-
-  Kokkos::View<ArborX::Point *, DeviceType> random_values(
-      Kokkos::view_alloc(Kokkos::WithoutInitializing, "Testing::values"),
-      n_values);
-  Kokkos::View<ArborX::Point *, DeviceType> random_queries(
-      Kokkos::view_alloc(Kokkos::WithoutInitializing, "Testing::queries"),
-      n_queries);
-  {
-    double a = 0.;
-    double offset_x = 0.;
-    double offset_y = 0.;
-    double offset_z = 0.;
-    int i_max = 0;
-    // Change the geometry of the problem. In 1D, all the point clouds are
-    // aligned on a line. In 2D, the point clouds create a board and in 3D,
-    // they create a box.
-    switch (partition_dim)
-    {
-    case 1:
-    {
-      i_max = comm_size;
-      offset_x = 2 * shift * comm_rank;
-      a = n_values;
-
-      break;
-    }
-    case 2:
-    {
-      i_max = std::ceil(std::sqrt(comm_size));
-      int i = comm_rank % i_max;
-      int j = comm_rank / i_max;
-      offset_x = 2 * shift * i;
-      offset_y = 2 * shift * j;
-      a = std::sqrt(n_values);
-
-      break;
-    }
-    case 3:
-    {
-      i_max = std::ceil(std::cbrt(comm_size));
-      int j_max = i_max;
-      int i = comm_rank % i_max;
-      int j = (comm_rank / i_max) % j_max;
-      int k = comm_rank / (i_max * j_max);
-      offset_x = 2 * shift * i;
-      offset_y = 2 * shift * j;
-      offset_z = 2 * shift * k;
-      a = std::cbrt(n_values);
-
-      break;
-    }
-    default:
-    {
-      throw std::runtime_error("partition_dim should be 1, 2, or 3");
-    }
-    }
-
-    // Generate random points uniformly distributed within a box.
-    std::uniform_real_distribution<double> distribution(-1., 1.);
-    std::default_random_engine generator;
-    auto random = [&distribution, &generator]() {
-      return distribution(generator);
-    };
-
-    // The boxes in which the points are placed have side length two, centered
-    // around offset_[xyz] and scaled by a.
-    Kokkos::View<ArborX::Point *, DeviceType> random_points(
-        Kokkos::view_alloc(Kokkos::WithoutInitializing, "Testing::points"),
-        std::max(n_values, n_queries));
-    auto random_points_host = Kokkos::create_mirror_view(random_points);
-    for (int i = 0; i < random_points.extent_int(0); ++i)
-      random_points_host(i) = {
-          {a * (offset_x + random()),
-           a * (offset_y + random()) * (partition_dim > 1),
-           a * (offset_z + random()) * (partition_dim > 2)}};
-    Kokkos::deep_copy(random_points, random_points_host);
-
-    Kokkos::deep_copy(
-        random_values,
-        Kokkos::subview(random_points, Kokkos::pair<int, int>(0, n_values)));
-
-    if (!shift_queries)
-    {
-      // By default, random points are "reused" between building the tree and
-      // performing queries.
-      Kokkos::deep_copy(
-          random_queries,
-          Kokkos::subview(random_points, Kokkos::pair<int, int>(0, n_queries)));
-    }
-    else
-    {
-      // For the queries, we shrink the global box by a factor three, and
-      // move it by a third of the global size towards the global center.
-      auto random_queries_host = Kokkos::create_mirror_view(random_queries);
-
-      int const max_offset = 2 * shift * i_max;
-      for (int i = 0; i < n_queries; ++i)
-        random_queries_host(i) = {
-            {a * ((offset_x + random()) / 3 + max_offset / 3),
-             a * ((offset_y + random()) / 3 + max_offset / 3) *
-                 (partition_dim > 1),
-             a * ((offset_z + random()) / 3 + max_offset / 3) *
-                 (partition_dim > 2)}};
-      Kokkos::deep_copy(random_queries, random_queries_host);
-    }
-  }
-
-  Kokkos::View<ArborX::Box *, DeviceType> bounding_boxes(
-      Kokkos::view_alloc(Kokkos::WithoutInitializing,
-                         "Testing::bounding_boxes"),
-      n_values);
-  Kokkos::parallel_for("bvh_driver:construct_bounding_boxes",
-                       Kokkos::RangePolicy<ExecutionSpace>(0, n_values),
-                       KOKKOS_LAMBDA(int i) {
-                         double const x = random_values(i)[0];
-                         double const y = random_values(i)[1];
-                         double const z = random_values(i)[2];
-                         bounding_boxes(i) = {{{x - 1., y - 1., z - 1.}},
-                                              {{x + 1., y + 1., z + 1.}}};
-                       });
-
-  auto construction = time_monitor.getNewTimer("construction");
-  MPI_Barrier(comm);
-  construction->start();
-  ArborX::DistributedTree<MemorySpace> distributed_tree(comm, ExecutionSpace{},
-                                                        bounding_boxes);
-  construction->stop();
-
-  std::ostream &os = std::cout;
-  if (comm_rank == 0)
-    os << "construction done\n";
-
-  using PairIndexRank = Kokkos::pair<int, int>;
-
-  if (perform_knn_search)
-  {
-    Kokkos::View<int *, DeviceType> offsets("Testing::offsets", 0);
-    Kokkos::View<PairIndexRank *, DeviceType> values("Testing::values", 0);
-
-    auto knn = time_monitor.getNewTimer("knn");
-    MPI_Barrier(comm);
-    knn->start();
-    distributed_tree.query(
-        ExecutionSpace{},
-        NearestNeighborsSearches<DeviceType>{random_queries, n_neighbors},
-        values, offsets);
-    knn->stop();
-
-    if (comm_rank == 0)
-      os << "knn done\n";
-  }
-
-  if (perform_radius_search)
-  {
-    // Radius is computed so that the number of results per query for a
-    // uniformly distributed primitives in a [-a,a]^d box is approximately
-    // n_neighbors. The primivites are boxes and not points. Thus, the radius
-    // we would have chosen for the case of point primitives has to be adjusted
-    // to account for box-box interaction. The radius is decreased by an
-    // average of the lengths of a half-edge and a half-diagonal to account for
-    // that (approximately). An exact calculation would require computing
-    // an integral.
-    double r = 0.;
-    switch (partition_dim)
-    {
-    case 1:
-      // Derivation (first term): n_values*(2*r)/(2a) = n_neighbors
-      r = static_cast<double>(n_neighbors) - 1.;
-      break;
-    case 2:
-      // Derivation (first term): n_values*(M_PI*r^2)/(2a)^2 = n_neighbors
-      r = std::sqrt(static_cast<double>(n_neighbors) * 4. / M_PI) -
-          (1. + std::sqrt(2.)) / 2;
-      break;
-    case 3:
-      // Derivation (first term): n_values*(4/3*M_PI*r^3)/(2a)^3 = n_neighbors
-      r = std::cbrt(static_cast<double>(n_neighbors) * 6. / M_PI) -
-          (1. + std::cbrt(3.)) / 2;
-      break;
-    }
-
-    Kokkos::View<int *, DeviceType> offsets("Testing::offsets", 0);
-    Kokkos::View<PairIndexRank *, DeviceType> values("Testing::values", 0);
-
-    auto radius = time_monitor.getNewTimer("radius");
-    MPI_Barrier(comm);
-    radius->start();
-    distributed_tree.query(ExecutionSpace{},
-                           RadiusSearches<DeviceType>{random_queries, r},
-                           values, offsets);
-    radius->stop();
-
-    if (comm_rank == 0)
-      os << "radius done\n";
-  }
-  time_monitor.summarize(comm);
-
-  return 0;
-}
-
-int main(int argc, char *argv[])
-{
-  MPI_Init(&argc, &argv);
-
-  MPI_Comm const comm = MPI_COMM_WORLD;
-  int comm_rank;
-  MPI_Comm_rank(comm, &comm_rank);
-  if (comm_rank == 0)
-  {
-    std::cout << "ArborX version: " << ArborX::version() << std::endl;
-    std::cout << "ArborX hash   : " << ArborX::gitCommitHash() << std::endl;
-  }
-
-  // Strip "--help" and "--kokkos-help" from the flags passed to Kokkos if we
-  // are not on MPI rank 0 to prevent Kokkos from printing the help message
-  // multiply.
-  if (comm_rank != 0)
-  {
-    auto *help_it = std::find_if(argv, argv + argc, [](std::string const &x) {
-      return x == "--help" || x == "--kokkos-help";
-    });
-    if (help_it != argv + argc)
-    {
-      std::swap(*help_it, *(argv + argc - 1));
-      --argc;
-    }
-  }
-  Kokkos::initialize(argc, argv);
-
-  bool success = true;
-
-  try
-  {
-    std::string node;
-    // NOTE Lame trick to get a valid default value
-#if defined(KOKKOS_ENABLE_HIP)
-    node = "hip";
-#elif defined(KOKKOS_ENABLE_CUDA)
-    node = "cuda";
-#elif defined(KOKKOS_ENABLE_OPENMP)
-    node = "openmp";
-#elif defined(KOKKOS_ENABLE_THREADS)
-    node = "threads";
-#elif defined(KOKKOS_ENABLE_SERIAL)
-    node = "serial";
-#endif
-    bpo::options_description desc("Parallel setting:");
-    desc.add_options()("node", bpo::value<std::string>(&node),
-                       "node type (serial | openmp | threads | cuda)");
-    bpo::variables_map vm;
-    bpo::parsed_options parsed = bpo::command_line_parser(argc, argv)
-                                     .options(desc)
-                                     .allow_unregistered()
-                                     .run();
-    bpo::store(parsed, vm);
-    std::vector<std::string> pass_further =
-        bpo::collect_unrecognized(parsed.options, bpo::include_positional);
-    bpo::notify(vm);
-
-    if (comm_rank == 0 && std::find_if(pass_further.begin(), pass_further.end(),
-                                       [](std::string const &x) {
-                                         return x == "--help";
-                                       }) != pass_further.end())
-    {
-      std::cout << desc << '\n';
-    }
-
-    if (node != "serial" && node != "openmp" && node != "cuda" &&
-        node != "threads" && node != "hip")
-      throw std::runtime_error("Unrecognized node type: \"" + node + "\"");
-
-    if (node == "serial")
-    {
-#ifdef KOKKOS_ENABLE_SERIAL
-      using Node = Kokkos::Serial;
-      main_<Node>(pass_further, comm);
-#else
-      throw std::runtime_error("Serial node type is disabled");
-#endif
-    }
-    if (node == "openmp")
-    {
-#ifdef KOKKOS_ENABLE_OPENMP
-      using Node = Kokkos::OpenMP;
-      main_<Node>(pass_further, comm);
-#else
-      throw std::runtime_error("OpenMP node type is disabled");
-#endif
-    }
-    if (node == "threads")
-    {
-#ifdef KOKKOS_ENABLE_THREADS
-      using Node = Kokkos::Threads;
-      main_<Node>(pass_further, comm);
-#else
-      throw std::runtime_error("Threads node type is disabled");
-#endif
-    }
-    if (node == "cuda")
-    {
-#ifdef KOKKOS_ENABLE_CUDA
-      using Node = Kokkos::Device<Kokkos::Cuda, Kokkos::CudaSpace>;
-      main_<Node>(pass_further, comm);
-#else
-      throw std::runtime_error("CUDA node type is disabled");
-#endif
-    }
-    if (node == "hip")
-    {
-#ifdef KOKKOS_ENABLE_HIP
-      using Node = Kokkos::Device<Kokkos::Experimental::HIP,
-                                  Kokkos::Experimental::HIPSpace>;
-      main_<Node>(pass_further, comm);
-#else
-      throw std::runtime_error("HIP node type is disabled");
-#endif
-    }
-  }
-  catch (HelpPrinted const &)
-  {
-    // Do nothing, it was a successful run. Just clean up things below.
-  }
-  catch (std::exception const &e)
-  {
-    std::cerr << "processor " << comm_rank
-              << " caught a std::exception: " << e.what() << '\n';
-    success = false;
-  }
-  catch (...)
-  {
-    std::cerr << "processor " << comm_rank
-              << " caught some kind of exception\n";
-    success = false;
-  }
-
-  Kokkos::finalize();
-
-  MPI_Finalize();
-
-  return (success ? EXIT_SUCCESS : EXIT_FAILURE);
-}
diff --git a/arborx/benchmarks/execution_space_instances/CMakeLists.txt b/arborx/benchmarks/execution_space_instances/CMakeLists.txt
deleted file mode 100644
index 2034009d7..000000000
--- a/arborx/benchmarks/execution_space_instances/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-add_executable(ArborX_ExecutionSpaces_Benchmark.exe execution_space_instances_driver.cpp)
-target_link_libraries(ArborX_ExecutionSpaces_Benchmark.exe ArborX::ArborX Boost::program_options)
-target_include_directories(ArborX_ExecutionSpaces_Benchmark.exe PRIVATE ${CMAKE_SOURCE_DIR}/benchmarks/point_clouds)
-add_test(NAME ArborX_ExecutionSpaces_Benchmark COMMAND ./ArborX_ExecutionSpaces_Benchmark.exe)
diff --git a/arborx/benchmarks/execution_space_instances/execution_space_instances_driver.cpp b/arborx/benchmarks/execution_space_instances/execution_space_instances_driver.cpp
deleted file mode 100644
index 99ede0097..000000000
--- a/arborx/benchmarks/execution_space_instances/execution_space_instances_driver.cpp
+++ /dev/null
@@ -1,225 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2017-2021 by the ArborX authors                            *
- * All rights reserved.                                                     *
- *                                                                          *
- * This file is part of the ArborX library. ArborX is                       *
- * distributed under a BSD 3-clause license. For the licensing terms see    *
- * the LICENSE file in the top-level directory.                             *
- *                                                                          *
- * SPDX-License-Identifier: BSD-3-Clause                                    *
- ****************************************************************************/
-
-#include <ArborX_LinearBVH.hpp>
-#include <ArborX_Version.hpp>
-
-#include <Kokkos_Core.hpp>
-
-#include <boost/program_options.hpp>
-
-#include <algorithm>
-#include <chrono>
-#include <cmath> // sqrt, cbrt
-#include <iomanip>
-#include <numeric>
-#include <random>
-#include <utility>
-#include <vector>
-
-template <typename ExecutionSpace>
-class InstanceManager
-{
-public:
-  InstanceManager(int const n_instances) { _instances.resize(n_instances); }
-  const std::vector<ExecutionSpace> &get_instances() const
-  {
-    return _instances;
-  }
-
-private:
-  std::vector<ExecutionSpace> _instances;
-};
-
-#ifdef KOKKOS_ENABLE_CUDA
-template <>
-class InstanceManager<Kokkos::Cuda>
-{
-public:
-  InstanceManager(int const n_instances)
-  {
-    _streams.resize(n_instances);
-    _instances.reserve(n_instances);
-    for (int i = 0; i < n_instances; ++i)
-    {
-      cudaStreamCreate(&_streams[i]);
-      _instances.emplace_back(_streams[i]);
-    }
-  }
-
-  ~InstanceManager()
-  {
-    for (unsigned int i = 0; i < _streams.size(); ++i)
-      cudaStreamDestroy(_streams[i]);
-  }
-
-  const std::vector<Kokkos::Cuda> &get_instances() const { return _instances; }
-
-private:
-  std::vector<Kokkos::Cuda> _instances;
-  std::vector<cudaStream_t> _streams;
-};
-#endif
-
-template <typename MemorySpace>
-struct CountCallback
-{
-  Kokkos::View<int *, MemorySpace> _counts;
-
-  template <typename Query>
-  KOKKOS_FUNCTION void operator()(Query const &query, int) const
-  {
-    auto const i = ArborX::getData(query);
-    Kokkos::atomic_fetch_add(&_counts(i), 1);
-  }
-};
-
-int main(int argc, char *argv[])
-{
-  using ExecutionSpace = Kokkos::DefaultExecutionSpace;
-  using MemorySpace = typename ExecutionSpace::memory_space;
-
-  Kokkos::ScopeGuard guard(argc, argv);
-
-  std::cout << "ArborX version: " << ArborX::version() << std::endl;
-  std::cout << "ArborX hash   : " << ArborX::gitCommitHash() << std::endl;
-
-  namespace bpo = boost::program_options;
-
-  int num_exec_spaces;
-  int num_primitives;
-  int num_problems;
-  int num_predicates;
-
-  bpo::options_description desc("Allowed options");
-  // clang-format off
-    desc.add_options()
-        ( "help", "produce help message" )
-        ( "num-spaces", bpo::value<int>(&num_exec_spaces)->default_value(1), "Number of execution space instances." )
-        ( "num-problems", bpo::value<int>(&num_problems)->default_value(1), "Number of subproblems." )
-        ( "values", bpo::value<int>(&num_primitives)->default_value(20000), "Number of indexable values (source) per subproblem." )
-        ( "queries", bpo::value<int>(&num_predicates)->default_value(5000), "Number of queries (target) per subproblem." )
-        ;
-  // clang-format on
-  bpo::variables_map vm;
-  bpo::store(bpo::command_line_parser(argc, argv).options(desc).run(), vm);
-  bpo::notify(vm);
-
-  float const r = 0.1f;
-  float const shift = 2.f;
-
-  if (vm.count("help") > 0)
-  {
-    std::cout << desc << '\n';
-    return 1;
-  }
-
-  std::cout << std::boolalpha;
-  std::cout << "\nRunning with arguments:"
-            << "\nnumber of execution space instances : " << num_exec_spaces
-            << "\nnumber of problems                  : " << num_problems
-            << "\n#points/problem                     : " << num_primitives
-            << "\n#queries/problem                    : " << num_predicates
-            << '\n';
-
-  // Generate random points uniformly distributed within a box.
-  std::uniform_real_distribution<float> distribution(-1., 1.);
-  std::default_random_engine generator;
-  auto random = [&distribution, &generator]() {
-    return distribution(generator);
-  };
-
-  Kokkos::View<ArborX::Point *, MemorySpace> primitives(
-      Kokkos::view_alloc(Kokkos::WithoutInitializing, "primitives"),
-      num_primitives * num_problems);
-  Kokkos::View<decltype(ArborX::attach(ArborX::intersects(ArborX::Sphere{}),
-                                       int{})) *,
-               MemorySpace>
-      predicates(Kokkos::view_alloc(Kokkos::WithoutInitializing, "predicates"),
-                 num_predicates * num_problems);
-  for (int p = 0; p < num_problems; ++p)
-  {
-    // Points are placed in a box [offset_x-1, offset_x+1] x [-1, 1] x [-1, 1]
-    float offset_x = p * shift;
-
-    Kokkos::View<ArborX::Point *, MemorySpace> points(
-        "points", std::max(num_primitives, num_predicates));
-    auto points_host = Kokkos::create_mirror_view(points);
-    for (int i = 0; i < (int)points.extent(0); ++i)
-      points_host(i) = {offset_x + random(), random(), random()};
-    Kokkos::deep_copy(points, points_host);
-
-    Kokkos::deep_copy(
-        Kokkos::subview(
-            primitives,
-            Kokkos::make_pair(p * num_primitives, (p + 1) * num_primitives)),
-        Kokkos::subview(points, Kokkos::make_pair(0, num_primitives)));
-    Kokkos::parallel_for(
-        "construct_predicates",
-        Kokkos::RangePolicy<ExecutionSpace>(
-            ExecutionSpace{}, p * num_predicates, (p + 1) * num_predicates),
-        KOKKOS_LAMBDA(int i) {
-          predicates(i) =
-              ArborX::attach(ArborX::intersects(ArborX::Sphere{
-                                 points(i - p * num_predicates), r}),
-                             i);
-        });
-  }
-
-  InstanceManager<ExecutionSpace> instance_manager(num_exec_spaces);
-  auto const &instances = instance_manager.get_instances();
-
-  std::vector<ArborX::BVH<MemorySpace>> trees;
-  for (int p = 0; p < num_problems; ++p)
-  {
-    auto const &exec_space = instances[p % num_exec_spaces];
-
-    trees.emplace_back(
-        exec_space, Kokkos::subview(primitives, Kokkos::pair<int, int>(
-                                                    p * num_primitives,
-                                                    (p + 1) * num_primitives)));
-  }
-  ArborX::BVH<MemorySpace> tree(instances[0], primitives);
-
-  Kokkos::View<int *, MemorySpace> counts("counts",
-                                          num_predicates * num_problems);
-
-  Kokkos::fence();
-  Kokkos::Timer query_time;
-  query_time.reset();
-  for (int p = 0; p < num_problems; ++p)
-  {
-    auto const &exec_space = instances[p % num_exec_spaces];
-
-    trees[p].query(
-        exec_space,
-        Kokkos::subview(predicates,
-                        Kokkos::pair<int, int>(p * num_predicates,
-                                               (p + 1) * num_predicates)),
-        CountCallback<MemorySpace>{counts},
-        ArborX::Experimental::TraversalPolicy().setPredicateSorting(false));
-    // ArborX::Experimental::TraversalPolicy().setPredicateSorting(true));
-  }
-  Kokkos::fence();
-  std::cout << "Time multiple(s): " << query_time.seconds() << '\n';
-
-  Kokkos::deep_copy(counts, 0);
-  query_time.reset();
-
-  tree.query(
-      instances[0], predicates, CountCallback<MemorySpace>{counts},
-      ArborX::Experimental::TraversalPolicy().setPredicateSorting(false));
-
-  Kokkos::fence();
-  std::cout << "Time single(s): " << query_time.seconds() << '\n';
-
-  return EXIT_SUCCESS;
-}
diff --git a/arborx/benchmarks/point_clouds/point_clouds.hpp b/arborx/benchmarks/point_clouds/point_clouds.hpp
deleted file mode 100644
index 340f25f72..000000000
--- a/arborx/benchmarks/point_clouds/point_clouds.hpp
+++ /dev/null
@@ -1,216 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2017-2021 by the ArborX authors                            *
- * All rights reserved.                                                     *
- *                                                                          *
- * This file is part of the ArborX library. ArborX is                       *
- * distributed under a BSD 3-clause license. For the licensing terms see    *
- * the LICENSE file in the top-level directory.                             *
- *                                                                          *
- * SPDX-License-Identifier: BSD-3-Clause                                    *
- ****************************************************************************/
-
-#ifndef ARBORX_POINT_CLOUDS_HPP
-#define ARBORX_POINT_CLOUDS_HPP
-
-#include <ArborX_DetailsKokkosExtAccessibilityTraits.hpp>
-#include <ArborX_Exception.hpp>
-#include <ArborX_Point.hpp>
-
-#include <Kokkos_Core.hpp>
-
-#include <fstream>
-#include <random>
-
-enum class PointCloudType
-{
-  filled_box,
-  hollow_box,
-  filled_sphere,
-  hollow_sphere
-};
-
-inline PointCloudType to_point_cloud_enum(std::string const &str)
-{
-  if (str == "filled_box")
-    return PointCloudType::filled_box;
-  if (str == "hollow_box")
-    return PointCloudType::hollow_box;
-  if (str == "filled_sphere")
-    return PointCloudType::filled_sphere;
-  if (str == "hollow_sphere")
-    return PointCloudType::hollow_sphere;
-  throw std::runtime_error(str +
-                           " doesn't correspond to any known PointCloudType!");
-}
-
-template <typename Layout, typename DeviceType>
-void filledBoxCloud(
-    double const half_edge,
-    Kokkos::View<ArborX::Point *, Layout, DeviceType> random_points)
-{
-  static_assert(
-      KokkosExt::is_accessible_from_host<decltype(random_points)>::value,
-      "The View should be accessible on the Host");
-  std::uniform_real_distribution<double> distribution(-half_edge, half_edge);
-  std::default_random_engine generator;
-  auto random = [&distribution, &generator]() {
-    return distribution(generator);
-  };
-  unsigned int const n = random_points.extent(0);
-  for (unsigned int i = 0; i < n; ++i)
-    random_points(i) = {{random(), random(), random()}};
-}
-
-template <typename Layout, typename DeviceType>
-void hollowBoxCloud(
-    double const half_edge,
-    Kokkos::View<ArborX::Point *, Layout, DeviceType> random_points)
-{
-  static_assert(
-      KokkosExt::is_accessible_from_host<decltype(random_points)>::value,
-      "The View should be accessible on the Host");
-  std::uniform_real_distribution<double> distribution(-half_edge, half_edge);
-  std::default_random_engine generator;
-  auto random = [&distribution, &generator]() {
-    return distribution(generator);
-  };
-  unsigned int const n = random_points.extent(0);
-  for (unsigned int i = 0; i < n; ++i)
-  {
-    unsigned int face = i % 6;
-    switch (face)
-    {
-    case 0:
-    {
-      random_points(i) = {{-half_edge, random(), random()}};
-
-      break;
-    }
-    case 1:
-    {
-      random_points(i) = {{half_edge, random(), random()}};
-
-      break;
-    }
-    case 2:
-    {
-      random_points(i) = {{random(), -half_edge, random()}};
-
-      break;
-    }
-    case 3:
-    {
-      random_points(i) = {{random(), half_edge, random()}};
-
-      break;
-    }
-    case 4:
-    {
-      random_points(i) = {{random(), random(), -half_edge}};
-
-      break;
-    }
-    case 5:
-    {
-      random_points(i) = {{random(), random(), half_edge}};
-
-      break;
-    }
-    default:
-    {
-      throw std::runtime_error("Your compiler is broken");
-    }
-    }
-  }
-}
-
-template <typename Layout, typename DeviceType>
-void filledSphereCloud(
-    double const radius,
-    Kokkos::View<ArborX::Point *, Layout, DeviceType> random_points)
-{
-  static_assert(
-      KokkosExt::is_accessible_from_host<decltype(random_points)>::value,
-      "The View should be accessible on the Host");
-  std::default_random_engine generator;
-
-  std::uniform_real_distribution<double> distribution(-radius, radius);
-  auto random = [&distribution, &generator]() {
-    return distribution(generator);
-  };
-
-  unsigned int const n = random_points.extent(0);
-  for (unsigned int i = 0; i < n; ++i)
-  {
-    bool point_accepted = false;
-    while (!point_accepted)
-    {
-      double const x = random();
-      double const y = random();
-      double const z = random();
-
-      // Only accept points that are in the sphere
-      if (std::sqrt(x * x + y * y + z * z) <= radius)
-      {
-        random_points(i) = {{x, y, z}};
-        point_accepted = true;
-      }
-    }
-  }
-}
-
-template <typename Layout, typename DeviceType>
-void hollowSphereCloud(
-    double const radius,
-    Kokkos::View<ArborX::Point *, Layout, DeviceType> random_points)
-{
-  static_assert(
-      KokkosExt::is_accessible_from_host<decltype(random_points)>::value,
-      "The View should be accessible on the Host");
-  std::default_random_engine generator;
-
-  std::uniform_real_distribution<double> distribution(-1., 1.);
-  auto random = [&distribution, &generator]() {
-    return distribution(generator);
-  };
-
-  unsigned int const n = random_points.extent(0);
-  for (unsigned int i = 0; i < n; ++i)
-  {
-    double const x = random();
-    double const y = random();
-    double const z = random();
-    double const norm = std::sqrt(x * x + y * y + z * z);
-
-    random_points(i) = {
-        {radius * x / norm, radius * y / norm, radius * z / norm}};
-  }
-}
-
-template <typename DeviceType>
-void generatePointCloud(PointCloudType const point_cloud_type,
-                        double const length,
-                        Kokkos::View<ArborX::Point *, DeviceType> random_points)
-{
-  auto random_points_host = Kokkos::create_mirror_view(random_points);
-  switch (point_cloud_type)
-  {
-  case PointCloudType::filled_box:
-    filledBoxCloud(length, random_points_host);
-    break;
-  case PointCloudType::hollow_box:
-    hollowBoxCloud(length, random_points_host);
-    break;
-  case PointCloudType::filled_sphere:
-    filledSphereCloud(length, random_points_host);
-    break;
-  case PointCloudType::hollow_sphere:
-    hollowSphereCloud(length, random_points_host);
-    break;
-  default:
-    throw ArborX::SearchException("not implemented");
-  }
-  Kokkos::deep_copy(random_points, random_points_host);
-}
-
-#endif
diff --git a/arborx/docker/.env b/arborx/docker/.env
deleted file mode 100644
index c4798d0a6..000000000
--- a/arborx/docker/.env
+++ /dev/null
@@ -1,2 +0,0 @@
-CONTAINER_ARBORX_DIR=/scratch
-CONTAINER_CCACHE_DIR=/tmp/ccache
diff --git a/arborx/docker/Dockerfile b/arborx/docker/Dockerfile
deleted file mode 100644
index 9861c9ff6..000000000
--- a/arborx/docker/Dockerfile
+++ /dev/null
@@ -1,145 +0,0 @@
-ARG BASE=nvidia/cuda:10.1-devel
-FROM $BASE
-
-ARG NPROCS=4
-
-RUN apt-get update && apt-get install -y \
-        build-essential \
-        bc \
-        curl \
-        git \
-        wget \
-        jq \
-        vim \
-        lcov \
-        ccache \
-        gdb \
-        ninja-build \
-        libbz2-dev \
-        libicu-dev \
-        python-dev \
-        autotools-dev \
-        && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/*
-
-RUN KEYDUMP_URL=https://cloud.cees.ornl.gov/download && \
-    KEYDUMP_FILE=keydump && \
-    wget --quiet ${KEYDUMP_URL}/${KEYDUMP_FILE} && \
-    wget --quiet ${KEYDUMP_URL}/${KEYDUMP_FILE}.sig && \
-    gpg --import ${KEYDUMP_FILE} && \
-    gpg --verify ${KEYDUMP_FILE}.sig ${KEYDUMP_FILE} && \
-    rm ${KEYDUMP_FILE}*
-
-# Install CMake
-ENV CMAKE_DIR=/opt/cmake
-RUN CMAKE_VERSION=3.16.9 && \
-    CMAKE_KEY=2D2CEF1034921684 && \
-    CMAKE_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION} && \
-    CMAKE_SCRIPT=cmake-${CMAKE_VERSION}-Linux-x86_64.sh && \
-    CMAKE_SHA256=cmake-${CMAKE_VERSION}-SHA-256.txt && \
-    wget --quiet ${CMAKE_URL}/${CMAKE_SHA256} && \
-    wget --quiet ${CMAKE_URL}/${CMAKE_SHA256}.asc && \
-    wget --quiet ${CMAKE_URL}/${CMAKE_SCRIPT} && \
-    gpg --verify ${CMAKE_SHA256}.asc ${CMAKE_SHA256} && \
-    grep ${CMAKE_SCRIPT} ${CMAKE_SHA256} | sha256sum --check && \
-    mkdir -p ${CMAKE_DIR} && \
-    sh ${CMAKE_SCRIPT} --skip-license --prefix=${CMAKE_DIR} && \
-    rm cmake*
-ENV PATH=${CMAKE_DIR}/bin:$PATH
-
-# Install Clang/LLVM
-ENV LLVM_DIR=/opt/llvm
-RUN LLVM_VERSION=10.0.0 && \
-    LLVM_KEY="86419D8A 345AD05D" && \
-    LLVM_URL=https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/clang+llvm-${LLVM_VERSION}-x86_64-linux-gnu-ubuntu-18.04.tar.xz && \
-    LLVM_ARCHIVE=llvm-${LLVM_VERSION}.tar.xz && \
-    SCRATCH_DIR=/scratch && mkdir -p ${SCRATCH_DIR} && cd ${SCRATCH_DIR} && \
-    wget --quiet ${LLVM_URL} --output-document=${LLVM_ARCHIVE} && \
-    wget --quiet ${LLVM_URL}.sig --output-document=${LLVM_ARCHIVE}.sig && \
-    gpg --verify ${LLVM_ARCHIVE}.sig ${LLVM_ARCHIVE} && \
-    mkdir -p ${LLVM_DIR} && \
-    tar -xvf ${LLVM_ARCHIVE} -C ${LLVM_DIR} --strip-components=1 && \
-    echo "${LLVM_DIR}/lib" > /etc/ld.so.conf.d/llvm.conf && ldconfig && \
-    rm -rf ${SCRATCH_DIR}
-ENV PATH=${LLVM_DIR}/bin:$PATH
-
-# Install OpenMPI
-ARG CUDA_AWARE_MPI
-ENV OPENMPI_DIR=/opt/openmpi
-RUN OPENMPI_VERSION=4.0.3 && \
-    OPENMPI_VERSION_SHORT=$(echo "$OPENMPI_VERSION" | cut -d. -f1,2) && \
-    OPENMPI_SHA1=d958454e32da2c86dd32b7d557cf9a401f0a08d3 && \
-    OPENMPI_URL=https://download.open-mpi.org/release/open-mpi/v${OPENMPI_VERSION_SHORT}/openmpi-${OPENMPI_VERSION}.tar.bz2 && \
-    OPENMPI_ARCHIVE=openmpi-${OPENMPI_VERSION}.tar.bz2 && \
-    CUDA_OPTIONS=${CUDA_AWARE_MPI:+--with-cuda} && \
-    SCRATCH_DIR=/scratch && mkdir -p ${SCRATCH_DIR} && cd ${SCRATCH_DIR} && \
-    wget --quiet ${OPENMPI_URL} --output-document=${OPENMPI_ARCHIVE} && \
-    echo "${OPENMPI_SHA1} ${OPENMPI_ARCHIVE}" | sha1sum -c && \
-    mkdir -p openmpi && \
-    tar -xf ${OPENMPI_ARCHIVE} -C openmpi --strip-components=1 && \
-    mkdir -p build && cd build && \
-    ../openmpi/configure --prefix=${OPENMPI_DIR} ${CUDA_OPTIONS} CFLAGS=-w && \
-    make -j${NPROCS} install && \
-    rm -rf ${SCRATCH_DIR}
-ENV PATH=${OPENMPI_DIR}/bin:$PATH
-
-# Install Boost
-ENV BOOST_DIR=/opt/boost
-RUN BOOST_VERSION=1.75.0 && \
-    BOOST_VERSION_UNDERSCORE=$(echo "$BOOST_VERSION" | sed -e "s/\./_/g") && \
-    BOOST_KEY=379CE192D401AB61 && \
-    BOOST_URL=https://boostorg.jfrog.io/artifactory/main/release/${BOOST_VERSION}/source && \
-    BOOST_ARCHIVE=boost_${BOOST_VERSION_UNDERSCORE}.tar.bz2 && \
-    SCRATCH_DIR=/scratch && mkdir -p ${SCRATCH_DIR} && cd ${SCRATCH_DIR} && \
-    wget --quiet ${BOOST_URL}/${BOOST_ARCHIVE} && \
-    wget --quiet ${BOOST_URL}/${BOOST_ARCHIVE}.asc && \
-    wget --quiet ${BOOST_URL}/${BOOST_ARCHIVE}.json && \
-    wget --quiet ${BOOST_URL}/${BOOST_ARCHIVE}.json.asc && \
-    gpg --verify ${BOOST_ARCHIVE}.json.asc ${BOOST_ARCHIVE}.json && \
-    gpg --verify ${BOOST_ARCHIVE}.asc ${BOOST_ARCHIVE} && \
-    cat ${BOOST_ARCHIVE}.json | jq -r '. | .sha256 + "  " + .file' | sha256sum --check && \
-    mkdir -p boost && \
-    tar -xf ${BOOST_ARCHIVE} -C boost --strip-components=1 && \
-    cd boost && \
-    CXXFLAGS="-w" ./bootstrap.sh \
-        --prefix=${BOOST_DIR} \
-        && \
-    echo "using mpi ;" >> project-config.jam && \
-    ./b2 -j${NPROCS} \
-        hardcode-dll-paths=true dll-path=${BOOST_DIR}/lib \
-        link=shared \
-        variant=release \
-        cxxflags=-w \
-        install \
-        && \
-    rm -rf ${SCRATCH_DIR}
-
-# Install Google Benchmark support library
-ENV BENCHMARK_DIR=/opt/benchmark
-RUN SCRATCH_DIR=/scratch && mkdir -p ${SCRATCH_DIR} && cd ${SCRATCH_DIR} && \
-    git clone https://github.com/google/benchmark.git -b v1.4.1 && \
-    cd benchmark && \
-    mkdir build && cd build && \
-    cmake -D CMAKE_BUILD_TYPE=Release -D CMAKE_INSTALL_PREFIX=${BENCHMARK_DIR} -D BENCHMARK_ENABLE_TESTING=OFF .. && \
-    make -j${NPROCS} && make install && \
-    rm -rf ${SCRATCH_DIR}
-
-# Workaround for Kokkos to find libcudart
-ENV LD_LIBRARY_PATH=/usr/local/cuda/targets/x86_64-linux/lib:${LD_LIBRARY_PATH}
-
-# Install Kokkos
-ARG KOKKOS_VERSION=3.1.00
-ARG KOKKOS_OPTIONS="-DKokkos_ENABLE_SERIAL=ON -DKokkos_ENABLE_OPENMP=ON -DKokkos_ENABLE_CUDA=ON -DKokkos_ENABLE_CUDA_LAMBDA=ON"
-ENV KOKKOS_DIR=/opt/kokkos
-RUN KOKKOS_URL=https://github.com/kokkos/kokkos/archive/${KOKKOS_VERSION}.tar.gz && \
-    KOKKOS_ARCHIVE=kokkos-${KOKKOS_HASH}.tar.gz && \
-    SCRATCH_DIR=/scratch && mkdir -p ${SCRATCH_DIR} && cd ${SCRATCH_DIR} && \
-    wget --quiet ${KOKKOS_URL} --output-document=${KOKKOS_ARCHIVE} && \
-    mkdir -p kokkos && \
-    tar -xf ${KOKKOS_ARCHIVE} -C kokkos --strip-components=1 && \
-    cd kokkos && \
-    mkdir -p build && cd build && \
-    cmake -D CMAKE_BUILD_TYPE=Release -D CMAKE_INSTALL_PREFIX=${KOKKOS_DIR} -D CMAKE_CXX_COMPILER=/scratch/kokkos/bin/nvcc_wrapper ${KOKKOS_OPTIONS} .. && \
-    make -j${NPROCS} install && \
-    rm -rf ${SCRATCH_DIR}
diff --git a/arborx/docker/Dockerfile.hipcc b/arborx/docker/Dockerfile.hipcc
deleted file mode 100644
index 2d22a448c..000000000
--- a/arborx/docker/Dockerfile.hipcc
+++ /dev/null
@@ -1,110 +0,0 @@
-ARG BASE=rocm/dev-ubuntu-20.04:4.2
-FROM $BASE
-
-ARG NPROCS=4
-
-RUN apt-get update && \
-    DEBIAN_FRONTEND=noninteractive apt-get install -yq \
-        build-essential \
-        bc \
-        curl \
-        git \
-        kmod \
-        wget \
-        jq \
-        vim \
-        gdb \
-        ccache \
-        libbz2-dev \
-        libicu-dev \
-        python-dev \
-        autotools-dev \
-        libopenmpi-dev \
-        rocthrust \
-        && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/*
-
-ENV PATH=/opt/rocm/bin:$PATH
-
-RUN KEYDUMP_URL=https://cloud.cees.ornl.gov/download && \
-    KEYDUMP_FILE=keydump && \
-    wget --quiet ${KEYDUMP_URL}/${KEYDUMP_FILE} && \
-    wget --quiet ${KEYDUMP_URL}/${KEYDUMP_FILE}.sig && \
-    gpg --import ${KEYDUMP_FILE} && \
-    gpg --verify ${KEYDUMP_FILE}.sig ${KEYDUMP_FILE} && \
-    rm ${KEYDUMP_FILE}*
-
-# Install CMake
-ENV CMAKE_DIR=/opt/cmake
-RUN CMAKE_VERSION=3.18.5 && \
-    CMAKE_KEY=2D2CEF1034921684 && \
-    CMAKE_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION} && \
-    CMAKE_SCRIPT=cmake-${CMAKE_VERSION}-Linux-x86_64.sh && \
-    CMAKE_SHA256=cmake-${CMAKE_VERSION}-SHA-256.txt && \
-    wget --quiet ${CMAKE_URL}/${CMAKE_SHA256} && \
-    wget --quiet ${CMAKE_URL}/${CMAKE_SHA256}.asc && \
-    wget --quiet ${CMAKE_URL}/${CMAKE_SCRIPT} && \
-    gpg --verify ${CMAKE_SHA256}.asc ${CMAKE_SHA256} && \
-    grep ${CMAKE_SCRIPT} ${CMAKE_SHA256} | sha256sum --check && \
-    mkdir -p ${CMAKE_DIR} && \
-    sh ${CMAKE_SCRIPT} --skip-license --prefix=${CMAKE_DIR} && \
-    rm cmake*
-ENV PATH=${CMAKE_DIR}/bin:$PATH
-
-# Install Boost
-ENV BOOST_DIR=/opt/boost
-RUN BOOST_VERSION=1.72.0 && \
-    BOOST_VERSION_UNDERSCORE=$(echo "$BOOST_VERSION" | sed -e "s/\./_/g") && \
-    BOOST_KEY=379CE192D401AB61 && \
-    BOOST_URL=https://boostorg.jfrog.io/artifactory/main/release/${BOOST_VERSION}/source && \
-    BOOST_ARCHIVE=boost_${BOOST_VERSION_UNDERSCORE}.tar.bz2 && \
-    SCRATCH_DIR=/scratch && mkdir -p ${SCRATCH_DIR} && cd ${SCRATCH_DIR} && \
-    wget --quiet ${BOOST_URL}/${BOOST_ARCHIVE} && \
-    wget --quiet ${BOOST_URL}/${BOOST_ARCHIVE}.asc && \
-    wget --quiet ${BOOST_URL}/${BOOST_ARCHIVE}.json && \
-    wget --quiet ${BOOST_URL}/${BOOST_ARCHIVE}.json.asc && \
-    gpg --verify ${BOOST_ARCHIVE}.json.asc ${BOOST_ARCHIVE}.json && \
-    gpg --verify ${BOOST_ARCHIVE}.asc ${BOOST_ARCHIVE} && \
-    cat ${BOOST_ARCHIVE}.json | jq -r '. | .sha256 + "  " + .file' | sha256sum --check && \
-    mkdir -p boost && \
-    tar -xf ${BOOST_ARCHIVE} -C boost --strip-components=1 && \
-    cd boost && \
-    CXXFLAGS="-w" ./bootstrap.sh \
-        --prefix=${BOOST_DIR} \
-        && \
-    ./b2 -j${NPROCS} \
-        hardcode-dll-paths=true dll-path=${BOOST_DIR}/lib \
-        link=shared \
-        variant=release \
-        cxxflags=-w \
-        install \
-        && \
-    rm -rf ${SCRATCH_DIR}
-
-# Install Google Benchmark support library
-ENV BENCHMARK_DIR=/opt/benchmark
-RUN SCRATCH_DIR=/scratch && mkdir -p ${SCRATCH_DIR} && cd ${SCRATCH_DIR} && \
-    git clone https://github.com/google/benchmark.git -b v1.5.0 && \
-    cd benchmark && \
-    mkdir build && cd build && \
-    cmake -D CMAKE_BUILD_TYPE=Release -D CMAKE_INSTALL_PREFIX=${BENCHMARK_DIR} -D BENCHMARK_ENABLE_TESTING=OFF .. && \
-    make -j${NPROCS} && make install && \
-    rm -rf ${SCRATCH_DIR}
-
-# Install Kokkos
-ARG KOKKOS_VERSION=3.3.01
-ARG KOKKOS_ARCH=Kokkos_ARCH_VEGA906
-ARG KOKKOS_OPTIONS="-DKokkos_ENABLE_HIP=ON -D${KOKKOS_ARCH}=ON"
-ENV KOKKOS_DIR=/opt/kokkos
-RUN KOKKOS_URL=https://github.com/kokkos/kokkos/archive/${KOKKOS_VERSION}.tar.gz && \
-    KOKKOS_ARCHIVE=kokkos-${KOKKOS_HASH}.tar.gz && \
-    SCRATCH_DIR=/scratch && mkdir -p ${SCRATCH_DIR} && cd ${SCRATCH_DIR} && \
-    wget --quiet ${KOKKOS_URL} --output-document=${KOKKOS_ARCHIVE} && \
-    mkdir -p kokkos && \
-    tar -xf ${KOKKOS_ARCHIVE} -C kokkos --strip-components=1 && \
-    cd kokkos && \
-    mkdir -p build && cd build && \
-    cmake -D CMAKE_BUILD_TYPE=Release -D CMAKE_INSTALL_PREFIX=${KOKKOS_DIR} -D CMAKE_CXX_COMPILER=hipcc ${KOKKOS_OPTIONS} .. && \
-    make -j${NPROCS} install && \
-    rm -rf ${SCRATCH_DIR}
diff --git a/arborx/docker/Dockerfile.pgi b/arborx/docker/Dockerfile.pgi
deleted file mode 100644
index 4b3025489..000000000
--- a/arborx/docker/Dockerfile.pgi
+++ /dev/null
@@ -1,122 +0,0 @@
-# Installing PGI needs to be done interactively to accept the license. The
-# installation of the compiler and MPI is done using the default options.
-# During the installation the PGI compiler, multiple versions of the CUDA
-# toolkit are gettin installed. This unnecessarily increases the size of 
-# the image, so before the image is created all but the latest CUDA toolkit 
-# are removed from the container. The image is built using the ubuntu:18.04 image and
-# the compiler is downloaded from https://www.pgroup.com/products/community.html
-FROM rombur/pgi:19.04
-
-ARG NPROCS=8
-ARG DEBIAN_FRONTEND=noninteractive
-
-RUN apt-get update && apt-get install -y \
-        build-essential \
-        bc \
-        curl \
-        git \
-        wget \
-        jq \
-        ccache \
-        ninja-build \
-        libbz2-dev \
-        libicu-dev \
-        autotools-dev \
-        environment-modules \
-        tcl \
-        && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/*
-
-RUN KEYDUMP_URL=https://cloud.cees.ornl.gov/download && \
-    KEYDUMP_FILE=keydump && \
-    wget --quiet ${KEYDUMP_URL}/${KEYDUMP_FILE} && \
-    wget --quiet ${KEYDUMP_URL}/${KEYDUMP_FILE}.sig && \
-    gpg --import ${KEYDUMP_FILE} && \
-    gpg --verify ${KEYDUMP_FILE}.sig ${KEYDUMP_FILE} && \
-    rm ${KEYDUMP_FILE}*
-
-# Install CMake
-ENV CMAKE_DIR=/opt/cmake
-RUN CMAKE_VERSION=3.16.9 && \
-    CMAKE_KEY=2D2CEF1034921684 && \
-    CMAKE_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION} && \
-    CMAKE_SCRIPT=cmake-${CMAKE_VERSION}-Linux-x86_64.sh && \
-    CMAKE_SHA256=cmake-${CMAKE_VERSION}-SHA-256.txt && \
-    wget --quiet ${CMAKE_URL}/${CMAKE_SHA256} && \
-    wget --quiet ${CMAKE_URL}/${CMAKE_SHA256}.asc && \
-    wget --quiet ${CMAKE_URL}/${CMAKE_SCRIPT} && \
-    gpg --verify ${CMAKE_SHA256}.asc ${CMAKE_SHA256} && \
-    grep ${CMAKE_SCRIPT} ${CMAKE_SHA256} | sha256sum --check && \
-    mkdir -p ${CMAKE_DIR} && \
-    sh ${CMAKE_SCRIPT} --skip-license --prefix=${CMAKE_DIR} && \
-    rm cmake*
-ENV PATH=${CMAKE_DIR}/bin:$PATH
-
-# Install Boost
-ENV BOOST_DIR=/opt/boost
-RUN BOOST_VERSION=1.71.0 && \
-    BOOST_VERSION_UNDERSCORE=$(echo "$BOOST_VERSION" | sed -e "s/\./_/g") && \
-    BOOST_KEY=379CE192D401AB61 && \
-    BOOST_URL=https://boostorg.jfrog.io/artifactory/main/release/${BOOST_VERSION}/source && \
-    BOOST_ARCHIVE=boost_${BOOST_VERSION_UNDERSCORE}.tar.bz2 && \
-    SCRATCH_DIR=/scratch && mkdir -p ${SCRATCH_DIR} && cd ${SCRATCH_DIR} && \
-    wget --quiet ${BOOST_URL}/${BOOST_ARCHIVE} && \
-    wget --quiet ${BOOST_URL}/${BOOST_ARCHIVE}.asc && \
-    wget --quiet ${BOOST_URL}/${BOOST_ARCHIVE}.json && \
-    wget --quiet ${BOOST_URL}/${BOOST_ARCHIVE}.json.asc && \
-    gpg --verify ${BOOST_ARCHIVE}.json.asc ${BOOST_ARCHIVE}.json && \
-    gpg --verify ${BOOST_ARCHIVE}.asc ${BOOST_ARCHIVE} && \
-    cat ${BOOST_ARCHIVE}.json | jq -r '. | .sha256 + "  " + .file' | sha256sum --check && \
-    mkdir -p boost && \
-    tar -xf ${BOOST_ARCHIVE} -C boost --strip-components=1 && \
-    cd boost && \
-    CXXFLAGS="-w" ./bootstrap.sh \
-        --prefix=${BOOST_DIR} \
-        && \
-    echo "using mpi ;" >> project-config.jam && \
-    ./b2 -j${NPROCS} \
-        hardcode-dll-paths=true dll-path=${BOOST_DIR}/lib \
-        link=shared \
-        variant=release \
-        cxxflags=-w \
-        install \
-        && \
-    rm -rf ${SCRATCH_DIR}
-
-# Install Google Benchmark support library
-ENV BENCHMARK_DIR=/opt/benchmark
-RUN SCRATCH_DIR=/scratch && mkdir -p ${SCRATCH_DIR} && cd ${SCRATCH_DIR} && \
-    git clone https://github.com/google/benchmark.git -b v1.4.1 && \
-    cd benchmark && \
-    mkdir build && cd build && \
-    cmake -D CMAKE_BUILD_TYPE=Release -D CMAKE_INSTALL_PREFIX=${BENCHMARK_DIR} -D BENCHMARK_ENABLE_TESTING=OFF .. && \
-    make -j${NPROCS} && make install && \
-    rm -rf ${SCRATCH_DIR}
-
-# Install Kokkos
-ARG KOKKOS_VERSION=3.1.00
-ARG KOKKOS_OPTIONS="-DKokkos_ENABLE_SERIAL=ON -DKokkos_ENABLE_OPENMP=ON -DKokkos_ENABLE_DEPRECATED_CODE=OFF -DKokkos_ENABLE_PROFILING=OFF -DKokkos_ENABLE_LIBDL=OFF"
-ENV KOKKOS_DIR=/opt/kokkos
-RUN KOKKOS_URL=https://github.com/kokkos/kokkos/archive/${KOKKOS_VERSION}.tar.gz && \
-    KOKKOS_ARCHIVE=kokkos-${KOKKOS_HASH}.tar.gz && \
-    SCRATCH_DIR=/scratch && mkdir -p ${SCRATCH_DIR} && cd ${SCRATCH_DIR} && \
-    wget --quiet ${KOKKOS_URL} --output-document=${KOKKOS_ARCHIVE} && \
-    mkdir -p kokkos && \
-    tar -xf ${KOKKOS_ARCHIVE} -C kokkos --strip-components=1 && \
-    cd kokkos && \
-    mkdir -p build && cd build && \
-    cmake -D CMAKE_BUILD_TYPE=Release -D CMAKE_INSTALL_PREFIX=${KOKKOS_DIR} -D CMAKE_CXX_COMPILER=/opt/pgi/linux86-64-llvm/19.4/bin/pgc++ ${KOKKOS_OPTIONS} .. && \
-    make -j${NPROCS} install && \
-    rm -rf ${SCRATCH_DIR}
-
-# Set the different paths
-ENV PGI_VERSION=19.4
-ENV LD_LIBRARY_PATH=/opt/pgi/linux86-64-llvm/2019/mpi/openmpi-3.1.3/lib:/opt/pgi/linux86-64-llvm/${PGI_VERSION}/lib:$LD_LIBRARY_PATH
-ENV CXX=/opt/pgi/linux86-64-llvm/${PGI_VERSION}/bin/pgc++
-ENV F90=/opt/pgi/linux86-64-llvm/${PGI_VERSION}/bin/pgf90
-ENV PGI=/opt/pgi
-ENV FC=/opt/pgi/linux86-64-llvm/${PGI_VERSION}/bin/pgfortran
-ENV F77=/opt/pgi/linux86-64-llvm/${PGI_VERSION}/bin/pgf77
-ENV PATH=/opt/pgi/linux86-64-llvm/2019/mpi/openmpi-3.1.3/bin:/opt/pgi/linux86-64-llvm/${PGI_VERSION}/bin:/trash:/opt/cmake/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-ENV CC=/opt/pgi/linux86-64-llvm/${PGI_VERSION}/bin/pgcc
diff --git a/arborx/docker/Dockerfile.sycl b/arborx/docker/Dockerfile.sycl
deleted file mode 100644
index 76668985f..000000000
--- a/arborx/docker/Dockerfile.sycl
+++ /dev/null
@@ -1,132 +0,0 @@
-ARG BASE=nvidia/cuda:10.2-devel
-FROM $BASE
-
-ARG NPROCS=4
-
-RUN apt-get update && apt-get install -y \
-        bc \
-        wget \
-        ccache \
-        ninja-build \
-        python3 \
-        git \
-        vim \
-        jq \
-        libopenmpi-dev \
-        && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/*
-
-RUN KEYDUMP_URL=https://cloud.cees.ornl.gov/download && \
-    KEYDUMP_FILE=keydump && \
-    wget --quiet ${KEYDUMP_URL}/${KEYDUMP_FILE} && \
-    wget --quiet ${KEYDUMP_URL}/${KEYDUMP_FILE}.sig && \
-    gpg --import ${KEYDUMP_FILE} && \
-    gpg --verify ${KEYDUMP_FILE}.sig ${KEYDUMP_FILE} && \
-    rm ${KEYDUMP_FILE}*
-
-ARG CMAKE_VERSION=3.19.0
-ENV CMAKE_DIR=/opt/cmake
-RUN CMAKE_KEY=2D2CEF1034921684 && \
-    CMAKE_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION} && \
-    CMAKE_SCRIPT=cmake-${CMAKE_VERSION}-Linux-x86_64.sh && \
-    CMAKE_SHA256=cmake-${CMAKE_VERSION}-SHA-256.txt && \
-    wget --quiet ${CMAKE_URL}/${CMAKE_SHA256} && \
-    wget --quiet ${CMAKE_URL}/${CMAKE_SHA256}.asc && \
-    wget --quiet ${CMAKE_URL}/${CMAKE_SCRIPT} && \
-    gpg --verify ${CMAKE_SHA256}.asc ${CMAKE_SHA256} && \
-    grep ${CMAKE_SCRIPT} ${CMAKE_SHA256} | sha256sum --check && \
-    mkdir -p ${CMAKE_DIR} && \
-    sh ${CMAKE_SCRIPT} --skip-license --prefix=${CMAKE_DIR} && \
-    rm cmake*
-ENV PATH=${CMAKE_DIR}/bin:$PATH
-
-ENV SYCL_DIR=/opt/sycl
-RUN SYCL_VERSION=20210311 && \
-    SYCL_URL=https://github.com/intel/llvm/archive/sycl-nightly && \
-    SYCL_ARCHIVE=${SYCL_VERSION}.tar.gz && \
-    SCRATCH_DIR=/scratch && mkdir -p ${SCRATCH_DIR} && cd ${SCRATCH_DIR} && \
-    wget --quiet ${SYCL_URL}/${SYCL_ARCHIVE} && \
-    mkdir llvm && \
-    tar -xf ${SYCL_ARCHIVE} -C llvm --strip-components=1 && \
-    cd llvm && \
-    python3 buildbot/configure.py --cuda && \
-    python3 buildbot/compile.py && \
-    mkdir -p ${SYCL_DIR} && \
-    mv ${SCRATCH_DIR}/llvm/build/install/* ${SYCL_DIR} && \
-    echo "${SYCL_DIR}/lib" > /etc/ld.so.conf.d/sycl.conf && ldconfig && \
-    rm -rf ${SCRATCH_DIR}
-ENV PATH=${SYCL_DIR}/bin:$PATH
-
-# Install oneDPL
-ENV ONE_DPL_DIR=/opt/onedpl
-RUN ONE_DPL_VERSION=oneDPL-2021.3.0-release && \
-    ONE_DPL_URL=https://github.com/oneapi-src/oneDPL/archive && \
-    ONE_DPL_ARCHIVE=${ONE_DPL_VERSION}.tar.gz && \
-    SCRATCH_DIR=/scratch && mkdir -p ${SCRATCH_DIR} && cd ${SCRATCH_DIR} && \
-    wget --quiet ${ONE_DPL_URL}/${ONE_DPL_ARCHIVE} && \
-    mkdir onedpl && \
-    tar -xf ${ONE_DPL_ARCHIVE} -C onedpl --strip-components=1 && cd onedpl && \
-    echo 'install(CODE "set(OUTPUT_DIR \"${CMAKE_INSTALL_PREFIX}/lib/cmake/oneDPL\")")' >> CMakeLists.txt && \
-    echo 'install(SCRIPT cmake/scripts/generate_config.cmake)' >> CMakeLists.txt && \
-    echo 'install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include DESTINATION linux)' >> CMakeLists.txt && \
-    mkdir build && cd build && \
-    cmake -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_CXX_FLAGS="-w" -DCMAKE_INSTALL_PREFIX=${ONE_DPL_DIR} -DCMAKE_SKIP_INSTALL_ALL_DEPENDENCY=TRUE -DONEDPL_BACKEND="dpcpp_only" .. && \
-    make -j${NPROCS} install && \
-    rm -rf ${SCRATCH_DIR}
-
-# Install Boost
-ENV BOOST_DIR=/opt/boost
-RUN BOOST_VERSION=1.72.0 && \
-    BOOST_VERSION_UNDERSCORE=$(echo "$BOOST_VERSION" | sed -e "s/\./_/g") && \
-    BOOST_KEY=379CE192D401AB61 && \
-    BOOST_URL=https://boostorg.jfrog.io/artifactory/main/release/${BOOST_VERSION}/source && \
-    BOOST_ARCHIVE=boost_${BOOST_VERSION_UNDERSCORE}.tar.bz2 && \
-    SCRATCH_DIR=/scratch && mkdir -p ${SCRATCH_DIR} && cd ${SCRATCH_DIR} && \
-    wget --quiet ${BOOST_URL}/${BOOST_ARCHIVE} && \
-    wget --quiet ${BOOST_URL}/${BOOST_ARCHIVE}.asc && \
-    wget --quiet ${BOOST_URL}/${BOOST_ARCHIVE}.json && \
-    wget --quiet ${BOOST_URL}/${BOOST_ARCHIVE}.json.asc && \
-    gpg --verify ${BOOST_ARCHIVE}.json.asc ${BOOST_ARCHIVE}.json && \
-    gpg --verify ${BOOST_ARCHIVE}.asc ${BOOST_ARCHIVE} && \
-    cat ${BOOST_ARCHIVE}.json | jq -r '. | .sha256 + "  " + .file' | sha256sum --check && \
-    mkdir -p boost && \
-    tar -xf ${BOOST_ARCHIVE} -C boost --strip-components=1 && \
-    cd boost && \
-    CXXFLAGS="-w" ./bootstrap.sh \
-        --prefix=${BOOST_DIR} \
-        && \
-    ./b2 -j${NPROCS} \
-        hardcode-dll-paths=true dll-path=${BOOST_DIR}/lib \
-        link=shared \
-        variant=release \
-        cxxflags=-w \
-        install \
-        && \
-    rm -rf ${SCRATCH_DIR}
-
-# Install Google Benchmark support library
-ENV BENCHMARK_DIR=/opt/benchmark
-RUN SCRATCH_DIR=/scratch && mkdir -p ${SCRATCH_DIR} && cd ${SCRATCH_DIR} && \
-    git clone https://github.com/google/benchmark.git -b v1.5.0 && \
-    cd benchmark && \
-    mkdir build && cd build && \
-    cmake -D CMAKE_BUILD_TYPE=Release -D CMAKE_INSTALL_PREFIX=${BENCHMARK_DIR} -D BENCHMARK_ENABLE_TESTING=OFF .. && \
-    make -j${NPROCS} && make install && \
-    rm -rf ${SCRATCH_DIR}
-
-# Install Kokkos
-ARG KOKKOS_VERSION=3.4.00
-ARG KOKKOS_OPTIONS="-DKokkos_ENABLE_SYCL=ON -DCMAKE_CXX_FLAGS=-Wno-unknown-cuda-version -DKokkos_ENABLE_UNSUPPORTED_ARCHS=ON -DKokkos_ARCH_VOLTA70=ON -DCMAKE_CXX_STANDARD=17"
-ENV KOKKOS_DIR=/opt/kokkos
-RUN KOKKOS_URL=https://github.com/kokkos/kokkos/archive/${KOKKOS_VERSION}.tar.gz && \
-    KOKKOS_ARCHIVE=kokkos-${KOKKOS_HASH}.tar.gz && \
-    SCRATCH_DIR=/scratch && mkdir -p ${SCRATCH_DIR} && cd ${SCRATCH_DIR} && \
-    wget --quiet ${KOKKOS_URL} --output-document=${KOKKOS_ARCHIVE} && \
-    mkdir -p kokkos && \
-    tar -xf ${KOKKOS_ARCHIVE} -C kokkos --strip-components=1 && \
-    cd kokkos && \
-    mkdir -p build && cd build && \
-    cmake -D CMAKE_BUILD_TYPE=Release -D CMAKE_INSTALL_PREFIX=${KOKKOS_DIR} -D CMAKE_CXX_COMPILER=clang++ ${KOKKOS_OPTIONS} .. && \
-    make -j${NPROCS} install && \
-    rm -rf ${SCRATCH_DIR}
diff --git a/arborx/docker/README.md b/arborx/docker/README.md
deleted file mode 100644
index 66b82173c..000000000
--- a/arborx/docker/README.md
+++ /dev/null
@@ -1,18 +0,0 @@
-Consider setting the `COMPOSE_PROJECT_NAME` environment variable or providing it
-in the environment file.  Its value will be prepended along with the service
-name to the container on start up.
-
-
-You may use multiple compose files to customize your container.  For instance, you
-could reproduce the configuration from one of the automated builds by providing
-the following a `docker-compose.override.yml` file:
-```
-version: '3'
-services:
-  arborx_dev:
-    build:
-      args:
-        - BASE=nvidia/cuda:10.1-devel
-        - KOKKOS_VERSION=2.8.00
-        - KOKKOS_OPTIONS=--cxxstandard=c++14 --with-serial --with-openmp --with-options=disable_deprecated_code --with-cuda --with-cuda-options=enable_lambda --arch=SNB,Volta70
-```
diff --git a/arborx/docker/docker-compose.yml b/arborx/docker/docker-compose.yml
deleted file mode 100644
index 3487fb773..000000000
--- a/arborx/docker/docker-compose.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-version: '3'
-services:
-  arborx_dev:
-    build:
-      context: .
-    volumes:
-      - ..:${CONTAINER_ARBORX_DIR}
-      - ccache_dir:${CONTAINER_CCACHE_DIR}
-    working_dir: ${CONTAINER_ARBORX_DIR}
-    environment:
-      - TERM=xterm
-      - ARBORX_DIR=${CONTAINER_ARBORX_DIR}
-      - CCACHE_DIR=${CONTAINER_CCACHE_DIR}
-      - CCACHE_MAXSIZE=10G
-    command: tail -f /dev/null
-    security_opt:
-      - seccomp:unconfined
-    network_mode: host
-volumes:
-  ccache_dir:
diff --git a/arborx/docs/LICENSE.ECL b/arborx/docs/LICENSE.ECL
deleted file mode 100644
index 82de69c15..000000000
--- a/arborx/docs/LICENSE.ECL
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-ECL-CC code: ECL-CC is a connected components algorithm. The CUDA
-implementation thereof is very fast. It operates on graphs stored in
-binary CSR format.
-
-Copyright (c) 2017, Texas State University. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted for academic, research, experimental, or personal use provided
-that the following conditions are met:
-
-   * Redistributions of source code must retain the above copyright notice,
-     this list of conditions, and the following disclaimer.
-   * Redistributions in binary form must reproduce the above copyright notice,
-     this list of conditions, and the following disclaimer in the documentation
-     and/or other materials provided with the distribution.
-   * Neither the name of Texas State University nor the names of its
-     contributors may be used to endorse or promote products derived from this
-     software without specific prior written permission.
-
-For all other uses, please contact the Office for Commercialization and Industry
-Relations at Texas State University <http://www.txstate.edu/ocir/>.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR 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.
-
-Authors: Jayadharini Jaiganesh and Martin Burtscher
-*/
diff --git a/arborx/docs/logos/arborx_logo_v1.0.png b/arborx/docs/logos/arborx_logo_v1.0.png
deleted file mode 100644
index d52b1c3f80f4495fe16ae5e924bf5c2dc19f7925..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 79458
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%0A!Yz6b*THf_m-0<@
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%0A%*o#vfqB1&{LTB_E5rgs*=9vE(mcJBe5I
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
U9;;Ys#lmN(YpO%ka=!b205R3q4FCWD

diff --git a/arborx/docs/logos/arborx_logo_v1.0.svg b/arborx/docs/logos/arborx_logo_v1.0.svg
deleted file mode 100644
index 5c94a0b19..000000000
--- a/arborx/docs/logos/arborx_logo_v1.0.svg
+++ /dev/null
@@ -1,357 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
- "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
- width="2419.000000pt" height="2418.000000pt" viewBox="0 0 2419.000000 2418.000000"
- preserveAspectRatio="xMidYMid meet">
-
-<g transform="translate(0.000000,2418.000000) scale(0.100000,-0.100000)"
-fill="#000000" stroke="none">
-<path d="M12924 23843 c-61 -106 -168 -197 -334 -286 -161 -86 -287 -112 -640
--132 -158 -9 -293 -21 -335 -31 -122 -29 -306 -132 -375 -210 -53 -61 -107
--198 -186 -478 -61 -214 -96 -287 -170 -360 -84 -82 -154 -113 -284 -127 -135
--14 -224 -6 -429 36 -284 60 -339 83 -406 175 -44 60 -54 108 -55 260 0 108 4
-143 31 250 17 69 32 155 33 192 1 63 -2 73 -62 191 -69 137 -117 198 -205 263
--64 47 -93 57 -319 108 l-156 36 -79 -29 c-64 -24 -73 -30 -53 -34 14 -3 89
--17 166 -31 224 -41 269 -58 331 -123 105 -109 161 -280 119 -357 -40 -73
--107 -90 -316 -80 -124 5 -153 4 -205 -12 l-60 -18 83 -8 c107 -9 298 -45 331
--63 36 -18 75 -62 100 -112 36 -72 30 -115 -56 -427 -31 -115 -35 -139 -31
--211 9 -130 54 -208 226 -387 92 -96 150 -131 349 -212 314 -129 472 -176 664
--200 236 -29 395 -93 504 -201 79 -78 265 -328 304 -408 37 -75 57 -153 71
--272 23 -206 7 -299 -83 -469 -52 -99 -89 -137 -175 -180 -128 -65 -295 -96
--411 -77 -109 18 -122 42 -122 224 0 117 -3 138 -31 226 -37 117 -62 166 -124
-251 -82 112 -162 187 -254 240 -101 58 -291 144 -364 165 -73 21 -290 53 -438
-64 -182 14 -201 27 -227 166 -23 118 -21 117 -47 40 -23 -64 -24 -76 -14 -145
-20 -138 12 -126 98 -154 42 -13 117 -30 166 -36 166 -21 320 -88 486 -210 132
--98 165 -148 176 -268 6 -61 4 -75 -16 -110 -26 -47 -90 -97 -180 -142 -212
--106 -302 -106 -532 0 -125 58 -245 90 -343 90 -186 0 -321 36 -379 100 -91
-100 -166 339 -166 524 0 95 -23 180 -65 241 -19 28 -78 88 -132 135 -54 47
--180 156 -279 243 -118 102 -186 168 -195 189 -9 21 -14 72 -14 143 0 103 2
-113 30 163 42 76 118 141 234 200 154 78 153 77 212 226 59 148 116 266 152
-313 35 48 151 140 193 153 45 15 127 8 211 -18 50 -16 63 -17 67 -6 3 8 -31
-32 -99 68 -113 61 -208 84 -292 71 -54 -8 -244 -91 -304 -132 -36 -25 -56 -52
--104 -144 -69 -129 -81 -139 -245 -200 -85 -32 -86 -32 -330 -39 -267 -6 -295
--12 -346 -67 -65 -70 -83 -159 -49 -253 9 -25 51 -110 95 -190 92 -170 105
--212 97 -322 -4 -68 -10 -88 -34 -122 -69 -97 -147 -118 -639 -171 -449 -47
--542 -52 -624 -30 -112 29 -133 47 -230 190 -81 120 -93 132 -144 158 -31 15
--59 27 -61 27 -3 0 13 -23 36 -52 84 -107 113 -210 73 -266 -20 -29 -87 -29
--203 -2 -161 39 -242 94 -403 274 -71 80 -52 26 48 -134 57 -91 112 -172 123
--181 10 -8 80 -50 156 -93 136 -78 136 -78 278 -103 127 -22 177 -25 472 -29
-203 -3 341 -9 358 -16 36 -14 67 -54 67 -85 0 -14 -7 -40 -16 -59 -18 -38 -38
--46 -174 -65 -74 -10 -92 -16 -137 -51 -44 -32 -53 -44 -53 -69 0 -39 21 -34
-32 8 12 45 46 54 263 62 204 8 242 17 291 73 24 27 44 90 44 140 0 58 26 72
-140 76 117 4 297 -12 342 -31 56 -24 157 -107 217 -178 46 -55 74 -106 136
--242 185 -409 328 -676 402 -753 21 -22 117 -89 212 -149 190 -118 282 -187
-318 -238 41 -58 57 -161 57 -377 1 -192 1 -196 -26 -253 -38 -82 -81 -132
--133 -157 -65 -32 -192 -52 -340 -53 -147 -2 -152 -1 -420 105 -82 32 -197 77
--255 100 -136 53 -238 106 -256 133 -8 12 -18 42 -23 68 -9 49 -44 99 -135
-195 -62 66 -101 86 -386 200 -526 211 -776 360 -866 516 -40 70 -50 79 -237
-222 l-138 106 -46 -9 -46 -8 69 -51 c82 -62 147 -131 230 -245 109 -150 254
--418 254 -470 0 -14 -9 -38 -21 -53 -19 -24 -26 -26 -104 -26 -45 0 -198 -7
--339 -15 l-256 -16 -96 -75 c-106 -82 -136 -98 -239 -121 -38 -9 -74 -20 -78
--23 -11 -10 150 -60 189 -60 48 0 93 19 176 76 83 57 120 67 238 68 52 0 76
--5 117 -27 160 -83 390 -97 683 -41 96 18 255 19 306 1 21 -7 112 -61 201
--119 137 -90 165 -112 178 -144 50 -119 21 -173 -111 -205 -86 -21 -134 -70
--149 -152 -14 -74 -109 -118 -307 -141 -251 -31 -589 -58 -631 -52 -39 6 -52
-16 -116 87 -91 99 -133 123 -221 122 -86 0 -125 -19 -200 -92 -46 -46 -74 -64
--113 -76 -117 -35 -186 -16 -401 110 -178 104 -214 118 -273 104 -44 -9 -66
--33 -101 -109 -21 -44 -27 -77 -31 -160 -6 -96 -11 -117 -60 -246 -45 -120
--53 -148 -46 -180 6 -35 8 -36 18 -19 6 11 53 97 103 190 l92 170 77 3 c96 4
-134 -12 323 -139 l137 -91 190 5 c104 2 206 10 225 16 63 21 245 25 393 7 163
--19 287 -13 707 35 697 78 705 79 965 79 138 0 279 5 315 9 36 5 119 17 185
-27 155 22 230 13 350 -44 118 -57 293 -106 380 -106 88 -1 147 25 271 119 107
-82 154 104 217 105 74 0 136 -38 262 -161 l111 -108 84 39 c111 52 156 53 264
-5 l80 -34 65 19 c265 80 424 93 711 59 137 -16 253 -23 390 -23 l195 -1 95 47
-c52 26 135 71 185 100 l89 53 91 0 c79 -1 99 -4 163 -33 93 -40 165 -54 503
--97 l275 -34 1045 -7 1044 -6 700 38 c769 41 1170 49 1292 25 64 -12 97 -12
-290 5 210 18 289 19 803 13 137 -2 230 3 357 18 154 19 178 25 234 54 34 18
-78 52 97 76 34 40 40 43 84 43 33 0 66 -9 100 -26 28 -14 94 -38 147 -52 l96
--27 375 1 c356 1 378 2 434 22 97 35 119 59 191 205 36 72 65 134 65 138 0 5
--64 -23 -142 -61 -234 -115 -236 -115 -493 -115 -170 0 -238 4 -300 18 -161
-34 -171 39 -331 192 l-147 139 -106 0 -106 0 -305 -151 c-318 -158 -360 -174
--599 -224 -86 -18 -123 -21 -204 -15 -245 16 -617 77 -802 131 -31 9 -75 35
--115 67 l-65 53 580 5 579 5 416 445 415 445 1204 0 1204 0 241 424 242 425
-79 1 c89 1 139 20 194 76 56 55 76 105 76 189 0 84 -20 134 -76 189 -55 56
--105 76 -189 76 -84 0 -134 -20 -189 -76 -56 -55 -76 -105 -76 -189 0 -73 12
--108 56 -171 10 -13 -31 -90 -213 -410 l-225 -394 -1190 4 -1190 3 -419 -450
--419 -451 -592 0 -592 -1 -15 22 c-9 12 -16 26 -16 30 0 5 254 8 564 8 l564 0
-433 455 434 456 1130 -6 1130 -6 130 221 130 222 66 1 c78 2 133 33 176 99 24
-35 28 52 28 108 0 56 -4 73 -28 108 -15 23 -46 54 -69 69 -35 24 -52 28 -108
-28 -56 0 -73 -4 -108 -28 -108 -71 -133 -201 -58 -300 l33 -43 -120 -203 -121
--203 -1121 7 -1120 7 -435 -455 -435 -456 -576 -1 c-559 0 -576 1 -594 20 -32
-36 -113 45 -370 43 -132 -1 -289 -6 -350 -11 -98 -8 -119 -13 -195 -49 -47
--22 -161 -89 -255 -147 -197 -124 -244 -141 -356 -133 -207 16 -282 97 -280
-302 0 51 5 105 11 120 17 43 68 109 100 128 16 10 114 33 217 53 173 31 203
-34 369 33 140 0 188 3 210 14 44 22 171 50 228 50 35 0 69 -8 106 -26 61 -29
-106 -33 175 -15 36 10 56 25 102 78 32 36 158 173 280 306 l223 241 1336 6
-c736 4 1555 7 1821 7 l483 0 100 134 99 134 38 -20 c84 -43 201 -6 260 84 24
-35 28 52 28 108 0 56 -4 73 -28 108 -15 23 -46 54 -69 69 -35 24 -52 28 -108
-28 -56 0 -73 -4 -108 -28 -86 -57 -124 -165 -88 -251 9 -21 13 -43 9 -50 -4
--6 -45 -62 -91 -123 l-84 -113 -498 0 c-273 0 -1066 -3 -1761 -6 l-1264 -7 29
-32 30 31 1692 0 1693 0 94 116 95 116 7 121 8 122 83 91 84 91 47 -23 c109
--56 241 -6 294 111 63 137 -48 305 -201 305 -147 0 -261 -162 -206 -294 l14
--33 -98 -107 -98 -107 -7 -123 -7 -123 -72 -91 -71 -91 -1639 -1 -1640 0 35
-36 34 36 366 -7 366 -7 211 315 212 316 0 233 0 234 326 416 326 416 36 -10
-c112 -31 245 33 305 146 31 58 31 174 0 232 -28 53 -74 99 -127 127 -58 31
--174 31 -232 0 -53 -28 -99 -74 -127 -127 -33 -63 -31 -175 5 -239 l27 -48
--339 -432 -340 -432 0 -237 0 -237 -177 -266 -178 -266 -361 7 -361 6 -198
--213 c-109 -118 -280 -302 -379 -409 -314 -338 -309 -334 -340 -326 -15 4 -49
-26 -74 51 l-47 43 -115 -15 c-188 -24 -434 1 -472 47 -9 12 -20 41 -24 65 -7
-51 -1 65 92 213 33 53 82 134 108 179 26 46 69 106 94 134 l46 51 330 -7 331
--7 284 293 c157 162 317 327 357 368 l72 74 41 -17 c109 -43 231 8 282 119 49
-106 -4 235 -116 286 -176 81 -365 -112 -285 -290 l20 -43 -92 -97 c-50 -53
--204 -212 -342 -354 l-251 -259 -306 7 -307 7 -22 -22 c-12 -12 -47 -33 -78
--47 -74 -32 -83 -41 -153 -145 -67 -98 -117 -149 -230 -230 -131 -93 -174
--111 -293 -116 -130 -5 -195 16 -255 84 -55 63 -75 127 -69 223 6 111 42 181
-159 313 52 59 110 133 129 165 34 56 35 60 35 163 0 68 5 114 13 130 9 16 -2
-9 -31 -21 -33 -33 -47 -57 -52 -87 -10 -58 -35 -75 -189 -123 -72 -22 -153
--47 -181 -56 -39 -13 -70 -36 -141 -104 -90 -87 -133 -111 -163 -92 -30 19
--51 59 -53 101 l-1 44 344 345 344 345 455 -6 c250 -3 667 -9 926 -12 l470 -6
-195 205 194 205 263 1 c242 1 263 0 268 -16 28 -88 75 -147 147 -185 59 -32
-175 -32 233 -1 53 28 99 74 127 127 31 58 31 174 0 232 -100 189 -356 205
--467 30 l-29 -46 -297 0 -298 0 -188 -197 c-103 -109 -191 -202 -194 -206 -4
--5 -425 -3 -935 3 l-929 11 -217 -217 c-120 -120 -220 -216 -222 -214 -2 3
--13 31 -24 62 l-20 57 201 192 201 191 845 -6 845 -7 319 301 319 300 137 0
-c75 0 299 -3 498 -7 l360 -6 6 -32 c10 -50 59 -110 111 -135 92 -45 201 -6
-253 90 48 91 10 205 -88 258 -88 47 -202 11 -252 -79 l-23 -41 -515 7 -515 6
--319 -301 -319 -300 -55 0 c-32 0 -52 4 -46 9 5 4 171 156 368 336 l360 327
-416 -7 417 -7 23 37 c18 29 27 35 44 30 61 -19 121 -17 166 7 134 72 145 245
-22 332 -161 113 -371 -73 -278 -247 25 -46 25 -49 9 -74 l-17 -25 -415 6 -416
-7 -400 -366 -399 -367 -746 7 -745 6 -198 -191 c-108 -105 -201 -189 -206
--186 -5 3 -17 35 -26 71 -34 124 -3 241 83 315 l47 40 367 0 367 0 278 289
-278 290 161 0 162 1 283 277 c156 152 363 355 460 450 l176 174 52 -17 c124
--40 259 18 324 140 31 58 31 174 0 232 -28 53 -74 99 -127 127 -32 17 -58 22
--116 22 -58 0 -84 -5 -116 -22 -53 -28 -99 -74 -127 -127 -28 -53 -31 -174 -5
--222 l17 -32 -438 -431 -439 -431 -160 0 -161 0 -278 -289 -278 -290 -277 0
--278 -1 37 55 38 56 215 -7 215 -7 300 307 300 306 40 -15 c136 -49 290 37
-327 183 l10 42 88 0 88 0 261 273 261 272 0 136 0 136 43 17 c187 71 194 324
-12 407 -173 80 -366 -112 -286 -286 22 -50 75 -101 118 -117 l33 -12 0 -126
--1 -125 -236 -245 -236 -245 -77 -3 -77 -3 -18 40 c-22 50 -67 96 -119 124
--57 30 -165 30 -221 0 -140 -74 -185 -241 -100 -368 l26 -37 -279 -286 -279
--287 -59 -3 c-33 -2 -160 2 -284 8 l-225 11 -45 -50 c-54 -60 -114 -101 -147
--101 -59 0 -132 67 -139 126 -9 76 42 139 507 627 151 158 297 320 326 360
-153 212 244 495 198 617 l-13 35 -12 -30 c-6 -16 -25 -68 -42 -115 -37 -105
--58 -145 -119 -237 -116 -172 -184 -228 -323 -268 -109 -32 -251 -1 -298 65
--31 44 -50 141 -58 300 -4 85 -9 156 -9 157 -1 2 -23 28 -51 58 -27 30 -50 60
--50 67 0 30 -44 168 -51 161 -4 -4 -13 -37 -18 -73 -10 -58 -8 -72 16 -145 17
--53 26 -103 26 -150 1 -94 -40 -287 -124 -585 -54 -188 -73 -275 -84 -375 -23
--204 -33 -232 -140 -405 -127 -207 -145 -267 -145 -484 0 -88 -5 -177 -10
--197 -17 -62 -78 -120 -186 -176 -119 -61 -162 -71 -347 -79 -154 -7 -238 6
--325 47 -41 20 -72 60 -72 95 0 9 22 42 49 74 45 54 49 65 65 152 27 147 77
-348 101 403 12 28 36 64 52 80 17 17 110 71 208 120 191 97 189 96 226 203 26
-75 25 76 -22 4 -22 -34 -55 -70 -72 -78 -26 -14 -133 -54 -144 -54 -1 0 -3 65
--3 145 l0 144 138 104 c75 57 142 106 148 110 7 4 32 -2 55 -13 110 -49 238 1
-290 115 63 137 -48 305 -201 305 -150 0 -261 -162 -204 -298 14 -35 14 -38 -4
--52 -10 -8 -83 -63 -160 -123 l-142 -107 0 -174 0 -173 -42 -7 c-98 -16 -143
--64 -293 -316 -100 -167 -186 -240 -286 -240 -44 0 -64 6 -102 29 -61 39 -126
-107 -133 140 -12 57 -78 281 -106 358 -16 46 -33 120 -39 165 -17 128 6 516
-37 643 29 120 94 219 167 256 60 31 214 46 326 32 105 -13 141 -30 171 -78
-l22 -35 130 0 c116 0 135 2 165 21 19 12 32 23 30 26 -3 2 -31 0 -63 -6 -99
--19 -151 -15 -180 14 -32 32 -64 101 -64 142 0 26 12 42 75 101 58 54 92 77
-153 102 149 61 186 81 283 150 137 98 183 165 195 287 6 53 4 60 -19 81 l-24
-23 -29 -48z m3295 -100 c85 -63 75 -186 -20 -236 -92 -49 -208 33 -195 137 12
-104 133 159 215 99z m390 -391 c58 -43 64 -140 12 -193 -76 -75 -204 -30 -217
-77 -14 110 115 183 205 116z m-3470 -529 c85 -63 75 -186 -20 -236 -92 -49
--208 33 -195 137 12 104 133 159 215 99z m2122 -50 c48 -9 115 -80 124 -130
-11 -67 -3 -112 -50 -159 -73 -72 -168 -72 -241 1 -72 73 -72 168 1 241 51 50
-92 62 166 47z m3298 -201 c58 -43 64 -140 12 -193 -76 -75 -204 -30 -217 77
--14 110 115 183 205 116z m-1031 -82 c40 -25 72 -75 72 -115 0 -63 -72 -135
--135 -135 -63 0 -135 72 -135 135 0 63 72 135 135 135 17 0 45 -9 63 -20z
-m250 -370 c40 -25 72 -75 72 -115 0 -63 -72 -135 -135 -135 -63 0 -135 72
--135 135 0 63 72 135 135 135 17 0 45 -9 63 -20z m-329 -378 c58 -43 64 -140
-12 -193 -76 -75 -204 -30 -217 77 -14 110 115 183 205 116z m-670 -459 c85
--63 75 -186 -20 -236 -92 -49 -208 33 -195 137 12 104 133 159 215 99z m3605
--177 c93 -39 112 -165 35 -230 -61 -52 -141 -43 -194 21 -57 68 -35 164 46
-205 41 22 69 22 113 4z m935 -274 c58 -43 64 -140 12 -193 -76 -75 -204 -30
--217 77 -14 110 115 183 205 116z m-520 -250 c38 -20 71 -73 71 -112 0 -62
--68 -130 -130 -130 -62 0 -130 68 -130 130 0 39 33 92 71 112 18 10 45 18 59
-18 14 0 41 -8 59 -18z m-480 -10 c38 -20 71 -73 71 -112 0 -39 -33 -92 -71
--112 -18 -10 -45 -18 -59 -18 -14 0 -41 8 -59 18 -38 20 -71 73 -71 112 0 62
-68 130 130 130 14 0 41 -8 59 -18z"/>
-<path d="M13245 17516 c-243 -55 -410 -211 -487 -456 -22 -71 -23 -90 -23
--335 0 -241 2 -266 23 -340 50 -173 168 -318 323 -394 128 -63 181 -71 501
--71 162 0 299 5 330 11 133 27 219 72 317 164 78 74 131 159 169 270 26 79 27
-82 27 360 0 276 -1 281 -27 358 -36 108 -96 204 -168 271 -76 70 -142 108
--245 143 -79 27 -84 27 -380 30 -223 2 -315 -1 -360 -11z m703 -310 c73 -34
-124 -86 161 -165 l26 -56 0 -260 0 -260 -33 -67 c-53 -109 -139 -168 -271
--189 -92 -14 -508 -6 -566 10 -60 18 -146 81 -182 135 -54 79 -58 107 -58 376
-l0 245 27 58 c46 98 94 145 186 183 56 24 62 24 352 21 l295 -2 63 -29z"/>
-<path d="M5705 17500 c-302 -45 -535 -244 -624 -533 -32 -104 -41 -248 -41
--654 l0 -373 145 0 145 0 0 190 0 190 500 0 500 0 0 -190 0 -190 145 0 145 0
-0 708 c0 479 -4 720 -11 747 -6 22 -21 51 -32 64 -45 50 -60 51 -454 50 -202
--1 -390 -5 -418 -9z m625 -585 l0 -305 -500 0 -500 0 0 89 c0 165 39 279 129
-374 61 65 125 101 223 127 63 16 111 19 361 19 l287 1 0 -305z"/>
-<path d="M7767 17500 c-38 -12 -55 -27 -78 -71 -18 -37 -19 -67 -19 -764 l0
--725 145 0 145 0 0 643 0 642 482 -3 c325 -2 486 -6 495 -14 20 -16 18 -277
--3 -326 -19 -47 -58 -88 -109 -115 -39 -21 -53 -22 -397 -25 l-358 -3 0 -144
-0 -145 104 0 104 0 293 -255 294 -254 218 -1 c120 0 216 3 213 8 -2 4 -132
-117 -289 252 l-284 245 41 8 c153 29 259 80 337 164 106 114 139 217 139 439
-0 123 -4 164 -20 215 -29 92 -80 155 -164 198 l-69 36 -596 2 c-328 1 -609 -2
--624 -7z"/>
-<path d="M10321 17492 c-19 -9 -44 -30 -55 -45 -21 -28 -21 -38 -24 -715 -2
--672 -2 -688 18 -720 11 -18 34 -41 52 -52 32 -20 47 -20 643 -18 l610 3 68
-38 c123 69 173 172 171 352 -1 170 -55 299 -164 397 l-59 53 38 77 c48 98 65
-189 59 311 -5 86 -8 101 -42 161 -44 79 -102 125 -194 155 -60 20 -84 21 -575
-21 -468 0 -515 -2 -546 -18z m1059 -287 c9 -10 11 -42 8 -102 -5 -107 -31
--157 -105 -200 l-48 -28 -297 -3 -298 -3 0 -145 0 -144 348 0 c342 0 348 -1
-397 -24 60 -27 110 -81 124 -133 15 -52 14 -166 -1 -181 -9 -9 -133 -12 -495
--12 l-483 0 0 495 0 495 419 0 c360 0 420 -2 431 -15z"/>
-<path d="M15520 17492 c-19 -9 -45 -32 -57 -51 l-23 -34 0 -733 0 -734 140 0
-140 0 0 643 0 642 487 -3 c333 -2 491 -6 500 -14 16 -13 18 -254 2 -312 -14
--51 -85 -120 -146 -140 -39 -13 -101 -16 -385 -16 l-338 0 0 -145 0 -145 103
-0 102 -1 295 -254 295 -255 220 0 c175 1 217 3 204 13 -8 7 -140 120 -293 252
-l-277 239 83 18 c174 37 309 133 375 268 47 96 56 147 56 330 1 135 -2 174
--17 215 -29 79 -76 143 -129 176 -94 58 -107 59 -732 59 -523 0 -573 -1 -605
--18z"/>
-<path d="M17867 17488 c11 -13 154 -180 318 -373 164 -192 307 -359 317 -371
-19 -21 17 -23 -312 -408 -181 -213 -330 -390 -330 -392 0 -2 85 -4 189 -4
-l188 0 234 274 c129 151 237 275 240 275 3 1 112 -123 243 -274 l237 -275 190
-0 c182 0 190 1 177 18 -7 10 -155 184 -328 386 -173 202 -314 373 -314 380 1
-10 310 375 612 724 l54 62 -194 0 -194 0 -239 -279 c-170 -199 -243 -277 -251
--270 -6 5 -115 131 -240 279 l-229 269 -194 1 -194 0 20 -22z"/>
-<path d="M15770 15419 c-50 -20 -398 -110 -515 -133 -92 -19 -169 -26 -330
--30 -268 -9 -428 -22 -537 -47 -124 -27 -356 -25 -734 6 -388 33 -809 87 -832
-109 -16 13 -42 12 -267 -15 -330 -39 -485 -44 -784 -25 l-245 15 -91 -88
-c-102 -99 -197 -154 -301 -173 l-62 -11 -108 51 c-208 98 -292 97 -410 -3 -64
--55 -73 -59 -204 -79 -153 -24 -182 -12 -293 122 -89 106 -94 108 -214 93 -53
--7 -106 -16 -118 -21 -13 -5 -49 -61 -100 -155 -56 -103 -89 -153 -109 -166
-l-30 -18 -33 39 c-51 59 -89 68 -308 74 -150 4 -206 9 -265 25 -41 12 -105 28
--143 36 l-67 15 -181 -111 -180 -111 -132 22 c-257 42 -393 72 -529 116 -83
-26 -173 48 -230 54 -51 6 -128 15 -170 20 -45 6 -115 24 -170 46 -180 70 -184
-70 -453 -16 l-160 -51 -175 26 c-262 38 -432 55 -555 55 -163 0 -383 17 -440
-34 -112 33 -219 46 -375 46 -86 0 -182 -4 -211 -10 -30 -5 -106 -36 -172 -69
-l-118 -60 -71 25 c-69 23 -71 23 -97 5 -53 -38 -151 -81 -183 -81 -45 0 -94
-32 -102 67 -15 62 -31 85 -108 144 -66 51 -79 58 -73 38 19 -58 26 -102 35
--224 5 -71 14 -146 21 -165 24 -71 94 -123 213 -159 115 -35 178 -25 291 49
-67 43 152 83 211 99 21 5 127 17 236 26 l196 15 79 -32 78 -32 315 -7 c345 -7
-334 -5 605 -89 55 -17 165 -39 244 -50 l143 -20 142 -74 c163 -87 193 -94 426
--102 l155 -6 235 55 c313 74 349 80 450 72 362 -28 642 -58 703 -76 62 -18 78
--19 180 -9 62 5 193 15 292 20 249 13 341 2 582 -70 143 -42 211 -74 261 -123
-l43 -42 28 31 c16 18 39 63 51 100 13 38 31 87 41 110 l17 41 119 7 120 6 99
--36 c144 -52 355 -104 423 -104 68 0 124 18 293 94 177 79 238 94 329 78 134
--23 260 -100 328 -200 91 -135 151 -280 181 -443 11 -63 30 -147 41 -187 l19
--72 -71 -90 -70 -90 16 -136 c15 -133 15 -136 -5 -164 -14 -20 -20 -44 -20
--83 0 -44 -7 -70 -36 -124 -69 -133 -150 -182 -281 -170 -102 10 -112 18 -147
-124 -17 50 -33 94 -36 96 -3 3 -59 -1 -125 -9 -247 -29 -520 -54 -589 -54
--152 0 -719 99 -826 145 -30 12 -121 50 -203 84 l-147 62 -167 -7 -167 -7 -80
--58 c-174 -123 -432 -255 -546 -278 -89 -18 -429 -31 -825 -31 l-371 0 -149
-31 c-113 23 -186 32 -295 36 -160 5 -157 6 -520 -97 -104 -30 -172 -43 -241
--47 -89 -5 -100 -4 -153 20 -91 42 -218 130 -299 206 -78 74 -141 110 -193
-111 l-32 0 -6 -92 c-3 -51 -8 -109 -12 -128 -5 -29 11 -76 92 -275 53 -132
-100 -243 104 -248 3 -4 62 -16 131 -27 371 -61 503 -141 540 -328 17 -90 7
--181 -25 -236 -22 -38 -39 -52 -99 -80 -83 -40 -164 -54 -363 -63 l-132 -6 10
--31 c15 -44 21 -50 96 -94 64 -37 73 -39 195 -50 127 -11 128 -11 216 -61 49
--28 97 -51 107 -51 11 0 50 7 87 15 57 12 82 24 142 70 l73 56 254 -137 c414
--224 659 -363 723 -410 33 -25 87 -65 120 -90 33 -25 96 -63 140 -85 l80 -40
-137 7 137 7 33 -35 c18 -19 40 -45 48 -58 l16 -23 59 18 c77 22 137 53 211
-109 73 55 101 66 162 66 90 0 118 -14 148 -75 29 -61 28 -86 -8 -182 -23 -62
--87 -132 -171 -188 l-57 -38 -133 6 c-151 7 -486 41 -567 58 -32 6 -95 34
--150 65 -52 30 -108 56 -125 58 -16 3 -116 7 -222 10 -183 5 -192 5 -198 -14
--3 -10 -19 -30 -35 -43 -23 -20 -65 -32 -227 -62 -406 -77 -447 -88 -610 -159
--99 -44 -174 -71 -215 -76 -104 -16 -369 -12 -417 5 -23 8 -130 68 -239 134
--151 91 -240 137 -380 195 l-182 76 -75 -52 c-41 -29 -75 -55 -75 -58 0 -4 71
--41 158 -82 l158 -75 109 -154 c60 -85 132 -176 160 -204 64 -62 177 -130 323
--196 178 -79 200 -82 467 -76 l230 6 170 59 c265 93 327 106 466 99 64 -4 151
--12 194 -18 87 -13 123 -37 163 -107 l23 -41 -43 -29 c-80 -55 -233 -145 -303
--179 l-70 -33 189 6 188 7 117 84 c141 102 213 138 311 159 130 28 173 18 365
--80 91 -47 198 -95 237 -107 87 -27 137 -23 338 26 214 52 288 47 351 -22 37
--39 47 -61 64 -144 9 -40 23 -81 32 -91 29 -32 201 -68 257 -54 13 3 47 34 75
-70 56 70 131 126 168 126 49 0 150 -63 236 -147 98 -96 138 -205 141 -383 1
--84 -2 -99 -21 -126 -40 -56 -81 -68 -213 -61 -63 4 -173 13 -244 22 l-129 15
--174 -56 c-202 -64 -330 -112 -339 -125 -10 -17 15 -36 72 -54 57 -18 78 -39
-92 -91 14 -49 5 -63 -51 -78 -63 -18 -210 -36 -292 -36 -65 0 -292 34 -505 75
--242 47 -359 81 -510 148 -185 82 -360 151 -439 173 -71 20 -75 19 -230 -51
--56 -26 -122 -50 -145 -52 -29 -3 -115 14 -296 60 -254 64 -256 65 -460 75
--112 6 -206 10 -207 8 -1 -1 44 -23 100 -48 67 -30 141 -54 213 -68 194 -39
-262 -78 284 -161 15 -55 7 -154 -18 -236 l-20 -63 83 0 c169 0 311 22 408 65
-23 10 22 -11 -4 -111 -12 -48 -35 -102 -59 -139 -21 -33 -50 -85 -64 -115 -37
--81 -61 -260 -36 -260 6 0 49 10 96 21 70 18 95 30 136 65 96 82 121 89 298
-87 182 -1 295 -20 353 -59 22 -14 83 -66 136 -114 l97 -87 69 15 c76 17 313
-23 378 9 24 -5 59 -27 96 -60 113 -101 283 -190 441 -232 87 -22 93 -30 74
--91 -14 -48 -17 -52 -52 -58 -20 -3 -50 -6 -65 -6 -26 0 -28 -3 -25 -32 3 -29
-14 -40 88 -90 130 -88 219 -119 365 -128 181 -11 258 -37 270 -90 5 -23 13
--30 38 -35 18 -3 156 -23 307 -46 151 -22 331 -51 400 -65 68 -14 135 -22 147
--19 13 3 23 2 23 -2 0 -10 -75 -191 -81 -198 -3 -2 -72 -18 -154 -36 -236 -49
--301 -76 -443 -181 l-54 -40 6 -46 c3 -26 12 -52 19 -59 26 -26 251 -134 268
--130 25 7 25 -17 -1 -43 -17 -17 -33 -20 -107 -20 -313 0 -505 -89 -850 -393
--109 -96 -176 -163 -309 -309 -33 -37 -74 -68 -120 -91 -115 -58 -118 -62
--110 -140 l8 -68 66 -31 c83 -39 127 -39 242 -3 163 52 249 104 410 250 163
-147 488 335 614 355 113 18 424 30 537 21 92 -8 387 -71 418 -90 20 -13 -65
--239 -103 -270 -8 -7 -61 -17 -118 -23 l-103 -10 -93 36 -93 36 -54 -27 c-30
--15 -55 -30 -55 -33 0 -4 15 -14 34 -22 18 -9 49 -30 67 -46 19 -16 58 -37 86
--46 62 -21 104 -65 133 -144 37 -99 22 -177 -42 -225 -48 -35 -61 -38 -205
--46 -73 -4 -135 -10 -139 -13 -14 -14 -64 -266 -64 -323 l0 -60 77 -73 c87
--82 84 -82 98 21 l6 48 180 -7 180 -7 70 69 69 68 0 -111 0 -111 -82 -27 c-50
--17 -94 -38 -112 -55 l-28 -28 127 -7 c119 -7 374 -2 631 11 l111 6 37 -32
-c48 -43 69 -85 63 -125 -3 -17 -24 -71 -47 -118 -34 -69 -44 -104 -51 -167 -7
--78 -11 -86 -105 -248 -53 -92 -104 -175 -113 -186 -20 -23 -224 -195 -306
--258 -33 -25 -78 -54 -100 -66 -53 -27 -81 -58 -100 -111 -20 -57 -19 -79 5
--143 48 -130 102 -150 211 -81 146 92 326 162 439 170 61 4 67 3 103 -27 32
--27 37 -37 37 -74 0 -50 -36 -111 -110 -190 -47 -50 -49 -54 -56 -129 l-7 -77
-73 0 c72 0 75 1 236 85 l163 85 44 -62 c73 -102 158 -248 194 -330 44 -102 45
--158 2 -216 -17 -23 -34 -42 -38 -42 -3 0 -28 -20 -54 -43 -43 -40 -47 -48
--47 -88 1 -66 32 -124 115 -210 41 -43 77 -89 80 -102 4 -13 -1 -165 -10 -337
--16 -305 -15 -368 11 -527 5 -35 18 -40 83 -27 l31 6 -22 30 -21 30 66 66 65
-67 76 241 76 241 -25 96 c-13 53 -32 147 -41 209 -32 219 -4 301 164 468 132
-132 172 154 258 147 44 -3 77 -13 111 -32 116 -67 124 -70 213 -70 98 1 143
-18 181 68 21 28 24 42 24 122 0 52 5 99 12 111 13 23 75 80 112 105 23 15 24
-20 24 120 0 107 -11 146 -52 193 -36 41 -58 44 -381 55 l-314 11 -66 36 c-36
-20 -68 39 -72 43 -4 3 -14 72 -23 151 -8 80 -18 162 -21 182 -5 36 -4 37 45
-62 l50 26 88 -21 c48 -11 114 -20 146 -20 71 0 194 35 232 65 l27 22 -16 71
-c-13 60 -26 85 -84 161 -74 99 -132 206 -132 244 0 14 7 48 16 78 21 70 91
-139 206 203 147 82 211 100 375 105 175 5 355 -11 425 -39 41 -16 94 -23 235
--32 163 -9 194 -9 276 7 51 10 99 21 106 25 11 7 23 63 66 298 5 29 0 36 -84
-107 l-89 76 -52 -10 c-152 -29 -264 2 -415 112 -60 44 -67 52 -50 59 11 4 47
-17 79 30 32 12 99 51 148 87 112 80 154 98 246 107 39 4 74 10 77 15 6 10
--236 125 -305 144 -72 21 -274 51 -475 71 -188 19 -419 57 -525 86 -141 38
--301 156 -315 232 -4 20 -4 50 0 67 9 40 81 116 119 126 18 4 75 -1 145 -14
-379 -69 548 -66 711 16 48 24 59 35 90 94 19 37 46 73 61 82 43 25 251 57 379
-57 122 1 430 -38 529 -67 30 -9 80 -28 110 -44 139 -69 311 -119 311 -90 0 16
--66 84 -125 130 -29 23 -117 75 -194 116 -78 41 -202 111 -277 155 -247 147
--290 158 -464 114 -183 -45 -281 -44 -325 5 -30 33 -11 56 78 92 45 18 109 47
-142 63 52 26 60 34 63 62 6 57 -67 161 -138 198 -63 32 -109 30 -216 -10 -121
--47 -191 -54 -270 -29 -67 21 -68 21 58 29 l97 7 12 36 c49 153 94 223 174
-267 109 61 336 153 480 194 308 88 358 110 523 220 144 96 152 103 162 143 25
-99 84 278 112 338 35 79 81 127 173 185 147 92 237 124 550 193 l120 27 485 0
-c448 0 488 1 513 18 36 23 34 39 -8 76 -63 55 -78 58 -260 64 -200 5 -257 19
--304 72 -28 32 -31 42 -31 99 0 71 7 80 99 135 30 18 44 36 55 66 22 65 13 70
--90 56 -87 -12 -90 -13 -144 -65 -83 -79 -87 -81 -230 -79 -69 1 -149 4 -178
-8 -49 6 -54 9 -73 48 -36 71 -87 134 -121 148 -46 19 -212 17 -259 -3 -19 -9
--71 -47 -115 -85 -113 -100 -130 -107 -234 -100 -118 9 -267 35 -316 57 -28
-12 -59 40 -96 86 -118 148 -148 234 -155 445 -5 125 -2 157 16 228 35 139 74
-181 168 181 26 0 125 -11 218 -25 362 -53 627 -21 739 89 30 29 51 62 70 112
-38 102 67 125 189 150 93 20 490 30 569 16 31 -6 105 -33 165 -61 181 -82 225
--95 338 -95 176 -1 276 49 460 231 155 154 200 178 330 177 141 0 164 -15 370
--235 88 -93 151 -141 229 -173 48 -19 75 -21 436 -24 212 -2 458 -1 547 3
-l162 7 -98 111 c-78 89 -104 113 -132 119 -19 3 -104 19 -189 33 -182 32 -302
-64 -385 105 -114 55 -384 302 -602 552 -103 117 -225 216 -332 270 -58 28 -78
-33 -166 36 -55 2 -183 -3 -283 -12 -317 -28 -346 -22 -394 73 -37 72 -45 80
--103 107 -71 34 -95 31 -123 -12 -54 -83 -192 -84 -242 -2 -36 59 -36 90 1
-155 91 160 286 438 345 494 52 48 103 83 337 233 764 490 1178 722 1377 772
-211 54 378 75 680 85 360 11 412 18 515 69 91 45 357 212 363 228 1 5 -39 45
--90 89 l-94 80 -144 6 c-179 7 -222 19 -330 97 -127 92 -176 98 -341 41 -46
--16 -124 -43 -172 -60 -82 -29 -99 -31 -220 -31 -247 1 -317 37 -317 162 0 66
-36 133 107 200 58 54 105 70 338 121 143 30 160 32 365 32 l215 0 68 48 c60
-43 96 82 84 93 -2 2 -140 22 -307 44 l-303 40 -221 -31 c-685 -93 -1165 -182
--1352 -249 -309 -111 -723 -237 -1002 -306 -208 -50 -261 -73 -352 -149 l-78
--65 -122 -25 c-68 -14 -125 -25 -127 -25 -2 0 -1 49 3 109 l7 109 -62 31 -61
-31 -119 -75 c-291 -184 -447 -304 -617 -472 -119 -118 -279 -253 -379 -319
--60 -40 -147 -64 -228 -64 l-60 0 5 43 c3 23 24 83 48 134 l42 92 -7 84 c-6
-79 -9 87 -40 117 l-34 33 -68 -48 c-171 -121 -339 -271 -372 -333 -6 -12 -30
--75 -52 -140 -22 -64 -47 -127 -54 -138 -8 -12 -43 -42 -80 -68 l-65 -47 -39
-30 c-75 60 -207 209 -253 287 -26 44 -58 113 -72 155 -45 135 -71 410 -82 879
-l-6 275 36 213 36 212 -19 77 c-11 42 -18 80 -16 83 2 4 55 47 117 97 l113 89
-58 -42 c31 -23 86 -52 122 -64 91 -30 157 -29 254 6 l80 28 259 -27 c247 -27
-262 -27 299 -12 184 80 296 97 536 85 l168 -10 52 41 c28 22 78 54 111 71 68
-34 77 34 281 -8 180 -37 329 -78 435 -119 160 -62 426 -125 531 -125 39 0 56
-7 100 40 65 49 44 48 425 15 l291 -26 50 31 c64 40 206 90 256 90 21 0 99 -9
-174 -21 88 -14 154 -19 188 -14 73 9 156 51 252 128 85 67 127 86 248 112 99
-21 135 19 309 -15 l153 -30 109 51 c60 28 159 72 219 97 l110 47 115 -1 c117
--1 265 -22 340 -49 52 -18 143 -10 435 40 l201 34 94 -29 c92 -29 96 -30 133
--14 20 10 37 20 37 24 0 8 -98 50 -180 78 -33 11 -115 17 -305 22 -271 8 -288
-10 -565 75 -96 22 -163 27 -765 55 -620 29 -664 30 -737 15 -120 -24 -199 -51
--252 -87 -124 -83 -114 -80 -201 -74 -44 3 -148 17 -232 31 l-152 25 -218 -46
-c-484 -100 -587 -109 -783 -65 -134 30 -193 57 -282 128 -91 72 -142 100 -259
-143 -88 33 -92 33 -129 19z"/>
-</g>
-</svg>
diff --git a/arborx/docs/logos/arborx_logo_v1.0_nobg.png b/arborx/docs/logos/arborx_logo_v1.0_nobg.png
deleted file mode 100644
index 7769f01366736943aa400145cecca0622cbfb187..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 81640
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

diff --git a/arborx/examples/CMakeLists.txt b/arborx/examples/CMakeLists.txt
deleted file mode 100644
index 211aece82..000000000
--- a/arborx/examples/CMakeLists.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
-  cmake_minimum_required(VERSION 3.12)
-  project(ArborXExamples CXX)
-  find_package(ArborX 1.1 REQUIRED)
-  enable_testing()
-endif()
-
-add_subdirectory(access_traits)
-
-add_subdirectory(callback)
-
-add_subdirectory(simple_intersection)
-
-find_package(Boost COMPONENTS program_options)
-if(Boost_FOUND)
-  add_subdirectory(viz)
-  add_subdirectory(dbscan)
-  add_subdirectory(raytracing)
-  add_subdirectory(brute_force)
-endif()
diff --git a/arborx/examples/access_traits/CMakeLists.txt b/arborx/examples/access_traits/CMakeLists.txt
deleted file mode 100644
index 2a36771cd..000000000
--- a/arborx/examples/access_traits/CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-if(Kokkos_ENABLE_CUDA)
-  add_executable(ArborX_CudaAccessTraits.exe example_cuda_access_traits.cpp)
-  target_link_libraries(ArborX_CudaAccessTraits.exe ArborX::ArborX)
-  add_test(NAME ArborX_CudaAccessTraits_Example COMMAND ./ArborX_CudaAccessTraits.exe)
-else()
-  add_executable(ArborX_HostAccessTraits.exe example_host_access_traits.cpp)
-  target_link_libraries(ArborX_HostAccessTraits.exe ArborX::ArborX)
-  add_test(NAME ArborX_HostAccessTraits_Example COMMAND ./ArborX_HostAccessTraits.exe)
-endif()
diff --git a/arborx/examples/access_traits/example_cuda_access_traits.cpp b/arborx/examples/access_traits/example_cuda_access_traits.cpp
deleted file mode 100644
index 3f67dff22..000000000
--- a/arborx/examples/access_traits/example_cuda_access_traits.cpp
+++ /dev/null
@@ -1,98 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2017-2021 by the ArborX authors                            *
- * All rights reserved.                                                     *
- *                                                                          *
- * This file is part of the ArborX library. ArborX is                       *
- * distributed under a BSD 3-clause license. For the licensing terms see    *
- * the LICENSE file in the top-level directory.                             *
- *                                                                          *
- * SPDX-License-Identifier: BSD-3-Clause                                    *
- ****************************************************************************/
-
-#include <ArborX.hpp>
-
-#include <Kokkos_Core.hpp>
-
-#include <array>
-#include <iostream>
-#include <numeric>
-
-struct PointCloud
-{
-  float *d_x;
-  float *d_y;
-  float *d_z;
-  int N;
-};
-
-struct Spheres
-{
-  float *d_x;
-  float *d_y;
-  float *d_z;
-  float *d_r;
-  int N;
-};
-
-template <>
-struct ArborX::AccessTraits<PointCloud, ArborX::PrimitivesTag>
-{
-  static KOKKOS_FUNCTION std::size_t size(PointCloud const &cloud)
-  {
-    return cloud.N;
-  }
-  static KOKKOS_FUNCTION ArborX::Point get(PointCloud const &cloud,
-                                           std::size_t i)
-  {
-    return {{cloud.d_x[i], cloud.d_y[i], cloud.d_z[i]}};
-  }
-  using memory_space = Kokkos::CudaSpace;
-};
-
-template <>
-struct ArborX::AccessTraits<Spheres, ArborX::PredicatesTag>
-{
-  static KOKKOS_FUNCTION std::size_t size(Spheres const &d) { return d.N; }
-  static KOKKOS_FUNCTION auto get(Spheres const &d, std::size_t i)
-  {
-    return ArborX::intersects(
-        ArborX::Sphere{{{d.d_x[i], d.d_y[i], d.d_z[i]}}, d.d_r[i]});
-  }
-  using memory_space = Kokkos::CudaSpace;
-};
-
-int main(int argc, char *argv[])
-{
-  Kokkos::ScopeGuard guard(argc, argv);
-
-  constexpr std::size_t N = 10;
-  std::array<float, N> a;
-
-  float *d_a;
-  cudaMalloc(&d_a, sizeof(a));
-
-  std::iota(std::begin(a), std::end(a), 1.0);
-
-  cudaStream_t stream;
-  cudaStreamCreate(&stream);
-  cudaMemcpyAsync(d_a, a.data(), sizeof(a), cudaMemcpyHostToDevice, stream);
-
-  Kokkos::Cuda cuda{stream};
-  ArborX::BVH<Kokkos::CudaSpace> bvh{cuda, PointCloud{d_a, d_a, d_a, N}};
-
-  Kokkos::View<int *, Kokkos::CudaSpace> indices("indices", 0);
-  Kokkos::View<int *, Kokkos::CudaSpace> offset("offset", 0);
-  ArborX::query(bvh, cuda, Spheres{d_a, d_a, d_a, d_a, N}, indices, offset);
-
-  Kokkos::parallel_for(Kokkos::RangePolicy<Kokkos::Cuda>(cuda, 0, N),
-                       KOKKOS_LAMBDA(int i) {
-                         for (int j = offset(i); j < offset(i + 1); ++j)
-                         {
-                           printf("%i %i\n", i, indices(j));
-                         }
-                       });
-
-  cudaStreamDestroy(stream);
-
-  return 0;
-}
diff --git a/arborx/examples/access_traits/example_host_access_traits.cpp b/arborx/examples/access_traits/example_host_access_traits.cpp
deleted file mode 100644
index b2a1eb06b..000000000
--- a/arborx/examples/access_traits/example_host_access_traits.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2017-2021 by the ArborX authors                            *
- * All rights reserved.                                                     *
- *                                                                          *
- * This file is part of the ArborX library. ArborX is                       *
- * distributed under a BSD 3-clause license. For the licensing terms see    *
- * the LICENSE file in the top-level directory.                             *
- *                                                                          *
- * SPDX-License-Identifier: BSD-3-Clause                                    *
- ****************************************************************************/
-
-#include <ArborX.hpp>
-
-#include <Kokkos_Core.hpp>
-
-#include <iostream>
-#include <random>
-#include <vector>
-
-template <typename T, typename Tag>
-struct ArborX::AccessTraits<std::vector<T>, Tag>
-{
-  static std::size_t size(std::vector<T> const &v) { return v.size(); }
-  static T const &get(std::vector<T> const &v, std::size_t i) { return v[i]; }
-  using memory_space = Kokkos::HostSpace;
-};
-
-int main(int argc, char *argv[])
-{
-  Kokkos::ScopeGuard guard(argc, argv);
-
-  std::vector<ArborX::Point> points;
-  // Fill vector with random points in [-1, 1]^3
-  std::uniform_real_distribution<float> dis{-1., 1.};
-  std::default_random_engine gen;
-  auto rd = [&]() { return dis(gen); };
-  std::generate_n(std::back_inserter(points), 100, [&]() {
-    return ArborX::Point{rd(), rd(), rd()};
-  });
-
-  // Pass directly the vector of points to use the access traits defined above
-  ArborX::BVH<Kokkos::HostSpace> bvh{Kokkos::DefaultHostExecutionSpace{},
-                                     points};
-
-  // As a supported alternative, wrap the vector in an unmanaged View
-  bvh = ArborX::BVH<Kokkos::HostSpace>{
-      Kokkos::DefaultHostExecutionSpace{},
-      Kokkos::View<ArborX::Point *, Kokkos::HostSpace, Kokkos::MemoryUnmanaged>{
-          points.data(), points.size()}};
-
-  return 0;
-}
diff --git a/arborx/examples/brute_force/CMakeLists.txt b/arborx/examples/brute_force/CMakeLists.txt
deleted file mode 100644
index c2ab407e6..000000000
--- a/arborx/examples/brute_force/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-add_executable(ArborX_BruteForce.exe brute_force.cpp)
-target_link_libraries(ArborX_BruteForce.exe ArborX::ArborX Boost::program_options)
-add_test(NAME ArborX_BruteForce_Example COMMAND ./ArborX_BruteForce.exe)
diff --git a/arborx/examples/brute_force/brute_force.cpp b/arborx/examples/brute_force/brute_force.cpp
deleted file mode 100644
index 1b03d2d1f..000000000
--- a/arborx/examples/brute_force/brute_force.cpp
+++ /dev/null
@@ -1,124 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2017-2021 by the ArborX authors                            *
- * All rights reserved.                                                     *
- *                                                                          *
- * This file is part of the ArborX library. ArborX is                       *
- * distributed under a BSD 3-clause license. For the licensing terms see    *
- * the LICENSE file in the top-level directory.                             *
- *                                                                          *
- * SPDX-License-Identifier: BSD-3-Clause                                    *
- ****************************************************************************/
-
-#include <ArborX_BruteForce.hpp>
-#include <ArborX_LinearBVH.hpp>
-
-#include <Kokkos_Core.hpp>
-
-#include <boost/program_options.hpp>
-
-struct Dummy
-{
-  int count;
-};
-
-using ExecutionSpace = Kokkos::DefaultExecutionSpace;
-using MemorySpace = ExecutionSpace::memory_space;
-
-template <>
-struct ArborX::AccessTraits<Dummy, ArborX::PrimitivesTag>
-{
-  using memory_space = MemorySpace;
-  using size_type = typename MemorySpace::size_type;
-  static KOKKOS_FUNCTION size_type size(Dummy const &d) { return d.count; }
-  static KOKKOS_FUNCTION Point get(Dummy const &, size_type i)
-  {
-    return {{(float)i, (float)i, (float)i}};
-  }
-};
-
-template <>
-struct ArborX::AccessTraits<Dummy, ArborX::PredicatesTag>
-{
-  using memory_space = MemorySpace;
-  using size_type = typename MemorySpace::size_type;
-  static KOKKOS_FUNCTION size_type size(Dummy const &d) { return d.count; }
-  static KOKKOS_FUNCTION auto get(Dummy const &, size_type i)
-  {
-    return attach(
-        intersects(Sphere{{{(float)i, (float)i, (float)i}}, (float)i}), i);
-  }
-};
-
-int main(int argc, char *argv[])
-{
-  Kokkos::ScopeGuard guard(argc, argv);
-
-  int nqueries;
-  int nprimitives;
-  int nrepeats;
-  namespace bpo = boost::program_options;
-  bpo::options_description desc("Allowed options");
-  // clang-format off
-  desc.add_options()
-      ( "help", "help message" )
-      ( "predicates", bpo::value<int>(&nqueries)->default_value(5), "number of predicates" )
-      ( "primitives", bpo::value<int>(&nprimitives)->default_value(5), "number of primitives" )
-      ( "iterations", bpo::value<int>(&nrepeats)->default_value(1), "number of iterations" )
-      ;
-  // clang-format on
-  bpo::variables_map vm;
-  bpo::store(bpo::command_line_parser(argc, argv).options(desc).run(), vm);
-  bpo::notify(vm);
-
-  if (vm.count("help") > 0)
-  {
-    std::cout << desc << '\n';
-    return 1;
-  }
-  printf("Primitives: %d\n", nprimitives);
-  printf("Predicates: %d\n", nqueries);
-  printf("Iterations: %d\n", nrepeats);
-
-  ARBORX_ASSERT(nprimitives > 0);
-  ARBORX_ASSERT(nqueries > 0);
-
-  ExecutionSpace space{};
-  Dummy primitives{nprimitives};
-  Dummy predicates{nqueries};
-
-  for (int i = 0; i < nrepeats; i++)
-  {
-    unsigned int out_count;
-    {
-      Kokkos::Timer timer;
-      ArborX::BoundingVolumeHierarchy<MemorySpace> bvh{space, primitives};
-
-      Kokkos::View<int *, ExecutionSpace> indices("indices_ref", 0);
-      Kokkos::View<int *, ExecutionSpace> offset("offset_ref", 0);
-      bvh.query(space, predicates, indices, offset);
-
-      space.fence();
-      double time = timer.seconds();
-      if (i == 0)
-        printf("Collisions: %.5f\n",
-               (float)(indices.extent(0)) / (nprimitives * nqueries));
-      printf("Time BVH: %lf\n", time);
-      out_count = indices.extent(0);
-    }
-
-    {
-      Kokkos::Timer timer;
-      ArborX::BruteForce<MemorySpace> brute{space, primitives};
-
-      Kokkos::View<int *, ExecutionSpace> indices("indices", 0);
-      Kokkos::View<int *, ExecutionSpace> offset("offset", 0);
-      brute.query(space, predicates, indices, offset);
-
-      space.fence();
-      double time = timer.seconds();
-      printf("Time BF: %lf\n", time);
-      ARBORX_ASSERT(out_count == indices.extent(0));
-    }
-  }
-  return 0;
-}
diff --git a/arborx/examples/callback/CMakeLists.txt b/arborx/examples/callback/CMakeLists.txt
deleted file mode 100644
index c0338142f..000000000
--- a/arborx/examples/callback/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-add_executable(ArborX_Callback.exe example_callback.cpp)
-target_link_libraries(ArborX_Callback.exe ArborX::ArborX)
-add_test(NAME ArborX_Callback_Example COMMAND ./ArborX_Callback.exe)
diff --git a/arborx/examples/callback/example_callback.cpp b/arborx/examples/callback/example_callback.cpp
deleted file mode 100644
index 2bd3234cb..000000000
--- a/arborx/examples/callback/example_callback.cpp
+++ /dev/null
@@ -1,145 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2017-2021 by the ArborX authors                            *
- * All rights reserved.                                                     *
- *                                                                          *
- * This file is part of the ArborX library. ArborX is                       *
- * distributed under a BSD 3-clause license. For the licensing terms see    *
- * the LICENSE file in the top-level directory.                             *
- *                                                                          *
- * SPDX-License-Identifier: BSD-3-Clause                                    *
- ****************************************************************************/
-
-#include <ArborX.hpp>
-
-#include <Kokkos_Core.hpp>
-
-#include <iostream>
-#include <random>
-#include <vector>
-
-using ExecutionSpace = Kokkos::DefaultExecutionSpace;
-using MemorySpace = ExecutionSpace::memory_space;
-
-struct FirstOctant
-{
-};
-
-struct NearestToOrigin
-{
-  int k;
-};
-
-template <>
-struct ArborX::AccessTraits<FirstOctant, ArborX::PredicatesTag>
-{
-  static KOKKOS_FUNCTION std::size_t size(FirstOctant) { return 1; }
-  static KOKKOS_FUNCTION auto get(FirstOctant, std::size_t)
-  {
-    return ArborX::intersects(ArborX::Box{{{0, 0, 0}}, {{1, 1, 1}}});
-  }
-  using memory_space = MemorySpace;
-};
-
-template <>
-struct ArborX::AccessTraits<NearestToOrigin, ArborX::PredicatesTag>
-{
-  static KOKKOS_FUNCTION std::size_t size(NearestToOrigin) { return 1; }
-  static KOKKOS_FUNCTION auto get(NearestToOrigin d, std::size_t)
-  {
-    return ArborX::nearest(ArborX::Point{0, 0, 0}, d.k);
-  }
-  using memory_space = MemorySpace;
-};
-
-struct PrintfCallback
-{
-  template <typename Predicate, typename OutputFunctor>
-  KOKKOS_FUNCTION void operator()(Predicate, int primitive,
-                                  OutputFunctor const &out) const
-  {
-#ifndef __SYCL_DEVICE_ONLY__
-    printf("Found %d from functor\n", primitive);
-#endif
-    out(primitive);
-  }
-};
-
-int main(int argc, char *argv[])
-{
-  Kokkos::ScopeGuard guard(argc, argv);
-
-  int const n = 100;
-  std::vector<ArborX::Point> points;
-  // Fill vector with random points in [-1, 1]^3
-  std::uniform_real_distribution<float> dis{-1., 1.};
-  std::default_random_engine gen;
-  auto rd = [&]() { return dis(gen); };
-  std::generate_n(std::back_inserter(points), n, [&]() {
-    return ArborX::Point{rd(), rd(), rd()};
-  });
-
-  ArborX::BVH<MemorySpace> bvh{
-      ExecutionSpace{},
-      Kokkos::create_mirror_view_and_copy(
-          MemorySpace{},
-          Kokkos::View<ArborX::Point *, Kokkos::HostSpace,
-                       Kokkos::MemoryUnmanaged>(points.data(), points.size()))};
-
-  {
-    Kokkos::View<int *, MemorySpace> values("values", 0);
-    Kokkos::View<int *, MemorySpace> offsets("offsets", 0);
-    ArborX::query(bvh, ExecutionSpace{}, FirstOctant{}, PrintfCallback{},
-                  values, offsets);
-#ifndef __NVCC__
-    ArborX::query(bvh, ExecutionSpace{}, FirstOctant{},
-                  KOKKOS_LAMBDA(auto /*predicate*/, int primitive,
-                                auto /*output_functor*/) {
-#ifndef __SYCL_DEVICE_ONLY__
-                    printf("Found %d from generic lambda\n", primitive);
-#else
-                    (void)primitive;
-#endif
-                  },
-                  values, offsets);
-#endif
-  }
-
-  {
-    int const k = 10;
-    Kokkos::View<int *, MemorySpace> values("values", 0);
-    Kokkos::View<int *, MemorySpace> offsets("offsets", 0);
-    ArborX::query(bvh, ExecutionSpace{}, NearestToOrigin{k}, PrintfCallback{},
-                  values, offsets);
-#ifndef __NVCC__
-    ArborX::query(bvh, ExecutionSpace{}, NearestToOrigin{k},
-                  KOKKOS_LAMBDA(auto /*predicate*/, int primitive,
-                                auto /*output_functor*/) {
-#ifndef __SYCL_DEVICE_ONLY__
-                    printf("Found %d from generic lambda\n", primitive);
-#else
-                    (void)primitive;
-#endif
-                  },
-                  values, offsets);
-#endif
-  }
-
-  {
-    // EXPERIMENTAL
-    Kokkos::View<int, ExecutionSpace, Kokkos::MemoryTraits<Kokkos::Atomic>> c(
-        "counter");
-
-#ifndef __NVCC__
-    bvh.query(ExecutionSpace{}, FirstOctant{},
-              KOKKOS_LAMBDA(auto /*predicate*/, int j) {
-#ifndef __SYCL_DEVICE_ONLY__
-                printf("%d %d %d\n", ++c(), -1, j);
-#else
-                (void)j;
-#endif
-              });
-#endif
-  }
-
-  return 0;
-}
diff --git a/arborx/examples/dbscan/ArborX_DBSCANVerification.hpp b/arborx/examples/dbscan/ArborX_DBSCANVerification.hpp
deleted file mode 100644
index d8f8e1437..000000000
--- a/arborx/examples/dbscan/ArborX_DBSCANVerification.hpp
+++ /dev/null
@@ -1,320 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2017-2021 by the ArborX authors                            *
- * All rights reserved.                                                     *
- *                                                                          *
- * This file is part of the ArborX library. ArborX is                       *
- * distributed under a BSD 3-clause license. For the licensing terms see    *
- * the LICENSE file in the top-level directory.                             *
- *                                                                          *
- * SPDX-License-Identifier: BSD-3-Clause                                    *
- ****************************************************************************/
-
-#ifndef ARBORX_DETAILSDBSCANVERIFICATION_HPP
-#define ARBORX_DETAILSDBSCANVERIFICATION_HPP
-
-#include <ArborX_DetailsUtils.hpp>
-#include <ArborX_LinearBVH.hpp>
-
-#include <Kokkos_View.hpp>
-
-#include <set>
-#include <stack>
-
-namespace ArborX
-{
-namespace Details
-{
-
-// Check that core points have nonnegative indices
-template <typename ExecutionSpace, typename IndicesView, typename OffsetView,
-          typename LabelsView>
-bool verifyCorePointsNonnegativeIndex(ExecutionSpace const &exec_space,
-                                      IndicesView /*indices*/,
-                                      OffsetView offset, LabelsView labels,
-                                      int core_min_size)
-{
-  int n = labels.size();
-
-  int num_incorrect = 0;
-  Kokkos::parallel_reduce(
-      "ArborX::DBSCAN::verify_core_points_nonnegative",
-      Kokkos::RangePolicy<ExecutionSpace>(exec_space, 0, n),
-      KOKKOS_LAMBDA(int i, int &update) {
-        bool self_is_core_point = (offset(i + 1) - offset(i) >= core_min_size);
-        if (self_is_core_point && labels(i) < 0)
-        {
-#ifndef __SYCL_DEVICE_ONLY__
-          printf("Core point is marked as noise: %d [%d]\n", i, labels(i));
-#endif
-          update++;
-        }
-      },
-      num_incorrect);
-  return (num_incorrect == 0);
-}
-
-// Check that connected core points have same cluster indices
-template <typename ExecutionSpace, typename IndicesView, typename OffsetView,
-          typename LabelsView>
-bool verifyConnectedCorePointsShareIndex(ExecutionSpace const &exec_space,
-                                         IndicesView indices, OffsetView offset,
-                                         LabelsView labels, int core_min_size)
-{
-  int n = labels.size();
-
-  int num_incorrect = 0;
-  Kokkos::parallel_reduce(
-      "ArborX::DBSCAN::verify_connected_core_points",
-      Kokkos::RangePolicy<ExecutionSpace>(exec_space, 0, n),
-      KOKKOS_LAMBDA(int i, int &update) {
-        bool self_is_core_point = (offset(i + 1) - offset(i) >= core_min_size);
-        if (self_is_core_point)
-        {
-          for (int jj = offset(i); jj < offset(i + 1); ++jj)
-          {
-            int j = indices(jj);
-            bool neigh_is_core_point =
-                (offset(j + 1) - offset(j) >= core_min_size);
-
-            if (neigh_is_core_point && labels(i) != labels(j))
-            {
-#ifndef __SYCL_DEVICE_ONLY__
-              printf("Connected cores do not belong to the same cluster: "
-                     "%d [%d] -> %d [%d]\n",
-                     i, labels(i), j, labels(j));
-#endif
-              update++;
-            }
-          }
-        }
-      },
-      num_incorrect);
-  return (num_incorrect == 0);
-}
-
-// Check that border points share index with at least one core point, and
-// that noise points have index -1
-template <typename ExecutionSpace, typename IndicesView, typename OffsetView,
-          typename LabelsView>
-bool verifyBorderAndNoisePoints(ExecutionSpace const &exec_space,
-                                IndicesView indices, OffsetView offset,
-                                LabelsView labels, int core_min_size)
-{
-  int n = labels.size();
-
-  int num_incorrect = 0;
-  Kokkos::parallel_reduce(
-      "ArborX::DBSCAN::verify_connected_border_points",
-      Kokkos::RangePolicy<ExecutionSpace>(exec_space, 0, n),
-      KOKKOS_LAMBDA(int i, int &update) {
-        bool self_is_core_point = (offset(i + 1) - offset(i) >= core_min_size);
-        if (!self_is_core_point)
-        {
-          bool is_border = false;
-          bool have_shared_core = false;
-          for (int jj = offset(i); jj < offset(i + 1); ++jj)
-          {
-            int j = indices(jj);
-            bool neigh_is_core_point =
-                (offset(j + 1) - offset(j) >= core_min_size);
-
-            if (neigh_is_core_point)
-            {
-              is_border = true;
-              if (labels(i) == labels(j))
-              {
-                have_shared_core = true;
-                break;
-              }
-            }
-          }
-
-          // Border point must be connected to a core point
-          if (is_border && !have_shared_core)
-          {
-#ifndef __SYCL_DEVICE_ONLY__
-            printf("Border point does not belong to a cluster: %d [%d]\n", i,
-                   labels(i));
-#endif
-            update++;
-          }
-          // Noise points must have index -1
-          if (!is_border && labels(i) != -1)
-          {
-#ifndef __SYCL_DEVICE_ONLY__
-            printf("Noise point does not have index -1: %d [%d]\n", i,
-                   labels(i));
-#endif
-            update++;
-          }
-        }
-      },
-      num_incorrect);
-  return (num_incorrect == 0);
-}
-
-// Check that cluster indices are unique
-template <typename ExecutionSpace, typename IndicesView, typename OffsetView,
-          typename LabelsView>
-bool verifyClustersAreUnique(ExecutionSpace const &exec_space,
-                             IndicesView indices, OffsetView offset,
-                             LabelsView labels, int core_min_size)
-{
-  int n = labels.size();
-
-  // FIXME we don't want to modify the labels view in this check. What we
-  // want here is to create a view on the host, and deep_copy into it.
-  // create_mirror_view_and_copy won't work, because it is a no-op if labels
-  // is already on the host.
-  decltype(Kokkos::create_mirror_view(Kokkos::HostSpace{},
-                                      std::declval<LabelsView>()))
-      labels_host(Kokkos::view_alloc(Kokkos::WithoutInitializing,
-                                     "ArborX::DBSCAN::labels_host"),
-                  labels.size());
-  Kokkos::deep_copy(exec_space, labels_host, labels);
-  auto offset_host =
-      Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace{}, offset);
-  auto indices_host =
-      Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace{}, indices);
-
-  auto is_core_point = [&](int i) {
-    return offset_host(i + 1) - offset_host(i) >= core_min_size;
-  };
-
-  // Remove all border points from consideration (noise points are already -1)
-  // The idea is that this way if labels were bridged through a border
-  // point, we will count them as separate labels but with a shared cluster
-  // index, which will fail the unique labels check
-  for (int i = 0; i < n; ++i)
-  {
-    if (!is_core_point(i))
-    {
-      for (int jj = offset_host(i); jj < offset_host(i + 1); ++jj)
-      {
-        int j = indices_host(jj);
-        if (is_core_point(j))
-        {
-          // The point is a border point
-          labels_host(i) = -1;
-          break;
-        }
-      }
-    }
-  }
-
-  // Record all unique cluster indices
-  std::set<int> unique_cluster_indices;
-  for (int i = 0; i < n; ++i)
-    if (labels_host(i) != -1)
-      unique_cluster_indices.insert(labels_host(i));
-  auto num_unique_cluster_indices = unique_cluster_indices.size();
-
-  // Record all cluster indices, assigning a unique index to each (which is
-  // different from the original cluster index). This will only use noise and
-  // core points (see above).
-  unsigned int num_clusters = 0;
-  std::set<int> cluster_sets;
-  for (int i = 0; i < n; ++i)
-  {
-    if (labels_host(i) >= 0)
-    {
-      auto id = labels_host(i);
-      cluster_sets.insert(id);
-      num_clusters++;
-
-      // DFS search
-      std::stack<int> stack;
-      stack.push(i);
-      while (!stack.empty())
-      {
-        auto k = stack.top();
-        stack.pop();
-        if (labels_host(k) >= 0)
-        {
-          labels_host(k) = -1;
-          for (int jj = offset_host(k); jj < offset_host(k + 1); ++jj)
-          {
-            int j = indices_host(jj);
-            if (is_core_point(j) || (labels_host(j) == id))
-              stack.push(j);
-          }
-        }
-      }
-    }
-  }
-  if (cluster_sets.size() != num_unique_cluster_indices)
-  {
-    std::cerr << "Number of components does not match" << std::endl;
-    return false;
-  }
-  if (num_clusters != num_unique_cluster_indices)
-  {
-    std::cerr << "Cluster IDs are not unique" << std::endl;
-    return false;
-  }
-
-  return true;
-}
-
-template <typename ExecutionSpace, typename IndicesView, typename OffsetView,
-          typename LabelsView>
-bool verifyClusters(ExecutionSpace const &exec_space, IndicesView indices,
-                    OffsetView offset, LabelsView labels, int core_min_size)
-{
-  int n = labels.size();
-  if ((int)offset.size() != n + 1 ||
-      ArborX::lastElement(offset) != (int)indices.size())
-    return false;
-
-  using Verify = bool (*)(ExecutionSpace const &, IndicesView, OffsetView,
-                          LabelsView, int);
-
-  for (auto verify : {static_cast<Verify>(verifyCorePointsNonnegativeIndex),
-                      static_cast<Verify>(verifyConnectedCorePointsShareIndex),
-                      static_cast<Verify>(verifyBorderAndNoisePoints),
-                      static_cast<Verify>(verifyClustersAreUnique)})
-  {
-    if (!verify(exec_space, indices, offset, labels, core_min_size))
-      return false;
-  }
-
-  return true;
-}
-
-template <typename ExecutionSpace, typename Primitives, typename LabelsView>
-bool verifyDBSCAN(ExecutionSpace exec_space, Primitives const &primitives,
-                  float eps, int core_min_size, LabelsView const &labels)
-{
-  Kokkos::Profiling::pushRegion("ArborX::DBSCAN::verify");
-
-  static_assert(Kokkos::is_view<LabelsView>{}, "");
-
-  using Access = AccessTraits<Primitives, PrimitivesTag>;
-  using MemorySpace = typename Access::memory_space;
-
-  static_assert(std::is_same<typename LabelsView::value_type, int>{}, "");
-  static_assert(std::is_same<typename LabelsView::memory_space, MemorySpace>{},
-                "");
-
-  ARBORX_ASSERT(eps > 0);
-  ARBORX_ASSERT(core_min_size >= 2);
-
-  ArborX::BVH<MemorySpace> bvh(exec_space, primitives);
-
-  auto const predicates =
-      Details::PrimitivesWithRadius<Primitives>{primitives, eps};
-
-  Kokkos::View<int *, MemorySpace> indices("ArborX::DBSCAN::indices", 0);
-  Kokkos::View<int *, MemorySpace> offset("ArborX::DBSCAN::offset", 0);
-  ArborX::query(bvh, exec_space, predicates, indices, offset);
-
-  auto passed = Details::verifyClusters(exec_space, indices, offset, labels,
-                                        core_min_size);
-  Kokkos::Profiling::popRegion();
-
-  return passed;
-}
-} // namespace Details
-} // namespace ArborX
-
-#endif
diff --git a/arborx/examples/dbscan/CMakeLists.txt b/arborx/examples/dbscan/CMakeLists.txt
deleted file mode 100644
index 6449e7261..000000000
--- a/arborx/examples/dbscan/CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-add_executable(ArborX_DBSCAN.exe dbscan.cpp)
-target_include_directories(ArborX_DBSCAN.exe PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
-target_link_libraries(ArborX_DBSCAN.exe ArborX::ArborX Boost::program_options)
-
-add_executable(ArborX_DataConverter.exe converter.cpp)
-target_compile_features(ArborX_DataConverter.exe PRIVATE cxx_std_14)
-target_link_libraries(ArborX_DataConverter.exe Boost::program_options)
-
-set(input_file "input.txt")
-add_test(NAME ArborX_DBSCAN_Example COMMAND ./ArborX_DBSCAN.exe --filename=${input_file} --eps=1.4 --verify)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${input_file} ${CMAKE_CURRENT_BINARY_DIR}/${input_file} COPYONLY)
diff --git a/arborx/examples/dbscan/README.md b/arborx/examples/dbscan/README.md
deleted file mode 100644
index 683e6a4ce..000000000
--- a/arborx/examples/dbscan/README.md
+++ /dev/null
@@ -1,62 +0,0 @@
-# Algorithm
-
-This example considers the DBSCAN algorithm [1]. DBSCAN algorithm computes
-clusters based on two parameters, `min_pts` (number of neighbors required to be
-considered a core point) and `eps` (radius).
-
-An example of an application requiring a solution to such problem is computing
-halos in a cosmology simulation. Here, points correspond to points in the
-universe, `eps` is called linking length, `min_pts = 1` and clusters are called
-halos, or Friends-of-Friends (FoF).
-
-A straightforward approach to compute halos, for example, would have one
-compute the connectivity graph explicitly through ArborX spatial query search,
-and then run a CC algorithm, such as ECL-CC ([2]), on that graph. The
-implemented approach is an improvement over straightforward approach. Instead
-of constructing the graph explicitly, it uses a combination of the callback
-mechanism in ArborX with the `compute1` routine of the CC algorithm in [2] to
-construct CC in a single tree query. A general DBSCAN algorithm is implemented
-in a similar fashion, with a main distinction being that the number of
-neighbors is pre-computed. Thus, it is expected that the `min_pts > 1`
-algorithm is twice slower compared to `min_pts = 1` case.
-
-[1] Ester, Kriegel, Sander, Xu. "A density-based algorithm for discovering
-clusters in large spatial databases with noise". In Proceedings of the Second
-International Conference on Knowledge Discovery and Data Mining, pp. 226-231.
-1996.
-
-[2] Jaiganesh, Burtscher. "A high-performance connected
-components implementation for GPUs." In Proceedings of the 27th International
-Symposium on High-Performance Parallel and Distributed Computing, pp. 92-104.
-2018.
-
-# Input
-
-The example conrols its input through command-line options:
-- `--filename`
-  The data is expected to be provided as an argument to the `--filename`
-  option. The data is in the format `[number of points, X-coordinates,
-  Y-coordinates, Z-coordinates]`.
-- `--binary`
-  Indicator whether the data provided through `--filename` option is text or
-  binary. If the data is binary, it is expected that number of points is an
-  4-byte integer, and each coordinate is a 4-byte floating point number.
-- `--core-min-size`
-  `min_pts` parameter of the DBSCAN algorithm
-- `--eps`
-  `eps` parameter of the DBSCAN algorithm
-- `--cluster-min-size`
-  Further post-processing to filter out clusters under certain size
-- `--verify`
-  Internal check switch to verify clusters. This options is significantly more
-  expected, as it explicitly computes the graph. This may also mean that it
-  will run out of memory on GPU even if the DBSCAN algorithm itself does not.
-
-# Output
-
-The example produces clusters in CSR (compressed sparse storage) format
-consisting of two arrays `(cluster_indices, cluster_offset)`, with indices for
-a cluster `i` being entries
-`cluster_indices(cluster_offset(i):cluster_offset(i+1)`. A simple
-postprocessing step that calculates the sizes and centers of each cluster is
-then performed.
diff --git a/arborx/examples/dbscan/converter.cpp b/arborx/examples/dbscan/converter.cpp
deleted file mode 100644
index 53d7f4572..000000000
--- a/arborx/examples/dbscan/converter.cpp
+++ /dev/null
@@ -1,472 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2017-2021 by the ArborX authors                            *
- * All rights reserved.                                                     *
- *                                                                          *
- * This file is part of the ArborX library. ArborX is                       *
- * distributed under a BSD 3-clause license. For the licensing terms see    *
- * the LICENSE file in the top-level directory.                             *
- *                                                                          *
- * SPDX-License-Identifier: BSD-3-Clause                                    *
- ****************************************************************************/
-
-#include <boost/program_options.hpp>
-
-#include <algorithm>
-#include <cassert>
-#include <cstring>
-#include <fstream>
-#include <iostream>
-#include <iterator>
-#include <sstream>
-#include <stdexcept>
-#include <vector>
-
-class Points
-{
-private:
-  std::vector<std::vector<float>> _data;
-
-public:
-  Points(int dim, int num_points = 0)
-  {
-    _data.resize(dim);
-    for (int i = 0; i < dim; ++i)
-      _data[i].resize(num_points);
-  }
-
-  int dimension() const { return _data.size(); }
-
-  int size() const
-  {
-    assert(dimension() > 0);
-    return _data[0].size();
-  }
-
-  std::vector<float> &operator[](int d)
-  {
-    assert(d < dimension());
-    return _data[d];
-  }
-
-  std::vector<float> const &operator[](int d) const
-  {
-    assert(d < dimension());
-    return _data[d];
-  }
-};
-
-auto loadHACCData(std::string const &filename)
-{
-  std::cout << "Assuming HACC data.\n";
-  std::cout << "Reading in \"" << filename << "\" in binary mode...";
-  std::cout.flush();
-
-  std::ifstream input(filename, std::ifstream::binary);
-  if (!input.good())
-    throw std::runtime_error("Cannot open file");
-
-  int num_points = 0;
-  input.read(reinterpret_cast<char *>(&num_points), sizeof(int));
-
-  Points points(3, num_points);
-  input.read(reinterpret_cast<char *>(points[0].data()),
-             num_points * sizeof(float));
-  input.read(reinterpret_cast<char *>(points[1].data()),
-             num_points * sizeof(float));
-  input.read(reinterpret_cast<char *>(points[2].data()),
-             num_points * sizeof(float));
-  input.close();
-  std::cout << "done\nRead in " << num_points << " points" << std::endl;
-
-  return points;
-}
-
-// Next Generation Simulation (NGSIM) Vehicle Trajectories data reader.
-//
-// NGSIM data consists of vehicle trajectory data collected by NGSIM
-// researchers on three highways in Los Angeles, CA, Emeryville, CA, and
-// Atlanta, GA. The trajectory data have been transcribed for every vehicle
-// from the footage of video cameras using NGVIDEO.
-//
-// The data was used in Mustafa et al "An experimental comparison of GPU
-// techniques for DBSCAN clustering", IEEE International Conference on Big Data,
-// 2019.
-//
-// The data can be found at
-// https://catalog.data.gov/dataset/next-generation-simulation-ngsim-vehicle-trajectories-and-supporting-data
-// (direct link
-// https://data.transportation.gov/api/views/8ect-6jqj/rows.csv?accessType=DOWNLOAD).
-//
-// Among other attributes, each data points has a timestamp, vehicle ID, local
-// orad coordinates, global coordinates, vehicle length, width, velocity and
-// acceleration.
-//
-// The code here is different from the source code for the Mustafa2019 paper.
-// In that codebase, they seem to have a filtered file that only contains the
-// global coordinates and not all the other data fields.
-auto loadNGSIMData(std::string const &filename)
-{
-  std::cout << "Assuming NGSIM data.\n";
-  std::cout << "Reading in \"" << filename << "\" in text mode...";
-  std::cout.flush();
-
-  std::ifstream file(filename);
-  if (!file.good())
-    throw std::runtime_error("Cannot open file");
-
-  std::string thisWord;
-  std::string line;
-
-  Points points(2);
-
-  // ignore first line that contains the descriptions
-  int n_points = 0;
-  getline(file, thisWord);
-  while (file.good())
-  {
-    if (!getline(file, line))
-      break;
-
-    std::stringstream ss(line);
-    // GVehicle_ID,Frame_ID,Total_Frames,Global_Time,Local_X,Local_Y
-    for (int i = 0; i < 6; ++i)
-      getline(ss, thisWord, ',');
-    // Global_X,Global_Y
-    getline(ss, thisWord, ',');
-    float longitude = stof(thisWord);
-    getline(ss, thisWord, ',');
-    float latitude = stof(thisWord);
-    points[0].emplace_back(longitude);
-    points[1].emplace_back(latitude);
-    // v_length,v_Width,v_Class,v_Vel,v_Acc,Lane_ID,O_Zone,D_Zone,Int_ID,Section_ID,Direction,Movement,Preceding,Following,Space_Headway,Time_Headway,Location
-    for (int i = 0; i < 16; ++i)
-      getline(ss, thisWord, ',');
-    getline(ss, thisWord, ',');
-    ++n_points;
-  }
-  std::cout << "done\nRead in " << n_points << " points" << std::endl;
-  return points;
-}
-
-// Taxi Service Trajectory Prediction Challenge data reader.
-//
-// The data consists of the trajectories of 442 taxis running in the city of
-// Porto, Portugal, over the period of one year. This is a dataset with over
-// 1,710,000+ trajectories with 81,000,000+ points in total.
-//
-// The data can be found at
-// https://archive.ics.uci.edu/ml/datasets/Taxi+Service+Trajectory+-+Prediction+Challenge,+ECML+PKDD+2015
-// (direct link
-// https://archive.ics.uci.edu/ml/machine-learning-databases/00339/train.csv.zip).
-//
-// Every data point in this dataset has, besides longitude and latitude values,
-// a unique identifier for each taxi trip, taxi ID, timestamp, and user
-// information.
-auto loadTaxiPortoData(std::string const &filename)
-{
-  std::cout << "Assuming TaxiPorto data.\n";
-  std::cout << "Reading in \"" << filename << "\" in text mode...";
-  std::cout.flush();
-
-  FILE *fp_data = fopen(filename.c_str(), "rb");
-  if (fp_data == nullptr)
-    throw std::runtime_error("Cannot open file");
-  char line[100000];
-
-  // This function reads and segments trajectories in dataset in the following
-  // format: The first line indicates number of variables per point (I'm
-  // ignoring that and assuming 2) The second line indicates total trajectories
-  // in file (I'm ignoring that and observing how many are there by reading
-  // them). All lines that follow contains a trajectory separated by new line.
-  // The first number in the trajectory is the number of points followed by
-  // location points separated by spaces
-
-  std::vector<float> longitudes;
-  std::vector<float> latitudes;
-
-  int lineNo = -1;
-  int wordNo = 0;
-  int lonlatno = 100;
-
-  float thisWord;
-  while (fgets(line, sizeof(line), fp_data) != nullptr)
-  {
-    if (lineNo > -1)
-    {
-      char *pch;
-      char *end_str;
-      wordNo = 0;
-      lonlatno = 0;
-      pch = strtok_r(line, "\"[", &end_str);
-      while (pch != nullptr)
-      {
-        if (wordNo > 0)
-        {
-          char *pch2;
-          char *end_str2;
-
-          pch2 = strtok_r(pch, ",", &end_str2);
-
-          if (strcmp(pch2, "]") < 0 && lonlatno < 255)
-          {
-
-            thisWord = atof(pch2);
-
-            if (thisWord != 0.00000)
-            {
-              if (thisWord > -9 && thisWord < -7)
-              {
-                longitudes.push_back(thisWord);
-                // printf("lon %f",thisWord);
-                pch2 = strtok_r(nullptr, ",", &end_str2);
-                thisWord = atof(pch2);
-                if (thisWord < 42 && thisWord > 40)
-                {
-                  latitudes.push_back(thisWord);
-                  // printf(" lat %f\n",thisWord);
-
-                  lonlatno++;
-                }
-                else
-                {
-                  longitudes.pop_back();
-                }
-              }
-            }
-          }
-        }
-        pch = strtok_r(nullptr, "[", &end_str);
-        wordNo++;
-      }
-      // printf("num lonlat were %d x 2\n",lonlatno);
-    }
-    lineNo++;
-    if (lonlatno <= 0)
-    {
-      lineNo--;
-    }
-
-    // printf("Line %d\n",lineNo);
-  }
-  fclose(fp_data);
-
-  int num_points = longitudes.size();
-  assert(longitudes.size() == latitudes.size());
-
-  Points points(2, num_points);
-  std::copy(longitudes.begin(), longitudes.end(), points[0].begin());
-  std::copy(latitudes.begin(), latitudes.end(), points[1].begin());
-
-  std::cout << "done\nRead in " << num_points << " points" << std::endl;
-
-  return points;
-}
-
-// 3D Road Network data reader.
-//
-// The data consists of more than 400,000 points from the road network of North
-// Jutland in Denmark.
-//
-// The data can be found at
-// https://archive.ics.uci.edu/ml/datasets/3D+Road+Network+(North+Jutland,+Denmark)
-// (direct link
-// https://archive.ics.uci.edu/ml/machine-learning-databases/00246/3D_spatial_network.txt).
-//
-// Each data point contains its ID, longitude, latitude, and altitude.
-auto load3DRoadNetworkData(std::string const &filename)
-{
-  std::cout << "Assuming 3DRoadNetwork data.\n";
-  std::cout << "Reading in \"" << filename << "\" in text mode...";
-  std::cout.flush();
-
-  std::ifstream file(filename);
-  assert(file.good());
-  if (!file.good())
-    throw std::runtime_error("Cannot open file");
-
-  Points points(2);
-
-  std::string thisWord;
-  while (file.good())
-  {
-    getline(file, thisWord, ',');
-    getline(file, thisWord, ',');
-    float longitude = stof(thisWord);
-    getline(file, thisWord, ',');
-    float latitude = stof(thisWord);
-    points[0].emplace_back(longitude);
-    points[1].emplace_back(latitude);
-  }
-  // In Mustafa2019 they discarded the last item read but it's not quite clear
-  // if/why this was necessary.
-  // lon_ptr.pop_back();
-  // lat_ptr.pop_back();
-  std::cout << "done\nRead in " << points.size() << " points" << std::endl;
-
-  return points;
-}
-
-// SW data reader.
-//
-// SW data consists of ionospheric total electron content datasets collected by
-// GPS receivers.
-//
-// Data preprocessing described in Pankratius et al "GPS Data Processing for
-// Scientific Studies of the Earth’s Atmosphere and Near-Space Environment".
-// Springer International Publishing, 2015, pp. 1–12.
-//
-// The data was used in Gowanlock et al "Clustering Throughput Optimization on
-// the GPU", IPDPS, 2017, pp. 832-841.
-//
-// The data is available at
-// ftp://gemini.haystack.mit.edu/pub/informatics/dbscandat.zip
-//
-// The data file is a text file. Each line contains three floating point
-// numbers separated by ','. The fields corespond to longitude, latitude, and
-// total electron content (TEC). The TEC field is unused in the Gowanlock's
-// paper, as according to the author:
-//   because in the application scenario of monitoring space weather, we
-//   typically first selected the data points based on TEC, and then cluster
-//   the positions of the points
-auto loadSWData(std::string const &filename)
-{
-  std::cout << "Assuming SW data.\n";
-  std::cout << "Reading in \"" << filename << "\" in text mode...";
-  std::cout.flush();
-
-  std::ifstream input;
-  input.open(filename);
-  if (!input.good())
-    throw std::runtime_error("Cannot open file");
-
-  Points points(2);
-  while (input.good())
-  {
-    std::string line;
-    if (!std::getline(input, line))
-      break;
-    std::istringstream line_stream(line);
-
-    std::string word;
-    std::getline(line_stream, word, ','); // longitude field
-    float longitude = std::stof(word);
-    std::getline(line_stream, word, ','); // latitude field
-    float latitude = std::stof(word);
-    std::getline(line_stream, word, ','); // TEC field (ignored)
-
-    points[0].emplace_back(longitude);
-    points[1].emplace_back(latitude);
-  }
-  input.close();
-  std::cout << "done\nRead in " << points.size() << " points" << std::endl;
-
-  return points;
-}
-
-// Gaia data reader.
-//
-// Gaia catalog (data release 2) contains 1.69 billion points
-//
-// Scientific Studies of the Earth’s Atmosphere and Near-Space Environment".
-// Springer International Publishing, 2015, pp. 1–12.
-//
-// The data was used in Gowanlock "Hybrid CPU/GPU Clustering in Shared Memory
-// on the Billion Point Scale", 2019
-//
-// The data is available at
-// https://rcdata.nau.edu/gowanlock_lab/datasets/ICS19_data/gaia_dr2_ra_dec_50M.txt.
-//
-// The data file is a text file. Each line contains two floating point
-// numbers separated by ','. The fields corespond to longitude, latitude.
-auto loadGaiaData(std::string const &filename)
-{
-  std::cout << "Assuming Gaia data.\n";
-  std::cout << "Reading in \"" << filename << "\" in text mode...";
-  std::cout.flush();
-
-  std::ifstream input;
-  input.open(filename);
-  if (!input.good())
-    throw std::runtime_error("Cannot open file");
-
-  Points points(2);
-  while (input.good())
-  {
-    std::string line;
-    if (!std::getline(input, line))
-      break;
-    std::istringstream line_stream(line);
-
-    std::string word;
-    std::getline(line_stream, word, ','); // longitude field
-    float longitude = std::stof(word);
-    std::getline(line_stream, word, ','); // latitude field
-    float latitude = std::stof(word);
-
-    points[0].emplace_back(longitude);
-    points[1].emplace_back(latitude);
-  }
-  input.close();
-  std::cout << "done\nRead in " << points.size() << " points" << std::endl;
-
-  return points;
-}
-
-auto loadData(std::string const &filename, std::string const &reader_type)
-{
-  if (reader_type == "hacc")
-    return loadHACCData(filename);
-  if (reader_type == "ngsim")
-    return loadNGSIMData(filename);
-  if (reader_type == "taxiporto")
-    return loadTaxiPortoData(filename);
-  if (reader_type == "3droad")
-    return load3DRoadNetworkData(filename);
-  if (reader_type == "sw")
-    return loadSWData(filename);
-  if (reader_type == "gaia")
-    return loadGaiaData(filename);
-
-  throw std::runtime_error("Unknown reader type: \"" + reader_type + "\"");
-}
-
-int main(int argc, char *argv[])
-{
-  namespace bpo = boost::program_options;
-
-  std::string input_file;
-  std::string output_file;
-  std::string reader;
-
-  bpo::options_description desc("Allowed options");
-  // clang-format off
-    desc.add_options()
-        ( "help", "help message" )
-        ( "input", bpo::value<std::string>(&input_file), "file containing data" )
-        ( "output", bpo::value<std::string>(&output_file), "file to contain the results" )
-        ( "reader", bpo::value<std::string>(&reader), "reader type" )
-        ;
-  // clang-format on
-  bpo::variables_map vm;
-  bpo::store(bpo::command_line_parser(argc, argv).options(desc).run(), vm);
-  bpo::notify(vm);
-
-  if (vm.count("help") > 0)
-  {
-    std::cout << desc << '\n';
-    return 1;
-  }
-
-  auto points = loadData(input_file, reader);
-  int n = points.size();
-  int dim = points.dimension();
-
-  std::ofstream out(output_file, std::ofstream::binary);
-  out.write((char *)&n, sizeof(int));
-  out.write((char *)&dim, sizeof(int));
-  for (int i = 0; i < n; ++i)
-    for (int d = 0; d < dim; ++d)
-      out.write((char *)(&points[d][i]), sizeof(float));
-
-  return EXIT_SUCCESS;
-}
diff --git a/arborx/examples/dbscan/dbscan.cpp b/arborx/examples/dbscan/dbscan.cpp
deleted file mode 100644
index a79e5bba2..000000000
--- a/arborx/examples/dbscan/dbscan.cpp
+++ /dev/null
@@ -1,504 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2017-2021 by the ArborX authors                            *
- * All rights reserved.                                                     *
- *                                                                          *
- * This file is part of the ArborX library. ArborX is                       *
- * distributed under a BSD 3-clause license. For the licensing terms see    *
- * the LICENSE file in the top-level directory.                             *
- *                                                                          *
- * SPDX-License-Identifier: BSD-3-Clause                                    *
- ****************************************************************************/
-
-#include <ArborX_DBSCAN.hpp>
-#include <ArborX_DBSCANVerification.hpp>
-#include <ArborX_DetailsHeap.hpp>
-#include <ArborX_DetailsOperatorFunctionObjects.hpp> // Less
-#include <ArborX_Version.hpp>
-
-#include <Kokkos_Core.hpp>
-
-#include <boost/program_options.hpp>
-
-#include <fstream>
-
-std::vector<ArborX::Point> loadData(std::string const &filename,
-                                    bool binary = true, int max_num_points = -1)
-{
-  std::cout << "Reading in \"" << filename << "\" in "
-            << (binary ? "binary" : "text") << " mode...";
-  std::cout.flush();
-
-  std::ifstream input;
-  if (!binary)
-    input.open(filename);
-  else
-    input.open(filename, std::ifstream::binary);
-  ARBORX_ASSERT(input.good());
-
-  std::vector<ArborX::Point> v;
-
-  int num_points = 0;
-  int dim = 0;
-  if (!binary)
-  {
-    input >> num_points;
-    input >> dim;
-  }
-  else
-  {
-    input.read(reinterpret_cast<char *>(&num_points), sizeof(int));
-    input.read(reinterpret_cast<char *>(&dim), sizeof(int));
-  }
-
-  // For now, only allow reading in 2D or 3D data. Will relax in the future.
-  ARBORX_ASSERT(dim == 2 || dim == 3);
-
-  if (max_num_points > 0 && max_num_points < num_points)
-    num_points = max_num_points;
-
-  if (!binary)
-  {
-    v.reserve(num_points);
-
-    auto it = std::istream_iterator<float>(input);
-    auto read_point = [&it, dim]() {
-      float xyz[3] = {0.f, 0.f, 0.f};
-      for (int i = 0; i < dim; ++i)
-        xyz[i] = *it++;
-      return ArborX::Point{xyz[0], xyz[1], xyz[2]};
-    };
-    std::generate_n(std::back_inserter(v), num_points, read_point);
-  }
-  else
-  {
-    v.resize(num_points);
-
-    if (dim == 3)
-    {
-      // Can directly read into ArborX::Point
-      input.read(reinterpret_cast<char *>(v.data()),
-                 num_points * sizeof(ArborX::Point));
-    }
-    else
-    {
-      std::vector<float> aux(num_points * dim);
-      input.read(reinterpret_cast<char *>(aux.data()),
-                 aux.size() * sizeof(float));
-
-      for (int i = 0; i < num_points; ++i)
-      {
-        ArborX::Point p{0.f, 0.f, 0.f};
-        for (int d = 0; d < dim; ++d)
-          p[d] = aux[i * dim + d];
-        v[i] = p;
-      }
-    }
-  }
-  input.close();
-  std::cout << "done\nRead in " << num_points << " " << dim << "D points"
-            << std::endl;
-
-  return v;
-}
-
-std::vector<ArborX::Point> sampleData(std::vector<ArborX::Point> const &data,
-                                      int num_samples)
-{
-  std::vector<ArborX::Point> sampled_data(num_samples);
-
-  // Knuth algorithm
-  auto const N = (int)data.size();
-  auto const M = num_samples;
-  for (int in = 0, im = 0; in < N && im < M; ++in)
-  {
-    int rn = N - in;
-    int rm = M - im;
-    if (rand() % rn < rm)
-      sampled_data[im++] = data[in];
-  }
-  return sampled_data;
-}
-
-template <typename MemorySpace>
-void writeLabelsData(std::string const &filename,
-                     Kokkos::View<int *, MemorySpace> labels)
-{
-  std::ofstream out(filename, std::ofstream::binary);
-  ARBORX_ASSERT(out.good());
-
-  auto labels_host =
-      Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace{}, labels);
-
-  int n = labels_host.size();
-  out.write((char *)&n, sizeof(int));
-  out.write((char *)labels_host.data(), sizeof(int) * n);
-}
-
-template <typename... P, typename T>
-auto vec2view(std::vector<T> const &in, std::string const &label = "")
-{
-  Kokkos::View<T *, P...> out(
-      Kokkos::view_alloc(label, Kokkos::WithoutInitializing), in.size());
-  Kokkos::deep_copy(out, Kokkos::View<T const *, Kokkos::HostSpace,
-                                      Kokkos::MemoryTraits<Kokkos::Unmanaged>>{
-                             in.data(), in.size()});
-  return out;
-}
-
-template <typename ExecutionSpace, typename LabelsView,
-          typename ClusterIndicesView, typename ClusterOffsetView>
-void sortAndFilterClusters(ExecutionSpace const &exec_space,
-                           LabelsView const &labels,
-                           ClusterIndicesView &cluster_indices,
-                           ClusterOffsetView &cluster_offset,
-                           int cluster_min_size = 1)
-{
-  Kokkos::Profiling::pushRegion("ArborX::DBSCAN::sortAndFilterClusters");
-
-  static_assert(Kokkos::is_view<LabelsView>{}, "");
-  static_assert(Kokkos::is_view<ClusterIndicesView>{}, "");
-  static_assert(Kokkos::is_view<ClusterOffsetView>{}, "");
-
-  using MemorySpace = typename LabelsView::memory_space;
-
-  static_assert(std::is_same<typename LabelsView::value_type, int>{}, "");
-  static_assert(std::is_same<typename ClusterIndicesView::value_type, int>{},
-                "");
-  static_assert(std::is_same<typename ClusterOffsetView::value_type, int>{},
-                "");
-
-  static_assert(std::is_same<typename LabelsView::memory_space, MemorySpace>{},
-                "");
-  static_assert(
-      std::is_same<typename ClusterIndicesView::memory_space, MemorySpace>{},
-      "");
-  static_assert(
-      std::is_same<typename ClusterOffsetView::memory_space, MemorySpace>{},
-      "");
-
-  ARBORX_ASSERT(cluster_min_size >= 1);
-
-  int const n = labels.extent_int(0);
-
-  Kokkos::View<int *, MemorySpace> cluster_sizes(
-      "ArborX::DBSCAN::cluster_sizes", n);
-  Kokkos::parallel_for("ArborX::DBSCAN::compute_cluster_sizes",
-                       Kokkos::RangePolicy<ExecutionSpace>(exec_space, 0, n),
-                       KOKKOS_LAMBDA(int const i) {
-                         // Ignore noise points
-                         if (labels(i) < 0)
-                           return;
-
-                         Kokkos::atomic_fetch_add(&cluster_sizes(labels(i)), 1);
-                       });
-
-  // This kernel serves dual purpose:
-  // - it constructs an offset array through exclusive prefix sum, with a
-  //   caveat that small clusters (of size < cluster_min_size) are filtered out
-  // - it creates a mapping from a cluster index into the cluster's position in
-  //   the offset array
-  // We reuse the cluster_sizes array for the second, creating a new alias for
-  // it for clarity.
-  auto &map_cluster_to_offset_position = cluster_sizes;
-  int constexpr IGNORED_CLUSTER = -1;
-  int num_clusters;
-  ArborX::reallocWithoutInitializing(cluster_offset, n + 1);
-  Kokkos::parallel_scan(
-      "ArborX::DBSCAN::compute_cluster_offset_with_filter",
-      Kokkos::RangePolicy<ExecutionSpace>(exec_space, 0, n),
-      KOKKOS_LAMBDA(int const i, int &update, bool final_pass) {
-        bool is_cluster_too_small = (cluster_sizes(i) < cluster_min_size);
-        if (!is_cluster_too_small)
-        {
-          if (final_pass)
-          {
-            cluster_offset(update) = cluster_sizes(i);
-            map_cluster_to_offset_position(i) = update;
-          }
-          ++update;
-        }
-        else
-        {
-          if (final_pass)
-            map_cluster_to_offset_position(i) = IGNORED_CLUSTER;
-        }
-      },
-      num_clusters);
-  Kokkos::resize(Kokkos::WithoutInitializing, cluster_offset, num_clusters + 1);
-  ArborX::exclusivePrefixSum(exec_space, cluster_offset);
-
-  auto cluster_starts = ArborX::clone(exec_space, cluster_offset);
-  ArborX::reallocWithoutInitializing(cluster_indices,
-                                     ArborX::lastElement(cluster_offset));
-  Kokkos::parallel_for("ArborX::DBSCAN::compute_cluster_indices",
-                       Kokkos::RangePolicy<ExecutionSpace>(exec_space, 0, n),
-                       KOKKOS_LAMBDA(int const i) {
-                         // Ignore noise points
-                         if (labels(i) < 0)
-                           return;
-
-                         auto offset_pos =
-                             map_cluster_to_offset_position(labels(i));
-                         if (offset_pos != IGNORED_CLUSTER)
-                         {
-                           auto position = Kokkos::atomic_fetch_add(
-                               &cluster_starts(offset_pos), 1);
-                           cluster_indices(position) = i;
-                         }
-                       });
-
-  Kokkos::Profiling::popRegion();
-}
-
-template <typename ExecutionSpace, typename Primitives,
-          typename ClusterIndicesView, typename ClusterOffsetView>
-void printClusterSizesAndCenters(ExecutionSpace const &exec_space,
-                                 Primitives const &primitives,
-                                 ClusterIndicesView &cluster_indices,
-                                 ClusterOffsetView &cluster_offset)
-{
-  auto const num_clusters = static_cast<int>(cluster_offset.size()) - 1;
-
-  using MemorySpace = typename ClusterIndicesView::memory_space;
-
-  Kokkos::View<ArborX::Point *, MemorySpace> cluster_centers(
-      Kokkos::view_alloc(Kokkos::WithoutInitializing, "Testing::centers"),
-      num_clusters);
-  Kokkos::parallel_for(
-      "Testing::compute_centers",
-      Kokkos::RangePolicy<ExecutionSpace>(exec_space, 0, num_clusters),
-      KOKKOS_LAMBDA(int const i) {
-        // The only reason we sort indices here is for reproducibility.
-        // Current DBSCAN algorithm does not guarantee that the indices
-        // corresponding to the same cluster are going to appear in the same
-        // order from run to run. Using sorted indices, we explicitly
-        // guarantee the same summation order when computing cluster centers.
-
-        auto *cluster_start = cluster_indices.data() + cluster_offset(i);
-        auto cluster_size = cluster_offset(i + 1) - cluster_offset(i);
-
-        // Sort cluster indices in ascending order. This uses heap for
-        // sorting, only because there is no other convenient utility that
-        // could sort within a kernel.
-        ArborX::Details::makeHeap(cluster_start, cluster_start + cluster_size,
-                                  ArborX::Details::Less<int>());
-        ArborX::Details::sortHeap(cluster_start, cluster_start + cluster_size,
-                                  ArborX::Details::Less<int>());
-
-        // Compute cluster centers
-        ArborX::Point cluster_center{0.f, 0.f, 0.f};
-        for (int j = cluster_offset(i); j < cluster_offset(i + 1); j++)
-        {
-          auto const &cluster_point = primitives(cluster_indices(j));
-          // NOTE The explicit casts below are intended to silence warnings
-          // about narrowing conversion from 'int' to 'float'. A potential
-          // accuracy issue here is that 'float' can represent all integer
-          // values in the range [-2^23, 2^23] but 'int' can actually represent
-          // values in the range [-2^31, 2^31-1]. However, we ignore it for
-          // now.
-          cluster_center[0] +=
-              cluster_point[0] / static_cast<float>(cluster_size);
-          cluster_center[1] +=
-              cluster_point[1] / static_cast<float>(cluster_size);
-          cluster_center[2] +=
-              cluster_point[2] / static_cast<float>(cluster_size);
-        }
-        cluster_centers(i) = cluster_center;
-      });
-
-  auto cluster_offset_host =
-      Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace{}, cluster_offset);
-  auto cluster_centers_host =
-      Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace{}, cluster_centers);
-  for (int i = 0; i < num_clusters; i++)
-  {
-    int cluster_size = cluster_offset_host(i + 1) - cluster_offset_host(i);
-
-    // This is HACC specific filtering. It is only interested in the clusters
-    // with centers in [0,64]^3 domain.
-    auto const &cluster_center = cluster_centers_host(i);
-    if (cluster_center[0] >= 0 && cluster_center[1] >= 0 &&
-        cluster_center[2] >= 0 && cluster_center[0] < 64 &&
-        cluster_center[1] < 64 && cluster_center[2] < 64)
-    {
-      printf("%d %e %e %e\n", cluster_size, cluster_center[0],
-             cluster_center[1], cluster_center[2]);
-    }
-  }
-}
-
-namespace ArborX
-{
-namespace DBSCAN
-{
-// This function is required for Boost program_options to be able to use the
-// Implementation enum.
-std::istream &operator>>(std::istream &in, Implementation &implementation)
-{
-  std::string impl_string;
-  in >> impl_string;
-
-  if (impl_string == "fdbscan")
-    implementation = ArborX::DBSCAN::Implementation::FDBSCAN;
-  else if (impl_string == "fdbscan-densebox")
-    implementation = ArborX::DBSCAN::Implementation::FDBSCAN_DenseBox;
-  else
-    in.setstate(std::ios_base::failbit);
-
-  return in;
-}
-
-// This function is required for Boost program_options to use Implementation
-// enum as the default_value().
-std::ostream &operator<<(std::ostream &out,
-                         Implementation const &implementation)
-{
-  switch (implementation)
-  {
-  case ArborX::DBSCAN::Implementation::FDBSCAN:
-    out << "fdbscan";
-    break;
-  case ArborX::DBSCAN::Implementation::FDBSCAN_DenseBox:
-    out << "fdbscan-densebox";
-    break;
-  }
-  return out;
-}
-} // namespace DBSCAN
-} // namespace ArborX
-
-int main(int argc, char *argv[])
-{
-  using ExecutionSpace = Kokkos::DefaultExecutionSpace;
-  using MemorySpace = typename ExecutionSpace::memory_space;
-
-  Kokkos::ScopeGuard guard(argc, argv);
-
-  std::cout << "ArborX version    : " << ArborX::version() << std::endl;
-  std::cout << "ArborX hash       : " << ArborX::gitCommitHash() << std::endl;
-
-  namespace bpo = boost::program_options;
-  using ArborX::DBSCAN::Implementation;
-
-  std::string filename;
-  bool binary;
-  bool verify;
-  bool print_dbscan_timers;
-  bool print_sizes_centers;
-  float eps;
-  int cluster_min_size;
-  int core_min_size;
-  int max_num_points;
-  int num_samples;
-  std::string filename_labels;
-  Implementation implementation;
-
-  bpo::options_description desc("Allowed options");
-  // clang-format off
-  desc.add_options()
-      ( "help", "help message" )
-      ( "filename", bpo::value<std::string>(&filename), "filename containing data" )
-      ( "binary", bpo::bool_switch(&binary)->default_value(false), "binary file indicator")
-      ( "max-num-points", bpo::value<int>(&max_num_points)->default_value(-1), "max number of points to read in")
-      ( "eps", bpo::value<float>(&eps), "DBSCAN eps" )
-      ( "cluster-min-size", bpo::value<int>(&cluster_min_size)->default_value(1), "minimum cluster size")
-      ( "core-min-size", bpo::value<int>(&core_min_size)->default_value(2), "DBSCAN min_pts")
-      ( "verify", bpo::bool_switch(&verify)->default_value(false), "verify connected components")
-      ( "samples", bpo::value<int>(&num_samples)->default_value(-1), "number of samples" )
-      ( "labels", bpo::value<std::string>(&filename_labels)->default_value(""), "clutering results output" )
-      ( "print-dbscan-timers", bpo::bool_switch(&print_dbscan_timers)->default_value(false), "print dbscan timers")
-      ( "output-sizes-and-centers", bpo::bool_switch(&print_sizes_centers)->default_value(false), "print cluster sizes and centers")
-      ( "impl", bpo::value<Implementation>(&implementation)->default_value(Implementation::FDBSCAN), R"(implementation ("fdbscan" or "fdbscan-densebox"))")
-      ;
-  // clang-format on
-  bpo::variables_map vm;
-  bpo::store(bpo::command_line_parser(argc, argv).options(desc).run(), vm);
-  bpo::notify(vm);
-
-  if (vm.count("help") > 0)
-  {
-    std::cout << desc << '\n';
-    return 1;
-  }
-
-  std::stringstream ss;
-  ss << implementation;
-
-  // Print out the runtime parameters
-  printf("eps               : %f\n", eps);
-  printf("minpts            : %d\n", core_min_size);
-  printf("cluster min size  : %d\n", cluster_min_size);
-  printf("filename          : %s [%s, max_pts = %d]\n", filename.c_str(),
-         (binary ? "binary" : "text"), max_num_points);
-  printf("filename [labels] : %s [binary]\n", filename_labels.c_str());
-  printf("implementation    : %s\n", ss.str().c_str());
-  printf("samples           : %d\n", num_samples);
-  printf("verify            : %s\n", (verify ? "true" : "false"));
-  printf("print timers      : %s\n", (print_dbscan_timers ? "true" : "false"));
-  printf("output centers    : %s\n", (print_sizes_centers ? "true" : "false"));
-
-  // read in data
-  std::vector<ArborX::Point> data = loadData(filename, binary, max_num_points);
-  if (num_samples > 0 && num_samples < (int)data.size())
-    data = sampleData(data, num_samples);
-  auto const primitives = vec2view<MemorySpace>(data, "primitives");
-
-  ExecutionSpace exec_space;
-
-  Kokkos::Timer timer_total;
-  Kokkos::Timer timer;
-  std::map<std::string, double> elapsed;
-
-  bool const verbose = print_dbscan_timers;
-  auto timer_start = [&exec_space, verbose](Kokkos::Timer &timer) {
-    if (verbose)
-      exec_space.fence();
-    timer.reset();
-  };
-  auto timer_seconds = [&exec_space, verbose](Kokkos::Timer const &timer) {
-    if (verbose)
-      exec_space.fence();
-    return timer.seconds();
-  };
-
-  timer_start(timer_total);
-
-  auto labels = ArborX::dbscan(exec_space, primitives, eps, core_min_size,
-                               ArborX::DBSCAN::Parameters()
-                                   .setPrintTimers(print_dbscan_timers)
-                                   .setImplementation(implementation));
-
-  timer_start(timer);
-  Kokkos::View<int *, MemorySpace> cluster_indices("Testing::cluster_indices",
-                                                   0);
-  Kokkos::View<int *, MemorySpace> cluster_offset("Testing::cluster_offset", 0);
-  sortAndFilterClusters(exec_space, labels, cluster_indices, cluster_offset,
-                        cluster_min_size);
-  elapsed["cluster"] = timer_seconds(timer);
-  elapsed["total"] = timer_seconds(timer_total);
-
-  printf("-- postprocess      : %10.3f\n", elapsed["cluster"]);
-  printf("total time          : %10.3f\n", elapsed["total"]);
-
-  int num_clusters = cluster_offset.size() - 1;
-  int num_cluster_points = cluster_indices.size();
-  printf("\n#clusters       : %d\n", num_clusters);
-  printf("#cluster points : %d [%.2f%%]\n", num_cluster_points,
-         (100.f * num_cluster_points / data.size()));
-
-  if (verify)
-  {
-    auto passed = ArborX::Details::verifyDBSCAN(exec_space, primitives, eps,
-                                                core_min_size, labels);
-    printf("Verification %s\n", (passed ? "passed" : "failed"));
-  }
-
-  if (!filename_labels.empty())
-    writeLabelsData(filename_labels, labels);
-
-  if (print_sizes_centers)
-    printClusterSizesAndCenters(exec_space, primitives, cluster_indices,
-                                cluster_offset);
-
-  return EXIT_SUCCESS;
-}
diff --git a/arborx/examples/dbscan/input.txt b/arborx/examples/dbscan/input.txt
deleted file mode 100644
index f04abedd9..000000000
--- a/arborx/examples/dbscan/input.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-8 2
-3 2
-0 0
-0 1
-1 1
-1 0
-2 2
-2 3
-3 3
diff --git a/arborx/examples/raytracing/CMakeLists.txt b/arborx/examples/raytracing/CMakeLists.txt
deleted file mode 100644
index 27e6e6ce0..000000000
--- a/arborx/examples/raytracing/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-add_executable(ArborX_RayTracing.exe example_raytracing.cpp)
-target_link_libraries(ArborX_RayTracing.exe ArborX::ArborX Boost::program_options)
-add_test(NAME ArborX_RayTracing_Example COMMAND ./ArborX_RayTracing.exe --spheres=1000 --rays=50000 --L=200.0)
diff --git a/arborx/examples/raytracing/example_raytracing.cpp b/arborx/examples/raytracing/example_raytracing.cpp
deleted file mode 100644
index e435d5f32..000000000
--- a/arborx/examples/raytracing/example_raytracing.cpp
+++ /dev/null
@@ -1,200 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2017-2021 by the ArborX authors                            *
- * All rights reserved.                                                     *
- *                                                                          *
- * This file is part of the ArborX library. ArborX is                       *
- * distributed under a BSD 3-clause license. For the licensing terms see    *
- * the LICENSE file in the top-level directory.                             *
- *                                                                          *
- * SPDX-License-Identifier: BSD-3-Clause                                    *
- ****************************************************************************/
-
-#include <ArborX.hpp>
-#include <ArborX_Ray.hpp>
-#include <ArborX_Version.hpp>
-
-#include <Kokkos_Core.hpp>
-
-#include <boost/program_options.hpp>
-
-#include <iostream>
-#include <random>
-
-template <typename MemorySpace>
-struct SpheresToBoxes
-{
-  Kokkos::View<ArborX::Sphere *, MemorySpace> _spheres;
-};
-
-template <typename MemorySpace>
-struct ArborX::AccessTraits<SpheresToBoxes<MemorySpace>, ArborX::PrimitivesTag>
-{
-  using memory_space = MemorySpace;
-
-  KOKKOS_FUNCTION static std::size_t
-  size(const SpheresToBoxes<MemorySpace> &stob)
-  {
-    return stob._spheres.extent(0);
-  }
-  KOKKOS_FUNCTION static ArborX::Box
-  get(SpheresToBoxes<MemorySpace> const &stobs, std::size_t const i)
-  {
-    auto const &sphere = stobs._spheres(i);
-    auto const &c = sphere.centroid();
-    auto const r = sphere.radius();
-    return {{c[0] - r, c[1] - r, c[2] - r}, {c[0] + r, c[1] + r, c[2] + r}};
-  }
-};
-
-template <typename MemorySpace>
-struct Rays
-{
-  Kokkos::View<ArborX::Experimental::Ray *, MemorySpace> _rays;
-};
-
-template <typename MemorySpace>
-struct ArborX::AccessTraits<Rays<MemorySpace>, ArborX::PredicatesTag>
-{
-  using memory_space = MemorySpace;
-
-  KOKKOS_FUNCTION static std::size_t size(const Rays<MemorySpace> &rays)
-  {
-    return rays._rays.extent(0);
-  }
-  KOKKOS_FUNCTION static auto get(Rays<MemorySpace> const &rays, std::size_t i)
-  {
-    return attach(intersects(rays._rays(i)), (int)i);
-  }
-};
-
-template <typename MemorySpace>
-struct AccumRaySphereInterDist
-{
-  Kokkos::View<ArborX::Sphere *, MemorySpace> _spheres;
-  Kokkos::View<float *, MemorySpace> _accumulator;
-
-  template <typename Predicate>
-  KOKKOS_FUNCTION void operator()(Predicate const &predicate,
-                                  int const primitive_index) const
-  {
-    auto const &ray = ArborX::getGeometry(predicate);
-    auto const &sphere = _spheres(primitive_index);
-
-    float const length = overlapDistance(ray, sphere);
-    int const i = getData(predicate);
-
-    Kokkos::atomic_fetch_add(&_accumulator(i), length);
-  }
-};
-
-int main(int argc, char *argv[])
-{
-  using ExecutionSpace = Kokkos::DefaultExecutionSpace;
-  using MemorySpace = ExecutionSpace::memory_space;
-
-  Kokkos::ScopeGuard guard(argc, argv);
-
-  namespace bpo = boost::program_options;
-
-  int num_spheres;
-  int num_rays;
-  float L;
-
-  bpo::options_description desc("Allowed options");
-  // clang-format off
-  desc.add_options()
-    ( "help", "help message" )
-    ("spheres", bpo::value<int>(&num_spheres)->default_value(100), "number of spheres")
-    ("rays", bpo::value<int>(&num_rays)->default_value(10000), "number of rays")
-    ("L", bpo::value<float>(&L)->default_value(100.0), "size of the domain")
-    ;
-  // clang-format on
-  bpo::variables_map vm;
-  bpo::store(bpo::command_line_parser(argc, argv).options(desc).run(), vm);
-  bpo::notify(vm);
-
-  if (vm.count("help") > 0)
-  {
-    std::cout << desc << '\n';
-    return 1;
-  }
-
-  std::cout << "ArborX version: " << ArborX::version() << std::endl;
-  std::cout << "ArborX hash   : " << ArborX::gitCommitHash() << std::endl;
-
-  std::uniform_real_distribution<float> uniform{0.0, 1.0};
-  std::default_random_engine gen;
-  auto rand_uniform = [&]() { return uniform(gen); };
-
-  // Random parameters for Gaussian distribution of radii
-  const float mu_R = 1.0;
-  const float sigma_R = mu_R / 3.0;
-
-  std::normal_distribution<> normal{mu_R, sigma_R};
-  auto rand_normal = [&]() { return std::max(normal(gen), 0.0); };
-
-  // Construct spheres
-  //
-  // The centers of spheres are uniformly sampling the domain. The radii of
-  // spheres have Gaussian (mu_R, sigma_R) sampling.
-  Kokkos::View<ArborX::Sphere *, MemorySpace> spheres(
-      Kokkos::view_alloc(Kokkos::WithoutInitializing, "spheres"), num_spheres);
-  auto spheres_host = Kokkos::create_mirror_view(spheres);
-  for (int i = 0; i < num_spheres; ++i)
-  {
-    spheres_host(i) = {
-        {rand_uniform() * L, rand_uniform() * L, rand_uniform() * L},
-        rand_normal()};
-  }
-  Kokkos::deep_copy(spheres, spheres_host);
-
-  // Construct rays
-  //
-  // The origins of rays are uniformly sampling the bottom surface of the
-  // domain. The direction vectors are uniformly sampling of a cosine-weighted
-  // hemisphere, It requires expressing the direction vector in the spherical
-  // coordinates as:
-  //    {sinpolar * cosazimuth, sinpolar * sinazimuth, cospolar}
-  // A detailed description can be found in the slides here (slide 47):
-  // https://cg.informatik.uni-freiburg.de/course_notes/graphics2_08_renderingEquation.pdf
-  Kokkos::View<ArborX::Experimental::Ray *, MemorySpace> rays(
-      Kokkos::view_alloc(Kokkos::WithoutInitializing, "rays"), num_rays);
-  auto rays_host = Kokkos::create_mirror_view(rays);
-
-  for (int i = 0; i < num_rays; ++i)
-  {
-    float xi_1 = rand_uniform();
-    float xi_2 = rand_uniform();
-
-    rays_host(i) = {ArborX::Point{rand_uniform() * L, rand_uniform() * L, 0.f},
-                    ArborX::Experimental::Vector{
-                        float(std::cos(2 * M_PI * xi_2) * std::sqrt(xi_1)),
-                        float(std::sin(2 * M_PI * xi_2) * std::sqrt(xi_1)),
-                        std::sqrt(1.f - xi_1)}};
-  }
-  Kokkos::deep_copy(rays, rays_host);
-
-  Kokkos::Timer timer;
-
-  ExecutionSpace exec_space{};
-
-  exec_space.fence();
-  timer.reset();
-  ArborX::BVH<MemorySpace> bvh{exec_space,
-                               SpheresToBoxes<MemorySpace>{spheres}};
-
-  Kokkos::View<float *, MemorySpace> accumulator("accumulator", num_rays);
-  bvh.query(exec_space, Rays<MemorySpace>{rays},
-            AccumRaySphereInterDist<MemorySpace>{spheres, accumulator});
-  exec_space.fence();
-  auto time = timer.seconds();
-
-  auto accumulator_avg =
-      ArborX::accumulate(exec_space, accumulator, 0.f) / num_rays;
-
-  printf("time          : %.3f   [%.3fM ray/sec]\n", time,
-         num_rays / (1000000 * time));
-  printf("ray avg       : %.3f\n", accumulator_avg);
-
-  return EXIT_SUCCESS;
-}
diff --git a/arborx/examples/simple_intersection/CMakeLists.txt b/arborx/examples/simple_intersection/CMakeLists.txt
deleted file mode 100644
index 5b76eee46..000000000
--- a/arborx/examples/simple_intersection/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-add_executable(ArborX_Intersection.exe example_intersection.cpp)
-target_link_libraries(ArborX_Intersection.exe ArborX::ArborX)
-add_test(NAME ArborX_Intersection_Example COMMAND ./ArborX_Intersection.exe)
diff --git a/arborx/examples/simple_intersection/example_intersection.cpp b/arborx/examples/simple_intersection/example_intersection.cpp
deleted file mode 100644
index e30aad98b..000000000
--- a/arborx/examples/simple_intersection/example_intersection.cpp
+++ /dev/null
@@ -1,168 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2017-2021 by the ArborX authors                            *
- * All rights reserved.                                                     *
- *                                                                          *
- * This file is part of the ArborX library. ArborX is                       *
- * distributed under a BSD 3-clause license. For the licensing terms see    *
- * the LICENSE file in the top-level directory.                             *
- *                                                                          *
- * SPDX-License-Identifier: BSD-3-Clause                                    *
- ****************************************************************************/
-
-#include <ArborX.hpp>
-
-#include <Kokkos_Core.hpp>
-
-// Perform intersection queries using the same objects for the queries as the
-// objects used in BVH construction that are located on a regular spaced
-// three-dimensional grid.
-// Each box will only intersect with itself.
-//
-// i-2  i-1  i  i+1
-//
-//  o    o   o   o   j+1
-//          ---
-//  o    o | x | o   j
-//          ---
-//  o    o   o   o   j-1
-//
-//  o    o   o   o   j-2
-//
-
-template <typename DeviceType>
-class Boxes
-{
-public:
-  // Create non-intersecting boxes on a 3D cartesian grid
-  // used both for queries and predicates.
-  Boxes(typename DeviceType::execution_space const &execution_space)
-  {
-    float Lx = 100.0;
-    float Ly = 100.0;
-    float Lz = 100.0;
-    int nx = 11;
-    int ny = 11;
-    int nz = 11;
-    int n = nx * ny * nz;
-    float hx = Lx / (nx - 1);
-    float hy = Ly / (ny - 1);
-    float hz = Lz / (nz - 1);
-
-    auto index = [nx, ny](int i, int j, int k) {
-      return i + j * nx + k * (nx * ny);
-    };
-
-    _boxes = Kokkos::View<ArborX::Box *, typename DeviceType::memory_space>(
-        Kokkos::view_alloc(Kokkos::WithoutInitializing, "boxes"), n);
-    auto boxes_host = Kokkos::create_mirror_view(_boxes);
-
-    for (int i = 0; i < nx; ++i)
-      for (int j = 0; j < ny; ++j)
-        for (int k = 0; k < nz; ++k)
-        {
-          ArborX::Point p_lower{
-              {(i - .25) * hx, (j - .25) * hy, (k - .25) * hz}};
-          ArborX::Point p_upper{
-              {(i + .25) * hx, (j + .25) * hy, (k + .25) * hz}};
-          boxes_host[index(i, j, k)] = {p_lower, p_upper};
-        }
-    Kokkos::deep_copy(execution_space, _boxes, boxes_host);
-  }
-
-  // Return the number of boxes.
-  KOKKOS_FUNCTION int size() const { return _boxes.size(); }
-
-  // Return the box with index i.
-  KOKKOS_FUNCTION const ArborX::Box &get_box(int i) const { return _boxes(i); }
-
-private:
-  Kokkos::View<ArborX::Box *, typename DeviceType::memory_space> _boxes;
-};
-
-// For creating the bounding volume hierarchy given a Boxes object, we
-// need to define the memory space, how to get the total number of objects,
-// and how to access a specific box. Since there are corresponding functions in
-// the Boxes class, we just resort to them.
-template <typename DeviceType>
-struct ArborX::AccessTraits<Boxes<DeviceType>, ArborX::PrimitivesTag>
-{
-  using memory_space = typename DeviceType::memory_space;
-  static KOKKOS_FUNCTION int size(Boxes<DeviceType> const &boxes)
-  {
-    return boxes.size();
-  }
-  static KOKKOS_FUNCTION auto get(Boxes<DeviceType> const &boxes, int i)
-  {
-    return boxes.get_box(i);
-  }
-};
-
-// For performing the queries given a Boxes object, we need to define memory
-// space, how to get the total number of queries, and what the query with index
-// i should look like. Since we are using self-intersection (which boxes
-// intersect with the given one), the functions here very much look like the
-// ones in ArborX::AccessTraits<Boxes<DeviceType>, ArborX::PrimitivesTag>.
-template <typename DeviceType>
-struct ArborX::AccessTraits<Boxes<DeviceType>, ArborX::PredicatesTag>
-{
-  using memory_space = typename DeviceType::memory_space;
-  static KOKKOS_FUNCTION int size(Boxes<DeviceType> const &boxes)
-  {
-    return boxes.size();
-  }
-  static KOKKOS_FUNCTION auto get(Boxes<DeviceType> const &boxes, int i)
-  {
-    return intersects(boxes.get_box(i));
-  }
-};
-
-// Now that we have encapsulated the objects and queries to be used within the
-// Boxes class, we can continue with performing the actual search.
-int main()
-{
-  Kokkos::initialize();
-  {
-    using ExecutionSpace = Kokkos::DefaultExecutionSpace;
-    using MemorySpace = typename ExecutionSpace::memory_space;
-    using DeviceType = Kokkos::Device<ExecutionSpace, MemorySpace>;
-    ExecutionSpace execution_space;
-
-    std::cout << "Create grid with bounding boxes" << '\n';
-    Boxes<DeviceType> boxes(execution_space);
-    std::cout << "Bounding boxes set up." << '\n';
-
-    std::cout << "Creating BVH tree." << '\n';
-    ArborX::BVH<MemorySpace> const tree(execution_space, boxes);
-    std::cout << "BVH tree set up." << '\n';
-
-    std::cout << "Starting the queries." << '\n';
-    // The query will resize indices and offsets accordingly
-    Kokkos::View<int *, MemorySpace> indices("indices", 0);
-    Kokkos::View<int *, MemorySpace> offsets("offsets", 0);
-
-    ArborX::query(tree, execution_space, boxes, indices, offsets);
-    std::cout << "Queries done." << '\n';
-
-    std::cout << "Starting checking results." << '\n';
-    auto offsets_host =
-        Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace{}, offsets);
-    auto indices_host =
-        Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace{}, indices);
-
-    unsigned int const n = boxes.size();
-    if (offsets_host.size() != n + 1)
-      Kokkos::abort("Wrong dimensions for the offsets View!\n");
-    for (int i = 0; i < static_cast<int>(n + 1); ++i)
-      if (offsets_host(i) != i)
-        Kokkos::abort("Wrong entry in the offsets View!\n");
-
-    if (indices_host.size() != n)
-      Kokkos::abort("Wrong dimensions for the indices View!\n");
-    for (int i = 0; i < static_cast<int>(n); ++i)
-      if (indices_host(i) != i)
-        Kokkos::abort("Wrong entry in the indices View!\n");
-    std::cout << "Checking results successful." << '\n';
-  }
-
-  Kokkos::finalize();
-}
diff --git a/arborx/examples/viz/CMakeLists.txt b/arborx/examples/viz/CMakeLists.txt
deleted file mode 100644
index 0c637903f..000000000
--- a/arborx/examples/viz/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-if(Kokkos_ENABLE_SERIAL)
-  add_executable(ArborX_TreeViz.exe tree_visualization.cpp)
-  target_link_libraries(ArborX_TreeViz.exe ArborX::ArborX Boost::program_options)
-  add_test(NAME ArborX_TreeViz_Example COMMAND ./ArborX_TreeViz.exe)
-  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/leaf_cloud.txt ${CMAKE_CURRENT_BINARY_DIR}/leaf_cloud.txt COPYONLY)
-  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/arborx_query_sort.py ${CMAKE_CURRENT_BINARY_DIR}/arborx_query_sort.py COPYONLY)
-ENDIF()
diff --git a/arborx/examples/viz/arborx_query_sort.py b/arborx/examples/viz/arborx_query_sort.py
deleted file mode 100755
index 5ab86b2ba..000000000
--- a/arborx/examples/viz/arborx_query_sort.py
+++ /dev/null
@@ -1,121 +0,0 @@
-#!/usr/bin/env python3
-"""arborx_query_sort.py
-
-Usage:
-  arborx_query_sort.py -a ALGO -p PREFIX [-d] [-o OUTPUT_FILE]
-  arborx_query_sort.py (-h | --help)
-
-Options:
-  -h --help                   Show this screen.
-  -a ALGO --algo=ALGO         Query order ['untouched', 'shuffled', 'sorted']
-  -d --display                Display mode
-  -o FILE --output-file=FILE  Output file [default: plot.png]
-  -p PREFIX --prefix=PREFIX   Input file prefix
-"""
-from docopt import docopt
-import subprocess
-import numpy
-import matplotlib.pyplot as plt
-from matplotlib.colors import ListedColormap
-
-
-def read_traversal(filename):
-    nearest_traversal = []
-    replace = {
-        '[internal]': '[style=filled, color=black]',
-        '[leaf]': '[style=filled, color=white]',
-        '[result]': '[style=filled, color=black]',
-    }
-    with open(filename) as fin:
-        def is_commented(line):
-            return line.lstrip(' ').startswith('//')
-
-        def is_edge(line):
-            return line.count('->') > 0
-
-        for line in fin:
-            for old, new in replace.items():
-                line = line.replace(old, new)
-            line = line.rstrip('\n')
-            if line and not is_commented(line) and not is_edge(line):
-                nearest_traversal.append(line)
-    return nearest_traversal
-
-
-def read_tree(filename):
-    tree = []
-    replace = {
-        '[internal]': '[style=filled, color=red]',
-        '[leaf]': '[style=filled, color=green]',
-        '[edge]': '',
-        '[pendant]': '',
-    }
-    with open(filename) as fin:
-        for line in fin:
-            line = line.rstrip('\n')
-            for old, new in replace.items():
-                line = line.replace(old, new)
-            tree.append(line)
-    tree.insert(0, 'digraph g {')
-    tree.insert(1, '    root = i0;')
-    tree.append('}')
-    return tree
-
-
-def append_traversal_to_tree(tree, traversal):
-    for line in traversal:
-        tree.insert(-1, line)
-    return tree
-
-
-if __name__ == '__main__':
-    # Process input
-    options = docopt(__doc__)
-
-    algo = options['--algo']
-    display = options['--display']
-    prefix = options['--prefix']
-    output_file = options['--output-file']
-
-    matrix = {}
-
-    n = int(subprocess.check_output('ls -1 ' + prefix + '*' + algo + '* '
-                                    '| wc -l', shell=True))
-    assert n > 0, 'Could not find any matching files'
-
-    matrix = numpy.zeros((n, n-1))
-    for i in range(n):
-        with open(prefix + '%s_%s_nearest_traversal.dot.m4'
-                  % (algo, i)) as fin:
-            def is_commented(line):
-                return line.lstrip(' ').startswith('//')
-
-            def is_edge(line):
-                return line.count('->') > 0
-
-            count = 0
-            for line in fin:
-                if line and not is_commented(line) and not is_edge(line):
-                    count += 1
-                    line = line.lstrip(' ')
-                    entry = int(line[1:line.find(' ')])
-                    if line[0] is 'i':
-                        matrix[i, entry] = 1
-                    elif line[0] is 'l':
-                        # Uncomment for full matrix with leaves
-                        # matrix[i, n-1 + entry] = 1
-                        continue
-                    else:
-                        raise RuntimeError()
-
-    cmap = ListedColormap(['w', 'r', 'k'])
-
-    plt.matshow(matrix, cmap=cmap)
-    plt.tight_layout()
-
-    if display:
-        plt.show()
-    else:
-        if output_file == "":
-            output_file = algo + '.png'
-        plt.savefig(output_file, bbox_inches='tight')
diff --git a/arborx/examples/viz/leaf_cloud.txt b/arborx/examples/viz/leaf_cloud.txt
deleted file mode 100644
index d2e220d11..000000000
--- a/arborx/examples/viz/leaf_cloud.txt
+++ /dev/null
@@ -1,59 +0,0 @@
-58
-0.5 0.1 0
-0.5 0 0
--0.2 0.4 0
--0.3 0.4 0
--0.5 0.6 0
--0.4 0.6 0
--0.9 0.8 0
--2 0.8 0
--2.4 1 0
--2.3 1.2 0
--1.9 1.3 0
--1.1 1.3 0
--1.1 1.6 0
--1.9 1.6 0
--2.4 1.6 0
--2.6 1.8 0
--2.4 2 0
--2.7 2.3 0
--2.6 2.5 0
--1.7 2.3 0
--1.6 2.5 0
--1.7 2.7 0
--2.6 3 0
--2.5 3.3 0
--2.1 3.2 0
--2 3.3 0
--2.2 3.6 0
--1.9 3.8 0
--1.4 3.4 0
--1.1 3.7 0
--0.95 3.7 0
--1 2.9 0
--0.9 2.7 0
--0.5 3.3 0
--0.3 3.5 0
--0.1 3.4 0
--0.15 3.2 0
-0.05 3.1 0
-0.2 3.15 0
-0.35 3.1 0
-0.15 2.9 0
--0.1 2.7 0
--0.2 2.5 0
--0.25 2.2 0
-0.25 2.5 0
-0.45 2.5 0
-0.5 2.3 0
-0.1 2 0
-0.2 1.7 0
-0.8 2 0
-1.1 1.9 0
-1.1 1.5 0
-0.1 1.2 0
--0.5 1 0
--2.2 1.7 0
--2.3 2.2 0
--0.5 2.2 0
--0 1.7 0
diff --git a/arborx/examples/viz/requirements.txt b/arborx/examples/viz/requirements.txt
deleted file mode 100644
index c45223e74..000000000
--- a/arborx/examples/viz/requirements.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-docopt
-matplotlib
-numpy
diff --git a/arborx/examples/viz/tree_visualization.cpp b/arborx/examples/viz/tree_visualization.cpp
deleted file mode 100644
index 6f5ca14d5..000000000
--- a/arborx/examples/viz/tree_visualization.cpp
+++ /dev/null
@@ -1,182 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2017-2021 by the ArborX authors                            *
- * All rights reserved.                                                     *
- *                                                                          *
- * This file is part of the ArborX library. ArborX is                       *
- * distributed under a BSD 3-clause license. For the licensing terms see    *
- * the LICENSE file in the top-level directory.                             *
- *                                                                          *
- * SPDX-License-Identifier: BSD-3-Clause                                    *
- ****************************************************************************/
-
-#include <ArborX_DetailsKokkosExtAccessibilityTraits.hpp>
-#include <ArborX_DetailsTreeVisualization.hpp>
-#include <ArborX_LinearBVH.hpp>
-
-#include <Kokkos_Core.hpp>
-
-#include <boost/program_options.hpp>
-
-#include <algorithm>
-#include <fstream>
-#include <random>
-
-// FIXME: this is a temporary place for loadPointCloud and writePointCloud
-// Right now, only loadPointCloud is being used, and only in this example
-template <typename DeviceType>
-void loadPointCloud(std::string const &filename,
-                    Kokkos::View<ArborX::Point *, DeviceType> &random_points)
-{
-  std::ifstream file(filename);
-  if (file.is_open())
-  {
-    int size = -1;
-    file >> size;
-    ARBORX_ASSERT(size > 0);
-    Kokkos::realloc(random_points, size);
-    auto random_points_host = Kokkos::create_mirror_view(random_points);
-    for (int i = 0; i < size; ++i)
-      for (int j = 0; j < 3; ++j)
-        file >> random_points(i)[j];
-    Kokkos::deep_copy(random_points, random_points_host);
-  }
-  else
-  {
-    throw std::runtime_error("Cannot open file");
-  }
-}
-
-template <typename Layout, typename DeviceType>
-void writePointCloud(
-    Kokkos::View<ArborX::Point *, Layout, DeviceType> random_points,
-    std::string const &filename)
-
-{
-  static_assert(
-      KokkosExt::is_accessible_from_host<decltype(random_points)>::value,
-      "The View should be accessible on the Host");
-  std::ofstream file(filename);
-  if (file.is_open())
-  {
-    unsigned int const n = random_points.extent(0);
-    for (unsigned int i = 0; i < n; ++i)
-      file << random_points(i)[0] << " " << random_points(i)[1] << " "
-           << random_points(i)[2] << "\n";
-    file.close();
-  }
-}
-
-template <typename View>
-void printPointCloud(View points, std::ostream &os)
-{
-  auto const n = points.extent_int(0);
-  for (int i = 0; i < n; ++i)
-    os << "\\node[leaf] at (" << points(i)[0] << "," << points(i)[1]
-       << ") {\\textbullet};\n";
-}
-
-void viz(std::string const &prefix, std::string const &infile, int n_neighbors)
-{
-  using ExecutionSpace = Kokkos::DefaultHostExecutionSpace;
-  using DeviceType = ExecutionSpace::device_type;
-  Kokkos::View<ArborX::Point *, DeviceType> points("points", 0);
-  loadPointCloud(infile, points);
-
-  ArborX::BVH<Kokkos::HostSpace> bvh{ExecutionSpace{}, points};
-
-  using TreeVisualization =
-      typename ArborX::Details::TreeVisualization<DeviceType>;
-  using TikZVisitor = typename TreeVisualization::TikZVisitor;
-  using GraphvizVisitor = typename TreeVisualization::GraphvizVisitor;
-
-  int const n_queries = bvh.size();
-  if (n_neighbors < 0)
-    n_neighbors = bvh.size();
-  Kokkos::View<ArborX::Nearest<ArborX::Point> *, DeviceType> queries("queries",
-                                                                     n_queries);
-  Kokkos::parallel_for(Kokkos::RangePolicy<ExecutionSpace>(0, n_queries),
-                       KOKKOS_LAMBDA(int i) {
-                         queries(i) = ArborX::nearest(points(i), n_neighbors);
-                       });
-
-  auto performQueries = [&bvh, &queries](std::string const &p,
-                                         std::string const &s) {
-    std::ofstream fout;
-    for (int i = 0; i < queries.extent_int(0); ++i)
-    {
-      std::string const fname = p + std::to_string(i) + s;
-      fout.open(fname, std::fstream::out);
-      TreeVisualization::visit(bvh, queries(i), GraphvizVisitor{fout});
-      fout.close();
-    }
-  };
-
-  std::fstream fout;
-
-  // Print the point cloud
-  fout.open(prefix + "points.tex", std::fstream::out);
-  printPointCloud(points, fout);
-  fout.close();
-
-  // Print the bounding volume hierarchy
-  fout.open(prefix + "bounding_volumes.tex", std::fstream::out);
-  TreeVisualization::visitAllIterative(bvh, TikZVisitor{fout});
-  fout.close();
-
-  // Print the entire tree
-  fout.open(prefix + "tree_all_nodes_and_edges.dot.m4", std::fstream::out);
-  TreeVisualization::visitAllIterative(bvh, GraphvizVisitor{fout});
-  fout.close();
-
-  std::string const suffix = "_nearest_traversal.dot.m4";
-  performQueries(prefix + "untouched_", suffix);
-
-  // Shuffle the queries
-  std::random_device rd;
-  std::mt19937 g(rd());
-  std::shuffle(queries.data(), queries.data() + queries.size(), g);
-  performQueries(prefix + "shuffled_", suffix);
-
-  // Sort them
-  auto permute =
-      ArborX::Details::BatchedQueries<DeviceType>::sortQueriesAlongZOrderCurve(
-          ExecutionSpace{}, bvh.bounds(), queries);
-  queries = ArborX::Details::BatchedQueries<DeviceType>::applyPermutation(
-      ExecutionSpace{}, permute, queries);
-  performQueries(prefix + "sorted_", suffix);
-}
-
-int main(int argc, char *argv[])
-{
-  Kokkos::InitArguments args;
-  args.disable_warnings = true;
-  Kokkos::ScopeGuard guard(args);
-
-  std::string prefix;
-  std::string infile;
-  int n_neighbors;
-  boost::program_options::options_description desc("Allowed options");
-  // clang-format off
-    desc.add_options()
-        ( "help", "produce help message" )
-        ( "prefix", boost::program_options::value<std::string> (&prefix)->default_value("viz_"), "set prefix for output files" )
-        ( "infile", boost::program_options::value<std::string> (&infile)->default_value("leaf_cloud.txt"), "set input point cloud file" )
-        ( "neighbors", boost::program_options::value<int> (&n_neighbors)->default_value(5), "set the number of neighbors to search for (negative value means all)" )
-    ;
-  // clang-format on
-
-  boost::program_options::variables_map vm;
-  boost::program_options::store(
-      boost::program_options::parse_command_line(argc, argv, desc), vm);
-  boost::program_options::notify(vm);
-
-  if (vm.count("help") > 0)
-  {
-    std::cout << desc << "\n";
-    return 1;
-  }
-
-  viz(prefix, infile, n_neighbors);
-
-  return 0;
-}
diff --git a/arborx/scripts/benchmark.py b/arborx/scripts/benchmark.py
deleted file mode 100644
index 3c4dfc619..000000000
--- a/arborx/scripts/benchmark.py
+++ /dev/null
@@ -1,101 +0,0 @@
-#!/usr/bin/env python
-
-import json
-import re
-
-def load_json(filename):
-    with open(filename) as f:
-        try:
-            # Try loading a file using JSON reader
-            data = json.loads(f.read())['benchmarks']
-        except ValueError:
-            # Try loading a file using ASCII reader
-            data = []
-            f.seek(0)   # reset the file as it was messed up above
-            try:
-                for line in f:
-                    # Try to parse only the lines starting with "BM_"
-                    if re.search('^BM_', line) != None:
-                        for timer in ['manual_time', 'manual_time_mean', 'manual_time_median', 'manual_time_stddev']:
-                            m = re.search('(^.*/' + timer + ') .*rate=([0-9.]*)(.*)$', line)
-                            if m != None:
-                                name = m.group(1)
-                                rate = float(m.group(2))
-                                rate_scale = m.group(3)
-                                if rate_scale == 'k/s':
-                                    rate = rate * 1000
-                                elif rate_scale == 'M/s':
-                                    rate = rate * 1000000
-                                else:
-                                    raise Exception('Unknown rate scaling: "' + rate_scale + '"')
-                                data.append({'name' : name, 'rate' : rate})
-                                break
-
-            except RuntimeError as e:
-                raise RuntimeError("Caught an error while parsing on line " + str(lineno) + ": " + e.args[0])
-
-    return data
-
-allowed_geometries = ['filled_box', 'hollow_box']
-allowed_algorithms = ['construction', 'radius_search', 'radius_callback_search', 'knn_search', 'knn_callback_search']
-
-# Geometry is only checked for the source cloud
-# We do not check target cloud geometry as they come in pairs:
-#   filled_box/filled_sphere or hollow_box/hollow_sphere
-def parse_benchmark(json_data, algorithm, implementation, timer_aggregate, geometry, num_radius_passes = 2):
-    if geometry not in allowed_geometries:
-        raise Exception('Unknown geometry: "' + geometry + '"')
-    if algorithm not in allowed_algorithms:
-        raise Exception('Unknown algorithm: "' + algorithm + '"')
-
-    geometries = { 'filled_box' : '0', 'hollow_box' : '1', 'filled_sphere' : '2', 'hollow_sphere' : '3' }
-
-    # Escape () in implementation string
-    implementation = implementation.translate(str.maketrans({"(" : "\(", ")" : "\)", "%" : "\%" }))
-
-    sorted = 1
-
-    # Templates:
-    # BM_construction<ArborX::BVH<_DeviceType_>>/_num_primitives_/_source_point_cloud_type_
-    construction_template = algorithm + '<.*' + implementation + '[^/]*/([^/]*)/' + geometries[geometry] + '/'
-    # BM_knn_search<ArborX::BVH<_DeviceType_>>/_num_primitives_/_num_predicates_/_n_neighbors_/_sort_predicate_/_source_point_cloud_type_/_target_point_cloud_type_
-    knn_template = algorithm + '<.*' + implementation + '[^/]*/([^/]*)/([^/]*)/[^/]*/' + str(sorted) + '/' + geometries[geometry] + '/'
-    # BM_knn_search<ArborX::BVH<_DeviceType_>>/_num_primitives_/_num_predicates_/_n_neighbors_/_sort_predicates_/_buffer_size_/_source_point_cloud_type_/_target_point_cloud_type_
-    # we consider (2P) to be represented by buffer_size = 0
-    radius_template_1P = algorithm + '<.*' + implementation + '[^/]*/([^/]*)/([^/]*)/[^/]*/' + str(sorted) + '/[^0][^/]+/' + geometries[geometry] + '/'
-    radius_template_2P = algorithm + '<.*' + implementation + '[^/]*/([^/]*)/([^/]*)/[^/]*/' + str(sorted) + '/0/' + geometries[geometry] + '/'
-
-    num_primitives = []
-    num_predicates = []
-    rates    = []
-
-    for benchmark in json_data:
-        name = benchmark['name']
-
-        # For Google Benchmark v1.5, one could do
-        #  if benchmark['run_type'] != 'aggregate' or benchmark['aggregate_name'] != timer_aggregate:
-            #  continue
-        if re.search(timer_aggregate, name) == None:
-            continue
-
-        if algorithm == 'construction' and re.search(algorithm, name) != None:
-            m = re.search(construction_template, name)
-            if m != None:
-                num_primitives.append(int(m.group(1)))
-                rates.append(benchmark['rate'])
-
-        elif (algorithm == 'knn_search' or algorithm == 'knn_callback_search') and re.search(algorithm, name) != None:
-            m = re.search(knn_template, name)
-            if m != None:
-                num_primitives.append(int(m.group(1)))
-                num_predicates.append(int(m.group(2)))
-                rates.append(benchmark['rate'])
-
-        elif (algorithm == 'radius_search' or algorithm == 'radius_callback_search') and re.search(algorithm, name) != None:
-            m = re.search(radius_template_2P if num_radius_passes == 2 else radius_template_1P, name)
-            if m != None:
-                num_primitives.append(int(m.group(1)))
-                num_predicates.append(int(m.group(2)))
-                rates.append(benchmark['rate'])
-
-    return num_primitives, num_predicates, rates
diff --git a/arborx/scripts/benchmark_plot.py b/arborx/scripts/benchmark_plot.py
deleted file mode 100755
index 3f3dd2140..000000000
--- a/arborx/scripts/benchmark_plot.py
+++ /dev/null
@@ -1,199 +0,0 @@
-#!/usr/bin/env python3
-"""benchmark_plot.py
-
-Usage:
-  benchmark_plot.py -a ALGORITHM [-b BACKENDS...] -g GEOMETRY -i INPUT... [-n] [-e] [-t TITLE] [-o OUTPUT_FILE]
-  benchmark_plot.py (-h | --help)
-
-Options:
-  -h --help                         Show this screen.
-  -a ALGORITHM --algo ALGORITHM     Algorithm ['construction', 'radius_search', 'radius_callback_search', 'knn_search', 'knn_callback_search']
-  -b BACKENDS --backends BACKENDS   Backends to parse [default: all]
-  -g GEOMETRY --geometry GEOMETRY   Geometry (source cloud) ['filled_box', 'hollow_box']
-  -i FILE --input-files=FILE        Input file(s) containing benchmark results in JSON format
-  -n --numbers                      Plot numbers [default: False]
-  -e --errors                       Plot error bars [default: False]
-  -o FILE --output-file=FILE        Output file
-  -t TITLE --title=TITLE            Plot title
-"""
-import matplotlib.pyplot as plt
-import numpy as np
-import math
-import re
-from docopt import docopt
-
-from benchmark import load_json, parse_benchmark, allowed_algorithms, allowed_geometries
-
-def find_available_backends(input_jsons):
-    arborx_backend_regex = "[^<]*<ArborX::BVH<([^>]*)>.*"
-
-    backends = set()
-    for input_json in input_jsons:
-        for benchmark in input_json:
-            search_result = re.search(arborx_backend_regex, benchmark['name'])
-            if search_result != None:
-                backends.add(search_result.group(1))
-    backends = list(backends)
-    backends.sort()
-
-    return backends
-
-class NotMatchingValuesAndPredicatesSizesException(Exception):
-    def __init__(self, message, i, backend):
-        super().__init__(message)
-        self.i = i
-        self.backend = backend
-
-def populate_data(input_jsons, backends):
-    all_num_primitives  = []
-    all_rates = []
-    all_errors = []
-
-    for i in range(len(backends)):
-        # For every backend, find all (num_primitives, rate, error) in all input files
-        backend = backends[i]
-
-        backend_num_primitives = []
-        backend_rates = []
-        backend_errors = []
-
-        implementation = 'ArborX::BVH<' + backend + '>'
-        for i in range(len(input_jsons)):
-            file_num_primitives, file_num_predicates, file_rates  = parse_benchmark(input_jsons[i], algorithm, implementation, 'median', geometry)
-            _,                   _,                   file_errors = parse_benchmark(input_jsons[i], algorithm, implementation, 'stddev', geometry)
-            if algorithm != 'construction' and file_num_primitives != file_num_predicates:
-                raise NotMatchingValuesAndPredicatesSizesException("", i, backend)
-
-            backend_num_primitives = backend_num_primitives +  file_num_primitives
-            backend_rates = backend_rates + file_rates
-            backend_errors = backend_errors + file_errors
-
-        all_num_primitives.append(backend_num_primitives)
-        all_rates.append(backend_rates)
-        all_errors.append(backend_errors)
-
-    num_unique_primitives = []
-    for i in range(len(all_num_primitives)):
-        num_unique_primitives = num_unique_primitives + all_num_primitives[i]
-    num_unique_primitives = list(set(num_unique_primitives))
-    num_unique_primitives.sort()
-
-    return num_unique_primitives, all_num_primitives, all_rates, all_errors,
-
-def backends_comparison_rate_figure(input_files, algorithm, geometry, backends, plot_numbers = False, plot_errors = True):
-    # Read in files to produce JSON
-    input_jsons = []
-    for input_file in input_files:
-        input_jsons.append(load_json(input_file))
-
-    # Phase 0: parse backends
-    backends = backends
-    if backends[0] == "all":
-        # Figure out a list of available backends by populating a set by
-        # searching a regular expression in all input files
-        backends = find_available_backends(input_jsons)
-
-    # Phase 1: data setup
-    try:
-        num_unique_primitives, all_num_primitives, all_rates, all_errors = populate_data(input_jsons, backends)
-    except NotMatchingValuesAndPredicatesSizesException as e:
-        raise Exception('The number of predicates does not match the number of primitives for "' + e.backend + '" in "' +  input_files[e.i] + "'")
-    n_unique = len(num_unique_primitives)
-
-    # If the same data point (algorithm, backend, num_sources) is present in
-    # multiple files, choose only the last one for plotting
-    y_scaling = 10**6
-    rates = np.zeros([len(backends), n_unique])
-    errors = np.zeros([len(backends), 2, n_unique])
-    for i in range(0, len(backends)):
-        for j in range(0, len(all_num_primitives[i])):
-            index = num_unique_primitives.index(all_num_primitives[i][j])
-            rates[i, index] = all_rates[i][j]/y_scaling
-            errors[i, 0, index] = 1 - all_errors[i][j]/all_rates[i][j]
-            errors[i, 1, index] = 1 + all_errors[i][j]/all_rates[i][j]
-
-    # Phase 2: plot generation
-    plt.figure(figsize=(max(n_unique, 6), 5))
-
-    ax = plt.subplot(111)
-    patterns = ('/', 'x', '\\', '.', 'o', 'O')
-
-    def autolabel(rects):
-        """Attach a text label above each bar in *rects*, displaying its height."""
-        for rect in rects:
-            height = round(rect.get_height(),1)
-            ax.annotate('{}'.format(height),
-                        xy=(rect.get_x() + rect.get_width() / 2, rect.get_height()),
-                        xytext=(0, 3),  # 3 points vertical offset
-                        textcoords="offset points",
-                        ha='center', va='bottom',
-                        fontsize=18)
-
-    # Create TeX-style label
-    def primitive_label(n):
-        e = math.floor(math.log(n + 1, 10))
-        r = math.floor(n/10**e)
-        return (str(r) + '$\cdot $' if r > 1 else '') +  '$10^' + str(e) + '$'
-
-    width = 0.6
-    scale = 1/len(backends)
-    for i in range(0, len(backends)):
-        barplot = ax.bar(np.arange(n_unique) + scale*(i-.5*(len(backends)-1)) * width,
-                         width=scale*width*np.ones(n_unique), height=rates[i, :],
-                         yerr=(errors[i, :] if plot_errors == True else None),
-                         capsize=5, hatch=patterns[i % len(patterns)],
-                         edgecolor='k',
-                         error_kw=dict(ecolor='gray', lw=2, capsize=5, capthick=2),
-                         label=backends[i])
-
-        if plot_numbers:
-            autolabel(barplot)
-
-    ax.legend(loc='upper left', fontsize=20)
-
-    ax.set_xlabel('Number of indexed objects', fontsize=20)
-    plt.xticks(fontsize=18)
-    ax.set_xticks(np.arange(n_unique))
-    ax.set_xticklabels([primitive_label(size) for size in num_unique_primitives])
-    ax.tick_params(axis='x', which='major', bottom='off', top='off')
-    ax.set_xlim([-0.5, n_unique - 0.5])
-
-    ax.set_ylabel('Rate (million queries/second)', fontsize=20)
-    plt.yticks(fontsize=18)
-    ax.yaxis.grid('on')
-    ax.set_ylim([0, 1.1*ax.get_ylim()[1]])
-
-if __name__ == '__main__':
-
-    # Process input
-    options = docopt(__doc__)
-
-    algorithm = options['--algo']
-    backends = options['--backends']
-    geometry = options['--geometry']
-    input_files = options['--input-files']
-    output_file = options['--output-file']
-    plot_numbers = options['--numbers']
-    plot_errors = options['--errors']
-    plot_title = options['--title']
-
-    # Check input
-    if geometry not in allowed_geometries:
-        raise Exception('Unknown geometry: "' + geometry + '". Allowed values are ' + str(allowed_geometries))
-
-    if algorithm not in allowed_algorithms:
-        raise Exception('Unknown algorithm: "' + algorithm + '". Allowed values are ' + str(allowed_algorithms))
-
-    backends_comparison_rate_figure(input_files, algorithm=algorithm, geometry=geometry,
-        backends=backends, plot_numbers=plot_numbers, plot_errors=plot_errors)
-
-    if plot_title != None:
-        plt.title(plot_title, fontsize=18)
-    else:
-        plt.title(algorithm, fontsize=18)
-
-    plt.tight_layout()
-    if output_file:
-        plt.savefig(output_file, bbox_inches='tight', dpi=600)
-    else:
-        plt.show()
diff --git a/arborx/scripts/check_format_cpp.sh b/arborx/scripts/check_format_cpp.sh
deleted file mode 100755
index f96e8027d..000000000
--- a/arborx/scripts/check_format_cpp.sh
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/usr/bin/env bash
-
-clang_format_executable=${CLANG_FORMAT_EXE:-clang-format}
-
-this_program=$(basename "$0")
-usage="Usage:
-  $this_program [options] -- check format of the C++ source files
-
-Options:
-    -h --help         Print help and exit
-    -q --quiet        Quiet mode (do not print the diff)
-    -p --apply-patch  Apply diff patch to the source files"
-
-verbose=1
-apply_patch=0
-
-#echo "Arguments: $# $@"
-
-while [ $# -gt 0 ]
-do
-  case $1 in
-  -p|--apply-patch)
-      apply_patch=1
-      ;;
-  -q|--quiet)
-      verbose=0
-      ;;
-  -h|--help)
-      echo "$usage"
-      exit 0
-      ;;
-  *)
-      echo "$this_program: Unknown argument '$1'. See '$this_program --help'."
-      exit -1
-      ;;
-  esac
-
-  shift
-done
-
-# stop right here if clang-format does not exist in $PATH
-command -v $clang_format_executable >/dev/null 2>&1 || { echo >&2 "clang-format executable '$clang_format_executable' not found.  Aborting."; exit 1; }
-
-# shamelessy redirecting everything to /dev/null in quiet mode
-if [ $verbose -eq 0 ]; then
-    exec &>/dev/null
-fi
-
-cpp_source_files=$(git ls-files | grep -E "\.hpp$|\.cpp$|\.h$|\.c$" | grep -v -f .clang-format-ignore)
-
-unformatted_files=()
-for file in $cpp_source_files; do
-    diff -u \
-        <(cat $file) \
-        --label a/$file \
-        <($clang_format_executable $file) \
-        --label b/$file >&1
-    if [ $? -eq 1 ]; then
-        unformatted_files+=($file)
-    fi
-done
-
-n_unformatted_files=${#unformatted_files[@]}
-if [ $n_unformatted_files -ne 0 ]; then
-    echo "${#unformatted_files[@]} file(s) not formatted properly:"
-    for file in ${unformatted_files[@]}; do
-        echo "    $file"
-        if [ $apply_patch -eq 1 ]; then
-            $clang_format_executable -i $file
-        fi
-    done
-else
-    echo "OK"
-fi
-exit $n_unformatted_files
diff --git a/arborx/scripts/docker_cmake b/arborx/scripts/docker_cmake
deleted file mode 100644
index 2c1c27604..000000000
--- a/arborx/scripts/docker_cmake
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-EXTRA_ARGS=("$@")
-
-rm -f  CMakeCache.txt
-rm -rf CMakeFiles/
-
-ARGS=(
-    -D CMAKE_BUILD_TYPE=Debug
-    -D BUILD_SHARED_LIBS=ON
-
-    ### TPLs
-    -D CMAKE_PREFIX_PATH="$KOKKOS_DIR;$BENCHMARK_DIR;$BOOST_DIR"
-    -D ARBORX_ENABLE_MPI=ON
-
-    ### COMPILERS AND FLAGS ###
-    -D CMAKE_CXX_COMPILER_LAUNCHER=ccache
-    -D CMAKE_CXX_COMPILER="$KOKKOS_DIR/bin/nvcc_wrapper"
-    -D CMAKE_CXX_FLAGS="-Wall -Wextra -Wpedantic"
-
-    ### MISC ###
-    -D MPIEXEC_PREFLAGS="--allow-run-as-root"
-)
-
-cmake "${ARGS[@]}" "${EXTRA_ARGS[@]}" "${ARBORX_DIR}"
diff --git a/arborx/scripts/requirements.txt b/arborx/scripts/requirements.txt
deleted file mode 100644
index c45223e74..000000000
--- a/arborx/scripts/requirements.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-docopt
-matplotlib
-numpy
diff --git a/arborx/test/ArborXTest_TreeTypeTraits.hpp b/arborx/test/ArborXTest_TreeTypeTraits.hpp
deleted file mode 100644
index c6d1b07dc..000000000
--- a/arborx/test/ArborXTest_TreeTypeTraits.hpp
+++ /dev/null
@@ -1,85 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2017-2021 by the ArborX authors                            *
- * All rights reserved.                                                     *
- *                                                                          *
- * This file is part of the ArborX library. ArborX is                       *
- * distributed under a BSD 3-clause license. For the licensing terms see    *
- * the LICENSE file in the top-level directory.                             *
- *                                                                          *
- * SPDX-License-Identifier: BSD-3-Clause                                    *
- ****************************************************************************/
-
-#ifndef ARBORX_TEST_TREE_TYPE_TRAITS_HPP
-#define ARBORX_TEST_TREE_TYPE_TRAITS_HPP
-
-#include <ArborX.hpp>
-
-#include <tuple>
-
-// NOTE Because std::tuple does not take template template parameters
-template <template <class> class...>
-struct Tuple
-{
-};
-
-#ifndef ARBORX_TEST_TREE_TYPES
-// NOTE Emulate resulting name from using ArborX::BoundingVolumeHierarchy as
-// template parameter in Boost.Test
-template <class MemorySpace>
-using ArborX__BoundingVolumeHierarchy =
-    ArborX::BoundingVolumeHierarchy<MemorySpace>;
-#define ARBORX_TEST_TREE_TYPES Tuple<ArborX__BoundingVolumeHierarchy>
-#endif
-
-#ifndef ARBORX_TEST_DEVICE_TYPES
-#define ARBORX_TEST_DEVICE_TYPES                                               \
-  std::tuple<Kokkos::DefaultExecutionSpace::device_type>
-#endif
-
-template <template <class> class Tree, class DeviceType>
-struct TreeExecutionAndMemorySpaces
-// NOTE The name of this class will be part of the resulting name of the unit
-// test produced by Boost.Test, such as
-//
-// clang-format off
-// test_case_name<this_class_name<ArborX__BVH_ Kokkos__Device<Kokkos__Cuda_ Kokkos__CudaSpace>>>*
-// clang-format on
-{
-  static_assert(Kokkos::is_device<DeviceType>{}, "");
-  using device_type = DeviceType;
-  using execution_space = typename DeviceType::execution_space;
-  using memory_space = typename DeviceType::memory_space;
-  using type = Tree<memory_space>;
-};
-
-template <class...>
-struct Concatenate;
-
-template <class... Ts, class... Us>
-struct Concatenate<std::tuple<Ts...>, std::tuple<Us...>>
-{
-  using type = std::tuple<Ts..., Us...>;
-};
-
-template <class T, class U>
-struct CartesianProduct;
-
-template <class... Us>
-struct CartesianProduct<Tuple<>, std::tuple<Us...>>
-{
-  using type = std::tuple<>;
-};
-
-template <template <class> class T, template <class> class... Ts, class... Us>
-struct CartesianProduct<Tuple<T, Ts...>, std::tuple<Us...>>
-{
-  using type = typename Concatenate<
-      std::tuple<TreeExecutionAndMemorySpaces<T, Us>...>,
-      typename CartesianProduct<Tuple<Ts...>, std::tuple<Us...>>::type>::type;
-};
-
-using TreeTypeTraitsList =
-    typename CartesianProduct<ARBORX_TEST_TREE_TYPES,
-                              ARBORX_TEST_DEVICE_TYPES>::type;
-
-#endif
diff --git a/arborx/test/ArborX_BoostGeometryAdapters.hpp b/arborx/test/ArborX_BoostGeometryAdapters.hpp
deleted file mode 100644
index 2ef0040c1..000000000
--- a/arborx/test/ArborX_BoostGeometryAdapters.hpp
+++ /dev/null
@@ -1,97 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2017-2021 by the ArborX authors                            *
- * All rights reserved.                                                     *
- *                                                                          *
- * This file is part of the ArborX library. ArborX is                       *
- * distributed under a BSD 3-clause license. For the licensing terms see    *
- * the LICENSE file in the top-level directory.                             *
- *                                                                          *
- * SPDX-License-Identifier: BSD-3-Clause                                    *
- ****************************************************************************/
-
-#ifndef ARBORX_BOOST_GEOMETRY_ADAPTERS_HPP
-#define ARBORX_BOOST_GEOMETRY_ADAPTERS_HPP
-
-#include <ArborX_Box.hpp>
-#include <ArborX_Point.hpp>
-
-#include <boost/geometry.hpp>
-
-namespace boost
-{
-namespace geometry
-{
-namespace traits
-{
-// Adapt ArborX::Point to Boost.Geometry
-template <>
-struct tag<ArborX::Point>
-{
-  using type = point_tag;
-};
-
-template <>
-struct coordinate_type<ArborX::Point>
-{
-  using type = float;
-};
-
-template <>
-struct coordinate_system<ArborX::Point>
-{
-  using type = cs::cartesian;
-};
-
-template <>
-struct dimension<ArborX::Point> : boost::mpl::int_<3>
-{
-};
-
-template <size_t D>
-struct access<ArborX::Point, D>
-{
-  static inline float get(ArborX::Point const &p) { return p[D]; }
-
-  static inline void set(ArborX::Point &p, float value) { p[D] = value; }
-};
-
-// Adapt ArborX::Box to Boost.Geometry
-template <>
-struct tag<ArborX::Box>
-{
-  using type = box_tag;
-};
-
-template <>
-struct point_type<ArborX::Box>
-{
-  using type = ArborX::Point;
-};
-
-template <size_t D>
-struct indexed_access<ArborX::Box, min_corner, D>
-{
-  static inline float get(ArborX::Box const &b) { return b.minCorner()[D]; }
-
-  static inline void set(ArborX::Box &b, float value)
-  {
-    b.minCorner()[D] = value;
-  }
-};
-
-template <size_t D>
-struct indexed_access<ArborX::Box, max_corner, D>
-{
-  static inline float get(ArborX::Box const &b) { return b.maxCorner()[D]; }
-
-  static inline void set(ArborX::Box &b, float value)
-  {
-    b.maxCorner()[D] = value;
-  }
-};
-
-} // namespace traits
-} // namespace geometry
-} // namespace boost
-
-#endif
diff --git a/arborx/test/ArborX_BoostRTreeHelpers.hpp b/arborx/test/ArborX_BoostRTreeHelpers.hpp
deleted file mode 100644
index 030175c81..000000000
--- a/arborx/test/ArborX_BoostRTreeHelpers.hpp
+++ /dev/null
@@ -1,337 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2017-2021 by the ArborX authors                            *
- * All rights reserved.                                                     *
- *                                                                          *
- * This file is part of the ArborX library. ArborX is                       *
- * distributed under a BSD 3-clause license. For the licensing terms see    *
- * the LICENSE file in the top-level directory.                             *
- *                                                                          *
- * SPDX-License-Identifier: BSD-3-Clause                                    *
- ****************************************************************************/
-
-#ifndef ARBORX_BOOST_RTREE_HELPERS_HPP
-#define ARBORX_BOOST_RTREE_HELPERS_HPP
-
-#include <ArborX_Config.hpp>
-
-#include "ArborX_BoostGeometryAdapters.hpp"
-#include "ArborX_BoostRangeAdapters.hpp"
-#include <ArborX_Box.hpp>
-#include <ArborX_DetailsKokkosExtAccessibilityTraits.hpp> // is_accessible_from_host
-#include <ArborX_DetailsUtils.hpp> // exclusivePrefixSum, lastElement
-#include <ArborX_Point.hpp>
-#include <ArborX_Predicates.hpp>
-
-#include <boost/range/adaptors.hpp>
-#include <boost/range/algorithm/copy.hpp>
-#include <boost/range/algorithm/transform.hpp>
-#include <boost/range/combine.hpp>
-
-#ifdef ARBORX_ENABLE_MPI
-#include <mpi.h>
-#endif
-
-namespace BoostRTreeHelpers
-{
-// NOTE: The balancing algorithm does not really matter since the tree is
-// created using packing algorithm and there is no later insertion of new
-// objects into the tree.  The values of the maximum and the minimum number
-// of elements could be adjusted in principle but I didn't bother setting
-// this type as a template argument.
-using Parameter = boost::geometry::index::linear<16>;
-
-template <typename Value, typename Index>
-struct PairMaker
-{
-  using result_type = std::pair<Value, Index>;
-  template <typename T>
-  inline result_type operator()(T const &v) const
-  {
-    return result_type(v.value(), v.index());
-  }
-};
-
-template <typename Indexable>
-using RTree =
-    boost::geometry::index::rtree<std::pair<Indexable, int>, Parameter>;
-
-template <typename View>
-static RTree<typename View::value_type> makeRTree(View const &objects)
-{
-  using Indexable = typename View::value_type;
-  return RTree<Indexable>(
-      objects | boost::adaptors::indexed() |
-      boost::adaptors::transformed(PairMaker<Indexable, int>()));
-}
-
-// NOTE: Boost.Config defines BOOST_NO_CXX11_VARIADIC_TEMPLATES for nvcc
-// with the current version of CUDA we are using.  In consequence we are
-// not able to use std::tuple<Indexable, ...> which is unfortunate :(
-class AppendRankToPairObjectIndex
-{
-public:
-  AppendRankToPairObjectIndex(int rank)
-      : _rank(rank)
-  {
-  }
-
-  template <typename T1, typename T2>
-  inline boost::tuple<T1, T2, int> operator()(std::pair<T1, T2> const &p) const
-  {
-    return boost::make_tuple(std::get<0>(p), std::get<1>(p), _rank);
-  }
-
-private:
-  int _rank = -1;
-};
-
-#ifdef ARBORX_ENABLE_MPI
-template <typename Indexable>
-using ParallelRTree =
-    boost::geometry::index::rtree<boost::tuple<Indexable, int, int>, Parameter>;
-
-template <typename View>
-static ParallelRTree<typename View::value_type> makeRTree(MPI_Comm comm,
-                                                          View const &objects)
-{
-  using Indexable = typename View::value_type;
-
-  // Fill buffer with pair (object, index)
-  std::vector<std::pair<Indexable, int>> buffer;
-  boost::copy(objects | boost::adaptors::indexed() |
-                  boost::adaptors::transformed(PairMaker<Indexable, int>()),
-              std::back_inserter(buffer));
-
-  // Gather all buffers
-  int comm_size;
-  MPI_Comm_size(comm, &comm_size);
-  int comm_rank;
-  MPI_Comm_rank(comm, &comm_rank);
-  std::vector<int> counts(comm_size);
-  counts[comm_rank] = buffer.size();
-  MPI_Allgather(MPI_IN_PLACE, 0, MPI_DATATYPE_NULL, counts.data(), 1, MPI_INT,
-                comm);
-  std::vector<int> offsets(comm_size + 1);
-  offsets[0] = 0;
-  for (int i = 0; i < comm_size; ++i)
-    offsets[i + 1] = counts[i] + offsets[i];
-  decltype(buffer) all_buffers(offsets.back());
-  auto const bytes_per_element = sizeof(typename decltype(buffer)::value_type);
-  for (auto *pv : {&counts, &offsets})
-    for (auto &x : *pv)
-      x *= bytes_per_element;
-  MPI_Allgatherv(buffer.data(), counts[comm_rank], MPI_BYTE, all_buffers.data(),
-                 counts.data(), offsets.data(), MPI_BYTE, comm);
-  for (auto &x : offsets)
-    x /= bytes_per_element;
-
-  std::vector<boost::tuple<Indexable, int, int>> all_objects;
-  for (int i = 0; i < comm_size; ++i)
-    boost::transform(std::make_pair(all_buffers.data() + offsets[i],
-                                    all_buffers.data() + offsets[i + 1]),
-                     std::back_inserter(all_objects),
-                     AppendRankToPairObjectIndex(i));
-
-  return ParallelRTree<Indexable>(all_objects);
-}
-#endif
-
-template <typename Value>
-struct UnaryPredicate
-{
-  using Function = std::function<bool(Value const &)>;
-  UnaryPredicate(Function pred)
-      : _pred(pred)
-  {
-  }
-  inline bool operator()(Value const &val) const { return _pred(val); }
-  Function _pred;
-};
-
-template <typename Value>
-static auto translate(ArborX::Intersects<ArborX::Sphere> const &query)
-{
-  auto const sphere = getGeometry(query);
-  auto const radius = sphere.radius();
-  auto const centroid = sphere.centroid();
-  ArborX::Box box;
-  ArborX::Details::expand(box, sphere);
-  return boost::geometry::index::intersects(box) &&
-         boost::geometry::index::satisfies(
-             UnaryPredicate<Value>([centroid, radius](Value const &val) {
-               boost::geometry::index::indexable<Value> indexableGetter;
-               auto const &geometry = indexableGetter(val);
-               return boost::geometry::distance(centroid, geometry) <= radius;
-             }));
-}
-
-template <typename Value>
-static auto translate(ArborX::Intersects<ArborX::Box> const &query)
-{
-  ArborX::Box const &box = getGeometry(query);
-  return boost::geometry::index::intersects(box);
-}
-
-template <typename Value, typename Geometry>
-static auto translate(ArborX::Nearest<Geometry> const &query)
-{
-  auto const geometry = getGeometry(query);
-  auto const k = getK(query);
-  return boost::geometry::index::nearest(geometry, k);
-}
-
-template <typename Indexable, typename InputView,
-          typename OutputView = Kokkos::View<int *, Kokkos::HostSpace>>
-static std::tuple<OutputView, OutputView>
-performQueries(RTree<Indexable> const &rtree, InputView const &queries)
-{
-  static_assert(KokkosExt::is_accessible_from_host<InputView>::value, "");
-
-  using Value = typename RTree<Indexable>::value_type;
-  auto const n_queries = queries.extent_int(0);
-  OutputView offset("offset", n_queries + 1);
-  std::vector<Value> returned_values;
-  for (int i = 0; i < n_queries; ++i)
-    offset(i) = rtree.query(translate<Value>(queries(i)),
-                            std::back_inserter(returned_values));
-  using ExecutionSpace = typename InputView::execution_space;
-  ArborX::exclusivePrefixSum(ExecutionSpace{}, offset);
-  auto const n_results = ArborX::lastElement(offset);
-  OutputView indices("indices", n_results);
-  for (int i = 0; i < n_queries; ++i)
-    for (int j = offset(i); j < offset(i + 1); ++j)
-      indices(j) = returned_values[j].second;
-  return std::make_tuple(offset, indices);
-}
-
-#ifdef ARBORX_ENABLE_MPI
-template <typename Indexable, typename InputView,
-          typename OutputView1 =
-              Kokkos::View<Kokkos::pair<int, int> *, Kokkos::HostSpace>,
-          typename OutputView2 = Kokkos::View<int *, Kokkos::HostSpace>>
-static std::tuple<OutputView2, OutputView1>
-performQueries(ParallelRTree<Indexable> const &rtree, InputView const &queries)
-{
-  static_assert(KokkosExt::is_accessible_from_host<InputView>::value, "");
-  using Value = typename ParallelRTree<Indexable>::value_type;
-  auto const n_queries = queries.extent_int(0);
-  OutputView2 offset("offset", n_queries + 1);
-  std::vector<Value> returned_values;
-  for (int i = 0; i < n_queries; ++i)
-    offset(i) = rtree.query(translate<Value>(queries(i)),
-                            std::back_inserter(returned_values));
-  using ExecutionSpace = typename InputView::execution_space;
-  ArborX::exclusivePrefixSum(ExecutionSpace{}, offset);
-  auto const n_results = ArborX::lastElement(offset);
-  OutputView1 values("values", n_results);
-  for (int i = 0; i < n_queries; ++i)
-    for (int j = offset(i); j < offset(i + 1); ++j)
-    {
-      int index;
-      int rank;
-      boost::tie(boost::tuples::ignore, index, rank) = returned_values[j];
-      values(j) = {index, rank};
-    }
-  return std::make_tuple(offset, values);
-}
-#endif
-} // end namespace BoostRTreeHelpers
-
-namespace BoostExt
-{
-
-// FIXME Goal is to match the BVH interface
-template <typename Indexable>
-class RTree
-{
-public:
-  using DeviceType = Kokkos::DefaultHostExecutionSpace::device_type;
-  using memory_space = typename DeviceType::memory_space;
-
-  template <typename ExecutionSpace>
-  RTree(ExecutionSpace, Kokkos::View<Indexable *, DeviceType> const &values)
-  {
-    static_assert(Kokkos::is_execution_space<ExecutionSpace>::value, "");
-
-    _tree = BoostRTreeHelpers::makeRTree(values);
-  }
-
-  // WARNING trailing pack will match anything :/
-  template <typename ExecutionSpace, typename Predicates, typename InputView,
-            typename... TrailingArgs>
-  void query(ExecutionSpace const &, Predicates const &predicates,
-             InputView &indices, InputView &offset, TrailingArgs &&...) const
-  {
-    static_assert(Kokkos::is_execution_space<ExecutionSpace>::value, "");
-
-    std::tie(offset, indices) =
-        BoostRTreeHelpers::performQueries(_tree, predicates);
-  }
-
-  template <typename ExecutionSpace, typename Predicates, typename Callback,
-            typename... TrailingArgs>
-  void query(ExecutionSpace const &, Predicates const &, Callback const &,
-             TrailingArgs &&...) const
-  {
-    static_assert(Kokkos::is_execution_space<ExecutionSpace>::value, "");
-
-    throw std::runtime_error(
-        "Boost RTree does not support callback only query overload.");
-  }
-
-private:
-  BoostRTreeHelpers::RTree<Indexable> _tree;
-};
-
-#ifdef ARBORX_ENABLE_MPI
-template <typename Indexable>
-class ParallelRTree
-{
-public:
-  using DeviceType = Kokkos::DefaultHostExecutionSpace::device_type;
-  using memory_space = typename DeviceType::memory_space;
-
-  template <typename ExecutionSpace>
-  ParallelRTree(MPI_Comm comm, ExecutionSpace const &,
-                Kokkos::View<Indexable *, DeviceType> const &values)
-  {
-    static_assert(Kokkos::is_execution_space<ExecutionSpace>::value, "");
-
-    _tree = BoostRTreeHelpers::makeRTree(comm, values);
-  }
-
-  // WARNING trailing pack will match anything :/
-  template <typename ExecutionSpace, typename Predicates, typename InputView1,
-            typename InputView2, typename... TrailingArgs>
-  void query(ExecutionSpace const &, Predicates const &predicates,
-             InputView1 &indices, InputView2 &offset, TrailingArgs &&...) const
-  {
-    static_assert(Kokkos::is_execution_space<ExecutionSpace>::value, "");
-
-    std::tie(offset, indices) =
-        BoostRTreeHelpers::performQueries(_tree, predicates);
-  }
-
-private:
-  BoostRTreeHelpers::ParallelRTree<Indexable> _tree;
-};
-#endif
-
-} // namespace BoostExt
-
-namespace ArborX
-{
-// Specialization of ArborX::query
-template <typename Indexable, typename ExecutionSpace, typename Predicates,
-          typename InputView, typename... TrailingArgs>
-inline void query(BoostExt::RTree<Indexable> const &rtree,
-                  ExecutionSpace const &space, Predicates const &predicates,
-                  InputView &indices, InputView &offset,
-                  TrailingArgs &&... args)
-{
-  rtree.query(space, predicates, indices, offset,
-              std::forward<TrailingArgs>(args)...);
-}
-} // namespace ArborX
-
-#endif
diff --git a/arborx/test/ArborX_BoostRangeAdapters.hpp b/arborx/test/ArborX_BoostRangeAdapters.hpp
deleted file mode 100644
index 0832d336a..000000000
--- a/arborx/test/ArborX_BoostRangeAdapters.hpp
+++ /dev/null
@@ -1,135 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2017-2021 by the ArborX authors                            *
- * All rights reserved.                                                     *
- *                                                                          *
- * This file is part of the ArborX library. ArborX is                       *
- * distributed under a BSD 3-clause license. For the licensing terms see    *
- * the LICENSE file in the top-level directory.                             *
- *                                                                          *
- * SPDX-License-Identifier: BSD-3-Clause                                    *
- ****************************************************************************/
-
-#ifndef ARBORX_BOOST_RANGE_ADAPTERS_HPP
-#define ARBORX_BOOST_RANGE_ADAPTERS_HPP
-
-#include <ArborX_DetailsKokkosExtAccessibilityTraits.hpp>
-#include <ArborX_Exception.hpp>
-
-#include <Kokkos_Core.hpp>
-
-#include <boost/range.hpp>
-
-#include <type_traits> // is_same
-
-namespace boost
-{
-#define ARBORX_ASSERT_VIEW_COMPATIBLE(View)                                    \
-  using Traits = typename View::traits;                                        \
-  static_assert(Traits::rank == 1,                                             \
-                "Adaptor to Boost.Range only available for Views of rank 1");  \
-  static_assert(                                                               \
-      KokkosExt::is_accessible_from_host<View>::value,                         \
-      "Adaptor to Boost.Range only available when View memory space is "       \
-      "accessible from host");
-
-// Adapt Kokkos::View<T, P...> to Boost.Range
-template <typename T, typename... P>
-struct range_iterator<Kokkos::View<T, P...>>
-{
-  using View = Kokkos::View<T, P...>;
-  ARBORX_ASSERT_VIEW_COMPATIBLE(View)
-  using type = typename std::add_pointer<
-      typename Kokkos::ViewTraits<T, P...>::value_type>::type;
-};
-
-template <typename T, typename... P>
-struct range_const_iterator<Kokkos::View<T, P...>>
-{
-  using View = Kokkos::View<T, P...>;
-  ARBORX_ASSERT_VIEW_COMPATIBLE(View)
-  using type = typename std::add_pointer<
-      typename Kokkos::ViewTraits<T, P...>::const_value_type>::type;
-};
-
-template <typename T, typename... P>
-struct range_value<Kokkos::View<T, P...>>
-{
-  using View = Kokkos::View<T, P...>;
-  ARBORX_ASSERT_VIEW_COMPATIBLE(View)
-  using type = typename Kokkos::ViewTraits<T, P...>::value_type;
-};
-
-template <typename T, typename... P>
-struct range_reference<Kokkos::View<T, P...>>
-{
-  using View = Kokkos::View<T, P...>;
-  ARBORX_ASSERT_VIEW_COMPATIBLE(View)
-  using type = typename Kokkos::ViewTraits<T, P...>::reference_type;
-};
-
-template <typename T, typename... P>
-struct range_size<Kokkos::View<T, P...>>
-{
-  using View = Kokkos::View<T, P...>;
-  ARBORX_ASSERT_VIEW_COMPATIBLE(View)
-  using type = typename Kokkos::ViewTraits<T, P...>::size_type;
-};
-
-} // namespace boost
-
-namespace Kokkos
-{
-
-template <typename T, typename... P>
-inline typename boost::range_iterator<Kokkos::View<T, P...>>::type
-range_begin(Kokkos::View<T, P...> &v)
-{
-  using View = Kokkos::View<T, P...>;
-  ARBORX_ASSERT_VIEW_COMPATIBLE(View)
-  return v.data();
-}
-
-template <typename T, typename... P>
-inline typename boost::range_const_iterator<Kokkos::View<T, P...>>::type
-range_begin(Kokkos::View<T, P...> const &v)
-{
-  using View = Kokkos::View<T, P...>;
-  ARBORX_ASSERT_VIEW_COMPATIBLE(View)
-  return v.data();
-}
-
-template <typename T, typename... P>
-inline typename boost::range_iterator<Kokkos::View<T, P...>>::type
-range_end(Kokkos::View<T, P...> &v)
-{
-  using View = Kokkos::View<T, P...>;
-  ARBORX_ASSERT_VIEW_COMPATIBLE(View)
-  ARBORX_ASSERT(v.span_is_contiguous());
-  return v.data() + v.span();
-}
-
-template <typename T, typename... P>
-inline typename boost::range_const_iterator<Kokkos::View<T, P...>>::type
-range_end(Kokkos::View<T, P...> const &v)
-{
-  using View = Kokkos::View<T, P...>;
-  ARBORX_ASSERT_VIEW_COMPATIBLE(View)
-  ARBORX_ASSERT(v.span_is_contiguous());
-  return v.data() + v.span();
-}
-
-// optional
-template <typename T, typename... P>
-inline typename boost::range_size<Kokkos::View<T, P...>>::type
-range_calculate_size(Kokkos::View<T, P...> const &v)
-{
-  using View = Kokkos::View<T, P...>;
-  ARBORX_ASSERT_VIEW_COMPATIBLE(View)
-  return v.extent(0);
-}
-
-#undef ARBORX_ASSERT_VIEW_COMPATIBLE
-
-} // namespace Kokkos
-
-#endif
diff --git a/arborx/test/ArborX_EnableDeviceTypes.hpp.in b/arborx/test/ArborX_EnableDeviceTypes.hpp.in
deleted file mode 100644
index 8df99fa55..000000000
--- a/arborx/test/ArborX_EnableDeviceTypes.hpp.in
+++ /dev/null
@@ -1,21 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2017-2021 by the ArborX authors                            *
- * All rights reserved.                                                     *
- *                                                                          *
- * This file is part of the ArborX library. ArborX is                       *
- * distributed under a BSD 3-clause license. For the licensing terms see    *
- * the LICENSE file in the top-level directory.                             *
- *                                                                          *
- * SPDX-License-Identifier: BSD-3-Clause                                    *
- ****************************************************************************/
-
-#ifndef ARBORX_ENABLE_DEVICE_TYPES_HPP
-#define ARBORX_ENABLE_DEVICE_TYPES_HPP
-
-#include <Kokkos_Core.hpp>
-
-#include <tuple>
-
-using ARBORX_DEVICE_TYPES = std::tuple<@ARBORX_DEVICE_TYPES@>;
-
-#endif
diff --git a/arborx/test/ArborX_EnableViewComparison.hpp b/arborx/test/ArborX_EnableViewComparison.hpp
deleted file mode 100644
index c7b8c1618..000000000
--- a/arborx/test/ArborX_EnableViewComparison.hpp
+++ /dev/null
@@ -1,71 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2017-2021 by the ArborX authors                            *
- * All rights reserved.                                                     *
- *                                                                          *
- * This file is part of the ArborX library. ArborX is                       *
- * distributed under a BSD 3-clause license. For the licensing terms see    *
- * the LICENSE file in the top-level directory.                             *
- *                                                                          *
- * SPDX-License-Identifier: BSD-3-Clause                                    *
- ****************************************************************************/
-
-#ifndef ARBORX_ENABLE_VIEW_COMPARISON_HPP
-#define ARBORX_ENABLE_VIEW_COMPARISON_HPP
-
-#include <ArborX_DetailsKokkosExtAccessibilityTraits.hpp> // is_accessible_from_host
-
-#include <Kokkos_Core.hpp>
-
-#include "BoostTest_CUDA_clang_workarounds.hpp"
-#include <boost/test/utils/is_forward_iterable.hpp>
-
-// Enable element-wise comparison for views that are accessible from the host
-namespace boost
-{
-namespace unit_test
-{
-
-template <typename T, typename... P>
-struct is_forward_iterable<Kokkos::View<T, P...>> : public boost::mpl::true_
-{
-  // NOTE Prefer static assertion to SFINAE because error message about no
-  // operator== for the operands is not as clear.
-  static_assert(
-      Kokkos::View<T, P...>::rank == 1 &&
-          KokkosExt::is_accessible_from_host<Kokkos::View<T, P...>>::value,
-      "Restricted to rank-one host-accessible views");
-};
-
-template <typename T, typename... P>
-struct bt_iterator_traits<Kokkos::View<T, P...>, true>
-{
-  using view_type = Kokkos::View<T, P...>;
-  using value_type = typename view_type::value_type;
-  using const_iterator =
-      typename std::add_pointer<typename view_type::const_value_type>::type;
-  static const_iterator begin(view_type const &v) { return v.data(); }
-  static const_iterator end(view_type const &v) { return v.data() + v.size(); }
-  static std::size_t size(view_type const &v) { return v.size(); }
-};
-
-template <typename T, size_t N, typename Proxy>
-struct is_forward_iterable<Kokkos::Array<T, N, Proxy>>
-    : public boost::mpl::true_
-{
-};
-
-template <typename T, size_t N, typename Proxy>
-struct bt_iterator_traits<Kokkos::Array<T, N, Proxy>, true>
-{
-  using array_type = Kokkos::Array<T, N, Proxy>;
-  using value_type = typename array_type::value_type;
-  using const_iterator = typename array_type::const_pointer;
-  static const_iterator begin(array_type const &v) { return v.data(); }
-  static const_iterator end(array_type const &v) { return v.data() + v.size(); }
-  static std::size_t size(array_type const &v) { return v.size(); }
-};
-
-} // namespace unit_test
-} // namespace boost
-
-#endif
diff --git a/arborx/test/BoostTest_CUDA_clang_workarounds.hpp b/arborx/test/BoostTest_CUDA_clang_workarounds.hpp
deleted file mode 100644
index c9682b957..000000000
--- a/arborx/test/BoostTest_CUDA_clang_workarounds.hpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2017-2021 by the ArborX authors                            *
- * All rights reserved.                                                     *
- *                                                                          *
- * This file is part of the ArborX library. ArborX is                       *
- * distributed under a BSD 3-clause license. For the licensing terms see    *
- * the LICENSE file in the top-level directory.                             *
- *                                                                          *
- * SPDX-License-Identifier: BSD-3-Clause                                    *
- ****************************************************************************/
-
-#ifndef BOOSTTEST_CUDA_CLANG_WORKAROUNDS_HPP
-#define BOOSTTEST_CUDA_CLANG_WORKAROUNDS_HPP
-
-#include <boost/fusion/adapted/std_tuple.hpp>
-#include <boost/fusion/include/std_tuple.hpp>
-#include <boost/type_traits/add_const.hpp>
-#include <boost/type_traits/add_pointer.hpp>
-
-#ifndef BOOST_STATIC_ASSERT
-#define BOOST_STATIC_ASSERT(m) static_assert(m, "");
-#endif
-
-#endif
diff --git a/arborx/test/CMakeLists.txt b/arborx/test/CMakeLists.txt
deleted file mode 100644
index 54bfd4208..000000000
--- a/arborx/test/CMakeLists.txt
+++ /dev/null
@@ -1,186 +0,0 @@
-
-set(ARBORX_DEVICE_TYPES)
-if(Kokkos_ENABLE_SERIAL)
-  list(APPEND ARBORX_DEVICE_TYPES Kokkos::Serial::device_type)
-endif()
-if(Kokkos_ENABLE_OPENMP)
-  list(APPEND ARBORX_DEVICE_TYPES Kokkos::OpenMP::device_type)
-endif()
-if(Kokkos_ENABLE_CUDA)
-  list(APPEND ARBORX_DEVICE_TYPES Kokkos::CudaSpace::device_type)
-endif()
-if(Kokkos_ENABLE_PTHREAD)
-  list(APPEND ARBORX_DEVICE_TYPES Kokkos::Threads::device_type)
-endif()
-if(Kokkos_ENABLE_HIP)
-  list(APPEND ARBORX_DEVICE_TYPES Kokkos::Experimental::HIPSpace::device_type)
-endif()
-if(Kokkos_ENABLE_OPENMPTARGET)
-  list(APPEND ARBORX_DEVICE_TYPES Kokkos::Experimental::OpenMPTarget::device_type)
-endif()
-if(Kokkos_ENABLE_SYCL)
-  list(APPEND ARBORX_DEVICE_TYPES Kokkos::Experimental::SYCL::device_type)
-endif()
-
-string(REPLACE ";" "," ARBORX_DEVICE_TYPES "${ARBORX_DEVICE_TYPES}")
-
-if(NOT ARBORX_DEVICE_TYPES)
-  message(SEND_ERROR "Kokkos_DEVICES must include at least one of 'SERIAL', 'OPENMP', 'CUDA', 'HIP', 'OPENMPTARGET', 'SYCL' or 'PTHREAD'!")
-endif()
-
-configure_file(ArborX_EnableDeviceTypes.hpp.in ${CMAKE_CURRENT_BINARY_DIR}/ArborX_EnableDeviceTypes.hpp @ONLY)
-
-find_package(Boost 1.67.0 REQUIRED COMPONENTS unit_test_framework)
-# CMake Boost version check is tricky due to multiple changes to the way Boost
-# package stores version information
-if(NOT DEFINED Boost_VERSION_MINOR)
-  set(Boost_VERSION_MINOR ${Boost_MINOR_VERSION})
-endif()
-if(Kokkos_ENABLE_CUDA AND Boost_VERSION VERSION_GREATER 1.68 AND Boost_VERSION VERSION_LESS 1.75)
-  message(WARNING "Boost versions 1.69 to 1.74 are known to yield build issues with NVCC")
-endif()
-
-# Compile only, nothing to run
-add_executable(ArborX_CompileOnly.exe
-  tstCompileOnlyAccessTraits.cpp
-  tstCompileOnlyCallbacks.cpp
-  tstCompileOnlyConcepts.cpp
-  tstCompileOnlyTypeRequirements.cpp
-  tstCompileOnlyMain.cpp
-)
-target_link_libraries(ArborX_CompileOnly.exe PRIVATE ArborX)
-
-add_executable(ArborX_DetailsUtils.exe tstDetailsUtils.cpp utf_main.cpp)
-# TODO link Boost::dynamic_linking interface target to enable dynamic linking
-# (adds BOOST_ALL_DYN_LINK)
-target_link_libraries(ArborX_DetailsUtils.exe PRIVATE ArborX Boost::unit_test_framework)
-target_compile_definitions(ArborX_DetailsUtils.exe PRIVATE BOOST_TEST_DYN_LINK)
-target_include_directories(ArborX_DetailsUtils.exe PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
-add_test(NAME ArborX_DetailsUtils_Test COMMAND ./ArborX_DetailsUtils.exe)
-
-add_executable(ArborX_Geometry.exe
-  tstDetailsAlgorithms.cpp
-  tstRay.cpp
-  tstKDOP.cpp
-)
-target_link_libraries(ArborX_Geometry.exe PRIVATE ArborX Boost::unit_test_framework)
-target_compile_definitions(ArborX_Geometry.exe PRIVATE BOOST_TEST_DYN_LINK)
-target_include_directories(ArborX_Geometry.exe PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
-add_test(NAME ArborX_Geometry_Test COMMAND ./ArborX_Geometry.exe)
-
-set(ARBORX_TEST_QUERY_TREE_SOURCES)
-foreach(_test Callbacks Degenerate ManufacturedSolution ComparisonWithBoost)
-  file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/tstQueryTree${_test}_BVH.cpp.tmp"
-    "#include <ArborX_LinearBVH.hpp>\n"
-    "#define ARBORX_TEST_TREE_TYPES Tuple<ArborX::BVH>\n"
-    "#define ARBORX_TEST_DEVICE_TYPES std::tuple<${ARBORX_DEVICE_TYPES}>\n"
-    "#include <tstQueryTree${_test}.cpp>\n"
-  )
-  configure_file(
-    "${CMAKE_CURRENT_BINARY_DIR}/tstQueryTree${_test}_BVH.cpp.tmp"
-    "${CMAKE_CURRENT_BINARY_DIR}/tstQueryTree${_test}_BVH.cpp" COPYONLY
-  )
-  list(APPEND ARBORX_TEST_QUERY_TREE_SOURCES "${CMAKE_CURRENT_BINARY_DIR}/tstQueryTree${_test}_BVH.cpp")
-  file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/tstQueryTree${_test}_BF.cpp.tmp"
-    "#include <ArborX_BruteForce.hpp>\n"
-    "#define ARBORX_TEST_TREE_TYPES Tuple<ArborX::BruteForce>\n"
-    "#define ARBORX_TEST_DEVICE_TYPES std::tuple<${ARBORX_DEVICE_TYPES}>\n"
-    "#define ARBORX_TEST_DISABLE_NEAREST_QUERY\n"
-    "#define ARBORX_TEST_DISABLE_CALLBACK_EARLY_EXIT\n"
-    "#include <tstQueryTree${_test}.cpp>\n"
-  )
-  configure_file(
-    "${CMAKE_CURRENT_BINARY_DIR}/tstQueryTree${_test}_BF.cpp.tmp"
-    "${CMAKE_CURRENT_BINARY_DIR}/tstQueryTree${_test}_BF.cpp" COPYONLY
-  )
-  list(APPEND ARBORX_TEST_QUERY_TREE_SOURCES "${CMAKE_CURRENT_BINARY_DIR}/tstQueryTree${_test}_BF.cpp")
-  foreach(_bounding_volume KDOP14 KDOP18) # purposefully ommitting KDOP6 and KDOP26 to reduce the number of instantiations
-    file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/tstQueryTree${_test}_BVH_${_bounding_volume}.cpp.tmp"
-      "#include <ArborX_LinearBVH.hpp>\n"
-      "#include <ArborX_KDOP.hpp>\n"
-      "using KDOP6 = ArborX::Experimental::KDOP<6>;\n"
-      "using KDOP14 = ArborX::Experimental::KDOP<14>;\n"
-      "using KDOP18 = ArborX::Experimental::KDOP<18>;\n"
-      "using KDOP26 = ArborX::Experimental::KDOP<26>;\n"
-      "template <class MemorySpace> using ArborX__BoundingVolumeHierarchy_${_bounding_volume} = ArborX::BasicBoundingVolumeHierarchy<MemorySpace, ${_bounding_volume}>;\n"
-      "#define ARBORX_TEST_TREE_TYPES Tuple<ArborX__BoundingVolumeHierarchy_${_bounding_volume}>\n"
-      "#define ARBORX_TEST_DEVICE_TYPES std::tuple<${ARBORX_DEVICE_TYPES}>\n"
-      "#define ARBORX_TEST_DISABLE_NEAREST_QUERY\n"
-      "#define ARBORX_TEST_DISABLE_SPATIAL_QUERY_INTERSECTS_SPHERE\n"
-      "#include <tstQueryTree${_test}.cpp>\n"
-    )
-    configure_file(
-      "${CMAKE_CURRENT_BINARY_DIR}/tstQueryTree${_test}_BVH_${_bounding_volume}.cpp.tmp"
-      "${CMAKE_CURRENT_BINARY_DIR}/tstQueryTree${_test}_BVH_${_bounding_volume}.cpp" COPYONLY
-    )
-    list(APPEND ARBORX_TEST_QUERY_TREE_SOURCES "${CMAKE_CURRENT_BINARY_DIR}/tstQueryTree${_test}_BVH_${_bounding_volume}.cpp")
-  endforeach()
-endforeach()
-add_executable(ArborX_QueryTree.exe
-  ${ARBORX_TEST_QUERY_TREE_SOURCES}
-  tstQueryTreeTraversalPolicy.cpp
-  tstQueryTreeIntersectsKDOP.cpp
-  tstKokkosToolsAnnotations.cpp
-  tstScopedProfileRegion.cpp
-  utf_main.cpp)
-target_link_libraries(ArborX_QueryTree.exe PRIVATE ArborX Boost::unit_test_framework)
-target_compile_definitions(ArborX_QueryTree.exe PRIVATE BOOST_TEST_DYN_LINK)
-target_include_directories(ArborX_QueryTree.exe PRIVATE ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
-add_test(NAME ArborX_QueryTree_Test COMMAND ./ArborX_QueryTree.exe)
-
-add_executable(ArborX_DetailsTreeConstruction.exe tstDetailsTreeConstruction.cpp utf_main.cpp)
-target_link_libraries(ArborX_DetailsTreeConstruction.exe PRIVATE ArborX Boost::unit_test_framework)
-target_compile_definitions(ArborX_DetailsTreeConstruction.exe PRIVATE BOOST_TEST_DYN_LINK)
-target_include_directories(ArborX_DetailsTreeConstruction.exe PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
-add_test(NAME ArborX_DetailsTreeConstruction_Test COMMAND ./ArborX_DetailsTreeConstruction.exe)
-
-add_executable(ArborX_DetailsContainers.exe
-  tstSequenceContainers.cpp
-  tstContainerAdaptors.cpp
-  tstHeapOperations.cpp
-  tstPriorityQueueMiscellaneous.cpp
-)
-target_link_libraries(ArborX_DetailsContainers.exe PRIVATE ArborX Boost::unit_test_framework)
-target_compile_definitions(ArborX_DetailsContainers.exe PRIVATE BOOST_TEST_DYN_LINK)
-add_test(NAME ArborX_DetailsContainers_Test COMMAND ./ArborX_DetailsContainers.exe)
-
-add_executable(ArborX_DetailsBatchedQueries.exe tstDetailsBatchedQueries.cpp utf_main.cpp)
-target_link_libraries(ArborX_DetailsBatchedQueries.exe PRIVATE ArborX Boost::unit_test_framework)
-target_compile_definitions(ArborX_DetailsBatchedQueries.exe PRIVATE BOOST_TEST_DYN_LINK)
-target_include_directories(ArborX_DetailsBatchedQueries.exe PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
-add_test(NAME ArborX_DetailsBatchedQueries_Test COMMAND ./ArborX_DetailsBatchedQueries.exe)
-
-add_executable(ArborX_DetailsCrsGraphWrapperImpl.exe tstDetailsCrsGraphWrapperImpl.cpp utf_main.cpp)
-target_link_libraries(ArborX_DetailsCrsGraphWrapperImpl.exe PRIVATE ArborX Boost::unit_test_framework)
-target_compile_definitions(ArborX_DetailsCrsGraphWrapperImpl.exe PRIVATE BOOST_TEST_DYN_LINK)
-target_include_directories(ArborX_DetailsCrsGraphWrapperImpl.exe PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
-add_test(NAME ArborX_DetailsCrsGraphWrapperImpl_Test COMMAND ./ArborX_DetailsCrsGraphWrapperImpl.exe)
-
-add_executable(ArborX_Clustering.exe tstDBSCAN.cpp utf_main.cpp)
-target_link_libraries(ArborX_Clustering.exe PRIVATE ArborX Boost::unit_test_framework)
-target_compile_definitions(ArborX_Clustering.exe PRIVATE BOOST_TEST_DYN_LINK)
-target_include_directories(ArborX_Clustering.exe PRIVATE ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}/examples/dbscan)
-add_test(NAME ArborX_Clustering_Test COMMAND ./ArborX_Clustering.exe)
-
-if(ARBORX_ENABLE_MPI)
-  add_executable(ArborX_DistributedTree.exe tstDistributedTree.cpp tstKokkosToolsDistributedAnnotations.cpp utf_main.cpp)
-  target_link_libraries(ArborX_DistributedTree.exe PRIVATE ArborX Boost::unit_test_framework)
-  target_compile_definitions(ArborX_DistributedTree.exe PRIVATE BOOST_TEST_DYN_LINK ARBORX_MPI_UNIT_TEST)
-  target_include_directories(ArborX_DistributedTree.exe PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
-  add_test(NAME ArborX_DistributedTree_Test COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} ./ArborX_DistributedTree.exe ${MPIEXEC_POSTFLAGS})
-
-  add_executable(ArborX_DetailsDistributedTreeImpl.exe tstDetailsDistributedTreeImpl.cpp utf_main.cpp)
-  target_link_libraries(ArborX_DetailsDistributedTreeImpl.exe PRIVATE ArborX Boost::unit_test_framework)
-  target_compile_definitions(ArborX_DetailsDistributedTreeImpl.exe PRIVATE BOOST_TEST_DYN_LINK ARBORX_MPI_UNIT_TEST)
-  target_include_directories(ArborX_DetailsDistributedTreeImpl.exe PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
-  add_test(NAME ArborX_DetailsDistributedTreeImpl_Test COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} ./ArborX_DetailsDistributedTreeImpl.exe ${MPIEXEC_POSTFLAGS})
-endif()
-
-add_executable(ArborX_BoostAdapters.exe tstBoostGeometryAdapters.cpp tstBoostRangeAdapters.cpp utf_main.cpp)
-target_link_libraries(ArborX_BoostAdapters.exe PRIVATE ArborX Boost::unit_test_framework)
-target_compile_definitions(ArborX_BoostAdapters.exe PRIVATE BOOST_TEST_DYN_LINK)
-add_test(NAME ArborX_BoostAdapters_Test COMMAND ./ArborX_BoostAdapters.exe)
-
-if(ARBORX_ENABLE_HEADER_SELF_CONTAINMENT_TESTS)
-  add_subdirectory(headers_self_contained)
-endif()
diff --git a/arborx/test/Search_UnitTestHelpers.hpp b/arborx/test/Search_UnitTestHelpers.hpp
deleted file mode 100644
index aad452c0c..000000000
--- a/arborx/test/Search_UnitTestHelpers.hpp
+++ /dev/null
@@ -1,276 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2017-2021 by the ArborX authors                            *
- * All rights reserved.                                                     *
- *                                                                          *
- * This file is part of the ArborX library. ArborX is                       *
- * distributed under a BSD 3-clause license. For the licensing terms see    *
- * the LICENSE file in the top-level directory.                             *
- *                                                                          *
- * SPDX-License-Identifier: BSD-3-Clause                                    *
- ****************************************************************************/
-
-#ifndef ARBORX_SEARCH_TEST_HELPERS_HPP
-#define ARBORX_SEARCH_TEST_HELPERS_HPP
-
-// clang-format off
-#include "boost_ext/KokkosPairComparison.hpp"
-#include "boost_ext/TupleComparison.hpp"
-#include "boost_ext/CompressedStorageComparison.hpp"
-// clang-format on
-
-#include "ArborX_EnableViewComparison.hpp"
-#ifdef ARBORX_ENABLE_MPI
-#include "ArborX_BoostRTreeHelpers.hpp"
-#include <ArborX_DistributedTree.hpp>
-#endif
-
-#include <boost/test/unit_test.hpp>
-
-#include <iostream>
-#include <utility>
-#include <vector>
-
-template <typename T>
-struct is_distributed : std::false_type
-{
-};
-
-#ifdef ARBORX_ENABLE_MPI
-template <typename D>
-struct is_distributed<ArborX::DistributedTree<D>> : std::true_type
-{
-};
-
-template <typename I>
-struct is_distributed<BoostExt::ParallelRTree<I>> : std::true_type
-{
-};
-#endif
-
-template <typename T>
-auto make_reference_solution(std::vector<T> const &values,
-                             std::vector<int> const &offsets)
-{
-  return make_compressed_storage(offsets, values);
-}
-
-#ifdef ARBORX_ENABLE_MPI
-// FIXME This is a temporary workaround until we reconcile interfaces of
-// DistributedTree and BVH
-template <typename ExecutionSpace, typename MemorySpace, typename Queries,
-          typename Values, typename Offsets>
-void query(ArborX::DistributedTree<MemorySpace> const &tree,
-           ExecutionSpace const &space, Queries const &queries,
-           Values const &values, Offsets const &offsets)
-{
-  tree.query(space, queries, values, offsets);
-}
-#endif
-
-template <typename ExecutionSpace, typename Tree, typename Queries>
-auto query(ExecutionSpace const &exec_space, Tree const &tree,
-           Queries const &queries)
-{
-  using memory_space = typename Tree::memory_space;
-  using value_type =
-      std::conditional_t<is_distributed<Tree>{}, Kokkos::pair<int, int>, int>;
-  Kokkos::View<value_type *, memory_space> values("Testing::values", 0);
-  Kokkos::View<int *, memory_space> offsets("Testing::offsets", 0);
-  tree.query(exec_space, queries, values, offsets);
-  return make_compressed_storage(
-      Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace{}, offsets),
-      Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace{}, values));
-}
-
-#define ARBORX_TEST_QUERY_TREE(exec_space, tree, queries, reference)           \
-  BOOST_TEST(query(exec_space, tree, queries) == (reference),                  \
-             boost::test_tools::per_element());
-
-template <typename ValueType, typename ExecutionSpace, typename Tree,
-          typename Queries, typename Callback>
-auto query(ExecutionSpace const &exec_space, Tree const &tree,
-           Queries const &queries, Callback const &callback)
-{
-  using memory_space = typename Tree::memory_space;
-  Kokkos::View<ValueType *, memory_space> values("Testing::values", 0);
-  Kokkos::View<int *, memory_space> offsets("Testing::offsets", 0);
-  tree.query(exec_space, queries, callback, values, offsets);
-  return make_compressed_storage(
-      Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace{}, offsets),
-      Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace{}, values));
-}
-
-#define ARBORX_TEST_QUERY_TREE_CALLBACK(exec_space, tree, queries, callback,   \
-                                        reference)                             \
-  using value_type = typename decltype(reference)::value_type;                 \
-  BOOST_TEST(query<value_type>(exec_space, tree, queries, callback) ==         \
-                 (reference),                                                  \
-             boost::test_tools::per_element());
-
-// Workaround for NVCC that complains that the enclosing parent function
-// (query_with_distance) for an extended __host__ __device__ lambda must not
-// have deduced return type
-template <typename DeviceType, typename ExecutionSpace>
-Kokkos::View<Kokkos::pair<Kokkos::pair<int, int>, float> *, DeviceType>
-zip(ExecutionSpace const &space, Kokkos::View<int *, DeviceType> indices,
-    Kokkos::View<int *, DeviceType> ranks,
-    Kokkos::View<float *, DeviceType> distances)
-{
-  auto const n = indices.extent(0);
-  Kokkos::View<Kokkos::pair<Kokkos::pair<int, int>, float> *, DeviceType>
-      values(Kokkos::view_alloc(Kokkos::WithoutInitializing, "Testing::values"),
-             n);
-  Kokkos::parallel_for("ArborX:UnitTestSupport:zip",
-                       Kokkos::RangePolicy<ExecutionSpace>(space, 0, n),
-                       KOKKOS_LAMBDA(int i) {
-                         values(i) = {{indices(i), ranks(i)}, distances(i)};
-                       });
-  return values;
-}
-
-#ifdef ARBORX_ENABLE_MPI
-template <typename ExecutionSpace, typename Tree, typename Queries>
-auto query_with_distance(ExecutionSpace const &exec_space, Tree const &tree,
-                         Queries const &queries,
-                         std::enable_if_t<is_distributed<Tree>{}> * = nullptr)
-{
-  using MemorySpace = typename Tree::memory_space;
-  using DeviceType = Kokkos::Device<ExecutionSpace, MemorySpace>;
-
-  Kokkos::View<int *, MemorySpace> offsets("Testing::offsets", 0);
-  Kokkos::View<int *, MemorySpace> indices("Testing::indices", 0);
-  Kokkos::View<int *, MemorySpace> ranks("Testing::ranks", 0);
-  Kokkos::View<float *, MemorySpace> distances("Testing::distances", 0);
-  ArborX::Details::DistributedTreeImpl<DeviceType>::queryDispatchImpl(
-      ArborX::Details::NearestPredicateTag{}, tree, exec_space, queries,
-      indices, offsets, ranks, &distances);
-
-  auto values = zip(exec_space, indices, ranks, distances);
-
-  return make_compressed_storage(
-      Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace{}, offsets),
-      Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace{}, values));
-}
-#endif
-
-#define ARBORX_TEST_QUERY_TREE_WITH_DISTANCE(exec_space, tree, queries,        \
-                                             reference)                        \
-  BOOST_TEST(query_with_distance(exec_space, tree, queries) == (reference),    \
-             boost::test_tools::per_element());
-
-template <typename Tree, typename ExecutionSpace>
-auto make(ExecutionSpace const &exec_space, std::vector<ArborX::Box> const &b)
-{
-  int const n = b.size();
-  Kokkos::View<ArborX::Box *, typename Tree::memory_space> boxes(
-      "Testing::boxes", n);
-  auto boxes_host = Kokkos::create_mirror_view(boxes);
-  for (int i = 0; i < n; ++i)
-    boxes_host(i) = b[i];
-  Kokkos::deep_copy(boxes, boxes_host);
-  return Tree(exec_space, boxes);
-}
-
-#ifdef ARBORX_ENABLE_MPI
-template <typename DeviceType>
-ArborX::DistributedTree<typename DeviceType::memory_space>
-makeDistributedTree(MPI_Comm comm, std::vector<ArborX::Box> const &b)
-{
-  using ExecutionSpace = typename DeviceType::execution_space;
-
-  int const n = b.size();
-  Kokkos::View<ArborX::Box *, DeviceType> boxes("Testing::boxes", n);
-  auto boxes_host = Kokkos::create_mirror_view(boxes);
-  for (int i = 0; i < n; ++i)
-    boxes_host(i) = b[i];
-  Kokkos::deep_copy(boxes, boxes_host);
-
-  return ArborX::DistributedTree<typename DeviceType::memory_space>(
-      comm, ExecutionSpace{}, boxes);
-}
-#endif
-
-template <typename DeviceType>
-auto makeIntersectsBoxQueries(std::vector<ArborX::Box> const &boxes)
-{
-  int const n = boxes.size();
-  Kokkos::View<decltype(ArborX::intersects(ArborX::Box{})) *, DeviceType>
-      queries("Testing::intersecting_with_box_predicates", n);
-  auto queries_host = Kokkos::create_mirror_view(queries);
-  for (int i = 0; i < n; ++i)
-    queries_host(i) = ArborX::intersects(boxes[i]);
-  Kokkos::deep_copy(queries, queries_host);
-  return queries;
-}
-
-template <typename DeviceType, typename Data>
-auto makeIntersectsBoxWithAttachmentQueries(
-    std::vector<ArborX::Box> const &boxes, std::vector<Data> const &data)
-{
-  int const n = boxes.size();
-  Kokkos::View<decltype(
-                   ArborX::attach(ArborX::intersects(ArborX::Box{}), Data{})) *,
-               DeviceType>
-      queries("Testing::intersecting_with_box_with_attachment_predicates", n);
-  auto queries_host = Kokkos::create_mirror_view(queries);
-  for (int i = 0; i < n; ++i)
-    queries_host(i) = ArborX::attach(ArborX::intersects(boxes[i]), data[i]);
-  Kokkos::deep_copy(queries, queries_host);
-  return queries;
-}
-
-template <typename DeviceType>
-auto makeNearestQueries(
-    std::vector<std::pair<ArborX::Point, int>> const &points)
-{
-  // NOTE: `points` is not a very descriptive name here. It stores both the
-  // actual point and the number k of neighbors to query for.
-  int const n = points.size();
-  Kokkos::View<ArborX::Nearest<ArborX::Point> *, DeviceType> queries(
-      "Testing::nearest_queries", n);
-  auto queries_host = Kokkos::create_mirror_view(queries);
-  for (int i = 0; i < n; ++i)
-    queries_host(i) = ArborX::nearest(points[i].first, points[i].second);
-  Kokkos::deep_copy(queries, queries_host);
-  return queries;
-}
-
-template <typename DeviceType, typename Data>
-auto makeNearestWithAttachmentQueries(
-    std::vector<std::pair<ArborX::Point, int>> const &points,
-    std::vector<Data> const &data)
-{
-  // NOTE: `points` is not a very descriptive name here. It stores both the
-  // actual point and the number k of neighbors to query for.
-  int const n = points.size();
-  Kokkos::View<decltype(
-                   ArborX::attach(ArborX::Nearest<ArborX::Point>{}, Data{})) *,
-               DeviceType>
-      queries("Testing::nearest_queries", n);
-  auto queries_host = Kokkos::create_mirror_view(queries);
-  for (int i = 0; i < n; ++i)
-    queries_host(i) = ArborX::attach(
-        ArborX::nearest(points[i].first, points[i].second), data[i]);
-  Kokkos::deep_copy(queries, queries_host);
-  return queries;
-}
-
-template <typename DeviceType>
-Kokkos::View<decltype(ArborX::intersects(ArborX::Sphere{})) *, DeviceType>
-makeIntersectsSphereQueries(
-    std::vector<std::pair<ArborX::Point, float>> const &points)
-{
-  // NOTE: `points` is not a very descriptive name here. It stores both the
-  // actual point and the radius for the search around that point.
-  int const n = points.size();
-  Kokkos::View<decltype(ArborX::intersects(ArborX::Sphere{})) *, DeviceType>
-      queries("Testing::intersecting_with_sphere_predicates", n);
-  auto queries_host = Kokkos::create_mirror_view(queries);
-  for (int i = 0; i < n; ++i)
-    queries_host(i) =
-        ArborX::intersects(ArborX::Sphere{points[i].first, points[i].second});
-  Kokkos::deep_copy(queries, queries_host);
-  return queries;
-}
-
-#endif
diff --git a/arborx/test/boost_ext/CompressedStorageComparison.hpp b/arborx/test/boost_ext/CompressedStorageComparison.hpp
deleted file mode 100644
index 10e11a3c9..000000000
--- a/arborx/test/boost_ext/CompressedStorageComparison.hpp
+++ /dev/null
@@ -1,110 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2017-2021 by the ArborX authors                            *
- * All rights reserved.                                                     *
- *                                                                          *
- * This file is part of the ArborX library. ArborX is                       *
- * distributed under a BSD 3-clause license. For the licensing terms see    *
- * the LICENSE file in the top-level directory.                             *
- *                                                                          *
- * SPDX-License-Identifier: BSD-3-Clause                                    *
- ****************************************************************************/
-
-#ifndef ARBORX_BOOST_TEST_COMPRESSED_STORAGE_COMPARISON_HPP
-#define ARBORX_BOOST_TEST_COMPRESSED_STORAGE_COMPARISON_HPP
-
-#include <boost/test/tools/detail/print_helper.hpp>
-
-#include <iosfwd>
-#include <set>
-
-template <typename Offsets, typename Values>
-struct CompressedStorage
-{
-  Offsets offsets;
-  Values values;
-  using value_type = typename Values::value_type;
-  using index_type = typename Offsets::value_type;
-  struct ConstForwardIterator
-  {
-    index_type i;
-    CompressedStorage const *p;
-    using value_type = std::multiset<CompressedStorage::value_type>;
-    ConstForwardIterator &operator++()
-    {
-      ++i;
-      return *this;
-    }
-    ConstForwardIterator operator++(int)
-    {
-      ConstForwardIterator old{*this};
-      ++*this;
-      return old;
-    };
-    ConstForwardIterator operator==(ConstForwardIterator const &o)
-    {
-      return i == o.i;
-    }
-    ConstForwardIterator operator!=(ConstForwardIterator const &o)
-    {
-      return !(*this == o);
-    }
-    value_type operator*()
-    {
-      return {p->values.data() + p->offsets[i],
-              p->values.data() + p->offsets[i + 1]};
-    }
-  };
-  ConstForwardIterator cbegin() const { return {0, this}; }
-  ConstForwardIterator cend() const { return {offsets.size(), this}; }
-  std::size_t size() const { return offsets.size() - 1; }
-};
-
-template <typename Offsets, typename Values>
-CompressedStorage<std::decay_t<Offsets>, std::decay_t<Values>>
-make_compressed_storage(Offsets &&offsets, Values &&values)
-{
-  return {std::forward<Offsets>(offsets), std::forward<Values>(values)};
-}
-
-namespace boost
-{
-namespace unit_test
-{
-template <typename Offsets, typename Values>
-struct is_forward_iterable<CompressedStorage<Offsets, Values>>
-    : public boost::mpl::true_
-{
-};
-template <typename Offsets, typename Values>
-struct bt_iterator_traits<CompressedStorage<Offsets, Values>, true>
-{
-  using this_type = CompressedStorage<Offsets, Values>;
-  using const_iterator = typename this_type::ConstForwardIterator;
-  using value_type = typename const_iterator::value_type;
-  static const_iterator begin(this_type const &x) { return x.cbegin(); }
-  static const_iterator end(this_type const &x) { return x.cend(); }
-  static std::size_t size(this_type const &x) { return x.size(); }
-};
-} // namespace unit_test
-} // namespace boost
-
-// Customization for logging with Boost.Test
-namespace std
-{
-template <typename Key, typename Compare, typename Allocator>
-std::ostream &
-boost_test_print_type(std::ostream &os,
-                      std::multiset<Key, Compare, Allocator> const &s)
-{
-  os << '(';
-  for (auto const &x : s)
-  {
-    os << ' ';
-    boost::test_tools::tt_detail::print_log_value<Key>()(os, x);
-  }
-  os << " )";
-  return os;
-}
-} // namespace std
-
-#endif
diff --git a/arborx/test/boost_ext/KokkosPairComparison.hpp b/arborx/test/boost_ext/KokkosPairComparison.hpp
deleted file mode 100644
index 43e1be6cb..000000000
--- a/arborx/test/boost_ext/KokkosPairComparison.hpp
+++ /dev/null
@@ -1,46 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2017-2021 by the ArborX authors                            *
- * All rights reserved.                                                     *
- *                                                                          *
- * This file is part of the ArborX library. ArborX is                       *
- * distributed under a BSD 3-clause license. For the licensing terms see    *
- * the LICENSE file in the top-level directory.                             *
- *                                                                          *
- * SPDX-License-Identifier: BSD-3-Clause                                    *
- ****************************************************************************/
-
-#ifndef ARBORX_BOOST_TEST_KOKKOS_PAIR_COMPARISON_HPP
-#define ARBORX_BOOST_TEST_KOKKOS_PAIR_COMPARISON_HPP
-
-#include <Kokkos_Pair.hpp>
-
-#include <boost/test/tools/detail/print_helper.hpp>
-
-#include <iostream>
-
-// Enable comparison of Kokkos pairs
-namespace boost
-{
-namespace test_tools
-{
-namespace tt_detail
-{
-
-// FIXME needed for TuplePrinter
-template <typename T1, typename T2>
-std::ostream &operator<<(std::ostream &os, Kokkos::pair<T1, T2> const &p)
-{
-  os << '(' << p.first << ',' << p.second << ')';
-  return os;
-}
-
-template <typename T1, typename T2>
-struct print_log_value<Kokkos::pair<T1, T2>>
-{
-  void operator()(std::ostream &os, Kokkos::pair<T1, T2> const &p) { os << p; }
-};
-} // namespace tt_detail
-} // namespace test_tools
-} // namespace boost
-
-#endif
diff --git a/arborx/test/boost_ext/TupleComparison.hpp b/arborx/test/boost_ext/TupleComparison.hpp
deleted file mode 100644
index 74424d850..000000000
--- a/arborx/test/boost_ext/TupleComparison.hpp
+++ /dev/null
@@ -1,62 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2017-2021 by the ArborX authors                            *
- * All rights reserved.                                                     *
- *                                                                          *
- * This file is part of the ArborX library. ArborX is                       *
- * distributed under a BSD 3-clause license. For the licensing terms see    *
- * the LICENSE file in the top-level directory.                             *
- *                                                                          *
- * SPDX-License-Identifier: BSD-3-Clause                                    *
- ****************************************************************************/
-
-#ifndef ARBORX_BOOST_TEST_TUPLE_COMPARISON_HPP
-#define ARBORX_BOOST_TEST_TUPLE_COMPARISON_HPP
-
-#include <boost/test/tools/detail/print_helper.hpp>
-
-#include <iostream>
-#include <tuple>
-
-// Enable comparison of tuples
-namespace boost
-{
-namespace test_tools
-{
-namespace tt_detail
-{
-namespace cppreference
-{
-// helper function to print a tuple of any size
-// adapted from https://en.cppreference.com/w/cpp/utility/tuple/tuple_cat
-template <class Tuple, std::size_t N>
-struct TuplePrinter
-{
-  static void print(std::ostream &os, Tuple const &t)
-  {
-    TuplePrinter<Tuple, N - 1>::print(os, t);
-    os << ", " << std::get<N - 1>(t);
-  }
-};
-
-template <class Tuple>
-struct TuplePrinter<Tuple, 1>
-{
-  static void print(std::ostream &os, Tuple const &t) { os << std::get<0>(t); }
-};
-} // namespace cppreference
-
-template <typename... Args>
-struct print_log_value<std::tuple<Args...>>
-{
-  void operator()(std::ostream &os, std::tuple<Args...> const &t)
-  {
-    os << '(';
-    cppreference::TuplePrinter<decltype(t), sizeof...(Args)>::print(os, t);
-    os << ')';
-  }
-};
-} // namespace tt_detail
-} // namespace test_tools
-} // namespace boost
-
-#endif
diff --git a/arborx/test/headers_self_contained/CMakeLists.txt b/arborx/test/headers_self_contained/CMakeLists.txt
deleted file mode 100644
index 7c3a1a7e6..000000000
--- a/arborx/test/headers_self_contained/CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-# Create tests that contain each header separately. We do not  run these tests
-# but we just try to compile them.
-foreach (_header ${ArborX_HEADERS})
-  if(NOT ARBORX_ENABLE_MPI AND _header IN_LIST ArborX_HEADERS_MUST_ENABLE_MPI)
-    continue()
-  endif()
-  string(REGEX REPLACE "[\./]" "_" header_test_name ${_header})
-  set(header_test_name ArborX_HeaderSelfContained_${header_test_name})
-  add_executable(${header_test_name} tstHeader.cpp)
-  if(_header IN_LIST ArborX_HEADERS_MUST_INCLUDE_CONFIG_HPP)
-    target_compile_definitions(${header_test_name} PRIVATE ARBORX_HEADER_MUST_INCLUDE_CONFIG_HPP)
-  endif()
-  target_link_libraries(${header_test_name} PRIVATE ArborX)
-  target_compile_definitions(${header_test_name} PRIVATE ARBORX_HEADER_TEST_NAME=${_header})
-endforeach()
diff --git a/arborx/test/headers_self_contained/tstHeader.cpp b/arborx/test/headers_self_contained/tstHeader.cpp
deleted file mode 100644
index 5a45b6eca..000000000
--- a/arborx/test/headers_self_contained/tstHeader.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2017-2021 by the ArborX authors                            *
- * All rights reserved.                                                     *
- *                                                                          *
- * This file is part of the ArborX library. ArborX is                       *
- * distributed under a BSD 3-clause license. For the licensing terms see    *
- * the LICENSE file in the top-level directory.                             *
- *                                                                          *
- * SPDX-License-Identifier: BSD-3-Clause                                    *
- ****************************************************************************/
-
-#define ARBORX_HEADER_TEST_STRINGIZE_IMPL(x) #x
-#define ARBORX_HEADER_TEST_STRINGIZE(x) ARBORX_HEADER_TEST_STRINGIZE_IMPL(x)
-
-#define ARBORX_HEADER_TO_TEST                                                  \
-  ARBORX_HEADER_TEST_STRINGIZE(ARBORX_HEADER_TEST_NAME)
-
-// include header twice to see if the include guards are set correctly
-#include ARBORX_HEADER_TO_TEST
-#include ARBORX_HEADER_TO_TEST
-
-#if defined(ARBORX_HEADER_MUST_INCLUDE_CONFIG_HPP) &&                          \
-    !defined(ARBORX_CONFIG_HPP)
-#error "This header does not include ArborX_Config.hpp"
-#endif
-
-int main() { return 0; }
diff --git a/arborx/test/tstBoostGeometryAdapters.cpp b/arborx/test/tstBoostGeometryAdapters.cpp
deleted file mode 100644
index a8f962241..000000000
--- a/arborx/test/tstBoostGeometryAdapters.cpp
+++ /dev/null
@@ -1,241 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2017-2021 by the ArborX authors                            *
- * All rights reserved.                                                     *
- *                                                                          *
- * This file is part of the ArborX library. ArborX is                       *
- * distributed under a BSD 3-clause license. For the licensing terms see    *
- * the LICENSE file in the top-level directory.                             *
- *                                                                          *
- * SPDX-License-Identifier: BSD-3-Clause                                    *
- ****************************************************************************/
-
-#include "ArborX_BoostGeometryAdapters.hpp"
-#include <ArborX_DetailsAlgorithms.hpp>
-
-#include <boost/test/unit_test.hpp>
-
-#define BOOST_TEST_MODULE BoostGeometryAdapters
-
-namespace bg = boost::geometry;
-namespace details = ArborX::Details;
-// Conveniently importing Point and Box in ArborX::Details:: namespace
-// and declaring type aliases within boost::geometry:: so that we are able to
-// just use details:: and bg:: to specify what geometry or algorithm we mean.
-namespace ArborX
-{
-namespace Details
-{
-using ArborX::Box;
-using ArborX::Point;
-} // namespace Details
-} // namespace ArborX
-namespace boost
-{
-namespace geometry
-{
-using Point = model::point<float, 3, cs::cartesian>;
-using Box = model::box<Point>;
-} // namespace geometry
-} // namespace boost
-
-BOOST_AUTO_TEST_CASE(equals)
-{
-  details::Point point = {{1., 2., 3.}};
-  BOOST_TEST(details::equals(point, {{1., 2., 3.}}));
-  BOOST_TEST(!details::equals(point, {{0., 0., 0.}}));
-  BOOST_TEST(bg::equals(point, bg::make<details::Point>(1., 2., 3.)));
-  BOOST_TEST(!bg::equals(point, bg::make<details::Point>(4., 5., 6.)));
-  BOOST_TEST(bg::equals(point, bg::make<bg::Point>(1., 2., 3.)));
-  BOOST_TEST(!bg::equals(point, bg::make<bg::Point>(0., 0., 0.)));
-
-  details::Box box = {{{1., 2., 3.}}, {{4., 5., 6.}}};
-  BOOST_TEST(details::equals(box, {{{1., 2., 3.}}, {{4., 5., 6.}}}));
-  BOOST_TEST(!details::equals(box, {{{0., 0., 0.}}, {{1., 1., 1.}}}));
-  BOOST_TEST(bg::equals(box, details::Box{{{1., 2., 3.}}, {{4., 5., 6.}}}));
-  BOOST_TEST(!bg::equals(box, details::Box{{{0., 0., 0.}}, {{1., 1., 1.}}}));
-  BOOST_TEST(bg::equals(box, bg::Box(bg::make<bg::Point>(1., 2., 3.),
-                                     bg::make<bg::Point>(4., 5., 6.))));
-  BOOST_TEST(!bg::equals(box, bg::Box(bg::make<bg::Point>(0., 0., 0.),
-                                      bg::make<bg::Point>(1., 1., 1.))));
-  // Now just for fun compare the ArborX box to a Boost.Geometry box composed
-  // of ArborX points.
-  BOOST_TEST(bg::equals(
-      box, bg::model::box<details::Point>({{1., 2., 3.}}, {{4., 5., 6.}})));
-  BOOST_TEST(!bg::equals(
-      box, bg::model::box<details::Point>({{0., 0., 0.}}, {{0., 0., 0.}})));
-}
-
-BOOST_AUTO_TEST_CASE(distance)
-{
-  // NOTE unsure if should test for floating point equality here
-  details::Point a = {{0., 0., 0.}};
-  details::Point b = {{0., 1., 0.}};
-  BOOST_TEST(details::distance(a, b) == 1.);
-  BOOST_TEST(bg::distance(a, b) == 1.);
-
-  std::tie(a, b) = std::make_pair<details::Point, details::Point>(
-      {{0., 0., 0.}}, {{1., 1., 1.}});
-  BOOST_TEST(details::distance(a, b) == std::sqrt(3.f));
-  BOOST_TEST(bg::distance(a, b) == std::sqrt(3.0));
-
-  BOOST_TEST(details::distance(a, a) == 0.);
-  BOOST_TEST(bg::distance(a, a) == 0.);
-
-  details::Box unit_box = {{{0., 0., 0.}}, {{1., 1., 1.}}};
-  details::Point p = {{.5, .5, .5}};
-  // NOTE ArborX has no overload distance( Box, Point )
-  BOOST_TEST(details::distance(p, unit_box) == 0.);
-  // BOOST_TEST( details::distance( unit_box, p ) == 0. );
-  BOOST_TEST(bg::distance(p, unit_box) == 0.);
-  BOOST_TEST(bg::distance(unit_box, p) == 0.);
-
-  p = {{-1., -1., -1.}};
-  BOOST_TEST(details::distance(p, unit_box) == std::sqrt(3.f));
-  BOOST_TEST(bg::distance(p, unit_box) == std::sqrt(3.0));
-
-  p = {{-1., .5, -1.}};
-  BOOST_TEST(details::distance(p, unit_box) == std::sqrt(2.f));
-  BOOST_TEST(bg::distance(p, unit_box) == std::sqrt(2.0));
-
-  p = {{-1., .5, .5}};
-  BOOST_TEST(details::distance(p, unit_box) == 1.);
-  BOOST_TEST(bg::distance(p, unit_box) == 1.);
-}
-
-BOOST_AUTO_TEST_CASE(expand)
-{
-  using details::equals;
-  details::Box box;
-  // NOTE even though not considered valid, default constructed ArborX box can
-  // be expanded using Boost.Geometry algorithm.
-  BOOST_TEST(!bg::is_valid(box));
-  bg::expand(box, details::Point{{0., 0., 0.}});
-  details::expand(box, {{1., 1., 1.}});
-  BOOST_TEST(equals(box, {{{0., 0., 0.}}, {{1., 1., 1.}}}));
-  bg::expand(box, details::Box{{{1., 2., 3.}}, {{4., 5., 6.}}});
-  details::expand(box, {{{-1., -2., -3.}}, {{0., 0., 0.}}});
-  BOOST_TEST(equals(box, {{{-1., -2., -3.}}, {{4., 5., 6.}}}));
-}
-
-BOOST_AUTO_TEST_CASE(centroid)
-{
-  using details::equals;
-
-  // Interestingly enough, even though for Boost.Geometry, the ArborX default
-  // constructed "empty" box is not valid, it will still calculate its
-  // centroid.  Admittedly, the result (centroid at origin) is garbage :)
-  details::Box empty_box = {};
-  BOOST_TEST(!bg::is_valid(empty_box));
-  BOOST_TEST(
-      equals(bg::return_centroid<details::Point>(empty_box), {{0., 0., 0.}}));
-  BOOST_TEST(equals(details::returnCentroid(empty_box), {{0., 0., 0.}}));
-
-  details::Box unit_box = {{{0., 0., 0.}}, {{1., 1., 1.}}};
-  BOOST_TEST(
-      equals(bg::return_centroid<details::Point>(unit_box), {{.5, .5, .5}}));
-  BOOST_TEST(equals(details::returnCentroid(unit_box), {{.5, .5, .5}}));
-
-  details::Point a_point = {{1., 2., 3.}};
-  BOOST_TEST(equals(bg::return_centroid<details::Point>(a_point), a_point));
-  BOOST_TEST(equals(details::returnCentroid(a_point), a_point));
-}
-
-BOOST_AUTO_TEST_CASE(is_valid)
-{
-  details::Box empty_box = {};
-  BOOST_TEST(!details::isValid(empty_box));
-  std::string message;
-  BOOST_TEST(!bg::is_valid(empty_box, message));
-  BOOST_TEST(message == "Box has corners in wrong order");
-
-  details::Box a_box = {{{0., 0., 0.}}, {{0., 0., 0.}}};
-  BOOST_TEST(!details::isValid(a_box));
-  BOOST_TEST(!bg::is_valid(a_box, message));
-  BOOST_TEST(message == "Geometry has wrong topological dimension");
-
-  details::Box unit_box = {{{0., 0., 0.}}, {{1., 1., 1.}}};
-  BOOST_TEST(details::isValid(unit_box));
-  BOOST_TEST(bg::is_valid(unit_box));
-
-  details::Box invalid_box = {{{1., 2., 3.}}, {{4., NAN, 6.}}};
-  BOOST_TEST(!details::isValid(invalid_box));
-  BOOST_TEST(!bg::is_valid(invalid_box, message));
-  BOOST_TEST(message == "Geometry has point(s) with invalid coordinate(s)");
-
-  details::Box other_invalid_box = {{{1., 5., 3.}}, {{4., 3., 6.}}};
-  BOOST_TEST(!details::isValid(other_invalid_box));
-  BOOST_TEST(!bg::is_valid(other_invalid_box, message));
-  BOOST_TEST(message == "Box has corners in wrong order");
-
-  auto const infty = std::numeric_limits<double>::infinity();
-  other_invalid_box = {{{1., 5., 3.}}, {{infty, 3., 6.}}};
-  BOOST_TEST(!details::isValid(other_invalid_box));
-  BOOST_TEST(!bg::is_valid(other_invalid_box, message));
-  BOOST_TEST(message == "Geometry has point(s) with invalid coordinate(s)");
-
-  other_invalid_box = {{{1., 5., infty}}, {{4., 3., 6.}}};
-  BOOST_TEST(!details::isValid(other_invalid_box));
-  BOOST_TEST(!bg::is_valid(other_invalid_box, message));
-  BOOST_TEST(message == "Geometry has point(s) with invalid coordinate(s)");
-
-  details::Point a_point = {{1., 2., 3.}};
-  BOOST_TEST(details::isValid(a_point));
-  BOOST_TEST(bg::is_valid(a_point));
-
-  details::Point invalid_point = {{infty, 1.41, 3.14}};
-  BOOST_TEST(!details::isValid(invalid_point));
-  BOOST_TEST(!bg::is_valid(invalid_point, message));
-  BOOST_TEST(message == "Geometry has point(s) with invalid coordinate(s)");
-
-  // Also Boost.Geometry has a is_empty() algorithm but it has a different
-  // meaning, it checks whether a geometry is an empty set and always returns
-  // false for a point or a box.
-  BOOST_TEST(!bg::is_empty(empty_box));
-  BOOST_TEST(!bg::is_empty(a_box));
-  BOOST_TEST(!bg::is_empty(unit_box));
-  BOOST_TEST(!bg::is_empty(a_point));
-}
-
-BOOST_AUTO_TEST_CASE(intersects)
-{
-  details::Box const unit_box = {{{0., 0., 0.}}, {{1., 1., 1.}}};
-
-  // self-intersection
-  BOOST_TEST(details::intersects(unit_box, unit_box));
-  BOOST_TEST(bg::intersects(unit_box, unit_box));
-
-  // share a corner
-  details::Box other_box = {{{1., 1., 1.}}, {{2., 2., 2.}}};
-  BOOST_TEST(details::intersects(unit_box, other_box));
-  BOOST_TEST(bg::intersects(unit_box, other_box));
-
-  // share an edge
-  other_box = {{{1., 0., 1.}}, {{2., 1., 2.}}};
-  BOOST_TEST(details::intersects(unit_box, other_box));
-  BOOST_TEST(bg::intersects(unit_box, other_box));
-
-  // share a face
-  other_box = {{{0., -1., 0.}}, {{1., 0., 1.}}};
-  BOOST_TEST(details::intersects(unit_box, other_box));
-  BOOST_TEST(bg::intersects(unit_box, other_box));
-
-  // contains the other box
-  other_box = {{{.3, .3, .3}}, {{.6, .6, .6}}};
-  BOOST_TEST(details::intersects(unit_box, other_box));
-  BOOST_TEST(bg::intersects(unit_box, other_box));
-
-  // within the other box
-  other_box = {{{-1., -1., -1.}}, {{2., 2., 2.}}};
-  BOOST_TEST(details::intersects(unit_box, other_box));
-  BOOST_TEST(bg::intersects(unit_box, other_box));
-
-  // intersecting
-  other_box = {{{.5, .5, .5}}, {{2., 2., 2.}}};
-  BOOST_TEST(details::intersects(unit_box, other_box));
-  BOOST_TEST(bg::intersects(unit_box, other_box));
-
-  // disjoint
-  other_box = {{{1., 2., 3.}}, {{4., 5., 6.}}};
-  BOOST_TEST(!details::intersects(unit_box, other_box));
-  BOOST_TEST(!bg::intersects(unit_box, other_box));
-}
diff --git a/arborx/test/tstBoostRangeAdapters.cpp b/arborx/test/tstBoostRangeAdapters.cpp
deleted file mode 100644
index f113baf8f..000000000
--- a/arborx/test/tstBoostRangeAdapters.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2017-2021 by the ArborX authors                            *
- * All rights reserved.                                                     *
- *                                                                          *
- * This file is part of the ArborX library. ArborX is                       *
- * distributed under a BSD 3-clause license. For the licensing terms see    *
- * the LICENSE file in the top-level directory.                             *
- *                                                                          *
- * SPDX-License-Identifier: BSD-3-Clause                                    *
- ****************************************************************************/
-
-#include "ArborX_BoostRangeAdapters.hpp"
-#include "ArborX_EnableViewComparison.hpp"
-#include <ArborX_Box.hpp>
-#include <ArborX_DetailsAlgorithms.hpp>
-#include <ArborX_Point.hpp>
-
-#include <Kokkos_Core.hpp>
-
-#include <boost/range/algorithm.hpp> // reverse_copy, replace_if, count, generate, count_if
-#include <boost/range/algorithm_ext.hpp> // iota
-#include <boost/range/numeric.hpp>       // accumulate
-#include <boost/test/unit_test.hpp>
-
-#include <random>
-#include <sstream>
-
-#define BOOST_TEST_MODULE BoostRangeAdapters
-
-namespace tt = boost::test_tools;
-
-BOOST_AUTO_TEST_CASE(range_algorithms)
-{
-  Kokkos::View<int[4], Kokkos::HostSpace> w("w");
-
-  boost::iota(w, 0);
-  std::stringstream ss;
-  boost::reverse_copy(w, std::ostream_iterator<int>(ss, " "));
-  BOOST_TEST(ss.str() == "3 2 1 0 ");
-
-  boost::replace_if(w, [](int i) { return (i > 1); }, -1);
-  BOOST_TEST(w == std::vector<int>({0, 1, -1, -1}), tt::per_element());
-
-  BOOST_TEST(boost::count(w, -1), 2);
-  BOOST_TEST(boost::accumulate(w, 5), 4);
-}
-
-BOOST_AUTO_TEST_CASE(point_cloud)
-{
-  using ArborX::Point;
-  using ArborX::Details::distance;
-  double const seed = 3.14;
-  std::default_random_engine generator(seed);
-  std::uniform_real_distribution<double> distribution(-1., 1.);
-  int const n = 10000;
-  Kokkos::View<Point *, Kokkos::HostSpace> cloud("cloud", n);
-  boost::generate(cloud, [&distribution, &generator]() {
-    Point p;
-    p[0] = distribution(generator);
-    p[1] = distribution(generator);
-    p[2] = distribution(generator);
-    return p;
-  });
-
-  Point const origin = {0., 0., 0.};
-  double const radius = 1.;
-  // 4/3 pi 1^3 / 2^3
-  double const pi = 6. *
-                    static_cast<double>(boost::count_if(
-                        cloud,
-                        [origin, radius](Point point) {
-                          return (distance(point, origin) <= radius);
-                        })) /
-                    static_cast<double>(n);
-
-  double const relative_tolerance = .05;
-  BOOST_TEST(pi == 3.14, tt::tolerance(relative_tolerance));
-}
diff --git a/arborx/test/tstCompileOnlyAccessTraits.cpp b/arborx/test/tstCompileOnlyAccessTraits.cpp
deleted file mode 100644
index 924ce73fb..000000000
--- a/arborx/test/tstCompileOnlyAccessTraits.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2017-2021 by the ArborX authors                            *
- * All rights reserved.                                                     *
- *                                                                          *
- * This file is part of the ArborX library. ArborX is                       *
- * distributed under a BSD 3-clause license. For the licensing terms see    *
- * the LICENSE file in the top-level directory.                             *
- *                                                                          *
- * SPDX-License-Identifier: BSD-3-Clause                                    *
- ****************************************************************************/
-
-#include <ArborX_AccessTraits.hpp>
-
-#include <Kokkos_Core.hpp>
-
-using ArborX::PredicatesTag;
-using ArborX::PrimitivesTag;
-using ArborX::Details::check_valid_access_traits;
-
-// NOTE Let's not bother with __host__ __device__ annotations here
-
-struct NoAccessTraitsSpecialization
-{
-};
-
-struct EmptySpecialization
-{
-};
-template <typename Tag>
-struct ArborX::AccessTraits<EmptySpecialization, Tag>
-{
-};
-
-struct InvalidMemorySpace
-{
-};
-template <typename Tag>
-struct ArborX::AccessTraits<InvalidMemorySpace, Tag>
-{
-  using memory_space = void;
-};
-
-struct SizeMemberFunctionNotStatic
-{
-};
-template <typename Tag>
-struct ArborX::AccessTraits<SizeMemberFunctionNotStatic, Tag>
-{
-  using memory_space = Kokkos::HostSpace;
-  int size(SizeMemberFunctionNotStatic) { return 255; }
-};
-
-// Ensure legacy access traits are still valid
-struct LegacyAccessTraits
-{
-};
-template <typename Tag>
-struct ArborX::Traits::Access<LegacyAccessTraits, Tag>
-{
-  using memory_space = Kokkos::HostSpace;
-  static int size(LegacyAccessTraits) { return 0; }
-  static Point get(LegacyAccessTraits, int) { return {}; }
-};
-
-void test_access_traits_compile_only()
-{
-  Kokkos::View<ArborX::Point *> p;
-  Kokkos::View<float **> v;
-  check_valid_access_traits(PrimitivesTag{}, p);
-  check_valid_access_traits(PrimitivesTag{}, v);
-
-  using NearestPredicate = decltype(ArborX::nearest(ArborX::Point{}));
-  Kokkos::View<NearestPredicate *> q;
-  check_valid_access_traits(PredicatesTag{}, q);
-
-  check_valid_access_traits(PrimitivesTag{}, LegacyAccessTraits{});
-
-  // Uncomment to see error messages
-
-  // check_valid_access_traits(PrimitivesTag{}, NoAccessTraitsSpecialization{});
-
-  // check_valid_access_traits(PrimitivesTag{}, EmptySpecialization{});
-
-  // check_valid_access_traits(PrimitivesTag{}, InvalidMemorySpace{});
-
-  // check_valid_access_traits(PrimitivesTag{}, SizeMemberFunctionNotStatic{});
-}
diff --git a/arborx/test/tstCompileOnlyCallbacks.cpp b/arborx/test/tstCompileOnlyCallbacks.cpp
deleted file mode 100644
index a7f807313..000000000
--- a/arborx/test/tstCompileOnlyCallbacks.cpp
+++ /dev/null
@@ -1,150 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2017-2021 by the ArborX authors                            *
- * All rights reserved.                                                     *
- *                                                                          *
- * This file is part of the ArborX library. ArborX is                       *
- * distributed under a BSD 3-clause license. For the licensing terms see    *
- * the LICENSE file in the top-level directory.                             *
- *                                                                          *
- * SPDX-License-Identifier: BSD-3-Clause                                    *
- ****************************************************************************/
-
-#include <ArborX_AccessTraits.hpp>
-#include <ArborX_Callbacks.hpp>
-#include <ArborX_Predicates.hpp>
-
-// NOTE Let's not bother with __host__ __device__ annotations here
-
-struct NearestPredicates
-{
-};
-template <>
-struct ArborX::AccessTraits<NearestPredicates, ArborX::PredicatesTag>
-{
-  using memory_space = Kokkos::HostSpace;
-  static int size(NearestPredicates const &) { return 1; }
-  static auto get(NearestPredicates const &, int) { return nearest(Point{}); }
-};
-
-struct SpatialPredicates
-{
-};
-template <>
-struct ArborX::AccessTraits<SpatialPredicates, ArborX::PredicatesTag>
-{
-  using memory_space = Kokkos::HostSpace;
-  static int size(SpatialPredicates const &) { return 1; }
-  static auto get(SpatialPredicates const &, int)
-  {
-    return intersects(Point{});
-  }
-};
-
-// Custom callbacks
-struct CallbackMissingTag
-{
-  template <typename Predicate, typename OutputFunctor>
-  void operator()(Predicate const &, int, OutputFunctor const &) const
-  {
-  }
-};
-
-struct Wrong
-{
-};
-
-struct CallbackDoesNotTakeCorrectArgument
-{
-  template <typename OutputFunctor>
-  void operator()(Wrong, int, OutputFunctor const &) const
-  {
-  }
-};
-
-struct CustomCallback
-{
-  template <class Predicate>
-  KOKKOS_FUNCTION void operator()(Predicate const &, int) const
-  {
-  }
-};
-
-struct CustomCallbackMissingConstQualifier
-{
-  template <class Predicate>
-  KOKKOS_FUNCTION void operator()(Predicate const &, int)
-  {
-  }
-};
-
-struct CustomCallbackNonVoidReturnType
-{
-  template <class Predicate>
-  KOKKOS_FUNCTION auto operator()(Predicate const &, int) const
-  {
-    return Wrong{};
-  }
-};
-
-struct LegacyNearestPredicateCallback
-{
-  template <class Predicate, class OutputFunctor>
-  void operator()(Predicate const &, int, float, OutputFunctor const &) const
-  {
-  }
-};
-
-void test_callbacks_compile_only()
-{
-  using ArborX::Details::check_valid_callback;
-
-  // view type does not matter as long as we do not call the output functor
-  Kokkos::View<float *> v;
-
-  check_valid_callback(ArborX::Details::DefaultCallback{}, SpatialPredicates{},
-                       v);
-  check_valid_callback(ArborX::Details::DefaultCallback{}, NearestPredicates{},
-                       v);
-
-  // not required to tag inline callbacks any more
-  check_valid_callback(CallbackMissingTag{}, SpatialPredicates{}, v);
-  check_valid_callback(CallbackMissingTag{}, NearestPredicates{}, v);
-
-  check_valid_callback(CustomCallback{}, SpatialPredicates{});
-  check_valid_callback(CustomCallback{}, NearestPredicates{});
-
-  // generic lambdas are supported if not using NVCC
-#ifndef __NVCC__
-  check_valid_callback([](auto const & /*predicate*/, int /*primitive*/,
-                          auto const & /*out*/) {},
-                       SpatialPredicates{}, v);
-
-  check_valid_callback([](auto const & /*predicate*/, int /*primitive*/,
-                          auto const & /*out*/) {},
-                       NearestPredicates{}, v);
-
-  check_valid_callback([](auto const & /*predicate*/, int /*primitive*/) {},
-                       SpatialPredicates{});
-
-  check_valid_callback([](auto const & /*predicate*/, int /*primitive*/) {},
-                       NearestPredicates{});
-#endif
-
-  // Uncomment to see error messages
-
-  // check_valid_callback(LegacyNearestPredicateCallback{}, NearestPredicates{},
-  //                     v);
-
-  // check_valid_callback(CallbackDoesNotTakeCorrectArgument{},
-  //                     SpatialPredicates{}, v);
-
-  // check_valid_callback(CustomCallbackNonVoidReturnType{},
-  //                     SpatialPredicates{});
-
-  // check_valid_callback(CustomCallbackMissingConstQualifier{},
-  //                     SpatialPredicates{});
-
-#ifndef __NVCC__
-  // check_valid_callback([](Wrong, int /*primitive*/) {}, SpatialPredicates{});
-#endif
-}
diff --git a/arborx/test/tstCompileOnlyConcepts.cpp b/arborx/test/tstCompileOnlyConcepts.cpp
deleted file mode 100644
index 03fae584b..000000000
--- a/arborx/test/tstCompileOnlyConcepts.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2017-2021 by the ArborX authors                            *
- * All rights reserved.                                                     *
- *                                                                          *
- * This file is part of the ArborX library. ArborX is                       *
- * distributed under a BSD 3-clause license. For the licensing terms see    *
- * the LICENSE file in the top-level directory.                             *
- *                                                                          *
- * SPDX-License-Identifier: BSD-3-Clause                                    *
- ****************************************************************************/
-
-#include <ArborX_DetailsConcepts.hpp>
-
-#include <tuple>
-#include <type_traits>
-
-void test_concepts_compile_only()
-{
-  using ArborX::Details::first_template_parameter_t;
-  static_assert(std::is_same<first_template_parameter_t<std::tuple<int, float>>,
-                             int>::value,
-                "");
-}
diff --git a/arborx/test/tstCompileOnlyMain.cpp b/arborx/test/tstCompileOnlyMain.cpp
deleted file mode 100644
index 8bfd76f25..000000000
--- a/arborx/test/tstCompileOnlyMain.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2017-2021 by the ArborX authors                            *
- * All rights reserved.                                                     *
- *                                                                          *
- * This file is part of the ArborX library. ArborX is                       *
- * distributed under a BSD 3-clause license. For the licensing terms see    *
- * the LICENSE file in the top-level directory.                             *
- *                                                                          *
- * SPDX-License-Identifier: BSD-3-Clause                                    *
- ****************************************************************************/
-
-int main() { return 0; }
diff --git a/arborx/test/tstCompileOnlyTypeRequirements.cpp b/arborx/test/tstCompileOnlyTypeRequirements.cpp
deleted file mode 100644
index d07f33c42..000000000
--- a/arborx/test/tstCompileOnlyTypeRequirements.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2017-2021 by the ArborX authors                            *
- * All rights reserved.                                                     *
- *                                                                          *
- * This file is part of the ArborX library. ArborX is                       *
- * distributed under a BSD 3-clause license. For the licensing terms see    *
- * the LICENSE file in the top-level directory.                             *
- *                                                                          *
- * SPDX-License-Identifier: BSD-3-Clause                                    *
- ****************************************************************************/
-
-#include <ArborX_LinearBVH.hpp>
-
-#include <Kokkos_Core.hpp>
-
-namespace Test
-{
-// NOTE only supporting Point and Box
-using PrimitivePointOrBox = ArborX::Point;
-// using PrimitivePointOrBox = ArborX::Box;
-
-// clang-format off
-struct FakeBoundingVolume
-{
-  KOKKOS_FUNCTION FakeBoundingVolume &operator+=(PrimitivePointOrBox) { return *this; }
-  KOKKOS_FUNCTION void operator+=(PrimitivePointOrBox) volatile {}
-  KOKKOS_FUNCTION operator ArborX::Box() const { return {}; }
-};
-KOKKOS_FUNCTION void expand(FakeBoundingVolume, FakeBoundingVolume) {}
-KOKKOS_FUNCTION void expand(FakeBoundingVolume, PrimitivePointOrBox) {}
-
-struct FakePredicateGeometry {};
-KOKKOS_FUNCTION ArborX::Point returnCentroid(FakePredicateGeometry) { return {}; }
-KOKKOS_FUNCTION bool intersects(FakePredicateGeometry, FakeBoundingVolume) { return true; }
-KOKKOS_FUNCTION float distance(FakePredicateGeometry, FakeBoundingVolume) { return 0.f; }
-// clang-format on
-} // namespace Test
-
-// Compile-only
-void check_bounding_volume_and_predicate_geometry_type_requirements()
-{
-  using ExecutionSpace = Kokkos::DefaultExecutionSpace;
-  using MemorySpace = ExecutionSpace::memory_space;
-  using Tree = ArborX::BasicBoundingVolumeHierarchy<MemorySpace,
-                                                    Test::FakeBoundingVolume>;
-
-  Kokkos::View<Test::PrimitivePointOrBox *, MemorySpace> primitives(
-      "primitives", 0);
-  Tree tree(ExecutionSpace{}, primitives);
-
-  using SpatialPredicate =
-      decltype(ArborX::intersects(Test::FakePredicateGeometry{}));
-  Kokkos::View<SpatialPredicate *, MemorySpace> spatial_predicates(
-      "spatial_predicates", 0);
-  tree.query(ExecutionSpace{}, spatial_predicates,
-             KOKKOS_LAMBDA(SpatialPredicate, int){});
-
-  using NearestPredicate =
-      decltype(ArborX::nearest(Test::FakePredicateGeometry{}));
-  Kokkos::View<NearestPredicate *, MemorySpace> nearest_predicates(
-      "nearest_predicates", 0);
-  tree.query(ExecutionSpace{}, nearest_predicates,
-             KOKKOS_LAMBDA(NearestPredicate, int){});
-}
diff --git a/arborx/test/tstContainerAdaptors.cpp b/arborx/test/tstContainerAdaptors.cpp
deleted file mode 100644
index 2217c4ac5..000000000
--- a/arborx/test/tstContainerAdaptors.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2017-2021 by the ArborX authors                            *
- * All rights reserved.                                                     *
- *                                                                          *
- * This file is part of the ArborX library. ArborX is                       *
- * distributed under a BSD 3-clause license. For the licensing terms see    *
- * the LICENSE file in the top-level directory.                             *
- *                                                                          *
- * SPDX-License-Identifier: BSD-3-Clause                                    *
- ****************************************************************************/
-
-#include <ArborX_DetailsPriorityQueue.hpp>
-#include <ArborX_DetailsStack.hpp>
-
-#include <boost/test/unit_test.hpp>
-
-using ArborX::Details::PriorityQueue;
-using ArborX::Details::Stack;
-
-BOOST_AUTO_TEST_SUITE(ContainerAdaptors)
-
-BOOST_AUTO_TEST_CASE(stack_)
-{
-  // stack is empty at construction
-  Stack<int> stack;
-  BOOST_TEST(stack.empty());
-  BOOST_TEST(stack.size() == 0);
-  // insert element
-  stack.push(2);
-  BOOST_TEST(!stack.empty());
-  BOOST_TEST(stack.size() == 1);
-  BOOST_TEST(stack.top() == 2);
-  // insert another element
-  stack.push(5);
-  BOOST_TEST(!stack.empty());
-  BOOST_TEST(stack.size() == 2);
-  BOOST_TEST(stack.top() == 5);
-  // remove it
-  stack.pop();
-  BOOST_TEST(!stack.empty());
-  BOOST_TEST(stack.size() == 1);
-  BOOST_TEST(stack.top() == 2);
-  // empty the stack
-  stack.pop();
-  BOOST_TEST(stack.empty());
-  BOOST_TEST(stack.size() == 0);
-}
-
-BOOST_AUTO_TEST_CASE(priority_queue)
-{
-  PriorityQueue<int> queue;
-  // queue is empty at construction
-  BOOST_TEST(queue.empty());
-  // insert element
-  queue.push(33);
-  BOOST_TEST(!queue.empty());
-  BOOST_TEST(queue.top() == 33);
-  // smaller distance stays on top of the priority queue
-  queue.push(24);
-  BOOST_TEST(queue.top() == 33);
-  // remove highest priority element
-  queue.pop();
-  BOOST_TEST(queue.top() == 24);
-  // insert element with higher priority and check it shows up on top
-  queue.push(33);
-  BOOST_TEST(queue.top() == 33);
-  // empty the queue
-  queue.pop();
-  queue.pop();
-  BOOST_TEST(queue.empty());
-}
-
-BOOST_AUTO_TEST_SUITE_END()
diff --git a/arborx/test/tstDBSCAN.cpp b/arborx/test/tstDBSCAN.cpp
deleted file mode 100644
index 5b9482c32..000000000
--- a/arborx/test/tstDBSCAN.cpp
+++ /dev/null
@@ -1,270 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2017-2021 by the ArborX authors                            *
- * All rights reserved.                                                     *
- *                                                                          *
- * This file is part of the ArborX library. ArborX is                       *
- * distributed under a BSD 3-clause license. For the licensing terms see    *
- * the LICENSE file in the top-level directory.                             *
- *                                                                          *
- * SPDX-License-Identifier: BSD-3-Clause                                    *
- ****************************************************************************/
-#include "ArborX_EnableDeviceTypes.hpp" // ARBORX_DEVICE_TYPES
-#include <ArborX_DBSCAN.hpp>
-#include <ArborX_DBSCANVerification.hpp>
-
-#include "BoostTest_CUDA_clang_workarounds.hpp"
-#include <boost/test/unit_test.hpp>
-
-template <typename View>
-struct HiddenView
-{
-  View _view;
-};
-template <typename View>
-struct ArborX::AccessTraits<HiddenView<View>, ArborX::PrimitivesTag>
-{
-  using Data = HiddenView<View>;
-  static KOKKOS_FUNCTION std::size_t size(Data const &data)
-  {
-    return data._view.extent(0);
-  }
-  static KOKKOS_FUNCTION typename View::value_type const &get(Data const &data,
-                                                              std::size_t i)
-  {
-    return data._view(i);
-  }
-  using memory_space = typename View::memory_space;
-};
-
-BOOST_AUTO_TEST_SUITE(DBSCAN)
-
-template <typename DeviceType, typename T>
-auto buildView(std::vector<T> const &v)
-{
-  Kokkos::View<T *, DeviceType> view("Testing::v", v.size());
-  Kokkos::deep_copy(view, Kokkos::View<T const *, Kokkos::HostSpace,
-                                       Kokkos::MemoryTraits<Kokkos::Unmanaged>>(
-                              v.data(), v.size()));
-  return view;
-}
-
-BOOST_AUTO_TEST_CASE_TEMPLATE(dbscan_verifier, DeviceType, ARBORX_DEVICE_TYPES)
-{
-  using ExecutionSpace = typename DeviceType::execution_space;
-  using ArborX::Point;
-  using ArborX::Details::verifyDBSCAN;
-
-  ExecutionSpace space;
-
-  {
-    auto points = buildView<DeviceType, Point>({{{0, 0, 0}}, {{1, 1, 1}}});
-
-    auto r = std::sqrt(3);
-
-    BOOST_TEST(verifyDBSCAN(space, points, r - 0.1, 2,
-                            buildView<DeviceType, int>({-1, -1})));
-    BOOST_TEST(!verifyDBSCAN(space, points, r - 0.1, 2,
-                             buildView<DeviceType, int>({1, 2})));
-    BOOST_TEST(!verifyDBSCAN(space, points, r - 0.1, 2,
-                             buildView<DeviceType, int>({1, 1})));
-    BOOST_TEST(
-        verifyDBSCAN(space, points, r, 2, buildView<DeviceType, int>({1, 1})));
-    BOOST_TEST(
-        !verifyDBSCAN(space, points, r, 2, buildView<DeviceType, int>({1, 2})));
-    BOOST_TEST(verifyDBSCAN(space, points, r, 3,
-                            buildView<DeviceType, int>({-1, -1})));
-    BOOST_TEST(
-        !verifyDBSCAN(space, points, r, 3, buildView<DeviceType, int>({1, 1})));
-  }
-
-  {
-    auto points = buildView<DeviceType, Point>(
-        {{{0, 0, 0}}, {{1, 1, 1}}, {{3, 3, 3}}, {{6, 6, 6}}});
-
-    auto r = std::sqrt(3);
-
-    BOOST_TEST(verifyDBSCAN(space, points, r, 2,
-                            buildView<DeviceType, int>({1, 1, -1, -1})));
-    BOOST_TEST(verifyDBSCAN(space, points, r, 3,
-                            buildView<DeviceType, int>({-1, -1, -1, -1})));
-
-    BOOST_TEST(verifyDBSCAN(space, points, 2 * r, 2,
-                            buildView<DeviceType, int>({3, 3, 3, -1})));
-    BOOST_TEST(verifyDBSCAN(space, points, 2 * r, 3,
-                            buildView<DeviceType, int>({3, 3, 3, -1})));
-    BOOST_TEST(verifyDBSCAN(space, points, 2 * r, 4,
-                            buildView<DeviceType, int>({-1, -1, -1, -1})));
-
-    BOOST_TEST(verifyDBSCAN(space, points, 3 * r, 2,
-                            buildView<DeviceType, int>({5, 5, 5, 5})));
-    BOOST_TEST(verifyDBSCAN(space, points, 3 * r, 3,
-                            buildView<DeviceType, int>({5, 5, 5, 5})));
-    BOOST_TEST(verifyDBSCAN(space, points, 3 * r, 4,
-                            buildView<DeviceType, int>({7, 7, 7, 7})));
-    BOOST_TEST(verifyDBSCAN(space, points, 3 * r, 5,
-                            buildView<DeviceType, int>({-1, -1, -1, -1})));
-  }
-
-  {
-    // check for bridging effect
-    auto points = buildView<DeviceType, Point>({{-1, 0.5, 0},
-                                                {-1, -0.5, 0},
-                                                {-1, 0, 0},
-                                                {{0, 0, 0}},
-                                                {{1, 0, 0}},
-                                                {{1, 0.5, 0}},
-                                                {{1, -0.5, 0}}});
-
-    BOOST_TEST(verifyDBSCAN(space, points, 1, 3,
-                            buildView<DeviceType, int>({5, 5, 5, 5, 5, 5, 5})));
-    BOOST_TEST(
-        (verifyDBSCAN(space, points, 1, 4,
-                      buildView<DeviceType, int>({5, 5, 5, 5, 6, 6, 6})) ||
-         verifyDBSCAN(space, points, 1, 4,
-                      buildView<DeviceType, int>({5, 5, 5, 6, 6, 6, 6}))));
-    BOOST_TEST(
-        !verifyDBSCAN(space, points, 1, 4,
-                      buildView<DeviceType, int>({5, 5, 5, 5, 5, 5, 5})));
-  }
-
-  {
-    // check where a core point is connected to only boundary points, but which
-    // are stripped by a second core point
-
-    // o - core, x - border
-    //     -1 0 1 2
-    //    ----------
-    //  2 | x o x
-    //  1 |   x   x
-    //  0 |   o x o
-    // -1 |   x   x
-    // -2 | x o x
-    // clang-format off
-    auto points = buildView<DeviceType, Point>({
-        {0, -2, 0}, {-1, -2, 0}, {1, -2, 0}, {0, -1, 0}, // bottom
-        {0, 2, 0}, {-1, 2, 0}, {1, 2, 0}, {0, 1, 0}, // top
-        {2, 0, 0}, {2, -1, 0}, {2, 1, 0}, {1, 0, 0}, // right
-        {0, 0, 0}  // stripped core
-    });
-    // clang-format on
-
-    BOOST_TEST(verifyDBSCAN(
-        space, points, 1, 4,
-        buildView<DeviceType, int>({0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 5})));
-    // make sure the stripped core is not marked as noise
-    BOOST_TEST(!verifyDBSCAN(
-        space, points, 1, 4,
-        buildView<DeviceType, int>({0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, -1})));
-  }
-}
-
-BOOST_AUTO_TEST_CASE_TEMPLATE(dbscan, DeviceType, ARBORX_DEVICE_TYPES)
-{
-  using ExecutionSpace = typename DeviceType::execution_space;
-  using ArborX::dbscan;
-  using ArborX::Point;
-  using ArborX::Details::verifyDBSCAN;
-
-  ExecutionSpace space;
-
-  for (auto impl : {ArborX::DBSCAN::Implementation::FDBSCAN,
-                    ArborX::DBSCAN::Implementation::FDBSCAN_DenseBox})
-  {
-    ArborX::DBSCAN::Parameters params;
-    params.setImplementation(impl);
-    {
-      auto points = buildView<DeviceType, Point>({{{0, 0, 0}}, {{1, 1, 1}}});
-
-      auto r = std::sqrt(3);
-
-      BOOST_TEST(verifyDBSCAN(space, points, r - 0.1, 2,
-                              dbscan(space, points, r - 0.1, 2, params)));
-      BOOST_TEST(verifyDBSCAN(space, points, r, 2,
-                              dbscan(space, points, r, 2, params)));
-      BOOST_TEST(verifyDBSCAN(space, points, r, 3,
-                              dbscan(space, points, r, 3, params)));
-
-      // Test non-View primitives
-      HiddenView<decltype(points)> hidden_points{points};
-      BOOST_TEST(
-          verifyDBSCAN(space, hidden_points, r - 0.1, 2,
-                       dbscan(space, hidden_points, r - 0.1, 2, params)));
-      BOOST_TEST(verifyDBSCAN(space, hidden_points, r, 2,
-                              dbscan(space, hidden_points, r, 2, params)));
-      BOOST_TEST(verifyDBSCAN(space, hidden_points, r, 3,
-                              dbscan(space, hidden_points, r, 3, params)));
-    }
-
-    {
-      auto points = buildView<DeviceType, Point>(
-          {{{0, 0, 0}}, {{1, 1, 1}}, {{3, 3, 3}}, {{6, 6, 6}}});
-
-      auto r = std::sqrt(3);
-
-      BOOST_TEST(verifyDBSCAN(space, points, r, 2,
-                              dbscan(space, points, r, 2, params)));
-      BOOST_TEST(verifyDBSCAN(space, points, r, 3,
-                              dbscan(space, points, r, 3, params)));
-
-      BOOST_TEST(verifyDBSCAN(space, points, 2 * r, 2,
-                              dbscan(space, points, 2 * r, 2, params)));
-      BOOST_TEST(verifyDBSCAN(space, points, 2 * r, 3,
-                              dbscan(space, points, 2 * r, 3, params)));
-      BOOST_TEST(verifyDBSCAN(space, points, 2 * r, 4,
-                              dbscan(space, points, 2 * r, 4, params)));
-
-      BOOST_TEST(verifyDBSCAN(space, points, 3 * r, 2,
-                              dbscan(space, points, 3 * r, 2, params)));
-      BOOST_TEST(verifyDBSCAN(space, points, 3 * r, 3,
-                              dbscan(space, points, 3 * r, 3, params)));
-      BOOST_TEST(verifyDBSCAN(space, points, 3 * r, 4,
-                              dbscan(space, points, 3 * r, 4, params)));
-      BOOST_TEST(verifyDBSCAN(space, points, 3 * r, 5,
-                              dbscan(space, points, 3 * r, 5, params)));
-    }
-
-    {
-      // check for bridging effect
-      auto points = buildView<DeviceType, Point>({{-1, 0.5, 0},
-                                                  {-1, -0.5, 0},
-                                                  {-1, 0, 0},
-                                                  {{0, 0, 0}},
-                                                  {{1, 0, 0}},
-                                                  {{1, 0.5, 0}},
-                                                  {{1, -0.5, 0}}});
-
-      BOOST_TEST(verifyDBSCAN(space, points, 1.0, 3,
-                              dbscan(space, points, 1, 3, params)));
-      BOOST_TEST(verifyDBSCAN(space, points, 1.0, 4,
-                              dbscan(space, points, 1, 4, params)));
-    }
-  }
-
-  {
-    // check where a core point is connected to only boundary points, but which
-    // are stripped by a second core point
-
-    // o - core, x - border
-    //     -1 0 1 2
-    //    ----------
-    //  2 | x o x
-    //  1 |   x   x
-    //  0 |   o x o
-    // -1 |   x   x
-    // -2 | x o x
-    // clang-format off
-    auto points = buildView<DeviceType, Point>({
-        {0, -2, 0}, {-1, -2, 0}, {1, -2, 0}, {0, -1, 0}, // bottom
-        {0, 2, 0}, {-1, 2, 0}, {1, 2, 0}, {0, 1, 0}, // top
-        {2, 0, 0}, {2, -1, 0}, {2, 1, 0}, {1, 0, 0}, // right
-        {0, 0, 0}  // stripped core
-    });
-    // clang-format on
-
-    // This does *not* guarantee to trigger the issue, as it depends on the
-    // specific implementation and runtime. But it may.
-    BOOST_TEST(verifyDBSCAN(space, points, 1, 4, dbscan(space, points, 1, 4)));
-  }
-}
-
-BOOST_AUTO_TEST_SUITE_END()
diff --git a/arborx/test/tstDetailsAlgorithms.cpp b/arborx/test/tstDetailsAlgorithms.cpp
deleted file mode 100644
index 5df205c02..000000000
--- a/arborx/test/tstDetailsAlgorithms.cpp
+++ /dev/null
@@ -1,234 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2017-2021 by the ArborX authors                            *
- * All rights reserved.                                                     *
- *                                                                          *
- * This file is part of the ArborX library. ArborX is                       *
- * distributed under a BSD 3-clause license. For the licensing terms see    *
- * the LICENSE file in the top-level directory.                             *
- *                                                                          *
- * SPDX-License-Identifier: BSD-3-Clause                                    *
- ****************************************************************************/
-
-#include <ArborX_DetailsAlgorithms.hpp>
-#include <ArborX_DetailsKokkosExtArithmeticTraits.hpp>
-
-#define BOOST_TEST_MODULE Geometry
-#include <boost/test/unit_test.hpp>
-
-// NOTE: message is not required any more with C++17
-#define STATIC_ASSERT(cond) static_assert(cond, "");
-
-using ArborX::Box;
-using ArborX::Point;
-using ArborX::Sphere;
-
-BOOST_AUTO_TEST_CASE(distance)
-{
-  using ArborX::Details::distance;
-  BOOST_TEST(distance({{1.0, 2.0, 3.0}}, {{1.0, 1.0, 1.0}}) == std::sqrt(5.f));
-
-  // box is unit cube
-  constexpr Box box{{{0.0, 0.0, 0.0}}, {{1.0, 1.0, 1.0}}};
-
-  // distance is zero if the point is inside the box
-  BOOST_TEST(distance({{0.5, 0.5, 0.5}}, box) == 0.0);
-  // or anywhere on the boundary
-  BOOST_TEST(distance({{0.0, 0.0, 0.5}}, box) == 0.0);
-  // normal projection onto center of one face
-  BOOST_TEST(distance({{2.0, 0.5, 0.5}}, box) == 1.0);
-  // projection onto edge
-  BOOST_TEST(distance({{2.0, 0.75, -1.0}}, box) == std::sqrt(2.f));
-  // projection onto corner node
-  BOOST_TEST(distance({{-1.0, 2.0, 2.0}}, box) == std::sqrt(3.f));
-
-  // unit sphere
-  constexpr Sphere sphere{{{0., 0., 0.}}, 1.};
-  BOOST_TEST(distance({{.5, .5, .5}}, sphere) == 0.);
-  BOOST_TEST(distance({{2., 0., 0.}}, sphere) == 1.);
-  BOOST_TEST(distance({{1., 1., 1.}}, sphere) == std::sqrt(3.f) - 1.f);
-}
-
-BOOST_AUTO_TEST_CASE(distance_box_box)
-{
-  using ArborX::Details::distance;
-
-  constexpr Box unit_box{{{0.0, 0.0, 0.0}}, {{1.0, 1.0, 1.0}}};
-
-  // distance to self
-  BOOST_TEST(distance(unit_box, unit_box) == 0);
-  // distance to another unit box translated along one axis
-  BOOST_TEST(distance(unit_box, Box{{{2, 0, 0}}, {{3, 1, 1}}}) == 1);
-  BOOST_TEST(distance(unit_box, Box{{{0, -3, 0}}, {{1, -2, 1}}}) == 2);
-  BOOST_TEST(distance(unit_box, Box{{{0, 0, 4}}, {{1, 1, 5}}}) == 3);
-  // distance to another unit box translated along a plane
-  BOOST_TEST(distance(unit_box, Box{{{-4, -4, 0}}, {{-3, -3, 1}}}) ==
-             3 * std::sqrt(2.f));
-  BOOST_TEST(distance(unit_box, Box{{{0, -2, 3}}, {{1, -1, 4}}}) ==
-             std::sqrt(5.f));
-  BOOST_TEST(distance(unit_box, Box{{{5, 0, 7}}, {{6, 1, 8}}}) ==
-             2 * std::sqrt(13.f));
-
-  // distance to another box that contains the box
-  BOOST_TEST(distance(unit_box, Box{{{-1, -2, -3}}, {{4, 5, 6}}}) == 0);
-  // distance to another box within the unit box
-  BOOST_TEST(distance(unit_box, Box{{{.1, .2, .3}}, {{.4, .5, .6}}}) == 0);
-  // distance to another box that overlaps with the unit box
-  BOOST_TEST(distance(unit_box, Box{{{.1, .2, .3}}, {{4, 5, 6}}}) == 0);
-
-  // distance to empty boxes
-  auto infinity = KokkosExt::ArithmeticTraits::infinity<float>::value;
-  BOOST_TEST(distance(unit_box, Box{}) == infinity);
-  BOOST_TEST(distance(Box{}, unit_box) == infinity);
-  BOOST_TEST(distance(Box{}, Box{}) == infinity);
-}
-
-BOOST_AUTO_TEST_CASE(distance_sphere_box)
-{
-  using ArborX::Details::distance;
-  auto infinity = KokkosExt::ArithmeticTraits::infinity<float>::value;
-
-  // unit sphere
-  constexpr Sphere sphere{{{0., 0., 0.}}, 1.};
-  // distance between a sphere and a box no intersection
-  BOOST_TEST(distance(sphere, Box{{2.0, 3.0, 4.0}, {2.5, 3.5, 4.5}}) ==
-             std::sqrt(29.f) - 1.f);
-  // distance between a sphere and a box with intersection
-  BOOST_TEST(distance(sphere, Box{{0.5, 0.5, 0.5}, {2.5, 3.5, 4.5}}) == 0.f);
-  // distance between a sphere included in a box and that box
-  BOOST_TEST(distance(sphere, Box{{-2., -2., -2.}, {2., 2., 2.}}) == 0.f);
-  // distance between a sphere and a box included in that sphere
-  BOOST_TEST(distance(sphere, Box{{0., 0., 0.}, {0.1, 0.2, 0.3}}) == 0.f);
-  // distance to empty box
-  BOOST_TEST(distance(sphere, Box{}) == infinity);
-}
-
-BOOST_AUTO_TEST_CASE(intersects)
-{
-  using ArborX::Details::intersects;
-
-  // uninitialized box does not intersect with other boxes
-  STATIC_ASSERT(!intersects(Box{}, {{{1.0, 2.0, 3.0}}, {{4.0, 5.0, 6.0}}}));
-  // uninitialized box does not even intersect with itself
-  STATIC_ASSERT(!intersects(Box{}, Box{}));
-  // box with zero extent does
-  STATIC_ASSERT(intersects(Box{{{0.0, 0.0, 0.0}}, {{0.0, 0.0, 0.0}}},
-                           Box{{{0.0, 0.0, 0.0}}, {{0.0, 0.0, 0.0}}}));
-
-  // point
-  constexpr Point point{{1.0, 1.0, 1.0}};
-  // point is contained in a box
-  STATIC_ASSERT(intersects(point, {{{0.0, 0.0, 0.0}}, {{2.0, 2.0, 2.0}}}));
-  STATIC_ASSERT(!intersects(point, {{{-1.0, -1.0, -1.0}}, {{0.0, 0.0, 0.0}}}));
-  // point is on a side of a box
-  STATIC_ASSERT(intersects(point, {{{0.0, 0.0, 0.0}}, {{2.0, 2.0, 1.0}}}));
-  // point is a corner of a box
-  STATIC_ASSERT(intersects(point, {{{0.0, 0.0, 0.0}}, {{1.0, 1.0, 1.0}}}));
-
-  // unit cube
-  constexpr Box box{{{0.0, 0.0, 0.0}}, {{1.0, 1.0, 1.0}}};
-  STATIC_ASSERT(intersects(box, box));
-  STATIC_ASSERT(!intersects(box, Box{}));
-  // smaller box inside
-  STATIC_ASSERT(intersects(box, {{{0.25, 0.25, 0.25}}, {{0.75, 0.75, 0.75}}}));
-  // bigger box that contains it
-  STATIC_ASSERT(intersects(box, {{{-1.0, -1.0, -1.0}}, {{2.0, 2.0, 2.0}}}));
-  // couple boxes that do intersect
-  STATIC_ASSERT(intersects(box, {{{0.5, 0.5, 0.5}}, {{1.5, 1.5, 1.5}}}));
-  STATIC_ASSERT(intersects(box, {{{-0.5, -0.5, -0.5}}, {{0.5, 0.5, 0.5}}}));
-  // couple boxes that do not
-  STATIC_ASSERT(!intersects(box, {{{-2.0, -2.0, -2.0}}, {{-1.0, -1.0, -1.0}}}));
-  STATIC_ASSERT(!intersects(box, {{{0.0, 0.0, 2.0}}, {{1.0, 1.0, 3.0}}}));
-  // boxes intersect if faces touch
-  STATIC_ASSERT(intersects(box, {{{1.0, 0.0, 0.0}}, {{2.0, 1.0, 1.0}}}));
-  STATIC_ASSERT(intersects(box, {{{-0.5, -0.5, -0.5}}, {{0.5, 0.0, 0.5}}}));
-
-  // unit sphere
-  constexpr Sphere sphere{{{0., 0., 0.}}, 1.};
-  BOOST_TEST(intersects(sphere, {{{0., 0., 0.}}, {{1., 1., 1.}}}));
-  BOOST_TEST(!intersects(sphere, {{{1., 2., 3.}}, {{4., 5., 6.}}}));
-}
-
-BOOST_AUTO_TEST_CASE(equals)
-{
-  using ArborX::Details::equals;
-  // points
-  STATIC_ASSERT(equals(Point{{0., 0., 0.}}, {{0., 0., 0.}}));
-  STATIC_ASSERT(!equals(Point{{0., 0., 0.}}, {{1., 1., 1.}}));
-  // boxes
-  STATIC_ASSERT(equals(Box{{{0.0, 0.0, 0.0}}, {{1.0, 1.0, 1.0}}},
-                       {{{0.0, 0.0, 0.0}}, {{1.0, 1.0, 1.0}}}));
-  STATIC_ASSERT(!equals(Box{{{0.0, 0.0, 0.0}}, {{1.0, 0.0, 1.0}}},
-                        {{{-1.0, -1.0, -1.0}}, {{1.0, 1.0, 1.0}}}));
-  // spheres
-  STATIC_ASSERT(equals({{{0., 0., 0.}}, 1.}, {{{0., 0., 0.}}, 1.}));
-  STATIC_ASSERT(!equals({{{0., 0., 0.}}, 1.}, {{{0., 1., 2.}}, 1.}));
-  STATIC_ASSERT(!equals({{{0., 0., 0.}}, 1.}, {{{0., 0., 0.}}, 2.}));
-}
-
-BOOST_AUTO_TEST_CASE(expand)
-{
-  using ArborX::Details::equals;
-  using ArborX::Details::expand;
-  Box box;
-
-  // expand box with points
-  expand(box, {{0.0, 0.0, 0.0}});
-  BOOST_TEST(equals(box, {{{0.0, 0.0, 0.0}}, {{0.0, 0.0, 0.0}}}));
-  expand(box, {{1.0, 1.0, 1.0}});
-  BOOST_TEST(equals(box, {{{0.0, 0.0, 0.0}}, {{1.0, 1.0, 1.0}}}));
-  expand(box, {{0.25, 0.75, 0.25}});
-  BOOST_TEST(equals(box, {{{0.0, 0.0, 0.0}}, {{1.0, 1.0, 1.0}}}));
-  expand(box, {{-1.0, -1.0, -1.0}});
-  BOOST_TEST(equals(box, {{{-1.0, -1.0, -1.0}}, {{1.0, 1.0, 1.0}}}));
-
-  // expand box with boxes
-  expand(box, {{{0.25, 0.25, 0.25}}, {{0.75, 0.75, 0.75}}});
-  BOOST_TEST(equals(box, {{{-1.0, -1.0, -1.0}}, {{1.0, 1.0, 1.0}}}));
-  expand(box, {{{10.0, 10.0, 10.0}}, {{11.0, 11.0, 11.0}}});
-  BOOST_TEST(equals(box, {{{-1.0, -1.0, -1.0}}, {{11.0, 11.0, 11.0}}}));
-
-  // expand box with spheres
-  expand(box, {{{0., 1., 2.}}, 3.});
-  BOOST_TEST(equals(box, {{{-3., -2., -1.}}, {{11., 11., 11.}}}));
-  expand(box, {{{0., 0., 0.}}, 1.});
-  BOOST_TEST(equals(box, {{{-3., -2., -1.}}, {{11., 11., 11.}}}));
-  expand(box, {{{0., 0., 0.}}, 24.});
-  BOOST_TEST(equals(box, {{{-24., -24., -24.}}, {{24., 24., 24.}}}));
-}
-
-BOOST_AUTO_TEST_CASE(centroid)
-{
-  using ArborX::Details::centroid;
-  Box box{{{-10.0, 0.0, 10.0}}, {{0.0, 10.0, 20.0}}};
-  Point center;
-  centroid(box, center);
-  BOOST_TEST(center[0] == -5.0);
-  BOOST_TEST(center[1] == 5.0);
-  BOOST_TEST(center[2] == 15.0);
-}
-
-BOOST_AUTO_TEST_CASE(is_valid)
-{
-  using ArborX::Details::isValid;
-
-  auto infty = std::numeric_limits<double>::infinity();
-
-  BOOST_TEST(isValid(Point{{1., 2., 3.}}));
-  BOOST_TEST(!isValid(Point{{0., infty, 0.}}));
-
-  BOOST_TEST(isValid(Box{{{1., 2., 3.}}, {{4., 5., 6.}}}));
-  BOOST_TEST(!isValid(Box{{{0., 0., 0.}}, {{0., 0., 0.}}}));
-  BOOST_TEST(!isValid(Box{{{0., 0., -infty}}, {{0., 0., 0.}}}));
-  BOOST_TEST(!isValid(Box{{{0., 0., 0.}}, {{+infty, 0., 0.}}}));
-  BOOST_TEST(!isValid(Box{}));
-  BOOST_TEST(!isValid(Box{{{1., 1., 1.}}, {{0., 0., 0.}}}));
-  BOOST_TEST(!isValid(Box{{{0., 0., 1.}}, {{0., 0., 0.}}}));
-  BOOST_TEST(!isValid(Box{{{0., 0., 0.}}, {{-1, 0., 0.}}}));
-
-  BOOST_TEST(isValid(Sphere{{{1., 2., 3.}}, 4.}));
-  BOOST_TEST(isValid(Sphere{{{0., 0., 0.}}, 0.}));
-  BOOST_TEST(!isValid(Sphere{{{1., 2., 3.}}, -1.}));
-  BOOST_TEST(!isValid(Sphere{{{0., 0., 0.}}, +infty}));
-  BOOST_TEST(!isValid(Sphere{{{0., -infty, 0.}}, +1.}));
-  BOOST_TEST(isValid(Sphere{}));
-}
diff --git a/arborx/test/tstDetailsBatchedQueries.cpp b/arborx/test/tstDetailsBatchedQueries.cpp
deleted file mode 100644
index 3599eb679..000000000
--- a/arborx/test/tstDetailsBatchedQueries.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2017-2021 by the ArborX authors                            *
- * All rights reserved.                                                     *
- *                                                                          *
- * This file is part of the ArborX library. ArborX is                       *
- * distributed under a BSD 3-clause license. For the licensing terms see    *
- * the LICENSE file in the top-level directory.                             *
- *                                                                          *
- * SPDX-License-Identifier: BSD-3-Clause                                    *
- ****************************************************************************/
-
-#include "ArborX_EnableDeviceTypes.hpp" // ARBORX_DEVICE_TYPES
-#include "ArborX_EnableViewComparison.hpp"
-#include <ArborX_DetailsBatchedQueries.hpp>
-
-#include <boost/test/unit_test.hpp>
-
-#define BOOST_TEST_MODULE DetailsBatchedQueries
-
-namespace tt = boost::test_tools;
-
-template <typename DeviceType, typename ValueType>
-Kokkos::View<ValueType *, DeviceType> toView(std::vector<ValueType> const &v)
-{
-  Kokkos::View<ValueType *, DeviceType> w("Testing::whocares", v.size());
-  auto w_host = Kokkos::create_mirror_view(w);
-  for (int i = 0; i < w.extent_int(0); ++i)
-    w_host(i) = v[i];
-  Kokkos::deep_copy(w, w_host);
-  return w;
-}
-
-BOOST_AUTO_TEST_CASE_TEMPLATE(permute_offset_and_indices, DeviceType,
-                              ARBORX_DEVICE_TYPES)
-{
-  using ExecutionSpace = typename DeviceType::execution_space;
-
-  Kokkos::View<int *, DeviceType> offset("Testing::offset", 0);
-  Kokkos::View<int *, DeviceType> indices("Testing::indices", 0);
-
-  Kokkos::View<unsigned int *, DeviceType> permute("Testing::permute", 0);
-
-  BOOST_CHECK_THROW(
-      ArborX::Details::BatchedQueries<DeviceType>::reversePermutation(
-          ExecutionSpace{}, permute, offset, indices),
-      ArborX::SearchException);
-
-  Kokkos::resize(offset, 1);
-  BOOST_CHECK_NO_THROW(
-      ArborX::Details::BatchedQueries<DeviceType>::reversePermutation(
-          ExecutionSpace{}, permute, offset, indices));
-
-  std::vector<int> offset_ = {0, 0, 1, 3, 6, 10};
-  std::vector<int> indices_ = {1, 2, 2, 3, 3, 3, 4, 4, 4, 4};
-  std::vector<unsigned int> permute_ = {4, 3, 2, 1, 0};
-  std::vector<int> offset_ref = {0, 4, 7, 9, 10, 10};
-  std::vector<int> indices_ref = {4, 4, 4, 4, 3, 3, 3, 2, 2, 1};
-
-  std::tie(offset, indices) =
-      ArborX::Details::BatchedQueries<DeviceType>::reversePermutation(
-          ExecutionSpace{}, toView<DeviceType>(permute_),
-          toView<DeviceType>(offset_), toView<DeviceType>(indices_));
-  auto offset_host = Kokkos::create_mirror_view(offset);
-  Kokkos::deep_copy(offset_host, offset);
-  auto indices_host = Kokkos::create_mirror_view(indices);
-  Kokkos::deep_copy(indices_host, indices);
-  BOOST_TEST(offset_host == offset_ref, tt::per_element());
-  BOOST_TEST(indices_host == indices_ref, tt::per_element());
-}
diff --git a/arborx/test/tstDetailsCrsGraphWrapperImpl.cpp b/arborx/test/tstDetailsCrsGraphWrapperImpl.cpp
deleted file mode 100644
index c8a1795e0..000000000
--- a/arborx/test/tstDetailsCrsGraphWrapperImpl.cpp
+++ /dev/null
@@ -1,95 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2017-2021 by the ArborX authors                            *
- * All rights reserved.                                                     *
- *                                                                          *
- * This file is part of the ArborX library. ArborX is                       *
- * distributed under a BSD 3-clause license. For the licensing terms see    *
- * the LICENSE file in the top-level directory.                             *
- *                                                                          *
- * SPDX-License-Identifier: BSD-3-Clause                                    *
- ****************************************************************************/
-
-#include "ArborX_EnableDeviceTypes.hpp" // ARBORX_DEVICE_TYPES
-#include "ArborX_EnableViewComparison.hpp"
-#include <ArborX_DetailsCrsGraphWrapperImpl.hpp>
-#include <ArborX_Predicates.hpp>
-#include <ArborX_TraversalPolicy.hpp>
-
-#include <boost/test/unit_test.hpp>
-
-#define BOOST_TEST_MODULE DetailsCrsGraphWrapperImpl
-
-namespace tt = boost::test_tools;
-
-struct Test1
-{
-  template <typename ExecutionSpace, typename Predicates,
-            typename InsertGenerator>
-  void query(ExecutionSpace const &space, Predicates const &predicates,
-             InsertGenerator const &insert_generator,
-             ArborX::Experimental::TraversalPolicy const & =
-                 ArborX::Experimental::TraversalPolicy()) const
-  {
-    using Access = ArborX::AccessTraits<Predicates, ArborX::PredicatesTag>;
-
-    Kokkos::parallel_for(
-        Kokkos::RangePolicy<ExecutionSpace>(space, 0, Access::size(predicates)),
-        KOKKOS_LAMBDA(int predicate_index) {
-          for (int primitive_index = 0; primitive_index < predicate_index;
-               ++primitive_index)
-            insert_generator(attach(Access::get(predicates, predicate_index),
-                                    predicate_index),
-                             primitive_index);
-        });
-  }
-};
-
-BOOST_AUTO_TEST_CASE_TEMPLATE(query_impl, DeviceType, ARBORX_DEVICE_TYPES)
-{
-  using ExecutionSpace = typename DeviceType::execution_space;
-
-  Kokkos::View<int *, DeviceType> offset("offset", 0);
-  Kokkos::View<int *, DeviceType> indices("indices", 0);
-
-  int const n = 10;
-  // Build a view of predicates.  Won't actually call any of them.  All is
-  // required is a valid access traits assocated to it. 'get()' nevers get
-  // called, only 'size()'.  FIXME
-  using Predicate = decltype(ArborX::intersects(std::declval<ArborX::Point>()));
-  Kokkos::View<Predicate *, DeviceType> predicates(
-      Kokkos::view_alloc("predicates", Kokkos::WithoutInitializing), n);
-
-  int const buffer_size = 2 * (n + 1);
-
-  ArborX::reallocWithoutInitializing(offset, n + 1);
-  Kokkos::deep_copy(offset, buffer_size);
-
-  Kokkos::View<unsigned int *, DeviceType> permute(
-      Kokkos::view_alloc(Kokkos::WithoutInitializing, "Testing::permute"), n);
-  ArborX::iota(ExecutionSpace{}, permute);
-
-  ArborX::exclusivePrefixSum(ExecutionSpace{}, offset);
-  ArborX::reallocWithoutInitializing(indices, ArborX::lastElement(offset));
-  ArborX::Details::CrsGraphWrapperImpl::queryImpl(
-      ExecutionSpace{}, Test1{}, predicates, ArborX::Details::DefaultCallback{},
-      indices, offset, permute,
-      ArborX::Details::BufferStatus::PreallocationHard);
-
-  auto indices_host =
-      Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace{}, indices);
-  auto offset_host =
-      Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace{}, offset);
-
-  std::vector<int> indices_ref;
-  std::vector<int> offset_ref;
-  offset_ref.push_back(0);
-  for (int i = 0; i < n; ++i)
-  {
-    for (int j = 0; j < i; ++j)
-      indices_ref.push_back(j);
-    offset_ref.push_back(indices_ref.size());
-  }
-
-  BOOST_TEST(offset_host == offset_ref, tt::per_element());
-  BOOST_TEST(indices_host == indices_ref, tt::per_element());
-}
diff --git a/arborx/test/tstDetailsDistributedTreeImpl.cpp b/arborx/test/tstDetailsDistributedTreeImpl.cpp
deleted file mode 100644
index 2fb76d0a2..000000000
--- a/arborx/test/tstDetailsDistributedTreeImpl.cpp
+++ /dev/null
@@ -1,418 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2017-2021 by the ArborX authors                            *
- * All rights reserved.                                                     *
- *                                                                          *
- * This file is part of the ArborX library. ArborX is                       *
- * distributed under a BSD 3-clause license. For the licensing terms see    *
- * the LICENSE file in the top-level directory.                             *
- *                                                                          *
- * SPDX-License-Identifier: BSD-3-Clause                                    *
- ****************************************************************************/
-
-#include "ArborX_EnableDeviceTypes.hpp" // ARBORX_DEVICE_TYPES
-#include "ArborX_EnableViewComparison.hpp"
-#include <ArborX_DetailsDistributedTreeImpl.hpp>
-
-#include <boost/test/unit_test.hpp>
-
-#define BOOST_TEST_MODULE DetailsDistributedTreeImpl
-
-#include <set>
-
-namespace tt = boost::test_tools;
-
-BOOST_AUTO_TEST_CASE_TEMPLATE(sort_results, DeviceType, ARBORX_DEVICE_TYPES)
-{
-  std::vector<int> ids_ = {4, 3, 2, 1, 4, 3, 2, 4, 3, 4};
-  std::vector<int> sorted_ids = {1, 2, 2, 3, 3, 3, 4, 4, 4, 4};
-  std::vector<int> offset = {0, 1, 3, 6, 10};
-  int const n = 10;
-  int const m = 4;
-  BOOST_TEST(ids_.size() == n);
-  BOOST_TEST(sorted_ids.size() == n);
-  BOOST_TEST(offset.size() == m + 1);
-  std::vector<int> results_ = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
-  std::vector<std::set<int>> sorted_results = {
-      {3},
-      {6, 2},
-      {8, 5, 1},
-      {9, 7, 4, 0},
-  };
-  std::vector<int> ranks_ = {10, 11, 12, 13, 14, 15, 16, 17, 18, 19};
-  std::vector<std::set<int>> sorted_ranks = {
-      {13},
-      {16, 12},
-      {18, 15, 11},
-      {19, 17, 14, 10},
-  };
-  BOOST_TEST(results_.size() == n);
-  BOOST_TEST(ranks_.size() == n);
-
-  Kokkos::View<int *, DeviceType> ids("query_ids", n);
-  Kokkos::View<int *, Kokkos::HostSpace,
-               Kokkos::MemoryTraits<Kokkos::Unmanaged>>
-      ids_host(ids_.data(), ids_.size());
-  Kokkos::deep_copy(ids, ids_host);
-
-  Kokkos::View<int *, DeviceType> results("results", n);
-  Kokkos::View<int *, Kokkos::HostSpace,
-               Kokkos::MemoryTraits<Kokkos::Unmanaged>>
-      results_host(results_.data(), results_.size());
-  Kokkos::deep_copy(results, results_host);
-
-  Kokkos::View<int *, DeviceType> ranks("ranks", n);
-  Kokkos::View<int *, Kokkos::HostSpace,
-               Kokkos::MemoryTraits<Kokkos::Unmanaged>>
-      ranks_host(ranks_.data(), ranks_.size());
-  Kokkos::deep_copy(ranks, ranks_host);
-
-  using ExecutionSpace = typename DeviceType::execution_space;
-  ArborX::Details::DistributedTreeImpl<DeviceType>::sortResults(
-      ExecutionSpace{}, ids, results, ranks);
-
-  // COMMENT: ids are untouched
-  Kokkos::deep_copy(ids_host, ids);
-  BOOST_TEST(ids_host == ids_, tt::per_element());
-
-  Kokkos::deep_copy(results_host, results);
-  Kokkos::deep_copy(ranks_host, ranks);
-  for (int q = 0; q < m; ++q)
-    for (int i = offset[q]; i < offset[q + 1]; ++i)
-    {
-      BOOST_TEST(sorted_results[q].count(results_host[i]) == 1);
-      BOOST_TEST(sorted_ranks[q].count(ranks_host[i]) == 1);
-    }
-
-  Kokkos::View<int *, DeviceType> not_sized_properly("", m);
-  BOOST_CHECK_THROW(
-      ArborX::Details::DistributedTreeImpl<DeviceType>::sortResults(
-          ExecutionSpace{}, ids, not_sized_properly),
-      ArborX::SearchException);
-}
-
-BOOST_AUTO_TEST_CASE_TEMPLATE(sort_results_2d, DeviceType, ARBORX_DEVICE_TYPES)
-{
-  std::array<int, 5> ids_{4, 2, 1, 3, 5};
-  Kokkos::View<int *, DeviceType> ids("ids", 5);
-  Kokkos::View<int *, Kokkos::HostSpace,
-               Kokkos::MemoryTraits<Kokkos::Unmanaged>>
-      ids_host(ids_.data(), ids_.size());
-  Kokkos::deep_copy(ids, ids_host);
-
-  int results_2d_[5][2] = {{1, 2}, {3, 4}, {5, 6}, {7, 8}, {9, 10}};
-  int sorted_results_2d[5][2] = {{5, 6}, {3, 4}, {7, 8}, {1, 2}, {9, 10}};
-  Kokkos::View<int **, DeviceType> results_2d("results", 5, 2);
-  auto results_2d_host = Kokkos::create_mirror_view(results_2d);
-  for (int i = 0; i < 5; ++i)
-    for (int j = 0; j < 2; ++j)
-      results_2d_host(i, j) = results_2d_[i][j];
-  Kokkos::deep_copy(results_2d, results_2d_host);
-
-  using ExecutionSpace = typename DeviceType::execution_space;
-  ArborX::Details::DistributedTreeImpl<DeviceType>::sortResults(
-      ExecutionSpace{}, ids, results_2d);
-
-  Kokkos::deep_copy(results_2d_host, results_2d);
-  for (int i = 0; i < 5; ++i)
-    for (int j = 0; j < 2; ++j)
-      BOOST_TEST(results_2d_host(i, j) == sorted_results_2d[i][j]);
-}
-
-BOOST_AUTO_TEST_CASE_TEMPLATE(sort_results_3d, DeviceType, ARBORX_DEVICE_TYPES)
-{
-  std::array<int, 5> ids_{4, 2, 1, 3, 5};
-  Kokkos::View<int *, DeviceType> ids("ids", 5);
-  Kokkos::View<int *, Kokkos::HostSpace,
-               Kokkos::MemoryTraits<Kokkos::Unmanaged>>
-      ids_host(ids_.data(), ids_.size());
-  Kokkos::deep_copy(ids, ids_host);
-
-  int results_3d_[5][2][2] = {{{1, 2}, {3, 4}},
-                              {{5, 6}, {7, 8}},
-                              {{9, 10}, {11, 12}},
-                              {{13, 14}, {15, 16}},
-                              {{17, 18}, {19, 20}}};
-  int sorted_results_3d[5][2][2] = {{{9, 10}, {11, 12}},
-                                    {{5, 6}, {7, 8}},
-                                    {{13, 14}, {15, 16}},
-                                    {{1, 2}, {3, 4}},
-                                    {{17, 18}, {19, 20}}};
-  Kokkos::View<int ***, DeviceType> results_3d("results", 5, 2, 2);
-  auto results_3d_host = Kokkos::create_mirror_view(results_3d);
-  for (int i = 0; i < 5; ++i)
-    for (int j = 0; j < 2; ++j)
-      for (int k = 0; k < 2; ++k)
-        results_3d_host(i, j, k) = results_3d_[i][j][k];
-  Kokkos::deep_copy(results_3d, results_3d_host);
-
-  using ExecutionSpace = typename DeviceType::execution_space;
-  ArborX::Details::DistributedTreeImpl<DeviceType>::sortResults(
-      ExecutionSpace{}, ids, results_3d);
-
-  Kokkos::deep_copy(results_3d_host, results_3d);
-  for (int i = 0; i < 5; ++i)
-    for (int j = 0; j < 2; ++j)
-      for (int k = 0; k < 2; ++k)
-        BOOST_TEST(results_3d_host(i, j, k) == sorted_results_3d[i][j][k]);
-}
-
-BOOST_AUTO_TEST_CASE_TEMPLATE(count_results, DeviceType, ARBORX_DEVICE_TYPES)
-{
-  std::vector<int> ids_ref = {4, 3, 2, 1, 4, 3, 2, 4, 3, 4};
-  std::vector<int> offset_ref = {
-      0, 0, 1, 3, 6, 10,
-  };
-  int const m = 5;
-  int const nnz = 10;
-  BOOST_TEST(ids_ref.size() == nnz);
-  BOOST_TEST(offset_ref.size() == m + 1);
-
-  Kokkos::View<int *, DeviceType> ids("query_ids", nnz);
-  auto ids_host = Kokkos::create_mirror_view(ids);
-  for (int i = 0; i < nnz; ++i)
-    ids_host(i) = ids_ref[i];
-  Kokkos::deep_copy(ids, ids_host);
-
-  Kokkos::View<int *, DeviceType> offset("offset", m);
-
-  using ExecutionSpace = typename DeviceType::execution_space;
-  ArborX::Details::DistributedTreeImpl<DeviceType>::countResults(
-      ExecutionSpace{}, m, ids, offset);
-
-  auto offset_host = Kokkos::create_mirror_view(offset);
-  Kokkos::deep_copy(offset_host, offset);
-  BOOST_TEST(offset_host == offset_ref, tt::per_element());
-}
-
-template <typename View1, typename View2>
-inline void checkViewWasNotAllocated(View1 const &v1, View2 const &v2)
-{
-  // NOTE: cannot use operator== here because array layout may "change" for
-  // rank-1 views
-  BOOST_TEST(v1.data() == v2.data());
-  BOOST_TEST(v1.span() == v2.span());
-
-  BOOST_TEST((int)View1::rank == (int)View2::rank);
-  BOOST_TEST((std::is_same<typename View1::const_value_type,
-                           typename View2::const_value_type>::value));
-  BOOST_TEST((std::is_same<typename View1::memory_space,
-                           typename View2::memory_space>::value));
-
-  BOOST_TEST(v1.extent(0) == v2.extent(0));
-  BOOST_TEST(v1.extent(1) == v2.extent(1));
-  BOOST_TEST(v1.extent(2) == v2.extent(2));
-  BOOST_TEST(v1.extent(3) == v2.extent(3));
-  BOOST_TEST(v1.extent(4) == v2.extent(4));
-  BOOST_TEST(v1.extent(5) == v2.extent(5));
-  BOOST_TEST(v1.extent(6) == v2.extent(6));
-  BOOST_TEST(v1.extent(7) == v2.extent(7));
-}
-
-template <typename View1, typename View2>
-inline void checkNewViewWasAllocated(View1 const &v1, View2 const &v2)
-{
-  BOOST_TEST(v1.data() != v2.data());
-
-  BOOST_TEST((int)View1::rank == (int)View2::rank);
-  BOOST_TEST((std::is_same<typename View1::const_value_type,
-                           typename View2::const_value_type>::value));
-
-  BOOST_TEST(v1.extent(0) == v2.extent(0));
-  BOOST_TEST(v1.extent(1) == v2.extent(1));
-  BOOST_TEST(v1.extent(2) == v2.extent(2));
-  BOOST_TEST(v1.extent(3) == v2.extent(3));
-  BOOST_TEST(v1.extent(4) == v2.extent(4));
-  BOOST_TEST(v1.extent(5) == v2.extent(5));
-  BOOST_TEST(v1.extent(6) == v2.extent(6));
-  BOOST_TEST(v1.extent(7) == v2.extent(7));
-}
-
-BOOST_AUTO_TEST_CASE_TEMPLATE(create_layout_right_mirror_view, DeviceType,
-                              ARBORX_DEVICE_TYPES)
-{
-  using ArborX::Details::create_layout_right_mirror_view;
-  using Kokkos::ALL;
-  using Kokkos::LayoutLeft;
-  using Kokkos::LayoutRight;
-  using Kokkos::make_pair;
-  using Kokkos::subview;
-  using Kokkos::View;
-
-  if (!Kokkos::SpaceAccessibility<
-          Kokkos::HostSpace, typename DeviceType::memory_space>::accessible)
-    return;
-
-  // rank-1 and not strided -> do not allocate
-  View<int *, LayoutLeft, DeviceType> u("u", 255);
-  auto u_h = create_layout_right_mirror_view(u);
-  checkViewWasNotAllocated(u, u_h);
-
-  // right layout -> do not allocate
-  View<int **, LayoutRight, DeviceType> v("v", 2, 3);
-  auto v_h = create_layout_right_mirror_view(v);
-  checkViewWasNotAllocated(v, v_h);
-
-  // the same with compile time size
-  View<int[2][3], LayoutRight, DeviceType> v_c("v");
-  auto v_c_h = create_layout_right_mirror_view(v_c);
-  checkViewWasNotAllocated(v_c, v_c_h);
-
-  // left layout and rank > 1 -> allocate
-  View<int **, LayoutLeft, DeviceType> w("w", 4, 5);
-  auto w_h = create_layout_right_mirror_view(w);
-  checkNewViewWasAllocated(w, w_h);
-
-  // the same with compile time size
-  View<int * [5], LayoutLeft, DeviceType> w_c("v", 4);
-  auto w_c_h = create_layout_right_mirror_view(w_c);
-  checkNewViewWasAllocated(w_c, w_c_h);
-
-  // strided layout -> allocate
-  auto x = subview(v, ALL, 0);
-  auto x_h = create_layout_right_mirror_view(x);
-  checkNewViewWasAllocated(x, x_h);
-
-  // subview is rank-1 and not strided -> do not allocate
-  auto y = subview(u, make_pair(8, 16));
-  auto y_h = create_layout_right_mirror_view(y);
-  checkViewWasNotAllocated(y, y_h);
-}
-
-void checkBufferLayout(std::vector<int> const &ranks,
-                       std::vector<int> const &permute_ref,
-                       std::vector<int> const &unique_ref,
-                       std::vector<int> const &counts_ref,
-                       std::vector<int> const &offsets_ref)
-{
-  std::vector<int> permute(ranks.size());
-  std::vector<int> unique;
-  std::vector<int> counts;
-  std::vector<int> offsets;
-  Kokkos::DefaultHostExecutionSpace space;
-  ArborX::Details::sortAndDetermineBufferLayout(
-      space,
-      Kokkos::View<int const *, Kokkos::HostSpace,
-                   Kokkos::MemoryTraits<Kokkos::Unmanaged>>(ranks.data(),
-                                                            ranks.size()),
-      Kokkos::View<int *, Kokkos::HostSpace,
-                   Kokkos::MemoryTraits<Kokkos::Unmanaged>>(permute.data(),
-                                                            permute.size()),
-      unique, counts, offsets);
-  BOOST_TEST(permute_ref == permute, tt::per_element());
-  BOOST_TEST(unique_ref == unique, tt::per_element());
-  BOOST_TEST(counts_ref == counts, tt::per_element());
-  BOOST_TEST(offsets_ref == offsets, tt::per_element());
-}
-
-BOOST_AUTO_TEST_CASE(sort_and_determine_buffer_layout)
-{
-  checkBufferLayout({}, {}, {}, {}, {0});
-  checkBufferLayout({2, 2}, {0, 1}, {2}, {2}, {0, 2});
-  checkBufferLayout({3, 3, 2, 3, 2, 1}, {0, 1, 3, 2, 4, 5}, {3, 2, 1},
-                    {3, 2, 1}, {0, 3, 5, 6});
-  checkBufferLayout({1, 2, 3, 2, 3, 3}, {5, 3, 0, 4, 1, 2}, {3, 2, 1},
-                    {3, 2, 1}, {0, 3, 5, 6});
-  checkBufferLayout({0, 1, 2, 3}, {3, 2, 1, 0}, {3, 2, 1, 0}, {1, 1, 1, 1},
-                    {0, 1, 2, 3, 4});
-}
-
-BOOST_AUTO_TEST_CASE(pointer_depth)
-{
-  static_assert(ArborX::Details::internal::PointerDepth<double>::value == 0,
-                "Failing for double");
-  static_assert(ArborX::Details::internal::PointerDepth<double *>::value == 1,
-                "Failing for double*");
-  static_assert(ArborX::Details::internal::PointerDepth<double[2]>::value == 0,
-                "Failing for double[2]");
-  static_assert(ArborX::Details::internal::PointerDepth<double **>::value == 2,
-                "Failing for double**");
-  static_assert(ArborX::Details::internal::PointerDepth<double * [2]>::value ==
-                    1,
-                "Failing for double*[2]");
-  static_assert(ArborX::Details::internal::PointerDepth<double[2][3]>::value ==
-                    0,
-                "Failing for double[2][3]");
-  static_assert(ArborX::Details::internal::PointerDepth<double ***>::value == 3,
-                "Failing for double***");
-  static_assert(
-      ArborX::Details::internal::PointerDepth<double * * [2]>::value == 2,
-      "Failing for double[2]");
-  static_assert(
-      ArborX::Details::internal::PointerDepth<double * [2][3]>::value == 1,
-      "Failing for double*[2][3]");
-  static_assert(
-      ArborX::Details::internal::PointerDepth<double[2][3][4]>::value == 0,
-      "Failing for double[2][3][4]");
-}
-
-template <typename DeviceType>
-struct Helper
-{
-  template <typename View1, typename View2, typename View3>
-  static void checkSendAcrossNetwork(MPI_Comm comm, View1 const &ranks,
-                                     View2 const &v_exp, View3 const &v_ref)
-  {
-    ArborX::Details::Distributor<DeviceType> distributor(comm);
-    distributor.createFromSends(typename DeviceType::execution_space{}, ranks);
-
-    // NOTE here we assume that the reference solution is sized properly
-    auto v_imp = Kokkos::create_mirror(typename View3::memory_space(), v_ref);
-
-    ArborX::Details::DistributedTreeImpl<DeviceType>::sendAcrossNetwork(
-        typename DeviceType::execution_space{}, distributor, v_exp, v_imp);
-
-    auto v_imp_host = Kokkos::create_mirror_view(v_imp);
-    Kokkos::deep_copy(v_imp_host, v_imp);
-    auto v_ref_host = Kokkos::create_mirror_view(v_ref);
-    Kokkos::deep_copy(v_ref_host, v_ref);
-
-    BOOST_TEST(v_imp.extent(0) == v_ref.extent(0));
-    BOOST_TEST(v_imp.extent(1) == v_ref.extent(1));
-    for (unsigned int i = 0; i < v_imp.extent(0); ++i)
-    {
-      for (unsigned int j = 0; j < v_imp.extent(1); ++j)
-      {
-        BOOST_TEST(v_imp_host(i, j) == v_ref_host(i, j));
-      }
-    }
-  }
-};
-
-BOOST_AUTO_TEST_CASE_TEMPLATE(send_across_network, DeviceType,
-                              ARBORX_DEVICE_TYPES)
-{
-  using ExecutionSpace = typename DeviceType::execution_space;
-  MPI_Comm comm = MPI_COMM_WORLD;
-  int comm_rank;
-  MPI_Comm_rank(comm, &comm_rank);
-  int comm_size;
-  MPI_Comm_size(comm, &comm_size);
-
-  int const DIM = 3;
-
-  // send 1 packet to rank k
-  // receive comm_size packets
-  Kokkos::View<int **, DeviceType> u_exp("u_exp", comm_size, DIM);
-  Kokkos::parallel_for(Kokkos::RangePolicy<ExecutionSpace>(0, comm_size),
-                       KOKKOS_LAMBDA(int i) {
-                         for (int j = 0; j < DIM; ++j)
-                           u_exp(i, j) = i + j * comm_rank;
-                       });
-
-  Kokkos::View<int *, DeviceType> ranks_u("", comm_size);
-  ArborX::iota(ExecutionSpace{}, ranks_u, 0);
-
-  Kokkos::View<int **, DeviceType> u_ref("u_ref", comm_size, DIM);
-  Kokkos::parallel_for(Kokkos::RangePolicy<ExecutionSpace>(0, comm_size),
-                       KOKKOS_LAMBDA(int i) {
-                         for (int j = 0; j < DIM; ++j)
-                           u_ref(i, j) = comm_rank + i * j;
-                       });
-
-  Helper<DeviceType>::checkSendAcrossNetwork(comm, ranks_u, u_exp, u_ref);
-
-  Kokkos::View<int **, DeviceType, Kokkos::MemoryUnmanaged> u_exp_unmanaged{
-      u_exp};
-  Helper<DeviceType>::checkSendAcrossNetwork(comm, ranks_u, u_exp_unmanaged,
-                                             u_ref);
-}
diff --git a/arborx/test/tstDetailsTreeConstruction.cpp b/arborx/test/tstDetailsTreeConstruction.cpp
deleted file mode 100644
index 2f2fd9140..000000000
--- a/arborx/test/tstDetailsTreeConstruction.cpp
+++ /dev/null
@@ -1,294 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2017-2021 by the ArborX authors                            *
- * All rights reserved.                                                     *
- *                                                                          *
- * This file is part of the ArborX library. ArborX is                       *
- * distributed under a BSD 3-clause license. For the licensing terms see    *
- * the LICENSE file in the top-level directory.                             *
- *                                                                          *
- * SPDX-License-Identifier: BSD-3-Clause                                    *
- ****************************************************************************/
-#include "ArborX_EnableDeviceTypes.hpp" // ARBORX_DEVICE_TYPES
-#include "ArborX_EnableViewComparison.hpp"
-#include <ArborX_DetailsAlgorithms.hpp>
-#include <ArborX_DetailsMortonCode.hpp> // expandBits, morton3D
-#include <ArborX_DetailsNode.hpp>       // ROPE SENTINEL
-#include <ArborX_DetailsSortUtils.hpp>  // sortObjects
-#include <ArborX_DetailsTreeConstruction.hpp>
-
-#include <boost/test/unit_test.hpp>
-
-#include <array>
-#include <bitset>
-#include <functional>
-#include <limits>
-#include <sstream>
-#include <vector>
-
-namespace tt = boost::test_tools;
-
-BOOST_AUTO_TEST_CASE_TEMPLATE(assign_morton_codes, DeviceType,
-                              ARBORX_DEVICE_TYPES)
-{
-  std::vector<ArborX::Point> points = {
-      {{0.0, 0.0, 0.0}},          {{0.25, 0.75, 0.25}}, {{0.75, 0.25, 0.25}},
-      {{0.75, 0.75, 0.25}},       {{1.33, 2.33, 3.33}}, {{1.66, 2.66, 3.66}},
-      {{1024.0, 1024.0, 1024.0}},
-  };
-  int const n = points.size();
-  // lower left front corner corner of the octant the points fall in
-  std::vector<std::array<unsigned int, 3>> anchors = {
-      {{0, 0, 0}}, {{0, 0, 0}}, {{0, 0, 0}},         {{0, 0, 0}},
-      {{1, 2, 3}}, {{1, 2, 3}}, {{1023, 1023, 1023}}};
-  auto fun = [](std::array<unsigned int, 3> const &anchor) {
-    using ArborX::Details::expandBits;
-    unsigned int i = std::get<0>(anchor);
-    unsigned int j = std::get<1>(anchor);
-    unsigned int k = std::get<2>(anchor);
-    return 4 * expandBits(i) + 2 * expandBits(j) + expandBits(k);
-  };
-  std::vector<unsigned int> ref(n, std::numeric_limits<unsigned int>::max());
-  for (int i = 0; i < n; ++i)
-    ref[i] = fun(anchors[i]);
-  // using points rather than boxes for convenience here but still have to
-  // build the axis-aligned bounding boxes around them
-  Kokkos::View<ArborX::Box *, DeviceType> boxes("boxes", n);
-  auto boxes_host = Kokkos::create_mirror_view(boxes);
-  for (int i = 0; i < n; ++i)
-    ArborX::Details::expand(boxes_host(i), points[i]);
-  Kokkos::deep_copy(boxes, boxes_host);
-
-  typename DeviceType::execution_space space{};
-  ArborX::Box scene_host;
-  ArborX::Details::TreeConstruction::calculateBoundingBoxOfTheScene(
-      space, boxes, scene_host);
-
-  BOOST_TEST(ArborX::Details::equals(
-      scene_host, {{{0., 0., 0.}}, {{1024., 1024., 1024.}}}));
-
-  Kokkos::View<unsigned int *, DeviceType> morton_codes("morton_codes", n);
-  ArborX::Details::TreeConstruction::assignMortonCodes(
-      space, boxes, morton_codes, scene_host);
-  auto morton_codes_host = Kokkos::create_mirror_view(morton_codes);
-  Kokkos::deep_copy(morton_codes_host, morton_codes);
-  BOOST_TEST(morton_codes_host == ref, tt::per_element());
-}
-
-template <typename DeviceType>
-class FillK
-{
-public:
-  FillK(Kokkos::View<unsigned int *, DeviceType> k)
-      : _k(k)
-  {
-  }
-
-  KOKKOS_INLINE_FUNCTION
-  void operator()(int const i) const { _k[i] = 4 - i; }
-
-private:
-  Kokkos::View<unsigned int *, DeviceType> _k;
-};
-
-BOOST_AUTO_TEST_CASE_TEMPLATE(indirect_sort, DeviceType, ARBORX_DEVICE_TYPES)
-{
-  // need a functionality that sort objects based on their Morton code and
-  // also returns the indices in the original configuration
-
-  // dummy unsorted Morton codes and corresponding sorted indices as reference
-  // solution
-  //
-  using ExecutionSpace = typename DeviceType::execution_space;
-  unsigned int const n = 4;
-  Kokkos::View<unsigned int *, DeviceType> k("k", n);
-  // Fill K with 4, 3, 2, 1
-  FillK<DeviceType> fill_k_functor(k);
-  Kokkos::parallel_for("fill_k", Kokkos::RangePolicy<ExecutionSpace>(0, n),
-                       fill_k_functor);
-
-  std::vector<size_t> ref = {3, 2, 1, 0};
-  // sort Morton codes and object ids
-  auto ids = ArborX::Details::sortObjects(ExecutionSpace{}, k);
-
-  auto k_host = Kokkos::create_mirror_view(k);
-  Kokkos::deep_copy(k_host, k);
-  auto ids_host = Kokkos::create_mirror_view(ids);
-  Kokkos::deep_copy(ids_host, ids);
-
-  // check that they are sorted
-  for (unsigned int i = 0; i < n; ++i)
-    BOOST_TEST(k_host[i] == i + 1);
-  // check that ids are properly ordered
-  BOOST_TEST(ids_host == ref, tt::per_element());
-}
-
-template <typename Primitives, typename MortonCodes, typename LeafNodes,
-          typename InternalNodes>
-void generateHierarchy(Primitives primitives, MortonCodes sorted_morton_codes,
-                       LeafNodes &leaf_nodes, InternalNodes &internal_nodes)
-{
-  using ArborX::Details::makeLeafNode;
-  using DeviceType = typename MortonCodes::device_type;
-
-  int const n = sorted_morton_codes.extent(0);
-
-  Kokkos::realloc(leaf_nodes, n);
-  Kokkos::realloc(internal_nodes, n - 1);
-
-  typename DeviceType::execution_space space{};
-
-  Kokkos::View<unsigned int *, DeviceType> permutation_indices(
-      "Testing::indices", n);
-  ArborX::iota(space, permutation_indices);
-
-  ArborX::Details::TreeConstruction::generateHierarchy(
-      space, primitives, permutation_indices, sorted_morton_codes, leaf_nodes,
-      internal_nodes);
-}
-
-template <typename Node, typename LeafNodes, typename InternalNodes>
-std::enable_if_t<
-    std::is_same<typename Node::Tag, ArborX::Details::NodeWithTwoChildrenTag>{}>
-traverse(LeafNodes leaf_nodes, InternalNodes internal_nodes, Node const *root,
-         std::ostringstream &sol)
-{
-  int n = leaf_nodes.extent(0);
-  auto getNodePtr = [&leaf_nodes, &internal_nodes, &n](int i) {
-    return i < n - 1 ? &internal_nodes(i) : &leaf_nodes(i - n + 1);
-  };
-
-  std::function<void(Node const *, std::ostream &)> traverseRecursive;
-  traverseRecursive = [&leaf_nodes, &internal_nodes, &getNodePtr,
-                       &traverseRecursive](Node const *node, std::ostream &os) {
-    if (node->isLeaf())
-    {
-      os << "L" << node - leaf_nodes.data();
-    }
-    else
-    {
-      os << "I" << node - internal_nodes.data();
-      for (Node const *child :
-           {getNodePtr(node->left_child), getNodePtr(node->right_child)})
-        traverseRecursive(child, os);
-    }
-  };
-
-  traverseRecursive(root, sol);
-}
-
-template <typename Node, typename LeafNodes, typename InternalNodes>
-std::enable_if_t<std::is_same<typename Node::Tag,
-                              ArborX::Details::NodeWithLeftChildAndRopeTag>{}>
-traverse(LeafNodes leaf_nodes, InternalNodes internal_nodes, Node const *root,
-         std::ostringstream &sol)
-{
-  int n = leaf_nodes.extent(0);
-  auto getNodePtr = [&leaf_nodes, &internal_nodes, &n](int i) {
-    return i < n - 1 ? &internal_nodes(i) : &leaf_nodes(i - n + 1);
-  };
-
-  using ArborX::Details::ROPE_SENTINEL;
-
-  std::function<void(Node const *, std::ostream &)> traverseRopes;
-  traverseRopes = [&leaf_nodes, &internal_nodes, &getNodePtr,
-                   &traverseRopes](Node const *node, std::ostream &os) {
-    if (node->isLeaf())
-    {
-      os << "L" << node - leaf_nodes.data();
-      if (node->rope != ROPE_SENTINEL)
-        traverseRopes(getNodePtr(node->rope), os);
-    }
-    else
-    {
-      os << "I" << node - internal_nodes.data();
-      traverseRopes(getNodePtr(node->left_child), os);
-    }
-  };
-
-  traverseRopes(root, sol);
-}
-
-namespace Test
-{
-struct FakePrimitive
-{
-};
-struct FakeBoundingVolume
-{
-};
-KOKKOS_FUNCTION void expand(FakeBoundingVolume, FakeBoundingVolume) {}
-KOKKOS_FUNCTION void expand(FakeBoundingVolume, FakePrimitive) {}
-} // namespace Test
-
-BOOST_AUTO_TEST_CASE_TEMPLATE(example_tree_construction, DeviceType,
-                              ARBORX_DEVICE_TYPES)
-{
-  if (!Kokkos::SpaceAccessibility<
-          Kokkos::HostSpace, typename DeviceType::memory_space>::accessible)
-    return;
-
-  // This is the example from the articles by Karras.
-  // See
-  // https://devblogs.nvidia.com/parallelforall/thinking-parallel-part-iii-tree-construction-gpu/
-  int const n = 8;
-  Kokkos::View<unsigned int *, DeviceType> sorted_morton_codes(
-      "sorted_morton_codes", n);
-  std::vector<std::string> s{
-      "00001", "00010", "00100", "00101", "10011", "11000", "11001", "11110",
-  };
-  for (int i = 0; i < n; ++i)
-  {
-    std::bitset<6> b(s[i]);
-    BOOST_TEST_MESSAGE(b << "  " << b.to_ulong());
-    sorted_morton_codes(i) = b.to_ulong();
-  }
-
-  Kokkos::View<Test::FakePrimitive *, DeviceType> primitives(
-      "Testing::primitives", n);
-
-  // Reference solution for the depth first search
-  std::ostringstream ref;
-  // clang-format off
-  ref << "I0" << "I3" << "I1" << "L0" << "L1" << "I2" << "L2" << "L3"
-      << "I4" << "L4" << "I5" << "I6" << "L5" << "L6" << "L7";
-  // clang-format on
-  BOOST_TEST_MESSAGE("ref = " << ref.str());
-
-  {
-    using Node = ArborX::Details::NodeWithTwoChildren<Test::FakeBoundingVolume>;
-
-    Kokkos::View<Node *, DeviceType> leaf_nodes("Testing::leaf_nodes", 0);
-    Kokkos::View<Node *, DeviceType> internal_nodes("Testing::internal_nodes",
-                                                    0);
-    generateHierarchy(primitives, sorted_morton_codes, leaf_nodes,
-                      internal_nodes);
-
-    auto const *root = internal_nodes.data();
-
-    std::ostringstream sol;
-    traverse(leaf_nodes, internal_nodes, root, sol);
-
-    BOOST_TEST_MESSAGE("sol(node_with_two_children) = " << sol.str());
-
-    BOOST_TEST(sol.str() == ref.str());
-  }
-  {
-    using Node =
-        ArborX::Details::NodeWithLeftChildAndRope<Test::FakeBoundingVolume>;
-
-    Kokkos::View<Node *, DeviceType> leaf_nodes("Testing::leaf_nodes", 0);
-    Kokkos::View<Node *, DeviceType> internal_nodes("Testing::internal_nodes",
-                                                    0);
-    generateHierarchy(primitives, sorted_morton_codes, leaf_nodes,
-                      internal_nodes);
-
-    auto const *root = internal_nodes.data();
-
-    std::ostringstream sol;
-    traverse(leaf_nodes, internal_nodes, root, sol);
-
-    BOOST_TEST_MESSAGE("sol(node_with_left_child_and_rope) = " << sol.str());
-
-    BOOST_TEST(sol.str() == ref.str());
-  }
-}
diff --git a/arborx/test/tstDetailsUtils.cpp b/arborx/test/tstDetailsUtils.cpp
deleted file mode 100644
index 3fd89e1bf..000000000
--- a/arborx/test/tstDetailsUtils.cpp
+++ /dev/null
@@ -1,268 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2017-2021 by the ArborX authors                            *
- * All rights reserved.                                                     *
- *                                                                          *
- * This file is part of the ArborX library. ArborX is                       *
- * distributed under a BSD 3-clause license. For the licensing terms see    *
- * the LICENSE file in the top-level directory.                             *
- *                                                                          *
- * SPDX-License-Identifier: BSD-3-Clause                                    *
- ****************************************************************************/
-
-#include "ArborX_EnableDeviceTypes.hpp" // ARBORX_DEVICE_TYPES
-#include "ArborX_EnableViewComparison.hpp"
-#include <ArborX_DetailsSortUtils.hpp>
-#include <ArborX_DetailsUtils.hpp>
-#include <ArborX_Exception.hpp>
-
-#include <Kokkos_Core.hpp>
-
-#include <boost/test/unit_test.hpp>
-
-#include <algorithm>
-#include <numeric>
-#include <vector>
-
-#define BOOST_TEST_MODULE StandardAlgorithms
-
-namespace tt = boost::test_tools;
-
-BOOST_AUTO_TEST_CASE_TEMPLATE(iota, DeviceType, ARBORX_DEVICE_TYPES)
-{
-  using ExecutionSpace = typename DeviceType::execution_space;
-  ExecutionSpace space{};
-  int const n = 10;
-  double const val = 3.;
-  Kokkos::View<double *, DeviceType> v("v", n);
-  ArborX::iota(space, v, val);
-  std::vector<double> v_ref(n);
-  std::iota(v_ref.begin(), v_ref.end(), val);
-  auto v_host = Kokkos::create_mirror_view(v);
-  Kokkos::deep_copy(v_host, v);
-  BOOST_TEST(v_ref == v_host, tt::per_element());
-
-  Kokkos::View<int[3], DeviceType> w("w");
-  ArborX::iota(space, w);
-  std::vector<int> w_ref = {0, 1, 2};
-  auto w_host = Kokkos::create_mirror_view(w);
-  Kokkos::deep_copy(w_host, w);
-  BOOST_TEST(w_ref == w_host, tt::per_element());
-}
-
-BOOST_AUTO_TEST_CASE_TEMPLATE(prefix_sum, DeviceType, ARBORX_DEVICE_TYPES)
-{
-  using ExecutionSpace = typename DeviceType::execution_space;
-  ExecutionSpace space{};
-  int const n = 10;
-  Kokkos::View<int *, DeviceType> x("x", n);
-  std::vector<int> x_ref(n, 1);
-  x_ref.back() = 0;
-  auto x_host = Kokkos::create_mirror_view(x);
-  for (int i = 0; i < n; ++i)
-    x_host(i) = x_ref[i];
-  Kokkos::deep_copy(x, x_host);
-  Kokkos::View<int *, DeviceType> y("y", n);
-  ArborX::exclusivePrefixSum(space, x, y);
-  std::vector<int> y_ref(n);
-  std::iota(y_ref.begin(), y_ref.end(), 0);
-  auto y_host = Kokkos::create_mirror_view(y);
-  Kokkos::deep_copy(y_host, y);
-  Kokkos::deep_copy(x_host, x);
-  BOOST_TEST(y_host == y_ref, tt::per_element());
-  BOOST_TEST(x_host == x_ref, tt::per_element());
-  // in-place
-  ArborX::exclusivePrefixSum(space, x, x);
-  Kokkos::deep_copy(x_host, x);
-  BOOST_TEST(x_host == y_ref, tt::per_element());
-  int const m = 11;
-  BOOST_TEST(n != m);
-  Kokkos::View<int *, DeviceType> z("z", m);
-  BOOST_CHECK_THROW(ArborX::exclusivePrefixSum(space, x, z),
-                    ArborX::SearchException);
-  Kokkos::View<double[3], DeviceType> v("v");
-  auto v_host = Kokkos::create_mirror_view(v);
-  v_host(0) = 1.;
-  v_host(1) = 1.;
-  v_host(2) = 0.;
-  Kokkos::deep_copy(v, v_host);
-  ArborX::exclusivePrefixSum(space, v);
-  Kokkos::deep_copy(v_host, v);
-  std::vector<double> v_ref = {0., 1., 2.};
-  BOOST_TEST(v_host == v_ref, tt::per_element());
-  Kokkos::View<double *, DeviceType> w("w", 4);
-  BOOST_CHECK_THROW(ArborX::exclusivePrefixSum(space, v, w),
-                    ArborX::SearchException);
-  v_host(0) = 1.;
-  v_host(1) = 0.;
-  v_host(2) = 0.;
-  Kokkos::deep_copy(v, v_host);
-  Kokkos::resize(w, 3);
-  ArborX::exclusivePrefixSum(space, v, w);
-  auto w_host = Kokkos::create_mirror_view(w);
-  Kokkos::deep_copy(w_host, w);
-  std::vector<double> w_ref = {0., 1., 1.};
-  BOOST_TEST(w_host == w_ref, tt::per_element());
-}
-
-BOOST_AUTO_TEST_CASE_TEMPLATE(last_element, DeviceType, ARBORX_DEVICE_TYPES)
-{
-  Kokkos::View<int *, DeviceType> v("v", 2);
-  auto v_host = Kokkos::create_mirror_view(v);
-  v_host(0) = 33;
-  v_host(1) = 24;
-  Kokkos::deep_copy(v, v_host);
-  BOOST_TEST(ArborX::lastElement(v) == 24);
-  Kokkos::View<int *, DeviceType> w("w", 0);
-  BOOST_CHECK_THROW(ArborX::lastElement(w), ArborX::SearchException);
-  Kokkos::View<double[1], DeviceType> u("u");
-  Kokkos::deep_copy(u, 3.14);
-  BOOST_TEST(ArborX::lastElement(u) == 3.14);
-}
-
-BOOST_AUTO_TEST_CASE_TEMPLATE(minmax, DeviceType, ARBORX_DEVICE_TYPES)
-{
-  using ExecutionSpace = typename DeviceType::execution_space;
-  ExecutionSpace space{};
-
-  Kokkos::View<double[4], DeviceType> v("v");
-  auto v_host = Kokkos::create_mirror_view(v);
-  v_host(0) = 3.14;
-  v_host(1) = 1.41;
-  v_host(2) = 2.71;
-  v_host(3) = 1.62;
-  Kokkos::deep_copy(v, v_host);
-
-  auto const result_float = ArborX::minMax(space, v);
-  BOOST_TEST(std::get<0>(result_float) == 1.41);
-  BOOST_TEST(std::get<1>(result_float) == 3.14);
-  Kokkos::View<int *, DeviceType> w("w", 0);
-  BOOST_CHECK_THROW(ArborX::minMax(space, w), ArborX::SearchException);
-  Kokkos::resize(w, 1);
-  Kokkos::deep_copy(w, 255);
-  auto const result_int = ArborX::minMax(space, w);
-  BOOST_TEST(std::get<0>(result_int) == 255);
-  BOOST_TEST(std::get<1>(result_int) == 255);
-
-  // testing use case in ORNL-CEES/DataTransferKit#336
-  Kokkos::View<int[2][3], DeviceType> u("u");
-  auto u_host = Kokkos::create_mirror_view(u);
-  u_host(0, 0) = 1; // x
-  u_host(0, 1) = 2; // y
-  u_host(0, 2) = 3; // z
-  u_host(1, 0) = 4; // x
-  u_host(1, 1) = 5; // y
-  u_host(1, 2) = 6; // Z
-  Kokkos::deep_copy(u, u_host);
-#if 0
-    // FIXME might be an issue with CUDA
-    auto const minmax_x =
-        ArborX::minMax( Kokkos::subview( u, Kokkos::ALL, 0 ) );
-    BOOST_TEST( std::get<0>( minmax_x ) == 1 );
-    BOOST_TEST( std::get<1>( minmax_x ) == 4 );
-    auto const minmax_y =
-        ArborX::minMax( Kokkos::subview( u, Kokkos::ALL, 1 ) );
-    BOOST_TEST( std::get<0>( minmax_y ) == 2 );
-    BOOST_TEST( std::get<1>( minmax_y ) == 5 );
-#endif
-}
-
-BOOST_AUTO_TEST_CASE_TEMPLATE(accumulate, DeviceType, ARBORX_DEVICE_TYPES)
-{
-  using ExecutionSpace = typename DeviceType::execution_space;
-  ExecutionSpace space{};
-
-  Kokkos::View<int[6], DeviceType> v("v");
-  Kokkos::deep_copy(v, 5);
-  BOOST_TEST(ArborX::accumulate(space, v, 3) == 33);
-
-  Kokkos::View<int *, DeviceType> w("w", 5);
-  ArborX::iota(space, w, 2);
-  BOOST_TEST(ArborX::accumulate(space, w, 4) == 24);
-}
-
-BOOST_AUTO_TEST_CASE_TEMPLATE(adjacent_difference, DeviceType,
-                              ARBORX_DEVICE_TYPES)
-{
-  using ExecutionSpace = typename DeviceType::execution_space;
-  ExecutionSpace space{};
-
-  Kokkos::View<int[5], DeviceType> v("v");
-  auto v_host = Kokkos::create_mirror_view(v);
-  v_host(0) = 2;
-  v_host(1) = 4;
-  v_host(2) = 6;
-  v_host(3) = 8;
-  v_host(4) = 10;
-  Kokkos::deep_copy(v, v_host);
-  // In-place operation is not allowed
-  BOOST_CHECK_THROW(ArborX::adjacentDifference(space, v, v),
-                    ArborX::SearchException);
-  auto w = Kokkos::create_mirror(DeviceType(), v);
-  BOOST_CHECK_NO_THROW(ArborX::adjacentDifference(space, v, w));
-  auto w_host = Kokkos::create_mirror_view(w);
-  Kokkos::deep_copy(w_host, w);
-  std::vector<int> w_ref(5, 2);
-  BOOST_TEST(w_host == w_ref, tt::per_element());
-
-  Kokkos::View<float *, DeviceType> x("x", 10);
-  Kokkos::deep_copy(x, 3.14);
-  BOOST_CHECK_THROW(ArborX::adjacentDifference(space, x, x),
-                    ArborX::SearchException);
-  Kokkos::View<float[10], DeviceType> y("y");
-  BOOST_CHECK_NO_THROW(ArborX::adjacentDifference(space, x, y));
-  std::vector<float> y_ref(10);
-  y_ref[0] = 3.14;
-  auto y_host = Kokkos::create_mirror_view(y);
-  Kokkos::deep_copy(y_host, y);
-  BOOST_TEST(y_host == y_ref, tt::per_element());
-
-  Kokkos::resize(x, 5);
-  BOOST_CHECK_THROW(ArborX::adjacentDifference(space, y, x),
-                    ArborX::SearchException);
-}
-
-BOOST_AUTO_TEST_CASE_TEMPLATE(min_and_max, DeviceType, ARBORX_DEVICE_TYPES)
-{
-  using ExecutionSpace = typename DeviceType::execution_space;
-  ExecutionSpace space{};
-
-  Kokkos::View<int[4], DeviceType> v("v");
-  ArborX::iota(space, v);
-  BOOST_TEST(ArborX::min(space, v) == 0);
-  BOOST_TEST(ArborX::max(space, v) == 3);
-
-  Kokkos::View<int *, DeviceType> w("w", 7);
-  ArborX::iota(space, w, 2);
-  BOOST_TEST(ArborX::min(space, w) == 2);
-  BOOST_TEST(ArborX::max(space, w) == 8);
-}
-
-BOOST_AUTO_TEST_CASE_TEMPLATE(sort_objects, DeviceType, ARBORX_DEVICE_TYPES)
-{
-  using ExecutionSpace = typename DeviceType::execution_space;
-  ExecutionSpace space{};
-
-  for (const auto &values : {std::vector<int>{36, 19, 25, 17, 3, 7, 1, 2, 9},
-                             std::vector<int>{36, 19, 25, 17, 3, 9, 1, 2, 7},
-                             std::vector<int>{100, 19, 36, 17, 3, 25, 1, 2, 7},
-                             std::vector<int>{15, 5, 11, 3, 4, 8}})
-  {
-    Kokkos::View<int *, Kokkos::HostSpace> host_view("data", values.size());
-    std::copy(values.begin(), values.end(), host_view.data());
-    auto device_view = Kokkos::create_mirror_view_and_copy(space, host_view);
-    auto device_permutation = ArborX::Details::sortObjects(space, device_view);
-    Kokkos::deep_copy(space, host_view, device_view);
-
-    // Check that values were sorted properly
-    std::vector<int> values_copy = values;
-    std::sort(values_copy.begin(), values_copy.end());
-    auto host_permutation = Kokkos::create_mirror_view_and_copy(
-        Kokkos::HostSpace{}, device_permutation);
-    BOOST_TEST(host_view == values_copy, tt::per_element());
-
-    // Check correctness of the permutation
-    for (unsigned int i = 0; i < values.size(); ++i)
-      values_copy[i] = values[host_permutation(i)];
-    BOOST_TEST(host_view == values_copy, tt::per_element());
-  }
-}
diff --git a/arborx/test/tstDistributedTree.cpp b/arborx/test/tstDistributedTree.cpp
deleted file mode 100644
index e1037d1fb..000000000
--- a/arborx/test/tstDistributedTree.cpp
+++ /dev/null
@@ -1,693 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2017-2021 by the ArborX authors                            *
- * All rights reserved.                                                     *
- *                                                                          *
- * This file is part of the ArborX library. ArborX is                       *
- * distributed under a BSD 3-clause license. For the licensing terms see    *
- * the LICENSE file in the top-level directory.                             *
- *                                                                          *
- * SPDX-License-Identifier: BSD-3-Clause                                    *
- ****************************************************************************/
-
-#include "ArborX_BoostRTreeHelpers.hpp"
-#include "ArborX_EnableDeviceTypes.hpp" // ARBORX_DEVICE_TYPES
-#include <ArborX_DistributedTree.hpp>
-
-#include <boost/test/unit_test.hpp>
-
-#include <algorithm>
-#include <iostream>
-#include <random>
-#include <tuple>
-
-#include "Search_UnitTestHelpers.hpp"
-#include <mpi.h>
-
-#define BOOST_TEST_MODULE DistributedTree
-
-namespace tt = boost::test_tools;
-
-using PairIndexRank = Kokkos::pair<int, int>;
-using TupleIndexRankDistance = Kokkos::pair<Kokkos::pair<int, int>, float>;
-
-BOOST_AUTO_TEST_CASE_TEMPLATE(hello_world, DeviceType, ARBORX_DEVICE_TYPES)
-{
-  using Tree = ArborX::DistributedTree<typename DeviceType::memory_space>;
-  using ExecutionSpace = typename DeviceType::execution_space;
-
-  MPI_Comm comm = MPI_COMM_WORLD;
-  int comm_rank;
-  MPI_Comm_rank(comm, &comm_rank);
-  int comm_size;
-  MPI_Comm_size(comm, &comm_size);
-
-  int const n = 4;
-  Kokkos::View<ArborX::Point *, DeviceType> points("Testing::points", n);
-  // [  rank 0       [  rank 1       [  rank 2       [  rank 3       [
-  // x---x---x---x---x---x---x---x---x---x---x---x---x---x---x---x---
-  // ^   ^   ^   ^
-  // 0   1   2   3   ^   ^   ^   ^
-  //                 0   1   2   3   ^   ^   ^   ^
-  //                                 0   1   2   3   ^   ^   ^   ^
-  //                                                 0   1   2   3
-  Kokkos::parallel_for(Kokkos::RangePolicy<ExecutionSpace>(0, n),
-                       KOKKOS_LAMBDA(int i) {
-                         points(i) = {{(double)i / n + comm_rank, 0., 0.}};
-                       });
-
-  Tree tree(comm, ExecutionSpace{}, points);
-
-  // 0---0---0---0---1---1---1---1---2---2---2---2---3---3---3---3---
-  // |               |               |               |               |
-  // |               |               |               x   x   x   x   |
-  // |               |               |               |<------0------>|
-  // |               |               x   x   x   x   x               |
-  // |               |               |<------1------>|               |
-  // |               x   x   x   x   x               |               |
-  // |               |<------2------>|               |               |
-  // x   x   x   x   x               |               |               |
-  // |<------3------>|               |               |               |
-  // |               |               |               |               |
-  Kokkos::View<decltype(ArborX::intersects(ArborX::Sphere{})) *, DeviceType>
-      queries("Testing::queries", 1);
-  auto queries_host = Kokkos::create_mirror_view(queries);
-  queries_host(0) = ArborX::intersects(
-      ArborX::Sphere{{{0.5 + comm_size - 1 - comm_rank, 0., 0.}}, 0.5});
-  deep_copy(queries, queries_host);
-
-  // 0---0---0---0---1---1---1---1---2---2---2---2---3---3---3---3---
-  // |               |               |               |               |
-  // |               |               |           x   x   x           |
-  // |               |           x   x   x        <--0-->            |
-  // |           x   x   x        <--1-->            |               |
-  // x   x        <--2-->            |               |               |
-  // 3-->            |               |               |               |
-  // |               |               |               |               |
-  Kokkos::View<ArborX::Nearest<ArborX::Point> *, DeviceType> nearest_queries(
-      "Testing::nearest_queries", 1);
-  auto nearest_queries_host = Kokkos::create_mirror_view(nearest_queries);
-  nearest_queries_host(0) = ArborX::nearest<ArborX::Point>(
-      {{0.0 + comm_size - 1 - comm_rank, 0., 0.}},
-      comm_rank < comm_size - 1 ? 3 : 2);
-  deep_copy(nearest_queries, nearest_queries_host);
-
-  std::vector<PairIndexRank> values;
-  values.reserve(n + 1);
-  for (int i = 0; i < n; ++i)
-  {
-    values.emplace_back(n - 1 - i, comm_size - 1 - comm_rank);
-  }
-  if (comm_rank > 0)
-  {
-    values.emplace_back(0, comm_size - comm_rank);
-    ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree, queries,
-                           make_reference_solution(values, {0, n + 1}));
-  }
-  else
-  {
-    ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree, queries,
-                           make_reference_solution(values, {0, n}));
-  }
-
-  BOOST_TEST(n > 2);
-  if (comm_rank < comm_size - 1)
-  {
-    ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree, nearest_queries,
-                           make_reference_solution<PairIndexRank>(
-                               {{0, comm_size - 1 - comm_rank},
-                                {n - 1, comm_size - 2 - comm_rank},
-                                {1, comm_size - 1 - comm_rank}},
-                               {0, 3}));
-  }
-  else
-  {
-    ARBORX_TEST_QUERY_TREE(
-        ExecutionSpace{}, tree, nearest_queries,
-        make_reference_solution<PairIndexRank>(
-            {{0, comm_size - 1 - comm_rank}, {1, comm_size - 1 - comm_rank}},
-            {0, 2}));
-  }
-}
-
-BOOST_AUTO_TEST_CASE_TEMPLATE(empty_tree, DeviceType, ARBORX_DEVICE_TYPES)
-{
-  using ExecutionSpace = typename DeviceType::execution_space;
-
-  MPI_Comm comm = MPI_COMM_WORLD;
-  int comm_rank;
-  MPI_Comm_rank(comm, &comm_rank);
-  int comm_size;
-  MPI_Comm_size(comm, &comm_size);
-
-  auto const tree = makeDistributedTree<DeviceType>(comm, {});
-
-  BOOST_TEST(tree.empty());
-  BOOST_TEST(tree.size() == 0);
-
-  BOOST_TEST(ArborX::Details::equals(tree.bounds(), {}));
-
-  ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree,
-                         makeIntersectsBoxQueries<DeviceType>({}),
-                         make_reference_solution<PairIndexRank>({}, {0}));
-
-  ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree,
-                         makeIntersectsSphereQueries<DeviceType>({}),
-                         make_reference_solution<PairIndexRank>({}, {0}));
-
-  ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree,
-                         makeNearestQueries<DeviceType>({}),
-                         make_reference_solution<PairIndexRank>({}, {0}));
-
-  ARBORX_TEST_QUERY_TREE_WITH_DISTANCE(
-      ExecutionSpace{}, tree, makeNearestQueries<DeviceType>({}),
-      make_reference_solution<TupleIndexRankDistance>({}, {0}));
-
-  // Only rank 0 has a couple spatial queries with a spatial predicate
-  if (comm_rank == 0)
-  {
-    ARBORX_TEST_QUERY_TREE(
-        ExecutionSpace{}, tree, makeIntersectsBoxQueries<DeviceType>({{}, {}}),
-        make_reference_solution<PairIndexRank>({}, {0, 0, 0}));
-  }
-  else
-  {
-    ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree,
-                           makeIntersectsBoxQueries<DeviceType>({}),
-                           make_reference_solution<PairIndexRank>({}, {0}));
-  }
-
-  // All ranks but rank 0 have a single query with a spatial predicate
-  if (comm_rank == 0)
-  {
-    ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree,
-                           makeIntersectsSphereQueries<DeviceType>({}),
-                           make_reference_solution<PairIndexRank>({}, {0}));
-  }
-  else
-  {
-    ARBORX_TEST_QUERY_TREE(
-        ExecutionSpace{}, tree,
-        makeIntersectsSphereQueries<DeviceType>({
-            {{{(double)comm_rank, 0., 0.}}, (double)comm_size},
-        }),
-        make_reference_solution<PairIndexRank>({}, {0, 0}));
-  }
-
-  // All ranks but rank 0 have a single query with a nearest predicate
-  if (comm_rank == 0)
-  {
-    ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree,
-                           makeNearestQueries<DeviceType>({}),
-                           make_reference_solution<PairIndexRank>({}, {0}));
-  }
-  else
-  {
-    ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree,
-                           makeNearestQueries<DeviceType>({
-                               {{{0., 0., 0.}}, comm_rank},
-                           }),
-                           make_reference_solution<PairIndexRank>({}, {0, 0}));
-  }
-
-  // All ranks have a single query with a nearest predicate (this version
-  // returns distances as well)
-  ARBORX_TEST_QUERY_TREE_WITH_DISTANCE(
-      ExecutionSpace{}, tree,
-      makeNearestQueries<DeviceType>({
-          {{{0., 0., 0.}}, comm_size},
-      }),
-      make_reference_solution<TupleIndexRankDistance>({}, {0, 0}));
-}
-
-BOOST_AUTO_TEST_CASE_TEMPLATE(unique_leaf_on_rank_0, DeviceType,
-                              ARBORX_DEVICE_TYPES)
-{
-  using ExecutionSpace = typename DeviceType::execution_space;
-
-  MPI_Comm comm = MPI_COMM_WORLD;
-  int comm_rank;
-  MPI_Comm_rank(comm, &comm_rank);
-  int comm_size;
-  MPI_Comm_size(comm, &comm_size);
-
-  // tree has one unique leaf that lives on rank 0
-  auto const tree =
-      (comm_rank == 0 ? makeDistributedTree<DeviceType>(
-                            comm,
-                            {
-                                {{{0., 0., 0.}}, {{1., 1., 1.}}},
-                            })
-                      : makeDistributedTree<DeviceType>(comm, {}));
-
-  BOOST_TEST(!tree.empty());
-  BOOST_TEST(tree.size() == 1);
-
-  BOOST_TEST(
-      ArborX::Details::equals(tree.bounds(), {{{0., 0., 0.}}, {{1., 1., 1.}}}));
-
-  ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree,
-                         makeIntersectsBoxQueries<DeviceType>({}),
-                         make_reference_solution<PairIndexRank>({}, {0}));
-
-  ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree,
-                         makeIntersectsSphereQueries<DeviceType>({}),
-                         make_reference_solution<PairIndexRank>({}, {0}));
-
-  ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree,
-                         makeNearestQueries<DeviceType>({}),
-                         make_reference_solution<PairIndexRank>({}, {0}));
-
-  ARBORX_TEST_QUERY_TREE_WITH_DISTANCE(
-      ExecutionSpace{}, tree, makeNearestQueries<DeviceType>({}),
-      make_reference_solution<TupleIndexRankDistance>({}, {0}));
-
-  // Querying for more neighbors than there are leaves in the tree
-  ARBORX_TEST_QUERY_TREE(
-      ExecutionSpace{}, tree,
-      makeNearestQueries<DeviceType>({
-          {{{(double)comm_rank, (double)comm_rank, (double)comm_rank}},
-           comm_size},
-      }),
-      make_reference_solution<PairIndexRank>({{0, 0}}, {0, 1}));
-}
-
-BOOST_AUTO_TEST_CASE_TEMPLATE(one_leaf_per_rank, DeviceType,
-                              ARBORX_DEVICE_TYPES)
-{
-  using ExecutionSpace = typename DeviceType::execution_space;
-
-  MPI_Comm comm = MPI_COMM_WORLD;
-  int comm_rank;
-  MPI_Comm_rank(comm, &comm_rank);
-  int comm_size;
-  MPI_Comm_size(comm, &comm_size);
-
-  // tree has one leaf per rank
-  auto const tree = makeDistributedTree<DeviceType>(
-      comm,
-      {
-          {{{(double)comm_rank, 0., 0.}}, {{(double)comm_rank + 1., 1., 1.}}},
-      });
-
-  BOOST_TEST(!tree.empty());
-  BOOST_TEST((int)tree.size() == comm_size);
-
-  BOOST_TEST(ArborX::Details::equals(
-      tree.bounds(), {{{0., 0., 0.}}, {{(double)comm_size, 1., 1.}}}));
-
-  ARBORX_TEST_QUERY_TREE(
-      ExecutionSpace{}, tree,
-      makeIntersectsBoxQueries<DeviceType>({
-          {{{(double)comm_size - (double)comm_rank - .5, .5, .5}},
-           {{(double)comm_size - (double)comm_rank - .5, .5, .5}}},
-          {{{(double)comm_rank + .5, .5, .5}},
-           {{(double)comm_rank + .5, .5, .5}}},
-      }),
-      make_reference_solution<PairIndexRank>(
-          {{0, comm_size - 1 - comm_rank}, {0, comm_rank}}, {0, 1, 2}));
-
-  ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree,
-                         makeNearestQueries<DeviceType>({}),
-                         make_reference_solution<PairIndexRank>({}, {0}));
-
-  ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree,
-                         makeIntersectsBoxQueries<DeviceType>({}),
-                         make_reference_solution<PairIndexRank>({}, {0}));
-
-  if (comm_rank > 0)
-  {
-    ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree,
-                           makeNearestQueries<DeviceType>({
-                               {{{0., 0., 0.}}, comm_rank * comm_size},
-                           }),
-                           make_reference_solution(
-                               [comm_size]() {
-                                 std::vector<PairIndexRank> values;
-                                 values.reserve(comm_size);
-                                 for (int i = 0; i < comm_size; ++i)
-                                   values.emplace_back(0, i);
-                                 return values;
-                               }(),
-                               {0, comm_size}));
-  }
-  else
-  {
-    ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree,
-                           makeNearestQueries<DeviceType>({
-                               {{{0., 0., 0.}}, comm_rank * comm_size},
-                           }),
-                           make_reference_solution<PairIndexRank>({}, {0, 0}));
-  }
-}
-
-BOOST_AUTO_TEST_CASE_TEMPLATE(do_not_exceed_capacity, DeviceType,
-                              ARBORX_DEVICE_TYPES)
-{
-  using ExecutionSpace = typename DeviceType::execution_space;
-
-  // This unit tests exposes bug that essentially assumed the number of
-  // neighbors queried for would not exceed the maximum size of the default
-  // underlying container for a priority queue which was 256.
-  // https://github.com/arborx/ArborX/pull/126#issuecomment-538410096
-  // Each rank has the exact same cloud and perform a knn query that will push
-  // comm_size * 512 elements into the queue.
-  using ArborX::Box;
-  using ArborX::nearest;
-  using ArborX::Point;
-  using ExecutionSpace = typename DeviceType::execution_space;
-  MPI_Comm comm = MPI_COMM_WORLD;
-  Kokkos::View<Point *, DeviceType> points("Testing::points", 512);
-  Kokkos::parallel_for(Kokkos::RangePolicy<ExecutionSpace>(0, 512),
-                       KOKKOS_LAMBDA(int i) {
-                         points(i) = {{(float)i, (float)i, (float)i}};
-                       });
-
-  ArborX::DistributedTree<typename DeviceType::memory_space> tree{
-      comm, ExecutionSpace{}, points};
-  Kokkos::View<decltype(nearest(Point{})) *, DeviceType> queries(
-      "Testing::queries", 1);
-  Kokkos::deep_copy(queries, nearest(Point{0, 0, 0}, 512));
-  Kokkos::View<PairIndexRank *, DeviceType> values("Testing::values", 0);
-  Kokkos::View<int *, DeviceType> offset("Testing::offset", 0);
-  BOOST_CHECK_NO_THROW(tree.query(ExecutionSpace{}, queries, values, offset));
-}
-
-BOOST_AUTO_TEST_CASE_TEMPLATE(non_approximate_nearest_neighbors, DeviceType,
-                              ARBORX_DEVICE_TYPES)
-{
-  using ExecutionSpace = typename DeviceType::execution_space;
-
-  MPI_Comm comm = MPI_COMM_WORLD;
-  int comm_rank;
-  MPI_Comm_rank(comm, &comm_rank);
-  int comm_size;
-  MPI_Comm_size(comm, &comm_size);
-
-  //  +----------0----------1----------2----------3
-  //  |          |          |          |          |
-  //  |          |          |          |          |
-  //  |          |          |          |          |
-  //  |          |          |          |          |
-  //  0----------1----------2----------3----------+
-  //  [  rank 0  ]
-  //             [  rank 1  ]
-  //                        [  rank 2  ]
-  //                                   [  rank 3  ]
-  auto const tree = makeDistributedTree<DeviceType>(
-      comm, {
-                {{{(double)comm_rank, 0., 0.}}, {{(double)comm_rank, 0., 0.}}},
-                {{{(double)comm_rank + 1., 1., 1.}},
-                 {{(double)comm_rank + 1., 1., 1.}}},
-            });
-
-  BOOST_TEST(!tree.empty());
-  BOOST_TEST((int)tree.size() == 2 * comm_size);
-
-  //  +----------0----------1----------2----------3
-  //  |          |          |          |          |
-  //  |          |          |          |          |
-  //  |          |          |          |          |
-  //  |          |          |          |          |
-  //  0-------x--1-------X--2-------X--3-------X--+
-  //          ^          ^          ^          ^
-  //          3          2          1          0
-  if (comm_rank > 0)
-  {
-    ARBORX_TEST_QUERY_TREE(
-        ExecutionSpace{}, tree,
-        makeNearestQueries<DeviceType>({
-            {{{(double)(comm_size - 1 - comm_rank) + .75, 0., 0.}}, 1},
-        }),
-        make_reference_solution<PairIndexRank>({{0, comm_size - comm_rank}},
-                                               {0, 1}));
-  }
-  else
-  {
-    ARBORX_TEST_QUERY_TREE(
-        ExecutionSpace{}, tree,
-        makeNearestQueries<DeviceType>({
-            {{{(double)(comm_size - 1 - comm_rank) + .75, 0., 0.}}, 1},
-        }),
-        make_reference_solution<PairIndexRank>({{0, comm_size - 1}}, {0, 1}));
-  }
-}
-
-template <typename DeviceType>
-struct CustomInlineCallbackWithAttachment
-{
-  using tag = ArborX::Details::InlineCallbackTag;
-  Kokkos::View<ArborX::Point *, DeviceType> points;
-  ArborX::Point const origin = {{0., 0., 0.}};
-  template <typename Query, typename Insert>
-  KOKKOS_FUNCTION void operator()(Query const &query, int index,
-                                  Insert const &insert) const
-  {
-    auto data = ArborX::getData(query);
-    float const distance_to_origin =
-        ArborX::Details::distance(points(index), origin);
-
-    insert(distance_to_origin + data);
-  }
-};
-
-template <typename DeviceType>
-struct CustomPostCallbackWithAttachment
-{
-  using tag = ArborX::Details::PostCallbackTag;
-  Kokkos::View<ArborX::Point *, DeviceType> points;
-  ArborX::Point const origin = {{0., 0., 0.}};
-  template <typename Predicates, typename InOutView, typename InView,
-            typename OutView>
-  void operator()(Predicates const &queries, InOutView &offset, InView in,
-                  OutView &out) const
-  {
-    using ExecutionSpace = typename DeviceType::execution_space;
-    using ArborX::Details::distance;
-    auto const n = offset.extent(0) - 1;
-    ArborX::reallocWithoutInitializing(out, in.extent(0));
-    // NOTE workaround to avoid implicit capture of *this
-    auto const &points_ = points;
-    auto const &origin_ = origin;
-    Kokkos::parallel_for(
-        Kokkos::RangePolicy<ExecutionSpace>(0, n), KOKKOS_LAMBDA(int i) {
-          auto data = ArborX::getData(queries(i));
-          for (int j = offset(i); j < offset(i + 1); ++j)
-          {
-            out(j) = (float)distance(points_(in(j)), origin_) + data;
-          }
-        });
-  }
-};
-BOOST_AUTO_TEST_CASE_TEMPLATE(callback_with_attachment, DeviceType,
-                              ARBORX_DEVICE_TYPES)
-{
-  using ExecutionSpace = typename DeviceType::execution_space;
-
-  MPI_Comm comm = MPI_COMM_WORLD;
-  int comm_rank;
-  MPI_Comm_rank(comm, &comm_rank);
-  int comm_size;
-  MPI_Comm_size(comm, &comm_size);
-
-  //  +----------0----------1----------2----------3
-  //  |          |          |          |          |
-  //  |          |          |          |          |
-  //  |          |          |          |          |
-  //  |          |          |          |          |
-  //  0----------1----------2----------3----------+
-  //  [  rank 0  ]
-  //             [  rank 1  ]
-  //                        [  rank 2  ]
-  //                                   [  rank 3  ]
-  auto const tree = makeDistributedTree<DeviceType>(
-      comm,
-      {{{{(double)comm_rank, 0., 0.}}, {{(double)comm_rank + 1, 1., 1.}}}});
-
-  //  +--------0---------1----------2---------3
-  //  |        |         |          |         |
-  //  |        |         |          |         |
-  //  |        |         |          |         |
-  //  |        |         |          |         |
-  //  0--------1----x----2-----x----3----x----+
-  //                ^          ^         ^
-  //                0          1         2
-
-  int const n_queries = 1;
-  using ExecutionSpace = typename DeviceType::execution_space;
-  Kokkos::View<ArborX::Point *, DeviceType> points("Testing::points",
-                                                   n_queries);
-  Kokkos::parallel_for(Kokkos::RangePolicy<ExecutionSpace>(0, n_queries),
-                       KOKKOS_LAMBDA(int i) {
-                         points(i) = {(float)(comm_rank) + 1.5f, 0.f, 0.f};
-                       });
-  auto points_host =
-      Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace{}, points);
-
-  // This is a bit tricky. One would assume that it should be
-  // distance(points(i), origin) + comm_rank, matching code inside the
-  // callback. However, the callbacks are initialized and called on the rank
-  // that produces results, not on the rank that sets up the queries. In this
-  // example, for point 0 the callback will be called on rank 1, which is
-  // initialized with point 1. So, within the callback, points(0) corresponds
-  // to point 1 physically, and not point 0, even though the query() call is
-  // called on rank 0.
-  int const n_results = (comm_rank < comm_size - 1) ? 1 : 0;
-  ArborX::Point const origin = {{0., 0., 0.}};
-  Kokkos::View<float *, DeviceType> ref("Testing::ref", n_results);
-  Kokkos::parallel_for(
-      Kokkos::RangePolicy<ExecutionSpace>(0, n_results), KOKKOS_LAMBDA(int i) {
-        ref(i) =
-            float(ArborX::Details::distance(points(i), origin) + 1) + comm_rank;
-      });
-
-  {
-    Kokkos::View<float *, DeviceType> custom("Testing::custom", 0);
-    Kokkos::View<int *, DeviceType> offset("Testing::offset", 0);
-    tree.query(ExecutionSpace{},
-               makeIntersectsBoxWithAttachmentQueries<DeviceType, int>(
-                   {{points_host(0), points_host(0)}}, {comm_rank}),
-               CustomInlineCallbackWithAttachment<DeviceType>{points}, custom,
-               offset);
-
-    auto custom_host =
-        Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace{}, custom);
-    auto ref_host =
-        Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace{}, ref);
-    auto offset_host =
-        Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace{}, offset);
-    BOOST_TEST(make_compressed_storage(offset_host, custom_host) ==
-                   make_compressed_storage(offset_host, ref_host),
-               tt::per_element());
-  }
-  {
-    Kokkos::View<float *, DeviceType> custom("Testing::custom", 0);
-    Kokkos::View<int *, DeviceType> offset("Testing::offset", 0);
-    tree.query(ExecutionSpace{},
-               makeIntersectsBoxWithAttachmentQueries<DeviceType, int>(
-                   {{points_host(0), points_host(0)}}, {comm_rank}),
-               CustomPostCallbackWithAttachment<DeviceType>{points}, custom,
-               offset);
-
-    auto custom_host =
-        Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace{}, custom);
-    auto ref_host =
-        Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace{}, ref);
-    auto offset_host =
-        Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace{}, offset);
-    BOOST_TEST(make_compressed_storage(offset_host, custom_host) ==
-                   make_compressed_storage(offset_host, ref_host),
-               tt::per_element());
-  }
-}
-
-std::vector<std::array<double, 3>>
-make_random_cloud(double const Lx, double const Ly, double const Lz,
-                  int const n, double const seed)
-{
-  std::vector<std::array<double, 3>> cloud(n);
-  std::default_random_engine generator(seed);
-  std::uniform_real_distribution<double> distribution_x(0.0, Lx);
-  std::uniform_real_distribution<double> distribution_y(0.0, Ly);
-  std::uniform_real_distribution<double> distribution_z(0.0, Lz);
-  for (int i = 0; i < n; ++i)
-  {
-    double x = distribution_x(generator);
-    double y = distribution_y(generator);
-    double z = distribution_z(generator);
-    cloud[i] = {{x, y, z}};
-  }
-  return cloud;
-}
-
-BOOST_AUTO_TEST_CASE_TEMPLATE(boost_comparison, DeviceType, ARBORX_DEVICE_TYPES)
-{
-  using ExecutionSpace = typename DeviceType::execution_space;
-
-  MPI_Comm comm = MPI_COMM_WORLD;
-  int comm_rank;
-  MPI_Comm_rank(comm, &comm_rank);
-  int comm_size;
-  MPI_Comm_size(comm, &comm_size);
-
-  // Construct a random cloud of point. We use the same seed on all the
-  // processors.
-  double const Lx = 10.0;
-  double const Ly = 10.0;
-  double const Lz = 10.0;
-  int const n = 100;
-  auto cloud = make_random_cloud(Lx, Ly, Lz, n, 0);
-  auto queries = make_random_cloud(Lx, Ly, Lz, n, 1234);
-
-  // The formula is a bit complicated but it does not require n be divisible
-  // by comm_size
-  int const local_n = (n + comm_size - 1 - comm_rank) / comm_size;
-  Kokkos::View<ArborX::Box *, DeviceType> bounding_boxes(
-      "Testing::bounding_boxes", local_n);
-  auto bounding_boxes_host = Kokkos::create_mirror_view(bounding_boxes);
-  for (int i = 0; i < n; ++i)
-  {
-    if (i % comm_size == comm_rank)
-    {
-      auto const &point = cloud[i];
-      double const x = std::get<0>(point);
-      double const y = std::get<1>(point);
-      double const z = std::get<2>(point);
-      bounding_boxes_host[i / comm_size] = {{{x, y, z}}, {{x, y, z}}};
-    }
-  }
-  Kokkos::deep_copy(bounding_boxes, bounding_boxes_host);
-
-  // Initialize the distributed search tree
-  ArborX::DistributedTree<typename DeviceType::memory_space> distributed_tree(
-      comm, ExecutionSpace{}, bounding_boxes);
-
-  // make queries
-  Kokkos::View<double * [3], ExecutionSpace> point_coords(
-      "Testing::point_coords", local_n);
-  auto point_coords_host = Kokkos::create_mirror_view(point_coords);
-  Kokkos::View<double *, ExecutionSpace> radii("Testing::radii", local_n);
-  auto radii_host = Kokkos::create_mirror_view(radii);
-  Kokkos::View<int * [2], ExecutionSpace> within_n_pts("Testing::within_n_pts",
-                                                       local_n);
-  std::default_random_engine generator(0);
-  std::uniform_real_distribution<double> distribution_radius(
-      0.0, std::sqrt(Lx * Lx + Ly * Ly + Lz * Lz));
-  std::uniform_int_distribution<int> distribution_k(1, std::floor(sqrt(n * n)));
-  for (int i = 0; i < n; ++i)
-  {
-    if (i % comm_size == comm_rank)
-    {
-      auto const &point = queries[i];
-      int const j = i / comm_size;
-      double const x = std::get<0>(point);
-      double const y = std::get<1>(point);
-      double const z = std::get<2>(point);
-      radii_host(j) = distribution_radius(generator);
-
-      point_coords_host(j, 0) = x;
-      point_coords_host(j, 1) = y;
-      point_coords_host(j, 2) = z;
-    }
-  }
-  Kokkos::deep_copy(point_coords, point_coords_host);
-  Kokkos::deep_copy(radii, radii_host);
-
-  Kokkos::View<decltype(ArborX::intersects(ArborX::Sphere{})) *, DeviceType>
-      within_queries("Testing::within_queries", local_n);
-  Kokkos::parallel_for(
-      "register_within_queries",
-      Kokkos::RangePolicy<ExecutionSpace>(0, local_n), KOKKOS_LAMBDA(int i) {
-        within_queries(i) = ArborX::intersects(ArborX::Sphere{
-            {{point_coords(i, 0), point_coords(i, 1), point_coords(i, 2)}},
-            radii(i)});
-      });
-
-  auto within_queries_host = Kokkos::create_mirror_view(within_queries);
-  Kokkos::deep_copy(within_queries_host, within_queries);
-
-  BoostExt::ParallelRTree<ArborX::Box> rtree(comm, ExecutionSpace{},
-                                             bounding_boxes_host);
-
-  ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, distributed_tree, within_queries,
-                         query(ExecutionSpace{}, rtree, within_queries_host));
-}
diff --git a/arborx/test/tstException.cpp b/arborx/test/tstException.cpp
deleted file mode 100644
index c7184cb39..000000000
--- a/arborx/test/tstException.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2017-2021 by the ArborX authors                            *
- * All rights reserved.                                                     *
- *                                                                          *
- * This file is part of the ArborX library. ArborX is                       *
- * distributed under a BSD 3-clause license. For the licensing terms see    *
- * the LICENSE file in the top-level directory.                             *
- *                                                                          *
- * SPDX-License-Identifier: BSD-3-Clause                                    *
- ****************************************************************************/
-
-#include <ArborX_Exception.hpp>
-
-#include <boost/test/unit_test.hpp>
-
-BOOST_AUTO_TEST_SUITE(DesignByContract)
-
-BOOST_AUTO_TEST_CASE(dumb)
-{
-  using namespace ArborX;
-  BOOST_CHECK_NO_THROW(ARBORX_ASSERT(true));
-  std::string const prefix = "ArborX exception: ";
-  BOOST_CHECK_EXCEPTION(
-      ARBORX_ASSERT(false), SearchException, [&](std::exception const &e) {
-        std::string const message = e.what();
-        bool const message_starts_with_prefix = message.find(prefix) == 0;
-        bool const message_contains_filename =
-            message.find(__FILE__) != std::string::npos;
-        return message_starts_with_prefix && message_contains_filename;
-      });
-  std::string const message = "Keep calm and chive on!";
-  BOOST_CHECK_EXCEPTION(
-      throw SearchException(message), std::exception,
-      [&](std::exception const &e) { return prefix + message == e.what(); });
-}
-
-BOOST_AUTO_TEST_SUITE_END()
diff --git a/arborx/test/tstHeapOperations.cpp b/arborx/test/tstHeapOperations.cpp
deleted file mode 100644
index 3aae8eca9..000000000
--- a/arborx/test/tstHeapOperations.cpp
+++ /dev/null
@@ -1,208 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2017-2021 by the ArborX authors                            *
- * All rights reserved.                                                     *
- *                                                                          *
- * This file is part of the ArborX library. ArborX is                       *
- * distributed under a BSD 3-clause license. For the licensing terms see    *
- * the LICENSE file in the top-level directory.                             *
- *                                                                          *
- * SPDX-License-Identifier: BSD-3-Clause                                    *
- ****************************************************************************/
-
-#include "ArborX_EnableViewComparison.hpp"
-#include <ArborX_DetailsHeap.hpp>
-#include <ArborX_DetailsPriorityQueue.hpp> // Less, Greater
-
-#include <Kokkos_Array.hpp>
-
-#include <boost/test/unit_test.hpp>
-
-using namespace ArborX::Details;
-namespace tt = boost::test_tools;
-
-BOOST_AUTO_TEST_SUITE(HeapOperations)
-
-BOOST_AUTO_TEST_CASE(push_heap)
-{
-  // Here checking against the example of binary heap insertion from
-  // https://en.wikipedia.org/wiki/Binary_heap#Insert
-  Kokkos::Array<int, 6> a = {11, 5, 8, 3, 4, 15};
-  BOOST_TEST(isHeap(a.data(), a.data() + 5, Less<int>()));
-  BOOST_TEST(!isHeap(a.data(), a.data() + 6, Less<int>()));
-  pushHeap(a.data(), a.data() + 6, Less<int>());
-  BOOST_TEST(isHeap(a.data(), a.data() + 6, Less<int>()));
-  Kokkos::Array<int, 6> ref = {15, 5, 11, 3, 4, 8};
-  BOOST_TEST(a == ref, tt::per_element());
-}
-
-BOOST_AUTO_TEST_CASE(pop_heap)
-{
-  // See https://en.wikipedia.org/wiki/Binary_heap#Extract
-  Kokkos::Array<int, 5> a = {11, 5, 8, 3, 4};
-  BOOST_TEST(isHeap(a.data(), a.data() + 5, Less<int>()));
-  popHeap(a.data(), a.data() + 5, Less<int>());
-  BOOST_TEST(isHeap(a.data(), a.data() + 4, Less<int>()));
-  BOOST_TEST(!isHeap(a.data(), a.data() + 5, Less<int>()));
-  Kokkos::Array<int, 5> ref = {8, 5, 4, 3, 11};
-  BOOST_TEST(a == ref, tt::per_element());
-}
-
-BOOST_AUTO_TEST_CASE(max_heap)
-{
-  // Here attempting to reproduce examples code from cppreference.com for
-  // std::push_heap() and std::pop_heap().  It turns out that calling
-  // std::make_heap() on { 3, 1, 4, 1, 5, 9 } is not equivalent to inserting
-  // one element at a time (I also tried to insert them in reverse order out
-  // of curiosity) and yields 9 5 4 1 1 3 :/
-  // cpluplus.com does make a note that the order of the elements will depend
-  // on implementation.
-  // Nevertheless, I thought it helps understanding how the algorithm works so
-  // I decided to keep it as a unit test.
-  Kokkos::Array<int, 7> a = {3, 1, 4, 1, 5, 9, 6};
-  Kokkos::Array<int, 7> ref;
-
-  pushHeap(a.data(), a.data() + 0, Less<int>());
-  ref = {3, 1, 4, 1, 5, 9, 6};
-  BOOST_TEST(a == ref, tt::per_element());
-
-  pushHeap(a.data(), a.data() + 1, Less<int>());
-  ref = {3, 1, 4, 1, 5, 9, 6};
-  BOOST_TEST(a == ref, tt::per_element());
-
-  pushHeap(a.data(), a.data() + 2, Less<int>());
-  ref = {3, 1, 4, 1, 5, 9, 6};
-  BOOST_TEST(a == ref, tt::per_element());
-
-  pushHeap(a.data(), a.data() + 3, Less<int>());
-  ref = {4, 1, 3, 1, 5, 9, 6};
-  BOOST_TEST(a == ref, tt::per_element());
-
-  pushHeap(a.data(), a.data() + 4, Less<int>());
-  ref = {4, 1, 3, 1, 5, 9, 6};
-  BOOST_TEST(a == ref, tt::per_element());
-
-  pushHeap(a.data(), a.data() + 5, Less<int>());
-  ref = {5, 4, 3, 1, 1, 9, 6};
-  BOOST_TEST(a == ref, tt::per_element());
-
-  pushHeap(a.data(), a.data() + 6, Less<int>());
-  ref = {9, 4, 5, 1, 1, 3, 6};
-  BOOST_TEST(a == ref, tt::per_element());
-
-  popHeap(a.data(), a.data() + 6, Less<int>());
-  ref = {5, 4, 3, 1, 1, 9, 6};
-  BOOST_TEST(a == ref, tt::per_element());
-
-  pushHeap(a.data(), a.data() + 6, Less<int>());
-  ref = {9, 4, 5, 1, 1, 3, 6};
-  BOOST_TEST(a == ref, tt::per_element());
-
-  pushHeap(a.data(), a.data() + 7, Less<int>());
-  ref = {9, 4, 6, 1, 1, 3, 5};
-  BOOST_TEST(a == ref, tt::per_element());
-}
-
-BOOST_AUTO_TEST_CASE(min_heap)
-{
-  // Here reproducing the example of a binary min heap from Wikipedia and then
-  // popping all elements one by one.
-  // This helped resolving an issue with ProprityQueue::pop() that was not
-  // exposed by other unit tests in this file, partly because they were too
-  // trivial.  The bug was only showing with real kNN search problems when
-  // comparing results from BoundingVolumeHierarchy with boost::rtree.
-  Kokkos::Array<int, 9> a = {1, 2, 3, 17, 19, 36, 7, 25, 100};
-  Kokkos::Array<int, 9> ref;
-  for (int i = 0; i < 9; ++i)
-  {
-    pushHeap(a.data(), a.data() + i, Greater<int>());
-    ref = {1, 2, 3, 17, 19, 36, 7, 25, 100};
-    BOOST_TEST(a == ref, tt::per_element());
-  }
-
-  popHeap(a.data(), a.data() + 9, Greater<int>());
-  ref = {2, 17, 3, 25, 19, 36, 7, 100, 1};
-  BOOST_TEST(a == ref, tt::per_element());
-
-  popHeap(a.data(), a.data() + 8, Greater<int>());
-  ref = {3, 17, 7, 25, 19, 36, 100, 2, 1};
-  BOOST_TEST(a == ref, tt::per_element());
-
-  popHeap(a.data(), a.data() + 7, Greater<int>());
-  ref = {7, 17, 36, 25, 19, 100, 3, 2, 1};
-  BOOST_TEST(a == ref, tt::per_element());
-
-  popHeap(a.data(), a.data() + 6, Greater<int>());
-  ref = {17, 19, 36, 25, 100, 7, 3, 2, 1};
-  BOOST_TEST(a == ref, tt::per_element());
-
-  popHeap(a.data(), a.data() + 5, Greater<int>());
-  ref = {19, 25, 36, 100, 17, 7, 3, 2, 1};
-  BOOST_TEST(a == ref, tt::per_element());
-
-  popHeap(a.data(), a.data() + 4, Greater<int>());
-  ref = {25, 100, 36, 19, 17, 7, 3, 2, 1};
-  BOOST_TEST(a == ref, tt::per_element());
-
-  popHeap(a.data(), a.data() + 3, Greater<int>());
-  ref = {36, 100, 25, 19, 17, 7, 3, 2, 1};
-  BOOST_TEST(a == ref, tt::per_element());
-
-  popHeap(a.data(), a.data() + 2, Greater<int>());
-  ref = {100, 36, 25, 19, 17, 7, 3, 2, 1};
-  BOOST_TEST(a == ref, tt::per_element());
-
-  popHeap(a.data(), a.data() + 1, Greater<int>());
-  ref = {100, 36, 25, 19, 17, 7, 3, 2, 1};
-  BOOST_TEST(a == ref, tt::per_element());
-
-  popHeap(a.data(), a.data() + 0, Greater<int>());
-  ref = {100, 36, 25, 19, 17, 7, 3, 2, 1};
-  BOOST_TEST(a == ref, tt::per_element());
-}
-
-BOOST_AUTO_TEST_CASE(make_heap)
-{
-  for (auto v : {
-           std::vector<int>{}, std::vector<int>{6}, std::vector<int>{2, 1},
-           std::vector<int>{1, 6, 2, 2, 9, 4, 16},
-           std::vector<int>{8, 6, 7, 2, 0}, std::vector<int>{3, 3, 3, 3, 3, 1},
-           std::vector<int>{36, 19, 25, 17, 3, 7, 1, 2, 9}, // <- already a heap
-       })
-  {
-    makeHeap(v.data(), v.data() + v.size(), Less<int>());
-    BOOST_TEST(std::is_heap(v.begin(), v.end()));
-  }
-}
-
-BOOST_AUTO_TEST_CASE(sort_heap)
-{
-  for (auto heap : {std::vector<int>{}, std::vector<int>{3},
-                    std::vector<int>{36, 19, 25, 17, 3, 7, 1, 2, 9},
-                    std::vector<int>{36, 19, 25, 17, 3, 9, 1, 2, 7},
-                    std::vector<int>{100, 19, 36, 17, 3, 25, 1, 2, 7},
-                    std::vector<int>{15, 5, 11, 3, 4, 8}})
-  {
-    sortHeap(heap.data(), heap.data() + heap.size(), Less<int>());
-    // std::sort_heap( heap.begin(), heap.end() );
-    BOOST_TEST(std::is_sorted(heap.begin(), heap.end()));
-  }
-}
-
-BOOST_AUTO_TEST_CASE(is_heap)
-{
-  for (auto heap : {std::vector<int>{36, 19, 25, 17, 3, 7, 1, 2, 9},
-                    std::vector<int>{36, 19, 25, 17, 3, 9, 1, 2, 7},
-                    std::vector<int>{100, 19, 36, 17, 3, 25, 1, 2, 7},
-                    std::vector<int>{15, 5, 11, 3, 4, 8}})
-  {
-    BOOST_TEST(isHeap(heap.data(), heap.data() + heap.size(), Less<int>()));
-  }
-  for (auto not_heap : {std::vector<int>{0, 1, 2, 3, 4, 3, 2, 1, 0},
-                        std::vector<int>{2, 1, 0, 1, 2}})
-  {
-    BOOST_TEST(!isHeap(not_heap.data(), not_heap.data() + not_heap.size(),
-                       Less<int>()));
-  }
-}
-
-BOOST_AUTO_TEST_SUITE_END()
diff --git a/arborx/test/tstKDOP.cpp b/arborx/test/tstKDOP.cpp
deleted file mode 100644
index c1154b7a0..000000000
--- a/arborx/test/tstKDOP.cpp
+++ /dev/null
@@ -1,143 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2017-2021 by the ArborX authors                            *
- * All rights reserved.                                                     *
- *                                                                          *
- * This file is part of the ArborX library. ArborX is                       *
- * distributed under a BSD 3-clause license. For the licensing terms see    *
- * the LICENSE file in the top-level directory.                             *
- *                                                                          *
- * SPDX-License-Identifier: BSD-3-Clause                                    *
- ****************************************************************************/
-
-#include <ArborX_DetailsAlgorithms.hpp>
-#include <ArborX_KDOP.hpp>
-
-#include "BoostTest_CUDA_clang_workarounds.hpp"
-#include <boost/test/unit_test.hpp>
-
-#include <tuple>
-#include <type_traits>
-
-using ArborX::Box;
-using ArborX::Point;
-using ArborX::Experimental::KDOP;
-
-using KDOP_types = std::tuple<KDOP<6>, KDOP<14>, KDOP<18>, KDOP<26>>;
-
-BOOST_AUTO_TEST_SUITE(DiscreteOrientedPolytopes)
-
-BOOST_AUTO_TEST_CASE_TEMPLATE(conversion_to_box, KDOP_t, KDOP_types)
-{
-  using ArborX::Details::equals;
-  KDOP_t x;
-  BOOST_TEST(equals((Box)x, Box{}));
-  x += Point{0, 1, 0};
-  x += Point{1, 0, 1};
-  BOOST_TEST(equals((Box)x, Box{{0, 0, 0}, {1, 1, 1}}));
-}
-
-BOOST_AUTO_TEST_CASE_TEMPLATE(intersects_KDOP, KDOP_t, KDOP_types)
-{
-  KDOP_t x;
-  BOOST_TEST(!intersects(x, x));
-  x += Point{1, 0, 0};
-  x += Point{0, 1, 0};
-  x += Point{0, 0, 1};
-  BOOST_TEST(intersects(x, x));
-  BOOST_TEST(!intersects(x, KDOP_t{}));
-}
-
-BOOST_AUTO_TEST_CASE_TEMPLATE(intersects_box, KDOP_t, KDOP_types)
-{
-  KDOP_t x;
-  BOOST_TEST(!intersects(x, Box{}));
-  BOOST_TEST(!intersects(x, Box{{0, 0, 0}, {1, 1, 1}}));
-  x += Point{1, 0, 0};
-  x += Point{0, 1, 0};
-  x += Point{0, 0, 1};
-  BOOST_TEST(!intersects(x, Box{}));
-  BOOST_TEST(intersects(x, Box{{0, 0, 0}, {1, 1, 1}}));
-}
-
-BOOST_AUTO_TEST_CASE_TEMPLATE(intersects_point, KDOP_t, KDOP_types)
-{
-  {
-    KDOP_t x;
-    BOOST_TEST(!intersects(Point{1, 1, 1}, x));
-  }
-  {
-    KDOP_t x; // unit cube with (1,1,0)--(1,1,1) edge chopped away
-    // bottom face
-    x += Point(0, 0, 0);
-    x += Point(1, 0, 0);
-    x += Point(1, 0.75, 0);
-    x += Point(0.75, 1, 0);
-    x += Point(0, 1, 0);
-    // top
-    x += Point(0, 0, 1);
-    x += Point(1, 0, 1);
-    x += Point(1, 0.75, 1);
-    x += Point(0.75, 1, 1);
-    x += Point(0, 1, 1);
-    // test intersection with point on the missing edge
-    BOOST_TEST(intersects(Point{1, 1, 0.5}, x) ==
-               (std::is_same<KDOP_t, KDOP<6>>::value ||
-                std::is_same<KDOP_t, KDOP<14>>::value));
-    BOOST_TEST(intersects(Point{1, 1, 0.625}, x) ==
-               (std::is_same<KDOP_t, KDOP<6>>::value ||
-                std::is_same<KDOP_t, KDOP<14>>::value));
-    BOOST_TEST(intersects(Point{1, 1, 0.375}, x) ==
-               (std::is_same<KDOP_t, KDOP<6>>::value ||
-                std::is_same<KDOP_t, KDOP<14>>::value));
-    BOOST_TEST(intersects(Point{1, 1, 0.875}, x) ==
-               (std::is_same<KDOP_t, KDOP<6>>::value));
-    BOOST_TEST(intersects(Point{1, 1, 0.125}, x) ==
-               (std::is_same<KDOP_t, KDOP<6>>::value));
-    // with both ends of the edge
-    BOOST_TEST(intersects(Point{1, 1, 0}, x) ==
-               (std::is_same<KDOP_t, KDOP<6>>::value));
-    BOOST_TEST(intersects(Point{1, 1, 1}, x) ==
-               (std::is_same<KDOP_t, KDOP<6>>::value));
-    // with centroid of unit cube
-    BOOST_TEST(intersects(Point{0.5, 0.5, 0.5}, x));
-    // with some point outside the unit cube
-    BOOST_TEST(!intersects(Point{1, 2, 3}, x));
-  }
-  {
-    KDOP_t x; // unit cube with (1,1,1) corner cut off
-    // bottom face
-    x += Point(0, 0, 0);
-    x += Point(1, 0, 0);
-    x += Point(1, 1, 0);
-    x += Point(0, 1, 0);
-    // top
-    x += Point(0, 0, 1);
-    x += Point(1, 0, 1);
-    x += Point(1, 0.75, 1);
-    x += Point(0.75, 1, 1);
-    x += Point(0, 1, 1);
-    // test intersection with center of the missing corner
-    BOOST_TEST(intersects(Point{1, 1, 1}, x) ==
-               (std::is_same<KDOP_t, KDOP<6>>::value ||
-                std::is_same<KDOP_t, KDOP<18>>::value));
-    // test with points on the edges out of that corner
-    BOOST_TEST(intersects(Point{0.5, 1, 1}, x));
-    BOOST_TEST(intersects(Point{0.875, 1, 1}, x) ==
-               (std::is_same<KDOP_t, KDOP<6>>::value ||
-                std::is_same<KDOP_t, KDOP<18>>::value));
-    BOOST_TEST(intersects(Point{1, 0.5, 1}, x));
-    BOOST_TEST(intersects(Point{1, 0.875, 1}, x) ==
-               (std::is_same<KDOP_t, KDOP<6>>::value ||
-                std::is_same<KDOP_t, KDOP<18>>::value));
-    BOOST_TEST(intersects(Point{1, 1, 0.5}, x));
-    BOOST_TEST(intersects(Point{1, 1, 0.875}, x) ==
-               (std::is_same<KDOP_t, KDOP<6>>::value ||
-                std::is_same<KDOP_t, KDOP<18>>::value));
-    // with centroid of unit cube
-    BOOST_TEST(intersects(Point{0.5, 0.5, 0.5}, x));
-    // with some point outside the unit cube
-    BOOST_TEST(!intersects(Point{1, 2, 3}, x));
-  }
-}
-
-BOOST_AUTO_TEST_SUITE_END()
diff --git a/arborx/test/tstKokkosToolsAnnotations.cpp b/arborx/test/tstKokkosToolsAnnotations.cpp
deleted file mode 100644
index 04103620c..000000000
--- a/arborx/test/tstKokkosToolsAnnotations.cpp
+++ /dev/null
@@ -1,249 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2017-2021 by the ArborX authors                            *
- * All rights reserved.                                                     *
- *                                                                          *
- * This file is part of the ArborX library. ArborX is                       *
- * distributed under a BSD 3-clause license. For the licensing terms see    *
- * the LICENSE file in the top-level directory.                             *
- *                                                                          *
- * SPDX-License-Identifier: BSD-3-Clause                                    *
- ****************************************************************************/
-
-#include "ArborX_EnableDeviceTypes.hpp" // ARBORX_DEVICE_TYPES
-#include <ArborX_LinearBVH.hpp>
-
-#include <boost/test/unit_test.hpp>
-
-#include <string>
-
-#include "Search_UnitTestHelpers.hpp"
-
-#if (KOKKOS_VERSION >= 30200) // callback registriation from within the program
-                              // was added in Kokkkos v3.2
-
-BOOST_AUTO_TEST_SUITE(KokkosToolsAnnotations)
-
-namespace tt = boost::test_tools;
-
-bool isPrefixedWith(std::string const &s, std::string const &prefix)
-{
-  return s.find(prefix) == 0;
-}
-
-BOOST_AUTO_TEST_CASE(is_prefixed_with)
-{
-  BOOST_TEST(isPrefixedWith("ArborX::Whatever", "ArborX"));
-  BOOST_TEST(!isPrefixedWith("Nope", "ArborX"));
-  BOOST_TEST(!isPrefixedWith("Nope::ArborX", "ArborX"));
-}
-
-BOOST_AUTO_TEST_CASE_TEMPLATE(bvh_bvh_allocations_prefixed, DeviceType,
-                              ARBORX_DEVICE_TYPES)
-{
-  using Tree = ArborX::BVH<typename DeviceType::memory_space>;
-  using ExecutionSpace = typename DeviceType::execution_space;
-
-  Kokkos::Tools::Experimental::set_allocate_data_callback(
-      [](Kokkos::Profiling::SpaceHandle /*handle*/, const char *label,
-         void const * /*ptr*/, uint64_t /*size*/) {
-        BOOST_TEST_MESSAGE(label);
-        BOOST_TEST(
-            (isPrefixedWith(label, "ArborX::BVH::") || // data member
-             isPrefixedWith(label, "ArborX::BVH::BVH::") ||
-             isPrefixedWith(label, "ArborX::Sorting::") ||
-             isPrefixedWith(label, "Kokkos::SortImpl::BinSortFunctor::") ||
-             isPrefixedWith(label,
-                            "Kokkos::Serial::") || // unsure what's going on
-             isPrefixedWith(label, "Testing::")));
-      });
-
-  { // default constructed
-    Tree tree;
-  }
-
-  { // empty
-    auto tree = make<Tree>(ExecutionSpace{}, {});
-  }
-
-  { // one leaf
-    auto tree = make<Tree>(ExecutionSpace{}, {
-                                                 {{{0, 0, 0}}, {{1, 1, 1}}},
-                                             });
-  }
-
-  { // two leaves
-    auto tree = make<Tree>(ExecutionSpace{}, {
-                                                 {{{0, 0, 0}}, {{1, 1, 1}}},
-                                                 {{{0, 0, 0}}, {{1, 1, 1}}},
-                                             });
-  }
-
-  Kokkos::Tools::Experimental::set_allocate_data_callback(nullptr);
-}
-
-BOOST_AUTO_TEST_CASE_TEMPLATE(bvh_query_allocations_prefixed, DeviceType,
-                              ARBORX_DEVICE_TYPES)
-{
-  using ExecutionSpace = typename DeviceType::execution_space;
-
-  auto tree = make<ArborX::BVH<typename DeviceType::memory_space>>(
-      ExecutionSpace{}, {
-                            {{{0, 0, 0}}, {{1, 1, 1}}},
-                            {{{0, 0, 0}}, {{1, 1, 1}}},
-                        });
-
-  Kokkos::Tools::Experimental::set_allocate_data_callback(
-      [](Kokkos::Profiling::SpaceHandle /*handle*/, const char *label,
-         void const * /*ptr*/, uint64_t /*size*/) {
-        BOOST_TEST_MESSAGE(label);
-        BOOST_TEST(
-            (isPrefixedWith(label, "ArborX::BVH::query::") ||
-             isPrefixedWith(label, "ArborX::TreeTraversal::spatial::") ||
-             isPrefixedWith(label, "ArborX::TreeTraversal::nearest::") ||
-             isPrefixedWith(label, "ArborX::CrsGraphWrapper::") ||
-             isPrefixedWith(label, "ArborX::Sorting::") ||
-             isPrefixedWith(label, "Kokkos::SortImpl::BinSortFunctor::") ||
-             isPrefixedWith(label, "Testing::")));
-      });
-
-  // spatial predicates
-  query(ExecutionSpace{}, tree,
-        makeIntersectsBoxQueries<DeviceType>({
-            {{{0, 0, 0}}, {{1, 1, 1}}},
-            {{{0, 0, 0}}, {{1, 1, 1}}},
-        }));
-
-  // nearest predicates
-  query(ExecutionSpace{}, tree,
-        makeNearestQueries<DeviceType>({
-            {{{0, 0, 0}}, 1},
-            {{{0, 0, 0}}, 2},
-        }));
-
-  Kokkos::Tools::Experimental::set_allocate_data_callback(nullptr);
-}
-
-BOOST_AUTO_TEST_CASE_TEMPLATE(kernels_prefixed, DeviceType, ARBORX_DEVICE_TYPES)
-{
-  using Tree = ArborX::BVH<typename DeviceType::memory_space>;
-  using ExecutionSpace = typename DeviceType::execution_space;
-
-  auto const callback = [](char const *label, uint32_t, uint64_t *) {
-    BOOST_TEST_MESSAGE(label);
-    BOOST_TEST((isPrefixedWith(label, "ArborX::") ||
-                isPrefixedWith(label, "Kokkos::")));
-  };
-  Kokkos::Tools::Experimental::set_begin_parallel_for_callback(callback);
-  Kokkos::Tools::Experimental::set_begin_parallel_scan_callback(callback);
-  Kokkos::Tools::Experimental::set_begin_parallel_reduce_callback(callback);
-
-  // BVH::BVH
-
-  { // default constructed
-    Tree tree;
-  }
-
-  { // empty
-    auto tree = make<Tree>(ExecutionSpace{}, {});
-  }
-
-  { // one leaf
-    auto tree = make<Tree>(ExecutionSpace{}, {
-                                                 {{{0, 0, 0}}, {{1, 1, 1}}},
-                                             });
-  }
-
-  { // two leaves
-    auto tree = make<Tree>(ExecutionSpace{}, {
-                                                 {{{0, 0, 0}}, {{1, 1, 1}}},
-                                                 {{{0, 0, 0}}, {{1, 1, 1}}},
-                                             });
-  }
-
-  // BVH::query
-
-  auto tree = make<Tree>(ExecutionSpace{}, {
-                                               {{{0, 0, 0}}, {{1, 1, 1}}},
-                                               {{{0, 0, 0}}, {{1, 1, 1}}},
-                                           });
-
-  // spatial predicates
-  query(ExecutionSpace{}, tree,
-        makeIntersectsBoxQueries<DeviceType>({
-            {{{0, 0, 0}}, {{1, 1, 1}}},
-            {{{0, 0, 0}}, {{1, 1, 1}}},
-        }));
-
-  // nearest predicates
-  query(ExecutionSpace{}, tree,
-        makeNearestQueries<DeviceType>({
-            {{{0, 0, 0}}, 1},
-            {{{0, 0, 0}}, 2},
-        }));
-
-  Kokkos::Tools::Experimental::set_begin_parallel_for_callback(nullptr);
-  Kokkos::Tools::Experimental::set_begin_parallel_scan_callback(nullptr);
-  Kokkos::Tools::Experimental::set_begin_parallel_reduce_callback(nullptr);
-}
-
-BOOST_AUTO_TEST_CASE_TEMPLATE(regions_prefixed, DeviceType, ARBORX_DEVICE_TYPES)
-{
-  using Tree = ArborX::BVH<typename DeviceType::memory_space>;
-  using ExecutionSpace = typename DeviceType::execution_space;
-
-  Kokkos::Tools::Experimental::set_push_region_callback([](char const *label) {
-    BOOST_TEST_MESSAGE(label);
-    BOOST_TEST((isPrefixedWith(label, "ArborX::") ||
-                isPrefixedWith(label, "Kokkos::")));
-  });
-
-  // BVH::BVH
-
-  { // default constructed
-    Tree tree;
-  }
-
-  { // empty
-    auto tree = make<Tree>(ExecutionSpace{}, {});
-  }
-
-  { // one leaf
-    auto tree = make<Tree>(ExecutionSpace{}, {
-                                                 {{{0, 0, 0}}, {{1, 1, 1}}},
-                                             });
-  }
-
-  { // two leaves
-    auto tree = make<Tree>(ExecutionSpace{}, {
-                                                 {{{0, 0, 0}}, {{1, 1, 1}}},
-                                                 {{{0, 0, 0}}, {{1, 1, 1}}},
-                                             });
-  }
-
-  // BVH::query
-
-  auto tree = make<Tree>(ExecutionSpace{}, {
-                                               {{{0, 0, 0}}, {{1, 1, 1}}},
-                                               {{{0, 0, 0}}, {{1, 1, 1}}},
-                                           });
-
-  // spatial predicates
-  query(ExecutionSpace{}, tree,
-        makeIntersectsBoxQueries<DeviceType>({
-            {{{0, 0, 0}}, {{1, 1, 1}}},
-            {{{0, 0, 0}}, {{1, 1, 1}}},
-        }));
-
-  // nearest predicates
-  query(ExecutionSpace{}, tree,
-        makeNearestQueries<DeviceType>({
-            {{{0, 0, 0}}, 1},
-            {{{0, 0, 0}}, 2},
-        }));
-
-  Kokkos::Tools::Experimental::set_push_region_callback(nullptr);
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-
-#endif
diff --git a/arborx/test/tstKokkosToolsDistributedAnnotations.cpp b/arborx/test/tstKokkosToolsDistributedAnnotations.cpp
deleted file mode 100644
index c145c6516..000000000
--- a/arborx/test/tstKokkosToolsDistributedAnnotations.cpp
+++ /dev/null
@@ -1,197 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2017-2021 by the ArborX authors                            *
- * All rights reserved.                                                     *
- *                                                                          *
- * This file is part of the ArborX library. ArborX is                       *
- * distributed under a BSD 3-clause license. For the licensing terms see    *
- * the LICENSE file in the top-level directory.                             *
- *                                                                          *
- * SPDX-License-Identifier: BSD-3-Clause                                    *
- ****************************************************************************/
-
-#include "ArborX_EnableDeviceTypes.hpp" // ARBORX_DEVICE_TYPES
-#include <ArborX_DistributedTree.hpp>
-
-#include <boost/test/unit_test.hpp>
-
-#include <string>
-
-#include "Search_UnitTestHelpers.hpp"
-
-#if (KOKKOS_VERSION >= 30200) // callback registriation from within the program
-                              // was added in Kokkkos v3.2
-
-BOOST_AUTO_TEST_SUITE(KokkosToolsDistributedAnnotations)
-
-namespace tt = boost::test_tools;
-
-bool isPrefixedWith(std::string const &s, std::string const &prefix)
-{
-  return s.find(prefix) == 0;
-}
-
-BOOST_AUTO_TEST_CASE(is_prefixed_with)
-{
-  BOOST_TEST(isPrefixedWith("ArborX::Whatever", "ArborX"));
-  BOOST_TEST(!isPrefixedWith("Nope", "ArborX"));
-  BOOST_TEST(!isPrefixedWith("Nope::ArborX", "ArborX"));
-}
-
-BOOST_AUTO_TEST_CASE_TEMPLATE(
-    distributed_search_tree_distributed_search_tree_allocations_prefixed,
-    DeviceType, ARBORX_DEVICE_TYPES)
-{
-  auto tree = makeDistributedTree<DeviceType>(MPI_COMM_WORLD,
-                                              {
-                                                  {{{0, 0, 0}}, {{1, 1, 1}}},
-                                                  {{{0, 0, 0}}, {{1, 1, 1}}},
-                                              });
-
-  Kokkos::Tools::Experimental::set_allocate_data_callback(
-      [](Kokkos::Profiling::SpaceHandle /*handle*/, const char *label,
-         void const * /*ptr*/, uint64_t /*size*/) {
-        BOOST_TEST_MESSAGE(label);
-        BOOST_TEST((isPrefixedWith(label, "ArborX::DistributedTree::") ||
-                    isPrefixedWith(label, "ArborX::BVH::") ||
-                    isPrefixedWith(label, "ArborX::Sorting::") ||
-                    isPrefixedWith(label, "Testing::")));
-      });
-
-  { // one leaf per process
-    auto tree = makeDistributedTree<DeviceType>(MPI_COMM_WORLD,
-                                                {
-                                                    {{{0, 0, 0}}, {{1, 1, 1}}},
-                                                });
-  }
-
-  Kokkos::Tools::Experimental::set_allocate_data_callback(nullptr);
-}
-
-BOOST_AUTO_TEST_CASE_TEMPLATE(
-    distributed_search_tree_query_allocations_prefixed, DeviceType,
-    ARBORX_DEVICE_TYPES)
-{
-  using ExecutionSpace = typename DeviceType::execution_space;
-
-  auto tree = makeDistributedTree<DeviceType>(MPI_COMM_WORLD,
-                                              {
-                                                  {{{0, 0, 0}}, {{1, 1, 1}}},
-                                                  {{{0, 0, 0}}, {{1, 1, 1}}},
-                                              });
-
-  Kokkos::Tools::Experimental::set_allocate_data_callback(
-      [](Kokkos::Profiling::SpaceHandle /*handle*/, const char *label,
-         void const * /*ptr*/, uint64_t /*size*/) {
-        BOOST_TEST_MESSAGE(label);
-        BOOST_TEST((isPrefixedWith(label, "ArborX::DistributedTree::query::") ||
-                    isPrefixedWith(label, "ArborX::Distributor::") ||
-                    isPrefixedWith(label, "ArborX::BVH::query::") ||
-                    isPrefixedWith(label, "ArborX::TreeTraversal::spatial::") ||
-                    isPrefixedWith(label, "ArborX::TreeTraversal::nearest::") ||
-                    isPrefixedWith(label, "ArborX::CrsGraphWrapper::") ||
-                    isPrefixedWith(label, "ArborX::Sorting::") ||
-                    isPrefixedWith(label, "Kokkos::SortImpl::") ||
-                    isPrefixedWith(label, "Testing::")));
-      });
-
-  // spatial predicates
-  query(ExecutionSpace{}, tree,
-        makeIntersectsBoxQueries<DeviceType>({
-            {{{0, 0, 0}}, {{1, 1, 1}}},
-            {{{0, 0, 0}}, {{1, 1, 1}}},
-        }));
-
-  // nearest predicates
-  query(ExecutionSpace{}, tree,
-        makeNearestQueries<DeviceType>({
-            {{{0, 0, 0}}, 1},
-            {{{0, 0, 0}}, 2},
-        }));
-
-  Kokkos::Tools::Experimental::set_allocate_data_callback(nullptr);
-}
-
-BOOST_AUTO_TEST_CASE_TEMPLATE(kernels_prefixed, DeviceType, ARBORX_DEVICE_TYPES)
-{
-  using ExecutionSpace = typename DeviceType::execution_space;
-
-  auto const callback = [](char const *label, uint32_t, uint64_t *) {
-    BOOST_TEST_MESSAGE(label);
-    BOOST_TEST((isPrefixedWith(label, "ArborX::") ||
-                isPrefixedWith(label, "Kokkos::")));
-  };
-  Kokkos::Tools::Experimental::set_begin_parallel_for_callback(callback);
-  Kokkos::Tools::Experimental::set_begin_parallel_scan_callback(callback);
-  Kokkos::Tools::Experimental::set_begin_parallel_reduce_callback(callback);
-
-  // DistributedTree::query
-
-  auto tree = makeDistributedTree<DeviceType>(MPI_COMM_WORLD,
-                                              {
-                                                  {{{0, 0, 0}}, {{1, 1, 1}}},
-                                                  {{{0, 0, 0}}, {{1, 1, 1}}},
-                                              });
-
-  // spatial predicates
-  query(ExecutionSpace{}, tree,
-        makeIntersectsBoxQueries<DeviceType>({
-            {{{0, 0, 0}}, {{1, 1, 1}}},
-            {{{0, 0, 0}}, {{1, 1, 1}}},
-        }));
-
-  // nearest predicates
-  query(ExecutionSpace{}, tree,
-        makeNearestQueries<DeviceType>({
-            {{{0, 0, 0}}, 1},
-            {{{0, 0, 0}}, 2},
-        }));
-
-  Kokkos::Tools::Experimental::set_begin_parallel_for_callback(nullptr);
-  Kokkos::Tools::Experimental::set_begin_parallel_scan_callback(nullptr);
-  Kokkos::Tools::Experimental::set_begin_parallel_reduce_callback(nullptr);
-}
-
-BOOST_AUTO_TEST_CASE_TEMPLATE(regions_prefixed, DeviceType, ARBORX_DEVICE_TYPES)
-{
-  using ExecutionSpace = typename DeviceType::execution_space;
-
-  Kokkos::Tools::Experimental::set_push_region_callback([](char const *label) {
-    BOOST_TEST_MESSAGE(label);
-    BOOST_TEST((isPrefixedWith(label, "ArborX::") ||
-                isPrefixedWith(label, "Kokkos::")));
-  });
-
-  // DistributedTree::DistriibutedSearchTree
-
-  { // empty
-    auto tree = makeDistributedTree<DeviceType>(MPI_COMM_WORLD, {});
-  }
-
-  // DistributedTree::query
-
-  auto tree = makeDistributedTree<DeviceType>(MPI_COMM_WORLD,
-                                              {
-                                                  {{{0, 0, 0}}, {{1, 1, 1}}},
-                                                  {{{0, 0, 0}}, {{1, 1, 1}}},
-                                              });
-
-  // spatial predicates
-  query(ExecutionSpace{}, tree,
-        makeIntersectsBoxQueries<DeviceType>({
-            {{{0, 0, 0}}, {{1, 1, 1}}},
-            {{{0, 0, 0}}, {{1, 1, 1}}},
-        }));
-
-  // nearest predicates
-  query(ExecutionSpace{}, tree,
-        makeNearestQueries<DeviceType>({
-            {{{0, 0, 0}}, 1},
-            {{{0, 0, 0}}, 2},
-        }));
-
-  Kokkos::Tools::Experimental::set_push_region_callback(nullptr);
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-
-#endif
diff --git a/arborx/test/tstPriorityQueueMiscellaneous.cpp b/arborx/test/tstPriorityQueueMiscellaneous.cpp
deleted file mode 100644
index d5545d9a1..000000000
--- a/arborx/test/tstPriorityQueueMiscellaneous.cpp
+++ /dev/null
@@ -1,144 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2017-2021 by the ArborX authors                            *
- * All rights reserved.                                                     *
- *                                                                          *
- * This file is part of the ArborX library. ArborX is                       *
- * distributed under a BSD 3-clause license. For the licensing terms see    *
- * the LICENSE file in the top-level directory.                             *
- *                                                                          *
- * SPDX-License-Identifier: BSD-3-Clause                                    *
- ****************************************************************************/
-
-#include <ArborX_DetailsPriorityQueue.hpp>
-
-#include <boost/test/unit_test.hpp>
-
-#include <random>
-
-using ArborX::Details::PriorityQueue;
-
-namespace tt = boost::test_tools;
-
-// NOTE The tests below check that the priority queue invariant is maintained
-// while inserting and removing elements into the queue.  They rely on a hack
-// (reinterpret_cast) to access the underlying container.
-BOOST_AUTO_TEST_SUITE(PriorityQueueMiscellaneous)
-
-template <typename PriorityQueue>
-void check_heap(PriorityQueue const &queue,
-                std::vector<typename PriorityQueue::value_type> const &heap_ref)
-{
-  auto const size = queue.size();
-  BOOST_TEST(size == static_cast<decltype(size)>(heap_ref.size()));
-
-  // NOTE Shameless hack to inspect the private data of the priority queue.
-  // Will break if data is reordered in the PriorityQueue class declaration.
-  auto heap =
-      reinterpret_cast<typename PriorityQueue::value_type const *>(&queue);
-  for (typename PriorityQueue::size_type i = 0; i < size; ++i)
-    BOOST_TEST(heap[i] == heap_ref[i]);
-}
-
-BOOST_AUTO_TEST_CASE(pop_push)
-{
-  // note that calling pop_push(x) does not necessarily yield the same heap
-  // than calling consecutively pop() and push(x)
-  // below is a max heap example to illustrate this interesting property
-  PriorityQueue<int> queue;
-
-  std::vector<int> ref = {100, 19, 36, 17, 3, 25, 1, 2, 7};
-  for (auto x : ref)
-    queue.push(x);
-  check_heap(queue, ref);
-
-  queue.pop();
-  check_heap(queue, {36, 19, 25, 17, 3, 7, 1, 2});
-
-  queue.push(9);
-  check_heap(queue, {36, 19, 25, 17, 3, 7, 1, 2, 9});
-  //                                    ^^       ^^
-
-  // Clear the content of the queue
-  queue = PriorityQueue<int>();
-  for (auto x : ref)
-    queue.push(x);
-  check_heap(queue, ref);
-
-  queue.popPush(9);
-  check_heap(queue, {36, 19, 25, 17, 3, 9, 1, 2, 7});
-  //                                    ^^       ^^
-}
-
-template <typename PriorityQueue>
-void check_heap(PriorityQueue const &queue)
-{
-  using ValueType = typename PriorityQueue::value_type;
-  int const size = queue.size();
-  auto const compare = queue.valueComp();
-  auto heap = reinterpret_cast<ValueType const *>(&queue);
-  for (int i = 0; i < size; ++i)
-  {
-    int parent = (i - 1) / 2;
-    if (i > 0)
-      BOOST_TEST(!compare(heap[parent], heap[i]));
-    for (int child : {2 * i + 1, 2 * i + 2})
-      if (child < size)
-        BOOST_TEST(!compare(heap[i], heap[child]));
-  }
-}
-
-BOOST_AUTO_TEST_CASE(maintain_heap_properties)
-{
-  PriorityQueue<int> queue;
-
-  std::default_random_engine generator;
-  std::uniform_int_distribution<int> uniform_distribution(0, 100);
-
-  enum OperationType : int
-  {
-    POP,
-    PUSH,
-    POP_PUSH
-  };
-  std::discrete_distribution<int> discrete_distribution({POP, PUSH, POP_PUSH});
-
-  // initially insert a number of elements in the queue so that it is
-  // unlikely that an error will be raised (this would happen if pop() is
-  // called on an empty queue or push(x) on a queue that is already at maximum
-  // capacity)
-  for (int i = 0; i < 64; ++i)
-  {
-    queue.push(uniform_distribution(generator));
-    check_heap(queue);
-  }
-
-  // choose randomly whether to call pop(), push(x), or pop_push(x) and check
-  // that the heap properties are maintained
-  for (int i = 0; i < 512; ++i)
-  {
-    switch (discrete_distribution(generator))
-    {
-    case POP:
-      queue.pop();
-      break;
-    case PUSH:
-      queue.push(uniform_distribution(generator));
-      break;
-    case POP_PUSH:
-      queue.popPush(uniform_distribution(generator));
-      break;
-    default:
-      throw std::runtime_error("something went wrong");
-    }
-    check_heap(queue);
-  }
-
-  // remove all elements from the queue one by one
-  while (!queue.empty())
-  {
-    queue.pop();
-    check_heap(queue);
-  }
-}
-
-BOOST_AUTO_TEST_SUITE_END()
diff --git a/arborx/test/tstQueryTreeCallbacks.cpp b/arborx/test/tstQueryTreeCallbacks.cpp
deleted file mode 100644
index 919d8117f..000000000
--- a/arborx/test/tstQueryTreeCallbacks.cpp
+++ /dev/null
@@ -1,343 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2017-2021 by the ArborX authors                            *
- * All rights reserved.                                                     *
- *                                                                          *
- * This file is part of the ArborX library. ArborX is                       *
- * distributed under a BSD 3-clause license. For the licensing terms see    *
- * the LICENSE file in the top-level directory.                             *
- *                                                                          *
- * SPDX-License-Identifier: BSD-3-Clause                                    *
- ****************************************************************************/
-
-#include <boost/test/unit_test.hpp>
-
-#include <numeric>
-#include <vector>
-
-#include "Search_UnitTestHelpers.hpp"
-// clang-format off
-#include "ArborXTest_TreeTypeTraits.hpp"
-// clang-format on
-
-BOOST_AUTO_TEST_SUITE(Callbacks)
-
-namespace tt = boost::test_tools;
-
-template <typename DeviceType>
-struct CustomInlineCallback
-{
-  using tag = ArborX::Details::InlineCallbackTag;
-  Kokkos::View<ArborX::Point *, DeviceType> points;
-  ArborX::Point const origin = {{0., 0., 0.}};
-  template <typename Query, typename Insert>
-  KOKKOS_FUNCTION void operator()(Query const &, int index,
-                                  Insert const &insert) const
-  {
-    float const distance_to_origin =
-        ArborX::Details::distance(points(index), origin);
-    insert({index, distance_to_origin});
-  }
-};
-
-template <typename DeviceType>
-struct CustomPostCallback
-{
-  using tag = ArborX::Details::PostCallbackTag;
-  Kokkos::View<ArborX::Point *, DeviceType> points;
-  ArborX::Point const origin = {{0., 0., 0.}};
-  template <typename Predicates, typename InOutView, typename InView,
-            typename OutView>
-  void operator()(Predicates const &, InOutView &offset, InView in,
-                  OutView &out) const
-  {
-    using ExecutionSpace = typename DeviceType::execution_space;
-    using ArborX::Details::distance;
-    auto const n = offset.extent(0) - 1;
-    ArborX::reallocWithoutInitializing(out, in.extent(0));
-    // NOTE woraround to avoid implicit capture of *this
-    auto const &points_ = points;
-    auto const &origin_ = origin;
-    Kokkos::parallel_for(
-        Kokkos::RangePolicy<ExecutionSpace>(0, n), KOKKOS_LAMBDA(int i) {
-          for (int j = offset(i); j < offset(i + 1); ++j)
-          {
-            out(j) = {in(j), (float)distance(points_(in(j)), origin_)};
-          }
-        });
-  }
-};
-
-BOOST_AUTO_TEST_CASE_TEMPLATE(callback_spatial_predicate, TreeTypeTraits,
-                              TreeTypeTraitsList)
-{
-  using Tree = typename TreeTypeTraits::type;
-  using ExecutionSpace = typename TreeTypeTraits::execution_space;
-  using DeviceType = typename TreeTypeTraits::device_type;
-
-  int const n = 10;
-  Kokkos::View<ArborX::Point *, DeviceType> points(
-      Kokkos::view_alloc(Kokkos::WithoutInitializing, "points"), n);
-  ArborX::Point const origin = {{0., 0., 0.}};
-  Kokkos::parallel_for(Kokkos::RangePolicy<ExecutionSpace>(0, n),
-                       KOKKOS_LAMBDA(int i) {
-                         points(i) = {{(double)i, (double)i, (double)i}};
-                       });
-  auto points_host =
-      Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace{}, points);
-
-  std::vector<Kokkos::pair<int, float>> values;
-  values.reserve(n);
-  for (int i = 0; i < n; ++i)
-    values.emplace_back(i, ArborX::Details::distance(points_host(i), origin));
-  std::vector<int> offsets = {0, n};
-
-  Tree const tree(ExecutionSpace{}, points);
-
-  ARBORX_TEST_QUERY_TREE_CALLBACK(ExecutionSpace{}, tree,
-                                  makeIntersectsBoxQueries<DeviceType>({
-                                      static_cast<ArborX::Box>(tree.bounds()),
-                                  }),
-                                  CustomInlineCallback<DeviceType>{points},
-                                  make_compressed_storage(offsets, values));
-
-  ARBORX_TEST_QUERY_TREE_CALLBACK(ExecutionSpace{}, tree,
-                                  makeIntersectsBoxQueries<DeviceType>({
-                                      static_cast<ArborX::Box>(tree.bounds()),
-                                  }),
-                                  CustomPostCallback<DeviceType>{points},
-                                  make_compressed_storage(offsets, values));
-}
-
-#ifndef ARBORX_TEST_DISABLE_NEAREST_QUERY
-BOOST_AUTO_TEST_CASE_TEMPLATE(callback_nearest_predicate, TreeTypeTraits,
-                              TreeTypeTraitsList)
-{
-  using Tree = typename TreeTypeTraits::type;
-  using ExecutionSpace = typename TreeTypeTraits::execution_space;
-  using DeviceType = typename TreeTypeTraits::device_type;
-
-  int const n = 10;
-  Kokkos::View<ArborX::Point *, DeviceType> points(
-      Kokkos::view_alloc(Kokkos::WithoutInitializing, "points"), n);
-  ArborX::Point const origin = {{0., 0., 0.}};
-  Kokkos::parallel_for(Kokkos::RangePolicy<ExecutionSpace>(0, n),
-                       KOKKOS_LAMBDA(int i) {
-                         points(i) = {{(double)i, (double)i, (double)i}};
-                       });
-  auto points_host =
-      Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace{}, points);
-
-  std::vector<Kokkos::pair<int, float>> values;
-  values.reserve(n);
-  for (int i = 0; i < n; ++i)
-    values.emplace_back(i, ArborX::Details::distance(points_host(i), origin));
-  std::vector<int> offsets = {0, n};
-
-  Tree const tree(ExecutionSpace{}, points);
-
-  ARBORX_TEST_QUERY_TREE_CALLBACK(ExecutionSpace{}, tree,
-                                  makeNearestQueries<DeviceType>({
-                                      {origin, n},
-                                  }),
-                                  CustomInlineCallback<DeviceType>{points},
-                                  make_compressed_storage(offsets, values));
-
-  ARBORX_TEST_QUERY_TREE_CALLBACK(ExecutionSpace{}, tree,
-                                  makeNearestQueries<DeviceType>({
-                                      {origin, n},
-                                  }),
-                                  CustomPostCallback<DeviceType>{points},
-                                  make_compressed_storage(offsets, values));
-}
-#endif
-
-#ifndef ARBORX_TEST_DISABLE_CALLBACK_EARLY_EXIT
-template <class DeviceType>
-struct Experimental_CustomCallbackEarlyExit
-{
-  Kokkos::View<int *, DeviceType, Kokkos::MemoryTraits<Kokkos::Atomic>> counts;
-  template <class Predicate>
-  KOKKOS_FUNCTION auto operator()(Predicate const &predicate, int) const
-  {
-    int i = getData(predicate);
-
-    if (counts(i)++ < i)
-    {
-      return ArborX::CallbackTreeTraversalControl::normal_continuation;
-    }
-
-    return ArborX::CallbackTreeTraversalControl::early_exit;
-  }
-};
-
-BOOST_AUTO_TEST_CASE_TEMPLATE(callback_early_exit, TreeTypeTraits,
-                              TreeTypeTraitsList)
-{
-  using Tree = typename TreeTypeTraits::type;
-  using ExecutionSpace = typename TreeTypeTraits::execution_space;
-  using DeviceType = typename TreeTypeTraits::device_type;
-
-  auto const tree =
-      make<Tree>(ExecutionSpace{}, {
-                                       {{{0., 0., 0.}}, {{0., 0., 0.}}},
-                                       {{{1., 1., 1.}}, {{1., 1., 1.}}},
-                                       {{{2., 2., 2.}}, {{2., 2., 2.}}},
-                                       {{{3., 3., 3.}}, {{3., 3., 3.}}},
-                                   });
-
-  Kokkos::View<int *, DeviceType> counts("counts", 4);
-
-  std::vector<int> counts_ref(4);
-  std::iota(counts_ref.begin(), counts_ref.end(), 1);
-
-  auto b = static_cast<ArborX::Box>(tree.bounds());
-  auto predicates = makeIntersectsBoxWithAttachmentQueries<DeviceType, int>(
-      {b, b, b, b}, {0, 1, 2, 3});
-
-  tree.query(ExecutionSpace{}, predicates,
-             Experimental_CustomCallbackEarlyExit<DeviceType>{counts});
-
-  auto counts_host =
-      Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace{}, counts);
-
-  BOOST_TEST(counts_host == counts_ref, tt::per_element());
-}
-#endif
-
-template <typename DeviceType>
-struct CustomInlineCallbackWithAttachment
-{
-  using tag = ArborX::Details::InlineCallbackTag;
-  Kokkos::View<ArborX::Point *, DeviceType> points;
-  ArborX::Point const origin = {{0., 0., 0.}};
-  template <typename Query, typename Insert>
-  KOKKOS_FUNCTION void operator()(Query const &query, int index,
-                                  Insert const &insert) const
-  {
-    float const distance_to_origin =
-        ArborX::Details::distance(points(index), origin);
-
-    auto data = ArborX::getData(query);
-    insert({index, data + distance_to_origin});
-  }
-};
-template <typename DeviceType>
-struct CustomPostCallbackWithAttachment
-{
-  using tag = ArborX::Details::PostCallbackTag;
-  Kokkos::View<ArborX::Point *, DeviceType> points;
-  ArborX::Point const origin = {{0., 0., 0.}};
-  template <typename Predicates, typename InOutView, typename InView,
-            typename OutView>
-  void operator()(Predicates const &queries, InOutView &offset, InView in,
-                  OutView &out) const
-  {
-    using ExecutionSpace = typename DeviceType::execution_space;
-    using ArborX::Details::distance;
-    auto const n = offset.extent(0) - 1;
-    ArborX::reallocWithoutInitializing(out, in.extent(0));
-    // NOTE workaround to avoid implicit capture of *this
-    auto const &points_ = points;
-    auto const &origin_ = origin;
-    Kokkos::parallel_for(
-        Kokkos::RangePolicy<ExecutionSpace>(0, n), KOKKOS_LAMBDA(int i) {
-          auto data_2 = ArborX::getData(queries(i));
-          auto data = data_2[1];
-          for (int j = offset(i); j < offset(i + 1); ++j)
-          {
-            out(j) = {in(j), data + (float)distance(points_(in(j)), origin_)};
-          }
-        });
-  }
-};
-
-BOOST_AUTO_TEST_CASE_TEMPLATE(callback_with_attachment_spatial_predicate,
-                              TreeTypeTraits, TreeTypeTraitsList)
-{
-  using Tree = typename TreeTypeTraits::type;
-  using ExecutionSpace = typename TreeTypeTraits::execution_space;
-  using DeviceType = typename TreeTypeTraits::device_type;
-
-  int const n = 10;
-  Kokkos::View<ArborX::Point *, DeviceType> points(
-      Kokkos::view_alloc(Kokkos::WithoutInitializing, "points"), n);
-  ArborX::Point const origin = {{0., 0., 0.}};
-  Kokkos::parallel_for(Kokkos::RangePolicy<ExecutionSpace>(0, n),
-                       KOKKOS_LAMBDA(int i) {
-                         points(i) = {{(double)i, (double)i, (double)i}};
-                       });
-  auto points_host =
-      Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace{}, points);
-
-  std::vector<Kokkos::pair<int, float>> values;
-  values.reserve(n);
-  float const delta = 5.f;
-  for (int i = 0; i < n; ++i)
-    values.emplace_back(
-        i, delta + ArborX::Details::distance(points_host(i), origin));
-  std::vector<int> offsets = {0, n};
-
-  Tree const tree(ExecutionSpace{}, points);
-
-  ARBORX_TEST_QUERY_TREE_CALLBACK(
-      ExecutionSpace{}, tree,
-      (makeIntersectsBoxWithAttachmentQueries<DeviceType, float>(
-          {static_cast<ArborX::Box>(tree.bounds())}, {delta})),
-      CustomInlineCallbackWithAttachment<DeviceType>{points},
-      make_compressed_storage(offsets, values));
-
-  ARBORX_TEST_QUERY_TREE_CALLBACK(
-      ExecutionSpace{}, tree,
-      (makeIntersectsBoxWithAttachmentQueries<DeviceType,
-                                              Kokkos::Array<float, 2>>(
-          {static_cast<ArborX::Box>(tree.bounds())}, {{0., delta}})),
-      CustomPostCallbackWithAttachment<DeviceType>{points},
-      make_compressed_storage(offsets, values));
-}
-
-#ifndef ARBORX_TEST_DISABLE_NEAREST_QUERY
-BOOST_AUTO_TEST_CASE_TEMPLATE(callback_with_attachment_nearest_predicate,
-                              TreeTypeTraits, TreeTypeTraitsList)
-{
-  using Tree = typename TreeTypeTraits::type;
-  using ExecutionSpace = typename TreeTypeTraits::execution_space;
-  using DeviceType = typename TreeTypeTraits::device_type;
-
-  int const n = 10;
-  Kokkos::View<ArborX::Point *, DeviceType> points(
-      Kokkos::view_alloc(Kokkos::WithoutInitializing, "points"), n);
-  ArborX::Point const origin = {{0., 0., 0.}};
-  Kokkos::parallel_for(Kokkos::RangePolicy<ExecutionSpace>(0, n),
-                       KOKKOS_LAMBDA(int i) {
-                         points(i) = {{(double)i, (double)i, (double)i}};
-                       });
-  auto points_host =
-      Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace{}, points);
-
-  std::vector<Kokkos::pair<int, float>> values;
-  values.reserve(n);
-  float const delta = 5.f;
-  for (int i = 0; i < n; ++i)
-    values.emplace_back(
-        i, delta + ArborX::Details::distance(points_host(i), origin));
-  std::vector<int> offsets = {0, n};
-
-  Tree const tree(ExecutionSpace{}, points);
-
-  ARBORX_TEST_QUERY_TREE_CALLBACK(
-      ExecutionSpace{}, tree,
-      (makeNearestWithAttachmentQueries<DeviceType, float>({{origin, n}},
-                                                           {delta})),
-      CustomInlineCallbackWithAttachment<DeviceType>{points},
-      make_compressed_storage(offsets, values));
-
-  ARBORX_TEST_QUERY_TREE_CALLBACK(
-      ExecutionSpace{}, tree,
-      (makeNearestWithAttachmentQueries<DeviceType, Kokkos::Array<float, 2>>(
-          {{origin, n}}, {{0, delta}})),
-      CustomPostCallbackWithAttachment<DeviceType>{points},
-      make_compressed_storage(offsets, values));
-}
-#endif
-
-BOOST_AUTO_TEST_SUITE_END()
diff --git a/arborx/test/tstQueryTreeComparisonWithBoost.cpp b/arborx/test/tstQueryTreeComparisonWithBoost.cpp
deleted file mode 100644
index b2023a440..000000000
--- a/arborx/test/tstQueryTreeComparisonWithBoost.cpp
+++ /dev/null
@@ -1,269 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2017-2021 by the ArborX authors                            *
- * All rights reserved.                                                     *
- *                                                                          *
- * This file is part of the ArborX library. ArborX is                       *
- * distributed under a BSD 3-clause license. For the licensing terms see    *
- * the LICENSE file in the top-level directory.                             *
- *                                                                          *
- * SPDX-License-Identifier: BSD-3-Clause                                    *
- ****************************************************************************/
-
-#include "ArborX_BoostRTreeHelpers.hpp"
-
-#include <boost/test/unit_test.hpp>
-
-#include <functional>
-#include <random>
-
-#include "Search_UnitTestHelpers.hpp"
-// clang-format off
-#include "ArborXTest_TreeTypeTraits.hpp"
-// clang-format on
-#include <Kokkos_Core.hpp>
-
-// We need a forward-declaration for NVCC, see below.
-namespace ArborX
-{
-namespace Experimental
-{
-template <int k>
-struct KDOP;
-}
-} // namespace ArborX
-
-BOOST_AUTO_TEST_SUITE(ComparisonWithBoost)
-
-namespace tt = boost::test_tools;
-
-inline Kokkos::View<ArborX::Point *, Kokkos::HostSpace>
-make_stuctured_cloud(double Lx, double Ly, double Lz, int nx, int ny, int nz)
-{
-  std::function<int(int, int, int)> ind = [nx, ny](int i, int j, int k) {
-    return i + j * nx + k * (nx * ny);
-  };
-  Kokkos::View<ArborX::Point *, Kokkos::HostSpace> cloud(
-      Kokkos::view_alloc(Kokkos::WithoutInitializing, "structured_cloud"),
-      nx * ny * nz);
-  for (int i = 0; i < nx; ++i)
-    for (int j = 0; j < ny; ++j)
-      for (int k = 0; k < nz; ++k)
-      {
-        cloud[ind(i, j, k)] = {
-            {i * Lx / (nx - 1), j * Ly / (ny - 1), k * Lz / (nz - 1)}};
-      }
-  return cloud;
-}
-
-template <typename Geometry>
-Kokkos::View<Geometry *, Kokkos::HostSpace>
-make_random_cloud(double Lx, double Ly, double Lz, int n);
-
-template <>
-inline Kokkos::View<ArborX::Point *, Kokkos::HostSpace>
-make_random_cloud(double Lx, double Ly, double Lz, int n)
-{
-  Kokkos::View<ArborX::Point *, Kokkos::HostSpace> cloud(
-      Kokkos::view_alloc(Kokkos::WithoutInitializing, "random_cloud"), n);
-  std::default_random_engine generator;
-  std::uniform_real_distribution<double> distribution_x(0.0, Lx);
-  std::uniform_real_distribution<double> distribution_y(0.0, Ly);
-  std::uniform_real_distribution<double> distribution_z(0.0, Lz);
-  for (int i = 0; i < n; ++i)
-  {
-    double x = distribution_x(generator);
-    double y = distribution_y(generator);
-    double z = distribution_z(generator);
-    cloud[i] = {{x, y, z}};
-  }
-  return cloud;
-}
-
-template <>
-inline Kokkos::View<ArborX::Box *, Kokkos::HostSpace>
-make_random_cloud(double Lx, double Ly, double Lz, int n)
-{
-  Kokkos::View<ArborX::Box *, Kokkos::HostSpace> cloud(
-      Kokkos::view_alloc(Kokkos::WithoutInitializing, "random_cloud"), n);
-  std::default_random_engine generator;
-  std::uniform_real_distribution<double> distribution_x(0.0, Lx);
-  std::uniform_real_distribution<double> distribution_y(0.0, Ly);
-  std::uniform_real_distribution<double> distribution_z(0.0, Lz);
-  double const min_xyz = std::min(std::min(Lx, Ly), Lz);
-  // We divide min_xyz by n in order to avoid a large number of overlapping
-  // boxes
-  std::uniform_real_distribution<double> distribution_l(
-      0.0, min_xyz / static_cast<double>(n));
-  for (int i = 0; i < n; ++i)
-  {
-    float x = distribution_x(generator);
-    float y = distribution_y(generator);
-    float z = distribution_z(generator);
-    float length = distribution_l(generator);
-    cloud[i] = {{x, y, z}, {x + length, y + length, z + length}};
-  }
-  return cloud;
-}
-
-template <typename Tree, typename ExecutionSpace, typename DeviceType,
-          typename PrimitiveGeometry>
-void boost_rtree_nearest_predicate()
-{
-  // construct a cloud of points (nodes of a structured grid)
-  double Lx = 10.0;
-  double Ly = 10.0;
-  double Lz = 10.0;
-  int nx = 11;
-  int ny = 11;
-  int nz = 11;
-  auto cloud = make_stuctured_cloud(Lx, Ly, Lz, nx, ny, nz);
-
-  // random objects for kNN queries
-  // compare our solution against Boost R-tree
-  int const n_queries = 100;
-  using MemorySpace = typename Tree::memory_space;
-  auto geometry_objects = Kokkos::create_mirror_view_and_copy(
-      MemorySpace{},
-      make_random_cloud<PrimitiveGeometry>(Lx, Ly, Lz, n_queries));
-
-  Kokkos::View<int *, ExecutionSpace> k("k", n_queries);
-  auto k_host = Kokkos::create_mirror_view(k);
-  // use random number k of for the kNN search
-  std::default_random_engine generator;
-  std::uniform_int_distribution<int> distribution_k(
-      1, std::floor(sqrt(nx * nx + ny * ny + nz * nz)));
-  for (unsigned int i = 0; i < n_queries; ++i)
-  {
-    k_host[i] = distribution_k(generator);
-  }
-
-  Kokkos::deep_copy(k, k_host);
-
-  Kokkos::View<ArborX::Nearest<PrimitiveGeometry> *, DeviceType>
-      nearest_queries("nearest_queries", n_queries);
-  Kokkos::parallel_for(
-      Kokkos::RangePolicy<ExecutionSpace>(0, n_queries), KOKKOS_LAMBDA(int i) {
-        nearest_queries(i) = ArborX::nearest(geometry_objects(i), k(i));
-      });
-  auto nearest_queries_host = Kokkos::create_mirror_view(nearest_queries);
-  Kokkos::deep_copy(nearest_queries_host, nearest_queries);
-
-  Tree tree(ExecutionSpace{},
-            Kokkos::create_mirror_view_and_copy(MemorySpace{}, cloud));
-
-  BoostExt::RTree<decltype(cloud)::value_type> rtree(ExecutionSpace{}, cloud);
-
-  ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree, nearest_queries,
-                         query(ExecutionSpace{}, rtree, nearest_queries_host));
-}
-
-BOOST_AUTO_TEST_CASE_TEMPLATE(boost_rtree_spatial_predicate, TreeTypeTraits,
-                              TreeTypeTraitsList)
-{
-  using Tree = typename TreeTypeTraits::type;
-  using ExecutionSpace = typename TreeTypeTraits::execution_space;
-  using DeviceType = typename TreeTypeTraits::device_type;
-
-  // FIXME_NVCC we see inexplainable test failures with NVCC and KDOP<18> and
-  // KDOP<26> here.
-#ifdef __NVCC__
-  if (std::is_same<typename Tree::bounding_volume_type,
-                   ArborX::Experimental::KDOP<18>>::value ||
-      std::is_same<typename Tree::bounding_volume_type,
-                   ArborX::Experimental::KDOP<26>>::value)
-    return;
-#endif
-
-  // construct a cloud of points (nodes of a structured grid)
-  double Lx = 10.0;
-  double Ly = 10.0;
-  double Lz = 10.0;
-  int nx = 11;
-  int ny = 11;
-  int nz = 11;
-  auto cloud = make_stuctured_cloud(Lx, Ly, Lz, nx, ny, nz);
-
-  // random points for radius search
-  // compare our solution against Boost R-tree
-  int const n_points = 100;
-  using MemorySpace = typename Tree::memory_space;
-  auto points = Kokkos::create_mirror_view_and_copy(
-      MemorySpace{}, make_random_cloud<ArborX::Point>(Lx, Ly, Lz, n_points));
-
-  Kokkos::View<double *, ExecutionSpace> radii("radii", n_points);
-  auto radii_host = Kokkos::create_mirror_view(radii);
-  // use random radius for the search
-  std::default_random_engine generator;
-  std::uniform_real_distribution<double> distribution_radius(
-      0.0, std::sqrt(Lx * Lx + Ly * Ly + Lz * Lz));
-  for (unsigned int i = 0; i < n_points; ++i)
-  {
-    radii_host[i] = distribution_radius(generator);
-  }
-
-  Kokkos::deep_copy(radii, radii_host);
-
-  Kokkos::View<decltype(ArborX::intersects(ArborX::Sphere{})) *, DeviceType>
-      within_queries("within_queries", n_points);
-  Kokkos::parallel_for(
-      Kokkos::RangePolicy<ExecutionSpace>(0, n_points), KOKKOS_LAMBDA(int i) {
-        within_queries(i) =
-            ArborX::intersects(ArborX::Sphere{points(i), radii(i)});
-      });
-  auto within_queries_host = Kokkos::create_mirror_view(within_queries);
-  Kokkos::deep_copy(within_queries_host, within_queries);
-
-  Kokkos::View<decltype(ArborX::intersects(ArborX::Box{})) *, DeviceType>
-      intersects_queries("intersects_queries", n_points);
-  Kokkos::parallel_for(
-      Kokkos::RangePolicy<ExecutionSpace>(0, n_points), KOKKOS_LAMBDA(int i) {
-        ArborX::Box box{{static_cast<float>(points(i)[0] - radii(i)),
-                         static_cast<float>(points(i)[1] - radii(i)),
-                         static_cast<float>(points(i)[2] - radii(i))},
-                        {static_cast<float>(points(i)[0] + radii(i)),
-                         static_cast<float>(points(i)[1] + radii(i)),
-                         static_cast<float>(points(i)[2] + radii(i))}};
-        intersects_queries(i) = ArborX::intersects(box);
-      });
-  auto intersects_queries_host = Kokkos::create_mirror_view(intersects_queries);
-  Kokkos::deep_copy(intersects_queries_host, intersects_queries);
-
-  Tree tree(ExecutionSpace{},
-            Kokkos::create_mirror_view_and_copy(MemorySpace{}, cloud));
-
-  BoostExt::RTree<decltype(cloud)::value_type> rtree(ExecutionSpace{}, cloud);
-
-  ARBORX_TEST_QUERY_TREE(
-      ExecutionSpace{}, tree, intersects_queries,
-      query(ExecutionSpace{}, rtree, intersects_queries_host));
-#ifndef ARBORX_TEST_DISABLE_SPATIAL_QUERY_INTERSECTS_SPHERE
-  ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree, within_queries,
-                         query(ExecutionSpace{}, rtree, within_queries_host));
-#endif
-}
-
-#ifndef ARBORX_TEST_DISABLE_NEAREST_QUERY
-BOOST_AUTO_TEST_CASE_TEMPLATE(boost_rtree_nearest_predicate_point,
-                              TreeTypeTraits, TreeTypeTraitsList)
-{
-  using Tree = typename TreeTypeTraits::type;
-  using ExecutionSpace = typename TreeTypeTraits::execution_space;
-  using DeviceType = typename TreeTypeTraits::device_type;
-
-  boost_rtree_nearest_predicate<Tree, ExecutionSpace, DeviceType,
-                                ArborX::Point>();
-}
-
-BOOST_AUTO_TEST_CASE_TEMPLATE(boost_rtree_nearest_predicate_box, TreeTypeTraits,
-                              TreeTypeTraitsList)
-{
-  using Tree = typename TreeTypeTraits::type;
-  using ExecutionSpace = typename TreeTypeTraits::execution_space;
-  using DeviceType = typename TreeTypeTraits::device_type;
-
-  boost_rtree_nearest_predicate<Tree, ExecutionSpace, DeviceType,
-                                ArborX::Box>();
-}
-#endif
-
-BOOST_AUTO_TEST_SUITE_END()
diff --git a/arborx/test/tstQueryTreeDegenerate.cpp b/arborx/test/tstQueryTreeDegenerate.cpp
deleted file mode 100644
index 7f974f1a2..000000000
--- a/arborx/test/tstQueryTreeDegenerate.cpp
+++ /dev/null
@@ -1,403 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2017-2021 by the ArborX authors                            *
- * All rights reserved.                                                     *
- *                                                                          *
- * This file is part of the ArborX library. ArborX is                       *
- * distributed under a BSD 3-clause license. For the licensing terms see    *
- * the LICENSE file in the top-level directory.                             *
- *                                                                          *
- * SPDX-License-Identifier: BSD-3-Clause                                    *
- ****************************************************************************/
-
-#include <boost/test/unit_test.hpp>
-
-#include <vector>
-
-#include "Search_UnitTestHelpers.hpp"
-// clang-format off
-#include "ArborXTest_TreeTypeTraits.hpp"
-// clang-format on
-
-BOOST_AUTO_TEST_SUITE(Degenerate)
-
-namespace tt = boost::test_tools;
-
-BOOST_AUTO_TEST_CASE_TEMPLATE(empty_tree_spatial_predicate, TreeTypeTraits,
-                              TreeTypeTraitsList)
-{
-  using Tree = typename TreeTypeTraits::type;
-  using ExecutionSpace = typename TreeTypeTraits::execution_space;
-  using DeviceType = typename TreeTypeTraits::device_type;
-
-  // tree is empty, it has no leaves.
-  for (auto const &tree : {
-           Tree{}, // default constructed
-           make<Tree>(ExecutionSpace{},
-                      {}), // constructed with empty view of boxes
-       })
-  {
-    BOOST_TEST(tree.empty());
-    BOOST_TEST(tree.size() == 0);
-    // Tree::bounds() returns an invalid box when the tree is empty.
-    using ArborX::Details::equals;
-    BOOST_TEST(equals(static_cast<ArborX::Box>(tree.bounds()), {}));
-
-    // Passing a view with no query does seem a bit silly but we still need
-    // to support it. And since the tag dispatching yields different tree
-    // traversals for nearest and spatial predicates, we do have to check
-    // the results for various type of queries.
-    ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree,
-                           makeIntersectsBoxQueries<DeviceType>({}),
-                           make_reference_solution<int>({}, {0}));
-
-    // Now passing a couple queries of various type and checking the
-    // results.
-    ARBORX_TEST_QUERY_TREE(
-        ExecutionSpace{}, tree,
-        makeIntersectsBoxQueries<DeviceType>({
-            {}, // Did not bother giving a valid box here but that's fine.
-            {},
-        }),
-        make_reference_solution<int>({}, {0, 0, 0}));
-
-#ifndef ARBORX_TEST_DISABLE_SPATIAL_QUERY_INTERSECTS_SPHERE
-    // NOTE: Admittedly testing for both intersection with a box and with a
-    // sphere queries might be a bit overkill but I'd rather test for all the
-    // queries we plan on using.
-    ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree,
-                           makeIntersectsSphereQueries<DeviceType>({}),
-                           make_reference_solution<int>({}, {0}));
-
-    ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree,
-                           makeIntersectsSphereQueries<DeviceType>({
-                               {{{0., 0., 0.}}, 1.},
-                               {{{1., 1., 1.}}, 2.},
-                           }),
-                           make_reference_solution<int>({}, {0, 0, 0}));
-#endif
-  }
-}
-
-#ifndef ARBORX_TEST_DISABLE_NEAREST_QUERY
-BOOST_AUTO_TEST_CASE_TEMPLATE(empty_tree_nearest_predicate, TreeTypeTraits,
-                              TreeTypeTraitsList)
-{
-  using Tree = typename TreeTypeTraits::type;
-  using ExecutionSpace = typename TreeTypeTraits::execution_space;
-  using DeviceType = typename TreeTypeTraits::device_type;
-
-  // tree is empty, it has no leaves.
-  for (auto const &tree : {
-           Tree{}, // default constructed
-           make<Tree>(ExecutionSpace{},
-                      {}), // constructed with empty view of boxes
-       })
-  {
-    BOOST_TEST(tree.empty());
-    BOOST_TEST(tree.size() == 0);
-    // Tree::bounds() returns an invalid box when the tree is empty.
-    using ArborX::Details::equals;
-    BOOST_TEST(equals(static_cast<ArborX::Box>(tree.bounds()), {}));
-
-    // Passing a view with no query does seem a bit silly but we still need
-    // to support it. And since the tag dispatching yields different tree
-    // traversals for nearest and spatial predicates, we do have to check
-    // the results for various type of queries.
-    ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree,
-                           makeNearestQueries<DeviceType>({}),
-                           make_reference_solution<int>({}, {0}));
-
-    // Now passing a couple queries of various type and checking the
-    // results.
-    ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree,
-                           makeNearestQueries<DeviceType>({
-                               {{{0., 0., 0.}}, 1},
-                               {{{1., 1., 1.}}, 2},
-                           }),
-                           make_reference_solution<int>({}, {0, 0, 0}));
-  }
-}
-#endif
-
-BOOST_AUTO_TEST_CASE_TEMPLATE(single_leaf_tree_spatial_predicate,
-                              TreeTypeTraits, TreeTypeTraitsList)
-{
-  using Tree = typename TreeTypeTraits::type;
-  using ExecutionSpace = typename TreeTypeTraits::execution_space;
-  using DeviceType = typename TreeTypeTraits::device_type;
-
-  // tree has a single leaf (unit box)
-  auto const tree =
-      make<Tree>(ExecutionSpace{}, {
-                                       {{{0., 0., 0.}}, {{1., 1., 1.}}},
-                                   });
-
-  BOOST_TEST(!tree.empty());
-  BOOST_TEST(tree.size() == 1);
-  using ArborX::Details::equals;
-  BOOST_TEST(equals(static_cast<ArborX::Box>(tree.bounds()),
-                    {{{0., 0., 0.}}, {{1., 1., 1.}}}));
-
-  ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree,
-                         makeIntersectsBoxQueries<DeviceType>({}),
-                         make_reference_solution<int>({}, {0}));
-
-  ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree,
-                         makeIntersectsBoxQueries<DeviceType>({
-                             {{{5., 5., 5.}}, {{5., 5., 5.}}},
-                             {{{.5, .5, .5}}, {{.5, .5, .5}}},
-                         }),
-                         make_reference_solution<int>({0}, {0, 0, 1}));
-
-#ifndef ARBORX_TEST_DISABLE_SPATIAL_QUERY_INTERSECTS_SPHERE
-  ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree,
-                         makeIntersectsSphereQueries<DeviceType>({}),
-                         make_reference_solution<int>({}, {0}));
-
-  ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree,
-                         makeIntersectsSphereQueries<DeviceType>({
-                             {{{0., 0., 0.}}, 1.},
-                             {{{1., 1., 1.}}, 3.},
-                             {{{5., 5., 5.}}, 2.},
-                         }),
-                         make_reference_solution<int>({0, 0}, {0, 1, 2, 2}));
-#endif
-}
-
-#ifndef ARBORX_TEST_DISABLE_NEAREST_QUERY
-BOOST_AUTO_TEST_CASE_TEMPLATE(single_leaf_tree_nearest_predicate,
-                              TreeTypeTraits, TreeTypeTraitsList)
-{
-  using Tree = typename TreeTypeTraits::type;
-  using ExecutionSpace = typename TreeTypeTraits::execution_space;
-  using DeviceType = typename TreeTypeTraits::device_type;
-
-  // tree has a single leaf (unit box)
-  auto const tree =
-      make<Tree>(ExecutionSpace{}, {
-                                       {{{0., 0., 0.}}, {{1., 1., 1.}}},
-                                   });
-
-  BOOST_TEST(!tree.empty());
-  BOOST_TEST(tree.size() == 1);
-  using ArborX::Details::equals;
-  BOOST_TEST(equals(static_cast<ArborX::Box>(tree.bounds()),
-                    {{{0., 0., 0.}}, {{1., 1., 1.}}}));
-
-  ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree,
-                         makeNearestQueries<DeviceType>({}),
-                         make_reference_solution<int>({}, {0}));
-  ARBORX_TEST_QUERY_TREE(
-      ExecutionSpace{}, tree,
-      makeNearestQueries<DeviceType>({{{0., 0., 0.}, 3}, {{4., 5., 1.}, 1}}),
-      make_reference_solution<int>({0, 0}, {0, 1, 2}));
-
-  ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree,
-                         makeNearestQueries<DeviceType>({
-                             {{{0., 0., 0.}}, 1},
-                             {{{1., 1., 1.}}, 2},
-                             {{{2., 2., 2.}}, 3},
-                         }),
-                         make_reference_solution<int>({0, 0, 0}, {0, 1, 2, 3}));
-}
-#endif
-
-// FIXME Tree with two leaves is not "degenerated".  Find a better place for it.
-BOOST_AUTO_TEST_CASE_TEMPLATE(couple_leaves_tree_spatial_predicate,
-                              TreeTypeTraits, TreeTypeTraitsList)
-{
-  using Tree = typename TreeTypeTraits::type;
-  using ExecutionSpace = typename TreeTypeTraits::execution_space;
-  using DeviceType = typename TreeTypeTraits::device_type;
-
-  auto const tree =
-      make<Tree>(ExecutionSpace{}, {
-                                       {{{0., 0., 0.}}, {{0., 0., 0.}}},
-                                       {{{1., 1., 1.}}, {{1., 1., 1.}}},
-                                   });
-
-  BOOST_TEST(!tree.empty());
-  BOOST_TEST(tree.size() == 2);
-  using ArborX::Details::equals;
-  BOOST_TEST(equals(static_cast<ArborX::Box>(tree.bounds()),
-                    {{{0., 0., 0.}}, {{1., 1., 1.}}}));
-
-  // single query intersects with nothing
-  ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree,
-                         makeIntersectsBoxQueries<DeviceType>({
-                             {},
-                         }),
-                         make_reference_solution<int>({}, {0, 0}));
-
-  // single query intersects with both
-  ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree,
-                         makeIntersectsBoxQueries<DeviceType>({
-                             {{{0., 0., 0.}}, {{1., 1., 1.}}},
-                         }),
-                         make_reference_solution<int>({1, 0}, {0, 2}));
-
-  // single query intersects with only one
-  ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree,
-                         makeIntersectsBoxQueries<DeviceType>({
-                             {{{0.5, 0.5, 0.5}}, {{1.5, 1.5, 1.5}}},
-                         }),
-                         make_reference_solution<int>({1}, {0, 1}));
-
-  // a couple queries both intersect with nothing
-  ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree,
-                         makeIntersectsBoxQueries<DeviceType>({
-                             {},
-                             {},
-                         }),
-                         make_reference_solution<int>({}, {0, 0, 0}));
-
-  // a couple queries first intersects with nothing second with only one
-  ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree,
-                         makeIntersectsBoxQueries<DeviceType>({
-                             {},
-                             {{{0., 0., 0.}}, {{0., 0., 0.}}},
-                         }),
-                         make_reference_solution<int>({0}, {0, 0, 1}));
-
-  // no query
-  ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree,
-                         makeIntersectsBoxQueries<DeviceType>({}),
-                         make_reference_solution<int>({}, {0}));
-}
-
-#ifndef ARBORX_TEST_DISABLE_NEAREST_QUERY
-BOOST_AUTO_TEST_CASE_TEMPLATE(couple_leaves_tree_nearest_predicate,
-                              TreeTypeTraits, TreeTypeTraitsList)
-{
-  using Tree = typename TreeTypeTraits::type;
-  using ExecutionSpace = typename TreeTypeTraits::execution_space;
-  using DeviceType = typename TreeTypeTraits::device_type;
-
-  auto const tree =
-      make<Tree>(ExecutionSpace{}, {
-                                       {{{0., 0., 0.}}, {{0., 0., 0.}}},
-                                       {{{1., 1., 1.}}, {{1., 1., 1.}}},
-                                   });
-
-  BOOST_TEST(!tree.empty());
-  BOOST_TEST(tree.size() == 2);
-  using ArborX::Details::equals;
-  BOOST_TEST(equals(static_cast<ArborX::Box>(tree.bounds()),
-                    {{{0., 0., 0.}}, {{1., 1., 1.}}}));
-
-  // no query
-  ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree,
-                         makeNearestQueries<DeviceType>({}),
-                         make_reference_solution<int>({}, {0}));
-
-  ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree,
-                         makeNearestQueries<DeviceType>({
-                             {{{0., 0., 0.}}, 2},
-                             {{{1., 0., 0.}}, 4},
-                         }),
-                         make_reference_solution<int>({0, 1, 0, 1}, {0, 2, 4}));
-}
-#endif
-
-#ifndef ARBORX_TEST_DISABLE_SPATIAL_QUERY_INTERSECTS_SPHERE
-BOOST_AUTO_TEST_CASE_TEMPLATE(duplicated_leaves_spatial_predicate,
-                              TreeTypeTraits, TreeTypeTraitsList)
-{
-  using Tree = typename TreeTypeTraits::type;
-  using ExecutionSpace = typename TreeTypeTraits::execution_space;
-  using DeviceType = typename TreeTypeTraits::device_type;
-
-  // The tree contains multiple (more than two) leaves that will be assigned
-  // the same Morton code.  This was able to trigger a bug that we discovered
-  // when building trees over ~10M indexable values.  The hierarchy generated
-  // at construction had leaves with no parent which yielded a segfault later
-  // when computing bounding boxes and walking the hierarchy toward the root.
-  auto const tree =
-      make<Tree>(ExecutionSpace{}, {
-                                       {{{0., 0., 0.}}, {{0., 0., 0.}}},
-                                       {{{1., 1., 1.}}, {{1., 1., 1.}}},
-                                       {{{1., 1., 1.}}, {{1., 1., 1.}}},
-                                       {{{1., 1., 1.}}, {{1., 1., 1.}}},
-                                   });
-
-  ARBORX_TEST_QUERY_TREE(
-      ExecutionSpace{}, tree,
-      makeIntersectsSphereQueries<DeviceType>({
-          {{{0., 0., 0.}}, 1.},
-          {{{1., 1., 1.}}, 1.},
-          {{{.5, .5, .5}}, 1.},
-      }),
-      make_reference_solution<int>({0, 1, 2, 3, 0, 1, 2, 3}, {0, 1, 4, 8}));
-}
-#endif
-
-BOOST_AUTO_TEST_SUITE_END()
-
-BOOST_AUTO_TEST_SUITE(Miscellaneous)
-
-BOOST_AUTO_TEST_CASE_TEMPLATE(not_exceeding_stack_capacity_spatial_predicate,
-                              TreeTypeTraits, TreeTypeTraitsList)
-{
-  // FIXME This unit test might make little sense for other trees than BVH
-  // using Tree = typename TreeTypeTraits::type;
-  using ExecutionSpace = typename TreeTypeTraits::execution_space;
-  using DeviceType = typename TreeTypeTraits::device_type;
-
-  std::vector<ArborX::Box> boxes;
-  int const n = 4096; // exceeds stack capacity which is 64
-  boxes.reserve(n);
-  for (int i = 0; i < n; ++i)
-  {
-    double const a = i;
-    double const b = i + 1;
-    boxes.push_back({{{a, a, a}}, {{b, b, b}}});
-  }
-  auto const bvh = make<ArborX::BVH<typename DeviceType::memory_space>>(
-      ExecutionSpace{}, boxes);
-
-  Kokkos::View<int *, DeviceType> indices("indices", 0);
-  Kokkos::View<int *, DeviceType> offset("offset", 0);
-  // spatial query that is satisfied by all leaves in the tree
-  BOOST_CHECK_NO_THROW(ArborX::query(bvh, ExecutionSpace{},
-                                     makeIntersectsBoxQueries<DeviceType>({
-                                         {},
-                                         {{{0., 0., 0.}}, {{n, n, n}}},
-                                     }),
-                                     indices, offset));
-  BOOST_TEST(ArborX::lastElement(offset) == n);
-}
-
-#ifndef ARBORX_TEST_DISABLE_NEAREST_QUERY
-BOOST_AUTO_TEST_CASE_TEMPLATE(not_exceeding_stack_capacity_nearest_predicate,
-                              TreeTypeTraits, TreeTypeTraitsList)
-{
-  // FIXME This unit test might make little sense for other trees than BVH
-  // using Tree = typename TreeTypeTraits::type;
-  using ExecutionSpace = typename TreeTypeTraits::execution_space;
-  using DeviceType = typename TreeTypeTraits::device_type;
-
-  std::vector<ArborX::Box> boxes;
-  int const n = 4096; // exceed stack capacity which is 64
-  boxes.reserve(n);
-  for (int i = 0; i < n; ++i)
-  {
-    double const a = i;
-    double const b = i + 1;
-    boxes.push_back({{{a, a, a}}, {{b, b, b}}});
-  }
-  auto const bvh = make<ArborX::BVH<typename DeviceType::memory_space>>(
-      ExecutionSpace{}, boxes);
-
-  Kokkos::View<int *, DeviceType> indices("indices", 0);
-  Kokkos::View<int *, DeviceType> offset("offset", 0);
-  // nearest query asking for as many neighbors as they are leaves in the tree
-  BOOST_CHECK_NO_THROW(ArborX::query(bvh, ExecutionSpace{},
-                                     makeNearestQueries<DeviceType>({
-                                         {{{0., 0., 0.}}, n},
-                                     }),
-                                     indices, offset));
-  BOOST_TEST(ArborX::lastElement(offset) == n);
-}
-#endif
-
-BOOST_AUTO_TEST_SUITE_END()
diff --git a/arborx/test/tstQueryTreeIntersectsKDOP.cpp b/arborx/test/tstQueryTreeIntersectsKDOP.cpp
deleted file mode 100644
index 2d03dd24b..000000000
--- a/arborx/test/tstQueryTreeIntersectsKDOP.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2017-2021 by the ArborX authors                            *
- * All rights reserved.                                                     *
- *                                                                          *
- * This file is part of the ArborX library. ArborX is                       *
- * distributed under a BSD 3-clause license. For the licensing terms see    *
- * the LICENSE file in the top-level directory.                             *
- *                                                                          *
- * SPDX-License-Identifier: BSD-3-Clause                                    *
- ****************************************************************************/
-
-#include "ArborX_EnableDeviceTypes.hpp" // ARBORX_DEVICE_TYPES
-#include <ArborX_KDOP.hpp>
-#include <ArborX_LinearBVH.hpp>
-
-#include <Kokkos_CopyViews.hpp>
-
-#include <boost/test/unit_test.hpp>
-
-#include <vector>
-
-#include "Search_UnitTestHelpers.hpp"
-
-BOOST_AUTO_TEST_CASE_TEMPLATE(intersects_kdop, DeviceType, ARBORX_DEVICE_TYPES)
-{
-  using ExecutionSpace = typename DeviceType::execution_space;
-  using MemorySpace = typename DeviceType::memory_space;
-  using Tree = ArborX::BVH<MemorySpace>;
-
-  using ArborX::Point;
-
-  std::vector<ArborX::Point> primitives = {
-      {{0, 0, 0}}, // 0
-      {{1, 1, 1}}, // 1
-      {{2, 2, 2}}, // 2
-      {{3, 3, 3}}, // 3
-      {{1, 0, 0}}, // 4
-      {{2, 0, 0}}, // 5
-      {{3, 0, 0}}, // 6
-      {{0, 1, 0}}, // 7
-      {{0, 2, 0}}, // 8
-      {{0, 3, 0}}, // 9
-      {{0, 0, 1}}, // 10
-      {{0, 0, 2}}, // 11
-      {{0, 0, 3}}, // 12
-  };
-  Tree const tree(
-      ExecutionSpace{},
-      Kokkos::create_mirror_view_and_copy(
-          MemorySpace{},
-          Kokkos::View<Point *, Kokkos::HostSpace, Kokkos::MemoryUnmanaged>(
-              primitives.data(), primitives.size())));
-
-  // (0,0,0)->(1,2,3) box with (0,0,0)--(0,0,3) edge cut off
-  ArborX::Experimental::KDOP<18> x;
-  // bottom
-  x += ArborX::Point{0.25, 0, 0};
-  x += ArborX::Point{1, 0, 0};
-  x += ArborX::Point{1, 2, 0};
-  x += ArborX::Point{0, 2, 0};
-  x += ArborX::Point{0, 0.25, 0};
-  // top
-  x += ArborX::Point{0.25, 0, 3};
-  x += ArborX::Point{1, 0, 3};
-  x += ArborX::Point{1, 2, 3};
-  x += ArborX::Point{0, 2, 3};
-  x += ArborX::Point{0, 0.25, 3};
-
-  using IntersectsKDop = decltype(ArborX::intersects(x));
-  std::vector<IntersectsKDop> predicates = {ArborX::intersects(x)};
-
-  ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree,
-                         makeIntersectsBoxQueries<DeviceType>({}),
-                         make_reference_solution<int>({}, {0}));
-  ARBORX_TEST_QUERY_TREE(
-      ExecutionSpace{}, tree,
-      Kokkos::create_mirror_view_and_copy(
-          MemorySpace{}, Kokkos::View<IntersectsKDop *, Kokkos::HostSpace,
-                                      Kokkos::MemoryUnmanaged>(
-                             predicates.data(), predicates.size())),
-      make_reference_solution<int>({1, 4, 7, 8}, {0, 4}));
-}
diff --git a/arborx/test/tstQueryTreeManufacturedSolution.cpp b/arborx/test/tstQueryTreeManufacturedSolution.cpp
deleted file mode 100644
index de76a9c0b..000000000
--- a/arborx/test/tstQueryTreeManufacturedSolution.cpp
+++ /dev/null
@@ -1,257 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2017-2021 by the ArborX authors                            *
- * All rights reserved.                                                     *
- *                                                                          *
- * This file is part of the ArborX library. ArborX is                       *
- * distributed under a BSD 3-clause license. For the licensing terms see    *
- * the LICENSE file in the top-level directory.                             *
- *                                                                          *
- * SPDX-License-Identifier: BSD-3-Clause                                    *
- ****************************************************************************/
-
-#include <boost/test/unit_test.hpp>
-
-#include <algorithm>
-#include <iostream>
-#include <random>
-#include <tuple>
-
-#include "Search_UnitTestHelpers.hpp"
-// clang-format off
-#include "ArborXTest_TreeTypeTraits.hpp"
-// clang-format on
-
-// We need a forward-declaration for NVCC, see below.
-namespace ArborX
-{
-namespace Experimental
-{
-template <int k>
-struct KDOP;
-}
-} // namespace ArborX
-
-BOOST_AUTO_TEST_SUITE(ManufacturedSolution)
-
-namespace tt = boost::test_tools;
-
-BOOST_AUTO_TEST_CASE_TEMPLATE(structured_grid, TreeTypeTraits,
-                              TreeTypeTraitsList)
-{
-  using Tree = typename TreeTypeTraits::type;
-  using ExecutionSpace = typename TreeTypeTraits::execution_space;
-  using DeviceType = typename TreeTypeTraits::device_type;
-
-  // FIXME_NVCC we see inexplainable test failures with NVCC and KDOP<18> and
-  // KDOP<26> here.
-#ifdef __NVCC__
-  if (std::is_same<typename Tree::bounding_volume_type,
-                   ArborX::Experimental::KDOP<18>>::value ||
-      std::is_same<typename Tree::bounding_volume_type,
-                   ArborX::Experimental::KDOP<26>>::value)
-    return;
-#endif
-
-  float Lx = 100.0;
-  float Ly = 100.0;
-  float Lz = 100.0;
-  int nx = 11;
-  int ny = 11;
-  int nz = 11;
-  int n = nx * ny * nz;
-  float hx = Lx / (nx - 1);
-  float hy = Ly / (ny - 1);
-  float hz = Lz / (nz - 1);
-
-  std::function<int(int, int, int)> ind = [nx, ny](int i, int j, int k) {
-    return i + j * nx + k * (nx * ny);
-  };
-
-  Kokkos::View<ArborX::Box *, DeviceType> bounding_boxes("bounding_boxes", n);
-  auto bounding_boxes_host = Kokkos::create_mirror_view(bounding_boxes);
-
-  for (int i = 0; i < nx; ++i)
-    for (int j = 0; j < ny; ++j)
-      for (int k = 0; k < nz; ++k)
-      {
-        ArborX::Point p{{i * hx, j * hy, k * hz}};
-        bounding_boxes_host[ind(i, j, k)] = {p, p};
-      }
-  Kokkos::deep_copy(bounding_boxes, bounding_boxes_host);
-
-  Tree const tree(ExecutionSpace{}, bounding_boxes);
-
-  std::vector<int> offset_ref(n + 1);
-  std::vector<int> indices_ref;
-
-  // (i) use the same objects for the queries as the objects used in BVH
-  // construction
-  // i-2  i-1  i  i+1
-  //
-  //  o    o   o   o   j+1
-  //          ---
-  //  o    o | x | o   j
-  //          ---
-  //  o    o   o   o   j-1
-  //
-  //  o    o   o   o   j-2
-  //
-  indices_ref.resize(n);
-  std::iota(offset_ref.begin(), offset_ref.end(), 0);
-  std::iota(indices_ref.begin(), indices_ref.end(), 0);
-
-  Kokkos::View<decltype(ArborX::intersects(ArborX::Box{})) *, DeviceType>
-      queries("queries", n);
-  Kokkos::parallel_for("fill_queries",
-                       Kokkos::RangePolicy<ExecutionSpace>(0, n),
-                       KOKKOS_LAMBDA(int i) {
-                         queries(i) = ArborX::intersects(bounding_boxes(i));
-                       });
-  ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree, queries,
-                         make_reference_solution(indices_ref, offset_ref));
-
-  // (ii) use bounding boxes that intersects with first neighbors
-  //
-  // i-2  i-1  i  i+1
-  //
-  //  o    x---x---x   j+1
-  //       |       |
-  //  o    x   x   x   j
-  //       |       |
-  //  o    x---x---x   j-1
-  //
-  //  o    o   o   o   j-2
-  //
-  std::vector<std::set<int>> ref(n);
-  for (int i = 0; i < nx; ++i)
-    for (int j = 0; j < ny; ++j)
-      for (int k = 0; k < nz; ++k)
-      {
-        int const index = ind(i, j, k);
-        // bounding box around nodes of the structured grid will
-        // intersect with neighboring nodes
-        bounding_boxes_host[index] = {
-            {{(i - 1) * hx, (j - 1) * hy, (k - 1) * hz}},
-            {{(i + 1) * hx, (j + 1) * hy, (k + 1) * hz}}};
-        // fill in reference solution to check against the collision
-        // list computed during the tree traversal
-        if ((i > 0) && (j > 0) && (k > 0))
-          ref[index].emplace(ind(i - 1, j - 1, k - 1));
-        if ((i > 0) && (k > 0))
-          ref[index].emplace(ind(i - 1, j, k - 1));
-        if ((i > 0) && (j < ny - 1) && (k > 0))
-          ref[index].emplace(ind(i - 1, j + 1, k - 1));
-        if ((i > 0) && (j > 0))
-          ref[index].emplace(ind(i - 1, j - 1, k));
-        if (i > 0)
-          ref[index].emplace(ind(i - 1, j, k));
-        if ((i > 0) && (j < ny - 1))
-          ref[index].emplace(ind(i - 1, j + 1, k));
-        if ((i > 0) && (j > 0) && (k < nz - 1))
-          ref[index].emplace(ind(i - 1, j - 1, k + 1));
-        if ((i > 0) && (k < nz - 1))
-          ref[index].emplace(ind(i - 1, j, k + 1));
-        if ((i > 0) && (j < ny - 1) && (k < nz - 1))
-          ref[index].emplace(ind(i - 1, j + 1, k + 1));
-
-        if ((j > 0) && (k > 0))
-          ref[index].emplace(ind(i, j - 1, k - 1));
-        if (k > 0)
-          ref[index].emplace(ind(i, j, k - 1));
-        if ((j < ny - 1) && (k > 0))
-          ref[index].emplace(ind(i, j + 1, k - 1));
-        if (j > 0)
-          ref[index].emplace(ind(i, j - 1, k));
-        if (true) // NOLINT
-          ref[index].emplace(ind(i, j, k));
-        if (j < ny - 1)
-          ref[index].emplace(ind(i, j + 1, k));
-        if ((j > 0) && (k < nz - 1))
-          ref[index].emplace(ind(i, j - 1, k + 1));
-        if (k < nz - 1)
-          ref[index].emplace(ind(i, j, k + 1));
-        if ((j < ny - 1) && (k < nz - 1))
-          ref[index].emplace(ind(i, j + 1, k + 1));
-
-        if ((i < nx - 1) && (j > 0) && (k > 0))
-          ref[index].emplace(ind(i + 1, j - 1, k - 1));
-        if ((i < nx - 1) && (k > 0))
-          ref[index].emplace(ind(i + 1, j, k - 1));
-        if ((i < nx - 1) && (j < ny - 1) && (k > 0))
-          ref[index].emplace(ind(i + 1, j + 1, k - 1));
-        if ((i < nx - 1) && (j > 0))
-          ref[index].emplace(ind(i + 1, j - 1, k));
-        if (i < nx - 1)
-          ref[index].emplace(ind(i + 1, j, k));
-        if ((i < nx - 1) && (j < ny - 1))
-          ref[index].emplace(ind(i + 1, j + 1, k));
-        if ((i < nx - 1) && (j > 0) && (k < nz - 1))
-          ref[index].emplace(ind(i + 1, j - 1, k + 1));
-        if ((i < nx - 1) && (k < nz - 1))
-          ref[index].emplace(ind(i + 1, j, k + 1));
-        if ((i < nx - 1) && (j < ny - 1) && (k < nz - 1))
-          ref[index].emplace(ind(i + 1, j + 1, k + 1));
-      }
-  Kokkos::deep_copy(bounding_boxes, bounding_boxes_host);
-
-  indices_ref.resize(0);
-  for (int i = 0; i < n; ++i)
-  {
-    std::copy(ref[i].begin(), ref[i].end(), std::back_inserter(indices_ref));
-    offset_ref[i + 1] = indices_ref.size();
-  }
-
-  Kokkos::parallel_for("fill_first_neighbors_queries",
-                       Kokkos::RangePolicy<ExecutionSpace>(0, n),
-                       KOKKOS_LAMBDA(int i) {
-                         queries[i] = ArborX::intersects(bounding_boxes[i]);
-                       });
-  ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree, queries,
-                         make_reference_solution(indices_ref, offset_ref));
-
-  // (iii) use random points
-  //
-  // i-1      i      i+1
-  //
-  //  o       o       o   j+1
-  //         -------
-  //        |       |
-  //        |   +   |
-  //  o     | x     | o   j
-  //         -------
-  //
-  //  o       o       o   j-1
-  //
-  std::default_random_engine generator;
-  std::uniform_real_distribution<double> distribution_x(0.0, Lz);
-  std::uniform_real_distribution<double> distribution_y(0.0, Ly);
-  std::uniform_real_distribution<double> distribution_z(0.0, Lz);
-
-  std::iota(offset_ref.begin(), offset_ref.end(), 0);
-  indices_ref.resize(n);
-  for (int l = 0; l < n; ++l)
-  {
-    double x = distribution_x(generator);
-    double y = distribution_y(generator);
-    double z = distribution_z(generator);
-    bounding_boxes_host(l) = {{{x - 0.5 * hx, y - 0.5 * hy, z - 0.5 * hz}},
-                              {{x + 0.5 * hx, y + 0.5 * hy, z + 0.5 * hz}}};
-
-    auto const i = static_cast<int>(std::round(x / hx));
-    auto const j = static_cast<int>(std::round(y / hy));
-    auto const k = static_cast<int>(std::round(z / hz));
-    // Save the indices for the check
-    indices_ref[l] = ind(i, j, k);
-  }
-  Kokkos::deep_copy(bounding_boxes, bounding_boxes_host);
-
-  Kokkos::parallel_for("fill_first_neighbors_queries",
-                       Kokkos::RangePolicy<ExecutionSpace>(0, n),
-                       KOKKOS_LAMBDA(int i) {
-                         queries[i] = ArborX::intersects(bounding_boxes[i]);
-                       });
-  ARBORX_TEST_QUERY_TREE(ExecutionSpace{}, tree, queries,
-                         make_reference_solution(indices_ref, offset_ref));
-}
-
-BOOST_AUTO_TEST_SUITE_END()
diff --git a/arborx/test/tstQueryTreeTraversalPolicy.cpp b/arborx/test/tstQueryTreeTraversalPolicy.cpp
deleted file mode 100644
index dde72f5c2..000000000
--- a/arborx/test/tstQueryTreeTraversalPolicy.cpp
+++ /dev/null
@@ -1,177 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2017-2021 by the ArborX authors                            *
- * All rights reserved.                                                     *
- *                                                                          *
- * This file is part of the ArborX library. ArborX is                       *
- * distributed under a BSD 3-clause license. For the licensing terms see    *
- * the LICENSE file in the top-level directory.                             *
- *                                                                          *
- * SPDX-License-Identifier: BSD-3-Clause                                    *
- ****************************************************************************/
-
-#include "ArborX_EnableDeviceTypes.hpp" // ARBORX_DEVICE_TYPES
-#include <ArborX_LinearBVH.hpp>
-
-#include <boost/test/unit_test.hpp>
-
-#include <algorithm>
-#include <iostream>
-#include <random>
-#include <tuple>
-
-#include "Search_UnitTestHelpers.hpp"
-
-BOOST_AUTO_TEST_SUITE(TraversalPolicy)
-
-namespace tt = boost::test_tools;
-
-BOOST_AUTO_TEST_CASE_TEMPLATE(buffer_optimization, DeviceType,
-                              ARBORX_DEVICE_TYPES)
-{
-  using ExecutionSpace = typename DeviceType::execution_space;
-
-  auto const bvh = make<ArborX::BVH<typename DeviceType::memory_space>>(
-      ExecutionSpace{}, {
-                            {{{0., 0., 0.}}, {{0., 0., 0.}}},
-                            {{{1., 0., 0.}}, {{1., 0., 0.}}},
-                            {{{2., 0., 0.}}, {{2., 0., 0.}}},
-                            {{{3., 0., 0.}}, {{3., 0., 0.}}},
-                        });
-
-  auto const queries = makeIntersectsBoxQueries<DeviceType>({
-      {},
-      {{{0., 0., 0.}}, {{3., 3., 3.}}},
-      {},
-  });
-
-  using ViewType = Kokkos::View<int *, DeviceType>;
-  ViewType indices("indices", 0);
-  ViewType offset("offset", 0);
-
-  std::vector<int> indices_ref = {0, 1, 2, 3};
-  std::vector<int> offset_ref = {0, 0, 4, 4};
-  auto checkResultsAreFine = [&indices, &offset, &indices_ref,
-                              &offset_ref]() -> void {
-    auto indices_host = Kokkos::create_mirror_view(indices);
-    Kokkos::deep_copy(indices_host, indices);
-    auto offset_host = Kokkos::create_mirror_view(offset);
-    Kokkos::deep_copy(offset_host, offset);
-    BOOST_TEST(make_compressed_storage(offset_host, indices_host) ==
-                   make_compressed_storage(offset_ref, indices_ref),
-               tt::per_element());
-  };
-
-  BOOST_CHECK_NO_THROW(
-      ArborX::query(bvh, ExecutionSpace{}, queries, indices, offset));
-  checkResultsAreFine();
-
-  // compute number of results per query
-  auto counts = ArborX::cloneWithoutInitializingNorCopying(offset);
-  ArborX::adjacentDifference(ExecutionSpace{}, offset, counts);
-  // extract optimal buffer size
-  auto const max_results_per_query = ArborX::max(ExecutionSpace{}, counts);
-  BOOST_TEST(max_results_per_query == 4);
-
-  // optimal size
-  BOOST_CHECK_NO_THROW(
-      ArborX::query(bvh, ExecutionSpace{}, queries, indices, offset,
-                    ArborX::Experimental::TraversalPolicy().setBufferSize(
-                        -max_results_per_query)));
-  checkResultsAreFine();
-
-  // buffer size insufficient
-  BOOST_TEST(max_results_per_query > 1);
-  BOOST_CHECK_NO_THROW(
-      ArborX::query(bvh, ExecutionSpace{}, queries, indices, offset,
-                    ArborX::Experimental::TraversalPolicy().setBufferSize(+1)));
-  checkResultsAreFine();
-  BOOST_CHECK_THROW(
-      ArborX::query(bvh, ExecutionSpace{}, queries, indices, offset,
-                    ArborX::Experimental::TraversalPolicy().setBufferSize(-1)),
-      ArborX::SearchException);
-
-  // adequate buffer size
-  BOOST_TEST(max_results_per_query < 5);
-  BOOST_CHECK_NO_THROW(
-      ArborX::query(bvh, ExecutionSpace{}, queries, indices, offset,
-                    ArborX::Experimental::TraversalPolicy().setBufferSize(+5)));
-  checkResultsAreFine();
-  BOOST_CHECK_NO_THROW(
-      ArborX::query(bvh, ExecutionSpace{}, queries, indices, offset,
-                    ArborX::Experimental::TraversalPolicy().setBufferSize(-5)));
-  checkResultsAreFine();
-
-  // passing null size skips the buffer optimization and never throws
-  BOOST_CHECK_NO_THROW(
-      ArborX::query(bvh, ExecutionSpace{}, queries, indices, offset,
-                    ArborX::Experimental::TraversalPolicy().setBufferSize(0)));
-  checkResultsAreFine();
-}
-
-BOOST_AUTO_TEST_CASE_TEMPLATE(unsorted_predicates, DeviceType,
-                              ARBORX_DEVICE_TYPES)
-{
-  using ExecutionSpace = typename DeviceType::execution_space;
-
-  auto const bvh = make<ArborX::BVH<typename DeviceType::memory_space>>(
-      ExecutionSpace{}, {
-                            {{{0., 0., 0.}}, {{0., 0., 0.}}},
-                            {{{1., 1., 1.}}, {{1., 1., 1.}}},
-                            {{{2., 2., 2.}}, {{2., 2., 2.}}},
-                            {{{3., 3., 3.}}, {{3., 3., 3.}}},
-                        });
-
-  using ViewType = Kokkos::View<int *, DeviceType>;
-  ViewType indices("indices", 0);
-  ViewType offset("offset", 0);
-
-  std::vector<int> indices_ref = {2, 3, 0, 1};
-  std::vector<int> offset_ref = {0, 2, 4};
-  auto checkResultsAreFine = [&indices, &offset, &indices_ref,
-                              &offset_ref]() -> void {
-    auto indices_host = Kokkos::create_mirror_view(indices);
-    Kokkos::deep_copy(indices_host, indices);
-    auto offset_host = Kokkos::create_mirror_view(offset);
-    Kokkos::deep_copy(offset_host, offset);
-    BOOST_TEST(make_compressed_storage(offset_host, indices_host) ==
-                   make_compressed_storage(offset_ref, indices_ref),
-               tt::per_element());
-  };
-
-  {
-    auto const queries = makeIntersectsBoxQueries<DeviceType>({
-        {{{2., 2., 2.}}, {{3., 3., 3.}}},
-        {{{0., 0., 0.}}, {{1., 1., 1.}}},
-    });
-
-    BOOST_CHECK_NO_THROW(ArborX::query(
-        bvh, ExecutionSpace{}, queries, indices, offset,
-        ArborX::Experimental::TraversalPolicy().setPredicateSorting(true)));
-    checkResultsAreFine();
-
-    BOOST_CHECK_NO_THROW(ArborX::query(
-        bvh, ExecutionSpace{}, queries, indices, offset,
-        ArborX::Experimental::TraversalPolicy().setPredicateSorting(false)));
-    checkResultsAreFine();
-  }
-
-  indices_ref = {2, 3, 0, 1};
-  {
-    auto queries = makeNearestQueries<DeviceType>({
-        {{{2.5, 2.5, 2.5}}, 2},
-        {{{0.5, 0.5, 0.5}}, 2},
-    });
-
-    BOOST_CHECK_NO_THROW(ArborX::query(
-        bvh, ExecutionSpace{}, queries, indices, offset,
-        ArborX::Experimental::TraversalPolicy().setPredicateSorting(true)));
-    checkResultsAreFine();
-
-    BOOST_CHECK_NO_THROW(ArborX::query(
-        bvh, ExecutionSpace{}, queries, indices, offset,
-        ArborX::Experimental::TraversalPolicy().setPredicateSorting(false)));
-    checkResultsAreFine();
-  }
-}
-
-BOOST_AUTO_TEST_SUITE_END()
diff --git a/arborx/test/tstRay.cpp b/arborx/test/tstRay.cpp
deleted file mode 100644
index c6be3820d..000000000
--- a/arborx/test/tstRay.cpp
+++ /dev/null
@@ -1,259 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2017-2021 by the ArborX authors                            *
- * All rights reserved.                                                     *
- *                                                                          *
- * This file is part of the ArborX library. ArborX is                       *
- * distributed under a BSD 3-clause license. For the licensing terms see    *
- * the LICENSE file in the top-level directory.                             *
- *                                                                          *
- * SPDX-License-Identifier: BSD-3-Clause                                    *
- ****************************************************************************/
-#include <ArborX_Box.hpp>
-#include <ArborX_Ray.hpp>
-
-#include <boost/test/unit_test.hpp>
-
-BOOST_AUTO_TEST_CASE(intersects_box)
-{
-  using ArborX::Box;
-  using ArborX::Point;
-  using ArborX::Experimental::Ray;
-
-  Box unit_box{{0, 0, 0}, {1, 1, 1}};
-
-  // origin is within the box
-  BOOST_TEST(intersects(Ray{{.5, .5, .5}, {1, 0, 0}}, unit_box));
-  BOOST_TEST(intersects(Ray{{.5, .5, .5}, {0, 1, 0}}, unit_box));
-  BOOST_TEST(intersects(Ray{{.5, .5, .5}, {0, 0, 1}}, unit_box));
-  BOOST_TEST(intersects(Ray{{.5, .5, .5}, {1, 1, 0}}, unit_box));
-  BOOST_TEST(intersects(Ray{{.5, .5, .5}, {1, 1, 1}}, unit_box));
-
-  // origin is outside the box
-  // hit the center of the face
-  BOOST_TEST(intersects(Ray{{-1, .5, .5}, {1, 0, 0}}, unit_box));
-  BOOST_TEST(!intersects(Ray{{-1, .5, .5}, {-1, 0, 0}}, unit_box));
-  BOOST_TEST(!intersects(Ray{{-1, .5, .5}, {0, 1, 1}}, unit_box));
-  BOOST_TEST(intersects(Ray{{2, .5, .5}, {-1, 0, 0}}, unit_box));
-  BOOST_TEST(!intersects(Ray{{2, .5, .5}, {1, 0, 0}}, unit_box));
-  BOOST_TEST(!intersects(Ray{{2, .5, .5}, {0, 1, 1}}, unit_box));
-  BOOST_TEST(intersects(Ray{{-1, 1.5, .5}, {1, -1, 0}}, unit_box));
-  BOOST_TEST(!intersects(Ray{{-1, 1.5, .5}, {1, 0, 0}}, unit_box));
-  BOOST_TEST(intersects(Ray{{-1, 1.5, 1.5}, {1, -1, -1}}, unit_box));
-  BOOST_TEST(!intersects(Ray{{-1, 1.5, 1.5}, {1, 0, 0}}, unit_box));
-  BOOST_TEST(!intersects(Ray{{-1, 1.5, 1.5}, {1, -1, 0}}, unit_box));
-  BOOST_TEST(!intersects(Ray{{-1, 1.5, 1.5}, {1, 0, -1}}, unit_box));
-  BOOST_TEST(intersects(Ray{{2, -.5, .5}, {-1, 1, 0}}, unit_box));
-  BOOST_TEST(!intersects(Ray{{2, -.5, .5}, {-1, 0, 0}}, unit_box));
-  BOOST_TEST(intersects(Ray{{2, -.5, 1.5}, {-1, 1, -1}}, unit_box));
-  BOOST_TEST(!intersects(Ray{{2, -.5, 1.5}, {-1, 0, 0}}, unit_box));
-  BOOST_TEST(!intersects(Ray{{2, -.5, 1.5}, {-1, 1, 0}}, unit_box));
-  BOOST_TEST(!intersects(Ray{{2, -.5, 1.5}, {-1, 0, -1}}, unit_box));
-
-  // hit the center of an edge
-  BOOST_TEST(intersects(Ray{{-1, 0, .5}, {1, 0, 0}}, unit_box));
-  BOOST_TEST(!intersects(Ray{{-1, 0, .5}, {-1, 0, 0}}, unit_box));
-  BOOST_TEST(!intersects(Ray{{-1, 0, .5}, {0, 1, 1}}, unit_box));
-  BOOST_TEST(intersects(Ray{{2, 0, .5}, {-1, 0, 0}}, unit_box));
-  BOOST_TEST(!intersects(Ray{{2, 0, .5}, {1, 0, 0}}, unit_box));
-  BOOST_TEST(!intersects(Ray{{2, 0, .5}, {0, 1, 1}}, unit_box));
-  BOOST_TEST(intersects(Ray{{-1, -1, .5}, {1, 1, 0}}, unit_box));
-  BOOST_TEST(intersects(Ray{{-1, 1, .5}, {1, -1, 0}}, unit_box));
-  BOOST_TEST(intersects(Ray{{-1, -2, .5}, {1, 2, 0}}, unit_box));
-  BOOST_TEST(intersects(Ray{{2, 2, .5}, {-1, -1, 0}}, unit_box));
-  BOOST_TEST(intersects(Ray{{2, -1, .5}, {-1, 1, 0}}, unit_box));
-  BOOST_TEST(intersects(Ray{{2, 1, .5}, {-1, -1, 0}}, unit_box));
-
-  // hit a corner
-  BOOST_TEST(intersects(Ray{{-0.5, 1.5, 1.5}, {1, -1, -1}}, unit_box));
-  BOOST_TEST(!intersects(Ray{{-1, 1, 1}, {-1, 0, 0}}, unit_box));
-  BOOST_TEST(!intersects(Ray{{-1, 1, 1}, {0, 1, 1}}, unit_box));
-  BOOST_TEST(!intersects(Ray{{2, 1, 1}, {1, 0, 0}}, unit_box));
-  BOOST_TEST(!intersects(Ray{{2, 1, 1}, {0, 1, 1}}, unit_box));
-  BOOST_TEST(intersects(Ray{{-1, -1, -1}, {1, 1, 1}}, unit_box));
-  BOOST_TEST(intersects(Ray{{2, 2, 2}, {-1, -1, -1}}, unit_box));
-
-  BOOST_TEST(!intersects(Ray{{1, 2, 3}, {4, 5, 6}}, unit_box));
-  BOOST_TEST(intersects(Ray{{1, 2, 3}, {-1, -2, -3}}, unit_box));
-
-  // origin is on the box (no 0*inf).
-  BOOST_TEST(intersects(Ray{{0, 0, 0}, {1, 1, 1}}, unit_box));
-  BOOST_TEST(intersects(Ray{{0, 0, 0}, {-1, -1, -1}}, unit_box));
-  BOOST_TEST(intersects(Ray{{1, 1, 1}, {-1, -1, -1}}, unit_box));
-  BOOST_TEST(intersects(Ray{{1, 1, 1}, {1, 1, 1}}, unit_box));
-
-  BOOST_TEST(intersects(Ray{{1, .5, .5}, {-1, 0, 0}}, unit_box));
-  BOOST_TEST(intersects(Ray{{1, .5, .5}, {1, 0, 0}}, unit_box));
-  BOOST_TEST(intersects(Ray{{.5, 1, .5}, {0, -1, 0}}, unit_box));
-  BOOST_TEST(intersects(Ray{{.5, 1, .5}, {0, 1, 0}}, unit_box));
-  BOOST_TEST(intersects(Ray{{.5, .5, 1}, {0, 0, -1}}, unit_box));
-  BOOST_TEST(intersects(Ray{{.5, .5, 1}, {0, 0, 1}}, unit_box));
-
-  BOOST_TEST(intersects(Ray{{0, 0, .5}, {1, 1, 0}}, unit_box));
-  BOOST_TEST(intersects(Ray{{0, 0, .5}, {-1, -1, 0}}, unit_box));
-  BOOST_TEST(intersects(Ray{{1, 1, .5}, {-1, -1, 0}}, unit_box));
-  BOOST_TEST(intersects(Ray{{1, 1, .5}, {1, 1, 0}}, unit_box));
-
-  BOOST_TEST(intersects(Ray{{0, 0.5, 0}, {-1, -2, 0}}, unit_box));
-  BOOST_TEST(intersects(Ray{{0.5, 0, 0.5}, {2, 0, -1}}, unit_box));
-
-  // origin is on the box (with 0*inf).
-  BOOST_TEST(intersects(Ray{{0, 0, 0}, {0, 1, -1}}, unit_box));
-  BOOST_TEST(intersects(Ray{{0, 0, 0}, {-1, 0, -1}}, unit_box));
-  BOOST_TEST(intersects(Ray{{0, 0, 0}, {-1, 1, 0}}, unit_box));
-  BOOST_TEST(intersects(Ray{{0, 0, 0}, {0, 0, 1}}, unit_box));
-  BOOST_TEST(intersects(Ray{{0, 0, 0}, {-1, 0, 0}}, unit_box));
-  BOOST_TEST(intersects(Ray{{0, 0, 0}, {0, -1, 0}}, unit_box));
-
-  BOOST_TEST(intersects(Ray{{1, 1, 1}, {0, -1, -1}}, unit_box));
-  BOOST_TEST(intersects(Ray{{1, 1, 1}, {1, 0, 1}}, unit_box));
-  BOOST_TEST(intersects(Ray{{1, 1, 1}, {-1, -1, 0}}, unit_box));
-  BOOST_TEST(intersects(Ray{{1, 1, 1}, {1, 0, 0}}, unit_box));
-  BOOST_TEST(intersects(Ray{{1, 1, 1}, {0, 1, 0}}, unit_box));
-  BOOST_TEST(intersects(Ray{{1, 1, 1}, {0, 0, -1}}, unit_box));
-
-  BOOST_TEST(intersects(Ray{{0, 1, 1}, {0, 0, 1}}, unit_box));
-  BOOST_TEST(intersects(Ray{{1, 0, 1}, {1, 0, 0}}, unit_box));
-  BOOST_TEST(intersects(Ray{{1, 1, 0}, {0, 1, 0}}, unit_box));
-
-  BOOST_TEST(intersects(Ray{{0, 0, 1}, {-1, 0, -1}}, unit_box));
-  BOOST_TEST(intersects(Ray{{0, 0, 1}, {0, 0, 1}}, unit_box));
-  BOOST_TEST(intersects(Ray{{1, 0, 0}, {0, 1, 0}}, unit_box));
-  BOOST_TEST(intersects(Ray{{1, 0, 0}, {-1, 0, 0}}, unit_box));
-  BOOST_TEST(intersects(Ray{{0, 1, 0}, {0, 0, 1}}, unit_box));
-  BOOST_TEST(intersects(Ray{{0, 1, 0}, {0, 0, -1}}, unit_box));
-
-  // more cases with 0*inf:
-  BOOST_TEST(intersects(Ray{{0, 1.5, 1.5}, {0, -1, -1}}, unit_box));
-  BOOST_TEST(!intersects(Ray{{0, 1.5, 1.5}, {0, 1, 1}}, unit_box));
-  BOOST_TEST(intersects(Ray{{1.5, 0, 1.5}, {-1, 0, -1}}, unit_box));
-  BOOST_TEST(!intersects(Ray{{1.5, 0, 1.5}, {1, 0, 1}}, unit_box));
-  BOOST_TEST(intersects(Ray{{1.5, 1.5, 0}, {-1, -1, 0}}, unit_box));
-  BOOST_TEST(!intersects(Ray{{1.5, 1.5, 0}, {1, 1, 0}}, unit_box));
-
-  BOOST_TEST(intersects(Ray{{1, 1.5, 1.5}, {0, -1, -1}}, unit_box));
-  BOOST_TEST(!intersects(Ray{{1, 1.5, 1.5}, {0, 1, 1}}, unit_box));
-  BOOST_TEST(intersects(Ray{{1.5, 1, 1.5}, {-1, 0, -1}}, unit_box));
-  BOOST_TEST(!intersects(Ray{{1.5, 1, 1.5}, {1, 0, 1}}, unit_box));
-  BOOST_TEST(intersects(Ray{{1.5, 1.5, 1}, {-1, -1, 0}}, unit_box));
-  BOOST_TEST(!intersects(Ray{{1.5, 1.5, 1}, {1, 1, 0}}, unit_box));
-
-  BOOST_TEST(intersects(Ray{{1.5, 0, 0}, {-1, 0, 2}}, unit_box));
-  BOOST_TEST(intersects(Ray{{1.5, 0, 0}, {-1, 2, 0}}, unit_box));
-  BOOST_TEST(!intersects(Ray{{1.5, 0, 0}, {-1, 0, 2.1}}, unit_box));
-  BOOST_TEST(!intersects(Ray{{1.5, 0, 0}, {-1, 2.1, 0}}, unit_box));
-  BOOST_TEST(intersects(Ray{{1.5, 1, 1}, {-1, 0, -2}}, unit_box));
-  BOOST_TEST(intersects(Ray{{1.5, 1, 1}, {-1, -2, 0}}, unit_box));
-  BOOST_TEST(!intersects(Ray{{1.5, 1, 1}, {-1, 0, -2.1}}, unit_box));
-  BOOST_TEST(!intersects(Ray{{1.5, 1, 1}, {-1, -2.1, 0}}, unit_box));
-
-  BOOST_TEST(intersects(Ray{{0, 1.5, 0}, {0, -1, 2}}, unit_box));
-  BOOST_TEST(intersects(Ray{{0, 1.5, 0}, {2, -1, 0}}, unit_box));
-  BOOST_TEST(!intersects(Ray{{0, 1.5, 0}, {0, -1, 2.1}}, unit_box));
-  BOOST_TEST(!intersects(Ray{{0, 1.5, 0}, {2.1, -1, 0}}, unit_box));
-  BOOST_TEST(intersects(Ray{{1, 1.5, 1}, {0, -1, -2}}, unit_box));
-  BOOST_TEST(intersects(Ray{{1, 1.5, 1}, {-2, -1, 0}}, unit_box));
-  BOOST_TEST(!intersects(Ray{{1, 1.5, 1}, {0, -1, -2.1}}, unit_box));
-  BOOST_TEST(!intersects(Ray{{1, 1.5, 1}, {-2.1, -1, 0}}, unit_box));
-}
-
-// NOTE until boost 1.70 need to cast both operands when comparing floating
-// points
-BOOST_AUTO_TEST_CASE(overlap_distance_sphere,
-                     *boost::unit_test::tolerance(1e-6f))
-{
-  using ArborX::Sphere;
-  using ArborX::Experimental::Ray;
-  constexpr Sphere unit_sphere{{0, 0, 0}, 1};
-
-  auto const sqrtf_3 = std::sqrt(3.f);
-  auto const half_sqrtf_2 = std::sqrt(2.f) / 2;
-  auto const half_sqrtf_3 = std::sqrt(3.f) / 2;
-
-  // hit center of the sphere
-  BOOST_TEST(overlapDistance(Ray{{-2, 0, 0}, {1, 0, 0}}, unit_sphere) == 2.f);
-  BOOST_TEST(overlapDistance(Ray{{0, 3, 0}, {0, -1, 0}}, unit_sphere) == 2.f);
-  BOOST_TEST(overlapDistance(Ray{{0, 0, -4}, {0, 0, 1}}, unit_sphere) == 2.f);
-  BOOST_TEST(overlapDistance(Ray{{-2, -2, -2}, {1, 1, 1}}, unit_sphere) == 2.f);
-  // miss it
-  BOOST_TEST(overlapDistance(Ray{{-2, -2, -2}, {1, 0, 0}}, unit_sphere) == 0.f);
-  BOOST_TEST(overlapDistance(Ray{{1, 2, 3}, {4, 5, 6}}, unit_sphere) == 0.f);
-  // half-radius
-  BOOST_TEST(overlapDistance(Ray{{-2, 0, 0.5}, {1, 0, 0}}, unit_sphere) ==
-             sqrtf_3);
-  BOOST_TEST(overlapDistance(Ray{{0, -0.5, 2}, {0, 0, -1}}, unit_sphere) ==
-             sqrtf_3);
-  // touch surface but no intersection
-  BOOST_TEST(overlapDistance(Ray{{1, -2, 0}, {0, 1, 0}}, unit_sphere) == 0.f);
-  BOOST_TEST(overlapDistance(Ray{{2, 2, -1}, {-1, -1, 0}}, unit_sphere) == 0.f);
-
-  // behind the origin
-  BOOST_TEST(overlapDistance(Ray{{-2, 0, 0}, {-1, 0, 0}}, unit_sphere) == 0.f);
-  BOOST_TEST(overlapDistance(Ray{{0, 2, 2}, {0, 1, 1}}, unit_sphere) == 0.f);
-  BOOST_TEST(overlapDistance(Ray{{0, 2, 2}, {0, 1, 1}}, unit_sphere) == 0.f);
-
-  // origin inside
-  BOOST_TEST(overlapDistance(Ray{{0.5, 0, 0}, {0, 1, 1}}, unit_sphere) ==
-             half_sqrtf_3);
-  BOOST_TEST(overlapDistance(Ray{{0, -half_sqrtf_3, 0}, {0, 0, 1}},
-                             unit_sphere) == 0.5f);
-  BOOST_TEST(overlapDistance(Ray{{0, 0, half_sqrtf_2}, {1, -1, 0}},
-                             unit_sphere) == half_sqrtf_2);
-  BOOST_TEST(overlapDistance(Ray{{0, 0.6, 0}, {0, 1, 0}}, unit_sphere) == 0.4f);
-  BOOST_TEST(overlapDistance(Ray{{0, 0, 0}, {1, 2, 3}}, unit_sphere) == 1.f);
-
-  // origin on surface
-  //   tangent
-  BOOST_TEST(overlapDistance(Ray{{0, 0, 1}, {1, -1, 0}}, unit_sphere) == 0.f);
-  BOOST_TEST(overlapDistance(Ray{{0, 1, 0}, {2, 0, 3}}, unit_sphere) == 0.f);
-  BOOST_TEST(
-      overlapDistance(Ray{{half_sqrtf_2, half_sqrtf_2, 0}, {1, -1, 0}},
-                      unit_sphere) == 0.f,
-      boost::test_tools::tolerance(5e-4f)); // inside at machine precision...
-  BOOST_TEST(overlapDistance(Ray{{-half_sqrtf_3, 0.5, 0}, {1, 2, 0}},
-                             unit_sphere) == 0.f);
-  BOOST_TEST(overlapDistance(Ray{{0.5, half_sqrtf_3, 0}, {2, -1, 0}},
-                             unit_sphere) == 0.f);
-  //   directed at sphere
-  BOOST_TEST(overlapDistance(Ray{{1, 0, 0}, {-2, 0, 0}}, unit_sphere) == 2.f);
-  BOOST_TEST(overlapDistance(Ray{{1, 0, 0}, {-2, 0, 0}}, unit_sphere) == 2.f);
-  BOOST_TEST(overlapDistance(Ray{{0, -half_sqrtf_2, half_sqrtf_2}, {0, 1, -1}},
-                             unit_sphere) == 2.f);
-  BOOST_TEST(overlapDistance(Ray{{half_sqrtf_3, 0.5, 0}, {-1, 0, 0}},
-                             unit_sphere) == sqrtf_3);
-  //   directed away
-  BOOST_TEST(overlapDistance(Ray{{0, 0, 1}, {1, 1, 1}}, unit_sphere) == 0.f);
-  BOOST_TEST(overlapDistance(Ray{{half_sqrtf_3, 0.5, 0}, {1, 0, 0}},
-                             unit_sphere) == 0.f);
-}
-
-#define STATIC_ASSERT(cond) static_assert(cond, "");
-BOOST_AUTO_TEST_CASE(make_euclidean_vector)
-{
-  using ArborX::Experimental::makeVector;
-  using ArborX::Experimental::Vector;
-  STATIC_ASSERT((makeVector({0, 0, 0}, {1, 2, 3}) == Vector{1, 2, 3}));
-  STATIC_ASSERT((makeVector({1, 2, 3}, {4, 5, 6}) == Vector{3, 3, 3}));
-}
-
-BOOST_AUTO_TEST_CASE(dot_product)
-{
-  using ArborX::Experimental::dotProduct;
-  STATIC_ASSERT(dotProduct({1, 0, 0}, {1, 0, 0}) == 1);
-  STATIC_ASSERT(dotProduct({1, 0, 0}, {0, 1, 0}) == 0);
-  STATIC_ASSERT(dotProduct({1, 0, 0}, {0, 0, 1}) == 0);
-  STATIC_ASSERT(dotProduct({1, 1, 1}, {1, 1, 1}) == 3);
-}
-
-BOOST_AUTO_TEST_CASE(cross_product)
-{
-  using ArborX::Experimental::crossProduct;
-  using ArborX::Experimental::Vector;
-  STATIC_ASSERT((crossProduct({1, 0, 0}, {1, 0, 0}) == Vector{0, 0, 0}));
-  STATIC_ASSERT((crossProduct({1, 0, 0}, {0, 1, 0}) == Vector{0, 0, 1}));
-  STATIC_ASSERT((crossProduct({1, 0, 0}, {0, 0, 1}) == Vector{0, -1, 0}));
-  STATIC_ASSERT((crossProduct({0, 1, 0}, {1, 0, 0}) == Vector{0, 0, -1}));
-  STATIC_ASSERT((crossProduct({0, 1, 0}, {0, 1, 0}) == Vector{0, 0, 0}));
-  STATIC_ASSERT((crossProduct({0, 1, 0}, {0, 0, 1}) == Vector{1, 0, 0}));
-  STATIC_ASSERT((crossProduct({1, 1, 1}, {1, 1, 1}) == Vector{0, 0, 0}));
-}
-#undef STATIC_ASSERT
diff --git a/arborx/test/tstScopedProfileRegion.cpp b/arborx/test/tstScopedProfileRegion.cpp
deleted file mode 100644
index fbf13cb34..000000000
--- a/arborx/test/tstScopedProfileRegion.cpp
+++ /dev/null
@@ -1,97 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2017-2021 by the ArborX authors                            *
- * All rights reserved.                                                     *
- *                                                                          *
- * This file is part of the ArborX library. ArborX is                       *
- * distributed under a BSD 3-clause license. For the licensing terms see    *
- * the LICENSE file in the top-level directory.                             *
- *                                                                          *
- * SPDX-License-Identifier: BSD-3-Clause                                    *
- ****************************************************************************/
-
-#include <ArborX_DetailsKokkosExtScopedProfileRegion.hpp>
-
-#include <boost/test/unit_test.hpp>
-
-#include <stack>
-#include <string>
-#include <type_traits>
-
-#if (KOKKOS_VERSION >= 30200) // callback registration from within the program
-                              // was added in Kokkkos v3.2
-
-namespace
-{
-std::stack<std::string> arborx_test_region_stack;
-
-// NOTE: cannot use lambdas because they can only be converted to function
-// pointers if they don't capture anything
-void arborx_test_push_region(char const *label)
-{
-  BOOST_TEST_MESSAGE(std::string("push ") + label);
-  arborx_test_region_stack.push(label);
-}
-
-void arborx_test_pop_region()
-{
-  auto const &label = arborx_test_region_stack.top();
-  BOOST_TEST_MESSAGE(std::string("pop ") + label);
-  arborx_test_region_stack.pop();
-}
-
-} // namespace
-
-BOOST_AUTO_TEST_SUITE(KokkosToolsAnnotations)
-
-BOOST_AUTO_TEST_CASE(scoped_profile_region)
-{
-  Kokkos::Tools::Experimental::set_push_region_callback(
-      arborx_test_push_region);
-  Kokkos::Tools::Experimental::set_pop_region_callback(arborx_test_pop_region);
-
-  BOOST_TEST(arborx_test_region_stack.empty());
-
-  // Unnamed guard!  Profile region is popped at the end of the statement.
-  KokkosExt::ScopedProfileRegion("bug");
-
-  BOOST_TEST(arborx_test_region_stack.empty());
-
-  {
-    std::string outer_identifier = "outer";
-    KokkosExt::ScopedProfileRegion guard_outer(outer_identifier);
-
-    BOOST_TEST(arborx_test_region_stack.size() == 1);
-    BOOST_TEST(arborx_test_region_stack.top() == outer_identifier);
-
-    {
-      std::string inner_identifier = "inner";
-      KokkosExt::ScopedProfileRegion guard_inner(inner_identifier);
-      BOOST_TEST(arborx_test_region_stack.size() == 2);
-      BOOST_TEST(arborx_test_region_stack.top() == inner_identifier);
-    }
-
-    BOOST_TEST(arborx_test_region_stack.size() == 1);
-    BOOST_TEST(arborx_test_region_stack.top() == outer_identifier);
-  }
-
-  BOOST_TEST(arborx_test_region_stack.empty());
-
-  // Unset callbacks
-  Kokkos::Tools::Experimental::set_push_region_callback(nullptr);
-  Kokkos::Tools::Experimental::set_pop_region_callback(nullptr);
-}
-
-static_assert(
-    !std::is_default_constructible<KokkosExt::ScopedProfileRegion>::value, "");
-static_assert(
-    !std::is_copy_constructible<KokkosExt::ScopedProfileRegion>::value, "");
-static_assert(
-    !std::is_move_constructible<KokkosExt::ScopedProfileRegion>::value, "");
-static_assert(!std::is_copy_assignable<KokkosExt::ScopedProfileRegion>::value,
-              "");
-static_assert(!std::is_move_assignable<KokkosExt::ScopedProfileRegion>::value,
-              "");
-
-BOOST_AUTO_TEST_SUITE_END()
-
-#endif
diff --git a/arborx/test/tstSequenceContainers.cpp b/arborx/test/tstSequenceContainers.cpp
deleted file mode 100644
index 2284208a9..000000000
--- a/arborx/test/tstSequenceContainers.cpp
+++ /dev/null
@@ -1,146 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2017-2021 by the ArborX authors                            *
- * All rights reserved.                                                     *
- *                                                                          *
- * This file is part of the ArborX library. ArborX is                       *
- * distributed under a BSD 3-clause license. For the licensing terms see    *
- * the LICENSE file in the top-level directory.                             *
- *                                                                          *
- * SPDX-License-Identifier: BSD-3-Clause                                    *
- ****************************************************************************/
-
-#include <ArborX_DetailsContainers.hpp>
-
-#define BOOST_TEST_MODULE Containers
-#include <boost/test/unit_test.hpp>
-
-using ArborX::Details::StaticVector;
-using ArborX::Details::UnmanagedStaticVector;
-
-BOOST_AUTO_TEST_SUITE(SequenceContainers)
-
-BOOST_AUTO_TEST_CASE(dynamic_array_with_fixed_maximum_size)
-{
-  StaticVector<int, 4> a;
-
-  BOOST_TEST(a.empty());
-  BOOST_TEST(a.size() == 0);
-  BOOST_TEST(a.maxSize() == 4);
-  BOOST_TEST(a.capacity() == 4);
-
-  a.pushBack(255);
-  BOOST_TEST(!a.empty());
-  BOOST_TEST(a.size() == 1);
-  BOOST_TEST(a.maxSize() == 4);
-  BOOST_TEST(a.capacity() == 4);
-  BOOST_TEST(a.front() == 255);
-  BOOST_TEST(a[0] == 255);
-  BOOST_TEST(a.back() == 255);
-
-  a.pushBack(-1);
-  BOOST_TEST(!a.empty());
-  BOOST_TEST(a.size() == 2);
-  BOOST_TEST(a.maxSize() == 4);
-  BOOST_TEST(a.capacity() == 4);
-  BOOST_TEST(a.front() == 255);
-  BOOST_TEST(a[0] == 255);
-  BOOST_TEST(a.back() == -1);
-  BOOST_TEST(a[1] == -1);
-
-  a.pushBack(33);
-  BOOST_TEST(!a.empty());
-  BOOST_TEST(a.size() == 3);
-  BOOST_TEST(a.maxSize() == 4);
-  BOOST_TEST(a.capacity() == 4);
-  BOOST_TEST(a.front() == 255);
-  BOOST_TEST(a[0] == 255);
-  BOOST_TEST(a[1] == -1);
-  BOOST_TEST(a.back() == 33);
-  BOOST_TEST(a[2] == 33);
-
-  a.popBack();
-  BOOST_TEST(!a.empty());
-  BOOST_TEST(a.size() == 2);
-  BOOST_TEST(a.maxSize() == 4);
-  BOOST_TEST(a.capacity() == 4);
-  BOOST_TEST(a.front() == 255);
-  BOOST_TEST(a.back() == -1);
-
-  a.popBack();
-  BOOST_TEST(!a.empty());
-  BOOST_TEST(a.size() == 1);
-  BOOST_TEST(a.maxSize() == 4);
-  BOOST_TEST(a.capacity() == 4);
-  BOOST_TEST(a.front() == 255);
-  BOOST_TEST(a.back() == 255);
-
-  a.popBack();
-  BOOST_TEST(a.empty());
-  BOOST_TEST(a.size() == 0);
-  BOOST_TEST(a.maxSize() == 4);
-  BOOST_TEST(a.capacity() == 4);
-}
-
-BOOST_AUTO_TEST_CASE(non_owning_view_over_dynamic_array)
-{
-  float data[6] = {255, 255, 255, 255, 255, 255};
-  //                        ^^^^ ^^^^ ^^^^
-  UnmanagedStaticVector<float> a(data + 2, 3);
-
-  BOOST_TEST(!std::is_default_constructible<decltype(a)>::value);
-  BOOST_TEST(a.data() == data + 2);
-
-  BOOST_TEST(a.empty());
-  BOOST_TEST(a.size() == 0);
-  BOOST_TEST(a.maxSize() == 3);
-  BOOST_TEST(a.capacity() == 3);
-
-  a.pushBack(0);
-  BOOST_TEST(!a.empty());
-  BOOST_TEST(a.size() == 1);
-  BOOST_TEST(a.maxSize() == 3);
-  BOOST_TEST(a.capacity() == 3);
-  BOOST_TEST(a.front() == 0);
-  BOOST_TEST(a.back() == 0);
-  BOOST_TEST(a[0] == 0);
-
-  a.pushBack(1);
-  BOOST_TEST(!a.empty());
-  BOOST_TEST(a.size() == 2);
-  BOOST_TEST(a.maxSize() == 3);
-  BOOST_TEST(a.capacity() == 3);
-  BOOST_TEST(a.front() == 0);
-  BOOST_TEST(a[0] == 0);
-  BOOST_TEST(a.back() == 1);
-  BOOST_TEST(a[1] == 1);
-
-  a.pushBack(2);
-  BOOST_TEST(!a.empty());
-  BOOST_TEST(a.size() == 3);
-  BOOST_TEST(a.maxSize() == 3);
-  BOOST_TEST(a.capacity() == 3);
-  BOOST_TEST(a.front() == 0);
-  BOOST_TEST(a[0] == 0);
-  BOOST_TEST(a[1] == 1);
-  BOOST_TEST(a.back() == 2);
-  BOOST_TEST(a[2] == 2);
-
-  a.popBack();
-  BOOST_TEST(!a.empty());
-  BOOST_TEST(a.size() == 2);
-  BOOST_TEST(a.maxSize() == 3);
-  BOOST_TEST(a.capacity() == 3);
-  BOOST_TEST(a.front() == 0);
-  BOOST_TEST(a[0] == 0);
-  BOOST_TEST(a.back() == 1);
-  BOOST_TEST(a[1] == 1);
-
-  BOOST_TEST(data[0] == 255);
-  BOOST_TEST(data[1] == 255);
-  BOOST_TEST(data[2] == 0);
-  BOOST_TEST(data[3] == 1);
-  BOOST_TEST(data[4] == 2);
-  BOOST_TEST(data[5] == 255);
-}
-
-BOOST_AUTO_TEST_SUITE_END()
diff --git a/arborx/test/utf_main.cpp b/arborx/test/utf_main.cpp
deleted file mode 100644
index d3bdaceb8..000000000
--- a/arborx/test/utf_main.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2017-2021 by the ArborX authors                            *
- * All rights reserved.                                                     *
- *                                                                          *
- * This file is part of the ArborX library. ArborX is                       *
- * distributed under a BSD 3-clause license. For the licensing terms see    *
- * the LICENSE file in the top-level directory.                             *
- *                                                                          *
- * SPDX-License-Identifier: BSD-3-Clause                                    *
- ****************************************************************************/
-
-#include <Kokkos_Core.hpp>
-
-#define BOOST_TEST_NO_MAIN
-#include <boost/test/unit_test.hpp>
-
-#if defined(ARBORX_MPI_UNIT_TEST)
-#include <mpi.h>
-#endif
-
-struct ExecutionEnvironmentScopeGuard
-{
-  ExecutionEnvironmentScopeGuard(int argc, char *argv[])
-  {
-#if defined(ARBORX_MPI_UNIT_TEST)
-    MPI_Init(&argc, &argv);
-#endif
-    Kokkos::initialize(argc, argv);
-  }
-  ~ExecutionEnvironmentScopeGuard()
-  {
-    Kokkos::finalize();
-#if defined(ARBORX_MPI_UNIT_TEST)
-    MPI_Finalize();
-#endif
-  }
-};
-
-bool init_function() { return true; }
-
-int main(int argc, char *argv[])
-{
-  ExecutionEnvironmentScopeGuard scope_guard(argc, argv);
-  return boost::unit_test::unit_test_main(&init_function, argc, argv);
-}

From e15e2179351b6f3c7c43c984598ff61a3f4cab08 Mon Sep 17 00:00:00 2001
From: Paul Kuberry <pakuber@sandia.gov>
Date: Tue, 28 Sep 2021 16:41:00 -0600
Subject: [PATCH 16/40] ArborX radius search working on GPU

---
 src/Compadre_PointCloudSearch_ArborX.hpp | 69 ++++++++++++++++--------
 1 file changed, 46 insertions(+), 23 deletions(-)

diff --git a/src/Compadre_PointCloudSearch_ArborX.hpp b/src/Compadre_PointCloudSearch_ArborX.hpp
index 8a43b1564..809c20b94 100644
--- a/src/Compadre_PointCloudSearch_ArborX.hpp
+++ b/src/Compadre_PointCloudSearch_ArborX.hpp
@@ -8,19 +8,26 @@
 
 template <typename view_type_1>
 struct Points {
-    view_type_1 _pts;
-    Points(view_type_1 pts): 
-                _pts(pts) {}
+    typedef decltype(Kokkos::create_mirror_view<device_memory_space>(
+                device_memory_space(), view_type_1())) 
+                        device_mirror_type;
+    device_mirror_type _pts;
+
+    Points(view_type_1 pts) {
+        _pts = Kokkos::create_mirror_view<device_memory_space>(device_memory_space(), pts);
+        Kokkos::deep_copy(_pts, pts);
+        Kokkos::fence();
+    }
 };
 
 template <typename view_type>
 struct ArborX::AccessTraits<Points<view_type>, ArborX::PrimitivesTag>
 {
-    static KOKKOS_FUNCTION std::size_t size(Points<view_type> const &cloud)
+    static KOKKOS_FUNCTION std::size_t size(Points<view_type> const cloud)
     {
         return cloud._pts.extent(0);
     }
-    static KOKKOS_FUNCTION ArborX::Point get(Points<view_type> const &cloud, std::size_t i)
+    static KOKKOS_FUNCTION ArborX::Point get(Points<view_type> const cloud, std::size_t i)
     {
         switch (cloud._pts.extent(1)) {
         case 3:
@@ -34,23 +41,32 @@ struct ArborX::AccessTraits<Points<view_type>, ArborX::PrimitivesTag>
             return ArborX::Point(           0.0,             0.0,             0.0);
         }
     }
-    using memory_space = host_memory_space;
+    using memory_space = device_memory_space;
 };
 
 template <typename view_type_1, typename view_type_2>
 struct Radius {
 
-    view_type_1 _pts;
-    view_type_2 _radii;
+    typedef decltype(Kokkos::create_mirror_view<device_memory_space>(
+                device_memory_space(), view_type_1())) 
+                        device_mirror_type_1;
+    device_mirror_type_1 _pts;
+    typedef decltype(Kokkos::create_mirror_view<device_memory_space>(
+                device_memory_space(), view_type_2())) 
+                        device_mirror_type_2;
+    device_mirror_type_2 _radii;
     double _uniform_radius;
     double _max_search_radius;
 
     Radius(view_type_1 pts, view_type_2 radii, const double uniform_radius, 
-            const double max_search_radius) : 
-                _pts(pts), _radii(radii),
+            const double max_search_radius) :
                 _uniform_radius(uniform_radius), 
-                _max_search_radius(max_search_radius) 
-    {}
+                _max_search_radius(max_search_radius) {
+        _pts = Kokkos::create_mirror_view<device_memory_space>(device_memory_space(), pts);
+        _radii = Kokkos::create_mirror_view<device_memory_space>(device_memory_space(), radii);
+        Kokkos::deep_copy(_pts, pts);
+        Kokkos::deep_copy(_radii, radii);
+    }
 };
 
 template <typename view_type_1, typename view_type_2>
@@ -87,8 +103,11 @@ struct ArborX::AccessTraits<Radius<view_type_1, view_type_2>, ArborX::Predicates
                       ArborX::Point(            0.0,             0.0,             0.0),
                       radius));
       }
+      return ArborX::intersects(ArborX::Sphere(
+                  ArborX::Point(            0.0,             0.0,             0.0),
+                  0.0));
   }
-  using memory_space = host_memory_space;
+  using memory_space = device_memory_space;
 };
 
 template <typename view_type_1>
@@ -164,7 +183,7 @@ class PointCloudSearch {
         local_index_type _dim;
         local_index_type _max_leaf;
 
-        ArborX::BVH<host_memory_space> _tree;
+        ArborX::BVH<device_memory_space> _tree;
 
     public:
 
@@ -177,11 +196,8 @@ class PointCloudSearch {
                     && "Views passed to PointCloudSearch at construction should be accessible from the host.");
 
             {
-                //if (Kokkos::SpaceAccessibility<device_execution_space, 
-                //        typename trg_view_type::memory_space>::accessible==1) {
-                    _tree = ArborX::BVH<host_memory_space>(host_execution_space(), 
+                _tree = ArborX::BVH<device_memory_space>(device_execution_space(), 
                                 Points<view_type>(_src_pts_view));
-                //}
             }
         };
     
@@ -322,12 +338,19 @@ class PointCloudSearch {
             compadre_assert_release((epsilons.extent(0)==(size_t)num_target_sites)
                         && "epsilons View does not have the correct dimension");
 
-            // perform tree search
-            Kokkos::View<int *, host_memory_space> values("values", 0);
-            Kokkos::View<int *, host_memory_space> offsets("offsets", 0);
-            auto predicates = Radius<trg_view_type,epsilons_view_type>(trg_pts_view, epsilons,
+            // perform tree search on device
+            Kokkos::View<int*, device_memory_space> d_values("values", 0);
+            Kokkos::View<int*, device_memory_space> d_offsets("offsets", 0);
+            auto predicates = Radius<trg_view_type,epsilons_view_type>(
+                    trg_pts_view, epsilons,
                     uniform_radius, max_search_radius);
-            _tree.query(host_execution_space(), predicates, values, offsets);
+            _tree.query(device_execution_space(), predicates, d_values, d_offsets);
+            // move solution back to host accessible space 
+            // (does nothing if already host accessible)
+            auto values  = create_mirror_view(d_values);
+            auto offsets = create_mirror_view(d_offsets);
+            Kokkos::deep_copy(values,  d_values);
+            Kokkos::deep_copy(offsets, d_offsets);
 
             // set number of neighbors list (how many neighbors for each target site) based
             // on results on tree query

From db935f8d112f31ac5fff3f18ef264e91d0569a44 Mon Sep 17 00:00:00 2001
From: Paul Kuberry <pakuber@sandia.gov>
Date: Tue, 28 Sep 2021 19:39:23 -0600
Subject: [PATCH 17/40] ArborX nearest neighbor search working on GPU

---
 src/Compadre_PointCloudSearch_ArborX.hpp | 46 ++++++++++++++++--------
 1 file changed, 32 insertions(+), 14 deletions(-)

diff --git a/src/Compadre_PointCloudSearch_ArborX.hpp b/src/Compadre_PointCloudSearch_ArborX.hpp
index 809c20b94..a456acbcc 100644
--- a/src/Compadre_PointCloudSearch_ArborX.hpp
+++ b/src/Compadre_PointCloudSearch_ArborX.hpp
@@ -23,11 +23,11 @@ struct Points {
 template <typename view_type>
 struct ArborX::AccessTraits<Points<view_type>, ArborX::PrimitivesTag>
 {
-    static KOKKOS_FUNCTION std::size_t size(Points<view_type> const cloud)
+    static KOKKOS_FUNCTION std::size_t size(Points<view_type> const &cloud)
     {
         return cloud._pts.extent(0);
     }
-    static KOKKOS_FUNCTION ArborX::Point get(Points<view_type> const cloud, std::size_t i)
+    static KOKKOS_FUNCTION ArborX::Point get(Points<view_type> const &cloud, std::size_t i)
     {
         switch (cloud._pts.extent(1)) {
         case 3:
@@ -66,6 +66,12 @@ struct Radius {
         _radii = Kokkos::create_mirror_view<device_memory_space>(device_memory_space(), radii);
         Kokkos::deep_copy(_pts, pts);
         Kokkos::deep_copy(_radii, radii);
+        Kokkos::fence();
+    }
+
+    void getRadiiFromDevice(view_type_2 radii) {
+        Kokkos::deep_copy(radii, _radii);
+        Kokkos::fence();
     }
 };
 
@@ -103,22 +109,24 @@ struct ArborX::AccessTraits<Radius<view_type_1, view_type_2>, ArborX::Predicates
                       ArborX::Point(            0.0,             0.0,             0.0),
                       radius));
       }
-      return ArborX::intersects(ArborX::Sphere(
-                  ArborX::Point(            0.0,             0.0,             0.0),
-                  0.0));
   }
   using memory_space = device_memory_space;
 };
 
 template <typename view_type_1>
 struct NearestNeighbor {
-
-    view_type_1 _pts;
+    typedef decltype(Kokkos::create_mirror_view<device_memory_space>(
+                device_memory_space(), view_type_1())) 
+                        device_mirror_type;
+    device_mirror_type _pts;
     int _neighbors_needed;
 
     NearestNeighbor(view_type_1 pts, const int neighbors_needed) :
-                _pts(pts), _neighbors_needed(neighbors_needed)
-    {}
+            _neighbors_needed(neighbors_needed) {
+        _pts = Kokkos::create_mirror_view<device_memory_space>(device_memory_space(), pts);
+        Kokkos::deep_copy(_pts, pts);
+        Kokkos::fence();
+    }
 };
 
 template <typename view_type_1>
@@ -151,7 +159,7 @@ struct ArborX::AccessTraits<NearestNeighbor<view_type_1>, ArborX::PredicatesTag>
                       cloud._neighbors_needed);
       }
   }
-  using memory_space = host_memory_space;
+  using memory_space = device_memory_space;
 };
 
 namespace Compadre {
@@ -345,12 +353,15 @@ class PointCloudSearch {
                     trg_pts_view, epsilons,
                     uniform_radius, max_search_radius);
             _tree.query(device_execution_space(), predicates, d_values, d_offsets);
+            // get updated epsilons from device
+            predicates.getRadiiFromDevice(epsilons);
             // move solution back to host accessible space 
             // (does nothing if already host accessible)
             auto values  = create_mirror_view(d_values);
             auto offsets = create_mirror_view(d_offsets);
             Kokkos::deep_copy(values,  d_values);
             Kokkos::deep_copy(offsets, d_offsets);
+            Kokkos::fence();
 
             // set number of neighbors list (how many neighbors for each target site) based
             // on results on tree query
@@ -544,11 +555,18 @@ class PointCloudSearch {
             compadre_assert_release((epsilons.extent(0)==(size_t)num_target_sites)
                         && "epsilons View does not have the correct dimension");
 
-            // perform tree search
-            Kokkos::View<int *, host_memory_space> values("values", 0);
-            Kokkos::View<int *, host_memory_space> offsets("offsets", 0);
+            // perform tree search on device
+            Kokkos::View<int*, device_memory_space> d_values("values", 0);
+            Kokkos::View<int*, device_memory_space> d_offsets("offsets", 0);
             auto predicates = NearestNeighbor<trg_view_type>(trg_pts_view, neighbors_needed);
-            _tree.query(host_execution_space(), predicates, values, offsets);
+            _tree.query(device_execution_space(), predicates, d_values, d_offsets);
+            // move solution back to host accessible space 
+            // (does nothing if already host accessible)
+            auto values  = create_mirror_view(d_values);
+            auto offsets = create_mirror_view(d_offsets);
+            Kokkos::deep_copy(values,  d_values);
+            Kokkos::deep_copy(offsets, d_offsets);
+            Kokkos::fence();
 
             size_t min_num_neighbors = 0;
             // if no target sites, then min_num_neighbors is set to neighbors_needed

From 0bc39fed3925509a420d44d10f7ddb8e8b31f0ea Mon Sep 17 00:00:00 2001
From: Paul Kuberry <pakuber@sandia.gov>
Date: Fri, 1 Oct 2021 07:01:20 -0600
Subject: [PATCH 18/40] Added search_scalar type and SEARCH_SCALAR_EPS, modify
 neighbor test for floats

- Added SEARCH_SCALAR_EPS conditional on which neighbor search routine
  is being used (1e-7 for ArborX and 1e-14 for Nanoflann) because
  ArborX searches using floats and Nanoflann searches using doubles.

- Modified tests and search routine to make the various casts explicit.
---
 examples/NeighborSearchTest.cpp             | 63 ++++++++++-----------
 src/Compadre_PointCloudSearch_ArborX.hpp    | 29 +++++-----
 src/Compadre_PointCloudSearch_Nanoflann.hpp |  4 +-
 src/Compadre_Typedefs.hpp                   |  8 +++
 4 files changed, 55 insertions(+), 49 deletions(-)

diff --git a/examples/NeighborSearchTest.cpp b/examples/NeighborSearchTest.cpp
index 83aa9eb65..3f15e5d39 100644
--- a/examples/NeighborSearchTest.cpp
+++ b/examples/NeighborSearchTest.cpp
@@ -224,13 +224,13 @@ bool all_passed = true;
                     (0,number_target_coords), [&](const int i) {
                 auto &brute_force_neighbor_list_i = const_cast<std::map<int, double>& >(brute_force_neighbor_list[i]);
                 for (int j=0; j<number_source_coords; ++j) {
-                    double dist = 0;
+                    search_scalar dist = 0;
                     for (int k=0; k<dimension; ++k) {
-                        dist += (target_coords(i,k)-source_coords(j,k))*(target_coords(i,k)-source_coords(j,k));
+                        dist += (static_cast<search_scalar>(target_coords(i,k))-static_cast<search_scalar>(source_coords(j,k)))*(static_cast<search_scalar>(target_coords(i,k))-static_cast<search_scalar>(source_coords(j,k)));
                     }
                     dist = std::sqrt(dist);
 
-                    if (dist<(h_multiplier + random_vec(i))*h_spacing) {
+                    if (dist < static_cast<search_scalar>((h_multiplier + random_vec(i))*h_spacing)) {
                         brute_force_neighbor_list_i[j]=dist;
                     }
                 }
@@ -343,13 +343,13 @@ bool all_passed = true;
                     (0,number_target_coords), [&](const int i) {
                 auto &brute_force_neighbor_list_i = const_cast<std::map<int, double>& >(brute_force_neighbor_list[i]);
                 for (int j=0; j<number_source_coords; ++j) {
-                    double dist = 0;
+                    search_scalar dist = 0;
                     for (int k=0; k<dimension; ++k) {
-                        dist += (target_coords(i,k)-source_coords(j,k))*(target_coords(i,k)-source_coords(j,k));
+                        dist += (static_cast<search_scalar>(target_coords(i,k))-static_cast<search_scalar>(source_coords(j,k)))*(static_cast<search_scalar>(target_coords(i,k))-static_cast<search_scalar>(source_coords(j,k)));
                     }
                     dist = std::sqrt(dist);
 
-                    if (dist<(h_multiplier + random_vec(i))*h_spacing) {
+                    if (dist < static_cast<search_scalar>((h_multiplier + random_vec(i))*h_spacing)) {
                         brute_force_neighbor_list_i[j]=dist;
                     }
                 }
@@ -466,13 +466,13 @@ bool all_passed = true;
                     (0,number_target_coords), [&](const int i) {
                 auto &brute_force_neighbor_list_i = const_cast<std::map<int, double>& >(brute_force_neighbor_list[i]);
                 for (int j=0; j<number_source_coords; ++j) {
-                    double dist = 0;
+                    search_scalar dist = 0;
                     for (int k=0; k<dimension; ++k) {
-                        dist += (target_coords(i,k)-source_coords(j,k))*(target_coords(i,k)-source_coords(j,k));
+                        dist += (static_cast<search_scalar>(target_coords(i,k))-static_cast<search_scalar>(source_coords(j,k)))*(static_cast<search_scalar>(target_coords(i,k))-static_cast<search_scalar>(source_coords(j,k)));
                     }
                     dist = std::sqrt(dist);
 
-                    if (dist<(h_multiplier + random_vec(i))*h_spacing) {
+                    if (dist < static_cast<search_scalar>((h_multiplier + random_vec(i))*h_spacing)) {
                         brute_force_neighbor_list_i[j]=dist;
                     }
                 }
@@ -564,9 +564,9 @@ bool all_passed = true;
                     (0,number_target_coords), [&](const int i) {
                 auto &point_cloud_neighbor_list_i = const_cast<std::map<int, double>& >(point_cloud_neighbor_list[i]);
                 for (int j=0; j<nla.getNumberOfNeighborsHost(i); ++j) {
-                    double dist = 0;
+                    search_scalar dist = 0;
                     for (int k=0; k<dimension; ++k) {
-                        dist += (target_coords(i,k)-source_coords(nla.getNeighborHost(i,j),k))*(target_coords(i,k)-source_coords(nla.getNeighborHost(i,j),k));
+                        dist += (static_cast<search_scalar>(target_coords(i,k))-static_cast<search_scalar>(source_coords(nla.getNeighborHost(i,j),k)))*(static_cast<search_scalar>(target_coords(i,k))-static_cast<search_scalar>(source_coords(nla.getNeighborHost(i,j),k)));
                     }
                     dist = std::sqrt(dist);
                     point_cloud_neighbor_list_i[nla.getNeighborHost(i,j)] = dist;
@@ -576,7 +576,6 @@ bool all_passed = true;
             printf("point cloud convert time: %f s\n", point_cloud_convert_time);
             Kokkos::fence();
 
-            double eps = 1e-14;
             // need to do a sort by dist, then verify epsilon(i) = 1.5 * knn_distance
             int epsilon_diff_from_knn_dist_multiplied = 0;
             Kokkos::parallel_reduce("check kth neighbor in point cloud", Kokkos::RangePolicy<Kokkos::DefaultHostExecutionSpace>
@@ -586,7 +585,7 @@ bool all_passed = true;
                 int j = 0;
                 for (auto it=inverted_map.begin(); it!=inverted_map.end(); ++it) {
                     if (j==min_neighbors-1) {
-                        if (std::abs(epsilon(i)/1.5 - it->first) > eps) {
+                        if (std::abs(static_cast<search_scalar>(epsilon(i))/static_cast<search_scalar>(1.5) - static_cast<search_scalar>(it->first)) > SEARCH_SCALAR_EPS) {
                             t_epsilon_diff_from_knn_dist_multiplied++;
                         }
                         break;
@@ -610,14 +609,14 @@ bool all_passed = true;
                     (0,number_target_coords), [&](const int i, int& t_total_insufficient_neighbors) {
                 auto &brute_force_neighbor_list_i = const_cast<std::map<int, double>& >(brute_force_neighbor_list[i]);
                 for (int j=0; j<number_source_coords; ++j) {
-                    double dist = 0;
+                    search_scalar dist = 0;
                     for (int k=0; k<dimension; ++k) {
-                        dist += (target_coords(i,k)-source_coords(j,k))*(target_coords(i,k)-source_coords(j,k));
+                        dist += (static_cast<search_scalar>(target_coords(i,k))-static_cast<search_scalar>(source_coords(j,k)))*(static_cast<search_scalar>(target_coords(i,k))-static_cast<search_scalar>(source_coords(j,k)));
                     }
                     dist = std::sqrt(dist);
 
                     // epsilon was set to 1.5 * distance to kth neighbor, but we need distance to kth neighbor
-                    if (dist<(epsilon(i)/1.5 + eps)) {
+                    if (dist < static_cast<search_scalar>(epsilon(i)/1.5 + SEARCH_SCALAR_EPS)) {
                         brute_force_neighbor_list_i[j]=dist;
                     }
                 }
@@ -625,7 +624,7 @@ bool all_passed = true;
                 if (brute_force_neighbor_list_i.size() < (size_t)min_neighbors) t_total_insufficient_neighbors++;
             }, Kokkos::Sum<int>(total_insufficient_neighbors));
             if (total_insufficient_neighbors > 0) {
-                printf("less neighbors found using kth_neighbor_distance+eps than using knn search.\n");
+                printf("less neighbors found using kth_neighbor_distance+SEARCH_SCALAR_EPS than using knn search.\n");
                 all_passed = false;
             }
             double brute_force_search_time = timer.seconds();
@@ -666,9 +665,9 @@ bool all_passed = true;
                     (0,number_target_coords), [&](const int i) {
                 auto &point_cloud_neighbor_list_i = const_cast<std::map<int, double>& >(point_cloud_neighbor_list[i]);
                 for (int j=1; j<=neighbor_lists(i,0); ++j) {
-                    double dist = 0;
+                    search_scalar dist = 0;
                     for (int k=0; k<dimension; ++k) {
-                        dist += (target_coords(i,k)-source_coords(neighbor_lists(i,j),k))*(target_coords(i,k)-source_coords(neighbor_lists(i,j),k));
+                        dist += (static_cast<search_scalar>(target_coords(i,k))-static_cast<search_scalar>(source_coords(neighbor_lists(i,j),k)))*(static_cast<search_scalar>(target_coords(i,k))-static_cast<search_scalar>(source_coords(neighbor_lists(i,j),k)));
                     }
                     dist = std::sqrt(dist);
                     point_cloud_neighbor_list_i[neighbor_lists(i,j)] = dist;
@@ -678,7 +677,6 @@ bool all_passed = true;
             printf("point cloud convert time: %f s\n", point_cloud_convert_time);
             Kokkos::fence();
 
-            double eps = 1e-14;
             // need to do a sort by dist, then verify epsilon(i) = 1.5 * knn_distance
             int epsilon_diff_from_knn_dist_multiplied = 0;
             Kokkos::parallel_reduce("check kth neighbor in point cloud", Kokkos::RangePolicy<Kokkos::DefaultHostExecutionSpace>
@@ -688,7 +686,7 @@ bool all_passed = true;
                 int j = 0;
                 for (auto it=inverted_map.begin(); it!=inverted_map.end(); ++it) {
                     if (j==min_neighbors-1) {
-                        if (std::abs(epsilon(i)/1.5 - it->first) > eps) {
+                        if (std::abs(static_cast<search_scalar>(epsilon(i))/static_cast<search_scalar>(1.5) - static_cast<search_scalar>(it->first)) > SEARCH_SCALAR_EPS) {
                             t_epsilon_diff_from_knn_dist_multiplied++;
                         }
                         break;
@@ -712,14 +710,14 @@ bool all_passed = true;
                     (0,number_target_coords), [&](const int i, int& t_total_insufficient_neighbors) {
                 auto &brute_force_neighbor_list_i = const_cast<std::map<int, double>& >(brute_force_neighbor_list[i]);
                 for (int j=0; j<number_source_coords; ++j) {
-                    double dist = 0;
+                    search_scalar dist = 0;
                     for (int k=0; k<dimension; ++k) {
-                        dist += (target_coords(i,k)-source_coords(j,k))*(target_coords(i,k)-source_coords(j,k));
+                        dist += (static_cast<search_scalar>(target_coords(i,k))-static_cast<search_scalar>(source_coords(j,k)))*(static_cast<search_scalar>(target_coords(i,k))-static_cast<search_scalar>(source_coords(j,k)));
                     }
                     dist = std::sqrt(dist);
 
                     // epsilon was set to 1.5 * distance to kth neighbor, but we need distance to kth neighbor
-                    if (dist<(epsilon(i)/1.5 + eps)) {
+                    if (dist < static_cast<search_scalar>(epsilon(i)/1.5 + SEARCH_SCALAR_EPS)) {
                         brute_force_neighbor_list_i[j]=dist;
                     }
                 }
@@ -727,7 +725,7 @@ bool all_passed = true;
                 if (brute_force_neighbor_list_i.size() < (size_t)min_neighbors) t_total_insufficient_neighbors++;
             }, Kokkos::Sum<int>(total_insufficient_neighbors));
             if (total_insufficient_neighbors > 0) {
-                printf("less neighbors found using kth_neighbor_distance+eps than using knn search.\n");
+                printf("less neighbors found using kth_neighbor_distance+SEARCH_SCALAR_EPS than using knn search.\n");
                 all_passed = false;
             }
             double brute_force_search_time = timer.seconds();
@@ -770,9 +768,9 @@ bool all_passed = true;
                     (0,number_target_coords), [&](const int i) {
                 auto &point_cloud_neighbor_list_i = const_cast<std::map<int, double>& >(point_cloud_neighbor_list[i]);
                 for (int j=0; j<nla.getNumberOfNeighborsHost(i); ++j) {
-                    double dist = 0;
+                    search_scalar dist = 0;
                     for (int k=0; k<dimension; ++k) {
-                        dist += (target_coords(i,k)-source_coords(nla.getNeighborHost(i,j),k))*(target_coords(i,k)-source_coords(nla.getNeighborHost(i,j),k));
+                        dist += (static_cast<search_scalar>(target_coords(i,k))-static_cast<search_scalar>(source_coords(nla.getNeighborHost(i,j),k)))*(static_cast<search_scalar>(target_coords(i,k))-static_cast<search_scalar>(source_coords(nla.getNeighborHost(i,j),k)));
                     }
                     dist = std::sqrt(dist);
                     point_cloud_neighbor_list_i[nla.getNeighborHost(i,j)] = dist;
@@ -782,7 +780,6 @@ bool all_passed = true;
             printf("point cloud convert time: %f s\n", point_cloud_convert_time);
             Kokkos::fence();
 
-            double eps = 1e-14;
             // need to do a sort by dist, then verify epsilon(i) = 1.5 * knn_distance
             int epsilon_diff_from_knn_dist_multiplied = 0;
             Kokkos::parallel_reduce("check kth neighbor in point cloud", Kokkos::RangePolicy<Kokkos::DefaultHostExecutionSpace>
@@ -792,7 +789,7 @@ bool all_passed = true;
                 int j = 0;
                 for (auto it=inverted_map.begin(); it!=inverted_map.end(); ++it) {
                     if (j==min_neighbors-1) {
-                        if (std::abs(epsilon(i)/1.5 - it->first) > eps) {
+                        if (std::abs(static_cast<search_scalar>(epsilon(i))/static_cast<search_scalar>(1.5) - static_cast<search_scalar>(it->first)) > SEARCH_SCALAR_EPS) {
                             t_epsilon_diff_from_knn_dist_multiplied++;
                         }
                         break;
@@ -816,14 +813,14 @@ bool all_passed = true;
                     (0,number_target_coords), [&](const int i, int& t_total_insufficient_neighbors) {
                 auto &brute_force_neighbor_list_i = const_cast<std::map<int, double>& >(brute_force_neighbor_list[i]);
                 for (int j=0; j<number_source_coords; ++j) {
-                    double dist = 0;
+                    search_scalar dist = 0;
                     for (int k=0; k<dimension; ++k) {
-                        dist += (target_coords(i,k)-source_coords(j,k))*(target_coords(i,k)-source_coords(j,k));
+                        dist += (static_cast<search_scalar>(target_coords(i,k))-static_cast<search_scalar>(source_coords(j,k)))*(static_cast<search_scalar>(target_coords(i,k))-static_cast<search_scalar>(source_coords(j,k)));
                     }
                     dist = std::sqrt(dist);
 
                     // epsilon was set to 1.5 * distance to kth neighbor, but we need distance to kth neighbor
-                    if (dist<(epsilon(i)/1.5 + eps)) {
+                    if (dist < static_cast<search_scalar>(epsilon(i)/1.5 + SEARCH_SCALAR_EPS)) {
                         brute_force_neighbor_list_i[j]=dist;
                     }
                 }
@@ -831,7 +828,7 @@ bool all_passed = true;
                 if (brute_force_neighbor_list_i.size() < (size_t)min_neighbors) t_total_insufficient_neighbors++;
             }, Kokkos::Sum<int>(total_insufficient_neighbors));
             if (total_insufficient_neighbors > 0) {
-                printf("less neighbors found using kth_neighbor_distance+eps than using knn search.\n");
+                printf("less neighbors found using kth_neighbor_distance+SEARCH_SCALAR_EPS than using knn search.\n");
                 all_passed = false;
             }
             double brute_force_search_time = timer.seconds();
diff --git a/src/Compadre_PointCloudSearch_ArborX.hpp b/src/Compadre_PointCloudSearch_ArborX.hpp
index a456acbcc..6b5f657eb 100644
--- a/src/Compadre_PointCloudSearch_ArborX.hpp
+++ b/src/Compadre_PointCloudSearch_ArborX.hpp
@@ -85,7 +85,7 @@ struct ArborX::AccessTraits<Radius<view_type_1, view_type_2>, ArborX::Predicates
   static KOKKOS_FUNCTION ArborX::Intersects<ArborX::Sphere> 
       get(Radius<view_type_1, view_type_2> const &cloud, std::size_t i)
   {
-      double radius = (cloud._uniform_radius != 0) ? cloud._uniform_radius : cloud._radii(i);
+      search_scalar radius = (cloud._uniform_radius != 0) ? cloud._uniform_radius : cloud._radii(i);
       cloud._radii(i) = radius;
       compadre_kernel_assert_release((cloud._radii(i)<=cloud._max_search_radius || cloud._max_search_radius==0) 
               && "max_search_radius given (generally derived from the size of a halo region), \
@@ -221,14 +221,15 @@ class PointCloudSearch {
         }
 
         //! Returns the distance between a point and a source site, given its index
-        inline double kdtreeDistance(const double* queryPt, const int idx) const {
-
-            double distance = 0;
+        inline search_scalar kdtreeDistance(const double* queryPt, const int idx) const {
+            search_scalar distance = 0;
             for (int i=0; i<_dim; ++i) {
-                distance += (_src_pts_view(idx,i)-queryPt[i])*(_src_pts_view(idx,i)-queryPt[i]);
+                distance += (static_cast<search_scalar>(_src_pts_view(idx,i))
+                                -static_cast<search_scalar>(queryPt[i]))
+                           *(static_cast<search_scalar>(_src_pts_view(idx,i))
+                                 -static_cast<search_scalar>(queryPt[i]));
             }
             return std::sqrt(distance);
-
         }
 
         /*! \brief Generates neighbor lists of 2D view by performing a radius search 
@@ -592,15 +593,15 @@ class PointCloudSearch {
                 for (int j=0; j<trg_pts_view.extent(1); ++j) {
                     trg_pt(j) = trg_pts_view(i,j);
                 }
-                double last_neighbor_distance = kdtreeDistance(trg_pt.data(), values(offsets(i)+num_neighbors-1));
+                search_scalar last_neighbor_distance = kdtreeDistance(trg_pt.data(), values(offsets(i)+num_neighbors-1));
 
                 // scale by epsilon_multiplier to window from location where the last neighbor was found
                 epsilons(i) = (last_neighbor_distance > 0) ? 
-                                    last_neighbor_distance*epsilon_multiplier
-                                  : 1e-14*epsilon_multiplier;
-                // the only time the second case using 1e-14 is used is when either zero neighbors or exactly one 
+                                    static_cast<search_scalar>(last_neighbor_distance*epsilon_multiplier)
+                                  : static_cast<search_scalar>(SEARCH_SCALAR_EPS*epsilon_multiplier);
+                // the only time the second case using 1e-7 is used is when either zero neighbors or exactly one 
                 // neighbor (neighbor is target site) is found.  when the follow on radius search is conducted, the one
-                // neighbor (target site) will not be found if left at 0, so any positive amount will do, however 1e-14 
+                // neighbor (target site) will not be found if left at 0, so any positive amount will do, however 1e-7 
                 // should be small enough to ensure that other neighbors are not found
 
                 compadre_kernel_assert_release((epsilons(i)<=max_search_radius || max_search_radius==0 || is_dry_run) 
@@ -609,9 +610,9 @@ class PointCloudSearch {
 
 #ifdef COMPADRE_DEBUG
                 Kokkos::parallel_for(Kokkos::TeamThreadRange(teamMember, num_neighbors-1), [=](const int j) {
-                    double this_distance = kdtreeDistance(trg_pt.data(), values(offsets(i)+j  ));
-                    double next_distance = kdtreeDistance(trg_pt.data(), values(offsets(i)+j+1));
-                    compadre_kernel_assert_debug((this_distance-next_distance<1e-14) 
+                    search_scalar this_distance = kdtreeDistance(trg_pt.data(), values(offsets(i)+j  ));
+                    search_scalar next_distance = kdtreeDistance(trg_pt.data(), values(offsets(i)+j+1));
+                    compadre_kernel_assert_debug((this_distance-next_distance<SEARCH_SCALAR_EPS) 
                         && "Neighbors returned by KD tree search are not ordered.");
                 });
 #endif
diff --git a/src/Compadre_PointCloudSearch_Nanoflann.hpp b/src/Compadre_PointCloudSearch_Nanoflann.hpp
index 45694b247..15eeddb75 100644
--- a/src/Compadre_PointCloudSearch_Nanoflann.hpp
+++ b/src/Compadre_PointCloudSearch_Nanoflann.hpp
@@ -602,7 +602,7 @@ class PointCloudSearch {
             
                     // scale by epsilon_multiplier to window from location where the last neighbor was found
                     epsilons(i) = (neighbor_distances(neighbors_found-1) > 0) ?
-                        std::sqrt(neighbor_distances(neighbors_found-1))*epsilon_multiplier : 1e-14*epsilon_multiplier;
+                        std::sqrt(neighbor_distances(neighbors_found-1))*epsilon_multiplier : SEARCH_SCALAR_EPS*epsilon_multiplier;
                     // the only time the second case using 1e-14 is used is when either zero neighbors or exactly one 
                     // neighbor (neighbor is target site) is found.  when the follow on radius search is conducted, the one
                     // neighbor (target site) will not be found if left at 0, so any positive amount will do, however 1e-14 
@@ -750,7 +750,7 @@ class PointCloudSearch {
             
                     // scale by epsilon_multiplier to window from location where the last neighbor was found
                     epsilons(i) = (neighbor_distances(neighbors_found-1) > 0) ?
-                        std::sqrt(neighbor_distances(neighbors_found-1))*epsilon_multiplier : 1e-14*epsilon_multiplier;
+                        std::sqrt(neighbor_distances(neighbors_found-1))*epsilon_multiplier : SEARCH_SCALAR_EPS*epsilon_multiplier;
                     // the only time the second case using 1e-14 is used is when either zero neighbors or exactly one 
                     // neighbor (neighbor is target site) is found.  when the follow on radius search is conducted, the one
                     // neighbor (target site) will not be found if left at 0, so any positive amount will do, however 1e-14 
diff --git a/src/Compadre_Typedefs.hpp b/src/Compadre_Typedefs.hpp
index 3e1328871..d809a841b 100644
--- a/src/Compadre_Typedefs.hpp
+++ b/src/Compadre_Typedefs.hpp
@@ -26,6 +26,14 @@ typedef double      scalar_type;
 typedef int         local_index_type;
 typedef std::size_t global_index_type;
 
+#ifdef COMPADRE_USE_ARBORX
+typedef float search_scalar;
+constexpr search_scalar SEARCH_SCALAR_EPS = 1e-7;
+#else
+typedef double search_scalar;
+constexpr search_scalar SEARCH_SCALAR_EPS = 1e-14;
+#endif
+
 // helper function when doing pointer arithmetic
 #define TO_GLOBAL(variable) ((global_index_type)variable)
 

From 61a1a1fee7b361fe812e47a7256a6e778f33b97b Mon Sep 17 00:00:00 2001
From: Paul Kuberry <pakuber@sandia.gov>
Date: Fri, 1 Oct 2021 07:36:38 -0600
Subject: [PATCH 19/40] Move arborx to src/tpl folder

---
 {arborx => src/tpl/arborx}/.clang-format                          | 0
 {arborx => src/tpl/arborx}/.clang-format-ignore                   | 0
 {arborx => src/tpl/arborx}/.clang-tidy                            | 0
 {arborx => src/tpl/arborx}/.gitattributes                         | 0
 {arborx => src/tpl/arborx}/.github/workflows/gitlab-ci.yml        | 0
 {arborx => src/tpl/arborx}/.gitignore                             | 0
 {arborx => src/tpl/arborx}/.gitlab-ci.yml                         | 0
 {arborx => src/tpl/arborx}/.jenkins                               | 0
 {arborx => src/tpl/arborx}/.mailmap                               | 0
 {arborx => src/tpl/arborx}/CMakeLists.txt                         | 0
 {arborx => src/tpl/arborx}/LICENSE                                | 0
 {arborx => src/tpl/arborx}/cmake/ArborXConfig.cmake.in            | 0
 {arborx => src/tpl/arborx}/cmake/ArborXSettings.cmake.in          | 0
 {arborx => src/tpl/arborx}/cmake/SetupVersion.cmake               | 0
 {arborx => src/tpl/arborx}/src/ArborX.hpp                         | 0
 {arborx => src/tpl/arborx}/src/ArborX_BruteForce.hpp              | 0
 {arborx => src/tpl/arborx}/src/ArborX_Config.hpp.in               | 0
 {arborx => src/tpl/arborx}/src/ArborX_CrsGraphWrapper.hpp         | 0
 {arborx => src/tpl/arborx}/src/ArborX_DBSCAN.hpp                  | 0
 {arborx => src/tpl/arborx}/src/ArborX_DistributedSearchTree.hpp   | 0
 {arborx => src/tpl/arborx}/src/ArborX_DistributedTree.hpp         | 0
 {arborx => src/tpl/arborx}/src/ArborX_LinearBVH.hpp               | 0
 {arborx => src/tpl/arborx}/src/ArborX_Version.hpp.in              | 0
 {arborx => src/tpl/arborx}/src/details/ArborX_AccessTraits.hpp    | 0
 {arborx => src/tpl/arborx}/src/details/ArborX_Box.hpp             | 0
 {arborx => src/tpl/arborx}/src/details/ArborX_Callbacks.hpp       | 0
 .../tpl/arborx}/src/details/ArborX_DetailsAlgorithms.hpp          | 0
 .../tpl/arborx}/src/details/ArborX_DetailsBatchedQueries.hpp      | 0
 .../tpl/arborx}/src/details/ArborX_DetailsBruteForceImpl.hpp      | 0
 {arborx => src/tpl/arborx}/src/details/ArborX_DetailsConcepts.hpp | 0
 .../tpl/arborx}/src/details/ArborX_DetailsContainers.hpp          | 0
 .../tpl/arborx}/src/details/ArborX_DetailsCrsGraphWrapperImpl.hpp | 0
 .../tpl/arborx}/src/details/ArborX_DetailsDistributedTreeImpl.hpp | 0
 .../tpl/arborx}/src/details/ArborX_DetailsDistributor.hpp         | 0
 {arborx => src/tpl/arborx}/src/details/ArborX_DetailsFDBSCAN.hpp  | 0
 .../tpl/arborx}/src/details/ArborX_DetailsFDBSCANDenseBox.hpp     | 0
 .../tpl/arborx}/src/details/ArborX_DetailsHappyTreeFriends.hpp    | 0
 {arborx => src/tpl/arborx}/src/details/ArborX_DetailsHeap.hpp     | 0
 .../src/details/ArborX_DetailsKokkosExtAccessibilityTraits.hpp    | 0
 .../src/details/ArborX_DetailsKokkosExtArithmeticTraits.hpp       | 0
 .../arborx}/src/details/ArborX_DetailsKokkosExtMathFunctions.hpp  | 0
 .../src/details/ArborX_DetailsKokkosExtMinMaxOperations.hpp       | 0
 .../src/details/ArborX_DetailsKokkosExtScopedProfileRegion.hpp    | 0
 .../tpl/arborx}/src/details/ArborX_DetailsMortonCode.hpp          | 0
 {arborx => src/tpl/arborx}/src/details/ArborX_DetailsNode.hpp     | 0
 .../arborx}/src/details/ArborX_DetailsOperatorFunctionObjects.hpp | 0
 .../tpl/arborx}/src/details/ArborX_DetailsPermutedData.hpp        | 0
 .../tpl/arborx}/src/details/ArborX_DetailsPriorityQueue.hpp       | 0
 .../tpl/arborx}/src/details/ArborX_DetailsSortUtils.hpp           | 0
 {arborx => src/tpl/arborx}/src/details/ArborX_DetailsStack.hpp    | 0
 {arborx => src/tpl/arborx}/src/details/ArborX_DetailsTags.hpp     | 0
 .../tpl/arborx}/src/details/ArborX_DetailsTreeConstruction.hpp    | 0
 .../tpl/arborx}/src/details/ArborX_DetailsTreeTraversal.hpp       | 0
 .../tpl/arborx}/src/details/ArborX_DetailsTreeVisualization.hpp   | 0
 .../tpl/arborx}/src/details/ArborX_DetailsUnionFind.hpp           | 0
 {arborx => src/tpl/arborx}/src/details/ArborX_DetailsUtils.hpp    | 0
 {arborx => src/tpl/arborx}/src/details/ArborX_Exception.hpp       | 0
 {arborx => src/tpl/arborx}/src/details/ArborX_KDOP.hpp            | 0
 {arborx => src/tpl/arborx}/src/details/ArborX_Point.hpp           | 0
 {arborx => src/tpl/arborx}/src/details/ArborX_Predicates.hpp      | 0
 {arborx => src/tpl/arborx}/src/details/ArborX_Ray.hpp             | 0
 {arborx => src/tpl/arborx}/src/details/ArborX_Sphere.hpp          | 0
 {arborx => src/tpl/arborx}/src/details/ArborX_TraversalPolicy.hpp | 0
 63 files changed, 0 insertions(+), 0 deletions(-)
 rename {arborx => src/tpl/arborx}/.clang-format (100%)
 rename {arborx => src/tpl/arborx}/.clang-format-ignore (100%)
 rename {arborx => src/tpl/arborx}/.clang-tidy (100%)
 rename {arborx => src/tpl/arborx}/.gitattributes (100%)
 rename {arborx => src/tpl/arborx}/.github/workflows/gitlab-ci.yml (100%)
 rename {arborx => src/tpl/arborx}/.gitignore (100%)
 rename {arborx => src/tpl/arborx}/.gitlab-ci.yml (100%)
 rename {arborx => src/tpl/arborx}/.jenkins (100%)
 rename {arborx => src/tpl/arborx}/.mailmap (100%)
 rename {arborx => src/tpl/arborx}/CMakeLists.txt (100%)
 rename {arborx => src/tpl/arborx}/LICENSE (100%)
 rename {arborx => src/tpl/arborx}/cmake/ArborXConfig.cmake.in (100%)
 rename {arborx => src/tpl/arborx}/cmake/ArborXSettings.cmake.in (100%)
 rename {arborx => src/tpl/arborx}/cmake/SetupVersion.cmake (100%)
 rename {arborx => src/tpl/arborx}/src/ArborX.hpp (100%)
 rename {arborx => src/tpl/arborx}/src/ArborX_BruteForce.hpp (100%)
 rename {arborx => src/tpl/arborx}/src/ArborX_Config.hpp.in (100%)
 rename {arborx => src/tpl/arborx}/src/ArborX_CrsGraphWrapper.hpp (100%)
 rename {arborx => src/tpl/arborx}/src/ArborX_DBSCAN.hpp (100%)
 rename {arborx => src/tpl/arborx}/src/ArborX_DistributedSearchTree.hpp (100%)
 rename {arborx => src/tpl/arborx}/src/ArborX_DistributedTree.hpp (100%)
 rename {arborx => src/tpl/arborx}/src/ArborX_LinearBVH.hpp (100%)
 rename {arborx => src/tpl/arborx}/src/ArborX_Version.hpp.in (100%)
 rename {arborx => src/tpl/arborx}/src/details/ArborX_AccessTraits.hpp (100%)
 rename {arborx => src/tpl/arborx}/src/details/ArborX_Box.hpp (100%)
 rename {arborx => src/tpl/arborx}/src/details/ArborX_Callbacks.hpp (100%)
 rename {arborx => src/tpl/arborx}/src/details/ArborX_DetailsAlgorithms.hpp (100%)
 rename {arborx => src/tpl/arborx}/src/details/ArborX_DetailsBatchedQueries.hpp (100%)
 rename {arborx => src/tpl/arborx}/src/details/ArborX_DetailsBruteForceImpl.hpp (100%)
 rename {arborx => src/tpl/arborx}/src/details/ArborX_DetailsConcepts.hpp (100%)
 rename {arborx => src/tpl/arborx}/src/details/ArborX_DetailsContainers.hpp (100%)
 rename {arborx => src/tpl/arborx}/src/details/ArborX_DetailsCrsGraphWrapperImpl.hpp (100%)
 rename {arborx => src/tpl/arborx}/src/details/ArborX_DetailsDistributedTreeImpl.hpp (100%)
 rename {arborx => src/tpl/arborx}/src/details/ArborX_DetailsDistributor.hpp (100%)
 rename {arborx => src/tpl/arborx}/src/details/ArborX_DetailsFDBSCAN.hpp (100%)
 rename {arborx => src/tpl/arborx}/src/details/ArborX_DetailsFDBSCANDenseBox.hpp (100%)
 rename {arborx => src/tpl/arborx}/src/details/ArborX_DetailsHappyTreeFriends.hpp (100%)
 rename {arborx => src/tpl/arborx}/src/details/ArborX_DetailsHeap.hpp (100%)
 rename {arborx => src/tpl/arborx}/src/details/ArborX_DetailsKokkosExtAccessibilityTraits.hpp (100%)
 rename {arborx => src/tpl/arborx}/src/details/ArborX_DetailsKokkosExtArithmeticTraits.hpp (100%)
 rename {arborx => src/tpl/arborx}/src/details/ArborX_DetailsKokkosExtMathFunctions.hpp (100%)
 rename {arborx => src/tpl/arborx}/src/details/ArborX_DetailsKokkosExtMinMaxOperations.hpp (100%)
 rename {arborx => src/tpl/arborx}/src/details/ArborX_DetailsKokkosExtScopedProfileRegion.hpp (100%)
 rename {arborx => src/tpl/arborx}/src/details/ArborX_DetailsMortonCode.hpp (100%)
 rename {arborx => src/tpl/arborx}/src/details/ArborX_DetailsNode.hpp (100%)
 rename {arborx => src/tpl/arborx}/src/details/ArborX_DetailsOperatorFunctionObjects.hpp (100%)
 rename {arborx => src/tpl/arborx}/src/details/ArborX_DetailsPermutedData.hpp (100%)
 rename {arborx => src/tpl/arborx}/src/details/ArborX_DetailsPriorityQueue.hpp (100%)
 rename {arborx => src/tpl/arborx}/src/details/ArborX_DetailsSortUtils.hpp (100%)
 rename {arborx => src/tpl/arborx}/src/details/ArborX_DetailsStack.hpp (100%)
 rename {arborx => src/tpl/arborx}/src/details/ArborX_DetailsTags.hpp (100%)
 rename {arborx => src/tpl/arborx}/src/details/ArborX_DetailsTreeConstruction.hpp (100%)
 rename {arborx => src/tpl/arborx}/src/details/ArborX_DetailsTreeTraversal.hpp (100%)
 rename {arborx => src/tpl/arborx}/src/details/ArborX_DetailsTreeVisualization.hpp (100%)
 rename {arborx => src/tpl/arborx}/src/details/ArborX_DetailsUnionFind.hpp (100%)
 rename {arborx => src/tpl/arborx}/src/details/ArborX_DetailsUtils.hpp (100%)
 rename {arborx => src/tpl/arborx}/src/details/ArborX_Exception.hpp (100%)
 rename {arborx => src/tpl/arborx}/src/details/ArborX_KDOP.hpp (100%)
 rename {arborx => src/tpl/arborx}/src/details/ArborX_Point.hpp (100%)
 rename {arborx => src/tpl/arborx}/src/details/ArborX_Predicates.hpp (100%)
 rename {arborx => src/tpl/arborx}/src/details/ArborX_Ray.hpp (100%)
 rename {arborx => src/tpl/arborx}/src/details/ArborX_Sphere.hpp (100%)
 rename {arborx => src/tpl/arborx}/src/details/ArborX_TraversalPolicy.hpp (100%)

diff --git a/arborx/.clang-format b/src/tpl/arborx/.clang-format
similarity index 100%
rename from arborx/.clang-format
rename to src/tpl/arborx/.clang-format
diff --git a/arborx/.clang-format-ignore b/src/tpl/arborx/.clang-format-ignore
similarity index 100%
rename from arborx/.clang-format-ignore
rename to src/tpl/arborx/.clang-format-ignore
diff --git a/arborx/.clang-tidy b/src/tpl/arborx/.clang-tidy
similarity index 100%
rename from arborx/.clang-tidy
rename to src/tpl/arborx/.clang-tidy
diff --git a/arborx/.gitattributes b/src/tpl/arborx/.gitattributes
similarity index 100%
rename from arborx/.gitattributes
rename to src/tpl/arborx/.gitattributes
diff --git a/arborx/.github/workflows/gitlab-ci.yml b/src/tpl/arborx/.github/workflows/gitlab-ci.yml
similarity index 100%
rename from arborx/.github/workflows/gitlab-ci.yml
rename to src/tpl/arborx/.github/workflows/gitlab-ci.yml
diff --git a/arborx/.gitignore b/src/tpl/arborx/.gitignore
similarity index 100%
rename from arborx/.gitignore
rename to src/tpl/arborx/.gitignore
diff --git a/arborx/.gitlab-ci.yml b/src/tpl/arborx/.gitlab-ci.yml
similarity index 100%
rename from arborx/.gitlab-ci.yml
rename to src/tpl/arborx/.gitlab-ci.yml
diff --git a/arborx/.jenkins b/src/tpl/arborx/.jenkins
similarity index 100%
rename from arborx/.jenkins
rename to src/tpl/arborx/.jenkins
diff --git a/arborx/.mailmap b/src/tpl/arborx/.mailmap
similarity index 100%
rename from arborx/.mailmap
rename to src/tpl/arborx/.mailmap
diff --git a/arborx/CMakeLists.txt b/src/tpl/arborx/CMakeLists.txt
similarity index 100%
rename from arborx/CMakeLists.txt
rename to src/tpl/arborx/CMakeLists.txt
diff --git a/arborx/LICENSE b/src/tpl/arborx/LICENSE
similarity index 100%
rename from arborx/LICENSE
rename to src/tpl/arborx/LICENSE
diff --git a/arborx/cmake/ArborXConfig.cmake.in b/src/tpl/arborx/cmake/ArborXConfig.cmake.in
similarity index 100%
rename from arborx/cmake/ArborXConfig.cmake.in
rename to src/tpl/arborx/cmake/ArborXConfig.cmake.in
diff --git a/arborx/cmake/ArborXSettings.cmake.in b/src/tpl/arborx/cmake/ArborXSettings.cmake.in
similarity index 100%
rename from arborx/cmake/ArborXSettings.cmake.in
rename to src/tpl/arborx/cmake/ArborXSettings.cmake.in
diff --git a/arborx/cmake/SetupVersion.cmake b/src/tpl/arborx/cmake/SetupVersion.cmake
similarity index 100%
rename from arborx/cmake/SetupVersion.cmake
rename to src/tpl/arborx/cmake/SetupVersion.cmake
diff --git a/arborx/src/ArborX.hpp b/src/tpl/arborx/src/ArborX.hpp
similarity index 100%
rename from arborx/src/ArborX.hpp
rename to src/tpl/arborx/src/ArborX.hpp
diff --git a/arborx/src/ArborX_BruteForce.hpp b/src/tpl/arborx/src/ArborX_BruteForce.hpp
similarity index 100%
rename from arborx/src/ArborX_BruteForce.hpp
rename to src/tpl/arborx/src/ArborX_BruteForce.hpp
diff --git a/arborx/src/ArborX_Config.hpp.in b/src/tpl/arborx/src/ArborX_Config.hpp.in
similarity index 100%
rename from arborx/src/ArborX_Config.hpp.in
rename to src/tpl/arborx/src/ArborX_Config.hpp.in
diff --git a/arborx/src/ArborX_CrsGraphWrapper.hpp b/src/tpl/arborx/src/ArborX_CrsGraphWrapper.hpp
similarity index 100%
rename from arborx/src/ArborX_CrsGraphWrapper.hpp
rename to src/tpl/arborx/src/ArborX_CrsGraphWrapper.hpp
diff --git a/arborx/src/ArborX_DBSCAN.hpp b/src/tpl/arborx/src/ArborX_DBSCAN.hpp
similarity index 100%
rename from arborx/src/ArborX_DBSCAN.hpp
rename to src/tpl/arborx/src/ArborX_DBSCAN.hpp
diff --git a/arborx/src/ArborX_DistributedSearchTree.hpp b/src/tpl/arborx/src/ArborX_DistributedSearchTree.hpp
similarity index 100%
rename from arborx/src/ArborX_DistributedSearchTree.hpp
rename to src/tpl/arborx/src/ArborX_DistributedSearchTree.hpp
diff --git a/arborx/src/ArborX_DistributedTree.hpp b/src/tpl/arborx/src/ArborX_DistributedTree.hpp
similarity index 100%
rename from arborx/src/ArborX_DistributedTree.hpp
rename to src/tpl/arborx/src/ArborX_DistributedTree.hpp
diff --git a/arborx/src/ArborX_LinearBVH.hpp b/src/tpl/arborx/src/ArborX_LinearBVH.hpp
similarity index 100%
rename from arborx/src/ArborX_LinearBVH.hpp
rename to src/tpl/arborx/src/ArborX_LinearBVH.hpp
diff --git a/arborx/src/ArborX_Version.hpp.in b/src/tpl/arborx/src/ArborX_Version.hpp.in
similarity index 100%
rename from arborx/src/ArborX_Version.hpp.in
rename to src/tpl/arborx/src/ArborX_Version.hpp.in
diff --git a/arborx/src/details/ArborX_AccessTraits.hpp b/src/tpl/arborx/src/details/ArborX_AccessTraits.hpp
similarity index 100%
rename from arborx/src/details/ArborX_AccessTraits.hpp
rename to src/tpl/arborx/src/details/ArborX_AccessTraits.hpp
diff --git a/arborx/src/details/ArborX_Box.hpp b/src/tpl/arborx/src/details/ArborX_Box.hpp
similarity index 100%
rename from arborx/src/details/ArborX_Box.hpp
rename to src/tpl/arborx/src/details/ArborX_Box.hpp
diff --git a/arborx/src/details/ArborX_Callbacks.hpp b/src/tpl/arborx/src/details/ArborX_Callbacks.hpp
similarity index 100%
rename from arborx/src/details/ArborX_Callbacks.hpp
rename to src/tpl/arborx/src/details/ArborX_Callbacks.hpp
diff --git a/arborx/src/details/ArborX_DetailsAlgorithms.hpp b/src/tpl/arborx/src/details/ArborX_DetailsAlgorithms.hpp
similarity index 100%
rename from arborx/src/details/ArborX_DetailsAlgorithms.hpp
rename to src/tpl/arborx/src/details/ArborX_DetailsAlgorithms.hpp
diff --git a/arborx/src/details/ArborX_DetailsBatchedQueries.hpp b/src/tpl/arborx/src/details/ArborX_DetailsBatchedQueries.hpp
similarity index 100%
rename from arborx/src/details/ArborX_DetailsBatchedQueries.hpp
rename to src/tpl/arborx/src/details/ArborX_DetailsBatchedQueries.hpp
diff --git a/arborx/src/details/ArborX_DetailsBruteForceImpl.hpp b/src/tpl/arborx/src/details/ArborX_DetailsBruteForceImpl.hpp
similarity index 100%
rename from arborx/src/details/ArborX_DetailsBruteForceImpl.hpp
rename to src/tpl/arborx/src/details/ArborX_DetailsBruteForceImpl.hpp
diff --git a/arborx/src/details/ArborX_DetailsConcepts.hpp b/src/tpl/arborx/src/details/ArborX_DetailsConcepts.hpp
similarity index 100%
rename from arborx/src/details/ArborX_DetailsConcepts.hpp
rename to src/tpl/arborx/src/details/ArborX_DetailsConcepts.hpp
diff --git a/arborx/src/details/ArborX_DetailsContainers.hpp b/src/tpl/arborx/src/details/ArborX_DetailsContainers.hpp
similarity index 100%
rename from arborx/src/details/ArborX_DetailsContainers.hpp
rename to src/tpl/arborx/src/details/ArborX_DetailsContainers.hpp
diff --git a/arborx/src/details/ArborX_DetailsCrsGraphWrapperImpl.hpp b/src/tpl/arborx/src/details/ArborX_DetailsCrsGraphWrapperImpl.hpp
similarity index 100%
rename from arborx/src/details/ArborX_DetailsCrsGraphWrapperImpl.hpp
rename to src/tpl/arborx/src/details/ArborX_DetailsCrsGraphWrapperImpl.hpp
diff --git a/arborx/src/details/ArborX_DetailsDistributedTreeImpl.hpp b/src/tpl/arborx/src/details/ArborX_DetailsDistributedTreeImpl.hpp
similarity index 100%
rename from arborx/src/details/ArborX_DetailsDistributedTreeImpl.hpp
rename to src/tpl/arborx/src/details/ArborX_DetailsDistributedTreeImpl.hpp
diff --git a/arborx/src/details/ArborX_DetailsDistributor.hpp b/src/tpl/arborx/src/details/ArborX_DetailsDistributor.hpp
similarity index 100%
rename from arborx/src/details/ArborX_DetailsDistributor.hpp
rename to src/tpl/arborx/src/details/ArborX_DetailsDistributor.hpp
diff --git a/arborx/src/details/ArborX_DetailsFDBSCAN.hpp b/src/tpl/arborx/src/details/ArborX_DetailsFDBSCAN.hpp
similarity index 100%
rename from arborx/src/details/ArborX_DetailsFDBSCAN.hpp
rename to src/tpl/arborx/src/details/ArborX_DetailsFDBSCAN.hpp
diff --git a/arborx/src/details/ArborX_DetailsFDBSCANDenseBox.hpp b/src/tpl/arborx/src/details/ArborX_DetailsFDBSCANDenseBox.hpp
similarity index 100%
rename from arborx/src/details/ArborX_DetailsFDBSCANDenseBox.hpp
rename to src/tpl/arborx/src/details/ArborX_DetailsFDBSCANDenseBox.hpp
diff --git a/arborx/src/details/ArborX_DetailsHappyTreeFriends.hpp b/src/tpl/arborx/src/details/ArborX_DetailsHappyTreeFriends.hpp
similarity index 100%
rename from arborx/src/details/ArborX_DetailsHappyTreeFriends.hpp
rename to src/tpl/arborx/src/details/ArborX_DetailsHappyTreeFriends.hpp
diff --git a/arborx/src/details/ArborX_DetailsHeap.hpp b/src/tpl/arborx/src/details/ArborX_DetailsHeap.hpp
similarity index 100%
rename from arborx/src/details/ArborX_DetailsHeap.hpp
rename to src/tpl/arborx/src/details/ArborX_DetailsHeap.hpp
diff --git a/arborx/src/details/ArborX_DetailsKokkosExtAccessibilityTraits.hpp b/src/tpl/arborx/src/details/ArborX_DetailsKokkosExtAccessibilityTraits.hpp
similarity index 100%
rename from arborx/src/details/ArborX_DetailsKokkosExtAccessibilityTraits.hpp
rename to src/tpl/arborx/src/details/ArborX_DetailsKokkosExtAccessibilityTraits.hpp
diff --git a/arborx/src/details/ArborX_DetailsKokkosExtArithmeticTraits.hpp b/src/tpl/arborx/src/details/ArborX_DetailsKokkosExtArithmeticTraits.hpp
similarity index 100%
rename from arborx/src/details/ArborX_DetailsKokkosExtArithmeticTraits.hpp
rename to src/tpl/arborx/src/details/ArborX_DetailsKokkosExtArithmeticTraits.hpp
diff --git a/arborx/src/details/ArborX_DetailsKokkosExtMathFunctions.hpp b/src/tpl/arborx/src/details/ArborX_DetailsKokkosExtMathFunctions.hpp
similarity index 100%
rename from arborx/src/details/ArborX_DetailsKokkosExtMathFunctions.hpp
rename to src/tpl/arborx/src/details/ArborX_DetailsKokkosExtMathFunctions.hpp
diff --git a/arborx/src/details/ArborX_DetailsKokkosExtMinMaxOperations.hpp b/src/tpl/arborx/src/details/ArborX_DetailsKokkosExtMinMaxOperations.hpp
similarity index 100%
rename from arborx/src/details/ArborX_DetailsKokkosExtMinMaxOperations.hpp
rename to src/tpl/arborx/src/details/ArborX_DetailsKokkosExtMinMaxOperations.hpp
diff --git a/arborx/src/details/ArborX_DetailsKokkosExtScopedProfileRegion.hpp b/src/tpl/arborx/src/details/ArborX_DetailsKokkosExtScopedProfileRegion.hpp
similarity index 100%
rename from arborx/src/details/ArborX_DetailsKokkosExtScopedProfileRegion.hpp
rename to src/tpl/arborx/src/details/ArborX_DetailsKokkosExtScopedProfileRegion.hpp
diff --git a/arborx/src/details/ArborX_DetailsMortonCode.hpp b/src/tpl/arborx/src/details/ArborX_DetailsMortonCode.hpp
similarity index 100%
rename from arborx/src/details/ArborX_DetailsMortonCode.hpp
rename to src/tpl/arborx/src/details/ArborX_DetailsMortonCode.hpp
diff --git a/arborx/src/details/ArborX_DetailsNode.hpp b/src/tpl/arborx/src/details/ArborX_DetailsNode.hpp
similarity index 100%
rename from arborx/src/details/ArborX_DetailsNode.hpp
rename to src/tpl/arborx/src/details/ArborX_DetailsNode.hpp
diff --git a/arborx/src/details/ArborX_DetailsOperatorFunctionObjects.hpp b/src/tpl/arborx/src/details/ArborX_DetailsOperatorFunctionObjects.hpp
similarity index 100%
rename from arborx/src/details/ArborX_DetailsOperatorFunctionObjects.hpp
rename to src/tpl/arborx/src/details/ArborX_DetailsOperatorFunctionObjects.hpp
diff --git a/arborx/src/details/ArborX_DetailsPermutedData.hpp b/src/tpl/arborx/src/details/ArborX_DetailsPermutedData.hpp
similarity index 100%
rename from arborx/src/details/ArborX_DetailsPermutedData.hpp
rename to src/tpl/arborx/src/details/ArborX_DetailsPermutedData.hpp
diff --git a/arborx/src/details/ArborX_DetailsPriorityQueue.hpp b/src/tpl/arborx/src/details/ArborX_DetailsPriorityQueue.hpp
similarity index 100%
rename from arborx/src/details/ArborX_DetailsPriorityQueue.hpp
rename to src/tpl/arborx/src/details/ArborX_DetailsPriorityQueue.hpp
diff --git a/arborx/src/details/ArborX_DetailsSortUtils.hpp b/src/tpl/arborx/src/details/ArborX_DetailsSortUtils.hpp
similarity index 100%
rename from arborx/src/details/ArborX_DetailsSortUtils.hpp
rename to src/tpl/arborx/src/details/ArborX_DetailsSortUtils.hpp
diff --git a/arborx/src/details/ArborX_DetailsStack.hpp b/src/tpl/arborx/src/details/ArborX_DetailsStack.hpp
similarity index 100%
rename from arborx/src/details/ArborX_DetailsStack.hpp
rename to src/tpl/arborx/src/details/ArborX_DetailsStack.hpp
diff --git a/arborx/src/details/ArborX_DetailsTags.hpp b/src/tpl/arborx/src/details/ArborX_DetailsTags.hpp
similarity index 100%
rename from arborx/src/details/ArborX_DetailsTags.hpp
rename to src/tpl/arborx/src/details/ArborX_DetailsTags.hpp
diff --git a/arborx/src/details/ArborX_DetailsTreeConstruction.hpp b/src/tpl/arborx/src/details/ArborX_DetailsTreeConstruction.hpp
similarity index 100%
rename from arborx/src/details/ArborX_DetailsTreeConstruction.hpp
rename to src/tpl/arborx/src/details/ArborX_DetailsTreeConstruction.hpp
diff --git a/arborx/src/details/ArborX_DetailsTreeTraversal.hpp b/src/tpl/arborx/src/details/ArborX_DetailsTreeTraversal.hpp
similarity index 100%
rename from arborx/src/details/ArborX_DetailsTreeTraversal.hpp
rename to src/tpl/arborx/src/details/ArborX_DetailsTreeTraversal.hpp
diff --git a/arborx/src/details/ArborX_DetailsTreeVisualization.hpp b/src/tpl/arborx/src/details/ArborX_DetailsTreeVisualization.hpp
similarity index 100%
rename from arborx/src/details/ArborX_DetailsTreeVisualization.hpp
rename to src/tpl/arborx/src/details/ArborX_DetailsTreeVisualization.hpp
diff --git a/arborx/src/details/ArborX_DetailsUnionFind.hpp b/src/tpl/arborx/src/details/ArborX_DetailsUnionFind.hpp
similarity index 100%
rename from arborx/src/details/ArborX_DetailsUnionFind.hpp
rename to src/tpl/arborx/src/details/ArborX_DetailsUnionFind.hpp
diff --git a/arborx/src/details/ArborX_DetailsUtils.hpp b/src/tpl/arborx/src/details/ArborX_DetailsUtils.hpp
similarity index 100%
rename from arborx/src/details/ArborX_DetailsUtils.hpp
rename to src/tpl/arborx/src/details/ArborX_DetailsUtils.hpp
diff --git a/arborx/src/details/ArborX_Exception.hpp b/src/tpl/arborx/src/details/ArborX_Exception.hpp
similarity index 100%
rename from arborx/src/details/ArborX_Exception.hpp
rename to src/tpl/arborx/src/details/ArborX_Exception.hpp
diff --git a/arborx/src/details/ArborX_KDOP.hpp b/src/tpl/arborx/src/details/ArborX_KDOP.hpp
similarity index 100%
rename from arborx/src/details/ArborX_KDOP.hpp
rename to src/tpl/arborx/src/details/ArborX_KDOP.hpp
diff --git a/arborx/src/details/ArborX_Point.hpp b/src/tpl/arborx/src/details/ArborX_Point.hpp
similarity index 100%
rename from arborx/src/details/ArborX_Point.hpp
rename to src/tpl/arborx/src/details/ArborX_Point.hpp
diff --git a/arborx/src/details/ArborX_Predicates.hpp b/src/tpl/arborx/src/details/ArborX_Predicates.hpp
similarity index 100%
rename from arborx/src/details/ArborX_Predicates.hpp
rename to src/tpl/arborx/src/details/ArborX_Predicates.hpp
diff --git a/arborx/src/details/ArborX_Ray.hpp b/src/tpl/arborx/src/details/ArborX_Ray.hpp
similarity index 100%
rename from arborx/src/details/ArborX_Ray.hpp
rename to src/tpl/arborx/src/details/ArborX_Ray.hpp
diff --git a/arborx/src/details/ArborX_Sphere.hpp b/src/tpl/arborx/src/details/ArborX_Sphere.hpp
similarity index 100%
rename from arborx/src/details/ArborX_Sphere.hpp
rename to src/tpl/arborx/src/details/ArborX_Sphere.hpp
diff --git a/arborx/src/details/ArborX_TraversalPolicy.hpp b/src/tpl/arborx/src/details/ArborX_TraversalPolicy.hpp
similarity index 100%
rename from arborx/src/details/ArborX_TraversalPolicy.hpp
rename to src/tpl/arborx/src/details/ArborX_TraversalPolicy.hpp

From 7382af17e93cae21008986a89c2c440e63b68374 Mon Sep 17 00:00:00 2001
From: Paul Kuberry <pakuber@sandia.gov>
Date: Fri, 1 Oct 2021 07:40:25 -0600
Subject: [PATCH 20/40] Update CMake logic for arborx source files move

---
 CMakeLists.txt     | 7 +------
 src/CMakeLists.txt | 2 ++
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 88c5bebd1..036d15868 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -351,12 +351,6 @@ else() # Raw CMake Project
     set(Compadre_EXT_DEPS Kokkos KokkosKernels)
   endif()
 
-  bob_option(Compadre_USE_ARBORX "Use ArborX for neighbor search" OFF)
-  if (Compadre_USE_ARBORX)
-    option(ARBORX_ENABLE_MPI "" "${Compadre_USE_MPI}")
-    add_subdirectory(arborx)
-  endif()
-
 
   #MPI (Not really needed, only used so that if a kokkos-tool was built with MPI, it won't segfault)
   if (Compadre_USE_MPI)
@@ -383,6 +377,7 @@ else() # Raw CMake Project
 
   bob_option(Compadre_TESTS "Compile Compadre tests" ON)
   bob_option(Compadre_EXAMPLES "Compile Compadre examples" "${Compadre_TESTS}")
+  bob_option(Compadre_USE_ARBORX "Use ArborX for neighbor search" OFF)
 
 
 endif() 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 48d41a719..d51256d29 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -56,6 +56,8 @@ elseif (KOKKOSKERNELS_BUILT_FOR_USER) # Kokkos-Kernels built for user by this pr
 endif()
 
 if (Compadre_USE_ARBORX)
+  option(ARBORX_ENABLE_MPI "" "${Compadre_USE_MPI}")
+  add_subdirectory(tpl/arborx)
   target_link_libraries(compadre PUBLIC ArborX::ArborX)
 endif()
 

From 1649ae4c0375d3161bb3aef4e640159742f835c7 Mon Sep 17 00:00:00 2001
From: Paul Kuberry <pakuber@sandia.gov>
Date: Fri, 1 Oct 2021 07:44:37 -0600
Subject: [PATCH 21/40] Remove unneeded arborx files

---
 src/tpl/arborx/.clang-format                  |  22 -
 src/tpl/arborx/.clang-format-ignore           |   0
 src/tpl/arborx/.clang-tidy                    | 109 -----
 src/tpl/arborx/.gitattributes                 |   7 -
 .../arborx/.github/workflows/gitlab-ci.yml    |  21 -
 src/tpl/arborx/.gitignore                     |   4 -
 src/tpl/arborx/.gitlab-ci.yml                 | 147 ------
 src/tpl/arborx/.jenkins                       | 462 ------------------
 src/tpl/arborx/.mailmap                       |   2 -
 9 files changed, 774 deletions(-)
 delete mode 100644 src/tpl/arborx/.clang-format
 delete mode 100644 src/tpl/arborx/.clang-format-ignore
 delete mode 100644 src/tpl/arborx/.clang-tidy
 delete mode 100644 src/tpl/arborx/.gitattributes
 delete mode 100644 src/tpl/arborx/.github/workflows/gitlab-ci.yml
 delete mode 100644 src/tpl/arborx/.gitignore
 delete mode 100644 src/tpl/arborx/.gitlab-ci.yml
 delete mode 100644 src/tpl/arborx/.jenkins
 delete mode 100644 src/tpl/arborx/.mailmap

diff --git a/src/tpl/arborx/.clang-format b/src/tpl/arborx/.clang-format
deleted file mode 100644
index a77b42069..000000000
--- a/src/tpl/arborx/.clang-format
+++ /dev/null
@@ -1,22 +0,0 @@
-BasedOnStyle:  LLVM
----
-AlwaysBreakTemplateDeclarations: true
-BreakBeforeBraces: Allman
-BreakConstructorInitializersBeforeComma: true
-IncludeBlocks: Regroup
-Language: Cpp
-IncludeCategories:
-# arborx first
-  - Regex: "ArborX_Config.hpp"
-    Priority: -1
-  - Regex: "ArborX*"
-    Priority: 1
-# Then Kokkos
-  - Regex: "Kokkos*"
-    Priority: 2
-# Then boost
-  - Regex: "boost*"
-    Priority: 3
-# Finally the standard library
-  - Regex: "<[a-z_]+>"
-    Priority: 10
diff --git a/src/tpl/arborx/.clang-format-ignore b/src/tpl/arborx/.clang-format-ignore
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/tpl/arborx/.clang-tidy b/src/tpl/arborx/.clang-tidy
deleted file mode 100644
index ecd9abb7c..000000000
--- a/src/tpl/arborx/.clang-tidy
+++ /dev/null
@@ -1,109 +0,0 @@
----
-Checks:          'clang-diagnostic-*,clang-analyzer-*,-*,performance-*,-performance-inefficient-string-concatenation,mpi-*,modernize-*,-modernize-pass-by-value,-modernize-use-trailing-return-type,-modernize-avoid-c-arrays,readability-*,-readability-braces-around-statements,-readability-named-parameter,-readability-magic-numbers,-readability-uppercase-literal-suffix'
-WarningsAsErrors: ''
-HeaderFilterRegex: '.*'
-AnalyzeTemporaryDtors: false
-FormatStyle:     none
-CheckOptions:    
-  - key:             google-readability-braces-around-statements.ShortStatementLines
-    value:           '1'
-  - key:             google-readability-function-size.StatementThreshold
-    value:           '800'
-  - key:             google-readability-namespace-comments.ShortNamespaceLines
-    value:           '10'
-  - key:             google-readability-namespace-comments.SpacesBeforeComments
-    value:           '2'
-  - key:             modernize-loop-convert.MaxCopySize
-    value:           '16'
-  - key:             modernize-loop-convert.MinConfidence
-    value:           reasonable
-  - key:             modernize-loop-convert.NamingStyle
-    value:           CamelCase
-  - key:             modernize-make-shared.IgnoreMacros
-    value:           '1'
-  - key:             modernize-make-shared.IncludeStyle
-    value:           '0'
-  - key:             modernize-make-shared.MakeSmartPtrFunction
-    value:           'std::make_shared'
-  - key:             modernize-make-shared.MakeSmartPtrFunctionHeader
-    value:           memory
-  - key:             modernize-make-unique.IgnoreMacros
-    value:           '1'
-  - key:             modernize-make-unique.IncludeStyle
-    value:           '0'
-  - key:             modernize-make-unique.MakeSmartPtrFunction
-    value:           'std::make_unique'
-  - key:             modernize-make-unique.MakeSmartPtrFunctionHeader
-    value:           memory
-  - key:             modernize-pass-by-value.IncludeStyle
-    value:           llvm
-  - key:             modernize-raw-string-literal.ReplaceShorterLiterals
-    value:           '0'
-  - key:             modernize-replace-auto-ptr.IncludeStyle
-    value:           llvm
-  - key:             modernize-replace-random-shuffle.IncludeStyle
-    value:           llvm
-  - key:             modernize-use-auto.RemoveStars
-    value:           '0'
-  - key:             modernize-use-default-member-init.IgnoreMacros
-    value:           '1'
-  - key:             modernize-use-default-member-init.UseAssignment
-    value:           '0'
-  - key:             modernize-use-emplace.ContainersWithPushBack
-    value:           '::std::vector;::std::list;::std::deque'
-  - key:             modernize-use-emplace.SmartPointers
-    value:           '::std::shared_ptr;::std::unique_ptr;::std::auto_ptr;::std::weak_ptr'
-  - key:             modernize-use-emplace.TupleMakeFunctions
-    value:           '::std::make_pair;::std::make_tuple'
-  - key:             modernize-use-emplace.TupleTypes
-    value:           '::std::pair;::std::tuple'
-  - key:             modernize-use-equals-default.IgnoreMacros
-    value:           '1'
-  - key:             modernize-use-noexcept.ReplacementString
-    value:           ''
-  - key:             modernize-use-noexcept.UseNoexceptFalse
-    value:           '1'
-  - key:             modernize-use-nullptr.NullMacros
-    value:           'NULL'
-  - key:             modernize-use-transparent-functors.SafeMode
-    value:           '0'
-  - key:             modernize-use-using.IgnoreMacros
-    value:           '1'
-  - key:             performance-faster-string-find.StringLikeClasses
-    value:           'std::basic_string'
-  - key:             performance-for-range-copy.WarnOnAllAutoCopies
-    value:           '0'
-  - key:             performance-inefficient-vector-operation.VectorLikeClasses
-    value:           '::std::vector'
-  - key:             performance-move-const-arg.CheckTriviallyCopyableMove
-    value:           '0'
-  - key:             performance-move-constructor-init.IncludeStyle
-    value:           llvm
-  - key:             performance-type-promotion-in-math-fn.IncludeStyle
-    value:           llvm
-  - key:             performance-unnecessary-value-param.IncludeStyle
-    value:           llvm
-  - key:             readability-function-size.BranchThreshold
-    value:           '4294967295'
-  - key:             readability-function-size.LineThreshold
-    value:           '4294967295'
-  - key:             readability-function-size.NestingThreshold
-    value:           '4294967295'
-  - key:             readability-function-size.ParameterThreshold
-    value:           '4294967295'
-  - key:             readability-function-size.StatementThreshold
-    value:           '800'
-  - key:             readability-identifier-naming.IgnoreFailedSplit
-    value:           '0'
-  - key:             readability-implicit-bool-conversion.AllowIntegerConditions
-    value:           '0'
-  - key:             readability-implicit-bool-conversion.AllowPointerConditions
-    value:           '0'
-  - key:             readability-simplify-boolean-expr.ChainedConditionalAssignment
-    value:           '0'
-  - key:             readability-simplify-boolean-expr.ChainedConditionalReturn
-    value:           '0'
-  - key:             readability-static-accessed-through-instance.NameSpecifierNestingThreshold
-    value:           '3'
-...
-
diff --git a/src/tpl/arborx/.gitattributes b/src/tpl/arborx/.gitattributes
deleted file mode 100644
index d05b3a821..000000000
--- a/src/tpl/arborx/.gitattributes
+++ /dev/null
@@ -1,7 +0,0 @@
-docker/ export-ignore
-.clang* export-ignore
-.git* export-ignore
-.jenkins export-ignore
-.mailmap export-ignore
-.travis.yml export-ignore
-*.svg binary
diff --git a/src/tpl/arborx/.github/workflows/gitlab-ci.yml b/src/tpl/arborx/.github/workflows/gitlab-ci.yml
deleted file mode 100644
index 5340536cb..000000000
--- a/src/tpl/arborx/.github/workflows/gitlab-ci.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-name: Mirror and run GitLab CI
-
-on: [push]
-
-jobs:
-  build:
-    runs-on: ubuntu-18.04
-    steps:
-    - uses: actions/checkout@v1
-    - name: Trigger GitLab CI
-      uses: masterleinad/gitlab-mirror-and-ci-action@master
-      with:
-        args: "https://code.ornl.gov/ecpcitest/alexa/"
-      env:
-        GITLAB_HOSTNAME: "code.ornl.gov"
-        GITLAB_USERNAME: ${{ secrets.GITLAB_USER }}
-        GITLAB_PASSWORD: ${{ secrets.GITLAB_PASSWORD }}
-        GITLAB_PROJECT_ID: "6927"
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        ARTIFACT_JOB_NAME: "CompareResults"
-        ARTIFACT_NAME: "regression"
diff --git a/src/tpl/arborx/.gitignore b/src/tpl/arborx/.gitignore
deleted file mode 100644
index 48439bce0..000000000
--- a/src/tpl/arborx/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*~
-*.swp
-.#*
-/build*
diff --git a/src/tpl/arborx/.gitlab-ci.yml b/src/tpl/arborx/.gitlab-ci.yml
deleted file mode 100644
index fcf63137a..000000000
--- a/src/tpl/arborx/.gitlab-ci.yml
+++ /dev/null
@@ -1,147 +0,0 @@
-# see https://docs.gitlab.com/ce/ci/yaml/README.html for all available options
-
-variables:
-  SCHEDULER_PARAMETERS: "-J ArborX_CI -W 1:00 -nnodes 1 -P CSC333 -alloc_flags smt1"
-
-stages:
-  - buildDependencies
-  - buildArborX
-  - runBenchmarks
-  - compare
-
-.LoadModules:
-  before_script:
-    - module load gcc/7.4.0 cuda/10.1.243 cmake/3.18.2 git/2.20.1 spectrum-mpi/10.3.1.2-20200121
-
-.BuildBoost:
-  extends: .LoadModules
-  stage: buildDependencies
-  script:
-    - BOOST_VERSION=1.67.0 &&
-      BOOST_VERSION_UNDERSCORE=$(echo "$BOOST_VERSION" | sed -e "s/\./_/g") &&
-      BOOST_URL=https://boostorg.jfrog.io/artifactory/main/release/${BOOST_VERSION}/source &&
-      BOOST_ARCHIVE=boost_${BOOST_VERSION_UNDERSCORE}.tar.bz2 &&
-      wget --quiet ${BOOST_URL}/${BOOST_ARCHIVE} &&
-      mkdir -p boost &&
-      tar -xf ${BOOST_ARCHIVE} -C boost --strip-components=1 &&
-      cd boost &&
-      ./bootstrap.sh --prefix=/ccsopen/proj/csc333/boost.install &&
-      ./b2 -j8 variant=release cxxflags=-w install
-  tags:
-    - nobatch
-
-.BuildBenchmark:
-  extends: .LoadModules
-  stage: buildDependencies
-  script:
-    - git clone https://github.com/google/benchmark.git -b v1.4.1 &&
-      cd benchmark &&
-      git clone https://github.com/google/googletest.git -b release-1.8.1 &&
-      mkdir build && cd build &&
-      cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=g++ -DBENCHMARK_ENABLE_TESTING=OFF -DCMAKE_INSTALL_PREFIX=/ccsopen/proj/csc333/benchmark.install .. &&
-      make && make install
-  tags:
-    - nobatch
-
-.BuildKokkos:
-  extends: .LoadModules
-  stage: buildDependencies
-  script:
-    - git clone --depth=1 --branch 3.1.00 https://github.com/kokkos/kokkos.git &&
-      cd kokkos &&
-      mkdir build &&
-      cd build &&
-      cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/ccsopen/proj/csc333/kokkos.install -DCMAKE_CXX_COMPILER=${CI_PROJECT_DIR}/kokkos/bin/nvcc_wrapper -DCMAKE_CXX_EXTENSIONS=OFF -DKokkos_ENABLE_SERIAL=ON -DKokkos_ENABLE_OPENMP=ON -DKokkos_ENABLE_CUDA=ON -DKokkos_ENABLE_CUDA_LAMBDA=ON -DKokkos_ARCH_POWER9=ON -DKokkos_ARCH_VOLTA70=ON .. &&
-      make &&
-      make install
-  tags:
-    - nobatch
-
-BuildArborXBranch:
-  extends: .LoadModules
-  stage: buildArborX
-  script:
-    - git fetch
-    - export BRANCH_HASH=`git rev-parse HEAD`
-    - git merge origin/master
-    - mkdir build && cd build &&
-      cmake -DCMAKE_PREFIX_PATH="/ccsopen/proj/csc333/kokkos.install;/ccsopen/proj/csc333/benchmark.install;/ccsopen/proj/csc333/boost.install"
-            -DCMAKE_CXX_COMPILER=/ccsopen/proj/csc333/kokkos.install/bin/nvcc_wrapper
-            -DARBORX_ENABLE_MPI=ON
-            -DARBORX_ENABLE_TESTS=OFF
-            -DARBORX_ENABLE_BENCHMARKS=ON
-            -DARBORX_PERFORMANCE_TESTING=ON .. &&
-      make ArborX_BoundingVolumeHierarchy.exe
-    - cp ./benchmarks/bvh_driver/ArborX_BoundingVolumeHierarchy.exe /ccsopen/proj/csc333/ArborX_BoundingVolumeHierarchyBranch${BRANCH_HASH}.exe
-    - echo export BRANCH_HASH=${BRANCH_HASH} > ${CI_PROJECT_DIR}/branch_hash
-  tags:
-    - nobatch
-  artifacts:
-    paths:
-      - ${CI_PROJECT_DIR}/branch_hash
-
-BuildArborXMaster:
-  extends: .LoadModules
-  stage: buildArborX
-  script:
-    - git fetch
-    - export BRANCH_HASH=`git rev-parse HEAD`
-    - git worktree add -f ${CI_PROJECT_DIR}/arborx-master origin/master
-    - cd ${CI_PROJECT_DIR}/arborx-master
-    - mkdir build_master && cd build_master &&
-      cmake -DCMAKE_PREFIX_PATH="/ccsopen/proj/csc333/kokkos.install;/ccsopen/proj/csc333/benchmark.install;/ccsopen/proj/csc333/boost.install"
-            -DCMAKE_CXX_COMPILER=/ccsopen/proj/csc333/kokkos.install/bin/nvcc_wrapper
-            -DARBORX_ENABLE_MPI=ON
-            -DARBORX_ENABLE_TESTS=OFF
-            -DARBORX_ENABLE_BENCHMARKS=ON
-            -DARBORX_PERFORMANCE_TESTING=ON .. &&
-      make ArborX_BoundingVolumeHierarchy.exe
-    - cp ./benchmarks/bvh_driver/ArborX_BoundingVolumeHierarchy.exe /ccsopen/proj/csc333/ArborX_BoundingVolumeHierarchyMaster${BRANCH_HASH}.exe
-  tags:
-    - nobatch
-
-RunBenchmarks:
-  extends: .LoadModules
-  stage: runBenchmarks
-  script:
-    - source ${CI_PROJECT_DIR}/branch_hash
-    - export OMP_PROC_BIND=spread
-    - export OMP_PLACES=threads
-    - export JSRUN_OPTIONS="-n 1 -a 1 -c 42 -g 1 -r 1 -l CPU-CPU -d packed -b packed:42"
-    - export BENCHMARK_OPTIONS="--benchmark_repetitions=15
-                                --exact-spec serial/1000/1000/10/1/0/0/2
-                                --exact-spec serial/10000/10000/10/1/0/0/2
-                                --exact-spec serial/100000/100000/10/1/0/0/2
-                                --exact-spec serial/1000/1000/10/1/0/1/3
-                                --exact-spec serial/10000/10000/10/1/0/1/3
-                                --exact-spec serial/100000/100000/10/1/0/1/3
-                                --exact-spec openmp/1000/1000/10/1/0/0/2
-                                --exact-spec openmp/10000/10000/10/1/0/0/2
-                                --exact-spec openmp/100000/100000/10/1/0/0/2
-                                --exact-spec openmp/1000/1000/10/1/0/1/3
-                                --exact-spec openmp/10000/10000/10/1/0/1/3
-                                --exact-spec openmp/100000/100000/10/1/0/1/3
-                                --exact-spec cuda/10000/10000/10/1/0/0/2
-                                --exact-spec cuda/100000/100000/10/1/0/0/2
-                                --exact-spec cuda/1000000/1000000/10/1/0/0/2
-                                --exact-spec cuda/10000/10000/10/1/0/1/3
-                                --exact-spec cuda/100000/100000/10/1/0/1/3
-                                --exact-spec cuda/1000000/1000000/10/1/0/1/3"
-    - jsrun ${JSRUN_OPTIONS} /ccsopen/proj/csc333/ArborX_BoundingVolumeHierarchyBranch${BRANCH_HASH}.exe ${BENCHMARK_OPTIONS} --benchmark_out_format=json --benchmark_out=/ccsopen/proj/csc333/arborx-branch${BRANCH_HASH}.json
-    - jsrun ${JSRUN_OPTIONS} /ccsopen/proj/csc333/ArborX_BoundingVolumeHierarchyMaster${BRANCH_HASH}.exe ${BENCHMARK_OPTIONS} --benchmark_out_format=json --benchmark_out=/ccsopen/proj/csc333/arborx-master${BRANCH_HASH}.json
-    - rm /ccsopen/proj/csc333/ArborX_BoundingVolumeHierarchyBranch${BRANCH_HASH}.exe /ccsopen/proj/csc333/ArborX_BoundingVolumeHierarchyMaster${BRANCH_HASH}.exe
-  tags:
-    - batch
-
-CompareResults:
-  stage: compare
-  script:
-    - module load python/3.6.6-anaconda3-5.3.0
-    - source ${CI_PROJECT_DIR}/branch_hash
-    - /ccsopen/proj/csc333/tools/compare.py benchmarks /ccsopen/proj/csc333/arborx-master${BRANCH_HASH}.json /ccsopen/proj/csc333/arborx-branch${BRANCH_HASH}.json | grep "median" | tee ${CI_PROJECT_DIR}/regression${CI_PIPELINE_ID}
-    - rm /ccsopen/proj/csc333/arborx-branch${BRANCH_HASH}.json /ccsopen/proj/csc333/arborx-master${BRANCH_HASH}.json
-  tags:
-    - nobatch
-  artifacts:
-    paths:
-      - ${CI_PROJECT_DIR}/regression${CI_PIPELINE_ID}
diff --git a/src/tpl/arborx/.jenkins b/src/tpl/arborx/.jenkins
deleted file mode 100644
index 2a0741629..000000000
--- a/src/tpl/arborx/.jenkins
+++ /dev/null
@@ -1,462 +0,0 @@
-pipeline {
-    triggers {
-        issueCommentTrigger('.*test this please.*')
-    }
-    agent none
-
-    environment {
-        CCACHE_DIR = '/tmp/ccache'
-        CCACHE_MAXSIZE = '10G'
-        ARBORX_DIR = '/opt/arborx'
-        BENCHMARK_COLOR = 'no'
-        BOOST_TEST_COLOR_OUTPUT = 'no'
-        CTEST_OPTIONS = '--timeout 180 --no-compress-output -T Test --test-output-size-passed=65536 --test-output-size-failed=1048576'
-        OMP_NUM_THREADS = 8
-        OMP_PLACES = 'threads'
-        OMP_PROC_BIND = 'spread'
-    }
-    stages {
-
-        stage("Style") {
-            agent {
-                docker {
-                    // arbitrary image that has clang-format version 7.0
-                    image "dalg24/arborx_base:19.04.0-cuda-9.2"
-                    label 'docker'
-                }
-            }
-            steps {
-                sh './scripts/check_format_cpp.sh'
-            }
-        }
-
-        stage('Build') {
-            parallel {
-                stage('CUDA-9.2-NVCC-CUDA-AWARE-MPI') {
-                    agent {
-                        dockerfile {
-                            filename "Dockerfile"
-                            dir "docker"
-                            additionalBuildArgs '--build-arg BASE=nvidia/cuda:9.2-devel-ubuntu18.04 --build-arg KOKKOS_OPTIONS="-DCMAKE_CXX_EXTENSIONS=OFF -DKokkos_ENABLE_SERIAL=ON -DKokkos_ENABLE_CUDA=ON -DKokkos_ENABLE_CUDA_LAMBDA=ON -DKokkos_ARCH_VOLTA70=ON" --build-arg CUDA_AWARE_MPI=1'
-                            args '-v /tmp/ccache:/tmp/ccache --env NVIDIA_VISIBLE_DEVICES=${NVIDIA_VISIBLE_DEVICES}'
-                            label 'NVIDIA_Tesla_V100-PCIE-32GB && nvidia-docker'
-                        }
-                    }
-                    steps {
-                        sh 'ccache --zero-stats'
-                        sh 'rm -rf build && mkdir -p build'
-                        dir('build') {
-                            sh '''
-                                cmake \
-                                    -D CMAKE_INSTALL_PREFIX=$ARBORX_DIR \
-                                    -D CMAKE_BUILD_TYPE=Debug \
-                                    -D CMAKE_CXX_COMPILER_LAUNCHER=ccache \
-                                    -D CMAKE_CXX_COMPILER=$KOKKOS_DIR/bin/nvcc_wrapper \
-                                    -D CMAKE_CXX_EXTENSIONS=OFF \
-                                    -D CMAKE_CXX_FLAGS="-Wpedantic -Wall -Wextra" \
-                                    -D CMAKE_PREFIX_PATH="$KOKKOS_DIR;$BOOST_DIR;$BENCHMARK_DIR" \
-                                    -D ARBORX_ENABLE_MPI=ON \
-                                    -D MPIEXEC_PREFLAGS="--allow-run-as-root" \
-                                    -D MPIEXEC_MAX_NUMPROCS=4 \
-                                    -D ARBORX_USE_CUDA_AWARE_MPI=ON \
-                                    -D ARBORX_ENABLE_TESTS=ON \
-                                    -D ARBORX_ENABLE_EXAMPLES=ON \
-                                    -D ARBORX_ENABLE_BENCHMARKS=ON \
-                                ..
-                            '''
-                            sh 'make -j8 VERBOSE=1'
-                            sh 'ctest $CTEST_OPTIONS'
-                        }
-                    }
-                    post {
-                        always {
-                            sh 'ccache --show-stats'
-                            xunit reduceLog: false, tools:[CTest(deleteOutputFiles: true, failIfNotNew: true, pattern: 'build/Testing/**/Test.xml', skipNoTestFiles: false, stopProcessingIfError: true)]
-                        }
-                        success {
-                            sh 'cd build && make install'
-                            sh 'rm -rf test_install && mkdir -p test_install'
-                            dir('test_install') {
-                                sh 'cp -r ../examples .'
-                                sh '''
-                                    cmake \
-                                        -D CMAKE_CXX_COMPILER_LAUNCHER=ccache \
-                                        -D CMAKE_CXX_COMPILER=$KOKKOS_DIR/bin/nvcc_wrapper \
-                                        -D CMAKE_CXX_EXTENSIONS=OFF \
-                                        -D CMAKE_PREFIX_PATH="$KOKKOS_DIR;$ARBORX_DIR" \
-                                    examples \
-                                '''
-                                sh 'make VERBOSE=1'
-                                sh 'make test'
-                            }
-                        }
-                    }
-                }
-                stage('CUDA-10.2-NVCC') {
-                    agent {
-                        dockerfile {
-                            filename "Dockerfile"
-                            dir "docker"
-                            additionalBuildArgs '--build-arg BASE=nvidia/cuda:10.2-devel --build-arg KOKKOS_OPTIONS="-DCMAKE_CXX_EXTENSIONS=OFF -DKokkos_ENABLE_SERIAL=ON -DKokkos_ENABLE_OPENMP=ON -DKokkos_ENABLE_CUDA=ON -DKokkos_ENABLE_CUDA_LAMBDA=ON -DKokkos_ARCH_VOLTA70=ON"'
-                            args '-v /tmp/ccache:/tmp/ccache --env NVIDIA_VISIBLE_DEVICES=${NVIDIA_VISIBLE_DEVICES}'
-                            label 'NVIDIA_Tesla_V100-PCIE-32GB && nvidia-docker'
-                        }
-                    }
-                    steps {
-                        sh 'ccache --zero-stats'
-                        sh 'rm -rf build && mkdir -p build'
-                        dir('build') {
-                            sh '''
-                                cmake \
-                                    -D CMAKE_INSTALL_PREFIX=$ARBORX_DIR \
-                                    -D CMAKE_BUILD_TYPE=Debug \
-                                    -D CMAKE_CXX_COMPILER_LAUNCHER=ccache \
-                                    -D CMAKE_CXX_COMPILER=$KOKKOS_DIR/bin/nvcc_wrapper \
-                                    -D CMAKE_CXX_EXTENSIONS=OFF \
-                                    -D CMAKE_CXX_FLAGS="-Wpedantic -Wall -Wextra" \
-                                    -D CMAKE_PREFIX_PATH="$KOKKOS_DIR;$BOOST_DIR;$BENCHMARK_DIR" \
-                                    -D ARBORX_ENABLE_MPI=ON \
-                                    -D MPIEXEC_PREFLAGS="--allow-run-as-root" \
-                                    -D MPIEXEC_MAX_NUMPROCS=4 \
-                                    -D ARBORX_ENABLE_TESTS=ON \
-                                    -D ARBORX_ENABLE_EXAMPLES=ON \
-                                    -D ARBORX_ENABLE_BENCHMARKS=ON \
-                                ..
-                            '''
-                            sh 'make -j8 VERBOSE=1'
-                            sh 'ctest $CTEST_OPTIONS'
-                        }
-                    }
-                    post {
-                        always {
-                            sh 'ccache --show-stats'
-                            xunit reduceLog: false, tools:[CTest(deleteOutputFiles: true, failIfNotNew: true, pattern: 'build/Testing/**/Test.xml', skipNoTestFiles: false, stopProcessingIfError: true)]
-                        }
-                        success {
-                            sh 'cd build && make install'
-                            sh 'rm -rf test_install && mkdir -p test_install'
-                            dir('test_install') {
-                                sh 'cp -r ../examples .'
-                                sh '''
-                                    cmake \
-                                        -D CMAKE_CXX_COMPILER_LAUNCHER=ccache \
-                                        -D CMAKE_CXX_COMPILER=$KOKKOS_DIR/bin/nvcc_wrapper \
-                                        -D CMAKE_CXX_EXTENSIONS=OFF \
-                                        -D CMAKE_PREFIX_PATH="$KOKKOS_DIR;$ARBORX_DIR" \
-                                    examples \
-                                '''
-                                sh 'make VERBOSE=1'
-                                sh 'make test'
-                            }
-                        }
-                    }
-                }
-                stage('CUDA-10.0-Clang') {
-                    agent {
-                        dockerfile {
-                            filename "Dockerfile"
-                            dir "docker"
-                            additionalBuildArgs '--build-arg BASE=nvidia/cuda:10.0-devel-ubuntu18.04 --build-arg KOKKOS_OPTIONS="-DCMAKE_CXX_EXTENSIONS=OFF -DCMAKE_CXX_COMPILER=clang++ -DKokkos_ENABLE_PTHREAD=ON -DKokkos_ENABLE_CUDA=ON -DKokkos_ENABLE_CUDA_LAMBDA=ON -DKokkos_ARCH_VOLTA70=ON"'
-                            args '-v /tmp/ccache:/tmp/ccache --env NVIDIA_VISIBLE_DEVICES=${NVIDIA_VISIBLE_DEVICES}'
-                            label 'NVIDIA_Tesla_V100-PCIE-32GB && nvidia-docker'
-                        }
-                    }
-                    steps {
-                        sh 'ccache --zero-stats'
-                        sh 'rm -rf build && mkdir -p build'
-                        dir('build') {
-                            sh '''
-                                cmake \
-                                    -D CMAKE_INSTALL_PREFIX=$ARBORX_DIR \
-                                    -D CMAKE_BUILD_TYPE=Debug \
-                                    -D CMAKE_CXX_COMPILER_LAUNCHER=ccache \
-                                    -D CMAKE_CXX_COMPILER=clang++ \
-                                    -D CMAKE_CXX_EXTENSIONS=OFF \
-                                    -D CMAKE_CXX_FLAGS="-Wpedantic -Wall -Wextra" \
-                                    -D CMAKE_PREFIX_PATH="$KOKKOS_DIR;$BOOST_DIR;$BENCHMARK_DIR" \
-                                    -D ARBORX_ENABLE_MPI=OFF \
-                                    -D ARBORX_ENABLE_TESTS=ON \
-                                    -D ARBORX_ENABLE_EXAMPLES=ON \
-                                    -D ARBORX_ENABLE_BENCHMARKS=ON \
-                                ..
-                            '''
-                            sh 'make -j8 VERBOSE=1'
-                            sh 'ctest $CTEST_OPTIONS'
-                        }
-                    }
-                    post {
-                        always {
-                            sh 'ccache --show-stats'
-                            xunit reduceLog: false, tools:[CTest(deleteOutputFiles: true, failIfNotNew: true, pattern: 'build/Testing/**/Test.xml', skipNoTestFiles: false, stopProcessingIfError: true)]
-                        }
-                        success {
-                            sh 'cd build && make install'
-                            sh 'rm -rf test_install && mkdir -p test_install'
-                            dir('test_install') {
-                                sh 'cp -r ../examples .'
-                                sh '''
-                                    cmake \
-                                        -D CMAKE_CXX_COMPILER_LAUNCHER=ccache \
-                                        -D CMAKE_CXX_COMPILER=clang++ \
-                                        -D CMAKE_CXX_EXTENSIONS=OFF \
-                                        -D CMAKE_PREFIX_PATH="$KOKKOS_DIR;$ARBORX_DIR" \
-                                    examples \
-                                '''
-                                sh 'make VERBOSE=1'
-                                sh 'make test'
-                            }
-                        }
-                    }
-                }
-
-                stage('Clang') {
-                    agent {
-                        dockerfile {
-                            filename "Dockerfile"
-                            dir "docker"
-                            additionalBuildArgs '--build-arg BASE=ubuntu:18.04 --build-arg KOKKOS_OPTIONS="-DCMAKE_CXX_EXTENSIONS=OFF -DKokkos_ENABLE_OPENMP=ON -DCMAKE_CXX_COMPILER=clang++"'
-                            args '-v /tmp/ccache:/tmp/ccache'
-                            label 'docker'
-                        }
-                    }
-                    steps {
-                        sh 'ccache --zero-stats'
-                        sh 'rm -rf build && mkdir -p build'
-                        dir('build') {
-                            sh '''
-                                cmake \
-                                    -D CMAKE_INSTALL_PREFIX=$ARBORX_DIR \
-                                    -D CMAKE_BUILD_TYPE=Debug \
-                                    -D CMAKE_CXX_COMPILER_LAUNCHER=ccache \
-                                    -D CMAKE_CXX_COMPILER=clang++ \
-                                    -D CMAKE_CXX_EXTENSIONS=OFF \
-                                    -D CMAKE_CXX_FLAGS="-Wpedantic -Wall -Wextra" \
-                                    -D CMAKE_CXX_CLANG_TIDY="$LLVM_DIR/bin/clang-tidy" \
-                                    -D CMAKE_PREFIX_PATH="$KOKKOS_DIR;$BOOST_DIR;$BENCHMARK_DIR" \
-                                    -D ARBORX_ENABLE_MPI=ON \
-                                    -D MPIEXEC_PREFLAGS="--allow-run-as-root" \
-                                    -D MPIEXEC_MAX_NUMPROCS=4 \
-                                    -D ARBORX_ENABLE_TESTS=ON \
-                                    -D ARBORX_ENABLE_EXAMPLES=ON \
-                                    -D ARBORX_ENABLE_BENCHMARKS=ON \
-                                ..
-                            '''
-                            sh 'make -j8 VERBOSE=1'
-                            sh 'ctest $CTEST_OPTIONS'
-                        }
-                    }
-                    post {
-                        always {
-                            sh 'ccache --show-stats'
-                            xunit reduceLog: false, tools:[CTest(deleteOutputFiles: true, failIfNotNew: true, pattern: 'build/Testing/**/Test.xml', skipNoTestFiles: false, stopProcessingIfError: true)]
-                        }
-                        success {
-                            sh 'cd build && make install'
-                            sh 'rm -rf test_install && mkdir -p test_install'
-                            dir('test_install') {
-                                sh 'cp -r ../examples .'
-                                sh '''
-                                    cmake \
-                                        -D CMAKE_CXX_COMPILER_LAUNCHER=ccache \
-                                        -D CMAKE_CXX_COMPILER=clang++ \
-                                        -D CMAKE_CXX_EXTENSIONS=OFF \
-                                        -D CMAKE_PREFIX_PATH="$KOKKOS_DIR;$ARBORX_DIR" \
-                                    examples \
-                                '''
-                                sh 'make VERBOSE=1'
-                                sh 'make test'
-                            }
-                        }
-                    }
-                }
-
-                stage('PGI') {
-                    agent {
-                        dockerfile {
-                            filename "Dockerfile.pgi"
-                            dir "docker"
-                            args '-v /tmp/ccache:/tmp/ccache'
-                            label 'docker'
-                        }
-                    }
-                    steps {
-                        sh 'ccache --zero-stats'
-                        sh 'rm -rf build && mkdir -p build'
-                        dir('build') {
-                            sh '''
-                                cmake \
-                                    -D CMAKE_INSTALL_PREFIX=$ARBORX_DIR \
-                                    -D CMAKE_BUILD_TYPE=Debug \
-                                    -D CMAKE_CXX_COMPILER_LAUNCHER=ccache \
-                                    -D CMAKE_CXX_COMPILER=pgc++ \
-                                    -D CMAKE_CXX_FLAGS="-Minform=inform" \
-                                    -D CMAKE_PREFIX_PATH="$KOKKOS_DIR;$BOOST_DIR;$BENCHMARK_DIR" \
-                                    -D ARBORX_ENABLE_MPI=ON \
-                                    -D MPIEXEC_PREFLAGS="--allow-run-as-root" \
-                                    -D MPIEXEC_MAX_NUMPROCS=4 \
-                                    -D ARBORX_ENABLE_TESTS=ON \
-                                    -D ARBORX_ENABLE_EXAMPLES=ON \
-                                    -D ARBORX_ENABLE_BENCHMARKS=ON \
-                                ..
-                            '''
-                            sh 'make -j8 VERBOSE=1'
-                            sh 'ctest $CTEST_OPTIONS'
-                        }
-                    }
-                    post {
-                        always {
-                            sh 'ccache --show-stats'
-                            xunit reduceLog: false, tools:[CTest(deleteOutputFiles: true, failIfNotNew: true, pattern: 'build/Testing/**/Test.xml', skipNoTestFiles: false, stopProcessingIfError: true)]
-                        }
-                        success {
-                            sh 'cd build && make install'
-                            sh 'rm -rf test_install && mkdir -p test_install'
-                            dir('test_install') {
-                                sh 'cp -r ../examples .'
-                                sh '''
-                                    cmake \
-                                        -D CMAKE_CXX_COMPILER_LAUNCHER=ccache \
-                                        -D CMAKE_CXX_COMPILER=pgc++ \
-                                        -D CMAKE_PREFIX_PATH="$KOKKOS_DIR;$ARBORX_DIR" \
-                                    examples \
-                                '''
-                                sh 'make VERBOSE=1'
-                                sh 'make test'
-                            }
-                        }
-                    }
-                }
-
-                stage('HIP-4.2') {
-                    agent {
-                        dockerfile {
-                            filename "Dockerfile.hipcc"
-                            dir "docker"
-                            additionalBuildArgs '--build-arg BASE=rocm/dev-ubuntu-20.04:4.2 --build-arg KOKKOS_ARCH=${KOKKOS_ARCH}'
-                            args '-v /tmp/ccache.kokkos:/tmp/ccache --device=/dev/kfd --device=/dev/dri --security-opt seccomp=unconfined --group-add video --env HIP_VISIBLE_DEVICES=${HIP_VISIBLE_DEVICES}'
-                            label 'rocm-docker && vega'
-                        }
-                    }
-                    steps {
-                        sh 'ccache --zero-stats'
-                        sh 'rm -rf build && mkdir -p build'
-                        dir('build') {
-                            sh '''
-                                cmake \
-                                    -D CMAKE_INSTALL_PREFIX=$ARBORX_DIR \
-                                    -D CMAKE_BUILD_TYPE=Debug \
-                                    -D CMAKE_CXX_COMPILER=hipcc \
-                                    -D CMAKE_CXX_EXTENSIONS=OFF \
-                                    -D CMAKE_CXX_FLAGS="-DNDEBUG -Wpedantic -Wall -Wextra" \
-                                    -D CMAKE_PREFIX_PATH="$KOKKOS_DIR;$BOOST_DIR;$BENCHMARK_DIR" \
-                                    -D ARBORX_ENABLE_MPI=ON \
-                                    -D MPIEXEC_PREFLAGS="--allow-run-as-root" \
-                                    -D MPIEXEC_MAX_NUMPROCS=4 \
-                                    -D ARBORX_ENABLE_TESTS=ON \
-                                    -D ARBORX_ENABLE_EXAMPLES=ON \
-                                    -D ARBORX_ENABLE_BENCHMARKS=ON \
-                                ..
-                            '''
-                            sh 'make -j8 VERBOSE=1'
-                            sh 'ctest $CTEST_OPTIONS'
-                        }
-                    }
-                    post {
-                        always {
-                            sh 'ccache --show-stats'
-                            xunit reduceLog: false, tools:[CTest(deleteOutputFiles: true, failIfNotNew: true, pattern: 'build/Testing/**/Test.xml', skipNoTestFiles: false, stopProcessingIfError: true)]
-                        }
-                        success {
-                            sh 'cd build && make install'
-                            sh 'rm -rf test_install && mkdir -p test_install'
-                            dir('test_install') {
-                                sh 'cp -r ../examples .'
-                                sh '''
-                                    cmake \
-                                        -D CMAKE_CXX_COMPILER=hipcc \
-                                        -D CMAKE_CXX_EXTENSIONS=OFF \
-                                        -D CMAKE_BUILD_TYPE=RelWithDebInfo \
-                                        -D CMAKE_PREFIX_PATH="$KOKKOS_DIR;$ARBORX_DIR" \
-                                    examples \
-                                '''
-                                sh 'make VERBOSE=1'
-                                sh 'ctest --output-on-failure'
-                            }
-                        }
-                    }
-                }
-
-                stage('SYCL') {
-                    agent {
-                        dockerfile {
-                            filename "Dockerfile.sycl"
-                            dir "docker"
-                            args '-v /tmp/ccache.kokkos:/tmp/ccache'
-                            label 'NVIDIA_Tesla_V100-PCIE-32GB && nvidia-docker'
-                        }
-                    }
-                    steps {
-                        sh 'ccache --zero-stats'
-                        sh 'rm -rf build && mkdir -p build'
-                        dir('build') {
-                            sh '''
-                                cmake \
-                                    -D CMAKE_INSTALL_PREFIX=$ARBORX_DIR \
-                                    -D CMAKE_BUILD_TYPE=Release \
-                                    -D CMAKE_CXX_COMPILER=clang++ \
-                                    -D CMAKE_CXX_EXTENSIONS=OFF \
-                                    -D CMAKE_CXX_FLAGS="-Wpedantic -Wall -Wextra -Wno-unknown-cuda-version -fsycl -fsycl-targets=nvptx64-nvidia-cuda-sycldevice" \
-                                    -D CMAKE_PREFIX_PATH="$KOKKOS_DIR;$BOOST_DIR;$BENCHMARK_DIR;$ONE_DPL_DIR" \
-                                    -D ARBORX_ENABLE_MPI=ON \
-                                    -D MPIEXEC_PREFLAGS="--allow-run-as-root" \
-                                    -D MPIEXEC_MAX_NUMPROCS=4 \
-                                    -D ARBORX_ENABLE_TESTS=ON \
-                                    -D ARBORX_ENABLE_EXAMPLES=ON \
-                                    -D ARBORX_ENABLE_BENCHMARKS=ON \
-                                    -D ARBORX_ENABLE_ONEDPL=ON \
-                                ..
-                            '''
-                            sh 'make -j8 VERBOSE=1'
-                            sh 'ctest $CTEST_OPTIONS'
-                        }
-                    }
-                    post {
-                        always {
-                            sh 'ccache --show-stats'
-                            xunit reduceLog: false, tools:[CTest(deleteOutputFiles: true, failIfNotNew: true, pattern: 'build/Testing/**/Test.xml', skipNoTestFiles: false, stopProcessingIfError: true)]
-                        }
-                        success {
-                            sh 'cd build && make install'
-                            sh 'rm -rf test_install && mkdir -p test_install'
-                            dir('test_install') {
-                                sh 'cp -r ../examples .'
-                                sh '''
-                                    cmake \
-                                        -D CMAKE_BUILD_TYPE=Release \
-                                        -D CMAKE_CXX_COMPILER=clang++ \
-                                        -D CMAKE_CXX_EXTENSIONS=OFF \
-                                        -D CMAKE_PREFIX_PATH="$KOKKOS_DIR;$ARBORX_DIR;$ONE_DPL_DIR" \
-                                    examples \
-                                '''
-                                sh 'make VERBOSE=1'
-                                sh 'make test'
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-    post {
-        always {
-            node('docker') {
-                recordIssues(
-                    enabledForFailure: true,
-                    tools: [cmake(), gcc(), clang(), clangTidy()],
-                    qualityGates: [[threshold: 1, type: 'TOTAL', unstable: true]],
-                    filters: [excludeFile('/usr/local/cuda.*'), excludeCategory('#pragma-messages')]
-                )
-            }
-        }
-    }
-}
diff --git a/src/tpl/arborx/.mailmap b/src/tpl/arborx/.mailmap
deleted file mode 100644
index 802d8ebba..000000000
--- a/src/tpl/arborx/.mailmap
+++ /dev/null
@@ -1,2 +0,0 @@
-Damien L-G <dalg24@gmail.com>
-Wenjun Ge <gew1@ornl.gov>

From 027dd6e938a301701779a15d94d1e35ad4976237 Mon Sep 17 00:00:00 2001
From: Paul Kuberry <pakuber@sandia.gov>
Date: Fri, 1 Oct 2021 07:51:55 -0600
Subject: [PATCH 22/40] Prune more arborx files

---
 src/CMakeLists.txt                            |   3 +-
 src/tpl/arborx/src/ArborX_BruteForce.hpp      | 125 ---
 src/tpl/arborx/src/ArborX_DBSCAN.hpp          | 502 ----------
 .../src/ArborX_DistributedSearchTree.hpp      |  25 -
 src/tpl/arborx/src/ArborX_DistributedTree.hpp | 225 -----
 .../details/ArborX_DetailsBruteForceImpl.hpp  | 152 ---
 .../ArborX_DetailsDistributedTreeImpl.hpp     | 921 ------------------
 .../src/details/ArborX_DetailsDistributor.hpp | 425 --------
 .../src/details/ArborX_DetailsFDBSCAN.hpp     | 100 --
 .../details/ArborX_DetailsFDBSCANDenseBox.hpp | 390 --------
 src/tpl/arborx/src/details/ArborX_KDOP.hpp    | 316 ------
 11 files changed, 2 insertions(+), 3182 deletions(-)
 delete mode 100644 src/tpl/arborx/src/ArborX_BruteForce.hpp
 delete mode 100644 src/tpl/arborx/src/ArborX_DBSCAN.hpp
 delete mode 100644 src/tpl/arborx/src/ArborX_DistributedSearchTree.hpp
 delete mode 100644 src/tpl/arborx/src/ArborX_DistributedTree.hpp
 delete mode 100644 src/tpl/arborx/src/details/ArborX_DetailsBruteForceImpl.hpp
 delete mode 100644 src/tpl/arborx/src/details/ArborX_DetailsDistributedTreeImpl.hpp
 delete mode 100644 src/tpl/arborx/src/details/ArborX_DetailsDistributor.hpp
 delete mode 100644 src/tpl/arborx/src/details/ArborX_DetailsFDBSCAN.hpp
 delete mode 100644 src/tpl/arborx/src/details/ArborX_DetailsFDBSCANDenseBox.hpp
 delete mode 100644 src/tpl/arborx/src/details/ArborX_KDOP.hpp

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d51256d29..4161b9765 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -56,7 +56,8 @@ elseif (KOKKOSKERNELS_BUILT_FOR_USER) # Kokkos-Kernels built for user by this pr
 endif()
 
 if (Compadre_USE_ARBORX)
-  option(ARBORX_ENABLE_MPI "" "${Compadre_USE_MPI}")
+  option(ARBORX_ENABLE_MPI "" OFF)
+  set(ARBORX_ENABLE_MPI OFF)
   add_subdirectory(tpl/arborx)
   target_link_libraries(compadre PUBLIC ArborX::ArborX)
 endif()
diff --git a/src/tpl/arborx/src/ArborX_BruteForce.hpp b/src/tpl/arborx/src/ArborX_BruteForce.hpp
deleted file mode 100644
index 5d595c4d2..000000000
--- a/src/tpl/arborx/src/ArborX_BruteForce.hpp
+++ /dev/null
@@ -1,125 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2017-2021 by the ArborX authors                            *
- * All rights reserved.                                                     *
- *                                                                          *
- * This file is part of the ArborX library. ArborX is                       *
- * distributed under a BSD 3-clause license. For the licensing terms see    *
- * the LICENSE file in the top-level directory.                             *
- *                                                                          *
- * SPDX-License-Identifier: BSD-3-Clause                                    *
- ****************************************************************************/
-
-#ifndef ARBORX_BRUTE_FORCE_HPP
-#define ARBORX_BRUTE_FORCE_HPP
-
-#include <ArborX_AccessTraits.hpp>
-#include <ArborX_Box.hpp>
-#include <ArborX_CrsGraphWrapper.hpp>
-#include <ArborX_DetailsBruteForceImpl.hpp>
-#include <ArborX_DetailsKokkosExtAccessibilityTraits.hpp>
-
-#include <Kokkos_Core.hpp>
-
-namespace ArborX
-{
-
-template <typename MemorySpace>
-class BruteForce
-{
-public:
-  using memory_space = MemorySpace;
-  static_assert(Kokkos::is_memory_space<MemorySpace>::value, "");
-  using size_type = typename MemorySpace::size_type;
-  using bounding_volume_type = Box;
-
-  BruteForce() = default;
-
-  template <typename ExecutionSpace, typename Primitives>
-  BruteForce(ExecutionSpace const &space, Primitives const &primitives);
-
-  KOKKOS_FUNCTION
-  size_type size() const noexcept { return _size; }
-
-  KOKKOS_FUNCTION
-  bool empty() const noexcept { return size() == 0; }
-
-  KOKKOS_FUNCTION
-  bounding_volume_type bounds() const noexcept { return _bounds; }
-
-  template <typename ExecutionSpace, typename Predicates, typename Callback,
-            typename Ignore = int>
-  void query(ExecutionSpace const &space, Predicates const &predicates,
-             Callback const &callback, Ignore = Ignore()) const;
-
-  template <typename ExecutionSpace, typename Predicates,
-            typename CallbackOrView, typename View, typename... Args>
-  std::enable_if_t<Kokkos::is_view<std::decay_t<View>>{}>
-  query(ExecutionSpace const &space, Predicates const &predicates,
-        CallbackOrView &&callback_or_view, View &&view, Args &&... args) const
-  {
-    ArborX::query(*this, space, predicates,
-                  std::forward<CallbackOrView>(callback_or_view),
-                  std::forward<View>(view), std::forward<Args>(args)...);
-  }
-
-private:
-  size_type _size;
-  bounding_volume_type _bounds;
-  Kokkos::View<bounding_volume_type *, memory_space> _bounding_volumes;
-};
-
-template <typename MemorySpace>
-template <typename ExecutionSpace, typename Primitives>
-BruteForce<MemorySpace>::BruteForce(ExecutionSpace const &space,
-                                    Primitives const &primitives)
-    : _size(AccessTraits<Primitives, PrimitivesTag>::size(primitives))
-    , _bounding_volumes(
-          Kokkos::view_alloc(Kokkos::WithoutInitializing,
-                             "ArborX::BruteForce::bounding_volumes"),
-          _size)
-{
-  static_assert(
-      KokkosExt::is_accessible_from<MemorySpace, ExecutionSpace>::value, "");
-  Details::check_valid_access_traits(PrimitivesTag{}, primitives);
-  using Access = AccessTraits<Primitives, PrimitivesTag>;
-  static_assert(KokkosExt::is_accessible_from<typename Access::memory_space,
-                                              ExecutionSpace>::value,
-                "Primitives must be accessible from the execution space");
-
-  Kokkos::Profiling::pushRegion("ArborX::BruteForce::BruteForce");
-
-  Details::BruteForceImpl::initializeBoundingVolumesAndReduceBoundsOfTheScene(
-      space, primitives, _bounding_volumes, _bounds);
-
-  Kokkos::Profiling::popRegion();
-}
-
-template <typename MemorySpace>
-template <typename ExecutionSpace, typename Predicates, typename Callback,
-          typename Ignore>
-void BruteForce<MemorySpace>::query(ExecutionSpace const &space,
-                                    Predicates const &predicates,
-                                    Callback const &callback, Ignore) const
-{
-  static_assert(
-      KokkosExt::is_accessible_from<MemorySpace, ExecutionSpace>::value, "");
-  Details::check_valid_access_traits(PredicatesTag{}, predicates);
-  using Access = AccessTraits<Predicates, PredicatesTag>;
-  static_assert(KokkosExt::is_accessible_from<typename Access::memory_space,
-                                              ExecutionSpace>::value,
-                "Predicates must be accessible from the execution space");
-  using Tag = typename Details::AccessTraitsHelper<Access>::tag;
-  static_assert(std::is_same<Tag, Details::SpatialPredicateTag>{},
-                "nearest query not implemented yet");
-
-  Kokkos::Profiling::pushRegion("ArborX::BruteForce::query::spatial");
-
-  Details::BruteForceImpl::query(space, _bounding_volumes, predicates,
-                                 callback);
-
-  Kokkos::Profiling::popRegion();
-}
-
-} // namespace ArborX
-
-#endif
diff --git a/src/tpl/arborx/src/ArborX_DBSCAN.hpp b/src/tpl/arborx/src/ArborX_DBSCAN.hpp
deleted file mode 100644
index 31a4269cd..000000000
--- a/src/tpl/arborx/src/ArborX_DBSCAN.hpp
+++ /dev/null
@@ -1,502 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2017-2021 by the ArborX authors                            *
- * All rights reserved.                                                     *
- *                                                                          *
- * This file is part of the ArborX library. ArborX is                       *
- * distributed under a BSD 3-clause license. For the licensing terms see    *
- * the LICENSE file in the top-level directory.                             *
- *                                                                          *
- * SPDX-License-Identifier: BSD-3-Clause                                    *
- ****************************************************************************/
-
-#ifndef ARBORX_DBSCAN_HPP
-#define ARBORX_DBSCAN_HPP
-
-#include <ArborX_AccessTraits.hpp>
-#include <ArborX_DetailsFDBSCAN.hpp>
-#include <ArborX_DetailsFDBSCANDenseBox.hpp>
-#include <ArborX_DetailsSortUtils.hpp>
-#include <ArborX_LinearBVH.hpp>
-
-#include <map>
-
-namespace ArborX
-{
-
-namespace Details
-{
-
-// All points are marked as if they were core points minpts = 2 case.
-// Obviously, this is not true. However, in the algorithms it is used only for
-// pairs of points within the distance eps, in which case it is correct.
-struct CCSCorePoints
-{
-  KOKKOS_FUNCTION bool operator()(int) const { return true; }
-};
-
-template <typename MemorySpace>
-struct DBSCANCorePoints
-{
-  Kokkos::View<int *, MemorySpace> _num_neigh;
-  int _core_min_size;
-
-  KOKKOS_FUNCTION bool operator()(int const i) const
-  {
-    return _num_neigh(i) >= _core_min_size;
-  }
-};
-
-template <typename Primitives>
-struct PrimitivesWithRadius
-{
-  Primitives _primitives;
-  double _r;
-};
-
-template <typename Primitives, typename PermuteFilter>
-struct PrimitivesWithRadiusReorderedAndFiltered
-{
-  Primitives _primitives;
-  double _r;
-  PermuteFilter _filter;
-};
-
-// Mixed primitives consist of a set of boxes corresponding to dense cells,
-// followed by boxes corresponding to points in non-dense cells.
-template <typename PointPrimitives, typename DenseCellOffsets,
-          typename CellIndices, typename Permutation>
-struct MixedBoxPrimitives
-{
-  PointPrimitives _point_primitives;
-  Details::CartesianGrid _grid;
-  DenseCellOffsets _dense_cell_offsets;
-  int _num_points_in_dense_cells; // to avoid lastElement() in AccessTraits
-  CellIndices _sorted_cell_indices;
-  Permutation _permute;
-};
-
-} // namespace Details
-
-template <typename Primitives>
-struct AccessTraits<Details::PrimitivesWithRadius<Primitives>, PredicatesTag>
-{
-  using PrimitivesAccess = AccessTraits<Primitives, PrimitivesTag>;
-
-  using memory_space = typename PrimitivesAccess::memory_space;
-  using Predicates = Details::PrimitivesWithRadius<Primitives>;
-
-  static size_t size(Predicates const &w)
-  {
-    return PrimitivesAccess::size(w._primitives);
-  }
-  static KOKKOS_FUNCTION auto get(Predicates const &w, size_t i)
-  {
-    return attach(
-        intersects(Sphere{PrimitivesAccess::get(w._primitives, i), w._r}),
-        (int)i);
-  }
-};
-
-template <typename Primitives, typename PermuteFilter>
-struct AccessTraits<Details::PrimitivesWithRadiusReorderedAndFiltered<
-                        Primitives, PermuteFilter>,
-                    PredicatesTag>
-{
-  using PrimitivesAccess = AccessTraits<Primitives, PrimitivesTag>;
-
-  using memory_space = typename PrimitivesAccess::memory_space;
-  using Predicates =
-      Details::PrimitivesWithRadiusReorderedAndFiltered<Primitives,
-                                                        PermuteFilter>;
-
-  static size_t size(Predicates const &w) { return w._filter.extent(0); }
-  static KOKKOS_FUNCTION auto get(Predicates const &w, size_t i)
-  {
-    int index = w._filter(i);
-    return attach(
-        intersects(Sphere{PrimitivesAccess::get(w._primitives, index), w._r}),
-        (int)index);
-  }
-};
-
-template <typename PointPrimitives, typename MixedOffsets, typename CellIndices,
-          typename Permutation>
-struct AccessTraits<Details::MixedBoxPrimitives<PointPrimitives, MixedOffsets,
-                                                CellIndices, Permutation>,
-                    ArborX::PrimitivesTag>
-{
-  using Primitives = Details::MixedBoxPrimitives<PointPrimitives, MixedOffsets,
-                                                 CellIndices, Permutation>;
-  static KOKKOS_FUNCTION std::size_t size(Primitives const &w)
-  {
-    auto const &dco = w._dense_cell_offsets;
-
-    auto const n = w._permute.size();
-    auto num_dense_primitives = dco.size() - 1;
-    auto num_sparse_primitives = n - w._num_points_in_dense_cells;
-
-    return num_dense_primitives + num_sparse_primitives;
-  }
-  static KOKKOS_FUNCTION ArborX::Box get(Primitives const &w, std::size_t i)
-  {
-    auto const &dco = w._dense_cell_offsets;
-
-    auto num_dense_primitives = dco.size() - 1;
-    if (i < num_dense_primitives)
-    {
-      // For a primitive corresponding to a dense cell, use that cell's box. It
-      // may not be tight around the points inside, but is cheap to compute.
-      auto cell_index = w._sorted_cell_indices(dco(i));
-      return w._grid.cellBox(cell_index);
-    }
-
-    // For a primitive corresponding to a point in a non-dense cell, use that
-    // point. But first, figure out its index, which requires some
-    // computations.
-    using Access = AccessTraits<PointPrimitives, PrimitivesTag>;
-
-    i = (i - num_dense_primitives) + w._num_points_in_dense_cells;
-    Point const &point = Access::get(w._point_primitives, w._permute(i));
-    return {point, point};
-  }
-  using memory_space = typename MixedOffsets::memory_space;
-};
-
-namespace DBSCAN
-{
-
-enum class Implementation
-{
-  FDBSCAN,
-  FDBSCAN_DenseBox
-};
-
-struct Parameters
-{
-  // Print timers to standard output
-  bool _print_timers = false;
-  // Algorithm implementation (FDBSCAN or FDBSCAN-DenseBox)
-  Implementation _implementation = Implementation::FDBSCAN_DenseBox;
-
-  Parameters &setPrintTimers(bool print_timers)
-  {
-    _print_timers = print_timers;
-    return *this;
-  }
-  Parameters &setImplementation(Implementation impl)
-  {
-    _implementation = impl;
-    return *this;
-  }
-};
-} // namespace DBSCAN
-
-template <typename ExecutionSpace, typename Primitives>
-Kokkos::View<int *,
-             typename AccessTraits<Primitives, PrimitivesTag>::memory_space>
-dbscan(ExecutionSpace const &exec_space, Primitives const &primitives,
-       float eps, int core_min_size,
-       DBSCAN::Parameters const &parameters = DBSCAN::Parameters())
-{
-  Kokkos::Profiling::pushRegion("ArborX::DBSCAN");
-
-  using Access = AccessTraits<Primitives, PrimitivesTag>;
-  using MemorySpace = typename Access::memory_space;
-
-  static_assert(
-      KokkosExt::is_accessible_from<MemorySpace, ExecutionSpace>::value,
-      "Primitives must be accessible from the execution space");
-
-  ARBORX_ASSERT(eps > 0);
-  ARBORX_ASSERT(core_min_size >= 2);
-
-  bool const is_special_case = (core_min_size == 2);
-
-  Kokkos::Timer timer;
-  std::map<std::string, double> elapsed;
-
-  bool const verbose = parameters._print_timers;
-  auto timer_start = [&exec_space, verbose](Kokkos::Timer &timer) {
-    if (verbose)
-      exec_space.fence();
-    timer.reset();
-  };
-  auto timer_seconds = [&exec_space, verbose](Kokkos::Timer const &timer) {
-    if (verbose)
-      exec_space.fence();
-    return timer.seconds();
-  };
-
-  int const n = Access::size(primitives);
-
-  Kokkos::View<int *, MemorySpace> num_neigh("ArborX::DBSCAN::num_neighbors",
-                                             0);
-
-  Kokkos::View<int *, MemorySpace> labels(
-      Kokkos::view_alloc(Kokkos::WithoutInitializing, "ArborX::DBSCAN::labels"),
-      n);
-  ArborX::iota(exec_space, labels);
-
-  if (parameters._implementation == DBSCAN::Implementation::FDBSCAN)
-  {
-    // Build the tree
-    timer_start(timer);
-    Kokkos::Profiling::pushRegion("ArborX::DBSCAN::tree_construction");
-    ArborX::BVH<MemorySpace> bvh(exec_space, primitives);
-    Kokkos::Profiling::popRegion();
-    elapsed["construction"] = timer_seconds(timer);
-
-    timer_start(timer);
-    Kokkos::Profiling::pushRegion("ArborX::DBSCAN::clusters");
-    auto const predicates =
-        Details::PrimitivesWithRadius<Primitives>{primitives, eps};
-    if (is_special_case)
-    {
-      // Perform the queries and build clusters through callback
-      using CorePoints = Details::CCSCorePoints;
-      CorePoints core_points;
-      Kokkos::Profiling::pushRegion("ArborX::DBSCAN::clusters::query");
-      bvh.query(exec_space, predicates,
-                Details::FDBSCANCallback<MemorySpace, CorePoints>{labels,
-                                                                  core_points});
-      Kokkos::Profiling::popRegion();
-    }
-    else
-    {
-      // Determine core points
-      Kokkos::Timer timer_local;
-      timer_start(timer_local);
-      Kokkos::Profiling::pushRegion("ArborX::DBSCAN::clusters::num_neigh");
-      Kokkos::resize(num_neigh, n);
-      bvh.query(exec_space, predicates,
-                Details::CountUpToN<MemorySpace>{num_neigh, core_min_size});
-      Kokkos::Profiling::popRegion();
-      elapsed["neigh"] = timer_seconds(timer_local);
-
-      using CorePoints = Details::DBSCANCorePoints<MemorySpace>;
-
-      // Perform the queries and build clusters through callback
-      timer_start(timer_local);
-      Kokkos::Profiling::pushRegion("ArborX::DBSCAN::clusters:query");
-      bvh.query(exec_space, predicates,
-                Details::FDBSCANCallback<MemorySpace, CorePoints>{
-                    labels, CorePoints{num_neigh, core_min_size}});
-      Kokkos::Profiling::popRegion();
-      elapsed["query"] = timer_seconds(timer_local);
-    }
-  }
-  else if (parameters._implementation ==
-           DBSCAN::Implementation::FDBSCAN_DenseBox)
-  {
-    // Find dense boxes
-    timer_start(timer);
-    Kokkos::Profiling::pushRegion("ArborX::DBSCAN::dense_cells");
-    Box bounds;
-    Details::TreeConstruction::calculateBoundingBoxOfTheScene(
-        exec_space, primitives, bounds);
-
-    // The cell length is chosen to be eps/sqrt(dimension), so that any two
-    // points within the same cell are within eps distance of each other.
-    float const h = eps / std::sqrt(3); // 3D (for 2D change to std::sqrt(2))
-    Details::CartesianGrid const grid(bounds, h);
-
-    auto cell_indices =
-        Details::computeCellIndices(exec_space, primitives, grid);
-
-    auto permute = Details::sortObjects(exec_space, cell_indices);
-    auto &sorted_cell_indices = cell_indices; // alias
-
-    int num_nonempty_cells;
-    int num_points_in_dense_cells;
-    {
-      // Reorder indices and permutation so that the dense cells go first
-      auto cell_offsets =
-          Details::computeOffsetsInOrderedView(exec_space, sorted_cell_indices);
-      num_nonempty_cells = cell_offsets.size() - 1;
-
-      num_points_in_dense_cells = Details::reorderDenseAndSparseCells(
-          exec_space, cell_offsets, core_min_size, sorted_cell_indices,
-          permute);
-    }
-    int num_points_in_sparse_cells = n - num_points_in_dense_cells;
-
-    auto dense_sorted_cell_indices = Kokkos::subview(
-        sorted_cell_indices, Kokkos::make_pair(0, num_points_in_dense_cells));
-
-    auto dense_cell_offsets = Details::computeOffsetsInOrderedView(
-        exec_space, dense_sorted_cell_indices);
-    int num_dense_cells = dense_cell_offsets.size() - 1;
-    if (verbose)
-    {
-      printf("h = %e, nx = %zu, ny = %zu, nz = %zu\n", h, grid._nx, grid._ny,
-             grid._nz);
-      printf("#nonempty cells     : %10d\n", num_nonempty_cells);
-      printf("#dense cells        : %10d [%.2f%%]\n", num_dense_cells,
-             (100.f * num_dense_cells) / num_nonempty_cells);
-      printf("#dense cell points  : %10d [%.2f%%]\n", num_points_in_dense_cells,
-             (100.f * num_points_in_dense_cells) / n);
-      printf("#mixed primitives   : %10d\n",
-             num_dense_cells + num_points_in_sparse_cells);
-    }
-
-    Details::unionFindWithinEachDenseCell(exec_space, dense_sorted_cell_indices,
-                                          permute, labels);
-
-    Kokkos::Profiling::popRegion();
-    elapsed["dense_cells"] = timer_seconds(timer);
-
-    // Build the tree
-    timer_start(timer);
-    Kokkos::Profiling::pushRegion("ArborX::DBSCAN::tree_construction");
-    BVH<MemorySpace> bvh(
-        exec_space,
-        Details::MixedBoxPrimitives<Primitives, decltype(dense_cell_offsets),
-                                    decltype(cell_indices), decltype(permute)>{
-            primitives, grid, dense_cell_offsets, num_points_in_dense_cells,
-            sorted_cell_indices, permute});
-
-    Kokkos::Profiling::popRegion();
-    elapsed["construction"] = timer_seconds(timer);
-
-    timer_start(timer);
-    Kokkos::Profiling::pushRegion("ArborX::DBSCAN::clusters");
-
-    if (is_special_case)
-    {
-      // Perform the queries and build clusters through callback
-      using CorePoints = Details::CCSCorePoints;
-      Kokkos::Profiling::pushRegion("ArborX::DBSCAN::clusters::query");
-      auto const predicates =
-          Details::PrimitivesWithRadius<Primitives>{primitives, eps};
-      bvh.query(
-          exec_space, predicates,
-          Details::FDBSCANDenseBoxCallback<MemorySpace, CorePoints, Primitives,
-                                           decltype(dense_cell_offsets),
-                                           decltype(permute)>{
-              labels, CorePoints{}, primitives, dense_cell_offsets, permute,
-              eps});
-      Kokkos::Profiling::popRegion();
-    }
-    else
-    {
-      // Determine core points
-      Kokkos::Timer timer_local;
-      timer_start(timer_local);
-      Kokkos::Profiling::pushRegion("ArborX::DBSCAN::clusters::num_neigh");
-      Kokkos::resize(num_neigh, n);
-      // Set num neighbors for points in dense cells to max, so that they are
-      // automatically core points
-      Kokkos::parallel_for(
-          "ArborX::DBSCAN::mark_dense_cells_core_points",
-          Kokkos::RangePolicy<ExecutionSpace>(exec_space, 0,
-                                              num_points_in_dense_cells),
-          KOKKOS_LAMBDA(int i) { num_neigh(permute(i)) = INT_MAX; });
-      // Count neighbors for points in sparse cells
-      auto sparse_permute = Kokkos::subview(
-          permute, Kokkos::make_pair(num_points_in_dense_cells, n));
-
-      auto const sparse_predicates =
-          Details::PrimitivesWithRadiusReorderedAndFiltered<
-              Primitives, decltype(sparse_permute)>{primitives, eps,
-                                                    sparse_permute};
-      bvh.query(exec_space, sparse_predicates,
-                Details::CountUpToN_DenseBox<MemorySpace, Primitives,
-                                             decltype(dense_cell_offsets),
-                                             decltype(permute)>(
-                    num_neigh, primitives, dense_cell_offsets, permute,
-                    core_min_size, eps, core_min_size));
-      Kokkos::Profiling::popRegion();
-      elapsed["neigh"] = timer_seconds(timer_local);
-
-      using CorePoints = Details::DBSCANCorePoints<MemorySpace>;
-
-      // Perform the queries and build clusters through callback
-      timer_start(timer_local);
-      Kokkos::Profiling::pushRegion("ArborX::DBSCAN::clusters:query");
-      auto const predicates =
-          Details::PrimitivesWithRadius<Primitives>{primitives, eps};
-      bvh.query(
-          exec_space, predicates,
-          Details::FDBSCANDenseBoxCallback<MemorySpace, CorePoints, Primitives,
-                                           decltype(dense_cell_offsets),
-                                           decltype(permute)>{
-              labels, CorePoints{num_neigh, core_min_size}, primitives,
-              dense_cell_offsets, permute, eps});
-      Kokkos::Profiling::popRegion();
-      elapsed["query"] = timer_seconds(timer_local);
-    }
-  }
-
-  // Per [1]:
-  //
-  // ```
-  // The finalization kernel will, ultimately, make all parents
-  // point directly to the representative.
-  // ```
-  Kokkos::View<int *, MemorySpace> cluster_sizes(
-      "ArborX::DBSCAN::cluster_sizes", n);
-  Kokkos::parallel_for("ArborX::DBSCAN::finalize_labels",
-                       Kokkos::RangePolicy<ExecutionSpace>(exec_space, 0, n),
-                       KOKKOS_LAMBDA(int const i) {
-                         // ##### ECL license (see LICENSE.ECL) #####
-                         int next;
-                         int vstat = labels(i);
-                         int const old = vstat;
-                         while (vstat > (next = labels(vstat)))
-                         {
-                           vstat = next;
-                         }
-                         if (vstat != old)
-                           labels(i) = vstat;
-
-                         Kokkos::atomic_fetch_add(&cluster_sizes(labels(i)), 1);
-                       });
-  if (is_special_case)
-  {
-    // Ideally, this kernel would have had the exactly same form as in the
-    // else() clause. But there's no available valid is_core() for use here:
-    // - CCSCorePoints cannot be used as it always returns true, which is OK
-    //   inside the callback, but not here
-    // - DBSCANCorePoints cannot be used either as num_neigh is not initialized
-    //   in the special case.
-    Kokkos::parallel_for("ArborX::DBSCAN::mark_noise",
-                         Kokkos::RangePolicy<ExecutionSpace>(exec_space, 0, n),
-                         KOKKOS_LAMBDA(int const i) {
-                           if (cluster_sizes(labels(i)) == 1)
-                             labels(i) = -1;
-                         });
-  }
-  else
-  {
-    Details::DBSCANCorePoints<MemorySpace> is_core{num_neigh, core_min_size};
-    Kokkos::parallel_for("ArborX::DBSCAN::mark_noise",
-                         Kokkos::RangePolicy<ExecutionSpace>(exec_space, 0, n),
-                         KOKKOS_LAMBDA(int const i) {
-                           if (cluster_sizes(labels(i)) == 1 && !is_core(i))
-                             labels(i) = -1;
-                         });
-  }
-  Kokkos::Profiling::popRegion();
-  elapsed["query+cluster"] = timer_seconds(timer);
-
-  if (verbose)
-  {
-    if (parameters._implementation == DBSCAN::Implementation::FDBSCAN_DenseBox)
-      printf("-- dense cells      : %10.3f\n", elapsed["dense_cells"]);
-    printf("-- construction     : %10.3f\n", elapsed["construction"]);
-    printf("-- query+cluster    : %10.3f\n", elapsed["query+cluster"]);
-    if (!is_special_case)
-    {
-      printf("---- neigh          : %10.3f\n", elapsed["neigh"]);
-      printf("---- query          : %10.3f\n", elapsed["query"]);
-    }
-  }
-
-  Kokkos::Profiling::popRegion();
-
-  return labels;
-}
-
-} // namespace ArborX
-
-#endif
diff --git a/src/tpl/arborx/src/ArborX_DistributedSearchTree.hpp b/src/tpl/arborx/src/ArborX_DistributedSearchTree.hpp
deleted file mode 100644
index d68fa9c30..000000000
--- a/src/tpl/arborx/src/ArborX_DistributedSearchTree.hpp
+++ /dev/null
@@ -1,25 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2017-2021 by the ArborX authors                            *
- * All rights reserved.                                                     *
- *                                                                          *
- * This file is part of the ArborX library. ArborX is                       *
- * distributed under a BSD 3-clause license. For the licensing terms see    *
- * the LICENSE file in the top-level directory.                             *
- *                                                                          *
- * SPDX-License-Identifier: BSD-3-Clause                                    *
- ****************************************************************************/
-
-#ifndef ARBORX_DISTRIBUTED_SEARCH_TREE_HPP
-#define ARBORX_DISTRIBUTED_SEARCH_TREE_HPP
-
-#include <ArborX_DistributedTree.hpp>
-
-#include <mpi.h>
-
-// clang-format off
-
-_Pragma("message(\"This file is deprecated. Use ArborX_DistributedTree.hpp instead!\")")
-
-// clang-format on
-
-#endif
diff --git a/src/tpl/arborx/src/ArborX_DistributedTree.hpp b/src/tpl/arborx/src/ArborX_DistributedTree.hpp
deleted file mode 100644
index 77d4851da..000000000
--- a/src/tpl/arborx/src/ArborX_DistributedTree.hpp
+++ /dev/null
@@ -1,225 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2017-2021 by the ArborX authors                            *
- * All rights reserved.                                                     *
- *                                                                          *
- * This file is part of the ArborX library. ArborX is                       *
- * distributed under a BSD 3-clause license. For the licensing terms see    *
- * the LICENSE file in the top-level directory.                             *
- *                                                                          *
- * SPDX-License-Identifier: BSD-3-Clause                                    *
- ****************************************************************************/
-
-#ifndef ARBORX_DISTRIBUTED_TREE_HPP
-#define ARBORX_DISTRIBUTED_TREE_HPP
-
-#include <ArborX_Box.hpp>
-#include <ArborX_DetailsDistributedTreeImpl.hpp>
-#include <ArborX_DetailsUtils.hpp> // accumulate
-#include <ArborX_LinearBVH.hpp>
-
-#include <Kokkos_Core.hpp>
-
-#include <memory>
-
-#include <mpi.h>
-
-namespace ArborX
-{
-
-/** \brief Distributed search tree
- *
- *  \note query() must be called as collective over all processes in the
- *  communicator passed to the constructor.
- */
-template <typename MemorySpace, typename Enable = void>
-class DistributedTree
-{
-public:
-  using memory_space = MemorySpace;
-  static_assert(Kokkos::is_memory_space<MemorySpace>::value, "");
-  using size_type = typename BVH<MemorySpace>::size_type;
-  using bounding_volume_type = typename BVH<MemorySpace>::bounding_volume_type;
-
-  template <typename ExecutionSpace, typename Primitives>
-  DistributedTree(MPI_Comm comm, ExecutionSpace const &space,
-                  Primitives const &primitives);
-
-  /** Returns the smallest axis-aligned box able to contain all the objects
-   *  stored in the tree or an invalid box if the tree is empty.
-   */
-  bounding_volume_type bounds() const noexcept { return _top_tree.bounds(); }
-
-  /** Returns the global number of objects stored in the tree.
-   */
-  size_type size() const noexcept { return _top_tree_size; }
-
-  /** Indicates whether the tree is empty on all processes.
-   */
-  bool empty() const noexcept { return size() == 0; }
-
-  /** \brief Finds object satisfying the passed predicates (e.g. nearest to
-   *  some point or intersecting with some box)
-   *
-   *  This query function performs a batch of spatial or k-nearest neighbors
-   *  searches.  The results give indices of the objects that satisfy
-   *  predicates (as given to the constructor).  They are organized in a
-   *  distributed compressed row storage format.
-   *
-   *  \c indices stores the indices of the objects that satisfy the
-   *  predicates.  \c offset stores the locations in the \c indices view that
-   *  start a predicate, that is, \c queries(q) is satisfied by \c indices(o)
-   *  for <code>objects(q) <= o < objects(q+1)</code> that live on processes
-   *  \c ranks(o) respectively.  Following the usual convention,
-   *  <code>offset(n) = nnz</code>, where \c n is the number of queries that
-   *  were performed and \c nnz is the total number of collisions.
-   *
-   *  \note The views \c indices, \c offset, and \c ranks are passed by
-   *  reference because \c Kokkos::realloc() calls the assignment operator.
-   *
-   *  \param[in] predicates Collection of predicates of the same type.  These
-   *  may be spatial predicates or nearest predicates.
-   *  \param[out] args
-   *     - \c indices Object local indices that satisfy the predicates.
-   *     - \c offset Array of predicate offsets for one-dimensional
-   *       storage.
-   *     - \c ranks Process ranks that own objects.
-   *     - \c distances Computed distances (optional and only for nearest
-   *       predicates).
-   */
-  template <typename ExecutionSpace, typename Predicates, typename... Args>
-  void query(ExecutionSpace const &space, Predicates const &predicates,
-             Args &&... args) const
-  {
-    static_assert(Kokkos::is_execution_space<ExecutionSpace>::value, "");
-    using Access = AccessTraits<Predicates, PredicatesTag>;
-    using Tag = typename Details::AccessTraitsHelper<Access>::tag;
-    using DeviceType = Kokkos::Device<ExecutionSpace, MemorySpace>;
-    Details::DistributedTreeImpl<DeviceType>::queryDispatch(
-        Tag{}, *this, space, predicates, std::forward<Args>(args)...);
-  }
-
-private:
-  template <typename DeviceType>
-  friend struct Details::DistributedTreeImpl;
-  MPI_Comm getComm() const { return *_comm_ptr; }
-  std::shared_ptr<MPI_Comm> _comm_ptr;
-  BVH<MemorySpace> _top_tree;    // replicated
-  BVH<MemorySpace> _bottom_tree; // local
-  size_type _top_tree_size;
-  Kokkos::View<size_type *, MemorySpace> _bottom_tree_sizes;
-};
-
-template <typename MemorySpace, typename Enable>
-template <typename ExecutionSpace, typename Primitives>
-DistributedTree<MemorySpace, Enable>::DistributedTree(
-    MPI_Comm comm, ExecutionSpace const &space, Primitives const &primitives)
-{
-  Kokkos::Profiling::pushRegion("ArborX::DistributedTree::DistributedTree");
-
-  static_assert(Kokkos::is_execution_space<ExecutionSpace>::value, "");
-
-  // Create new context for the library to isolate library's communication from
-  // user's
-  _comm_ptr.reset(
-      // duplicate the communicator and store it in a std::shared_ptr so that
-      // all copies of the distributed tree point to the same object
-      [comm]() {
-        auto p = std::make_unique<MPI_Comm>();
-        MPI_Comm_dup(comm, p.get());
-        return p.release();
-      }(),
-      // custom deleter to mark the communicator object for deallocation
-      [](MPI_Comm *p) {
-        MPI_Comm_free(p);
-        delete p;
-      });
-
-  Kokkos::Profiling::pushRegion("ArborX::DistributedTree::DistributedTree::"
-                                "bottom_tree_construction");
-
-  _bottom_tree = BVH<MemorySpace>(space, primitives);
-
-  Kokkos::Profiling::popRegion();
-  Kokkos::Profiling::pushRegion("ArborX::DistributedTree::DistributedTree::"
-                                "top_tree_construction");
-
-  int comm_rank;
-  MPI_Comm_rank(getComm(), &comm_rank);
-  int comm_size;
-  MPI_Comm_size(getComm(), &comm_size);
-
-  Kokkos::View<Box *, MemorySpace> boxes(
-      Kokkos::view_alloc(Kokkos::WithoutInitializing,
-                         "ArborX::DistributedTree::DistributedTree::"
-                         "rank_bounding_boxes"),
-      comm_size);
-  // FIXME when we move to MPI with CUDA-aware support, we will not need to
-  // copy from the device to the host
-  auto boxes_host = Kokkos::create_mirror_view(boxes);
-  boxes_host(comm_rank) = _bottom_tree.bounds();
-  MPI_Allgather(MPI_IN_PLACE, 0, MPI_DATATYPE_NULL,
-                static_cast<void *>(boxes_host.data()), sizeof(Box), MPI_BYTE,
-                getComm());
-  Kokkos::deep_copy(space, boxes, boxes_host);
-
-  _top_tree = BVH<MemorySpace>{space, boxes};
-
-  Kokkos::Profiling::popRegion();
-  Kokkos::Profiling::pushRegion("ArborX::DistributedTree::DistributedTree::"
-                                "size_calculation");
-
-  _bottom_tree_sizes = Kokkos::View<size_type *, MemorySpace>(
-      Kokkos::view_alloc(Kokkos::WithoutInitializing,
-                         "ArborX::DistributedTree::"
-                         "leave_count_in_local_trees"),
-      comm_size);
-  auto bottom_tree_sizes_host = Kokkos::create_mirror_view(_bottom_tree_sizes);
-  bottom_tree_sizes_host(comm_rank) = _bottom_tree.size();
-  MPI_Allgather(MPI_IN_PLACE, 0, MPI_DATATYPE_NULL,
-                static_cast<void *>(bottom_tree_sizes_host.data()),
-                sizeof(size_type), MPI_BYTE, getComm());
-  Kokkos::deep_copy(space, _bottom_tree_sizes, bottom_tree_sizes_host);
-
-  _top_tree_size = accumulate(space, _bottom_tree_sizes, 0);
-
-  Kokkos::Profiling::popRegion();
-  Kokkos::Profiling::popRegion();
-}
-
-template <typename DeviceType>
-class DistributedTree<DeviceType,
-                      std::enable_if_t<Kokkos::is_device<DeviceType>::value>>
-    : public DistributedTree<typename DeviceType::memory_space>
-{
-public:
-  using device_type = DeviceType;
-
-  // clang-format off
-  template <typename Primitives>
-  [[deprecated("ArborX::DistributedTree templated on a device type is "
-               "deprecated, use it templated on a memory space instead.")]]
-  DistributedTree(MPI_Comm comm, Primitives const &primitives)
-      : DistributedTree<typename DeviceType::memory_space>(
-            comm, typename DeviceType::execution_space{}, primitives)
-  {
-  }
-  // clang-format on
-  template <typename... Args>
-  void query(Args &&... args) const
-  {
-    DistributedTree<typename DeviceType::memory_space>::query(
-        typename DeviceType::execution_space{}, std::forward<Args>(args)...);
-  }
-};
-
-// clang-format off
-
-template <typename MemorySpace, typename Enable = void>
-using DistributedSearchTree [[deprecated("Use DistributedTree instead.")]] =
-    DistributedTree<MemorySpace, Enable>;
-
-// clang-format-on
-
-} // namespace ArborX
-
-#endif
diff --git a/src/tpl/arborx/src/details/ArborX_DetailsBruteForceImpl.hpp b/src/tpl/arborx/src/details/ArborX_DetailsBruteForceImpl.hpp
deleted file mode 100644
index 40371e7f1..000000000
--- a/src/tpl/arborx/src/details/ArborX_DetailsBruteForceImpl.hpp
+++ /dev/null
@@ -1,152 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2017-2021 by the ArborX authors                            *
- * All rights reserved.                                                     *
- *                                                                          *
- * This file is part of the ArborX library. ArborX is                       *
- * distributed under a BSD 3-clause license. For the licensing terms see    *
- * the LICENSE file in the top-level directory.                             *
- *                                                                          *
- * SPDX-License-Identifier: BSD-3-Clause                                    *
- ****************************************************************************/
-
-#ifndef ARBORX_DETAILS_BRUTE_FORCE_IMPL_HPP
-#define ARBORX_DETAILS_BRUTE_FORCE_IMPL_HPP
-
-#include <ArborX_AccessTraits.hpp>
-#include <ArborX_DetailsAlgorithms.hpp> // expand
-#include <ArborX_DetailsTreeConstruction.hpp> // Kokkos::reduction_identity<ArborX::Box>
-
-#include <Kokkos_Core.hpp>
-
-namespace ArborX
-{
-namespace Details
-{
-struct BruteForceImpl
-{
-  template <class ExecutionSpace, class Primitives, class BoundingVolumes,
-            class Bounds>
-  static void initializeBoundingVolumesAndReduceBoundsOfTheScene(
-      ExecutionSpace const &space, Primitives const &primitives,
-      BoundingVolumes const &bounding_volumes, Bounds &bounds)
-  {
-    using Access = AccessTraits<Primitives, PrimitivesTag>;
-
-    int const n = Access::size(primitives);
-
-    Kokkos::parallel_reduce("ArborX::BruteForce::BruteForce::"
-                            "initialize_bounding_volumes_and_reduce_bounds",
-                            Kokkos::RangePolicy<ExecutionSpace>(space, 0, n),
-                            KOKKOS_LAMBDA(int i, Bounds &update) {
-                              using Details::expand;
-                              Bounds bounding_volume{};
-                              expand(bounding_volume,
-                                     Access::get(primitives, i));
-                              bounding_volumes(i) = bounding_volume;
-                              update += bounding_volume;
-                            },
-                            bounds);
-  }
-
-  template <class ExecutionSpace, class Primitives, class Predicates,
-            class Callback>
-  static void query(ExecutionSpace const &space, Primitives const &primitives,
-                    Predicates const &predicates, Callback const &callback)
-  {
-    using TeamPolicy = Kokkos::TeamPolicy<ExecutionSpace>;
-    using AccessPrimitives = AccessTraits<Primitives, PrimitivesTag>;
-    using AccessPredicates = AccessTraits<Predicates, PredicatesTag>;
-    using PredicateType = typename AccessTraitsHelper<AccessPredicates>::type;
-    using PrimitiveType = typename AccessTraitsHelper<AccessPrimitives>::type;
-
-    int const n_primitives = AccessPrimitives::size(primitives);
-    int const n_predicates = AccessPredicates::size(predicates);
-    int max_scratch_size = TeamPolicy::scratch_size_max(0);
-    // half of the scratch memory used by predicates and half for primitives
-    int const predicates_per_team =
-        max_scratch_size / 2 / sizeof(PredicateType);
-    int const primitives_per_team =
-        max_scratch_size / 2 / sizeof(PrimitiveType);
-    ARBORX_ASSERT(predicates_per_team > 0);
-    ARBORX_ASSERT(primitives_per_team > 0);
-
-    int const n_primitive_tiles =
-        std::ceil((float)n_primitives / primitives_per_team);
-    int const n_predicate_tiles =
-        std::ceil((float)n_predicates / predicates_per_team);
-    int const n_teams = n_primitive_tiles * n_predicate_tiles;
-
-    using ScratchPredicateType =
-        Kokkos::View<PredicateType *,
-                     typename ExecutionSpace::scratch_memory_space,
-                     Kokkos::MemoryTraits<Kokkos::Unmanaged>>;
-    using ScratchPrimitiveType =
-        Kokkos::View<PrimitiveType *,
-                     typename ExecutionSpace::scratch_memory_space,
-                     Kokkos::MemoryTraits<Kokkos::Unmanaged>>;
-    int scratch_size = ScratchPredicateType::shmem_size(predicates_per_team) +
-                       ScratchPrimitiveType::shmem_size(primitives_per_team);
-
-    Kokkos::parallel_for(
-        "ArborX::BruteForce::query::spatial::"
-        "check_all_predicates_against_all_primitives",
-        TeamPolicy(space, n_teams, Kokkos::AUTO, 1)
-            .set_scratch_size(0, Kokkos::PerTeam(scratch_size)),
-        KOKKOS_LAMBDA(typename TeamPolicy::member_type const &teamMember) {
-          // select the tiles of predicates/primitives checked by each team
-          int predicate_start = predicates_per_team *
-                                (teamMember.league_rank() / n_primitive_tiles);
-          int primitive_start = primitives_per_team *
-                                (teamMember.league_rank() % n_primitive_tiles);
-
-          int predicates_in_this_team = KokkosExt::min(
-              predicates_per_team, n_predicates - predicate_start);
-          int primitives_in_this_team = KokkosExt::min(
-              primitives_per_team, n_primitives - primitive_start);
-
-          ScratchPredicateType scratch_predicates(teamMember.team_scratch(0),
-                                                  predicates_per_team);
-          ScratchPrimitiveType scratch_primitives(teamMember.team_scratch(0),
-                                                  primitives_per_team);
-          // rank 0 in each team fills the scratch space with the
-          // predicates / primitives in the tile
-          if (teamMember.team_rank() == 0)
-          {
-            Kokkos::parallel_for(
-                Kokkos::ThreadVectorRange(teamMember, predicates_in_this_team),
-                [&](const int q) {
-                  scratch_predicates(q) =
-                      AccessPredicates::get(predicates, predicate_start + q);
-                });
-            Kokkos::parallel_for(
-                Kokkos::ThreadVectorRange(teamMember, primitives_in_this_team),
-                [&](const int j) {
-                  scratch_primitives(j) =
-                      AccessPrimitives::get(primitives, primitive_start + j);
-                });
-          }
-          teamMember.team_barrier();
-
-          // start threads for every predicate / primitive combination
-          Kokkos::parallel_for(
-              Kokkos::TeamThreadRange(teamMember, primitives_in_this_team),
-              [&](int j) {
-                Kokkos::parallel_for(
-                    Kokkos::ThreadVectorRange(teamMember,
-                                              predicates_in_this_team),
-                    [&](const int q) {
-                      auto const &predicate = scratch_predicates(q);
-                      auto const &primitive = scratch_primitives(j);
-                      if (predicate(primitive))
-                      {
-                        callback(predicate, j + primitive_start);
-                      }
-                    });
-              });
-        });
-  }
-};
-} // namespace Details
-} // namespace ArborX
-
-#endif
diff --git a/src/tpl/arborx/src/details/ArborX_DetailsDistributedTreeImpl.hpp b/src/tpl/arborx/src/details/ArborX_DetailsDistributedTreeImpl.hpp
deleted file mode 100644
index 484e765c9..000000000
--- a/src/tpl/arborx/src/details/ArborX_DetailsDistributedTreeImpl.hpp
+++ /dev/null
@@ -1,921 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2017-2021 by the ArborX authors                            *
- * All rights reserved.                                                     *
- *                                                                          *
- * This file is part of the ArborX library. ArborX is                       *
- * distributed under a BSD 3-clause license. For the licensing terms see    *
- * the LICENSE file in the top-level directory.                             *
- *                                                                          *
- * SPDX-License-Identifier: BSD-3-Clause                                    *
- ****************************************************************************/
-#ifndef ARBORX_DETAILS_DISTRIBUTED_SEARCH_TREE_IMPL_HPP
-#define ARBORX_DETAILS_DISTRIBUTED_SEARCH_TREE_IMPL_HPP
-
-#include <ArborX_Config.hpp>
-
-#include <ArborX_DetailsDistributor.hpp>
-#include <ArborX_DetailsHappyTreeFriends.hpp>
-#include <ArborX_DetailsKokkosExtMinMaxOperations.hpp>
-#include <ArborX_DetailsPriorityQueue.hpp>
-#include <ArborX_DetailsUtils.hpp>
-#include <ArborX_LinearBVH.hpp>
-#include <ArborX_Predicates.hpp>
-
-#include <Kokkos_Core.hpp>
-
-#include <mpi.h>
-
-namespace ArborX
-{
-
-namespace Details
-{
-struct DefaultCallbackWithRank
-{
-  int _rank;
-  template <typename Predicate, typename OutputFunctor>
-  KOKKOS_FUNCTION void operator()(Predicate const &, int primitive_index,
-                                  OutputFunctor const &out) const
-  {
-    out({primitive_index, _rank});
-  }
-};
-
-template <typename DeviceType>
-struct DistributedTreeImpl
-{
-  // spatial queries
-  template <typename DistributedTree, typename ExecutionSpace,
-            typename Predicates, typename IndicesAndRanks, typename Offset>
-  static std::enable_if_t<Kokkos::is_view<IndicesAndRanks>{} &&
-                          Kokkos::is_view<Offset>{}>
-  queryDispatch(SpatialPredicateTag, DistributedTree const &tree,
-                ExecutionSpace const &space, Predicates const &queries,
-                IndicesAndRanks &values, Offset &offset)
-  {
-    int comm_rank;
-    MPI_Comm_rank(tree.getComm(), &comm_rank);
-    queryDispatch(SpatialPredicateTag{}, tree, space, queries,
-                  DefaultCallbackWithRank{comm_rank}, values, offset);
-  }
-
-  // NOTE NVCC did not like having definition of that type within the
-  // queryDispatch function below while using an extended __host__ __device__
-  // lambda
-  struct PairIndexRank
-  {
-    int index;
-    int rank;
-  };
-
-  template <typename DistributedTree, typename ExecutionSpace,
-            typename Predicates, typename Indices, typename Offset,
-            typename Ranks>
-  [[deprecated]] static std::enable_if_t<Kokkos::is_view<Indices>{} &&
-                                         Kokkos::is_view<Offset>{} &&
-                                         Kokkos::is_view<Ranks>{}>
-  queryDispatch(SpatialPredicateTag, DistributedTree const &tree,
-                ExecutionSpace const &space, Predicates const &queries,
-                Indices &indices, Offset &offset, Ranks &ranks)
-  {
-    Kokkos::View<PairIndexRank *, ExecutionSpace> out(
-        "ArborX::DistributedTree::query::spatial::pairs_index_rank", 0);
-    queryDispatch(SpatialPredicateTag{}, tree, space, queries, out, offset);
-    auto const n = out.extent(0);
-    reallocWithoutInitializing(indices, n);
-    reallocWithoutInitializing(ranks, n);
-    Kokkos::parallel_for("ArborX::DistributedTree::query::split_pairs",
-                         Kokkos::RangePolicy<ExecutionSpace>(space, 0, n),
-                         KOKKOS_LAMBDA(int i) {
-                           indices(i) = out(i).index;
-                           ranks(i) = out(i).rank;
-                         });
-  }
-
-  template <typename DistributedTree, typename ExecutionSpace,
-            typename Predicates, typename OutputView, typename OffsetView,
-            typename Callback>
-  static std::enable_if_t<Kokkos::is_view<OutputView>{} &&
-                          Kokkos::is_view<OffsetView>{}>
-  queryDispatch(SpatialPredicateTag, DistributedTree const &tree,
-                ExecutionSpace const &space, Predicates const &queries,
-                Callback const &callback, OutputView &out, OffsetView &offset);
-
-  // nearest neighbors queries
-  template <typename DistributedTree, typename ExecutionSpace,
-            typename Predicates, typename Indices, typename Offset,
-            typename Ranks,
-            typename Distances = Kokkos::View<float *, DeviceType>>
-  static std::enable_if_t<
-      Kokkos::is_view<Indices>{} && Kokkos::is_view<Offset>{} &&
-      Kokkos::is_view<Ranks>{} && Kokkos::is_view<Distances>{}>
-  queryDispatchImpl(NearestPredicateTag, DistributedTree const &tree,
-                    ExecutionSpace const &space, Predicates const &queries,
-                    Indices &indices, Offset &offset, Ranks &ranks,
-                    Distances *distances_ptr = nullptr);
-
-  template <typename DistributedTree, typename ExecutionSpace,
-            typename Predicates, typename Indices, typename Offset,
-            typename Ranks>
-  [[deprecated]] static std::enable_if_t<Kokkos::is_view<Indices>{} &&
-                                         Kokkos::is_view<Offset>{} &&
-                                         Kokkos::is_view<Ranks>{}>
-  queryDispatch(NearestPredicateTag tag, DistributedTree const &tree,
-                ExecutionSpace const &space, Predicates const &queries,
-                Indices &indices, Offset &offset, Ranks &ranks)
-  {
-    queryDispatchImpl(tag, tree, space, queries, indices, offset, ranks);
-  }
-
-  template <typename DistributedTree, typename ExecutionSpace,
-            typename Predicates, typename Indices, typename Offset,
-            typename Ranks, typename Distances>
-  [[deprecated]] static std::enable_if_t<
-      Kokkos::is_view<Indices>{} && Kokkos::is_view<Offset>{} &&
-      Kokkos::is_view<Ranks>{} && Kokkos::is_view<Distances>{}>
-  queryDispatch(NearestPredicateTag tag, DistributedTree const &tree,
-                ExecutionSpace const &space, Predicates const &queries,
-                Indices &indices, Offset &offset, Ranks &ranks,
-                Distances &distances)
-  {
-    queryDispatchImpl(tag, tree, space, queries, indices, offset, ranks,
-                      &distances);
-  }
-
-  template <typename DistributedTree, typename ExecutionSpace,
-            typename Predicates, typename IndicesAndRanks, typename Offset>
-  static std::enable_if_t<Kokkos::is_view<IndicesAndRanks>{} &&
-                          Kokkos::is_view<Offset>{}>
-  queryDispatch(NearestPredicateTag tag, DistributedTree const &tree,
-                ExecutionSpace const &space, Predicates const &queries,
-                IndicesAndRanks &values, Offset &offset)
-  {
-    // FIXME avoid zipping when distributed nearest callbacks become availale
-    Kokkos::View<int *, ExecutionSpace> indices(
-        "ArborX::DistributedTree::query::nearest::indices", 0);
-    Kokkos::View<int *, ExecutionSpace> ranks(
-        "ArborX::DistributedTree::query::nearest::ranks", 0);
-    queryDispatchImpl(tag, tree, space, queries, indices, offset, ranks);
-    auto const n = indices.extent(0);
-    reallocWithoutInitializing(values, n);
-    Kokkos::parallel_for(
-        "ArborX::DistributedTree::query::zip_indices_and_ranks",
-        Kokkos::RangePolicy<ExecutionSpace>(space, 0, n), KOKKOS_LAMBDA(int i) {
-          values(i) = {indices(i), ranks(i)};
-        });
-  }
-
-  template <typename DistributedTree, typename ExecutionSpace,
-            typename Predicates, typename Indices, typename Offset,
-            typename Distances>
-  static void deviseStrategy(ExecutionSpace const &space,
-                             Predicates const &queries,
-                             DistributedTree const &tree, Indices &indices,
-                             Offset &offset, Distances &);
-
-  template <typename DistributedTree, typename ExecutionSpace,
-            typename Predicates, typename Indices, typename Offset,
-            typename Distances>
-  static void reassessStrategy(ExecutionSpace const &space,
-                               Predicates const &queries,
-                               DistributedTree const &tree, Indices &indices,
-                               Offset &offset, Distances &distances);
-
-  template <typename ExecutionSpace, typename Predicates, typename Ranks,
-            typename Query>
-  static void forwardQueries(MPI_Comm comm, ExecutionSpace const &space,
-                             Predicates const &queries,
-                             Kokkos::View<int *, DeviceType> indices,
-                             Kokkos::View<int *, DeviceType> offset,
-                             Kokkos::View<Query *, DeviceType> &fwd_queries,
-                             Kokkos::View<int *, DeviceType> &fwd_ids,
-                             Ranks &fwd_ranks);
-
-  template <typename ExecutionSpace, typename OutputView, typename Ranks,
-            typename Distances = Kokkos::View<float *, DeviceType>>
-  static void communicateResultsBack(MPI_Comm comm, ExecutionSpace const &space,
-                                     OutputView &out,
-                                     Kokkos::View<int *, DeviceType> offset,
-                                     Ranks &ranks,
-                                     Kokkos::View<int *, DeviceType> &ids,
-                                     Distances *distances_ptr = nullptr);
-
-  template <typename ExecutionSpace, typename Predicates, typename Indices,
-            typename Offset, typename Ranks>
-  static void filterResults(ExecutionSpace const &space,
-                            Predicates const &queries,
-                            Kokkos::View<float *, DeviceType> distances,
-                            Indices &indices, Offset &offset, Ranks &ranks);
-
-  template <typename ExecutionSpace, typename View, typename... OtherViews>
-  static void sortResults(ExecutionSpace const &space, View keys,
-                          OtherViews... other_views);
-
-  template <typename ExecutionSpace, typename OffsetView>
-  static void countResults(ExecutionSpace const &space, int n_queries,
-                           Kokkos::View<int *, DeviceType> query_ids,
-                           OffsetView &offset);
-
-  template <typename ExecutionSpace, typename View>
-  static typename std::enable_if<Kokkos::is_view<View>::value>::type
-  sendAcrossNetwork(ExecutionSpace const &space,
-                    Distributor<DeviceType> const &distributor, View exports,
-                    typename View::non_const_type imports);
-};
-
-template <typename DeviceType>
-template <typename ExecutionSpace, typename View>
-typename std::enable_if<Kokkos::is_view<View>::value>::type
-DistributedTreeImpl<DeviceType>::sendAcrossNetwork(
-    ExecutionSpace const &space, Distributor<DeviceType> const &distributor,
-    View exports, typename View::non_const_type imports)
-{
-  Kokkos::Profiling::pushRegion("ArborX::DistributedTree::sendAcrossNetwork");
-
-  ARBORX_ASSERT((exports.extent(0) == distributor.getTotalSendLength()) &&
-                (imports.extent(0) == distributor.getTotalReceiveLength()) &&
-                (exports.extent(1) == imports.extent(1)) &&
-                (exports.extent(2) == imports.extent(2)) &&
-                (exports.extent(3) == imports.extent(3)) &&
-                (exports.extent(4) == imports.extent(4)) &&
-                (exports.extent(5) == imports.extent(5)) &&
-                (exports.extent(6) == imports.extent(6)) &&
-                (exports.extent(7) == imports.extent(7)));
-
-  auto const num_packets = exports.extent(1) * exports.extent(2) *
-                           exports.extent(3) * exports.extent(4) *
-                           exports.extent(5) * exports.extent(6) *
-                           exports.extent(7);
-
-  using NonConstValueType = typename View::non_const_value_type;
-
-#ifndef ARBORX_USE_CUDA_AWARE_MPI
-  using MirrorSpace = typename View::host_mirror_space;
-  MirrorSpace const execution_space;
-#else
-  using MirrorSpace = typename View::device_type;
-  auto const &execution_space = space;
-#endif
-
-  auto imports_layout_right =
-      create_layout_right_mirror_view(execution_space, imports);
-
-  Kokkos::View<NonConstValueType *, MirrorSpace,
-               Kokkos::MemoryTraits<Kokkos::Unmanaged>>
-      import_buffer(imports_layout_right.data(), imports_layout_right.size());
-
-  distributor.doPostsAndWaits(space, exports, num_packets, import_buffer);
-
-  auto tmp_view =
-      Kokkos::create_mirror_view_and_copy(space, imports_layout_right);
-  Kokkos::deep_copy(space, imports, tmp_view);
-
-  Kokkos::Profiling::popRegion();
-}
-
-template <typename DeviceType>
-template <typename DistributedTree, typename ExecutionSpace,
-          typename Predicates, typename Indices, typename Offset,
-          typename Distances>
-void DistributedTreeImpl<DeviceType>::deviseStrategy(
-    ExecutionSpace const &space, Predicates const &queries,
-    DistributedTree const &tree, Indices &indices, Offset &offset, Distances &)
-{
-  Kokkos::Profiling::pushRegion("ArborX::DistributedTree::deviseStrategy");
-
-  auto const &top_tree = tree._top_tree;
-  auto const &bottom_tree_sizes = tree._bottom_tree_sizes;
-
-  // Find the k nearest local trees.
-  query(top_tree, space, queries, indices, offset);
-
-  // Accumulate total leave count in the local trees until it reaches k which
-  // is the number of neighbors queried for.  Stop if local trees get
-  // empty because it means that they are no more leaves and there is no point
-  // on forwarding queries to leafless trees.
-  using Access = AccessTraits<Predicates, PredicatesTag>;
-  auto const n_queries = Access::size(queries);
-  Kokkos::View<int *, DeviceType> new_offset(
-      Kokkos::view_alloc(offset.label(), space), n_queries + 1);
-  Kokkos::parallel_for(
-      "ArborX::DistributedTree::query::"
-      "bottom_trees_with_required_cumulated_leaves_count",
-      Kokkos::RangePolicy<ExecutionSpace>(space, 0, n_queries),
-      KOKKOS_LAMBDA(int i) {
-        int leaves_count = 0;
-        int const n_nearest_neighbors = getK(Access::get(queries, i));
-        for (int j = offset(i); j < offset(i + 1); ++j)
-        {
-          int const bottom_tree_size = bottom_tree_sizes(indices(j));
-          if ((bottom_tree_size == 0) || (leaves_count >= n_nearest_neighbors))
-            break;
-          leaves_count += bottom_tree_size;
-          ++new_offset(i);
-        }
-      });
-
-  exclusivePrefixSum(space, new_offset);
-
-  // Truncate results so that queries will only be forwarded to as many local
-  // trees as necessary to find k neighbors.
-  Kokkos::View<int *, DeviceType> new_indices(
-      Kokkos::view_alloc(indices.label(), space), lastElement(new_offset));
-  Kokkos::parallel_for(
-      "ArborX::DistributedTree::query::truncate_before_forwarding",
-      Kokkos::RangePolicy<ExecutionSpace>(space, 0, n_queries),
-      KOKKOS_LAMBDA(int i) {
-        for (int j = 0; j < new_offset(i + 1) - new_offset(i); ++j)
-          new_indices(new_offset(i) + j) = indices(offset(i) + j);
-      });
-
-  offset = new_offset;
-  indices = new_indices;
-
-  Kokkos::Profiling::popRegion();
-}
-
-template <typename DeviceType>
-template <typename DistributedTree, typename ExecutionSpace,
-          typename Predicates, typename Indices, typename Offset,
-          typename Distances>
-void DistributedTreeImpl<DeviceType>::reassessStrategy(
-    ExecutionSpace const &space, Predicates const &queries,
-    DistributedTree const &tree, Indices &indices, Offset &offset,
-    Distances &distances)
-{
-  Kokkos::Profiling::pushRegion("ArborX::DistributedTree::reassessStrategy");
-
-  auto const &top_tree = tree._top_tree;
-  using Access = AccessTraits<Predicates, PredicatesTag>;
-  auto const n_queries = Access::size(queries);
-
-  // Determine distance to the farthest neighbor found so far.
-  Kokkos::View<float *, DeviceType> farthest_distances(
-      Kokkos::view_alloc(
-          Kokkos::WithoutInitializing,
-          "ArborX::DistributedTree::query::reassessStrategy::distances"),
-      n_queries);
-  // NOTE: in principle distances( j ) are arranged in ascending order for
-  // offset( i ) <= j < offset( i + 1 ) so max() is not necessary.
-  Kokkos::parallel_for(
-      "ArborX::DistributedTree::query::most_distant_neighbor_so_far",
-      Kokkos::RangePolicy<ExecutionSpace>(space, 0, n_queries),
-      KOKKOS_LAMBDA(int i) {
-        using KokkosExt::max;
-        farthest_distances(i) = 0.;
-        for (int j = offset(i); j < offset(i + 1); ++j)
-          farthest_distances(i) = max(farthest_distances(i), distances(j));
-      });
-
-  // Identify what ranks may have leaves that are within that distance.
-  Kokkos::View<decltype(intersects(Sphere{})) *, DeviceType> radius_searches(
-      Kokkos::view_alloc(
-          Kokkos::WithoutInitializing,
-          "ArborX::DistributedTree::query::reassessStrategy::queries"),
-      n_queries);
-  Kokkos::parallel_for(
-      "ArborX::DistributedTree::query::bottom_trees_within_that_distance",
-      Kokkos::RangePolicy<ExecutionSpace>(space, 0, n_queries),
-      KOKKOS_LAMBDA(int i) {
-        radius_searches(i) = intersects(Sphere{
-            getGeometry(Access::get(queries, i)), farthest_distances(i)});
-      });
-
-  query(top_tree, space, radius_searches, indices, offset);
-  // NOTE: in principle, we could perform radius searches on the bottom_tree
-  // rather than nearest queries.
-
-  Kokkos::Profiling::popRegion();
-}
-
-struct PairIndexDistance
-{
-  int index;
-  float distance;
-};
-
-template <typename Tree>
-struct CallbackWithDistance
-{
-  Tree _tree;
-  Kokkos::View<unsigned int *, typename Tree::memory_space> _rev_permute;
-
-  template <typename ExecutionSpace>
-  CallbackWithDistance(ExecutionSpace const &exec_space, Tree const &tree)
-      : _tree(tree)
-  {
-    // NOTE cannot have extended __host__ __device__  lambda in constructor with
-    // NVCC
-    computeReversePermutation(exec_space);
-  }
-
-  template <typename ExecutionSpace>
-  void computeReversePermutation(ExecutionSpace const &exec_space)
-  {
-    auto const n = _tree.size();
-
-    _rev_permute = Kokkos::View<unsigned int *, typename Tree::memory_space>(
-        Kokkos::view_alloc(
-            Kokkos::WithoutInitializing,
-            "ArborX::DistributedTree::query::nearest::reverse_permutation"),
-        n);
-    if (!_tree.empty())
-    {
-      int const leaf_nodes_shift = _tree.size() - 1;
-      auto const &leaf_nodes = HappyTreeFriends::getLeafNodes(_tree);
-      auto const &rev_permute = _rev_permute; // avoid implicit capture of *this
-      Kokkos::parallel_for(
-          "ArborX::DistributedTree::query::nearest::"
-          "compute_reverse_permutation",
-          Kokkos::RangePolicy<ExecutionSpace>(exec_space, 0, n),
-          KOKKOS_LAMBDA(int const i) {
-            rev_permute(leaf_nodes(i).getLeafPermutationIndex()) =
-                i + leaf_nodes_shift;
-          });
-    }
-  }
-
-  template <typename Query, typename OutputFunctor>
-  KOKKOS_FUNCTION void operator()(Query const &query, int index,
-                                  OutputFunctor const &out) const
-  {
-    // TODO: This breaks the abstraction of the distributed Tree not knowing
-    // the details of the local tree. Right now, this is the only way. Will
-    // need to be fixed with a proper callback abstraction.
-    int const leaf_node_index = _rev_permute(index);
-    auto const *leaf_node_ptr =
-        HappyTreeFriends::getNodePtr(_tree, leaf_node_index);
-    auto const &leaf_node_bounding_volume =
-        HappyTreeFriends::getBoundingVolume(_tree, leaf_node_ptr);
-    out({index, distance(getGeometry(query), leaf_node_bounding_volume)});
-  }
-};
-
-template <typename DeviceType>
-template <typename DistributedTree, typename ExecutionSpace,
-          typename Predicates, typename Indices, typename Offset,
-          typename Ranks, typename Distances>
-std::enable_if_t<Kokkos::is_view<Indices>{} && Kokkos::is_view<Offset>{} &&
-                 Kokkos::is_view<Ranks>{} && Kokkos::is_view<Distances>{}>
-DistributedTreeImpl<DeviceType>::queryDispatchImpl(
-    NearestPredicateTag, DistributedTree const &tree,
-    ExecutionSpace const &space, Predicates const &queries, Indices &indices,
-    Offset &offset, Ranks &ranks, Distances *distances_ptr)
-{
-  Kokkos::Profiling::pushRegion("ArborX::DistributedTree::query::nearest");
-
-  auto const &bottom_tree = tree._bottom_tree;
-  auto comm = tree.getComm();
-
-  Distances distances("ArborX::DistributedTree::query::nearest::distances", 0);
-  if (distances_ptr)
-    distances = *distances_ptr;
-
-  // "Strategy" is used to determine what ranks to forward queries to.  In
-  // the 1st pass, the queries are sent to as many ranks as necessary to
-  // guarantee that all k neighbors queried for are found.  In the 2nd pass,
-  // queries are sent again to all ranks that may have a neighbor closer to
-  // the farthest neighbor identified in the 1st pass.
-  //
-  // The current implementation discards the results after the 1st pass and
-  // recompute everything instead of just searching for potential better
-  // neighbors and updating the list.
-
-  // Right now, distance calcuations only work with BVH due to using functions
-  // in DistributedTreeNearestUtils. So, there's no point in replacing this
-  // with decltype.
-  CallbackWithDistance<BVH<typename DeviceType::memory_space>>
-      callback_with_distance(space, bottom_tree);
-
-  // NOTE: compiler would not deduce __range for the braced-init-list but I
-  // got it to work with the static_cast to function pointers.
-  using Strategy =
-      void (*)(ExecutionSpace const &, Predicates const &,
-               DistributedTree const &, Indices &, Offset &, Distances &);
-  for (auto implementStrategy :
-       {static_cast<Strategy>(DistributedTreeImpl<DeviceType>::deviseStrategy),
-        static_cast<Strategy>(
-            DistributedTreeImpl<DeviceType>::reassessStrategy)})
-  {
-    implementStrategy(space, queries, tree, indices, offset, distances);
-
-    {
-      // NOTE_COMM_NEAREST: The communication pattern here for the nearest
-      // search is identical to that of the spatial search (see
-      // NOTE_COMM_SPATIAL). The code differences are:
-      // - no callbacks
-      // - explicit distances
-      // - results filtering
-
-      // Forward queries
-      using Access = AccessTraits<Predicates, PredicatesTag>;
-      using Query = typename AccessTraitsHelper<Access>::type;
-      Kokkos::View<int *, DeviceType> ids(
-          "ArborX::DistributedTree::query::nearest::query_ids", 0);
-      Kokkos::View<Query *, DeviceType> fwd_queries(
-          "ArborX::DistributedTree::query::nearest::fwd_queries", 0);
-      forwardQueries(comm, space, queries, indices, offset, fwd_queries, ids,
-                     ranks);
-
-      // Perform queries that have been received
-      Kokkos::View<PairIndexDistance *, DeviceType> out(
-          "ArborX::DistributedTree::query::pairs_index_distance", 0);
-      query(bottom_tree, space, fwd_queries, callback_with_distance, out,
-            offset);
-
-      // Unzip
-      auto const n = out.extent(0);
-      reallocWithoutInitializing(indices, n);
-      reallocWithoutInitializing(distances, n);
-      Kokkos::parallel_for("ArborX::DistributedTree::query::nearest::split_"
-                           "index_distance_pairs",
-                           Kokkos::RangePolicy<ExecutionSpace>(space, 0, n),
-                           KOKKOS_LAMBDA(int i) {
-                             indices(i) = out(i).index;
-                             distances(i) = out(i).distance;
-                           });
-
-      // Communicate results back
-      communicateResultsBack(comm, space, indices, offset, ranks, ids,
-                             &distances);
-
-      // Merge results
-      Kokkos::Profiling::pushRegion(
-          "ArborX::DistributedTree::nearest::postprocess_results");
-
-      int const n_queries = Access::size(queries);
-      countResults(space, n_queries, ids, offset);
-      sortResults(space, ids, indices, ranks, distances);
-      filterResults(space, queries, distances, indices, offset, ranks);
-
-      Kokkos::Profiling::popRegion();
-    }
-  }
-
-  Kokkos::Profiling::popRegion();
-}
-
-template <typename DeviceType>
-template <typename DistributedTree, typename ExecutionSpace,
-          typename Predicates, typename OutputView, typename OffsetView,
-          typename Callback>
-std::enable_if_t<Kokkos::is_view<OutputView>{} && Kokkos::is_view<OffsetView>{}>
-DistributedTreeImpl<DeviceType>::queryDispatch(
-    SpatialPredicateTag, DistributedTree const &tree,
-    ExecutionSpace const &space, Predicates const &queries,
-    Callback const &callback, OutputView &out, OffsetView &offset)
-{
-  Kokkos::Profiling::pushRegion("ArborX::DistributedTree::query::spatial");
-
-  auto const &top_tree = tree._top_tree;
-  auto const &bottom_tree = tree._bottom_tree;
-  auto comm = tree.getComm();
-
-  Kokkos::View<int *, DeviceType> indices(
-      "ArborX::DistributedTree::query::spatial::indices", 0);
-  Kokkos::View<int *, DeviceType> ranks(
-      "ArborX::DistributedTree::query::spatial::ranks", 0);
-  query(top_tree, space, queries, indices, offset);
-
-  {
-    // NOTE_COMM_SPATIAL: The communication pattern here for the spatial search
-    // is identical to that of the nearest search (see NOTE_COMM_NEAREST). The
-    // code differences are:
-    // - usage of callbacks
-    // - no explicit distances
-    // - no results filtering
-
-    // Forward queries
-    using Access = AccessTraits<Predicates, PredicatesTag>;
-    using Query = typename AccessTraitsHelper<Access>::type;
-    Kokkos::View<int *, DeviceType> ids(
-        "ArborX::DistributedTree::query::spatial::query_ids", 0);
-    Kokkos::View<Query *, DeviceType> fwd_queries(
-        "ArborX::DistributedTree::query::spatial::fwd_queries", 0);
-    forwardQueries(comm, space, queries, indices, offset, fwd_queries, ids,
-                   ranks);
-
-    // Perform queries that have been received
-    query(bottom_tree, space, fwd_queries, callback, out, offset);
-
-    // Communicate results back
-    communicateResultsBack(comm, space, out, offset, ranks, ids);
-
-    Kokkos::Profiling::pushRegion(
-        "ArborX::DistributedTree::spatial::postprocess_results");
-
-    // Merge results
-    int const n_queries = Access::size(queries);
-    countResults(space, n_queries, ids, offset);
-    sortResults(space, ids, out);
-
-    Kokkos::Profiling::popRegion();
-  }
-
-  Kokkos::Profiling::popRegion();
-}
-
-template <typename DeviceType>
-template <typename ExecutionSpace, typename View, typename... OtherViews>
-void DistributedTreeImpl<DeviceType>::sortResults(ExecutionSpace const &space,
-                                                  View keys,
-                                                  OtherViews... other_views)
-{
-  auto const n = keys.extent(0);
-  // If they were no queries, min_val and max_val values won't change after
-  // the parallel reduce (they are initialized to +infty and -infty
-  // respectively) and the sort will hang.
-  if (n == 0)
-    return;
-
-  // We only want to get the permutation here, but sortObjects also sorts the
-  // elements given to it. Hence, we need to create a copy.
-  // TODO try to avoid the copy
-  View keys_clone(
-      Kokkos::view_alloc(Kokkos::WithoutInitializing,
-                         "ArborX::DistributedTree::query::sortResults::keys"),
-      keys.size());
-  Kokkos::deep_copy(space, keys_clone, keys);
-  auto const permutation = ArborX::Details::sortObjects(space, keys_clone);
-
-  // Call applyPermutation for every entry in the parameter pack.
-  // We need to use the comma operator here since the function returns void.
-  // The variable we assign to is actually not needed. We just need something
-  // to store the initializer list (that contains only zeros).
-  auto dummy = {
-      (ArborX::Details::applyPermutation(space, permutation, other_views),
-       0)...};
-  std::ignore = dummy;
-}
-
-template <typename DeviceType>
-template <typename ExecutionSpace, typename OffsetView>
-void DistributedTreeImpl<DeviceType>::countResults(
-    ExecutionSpace const &space, int n_queries,
-    Kokkos::View<int *, DeviceType> query_ids, OffsetView &offset)
-{
-  int const nnz = query_ids.extent(0);
-
-  Kokkos::realloc(offset, n_queries + 1);
-
-  Kokkos::parallel_for(
-      "ArborX::DistributedTree::query::count_results_per_query",
-      Kokkos::RangePolicy<ExecutionSpace>(space, 0, nnz), KOKKOS_LAMBDA(int i) {
-        Kokkos::atomic_increment(&offset(query_ids(i)));
-      });
-
-  exclusivePrefixSum(space, offset);
-}
-
-template <typename DeviceType>
-template <typename ExecutionSpace, typename Predicates, typename Ranks,
-          typename Query>
-void DistributedTreeImpl<DeviceType>::forwardQueries(
-    MPI_Comm comm, ExecutionSpace const &space, Predicates const &queries,
-    Kokkos::View<int *, DeviceType> indices,
-    Kokkos::View<int *, DeviceType> offset,
-    Kokkos::View<Query *, DeviceType> &fwd_queries,
-    Kokkos::View<int *, DeviceType> &fwd_ids, Ranks &fwd_ranks)
-{
-  Kokkos::Profiling::pushRegion("ArborX::DistributedTree::forwardQueries");
-
-  int comm_rank;
-  MPI_Comm_rank(comm, &comm_rank);
-
-  Distributor<DeviceType> distributor(comm);
-
-  using Access = AccessTraits<Predicates, PredicatesTag>;
-  int const n_queries = Access::size(queries);
-  int const n_exports = lastElement(offset);
-  int const n_imports = distributor.createFromSends(space, indices);
-
-  static_assert(
-      std::is_same<Query, typename AccessTraitsHelper<Access>::type>{}, "");
-  Kokkos::View<Query *, DeviceType> exports(
-      Kokkos::view_alloc(
-          Kokkos::WithoutInitializing,
-          "ArborX::DistributedTree::query::forwardQueries::queries"),
-      n_exports);
-  Kokkos::parallel_for(
-      "ArborX::DistributedTree::query::forward_queries_fill_buffer",
-      Kokkos::RangePolicy<ExecutionSpace>(space, 0, n_queries),
-      KOKKOS_LAMBDA(int q) {
-        for (int i = offset(q); i < offset(q + 1); ++i)
-        {
-          exports(i) = Access::get(queries, q);
-        }
-      });
-
-  Kokkos::View<int *, DeviceType> export_ranks(
-      Kokkos::view_alloc(
-          Kokkos::WithoutInitializing,
-          "ArborX::DistributedTree::query::forwardQueries::export_ranks"),
-      n_exports);
-  Kokkos::deep_copy(space, export_ranks, comm_rank);
-
-  Kokkos::View<int *, DeviceType> import_ranks(
-      Kokkos::view_alloc(
-          Kokkos::WithoutInitializing,
-          "ArborX::DistributedTree::query::forwardQueries::import_ranks"),
-      n_imports);
-  sendAcrossNetwork(space, distributor, export_ranks, import_ranks);
-
-  Kokkos::View<int *, DeviceType> export_ids(
-      Kokkos::view_alloc(
-          Kokkos::WithoutInitializing,
-          "ArborX::DistributedTree::query::forwardQueries::export_ids"),
-      n_exports);
-  Kokkos::parallel_for(
-      "ArborX::DistributedTree::query::forward_queries_fill_ids",
-      Kokkos::RangePolicy<ExecutionSpace>(space, 0, n_queries),
-      KOKKOS_LAMBDA(int q) {
-        for (int i = offset(q); i < offset(q + 1); ++i)
-        {
-          export_ids(i) = q;
-        }
-      });
-  Kokkos::View<int *, DeviceType> import_ids(
-      Kokkos::view_alloc(
-          Kokkos::WithoutInitializing,
-          "ArborX::DistributedTree::query::forwardQueries::import_ids"),
-      n_imports);
-  sendAcrossNetwork(space, distributor, export_ids, import_ids);
-
-  // Send queries across the network
-  Kokkos::View<Query *, DeviceType> imports(
-      Kokkos::view_alloc(
-          Kokkos::WithoutInitializing,
-          "ArborX::DistributedTree::query::forwardQueries::queries"),
-      n_imports);
-  sendAcrossNetwork(space, distributor, exports, imports);
-
-  fwd_queries = imports;
-  fwd_ids = import_ids;
-  fwd_ranks = import_ranks;
-
-  Kokkos::Profiling::popRegion();
-}
-
-template <typename DeviceType>
-template <typename ExecutionSpace, typename OutputView, typename Ranks,
-          typename Distances>
-void DistributedTreeImpl<DeviceType>::communicateResultsBack(
-    MPI_Comm comm, ExecutionSpace const &space, OutputView &out,
-    Kokkos::View<int *, DeviceType> offset, Ranks &ranks,
-    Kokkos::View<int *, DeviceType> &ids, Distances *distances_ptr)
-{
-  Kokkos::Profiling::pushRegion(
-      "ArborX::DistributedTree::communicateResultsBack");
-
-  int comm_rank;
-  MPI_Comm_rank(comm, &comm_rank);
-
-  int const n_fwd_queries = offset.extent_int(0) - 1;
-  int const n_exports = lastElement(offset);
-
-  // We are assuming here that if the same rank is related to multiple batches
-  // these batches appear consecutively. Hence, no reordering is necessary.
-  Distributor<DeviceType> distributor(comm);
-  // FIXME Distributor::createFromSends takes two views of the same type by
-  // a const reference.  There were two easy ways out, either take the views by
-  // value or cast at the callsite.  I went with the latter.  Proper fix
-  // involves more code cleanup in ArborX_DetailsDistributor.hpp than I am
-  // willing to do just now.
-  int const n_imports =
-      distributor.createFromSends(space, ranks, static_cast<Ranks>(offset));
-
-  Kokkos::View<int *, DeviceType> export_ranks(
-      Kokkos::view_alloc(Kokkos::WithoutInitializing, ranks.label()),
-      n_exports);
-  Kokkos::deep_copy(space, export_ranks, comm_rank);
-  Kokkos::View<int *, DeviceType> export_ids(
-      Kokkos::view_alloc(Kokkos::WithoutInitializing, ids.label()), n_exports);
-  Kokkos::parallel_for(
-      "ArborX::DistributedTree::query::fill_buffer",
-      Kokkos::RangePolicy<ExecutionSpace>(space, 0, n_fwd_queries),
-      KOKKOS_LAMBDA(int q) {
-        for (int i = offset(q); i < offset(q + 1); ++i)
-        {
-          export_ids(i) = ids(q);
-        }
-      });
-  OutputView export_out = out;
-
-  OutputView import_out(
-      Kokkos::view_alloc(Kokkos::WithoutInitializing, out.label()), n_imports);
-  Kokkos::View<int *, DeviceType> import_ranks(
-      Kokkos::view_alloc(Kokkos::WithoutInitializing, ranks.label()),
-      n_imports);
-  Kokkos::View<int *, DeviceType> import_ids(
-      Kokkos::view_alloc(Kokkos::WithoutInitializing, ids.label()), n_imports);
-
-  sendAcrossNetwork(space, distributor, export_out, import_out);
-  sendAcrossNetwork(space, distributor, export_ranks, import_ranks);
-  sendAcrossNetwork(space, distributor, export_ids, import_ids);
-
-  ids = import_ids;
-  ranks = import_ranks;
-  out = import_out;
-
-  if (distances_ptr)
-  {
-    auto &distances = *distances_ptr;
-    Kokkos::View<float *, DeviceType> export_distances = distances;
-    Kokkos::View<float *, DeviceType> import_distances(
-        Kokkos::view_alloc(Kokkos::WithoutInitializing, distances.label()),
-        n_imports);
-    sendAcrossNetwork(space, distributor, export_distances, import_distances);
-    distances = import_distances;
-  }
-
-  Kokkos::Profiling::popRegion();
-}
-
-template <typename DeviceType>
-template <typename ExecutionSpace, typename Predicates, typename Indices,
-          typename Offset, typename Ranks>
-void DistributedTreeImpl<DeviceType>::filterResults(
-    ExecutionSpace const &space, Predicates const &queries,
-    Kokkos::View<float *, DeviceType> distances, Indices &indices,
-    Offset &offset, Ranks &ranks)
-{
-  Kokkos::Profiling::pushRegion("ArborX::DistributedTree::filterResults");
-
-  using Access = AccessTraits<Predicates, PredicatesTag>;
-  int const n_queries = Access::size(queries);
-  // truncated views are prefixed with an underscore
-  Kokkos::View<int *, DeviceType> new_offset(offset.label(), n_queries + 1);
-
-  Kokkos::parallel_for("ArborX::DistributedTree::query::discard_results",
-                       Kokkos::RangePolicy<ExecutionSpace>(space, 0, n_queries),
-                       KOKKOS_LAMBDA(int q) {
-                         using KokkosExt::min;
-                         new_offset(q) = min(offset(q + 1) - offset(q),
-                                             getK(Access::get(queries, q)));
-                       });
-
-  exclusivePrefixSum(space, new_offset);
-
-  int const n_truncated_results = lastElement(new_offset);
-  Kokkos::View<int *, DeviceType> new_indices(indices.label(),
-                                              n_truncated_results);
-  Kokkos::View<int *, DeviceType> new_ranks(ranks.label(), n_truncated_results);
-
-  using PairIndexDistance = Kokkos::pair<Kokkos::Array<int, 2>, float>;
-  struct CompareDistance
-  {
-    KOKKOS_INLINE_FUNCTION bool operator()(PairIndexDistance const &lhs,
-                                           PairIndexDistance const &rhs)
-    {
-      // reverse order (larger distance means lower priority)
-      return lhs.second > rhs.second;
-    }
-  };
-
-  int const n_results = lastElement(offset);
-  Kokkos::View<PairIndexDistance *, DeviceType> buffer(
-      Kokkos::view_alloc(
-          Kokkos::WithoutInitializing,
-          "ArborX::DistributedTree::query::filterResults::buffer"),
-      n_results);
-  using PriorityQueue =
-      Details::PriorityQueue<PairIndexDistance, CompareDistance,
-                             UnmanagedStaticVector<PairIndexDistance>>;
-
-  Kokkos::parallel_for(
-      "ArborX::DistributedTree::query::truncate_results",
-      Kokkos::RangePolicy<ExecutionSpace>(space, 0, n_queries),
-      KOKKOS_LAMBDA(int q) {
-        if (offset(q + 1) > offset(q))
-        {
-          auto local_buffer = Kokkos::subview(
-              buffer, Kokkos::make_pair(offset(q), offset(q + 1)));
-          PriorityQueue queue(UnmanagedStaticVector<PairIndexDistance>(
-              local_buffer.data(), local_buffer.size()));
-          for (int i = offset(q); i < offset(q + 1); ++i)
-          {
-            queue.emplace(Kokkos::Array<int, 2>{{indices(i), ranks(i)}},
-                          distances(i));
-          }
-
-          int count = 0;
-          while (!queue.empty() && count < getK(Access::get(queries, q)))
-          {
-            new_indices(new_offset(q) + count) = queue.top().first[0];
-            new_ranks(new_offset(q) + count) = queue.top().first[1];
-            queue.pop();
-            ++count;
-          }
-        }
-      });
-  indices = new_indices;
-  ranks = new_ranks;
-  offset = new_offset;
-
-  Kokkos::Profiling::popRegion();
-}
-
-} // namespace Details
-} // namespace ArborX
-
-#endif
diff --git a/src/tpl/arborx/src/details/ArborX_DetailsDistributor.hpp b/src/tpl/arborx/src/details/ArborX_DetailsDistributor.hpp
deleted file mode 100644
index c8097f913..000000000
--- a/src/tpl/arborx/src/details/ArborX_DetailsDistributor.hpp
+++ /dev/null
@@ -1,425 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2017-2021 by the ArborX authors                            *
- * All rights reserved.                                                     *
- *                                                                          *
- * This file is part of the ArborX library. ArborX is                       *
- * distributed under a BSD 3-clause license. For the licensing terms see    *
- * the LICENSE file in the top-level directory.                             *
- *                                                                          *
- * SPDX-License-Identifier: BSD-3-Clause                                    *
- ****************************************************************************/
-#ifndef ARBORX_DETAILS_DISTRIBUTOR_HPP
-#define ARBORX_DETAILS_DISTRIBUTOR_HPP
-
-#include <ArborX_Config.hpp>
-
-#include <ArborX_DetailsSortUtils.hpp>
-#include <ArborX_DetailsUtils.hpp> // max
-#include <ArborX_Exception.hpp>
-
-#include <Kokkos_Core.hpp>
-
-#include <algorithm> // max_element
-#include <numeric>   // iota
-#include <sstream>
-#include <vector>
-
-#include <mpi.h>
-
-namespace ArborX
-{
-namespace Details
-{
-
-// Assuming that batched_ranks might contain elements multiply, but duplicates
-// are not separated by other elements, return the unique elements in that array
-// with the corresponding element counts and displacement (offsets).
-template <typename ExecutionSpace, typename InputView, typename OutputView>
-static void
-determineBufferLayout(ExecutionSpace const &space, InputView batched_ranks,
-                      InputView batched_offsets, OutputView permutation_indices,
-                      std::vector<int> &unique_ranks, std::vector<int> &counts,
-                      std::vector<int> &offsets)
-{
-  ARBORX_ASSERT(unique_ranks.empty());
-  ARBORX_ASSERT(offsets.empty());
-  ARBORX_ASSERT(counts.empty());
-  ARBORX_ASSERT(permutation_indices.extent_int(0) == 0);
-  ARBORX_ASSERT(batched_ranks.size() + 1 == batched_offsets.size());
-  static_assert(
-      std::is_same<typename InputView::non_const_value_type, int>::value, "");
-  static_assert(std::is_same<typename OutputView::value_type, int>::value, "");
-
-  // In case all the batches are empty, return an empty list of unique_ranks and
-  // counts, but still have one element in offsets. This is conforming with
-  // creating the total offsets from batched_ranks and batched_offsets ignoring
-  // empty batches and calling sortAndDetermeineBufferLayout.
-  offsets.push_back(0);
-
-  auto const n_batched_ranks = batched_ranks.size();
-  if (n_batched_ranks == 0 || lastElement(batched_offsets) == 0)
-    return;
-
-  using DeviceType = typename InputView::traits::device_type;
-
-  // Find the indices in batched_ranks for which the rank changes and store
-  // these ranks and the corresponding offsets in a new container that we can be
-  // sure to be large enough.
-  Kokkos::View<int *, DeviceType> compact_offsets(
-      Kokkos::view_alloc(Kokkos::WithoutInitializing, batched_offsets.label()),
-      batched_offsets.size());
-  Kokkos::View<int *, DeviceType> compact_ranks(
-      Kokkos::view_alloc(Kokkos::WithoutInitializing, batched_ranks.label()),
-      batched_ranks.size());
-
-  // Note that we never touch the first element of compact_offsets below.
-  // Consequently, it is uninitialized.
-  int n_unique_ranks;
-  Kokkos::parallel_scan(
-      "ArborX::Distributor::compact_offsets_and_ranks",
-      Kokkos::RangePolicy<ExecutionSpace>(space, 0, n_batched_ranks),
-      KOKKOS_LAMBDA(unsigned int i, int &update, bool last_pass) {
-        if (i == batched_ranks.size() - 1 ||
-            batched_ranks(i + 1) != batched_ranks(i))
-        {
-          if (last_pass)
-          {
-            compact_ranks(update) = batched_ranks(i);
-            compact_offsets(update + 1) = batched_offsets(i + 1);
-          }
-          ++update;
-        }
-      },
-      n_unique_ranks);
-
-  // Now create subviews containing the elements we actually need, copy
-  // everything to the CPU and fill the output variables.
-  auto restricted_offsets = InputView(
-      compact_offsets, std::make_pair(1, static_cast<int>(n_unique_ranks + 1)));
-  auto restricted_unique_ranks = InputView(
-      compact_ranks, std::make_pair(0, static_cast<int>(n_unique_ranks)));
-
-  auto const unique_ranks_host = Kokkos::create_mirror_view_and_copy(
-      Kokkos::HostSpace(), restricted_unique_ranks);
-  unique_ranks.reserve(n_unique_ranks);
-  auto const offsets_host = Kokkos::create_mirror_view_and_copy(
-      Kokkos::HostSpace(), restricted_offsets);
-  offsets.reserve(n_unique_ranks + 1);
-  counts.reserve(n_unique_ranks);
-
-  for (int i = 0; i < n_unique_ranks; ++i)
-  {
-    int const count =
-        i == 0 ? offsets_host(0) : offsets_host(i) - offsets_host(i - 1);
-    if (count > 0)
-    {
-      counts.push_back(count);
-      offsets.push_back(offsets_host(i));
-      unique_ranks.push_back(unique_ranks_host(i));
-    }
-  }
-}
-
-// Computes the array of indices that sort the input array (in reverse order)
-// but also returns the sorted unique elements in that array with the
-// corresponding element counts and displacement (offsets)
-template <typename ExecutionSpace, typename InputView, typename OutputView>
-static void sortAndDetermineBufferLayout(ExecutionSpace const &space,
-                                         InputView ranks,
-                                         OutputView permutation_indices,
-                                         std::vector<int> &unique_ranks,
-                                         std::vector<int> &counts,
-                                         std::vector<int> &offsets)
-{
-  ARBORX_ASSERT(unique_ranks.empty());
-  ARBORX_ASSERT(offsets.empty());
-  ARBORX_ASSERT(counts.empty());
-  ARBORX_ASSERT(permutation_indices.extent_int(0) == ranks.extent_int(0));
-  static_assert(
-      std::is_same<typename InputView::non_const_value_type, int>::value, "");
-  static_assert(std::is_same<typename OutputView::value_type, int>::value, "");
-
-  offsets.push_back(0);
-
-  auto const n = ranks.extent_int(0);
-  if (n == 0)
-    return;
-
-  // this implements a "sort" which is O(N * R) where (R) is the total number of
-  // unique destination ranks. it performs better than other algorithms in the
-  // case when (R) is small, but results may vary
-  using DeviceType = typename InputView::traits::device_type;
-
-  Kokkos::View<int *, DeviceType> device_ranks_duplicate(
-      Kokkos::view_alloc(Kokkos::WithoutInitializing, ranks.label()),
-      ranks.size());
-  Kokkos::deep_copy(space, device_ranks_duplicate, ranks);
-  auto device_permutation_indices =
-      Kokkos::create_mirror_view(DeviceType(), permutation_indices);
-  int offset = 0;
-  while (true)
-  {
-    int const largest_rank = ArborX::max(space, device_ranks_duplicate);
-    if (largest_rank == -1)
-      break;
-    unique_ranks.push_back(largest_rank);
-    int result = 0;
-    Kokkos::parallel_scan("ArborX::Distributor::process_biggest_rank_items",
-                          Kokkos::RangePolicy<ExecutionSpace>(space, 0, n),
-                          KOKKOS_LAMBDA(int i, int &update, bool last_pass) {
-                            bool const is_largest_rank =
-                                (device_ranks_duplicate(i) == largest_rank);
-                            if (is_largest_rank)
-                            {
-                              if (last_pass)
-                              {
-                                device_permutation_indices(i) = update + offset;
-                                device_ranks_duplicate(i) = -1;
-                              }
-                              ++update;
-                            }
-                          },
-                          result);
-    offset += result;
-    offsets.push_back(offset);
-  }
-  counts.reserve(offsets.size() - 1);
-  for (unsigned int i = 1; i < offsets.size(); ++i)
-    counts.push_back(offsets[i] - offsets[i - 1]);
-  Kokkos::deep_copy(space, permutation_indices, device_permutation_indices);
-  ARBORX_ASSERT(offsets.back() == static_cast<int>(ranks.size()));
-}
-
-template <typename DeviceType>
-class Distributor
-{
-public:
-  Distributor(MPI_Comm comm)
-      : _comm(comm)
-      , _permute{Kokkos::view_alloc(Kokkos::WithoutInitializing,
-                                    "ArborX::Distributor::permute"),
-                 0}
-  {
-  }
-
-  template <typename ExecutionSpace, typename View>
-  size_t createFromSends(ExecutionSpace const &space,
-                         View const &batched_destination_ranks,
-                         View const &batch_offsets)
-  {
-    static_assert(View::rank == 1, "");
-    static_assert(std::is_same<typename View::non_const_value_type, int>::value,
-                  "");
-
-    // The next two function calls are the only difference to the other
-    // overload.
-    // Note that we don't resize _permute here since we are assuming that no
-    // reordering is necessary.
-    determineBufferLayout(space, batched_destination_ranks, batch_offsets,
-                          _permute, _destinations, _dest_counts, _dest_offsets);
-
-    return preparePointToPointCommunication();
-  }
-
-  template <typename ExecutionSpace, typename View>
-  size_t createFromSends(ExecutionSpace const &space,
-                         View const &destination_ranks)
-  {
-    static_assert(View::rank == 1, "");
-    static_assert(std::is_same<typename View::non_const_value_type, int>::value,
-                  "");
-
-    // The next two function calls are the only difference to the other
-    // overload.
-    reallocWithoutInitializing(_permute, destination_ranks.size());
-    sortAndDetermineBufferLayout(space, destination_ranks, _permute,
-                                 _destinations, _dest_counts, _dest_offsets);
-
-    return preparePointToPointCommunication();
-  }
-
-  template <typename ExecutionSpace, typename ExportView, typename ImportView>
-  void doPostsAndWaits(ExecutionSpace const &space, ExportView const &exports,
-                       size_t num_packets, ImportView const &imports) const
-  {
-    ARBORX_ASSERT(num_packets * _src_offsets.back() == imports.size());
-    ARBORX_ASSERT(num_packets * _dest_offsets.back() == exports.size());
-
-    using ValueType = typename ImportView::value_type;
-    static_assert(
-        std::is_same<ValueType,
-                     std::remove_cv_t<typename ExportView::value_type>>::value,
-        "");
-    static_assert(ImportView::rank == 1, "");
-
-    static_assert(
-        std::is_same<typename ExportView::memory_space,
-                     typename decltype(_permute)::memory_space>::value,
-        "");
-
-    // This allows function to work even when ExportView is unmanaged.
-    using ExportViewWithoutMemoryTraits =
-        Kokkos::View<typename ExportView::data_type,
-                     typename ExportView::array_layout,
-                     typename ExportView::device_type>;
-
-    using DestBufferMirrorViewType =
-        decltype(ArborX::Details::create_layout_right_mirror_view_and_copy(
-            std::declval<typename ImportView::memory_space>(),
-            std::declval<ExportViewWithoutMemoryTraits>()));
-
-    constexpr int pointer_depth = internal::PointerDepth<
-        typename DestBufferMirrorViewType::traits::data_type>::value;
-    DestBufferMirrorViewType dest_buffer_mirror(
-        "ArborX::Distributor::doPostsAndWaits::destination_buffer_mirror", 0,
-        pointer_depth > 1 ? 0 : KOKKOS_INVALID_INDEX,
-        pointer_depth > 2 ? 0 : KOKKOS_INVALID_INDEX,
-        pointer_depth > 3 ? 0 : KOKKOS_INVALID_INDEX,
-        pointer_depth > 4 ? 0 : KOKKOS_INVALID_INDEX,
-        pointer_depth > 5 ? 0 : KOKKOS_INVALID_INDEX,
-        pointer_depth > 6 ? 0 : KOKKOS_INVALID_INDEX,
-        pointer_depth > 7 ? 0 : KOKKOS_INVALID_INDEX);
-
-    // If _permute is empty, we are assuming that we don't need to permute
-    // exports.
-    bool const permutation_necessary = _permute.size() != 0;
-    if (permutation_necessary)
-    {
-      auto dest_buffer = ExportViewWithoutMemoryTraits(
-          "ArborX::Distributor::doPostsAndWaits::destination_buffer",
-          typename ExportView::array_layout{});
-
-      reallocWithoutInitializing(dest_buffer, exports.layout());
-
-      // We need to create a local copy to avoid capturing a member variable
-      // (via the 'this' pointer) which we can't do using a KOKKOS_LAMBDA.
-      // Use KOKKOS_CLASS_LAMBDA when we require C++17.
-      auto const permute_copy = _permute;
-
-      ArborX::Details::applyInversePermutation(space, permute_copy, exports,
-                                               dest_buffer);
-
-      dest_buffer_mirror =
-          ArborX::Details::create_layout_right_mirror_view_and_copy(
-              typename ImportView::memory_space(), dest_buffer);
-    }
-    else
-    {
-      dest_buffer_mirror =
-          ArborX::Details::create_layout_right_mirror_view_and_copy(
-              typename ImportView::memory_space(), exports);
-    }
-
-    static_assert(
-        decltype(dest_buffer_mirror)::rank == 1 ||
-            std::is_same<typename decltype(dest_buffer_mirror)::array_layout,
-                         Kokkos::LayoutRight>::value,
-        "");
-    static_assert(ImportView::rank == 1 ||
-                      std::is_same<typename ImportView::array_layout,
-                                   Kokkos::LayoutRight>::value,
-                  "");
-
-    int comm_rank;
-    MPI_Comm_rank(_comm, &comm_rank);
-    int comm_size;
-    MPI_Comm_size(_comm, &comm_size);
-    int const indegrees = _sources.size();
-    int const outdegrees = _destinations.size();
-    std::vector<MPI_Request> requests;
-    requests.reserve(outdegrees + indegrees);
-    for (int i = 0; i < indegrees; ++i)
-    {
-      if (_sources[i] != comm_rank)
-      {
-        auto const message_size =
-            _src_counts[i] * num_packets * sizeof(ValueType);
-        auto const receive_buffer_ptr =
-            imports.data() + _src_offsets[i] * num_packets;
-        requests.emplace_back();
-        MPI_Irecv(receive_buffer_ptr, message_size, MPI_BYTE, _sources[i], 123,
-                  _comm, &requests.back());
-      }
-    }
-
-    // make sure the data in dest_buffer has been copied before sending it.
-    if (permutation_necessary)
-      space.fence();
-
-    for (int i = 0; i < outdegrees; ++i)
-    {
-      auto const message_size =
-          _dest_counts[i] * num_packets * sizeof(ValueType);
-      auto const send_buffer_ptr =
-          dest_buffer_mirror.data() + _dest_offsets[i] * num_packets;
-      if (_destinations[i] == comm_rank)
-      {
-        auto const it = std::find(_sources.begin(), _sources.end(), comm_rank);
-        ARBORX_ASSERT(it != _sources.end());
-        auto const position = it - _sources.begin();
-        auto const receive_buffer_ptr =
-            imports.data() + _src_offsets[position] * num_packets;
-
-        Kokkos::View<ValueType *, typename ImportView::traits::device_type,
-                     Kokkos::MemoryTraits<Kokkos::Unmanaged>>
-            receive_view(receive_buffer_ptr, message_size / sizeof(ValueType));
-        Kokkos::View<const ValueType *,
-                     typename ExportView::traits::device_type,
-                     Kokkos::MemoryTraits<Kokkos::Unmanaged>>
-            send_view(send_buffer_ptr, message_size / sizeof(ValueType));
-        Kokkos::deep_copy(space, receive_view, send_view);
-      }
-      else
-      {
-        requests.emplace_back();
-        MPI_Isend(send_buffer_ptr, message_size, MPI_BYTE, _destinations[i],
-                  123, _comm, &requests.back());
-      }
-    }
-    if (!requests.empty())
-      MPI_Waitall(requests.size(), requests.data(), MPI_STATUSES_IGNORE);
-  }
-  size_t getTotalReceiveLength() const { return _src_offsets.back(); }
-  size_t getTotalSendLength() const { return _dest_offsets.back(); }
-
-private:
-  size_t preparePointToPointCommunication()
-  {
-    int comm_size;
-    MPI_Comm_size(_comm, &comm_size);
-
-    std::vector<int> src_counts_dense(comm_size);
-    int const dest_size = _destinations.size();
-    for (int i = 0; i < dest_size; ++i)
-    {
-      src_counts_dense[_destinations[i]] = _dest_counts[i];
-    }
-    MPI_Alltoall(MPI_IN_PLACE, 0, MPI_DATATYPE_NULL, src_counts_dense.data(), 1,
-                 MPI_INT, _comm);
-
-    _src_offsets.push_back(0);
-    for (int i = 0; i < comm_size; ++i)
-      if (src_counts_dense[i] > 0)
-      {
-        _sources.push_back(i);
-        _src_counts.push_back(src_counts_dense[i]);
-        _src_offsets.push_back(_src_offsets.back() + _src_counts.back());
-      }
-
-    return _src_offsets.back();
-  }
-
-  MPI_Comm _comm;
-  Kokkos::View<int *, DeviceType> _permute;
-  std::vector<int> _dest_offsets;
-  std::vector<int> _dest_counts;
-  std::vector<int> _src_offsets;
-  std::vector<int> _src_counts;
-  std::vector<int> _sources;
-  std::vector<int> _destinations;
-};
-
-} // namespace Details
-} // namespace ArborX
-
-#endif
diff --git a/src/tpl/arborx/src/details/ArborX_DetailsFDBSCAN.hpp b/src/tpl/arborx/src/details/ArborX_DetailsFDBSCAN.hpp
deleted file mode 100644
index 27321281f..000000000
--- a/src/tpl/arborx/src/details/ArborX_DetailsFDBSCAN.hpp
+++ /dev/null
@@ -1,100 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2017-2021 by the ArborX authors                            *
- * All rights reserved.                                                     *
- *                                                                          *
- * This file is part of the ArborX library. ArborX is                       *
- * distributed under a BSD 3-clause license. For the licensing terms see    *
- * the LICENSE file in the top-level directory.                             *
- *                                                                          *
- * SPDX-License-Identifier: BSD-3-Clause                                    *
- ****************************************************************************/
-
-#ifndef ARBORX_DETAILSFDBSCAN_HPP
-#define ARBORX_DETAILSFDBSCAN_HPP
-
-#include <ArborX_Callbacks.hpp>
-#include <ArborX_DetailsUnionFind.hpp>
-#include <ArborX_Predicates.hpp>
-
-#include <Kokkos_Core.hpp>
-
-namespace ArborX
-{
-namespace Details
-{
-
-template <typename MemorySpace>
-struct CountUpToN
-{
-  Kokkos::View<int *, MemorySpace> _counts;
-  int _n;
-
-  template <typename Query>
-  KOKKOS_FUNCTION auto operator()(Query const &query, int) const
-  {
-    auto i = getData(query);
-    Kokkos::atomic_fetch_add(&_counts(i), 1);
-
-    if (_counts(i) < _n)
-      return ArborX::CallbackTreeTraversalControl::normal_continuation;
-
-    // Once count reaches threshold, terminate the traversal.
-    return ArborX::CallbackTreeTraversalControl::early_exit;
-  }
-};
-
-template <typename MemorySpace, typename CorePointsType>
-struct FDBSCANCallback
-{
-  UnionFind<MemorySpace> _union_find;
-  CorePointsType _is_core_point;
-
-  FDBSCANCallback(Kokkos::View<int *, MemorySpace> const &view,
-                  CorePointsType is_core_point)
-      : _union_find(view)
-      , _is_core_point(is_core_point)
-  {
-  }
-
-  template <typename Query>
-  KOKKOS_FUNCTION auto operator()(Query const &query, int j) const
-  {
-    int const i = ArborX::getData(query);
-
-    bool const is_border_point = !_is_core_point(i);
-    if (is_border_point)
-    {
-      // Ignore border points, they will be processed by the
-      // connected core points. Theoretically, border points could have been
-      // filtered out prior to running the algorithm, but that may be expensive.
-      return ArborX::CallbackTreeTraversalControl::early_exit;
-    }
-
-    bool const is_neighbor_core_point = _is_core_point(j);
-    if (is_neighbor_core_point && i > j)
-    {
-      // For a core point that is connected to another core point, do the
-      // standard CCS algorithm
-      _union_find.merge(i, j);
-    }
-    else if (!is_neighbor_core_point)
-    {
-      // For a border point that is connected to a core point, set its
-      // representative to that of the core point. If it is connected to
-      // multiple core points, it will be assigned to the cluster that the last
-      // core point was in.
-      //
-      // NOTE: DO NOT USE merge(i, j) here. This may set this border
-      // point as a representative for the whole cluster. This would mean that
-      // a) labels_(i) == i still (so it would be processed later, and b) it may
-      // be combined with a different cluster later forming a bridge.
-      _union_find.merge_into(j, i);
-    }
-
-    return ArborX::CallbackTreeTraversalControl::normal_continuation;
-  }
-};
-} // namespace Details
-} // namespace ArborX
-
-#endif
diff --git a/src/tpl/arborx/src/details/ArborX_DetailsFDBSCANDenseBox.hpp b/src/tpl/arborx/src/details/ArborX_DetailsFDBSCANDenseBox.hpp
deleted file mode 100644
index d8816b25a..000000000
--- a/src/tpl/arborx/src/details/ArborX_DetailsFDBSCANDenseBox.hpp
+++ /dev/null
@@ -1,390 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2017-2021 by the ArborX authors                            *
- * All rights reserved.                                                     *
- *                                                                          *
- * This file is part of the ArborX library. ArborX is                       *
- * distributed under a BSD 3-clause license. For the licensing terms see    *
- * the LICENSE file in the top-level directory.                             *
- *                                                                          *
- * SPDX-License-Identifier: BSD-3-Clause                                    *
- ****************************************************************************/
-
-#ifndef ARBORX_DETAILSFDBSCANDENSEBOX_HPP
-#define ARBORX_DETAILSFDBSCANDENSEBOX_HPP
-
-#include <ArborX_Callbacks.hpp>
-#include <ArborX_DetailsKokkosExtAccessibilityTraits.hpp>
-#include <ArborX_DetailsUnionFind.hpp>
-#include <ArborX_DetailsUtils.hpp>
-#include <ArborX_Predicates.hpp>
-
-#include <Kokkos_Core.hpp>
-
-#include <cassert>
-
-namespace ArborX
-{
-namespace Details
-{
-
-struct CartesianGrid
-{
-  Box _bounds;
-  float _h;
-  size_t _nx;
-  size_t _ny;
-  size_t _nz;
-
-  CartesianGrid(Box const &bounds, float h)
-      : _bounds(bounds)
-      , _h(h)
-  {
-    auto const &min_corner = bounds.minCorner();
-    auto const &max_corner = bounds.maxCorner();
-    _nx = std::ceil((max_corner[0] - min_corner[0]) / h);
-    _ny = std::ceil((max_corner[1] - min_corner[1]) / h);
-    _nz = std::ceil((max_corner[2] - min_corner[2]) / h);
-
-    // Catch potential overflow in grid cell indices early. This is a
-    // conservative check as an actual overflow may not occur, depending on
-    // which cells are filled.
-    size_t constexpr max_size_t = std::numeric_limits<size_t>::max();
-    ARBORX_ASSERT(_nx == 0 || _ny == 0 || _nz == 0 ||
-                  (_ny < max_size_t / _nx && _nz < max_size_t / (_nx * _ny)));
-  }
-
-  KOKKOS_FUNCTION
-  size_t cellIndex(Point const &point) const
-  {
-    auto const &min_corner = _bounds.minCorner();
-    size_t i = std::floor((point[0] - min_corner[0]) / _h);
-    size_t j = std::floor((point[1] - min_corner[1]) / _h);
-    size_t k = std::floor((point[2] - min_corner[2]) / _h);
-    return k * _nx * _ny + j * _nx + i;
-  }
-
-  KOKKOS_FUNCTION
-  Box cellBox(size_t cell_index) const
-  {
-    auto const &min_corner = _bounds.minCorner();
-
-    auto i = cell_index % _nx;
-    auto j = (cell_index / _nx) % _ny;
-    auto k = cell_index / (_nx * _ny);
-    return {{min_corner[0] + i * _h, min_corner[1] + j * _h,
-             min_corner[2] + k * _h},
-            {min_corner[0] + (i + 1) * _h, min_corner[1] + (j + 1) * _h,
-             min_corner[2] + (k + 1) * _h}};
-  }
-};
-
-template <typename MemorySpace, typename Primitives, typename DenseCellOffsets,
-          typename Permutation>
-struct CountUpToN_DenseBox
-{
-  Kokkos::View<int *, MemorySpace> _counts;
-  Primitives _primitives;
-  DenseCellOffsets _dense_cell_offsets;
-  int _num_dense_cells;
-  Permutation _permute;
-  int core_min_size;
-  float eps;
-  int _n;
-
-  CountUpToN_DenseBox(Kokkos::View<int *, MemorySpace> const &counts,
-                      Primitives const &primitives,
-                      DenseCellOffsets const &dense_cell_offsets,
-                      Permutation const &permute, int core_min_size_in,
-                      float eps_in, int n)
-      : _counts(counts)
-      , _primitives(primitives)
-      , _dense_cell_offsets(dense_cell_offsets)
-      , _num_dense_cells(dense_cell_offsets.size() - 1)
-      , _permute(permute)
-      , core_min_size(core_min_size_in)
-      , eps(eps_in)
-      , _n(n)
-  {
-  }
-
-  template <typename Query>
-  KOKKOS_FUNCTION auto operator()(Query const &query, int k) const
-  {
-    using Access = AccessTraits<Primitives, PrimitivesTag>;
-
-    auto const i = getData(query);
-
-    bool const is_dense_cell = (k < _num_dense_cells);
-
-    int &count = _counts(i);
-    if (is_dense_cell)
-    {
-      Point const &query_point = Access::get(_primitives, i);
-
-      int const cell_start = _dense_cell_offsets(k);
-      int const cell_end = _dense_cell_offsets(k + 1);
-      for (int jj = cell_start; jj < cell_end; ++jj)
-      {
-        int j = _permute(jj);
-        if (distance(query_point, Access::get(_primitives, j)) <= eps)
-        {
-          Kokkos::atomic_fetch_add(&count, 1);
-          if (count >= _n)
-            return ArborX::CallbackTreeTraversalControl::early_exit;
-        }
-      }
-    }
-    else
-    {
-      Kokkos::atomic_fetch_add(&count, 1);
-      if (count >= _n)
-        return ArborX::CallbackTreeTraversalControl::early_exit;
-    }
-
-    return ArborX::CallbackTreeTraversalControl::normal_continuation;
-  }
-};
-
-template <typename MemorySpace, typename CorePointsType, typename Primitives,
-          typename DenseCellOffsets, typename Permutation>
-struct FDBSCANDenseBoxCallback
-{
-  UnionFind<MemorySpace> _union_find;
-  CorePointsType _is_core_point;
-  Primitives _primitives;
-  DenseCellOffsets _dense_cell_offsets;
-  int _num_dense_cells;
-  int _num_points_in_dense_cells;
-  Permutation _permute;
-  float eps;
-
-  FDBSCANDenseBoxCallback(Kokkos::View<int *, MemorySpace> const &labels,
-                          CorePointsType const &is_core_point,
-                          Primitives const &primitives,
-                          DenseCellOffsets const &dense_cell_offsets,
-                          Permutation const &permute, float eps_in)
-      : _union_find(labels)
-      , _is_core_point(is_core_point)
-      , _primitives(primitives)
-      , _dense_cell_offsets(dense_cell_offsets)
-      , _num_dense_cells(dense_cell_offsets.size() - 1)
-      , _num_points_in_dense_cells(lastElement(dense_cell_offsets))
-      , _permute(permute)
-      , eps(eps_in)
-  {
-  }
-
-  template <typename Query>
-  KOKKOS_FUNCTION auto operator()(Query const &query, int k) const
-  {
-    using Access = AccessTraits<Primitives, PrimitivesTag>;
-
-    auto const i = ArborX::getData(query);
-
-    bool const is_border_point = !_is_core_point(i);
-    if (is_border_point)
-      return ArborX::CallbackTreeTraversalControl::early_exit;
-
-    bool const is_dense_cell = (k < _num_dense_cells);
-
-    if (is_dense_cell)
-    {
-      int const cell_start = _dense_cell_offsets(k);
-      int const cell_end = _dense_cell_offsets(k + 1);
-
-      // Skip the dense box if they were already merged together
-      if (_union_find.representative(i) ==
-          _union_find.representative(_permute(cell_start)))
-        return ArborX::CallbackTreeTraversalControl::normal_continuation;
-
-      Point const &query_point = Access::get(_primitives, i);
-
-      for (int jj = cell_start; jj < cell_end; ++jj)
-      {
-        int j = _permute(jj);
-
-        // As soon as a pair is found, stop the search. If it is a case of
-        // merging two dense cells, this will stop all other threads from
-        // processing the same merge.
-        if (_union_find.representative(i) == _union_find.representative(j))
-          break;
-
-        if (distance(query_point, Access::get(_primitives, j)) <= eps)
-        {
-          // We connected to at least one point in the dense box, thus we
-          // connected to all of them, so may terminate
-          _union_find.merge(i, j);
-          break;
-        }
-      }
-    }
-    else
-    {
-      int j = _permute(_num_points_in_dense_cells + (k - _num_dense_cells));
-
-      // No need to check the distance here, as the fact that we are inside the
-      // callback guarantees that it is <= eps
-
-      bool const is_neighbor_core_point = _is_core_point(j);
-      if (is_neighbor_core_point && i > j)
-        _union_find.merge(i, j);
-      else if (!is_neighbor_core_point)
-        _union_find.merge_into(j, i);
-    }
-
-    return ArborX::CallbackTreeTraversalControl::normal_continuation;
-  }
-};
-
-template <typename ExecutionSpace, typename Primitives>
-Kokkos::View<size_t *,
-             typename AccessTraits<Primitives, PrimitivesTag>::memory_space>
-computeCellIndices(ExecutionSpace const &exec_space,
-                   Primitives const &primitives, CartesianGrid const &grid)
-{
-  using Access = AccessTraits<Primitives, PrimitivesTag>;
-  using MemorySpace = typename Access::memory_space;
-
-  auto const n = Access::size(primitives);
-
-  Kokkos::View<size_t *, MemorySpace> cell_indices(
-      Kokkos::view_alloc(Kokkos::WithoutInitializing,
-                         "ArborX::DBSCAN::cell_indices"),
-      n);
-  Kokkos::parallel_for("ArborX::DBSCAN::compute_cell_indices",
-                       Kokkos::RangePolicy<ExecutionSpace>(exec_space, 0, n),
-                       KOKKOS_LAMBDA(int i) {
-                         auto const &xyz = Access::get(primitives, i);
-                         cell_indices(i) = grid.cellIndex(xyz);
-                       });
-  return cell_indices;
-}
-
-// TODO: should put it together with other commonly used Kokkos
-// routines and unit test it in the future
-template <typename ExecutionSpace, typename View>
-Kokkos::View<int *, typename View::memory_space>
-computeOffsetsInOrderedView(ExecutionSpace const &exec_space, View view)
-{
-  using MemorySpace = typename View::memory_space;
-
-  static_assert(
-      KokkosExt::is_accessible_from<MemorySpace, ExecutionSpace>::value, "");
-
-  auto const n = view.extent(0);
-
-  int num_offsets;
-  Kokkos::View<int *, MemorySpace> offsets(
-      Kokkos::view_alloc(Kokkos::WithoutInitializing,
-                         "ArborX::DBSCAN::offsets"),
-      n + 1);
-  Kokkos::parallel_scan(
-      "ArborX::DBSCAN::compute_offsets",
-      Kokkos::RangePolicy<ExecutionSpace>(exec_space, 0, n + 1),
-      KOKKOS_LAMBDA(int i, int &update, bool final_pass) {
-        bool const is_cell_first_index =
-            (i == 0 || i == (int)n || view(i) != view(i - 1));
-        if (is_cell_first_index)
-        {
-          if (final_pass)
-            offsets(update) = i;
-          ++update;
-        }
-      },
-      num_offsets);
-  --num_offsets;
-  Kokkos::resize(offsets, num_offsets + 1);
-
-  return offsets;
-}
-
-template <typename ExecutionSpace, typename CellIndices, typename CellOffsets,
-          typename Permutation>
-int reorderDenseAndSparseCells(ExecutionSpace const &exec_space,
-                               CellOffsets cell_offsets, int core_min_size,
-                               CellIndices &sorted_cell_indices,
-                               Permutation &permute)
-{
-  using MemorySpace = typename CellIndices::memory_space;
-
-  static_assert(
-      KokkosExt::is_accessible_from<MemorySpace, ExecutionSpace>::value, "");
-
-  auto const num_nonempty_cells = cell_offsets.size() - 1;
-
-  // Count the number of points in the dense cells
-  int num_points_in_dense_cells = 0;
-  Kokkos::parallel_reduce(
-      "ArborX::DBSCAN::count_points_in_dense_cells",
-      Kokkos::RangePolicy<ExecutionSpace>(exec_space, 0, num_nonempty_cells),
-      KOKKOS_LAMBDA(int i, int &update) {
-        int num_points_in_cell = cell_offsets(i + 1) - cell_offsets(i);
-        if (num_points_in_cell >= core_min_size)
-          update += num_points_in_cell;
-      },
-      num_points_in_dense_cells);
-
-  // Create new arrays of cells indices and permute, so that the points in the
-  // dense cells go first, and the points in non-dense (sparse) cells go after
-  // them. The points in the same cell are still together.
-  Kokkos::View<int, MemorySpace> dense_offset("ArborX::DBSCAN::dense_offset");
-  Kokkos::View<int, MemorySpace> sparse_offset("ArborX::DBSCAN::sparse_offset");
-  Kokkos::deep_copy(dense_offset, 0);
-  Kokkos::deep_copy(sparse_offset, num_points_in_dense_cells);
-
-  auto reordered_permute = cloneWithoutInitializingNorCopying(permute);
-  auto reordered_cell_indices =
-      cloneWithoutInitializingNorCopying(sorted_cell_indices);
-  Kokkos::parallel_for(
-      "ArborX::DBSCAN::reorder_cell_indices_and_permutation",
-      Kokkos::RangePolicy<ExecutionSpace>(exec_space, 0, num_nonempty_cells),
-      KOKKOS_LAMBDA(int i) {
-        auto const num_points_in_cell = cell_offsets(i + 1) - cell_offsets(i);
-        bool const is_dense_cell = (num_points_in_cell >= core_min_size);
-        int offset = Kokkos::atomic_fetch_add(
-            (is_dense_cell ? &dense_offset() : &sparse_offset()),
-            num_points_in_cell);
-        for (int j = cell_offsets(i); j < cell_offsets(i + 1); ++j, ++offset)
-        {
-          reordered_cell_indices(offset) = sorted_cell_indices(j);
-          reordered_permute(offset) = permute(j);
-        }
-      });
-
-  sorted_cell_indices = reordered_cell_indices;
-  permute = reordered_permute;
-
-  return num_points_in_dense_cells;
-}
-
-template <typename ExecutionSpace, typename CellIndices, typename Permutation,
-          typename Labels>
-void unionFindWithinEachDenseCell(ExecutionSpace const &exec_space,
-                                  CellIndices sorted_dense_cell_indices,
-                                  Permutation permute, Labels labels)
-{
-  using MemorySpace = typename Permutation::memory_space;
-
-  UnionFind<MemorySpace> union_find{labels};
-
-  // The algorithm relies on the fact that the cell indices array only contains
-  // dense cells. Thus, as long as two cell indices are the same, a) they
-  // belong to the same cell, and b) that cell is dense, thus they should be in
-  // the same cluster. If, on the other hand, the array also contained
-  // non-dense cells, that would not have been possible, as an additional
-  // computations would have to be done to figure out if the points belong to a
-  // dense cell, which would have required a linear scan.
-  auto const n = sorted_dense_cell_indices.size();
-  Kokkos::parallel_for("ArborX::DBSCAN::union_find_within_each_dense_box",
-                       Kokkos::RangePolicy<ExecutionSpace>(exec_space, 1, n),
-                       KOKKOS_LAMBDA(int i) {
-                         if (sorted_dense_cell_indices(i) ==
-                             sorted_dense_cell_indices(i - 1))
-                           union_find.merge(permute(i), permute(i - 1));
-                       });
-}
-
-} // namespace Details
-} // namespace ArborX
-
-#endif
diff --git a/src/tpl/arborx/src/details/ArborX_KDOP.hpp b/src/tpl/arborx/src/details/ArborX_KDOP.hpp
deleted file mode 100644
index 65d14c84d..000000000
--- a/src/tpl/arborx/src/details/ArborX_KDOP.hpp
+++ /dev/null
@@ -1,316 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2017-2021 by the ArborX authors                            *
- * All rights reserved.                                                     *
- *                                                                          *
- * This file is part of the ArborX library. ArborX is                       *
- * distributed under a BSD 3-clause license. For the licensing terms see    *
- * the LICENSE file in the top-level directory.                             *
- *                                                                          *
- * SPDX-License-Identifier: BSD-3-Clause                                    *
- ****************************************************************************/
-
-#ifndef ARBORX_KDOP_HPP
-#define ARBORX_KDOP_HPP
-
-#include <ArborX_Box.hpp>
-#include <ArborX_DetailsAlgorithms.hpp>
-#include <ArborX_DetailsKokkosExtArithmeticTraits.hpp>
-#include <ArborX_Point.hpp>
-#include <ArborX_Sphere.hpp>
-
-#include <Kokkos_Array.hpp>
-#include <Kokkos_Macros.hpp>
-
-namespace ArborX
-{
-namespace Details
-{
-struct Direction
-{
-  float _data[3];
-};
-
-template <int k>
-struct KDOP_Directions;
-
-template <>
-struct KDOP_Directions<6>
-{
-protected:
-  static constexpr int n_directions = 3;
-  static KOKKOS_FUNCTION Kokkos::Array<Direction, n_directions> const &
-  directions()
-  {
-    static constexpr Kokkos::Array<Direction, n_directions> directions = {
-        Direction{1, 0, 0},
-        Direction{0, 1, 0},
-        Direction{0, 0, 1},
-    };
-    return directions;
-  }
-};
-
-template <>
-struct KDOP_Directions<14>
-{
-protected:
-  static constexpr int n_directions = 7;
-  static KOKKOS_FUNCTION Kokkos::Array<Direction, n_directions> const &
-  directions()
-  {
-    static constexpr Kokkos::Array<Direction, n_directions> directions = {
-        Direction{1, 0, 0},
-        Direction{0, 1, 0},
-        Direction{0, 0, 1},
-        // corners
-        Direction{1, 1, 1},
-        Direction{1, -1, 1},
-        Direction{1, 1, -1},
-        Direction{1, -1, -1},
-    };
-    return directions;
-  }
-};
-
-template <>
-struct KDOP_Directions<18>
-{
-protected:
-  static constexpr int n_directions = 9;
-  static KOKKOS_FUNCTION Kokkos::Array<Direction, n_directions> const &
-  directions()
-  {
-    static constexpr Kokkos::Array<Direction, n_directions> directions = {
-        Direction{1, 0, 0},
-        Direction{0, 1, 0},
-        Direction{0, 0, 1},
-        // edges
-        Direction{1, 1, 0},
-        Direction{1, 0, 1},
-        Direction{0, 1, 1},
-        Direction{1, -1, 0},
-        Direction{1, 0, -1},
-        Direction{0, 1, -1},
-    };
-    return directions;
-  }
-};
-
-template <>
-struct KDOP_Directions<26>
-{
-protected:
-  static constexpr int n_directions = 13;
-  static KOKKOS_FUNCTION Kokkos::Array<Direction, n_directions> const &
-  directions()
-  {
-    static constexpr Kokkos::Array<Direction, n_directions> directions = {
-        Direction{1, 0, 0},
-        Direction{0, 1, 0},
-        Direction{0, 0, 1},
-        // edges
-        Direction{1, 1, 0},
-        Direction{1, 0, 1},
-        Direction{0, 1, 1},
-        Direction{1, -1, 0},
-        Direction{1, 0, -1},
-        Direction{0, 1, -1},
-        // corners
-        Direction{1, 1, 1},
-        Direction{1, -1, 1},
-        Direction{1, 1, -1},
-        Direction{1, -1, -1},
-    };
-    return directions;
-  }
-};
-KOKKOS_INLINE_FUNCTION float project(Point const &p, Direction const &d)
-{
-  float r = 0.;
-  for (int i = 0; i < 3; ++i)
-  {
-    r += p[i] * d._data[i];
-  }
-  return r;
-}
-} // namespace Details
-
-namespace Experimental
-{
-
-template <int k>
-struct KDOP : private Details::KDOP_Directions<k>
-{
-  static constexpr int n_directions = Details::KDOP_Directions<k>::n_directions;
-  Kokkos::Array<float, n_directions> _min_values;
-  Kokkos::Array<float, n_directions> _max_values;
-  KOKKOS_FUNCTION KDOP()
-  {
-    for (int i = 0; i < n_directions; ++i)
-    {
-      _min_values[i] = KokkosExt::ArithmeticTraits::max<float>::value;
-      _max_values[i] = -KokkosExt::ArithmeticTraits::max<float>::value;
-    }
-  }
-  KOKKOS_FUNCTION KDOP &operator+=(Point const &p)
-  {
-    using KokkosExt::max;
-    using KokkosExt::min;
-    for (int i = 0; i < n_directions; ++i)
-    {
-      auto const proj_i = Details::project(p, this->directions()[i]);
-      _min_values[i] = min(_min_values[i], proj_i);
-      _max_values[i] = max(_max_values[i], proj_i);
-    }
-    return *this;
-  }
-  KOKKOS_FUNCTION KDOP &operator+=(Box const &b)
-  {
-    // NOTE if any of the ranges is invalid, the code below would actually
-    // expand the KDOP which is not what we want.
-    // We may revisit this later and decide passing a valid box becomes a
-    // precondition but this would be a breaking change (going from a wide to a
-    // narrow contract).
-    for (int i = 0; i < 3; ++i)
-    {
-      if (b.minCorner()[i] > b.maxCorner()[i])
-      {
-        return *this;
-      }
-    }
-
-    auto const xmin = b.minCorner()[0];
-    auto const ymin = b.minCorner()[1];
-    auto const zmin = b.minCorner()[2];
-    auto const xmax = b.maxCorner()[0];
-    auto const ymax = b.maxCorner()[1];
-    auto const zmax = b.maxCorner()[2];
-    for (auto const &point : {
-             Point{xmin, ymin, zmin},
-             Point{xmin, ymax, zmin},
-             Point{xmin, ymin, zmax},
-             Point{xmin, ymax, zmax},
-             Point{xmax, ymin, zmin},
-             Point{xmax, ymax, zmin},
-             Point{xmax, ymin, zmax},
-             Point{xmax, ymax, zmax},
-         })
-    {
-      *this += point;
-    }
-    return *this;
-  }
-  KOKKOS_FUNCTION KDOP &operator+=(KDOP const &other)
-  {
-    using KokkosExt::max;
-    using KokkosExt::min;
-    for (int i = 0; i < n_directions; ++i)
-    {
-      _min_values[i] = min(_min_values[i], other._min_values[i]);
-      _max_values[i] = max(_max_values[i], other._max_values[i]);
-    }
-    return *this;
-  }
-  KOKKOS_FUNCTION explicit operator Box() const
-  {
-    // WARNING implicit requirement on KDOP first three directions
-    Box b{};
-    for (int i = 0; i < 3; ++i)
-    {
-      b.minCorner()[i] = _min_values[i];
-      b.maxCorner()[i] = _max_values[i];
-    }
-    return b;
-  }
-  KOKKOS_FUNCTION bool intersects(Point const &point) const
-  {
-    for (int i = 0; i < n_directions; ++i)
-    {
-      auto const proj_i = Details::project(point, this->directions()[i]);
-      if (proj_i < _min_values[i] || proj_i > _max_values[i])
-      {
-        return false;
-      }
-    }
-    return true;
-  }
-  KOKKOS_FUNCTION bool intersects(Box const &box) const
-  {
-    KDOP other{};
-    other += box;
-    return intersects(other);
-  }
-  KOKKOS_FUNCTION bool intersects(KDOP<k> const &other) const
-  {
-    for (int i = 0; i < n_directions; ++i)
-    {
-      if (other._max_values[i] < _min_values[i] ||
-          other._min_values[i] > _max_values[i])
-      {
-        return false;
-      }
-    }
-    return true;
-  }
-};
-
-template <int k>
-KOKKOS_INLINE_FUNCTION void expand(KDOP<k> &that, KDOP<k> const &other)
-{
-  that += other;
-}
-
-template <int k>
-KOKKOS_INLINE_FUNCTION void expand(KDOP<k> &that, Point const &point)
-{
-  that += point;
-}
-
-template <int k>
-KOKKOS_INLINE_FUNCTION void expand(KDOP<k> &that, Box const &box)
-{
-  that += box;
-}
-
-template <int k>
-KOKKOS_INLINE_FUNCTION void expand(Box &a, KDOP<k> const &b)
-{
-  ArborX::Details::expand(a, (Box)b);
-}
-
-// NOTE intersects(predicate_geometry, bounding_volume)
-template <int k>
-KOKKOS_INLINE_FUNCTION bool intersects(Box const &a, KDOP<k> const &b)
-{
-  return b.intersects(a);
-}
-
-template <int k>
-KOKKOS_INLINE_FUNCTION bool intersects(KDOP<k> const &a, Box const &b)
-{
-  return a.intersects(b);
-}
-
-template <int k>
-KOKKOS_INLINE_FUNCTION bool intersects(Point const &p, KDOP<k> const &x)
-{
-  return x.intersects(p);
-}
-
-template <int k>
-KOKKOS_INLINE_FUNCTION bool intersects(KDOP<k> const &a, KDOP<k> const &b)
-{
-  return a.intersects(b);
-}
-
-template <int k>
-KOKKOS_INLINE_FUNCTION Point returnCentroid(KDOP<k> const &p)
-{
-  // FIXME approximation
-  return ArborX::Details::returnCentroid((Box)p);
-}
-
-} // namespace Experimental
-} // namespace ArborX
-
-#endif

From 20ddfb35ffce40c62595b309e79c77ca54443b21 Mon Sep 17 00:00:00 2001
From: Paul Kuberry <pakuber@sandia.gov>
Date: Fri, 1 Oct 2021 08:04:17 -0600
Subject: [PATCH 23/40] Prune even more arborx files

---
 src/tpl/arborx/src/ArborX.hpp                 |  28 --
 .../ArborX_DetailsTreeVisualization.hpp       | 242 ---------------
 .../src/details/ArborX_DetailsUnionFind.hpp   | 189 ------------
 src/tpl/arborx/src/details/ArborX_Ray.hpp     | 286 ------------------
 4 files changed, 745 deletions(-)
 delete mode 100644 src/tpl/arborx/src/ArborX.hpp
 delete mode 100644 src/tpl/arborx/src/details/ArborX_DetailsTreeVisualization.hpp
 delete mode 100644 src/tpl/arborx/src/details/ArborX_DetailsUnionFind.hpp
 delete mode 100644 src/tpl/arborx/src/details/ArborX_Ray.hpp

diff --git a/src/tpl/arborx/src/ArborX.hpp b/src/tpl/arborx/src/ArborX.hpp
deleted file mode 100644
index 05e7b22ba..000000000
--- a/src/tpl/arborx/src/ArborX.hpp
+++ /dev/null
@@ -1,28 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2017-2021 by the ArborX authors                            *
- * All rights reserved.                                                     *
- *                                                                          *
- * This file is part of the ArborX library. ArborX is                       *
- * distributed under a BSD 3-clause license. For the licensing terms see    *
- * the LICENSE file in the top-level directory.                             *
- *                                                                          *
- * SPDX-License-Identifier: BSD-3-Clause                                    *
- ****************************************************************************/
-
-#ifndef ARBORX_HPP
-#define ARBORX_HPP
-
-#include <ArborX_Config.hpp>
-
-#include <ArborX_Box.hpp>
-#ifdef ARBORX_ENABLE_MPI
-#include <ArborX_DistributedTree.hpp>
-#endif
-#include <ArborX_CrsGraphWrapper.hpp>
-#include <ArborX_Exception.hpp>
-#include <ArborX_LinearBVH.hpp>
-#include <ArborX_Point.hpp>
-#include <ArborX_Predicates.hpp>
-#include <ArborX_Sphere.hpp>
-
-#endif
diff --git a/src/tpl/arborx/src/details/ArborX_DetailsTreeVisualization.hpp b/src/tpl/arborx/src/details/ArborX_DetailsTreeVisualization.hpp
deleted file mode 100644
index 6ceed3aa8..000000000
--- a/src/tpl/arborx/src/details/ArborX_DetailsTreeVisualization.hpp
+++ /dev/null
@@ -1,242 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2017-2021 by the ArborX authors                            *
- * All rights reserved.                                                     *
- *                                                                          *
- * This file is part of the ArborX library. ArborX is                       *
- * distributed under a BSD 3-clause license. For the licensing terms see    *
- * the LICENSE file in the top-level directory.                             *
- *                                                                          *
- * SPDX-License-Identifier: BSD-3-Clause                                    *
- ****************************************************************************/
-#ifndef ARBORX_DETAILS_TREE_VISUALIZATION_HPP
-#define ARBORX_DETAILS_TREE_VISUALIZATION_HPP
-
-#include <ArborX_DetailsHappyTreeFriends.hpp>
-#include <ArborX_DetailsKokkosExtAccessibilityTraits.hpp>
-#include <ArborX_DetailsTreeTraversal.hpp>
-
-#include <Kokkos_Core.hpp>
-
-#include <tuple> // ignore
-
-namespace ArborX
-{
-
-namespace Details
-{
-std::ostream &operator<<(std::ostream &os, Point const &p)
-{
-  os << "(" << p[0] << "," << p[1] << ")";
-  return os;
-}
-
-template <typename DeviceType>
-struct TreeVisualization
-{
-  static_assert(KokkosExt::is_accessible_from<typename DeviceType::memory_space,
-                                              Kokkos::HostSpace>{},
-                "tree visualization only available on the host");
-  struct TreeAccess
-  {
-    template <typename Tree>
-    KOKKOS_INLINE_FUNCTION static HappyTreeFriends::node_t<Tree> const *
-    getLeaf(Tree const &tree, size_t index)
-    {
-      auto leaf_nodes = HappyTreeFriends::getLeafNodes(tree);
-      auto const *first = leaf_nodes.data();
-      auto const *last = first + static_cast<ptrdiff_t>(leaf_nodes.size());
-      for (; first != last; ++first)
-        if (index == first->getLeafPermutationIndex())
-          return first;
-      return nullptr;
-    }
-
-    template <typename Tree>
-    KOKKOS_INLINE_FUNCTION static int
-    getIndex(HappyTreeFriends::node_t<Tree> const *node, Tree const &tree)
-    {
-      return node->isLeaf() ? node->getLeafPermutationIndex()
-                            : node - getRoot(tree);
-    }
-
-    template <typename Tree>
-    KOKKOS_INLINE_FUNCTION static HappyTreeFriends::node_t<Tree> const *
-    getRoot(Tree const &tree)
-    {
-      return HappyTreeFriends::getRoot(tree);
-    }
-
-    template <typename Tree>
-    KOKKOS_INLINE_FUNCTION static HappyTreeFriends::node_t<Tree> const *
-    getNodePtr(Tree const &tree, int index)
-    {
-      return HappyTreeFriends::getNodePtr(tree, index);
-    }
-
-    template <typename Tree, typename Node = HappyTreeFriends::node_t<Tree>>
-    KOKKOS_INLINE_FUNCTION static typename Tree::bounding_volume_type
-    getBoundingVolume(Node const *node, Tree const &tree)
-    {
-      return HappyTreeFriends::getBoundingVolume(tree, node);
-    }
-  };
-
-  template <typename Tree, typename Node = HappyTreeFriends::node_t<Tree>>
-  static std::string getNodeLabel(Node const *node, Tree const &tree)
-  {
-    auto const node_is_leaf = node->isLeaf();
-    auto const node_index = TreeAccess::getIndex(node, tree);
-    std::string label = node_is_leaf ? "l" : "i";
-    label.append(std::to_string(node_index));
-    return label;
-  }
-
-  template <typename Tree, typename Node = HappyTreeFriends::node_t<Tree>>
-  static std::string getNodeAttributes(Node const *node, Tree const &)
-  {
-    return node->isLeaf() ? "[leaf]" : "[internal]";
-  }
-
-  template <typename Tree, typename Node = HappyTreeFriends::node_t<Tree>>
-  static std::string getEdgeAttributes(Node const * /*parent*/,
-                                       Node const *child, Tree const &)
-  {
-    return child->isLeaf() ? "[pendant]" : "[edge]";
-  }
-
-  // Produces node and edges statements to be listed for a graph in DOT
-  // format:
-  // ```
-  // digraph g {
-  //   root = i0;
-  //   <paste node and edges statements here>
-  // }
-  // ```
-  struct GraphvizVisitor
-  {
-    std::ostream &_os;
-
-    template <typename Tree, typename Node = HappyTreeFriends::node_t<Tree>>
-    void visit(Node const *node, Tree const &tree) const
-    {
-      visitNode(node, tree);
-      visitEdgesStartingFromNode(node, tree);
-    }
-
-    template <typename Tree, typename Node = HappyTreeFriends::node_t<Tree>>
-    void visitNode(Node const *node, Tree const &tree) const
-    {
-      auto const node_label = getNodeLabel(node, tree);
-      auto const node_attributes = getNodeAttributes(node, tree);
-
-      _os << "    " << node_label << " " << node_attributes << ";\n";
-    }
-
-    template <typename Tree, typename Node = HappyTreeFriends::node_t<Tree>>
-    void visitEdgesStartingFromNode(Node const *node, Tree const &tree) const
-    {
-      auto const node_label = getNodeLabel(node, tree);
-      auto const node_is_internal = !node->isLeaf();
-      auto getNodePtr = [&](int i) { return TreeAccess::getNodePtr(tree, i); };
-
-      if (node_is_internal)
-        for (auto const *child :
-             {getNodePtr(node->left_child), getNodePtr(node->right_child)})
-        {
-          auto const child_label = getNodeLabel(child, tree);
-          auto const edge_attributes = getEdgeAttributes(node, child, tree);
-
-          _os << "    " << node_label << " -> " << child_label << " "
-              << edge_attributes << ";\n";
-        }
-    }
-  };
-
-  // Produces commands to enclose in a tikzpicture in a LateX document:
-  // ```
-  // \begin{tikzpicture}
-  //   <paste tikz commands here>
-  // \end{tikzpicture}
-  // ```
-  // NB ensure TikZ styles have been defined.
-  struct TikZVisitor
-  {
-    std::ostream &_os;
-
-    template <typename Tree, typename Node = HappyTreeFriends::node_t<Tree>>
-    void visit(Node const *node, Tree const &tree) const
-    {
-      auto const node_label = getNodeLabel(node, tree);
-      auto const node_attributes = getNodeAttributes(node, tree);
-      auto const bounding_volume = TreeAccess::getBoundingVolume(node, tree);
-      auto const min_corner = bounding_volume.minCorner();
-      auto const max_corner = bounding_volume.maxCorner();
-      _os << R"(\draw)" << node_attributes << " " << min_corner << " rectangle "
-          << max_corner << " node {" << node_label << "};\n";
-    }
-  };
-
-  template <typename Tree, typename Visitor>
-  static void visitAllIterative(Tree const &tree, Visitor const &visitor)
-  {
-    using Node = HappyTreeFriends::node_t<Tree>;
-    Stack<Node const *> stack;
-    stack.emplace(TreeAccess::getRoot(tree));
-    auto getNodePtr = [&](int i) { return TreeAccess::getNodePtr(tree, i); };
-    while (!stack.empty())
-    {
-      auto const *node = stack.top();
-      stack.pop();
-
-      visitor.visit(node, tree);
-
-      if (!node->isLeaf())
-        for (auto const *child :
-             {getNodePtr(node->left_child), getNodePtr(node->right_child)})
-          stack.push(child);
-    }
-  }
-
-  template <typename TreeType, typename VisitorType>
-  struct VisitorCallback
-  {
-    template <typename Query>
-    KOKKOS_FUNCTION void operator()(Query const &, int index) const
-    {
-      _visitor.visit(TreeAccess::getNodePtr(_tree, index), _tree);
-    }
-
-    TreeType _tree;
-    VisitorType _visitor;
-  };
-
-  template <typename Tree, typename Predicate, typename Visitor>
-  static void visit(Tree const &tree, Predicate const &pred,
-                    Visitor const &visitor)
-  {
-    // The preprocessor directives below are intended to silence the
-    // warnings about calling a __host__ function from a __host__
-    // __device__ function emitted by nvcc.
-#if defined(__CUDA_ARCH__)
-    std::ignore = tree;
-    std::ignore = pred;
-    std::ignore = visitor;
-    throw std::runtime_error("visit() is not meant to execute on the GPU");
-#else
-    using ExecutionSpace = typename DeviceType::execution_space;
-    using Predicates = Kokkos::View<Predicate *, DeviceType>;
-    using Callback = VisitorCallback<Tree, Visitor>;
-
-    Predicates predicates("predicates", 1);
-    predicates(0) = pred;
-
-    TreeTraversal<Tree, Predicates, Callback, NearestPredicateTag>
-        tree_traversal(ExecutionSpace{}, tree, predicates,
-                       Callback{tree, visitor});
-#endif
-  }
-};
-} // namespace Details
-} // namespace ArborX
-
-#endif
diff --git a/src/tpl/arborx/src/details/ArborX_DetailsUnionFind.hpp b/src/tpl/arborx/src/details/ArborX_DetailsUnionFind.hpp
deleted file mode 100644
index e27a9fda2..000000000
--- a/src/tpl/arborx/src/details/ArborX_DetailsUnionFind.hpp
+++ /dev/null
@@ -1,189 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2017-2021 by the ArborX authors                            *
- * All rights reserved.                                                     *
- *                                                                          *
- * This file is part of the ArborX library. ArborX is                       *
- * distributed under a BSD 3-clause license. For the licensing terms see    *
- * the LICENSE file in the top-level directory.                             *
- *                                                                          *
- * SPDX-License-Identifier: BSD-3-Clause                                    *
- ****************************************************************************/
-
-#ifndef ARBORX_DETAILSUNIONFIND_HPP
-#define ARBORX_DETAILSUNIONFIND_HPP
-
-// The algorithm is based on the the following paper:
-//
-//   [1] Jaiganesh, Jayadharini, and Martin Burtscher. "A high-performance
-//   connected components implementation for GPUs." In Proceedings of the 27th
-//   International Symposium on High-Performance Parallel and Distributed
-//   Computing, pp. 92-104. 2018.
-//
-// The general gist of the algorithm can be found on the second page and reads:
-//
-// ```
-// ...the majority of the parallel CC algorithms are based on the following
-// “label propagation” approach. Each vertex has a label to hold the component
-// ID to which it belongs. Initially, this label is set to the vertex ID, that
-// is, each vertex is considered a separate component, which can trivially be
-// done in parallel. Then the vertices are iteratively processed in parallel to
-// determine the connected components. For instance, each vertex’s label can be
-// updated with the smallest label among its neighbors. This process repeats
-// until there are no more updates, at which point all vertices in a connected
-// component have the same label. In this example, the ID of the minimum vertex
-// in each component serves as the component ID, which guarantees uniqueness. To
-// speed up the computation, the labels are often replaced by “parent” pointers
-// that form a union-find data structure.
-// ```
-//
-// Union-find algorithm is sped up through path compression:
-//
-// ```
-// Starting from any vertex, we can follow the parent pointers until we reach a
-// vertex that points to itself. This final vertex is the “representative”.
-// Every vertex’s implicit label is the ID of its representative and, as before,
-// all vertices with the same label (aka representative) belong to the same
-// component. Thus, making the representative u point to v indirectly changes
-// the labels of all vertices whose representative used to be u. This makes
-// union operations very fast. A chain of parent pointers leading to a
-// representative is called a “path”. To also make the traversals of these
-// paths, i.e., the find operations, very fast, the paths are sporadically
-// shortened by making earlier elements skip over some elements and point
-// directly to later elements. This process is referred to as “path
-// compression”.
-// ```
-//
-// ECL-CC makes use of an intermediate pointer jumping:
-//
-// ```
-// Intermediate pointer jumping only requires a single traversal while still
-// compressing the path of all elements encountered along the way, albeit not by
-// as much as multiple pointer jumping. It accomplishes this by making every
-// element skip over the next element, thus halving the path length in each
-// traversal.
-// ```
-//
-// This is encoded in `representative()` function.
-
-#include <Kokkos_Core.hpp>
-
-namespace ArborX
-{
-namespace Details
-{
-
-template <typename MemorySpace>
-struct UnionFind
-{
-  Kokkos::View<int *, MemorySpace> labels_;
-
-  UnionFind(Kokkos::View<int *, MemorySpace> labels)
-      : labels_(labels)
-  {
-  }
-
-  // Per [1]:
-  //
-  // Note that the [`representative()`] code is re-entrant and synchronization
-  // free even though concurrent execution may cause data races on the parent
-  // array. However, these races are guaranteed to be benign for the following
-  // reasons. First, the only write to shared data is in [`parent[prev] = next;
-  // `]. This write updates a single aligned machine word and is therefore
-  // atomic. Moreover, it overwrites a valid entry with another valid entry.
-  // Hence, it does not matter if other threads see the old or the new value as
-  // either value will allow them to eventually reach the representative.
-  // Similarly, all the reads of the parent array will either fetch the old or
-  // new value, but both values are acceptable. The only problem that can occur
-  // is that two threads try to update the same parent pointer at the same time.
-  // In this case, one of the updates is lost. This reduces the code’s
-  // performance as duplicate work is performed and the path is not shortened by
-  // as much as it could have been, but it does not result in incorrect paths.
-  // On average, the savings of not having to perform synchronization far
-  // outweighs this small cost. Lastly, it should be noted that the rest of the
-  // code either accesses the parent array via calls to the find_repres function
-  // or changes the parent pointer of a representative vertex but never of a
-  // vertex that is in the middle of a path. If the find_repres code already
-  // sees the new representative, it will return it. Otherwise, it will return
-  // the old representative. Either return value is handled correctly.
-  KOKKOS_FUNCTION
-  int representative(int const i) const
-  {
-    // ##### ECL license (see LICENSE.ECL) #####
-    int curr = labels_(i);
-    if (curr != i)
-    {
-      int next;
-      int prev = i;
-      while (curr > (next = labels_(curr)))
-      {
-        labels_(prev) = next;
-        prev = curr;
-        curr = next;
-      }
-    }
-    return curr;
-  }
-
-  // In some situations it is necessary to make sure that the a particular
-  // label is assigned to a point. As a regular merge() does not guarantee
-  // that, an extra function is introduced, which assigns the label of the
-  // second point (or, rather, the label of its representative) to the first.
-  KOKKOS_FUNCTION
-  void merge_into(int i, int j) const { labels_(i) = representative(j); }
-
-  KOKKOS_FUNCTION
-  void merge(int i, int j) const
-  {
-    // Per [1]:
-    //
-    // ```
-    // ...checks if the representatives of the two endpoints of the edge are
-    // the same. If so, nothing needs to be done. If not, the parent of the
-    // larger of the two representatives is updated to point to the smaller
-    // representative using an atomic CAS operation (<snip> depending on
-    // which representative is smaller). The atomic CAS is required because
-    // the representative may have been changed by another thread between
-    // the call to `representative()` and the call to the CAS. If it has
-    // been changed, `ostat` or `vstat` is updated with the latest value and
-    // the do-while loop repeats the computation until it succeeds, i.e.,
-    // until there is no data race on the parent.
-    // ```
-
-    // ##### ECL license (see LICENSE.ECL) #####
-    int vstat = representative(i);
-    int ostat = representative(j);
-
-    bool repeat;
-    do
-    {
-      repeat = false;
-      if (vstat != ostat)
-      {
-        int ret;
-        if (vstat < ostat)
-        {
-          if ((ret = Kokkos::atomic_compare_exchange(&labels_(ostat), ostat,
-                                                     vstat)) != ostat)
-          {
-            ostat = ret;
-            repeat = true;
-          }
-        }
-        else
-        {
-          if ((ret = Kokkos::atomic_compare_exchange(&labels_(vstat), vstat,
-                                                     ostat)) != vstat)
-          {
-            vstat = ret;
-            repeat = true;
-          }
-        }
-      }
-    } while (repeat);
-  }
-};
-
-} // namespace Details
-} // namespace ArborX
-
-#endif
diff --git a/src/tpl/arborx/src/details/ArborX_Ray.hpp b/src/tpl/arborx/src/details/ArborX_Ray.hpp
deleted file mode 100644
index d57b5e05d..000000000
--- a/src/tpl/arborx/src/details/ArborX_Ray.hpp
+++ /dev/null
@@ -1,286 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2017-2021 by the ArborX authors                            *
- * All rights reserved.                                                     *
- *                                                                          *
- * This file is part of the ArborX library. ArborX is                       *
- * distributed under a BSD 3-clause license. For the licensing terms see    *
- * the LICENSE file in the top-level directory.                             *
- *                                                                          *
- * SPDX-License-Identifier: BSD-3-Clause                                    *
- ****************************************************************************/
-#ifndef ARBORX_RAY_HPP
-#define ARBORX_RAY_HPP
-
-#include <ArborX_Box.hpp>
-#include <ArborX_DetailsAlgorithms.hpp> // equal
-#include <ArborX_DetailsKokkosExtArithmeticTraits.hpp>
-#include <ArborX_Point.hpp>
-#include <ArborX_Sphere.hpp>
-
-#include <Kokkos_Macros.hpp>
-
-#include <cassert>
-#include <cmath>
-
-namespace ArborX
-{
-namespace Experimental
-{
-
-struct Vector : private Point
-{
-  using Point::Point;
-  using Point::operator[];
-};
-
-KOKKOS_INLINE_FUNCTION constexpr Vector makeVector(Point const &begin,
-                                                   Point const &end)
-{
-  Vector v;
-  for (int d = 0; d < 3; ++d)
-  {
-    v[d] = end[d] - begin[d];
-  }
-  return v;
-}
-
-KOKKOS_INLINE_FUNCTION constexpr auto dotProduct(Vector const &v,
-                                                 Vector const &w)
-{
-  return v[0] * w[0] + v[1] * w[1] + v[2] * w[2];
-}
-
-KOKKOS_INLINE_FUNCTION constexpr Vector crossProduct(Vector const &v,
-                                                     Vector const &w)
-{
-  return {v[1] * w[2] - v[2] * w[1], v[2] * w[0] - v[0] * w[2],
-          v[0] * w[1] - v[1] * w[0]};
-}
-
-KOKKOS_INLINE_FUNCTION constexpr bool operator==(Vector const &v,
-                                                 Vector const &w)
-{
-  return v[0] == w[0] && v[1] == w[1] && v[2] == w[2];
-}
-
-KOKKOS_INLINE_FUNCTION constexpr bool equals(Vector const &v, Vector const &w)
-{
-  return v == w;
-}
-
-struct Ray
-{
-  Point _origin = {};
-  Experimental::Vector _direction = {0.f, 0.f, 0.f};
-
-  // We would like to use Scalar defined as:
-  // using Scalar =
-  //    std::decay_t<decltype(std::declval<Experimental::Vector>()[0])>;
-  // However, this means using float to compute the norm. This creates a large
-  // error in the norm that affects ray tracing for triangles. Casting the
-  // norm from double to float once it has been computed is not enough to
-  // improve the value of the normalized vector. Thus, the norm has to return a
-  // double.
-  using Scalar = double;
-
-  KOKKOS_DEFAULTED_FUNCTION
-  constexpr Ray() = default;
-
-  KOKKOS_FUNCTION
-  Ray(Point const &origin, Experimental::Vector const &direction)
-      : _origin(origin)
-      , _direction(direction)
-  {
-    normalize(_direction);
-  }
-
-  KOKKOS_FUNCTION
-  static Scalar norm(Experimental::Vector const &v)
-  {
-    Scalar sq{};
-    for (int d = 0; d < 3; ++d)
-      sq += static_cast<Scalar>(v[d]) * static_cast<Scalar>(v[d]);
-    return std::sqrt(sq);
-  }
-
-  KOKKOS_FUNCTION static void normalize(Experimental::Vector &v)
-  {
-    auto const magv = norm(v);
-    assert(magv > 0);
-    for (int d = 0; d < 3; ++d)
-      v[d] /= magv;
-  }
-
-  KOKKOS_FUNCTION
-  constexpr Point &origin() { return _origin; }
-
-  KOKKOS_FUNCTION
-  constexpr Point const &origin() const { return _origin; }
-
-  KOKKOS_FUNCTION
-  constexpr Experimental::Vector &direction() { return _direction; }
-
-  KOKKOS_FUNCTION
-  constexpr Experimental::Vector const &direction() const { return _direction; }
-
-  // FIXME avoid breaking Wenjun's code
-  using Vector [[deprecated]] = ArborX::Experimental::Vector;
-};
-
-KOKKOS_INLINE_FUNCTION
-constexpr bool equals(Ray const &l, Ray const &r)
-{
-  using ArborX::Details::equals;
-  return equals(l.origin(), r.origin()) && equals(l.direction(), r.direction());
-}
-
-KOKKOS_INLINE_FUNCTION
-Point returnCentroid(Ray const &ray) { return ray.origin(); }
-
-// The ray-box intersection algorithm is based on [1]. Their 'efficient slag'
-// algorithm checks the intersections both in front and behind the ray. The
-// function here checks the intersections in front of the ray.
-//
-// There are few issues here. First, when a ray direction is aligned with one
-// of the axis, a division by zero will occur. This is fine, as usually it
-// results in +inf or -inf, which are treated correctly. However, it also leads
-// to the second situation, when it is 0/0 which occurs when the ray's origin
-// in that dimension is on the same plane as one of the corners (i.e., if
-// inv_ray_dir[d] == 0 && (minCorner[d] == origin[d] || maxCorner[d] ==
-// origin[d])). This leads to NaN, which are not treated correctly (unless, as
-// in [1], the underlying min/max functions are able to ignore them). The issue
-// is discussed in more details in [2] and the webiste (key word: A minimal
-// ray-tracer: rendering simple shapes).
-//
-// In the algorithm below, we explicitly ignoring NaN values, leading to
-// correct algorithm. An interesting side note is that per IEEE standard, all
-// comparisons with NaN are false.
-//
-// [1] Majercik, A., Crassin, C., Shirley, P., & McGuire, M. (2018). A ray-box
-// intersection algorithm and efficient dynamic voxel rendering. Journal of
-// Computer Graphics Techniques Vol, 7(3).
-//
-// [2] Williams, A., Barrus, S., Morley, R. K., & Shirley, P. (2005). An
-// efficient and robust ray-box intersection algorithm. In ACM SIGGRAPH 2005
-// Courses (pp. 9-es).
-KOKKOS_INLINE_FUNCTION
-bool intersects(Ray const &ray, Box const &box)
-{
-  auto const &minCorner = box.minCorner();
-  auto const &maxCorner = box.maxCorner();
-  auto const &origin = ray.origin();
-  auto const &direction = ray.direction();
-
-  auto const inf = KokkosExt::ArithmeticTraits::infinity<float>::value;
-  float max_min = -inf;
-  float min_max = inf;
-
-  for (int d = 0; d < 3; ++d)
-  {
-    float tmin;
-    float tmax;
-    if (direction[d] >= 0)
-    {
-      tmin = (minCorner[d] - origin[d]) / direction[d];
-      tmax = (maxCorner[d] - origin[d]) / direction[d];
-    }
-    else
-    {
-      tmin = (maxCorner[d] - origin[d]) / direction[d];
-      tmax = (minCorner[d] - origin[d]) / direction[d];
-    }
-
-    if (!std::isnan(tmin) && max_min < tmin)
-      max_min = tmin;
-    if (!std::isnan(tmax) && min_max > tmax)
-      min_max = tmax;
-  }
-
-  return max_min <= min_max && (min_max >= 0);
-}
-
-// Solves a*x^2 + b*x + c = 0.
-// If a solution exists, return true and stores roots at x1, x2.
-// If a solution does not exist, returns false.
-KOKKOS_INLINE_FUNCTION bool solveQuadratic(float const a, float const b,
-                                           float const c, float &x1, float &x2)
-{
-  assert(a != 0);
-
-  auto const discriminant = b * b - 4 * a * c;
-  if (discriminant < 0)
-    return false;
-  if (discriminant == 0)
-  {
-    x1 = x2 = -b / (2 * a);
-    return true;
-  }
-
-  // Instead of doing a simple
-  //    (-b +- std::sqrt(discriminant)) / (2*a)
-  // we use a more stable algorithm with less loss of precision (see, for
-  // example, https://www.scratchapixel.com/lessons/3d-basic-rendering/
-  // minimal-ray-tracer-rendering-simple-shapes/ray-sphere-intersection).
-  auto const q = (b > 0) ? (-b - std::sqrt(discriminant)) / 2.0
-                         : (-b + std::sqrt(discriminant)) / 2.0;
-  x1 = q / a;
-  x2 = c / q;
-
-  return true;
-}
-
-// Ray-Sphere intersection algorithm.
-//
-// The sphere can be expressed as the solution to
-//     |p - c|^2 - r^2 = 0,           (1)
-// where c is the center of the sphere, and r is the radius. On the other
-// hand, any point on a bidirectional ray satisfies
-//     p = o + t*d,                   (2)
-// where o is the origin, and d is the direction vector.
-// Substituting (2) into (1),
-//     |(o + t*d) - c|^2 - r^2 = 0,   (3)
-// results in a quadratic equation for unknown t
-//     a2 * t^2 + a1 * t + a0 = 0
-// with
-//     a2 = |d|^2, a1 = 2*(d, o - c), and a0 = |o - c|^2 - r^2.
-// Then, we only need to intersect the solution interval [tmin, tmax] with
-// [0, +inf) for the unidirectional ray.
-KOKKOS_INLINE_FUNCTION float overlapDistance(Ray const &ray,
-                                             Sphere const &sphere)
-{
-  auto const &r = sphere.radius();
-
-  // Vector oc = (origin_of_ray - center_of_sphere)
-  Vector const oc = makeVector(sphere.centroid(), ray.origin());
-
-  float const a2 = 1.f; // directions are normalized
-  float const a1 = 2.f * dotProduct(ray.direction(), oc);
-  float const a0 = dotProduct(oc, oc) - r * r;
-
-  float t1;
-  float t2;
-  if (!solveQuadratic(a2, a1, a0, t1, t2))
-  {
-    // No intersection of a bidirectional ray with the sphere
-    return 0.f;
-  }
-  float tmin = KokkosExt::min(t1, t2);
-  float tmax = KokkosExt::max(t1, t2);
-
-  if (tmax < 0)
-  {
-    // Half-ray does not intersect with the sphere
-    return 0.f;
-  }
-
-  // Overlap [tmin, tmax] with [0, +inf)
-  tmin = KokkosExt::max(0.f, tmin);
-
-  // As direction is normalized,
-  //   |(o + tmax*d) - (o + tmin*d)| = tmax - tmin
-  return (tmax - tmin);
-}
-
-} // namespace Experimental
-} // namespace ArborX
-#endif

From f42ed1c95d10376efd73ecaeea8cdfa98f2c03d8 Mon Sep 17 00:00:00 2001
From: Paul Kuberry <pakuber@sandia.gov>
Date: Fri, 1 Oct 2021 10:48:59 -0600
Subject: [PATCH 24/40] Update search using ArborX to reflect neighbors
 included with distance==radius

---
 examples/NeighborSearchTest.cpp          | 45 ++++++++++++++++++++----
 src/Compadre_PointCloudSearch_ArborX.hpp | 11 +++---
 2 files changed, 43 insertions(+), 13 deletions(-)

diff --git a/examples/NeighborSearchTest.cpp b/examples/NeighborSearchTest.cpp
index 3f15e5d39..3e5f5ea5c 100644
--- a/examples/NeighborSearchTest.cpp
+++ b/examples/NeighborSearchTest.cpp
@@ -11,6 +11,22 @@
 #include <mpi.h>
 #endif
 
+#ifdef COMPADRE_USE_ARBORX
+// ArborX results which include distances up to and INCLUDING the radius
+template <typename scalar>
+bool within_radius(const scalar &value_1, const scalar &radius) {
+    if (value_1<=radius) return true;
+    return false;
+}
+#else
+// Nanoflann results which include distances up to and NOT NCLUDING the radius
+template <typename scalar>
+bool within_radius(const scalar &value_1, const scalar &radius) {
+    if (value_1<radius) return true;
+    return false;
+}
+#endif
+
 template<typename T1, typename T2>
 std::pair<T2,T1> swap_pair(const std::pair<T1,T2> &item)
 {
@@ -210,7 +226,12 @@ bool all_passed = true;
                     (0,number_target_coords), [&](const int i) {
                 auto &point_cloud_neighbor_list_i = const_cast<std::map<int, double>& >(point_cloud_neighbor_list[i]);
                 for (int j=0; j<nla.getNumberOfNeighborsHost(i); ++j) {
-                    point_cloud_neighbor_list_i[nla.getNeighborHost(i,j)] = 1.0;
+                    search_scalar dist = 0;
+                    for (int k=0; k<dimension; ++k) {
+                        dist += (static_cast<search_scalar>(target_coords(i,k))-static_cast<search_scalar>(source_coords(nla.getNeighborHost(i,j),k)))*(static_cast<search_scalar>(target_coords(i,k))-static_cast<search_scalar>(source_coords(nla.getNeighborHost(i,j),k)));
+                    }
+                    dist = std::sqrt(dist);
+                    point_cloud_neighbor_list_i[nla.getNeighborHost(i,j)] = dist;
                 }
             });
             double point_cloud_convert_time = timer.seconds();
@@ -230,7 +251,7 @@ bool all_passed = true;
                     }
                     dist = std::sqrt(dist);
 
-                    if (dist < static_cast<search_scalar>((h_multiplier + random_vec(i))*h_spacing)) {
+                    if (within_radius(dist,static_cast<search_scalar>((h_multiplier + random_vec(i))*h_spacing))) {
                         brute_force_neighbor_list_i[j]=dist;
                     }
                 }
@@ -329,7 +350,12 @@ bool all_passed = true;
                     (0,number_target_coords), [&](const int i) {
                 auto &point_cloud_neighbor_list_i = const_cast<std::map<int, double>& >(point_cloud_neighbor_list[i]);
                 for (int j=1; j<=neighbor_lists(i,0); ++j) {
-                    point_cloud_neighbor_list_i[neighbor_lists(i,j)] = 1.0;
+                    search_scalar dist = 0;
+                    for (int k=0; k<dimension; ++k) {
+                        dist += (static_cast<search_scalar>(target_coords(i,k))-static_cast<search_scalar>(source_coords(neighbor_lists(i,j),k)))*(static_cast<search_scalar>(target_coords(i,k))-static_cast<search_scalar>(source_coords(neighbor_lists(i,j),k)));
+                    }
+                    dist = std::sqrt(dist);
+                    point_cloud_neighbor_list_i[neighbor_lists(i,j)] = dist;
                 }
             });
             double point_cloud_convert_time = timer.seconds();
@@ -349,7 +375,7 @@ bool all_passed = true;
                     }
                     dist = std::sqrt(dist);
 
-                    if (dist < static_cast<search_scalar>((h_multiplier + random_vec(i))*h_spacing)) {
+                    if (within_radius(dist,static_cast<search_scalar>((h_multiplier + random_vec(i))*h_spacing))) {
                         brute_force_neighbor_list_i[j]=dist;
                     }
                 }
@@ -452,7 +478,12 @@ bool all_passed = true;
                     (0,number_target_coords), [&](const int i) {
                 auto &point_cloud_neighbor_list_i = const_cast<std::map<int, double>& >(point_cloud_neighbor_list[i]);
                 for (int j=0; j<nla.getNumberOfNeighborsHost(i); ++j) {
-                    point_cloud_neighbor_list_i[nla.getNeighborHost(i,j)] = 1.0;
+                    search_scalar dist = 0;
+                    for (int k=0; k<dimension; ++k) {
+                        dist += (static_cast<search_scalar>(target_coords(i,k))-static_cast<search_scalar>(source_coords(nla.getNeighborHost(i,j),k)))*(static_cast<search_scalar>(target_coords(i,k))-static_cast<search_scalar>(source_coords(nla.getNeighborHost(i,j),k)));
+                    }
+                    dist = std::sqrt(dist);
+                    point_cloud_neighbor_list_i[nla.getNeighborHost(i,j)] = dist;
                 }
             });
             double point_cloud_convert_time = timer.seconds();
@@ -472,7 +503,7 @@ bool all_passed = true;
                     }
                     dist = std::sqrt(dist);
 
-                    if (dist < static_cast<search_scalar>((h_multiplier + random_vec(i))*h_spacing)) {
+                    if (within_radius(dist,static_cast<search_scalar>((h_multiplier + random_vec(i))*h_spacing))) {
                         brute_force_neighbor_list_i[j]=dist;
                     }
                 }
@@ -508,6 +539,8 @@ bool all_passed = true;
                 for (int j=0; j<nla.getNumberOfNeighborsHost(i); ++j) {
                     if (brute_force_neighbor_list[i].count(nla.getNeighborHost(i,j))!=1) {
                         all_found = false;
+                        auto &point_cloud_neighbor_list_i = const_cast<std::map<int, double>& >(point_cloud_neighbor_list[i]);
+                        printf("failure: target i(%d), neighbor j(%d), distance(%.16f), radius(%.16f)\n", i, nla.getNeighborHost(i,j), point_cloud_neighbor_list_i[nla.getNeighborHost(i,j)], epsilon(i));
                     }
                 }
                 if (all_found) t_num_passed++;
diff --git a/src/Compadre_PointCloudSearch_ArborX.hpp b/src/Compadre_PointCloudSearch_ArborX.hpp
index 6b5f657eb..9e6cac49f 100644
--- a/src/Compadre_PointCloudSearch_ArborX.hpp
+++ b/src/Compadre_PointCloudSearch_ArborX.hpp
@@ -596,13 +596,10 @@ class PointCloudSearch {
                 search_scalar last_neighbor_distance = kdtreeDistance(trg_pt.data(), values(offsets(i)+num_neighbors-1));
 
                 // scale by epsilon_multiplier to window from location where the last neighbor was found
-                epsilons(i) = (last_neighbor_distance > 0) ? 
-                                    static_cast<search_scalar>(last_neighbor_distance*epsilon_multiplier)
-                                  : static_cast<search_scalar>(SEARCH_SCALAR_EPS*epsilon_multiplier);
-                // the only time the second case using 1e-7 is used is when either zero neighbors or exactly one 
-                // neighbor (neighbor is target site) is found.  when the follow on radius search is conducted, the one
-                // neighbor (target site) will not be found if left at 0, so any positive amount will do, however 1e-7 
-                // should be small enough to ensure that other neighbors are not found
+                epsilons(i) = static_cast<search_scalar>(last_neighbor_distance*epsilon_multiplier);
+                // because radius search is inclusive of endpoints for ArborX, no need to scale zero distances
+                // as an epsilon value times the epsilon multiplier (like is done in Nanoflann where radius 
+                // searches do not pick up points radius distance from target)
 
                 compadre_kernel_assert_release((epsilons(i)<=max_search_radius || max_search_radius==0 || is_dry_run) 
                         && "max_search_radius given (generally derived from the size of a halo region), \

From cd38160cd51396f789250eb497c8fca18d89fb03 Mon Sep 17 00:00:00 2001
From: Paul Kuberry <pakuber@sandia.gov>
Date: Fri, 1 Oct 2021 11:38:33 -0600
Subject: [PATCH 25/40] Remove need for dry run for ArborX searches

---
 src/Compadre_PointCloudSearch_ArborX.hpp | 161 ++++++-----------------
 1 file changed, 40 insertions(+), 121 deletions(-)

diff --git a/src/Compadre_PointCloudSearch_ArborX.hpp b/src/Compadre_PointCloudSearch_ArborX.hpp
index 9e6cac49f..67e64e255 100644
--- a/src/Compadre_PointCloudSearch_ArborX.hpp
+++ b/src/Compadre_PointCloudSearch_ArborX.hpp
@@ -245,65 +245,32 @@ class PointCloudSearch {
         */
         template <typename trg_view_type, typename neighbor_lists_view_type, typename epsilons_view_type>
         size_t generate2DNeighborListsFromRadiusSearch(bool is_dry_run, trg_view_type trg_pts_view, 
-                neighbor_lists_view_type& neighbor_lists, epsilons_view_type epsilons, 
+                neighbor_lists_view_type& neighbor_lists, epsilons_view_type& epsilons, 
                 const double uniform_radius = 0.0, double max_search_radius = 0.0,
                 bool check_same = true) {
 
-            // function does not populate epsilons, they must be prepopulated
             const int num_target_sites = trg_pts_view.extent(0);
  
-            // check neighbor lists and epsilons view sizes
-            compadre_assert_release((neighbor_lists.extent(0)==(size_t)num_target_sites 
-                        && neighbor_lists.extent(1)>=1)
-                        && "neighbor lists View does not have large enough dimensions");
+            // check neighbor lists rank
             compadre_assert_release((neighbor_lists_view_type::rank==2) && "neighbor_lists must be a 2D Kokkos view.");
 
-
             // temporary 1D array for cr_neighbor_lists
             typedef typename neighbor_lists_view_type::value_type value_type;
-            size_t cr_neighbor_entries =  (is_dry_run) ? 0 : num_target_sites * neighbor_lists.extent(1);
             Kokkos::View<value_type*, typename neighbor_lists_view_type::memory_space> 
-                cr_neighbor_lists(
-                    Kokkos::view_alloc(neighbor_lists.label(), 
-                        typename neighbor_lists_view_type::memory_space()), 
-                    cr_neighbor_entries);
+                cr_neighbor_lists(neighbor_lists.label(), 0);
 
             // temporary 1D array for number_of_neighbors_list
             typedef typename neighbor_lists_view_type::value_type value_type;
             Kokkos::View<value_type*, typename neighbor_lists_view_type::memory_space> 
-                number_of_neighbors_list(
-                    Kokkos::view_alloc("number of neighbors list", 
-                        typename neighbor_lists_view_type::memory_space()), 
-                    num_target_sites);
-
-            if (!is_dry_run) { 
-                // number_of_neighbors_list not populated when !is_dry_run
-                Kokkos::parallel_for(Kokkos::RangePolicy<host_execution_space>(0, num_target_sites),
-                KOKKOS_LAMBDA(int i) {
-                    number_of_neighbors_list(i) = neighbor_lists(i,0);
-                });
-                Kokkos::fence();
-            }
-            
-            // doesn't fill number_of_neighbors_list when !is_dry_run
+                number_of_neighbors_list("number of neighbors list", num_target_sites);
+
             generateCRNeighborListsFromRadiusSearch(is_dry_run, trg_pts_view,
                 cr_neighbor_lists, number_of_neighbors_list, epsilons, uniform_radius, 
                 max_search_radius, check_same);
 
-            size_t max_num_neighbors = 0;
-            if (!is_dry_run) {
-                auto nla = CreateNeighborLists(cr_neighbor_lists, number_of_neighbors_list);
-                ConvertCompressedRowNeighborListsTo2D(nla, neighbor_lists);
-                max_num_neighbors = nla.getMaxNumNeighbors();
-            } else {
-                Kokkos::parallel_for(Kokkos::RangePolicy<host_execution_space>(0, num_target_sites),
-                KOKKOS_LAMBDA(int i) {
-                    neighbor_lists(i,0) = number_of_neighbors_list(i);
-                });
-                Kokkos::fence();
-                auto nla = CreateNeighborLists(number_of_neighbors_list);
-                max_num_neighbors = nla.getMaxNumNeighbors();
-            }
+            auto nla = CreateNeighborLists(cr_neighbor_lists, number_of_neighbors_list);
+            size_t max_num_neighbors = nla.getMaxNumNeighbors();
+            ConvertCompressedRowNeighborListsTo2D(nla, neighbor_lists);
             
             return max_num_neighbors;
         }
@@ -322,8 +289,8 @@ class PointCloudSearch {
         */
         template <typename trg_view_type, typename neighbor_lists_view_type, typename epsilons_view_type>
         size_t generateCRNeighborListsFromRadiusSearch(bool is_dry_run, trg_view_type trg_pts_view, 
-                neighbor_lists_view_type neighbor_lists, neighbor_lists_view_type number_of_neighbors_list, 
-                epsilons_view_type epsilons, const double uniform_radius = 0.0, 
+                neighbor_lists_view_type& neighbor_lists, neighbor_lists_view_type& number_of_neighbors_list, 
+                epsilons_view_type& epsilons, const double uniform_radius = 0.0, 
                 double max_search_radius = 0.0, bool check_same = true) {
 
             // function does not populate epsilons, they must be prepopulated
@@ -340,12 +307,13 @@ class PointCloudSearch {
 
             // loop size
             const int num_target_sites = trg_pts_view.extent(0);
-
-            compadre_assert_release((number_of_neighbors_list.extent(0)==(size_t)num_target_sites)
-                        && "number_of_neighbors_list or neighbor lists View does not have large enough dimensions");
+            if (number_of_neighbors_list.extent(0)!=(size_t)num_target_sites) {
+                Kokkos::resize(number_of_neighbors_list, num_target_sites);
+            }
+            if (epsilons.extent(0)!=(size_t)num_target_sites) {
+                Kokkos::resize(epsilons, num_target_sites);
+            }
             compadre_assert_release((neighbor_lists_view_type::rank==1) && "neighbor_lists must be a 1D Kokkos view.");
-            compadre_assert_release((epsilons.extent(0)==(size_t)num_target_sites)
-                        && "epsilons View does not have the correct dimension");
 
             // perform tree search on device
             Kokkos::View<int*, device_memory_space> d_values("values", 0);
@@ -369,29 +337,10 @@ class PointCloudSearch {
             Kokkos::parallel_for(Kokkos::RangePolicy<host_execution_space>(0, num_target_sites),
             KOKKOS_LAMBDA(int i) {
                 size_t neighbors_found_for_target_i = offsets(i+1) - offsets(i);
-                if (!is_dry_run && check_same) { // check it is as expected before overwriting
-                    compadre_kernel_assert_debug(
-                            (neighbors_found_for_target_i==(size_t)number_of_neighbors_list(i)) 
-                            && "Number of neighbors found changed since dry-run.");
-                }
                 number_of_neighbors_list(i) = neighbors_found_for_target_i;
             });
             Kokkos::fence();
 
-            // build a row offsets object (only if not a dry run)
-            typedef Kokkos::View<global_index_type*, typename neighbor_lists_view_type::array_layout,
-                    typename neighbor_lists_view_type::memory_space, typename neighbor_lists_view_type::memory_traits> row_offsets_view_type;
-            row_offsets_view_type row_offsets;
-            if (!is_dry_run) {
-                auto nla = CreateNeighborLists(neighbor_lists, number_of_neighbors_list);
-                Kokkos::resize(row_offsets, num_target_sites);
-                Kokkos::fence();
-                Kokkos::parallel_for(Kokkos::RangePolicy<host_execution_space>(0,num_target_sites), [&](const int i) {
-                    row_offsets(i) = nla.getRowOffsetHost(i); 
-                });
-                Kokkos::fence();
-            }
-
             // sort to put closest neighbor first (other neighbors are not affected)
             typedef Kokkos::View<double*, Kokkos::HostSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> > 
                     scratch_double_view;
@@ -411,10 +360,10 @@ class PointCloudSearch {
 
                 // find swap index
                 int min_distance_ind = 0;
-                double first_neighbor_distance = kdtreeDistance(trg_pt.data(), values(offsets(i)));
+                float first_neighbor_distance = kdtreeDistance(trg_pt.data(), values(offsets(i)));
                 for (int j=1; j<number_of_neighbors_list(i); ++j) {
                     // distance to neighbor
-                    double neighbor_distance = kdtreeDistance(trg_pt.data(), values(offsets(i)+j));
+                    float neighbor_distance = kdtreeDistance(trg_pt.data(), values(offsets(i)+j));
                     if (neighbor_distance < first_neighbor_distance) {
                         first_neighbor_distance = neighbor_distance;
                         min_distance_ind = j;
@@ -431,15 +380,11 @@ class PointCloudSearch {
             Kokkos::fence();
 
             // copy neighbor list values over from tree query
-            if (!is_dry_run) {
-                Kokkos::parallel_for(Kokkos::RangePolicy<host_execution_space>(0, num_target_sites),
-                KOKKOS_LAMBDA(int i) {
-                    for (int j=0; j<number_of_neighbors_list(i); ++j) {
-                        neighbor_lists(row_offsets(i)+j) = values(offsets(i)+j);
-                    }
-                });
-                Kokkos::fence();
+            if (neighbor_lists.extent(0) != values.extent(0)) {
+                Kokkos::resize(neighbor_lists, values.extent(0));
             }
+            Kokkos::deep_copy(neighbor_lists, values);
+            Kokkos::fence();
 
             auto nla = CreateNeighborLists(number_of_neighbors_list);
             return nla.getTotalNeighborsOverAllListsHost();
@@ -458,63 +403,35 @@ class PointCloudSearch {
         */
         template <typename trg_view_type, typename neighbor_lists_view_type, typename epsilons_view_type>
         size_t generate2DNeighborListsFromKNNSearch(bool is_dry_run, trg_view_type trg_pts_view, 
-                neighbor_lists_view_type neighbor_lists, epsilons_view_type epsilons, 
+                neighbor_lists_view_type& neighbor_lists, epsilons_view_type& epsilons, 
                 const int neighbors_needed, const double epsilon_multiplier = 1.6, 
                 double max_search_radius = 0.0, bool check_same = true) {
 
             const int num_target_sites = trg_pts_view.extent(0);
  
-            // check neighbor lists and epsilons view sizes
-            compadre_assert_release((neighbor_lists.extent(0)==(size_t)num_target_sites 
-                        && neighbor_lists.extent(1)>=1)
-                        && "neighbor lists View does not have large enough dimensions");
+            // check neighbor lists rank
             compadre_assert_release((neighbor_lists_view_type::rank==2) && "neighbor_lists must be a 2D Kokkos view.");
 
             // temporary 1D array for cr_neighbor_lists
             typedef typename neighbor_lists_view_type::value_type value_type;
-            size_t cr_neighbor_entries =  (is_dry_run) ? 0 : num_target_sites * neighbor_lists.extent(1);
             Kokkos::View<value_type*, typename neighbor_lists_view_type::memory_space> 
-                cr_neighbor_lists(
-                    Kokkos::view_alloc(neighbor_lists.label(), 
-                        typename neighbor_lists_view_type::memory_space()), 
-                    cr_neighbor_entries);
+                cr_neighbor_lists(neighbor_lists.label(), 0);
 
             // temporary 1D array for number_of_neighbors_list
             typedef typename neighbor_lists_view_type::value_type value_type;
             Kokkos::View<value_type*, typename neighbor_lists_view_type::memory_space> 
-                number_of_neighbors_list(
-                    Kokkos::view_alloc("number of neighbors list", 
-                        typename neighbor_lists_view_type::memory_space()), 
-                    num_target_sites);
-
-            if (!is_dry_run) { 
-                // number_of_neighbors_list not populated when !is_dry_run
-                Kokkos::parallel_for(Kokkos::RangePolicy<host_execution_space>(0, num_target_sites),
-                KOKKOS_LAMBDA(int i) {
-                    number_of_neighbors_list(i) = neighbor_lists(i,0);
-                });
-            }
-            
+                number_of_neighbors_list("number of neighbors list", num_target_sites);
+
             // doesn't fill number_of_neighbors_list when !is_dry_run
             generateCRNeighborListsFromKNNSearch(is_dry_run, trg_pts_view,
                 cr_neighbor_lists, number_of_neighbors_list, epsilons, 
                 neighbors_needed, epsilon_multiplier, max_search_radius,
                 check_same);
 
-            size_t max_num_neighbors = 0;
-            if (!is_dry_run) {
-                auto nla = CreateNeighborLists(cr_neighbor_lists, number_of_neighbors_list);
-                ConvertCompressedRowNeighborListsTo2D(nla, neighbor_lists);
-                max_num_neighbors = nla.getMaxNumNeighbors();
-            } else {
-                Kokkos::parallel_for(Kokkos::RangePolicy<host_execution_space>(0, num_target_sites),
-                KOKKOS_LAMBDA(int i) {
-                    neighbor_lists(i,0) = number_of_neighbors_list(i);
-                });
-                Kokkos::fence();
-                auto nla = CreateNeighborLists(number_of_neighbors_list);
-                max_num_neighbors = nla.getMaxNumNeighbors();
-            }
+            auto nla = CreateNeighborLists(cr_neighbor_lists, number_of_neighbors_list);
+            size_t max_num_neighbors = nla.getMaxNumNeighbors();
+            ConvertCompressedRowNeighborListsTo2D(nla, neighbor_lists);
+
             return max_num_neighbors;
         }
 
@@ -531,8 +448,8 @@ class PointCloudSearch {
         */
         template <typename trg_view_type, typename neighbor_lists_view_type, typename epsilons_view_type>
         size_t generateCRNeighborListsFromKNNSearch(bool is_dry_run, trg_view_type trg_pts_view, 
-                neighbor_lists_view_type neighbor_lists, neighbor_lists_view_type number_of_neighbors_list,
-                epsilons_view_type epsilons, const int neighbors_needed, const double epsilon_multiplier = 1.6, 
+                neighbor_lists_view_type& neighbor_lists, neighbor_lists_view_type& number_of_neighbors_list,
+                epsilons_view_type& epsilons, const int neighbors_needed, const double epsilon_multiplier = 1.6, 
                 double max_search_radius = 0.0, bool check_same = true) {
 
             // First, do a knn search (removes need for guessing initial search radius)
@@ -550,11 +467,13 @@ class PointCloudSearch {
             // loop size
             const int num_target_sites = trg_pts_view.extent(0);
 
-            compadre_assert_release((number_of_neighbors_list.extent(0)==(size_t)num_target_sites)
-                        && "number_of_neighbors_list or neighbor lists View does not have large enough dimensions");
+            if (number_of_neighbors_list.extent(0)!=(size_t)num_target_sites) {
+                Kokkos::resize(number_of_neighbors_list, num_target_sites);
+            }
+            if (epsilons.extent(0)!=(size_t)num_target_sites) {
+                Kokkos::resize(epsilons, num_target_sites);
+            }
             compadre_assert_release((neighbor_lists_view_type::rank==1) && "neighbor_lists must be a 1D Kokkos view.");
-            compadre_assert_release((epsilons.extent(0)==(size_t)num_target_sites)
-                        && "epsilons View does not have the correct dimension");
 
             // perform tree search on device
             Kokkos::View<int*, device_memory_space> d_values("values", 0);
@@ -601,7 +520,7 @@ class PointCloudSearch {
                 // as an epsilon value times the epsilon multiplier (like is done in Nanoflann where radius 
                 // searches do not pick up points radius distance from target)
 
-                compadre_kernel_assert_release((epsilons(i)<=max_search_radius || max_search_radius==0 || is_dry_run) 
+                compadre_kernel_assert_release((epsilons(i)<=max_search_radius || max_search_radius==0) 
                         && "max_search_radius given (generally derived from the size of a halo region), \
                             and search radius needed would exceed this max_search_radius.");
 

From f8daa0c47913e7f4428f705a991557676f557344 Mon Sep 17 00:00:00 2001
From: Paul Kuberry <pakuber@sandia.gov>
Date: Fri, 1 Oct 2021 12:38:48 -0600
Subject: [PATCH 26/40] Remove all dry-run followed by real-run neighbor search
 in examples (changes API) - ArborX neighbor search will ignore all do_dry_run
 bool flags   and do full neighbor search with no recursive calls - Nanoflann
 is broken until next commit when dry-run/real-run is   built into recursive
 calls

---
 examples/GMLS_Device.cpp                      | 13 +--
 examples/GMLS_DivergenceFree.cpp              |  8 +-
 examples/GMLS_Manifold.cpp                    | 12 +--
 ...MLS_Manifold_Multiple_Evaluation_Sites.cpp |  8 +-
 examples/GMLS_Multiple_Evaluation_Sites.cpp   | 10 +--
 examples/GMLS_NeumannGradScalar.cpp           | 10 +--
 examples/GMLS_SmallBatchReuse_Device.cpp      | 12 ++-
 examples/GMLS_Staggered.cpp                   | 10 +--
 examples/GMLS_Staggered_Manifold.cpp          | 10 +--
 examples/GMLS_Vector.cpp                      | 10 +--
 examples/NeighborSearchTest.cpp               | 79 +++----------------
 examples/unittests/test_PointCloudSearch.hpp  | 23 +-----
 pycompadre/pycompadre.cpp                     |  8 +-
 src/Compadre_PointCloudSearch_ArborX.hpp      | 65 ++++++---------
 14 files changed, 77 insertions(+), 201 deletions(-)

diff --git a/examples/GMLS_Device.cpp b/examples/GMLS_Device.cpp
index f8db812e6..6795feca5 100644
--- a/examples/GMLS_Device.cpp
+++ b/examples/GMLS_Device.cpp
@@ -218,17 +218,7 @@ bool all_passed = true;
     // query the point cloud to generate the neighbor lists using a kdtree to produce the n nearest neighbor
     // to each target site, adding (epsilon_multiplier-1)*100% to whatever the distance away the further neighbor used is from
     // each target to the view for epsilon
-    //
-    // This dry run populates number_of_neighbors_list with neighborhood sizes
-    size_t storage_size = point_cloud_search.generateCRNeighborListsFromKNNSearch(true /*dry run*/, target_coords, neighbor_lists, 
-            number_of_neighbors_list, epsilon, min_neighbors, epsilon_multiplier);
-
-    // resize neighbor_lists_device so as to be large enough to contain all neighborhoods
-    Kokkos::resize(neighbor_lists_device, storage_size);
-    neighbor_lists = Kokkos::create_mirror_view(neighbor_lists_device);
-    
-    // query the point cloud a second time, but this time storing results into neighbor_lists
-    point_cloud_search.generateCRNeighborListsFromKNNSearch(false /*not dry run*/, target_coords, neighbor_lists, 
+    point_cloud_search.generateCRNeighborListsFromKNNSearch(target_coords, neighbor_lists, 
             number_of_neighbors_list, epsilon, min_neighbors, epsilon_multiplier);
     
     //! [Performing Neighbor Search]
@@ -244,6 +234,7 @@ bool all_passed = true;
     // We could have filled Kokkos Views with memory space on the host
     // and used these instead, and then the copying of data to the device
     // would be performed in the GMLS class
+    Kokkos::resize(neighbor_lists_device, neighbor_lists.extent(0));
     Kokkos::deep_copy(neighbor_lists_device, neighbor_lists);
     Kokkos::deep_copy(number_of_neighbors_list_device, number_of_neighbors_list);
     Kokkos::deep_copy(epsilon_device, epsilon);
diff --git a/examples/GMLS_DivergenceFree.cpp b/examples/GMLS_DivergenceFree.cpp
index 0a28a2ff8..7780562b6 100644
--- a/examples/GMLS_DivergenceFree.cpp
+++ b/examples/GMLS_DivergenceFree.cpp
@@ -177,11 +177,8 @@ bool all_passed = true;
     // the number of neighbors for that rows corresponding target site
     // for the default values in this test, the multiplier is suggested to be 2.2
     double epsilon_multiplier = 2.2;
-    int estimated_upper_bound_number_neighbors =
-        point_cloud_search.getEstimatedNumberNeighborsUpperBound(min_neighbors, dimension, epsilon_multiplier);
 
-    Kokkos::View<int**, Kokkos::DefaultExecutionSpace> neighbor_lists_device("neighbor lists",
-            number_target_coords, estimated_upper_bound_number_neighbors); // first column is # of neighbors
+    Kokkos::View<int**, Kokkos::DefaultExecutionSpace> neighbor_lists_device("neighbor lists", 0, 0);
     Kokkos::View<int**>::HostMirror neighbor_lists = Kokkos::create_mirror_view(neighbor_lists_device);
 
     // each target site has a window size
@@ -191,7 +188,7 @@ bool all_passed = true;
     // query the point cloud to generate the neighbor lists using a kdtree to produce the n nearest neighbor
     // to each target site, adding (epsilon_multiplier-1)*100% to whatever the distance away the further neighbor used is from
     // each target to the view for epsilon
-    point_cloud_search.generate2DNeighborListsFromKNNSearch(false /*not dry run*/, target_coords, neighbor_lists, 
+    point_cloud_search.generate2DNeighborListsFromKNNSearch(target_coords, neighbor_lists, 
             epsilon, min_neighbors, epsilon_multiplier);
 
     //! [Performing Neighbor Search]
@@ -207,6 +204,7 @@ bool all_passed = true;
     // We could have filled Kokkos Views with memory space on the host
     // and used these instead, and then the copying of data to the device
     // would be performed in the GMLS class
+    Kokkos::resize(neighbor_lists_device, neighbor_lists.extent(0), neighbor_lists.extent(1));
     Kokkos::deep_copy(neighbor_lists_device, neighbor_lists);
     Kokkos::deep_copy(epsilon_device, epsilon);
 
diff --git a/examples/GMLS_Manifold.cpp b/examples/GMLS_Manifold.cpp
index e1777dded..ce806b6cb 100644
--- a/examples/GMLS_Manifold.cpp
+++ b/examples/GMLS_Manifold.cpp
@@ -225,15 +225,8 @@ Kokkos::initialize(argc, args);
     Kokkos::View<double*, Kokkos::DefaultExecutionSpace> epsilon_device("h supports", number_target_coords);
     Kokkos::View<double*>::HostMirror epsilon = Kokkos::create_mirror_view(epsilon_device);
 
-    size_t storage_size = point_cloud_search.generateCRNeighborListsFromKNNSearch(true /*dry run*/, target_coords, neighbor_lists, 
-            number_of_neighbors_list, epsilon, min_neighbors, epsilon_multiplier);
-    
-    // resize neighbor_lists_device so as to be large enough to contain all neighborhoods
-    Kokkos::resize(neighbor_lists_device, storage_size);
-    neighbor_lists = Kokkos::create_mirror_view(neighbor_lists_device);
-
-    // query the point cloud a second time, but this time storing results into neighbor_lists
-    point_cloud_search.generateCRNeighborListsFromKNNSearch(false /*not dry run*/, target_coords, neighbor_lists, 
+    // search
+    point_cloud_search.generateCRNeighborListsFromKNNSearch(target_coords, neighbor_lists, 
             number_of_neighbors_list, epsilon, min_neighbors, epsilon_multiplier);
 
     // Diagnostic for neighbors found
@@ -259,6 +252,7 @@ Kokkos::initialize(argc, args);
     // We could have filled Kokkos Views with memory space on the host
     // and used these instead, and then the copying of data to the device
     // would be performed in the GMLS class
+    Kokkos::resize(neighbor_lists_device, neighbor_lists.extent(0));
     Kokkos::deep_copy(neighbor_lists_device, neighbor_lists);
     Kokkos::deep_copy(number_of_neighbors_list_device, number_of_neighbors_list);
     Kokkos::deep_copy(epsilon_device, epsilon);
diff --git a/examples/GMLS_Manifold_Multiple_Evaluation_Sites.cpp b/examples/GMLS_Manifold_Multiple_Evaluation_Sites.cpp
index a4b562f8f..ef6ae7831 100644
--- a/examples/GMLS_Manifold_Multiple_Evaluation_Sites.cpp
+++ b/examples/GMLS_Manifold_Multiple_Evaluation_Sites.cpp
@@ -240,11 +240,8 @@ Kokkos::initialize(argc, args);
     // each row is a neighbor list for a target site, with the first column of each row containing
     // the number of neighbors for that rows corresponding target site
     double epsilon_multiplier = 1.7;
-    int estimated_upper_bound_number_neighbors = 
-        point_cloud_search.getEstimatedNumberNeighborsUpperBound(min_neighbors, dimension, epsilon_multiplier);
 
-    Kokkos::View<int**, Kokkos::DefaultExecutionSpace> neighbor_lists_device("neighbor lists", 
-            number_target_coords, estimated_upper_bound_number_neighbors); // first column is # of neighbors
+    Kokkos::View<int**, Kokkos::DefaultExecutionSpace> neighbor_lists_device("neighbor lists", 0, 0);
     Kokkos::View<int**>::HostMirror neighbor_lists = Kokkos::create_mirror_view(neighbor_lists_device);
     
     // each target site has a window size
@@ -254,7 +251,7 @@ Kokkos::initialize(argc, args);
     // query the point cloud to generate the neighbor lists using a kdtree to produce the n nearest neighbor
     // to each target site, adding (epsilon_multiplier-1)*100% to whatever the distance away the further neighbor used is from
     // each target to the view for epsilon
-    point_cloud_search.generate2DNeighborListsFromKNNSearch(false /*not dry run*/, target_coords, neighbor_lists, 
+    point_cloud_search.generate2DNeighborListsFromKNNSearch(target_coords, neighbor_lists, 
             epsilon, min_neighbors, epsilon_multiplier);
 
     //! [Performing Neighbor Search]
@@ -270,6 +267,7 @@ Kokkos::initialize(argc, args);
     // We could have filled Kokkos Views with memory space on the host
     // and used these instead, and then the copying of data to the device
     // would be performed in the GMLS class
+    Kokkos::resize(neighbor_lists_device, neighbor_lists.extent(0), neighbor_lists.extent(1));
     Kokkos::deep_copy(neighbor_lists_device, neighbor_lists);
     Kokkos::deep_copy(epsilon_device, epsilon);
     
diff --git a/examples/GMLS_Multiple_Evaluation_Sites.cpp b/examples/GMLS_Multiple_Evaluation_Sites.cpp
index d96625916..b8c215545 100644
--- a/examples/GMLS_Multiple_Evaluation_Sites.cpp
+++ b/examples/GMLS_Multiple_Evaluation_Sites.cpp
@@ -228,11 +228,8 @@ bool all_passed = true;
     // each row is a neighbor list for a target site, with the first column of each row containing
     // the number of neighbors for that rows corresponding target site
     double epsilon_multiplier = 1.5;
-    int estimated_upper_bound_number_neighbors = 
-        point_cloud_search.getEstimatedNumberNeighborsUpperBound(min_neighbors, dimension, epsilon_multiplier);
 
-    Kokkos::View<int**, Kokkos::DefaultExecutionSpace> neighbor_lists_device("neighbor lists", 
-            number_target_coords, estimated_upper_bound_number_neighbors); // first column is # of neighbors
+    Kokkos::View<int**, Kokkos::DefaultExecutionSpace> neighbor_lists_device("neighbor lists", 0, 0);
     Kokkos::View<int**>::HostMirror neighbor_lists = Kokkos::create_mirror_view(neighbor_lists_device);
     
     // each target site has a window size
@@ -242,8 +239,8 @@ bool all_passed = true;
     // query the point cloud to generate the neighbor lists using a kdtree to produce the n nearest neighbor
     // to each target site, adding (epsilon_multiplier-1)*100% to whatever the distance away the further neighbor used is from
     // each target to the view for epsilon
-    point_cloud_search.generate2DNeighborListsFromKNNSearch(false /*not dry run*/, target_coords, neighbor_lists, 
-            epsilon, min_neighbors, epsilon_multiplier, 0.0 /* max search radius */, false);
+    point_cloud_search.generate2DNeighborListsFromKNNSearch(target_coords, neighbor_lists, 
+            epsilon, min_neighbors, epsilon_multiplier);
     
     
     //! [Performing Neighbor Search]
@@ -259,6 +256,7 @@ bool all_passed = true;
     // We could have filled Kokkos Views with memory space on the host
     // and used these instead, and then the copying of data to the device
     // would be performed in the GMLS class
+    Kokkos::resize(neighbor_lists_device, neighbor_lists.extent(0), neighbor_lists.extent(1));
     Kokkos::deep_copy(neighbor_lists_device, neighbor_lists);
     Kokkos::deep_copy(epsilon_device, epsilon);
     
diff --git a/examples/GMLS_NeumannGradScalar.cpp b/examples/GMLS_NeumannGradScalar.cpp
index d3481e6e1..0ad805f4d 100644
--- a/examples/GMLS_NeumannGradScalar.cpp
+++ b/examples/GMLS_NeumannGradScalar.cpp
@@ -200,11 +200,8 @@ bool all_passed = true;
     // each row is a neighbor list for a target site, with the first column of each row containing
     // the number of neighbors for that rows corresponding target site
     double epsilon_multiplier = 1.8;
-    int estimated_upper_bound_number_neighbors = 
-        point_cloud_search.getEstimatedNumberNeighborsUpperBound(min_neighbors, dimension, epsilon_multiplier);
 
-    Kokkos::View<int**, Kokkos::DefaultExecutionSpace> neighbor_lists_device("neighbor lists", 
-            number_target_coords, estimated_upper_bound_number_neighbors); // first column is # of neighbors
+    Kokkos::View<int**, Kokkos::DefaultExecutionSpace> neighbor_lists_device("neighbor lists", 0, 0);
     Kokkos::View<int**>::HostMirror neighbor_lists = Kokkos::create_mirror_view(neighbor_lists_device);
     
     // each target site has a window size
@@ -214,8 +211,8 @@ bool all_passed = true;
     // query the point cloud to generate the neighbor lists using a kdtree to produce the n nearest neighbor
     // to each target site, adding (epsilon_multiplier-1)*100% to whatever the distance away the further neighbor used is from
     // each target to the view for epsilon
-    point_cloud_search.generate2DNeighborListsFromKNNSearch(false /*not dry run*/, target_coords, neighbor_lists, 
-            epsilon, min_neighbors, epsilon_multiplier, 0.0 /* max search radius */, false);
+    point_cloud_search.generate2DNeighborListsFromKNNSearch(target_coords, neighbor_lists, 
+            epsilon, min_neighbors, epsilon_multiplier);
     
     //! [Performing Neighbor Search]
     
@@ -230,6 +227,7 @@ bool all_passed = true;
     // We could have filled Kokkos Views with memory space on the host
     // and used these instead, and then the copying of data to the device
     // would be performed in the GMLS class
+    Kokkos::resize(neighbor_lists_device, neighbor_lists.extent(0), neighbor_lists.extent(1));
     Kokkos::deep_copy(neighbor_lists_device, neighbor_lists);
     Kokkos::deep_copy(epsilon_device, epsilon);
     
diff --git a/examples/GMLS_SmallBatchReuse_Device.cpp b/examples/GMLS_SmallBatchReuse_Device.cpp
index 09f98b4cd..9f01be0cd 100644
--- a/examples/GMLS_SmallBatchReuse_Device.cpp
+++ b/examples/GMLS_SmallBatchReuse_Device.cpp
@@ -256,11 +256,8 @@ bool all_passed = true;
         // each row is a neighbor list for a target site, with the first column of each row containing
         // the number of neighbors for that rows corresponding target site
         double epsilon_multiplier = 1.5;
-        int estimated_upper_bound_number_neighbors = 
-            point_cloud_search.getEstimatedNumberNeighborsUpperBound(min_neighbors, dimension, epsilon_multiplier);
 
-        Kokkos::View<int**, Kokkos::DefaultExecutionSpace> single_neighbor_lists_device("neighbor lists", 
-                1, estimated_upper_bound_number_neighbors); // first column is # of neighbors
+        Kokkos::View<int**, Kokkos::DefaultExecutionSpace> single_neighbor_lists_device("neighbor lists", 0, 0);
         Kokkos::View<int**>::HostMirror single_neighbor_lists = Kokkos::create_mirror_view(single_neighbor_lists_device);
         
         // each target site has a window size
@@ -270,10 +267,10 @@ bool all_passed = true;
         // query the point cloud to generate the neighbor lists using a kdtree to produce the n nearest neighbor
         // to each target site, adding (epsilon_multiplier-1)*100% to whatever the distance away the further neighbor used is from
         // each target to the view for epsilon
-        point_cloud_search.generate2DNeighborListsFromKNNSearch(false /*not dry run*/, single_target_coords, 
-                single_neighbor_lists, single_epsilon, min_neighbors, epsilon_multiplier,
-                0.0 /* max search radius */, false);
+        point_cloud_search.generate2DNeighborListsFromKNNSearch(single_target_coords, 
+                single_neighbor_lists, single_epsilon, min_neighbors, epsilon_multiplier);
         
+
         //! [Performing Neighbor Search]
         
         
@@ -281,6 +278,7 @@ bool all_passed = true;
         // We could have filled Kokkos Views with memory space on the host
         // and used these instead, and then the copying of data to the device
         // would be performed in the GMLS class
+        Kokkos::resize(single_neighbor_lists_device, single_neighbor_lists.extent(0), single_neighbor_lists.extent(1));
         Kokkos::deep_copy(single_neighbor_lists_device, single_neighbor_lists);
         Kokkos::deep_copy(single_epsilon_device, single_epsilon);
         Kokkos::fence(); // let call to build neighbor lists complete before copying back to device
diff --git a/examples/GMLS_Staggered.cpp b/examples/GMLS_Staggered.cpp
index 7df5bf044..65c940660 100644
--- a/examples/GMLS_Staggered.cpp
+++ b/examples/GMLS_Staggered.cpp
@@ -194,11 +194,8 @@ bool all_passed = true;
     // the number of neighbors for that rows corresponding target site
     // for the default values in this test, the multiplier is suggested to be 2.2
     double epsilon_multiplier = 2.2;
-    int estimated_upper_bound_number_neighbors =
-        point_cloud_search.getEstimatedNumberNeighborsUpperBound(min_neighbors, dimension, epsilon_multiplier);
 
-    Kokkos::View<int**, Kokkos::DefaultExecutionSpace> neighbor_lists_device("neighbor lists",
-            number_target_coords, estimated_upper_bound_number_neighbors); // first column is # of neighbors
+    Kokkos::View<int**, Kokkos::DefaultExecutionSpace> neighbor_lists_device("neighbor lists", 0, 0);
     Kokkos::View<int**>::HostMirror neighbor_lists = Kokkos::create_mirror_view(neighbor_lists_device);
 
     // each target site has a window size
@@ -208,8 +205,8 @@ bool all_passed = true;
     // query the point cloud to generate the neighbor lists using a kdtree to produce the n nearest neighbor
     // to each target site, adding (epsilon_multiplier-1)*100% to whatever the distance away the further neighbor used is from
     // each target to the view for epsilon
-    point_cloud_search.generate2DNeighborListsFromKNNSearch(false /*not dry run*/, target_coords, neighbor_lists, 
-            epsilon, min_neighbors, epsilon_multiplier, 0.0 /* max search radius */, false);
+    point_cloud_search.generate2DNeighborListsFromKNNSearch(target_coords, neighbor_lists, 
+            epsilon, min_neighbors, epsilon_multiplier);
 
     //! [Performing Neighbor Search]
 
@@ -224,6 +221,7 @@ bool all_passed = true;
     // We could have filled Kokkos Views with memory space on the host
     // and used these instead, and then the copying of data to the device
     // would be performed in the GMLS class
+    Kokkos::resize(neighbor_lists_device, neighbor_lists.extent(0), neighbor_lists.extent(1));
     Kokkos::deep_copy(neighbor_lists_device, neighbor_lists);
     Kokkos::deep_copy(epsilon_device, epsilon);
 
diff --git a/examples/GMLS_Staggered_Manifold.cpp b/examples/GMLS_Staggered_Manifold.cpp
index 828960cde..885b9eb4c 100644
--- a/examples/GMLS_Staggered_Manifold.cpp
+++ b/examples/GMLS_Staggered_Manifold.cpp
@@ -184,11 +184,8 @@ Kokkos::initialize(argc, args);
     // each row is a neighbor list for a target site, with the first column of each row containing
     // the number of neighbors for that rows corresponding target site
     double epsilon_multiplier = 1.5;
-    int estimated_upper_bound_number_neighbors = 
-        point_cloud_search.getEstimatedNumberNeighborsUpperBound(min_neighbors, dimension, epsilon_multiplier);
 
-    Kokkos::View<int**, Kokkos::DefaultExecutionSpace> neighbor_lists_device("neighbor lists", 
-            number_target_coords, estimated_upper_bound_number_neighbors); // first column is # of neighbors
+    Kokkos::View<int**, Kokkos::DefaultExecutionSpace> neighbor_lists_device("neighbor lists", 0, 0);
     Kokkos::View<int**>::HostMirror neighbor_lists = Kokkos::create_mirror_view(neighbor_lists_device);
     
     // each target site has a window size
@@ -198,8 +195,8 @@ Kokkos::initialize(argc, args);
     // query the point cloud to generate the neighbor lists using a kdtree to produce the n nearest neighbor
     // to each target site, adding (epsilon_multiplier-1)*100% to whatever the distance away the further neighbor used is from
     // each target to the view for epsilon
-    point_cloud_search.generate2DNeighborListsFromKNNSearch(false /*not dry run*/, target_coords, neighbor_lists, 
-            epsilon, min_neighbors, epsilon_multiplier, 0.0 /* max search radius */, false);
+    point_cloud_search.generate2DNeighborListsFromKNNSearch(target_coords, neighbor_lists, 
+            epsilon, min_neighbors, epsilon_multiplier);
 
 
     //! [Performing Neighbor Search]
@@ -215,6 +212,7 @@ Kokkos::initialize(argc, args);
     // We could have filled Kokkos Views with memory space on the host
     // and used these instead, and then the copying of data to the device
     // would be performed in the GMLS class
+    Kokkos::resize(neighbor_lists_device, neighbor_lists.extent(0), neighbor_lists.extent(1));
     Kokkos::deep_copy(neighbor_lists_device, neighbor_lists);
     Kokkos::deep_copy(epsilon_device, epsilon);
     
diff --git a/examples/GMLS_Vector.cpp b/examples/GMLS_Vector.cpp
index 140b862fe..2a87dcb05 100644
--- a/examples/GMLS_Vector.cpp
+++ b/examples/GMLS_Vector.cpp
@@ -207,11 +207,8 @@ bool all_passed = true;
     // each row is a neighbor list for a target site, with the first column of each row containing
     // the number of neighbors for that rows corresponding target site
     double epsilon_multiplier = 1.5;
-    int estimated_upper_bound_number_neighbors = 
-        point_cloud_search.getEstimatedNumberNeighborsUpperBound(min_neighbors, dimension, epsilon_multiplier);
 
-    Kokkos::View<int**, Kokkos::DefaultExecutionSpace> neighbor_lists_device("neighbor lists", 
-            number_target_coords, estimated_upper_bound_number_neighbors); // first column is # of neighbors
+    Kokkos::View<int**, Kokkos::DefaultExecutionSpace> neighbor_lists_device("neighbor lists", 0, 0);
     Kokkos::View<int**>::HostMirror neighbor_lists = Kokkos::create_mirror_view(neighbor_lists_device);
     
     // each target site has a window size
@@ -221,8 +218,8 @@ bool all_passed = true;
     // query the point cloud to generate the neighbor lists using a kdtree to produce the n nearest neighbor
     // to each target site, adding (epsilon_multiplier-1)*100% to whatever the distance away the further neighbor used is from
     // each target to the view for epsilon
-    point_cloud_search.generate2DNeighborListsFromKNNSearch(false /*not dry run*/, target_coords, neighbor_lists, 
-            epsilon, min_neighbors, epsilon_multiplier, 0.0 /* max search radius */, false);
+    point_cloud_search.generate2DNeighborListsFromKNNSearch(target_coords, neighbor_lists, 
+            epsilon, min_neighbors, epsilon_multiplier);
     
     
     //! [Performing Neighbor Search]
@@ -238,6 +235,7 @@ bool all_passed = true;
     // We could have filled Kokkos Views with memory space on the host
     // and used these instead, and then the copying of data to the device
     // would be performed in the GMLS class
+    Kokkos::resize(neighbor_lists_device, neighbor_lists.extent(0), neighbor_lists.extent(1));
     Kokkos::deep_copy(neighbor_lists_device, neighbor_lists);
     Kokkos::deep_copy(epsilon_device, epsilon);
     
diff --git a/examples/NeighborSearchTest.cpp b/examples/NeighborSearchTest.cpp
index 3e5f5ea5c..f70758aae 100644
--- a/examples/NeighborSearchTest.cpp
+++ b/examples/NeighborSearchTest.cpp
@@ -198,17 +198,7 @@ bool all_passed = true;
             Kokkos::fence();
             
             // query the point cloud to generate the neighbor lists using a radius search
-
-            // start with a dry-run, but without enough room to store the results
-            size_t total_num_neighbors = point_cloud_search.generateCRNeighborListsFromRadiusSearch(true /* dry run */,
-                target_coords, neighbor_lists, number_neighbors_list, epsilon);
-            printf("total num neighbors: %lu\n", total_num_neighbors);
-
-            // resize neighbor lists to be large enough to hold the results
-            Kokkos::resize(neighbor_lists, total_num_neighbors);
-
-            // search again, now that we know that there is enough room to store the results
-            point_cloud_search.generateCRNeighborListsFromRadiusSearch(false /* dry run */,
+            point_cloud_search.generateCRNeighborListsFromRadiusSearch(
                 target_coords, neighbor_lists, number_neighbors_list, epsilon);
 
             auto nla(CreateNeighborLists(neighbor_lists, number_neighbors_list));
@@ -323,17 +313,7 @@ bool all_passed = true;
             Kokkos::fence();
             
             // query the point cloud to generate the neighbor lists using a radius search
-
-            // start with a dry-run, but without enough room to store the results
-            auto max_num_neighbors = point_cloud_search.generate2DNeighborListsFromRadiusSearch(true /* dry run */,
-                target_coords, neighbor_lists, epsilon);
-            printf("max num neighbors: %lu\n", max_num_neighbors);
-
-            // resize neighbor lists to be large enough to hold the results
-            Kokkos::resize(neighbor_lists, neighbor_lists.extent(0), 1+max_num_neighbors);
-
-            // search again, now that we know that there is enough room to store the results
-            max_num_neighbors = point_cloud_search.generate2DNeighborListsFromRadiusSearch(false /* dry run */,
+            point_cloud_search.generate2DNeighborListsFromRadiusSearch(
                 target_coords, neighbor_lists, epsilon);
 
             double radius_search_time = timer.seconds();
@@ -449,17 +429,7 @@ bool all_passed = true;
             Kokkos::fence();
             
             // query the point cloud to generate the neighbor lists using a radius search
-
-            // start with a dry-run, but without enough room to store the results
-            auto max_num_neighbors = point_cloud_search.generate2DNeighborListsFromRadiusSearch(true /* dry run */,
-                target_coords, neighbor_lists, epsilon);
-            printf("max num neighbors: %lu\n", max_num_neighbors);
-
-            // resize neighbor lists to be large enough to hold the results
-            Kokkos::resize(neighbor_lists, neighbor_lists.extent(0), 1+max_num_neighbors);
-
-            // search again, now that we know that there is enough room to store the results
-            max_num_neighbors = point_cloud_search.generate2DNeighborListsFromRadiusSearch(false /* dry run */,
+            point_cloud_search.generate2DNeighborListsFromRadiusSearch(
                 target_coords, neighbor_lists, epsilon);
 
             auto nla = Convert2DToCompressedRowNeighborLists(neighbor_lists);
@@ -575,18 +545,9 @@ bool all_passed = true;
             Kokkos::View<double*, Kokkos::DefaultHostExecutionSpace> epsilon("h supports", number_target_coords);
             
             // query the point cloud to generate the neighbor lists using a KNN search
-
-            // start with a dry-run, but without enough room to store the results
-            auto total_num_neighbors = point_cloud_search.generateCRNeighborListsFromKNNSearch(true /* dry-run for sizes */,
-                    target_coords, neighbor_lists, number_neighbors_list, epsilon, min_neighbors, 1.5 /* cutoff_multiplier */);
-            printf("total num neighbors: %lu\n", total_num_neighbors);
-
-            // resize with room to store results
-            Kokkos::resize(neighbor_lists, total_num_neighbors);
-
-            // real knn search with space to store
-            point_cloud_search.generateCRNeighborListsFromKNNSearch(false /*not dry run*/, 
-                    target_coords, neighbor_lists, number_neighbors_list, epsilon, min_neighbors, 1.5 /* cutoff_multiplier */);
+            point_cloud_search.generateCRNeighborListsFromKNNSearch(
+                    target_coords, neighbor_lists, number_neighbors_list, 
+                    epsilon, min_neighbors, 1.5 /* cutoff_multiplier */);
 
             auto nla(CreateNeighborLists(neighbor_lists, number_neighbors_list));
 
@@ -679,17 +640,9 @@ bool all_passed = true;
             Kokkos::View<double*, Kokkos::DefaultHostExecutionSpace> epsilon("h supports", number_target_coords);
             
             // query the point cloud to generate the neighbor lists using a KNN search
-            // start with a dry-run, but without enough room to store the results
-            auto max_num_neighbors = point_cloud_search.generate2DNeighborListsFromKNNSearch(true /* dry-run for sizes */,
-                    target_coords, neighbor_lists, epsilon, min_neighbors, 1.5 /* cutoff_multiplier */);
-            printf("max num neighbors: %lu\n", max_num_neighbors);
-
-            // resize with room to store results
-            Kokkos::resize(neighbor_lists, neighbor_lists.extent(0), 1+max_num_neighbors);
-
-            // real knn search with space to store
-            max_num_neighbors = point_cloud_search.generate2DNeighborListsFromKNNSearch(false /*not dry run*/, 
-                    target_coords, neighbor_lists, epsilon, min_neighbors, 1.5 /* cutoff_multiplier */);
+            point_cloud_search.generate2DNeighborListsFromKNNSearch(
+                    target_coords, neighbor_lists, epsilon, 
+                    min_neighbors, 1.5 /* cutoff_multiplier */);
 
             // convert point cloud search to vector of maps
             timer.reset();
@@ -780,17 +733,9 @@ bool all_passed = true;
             Kokkos::View<double*, Kokkos::DefaultHostExecutionSpace> epsilon("h supports", number_target_coords);
             
             // query the point cloud to generate the neighbor lists using a KNN search
-            // start with a dry-run, but without enough room to store the results
-            auto max_num_neighbors = point_cloud_search.generate2DNeighborListsFromKNNSearch(true /* dry-run for sizes */,
-                    target_coords, neighbor_lists, epsilon, min_neighbors, 1.5 /* cutoff_multiplier */);
-            printf("max num neighbors: %lu\n", max_num_neighbors);
-
-            // resize with room to store results
-            Kokkos::resize(neighbor_lists, neighbor_lists.extent(0), 1+max_num_neighbors);
-
-            // real knn search with space to store
-            max_num_neighbors = point_cloud_search.generate2DNeighborListsFromKNNSearch(false /*not dry run*/, 
-                    target_coords, neighbor_lists, epsilon, min_neighbors, 1.5 /* cutoff_multiplier */);
+            point_cloud_search.generate2DNeighborListsFromKNNSearch(
+                    target_coords, neighbor_lists, epsilon, 
+                    min_neighbors, 1.5 /* cutoff_multiplier */);
 
             auto nla = Convert2DToCompressedRowNeighborLists(neighbor_lists);
 
diff --git a/examples/unittests/test_PointCloudSearch.hpp b/examples/unittests/test_PointCloudSearch.hpp
index 25d6dfb40..189120655 100644
--- a/examples/unittests/test_PointCloudSearch.hpp
+++ b/examples/unittests/test_PointCloudSearch.hpp
@@ -79,16 +79,7 @@ TEST_F (PointCloudSearchTest, 1D_Radius_Search) {
     Kokkos::View<double*, host_execution_space> epsilon("h supports", 
             number_target_coords);
 
-    // This dry run populates number_of_neighbors_list with neighborhood sizes
-    size_t storage_size = 
-            point_cloud_search.generateCRNeighborListsFromRadiusSearch(true /* dry run */,
-                    target_coords, neighbor_lists, number_of_neighbors_list, epsilon, 0.2 /*radius*/);
-
-    // Resize based on dry-run
-    Kokkos::resize(neighbor_lists, storage_size);
-
-    // Search again, now that we know that there is enough room to store the results
-    point_cloud_search.generateCRNeighborListsFromRadiusSearch(false /* dry run */,
+    point_cloud_search.generateCRNeighborListsFromRadiusSearch(
             target_coords, neighbor_lists, number_of_neighbors_list, epsilon, 0.2 /*radius*/);
 
     auto nla(CreateNeighborLists(neighbor_lists, number_of_neighbors_list));
@@ -121,18 +112,8 @@ TEST_F (PointCloudSearchTest, 1D_Dynamic_Search) {
             number_target_coords);
 
     double epsilon_multiplier = 1.5;
-    // This dry run populates number_of_neighbors_list with neighborhood sizes
-    size_t storage_size = 
-            point_cloud_search.generateCRNeighborListsFromKNNSearch(true /*dry run*/, 
-                    target_coords, neighbor_lists, 
-                    number_of_neighbors_list, epsilon, 
-                    3 /*min_neighbors*/, epsilon_multiplier);
-
-    // Resize based on dry-run
-    Kokkos::resize(neighbor_lists, storage_size);
 
-    // Search again, now that we know that there is enough room to store the results
-    point_cloud_search.generateCRNeighborListsFromKNNSearch(false /*dry run*/, 
+    point_cloud_search.generateCRNeighborListsFromKNNSearch(
                     target_coords, neighbor_lists, 
                     number_of_neighbors_list, epsilon, 
                     3 /*min_neighbors*/, epsilon_multiplier);
diff --git a/pycompadre/pycompadre.cpp b/pycompadre/pycompadre.cpp
index d2fbfb013..0e5b1c667 100644
--- a/pycompadre/pycompadre.cpp
+++ b/pycompadre/pycompadre.cpp
@@ -403,13 +403,7 @@ class ParticleHelper {
             epsilon_multiplier = 1.0+1e-14;
         }
 
-        size_t total_storage = point_cloud_search->generateCRNeighborListsFromKNNSearch(true /* is a dry run*/, target_coords, neighbor_lists, 
-                number_of_neighbors_list, epsilon, neighbors_needed, epsilon_multiplier, max_search_radius);
-
-        Kokkos::resize(neighbor_lists, total_storage);
-        Kokkos::fence();
-
-        total_storage = point_cloud_search->generateCRNeighborListsFromKNNSearch(false /* not a dry run*/, target_coords, neighbor_lists, 
+        point_cloud_search->generateCRNeighborListsFromKNNSearch(target_coords, neighbor_lists, 
                 number_of_neighbors_list, epsilon, neighbors_needed, epsilon_multiplier, max_search_radius);
         Kokkos::fence();
 
diff --git a/src/Compadre_PointCloudSearch_ArborX.hpp b/src/Compadre_PointCloudSearch_ArborX.hpp
index 67e64e255..d04c96384 100644
--- a/src/Compadre_PointCloudSearch_ArborX.hpp
+++ b/src/Compadre_PointCloudSearch_ArborX.hpp
@@ -164,22 +164,15 @@ struct ArborX::AccessTraits<NearestNeighbor<view_type_1>, ArborX::PredicatesTag>
 
 namespace Compadre {
 
-//!  PointCloudSearch generates neighbor lists and window sizes for each target site
+//!  PointCloudSearch generates neighbor lists and window sizes for each target site, using ArborX
 /*!
-*  Search methods can be run in dry-run mode, or not.
 *
-*  #### When in dry-run mode:
-*                                                                                                                         
-*    `neighbors_list` will be populated with number of neighbors found for each target site.
-*
-*    This allows a user to know memory allocation needed before storage of neighbor indices.
-*                                                                                                                         
-*  #### When not in dry-run mode:
-*
-*    `neighbors_list_offsets` will be populated with offsets for values (dependent on method) determined by neighbor_list.
 *    If a 2D view for `neighbors_list` is used, then \f$ N(i,j+1) \f$ will store the \f$ j^{th} \f$ neighbor of \f$ i \f$,
 *    and \f$ N(i,0) \f$ will store the number of neighbors for target \f$ i \f$.
 *
+*    Otherwise, a compressed row representation will be stored in neighbor_lists and the number of
+*    neighbors for each target site will be stored in number_of_neighbors_list.
+*
 */
 template <typename view_type>
 class PointCloudSearch {
@@ -211,15 +204,6 @@ class PointCloudSearch {
     
         ~PointCloudSearch() {};
 
-        //! Returns a liberal estimated upper bound on number of neighbors to be returned by a neighbor search
-        //! for a given choice of dimension, basis size, and epsilon_multiplier. Assumes quasiuniform distribution
-        //! of points. This result can be used to size a preallocated neighbor_lists kokkos view.
-        static inline int getEstimatedNumberNeighborsUpperBound(int unisolvency_size, const int dimension, const double epsilon_multiplier) {
-            int multiplier = 1;
-            if (dimension==1) multiplier = 2;
-            return multiplier * 2.0 * unisolvency_size * std::pow(epsilon_multiplier, dimension) + 1; // +1 is for the number of neighbors entry needed in the first entry of each row
-        }
-
         //! Returns the distance between a point and a source site, given its index
         inline search_scalar kdtreeDistance(const double* queryPt, const int idx) const {
             search_scalar distance = 0;
@@ -236,18 +220,19 @@ class PointCloudSearch {
             where the radius to be searched is in the epsilons view.
             If uniform_radius is given, then this overrides the epsilons view radii sizes.
             Accepts 2D neighbor_lists without number_of_neighbors_list.
-            \param is_dry_run               [in] - whether to do a dry-run (find neighbors, but don't store)
             \param trg_pts_view             [in] - target coordinates from which to seek neighbors
             \param neighbor_lists           [out] - 2D view of neighbor lists to be populated from search
             \param epsilons                 [in/out] - radius to search, overwritten if uniform_radius != 0
             \param uniform_radius           [in] - double != 0 determines whether to overwrite all epsilons for uniform search
             \param max_search_radius        [in] - largest valid search (useful only for MPI jobs if halo size exists)
+            \param check_same               [in] - ignored (to match nanoflann)
+            \param do_dry_run               [in] - ignored (to match nanoflann)
         */
         template <typename trg_view_type, typename neighbor_lists_view_type, typename epsilons_view_type>
-        size_t generate2DNeighborListsFromRadiusSearch(bool is_dry_run, trg_view_type trg_pts_view, 
+        size_t generate2DNeighborListsFromRadiusSearch(trg_view_type trg_pts_view, 
                 neighbor_lists_view_type& neighbor_lists, epsilons_view_type& epsilons, 
                 const double uniform_radius = 0.0, double max_search_radius = 0.0,
-                bool check_same = true) {
+                bool check_same = true, bool do_dry_run = true) {
 
             const int num_target_sites = trg_pts_view.extent(0);
  
@@ -264,9 +249,9 @@ class PointCloudSearch {
             Kokkos::View<value_type*, typename neighbor_lists_view_type::memory_space> 
                 number_of_neighbors_list("number of neighbors list", num_target_sites);
 
-            generateCRNeighborListsFromRadiusSearch(is_dry_run, trg_pts_view,
+            generateCRNeighborListsFromRadiusSearch(trg_pts_view,
                 cr_neighbor_lists, number_of_neighbors_list, epsilons, uniform_radius, 
-                max_search_radius, check_same);
+                max_search_radius, check_same, do_dry_run);
 
             auto nla = CreateNeighborLists(cr_neighbor_lists, number_of_neighbors_list);
             size_t max_num_neighbors = nla.getMaxNumNeighbors();
@@ -279,19 +264,20 @@ class PointCloudSearch {
             where the radius to be searched is in the epsilons view.
             If uniform_radius is given, then this overrides the epsilons view radii sizes.
             Accepts 1D neighbor_lists with 1D number_of_neighbors_list.
-            \param is_dry_run               [in] - whether to do a dry-run (find neighbors, but don't store)
             \param trg_pts_view             [in] - target coordinates from which to seek neighbors
             \param neighbor_lists           [out] - 1D view of neighbor lists to be populated from search
             \param number_of_neighbors_list [in/out] - number of neighbors for each target site
             \param epsilons                 [in/out] - radius to search, overwritten if uniform_radius != 0
             \param uniform_radius           [in] - double != 0 determines whether to overwrite all epsilons for uniform search
             \param max_search_radius        [in] - largest valid search (useful only for MPI jobs if halo size exists)
+            \param check_same               [in] - ignored (to match nanoflann)
+            \param do_dry_run               [in] - ignored (to match nanoflann)
         */
         template <typename trg_view_type, typename neighbor_lists_view_type, typename epsilons_view_type>
-        size_t generateCRNeighborListsFromRadiusSearch(bool is_dry_run, trg_view_type trg_pts_view, 
+        size_t generateCRNeighborListsFromRadiusSearch(trg_view_type trg_pts_view, 
                 neighbor_lists_view_type& neighbor_lists, neighbor_lists_view_type& number_of_neighbors_list, 
                 epsilons_view_type& epsilons, const double uniform_radius = 0.0, 
-                double max_search_radius = 0.0, bool check_same = true) {
+                double max_search_radius = 0.0, bool check_same = true, bool do_dry_run = true) {
 
             // function does not populate epsilons, they must be prepopulated
 
@@ -393,19 +379,20 @@ class PointCloudSearch {
 
         /*! \brief Generates neighbor lists as 2D view by performing a k-nearest neighbor search
             Only accepts 2D neighbor_lists without number_of_neighbors_list.
-            \param is_dry_run               [in] - whether to do a dry-run (find neighbors, but don't store)
             \param trg_pts_view             [in] - target coordinates from which to seek neighbors
             \param neighbor_lists           [out] - 2D view of neighbor lists to be populated from search
             \param epsilons                 [in/out] - radius to search, overwritten if uniform_radius != 0
             \param neighbors_needed         [in] - k neighbors needed as a minimum
             \param epsilon_multiplier       [in] - distance to kth neighbor multiplied by epsilon_multiplier for follow-on radius search
             \param max_search_radius        [in] - largest valid search (useful only for MPI jobs if halo size exists)
+            \param check_same               [in] - ignored (to match nanoflann)
+            \param do_dry_run               [in] - ignored (to match nanoflann)
         */
         template <typename trg_view_type, typename neighbor_lists_view_type, typename epsilons_view_type>
-        size_t generate2DNeighborListsFromKNNSearch(bool is_dry_run, trg_view_type trg_pts_view, 
+        size_t generate2DNeighborListsFromKNNSearch(trg_view_type trg_pts_view, 
                 neighbor_lists_view_type& neighbor_lists, epsilons_view_type& epsilons, 
                 const int neighbors_needed, const double epsilon_multiplier = 1.6, 
-                double max_search_radius = 0.0, bool check_same = true) {
+                double max_search_radius = 0.0, bool check_same = true, bool do_dry_run = true) {
 
             const int num_target_sites = trg_pts_view.extent(0);
  
@@ -422,11 +409,10 @@ class PointCloudSearch {
             Kokkos::View<value_type*, typename neighbor_lists_view_type::memory_space> 
                 number_of_neighbors_list("number of neighbors list", num_target_sites);
 
-            // doesn't fill number_of_neighbors_list when !is_dry_run
-            generateCRNeighborListsFromKNNSearch(is_dry_run, trg_pts_view,
+            generateCRNeighborListsFromKNNSearch(trg_pts_view,
                 cr_neighbor_lists, number_of_neighbors_list, epsilons, 
                 neighbors_needed, epsilon_multiplier, max_search_radius,
-                check_same);
+                check_same, do_dry_run);
 
             auto nla = CreateNeighborLists(cr_neighbor_lists, number_of_neighbors_list);
             size_t max_num_neighbors = nla.getMaxNumNeighbors();
@@ -437,7 +423,6 @@ class PointCloudSearch {
 
         /*! \brief Generates compressed row neighbor lists by performing a k-nearest neighbor search
             Only accepts 1D neighbor_lists with 1D number_of_neighbors_list.
-            \param is_dry_run               [in] - whether to do a dry-run (find neighbors, but don't store)
             \param trg_pts_view             [in] - target coordinates from which to seek neighbors
             \param neighbor_lists           [out] - 1D view of neighbor lists to be populated from search
             \param number_of_neighbors_list [in/out] - number of neighbors for each target site
@@ -445,12 +430,14 @@ class PointCloudSearch {
             \param neighbors_needed         [in] - k neighbors needed as a minimum
             \param epsilon_multiplier       [in] - distance to kth neighbor multiplied by epsilon_multiplier for follow-on radius search
             \param max_search_radius        [in] - largest valid search (useful only for MPI jobs if halo size exists)
+            \param check_same               [in] - ignored (to match nanoflann)
+            \param do_dry_run               [in] - ignored (to match nanoflann)
         */
         template <typename trg_view_type, typename neighbor_lists_view_type, typename epsilons_view_type>
-        size_t generateCRNeighborListsFromKNNSearch(bool is_dry_run, trg_view_type trg_pts_view, 
+        size_t generateCRNeighborListsFromKNNSearch(trg_view_type trg_pts_view, 
                 neighbor_lists_view_type& neighbor_lists, neighbor_lists_view_type& number_of_neighbors_list,
                 epsilons_view_type& epsilons, const int neighbors_needed, const double epsilon_multiplier = 1.6, 
-                double max_search_radius = 0.0, bool check_same = true) {
+                double max_search_radius = 0.0, bool check_same = true, bool do_dry_run = true) {
 
             // First, do a knn search (removes need for guessing initial search radius)
 
@@ -539,9 +526,9 @@ class PointCloudSearch {
                     && "Neighbor search failed to find number of neighbors needed for unisolvency.");
             
             // call a radius search using values now stored in epsilons
-            generateCRNeighborListsFromRadiusSearch(is_dry_run, trg_pts_view, neighbor_lists, 
+            generateCRNeighborListsFromRadiusSearch(trg_pts_view, neighbor_lists, 
                     number_of_neighbors_list, epsilons, 0.0 /*don't set uniform radius*/, 
-                    max_search_radius, check_same);
+                    max_search_radius, check_same, do_dry_run);
 
             auto nla = CreateNeighborLists(number_of_neighbors_list);
             return nla.getTotalNeighborsOverAllListsHost();

From 8517bfbbadf410e7997f60e8b1299151e5875001 Mon Sep 17 00:00:00 2001
From: Paul Kuberry <pakuber@sandia.gov>
Date: Fri, 1 Oct 2021 14:33:34 -0600
Subject: [PATCH 27/40] Converted Nanoflann search to recursively call itself -
 Switches itself from dry-run to storing results (with resizing)   all through
 a single call - Changed size_t returns from search methods to void

---
 examples/GMLS_Device.cpp                    |   9 +-
 src/Compadre_PointCloudSearch_ArborX.hpp    |  18 +-
 src/Compadre_PointCloudSearch_Nanoflann.hpp | 198 +++++++++++---------
 3 files changed, 115 insertions(+), 110 deletions(-)

diff --git a/examples/GMLS_Device.cpp b/examples/GMLS_Device.cpp
index 6795feca5..81c3d5f58 100644
--- a/examples/GMLS_Device.cpp
+++ b/examples/GMLS_Device.cpp
@@ -200,15 +200,12 @@ bool all_passed = true;
     double epsilon_multiplier = 1.4;
 
     // neighbor_lists_device will contain all neighbor lists (for each target site) in a compressed row format
-    // Initially, we do a dry-run to calculate neighborhood sizes before actually storing the result. This is 
-    // why we can start with a neighbor_lists_device size of 0.
-    Kokkos::View<int*> neighbor_lists_device("neighbor lists", 
-            0); // first column is # of neighbors
+    Kokkos::View<int*> neighbor_lists_device("neighbor lists", 0); 
     Kokkos::View<int*>::HostMirror neighbor_lists = Kokkos::create_mirror_view(neighbor_lists_device);
+
     // number_of_neighbors_list must be the same size as the number of target sites so that it can be populated
     // with the number of neighbors for each target site.
-    Kokkos::View<int*> number_of_neighbors_list_device("number of neighbor lists", 
-            number_target_coords); // first column is # of neighbors
+    Kokkos::View<int*> number_of_neighbors_list_device("number of neighbor lists", number_target_coords);
     Kokkos::View<int*>::HostMirror number_of_neighbors_list = Kokkos::create_mirror_view(number_of_neighbors_list_device);
     
     // each target site has a window size
diff --git a/src/Compadre_PointCloudSearch_ArborX.hpp b/src/Compadre_PointCloudSearch_ArborX.hpp
index d04c96384..e066855c3 100644
--- a/src/Compadre_PointCloudSearch_ArborX.hpp
+++ b/src/Compadre_PointCloudSearch_ArborX.hpp
@@ -229,7 +229,7 @@ class PointCloudSearch {
             \param do_dry_run               [in] - ignored (to match nanoflann)
         */
         template <typename trg_view_type, typename neighbor_lists_view_type, typename epsilons_view_type>
-        size_t generate2DNeighborListsFromRadiusSearch(trg_view_type trg_pts_view, 
+        void generate2DNeighborListsFromRadiusSearch(trg_view_type trg_pts_view, 
                 neighbor_lists_view_type& neighbor_lists, epsilons_view_type& epsilons, 
                 const double uniform_radius = 0.0, double max_search_radius = 0.0,
                 bool check_same = true, bool do_dry_run = true) {
@@ -256,8 +256,6 @@ class PointCloudSearch {
             auto nla = CreateNeighborLists(cr_neighbor_lists, number_of_neighbors_list);
             size_t max_num_neighbors = nla.getMaxNumNeighbors();
             ConvertCompressedRowNeighborListsTo2D(nla, neighbor_lists);
-            
-            return max_num_neighbors;
         }
 
         /*! \brief Generates compressed row neighbor lists by performing a radius search 
@@ -274,7 +272,7 @@ class PointCloudSearch {
             \param do_dry_run               [in] - ignored (to match nanoflann)
         */
         template <typename trg_view_type, typename neighbor_lists_view_type, typename epsilons_view_type>
-        size_t generateCRNeighborListsFromRadiusSearch(trg_view_type trg_pts_view, 
+        void generateCRNeighborListsFromRadiusSearch(trg_view_type trg_pts_view, 
                 neighbor_lists_view_type& neighbor_lists, neighbor_lists_view_type& number_of_neighbors_list, 
                 epsilons_view_type& epsilons, const double uniform_radius = 0.0, 
                 double max_search_radius = 0.0, bool check_same = true, bool do_dry_run = true) {
@@ -371,9 +369,6 @@ class PointCloudSearch {
             }
             Kokkos::deep_copy(neighbor_lists, values);
             Kokkos::fence();
-
-            auto nla = CreateNeighborLists(number_of_neighbors_list);
-            return nla.getTotalNeighborsOverAllListsHost();
         }
 
 
@@ -389,7 +384,7 @@ class PointCloudSearch {
             \param do_dry_run               [in] - ignored (to match nanoflann)
         */
         template <typename trg_view_type, typename neighbor_lists_view_type, typename epsilons_view_type>
-        size_t generate2DNeighborListsFromKNNSearch(trg_view_type trg_pts_view, 
+        void generate2DNeighborListsFromKNNSearch(trg_view_type trg_pts_view, 
                 neighbor_lists_view_type& neighbor_lists, epsilons_view_type& epsilons, 
                 const int neighbors_needed, const double epsilon_multiplier = 1.6, 
                 double max_search_radius = 0.0, bool check_same = true, bool do_dry_run = true) {
@@ -417,8 +412,6 @@ class PointCloudSearch {
             auto nla = CreateNeighborLists(cr_neighbor_lists, number_of_neighbors_list);
             size_t max_num_neighbors = nla.getMaxNumNeighbors();
             ConvertCompressedRowNeighborListsTo2D(nla, neighbor_lists);
-
-            return max_num_neighbors;
         }
 
         /*! \brief Generates compressed row neighbor lists by performing a k-nearest neighbor search
@@ -434,7 +427,7 @@ class PointCloudSearch {
             \param do_dry_run               [in] - ignored (to match nanoflann)
         */
         template <typename trg_view_type, typename neighbor_lists_view_type, typename epsilons_view_type>
-        size_t generateCRNeighborListsFromKNNSearch(trg_view_type trg_pts_view, 
+        void generateCRNeighborListsFromKNNSearch(trg_view_type trg_pts_view, 
                 neighbor_lists_view_type& neighbor_lists, neighbor_lists_view_type& number_of_neighbors_list,
                 epsilons_view_type& epsilons, const int neighbors_needed, const double epsilon_multiplier = 1.6, 
                 double max_search_radius = 0.0, bool check_same = true, bool do_dry_run = true) {
@@ -529,9 +522,6 @@ class PointCloudSearch {
             generateCRNeighborListsFromRadiusSearch(trg_pts_view, neighbor_lists, 
                     number_of_neighbors_list, epsilons, 0.0 /*don't set uniform radius*/, 
                     max_search_radius, check_same, do_dry_run);
-
-            auto nla = CreateNeighborLists(number_of_neighbors_list);
-            return nla.getTotalNeighborsOverAllListsHost();
         }
 }; // ArborX's PointCloudSearch
 
diff --git a/src/Compadre_PointCloudSearch_Nanoflann.hpp b/src/Compadre_PointCloudSearch_Nanoflann.hpp
index 15eeddb75..c9fa251d5 100644
--- a/src/Compadre_PointCloudSearch_Nanoflann.hpp
+++ b/src/Compadre_PointCloudSearch_Nanoflann.hpp
@@ -113,9 +113,9 @@ class RadiusResultSet {
 };
 
 
-//!  PointCloudSearch generates neighbor lists and window sizes for each target site
+//!  PointCloudSearch generates neighbor lists and window sizes for each target site, using Nanoflann
 /*!
-*  Search methods can be run in dry-run mode, or not.
+*  Search methods will recursively be called, first in dry-run mode, then the actual search.
 *
 *  #### When in dry-run mode:
 *                                                                                                                         
@@ -125,10 +125,12 @@ class RadiusResultSet {
 *                                                                                                                         
 *  #### When not in dry-run mode:
 *
-*    `neighbors_list_offsets` will be populated with offsets for values (dependent on method) determined by neighbor_list.
 *    If a 2D view for `neighbors_list` is used, then \f$ N(i,j+1) \f$ will store the \f$ j^{th} \f$ neighbor of \f$ i \f$,
 *    and \f$ N(i,0) \f$ will store the number of neighbors for target \f$ i \f$.
 *
+*    Otherwise, a compressed row representation will be stored in neighbor_lists and the number of
+*    neighbors for each target site will be stored in number_of_neighbors_list.
+*
 */
 template <typename view_type>
 class PointCloudSearch {
@@ -165,15 +167,6 @@ class PointCloudSearch {
         };
     
         ~PointCloudSearch() {};
-
-        //! Returns a liberal estimated upper bound on number of neighbors to be returned by a neighbor search
-        //! for a given choice of dimension, basis size, and epsilon_multiplier. Assumes quasiuniform distribution
-        //! of points. This result can be used to size a preallocated neighbor_lists kokkos view.
-        static inline int getEstimatedNumberNeighborsUpperBound(int unisolvency_size, const int dimension, const double epsilon_multiplier) {
-            int multiplier = 1;
-            if (dimension==1) multiplier = 2;
-            return multiplier * 2.0 * unisolvency_size * std::pow(epsilon_multiplier, dimension) + 1; // +1 is for the number of neighbors entry needed in the first entry of each row
-        }
     
         //! Bounding box query method required by Nanoflann.
         template <class BBOX> bool kdtree_get_bbox(BBOX& bb) const {return false;}
@@ -212,18 +205,19 @@ class PointCloudSearch {
             where the radius to be searched is in the epsilons view.
             If uniform_radius is given, then this overrides the epsilons view radii sizes.
             Accepts 2D neighbor_lists without number_of_neighbors_list.
-            \param is_dry_run               [in] - whether to do a dry-run (find neighbors, but don't store)
             \param trg_pts_view             [in] - target coordinates from which to seek neighbors
             \param neighbor_lists           [out] - 2D view of neighbor lists to be populated from search
             \param epsilons                 [in/out] - radius to search, overwritten if uniform_radius != 0
             \param uniform_radius           [in] - double != 0 determines whether to overwrite all epsilons for uniform search
             \param max_search_radius        [in] - largest valid search (useful only for MPI jobs if halo size exists)
+            \param check_same               [in] - check if results during real search are same as dry-run
+            \param do_dry_run               [in] - (for use as state in recursive calls, do not change from default)
         */
         template <typename trg_view_type, typename neighbor_lists_view_type, typename epsilons_view_type>
-        size_t generate2DNeighborListsFromRadiusSearch(bool is_dry_run, trg_view_type trg_pts_view, 
-                neighbor_lists_view_type neighbor_lists, epsilons_view_type epsilons, 
+        void generate2DNeighborListsFromRadiusSearch(trg_view_type trg_pts_view, 
+                neighbor_lists_view_type& neighbor_lists, epsilons_view_type& epsilons, 
                 const double uniform_radius = 0.0, double max_search_radius = 0.0,
-                bool check_same = true) {
+                bool check_same = true, bool do_dry_run = true) {
 
             // function does not populate epsilons, they must be prepopulated
 
@@ -245,13 +239,12 @@ class PointCloudSearch {
             }
 
             // check neighbor lists and epsilons view sizes
-            compadre_assert_release((neighbor_lists.extent(0)==(size_t)num_target_sites 
-                        && neighbor_lists.extent(1)>=1)
-                        && "neighbor lists View does not have large enough dimensions");
             compadre_assert_release((neighbor_lists_view_type::rank==2) && "neighbor_lists must be a 2D Kokkos view.");
-
-            compadre_assert_release((epsilons.extent(0)==(size_t)num_target_sites)
-                        && "epsilons View does not have the correct dimension");
+            if (epsilons.extent(0)!=(size_t)num_target_sites) {
+                compadre_assert_release((do_dry_run) 
+                            && "epsilons is wrong dimension");
+                Kokkos::resize(epsilons, num_target_sites);
+            }
 
             typedef Kokkos::View<double*, Kokkos::HostSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> > 
                     scratch_double_view;
@@ -260,9 +253,10 @@ class PointCloudSearch {
                     scratch_int_view;
 
             // determine scratch space size needed
+            int storage_size = (neighbor_lists.extent(1) > 2) ? neighbor_lists.extent(1) : 2;
             int team_scratch_size = 0;
-            team_scratch_size += scratch_double_view::shmem_size(neighbor_lists.extent(1)); // distances
-            team_scratch_size += scratch_int_view::shmem_size(neighbor_lists.extent(1)); // indices
+            team_scratch_size += scratch_double_view::shmem_size(storage_size); // distances
+            team_scratch_size += scratch_int_view::shmem_size(storage_size); // indices
             team_scratch_size += scratch_double_view::shmem_size(_dim); // target coordinate
 
             // maximum number of neighbors found over all target sites' neighborhoods
@@ -274,8 +268,8 @@ class PointCloudSearch {
                     KOKKOS_LAMBDA(const host_member_type& teamMember, size_t& t_max_num_neighbors) {
 
                 // make unmanaged scratch views
-                scratch_double_view neighbor_distances(teamMember.team_scratch(0 /*shared memory*/), neighbor_lists.extent(1));
-                scratch_int_view neighbor_indices(teamMember.team_scratch(0 /*shared memory*/), neighbor_lists.extent(1));
+                scratch_double_view neighbor_distances(teamMember.team_scratch(0 /*shared memory*/), storage_size);
+                scratch_int_view neighbor_indices(teamMember.team_scratch(0 /*shared memory*/), storage_size);
                 scratch_double_view this_target_coord(teamMember.team_scratch(0 /*shared memory*/), _dim);
 
                 size_t neighbors_found = 0;
@@ -288,7 +282,7 @@ class PointCloudSearch {
                 // needs furthest neighbor's distance for next portion
                 compadre_kernel_assert_release((epsilons(i)<=max_search_radius || max_search_radius==0) && "max_search_radius given (generally derived from the size of a halo region), and search radius needed would exceed this max_search_radius.");
 
-                Kokkos::parallel_for(Kokkos::TeamThreadRange(teamMember, neighbor_lists.extent(1)), [&](const int j) { 
+                Kokkos::parallel_for(Kokkos::TeamThreadRange(teamMember, storage_size), [&](const int j) { 
                     neighbor_indices(j) = 0;
                     neighbor_distances(j) = -1.0;
                 });
@@ -303,7 +297,7 @@ class PointCloudSearch {
                     }
 
                     nanoflann::SearchParams sp; // default parameters
-                    Compadre::RadiusResultSet<double> rrs(epsilons(i)*epsilons(i), neighbor_distances.data(), neighbor_indices.data(), neighbor_lists.extent(1));
+                    Compadre::RadiusResultSet<double> rrs(epsilons(i)*epsilons(i), neighbor_distances.data(), neighbor_indices.data(), storage_size);
                     if (_dim==1) {
                         neighbors_found = _tree_1d->template radiusSearchCustomCallback<Compadre::RadiusResultSet<double> >(this_target_coord.data(), rrs, sp) ;
                     } else if (_dim==2) {
@@ -315,7 +309,7 @@ class PointCloudSearch {
                     t_max_num_neighbors = (neighbors_found > t_max_num_neighbors) ? neighbors_found : t_max_num_neighbors;
             
                     // the number of neighbors is stored in column zero of the neighbor lists 2D array
-                    if (!is_dry_run && check_same) {
+                    if (!do_dry_run && check_same) {
                         compadre_kernel_assert_debug((neighbors_found==(size_t)neighbor_lists(i,0)) 
                                 && "Number of neighbors found changed since dry-run.");
                     }
@@ -326,9 +320,9 @@ class PointCloudSearch {
                 teamMember.team_barrier();
 
                 // loop_bound so that we don't write into memory we don't have allocated
-                int loop_bound = (neighbors_found < neighbor_lists.extent(1)-1) ? neighbors_found : neighbor_lists.extent(1)-1;
+                int loop_bound = (neighbors_found < storage_size-1) ? neighbors_found : storage_size-1;
                 // loop over each neighbor index and fill with a value
-                if (!is_dry_run) {
+                if (!do_dry_run) {
                     Kokkos::parallel_for(Kokkos::TeamThreadRange(teamMember, loop_bound), [&](const int j) {
                         // cast to an whatever data type the 2D array of neighbor lists is using
                         neighbor_lists(i,j+1) = static_cast<typename std::remove_pointer<typename std::remove_pointer<typename neighbor_lists_view_type::data_type>::type>::type>(neighbor_indices(j));
@@ -340,29 +334,38 @@ class PointCloudSearch {
             Kokkos::fence();
 
             // check if max_num_neighbors will fit onto pre-allocated space
-            compadre_assert_release((neighbor_lists.extent(1) >= (max_num_neighbors+1) || is_dry_run) 
+            compadre_assert_release((neighbor_lists.extent(1) >= (max_num_neighbors+1) || do_dry_run) 
                     && "neighbor_lists does not contain enough columns for the maximum number of neighbors needing to be stored.");
 
-            return max_num_neighbors;
+            if (do_dry_run) {
+                if (neighbor_lists.extent_int(0)<num_target_sites || neighbor_lists.extent_int(1)<max_num_neighbors+1) {
+                    Kokkos::resize(neighbor_lists, num_target_sites, max_num_neighbors+1);
+                }
+                generate2DNeighborListsFromRadiusSearch(
+                    trg_pts_view, neighbor_lists, epsilons, 
+                    uniform_radius, max_search_radius,
+                    check_same, false /*do_dry_run*/);
+            }
         }
 
         /*! \brief Generates compressed row neighbor lists by performing a radius search 
             where the radius to be searched is in the epsilons view.
             If uniform_radius is given, then this overrides the epsilons view radii sizes.
             Accepts 1D neighbor_lists with 1D number_of_neighbors_list.
-            \param is_dry_run               [in] - whether to do a dry-run (find neighbors, but don't store)
             \param trg_pts_view             [in] - target coordinates from which to seek neighbors
             \param neighbor_lists           [out] - 1D view of neighbor lists to be populated from search
             \param number_of_neighbors_list [in/out] - number of neighbors for each target site
             \param epsilons                 [in/out] - radius to search, overwritten if uniform_radius != 0
             \param uniform_radius           [in] - double != 0 determines whether to overwrite all epsilons for uniform search
             \param max_search_radius        [in] - largest valid search (useful only for MPI jobs if halo size exists)
+            \param check_same               [in] - check if results during real search are same as dry-run
+            \param do_dry_run               [in] - (for use as state in recursive calls, do not change from default)
         */
         template <typename trg_view_type, typename neighbor_lists_view_type, typename epsilons_view_type>
-        size_t generateCRNeighborListsFromRadiusSearch(bool is_dry_run, trg_view_type trg_pts_view, 
-                neighbor_lists_view_type neighbor_lists, neighbor_lists_view_type number_of_neighbors_list, 
-                epsilons_view_type epsilons, const double uniform_radius = 0.0, 
-                double max_search_radius = 0.0, bool check_same = true) {
+        void generateCRNeighborListsFromRadiusSearch(trg_view_type trg_pts_view, 
+                neighbor_lists_view_type& neighbor_lists, neighbor_lists_view_type& number_of_neighbors_list, 
+                epsilons_view_type& epsilons, const double uniform_radius = 0.0, 
+                double max_search_radius = 0.0, bool check_same = true, bool do_dry_run = true) {
 
             // function does not populate epsilons, they must be prepopulated
 
@@ -383,16 +386,24 @@ class PointCloudSearch {
                 this->generateKDTree();
             }
 
-            compadre_assert_release((number_of_neighbors_list.extent(0)==(size_t)num_target_sites)
-                        && "number_of_neighbors_list or neighbor lists View does not have large enough dimensions");
+            if (number_of_neighbors_list.extent(0)!=(size_t)num_target_sites) {
+                compadre_assert_release((do_dry_run)
+                            && "number_of_neighbors_list is wrong dimension");
+                Kokkos::resize(number_of_neighbors_list, num_target_sites);
+            }
+            if (epsilons.extent(0)!=(size_t)num_target_sites) {
+                compadre_assert_release((do_dry_run) 
+                            && "epsilons is wrong dimension");
+                Kokkos::resize(epsilons, num_target_sites);
+            }
             compadre_assert_release((neighbor_lists_view_type::rank==1) && "neighbor_lists must be a 1D Kokkos view.");
 
             typedef Kokkos::View<global_index_type*, typename neighbor_lists_view_type::array_layout,
                     typename neighbor_lists_view_type::memory_space, typename neighbor_lists_view_type::memory_traits> row_offsets_view_type;
             row_offsets_view_type row_offsets;
             int max_neighbor_list_row_storage_size = 1;
-            if (!is_dry_run) {
-                auto nla = CreateNeighborLists(neighbor_lists, number_of_neighbors_list);
+            if (!do_dry_run) {
+                auto nla = CreateNeighborLists(number_of_neighbors_list);
                 max_neighbor_list_row_storage_size = nla.getMaxNumNeighbors();
                 Kokkos::resize(row_offsets, num_target_sites);
                 Kokkos::fence();
@@ -402,9 +413,6 @@ class PointCloudSearch {
                 Kokkos::fence();
             }
 
-            compadre_assert_release((epsilons.extent(0)==(size_t)num_target_sites)
-                        && "epsilons View does not have the correct dimension");
-
             typedef Kokkos::View<double*, Kokkos::HostSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> > 
                     scratch_double_view;
 
@@ -464,7 +472,7 @@ class PointCloudSearch {
             
                     // we check that neighbors found doesn't differ from dry-run or we store neighbors_found
                     // no check that neighbors found stay the same if uniform_radius specified (!=0)
-                    if (is_dry_run || uniform_radius!=0.0) {
+                    if (do_dry_run || uniform_radius!=0.0) {
                         number_of_neighbors_list(i) = neighbors_found;
                     } else if (check_same) {
                         compadre_kernel_assert_debug((neighbors_found==(size_t)number_of_neighbors_list(i)) 
@@ -478,7 +486,7 @@ class PointCloudSearch {
                 // loop_bound so that we don't write into memory we don't have allocated
                 int loop_bound = neighbors_found;
                 // loop over each neighbor index and fill with a value
-                if (!is_dry_run) {
+                if (!do_dry_run) {
                     Kokkos::parallel_for(Kokkos::TeamThreadRange(teamMember, loop_bound), [&](const int j) {
                         // cast to an whatever data type the 2D array of neighbor lists is using
                         neighbor_lists(row_offsets(i)+j) = static_cast<typename std::remove_pointer<typename std::remove_pointer<typename neighbor_lists_view_type::data_type>::type>::type>(neighbor_indices(j));
@@ -488,26 +496,37 @@ class PointCloudSearch {
 
             });
             Kokkos::fence();
-            auto nla = CreateNeighborLists(number_of_neighbors_list);
-            return nla.getTotalNeighborsOverAllListsHost();
+
+            if (do_dry_run) {
+                auto nla = CreateNeighborLists(number_of_neighbors_list);
+                auto cr_size =  nla.getTotalNeighborsOverAllListsHost();
+                if (neighbor_lists.extent(0)!=cr_size) {
+                    Kokkos::resize(neighbor_lists, cr_size);
+                }
+                generateCRNeighborListsFromRadiusSearch(
+                    trg_pts_view, neighbor_lists, number_of_neighbors_list, 
+                    epsilons, uniform_radius, max_search_radius,
+                    check_same, false /*do_dry_run*/);
+            }
         }
 
 
         /*! \brief Generates neighbor lists as 2D view by performing a k-nearest neighbor search
             Only accepts 2D neighbor_lists without number_of_neighbors_list.
-            \param is_dry_run               [in] - whether to do a dry-run (find neighbors, but don't store)
             \param trg_pts_view             [in] - target coordinates from which to seek neighbors
             \param neighbor_lists           [out] - 2D view of neighbor lists to be populated from search
             \param epsilons                 [in/out] - radius to search, overwritten if uniform_radius != 0
             \param neighbors_needed         [in] - k neighbors needed as a minimum
             \param epsilon_multiplier       [in] - distance to kth neighbor multiplied by epsilon_multiplier for follow-on radius search
             \param max_search_radius        [in] - largest valid search (useful only for MPI jobs if halo size exists)
+            \param check_same               [in] - check if results during real search are same as dry-run
+            \param do_dry_run               [in] - (for use as state in recursive calls, do not change from default)
         */
         template <typename trg_view_type, typename neighbor_lists_view_type, typename epsilons_view_type>
-        size_t generate2DNeighborListsFromKNNSearch(bool is_dry_run, trg_view_type trg_pts_view, 
-                neighbor_lists_view_type neighbor_lists, epsilons_view_type epsilons, 
+        void generate2DNeighborListsFromKNNSearch(trg_view_type trg_pts_view, 
+                neighbor_lists_view_type& neighbor_lists, epsilons_view_type& epsilons, 
                 const int neighbors_needed, const double epsilon_multiplier = 1.6, 
-                double max_search_radius = 0.0, bool check_same = true) {
+                double max_search_radius = 0.0, bool check_same = true, bool do_dry_run = true) {
 
             // First, do a knn search (removes need for guessing initial search radius)
 
@@ -529,15 +548,13 @@ class PointCloudSearch {
             }
             Kokkos::fence();
 
-            compadre_assert_release((num_target_sites==0 || // sizes don't matter when there are no targets
-                    (neighbor_lists.extent(0)==(size_t)num_target_sites 
-                        && neighbor_lists.extent(1)>=(size_t)(neighbors_needed+1)))
-                        && "neighbor lists View does not have large enough dimensions");
+            if (epsilons.extent(0)!=(size_t)num_target_sites) {
+                compadre_assert_release((do_dry_run) 
+                            && "epsilons is wrong dimension");
+                Kokkos::resize(epsilons, num_target_sites);
+            }
             compadre_assert_release((neighbor_lists_view_type::rank==2) && "neighbor_lists must be a 2D Kokkos view.");
 
-            compadre_assert_release((epsilons.extent(0)==(size_t)num_target_sites)
-                        && "epsilons View does not have the correct dimension");
-
             typedef Kokkos::View<double*, Kokkos::HostSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> > 
                     scratch_double_view;
 
@@ -546,8 +563,8 @@ class PointCloudSearch {
 
             // determine scratch space size needed
             int team_scratch_size = 0;
-            team_scratch_size += scratch_double_view::shmem_size(neighbor_lists.extent(1)); // distances
-            team_scratch_size += scratch_int_view::shmem_size(neighbor_lists.extent(1)); // indices
+            team_scratch_size += scratch_double_view::shmem_size(neighbors_needed); // distances
+            team_scratch_size += scratch_int_view::shmem_size(neighbors_needed); // indices
             team_scratch_size += scratch_double_view::shmem_size(_dim); // target coordinate
 
             // minimum number of neighbors found over all target sites' neighborhoods
@@ -558,21 +575,21 @@ class PointCloudSearch {
             //
             // as long as neighbor_lists can hold the number of neighbors_needed, we don't need to check
             // that the maximum number of neighbors will fit into neighbor_lists
-            //
+            // 
             Kokkos::parallel_reduce("knn search", host_team_policy(num_target_sites, Kokkos::AUTO)
                     .set_scratch_size(0 /*shared memory level*/, Kokkos::PerTeam(team_scratch_size)), 
                     KOKKOS_LAMBDA(const host_member_type& teamMember, size_t& t_min_num_neighbors) {
 
                 // make unmanaged scratch views
-                scratch_double_view neighbor_distances(teamMember.team_scratch(0 /*shared memory*/), neighbor_lists.extent(1));
-                scratch_int_view neighbor_indices(teamMember.team_scratch(0 /*shared memory*/), neighbor_lists.extent(1));
+                scratch_double_view neighbor_distances(teamMember.team_scratch(0 /*shared memory*/), neighbors_needed);
+                scratch_int_view neighbor_indices(teamMember.team_scratch(0 /*shared memory*/), neighbors_needed);
                 scratch_double_view this_target_coord(teamMember.team_scratch(0 /*shared memory*/), _dim);
 
                 size_t neighbors_found = 0;
 
                 const int i = teamMember.league_rank();
 
-                Kokkos::parallel_for(Kokkos::TeamThreadRange(teamMember, neighbor_lists.extent(1)), [=](const int j) {
+                Kokkos::parallel_for(Kokkos::TeamThreadRange(teamMember, neighbors_needed), [=](const int j) {
                     neighbor_indices(j) = 0;
                     neighbor_distances(j) = -1.0;
                 });
@@ -609,9 +626,9 @@ class PointCloudSearch {
                     // should is small enough to ensure that other neighbors are not found
 
                     // needs furthest neighbor's distance for next portion
-                    compadre_kernel_assert_release((neighbors_found<neighbor_lists.extent(1) || is_dry_run) 
+                    compadre_kernel_assert_release((neighbors_found<=neighbors_needed || do_dry_run) 
                             && "Neighbors found exceeded storage capacity in neighbor list.");
-                    compadre_kernel_assert_release((epsilons(i)<=max_search_radius || max_search_radius==0 || is_dry_run) 
+                    compadre_kernel_assert_release((epsilons(i)<=max_search_radius || max_search_radius==0 || do_dry_run) 
                             && "max_search_radius given (generally derived from the size of a halo region), \
                                 and search radius needed would exceed this max_search_radius.");
                     // neighbor_distances stores squared distances from neighbor to target, as returned by nanoflann
@@ -628,15 +645,12 @@ class PointCloudSearch {
                     && "Neighbor search failed to find number of neighbors needed for unisolvency.");
             
             // call a radius search using values now stored in epsilons
-            size_t max_num_neighbors = generate2DNeighborListsFromRadiusSearch(is_dry_run, trg_pts_view, neighbor_lists, 
-                    epsilons, 0.0 /*don't set uniform radius*/, max_search_radius, check_same);
-
-            return max_num_neighbors;
+            generate2DNeighborListsFromRadiusSearch(trg_pts_view, neighbor_lists, 
+                    epsilons, 0.0 /*don't set uniform radius*/, max_search_radius, check_same, do_dry_run);
         }
 
         /*! \brief Generates compressed row neighbor lists by performing a k-nearest neighbor search
             Only accepts 1D neighbor_lists with 1D number_of_neighbors_list.
-            \param is_dry_run               [in] - whether to do a dry-run (find neighbors, but don't store)
             \param trg_pts_view             [in] - target coordinates from which to seek neighbors
             \param neighbor_lists           [out] - 1D view of neighbor lists to be populated from search
             \param number_of_neighbors_list [in/out] - number of neighbors for each target site
@@ -644,13 +658,15 @@ class PointCloudSearch {
             \param neighbors_needed         [in] - k neighbors needed as a minimum
             \param epsilon_multiplier       [in] - distance to kth neighbor multiplied by epsilon_multiplier for follow-on radius search
             \param max_search_radius        [in] - largest valid search (useful only for MPI jobs if halo size exists)
+            \param check_same               [in] - check if results during real search are same as dry-run
+            \param do_dry_run               [in] - (for use as state in recursive calls, do not change from default)
         */
         template <typename trg_view_type, typename neighbor_lists_view_type, typename epsilons_view_type>
-        size_t generateCRNeighborListsFromKNNSearch(bool is_dry_run, trg_view_type trg_pts_view, 
-                neighbor_lists_view_type neighbor_lists, neighbor_lists_view_type number_of_neighbors_list,
-                epsilons_view_type epsilons, const int neighbors_needed, 
+        void generateCRNeighborListsFromKNNSearch(trg_view_type trg_pts_view, 
+                neighbor_lists_view_type& neighbor_lists, neighbor_lists_view_type& number_of_neighbors_list,
+                epsilons_view_type& epsilons, const int neighbors_needed, 
                 const double epsilon_multiplier = 1.6, double max_search_radius = 0.0, 
-                bool check_same = true) {
+                bool check_same = true, bool do_dry_run = true) {
 
             // First, do a knn search (removes need for guessing initial search radius)
 
@@ -672,20 +688,25 @@ class PointCloudSearch {
             }
             Kokkos::fence();
 
-            compadre_assert_release((number_of_neighbors_list.extent(0)==(size_t)num_target_sites ) 
-                        && "number_of_neighbors_list or neighbor lists View does not have large enough dimensions");
+            if (number_of_neighbors_list.extent(0)!=(size_t)num_target_sites) {
+                compadre_assert_release((do_dry_run)
+                            && "number_of_neighbors_list is wrong dimension");
+                Kokkos::resize(number_of_neighbors_list, num_target_sites);
+            }
+            if (epsilons.extent(0)!=(size_t)num_target_sites) {
+                compadre_assert_release((do_dry_run) 
+                            && "epsilons is wrong dimension");
+                Kokkos::resize(epsilons, num_target_sites);
+            }
             compadre_assert_release((neighbor_lists_view_type::rank==1) && "neighbor_lists must be a 1D Kokkos view.");
 
             // if dry-run, neighbors_needed, else max over previous dry-run
             int max_neighbor_list_row_storage_size = neighbors_needed;
-            if (!is_dry_run) {
-                auto nla = CreateNeighborLists(neighbor_lists, number_of_neighbors_list);
+            if (!do_dry_run) {
+                auto nla = CreateNeighborLists(number_of_neighbors_list);
                 max_neighbor_list_row_storage_size = nla.getMaxNumNeighbors();
             }
 
-            compadre_assert_release((epsilons.extent(0)==(size_t)num_target_sites)
-                        && "epsilons View does not have the correct dimension");
-
             typedef Kokkos::View<double*, Kokkos::HostSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> > 
                     scratch_double_view;
 
@@ -756,7 +777,7 @@ class PointCloudSearch {
                     // neighbor (target site) will not be found if left at 0, so any positive amount will do, however 1e-14 
                     // should is small enough to ensure that other neighbors are not found
 
-                    compadre_kernel_assert_release((epsilons(i)<=max_search_radius || max_search_radius==0 || is_dry_run) 
+                    compadre_kernel_assert_release((epsilons(i)<=max_search_radius || max_search_radius==0 || do_dry_run) 
                             && "max_search_radius given (generally derived from the size of a halo region), \
                                 and search radius needed would exceed this max_search_radius.");
                     // neighbor_distances stores squared distances from neighbor to target, as returned by nanoflann
@@ -773,12 +794,9 @@ class PointCloudSearch {
                     && "Neighbor search failed to find number of neighbors needed for unisolvency.");
             
             // call a radius search using values now stored in epsilons
-            generateCRNeighborListsFromRadiusSearch(is_dry_run, trg_pts_view, neighbor_lists, 
+            generateCRNeighborListsFromRadiusSearch(trg_pts_view, neighbor_lists, 
                     number_of_neighbors_list, epsilons, 0.0 /*don't set uniform radius*/, 
-                    max_search_radius, check_same);
-
-            auto nla = CreateNeighborLists(number_of_neighbors_list);
-            return nla.getTotalNeighborsOverAllListsHost();
+                    max_search_radius, check_same, do_dry_run);
         }
 }; // Nanoflann's PointCloudSearch
 

From c623f0584b01aa1071e086b36a2e751174296567 Mon Sep 17 00:00:00 2001
From: Paul Kuberry <pakuber@sandia.gov>
Date: Fri, 1 Oct 2021 16:25:33 -0600
Subject: [PATCH 28/40] Remove dry-run parameter from KNN searches (ArborX and
 Nanoflann) - Replaces internals of 2D searches for Nanoflann

---
 src/Compadre_PointCloudSearch_ArborX.hpp    |  16 +-
 src/Compadre_PointCloudSearch_Nanoflann.hpp | 293 +++-----------------
 2 files changed, 51 insertions(+), 258 deletions(-)

diff --git a/src/Compadre_PointCloudSearch_ArborX.hpp b/src/Compadre_PointCloudSearch_ArborX.hpp
index e066855c3..66a9b947b 100644
--- a/src/Compadre_PointCloudSearch_ArborX.hpp
+++ b/src/Compadre_PointCloudSearch_ArborX.hpp
@@ -381,13 +381,15 @@ class PointCloudSearch {
             \param epsilon_multiplier       [in] - distance to kth neighbor multiplied by epsilon_multiplier for follow-on radius search
             \param max_search_radius        [in] - largest valid search (useful only for MPI jobs if halo size exists)
             \param check_same               [in] - ignored (to match nanoflann)
-            \param do_dry_run               [in] - ignored (to match nanoflann)
+
+            This function performs a KNN search, and then performs a radius search using epsilon_multiplier 
+            scaling of the Kth nearest neighbor's distance
         */
         template <typename trg_view_type, typename neighbor_lists_view_type, typename epsilons_view_type>
         void generate2DNeighborListsFromKNNSearch(trg_view_type trg_pts_view, 
                 neighbor_lists_view_type& neighbor_lists, epsilons_view_type& epsilons, 
                 const int neighbors_needed, const double epsilon_multiplier = 1.6, 
-                double max_search_radius = 0.0, bool check_same = true, bool do_dry_run = true) {
+                double max_search_radius = 0.0, bool check_same = true) {
 
             const int num_target_sites = trg_pts_view.extent(0);
  
@@ -407,7 +409,7 @@ class PointCloudSearch {
             generateCRNeighborListsFromKNNSearch(trg_pts_view,
                 cr_neighbor_lists, number_of_neighbors_list, epsilons, 
                 neighbors_needed, epsilon_multiplier, max_search_radius,
-                check_same, do_dry_run);
+                check_same);
 
             auto nla = CreateNeighborLists(cr_neighbor_lists, number_of_neighbors_list);
             size_t max_num_neighbors = nla.getMaxNumNeighbors();
@@ -424,13 +426,15 @@ class PointCloudSearch {
             \param epsilon_multiplier       [in] - distance to kth neighbor multiplied by epsilon_multiplier for follow-on radius search
             \param max_search_radius        [in] - largest valid search (useful only for MPI jobs if halo size exists)
             \param check_same               [in] - ignored (to match nanoflann)
-            \param do_dry_run               [in] - ignored (to match nanoflann)
+
+            This function performs a KNN search, and then performs a radius search using epsilon_multiplier 
+            scaling of the Kth nearest neighbor's distance
         */
         template <typename trg_view_type, typename neighbor_lists_view_type, typename epsilons_view_type>
         void generateCRNeighborListsFromKNNSearch(trg_view_type trg_pts_view, 
                 neighbor_lists_view_type& neighbor_lists, neighbor_lists_view_type& number_of_neighbors_list,
                 epsilons_view_type& epsilons, const int neighbors_needed, const double epsilon_multiplier = 1.6, 
-                double max_search_radius = 0.0, bool check_same = true, bool do_dry_run = true) {
+                double max_search_radius = 0.0, bool check_same = true) {
 
             // First, do a knn search (removes need for guessing initial search radius)
 
@@ -521,7 +525,7 @@ class PointCloudSearch {
             // call a radius search using values now stored in epsilons
             generateCRNeighborListsFromRadiusSearch(trg_pts_view, neighbor_lists, 
                     number_of_neighbors_list, epsilons, 0.0 /*don't set uniform radius*/, 
-                    max_search_radius, check_same, do_dry_run);
+                    max_search_radius, check_same, true /*do_dry_run*/);
         }
 }; // ArborX's PointCloudSearch
 
diff --git a/src/Compadre_PointCloudSearch_Nanoflann.hpp b/src/Compadre_PointCloudSearch_Nanoflann.hpp
index c9fa251d5..10ed4e1d5 100644
--- a/src/Compadre_PointCloudSearch_Nanoflann.hpp
+++ b/src/Compadre_PointCloudSearch_Nanoflann.hpp
@@ -219,133 +219,28 @@ class PointCloudSearch {
                 const double uniform_radius = 0.0, double max_search_radius = 0.0,
                 bool check_same = true, bool do_dry_run = true) {
 
-            // function does not populate epsilons, they must be prepopulated
-
-            compadre_assert_release((Kokkos::SpaceAccessibility<host_execution_space, typename trg_view_type::memory_space>::accessible==1) &&
-                    "Target coordinates view passed to generate2DNeighborListsFromRadiusSearch should be accessible from the host.");
-            compadre_assert_release((((int)trg_pts_view.extent(1))>=_dim) &&
-                    "Target coordinates view passed to generate2DNeighborListsFromRadiusSearch must have \
-                    second dimension as large as _dim.");
-            compadre_assert_release((Kokkos::SpaceAccessibility<host_execution_space, typename neighbor_lists_view_type::memory_space>::accessible==1) &&
-                    "Views passed to generate2DNeighborListsFromRadiusSearch should be accessible from the host.");
-            compadre_assert_release((Kokkos::SpaceAccessibility<host_execution_space, typename epsilons_view_type::memory_space>::accessible==1) &&
-                    "Views passed to generate2DNeighborListsFromRadiusSearch should be accessible from the host.");
-
-            // loop size
             const int num_target_sites = trg_pts_view.extent(0);
-
-            if ((!_tree_1d && _dim==1) || (!_tree_2d && _dim==2) || (!_tree_3d && _dim==3)) {
-                this->generateKDTree();
-            }
-
-            // check neighbor lists and epsilons view sizes
+ 
+            // check neighbor lists rank
             compadre_assert_release((neighbor_lists_view_type::rank==2) && "neighbor_lists must be a 2D Kokkos view.");
-            if (epsilons.extent(0)!=(size_t)num_target_sites) {
-                compadre_assert_release((do_dry_run) 
-                            && "epsilons is wrong dimension");
-                Kokkos::resize(epsilons, num_target_sites);
-            }
-
-            typedef Kokkos::View<double*, Kokkos::HostSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> > 
-                    scratch_double_view;
-
-            typedef Kokkos::View<size_t*, Kokkos::HostSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> > 
-                    scratch_int_view;
-
-            // determine scratch space size needed
-            int storage_size = (neighbor_lists.extent(1) > 2) ? neighbor_lists.extent(1) : 2;
-            int team_scratch_size = 0;
-            team_scratch_size += scratch_double_view::shmem_size(storage_size); // distances
-            team_scratch_size += scratch_int_view::shmem_size(storage_size); // indices
-            team_scratch_size += scratch_double_view::shmem_size(_dim); // target coordinate
-
-            // maximum number of neighbors found over all target sites' neighborhoods
-            size_t max_num_neighbors = 0;
-            // part 2. do radius search using window size from knn search
-            // each row of neighbor lists is a neighbor list for the target site corresponding to that row
-            Kokkos::parallel_reduce("radius search", host_team_policy(num_target_sites, Kokkos::AUTO)
-                    .set_scratch_size(0 /*shared memory level*/, Kokkos::PerTeam(team_scratch_size)), 
-                    KOKKOS_LAMBDA(const host_member_type& teamMember, size_t& t_max_num_neighbors) {
-
-                // make unmanaged scratch views
-                scratch_double_view neighbor_distances(teamMember.team_scratch(0 /*shared memory*/), storage_size);
-                scratch_int_view neighbor_indices(teamMember.team_scratch(0 /*shared memory*/), storage_size);
-                scratch_double_view this_target_coord(teamMember.team_scratch(0 /*shared memory*/), _dim);
-
-                size_t neighbors_found = 0;
-
-                const int i = teamMember.league_rank();
-
-                // set epsilons if radius is specified
-                if (uniform_radius > 0) epsilons(i) = uniform_radius;
-
-                // needs furthest neighbor's distance for next portion
-                compadre_kernel_assert_release((epsilons(i)<=max_search_radius || max_search_radius==0) && "max_search_radius given (generally derived from the size of a halo region), and search radius needed would exceed this max_search_radius.");
-
-                Kokkos::parallel_for(Kokkos::TeamThreadRange(teamMember, storage_size), [&](const int j) { 
-                    neighbor_indices(j) = 0;
-                    neighbor_distances(j) = -1.0;
-                });
-                teamMember.team_barrier();
-
-                Kokkos::single(Kokkos::PerTeam(teamMember), [&] () {
-                    // target_coords is LayoutLeft on device and its HostMirror, so giving a pointer to 
-                    // this data would lead to a wrong result if the device is a GPU
-
-                    for (int j=0; j<_dim; ++j) {
-                        this_target_coord(j) = trg_pts_view(i,j);
-                    }
-
-                    nanoflann::SearchParams sp; // default parameters
-                    Compadre::RadiusResultSet<double> rrs(epsilons(i)*epsilons(i), neighbor_distances.data(), neighbor_indices.data(), storage_size);
-                    if (_dim==1) {
-                        neighbors_found = _tree_1d->template radiusSearchCustomCallback<Compadre::RadiusResultSet<double> >(this_target_coord.data(), rrs, sp) ;
-                    } else if (_dim==2) {
-                        neighbors_found = _tree_2d->template radiusSearchCustomCallback<Compadre::RadiusResultSet<double> >(this_target_coord.data(), rrs, sp) ;
-                    } else if (_dim==3) {
-                        neighbors_found = _tree_3d->template radiusSearchCustomCallback<Compadre::RadiusResultSet<double> >(this_target_coord.data(), rrs, sp) ;
-                    }
-
-                    t_max_num_neighbors = (neighbors_found > t_max_num_neighbors) ? neighbors_found : t_max_num_neighbors;
-            
-                    // the number of neighbors is stored in column zero of the neighbor lists 2D array
-                    if (!do_dry_run && check_same) {
-                        compadre_kernel_assert_debug((neighbors_found==(size_t)neighbor_lists(i,0)) 
-                                && "Number of neighbors found changed since dry-run.");
-                    }
-                    neighbor_lists(i,0) = neighbors_found;
-
-                    // epsilons already scaled and then set by search radius
-                });
-                teamMember.team_barrier();
 
-                // loop_bound so that we don't write into memory we don't have allocated
-                int loop_bound = (neighbors_found < storage_size-1) ? neighbors_found : storage_size-1;
-                // loop over each neighbor index and fill with a value
-                if (!do_dry_run) {
-                    Kokkos::parallel_for(Kokkos::TeamThreadRange(teamMember, loop_bound), [&](const int j) {
-                        // cast to an whatever data type the 2D array of neighbor lists is using
-                        neighbor_lists(i,j+1) = static_cast<typename std::remove_pointer<typename std::remove_pointer<typename neighbor_lists_view_type::data_type>::type>::type>(neighbor_indices(j));
-                    });
-                    teamMember.team_barrier();
-                }
+            // temporary 1D array for cr_neighbor_lists
+            typedef typename neighbor_lists_view_type::value_type value_type;
+            Kokkos::View<value_type*, typename neighbor_lists_view_type::memory_space> 
+                cr_neighbor_lists(neighbor_lists.label(), 0);
 
-            }, Kokkos::Max<size_t>(max_num_neighbors) );
-            Kokkos::fence();
+            // temporary 1D array for number_of_neighbors_list
+            typedef typename neighbor_lists_view_type::value_type value_type;
+            Kokkos::View<value_type*, typename neighbor_lists_view_type::memory_space> 
+                number_of_neighbors_list("number of neighbors list", num_target_sites);
 
-            // check if max_num_neighbors will fit onto pre-allocated space
-            compadre_assert_release((neighbor_lists.extent(1) >= (max_num_neighbors+1) || do_dry_run) 
-                    && "neighbor_lists does not contain enough columns for the maximum number of neighbors needing to be stored.");
+            generateCRNeighborListsFromRadiusSearch(trg_pts_view,
+                cr_neighbor_lists, number_of_neighbors_list, epsilons, uniform_radius, 
+                max_search_radius, check_same, do_dry_run);
 
-            if (do_dry_run) {
-                if (neighbor_lists.extent_int(0)<num_target_sites || neighbor_lists.extent_int(1)<max_num_neighbors+1) {
-                    Kokkos::resize(neighbor_lists, num_target_sites, max_num_neighbors+1);
-                }
-                generate2DNeighborListsFromRadiusSearch(
-                    trg_pts_view, neighbor_lists, epsilons, 
-                    uniform_radius, max_search_radius,
-                    check_same, false /*do_dry_run*/);
-            }
+            auto nla = CreateNeighborLists(cr_neighbor_lists, number_of_neighbors_list);
+            size_t max_num_neighbors = nla.getMaxNumNeighbors();
+            ConvertCompressedRowNeighborListsTo2D(nla, neighbor_lists);
         }
 
         /*! \brief Generates compressed row neighbor lists by performing a radius search 
@@ -520,133 +415,38 @@ class PointCloudSearch {
             \param epsilon_multiplier       [in] - distance to kth neighbor multiplied by epsilon_multiplier for follow-on radius search
             \param max_search_radius        [in] - largest valid search (useful only for MPI jobs if halo size exists)
             \param check_same               [in] - check if results during real search are same as dry-run
-            \param do_dry_run               [in] - (for use as state in recursive calls, do not change from default)
+
+            This function performs a KNN search, and then performs a radius search using epsilon_multiplier 
+            scaling of the Kth nearest neighbor's distance
         */
         template <typename trg_view_type, typename neighbor_lists_view_type, typename epsilons_view_type>
         void generate2DNeighborListsFromKNNSearch(trg_view_type trg_pts_view, 
                 neighbor_lists_view_type& neighbor_lists, epsilons_view_type& epsilons, 
                 const int neighbors_needed, const double epsilon_multiplier = 1.6, 
-                double max_search_radius = 0.0, bool check_same = true, bool do_dry_run = true) {
-
-            // First, do a knn search (removes need for guessing initial search radius)
-
-            compadre_assert_release((Kokkos::SpaceAccessibility<host_execution_space, typename trg_view_type::memory_space>::accessible==1) &&
-                    "Target coordinates view passed to generate2DNeighborListsFromKNNSearch should be accessible from the host.");
-            compadre_assert_release((((int)trg_pts_view.extent(1))>=_dim) &&
-                    "Target coordinates view passed to generate2DNeighborListsFromRadiusSearch must have \
-                    second dimension as large as _dim.");
-            compadre_assert_release((Kokkos::SpaceAccessibility<host_execution_space, typename neighbor_lists_view_type::memory_space>::accessible==1) &&
-                    "Views passed to generate2DNeighborListsFromKNNSearch should be accessible from the host.");
-            compadre_assert_release((Kokkos::SpaceAccessibility<host_execution_space, typename epsilons_view_type::memory_space>::accessible==1) &&
-                    "Views passed to generate2DNeighborListsFromKNNSearch should be accessible from the host.");
+                double max_search_radius = 0.0, bool check_same = true) {
 
-            // loop size
             const int num_target_sites = trg_pts_view.extent(0);
-
-            if ((!_tree_1d && _dim==1) || (!_tree_2d && _dim==2) || (!_tree_3d && _dim==3)) {
-                this->generateKDTree();
-            }
-            Kokkos::fence();
-
-            if (epsilons.extent(0)!=(size_t)num_target_sites) {
-                compadre_assert_release((do_dry_run) 
-                            && "epsilons is wrong dimension");
-                Kokkos::resize(epsilons, num_target_sites);
-            }
+ 
+            // check neighbor lists rank
             compadre_assert_release((neighbor_lists_view_type::rank==2) && "neighbor_lists must be a 2D Kokkos view.");
 
-            typedef Kokkos::View<double*, Kokkos::HostSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> > 
-                    scratch_double_view;
-
-            typedef Kokkos::View<size_t*, Kokkos::HostSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> > 
-                    scratch_int_view;
-
-            // determine scratch space size needed
-            int team_scratch_size = 0;
-            team_scratch_size += scratch_double_view::shmem_size(neighbors_needed); // distances
-            team_scratch_size += scratch_int_view::shmem_size(neighbors_needed); // indices
-            team_scratch_size += scratch_double_view::shmem_size(_dim); // target coordinate
-
-            // minimum number of neighbors found over all target sites' neighborhoods
-            size_t min_num_neighbors = 0;
-            //
-            // part 1. do knn search for neighbors needed for unisolvency
-            // each row of neighbor lists is a neighbor list for the target site corresponding to that row
-            //
-            // as long as neighbor_lists can hold the number of neighbors_needed, we don't need to check
-            // that the maximum number of neighbors will fit into neighbor_lists
-            // 
-            Kokkos::parallel_reduce("knn search", host_team_policy(num_target_sites, Kokkos::AUTO)
-                    .set_scratch_size(0 /*shared memory level*/, Kokkos::PerTeam(team_scratch_size)), 
-                    KOKKOS_LAMBDA(const host_member_type& teamMember, size_t& t_min_num_neighbors) {
-
-                // make unmanaged scratch views
-                scratch_double_view neighbor_distances(teamMember.team_scratch(0 /*shared memory*/), neighbors_needed);
-                scratch_int_view neighbor_indices(teamMember.team_scratch(0 /*shared memory*/), neighbors_needed);
-                scratch_double_view this_target_coord(teamMember.team_scratch(0 /*shared memory*/), _dim);
-
-                size_t neighbors_found = 0;
-
-                const int i = teamMember.league_rank();
-
-                Kokkos::parallel_for(Kokkos::TeamThreadRange(teamMember, neighbors_needed), [=](const int j) {
-                    neighbor_indices(j) = 0;
-                    neighbor_distances(j) = -1.0;
-                });
-            
-                teamMember.team_barrier();
-                Kokkos::single(Kokkos::PerTeam(teamMember), [&] () {
-                    // target_coords is LayoutLeft on device and its HostMirror, so giving a pointer to 
-                    // this data would lead to a wrong result if the device is a GPU
-
-                    for (int j=0; j<_dim; ++j) { 
-                        this_target_coord(j) = trg_pts_view(i,j);
-                    }
+            // temporary 1D array for cr_neighbor_lists
+            typedef typename neighbor_lists_view_type::value_type value_type;
+            Kokkos::View<value_type*, typename neighbor_lists_view_type::memory_space> 
+                cr_neighbor_lists(neighbor_lists.label(), 0);
 
-                    if (_dim==1) {
-                        neighbors_found = _tree_1d->knnSearch(this_target_coord.data(), neighbors_needed, 
-                                neighbor_indices.data(), neighbor_distances.data()) ;
-                    } else if (_dim==2) {
-                        neighbors_found = _tree_2d->knnSearch(this_target_coord.data(), neighbors_needed, 
-                                neighbor_indices.data(), neighbor_distances.data()) ;
-                    } else if (_dim==3) {
-                        neighbors_found = _tree_3d->knnSearch(this_target_coord.data(), neighbors_needed, 
-                                neighbor_indices.data(), neighbor_distances.data()) ;
-                    }
-
-                    // get minimum number of neighbors found over all target sites' neighborhoods
-                    t_min_num_neighbors = (neighbors_found < t_min_num_neighbors) ? neighbors_found : t_min_num_neighbors;
-            
-                    // scale by epsilon_multiplier to window from location where the last neighbor was found
-                    epsilons(i) = (neighbor_distances(neighbors_found-1) > 0) ?
-                        std::sqrt(neighbor_distances(neighbors_found-1))*epsilon_multiplier : SEARCH_SCALAR_EPS*epsilon_multiplier;
-                    // the only time the second case using 1e-14 is used is when either zero neighbors or exactly one 
-                    // neighbor (neighbor is target site) is found.  when the follow on radius search is conducted, the one
-                    // neighbor (target site) will not be found if left at 0, so any positive amount will do, however 1e-14 
-                    // should is small enough to ensure that other neighbors are not found
+            // temporary 1D array for number_of_neighbors_list
+            typedef typename neighbor_lists_view_type::value_type value_type;
+            Kokkos::View<value_type*, typename neighbor_lists_view_type::memory_space> 
+                number_of_neighbors_list("number of neighbors list", num_target_sites);
 
-                    // needs furthest neighbor's distance for next portion
-                    compadre_kernel_assert_release((neighbors_found<=neighbors_needed || do_dry_run) 
-                            && "Neighbors found exceeded storage capacity in neighbor list.");
-                    compadre_kernel_assert_release((epsilons(i)<=max_search_radius || max_search_radius==0 || do_dry_run) 
-                            && "max_search_radius given (generally derived from the size of a halo region), \
-                                and search radius needed would exceed this max_search_radius.");
-                    // neighbor_distances stores squared distances from neighbor to target, as returned by nanoflann
-                });
-            }, Kokkos::Min<size_t>(min_num_neighbors) );
-            Kokkos::fence();
-            
-            // if no target sites, then min_num_neighbors is set to neighbors_needed
-            // which also avoids min_num_neighbors being improperly set by min reduction
-            if (num_target_sites==0) min_num_neighbors = neighbors_needed;
+            generateCRNeighborListsFromKNNSearch(trg_pts_view,
+                cr_neighbor_lists, number_of_neighbors_list, epsilons, 
+                neighbors_needed, epsilon_multiplier, max_search_radius);
 
-            // Next, check that we found the neighbors_needed number that we require for unisolvency
-            compadre_assert_release((num_target_sites==0 || (min_num_neighbors>=(size_t)neighbors_needed))
-                    && "Neighbor search failed to find number of neighbors needed for unisolvency.");
-            
-            // call a radius search using values now stored in epsilons
-            generate2DNeighborListsFromRadiusSearch(trg_pts_view, neighbor_lists, 
-                    epsilons, 0.0 /*don't set uniform radius*/, max_search_radius, check_same, do_dry_run);
+            auto nla = CreateNeighborLists(cr_neighbor_lists, number_of_neighbors_list);
+            size_t max_num_neighbors = nla.getMaxNumNeighbors();
+            ConvertCompressedRowNeighborListsTo2D(nla, neighbor_lists);
         }
 
         /*! \brief Generates compressed row neighbor lists by performing a k-nearest neighbor search
@@ -659,14 +459,16 @@ class PointCloudSearch {
             \param epsilon_multiplier       [in] - distance to kth neighbor multiplied by epsilon_multiplier for follow-on radius search
             \param max_search_radius        [in] - largest valid search (useful only for MPI jobs if halo size exists)
             \param check_same               [in] - check if results during real search are same as dry-run
-            \param do_dry_run               [in] - (for use as state in recursive calls, do not change from default)
+
+            This function performs a KNN search, and then performs a radius search using epsilon_multiplier 
+            scaling of the Kth nearest neighbor's distance
         */
         template <typename trg_view_type, typename neighbor_lists_view_type, typename epsilons_view_type>
         void generateCRNeighborListsFromKNNSearch(trg_view_type trg_pts_view, 
                 neighbor_lists_view_type& neighbor_lists, neighbor_lists_view_type& number_of_neighbors_list,
                 epsilons_view_type& epsilons, const int neighbors_needed, 
                 const double epsilon_multiplier = 1.6, double max_search_radius = 0.0, 
-                bool check_same = true, bool do_dry_run = true) {
+                bool check_same = true) {
 
             // First, do a knn search (removes need for guessing initial search radius)
 
@@ -689,23 +491,15 @@ class PointCloudSearch {
             Kokkos::fence();
 
             if (number_of_neighbors_list.extent(0)!=(size_t)num_target_sites) {
-                compadre_assert_release((do_dry_run)
-                            && "number_of_neighbors_list is wrong dimension");
                 Kokkos::resize(number_of_neighbors_list, num_target_sites);
             }
             if (epsilons.extent(0)!=(size_t)num_target_sites) {
-                compadre_assert_release((do_dry_run) 
-                            && "epsilons is wrong dimension");
                 Kokkos::resize(epsilons, num_target_sites);
             }
             compadre_assert_release((neighbor_lists_view_type::rank==1) && "neighbor_lists must be a 1D Kokkos view.");
 
             // if dry-run, neighbors_needed, else max over previous dry-run
             int max_neighbor_list_row_storage_size = neighbors_needed;
-            if (!do_dry_run) {
-                auto nla = CreateNeighborLists(number_of_neighbors_list);
-                max_neighbor_list_row_storage_size = nla.getMaxNumNeighbors();
-            }
 
             typedef Kokkos::View<double*, Kokkos::HostSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> > 
                     scratch_double_view;
@@ -776,11 +570,6 @@ class PointCloudSearch {
                     // neighbor (neighbor is target site) is found.  when the follow on radius search is conducted, the one
                     // neighbor (target site) will not be found if left at 0, so any positive amount will do, however 1e-14 
                     // should is small enough to ensure that other neighbors are not found
-
-                    compadre_kernel_assert_release((epsilons(i)<=max_search_radius || max_search_radius==0 || do_dry_run) 
-                            && "max_search_radius given (generally derived from the size of a halo region), \
-                                and search radius needed would exceed this max_search_radius.");
-                    // neighbor_distances stores squared distances from neighbor to target, as returned by nanoflann
                 });
             }, Kokkos::Min<size_t>(min_num_neighbors) );
             Kokkos::fence();
@@ -796,7 +585,7 @@ class PointCloudSearch {
             // call a radius search using values now stored in epsilons
             generateCRNeighborListsFromRadiusSearch(trg_pts_view, neighbor_lists, 
                     number_of_neighbors_list, epsilons, 0.0 /*don't set uniform radius*/, 
-                    max_search_radius, check_same, do_dry_run);
+                    max_search_radius, check_same, true /*do_dry_run*/);
         }
 }; // Nanoflann's PointCloudSearch
 

From 5abad7950a64bde943fc324b26d22b9ca517c12f Mon Sep 17 00:00:00 2001
From: Paul Kuberry <pakuber@sandia.gov>
Date: Fri, 1 Oct 2021 16:58:39 -0600
Subject: [PATCH 29/40] Made rank 2 layout searches for ArborX and Nanoflann
 common - Replaces two definitions with one for both radius and KNN search -
 Removed parameter do_dry_run from all rank 2 layout searches

---
 src/Compadre_PointCloudSearch.hpp           |  63 ++++++++++
 src/Compadre_PointCloudSearch_ArborX.hpp    | 124 ++++++--------------
 src/Compadre_PointCloudSearch_Nanoflann.hpp | 123 ++++++-------------
 3 files changed, 137 insertions(+), 173 deletions(-)

diff --git a/src/Compadre_PointCloudSearch.hpp b/src/Compadre_PointCloudSearch.hpp
index 54dc1ccd4..aab27d896 100644
--- a/src/Compadre_PointCloudSearch.hpp
+++ b/src/Compadre_PointCloudSearch.hpp
@@ -13,6 +13,69 @@
 
 namespace Compadre {
 
+template <typename view_type>
+template <typename trg_view_type, typename neighbor_lists_view_type, typename epsilons_view_type>
+void PointCloudSearch<view_type>::generate2DNeighborListsFromRadiusSearch(trg_view_type trg_pts_view,
+        neighbor_lists_view_type& neighbor_lists, epsilons_view_type& epsilons,
+        const double uniform_radius, double max_search_radius,
+        bool check_same) {
+
+    const int num_target_sites = trg_pts_view.extent(0);
+
+    // check neighbor lists rank
+    compadre_assert_release((neighbor_lists_view_type::rank==2) && "neighbor_lists must be a 2D Kokkos view.");
+
+    // temporary 1D array for cr_neighbor_lists
+    typedef typename neighbor_lists_view_type::value_type value_type;
+    Kokkos::View<value_type*, typename neighbor_lists_view_type::memory_space>
+        cr_neighbor_lists(neighbor_lists.label(), 0);
+
+    // temporary 1D array for number_of_neighbors_list
+    typedef typename neighbor_lists_view_type::value_type value_type;
+    Kokkos::View<value_type*, typename neighbor_lists_view_type::memory_space>
+        number_of_neighbors_list("number of neighbors list", num_target_sites);
+
+    generateCRNeighborListsFromRadiusSearch(trg_pts_view,
+        cr_neighbor_lists, number_of_neighbors_list, epsilons, uniform_radius,
+        max_search_radius, check_same, true /*do_dry_run*/);
+
+    auto nla = CreateNeighborLists(cr_neighbor_lists, number_of_neighbors_list);
+    size_t max_num_neighbors = nla.getMaxNumNeighbors();
+    ConvertCompressedRowNeighborListsTo2D(nla, neighbor_lists);
+}
+
+template <typename view_type>
+template <typename trg_view_type, typename neighbor_lists_view_type, typename epsilons_view_type>
+void PointCloudSearch<view_type>::generate2DNeighborListsFromKNNSearch(trg_view_type trg_pts_view,
+        neighbor_lists_view_type& neighbor_lists, epsilons_view_type& epsilons,
+        const int neighbors_needed, const double epsilon_multiplier,
+        double max_search_radius, bool check_same) {
+
+    const int num_target_sites = trg_pts_view.extent(0);
+
+    // check neighbor lists rank
+    compadre_assert_release((neighbor_lists_view_type::rank==2) && "neighbor_lists must be a 2D Kokkos view.");
+
+    // temporary 1D array for cr_neighbor_lists
+    typedef typename neighbor_lists_view_type::value_type value_type;
+    Kokkos::View<value_type*, typename neighbor_lists_view_type::memory_space> 
+        cr_neighbor_lists(neighbor_lists.label(), 0);
+
+    // temporary 1D array for number_of_neighbors_list
+    typedef typename neighbor_lists_view_type::value_type value_type;
+    Kokkos::View<value_type*, typename neighbor_lists_view_type::memory_space> 
+        number_of_neighbors_list("number of neighbors list", num_target_sites);
+
+    generateCRNeighborListsFromKNNSearch(trg_pts_view,
+        cr_neighbor_lists, number_of_neighbors_list, epsilons, 
+        neighbors_needed, epsilon_multiplier, max_search_radius,
+        check_same);
+
+    auto nla = CreateNeighborLists(cr_neighbor_lists, number_of_neighbors_list);
+    size_t max_num_neighbors = nla.getMaxNumNeighbors();
+    ConvertCompressedRowNeighborListsTo2D(nla, neighbor_lists);
+}
+
 //! CreatePointCloudSearch allows for the construction of an object of type PointCloudSearch with template deduction
 template <typename view_type>
 PointCloudSearch<view_type> CreatePointCloudSearch(view_type src_view, const local_index_type dimensions = -1, const local_index_type max_leaf = -1) { 
diff --git a/src/Compadre_PointCloudSearch_ArborX.hpp b/src/Compadre_PointCloudSearch_ArborX.hpp
index 66a9b947b..c2e4358d0 100644
--- a/src/Compadre_PointCloudSearch_ArborX.hpp
+++ b/src/Compadre_PointCloudSearch_ArborX.hpp
@@ -216,48 +216,6 @@ class PointCloudSearch {
             return std::sqrt(distance);
         }
 
-        /*! \brief Generates neighbor lists of 2D view by performing a radius search 
-            where the radius to be searched is in the epsilons view.
-            If uniform_radius is given, then this overrides the epsilons view radii sizes.
-            Accepts 2D neighbor_lists without number_of_neighbors_list.
-            \param trg_pts_view             [in] - target coordinates from which to seek neighbors
-            \param neighbor_lists           [out] - 2D view of neighbor lists to be populated from search
-            \param epsilons                 [in/out] - radius to search, overwritten if uniform_radius != 0
-            \param uniform_radius           [in] - double != 0 determines whether to overwrite all epsilons for uniform search
-            \param max_search_radius        [in] - largest valid search (useful only for MPI jobs if halo size exists)
-            \param check_same               [in] - ignored (to match nanoflann)
-            \param do_dry_run               [in] - ignored (to match nanoflann)
-        */
-        template <typename trg_view_type, typename neighbor_lists_view_type, typename epsilons_view_type>
-        void generate2DNeighborListsFromRadiusSearch(trg_view_type trg_pts_view, 
-                neighbor_lists_view_type& neighbor_lists, epsilons_view_type& epsilons, 
-                const double uniform_radius = 0.0, double max_search_radius = 0.0,
-                bool check_same = true, bool do_dry_run = true) {
-
-            const int num_target_sites = trg_pts_view.extent(0);
- 
-            // check neighbor lists rank
-            compadre_assert_release((neighbor_lists_view_type::rank==2) && "neighbor_lists must be a 2D Kokkos view.");
-
-            // temporary 1D array for cr_neighbor_lists
-            typedef typename neighbor_lists_view_type::value_type value_type;
-            Kokkos::View<value_type*, typename neighbor_lists_view_type::memory_space> 
-                cr_neighbor_lists(neighbor_lists.label(), 0);
-
-            // temporary 1D array for number_of_neighbors_list
-            typedef typename neighbor_lists_view_type::value_type value_type;
-            Kokkos::View<value_type*, typename neighbor_lists_view_type::memory_space> 
-                number_of_neighbors_list("number of neighbors list", num_target_sites);
-
-            generateCRNeighborListsFromRadiusSearch(trg_pts_view,
-                cr_neighbor_lists, number_of_neighbors_list, epsilons, uniform_radius, 
-                max_search_radius, check_same, do_dry_run);
-
-            auto nla = CreateNeighborLists(cr_neighbor_lists, number_of_neighbors_list);
-            size_t max_num_neighbors = nla.getMaxNumNeighbors();
-            ConvertCompressedRowNeighborListsTo2D(nla, neighbor_lists);
-        }
-
         /*! \brief Generates compressed row neighbor lists by performing a radius search 
             where the radius to be searched is in the epsilons view.
             If uniform_radius is given, then this overrides the epsilons view radii sizes.
@@ -371,51 +329,6 @@ class PointCloudSearch {
             Kokkos::fence();
         }
 
-
-        /*! \brief Generates neighbor lists as 2D view by performing a k-nearest neighbor search
-            Only accepts 2D neighbor_lists without number_of_neighbors_list.
-            \param trg_pts_view             [in] - target coordinates from which to seek neighbors
-            \param neighbor_lists           [out] - 2D view of neighbor lists to be populated from search
-            \param epsilons                 [in/out] - radius to search, overwritten if uniform_radius != 0
-            \param neighbors_needed         [in] - k neighbors needed as a minimum
-            \param epsilon_multiplier       [in] - distance to kth neighbor multiplied by epsilon_multiplier for follow-on radius search
-            \param max_search_radius        [in] - largest valid search (useful only for MPI jobs if halo size exists)
-            \param check_same               [in] - ignored (to match nanoflann)
-
-            This function performs a KNN search, and then performs a radius search using epsilon_multiplier 
-            scaling of the Kth nearest neighbor's distance
-        */
-        template <typename trg_view_type, typename neighbor_lists_view_type, typename epsilons_view_type>
-        void generate2DNeighborListsFromKNNSearch(trg_view_type trg_pts_view, 
-                neighbor_lists_view_type& neighbor_lists, epsilons_view_type& epsilons, 
-                const int neighbors_needed, const double epsilon_multiplier = 1.6, 
-                double max_search_radius = 0.0, bool check_same = true) {
-
-            const int num_target_sites = trg_pts_view.extent(0);
- 
-            // check neighbor lists rank
-            compadre_assert_release((neighbor_lists_view_type::rank==2) && "neighbor_lists must be a 2D Kokkos view.");
-
-            // temporary 1D array for cr_neighbor_lists
-            typedef typename neighbor_lists_view_type::value_type value_type;
-            Kokkos::View<value_type*, typename neighbor_lists_view_type::memory_space> 
-                cr_neighbor_lists(neighbor_lists.label(), 0);
-
-            // temporary 1D array for number_of_neighbors_list
-            typedef typename neighbor_lists_view_type::value_type value_type;
-            Kokkos::View<value_type*, typename neighbor_lists_view_type::memory_space> 
-                number_of_neighbors_list("number of neighbors list", num_target_sites);
-
-            generateCRNeighborListsFromKNNSearch(trg_pts_view,
-                cr_neighbor_lists, number_of_neighbors_list, epsilons, 
-                neighbors_needed, epsilon_multiplier, max_search_radius,
-                check_same);
-
-            auto nla = CreateNeighborLists(cr_neighbor_lists, number_of_neighbors_list);
-            size_t max_num_neighbors = nla.getMaxNumNeighbors();
-            ConvertCompressedRowNeighborListsTo2D(nla, neighbor_lists);
-        }
-
         /*! \brief Generates compressed row neighbor lists by performing a k-nearest neighbor search
             Only accepts 1D neighbor_lists with 1D number_of_neighbors_list.
             \param trg_pts_view             [in] - target coordinates from which to seek neighbors
@@ -527,6 +440,43 @@ class PointCloudSearch {
                     number_of_neighbors_list, epsilons, 0.0 /*don't set uniform radius*/, 
                     max_search_radius, check_same, true /*do_dry_run*/);
         }
+
+        /*! \brief Generates neighbor lists of 2D view by performing a radius search 
+            where the radius to be searched is in the epsilons view.
+            If uniform_radius is given, then this overrides the epsilons view radii sizes.
+            Accepts 2D neighbor_lists without number_of_neighbors_list.
+            \param trg_pts_view             [in] - target coordinates from which to seek neighbors
+            \param neighbor_lists           [out] - 2D view of neighbor lists to be populated from search
+            \param epsilons                 [in/out] - radius to search, overwritten if uniform_radius != 0
+            \param uniform_radius           [in] - double != 0 determines whether to overwrite all epsilons for uniform search
+            \param max_search_radius        [in] - largest valid search (useful only for MPI jobs if halo size exists)
+            \param check_same               [in] - ignored (to match nanoflann)
+        */
+        template <typename trg_view_type, typename neighbor_lists_view_type, typename epsilons_view_type>
+        void generate2DNeighborListsFromRadiusSearch(trg_view_type trg_pts_view, 
+                neighbor_lists_view_type& neighbor_lists, epsilons_view_type& epsilons, 
+                const double uniform_radius = 0.0, double max_search_radius = 0.0,
+                bool check_same = true);
+
+        /*! \brief Generates neighbor lists as 2D view by performing a k-nearest neighbor search
+            Only accepts 2D neighbor_lists without number_of_neighbors_list.
+            \param trg_pts_view             [in] - target coordinates from which to seek neighbors
+            \param neighbor_lists           [out] - 2D view of neighbor lists to be populated from search
+            \param epsilons                 [in/out] - radius to search, overwritten if uniform_radius != 0
+            \param neighbors_needed         [in] - k neighbors needed as a minimum
+            \param epsilon_multiplier       [in] - distance to kth neighbor multiplied by epsilon_multiplier for follow-on radius search
+            \param max_search_radius        [in] - largest valid search (useful only for MPI jobs if halo size exists)
+            \param check_same               [in] - ignored (to match nanoflann)
+
+            This function performs a KNN search, and then performs a radius search using epsilon_multiplier 
+            scaling of the Kth nearest neighbor's distance
+        */
+        template <typename trg_view_type, typename neighbor_lists_view_type, typename epsilons_view_type>
+        void generate2DNeighborListsFromKNNSearch(trg_view_type trg_pts_view, 
+                neighbor_lists_view_type& neighbor_lists, epsilons_view_type& epsilons, 
+                const int neighbors_needed, const double epsilon_multiplier = 1.6, 
+                double max_search_radius = 0.0, bool check_same = true);
+
 }; // ArborX's PointCloudSearch
 
 } // Compadre
diff --git a/src/Compadre_PointCloudSearch_Nanoflann.hpp b/src/Compadre_PointCloudSearch_Nanoflann.hpp
index 10ed4e1d5..56144000a 100644
--- a/src/Compadre_PointCloudSearch_Nanoflann.hpp
+++ b/src/Compadre_PointCloudSearch_Nanoflann.hpp
@@ -201,48 +201,6 @@ class PointCloudSearch {
             }
         }
 
-        /*! \brief Generates neighbor lists of 2D view by performing a radius search 
-            where the radius to be searched is in the epsilons view.
-            If uniform_radius is given, then this overrides the epsilons view radii sizes.
-            Accepts 2D neighbor_lists without number_of_neighbors_list.
-            \param trg_pts_view             [in] - target coordinates from which to seek neighbors
-            \param neighbor_lists           [out] - 2D view of neighbor lists to be populated from search
-            \param epsilons                 [in/out] - radius to search, overwritten if uniform_radius != 0
-            \param uniform_radius           [in] - double != 0 determines whether to overwrite all epsilons for uniform search
-            \param max_search_radius        [in] - largest valid search (useful only for MPI jobs if halo size exists)
-            \param check_same               [in] - check if results during real search are same as dry-run
-            \param do_dry_run               [in] - (for use as state in recursive calls, do not change from default)
-        */
-        template <typename trg_view_type, typename neighbor_lists_view_type, typename epsilons_view_type>
-        void generate2DNeighborListsFromRadiusSearch(trg_view_type trg_pts_view, 
-                neighbor_lists_view_type& neighbor_lists, epsilons_view_type& epsilons, 
-                const double uniform_radius = 0.0, double max_search_radius = 0.0,
-                bool check_same = true, bool do_dry_run = true) {
-
-            const int num_target_sites = trg_pts_view.extent(0);
- 
-            // check neighbor lists rank
-            compadre_assert_release((neighbor_lists_view_type::rank==2) && "neighbor_lists must be a 2D Kokkos view.");
-
-            // temporary 1D array for cr_neighbor_lists
-            typedef typename neighbor_lists_view_type::value_type value_type;
-            Kokkos::View<value_type*, typename neighbor_lists_view_type::memory_space> 
-                cr_neighbor_lists(neighbor_lists.label(), 0);
-
-            // temporary 1D array for number_of_neighbors_list
-            typedef typename neighbor_lists_view_type::value_type value_type;
-            Kokkos::View<value_type*, typename neighbor_lists_view_type::memory_space> 
-                number_of_neighbors_list("number of neighbors list", num_target_sites);
-
-            generateCRNeighborListsFromRadiusSearch(trg_pts_view,
-                cr_neighbor_lists, number_of_neighbors_list, epsilons, uniform_radius, 
-                max_search_radius, check_same, do_dry_run);
-
-            auto nla = CreateNeighborLists(cr_neighbor_lists, number_of_neighbors_list);
-            size_t max_num_neighbors = nla.getMaxNumNeighbors();
-            ConvertCompressedRowNeighborListsTo2D(nla, neighbor_lists);
-        }
-
         /*! \brief Generates compressed row neighbor lists by performing a radius search 
             where the radius to be searched is in the epsilons view.
             If uniform_radius is given, then this overrides the epsilons view radii sizes.
@@ -405,50 +363,6 @@ class PointCloudSearch {
             }
         }
 
-
-        /*! \brief Generates neighbor lists as 2D view by performing a k-nearest neighbor search
-            Only accepts 2D neighbor_lists without number_of_neighbors_list.
-            \param trg_pts_view             [in] - target coordinates from which to seek neighbors
-            \param neighbor_lists           [out] - 2D view of neighbor lists to be populated from search
-            \param epsilons                 [in/out] - radius to search, overwritten if uniform_radius != 0
-            \param neighbors_needed         [in] - k neighbors needed as a minimum
-            \param epsilon_multiplier       [in] - distance to kth neighbor multiplied by epsilon_multiplier for follow-on radius search
-            \param max_search_radius        [in] - largest valid search (useful only for MPI jobs if halo size exists)
-            \param check_same               [in] - check if results during real search are same as dry-run
-
-            This function performs a KNN search, and then performs a radius search using epsilon_multiplier 
-            scaling of the Kth nearest neighbor's distance
-        */
-        template <typename trg_view_type, typename neighbor_lists_view_type, typename epsilons_view_type>
-        void generate2DNeighborListsFromKNNSearch(trg_view_type trg_pts_view, 
-                neighbor_lists_view_type& neighbor_lists, epsilons_view_type& epsilons, 
-                const int neighbors_needed, const double epsilon_multiplier = 1.6, 
-                double max_search_radius = 0.0, bool check_same = true) {
-
-            const int num_target_sites = trg_pts_view.extent(0);
- 
-            // check neighbor lists rank
-            compadre_assert_release((neighbor_lists_view_type::rank==2) && "neighbor_lists must be a 2D Kokkos view.");
-
-            // temporary 1D array for cr_neighbor_lists
-            typedef typename neighbor_lists_view_type::value_type value_type;
-            Kokkos::View<value_type*, typename neighbor_lists_view_type::memory_space> 
-                cr_neighbor_lists(neighbor_lists.label(), 0);
-
-            // temporary 1D array for number_of_neighbors_list
-            typedef typename neighbor_lists_view_type::value_type value_type;
-            Kokkos::View<value_type*, typename neighbor_lists_view_type::memory_space> 
-                number_of_neighbors_list("number of neighbors list", num_target_sites);
-
-            generateCRNeighborListsFromKNNSearch(trg_pts_view,
-                cr_neighbor_lists, number_of_neighbors_list, epsilons, 
-                neighbors_needed, epsilon_multiplier, max_search_radius);
-
-            auto nla = CreateNeighborLists(cr_neighbor_lists, number_of_neighbors_list);
-            size_t max_num_neighbors = nla.getMaxNumNeighbors();
-            ConvertCompressedRowNeighborListsTo2D(nla, neighbor_lists);
-        }
-
         /*! \brief Generates compressed row neighbor lists by performing a k-nearest neighbor search
             Only accepts 1D neighbor_lists with 1D number_of_neighbors_list.
             \param trg_pts_view             [in] - target coordinates from which to seek neighbors
@@ -587,6 +501,43 @@ class PointCloudSearch {
                     number_of_neighbors_list, epsilons, 0.0 /*don't set uniform radius*/, 
                     max_search_radius, check_same, true /*do_dry_run*/);
         }
+
+        /*! \brief Generates neighbor lists of 2D view by performing a radius search 
+            where the radius to be searched is in the epsilons view.
+            If uniform_radius is given, then this overrides the epsilons view radii sizes.
+            Accepts 2D neighbor_lists without number_of_neighbors_list.
+            \param trg_pts_view             [in] - target coordinates from which to seek neighbors
+            \param neighbor_lists           [out] - 2D view of neighbor lists to be populated from search
+            \param epsilons                 [in/out] - radius to search, overwritten if uniform_radius != 0
+            \param uniform_radius           [in] - double != 0 determines whether to overwrite all epsilons for uniform search
+            \param max_search_radius        [in] - largest valid search (useful only for MPI jobs if halo size exists)
+            \param check_same               [in] - check if results during real search are same as dry-run
+        */
+        template <typename trg_view_type, typename neighbor_lists_view_type, typename epsilons_view_type>
+        void generate2DNeighborListsFromRadiusSearch(trg_view_type trg_pts_view, 
+                neighbor_lists_view_type& neighbor_lists, epsilons_view_type& epsilons, 
+                const double uniform_radius = 0.0, double max_search_radius = 0.0,
+                bool check_same = true);
+
+        /*! \brief Generates neighbor lists as 2D view by performing a k-nearest neighbor search
+            Only accepts 2D neighbor_lists without number_of_neighbors_list.
+            \param trg_pts_view             [in] - target coordinates from which to seek neighbors
+            \param neighbor_lists           [out] - 2D view of neighbor lists to be populated from search
+            \param epsilons                 [in/out] - radius to search, overwritten if uniform_radius != 0
+            \param neighbors_needed         [in] - k neighbors needed as a minimum
+            \param epsilon_multiplier       [in] - distance to kth neighbor multiplied by epsilon_multiplier for follow-on radius search
+            \param max_search_radius        [in] - largest valid search (useful only for MPI jobs if halo size exists)
+            \param check_same               [in] - check if results during real search are same as dry-run
+
+            This function performs a KNN search, and then performs a radius search using epsilon_multiplier 
+            scaling of the Kth nearest neighbor's distance
+        */
+        template <typename trg_view_type, typename neighbor_lists_view_type, typename epsilons_view_type>
+        void generate2DNeighborListsFromKNNSearch(trg_view_type trg_pts_view, 
+                neighbor_lists_view_type& neighbor_lists, epsilons_view_type& epsilons, 
+                const int neighbors_needed, const double epsilon_multiplier = 1.6, 
+                double max_search_radius = 0.0, bool check_same = true);
+
 }; // Nanoflann's PointCloudSearch
 
 } // Compadre

From d1c57c5960a535d70527e2d500676a74cbd12cf5 Mon Sep 17 00:00:00 2001
From: Paul Kuberry <pakuber@sandia.gov>
Date: Sat, 2 Oct 2021 10:45:13 -0600
Subject: [PATCH 30/40] Use Andrey's update for sorting on CPU

---
 src/tpl/arborx/compadre.patch                 | 297 ++++++++++++++++++
 .../src/details/ArborX_DetailsSortUtils.hpp   | 272 ++++++++++------
 2 files changed, 474 insertions(+), 95 deletions(-)
 create mode 100644 src/tpl/arborx/compadre.patch

diff --git a/src/tpl/arborx/compadre.patch b/src/tpl/arborx/compadre.patch
new file mode 100644
index 000000000..b66d4935b
--- /dev/null
+++ b/src/tpl/arborx/compadre.patch
@@ -0,0 +1,297 @@
+diff --git a/src/tpl/arborx/src/details/ArborX_DetailsSortUtils.hpp b/src/tpl/arborx/src/details/ArborX_DetailsSortUtils.hpp
+index 5d6c3f8..15ed02a 100644
+--- a/src/tpl/arborx/src/details/ArborX_DetailsSortUtils.hpp
++++ b/src/tpl/arborx/src/details/ArborX_DetailsSortUtils.hpp
+@@ -72,6 +72,102 @@ namespace ArborX
+ namespace Details
+ {
+ 
++// Helper functions and structs for applyPermutations
++namespace PermuteHelper
++{
++template <class DstViewType, class SrcViewType, int Rank = DstViewType::Rank>
++struct CopyOp;
++
++template <class DstViewType, class SrcViewType>
++struct CopyOp<DstViewType, SrcViewType, 1>
++{
++  KOKKOS_INLINE_FUNCTION
++  static void copy(DstViewType const &dst, size_t i_dst, SrcViewType const &src,
++                   size_t i_src)
++  {
++    dst(i_dst) = src(i_src);
++  }
++};
++
++template <class DstViewType, class SrcViewType>
++struct CopyOp<DstViewType, SrcViewType, 2>
++{
++  KOKKOS_INLINE_FUNCTION
++  static void copy(DstViewType const &dst, size_t i_dst, SrcViewType const &src,
++                   size_t i_src)
++  {
++    for (unsigned int j = 0; j < dst.extent(1); j++)
++      dst(i_dst, j) = src(i_src, j);
++  }
++};
++
++template <class DstViewType, class SrcViewType>
++struct CopyOp<DstViewType, SrcViewType, 3>
++{
++  KOKKOS_INLINE_FUNCTION
++  static void copy(DstViewType const &dst, size_t i_dst, SrcViewType const &src,
++                   size_t i_src)
++  {
++    for (unsigned int j = 0; j < dst.extent(1); j++)
++      for (unsigned int k = 0; k < dst.extent(2); k++)
++        dst(i_dst, j, k) = src(i_src, j, k);
++  }
++};
++} // namespace PermuteHelper
++
++template <typename ExecutionSpace, typename PermutationView, typename InputView,
++          typename OutputView>
++void applyInversePermutation(ExecutionSpace const &space,
++                             PermutationView const &permutation,
++                             InputView const &input_view,
++                             OutputView const &output_view)
++{
++  static_assert(std::is_integral<typename PermutationView::value_type>::value,
++                "");
++  ARBORX_ASSERT(permutation.extent(0) == input_view.extent(0));
++  ARBORX_ASSERT(output_view.extent(0) == input_view.extent(0));
++
++  Kokkos::parallel_for(
++      "ArborX::Sorting::inverse_permute",
++      Kokkos::RangePolicy<ExecutionSpace>(space, 0, input_view.extent(0)),
++      KOKKOS_LAMBDA(int i) {
++        PermuteHelper::CopyOp<OutputView, InputView>::copy(
++            output_view, permutation(i), input_view, i);
++      });
++}
++
++template <typename ExecutionSpace, typename PermutationView, typename InputView,
++          typename OutputView>
++void applyPermutation(ExecutionSpace const &space,
++                      PermutationView const &permutation,
++                      InputView const &input_view,
++                      OutputView const &output_view)
++{
++  static_assert(std::is_integral<typename PermutationView::value_type>::value,
++                "");
++  ARBORX_ASSERT(permutation.extent(0) == input_view.extent(0));
++  ARBORX_ASSERT(output_view.extent(0) == input_view.extent(0));
++
++  Kokkos::parallel_for(
++      "ArborX::Sorting::permute",
++      Kokkos::RangePolicy<ExecutionSpace>(space, 0, input_view.extent(0)),
++      KOKKOS_LAMBDA(int i) {
++        PermuteHelper::CopyOp<OutputView, InputView>::copy(
++            output_view, i, input_view, permutation(i));
++      });
++}
++
++template <typename ExecutionSpace, typename PermutationView, typename View>
++void applyPermutation(ExecutionSpace const &space,
++                      PermutationView const &permutation, View &view)
++{
++  static_assert(std::is_integral<typename PermutationView::value_type>::value,
++                "");
++  auto scratch_view = clone(space, view);
++  applyPermutation(space, permutation, scratch_view, view);
++}
++
++
+ // NOTE returns the permutation indices **and** sorts the input view
+ template <typename ExecutionSpace, typename ViewType,
+           class SizeType = unsigned int>
+@@ -108,6 +204,87 @@ sortObjects(ExecutionSpace const &space, ViewType &view)
+   return bin_sort.get_permute_vector();
+ }
+ 
++#if defined(KOKKOS_ENABLE_OPENMP)
++// NOTE returns the permutation indices **and** sorts the input view
++template <typename ViewType, class SizeType = unsigned int>
++Kokkos::View<SizeType *, typename ViewType::device_type>
++sortObjects(Kokkos::OpenMP const &space, ViewType &view)
++{
++  static_assert(KokkosExt::is_accessible_from<typename ViewType::memory_space,
++                                              Kokkos::OpenMP>::value,
++                "");
++
++  int const n = view.extent(0);
++
++  Kokkos::View<SizeType *, typename ViewType::device_type> permute(
++      Kokkos::ViewAllocateWithoutInitializing("ArborX::Sorting::permutation"),
++      n);
++  ArborX::iota(space, permute);
++
++  std::sort(
++      permute.data(), permute.data() + n,
++      [&view](auto const &i, auto const &j) { return view(i) < view(j); });
++
++  applyPermutation(space, permute, view);
++
++  return permute;
++}
++#endif
++
++#if defined(KOKKOS_ENABLE_THREADS)
++// NOTE returns the permutation indices **and** sorts the input view
++template <typename ViewType, class SizeType = unsigned int>
++Kokkos::View<SizeType *, typename ViewType::device_type>
++sortObjects(Kokkos::Threads const &space, ViewType &view)
++{
++  static_assert(KokkosExt::is_accessible_from<typename ViewType::memory_space,
++                                              Kokkos::Threads>::value,
++                "");
++
++  int const n = view.extent(0);
++
++  Kokkos::View<SizeType *, typename ViewType::device_type> permute(
++      Kokkos::ViewAllocateWithoutInitializing("ArborX::Sorting::permutation"),
++      n);
++  ArborX::iota(space, permute);
++
++  std::sort(
++      permute.data(), permute.data() + n,
++      [&view](auto const &i, auto const &j) { return view(i) < view(j); });
++
++  applyPermutation(space, permute, view);
++
++  return permute;
++}
++#endif
++
++#if defined(KOKKOS_ENABLE_SERIAL)
++// NOTE returns the permutation indices **and** sorts the input view
++template <typename ViewType, class SizeType = unsigned int>
++Kokkos::View<SizeType *, typename ViewType::device_type>
++sortObjects(Kokkos::Threads const &space, ViewType &view)
++{
++  static_assert(KokkosExt::is_accessible_from<typename ViewType::memory_space,
++                                              Kokkos::Serial>::value,
++                "");
++
++  int const n = view.extent(0);
++
++  Kokkos::View<SizeType *, typename ViewType::device_type> permute(
++      Kokkos::ViewAllocateWithoutInitializing("ArborX::Sorting::permutation"),
++      n);
++  ArborX::iota(space, permute);
++
++  std::sort(
++      permute.data(), permute.data() + n,
++      [&view](auto const &i, auto const &j) { return view(i) < view(j); });
++
++  applyPermutation(space, permute, view);
++
++  return permute;
++}
++#endif
++
+ #if defined(KOKKOS_ENABLE_CUDA) ||                                             \
+     (defined(KOKKOS_ENABLE_HIP) && defined(ARBORX_ENABLE_ROCTHRUST))
+ // NOTE returns the permutation indices **and** sorts the input view
+@@ -179,101 +356,6 @@ sortObjects(Kokkos::Experimental::SYCL const &space, ViewType &view)
+ }
+ #endif
+ 
+-// Helper functions and structs for applyPermutations
+-namespace PermuteHelper
+-{
+-template <class DstViewType, class SrcViewType, int Rank = DstViewType::Rank>
+-struct CopyOp;
+-
+-template <class DstViewType, class SrcViewType>
+-struct CopyOp<DstViewType, SrcViewType, 1>
+-{
+-  KOKKOS_INLINE_FUNCTION
+-  static void copy(DstViewType const &dst, size_t i_dst, SrcViewType const &src,
+-                   size_t i_src)
+-  {
+-    dst(i_dst) = src(i_src);
+-  }
+-};
+-
+-template <class DstViewType, class SrcViewType>
+-struct CopyOp<DstViewType, SrcViewType, 2>
+-{
+-  KOKKOS_INLINE_FUNCTION
+-  static void copy(DstViewType const &dst, size_t i_dst, SrcViewType const &src,
+-                   size_t i_src)
+-  {
+-    for (unsigned int j = 0; j < dst.extent(1); j++)
+-      dst(i_dst, j) = src(i_src, j);
+-  }
+-};
+-
+-template <class DstViewType, class SrcViewType>
+-struct CopyOp<DstViewType, SrcViewType, 3>
+-{
+-  KOKKOS_INLINE_FUNCTION
+-  static void copy(DstViewType const &dst, size_t i_dst, SrcViewType const &src,
+-                   size_t i_src)
+-  {
+-    for (unsigned int j = 0; j < dst.extent(1); j++)
+-      for (unsigned int k = 0; k < dst.extent(2); k++)
+-        dst(i_dst, j, k) = src(i_src, j, k);
+-  }
+-};
+-} // namespace PermuteHelper
+-
+-template <typename ExecutionSpace, typename PermutationView, typename InputView,
+-          typename OutputView>
+-void applyInversePermutation(ExecutionSpace const &space,
+-                             PermutationView const &permutation,
+-                             InputView const &input_view,
+-                             OutputView const &output_view)
+-{
+-  static_assert(std::is_integral<typename PermutationView::value_type>::value,
+-                "");
+-  ARBORX_ASSERT(permutation.extent(0) == input_view.extent(0));
+-  ARBORX_ASSERT(output_view.extent(0) == input_view.extent(0));
+-
+-  Kokkos::parallel_for(
+-      "ArborX::Sorting::inverse_permute",
+-      Kokkos::RangePolicy<ExecutionSpace>(space, 0, input_view.extent(0)),
+-      KOKKOS_LAMBDA(int i) {
+-        PermuteHelper::CopyOp<OutputView, InputView>::copy(
+-            output_view, permutation(i), input_view, i);
+-      });
+-}
+-
+-template <typename ExecutionSpace, typename PermutationView, typename InputView,
+-          typename OutputView>
+-void applyPermutation(ExecutionSpace const &space,
+-                      PermutationView const &permutation,
+-                      InputView const &input_view,
+-                      OutputView const &output_view)
+-{
+-  static_assert(std::is_integral<typename PermutationView::value_type>::value,
+-                "");
+-  ARBORX_ASSERT(permutation.extent(0) == input_view.extent(0));
+-  ARBORX_ASSERT(output_view.extent(0) == input_view.extent(0));
+-
+-  Kokkos::parallel_for(
+-      "ArborX::Sorting::permute",
+-      Kokkos::RangePolicy<ExecutionSpace>(space, 0, input_view.extent(0)),
+-      KOKKOS_LAMBDA(int i) {
+-        PermuteHelper::CopyOp<OutputView, InputView>::copy(
+-            output_view, i, input_view, permutation(i));
+-      });
+-}
+-
+-template <typename ExecutionSpace, typename PermutationView, typename View>
+-void applyPermutation(ExecutionSpace const &space,
+-                      PermutationView const &permutation, View &view)
+-{
+-  static_assert(std::is_integral<typename PermutationView::value_type>::value,
+-                "");
+-  auto scratch_view = clone(space, view);
+-  applyPermutation(space, permutation, scratch_view, view);
+-}
+-
+ } // namespace Details
+ 
+ } // namespace ArborX
diff --git a/src/tpl/arborx/src/details/ArborX_DetailsSortUtils.hpp b/src/tpl/arborx/src/details/ArborX_DetailsSortUtils.hpp
index 5d6c3f825..15ed02a55 100644
--- a/src/tpl/arborx/src/details/ArborX_DetailsSortUtils.hpp
+++ b/src/tpl/arborx/src/details/ArborX_DetailsSortUtils.hpp
@@ -72,6 +72,102 @@ namespace ArborX
 namespace Details
 {
 
+// Helper functions and structs for applyPermutations
+namespace PermuteHelper
+{
+template <class DstViewType, class SrcViewType, int Rank = DstViewType::Rank>
+struct CopyOp;
+
+template <class DstViewType, class SrcViewType>
+struct CopyOp<DstViewType, SrcViewType, 1>
+{
+  KOKKOS_INLINE_FUNCTION
+  static void copy(DstViewType const &dst, size_t i_dst, SrcViewType const &src,
+                   size_t i_src)
+  {
+    dst(i_dst) = src(i_src);
+  }
+};
+
+template <class DstViewType, class SrcViewType>
+struct CopyOp<DstViewType, SrcViewType, 2>
+{
+  KOKKOS_INLINE_FUNCTION
+  static void copy(DstViewType const &dst, size_t i_dst, SrcViewType const &src,
+                   size_t i_src)
+  {
+    for (unsigned int j = 0; j < dst.extent(1); j++)
+      dst(i_dst, j) = src(i_src, j);
+  }
+};
+
+template <class DstViewType, class SrcViewType>
+struct CopyOp<DstViewType, SrcViewType, 3>
+{
+  KOKKOS_INLINE_FUNCTION
+  static void copy(DstViewType const &dst, size_t i_dst, SrcViewType const &src,
+                   size_t i_src)
+  {
+    for (unsigned int j = 0; j < dst.extent(1); j++)
+      for (unsigned int k = 0; k < dst.extent(2); k++)
+        dst(i_dst, j, k) = src(i_src, j, k);
+  }
+};
+} // namespace PermuteHelper
+
+template <typename ExecutionSpace, typename PermutationView, typename InputView,
+          typename OutputView>
+void applyInversePermutation(ExecutionSpace const &space,
+                             PermutationView const &permutation,
+                             InputView const &input_view,
+                             OutputView const &output_view)
+{
+  static_assert(std::is_integral<typename PermutationView::value_type>::value,
+                "");
+  ARBORX_ASSERT(permutation.extent(0) == input_view.extent(0));
+  ARBORX_ASSERT(output_view.extent(0) == input_view.extent(0));
+
+  Kokkos::parallel_for(
+      "ArborX::Sorting::inverse_permute",
+      Kokkos::RangePolicy<ExecutionSpace>(space, 0, input_view.extent(0)),
+      KOKKOS_LAMBDA(int i) {
+        PermuteHelper::CopyOp<OutputView, InputView>::copy(
+            output_view, permutation(i), input_view, i);
+      });
+}
+
+template <typename ExecutionSpace, typename PermutationView, typename InputView,
+          typename OutputView>
+void applyPermutation(ExecutionSpace const &space,
+                      PermutationView const &permutation,
+                      InputView const &input_view,
+                      OutputView const &output_view)
+{
+  static_assert(std::is_integral<typename PermutationView::value_type>::value,
+                "");
+  ARBORX_ASSERT(permutation.extent(0) == input_view.extent(0));
+  ARBORX_ASSERT(output_view.extent(0) == input_view.extent(0));
+
+  Kokkos::parallel_for(
+      "ArborX::Sorting::permute",
+      Kokkos::RangePolicy<ExecutionSpace>(space, 0, input_view.extent(0)),
+      KOKKOS_LAMBDA(int i) {
+        PermuteHelper::CopyOp<OutputView, InputView>::copy(
+            output_view, i, input_view, permutation(i));
+      });
+}
+
+template <typename ExecutionSpace, typename PermutationView, typename View>
+void applyPermutation(ExecutionSpace const &space,
+                      PermutationView const &permutation, View &view)
+{
+  static_assert(std::is_integral<typename PermutationView::value_type>::value,
+                "");
+  auto scratch_view = clone(space, view);
+  applyPermutation(space, permutation, scratch_view, view);
+}
+
+
 // NOTE returns the permutation indices **and** sorts the input view
 template <typename ExecutionSpace, typename ViewType,
           class SizeType = unsigned int>
@@ -108,6 +204,87 @@ sortObjects(ExecutionSpace const &space, ViewType &view)
   return bin_sort.get_permute_vector();
 }
 
+#if defined(KOKKOS_ENABLE_OPENMP)
+// NOTE returns the permutation indices **and** sorts the input view
+template <typename ViewType, class SizeType = unsigned int>
+Kokkos::View<SizeType *, typename ViewType::device_type>
+sortObjects(Kokkos::OpenMP const &space, ViewType &view)
+{
+  static_assert(KokkosExt::is_accessible_from<typename ViewType::memory_space,
+                                              Kokkos::OpenMP>::value,
+                "");
+
+  int const n = view.extent(0);
+
+  Kokkos::View<SizeType *, typename ViewType::device_type> permute(
+      Kokkos::ViewAllocateWithoutInitializing("ArborX::Sorting::permutation"),
+      n);
+  ArborX::iota(space, permute);
+
+  std::sort(
+      permute.data(), permute.data() + n,
+      [&view](auto const &i, auto const &j) { return view(i) < view(j); });
+
+  applyPermutation(space, permute, view);
+
+  return permute;
+}
+#endif
+
+#if defined(KOKKOS_ENABLE_THREADS)
+// NOTE returns the permutation indices **and** sorts the input view
+template <typename ViewType, class SizeType = unsigned int>
+Kokkos::View<SizeType *, typename ViewType::device_type>
+sortObjects(Kokkos::Threads const &space, ViewType &view)
+{
+  static_assert(KokkosExt::is_accessible_from<typename ViewType::memory_space,
+                                              Kokkos::Threads>::value,
+                "");
+
+  int const n = view.extent(0);
+
+  Kokkos::View<SizeType *, typename ViewType::device_type> permute(
+      Kokkos::ViewAllocateWithoutInitializing("ArborX::Sorting::permutation"),
+      n);
+  ArborX::iota(space, permute);
+
+  std::sort(
+      permute.data(), permute.data() + n,
+      [&view](auto const &i, auto const &j) { return view(i) < view(j); });
+
+  applyPermutation(space, permute, view);
+
+  return permute;
+}
+#endif
+
+#if defined(KOKKOS_ENABLE_SERIAL)
+// NOTE returns the permutation indices **and** sorts the input view
+template <typename ViewType, class SizeType = unsigned int>
+Kokkos::View<SizeType *, typename ViewType::device_type>
+sortObjects(Kokkos::Threads const &space, ViewType &view)
+{
+  static_assert(KokkosExt::is_accessible_from<typename ViewType::memory_space,
+                                              Kokkos::Serial>::value,
+                "");
+
+  int const n = view.extent(0);
+
+  Kokkos::View<SizeType *, typename ViewType::device_type> permute(
+      Kokkos::ViewAllocateWithoutInitializing("ArborX::Sorting::permutation"),
+      n);
+  ArborX::iota(space, permute);
+
+  std::sort(
+      permute.data(), permute.data() + n,
+      [&view](auto const &i, auto const &j) { return view(i) < view(j); });
+
+  applyPermutation(space, permute, view);
+
+  return permute;
+}
+#endif
+
 #if defined(KOKKOS_ENABLE_CUDA) ||                                             \
     (defined(KOKKOS_ENABLE_HIP) && defined(ARBORX_ENABLE_ROCTHRUST))
 // NOTE returns the permutation indices **and** sorts the input view
@@ -179,101 +356,6 @@ sortObjects(Kokkos::Experimental::SYCL const &space, ViewType &view)
 }
 #endif
 
-// Helper functions and structs for applyPermutations
-namespace PermuteHelper
-{
-template <class DstViewType, class SrcViewType, int Rank = DstViewType::Rank>
-struct CopyOp;
-
-template <class DstViewType, class SrcViewType>
-struct CopyOp<DstViewType, SrcViewType, 1>
-{
-  KOKKOS_INLINE_FUNCTION
-  static void copy(DstViewType const &dst, size_t i_dst, SrcViewType const &src,
-                   size_t i_src)
-  {
-    dst(i_dst) = src(i_src);
-  }
-};
-
-template <class DstViewType, class SrcViewType>
-struct CopyOp<DstViewType, SrcViewType, 2>
-{
-  KOKKOS_INLINE_FUNCTION
-  static void copy(DstViewType const &dst, size_t i_dst, SrcViewType const &src,
-                   size_t i_src)
-  {
-    for (unsigned int j = 0; j < dst.extent(1); j++)
-      dst(i_dst, j) = src(i_src, j);
-  }
-};
-
-template <class DstViewType, class SrcViewType>
-struct CopyOp<DstViewType, SrcViewType, 3>
-{
-  KOKKOS_INLINE_FUNCTION
-  static void copy(DstViewType const &dst, size_t i_dst, SrcViewType const &src,
-                   size_t i_src)
-  {
-    for (unsigned int j = 0; j < dst.extent(1); j++)
-      for (unsigned int k = 0; k < dst.extent(2); k++)
-        dst(i_dst, j, k) = src(i_src, j, k);
-  }
-};
-} // namespace PermuteHelper
-
-template <typename ExecutionSpace, typename PermutationView, typename InputView,
-          typename OutputView>
-void applyInversePermutation(ExecutionSpace const &space,
-                             PermutationView const &permutation,
-                             InputView const &input_view,
-                             OutputView const &output_view)
-{
-  static_assert(std::is_integral<typename PermutationView::value_type>::value,
-                "");
-  ARBORX_ASSERT(permutation.extent(0) == input_view.extent(0));
-  ARBORX_ASSERT(output_view.extent(0) == input_view.extent(0));
-
-  Kokkos::parallel_for(
-      "ArborX::Sorting::inverse_permute",
-      Kokkos::RangePolicy<ExecutionSpace>(space, 0, input_view.extent(0)),
-      KOKKOS_LAMBDA(int i) {
-        PermuteHelper::CopyOp<OutputView, InputView>::copy(
-            output_view, permutation(i), input_view, i);
-      });
-}
-
-template <typename ExecutionSpace, typename PermutationView, typename InputView,
-          typename OutputView>
-void applyPermutation(ExecutionSpace const &space,
-                      PermutationView const &permutation,
-                      InputView const &input_view,
-                      OutputView const &output_view)
-{
-  static_assert(std::is_integral<typename PermutationView::value_type>::value,
-                "");
-  ARBORX_ASSERT(permutation.extent(0) == input_view.extent(0));
-  ARBORX_ASSERT(output_view.extent(0) == input_view.extent(0));
-
-  Kokkos::parallel_for(
-      "ArborX::Sorting::permute",
-      Kokkos::RangePolicy<ExecutionSpace>(space, 0, input_view.extent(0)),
-      KOKKOS_LAMBDA(int i) {
-        PermuteHelper::CopyOp<OutputView, InputView>::copy(
-            output_view, i, input_view, permutation(i));
-      });
-}
-
-template <typename ExecutionSpace, typename PermutationView, typename View>
-void applyPermutation(ExecutionSpace const &space,
-                      PermutationView const &permutation, View &view)
-{
-  static_assert(std::is_integral<typename PermutationView::value_type>::value,
-                "");
-  auto scratch_view = clone(space, view);
-  applyPermutation(space, permutation, scratch_view, view);
-}
-
 } // namespace Details
 
 } // namespace ArborX

From e5ef3408696ce24e8ce15e85b2f2972f8996a98c Mon Sep 17 00:00:00 2001
From: Paul Kuberry <pakuber@sandia.gov>
Date: Mon, 4 Oct 2021 07:32:36 -0600
Subject: [PATCH 31/40] Everything inside of PointCloudSearch now performed on
 device for ArborX

---
 src/Compadre_PointCloudSearch_ArborX.hpp | 275 ++++++++++++-----------
 1 file changed, 146 insertions(+), 129 deletions(-)

diff --git a/src/Compadre_PointCloudSearch_ArborX.hpp b/src/Compadre_PointCloudSearch_ArborX.hpp
index c2e4358d0..a9182e42d 100644
--- a/src/Compadre_PointCloudSearch_ArborX.hpp
+++ b/src/Compadre_PointCloudSearch_ArborX.hpp
@@ -164,6 +164,20 @@ struct ArborX::AccessTraits<NearestNeighbor<view_type_1>, ArborX::PredicatesTag>
 
 namespace Compadre {
 
+//! Returns the distance between a point and a source site, given their indices
+template <typename view_type_1, typename view_type_2>
+KOKKOS_INLINE_FUNCTION
+search_scalar kdtreeDistance(const view_type_1& src_pts, const int src_idx, const view_type_2& trg_pts, const int trg_idx) {
+    search_scalar distance = 0;
+    for (int i=0; i<src_pts.extent_int(1); ++i) {
+        distance += (static_cast<search_scalar>(src_pts(src_idx,i))
+                        -static_cast<search_scalar>(trg_pts(trg_idx,i)))
+                   *(static_cast<search_scalar>(src_pts(src_idx,i))
+                        -static_cast<search_scalar>(trg_pts(trg_idx,i)));
+    }
+    return std::sqrt(distance);
+}
+
 //!  PointCloudSearch generates neighbor lists and window sizes for each target site, using ArborX
 /*!
 *
@@ -180,42 +194,30 @@ class PointCloudSearch {
     protected:
 
         //! source site coordinates
-        view_type _src_pts_view;
+        typedef decltype(Kokkos::create_mirror_view<device_memory_space>(
+                    device_memory_space(), view_type())) 
+                            device_mirror_view_type;
+        device_mirror_view_type _d_src_pts_view;
         local_index_type _dim;
-        local_index_type _max_leaf;
-
         ArborX::BVH<device_memory_space> _tree;
 
     public:
 
         PointCloudSearch(view_type src_pts_view, const local_index_type dimension = -1,
                 const local_index_type max_leaf = -1) 
-                : _src_pts_view(src_pts_view), 
-                  _dim((dimension < 0) ? src_pts_view.extent(1) : dimension),
-                  _max_leaf((max_leaf < 0) ? 10 : max_leaf) {
-            compadre_assert_release((Kokkos::SpaceAccessibility<host_execution_space, typename view_type::memory_space>::accessible==1)
-                    && "Views passed to PointCloudSearch at construction should be accessible from the host.");
-
+                : _dim((dimension < 0) ? src_pts_view.extent(1) : dimension) {
             {
+                _d_src_pts_view = Kokkos::create_mirror_view<device_memory_space>(
+                        device_memory_space(), src_pts_view);
+                Kokkos::deep_copy(_d_src_pts_view, src_pts_view);
+                Kokkos::fence();
                 _tree = ArborX::BVH<device_memory_space>(device_execution_space(), 
-                                Points<view_type>(_src_pts_view));
+                                Points<device_mirror_view_type>(_d_src_pts_view));
             }
         };
     
         ~PointCloudSearch() {};
 
-        //! Returns the distance between a point and a source site, given its index
-        inline search_scalar kdtreeDistance(const double* queryPt, const int idx) const {
-            search_scalar distance = 0;
-            for (int i=0; i<_dim; ++i) {
-                distance += (static_cast<search_scalar>(_src_pts_view(idx,i))
-                                -static_cast<search_scalar>(queryPt[i]))
-                           *(static_cast<search_scalar>(_src_pts_view(idx,i))
-                                 -static_cast<search_scalar>(queryPt[i]));
-            }
-            return std::sqrt(distance);
-        }
-
         /*! \brief Generates compressed row neighbor lists by performing a radius search 
             where the radius to be searched is in the epsilons view.
             If uniform_radius is given, then this overrides the epsilons view radii sizes.
@@ -228,6 +230,8 @@ class PointCloudSearch {
             \param max_search_radius        [in] - largest valid search (useful only for MPI jobs if halo size exists)
             \param check_same               [in] - ignored (to match nanoflann)
             \param do_dry_run               [in] - ignored (to match nanoflann)
+
+            NOTE: function does not populate epsilons, they must already be prepopulated
         */
         template <typename trg_view_type, typename neighbor_lists_view_type, typename epsilons_view_type>
         void generateCRNeighborListsFromRadiusSearch(trg_view_type trg_pts_view, 
@@ -235,77 +239,70 @@ class PointCloudSearch {
                 epsilons_view_type& epsilons, const double uniform_radius = 0.0, 
                 double max_search_radius = 0.0, bool check_same = true, bool do_dry_run = true) {
 
-            // function does not populate epsilons, they must be prepopulated
 
-            compadre_assert_release((Kokkos::SpaceAccessibility<host_execution_space, typename trg_view_type::memory_space>::accessible==1) &&
-                    "Target coordinates view passed to generateCRNeighborListsFromRadiusSearch should be accessible from the host.");
+            // make device mirrors and copy data over to device from host (if it was not device accessible)
+            typedef decltype(Kokkos::create_mirror_view<device_memory_space>(
+                        device_memory_space(), trg_view_type()))  
+                                device_mirror_trg_view_type;
+            device_mirror_trg_view_type d_trg_pts_view = Kokkos::create_mirror_view<device_memory_space>(
+                    device_memory_space(), trg_pts_view);
+            typedef decltype(Kokkos::create_mirror_view<device_memory_space>(
+                        device_memory_space(), neighbor_lists_view_type())) 
+                                device_mirror_neighbor_lists_view_type;
+            device_mirror_neighbor_lists_view_type d_neighbor_lists = Kokkos::create_mirror_view<device_memory_space>(
+                    device_memory_space(), neighbor_lists);
+            device_mirror_neighbor_lists_view_type d_number_of_neighbors_list = Kokkos::create_mirror_view<device_memory_space>(
+                    device_memory_space(), number_of_neighbors_list);
+            typedef decltype(Kokkos::create_mirror_view<device_memory_space>(
+                        device_memory_space(), epsilons_view_type())) 
+                                device_mirror_epsilons_view_type;
+            device_mirror_epsilons_view_type d_epsilons = Kokkos::create_mirror_view<device_memory_space>(
+                    device_memory_space(), epsilons);
+            Kokkos::deep_copy(d_trg_pts_view, trg_pts_view);
+            Kokkos::deep_copy(d_neighbor_lists, neighbor_lists);
+            Kokkos::deep_copy(d_number_of_neighbors_list, number_of_neighbors_list);
+            Kokkos::deep_copy(d_epsilons, epsilons);
+            Kokkos::fence();
+
+ 
             compadre_assert_release((((int)trg_pts_view.extent(1))>=_dim) &&
                     "Target coordinates view passed to generateCRNeighborListsFromRadiusSearch must have \
                     second dimension as large as _dim.");
-            compadre_assert_release((Kokkos::SpaceAccessibility<host_execution_space, typename neighbor_lists_view_type::memory_space>::accessible==1) &&
-                    "Views passed to generateCRNeighborListsFromRadiusSearch should be accessible from the host.");
-            compadre_assert_release((Kokkos::SpaceAccessibility<host_execution_space, typename epsilons_view_type::memory_space>::accessible==1) &&
-                    "Views passed to generateCRNeighborListsFromRadiusSearch should be accessible from the host.");
 
-            // loop size
-            const int num_target_sites = trg_pts_view.extent(0);
-            if (number_of_neighbors_list.extent(0)!=(size_t)num_target_sites) {
-                Kokkos::resize(number_of_neighbors_list, num_target_sites);
+            const int num_target_sites = d_trg_pts_view.extent(0);
+            // resize 
+            if (d_number_of_neighbors_list.extent(0)!=(size_t)num_target_sites) {
+                Kokkos::resize(d_number_of_neighbors_list, num_target_sites);
             }
-            if (epsilons.extent(0)!=(size_t)num_target_sites) {
-                Kokkos::resize(epsilons, num_target_sites);
+            if (d_epsilons.extent(0)!=(size_t)num_target_sites && uniform_radius!=0.0) {
+                Kokkos::resize(d_epsilons, num_target_sites);
+            } else {
+                compadre_assert_release((d_epsilons.extent(0)==(size_t)num_target_sites) && 
+                        "This function does not populate epsilons, they must already be prepopulated.");
             }
             compadre_assert_release((neighbor_lists_view_type::rank==1) && "neighbor_lists must be a 1D Kokkos view.");
 
             // perform tree search on device
             Kokkos::View<int*, device_memory_space> d_values("values", 0);
             Kokkos::View<int*, device_memory_space> d_offsets("offsets", 0);
-            auto predicates = Radius<trg_view_type,epsilons_view_type>(
-                    trg_pts_view, epsilons,
+            auto predicates = Radius<device_mirror_trg_view_type,device_mirror_epsilons_view_type>(
+                    d_trg_pts_view, d_epsilons,
                     uniform_radius, max_search_radius);
             _tree.query(device_execution_space(), predicates, d_values, d_offsets);
             // get updated epsilons from device
-            predicates.getRadiiFromDevice(epsilons);
-            // move solution back to host accessible space 
-            // (does nothing if already host accessible)
-            auto values  = create_mirror_view(d_values);
-            auto offsets = create_mirror_view(d_offsets);
-            Kokkos::deep_copy(values,  d_values);
-            Kokkos::deep_copy(offsets, d_offsets);
-            Kokkos::fence();
-
-            // set number of neighbors list (how many neighbors for each target site) based
-            // on results on tree query
-            Kokkos::parallel_for(Kokkos::RangePolicy<host_execution_space>(0, num_target_sites),
-            KOKKOS_LAMBDA(int i) {
-                size_t neighbors_found_for_target_i = offsets(i+1) - offsets(i);
-                number_of_neighbors_list(i) = neighbors_found_for_target_i;
-            });
-            Kokkos::fence();
+            predicates.getRadiiFromDevice(d_epsilons);
 
             // sort to put closest neighbor first (other neighbors are not affected)
-            typedef Kokkos::View<double*, Kokkos::HostSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> > 
-                    scratch_double_view;
-            int team_scratch_size = 0;
-            team_scratch_size += scratch_double_view::shmem_size(trg_pts_view.extent(1)); // distances
-            Kokkos::parallel_for("first entry sort", host_team_policy(num_target_sites, Kokkos::AUTO)
-                    .set_scratch_size(0 /*shared memory level*/, Kokkos::PerTeam(team_scratch_size)), 
-                    KOKKOS_LAMBDA(const host_member_type& teamMember) {
-
-                const int i = teamMember.league_rank();
-
-                // make unmanaged scratch views
-                scratch_double_view trg_pt(teamMember.team_scratch(0 /*shared memory*/), trg_pts_view.extent(1));
-                for (int j=0; j<trg_pts_view.extent(1); ++j) {
-                    trg_pt(j) = trg_pts_view(i,j);
-                }
-
+            auto d_src_pts_view = _d_src_pts_view;
+            Kokkos::parallel_for(Kokkos::RangePolicy<device_execution_space>(0, num_target_sites),
+            KOKKOS_LAMBDA(int i) {
                 // find swap index
                 int min_distance_ind = 0;
-                float first_neighbor_distance = kdtreeDistance(trg_pt.data(), values(offsets(i)));
-                for (int j=1; j<number_of_neighbors_list(i); ++j) {
+                float first_neighbor_distance = kdtreeDistance(d_trg_pts_view, i, d_src_pts_view, d_values(d_offsets(i)));
+                d_number_of_neighbors_list(i) = d_offsets(i+1) - d_offsets(i);
+                for (int j=1; j<d_number_of_neighbors_list(i); ++j) {
                     // distance to neighbor
-                    float neighbor_distance = kdtreeDistance(trg_pt.data(), values(offsets(i)+j));
+                    float neighbor_distance = kdtreeDistance(d_trg_pts_view, i, d_src_pts_view, d_values(d_offsets(i)+j));
                     if (neighbor_distance < first_neighbor_distance) {
                         first_neighbor_distance = neighbor_distance;
                         min_distance_ind = j;
@@ -313,19 +310,29 @@ class PointCloudSearch {
                 }
                 // do the swap
                 if (min_distance_ind != 0) {
-                    int tmp = values(offsets(i));
-                    values(offsets(i)) = values(offsets(i)+min_distance_ind);
-                    values(offsets(i)+min_distance_ind) = tmp;
+                    int tmp = d_values(d_offsets(i));
+                    d_values(d_offsets(i)) = d_values(d_offsets(i)+min_distance_ind);
+                    d_values(d_offsets(i)+min_distance_ind) = tmp;
 
                 }
             });
-            Kokkos::fence();
-
+                
             // copy neighbor list values over from tree query
-            if (neighbor_lists.extent(0) != values.extent(0)) {
-                Kokkos::resize(neighbor_lists, values.extent(0));
+            if (d_neighbor_lists.extent(0) != d_values.extent(0)) {
+                Kokkos::resize(d_neighbor_lists, d_values.extent(0));
             }
-            Kokkos::deep_copy(neighbor_lists, values);
+            Kokkos::deep_copy(d_neighbor_lists, d_values);
+            Kokkos::fence();
+
+            // resize (TODO: CHECK IF RESIZE DOES ANYTHING IF ALREADY OTHER SIZE)
+            Kokkos::resize(neighbor_lists, d_neighbor_lists.extent(0));
+            Kokkos::resize(number_of_neighbors_list, d_number_of_neighbors_list.extent(0));
+            Kokkos::resize(epsilons, d_epsilons.extent(0));
+
+            // copy
+            Kokkos::deep_copy(neighbor_lists, d_neighbor_lists);
+            Kokkos::deep_copy(number_of_neighbors_list, d_number_of_neighbors_list);
+            Kokkos::deep_copy(epsilons, d_epsilons);
             Kokkos::fence();
         }
 
@@ -349,86 +356,85 @@ class PointCloudSearch {
                 epsilons_view_type& epsilons, const int neighbors_needed, const double epsilon_multiplier = 1.6, 
                 double max_search_radius = 0.0, bool check_same = true) {
 
+            // make device mirrors and copy data over to device from host (if it was not device accessible)
+            typedef decltype(Kokkos::create_mirror_view<device_memory_space>(
+                        device_memory_space(), trg_view_type()))  
+                                device_mirror_trg_view_type;
+            device_mirror_trg_view_type d_trg_pts_view = Kokkos::create_mirror_view<device_memory_space>(
+                    device_memory_space(), trg_pts_view);
+            typedef decltype(Kokkos::create_mirror_view<device_memory_space>(
+                        device_memory_space(), neighbor_lists_view_type())) 
+                                device_mirror_neighbor_lists_view_type;
+            device_mirror_neighbor_lists_view_type d_neighbor_lists = Kokkos::create_mirror_view<device_memory_space>(
+                    device_memory_space(), neighbor_lists);
+            device_mirror_neighbor_lists_view_type d_number_of_neighbors_list = Kokkos::create_mirror_view<device_memory_space>(
+                    device_memory_space(), number_of_neighbors_list);
+            typedef decltype(Kokkos::create_mirror_view<device_memory_space>(
+                        device_memory_space(), epsilons_view_type())) 
+                                device_mirror_epsilons_view_type;
+            device_mirror_epsilons_view_type d_epsilons = Kokkos::create_mirror_view<device_memory_space>(
+                    device_memory_space(), epsilons);
+            Kokkos::deep_copy(d_trg_pts_view, trg_pts_view);
+            Kokkos::deep_copy(d_neighbor_lists, neighbor_lists);
+            Kokkos::deep_copy(d_number_of_neighbors_list, number_of_neighbors_list);
+            Kokkos::deep_copy(d_epsilons, epsilons);
+            Kokkos::fence();
+
             // First, do a knn search (removes need for guessing initial search radius)
 
-            compadre_assert_release((Kokkos::SpaceAccessibility<host_execution_space, typename trg_view_type::memory_space>::accessible==1) &&
-                    "Target coordinates view passed to generateCRNeighborListsFromKNNSearch should be accessible from the host.");
             compadre_assert_release((((int)trg_pts_view.extent(1))>=_dim) &&
                     "Target coordinates view passed to generateCRNeighborListsFromRadiusSearch must have \
                     second dimension as large as _dim.");
-            compadre_assert_release((Kokkos::SpaceAccessibility<host_execution_space, typename neighbor_lists_view_type::memory_space>::accessible==1) &&
-                    "Views passed to generateCRNeighborListsFromKNNSearch should be accessible from the host.");
-            compadre_assert_release((Kokkos::SpaceAccessibility<host_execution_space, typename epsilons_view_type::memory_space>::accessible==1) &&
-                    "Views passed to generateCRNeighborListsFromKNNSearch should be accessible from the host.");
 
-            // loop size
             const int num_target_sites = trg_pts_view.extent(0);
 
-            if (number_of_neighbors_list.extent(0)!=(size_t)num_target_sites) {
-                Kokkos::resize(number_of_neighbors_list, num_target_sites);
+            if (d_number_of_neighbors_list.extent(0)!=(size_t)num_target_sites) {
+                Kokkos::resize(d_number_of_neighbors_list, num_target_sites);
             }
-            if (epsilons.extent(0)!=(size_t)num_target_sites) {
-                Kokkos::resize(epsilons, num_target_sites);
+            if (d_epsilons.extent(0)!=(size_t)num_target_sites) {
+                Kokkos::resize(d_epsilons, num_target_sites);
             }
             compadre_assert_release((neighbor_lists_view_type::rank==1) && "neighbor_lists must be a 1D Kokkos view.");
 
             // perform tree search on device
             Kokkos::View<int*, device_memory_space> d_values("values", 0);
             Kokkos::View<int*, device_memory_space> d_offsets("offsets", 0);
-            auto predicates = NearestNeighbor<trg_view_type>(trg_pts_view, neighbors_needed);
+            auto predicates = NearestNeighbor<device_mirror_trg_view_type>(d_trg_pts_view, neighbors_needed);
             _tree.query(device_execution_space(), predicates, d_values, d_offsets);
-            // move solution back to host accessible space 
-            // (does nothing if already host accessible)
-            auto values  = create_mirror_view(d_values);
-            auto offsets = create_mirror_view(d_offsets);
-            Kokkos::deep_copy(values,  d_values);
-            Kokkos::deep_copy(offsets, d_offsets);
-            Kokkos::fence();
 
+            auto d_src_pts_view = this->_d_src_pts_view;
+            // get min_num_neighbors and set enlarged epsilon sizes
             size_t min_num_neighbors = 0;
             // if no target sites, then min_num_neighbors is set to neighbors_needed
             if (num_target_sites==0) min_num_neighbors = neighbors_needed;
+            Kokkos::parallel_reduce("knn inspect", Kokkos::RangePolicy<device_execution_space>(0, num_target_sites),
+                    KOKKOS_LAMBDA(const int i, size_t& t_min_num_neighbors) {
 
-            // get min_num_neighbors
-            typedef Kokkos::View<double*, Kokkos::HostSpace, Kokkos::MemoryTraits<Kokkos::Unmanaged> > 
-                    scratch_double_view;
-            int team_scratch_size = 0;
-            team_scratch_size += scratch_double_view::shmem_size(trg_pts_view.extent(1)); // distances
-            Kokkos::parallel_reduce("knn inspect", host_team_policy(num_target_sites, Kokkos::AUTO)
-                    .set_scratch_size(0 /*shared memory level*/, Kokkos::PerTeam(team_scratch_size)), 
-                    KOKKOS_LAMBDA(const host_member_type& teamMember, size_t& t_min_num_neighbors) {
-
-                const int i = teamMember.league_rank();
-
-                size_t num_neighbors = offsets(i+1) - offsets(i);
+                size_t num_neighbors = d_offsets(i+1) - d_offsets(i);
                 t_min_num_neighbors = (num_neighbors < t_min_num_neighbors) ?
                                         num_neighbors : t_min_num_neighbors;
 
-                // make unmanaged scratch views
-                scratch_double_view trg_pt(teamMember.team_scratch(0 /*shared memory*/), trg_pts_view.extent(1));
-                for (int j=0; j<trg_pts_view.extent(1); ++j) {
-                    trg_pt(j) = trg_pts_view(i,j);
+#ifdef COMPADRE_DEBUG
+                for (int j=0; j<num_neighbors-1; ++j) {
+                    search_scalar this_distance = kdtreeDistance(d_trg_pts_view, i, d_src_pts_view, d_values(d_offsets(i)+j  ));
+                    search_scalar next_distance = kdtreeDistance(d_trg_pts_view, i, d_src_pts_view, d_values(d_offsets(i)+j+1));
+                    compadre_kernel_assert_debug((this_distance-next_distance<SEARCH_SCALAR_EPS) 
+                        && "Neighbors returned by KD tree search are not ordered.");
                 }
-                search_scalar last_neighbor_distance = kdtreeDistance(trg_pt.data(), values(offsets(i)+num_neighbors-1));
+#endif
+                search_scalar last_neighbor_distance = 
+                    kdtreeDistance(d_trg_pts_view, i, d_src_pts_view, d_values(d_offsets(i)+num_neighbors-1));
 
                 // scale by epsilon_multiplier to window from location where the last neighbor was found
-                epsilons(i) = static_cast<search_scalar>(last_neighbor_distance*epsilon_multiplier);
+                d_epsilons(i) = static_cast<search_scalar>(last_neighbor_distance*epsilon_multiplier);
                 // because radius search is inclusive of endpoints for ArborX, no need to scale zero distances
                 // as an epsilon value times the epsilon multiplier (like is done in Nanoflann where radius 
                 // searches do not pick up points radius distance from target)
 
-                compadre_kernel_assert_release((epsilons(i)<=max_search_radius || max_search_radius==0) 
+                compadre_kernel_assert_release((d_epsilons(i)<=max_search_radius || max_search_radius==0) 
                         && "max_search_radius given (generally derived from the size of a halo region), \
                             and search radius needed would exceed this max_search_radius.");
 
-#ifdef COMPADRE_DEBUG
-                Kokkos::parallel_for(Kokkos::TeamThreadRange(teamMember, num_neighbors-1), [=](const int j) {
-                    search_scalar this_distance = kdtreeDistance(trg_pt.data(), values(offsets(i)+j  ));
-                    search_scalar next_distance = kdtreeDistance(trg_pt.data(), values(offsets(i)+j+1));
-                    compadre_kernel_assert_debug((this_distance-next_distance<SEARCH_SCALAR_EPS) 
-                        && "Neighbors returned by KD tree search are not ordered.");
-                });
-#endif
             }, Kokkos::Min<size_t>(min_num_neighbors));
 
             // Next, check that we found the neighbors_needed number that we require for unisolvency
@@ -436,9 +442,20 @@ class PointCloudSearch {
                     && "Neighbor search failed to find number of neighbors needed for unisolvency.");
             
             // call a radius search using values now stored in epsilons
-            generateCRNeighborListsFromRadiusSearch(trg_pts_view, neighbor_lists, 
-                    number_of_neighbors_list, epsilons, 0.0 /*don't set uniform radius*/, 
+            generateCRNeighborListsFromRadiusSearch(d_trg_pts_view, d_neighbor_lists, 
+                    d_number_of_neighbors_list, d_epsilons, 0.0 /*don't set uniform radius*/, 
                     max_search_radius, check_same, true /*do_dry_run*/);
+
+            // resize (TODO: CHECK IF RESIZE DOES ANYTHING IF ALREADY OTHER SIZE)
+            Kokkos::resize(neighbor_lists, d_neighbor_lists.extent(0));
+            Kokkos::resize(number_of_neighbors_list, d_number_of_neighbors_list.extent(0));
+            Kokkos::resize(epsilons, d_epsilons.extent(0));
+
+            // copy
+            Kokkos::deep_copy(neighbor_lists, d_neighbor_lists);
+            Kokkos::deep_copy(number_of_neighbors_list, d_number_of_neighbors_list);
+            Kokkos::deep_copy(epsilons, d_epsilons);
+            Kokkos::fence();
         }
 
         /*! \brief Generates neighbor lists of 2D view by performing a radius search 

From 2b66847cea3811ad56ce298811b66b72a5247f09 Mon Sep 17 00:00:00 2001
From: Paul Kuberry <pakuber@sandia.gov>
Date: Mon, 4 Oct 2021 07:54:01 -0600
Subject: [PATCH 32/40] Make resizes conditional on size check for ArborX

---
 src/Compadre_PointCloudSearch_ArborX.hpp | 28 +++++++++++++++++-------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/Compadre_PointCloudSearch_ArborX.hpp b/src/Compadre_PointCloudSearch_ArborX.hpp
index a9182e42d..56f44382f 100644
--- a/src/Compadre_PointCloudSearch_ArborX.hpp
+++ b/src/Compadre_PointCloudSearch_ArborX.hpp
@@ -324,10 +324,16 @@ class PointCloudSearch {
             Kokkos::deep_copy(d_neighbor_lists, d_values);
             Kokkos::fence();
 
-            // resize (TODO: CHECK IF RESIZE DOES ANYTHING IF ALREADY OTHER SIZE)
-            Kokkos::resize(neighbor_lists, d_neighbor_lists.extent(0));
-            Kokkos::resize(number_of_neighbors_list, d_number_of_neighbors_list.extent(0));
-            Kokkos::resize(epsilons, d_epsilons.extent(0));
+            // resize, if needed
+            if (neighbor_lists.extent(0) != d_neighbor_lists.extent(0)) {
+                Kokkos::resize(neighbor_lists, d_neighbor_lists.extent(0));
+            }
+            if (number_of_neighbors_list.extent(0) != d_number_of_neighbors_list.extent(0)) {
+                Kokkos::resize(number_of_neighbors_list, d_number_of_neighbors_list.extent(0));
+            }
+            if (epsilons.extent(0) != d_epsilons.extent(0)) {
+                Kokkos::resize(epsilons, d_epsilons.extent(0));
+            }
 
             // copy
             Kokkos::deep_copy(neighbor_lists, d_neighbor_lists);
@@ -446,10 +452,16 @@ class PointCloudSearch {
                     d_number_of_neighbors_list, d_epsilons, 0.0 /*don't set uniform radius*/, 
                     max_search_radius, check_same, true /*do_dry_run*/);
 
-            // resize (TODO: CHECK IF RESIZE DOES ANYTHING IF ALREADY OTHER SIZE)
-            Kokkos::resize(neighbor_lists, d_neighbor_lists.extent(0));
-            Kokkos::resize(number_of_neighbors_list, d_number_of_neighbors_list.extent(0));
-            Kokkos::resize(epsilons, d_epsilons.extent(0));
+            // resize, if needed
+            if (neighbor_lists.extent(0) != d_neighbor_lists.extent(0)) {
+                Kokkos::resize(neighbor_lists, d_neighbor_lists.extent(0));
+            }
+            if (number_of_neighbors_list.extent(0) != d_number_of_neighbors_list.extent(0)) {
+                Kokkos::resize(number_of_neighbors_list, d_number_of_neighbors_list.extent(0));
+            }
+            if (epsilons.extent(0) != d_epsilons.extent(0)) {
+                Kokkos::resize(epsilons, d_epsilons.extent(0));
+            }
 
             // copy
             Kokkos::deep_copy(neighbor_lists, d_neighbor_lists);

From 46191bdb55f0870de59e0fa12fb6c183e725a0a7 Mon Sep 17 00:00:00 2001
From: Paul Kuberry <pakuber@sandia.gov>
Date: Mon, 4 Oct 2021 11:12:17 -0600
Subject: [PATCH 33/40] Remove unneeded fences following deep_copy

---
 src/Compadre_PointCloudSearch_ArborX.hpp | 28 ++++++++++++++----------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/Compadre_PointCloudSearch_ArborX.hpp b/src/Compadre_PointCloudSearch_ArborX.hpp
index 56f44382f..f58a54fea 100644
--- a/src/Compadre_PointCloudSearch_ArborX.hpp
+++ b/src/Compadre_PointCloudSearch_ArborX.hpp
@@ -258,11 +258,12 @@ class PointCloudSearch {
                                 device_mirror_epsilons_view_type;
             device_mirror_epsilons_view_type d_epsilons = Kokkos::create_mirror_view<device_memory_space>(
                     device_memory_space(), epsilons);
-            Kokkos::deep_copy(d_trg_pts_view, trg_pts_view);
-            Kokkos::deep_copy(d_neighbor_lists, neighbor_lists);
-            Kokkos::deep_copy(d_number_of_neighbors_list, number_of_neighbors_list);
-            Kokkos::deep_copy(d_epsilons, epsilons);
-            Kokkos::fence();
+            Kokkos::deep_copy(device_execution_space(), d_trg_pts_view, trg_pts_view);
+            Kokkos::deep_copy(device_execution_space(), d_neighbor_lists, neighbor_lists);
+            Kokkos::deep_copy(device_execution_space(), d_number_of_neighbors_list, number_of_neighbors_list);
+            Kokkos::deep_copy(device_execution_space(), d_epsilons, epsilons);
+            // deep_copy with execution space comes with guarantee that no instructions will be executed 
+            // in the execution space before the deep_copy is complete
 
  
             compadre_assert_release((((int)trg_pts_view.extent(1))>=_dim) &&
@@ -339,7 +340,8 @@ class PointCloudSearch {
             Kokkos::deep_copy(neighbor_lists, d_neighbor_lists);
             Kokkos::deep_copy(number_of_neighbors_list, d_number_of_neighbors_list);
             Kokkos::deep_copy(epsilons, d_epsilons);
-            Kokkos::fence();
+            // deep_copy without execution space comes with guarantee that when deep_copy
+            // completes, the host information will be up-to-date
         }
 
         /*! \brief Generates compressed row neighbor lists by performing a k-nearest neighbor search
@@ -380,11 +382,12 @@ class PointCloudSearch {
                                 device_mirror_epsilons_view_type;
             device_mirror_epsilons_view_type d_epsilons = Kokkos::create_mirror_view<device_memory_space>(
                     device_memory_space(), epsilons);
-            Kokkos::deep_copy(d_trg_pts_view, trg_pts_view);
-            Kokkos::deep_copy(d_neighbor_lists, neighbor_lists);
-            Kokkos::deep_copy(d_number_of_neighbors_list, number_of_neighbors_list);
-            Kokkos::deep_copy(d_epsilons, epsilons);
-            Kokkos::fence();
+            Kokkos::deep_copy(device_execution_space(), d_trg_pts_view, trg_pts_view);
+            Kokkos::deep_copy(device_execution_space(), d_neighbor_lists, neighbor_lists);
+            Kokkos::deep_copy(device_execution_space(), d_number_of_neighbors_list, number_of_neighbors_list);
+            Kokkos::deep_copy(device_execution_space(), d_epsilons, epsilons);
+            // deep_copy with execution space comes with guarantee that no instructions will be executed 
+            // in the execution space before the deep_copy is complete
 
             // First, do a knn search (removes need for guessing initial search radius)
 
@@ -467,7 +470,8 @@ class PointCloudSearch {
             Kokkos::deep_copy(neighbor_lists, d_neighbor_lists);
             Kokkos::deep_copy(number_of_neighbors_list, d_number_of_neighbors_list);
             Kokkos::deep_copy(epsilons, d_epsilons);
-            Kokkos::fence();
+            // deep_copy without execution space comes with guarantee that when deep_copy
+            // completes, the host information will be up-to-date
         }
 
         /*! \brief Generates neighbor lists of 2D view by performing a radius search 

From f4c9a3aa0cc3375f4959f8062219d9505a09858d Mon Sep 17 00:00:00 2001
From: Paul Kuberry <pakuber@sandia.gov>
Date: Mon, 4 Oct 2021 13:28:48 -0600
Subject: [PATCH 34/40] Explicitly add ArborX to Compadre_EXT_DEPS list and set
 PREFIX

---
 examples/GMLS_Tutorial.hpp | 2 +-
 src/CMakeLists.txt         | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/examples/GMLS_Tutorial.hpp b/examples/GMLS_Tutorial.hpp
index bee612fd9..fa31967d3 100644
--- a/examples/GMLS_Tutorial.hpp
+++ b/examples/GMLS_Tutorial.hpp
@@ -2,7 +2,7 @@
 #define _GMLS_TUTORIAL_HPP_
 
 #include <Kokkos_Core.hpp>
-#include <basis/Compadre_DivergenceFreePolynomial.hpp>
+#include <Compadre_DivergenceFreePolynomial.hpp>
 #include <Compadre_GMLS.hpp>
 
 KOKKOS_INLINE_FUNCTION
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4161b9765..dbd53440b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -59,6 +59,9 @@ if (Compadre_USE_ARBORX)
   option(ARBORX_ENABLE_MPI "" OFF)
   set(ARBORX_ENABLE_MPI OFF)
   add_subdirectory(tpl/arborx)
+  set(ArborX_PREFIX ${CMAKE_INSTALL_PREFIX} PARENT_SCOPE)
+  list(APPEND Compadre_EXT_DEPS ArborX)
+  set(Compadre_EXT_DEPS ${Compadre_EXT_DEPS} PARENT_SCOPE)
   target_link_libraries(compadre PUBLIC ArborX::ArborX)
 endif()
 
@@ -82,7 +85,6 @@ set(COMPADRE_TPL
 )
 
 install(FILES ${COMPADRE_TPL} DESTINATION include/tpl)
-
 install(FILES ${COMPADRE_HEADERS} DESTINATION include)
 
 bob_end_subdir()

From 6927e7eff96fe2432807aea9310a5ab254e7b235 Mon Sep 17 00:00:00 2001
From: Paul Kuberry <pakuber@sandia.gov>
Date: Mon, 4 Oct 2021 19:51:53 -0600
Subject: [PATCH 35/40] Set CMAKE_BUILD_TYPE to "" to avoid default of
 ReleaseWithDebInfo from ArborX

---
 CMakeLists.txt              | 12 ++++++++++++
 src/Compadre_Quadrature.hpp |  1 +
 src/Compadre_Typedefs.hpp   | 29 +++++++++++++++--------------
 3 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 036d15868..8cb2b0fbf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -80,6 +80,18 @@ else() # Raw CMake Project
   SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
   SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
   SET(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_LIBDIR} ${CMAKE_INSTALL_RPATH})
+  if (NOT(CMAKE_BUILD_TYPE))
+    set(CMAKE_BUILD_TYPE "")
+  endif()
+  if (CMAKE_BUILD_TYPE STREQUAL "")
+    if (NOT(CMAKE_CXX_FLAGS) OR (CMAKE_CXX_FLAGS STREQUAL ""))
+      set(CMAKE_CXX_FLAGS " -O3 -g")
+    endif()
+    message(STATUS "CMAKE_CXX_FLAGS: ${CMAKE_CXX_FLAGS}")
+  else()
+      string(TOUPPER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_UPPER)
+      message(STATUS "CMAKE_CXX_FLAGS: ${CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE_UPPER}} ${CMAKE_CXX_FLAGS}")
+  endif()
 
   # RPATH should always include the folder it is called from
   bob_option(PYTHON_CALLING_BUILD "Python setuptools calling build" OFF)
diff --git a/src/Compadre_Quadrature.hpp b/src/Compadre_Quadrature.hpp
index 7c7903f12..aad86bd81 100644
--- a/src/Compadre_Quadrature.hpp
+++ b/src/Compadre_Quadrature.hpp
@@ -3229,6 +3229,7 @@ class Quadrature {
             return QuadratureType::INVALID;
         } else {
             compadre_assert_release(false && "Quadrature type not available.");
+            return QuadratureType::INVALID;
         }
     }
 
diff --git a/src/Compadre_Typedefs.hpp b/src/Compadre_Typedefs.hpp
index d809a841b..e8dcbd1c8 100644
--- a/src/Compadre_Typedefs.hpp
+++ b/src/Compadre_Typedefs.hpp
@@ -117,13 +117,11 @@ template<typename T>
 typename std::enable_if<2==T::rank,T>::type createView(std::string str, int dim_0, int dim_1)
 { return T(str, dim_0, dim_1); }
 
-//void compadre_rethrow_exception(std::exception &e, const std::string &extra_message) {
-//    std::cout << extra_message + "\n\n" + e.what() << std::endl;
-//}
 
 //! compadre_assert_release is used for assertions that should always be checked, but generally 
 //! are not expensive to verify or are not called frequently. 
-# define compadre_assert_release(condition) do {                                \
+#ifndef NDEBUG
+# define compadre_assert_release(condition) do {                        \
     if ( ! (condition)) {                                               \
       std::stringstream _ss_;                                           \
       _ss_ << __FILE__ << ":" << __LINE__ << ": FAIL:\n" << #condition  \
@@ -131,18 +129,21 @@ typename std::enable_if<2==T::rank,T>::type createView(std::string str, int dim_
         throw std::logic_error(_ss_.str());                             \
     }                                                                   \
   } while (0)
-
 //! compadre_kernel_assert_release is similar to compadre_assert_release, but is a call on the device, 
 //! namely inside of a function marked KOKKOS_INLINE_FUNCTION
 # define compadre_kernel_assert_release(condition) do { \
-    if ( ! (condition))                         \
-      Kokkos::abort(#condition);                \
+    if ( ! (condition))                                 \
+        Kokkos::abort(#condition);                      \
   } while (0)
+#else
+#  define compadre_assert_release(condition)
+#  define compadre_kernel_assert_release(condition)
+#endif
 
 //! compadre_assert_debug is used for assertions that are checked in loops, as these significantly
 //! impact performance. When NDEBUG is set, these conditions are not checked.
-#ifdef COMPADRE_DEBUG
-# define compadre_assert_debug(condition) do {                                \
+#if defined(COMPADRE_DEBUG) || defined(DDEBUG)
+# define compadre_assert_debug(condition) do {                          \
     if ( ! (condition)) {                                               \
       std::stringstream _ss_;                                           \
       _ss_ << __FILE__ << ":" << __LINE__ << ": FAIL:\n" << #condition  \
@@ -151,8 +152,8 @@ typename std::enable_if<2==T::rank,T>::type createView(std::string str, int dim_
     }                                                                   \
   } while (0)
 # define compadre_kernel_assert_debug(condition) do { \
-    if ( ! (condition))                         \
-      Kokkos::abort(#condition);                \
+    if ( ! (condition))                               \
+      Kokkos::abort(#condition);                      \
   } while (0)
 #else
 #  define compadre_assert_debug(condition)
@@ -162,7 +163,7 @@ typename std::enable_if<2==T::rank,T>::type createView(std::string str, int dim_
 //! namely inside of a function marked KOKKOS_INLINE_FUNCTION
 
 #ifdef COMPADRE_EXTREME_DEBUG
-# define compadre_assert_extreme_debug(condition) do {                                \
+# define compadre_assert_extreme_debug(condition) do {                  \
     if ( ! (condition)) {                                               \
       std::stringstream _ss_;                                           \
       _ss_ << __FILE__ << ":" << __LINE__ << ": FAIL:\n" << #condition  \
@@ -171,8 +172,8 @@ typename std::enable_if<2==T::rank,T>::type createView(std::string str, int dim_
     }                                                                   \
   } while (0)
 # define compadre_kernel_assert_extreme_debug(condition) do { \
-    if ( ! (condition))                         \
-      Kokkos::abort(#condition);                \
+    if ( ! (condition))                                       \
+      Kokkos::abort(#condition);                              \
   } while (0)
 #else
 #  define compadre_assert_extreme_debug(condition)

From c094150bd741eaee8d1eda46e6b519de5a6e96ab Mon Sep 17 00:00:00 2001
From: Paul Kuberry <pakuber@sandia.gov>
Date: Mon, 4 Oct 2021 20:12:11 -0600
Subject: [PATCH 36/40] Refactored quadrature choice to avoid compiler warnings

---
 src/Compadre_Quadrature.hpp | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/Compadre_Quadrature.hpp b/src/Compadre_Quadrature.hpp
index aad86bd81..3dfd0d2fc 100644
--- a/src/Compadre_Quadrature.hpp
+++ b/src/Compadre_Quadrature.hpp
@@ -3221,16 +3221,20 @@ class Quadrature {
 
     static QuadratureType parseQuadratureType(std::string quadrature_type) { 
         transform(quadrature_type.begin(), quadrature_type.end(), quadrature_type.begin(), ::tolower);
+        bool valid_choice = true;
+        QuadratureType qt;
         if (quadrature_type=="line") {
-            return QuadratureType::LINE;
+            qt = QuadratureType::LINE;
         } else if (quadrature_type=="tri" || quadrature_type=="triangle") {
-            return QuadratureType::TRI;
+            qt = QuadratureType::TRI;
         } else if (quadrature_type=="") {
-            return QuadratureType::INVALID;
+            qt = QuadratureType::INVALID;
         } else {
-            compadre_assert_release(false && "Quadrature type not available.");
-            return QuadratureType::INVALID;
+            qt = QuadratureType::INVALID;
+            valid_choice = false;
         }
+        compadre_assert_release(valid_choice && "Quadrature type not available.");
+        return qt;
     }
 
 ///@}

From 034fcb1653557ed2563851d70301a98980823080 Mon Sep 17 00:00:00 2001
From: Paul Kuberry <pkuberry@gmail.com>
Date: Thu, 28 Oct 2021 14:41:16 -0600
Subject: [PATCH 37/40] Add default constructor to Points struct - Changed a
 type to a decltype

---
 src/Compadre_PointCloudSearch_ArborX.hpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/Compadre_PointCloudSearch_ArborX.hpp b/src/Compadre_PointCloudSearch_ArborX.hpp
index f58a54fea..525abe519 100644
--- a/src/Compadre_PointCloudSearch_ArborX.hpp
+++ b/src/Compadre_PointCloudSearch_ArborX.hpp
@@ -18,6 +18,8 @@ struct Points {
         Kokkos::deep_copy(_pts, pts);
         Kokkos::fence();
     }
+
+    Points() {}
 };
 
 template <typename view_type>
@@ -198,6 +200,7 @@ class PointCloudSearch {
                     device_memory_space(), view_type())) 
                             device_mirror_view_type;
         device_mirror_view_type _d_src_pts_view;
+        Points<device_mirror_view_type> _pts;
         local_index_type _dim;
         ArborX::BVH<device_memory_space> _tree;
 
@@ -211,8 +214,8 @@ class PointCloudSearch {
                         device_memory_space(), src_pts_view);
                 Kokkos::deep_copy(_d_src_pts_view, src_pts_view);
                 Kokkos::fence();
-                _tree = ArborX::BVH<device_memory_space>(device_execution_space(), 
-                                Points<device_mirror_view_type>(_d_src_pts_view));
+                _pts = Points<decltype(_d_src_pts_view)>(_d_src_pts_view);
+                _tree = ArborX::BVH<device_memory_space>(device_execution_space(), _pts); 
             }
         };
     

From 4553d7a8c9919cbe5d5464b2ea69a164c96ec1fd Mon Sep 17 00:00:00 2001
From: Paul Kuberry <pakuber@sandia.gov>
Date: Sat, 30 Oct 2021 19:52:50 -0600
Subject: [PATCH 38/40] Change KOKKOS_LAMBDAs on host to [&]

---
 examples/NeighborSearchTest.cpp | 6 +++---
 src/Compadre_NeighborLists.hpp  | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/examples/NeighborSearchTest.cpp b/examples/NeighborSearchTest.cpp
index f70758aae..4e734d12a 100644
--- a/examples/NeighborSearchTest.cpp
+++ b/examples/NeighborSearchTest.cpp
@@ -272,7 +272,7 @@ bool all_passed = true;
             num_passed = 0;
             // check that all neighbors in point cloud search list are in brute force list
             Kokkos::parallel_reduce("original in brute force search", Kokkos::RangePolicy<Kokkos::DefaultHostExecutionSpace>
-                    (0,number_target_coords), KOKKOS_LAMBDA(const int i, int& t_num_passed) {
+                    (0,number_target_coords), [&](const int i, int& t_num_passed) {
                 bool all_found = true;
                 for (int j=0; j<nla.getNumberOfNeighborsHost(i); ++j) {
                     if (brute_force_neighbor_list[i].count(nla.getNeighborHost(i,j))!=1) {
@@ -386,7 +386,7 @@ bool all_passed = true;
             num_passed = 0;
             // check that all neighbors in point cloud search list are in brute force list
             Kokkos::parallel_reduce("original in brute force search", Kokkos::RangePolicy<Kokkos::DefaultHostExecutionSpace>
-                    (0,number_target_coords), KOKKOS_LAMBDA(const int i, int& t_num_passed) {
+                    (0,number_target_coords), [&](const int i, int& t_num_passed) {
                 bool all_found = true;
                 for (int j=1; j<=neighbor_lists(i,0); ++j) {
                     if (brute_force_neighbor_list[i].count(neighbor_lists(i,j))!=1) {
@@ -504,7 +504,7 @@ bool all_passed = true;
             num_passed = 0;
             // check that all neighbors in point cloud search list are in brute force list
             Kokkos::parallel_reduce("original in brute force search", Kokkos::RangePolicy<Kokkos::DefaultHostExecutionSpace>
-                    (0,number_target_coords), KOKKOS_LAMBDA(const int i, int& t_num_passed) {
+                    (0,number_target_coords), [&](const int i, int& t_num_passed) {
                 bool all_found = true;
                 for (int j=0; j<nla.getNumberOfNeighborsHost(i); ++j) {
                     if (brute_force_neighbor_list[i].count(nla.getNeighborHost(i,j))!=1) {
diff --git a/src/Compadre_NeighborLists.hpp b/src/Compadre_NeighborLists.hpp
index 7e520fee3..8634e5b33 100644
--- a/src/Compadre_NeighborLists.hpp
+++ b/src/Compadre_NeighborLists.hpp
@@ -363,7 +363,7 @@ NeighborLists<view_type_1d> Convert2DToCompressedRowNeighborLists(view_type_2d n
     // (which we know is host) so we can do a parallel_for over the host_execution_space
     else {
         Kokkos::parallel_for("copy neighbor lists to compressed row", Kokkos::RangePolicy<host_execution_space>(0, neighbor_lists.extent(0)), 
-                KOKKOS_LAMBDA(const int i) {
+                [&](const int i) {
             for (int j=0; j<neighbor_lists(i,0); ++j) {
                 cr_data(nla.getRowOffsetHost(i)+j) = d_neighbor_lists(i,j+1);
             }
@@ -417,7 +417,7 @@ void ConvertCompressedRowNeighborListsTo2D(const NeighborLists<view_type_1d>& nl
     // (which we know is host) so we can do a parallel_for over the host_execution_space
     else {
         Kokkos::parallel_for("copy compressed row to neighbor lists 2d", Kokkos::RangePolicy<host_execution_space>(0, num_targets), 
-                KOKKOS_LAMBDA(const int i) {
+                [&](const int i) {
             for (int j=0; j<nla.getNumberOfNeighborsHost(i); ++j) {
                 neighbor_lists_2d(i,  0) = nla.getNumberOfNeighborsHost(i);
                 neighbor_lists_2d(i,j+1) = nla.getNeighborHost(i,j);

From c421afebb420b26c2d5e5aef6d127aebffebe099 Mon Sep 17 00:00:00 2001
From: Paul Kuberry <pakuber@sandia.gov>
Date: Mon, 1 Nov 2021 07:28:47 -0600
Subject: [PATCH 39/40] Remove several unneeded deep_copy's in
 PointCloudSearch_ArborX

---
 src/Compadre_PointCloudSearch_ArborX.hpp | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/Compadre_PointCloudSearch_ArborX.hpp b/src/Compadre_PointCloudSearch_ArborX.hpp
index 525abe519..98f3c9117 100644
--- a/src/Compadre_PointCloudSearch_ArborX.hpp
+++ b/src/Compadre_PointCloudSearch_ArborX.hpp
@@ -262,9 +262,10 @@ class PointCloudSearch {
             device_mirror_epsilons_view_type d_epsilons = Kokkos::create_mirror_view<device_memory_space>(
                     device_memory_space(), epsilons);
             Kokkos::deep_copy(device_execution_space(), d_trg_pts_view, trg_pts_view);
-            Kokkos::deep_copy(device_execution_space(), d_neighbor_lists, neighbor_lists);
-            Kokkos::deep_copy(device_execution_space(), d_number_of_neighbors_list, number_of_neighbors_list);
-            Kokkos::deep_copy(device_execution_space(), d_epsilons, epsilons);
+            if (uniform_radius==0.0) {
+                // if not uniform, then epsilons contains radius values
+                Kokkos::deep_copy(device_execution_space(), d_epsilons, epsilons);
+            }
             // deep_copy with execution space comes with guarantee that no instructions will be executed 
             // in the execution space before the deep_copy is complete
 
@@ -386,9 +387,6 @@ class PointCloudSearch {
             device_mirror_epsilons_view_type d_epsilons = Kokkos::create_mirror_view<device_memory_space>(
                     device_memory_space(), epsilons);
             Kokkos::deep_copy(device_execution_space(), d_trg_pts_view, trg_pts_view);
-            Kokkos::deep_copy(device_execution_space(), d_neighbor_lists, neighbor_lists);
-            Kokkos::deep_copy(device_execution_space(), d_number_of_neighbors_list, number_of_neighbors_list);
-            Kokkos::deep_copy(device_execution_space(), d_epsilons, epsilons);
             // deep_copy with execution space comes with guarantee that no instructions will be executed 
             // in the execution space before the deep_copy is complete
 

From ee0cf02f8a146907c2a19831390c2902f41d6b8c Mon Sep 17 00:00:00 2001
From: Paul Kuberry <pakuber@sandia.gov>
Date: Mon, 1 Nov 2021 15:49:05 -0600
Subject: [PATCH 40/40] Fix Kokkos:Serial copy typo

---
 src/tpl/arborx/src/details/ArborX_DetailsSortUtils.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/tpl/arborx/src/details/ArborX_DetailsSortUtils.hpp b/src/tpl/arborx/src/details/ArborX_DetailsSortUtils.hpp
index 15ed02a55..b3c9df0e1 100644
--- a/src/tpl/arborx/src/details/ArborX_DetailsSortUtils.hpp
+++ b/src/tpl/arborx/src/details/ArborX_DetailsSortUtils.hpp
@@ -262,7 +262,7 @@ sortObjects(Kokkos::Threads const &space, ViewType &view)
 // NOTE returns the permutation indices **and** sorts the input view
 template <typename ViewType, class SizeType = unsigned int>
 Kokkos::View<SizeType *, typename ViewType::device_type>
-sortObjects(Kokkos::Threads const &space, ViewType &view)
+sortObjects(Kokkos::Serial const &space, ViewType &view)
 {
   static_assert(KokkosExt::is_accessible_from<typename ViewType::memory_space,
                                               Kokkos::Serial>::value,