Merge remote-tracking branch 'origin/master' into feature/pyproject

This should resolve build breakage with DPC++ compiler open source
nighly build sycl bundle.

Author: oleksandr-pavlyk

.github/workflows/conda-package.yml

@@ -44,7 +44,7 @@ jobs:
       - name: Add conda to system path
         run: echo $CONDA/bin >> $GITHUB_PATH
       - name: Install conda-build
-        run: conda install conda-build
+        run: conda install conda-build -c conda-forge --override-channels
       - name: Store conda paths as envs
         shell: bash -l {0}
         run: |
@@ -140,9 +140,9 @@ jobs:
           name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}
       - name: Add conda to system path
         run: echo $CONDA/bin >> $GITHUB_PATH
-      - name: Install conda-build
+      - name: Install conda-index
         # Needed to be able to run conda index
-        run: conda install conda-build
+        run: conda install conda-index -c conda-forge --override-channels
       - name: Create conda channel
         run: |
           mkdir -p $GITHUB_WORKSPACE/channel/linux-64
@@ -352,7 +352,7 @@ jobs:
           name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Wheels Python ${{ matrix.python }}
 
       - name: Install anaconda-client
-        run: conda install anaconda-client
+        run: conda install anaconda-client -c conda-forge --override-channels
       - name: Add conda to system path
         run: echo $CONDA/bin >> $GITHUB_PATH
       - name: Package version
@@ -393,7 +393,7 @@ jobs:
           activate-environment: ""
 
       - name: Install anaconda-client
-        run: conda install anaconda-client
+        run: conda install anaconda-client -c conda-forge --override-channels
 
       - name: Package version
         shell: bash -el {0}
@@ -425,9 +425,9 @@ jobs:
       BUILD_ENV_NAME: build_env
 
     steps:
-      - name: Install conda-build
+      - name: Install conda-index
         # Needed to be able to run conda index
-        run: conda install conda-build python=${{ matrix.python }}
+        run: conda install conda-index -c conda-forge --override-channels
       - name: Checkout dpctl repo
         uses: actions/checkout@v4.1.5
         with:
@@ -450,7 +450,9 @@ jobs:
       - name: Collect dependencies
         run: |
           CHANNELS="-c $GITHUB_WORKSPACE/channel ${{ env.CHANNELS }}"
-          conda install $PACKAGE_NAME python=${{ matrix.python }} $CHANNELS --only-deps --dry-run > lockfile
+          export PACKAGE_VERSION=$(python -c "${VER_SCRIPT1} ${VER_SCRIPT2}")
+          conda create -n ${{ env.EXAMPLES_ENV_NAME }} $PACKAGE_NAME=${PACKAGE_VERSION} python=${{ matrix.python }} $CHANNELS --only-deps --dry-run > lockfile
+          cat lockfile
       - name: Set pkgs_dirs
         run: |
           echo "pkgs_dirs: [~/.conda/pkgs]" >> ~/.condarc
@@ -468,7 +470,7 @@ jobs:
       - name: Install example requirements
         shell: bash -l {0}
         env:
-          DPCPP_CMPLR: dpcpp_linux-64">=2024.0"
+          DPCPP_CMPLR: dpcpp_linux-64">=2024.1"
         run: |
           CHANNELS="${{ env.CHANNELS }}"
           . $CONDA/etc/profile.d/conda.sh
@@ -601,9 +603,9 @@ jobs:
           name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}
       - name: Add conda to system path
         run: echo $CONDA/bin >> $GITHUB_PATH
-      - name: Install conda-build
+      - name: Install conda-index
         # Needed to be able to run conda index
-        run: conda install conda-build
+        run: conda install conda-index -c conda-forge --override-channels
       - name: Create conda channel
         run: |
           mkdir -p $GITHUB_WORKSPACE/channel/linux-64
@@ -712,7 +714,7 @@ jobs:
           python-version: '3.11'
 
       - name: Install anaconda-client
-        run: conda install anaconda-client
+        run: conda install anaconda-client -c conda-forge --override-channels
 
       - name: Checkout repo
         uses: actions/checkout@v4.1.5

.github/workflows/openssf-scorecard.yml

@@ -68,6 +68,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@9fdb3e49720b44c48891d036bb502feb25684276 # v3.25.6
+        uses: github/codeql-action/upload-sarif@f079b8493333aace61c81488f8bd40919487bd9f # v3.25.7
         with:
           sarif_file: results.sarif

docs/doc_sources/api_reference/dpctl_capi.rst

@@ -152,7 +152,16 @@ API for :c:struct:`Py_MemoryObject`
     :param nbytes: The size of allocation in bytes
     :param QRef: instance of :c:struct:`PySyclQueueRef` corresponding
         to ``sycl::queue`` to be associated with this allocation
-    :param owner: Python object instance whose deleter triggers freeing of this USM allocation
+    :param owner: Python object instance whose deleter triggers freeing of this USM allocation. Specify `owner=None`
+        to pass ownership to created Python memory object, which will use ``sycl::free(ptr, sycl_queue)`` for
+        deallocation.
+
+.. c:function:: void * Memory_GetOpaquePointer(struct Py_MemoryObject *o)
+
+    :param o: Input object
+    :returns: Returns opaque pointer to `std::shared_ptr<void>` which manages the USM allocation,
+        or a `nullptr` if the USM allocation represented by `o` is not managed by the smart
+        pointer.
 
 API for :c:struct:`PyUSMArrayObject`
 ------------------------------------
@@ -221,6 +230,11 @@ API for :c:struct:`PyUSMArrayObject`
     :returns: Offset of zero multi-index array element from the beginning of
               the USM allocation.
 
+.. c:function:: PyObject * UsmNDArray_GetUSMData(struct PyUSMArrayObject *arr)
+
+    :param arr: Input object
+    :returns: Python memory object underlying input array `arr`.
+
 .. c:function:: void UsmNDArray_SetWritableFlag(struct PyUSMArrayObject *arr, int flag)
 
     :param arr: Input object

dpctl/_sycl_queue.pyx

@@ -342,7 +342,7 @@ cdef DPCTLSyclEventRef _memcpy_impl(
     cdef unsigned char[::1] dst_host_buf = None
 
     if isinstance(src, _Memory):
-        c_src_ptr = <void*>(<_Memory>src).memory_ptr
+        c_src_ptr = <void*>(<_Memory>src).get_data_ptr()
     elif _is_buffer(src):
         src_host_buf = src
         c_src_ptr = <void *>&src_host_buf[0]
@@ -354,7 +354,7 @@ cdef DPCTLSyclEventRef _memcpy_impl(
        )
 
     if isinstance(dst, _Memory):
-        c_dst_ptr = <void*>(<_Memory>dst).memory_ptr
+        c_dst_ptr = <void*>(<_Memory>dst).get_data_ptr()
     elif _is_buffer(dst):
         dst_host_buf = dst
         c_dst_ptr = <void *>&dst_host_buf[0]
@@ -1265,7 +1265,7 @@ cdef class SyclQueue(_SyclQueue):
         cdef DPCTLSyclEventRef ERef = NULL
 
         if isinstance(mem, _Memory):
-            ptr = <void*>(<_Memory>mem).memory_ptr
+            ptr = <void*>(<_Memory>mem).get_data_ptr()
         else:
             raise TypeError("Parameter `mem` should have type _Memory")
 
@@ -1285,7 +1285,7 @@ cdef class SyclQueue(_SyclQueue):
         cdef DPCTLSyclEventRef ERef = NULL
 
         if isinstance(mem, _Memory):
-            ptr = <void*>(<_Memory>mem).memory_ptr
+            ptr = <void*>(<_Memory>mem).get_data_ptr()
         else:
             raise TypeError("Parameter `mem` should have type _Memory")