[oneDPL][ranges][zip_view][test] + minor changes

uxlfoundation · Sep 27, 2024 · 80ef9c5 · 80ef9c5
1 parent 91cf6b0
commit 80ef9c5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/test/parallel_api/ranges/std_ranges_test.h b/test/parallel_api/ranges/std_ranges_test.h
@@ -15,7 +15,6 @@
 
 #include <oneapi/dpl/execution>
 #include <oneapi/dpl/algorithm>
-#include <oneapi/dpl/pstl/zip_view_impl.h>
 
 #include "support/test_config.h"
 
@@ -501,11 +500,6 @@ struct test_range_algo
         test<T, host_span<T>, mode>{}(host_policies(), algo, checker, std::views::all, std::identity{}, args...);
 #endif
 
-#if 0//zip_view
-    auto zip_view = [](auto&& v) { return my::zip(v); };
-    test<T, host_subrange<T>, mode>{}(host_policies(), algo, checker, zip_view, std::identity{}, args...);
-#endif
-
 #if TEST_DPCPP_BACKEND_PRESENT
         //Skip the cases with pointer-to-function and hetero policy because pointer-to-function is not supported within kernel code.
         if constexpr(!std::disjunction_v<std::is_member_function_pointer<decltype(args)>...>)

diff --git a/test/parallel_api/ranges/std_ranges_zip_view.pass.cpp b/test/parallel_api/ranges/std_ranges_zip_view.pass.cpp
@@ -14,6 +14,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "std_ranges_test.h"
+#include <oneapi/dpl/pstl/zip_view_impl.h>
 
 template<typename>
 struct print_type;
@@ -33,7 +34,9 @@ main()
 
     test_std_ranges::call_with_host_policies(dpl_ranges::for_each, zip_view, test_std_ranges::f_mutuable, [](const auto& val) { return std::get<1>(val); });
 
+#if TEST_DPCPP_BACKEND_PRESENT
     dpl_ranges::for_each(test_std_ranges::dpcpp_policy(), zip_view, test_std_ranges::f_mutuable, [](const auto& val) { return std::get<1>(val); });
+#endif
 
     auto zip_view_sort = dpl_ranges::zip(data, data);