algorithms: separate nonseq ops, rename for consistency

algorithms/src/Kokkos_StdAlgorithms.hpp

@@ -48,11 +48,12 @@
 /// \file Kokkos_StdAlgorithms.hpp
 /// \brief Kokkos counterparts for Standard C++ Library algorithms
 
-#include <std_algorithms/Kokkos_StdAlgorithmsConstraints.hpp>
+#include <std_algorithms/Kokkos_Constraints.hpp>
 #include <std_algorithms/Kokkos_RandomAccessIterator.hpp>
 #include <std_algorithms/Kokkos_BeginEnd.hpp>
 
 #include <std_algorithms/Kokkos_MinMaxOperations.hpp>
+#include "std_algorithms/Kokkos_ModifyingOperations.hpp"
 #include <std_algorithms/Kokkos_ModifyingSequenceOperations.hpp>
 #include <std_algorithms/Kokkos_NonModifyingSequenceOperations.hpp>
 #include <std_algorithms/Kokkos_MinMaxElementOperations.hpp>

algorithms/src/std_algorithms/Kokkos_BeginEnd.hpp

@@ -47,7 +47,7 @@
 
 #include <Kokkos_View.hpp>
 #include "Kokkos_RandomAccessIterator.hpp"
-#include "Kokkos_StdAlgorithmsConstraints.hpp"
+#include "Kokkos_Constraints.hpp"
 
 /// \file Kokkos_BeginEnd.hpp
 /// \brief Kokkos begin, enc, cbegin, cend

algorithms/src/std_algorithms/Kokkos_MinMaxElementOperations.hpp

@@ -47,8 +47,8 @@
 
 #include <Kokkos_Core.hpp>
 #include "Kokkos_BeginEnd.hpp"
-#include "Kokkos_StdAlgorithmsConstraints.hpp"
-#include "Kokkos_ModifyingSequenceOperations.hpp"
+#include "Kokkos_Constraints.hpp"
+#include "Kokkos_ModifyingOperations.hpp"
 
 /// \file Kokkos_MinMaxElementOperations.hpp
 /// \brief Kokkos min/max element operations

algorithms/src/std_algorithms/Kokkos_ModifyingOperations.hpp

@@ -0,0 +1,117 @@
+/*
+//@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_MODIFYING_OPERATIONS_HPP
+#define KOKKOS_MODIFYING_OPERATIONS_HPP
+
+#include <Kokkos_Core.hpp>
+#include "Kokkos_BeginEnd.hpp"
+#include "Kokkos_Constraints.hpp"
+
+/// \file Kokkos_ModifyingOperations.hpp
+/// \brief Kokkos modifying operations
+
+namespace Kokkos {
+namespace Experimental {
+
+// see https://github.com/kokkos/kokkos/issues/4075
+//
+// move
+// swap
+// iter_swap
+
+// move
+template <typename T>
+KOKKOS_INLINE_FUNCTION std::remove_reference_t<T>&& move(T&& t) {
+  return static_cast<std::remove_reference_t<T>&&>(t);
+}
+
+// swap
+template <class T>
+KOKKOS_INLINE_FUNCTION void swap(T& a, T& b) noexcept {
+  static_assert(
+      std::is_move_assignable<T>::value && std::is_move_constructible<T>::value,
+      "Kokkos::Experimental::swap arguments must be move assignable "
+      "and move constructible");
+
+  T tmp = ::Kokkos::Experimental::move(a);
+  a     = ::Kokkos::Experimental::move(b);
+  b     = ::Kokkos::Experimental::move(tmp);
+}
+
+//----------------------------------------------------------------------------
+namespace Impl{
+template <class IteratorType1, class IteratorType2>
+struct StdIterSwapFunctor {
+  IteratorType1 m_a;
+  IteratorType2 m_b;
+
+  KOKKOS_INLINE_FUNCTION
+  void operator()(int i) const {
+    (void)i;
+    ::Kokkos::Experimental::swap(*m_a, *m_b);
+  }
+
+  KOKKOS_INLINE_FUNCTION
+  StdIterSwapFunctor(IteratorType1 _a, IteratorType2 _b) : m_a(_a), m_b(_b) {}
+};
+
+template <class IteratorType1, class IteratorType2>
+KOKKOS_INLINE_FUNCTION void iter_swap_impl(IteratorType1 a, IteratorType2 b) {
+  Kokkos::parallel_for(1,
+                       StdIterSwapFunctor<IteratorType1, IteratorType2>(a, b));
+}
+}  // namespace Impl
+//----------------------------------------------------------------------------
+
+// iter_swap
+template <class IteratorType1, class IteratorType2>
+KOKKOS_INLINE_FUNCTION void iter_swap(IteratorType1 a, IteratorType2 b) {
+  Impl::iter_swap_impl(a, b);
+}
+
+}  // namespace Experimental
+}  // namespace Kokkos
+
+#endif

algorithms/src/std_algorithms/Kokkos_ModifyingSequenceOperations.hpp

@@ -47,7 +47,8 @@
 
 #include <Kokkos_Core.hpp>
 #include "Kokkos_BeginEnd.hpp"
-#include "Kokkos_StdAlgorithmsConstraints.hpp"
+#include "Kokkos_Constraints.hpp"
+#include "Kokkos_ModifyingOperations.hpp"
 
 /// \file Kokkos_ModifyingSequenceOperations.hpp
 /// \brief Kokkos modifying sequence operations
@@ -61,24 +62,16 @@ namespace Experimental {
 // copy_if
 // copy_n
 // copy_backward
-// move
+// move (interval of iterators)
 // move_backward
 // fill
 // fill_n
 // transform
 // generate
 // generate_n
-// swap
 // swap_ranges
-// iter_swap
 // reverse_copy
 
-template <typename T>
-KOKKOS_INLINE_FUNCTION std::remove_reference_t<T>&& move(T&& t);
-
-template <class T>
-KOKKOS_INLINE_FUNCTION void swap(T& a, T& b) noexcept;
-
 namespace Impl {
 
 template <class InputIterator, class OutputIterator>
@@ -349,29 +342,7 @@ KOKKOS_INLINE_FUNCTION IteratorType2 swap_ranges_impl(IteratorType1 first1,
   return first2 + numOfElementsToSwap;
 }
 
-template <class IteratorType1, class IteratorType2>
-struct StdIterSwapFunctor {
-  IteratorType1 m_a;
-  IteratorType2 m_b;
-
-  KOKKOS_INLINE_FUNCTION
-  void operator()(int i) const {
-    (void)i;
-    ::Kokkos::Experimental::swap(*m_a, *m_b);
-  }
-
-  KOKKOS_INLINE_FUNCTION
-  StdIterSwapFunctor(IteratorType1 _a, IteratorType2 _b) : m_a(_a), m_b(_b) {}
-};
-
-template <class IteratorType1, class IteratorType2>
-KOKKOS_INLINE_FUNCTION void iter_swap_impl(IteratorType1 a, IteratorType2 b) {
-  Kokkos::parallel_for(1,
-                       StdIterSwapFunctor<IteratorType1, IteratorType2>(a, b));
-}
-
 }  // namespace Impl
-
 //----------------------------------------------------------------------------
 
 // -------------------
@@ -556,11 +527,6 @@ auto generate_n(const Kokkos::View<DataType, Properties...>& view, Size count,
 // ----------------------
 // move
 // ----------------------
-template <typename T>
-KOKKOS_INLINE_FUNCTION std::remove_reference_t<T>&& move(T&& t) {
-  return static_cast<std::remove_reference_t<T>&&>(t);
-}
-
 template <class InputIterator, class OutputIterator>
 OutputIterator move(InputIterator first, InputIterator last,
                     OutputIterator d_first) {
@@ -596,29 +562,6 @@ auto move_backward(const Kokkos::View<DataType1, Properties1...>& source,
   return Impl::move_backward_impl(begin(source), end(source), end(dest));
 }
 
-// ----------------------
-// swap
-// ----------------------
-template <class T>
-KOKKOS_INLINE_FUNCTION void swap(T& a, T& b) noexcept {
-  static_assert(
-      std::is_move_assignable<T>::value && std::is_move_constructible<T>::value,
-      "Kokkos::Experimental::swap arguments must be move assignable "
-      "and move constructible");
-
-  T tmp = ::Kokkos::Experimental::move(a);
-  a     = ::Kokkos::Experimental::move(b);
-  b     = ::Kokkos::Experimental::move(tmp);
-}
-
-// ----------------------
-// iter_swap
-// ----------------------
-template <class IteratorType1, class IteratorType2>
-KOKKOS_INLINE_FUNCTION void iter_swap(IteratorType1 a, IteratorType2 b) {
-  Impl::iter_swap_impl(a, b);
-}
-
 // ----------------------
 // swap_ranges
 // ----------------------

algorithms/src/std_algorithms/Kokkos_NonModifyingSequenceOperations.hpp

@@ -47,8 +47,8 @@
 
 #include <Kokkos_Core.hpp>
 #include "Kokkos_BeginEnd.hpp"
-#include "Kokkos_StdAlgorithmsConstraints.hpp"
-#include "Kokkos_ModifyingSequenceOperations.hpp"
+#include "Kokkos_Constraints.hpp"
+#include "Kokkos_ModifyingOperations.hpp"
 
 /// \file Kokkos_NonModifyingSequenceOperations.hpp
 /// \brief Kokkos non-modifying sequence operations

algorithms/src/std_algorithms/Kokkos_PartitioningOperations.hpp

@@ -47,9 +47,9 @@
 
 #include <Kokkos_Core.hpp>
 #include "Kokkos_BeginEnd.hpp"
-#include "Kokkos_StdAlgorithmsConstraints.hpp"
+#include "Kokkos_Constraints.hpp"
 #include "Kokkos_MinMaxOperations.hpp"
-#include "Kokkos_ModifyingSequenceOperations.hpp"
+#include "Kokkos_ModifyingOperations.hpp"
 #include "Kokkos_NonModifyingSequenceOperations.hpp"
 
 /// \file Kokkos_PartitionsOperations.hpp

algorithms/unit_tests/CMakeLists.txt

@@ -37,9 +37,11 @@ ENDIF()
 SET(ALGORITHM UnitTestMain.cpp)
 
 LIST(APPEND ALGORITHM_SOURCES
-  TestStdAlgorithmsNonModSeqOps.cpp
+  TestStdAlgorithmsModOps.cpp
   TestStdAlgorithmsModSeqOps.cpp
+  TestStdAlgorithmsNonModSeqOps.cpp
   TestStdAlgorithmsMinMaxOps.cpp
+  TestStdAlgorithmsMinMaxElementOps.cpp
   TestStdAlgorithmsPartitioningOps.cpp
 )