CExA-project · yasahi-hpc · Mar 18, 2024 · Apr 11, 2024 · Apr 15, 2024 · Apr 15, 2024
diff --git a/.github/workflows/continuous-integration-workflow-32bit.yml b/.github/workflows/continuous-integration-workflow-32bit.yml
@@ -36,7 +36,7 @@ jobs:
             -DKokkos_ENABLE_DEPRECATED_CODE_4=ON \
             -DKokkos_ENABLE_DEPRECATION_WARNINGS=OFF \
             -DKokkos_ENABLE_COMPILER_WARNINGS=ON \
-            -DCMAKE_CXX_FLAGS="-Werror -m32 -DKOKKOS_IMPL_32BIT" \
+            -DCMAKE_CXX_FLAGS="-Werror -m32" \
             -DCMAKE_CXX_COMPILER=g++ \
             -DCMAKE_BUILD_TYPE=RelWithDebInfo
       - name: Build

diff --git a/.jenkins_nightly b/.jenkins_nightly
@@ -95,7 +95,8 @@ pipeline {
                             -DKokkos_ENABLE_BENCHMARKS=ON \
                             -DKokkos_ENABLE_EXAMPLES=ON \
                             -DKokkos_ENABLE_TESTS=ON \
-                            -DKokkos_ENABLE_DEPRECATION_WARNINGS=OFF \
+                            -DKokkos_ENABLE_DEPRECATED_CODE_4=ON \
+                            -DKokkos_ENABLE_DEPRECATION_WARNINGS=ON \
                             -DKokkos_ENABLE_SERIAL=ON \
                           .. && \
                           make -j8 && ctest --verbose
@@ -123,7 +124,7 @@ pipeline {
                                 -DKokkos_ARCH_NATIVE=ON \
                                 -DKokkos_ENABLE_COMPILER_WARNINGS=ON \
                                 -DKokkos_ENABLE_DEPRECATED_CODE_4=ON \
-                                -DKokkos_ENABLE_DEPRECATION_WARNINGS=OFF \
+                                -DKokkos_ENABLE_DEPRECATION_WARNINGS=ON \
                                 -DKokkos_ENABLE_TESTS=ON \
                                 -DKokkos_ENABLE_BENCHMARKS=ON \
                                 -DKokkos_ENABLE_HIP=ON \

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,18 @@
 # CHANGELOG
 
+## [4.3.01](https://github.com/kokkos/kokkos/tree/4.3.01)
+[Full Changelog](https://github.com/kokkos/kokkos/compare/4.3.00...4.3.01)
+
+### Backend and Architecture Enhancements:
+
+#### HIP:
+* MI300 support unified memory [\#6877](https://github.com/kokkos/kokkos/pull/6877)
+
+### Bug Fixes
+* Serial: Use the provided execution space instance in TeamPolicy [\#6951](https://github.com/kokkos/kokkos/pull/6951)
+* `nvcc_wrapper`: bring back support for `--fmad` option [\#6931](https://github.com/kokkos/kokkos/pull/6931)
+* Fix CUDA reduction overflow for `RangePolicy` [\#6578](https://github.com/kokkos/kokkos/pull/6578)
+
 ## [4.3.00](https://github.com/kokkos/kokkos/tree/4.3.00) (2024-03-19)
 [Full Changelog](https://github.com/kokkos/kokkos/compare/4.2.01...4.3.00)
 
@@ -39,7 +52,7 @@
 * Make the OpenACC backend asynchronous [\#6772](https://github.com/kokkos/kokkos/pull/6772)
 
 #### Threads:
-* Add missing broadcast to TeamThreadRange parallel_scan [\#6601](https://github.com/kokkos/kokkos/pull/6446)
+* Add missing broadcast to TeamThreadRange parallel_scan [\#6601](https://github.com/kokkos/kokkos/pull/6601)
 
 #### OpenMP:
 * Improve performance of view initializations and filling with zeros [\#6573](https://github.com/kokkos/kokkos/pull/6573)

diff --git a/CITATION.cff b/CITATION.cff
@@ -0,0 +1,65 @@
+cff-version: 1.2.0
+title: Kokkos
+message: >-
+  If you use this software, please cite the overview paper
+type: software
+authors:
+  - name: The Kokkos authors
+    website: https://kokkos.org/community/team/
+identifiers:
+  - type: url
+    website: https://kokkos.org/kokkos-core-wiki/citation.html
+repository-code: 'https://github.com/kokkos/kokkos'
+url: 'https://kokkos.org/'
+license: Apache-2.0
+preferred-citation:
+  type: article
+  authors:
+  - given-names: Christian R.
+    family-names: Trott
+  - given-names: Damien
+    family-names: Lebrun-Grandié
+  - given-names: Daniel
+    family-names: Arndt
+  - family-names: Ciesko
+    given-names: Jan
+  - given-names: Vinh
+    family-names: Dang
+  - family-names: Ellingwood
+    given-names: Nathan
+  - given-names: Rahulkumar
+    family-names: Gayatri
+  - given-names: Evan
+    family-names: Harvey
+  - given-names: Daisy S.
+    family-names: Hollman
+  - given-names: Dan
+    family-names: Ibanez
+  - given-names: Nevin
+    family-names: Liber
+  - given-names: Jonathan
+    family-names: Madsen
+  - given-names: Jeff
+    family-names: Miles
+  - given-names: David
+    family-names: Poliakoff
+  - given-names: Amy
+    family-names: Powell
+  - given-names: Sivasankaran
+    family-names: Rajamanickam
+  - given-names: Mikael
+    family-names: Simberg
+  - given-names: Dan
+    family-names: Sunderland
+  - given-names: Bruno
+    family-names: Turcksin
+  - given-names: Jeremiah
+    family-names: Wilke
+  doi: 10.1109/TPDS.2021.3097283
+  journal: IEEE Transactions on Parallel and Distributed Systems
+  start: 805
+  end: 817
+  title: "Kokkos 3: Programming Model Extensions for the Exascale Era"
+  volume: 33
+  issue: 4
+  year: 2022
diff --git a/Copyright.txt b/Copyright.txt
@@ -1,41 +1,8 @@
-//@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 ([email protected])
-//
-// ************************************************************************
-//@HEADER
+************************************************************************
+
+                       Kokkos v. 4.0
+      Copyright (2022) National Technology & Engineering
+              Solutions of Sandia, LLC (NTESS).
+
+Under the terms of Contract DE-NA0003525 with NTESS,
+the U.S. Government retains certain rights in this software.
diff --git a/LICENSE b/LICENSE
@@ -1,13 +1,3 @@
- ************************************************************************
-
-                        Kokkos v. 4.0
-       Copyright (2022) National Technology & Engineering
-               Solutions of Sandia, LLC (NTESS).
-
- Under the terms of Contract DE-NA0003525 with NTESS,
- the U.S. Government retains certain rights in this software.
-
-
  ==============================================================================
  Kokkos is under the Apache License v2.0 with LLVM Exceptions:
  ==============================================================================

diff --git a/README.md b/README.md
@@ -12,6 +12,8 @@ backends in development.
 
 **Kokkos Core is part of the [Kokkos C++ Performance Portability Programming Ecosystem](https://kokkos.org/about/abstract/).**
 
+Kokkos is a [Linux Foundation](https://linuxfoundation.org) project.
+
 ## Learning about Kokkos
 
 To start learning about Kokkos:
@@ -28,12 +30,12 @@ To start learning about Kokkos:
 
 The latest release of Kokkos can be obtained from the [GitHub releases page](https://github.com/kokkos/kokkos/releases/latest).
 
-The current release is [4.2.01](https://github.com/kokkos/kokkos/releases/tag/4.2.01).
+The current release is [4.3.00](https://github.com/kokkos/kokkos/releases/tag/4.3.00).
 
 ```bash
-curl -OJ -L https://github.com/kokkos/kokkos/archive/refs/tags/4.2.01.tar.gz
+curl -OJ -L https://github.com/kokkos/kokkos/archive/refs/tags/4.3.00.tar.gz
 # Or with wget
-wget https://github.com/kokkos/kokkos/archive/refs/tags/4.2.01.tar.gz
+wget https://github.com/kokkos/kokkos/archive/refs/tags/4.3.00.tar.gz
 ```
 
 To clone the latest development version of Kokkos from GitHub:
@@ -44,7 +46,7 @@ git clone -b develop  https://github.com/kokkos/kokkos.git
 
 ### Building Kokkos
 
-To build Kokkos, you will need to have a C++ compiler that supports C++14 or later.
+To build Kokkos, you will need to have a C++ compiler that supports C++17 or later.
 All requirements including minimum and primary tested compiler versions can be found [here](https://kokkos.org/kokkos-core-wiki/requirements.html).
 
 Building and installation instructions are described [here](https://kokkos.org/kokkos-core-wiki/building.html).

diff --git a/algorithms/src/std_algorithms/impl/Kokkos_AdjacentDifference.hpp b/algorithms/src/std_algorithms/impl/Kokkos_AdjacentDifference.hpp
@@ -82,6 +82,11 @@ OutputIteratorType adjacent_difference_exespace_impl(
     return first_dest;
   }
 
+#ifdef KOKKOS_ENABLE_DEBUG
+  // check for overlapping iterators
+  Impl::expect_no_overlap(first_from, last_from, first_dest);
+#endif
+
   // run
   const auto num_elements =
       Kokkos::Experimental::distance(first_from, last_from);
@@ -114,6 +119,11 @@ KOKKOS_FUNCTION OutputIteratorType adjacent_difference_team_impl(
     return first_dest;
   }
 
+#ifdef KOKKOS_ENABLE_DEBUG
+  // check for overlapping iterators
+  Impl::expect_no_overlap(first_from, last_from, first_dest);
+#endif
+
   // run
   const auto num_elements =
       Kokkos::Experimental::distance(first_from, last_from);

diff --git a/algorithms/src/std_algorithms/impl/Kokkos_Constraints.hpp b/algorithms/src/std_algorithms/impl/Kokkos_Constraints.hpp
@@ -24,18 +24,21 @@ namespace Kokkos {
 namespace Experimental {
 namespace Impl {
 
+template <class T>
+class RandomAccessIterator;
+
 template <typename T, typename enable = void>
 struct is_admissible_to_kokkos_std_algorithms : std::false_type {};
 
 template <typename T>
 struct is_admissible_to_kokkos_std_algorithms<
-    T, std::enable_if_t< ::Kokkos::is_view<T>::value && T::rank() == 1 &&
-                         (std::is_same<typename T::traits::array_layout,
-                                       Kokkos::LayoutLeft>::value ||
-                          std::is_same<typename T::traits::array_layout,
-                                       Kokkos::LayoutRight>::value ||
-                          std::is_same<typename T::traits::array_layout,
-                                       Kokkos::LayoutStride>::value)> >
+    T, std::enable_if_t<::Kokkos::is_view<T>::value && T::rank() == 1 &&
+                        (std::is_same<typename T::traits::array_layout,
+                                      Kokkos::LayoutLeft>::value ||
+                         std::is_same<typename T::traits::array_layout,
+                                      Kokkos::LayoutRight>::value ||
+                         std::is_same<typename T::traits::array_layout,
+                                      Kokkos::LayoutStride>::value)>>
     : std::true_type {};
 
 template <class ViewType>
@@ -58,6 +61,18 @@ using is_iterator = Kokkos::is_detected<iterator_category_t, T>;
 template <class T>
 inline constexpr bool is_iterator_v = is_iterator<T>::value;
 
+template <typename ViewType>
+struct is_kokkos_iterator : std::false_type {};
+
+template <typename ViewType>
+struct is_kokkos_iterator<RandomAccessIterator<ViewType>> {
+  static constexpr bool value =
+      is_admissible_to_kokkos_std_algorithms<ViewType>::value;
+};
+
+template <class T>
+inline constexpr bool is_kokkos_iterator_v = is_kokkos_iterator<T>::value;
+
 //
 // are_iterators
 //
@@ -215,6 +230,38 @@ KOKKOS_INLINE_FUNCTION void expect_valid_range(IteratorType first,
   (void)last;
 }
 
+//
+// Check if kokkos iterators are overlapping
+//
+template <typename IteratorType1, typename IteratorType2>
+KOKKOS_INLINE_FUNCTION void expect_no_overlap(
+    [[maybe_unused]] IteratorType1 first, [[maybe_unused]] IteratorType1 last,
+    [[maybe_unused]] IteratorType2 s_first) {
+  if constexpr (is_kokkos_iterator_v<IteratorType1> &&
+                is_kokkos_iterator_v<IteratorType2>) {
+    auto const view1 = first.view();
+    auto const view2 = s_first.view();
+
+    std::size_t stride1  = view1.stride(0);
+    std::size_t stride2  = view2.stride(0);
+    ptrdiff_t first_diff = view1.data() - view2.data();
+
+    // FIXME If strides are not identical, checks may not be made
+    // with the cost of O(1)
+    // Currently, checks are made only if strides are identical
+    // If first_diff == 0, there is already an overlap
+    if (stride1 == stride2 || first_diff == 0) {
+      [[maybe_unused]] bool is_no_overlap  = (first_diff % stride1);
+      auto* first_pointer1                 = view1.data();
+      auto* first_pointer2                 = view2.data();
+      [[maybe_unused]] auto* last_pointer1 = first_pointer1 + (last - first);
+      [[maybe_unused]] auto* last_pointer2 = first_pointer2 + (last - first);
+      KOKKOS_EXPECTS(first_pointer1 >= last_pointer2 ||
+                     last_pointer1 <= first_pointer2 || is_no_overlap);
+    }
+  }
+}
+
 }  // namespace Impl
 }  // namespace Experimental
 }  // namespace Kokkos

diff --git a/algorithms/src/std_algorithms/impl/Kokkos_RandomAccessIterator.hpp b/algorithms/src/std_algorithms/impl/Kokkos_RandomAccessIterator.hpp
@@ -59,6 +59,38 @@ class RandomAccessIterator< ::Kokkos::View<DataType, Args...> > {
                                                 ptrdiff_t current_index)
       : m_view(view), m_current_index(current_index) {}
 
+// FIXME The C++20 requires expression is not supported with Clang 9 and GCC 9
+// The following guards is unsufficient until we increase our minimum CXX20
+// compiler requirements.
+//   #ifndef KOKKOS_ENABLE_CXX17  // C++20 and beyond
+// We replace the Kokkos guards with standard C++ feature testing in the
+// meantime.
+#if (defined(__cpp_concepts) && (__cpp_concepts >= 201907L)) && \
+    (defined(__cpp_conditional_explicit) &&                     \
+     (__cpp_conditional_explicit >= 201806L))
+  template <class OtherViewType>
+  requires(std::is_constructible_v<view_type, OtherViewType>) KOKKOS_FUNCTION
+      explicit(!std::is_convertible_v<OtherViewType, view_type>)
+          RandomAccessIterator(const RandomAccessIterator<OtherViewType>& other)
+      : m_view(other.m_view), m_current_index(other.m_current_index) {}
+#else
+  template <
+      class OtherViewType,
+      std::enable_if_t<std::is_constructible_v<view_type, OtherViewType> &&
+                           !std::is_convertible_v<OtherViewType, view_type>,
+                       int> = 0>
+  KOKKOS_FUNCTION explicit RandomAccessIterator(
+      const RandomAccessIterator<OtherViewType>& other)
+      : m_view(other.m_view), m_current_index(other.m_current_index) {}
+
+  template <class OtherViewType,
+            std::enable_if_t<std::is_convertible_v<OtherViewType, view_type>,
+                             int> = 0>
+  KOKKOS_FUNCTION RandomAccessIterator(
+      const RandomAccessIterator<OtherViewType>& other)
+      : m_view(other.m_view), m_current_index(other.m_current_index) {}
+#endif
+
   KOKKOS_FUNCTION
   iterator_type& operator++() {
     ++m_current_index;
@@ -152,9 +184,16 @@ class RandomAccessIterator< ::Kokkos::View<DataType, Args...> > {
   KOKKOS_FUNCTION
   reference operator*() const { return m_view(m_current_index); }
 
+  KOKKOS_FUNCTION
+  view_type view() const { return m_view; }
+
  private:
   view_type m_view;
   ptrdiff_t m_current_index = 0;
+
+  // Needed for the converting constructor accepting another iterator
+  template <class>
+  friend class RandomAccessIterator;
 };
 
 }  // namespace Impl