Merge branch 'master' into replace-use-of-queue-mgr

Author: oleksandr-pavlyk

.github/workflows/conda-package.yml

@@ -14,6 +14,7 @@ env:
   CHANNELS: '-c dppy/label/dev -c intel -c conda-forge --override-channels'
   CONDA_BUILD_VERSION: '24.1.2'
   CONDA_INDEX_VERSION: '0.4.0'
+  TEST_ENV_NAME: 'test'
   # TODO: to add test_arraymanipulation.py back to the scope once crash on Windows is gone
   TEST_SCOPE: >-
       test_arraycreation.py
@@ -171,10 +172,10 @@ jobs:
           auto-update-conda: true
           python-version: ${{ matrix.python }}
           miniconda-version: 'latest'
-          activate-environment: 'test'
+          activate-environment: ${{ env.TEST_ENV_NAME }}
 
       - name: Install conda-index
-        run: conda install conda-index=${{ env.CONDA_INDEX_VERSION}}
+        run: conda install conda-index=${{ env.CONDA_INDEX_VERSION }}
 
       - name: Create conda channel
         run: |
@@ -223,10 +224,25 @@ jobs:
           python -c "import dpnp; print(dpnp.__version__)"
 
       # TODO: run the whole scope once the issues on CPU are resolved
+      # - name: Run tests
+        # run: |
+        #   python -m pytest -q -ra --disable-warnings -vv ${{ env.TEST_SCOPE }}
+        # working-directory: ${{ env.tests-path }}
+
+      # TODO: remove once 2024.2 release is published
       - name: Run tests
-        run: |
-          python -m pytest -q -ra --disable-warnings -vv ${{ env.TEST_SCOPE }}
-        working-directory: ${{ env.tests-path }}
+        id: run_tests_linux
+        uses: nick-fields/retry@7152eba30c6575329ac0576536151aca5a72780e # v3.0.0
+        with:
+          shell: bash
+          timeout_minutes: 10
+          max_attempts: 5
+          retry_on: any
+          command: |
+            . $CONDA/etc/profile.d/conda.sh
+            conda activate ${{ env.TEST_ENV_NAME }}
+            cd ${{ env.tests-path }}
+            python -m pytest -q -ra --disable-warnings -vv ${{ env.TEST_SCOPE }}
 
   test_windows:
     name: Test ['windows-latest', python='${{ matrix.python }}']
@@ -252,7 +268,6 @@ jobs:
       extracted-pkg-path: '${{ github.workspace }}\pkg'
       tests-path: '${{ github.workspace }}\pkg\info\test\tests\'
       ver-json-path: '${{ github.workspace }}\version.json'
-      active-env-name: 'test'
 
     steps:
       - name: Download artifact
@@ -281,7 +296,7 @@ jobs:
           auto-update-conda: true
           python-version: ${{ matrix.python }}
           miniconda-version: 'latest'
-          activate-environment: ${{ env.active-env-name }}
+          activate-environment: ${{ env.TEST_ENV_NAME }}
 
       - name: Store conda paths as envs
         run: |
@@ -362,10 +377,24 @@ jobs:
           python -c "import dpnp; print(dpnp.__version__)"
 
       # TODO: run the whole scope once the issues on CPU are resolved
+      # - name: Run tests
+      #   run: |
+      #     python -m pytest -q -ra --disable-warnings -vv ${{ env.TEST_SCOPE }}
+      #   working-directory: ${{ env.tests-path }}
+
+      # TODO: remove once 2024.2 release is published
       - name: Run tests
-        run: |
-          python -m pytest -q -ra --disable-warnings -vv ${{ env.TEST_SCOPE }}
-        working-directory: ${{ env.tests-path }}
+        id: run_tests_win
+        uses: nick-fields/retry@7152eba30c6575329ac0576536151aca5a72780e # v3.0.0
+        with:
+          shell: cmd
+          timeout_minutes: 15
+          max_attempts: 5
+          retry_on: any
+          command: >-
+            conda activate ${{ env.TEST_ENV_NAME }}
+            & cd ${{ env.tests-path }}
+            & python -m pytest -q -ra --disable-warnings -vv ${{ env.TEST_SCOPE }}
 
   upload:
     name: Upload ['${{ matrix.os }}', python='${{ matrix.python }}']

tests/test_sycl_queue.py

@@ -37,6 +37,9 @@
         pass
     elif device.device_type.name not in list_of_device_type_str:
         pass
+    elif device.backend.name in "opencl" and device.is_gpu:
+        # due to reproted crash on Windows: CMPLRLLVM-55640
+        pass
     else:
         valid_devices.append(device)
 
@@ -474,9 +477,6 @@ def test_meshgrid(device_x, device_y):
     ids=[device.filter_string for device in valid_devices],
 )
 def test_1in_1out(func, data, device):
-    if func in ("std", "var") and "opencl:gpu" in device.filter_string:
-        pytest.skip("due to reproted crash on Windows: CMPLRLLVM-55640")
-
     x = dpnp.array(data, device=device)
     result = getattr(dpnp, func)(x)