Added C-API hash function, used them in Python interface (#491)

* Added `size_t DPCTLQueue_Hash(QRef)`

* Added `size_t DPCTLDevice_Hash(DRef)`

* Added `size_t DPCTLContext_Hash(CtxRef)`

* added DPCTL<Name>_Hash to _backend

* Defines __hash__ for all classes that define __eq__ method.

  - SyclContext, SyclDevice, SyclQueue classes previously where
    not hashable. The PR defines __hash__ function based on the
    C API DPCTL<Obj>_Hash function.

* Extended tests to check consistency of  __eq__ and __hash__

* try to use 'python -m pytest args' rather than 'pytest args'

* Test runners should not be activating oneAPI. More recent run-times are being installed into Python environment and should be used instead of those in the compiler installation

* changes per PR feedback

Co-authored-by: Diptorup Deb <diptorup.deb@intel.com>

Author: oleksandr-pavlyk

conda-recipe/run_test.bat

@@ -1,15 +1,7 @@
-call "%ONEAPI_ROOT%\compiler\latest\env\vars.bat"
-if errorlevel 1 (
-	echo "oneAPI compiler activation failed%"
-	exit /b 1
-)
-REM conda uses %ERRORLEVEL% but FPGA scripts can set it. So it should be reseted.
-set ERRORLEVEL=
-
 @echo on
 
 "%PYTHON%" -c "import dpctl"
 if errorlevel 1 exit 1
 
-pytest -q -ra --disable-warnings --pyargs dpctl -vv
+python -m pytest -q -ra --disable-warnings --pyargs dpctl -vv
 if errorlevel 1 exit 1

conda-recipe/run_test.sh

@@ -2,8 +2,5 @@
 
 set -e
 
-# Suppress error b/c it could fail on Ubuntu 18.04
-source ${ONEAPI_ROOT}/compiler/latest/env/vars.sh || true
-
 ${PYTHON} -c "import dpctl"
-pytest -q -ra --disable-warnings --cov dpctl --cov-report term-missing --pyargs dpctl -vv
+python -m pytest -q -ra --disable-warnings --cov dpctl --cov-report term-missing --pyargs dpctl -vv

dpctl-capi/include/dpctl_sycl_context_interface.h

@@ -161,4 +161,14 @@ DPCTLContext_GetBackend(__dpctl_keep const DPCTLSyclContextRef CtxRef);
 DPCTL_API
 void DPCTLContext_Delete(__dpctl_take DPCTLSyclContextRef CtxRef);
 
+/*!
+ * @brief Wrapper over std::hash<sycl::context>'s operator()
+ *
+ * @param    CtxRef        The DPCTLSyclContextRef pointer.
+ * @return   Hash value of the underlying ``sycl::context`` instance.
+ * @ingroup ContextInterface
+ */
+DPCTL_API
+size_t DPCTLContext_Hash(__dpctl_take DPCTLSyclContextRef CtxRef);
+
 DPCTL_C_EXTERN_C_END

dpctl-capi/include/dpctl_sycl_device_interface.h

@@ -555,3 +555,13 @@ uint32_t DPCTLDevice_GetPreferredVectorWidthHalf(
 DPCTL_API
 __dpctl_give DPCTLSyclDeviceRef
 DPCTLDevice_GetParentDevice(__dpctl_keep const DPCTLSyclDeviceRef DRef);
+
+/*!
+ * @brief Wrapper over
+ * std::hash<sycl::device>'s operator()
+ *
+ * @param    DRef           Opaque pointer to a sycl::device
+ * @return   Returns hash value.
+ */
+DPCTL_API
+size_t DPCTLDevice_Hash(__dpctl_keep const DPCTLSyclDeviceRef DRef);

dpctl-capi/include/dpctl_sycl_queue_interface.h

@@ -126,10 +126,11 @@ __dpctl_give DPCTLSyclQueueRef
 DPCTLQueue_Copy(__dpctl_keep const DPCTLSyclQueueRef QRef);
 
 /*!
- * @brief Checks if two DPCTLSyclQueueRef objects point to the same sycl::queue.
+ * @brief Checks if two DPCTLSyclQueueRef objects point to the
+ * same ``sycl::queue``.
  *
- * @param    QRef1          First opaque pointer to the sycl queue.
- * @param    QRef2          Second opaque pointer to the sycl queue.
+ * @param    QRef1          First opaque pointer to the ``sycl::queue``.
+ * @param    QRef2          Second opaque pointer to the ``sycl::queue``.
  * @return   True if the underlying sycl::queue are same, false otherwise.
  * @ingroup QueueInterface
  */
@@ -174,11 +175,12 @@ DPCTLQueue_GetDevice(__dpctl_keep const DPCTLSyclQueueRef QRef);
  * @brief Submits the kernel to the specified queue with the provided range
  * argument.
  *
- * A wrapper over sycl::queue.submit(). The function takes an interoperability
- * kernel, the kernel arguments, and a Sycl queue as input. The kernel is
- * submitted as parallel_for(range<NRange>, *unwrap(KRef)).
+ * A wrapper over ``sycl::queue.submit()``. The function takes an
+ * interoperability kernel, the kernel arguments, and a ``sycl::queue`` as
+ * input. The kernel is submitted as
+ * ``parallel_for(range<NRange>, *unwrap(KRef))``.
  *
- * \todo sycl::buffer arguments are not supported yet.
+ * \todo ``sycl::buffer`` arguments are not supported yet.
  * \todo Add support for id<Dims> WorkItemOffset
  *
  * @param    KRef           Opaque pointer to an OpenCL interoperability kernel
@@ -195,11 +197,11 @@ DPCTLQueue_GetDevice(__dpctl_keep const DPCTLSyclQueueRef QRef);
  *                          dimensions.
  * @param    NRange         Size of the gRange array.
  * @param    DepEvents      List of dependent DPCTLSyclEventRef objects (events)
- *                          for the kernel. We call sycl::handler.depends_on for
- *                          each of the provided events.
+ *                          for the kernel. We call ``sycl::handler.depends_on``
+ *                          for each of the provided events.
  * @param    NDepEvents     Size of the DepEvents list.
- * @return   An opaque pointer to the sycl::event returned by the
- *           sycl::queue.submit() function.
+ * @return   An opaque pointer to the ``sycl::event`` returned by the
+ *           ``sycl::queue.submit()`` function.
  * @ingroup QueueInterface
  */
 DPCTL_API
@@ -218,9 +220,9 @@ DPCTLQueue_SubmitRange(__dpctl_keep const DPCTLSyclKernelRef KRef,
  * @brief Submits the kernel to the specified queue with the provided nd_range
  * argument.
  *
- * A wrapper over sycl::queue.submit(). The function takes an interoperability
- * kernel, the kernel arguments, and a Sycl queue as input. The kernel is
- * submitted as parallel_for(nd_range<NRange>, *unwrap(KRef)).
+ * A wrapper over ``sycl::queue.submit()``. The function takes an
+ * interoperability kernel, the kernel arguments, and a Sycl queue as input.
+ * The kernel is submitted as ``parallel_for(nd_range<NRange>, *unwrap(KRef))``.
  *
  * \todo sycl::buffer arguments are not supported yet.
  * \todo Add support for id<Dims> WorkItemOffset
@@ -243,11 +245,11 @@ DPCTLQueue_SubmitRange(__dpctl_keep const DPCTLSyclKernelRef KRef,
  * @param    NDims          The number of dimensions for both local and global
  *                          ranges.
  * @param    DepEvents      List of dependent DPCTLSyclEventRef objects (events)
- *                          for the kernel. We call sycl::handler.depends_on for
- *                          each of the provided events.
+ *                          for the kernel. We call ``sycl::handler.depends_on``
+ *                          for each of the provided events.
  * @param    NDepEvents     Size of the DepEvents list.
- * @return   An opaque pointer to the sycl::event returned by the
- *           sycl::queue.submit() function.
+ * @return   An opaque pointer to the ``sycl::event`` returned by the
+ *           ``sycl::queue.submit()`` function.
  * @ingroup QueueInterface
  */
 DPCTL_API
@@ -264,20 +266,20 @@ DPCTLQueue_SubmitNDRange(__dpctl_keep const DPCTLSyclKernelRef KRef,
                          size_t NDepEvents);
 
 /*!
- * @brief Calls the sycl::queue.submit function to do a blocking wait on all
- * enqueued tasks in the queue.
+ * @brief Calls the ``sycl::queue.submit`` function to do a blocking wait on
+ * all enqueued tasks in the queue.
  *
- * @param    QRef           Opaque pointer to a sycl::queue.
+ * @param    QRef           Opaque pointer to a ``sycl::queue``.
  * @ingroup QueueInterface
  */
 DPCTL_API
 void DPCTLQueue_Wait(__dpctl_keep const DPCTLSyclQueueRef QRef);
 
 /*!
- * @brief C-API wrapper for sycl::queue::memcpy, the function waits on an event
- * till the memcpy operation completes.
+ * @brief C-API wrapper for ``sycl::queue::memcpy``, the function waits on an
+ * event till the memcpy operation completes.
  *
- * @param    QRef           An opaque pointer to the sycl queue.
+ * @param    QRef           An opaque pointer to the ``sycl::queue``.
  * @param    Dest           An USM pointer to the destination memory.
  * @param    Src            An USM pointer to the source memory.
  * @param    Count          A number of bytes to copy.
@@ -290,10 +292,10 @@ void DPCTLQueue_Memcpy(__dpctl_keep const DPCTLSyclQueueRef QRef,
                        size_t Count);
 
 /*!
- * @brief C-API wrapper for sycl::queue::prefetch, the function waits on an
+ * @brief C-API wrapper for ``sycl::queue::prefetch``, the function waits on an
  * event till the prefetch operation completes.
  *
- * @param    QRef           An opaque pointer to the sycl queue.
+ * @param    QRef           An opaque pointer to the ``sycl::queue``.
  * @param    Ptr            An USM pointer to memory.
  * @param    Count          A number of bytes to prefetch.
  * @ingroup QueueInterface
@@ -307,7 +309,7 @@ void DPCTLQueue_Prefetch(__dpctl_keep DPCTLSyclQueueRef QRef,
  * @brief C-API wrapper for sycl::queue::mem_advise, the function waits on an
  * event till the operation completes.
  *
- * @param    QRef           An opaque pointer to the sycl queue.
+ * @param    QRef           An opaque pointer to the ``sycl::queue``.
  * @param    Ptr            An USM pointer to memory.
  * @param    Count          A number of bytes to prefetch.
  * @param    Advice         Device-defined advice for the specified allocation.
@@ -325,10 +327,20 @@ void DPCTLQueue_MemAdvise(__dpctl_keep DPCTLSyclQueueRef QRef,
  * @brief C-API wrapper for sycl::queue::is_in_order that indicates whether
  * the referenced queue is in-order or out-of-order.
  *
- * @param    QRef         An opaque pointer to the sycl queue.
+ * @param    QRef         An opaque pointer to the ``sycl::queue``.
  * @ingroup QueueInterface
  */
 DPCTL_API
 bool DPCTLQueue_IsInOrder(__dpctl_keep const DPCTLSyclQueueRef QRef);
 
+/*!
+ * @brief C-API wrapper for std::hash<sycl::queue>'s operator().
+ *
+ * @param    QRef         An opaque pointer to the ``sycl::queue``.
+ * @return   Hash value of the underlying ``sycl::queue`` instance.
+ * @ingroup QueueInterface
+ */
+DPCTL_API
+size_t DPCTLQueue_Hash(__dpctl_keep const DPCTLSyclQueueRef QRef);
+
 DPCTL_C_EXTERN_C_END

dpctl-capi/source/dpctl_sycl_context_interface.cpp

@@ -197,3 +197,17 @@ DPCTLContext_GetBackend(__dpctl_keep const DPCTLSyclContextRef CtxRef)
         return DPCTL_UNKNOWN_BACKEND;
     }
 }
+
+size_t DPCTLContext_Hash(__dpctl_keep const DPCTLSyclContextRef CtxRef)
+{
+    if (CtxRef) {
+        auto C = unwrap(CtxRef);
+        std::hash<context> hash_fn;
+        return hash_fn(*C);
+    }
+    else {
+        std::cerr << "Argument CtxRef is null"
+                  << "/n";
+        return 0;
+    }
+}

dpctl-capi/source/dpctl_sycl_device_interface.cpp

@@ -690,3 +690,18 @@ __dpctl_give DPCTLDeviceVectorRef DPCTLDevice_CreateSubDevicesByAffinity(
     }
     return wrap(Devices);
 }
+
+size_t DPCTLDevice_Hash(__dpctl_keep const DPCTLSyclDeviceRef DRef)
+{
+    if (DRef) {
+        auto D = unwrap(DRef);
+        std::hash<device> hash_fn;
+        return hash_fn(*D);
+    }
+    else {
+        // todo: log error
+        std::cerr << "Argument DRef is null"
+                  << "/n";
+        return 0;
+    }
+}

dpctl-capi/source/dpctl_sycl_queue_interface.cpp

@@ -454,9 +454,15 @@ void DPCTLQueue_Wait(__dpctl_keep DPCTLSyclQueueRef QRef)
 {
     // \todo what happens if the QRef is null or a pointer to a valid sycl
     // queue
-    auto SyclQueue = unwrap(QRef);
-    if (SyclQueue)
-        SyclQueue->wait();
+    if (QRef) {
+        auto SyclQueue = unwrap(QRef);
+        if (SyclQueue)
+            SyclQueue->wait();
+    }
+    else {
+        // todo: log error
+        std::cerr << "Argument QRef is NULL" << '\n';
+    }
 }
 
 void DPCTLQueue_Memcpy(__dpctl_keep const DPCTLSyclQueueRef QRef,
@@ -504,3 +510,17 @@ bool DPCTLQueue_IsInOrder(__dpctl_keep const DPCTLSyclQueueRef QRef)
     else
         return false;
 }
+
+size_t DPCTLQueue_Hash(__dpctl_keep const DPCTLSyclQueueRef QRef)
+{
+    auto Q = unwrap(QRef);
+    if (Q) {
+        std::hash<queue> hash_fn;
+        return hash_fn(*Q);
+    }
+    else {
+        // todo: log error
+        std::cerr << "Argument QRef is null" << '\n';
+        return 0;
+    }
+}

dpctl-capi/tests/test_sycl_context_interface.cpp

@@ -177,6 +177,8 @@ TEST_P(TestDPCTLContextInterface, ChkAreEq)
     EXPECT_NO_FATAL_FAILURE(are_not_eq = DPCTLContext_AreEq(CRef1, CRef3));
     EXPECT_TRUE(are_eq);
     EXPECT_FALSE(are_not_eq);
+    EXPECT_TRUE(DPCTLContext_Hash(CRef1) == DPCTLContext_Hash(CRef2));
+    EXPECT_FALSE(DPCTLContext_Hash(CRef1) == DPCTLContext_Hash(CRef3));
 
     EXPECT_NO_FATAL_FAILURE(DPCTLContext_Delete(CRef1));
     EXPECT_NO_FATAL_FAILURE(DPCTLContext_Delete(CRef2));

dpctl-capi/tests/test_sycl_device_interface.cpp

@@ -68,6 +68,8 @@ TEST_P(TestDPCTLSyclDeviceInterface, ChkCopy)
     DPCTLSyclDeviceRef Copied_DRef = nullptr;
     EXPECT_NO_FATAL_FAILURE(Copied_DRef = DPCTLDevice_Copy(DRef));
     EXPECT_TRUE(bool(Copied_DRef));
+    EXPECT_TRUE(DPCTLDevice_AreEq(DRef, Copied_DRef));
+    EXPECT_TRUE(DPCTLDevice_Hash(DRef) == DPCTLDevice_Hash(Copied_DRef));
     EXPECT_NO_FATAL_FAILURE(DPCTLDevice_Delete(Copied_DRef));
 }