Add the library version header, and update oneDPL version to 2022.7.0 (…

…#945)
uxlfoundation · Sep 6, 2024 · 0bfd477 · 0bfd477
1 parent 07fe7e6
commit 0bfd477
Show file tree

Hide file tree

Showing 12 changed files with 94 additions and 31 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -31,7 +31,7 @@ option(ONEDPL_USE_AOT_COMPILATION "Enable the ahead of time compilation" OFF)
 option(ONEDPL_ENABLE_SIMD "Enable SIMD vectorization by passing an OpenMP SIMD flag to the compiler if supported" ON)
 cmake_dependent_option(ONEDPL_TEST_WIN_ICX_FIXES "Enable icx workarounds for Windows" ON "CMAKE_HOST_WIN32;NOT _onedpl_is_subproject" OFF)
 
-file(READ ${CMAKE_CURRENT_SOURCE_DIR}/include/oneapi/dpl/pstl/onedpl_config.h
+file(READ ${CMAKE_CURRENT_SOURCE_DIR}/include/oneapi/dpl/internal/version_impl.h
     _onedpl_version_info
     LIMIT 1024)
 string(REGEX REPLACE ".*#define ONEDPL_VERSION_MAJOR ([0-9]+).*" "\\1" _onedpl_ver_major "${_onedpl_version_info}")

diff --git a/cmake/scripts/generate_config.cmake b/cmake/scripts/generate_config.cmake
@@ -34,7 +34,7 @@ endif()
 
 set(ONEDPL_ROOT "${CMAKE_CURRENT_LIST_DIR}/../..")
 
-file(READ ${ONEDPL_ROOT}/include/oneapi/dpl/pstl/onedpl_config.h _onedpl_version_info LIMIT 1024)
+file(READ ${ONEDPL_ROOT}/include/oneapi/dpl/internal/version_impl.h _onedpl_version_info LIMIT 1024)
 string(REGEX REPLACE ".*#define ONEDPL_VERSION_MAJOR ([0-9]+).*" "\\1" _onedpl_ver_major "${_onedpl_version_info}")
 string(REGEX REPLACE ".*#define ONEDPL_VERSION_MINOR ([0-9]+).*" "\\1" _onedpl_ver_minor "${_onedpl_version_info}")
 string(REGEX REPLACE ".*#define ONEDPL_VERSION_PATCH ([0-9]+).*" "\\1" _onedpl_ver_patch "${_onedpl_version_info}")

diff --git a/documentation/library_guide/conf.py b/documentation/library_guide/conf.py
@@ -37,7 +37,7 @@
 author = 'Intel'
 
 # The full version, including alpha/beta/rc tags
-release = '2022.6.0'
+release = '2022.7.0'
 
 rst_epilog = """
 .. include:: /variables.txt

diff --git a/documentation/library_guide/macros.rst b/documentation/library_guide/macros.rst
@@ -27,6 +27,23 @@ Macro                             Description
 ``_PSTL_VERSION_PATCH``           ``_PSTL_VERSION % 10``: The patch number.
 ================================= ==============================
 
+Feature Macros
+==============
+Use these macros to test presence of specific |onedpl_short| functionality.
+
+================================== ===============================================
+Macro                              Macro values and the functionality
+================================== ===============================================
+``ONEDPL_HAS_RANDOM_NUMBERS``      Pseudo-random number generators and distributions.
+
+                                   * ``202409L`` - added support of comparison and I/O stream operators and an experimental Philox engine
+---------------------------------- -----------------------------------------------
+``ONEDPL_HAS_RANGE_ALGORITHMS``    Parallel range algorithms.
+
+                                   * ``202409L`` - for_each, transform, find, find_if, find_if_not, any_of, all_of, none_of, adjacent_find, search, search_n,
+                                     count, count_if, equal, is_sorted, sort, stable_sort, min_element, max_element, copy, copy_if, merge
+================================== ===============================================
+
 Additional Macros
 ==================
 Use these macros to control aspects of |onedpl_short| usage. You can set them in your program code

diff --git a/include/oneapi/dpl/internal/version_impl.h b/include/oneapi/dpl/internal/version_impl.h
@@ -0,0 +1,41 @@
+// -*- C++ -*-
+//===----------------------------------------------------------------------===//
+//
+// Copyright (C) Intel Corporation
+//
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef _ONEDPL_VERSION_IMPL_H
+#define _ONEDPL_VERSION_IMPL_H
+
+// The library version
+#define ONEDPL_VERSION_MAJOR 2022
+#define ONEDPL_VERSION_MINOR 7
+#define ONEDPL_VERSION_PATCH 0
+
+#if _ONEDPL___cplusplus >= 202002L && __has_include(<version>)
+#    include <version> // The standard C++20 header
+#    define _ONEDPL_STD_FEATURE_MACROS_PRESENT 1
+// Clang 15 and older do not support range adaptors, see https://bugs.llvm.org/show_bug.cgi?id=44833
+#    define _ONEDPL_CPP20_RANGES_PRESENT ((__cpp_lib_ranges >= 201911L) && !(__clang__ && __clang_major__ < 16))
+#else
+#    define _ONEDPL_STD_FEATURE_MACROS_PRESENT 0
+#    define _ONEDPL_CPP20_RANGES_PRESENT 0
+#endif
+
+#ifndef _PSTL_VERSION
+#    define _PSTL_VERSION 14000
+#    define _PSTL_VERSION_MAJOR (_PSTL_VERSION / 1000)
+#    define _PSTL_VERSION_MINOR ((_PSTL_VERSION % 1000) / 10)
+#    define _PSTL_VERSION_PATCH (_PSTL_VERSION % 10)
+#endif
+
+// Feature macros
+#define ONEDPL_HAS_RANDOM_NUMBERS         202409L
+#if _ONEDPL_CPP20_RANGES_PRESENT
+#    define ONEDPL_HAS_RANGE_ALGORITHMS   202409L
+#endif
+
+#endif // _ONEDPL_VERSION_IMPL_H
diff --git a/include/oneapi/dpl/pstl/onedpl_config.h b/include/oneapi/dpl/pstl/onedpl_config.h
@@ -16,21 +16,8 @@
 #ifndef _ONEDPL_CONFIG_H
 #define _ONEDPL_CONFIG_H
 
-#ifndef _PSTL_VERSION
-#    define _PSTL_VERSION 11000
-#    define _PSTL_VERSION_MAJOR (_PSTL_VERSION / 1000)
-#    define _PSTL_VERSION_MINOR ((_PSTL_VERSION % 1000) / 10)
-#    define _PSTL_VERSION_PATCH (_PSTL_VERSION % 10)
-#endif
-
-#define ONEDPL_VERSION_MAJOR 2022
-#define ONEDPL_VERSION_MINOR 6
-#define ONEDPL_VERSION_PATCH 0
-
-#if _ONEDPL___cplusplus >= 202002L && __has_include(<version>)
-#    include <version>
-#    define _ONEDPL_STD_FEATURE_MACROS_PRESENT 1
-#endif
+#include "../internal/version_impl.h"
+// The version header also defines a few configuration macros used in this file
 
 #if defined(ONEDPL_FPGA_DEVICE)
 #    undef _ONEDPL_FPGA_DEVICE
@@ -304,15 +291,12 @@
 #if _ONEDPL_STD_FEATURE_MACROS_PRESENT
 #    define _ONEDPL_CPP20_SPAN_PRESENT (__cpp_lib_span >= 202002L)
 #    define _ONEDPL_CPP20_CONCEPTS_PRESENT (__cpp_concepts >= 201907L && __cpp_lib_concepts >= 202002L)
-// Clang 15 and older do not support range adaptors, see https://bugs.llvm.org/show_bug.cgi?id=44833
-#    define _ONEDPL_CPP20_RANGES_PRESENT ((__cpp_lib_ranges >= 201911L) && !(__clang__ && __clang_major__ < 16))
 #    define _ONEDPL_CPP23_TUPLE_LIKE_COMMON_REFERENCE_PRESENT                                                          \
         (_ONEDPL___cplusplus >= 202302L && __cpp_lib_tuple_like >= 202207L)
 #    define _ONEDPL_CPP23_RANGES_ZIP_PRESENT (_ONEDPL___cplusplus >= 202302L && __cpp_lib_ranges_zip >= 202110L)
 #else
 #    define _ONEDPL_CPP20_SPAN_PRESENT 0
 #    define _ONEDPL_CPP20_CONCEPTS_PRESENT 0
-#    define _ONEDPL_CPP20_RANGES_PRESENT 0
 #    define _ONEDPL_CPP23_TUPLE_LIKE_COMMON_REFERENCE_PRESENT 0
 #    define _ONEDPL_CPP23_RANGES_ZIP_PRESENT 0
 #endif

diff --git a/include/oneapi/dpl/random b/include/oneapi/dpl/random
@@ -17,6 +17,7 @@
 #define _ONEDPL_RANDOM
 
 #include "oneapi/dpl/internal/common_config.h"
+#include "oneapi/dpl/pstl/onedpl_config.h"
 #include "oneapi/dpl/pstl/hetero/dpcpp/sycl_defs.h"
 #include <utility>
 #include <cstdint>

diff --git a/include/oneapi/dpl/version b/include/oneapi/dpl/version
@@ -0,0 +1,16 @@
+// -*- C++ -*-
+//===----------------------------------------------------------------------===//
+//
+// Copyright (C) Intel Corporation
+//
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef _ONEDPL_VERSION
+#define _ONEDPL_VERSION
+
+#include "internal/common_config.h"
+#include "internal/version_impl.h"
+
+#endif // _ONEDPL_VERSION
diff --git a/test/general/version.pass.cpp b/test/general/version.pass.cpp
@@ -15,23 +15,21 @@
 
 #include "support/test_config.h"
 
-#include _PSTL_TEST_HEADER(execution)
-
-#include <oneapi/dpl/pstl/onedpl_config.h>
-
-#include "support/utils.h"
+#include _PSTL_TEST_HEADER(version)
 
 #if !__has_include(<execution>)
-static_assert(_PSTL_VERSION == 11000);
-static_assert(_PSTL_VERSION_MAJOR == 11);
+static_assert(_PSTL_VERSION == 14000);
+static_assert(_PSTL_VERSION_MAJOR == 14);
 static_assert(_PSTL_VERSION_MINOR == 00);
 static_assert(_PSTL_VERSION_PATCH == 0);
 #endif
 
 static_assert(ONEDPL_VERSION_MAJOR == 2022);
-static_assert(ONEDPL_VERSION_MINOR == 6);
+static_assert(ONEDPL_VERSION_MINOR == 7);
 static_assert(ONEDPL_VERSION_PATCH == 0);
 
+#include "support/utils.h"
+
 int main() {
 
     return TestUtils::done();

diff --git a/test/parallel_api/ranges/std_ranges_test.h b/test/parallel_api/ranges/std_ranges_test.h
@@ -22,6 +22,8 @@
 
 #if _ENABLE_STD_RANGES_TESTING
 
+static_assert(ONEDPL_HAS_RANGE_ALGORITHMS >= 202409L);
+
 #if TEST_CPP20_SPAN_PRESENT
 #include <span>
 #endif

diff --git a/test/xpu_api/random/interface_tests/distributions_methods.pass.cpp b/test/xpu_api/random/interface_tests/distributions_methods.pass.cpp
@@ -20,10 +20,12 @@
 #include "support/utils.h"
 
 #if TEST_UNNAMED_LAMBDAS
+#include <oneapi/dpl/random>
+static_assert(ONEDPL_HAS_RANDOM_NUMBERS >= 202409L);
+
 #include <iostream>
 #include <cmath>
 #include <vector>
-#include <oneapi/dpl/random>
 
 constexpr auto SEED = 777;
 constexpr auto N_GEN = 960;

diff --git a/test/xpu_api/random/interface_tests/engines_methods.pass.cpp b/test/xpu_api/random/interface_tests/engines_methods.pass.cpp
@@ -20,9 +20,11 @@
 #include "support/utils.h"
 
 #if TEST_UNNAMED_LAMBDAS
+#    include <oneapi/dpl/random>
+static_assert(ONEDPL_HAS_RANDOM_NUMBERS >= 202409L);
+
 #    include <iostream>
 #    include <vector>
-#    include <oneapi/dpl/random>
 
 namespace ex = oneapi::dpl::experimental;