Install dpctl version compatible with DPC++ 2023.2 while collecting coverage

Author: antonwolfy

.github/workflows/build-sphinx.yml

@@ -91,7 +91,7 @@ jobs:
 
       - name: Install dpnp dependencies
         run: |
-          conda install numpy"<1.24" dpctl">=0.15.1dev1" mkl-devel-dpcpp onedpl-devel tbb-devel dpcpp_linux-64 \
+          conda install numpy"<1.24" dpctl">=0.15.1dev2" mkl-devel-dpcpp onedpl-devel tbb-devel dpcpp_linux-64 \
               cmake cython pytest ninja scikit-build sysroot_linux-64">=2.28" ${{ env.CHANNELS }}
 
       - name: Install cuPy dependencies

.github/workflows/generate_coverage.yaml

@@ -15,7 +15,7 @@ jobs:
 
     env:
       python-ver: '3.10'
-      CHANNELS: '-c dppy/label/dev -c intel -c conda-forge --override-channels'
+      CHANNELS: '-c dppy/label/coverage -c intel -c conda-forge --override-channels'
 
     steps:
       - name: Cancel Previous Runs
@@ -44,7 +44,7 @@ jobs:
         run: |
           # use DPC++ compiler 2023.2 to work around an issue with crash
           conda install cython llvm cmake">=3.21" scikit-build ninja pytest pytest-cov coverage[toml] \
-              dpctl dpcpp_linux-64"=2023.2" sysroot_linux-64">=2.28" mkl-devel-dpcpp tbb-devel"=2021.10" \
+              dpctl">=0.15.1dev2" dpcpp_linux-64"=2023.2" sysroot_linux-64">=2.28" mkl-devel-dpcpp tbb-devel"=2021.10" \
               onedpl-devel ${{ env.CHANNELS }}
 
       - name: Conda info

conda-recipe/meta.yaml

@@ -1,5 +1,5 @@
 {% set required_compiler_and_mkl_version = "2024.0" %}
-{% set required_dpctl_version = "0.15.1dev1" %}
+{% set required_dpctl_version = "0.15.1dev2" %}
 
 package:
     name: dpnp
@@ -28,9 +28,9 @@ requirements:
       - sysroot_linux-64 >=2.28 # [linux]
     run:
       - python
-      - dpctl >={{ required_dpctl_version }}
-      - {{ pin_compatible('dpcpp-cpp-rt', min_pin='x.x') }}
-      - {{ pin_compatible('mkl-dpcpp', min_pin='x.x') }}
+      - {{ pin_compatible('dpctl', min_pin='x.x.x', upper_bound=None) }}
+      - {{ pin_compatible('dpcpp-cpp-rt', min_pin='x.x', max_pin='x') }}
+      - {{ pin_compatible('mkl-dpcpp', min_pin='x.x', max_pin='x') }}
       - {{ pin_compatible('numpy', min_pin='x.x', max_pin='x') }}
 
 build:

dpnp/dpnp_algo/dpnp_elementwise_common.py

@@ -167,80 +167,11 @@ def check_nd_call_func(
     )
 
 
-"""
-Below utility functions are required to keep backward compitibility
-with DPC++ 2023.2 and dpctl 0.15.0. Otherwise we can't collect coverage report,
-since DPC++ 2024.0 has the reported crash issue while running for coverage
-and the latest dpctl (i.e. >0.15.0) can't be installed with DPC++ 2023.2.
-
-TODO: remove the w/a once the above issue is resolved.
-"""
-
-
-def _get_impl_fn(dpt_fn):
-    if hasattr(dpt_fn, "get_implementation_function"):
-        return dpt_fn.get_implementation_function()
-
-    if hasattr(dpt_fn, "__name__"):
-        if dpt_fn.__name__ == "UnaryElementwiseFunc":
-            return dpt_fn.unary_fn_
-        elif dpt_fn.__name__ == "BinaryElementwiseFunc":
-            return dpt_fn.binary_fn_
-
-    raise TypeError(
-        "Expected an instance of elementwise func class, but got {}".format(
-            type(dpt_fn)
-        )
-    )
-
-
-def _get_type_resolver_fn(dpt_fn):
-    if hasattr(dpt_fn, "get_type_result_resolver_function"):
-        return dpt_fn.get_type_result_resolver_function()
-
-    if hasattr(dpt_fn, "result_type_resolver_fn_"):
-        return dpt_fn.result_type_resolver_fn_
-
-    raise TypeError(
-        "Expected an instance of elementwise func class, but got {}".format(
-            type(dpt_fn)
-        )
-    )
-
-
-def _get_impl_inplace_fn(dpt_fn):
-    if hasattr(dpt_fn, "get_implementation_inplace_function"):
-        return dpt_fn.get_implementation_inplace_function()
-
-    if hasattr(dpt_fn, "binary_inplace_fn_"):
-        return dpt_fn.binary_inplace_fn_
-
-    raise TypeError(
-        "Expected an instance of elementwise func class, but got {}".format(
-            type(dpt_fn)
-        )
-    )
-
-
-def _get_type_promotion_fn(dpt_fn):
-    if hasattr(dpt_fn, "get_type_promotion_path_acceptance_function"):
-        return dpt_fn.get_type_promotion_path_acceptance_function()
-
-    if hasattr(dpt_fn, "acceptance_fn_"):
-        return dpt_fn.acceptance_fn_
-
-    raise TypeError(
-        "Expected an instance of elementwise func class, but got {}".format(
-            type(dpt_fn)
-        )
-    )
-
-
 def _make_unary_func(
     name, dpt_unary_fn, fn_docstring, mkl_fn_to_call=None, mkl_impl_fn=None
 ):
-    impl_fn = _get_impl_fn(dpt_unary_fn)
-    type_resolver_fn = _get_type_resolver_fn(dpt_unary_fn)
+    impl_fn = dpt_unary_fn.get_implementation_function()
+    type_resolver_fn = dpt_unary_fn.get_type_result_resolver_function()
 
     def _call_func(src, dst, sycl_queue, depends=None):
         """A callback to register in UnaryElementwiseFunc class of dpctl.tensor"""
@@ -262,10 +193,10 @@ def _call_func(src, dst, sycl_queue, depends=None):
 def _make_binary_func(
     name, dpt_binary_fn, fn_docstring, mkl_fn_to_call=None, mkl_impl_fn=None
 ):
-    impl_fn = _get_impl_fn(dpt_binary_fn)
-    type_resolver_fn = _get_type_resolver_fn(dpt_binary_fn)
-    inplce_fn = _get_impl_inplace_fn(dpt_binary_fn)
-    acceptance_fn = _get_type_promotion_fn(dpt_binary_fn)
+    impl_fn = dpt_binary_fn.get_implementation_function()
+    type_resolver_fn = dpt_binary_fn.get_type_result_resolver_function()
+    inplce_fn = dpt_binary_fn.get_implementation_inplace_function()
+    acceptance_fn = dpt_binary_fn.get_type_promotion_path_acceptance_function()
 
     def _call_func(src1, src2, dst, sycl_queue, depends=None):
         """A callback to register in UnaryElementwiseFunc class of dpctl.tensor"""