Change approach to instead comment out upstream PSTL define that has …

…changed
oneapi-src · May 6, 2024 · 57e5129 · 57e5129
1 parent a04cadc
commit 57e5129
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 16 deletions.
diff --git a/include/oneapi/dpl/pstl/algorithm_impl.h b/include/oneapi/dpl/pstl/algorithm_impl.h
@@ -3882,7 +3882,7 @@ _RandomAccessIterator
 __brick_min_element(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp,
                     /* __is_vector = */ ::std::true_type) noexcept
 {
-#if _ONEDPL_IS_ONE_OR_EMPTY(_PSTL_UDR_PRESENT) || _ONEDPL_UDR_PRESENT
+#if /*_PSTL_UDR_PRESENT ||*/ _ONEDPL_UDR_PRESENT
     return __unseq_backend::__simd_min_element(__first, __last - __first, __comp);
 #else
     return ::std::min_element(__first, __last, __comp);
@@ -3949,7 +3949,7 @@ ::std::pair<_RandomAccessIterator, _RandomAccessIterator>
 __brick_minmax_element(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp,
                        /* __is_vector = */ ::std::true_type) noexcept
 {
-#if _ONEDPL_IS_ONE_OR_EMPTY(_PSTL_UDR_PRESENT) || _ONEDPL_UDR_PRESENT
+#if /*_PSTL_UDR_PRESENT ||*/ _ONEDPL_UDR_PRESENT
     return __unseq_backend::__simd_minmax_element(__first, __last - __first, __comp);
 #else
     return ::std::minmax_element(__first, __last, __comp);

diff --git a/include/oneapi/dpl/pstl/numeric_impl.h b/include/oneapi/dpl/pstl/numeric_impl.h
@@ -213,7 +213,7 @@ __brick_transform_scan(_RandomAccessIterator __first, _RandomAccessIterator __la
                        _UnaryOperation __unary_op, _Tp __init, _BinaryOperation __binary_op, _Inclusive,
                        /*is_vector=*/::std::true_type) noexcept
 {
-#if _ONEDPL_IS_ONE_OR_EMPTY(_PSTL_UDS_PRESENT) || _ONEDPL_UDS_PRESENT
+#if /*_PSTL_UDS_PRESENT || */ _ONEDPL_UDS_PRESENT
     if (_Inclusive() || !oneapi::dpl::__internal::__iterators_possibly_equal(__first, __result))
     {
         return __unseq_backend::__simd_scan(__first, __last - __first, __result, __unary_op, __init, __binary_op,

diff --git a/include/oneapi/dpl/pstl/utils.h b/include/oneapi/dpl/pstl/utils.h
@@ -41,19 +41,6 @@
 #    include <cstring> // memcpy
 #endif
 
-#define _ONEDPL_IS_EMPTY_STRING(_X) ((0 - _X - 1) == 1 && (_X - 0) != -2)
-#define _ONEDPL_IS_ONE(_X) ((_X - 1) == 0)
-
-// This macro is needed because there are two ways that input defines are used:
-//
-//   1. A feature X is enabled if the macro X is defined as 1 and disabled if
-//      the macro X is defined as 0
-//   2. A feature X is enabled if the macro X is defined with no value (i.e.,
-//      an empty macro) and disabled if the macro is undefined
-//
-//  We want to catch both cases in a single macro
-#define _ONEDPL_IS_ONE_OR_EMPTY(_X) (_ONEDPL_IS_EMPTY_STRING(_X) || _ONEDPL_IS_ONE(_X))
-
 namespace oneapi
 {
 namespace dpl