Revert last commit and add _ExecutionPolicy to the kernel name

Signed-off-by: Matthew Michel <[email protected]>

Author: mmichel11

include/oneapi/dpl/pstl/hetero/dpcpp/parallel_backend_sycl_reduce_then_scan.h

@@ -763,11 +763,11 @@ __parallel_transform_reduce_then_scan(oneapi::dpl::__internal::__device_backend_
     // necessary to obtain a unique kernel name. However, if these compile time variables are adjusted in the
     // future, then we need to be careful here to ensure unique kernel naming.
     using _ReduceKernel = oneapi::dpl::__par_backend_hetero::__internal::__kernel_name_generator<
-        __reduce_then_scan_reduce_kernel, _CustomName, _InRng, _OutRng, _GenReduceInput, _ReduceOp, _InitType,
-        _Inclusive, _IsUniquePattern>;
+        __reduce_then_scan_reduce_kernel, _CustomName, _ExecutionPolicy, _InRng, _OutRng, _GenReduceInput, _ReduceOp,
+        _InitType, _Inclusive, _IsUniquePattern>;
     using _ScanKernel = oneapi::dpl::__par_backend_hetero::__internal::__kernel_name_generator<
-        __reduce_then_scan_scan_kernel, _CustomName, _InRng, _OutRng, _GenScanInput, _ReduceOp, _ScanInputTransform,
-        _WriteOp, _InitType, _Inclusive, _IsUniquePattern>;
+        __reduce_then_scan_scan_kernel, _CustomName, _ExecutionPolicy, _InRng, _OutRng, _GenScanInput, _ReduceOp,
+        _ScanInputTransform, _WriteOp, _InitType, _Inclusive, _IsUniquePattern>;
     static auto __kernels = __internal::__kernel_compiler<_ReduceKernel, _ScanKernel>::__compile(__exec);
     const sycl::kernel& __reduce_kernel = __kernels[0];
     const sycl::kernel& __scan_kernel = __kernels[1];