Merge branch 'master' into use_dpctl_full

Author: npolina4

.github/workflows/conda-package.yml

@@ -24,80 +24,24 @@ env:
   VER_SCRIPT2: "d = j['dpnp'][0]; print('='.join((d[s] for s in ('version', 'build'))))"
 
 jobs:
-  build_linux:
-    runs-on: ubuntu-latest
-
-    defaults:
-      run:
-        shell: bash -l {0}
+  build:
+    name: Build ['${{ matrix.os }}', python='${{ matrix.python }}']
 
     strategy:
       matrix:
         python: ['3.8', '3.9']
+        os: [ubuntu-latest, windows-latest]
+        include:
+          - python: '3.10'
+            os: ubuntu-latest
 
-    env:
-      conda-pkgs: '/home/runner/conda_pkgs_dir/'
-
-    steps:
-      - name: Cancel Previous Runs
-        uses: styfle/[email protected]
-        with:
-          access_token: ${{ github.token }}
-
-      - name: Checkout DPNP repo
-        uses: actions/[email protected]
-        with:
-          fetch-depth: 0
-
-      - name: Setup miniconda
-        uses: conda-incubator/[email protected]
-        with:
-          auto-update-conda: true
-          python-version: ${{ matrix.python }}
-          miniconda-version: 'latest'
-          activate-environment: 'build'
-          use-only-tar-bz2: true
-
-      - name: Store conda paths as envs
-        run: echo "CONDA_BLD=$CONDA_PREFIX/conda-bld/linux-64/" >> $GITHUB_ENV
-
-      - name: Install conda-build
-        run: conda install conda-build
-
-      - name: Cache conda packages
-        uses: actions/[email protected]
-        env:
-          CACHE_NUMBER: 1  # Increase to reset cache
-        with:
-          path: ${{ env.conda-pkgs }}
-          key:
-            ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-python-${{ matrix.python }}-${{hashFiles('**/meta.yaml') }}
-          restore-keys: |
-            ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-python-${{ matrix.python }}-
-            ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-
-
-      - name: Build conda package
-        run: conda build --no-test --python ${{ matrix.python }} ${{ env.CHANNELS }} conda-recipe
-
-      - name: Upload artifact
-        uses: actions/[email protected]
-        with:
-          name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}
-          path: ${{ env.CONDA_BLD }}${{ env.PACKAGE_NAME }}-*.tar.bz2
-
-  build_windows:
-    runs-on: windows-latest
+    runs-on: ${{ matrix.os }}
 
     defaults:
       run:
-        shell: cmd /C CALL {0}
+        shell: ${{ matrix.os == 'windows-latest' && 'cmd /C CALL {0}' || 'bash -l {0}' }}
 
-    strategy:
-      matrix:
-        python: ['3.8', '3.9']
-
-    env:
-      conda-pkgs: 'C:\Users\runneradmin\conda_pkgs_dir\'
+    continue-on-error: false
 
     steps:
       - name: Cancel Previous Runs
@@ -119,26 +63,31 @@ jobs:
           activate-environment: 'build'
           use-only-tar-bz2: true
 
-      - name: Store conda paths as envs
+      - if: matrix.os == 'ubuntu-latest'
+        name: Store conda paths as envs on Linux
+        run: echo "CONDA_BLD=$CONDA_PREFIX/conda-bld/linux-64/" >> $GITHUB_ENV
+
+      - if: matrix.os == 'windows-latest'
+        name: Store conda paths as envs on Win
         run: |
           @echo on
           (echo CONDA_BLD=%CONDA_PREFIX%\conda-bld\win-64\) >> %GITHUB_ENV%
 
+      - name: Install conda-build
+        run: conda install conda-build
+
       - name: Cache conda packages
         uses: actions/[email protected]
         env:
           CACHE_NUMBER: 1  # Increase to reset cache
         with:
-          path: ${{ env.conda-pkgs }}
+          path: ${{ env.CONDA_PKGS_DIR }}
           key:
             ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-python-${{ matrix.python }}-${{hashFiles('**/meta.yaml') }}
           restore-keys: |
             ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-python-${{ matrix.python }}-
             ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-
 
-      - name: Install conda-build
-        run: conda install conda-build
-
       - name: Build conda package
         run: conda build --no-test --python ${{ matrix.python }} ${{ env.CHANNELS }} conda-recipe
 
@@ -149,7 +98,9 @@ jobs:
           path: ${{ env.CONDA_BLD }}${{ env.PACKAGE_NAME }}-*.tar.bz2
 
   test_linux:
-    needs: build_linux
+    name: Test ['ubuntu-latest', python='${{ matrix.python }}']
+
+    needs: build
 
     runs-on: ubuntu-latest
 
@@ -250,7 +201,9 @@ jobs:
         working-directory: ${{ env.tests-path }}
 
   test_windows:
-    needs: build_windows
+    name: Test ['windows-latest', python='${{ matrix.python }}']
+
+    needs: build
 
     runs-on: windows-latest
 
@@ -422,61 +375,28 @@ jobs:
           python -m pytest -q -ra --disable-warnings -vv ${{ env.TEST_SCOPE }}
         working-directory: ${{ env.tests-path }}
 
-  upload_linux:
-    needs: test_linux
-
-    if: |
-      (github.repository == 'IntelPython/dpnp') &&
-      (github.ref == 'refs/heads/master' || (startsWith(github.ref, 'refs/heads/release') == true) || github.event_name == 'push' && contains(github.ref, 'refs/tags/'))
-
-    runs-on: ubuntu-latest
+  upload:
+    name: Upload ['${{ matrix.os }}', python='${{ matrix.python }}']
 
-    defaults:
-      run:
-        shell: bash -l {0}
+    needs: [test_linux, test_windows]
 
     strategy:
       matrix:
         python: ['3.8', '3.9']
+        os: [ubuntu-latest, windows-latest]
 
-    steps:
-      - name: Download artifact
-        uses: actions/[email protected]
-        with:
-          name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}
-
-      - name: Setup miniconda
-        uses: conda-incubator/[email protected]
-        with:
-          auto-update-conda: true
-          python-version: ${{ matrix.python }}
-          miniconda-version: 'latest'
-          activate-environment: 'upload'
+    runs-on: ${{ matrix.os }}
 
-      - name: Install anaconda-client
-        run: conda install anaconda-client
-
-      - name: Upload
-        run: anaconda --token ${{ env.ANACONDA_TOKEN }} upload --user dppy --label dev ${{ env.PACKAGE_NAME }}-*.tar.bz2
-        env:
-          ANACONDA_TOKEN: ${{ secrets.ANACONDA_TOKEN }}
+    defaults:
+      run:
+        shell: ${{ matrix.os == 'windows-latest' && 'cmd /C CALL {0}' || 'bash -l {0}' }}
 
-  upload_windows:
-    needs: test_windows
+    continue-on-error: false
 
     if: |
       (github.repository == 'IntelPython/dpnp') &&
       (github.ref == 'refs/heads/master' || (startsWith(github.ref, 'refs/heads/release') == true) || github.event_name == 'push' && contains(github.ref, 'refs/tags/'))
 
-    runs-on: windows-latest
-
-    defaults:
-      run:
-        shell: cmd /C CALL {0}
-
-    strategy:
-      matrix:
-        python: ['3.8', '3.9']
     steps:
       - name: Download artifact
         uses: actions/[email protected]

README.md

@@ -2,25 +2,15 @@
 [![codecov](https://codecov.io/gh/IntelPython/dpnp/branch/master/graph/badge.svg)](https://codecov.io/gh/IntelPython/dpnp)
 [![Build Sphinx](https://github.com/IntelPython/dpnp/workflows/Build%20Sphinx/badge.svg)](https://intelpython.github.io/dpnp)
 
-# DPNP: NumPy Drop-In Replacement for Intel(R) XPU
+# DPNP - Data Parallel Extension for NumPy*
 [API coverage summary](https://intelpython.github.io/dpnp/reference/comparison.html#summary)
 
 [Full documentation](https://intelpython.github.io/dpnp/)
 
 [DPNP C++ backend documentation](https://intelpython.github.io/dpnp/backend_doc/)
 
-The project contains:
-- Python interface with NumPy-like API
-- C++ library with SYCL based kernels
-
-## How to run
-By default main CPU SYCL queue is used. To use Intel GPU please use:
-```bash
-DPNP_QUEUE_GPU=1 python examples/example1.py
-```
-
 ## Build from source:
- Ensure you have the following prerequisite packages installed:
+Ensure you have the following prerequisite packages installed:
 
 - `mkl-devel-dpcpp`
 - `dpcpp_linux-64` or `dpcpp_win-64` (depending on your OS)

dpnp/dpnp_iface_linearalgebra.py

@@ -40,6 +40,7 @@
 """
 
 
+from dpnp.dpnp_array import dpnp_array
 from dpnp.dpnp_algo import *
 from dpnp.dpnp_utils import *
 import dpnp
@@ -312,10 +313,15 @@ def outer(x1, x2, **kwargs):
 
     """
 
-    x1_desc = dpnp.get_dpnp_descriptor(x1, copy_when_nondefault_queue=False)
-    x2_desc = dpnp.get_dpnp_descriptor(x2, copy_when_nondefault_queue=False)
-    if x1_desc and x2_desc and not kwargs:
-        return dpnp_outer(x1_desc, x2_desc).get_pyobj()
+    if not kwargs:
+        if isinstance(x1, dpnp_array) and isinstance(x2, dpnp_array):
+            ravel = lambda x: x.flatten() if x.ndim > 1 else x
+            return ravel(x1)[:, None] * ravel(x2)[None, :]
+
+        x1_desc = dpnp.get_dpnp_descriptor(x1, copy_when_nondefault_queue=False)
+        x2_desc = dpnp.get_dpnp_descriptor(x2, copy_when_nondefault_queue=False)
+        if x1_desc and x2_desc:
+            return dpnp_outer(x1_desc, x2_desc).get_pyobj()
 
     return call_origin(numpy.outer, x1, x2, **kwargs)
 

tests/skipped_tests_gpu.tbl

@@ -286,7 +286,7 @@ tests/third_party/cupy/linalg_tests/test_einsum.py::TestEinSumError::test_too_fe
 tests/third_party/cupy/linalg_tests/test_einsum.py::TestEinSumError::test_too_many_dimension3
 tests/third_party/cupy/linalg_tests/test_einsum.py::TestListArgEinSumError::test_dim_mismatch3
 tests/third_party/cupy/linalg_tests/test_einsum.py::TestListArgEinSumError::test_too_many_dims3
-tests/third_party/cupy/linalg_tests/test_product.py::TestProduct::test_outer
+
 tests/third_party/cupy/linalg_tests/test_product.py::TestProduct::test_reversed_outer
 tests/third_party/cupy/linalg_tests/test_product.py::TestProduct::test_reversed_vdot
 tests/third_party/cupy/manipulation_tests/test_basic.py::TestCopytoFromScalar_param_7_{dst_shape=(0,), src=3.2}::test_copyto_where
@@ -347,8 +347,6 @@ tests/third_party/cupy/sorting_tests/test_sort.py::TestPartition_param_2_{extern
 tests/third_party/cupy/statistics_tests/test_correlation.py::TestCov::test_cov_empty
 tests/third_party/cupy/statistics_tests/test_meanvar.py::TestMeanVar::test_external_mean_axis
 
-tests/third_party/cupy/linalg_tests/test_product.py::TestProduct::test_multidim_outer
-
 tests/third_party/cupy/sorting_tests/test_sort.py::TestPartition_param_3_{external=True, length=20000}::test_partition_axis
 tests/third_party/cupy/sorting_tests/test_sort.py::TestPartition_param_3_{external=True, length=20000}::test_partition_negative_axis
 tests/third_party/cupy/sorting_tests/test_sort.py::TestPartition_param_3_{external=True, length=20000}::test_partition_none_axis

tests/test_outer.py

@@ -0,0 +1,77 @@
+import unittest
+from tests.third_party.cupy import testing
+
+import dpnp as dp
+import numpy as np
+
+from numpy.testing import assert_raises
+
+
+class TestOuter(unittest.TestCase):
+
+    @testing.for_all_dtypes()
+    @testing.numpy_cupy_allclose()
+    def test_two_vectors(self, xp, dtype):
+        a = xp.ones((10, ), dtype=dtype)
+        b = xp.linspace(-2, 2, 5, dtype=dtype)
+
+        return xp.outer(a, b)
+
+    @testing.for_all_dtypes()
+    @testing.numpy_cupy_allclose()
+    def test_two_matrix(self, xp, dtype):
+        a = xp.ones((10, 10, 10), dtype=dtype)
+        b = xp.full(shape=(3, 7), fill_value=42, dtype=dtype)
+
+        return xp.outer(a, b)
+
+    @testing.for_all_dtypes()
+    @testing.numpy_cupy_allclose()
+    def test_the_same_vector(self, xp, dtype):
+        a = xp.full(shape=(100, ), fill_value=7, dtype=dtype)
+        return xp.outer(a, a)
+
+    @testing.for_all_dtypes()
+    @testing.numpy_cupy_allclose()
+    def test_the_same_matrix(self, xp, dtype):
+        a = xp.arange(27, dtype=dtype).reshape(3, 3, 3)
+        return xp.outer(a, a)
+
+
+class TestScalarOuter(unittest.TestCase):
+
+    @unittest.skip("A scalar isn't currently supported as input")
+    @testing.for_all_dtypes()
+    @testing.numpy_cupy_allclose()
+    def test_first_is_scalar(self, xp, dtype):
+        scalar = xp.int64(4)
+        a = xp.arange(5**3, dtype=dtype).reshape(5, 5, 5)
+        return xp.outer(scalar, a)
+
+    @unittest.skip("A scalar isn't currently supported as input")
+    @testing.for_all_dtypes()
+    @testing.numpy_cupy_allclose()
+    def test_second_is_scalar(self, xp, dtype):
+        scalar = xp.int32(7)
+        a = xp.arange(5**3, dtype=dtype).reshape(5, 5, 5)
+        return xp.outer(a, scalar)
+
+    @unittest.skip("A scalar isn't currently supported as input")
+    @testing.numpy_cupy_array_equal()
+    def test_both_inputs_as_scalar(self, xp):
+        a = xp.int64(4)
+        b = xp.int32(17)
+        return xp.outer(a, b)
+
+
+class TestListOuter(unittest.TestCase):
+
+    def test_list(self):
+        a = np.arange(27).reshape(3, 3, 3)
+        b: list[list[list[int]]] = a.tolist()
+        dp_a = dp.array(a)
+
+        with assert_raises(NotImplementedError):
+            dp.outer(b, dp_a)
+            dp.outer(dp_a, b)
+            dp.outer(b, b)