Merge pull request #354 from IntelPython/fix/intel_conda_channel

Switch workflows to not use intel channel.

.github/workflows/build_and_run.yml

@@ -65,12 +65,12 @@ jobs:
         with:
           fetch-depth: 0
 
-      # intel:numpy for python 3.11 is not upstreamed yet
+      # numpy for python 3.11 is not upstreamed yet
       - name: Patch numpy dependency for Python 3.11
         if: matrix.python == '3.11'
         shell: bash -l {0}
         run: |
-          find ./environments -type f | xargs sed -i 's/intel::numpy/numpy/'
+          find ./environments -type f | xargs sed -i 's/numpy/numpy/'
           find ./environments -type f | xargs sed -i 's/setuptools>=42,<64/setuptools/'
 
       - name: Setup miniconda

.github/workflows/conda-package.yml

@@ -19,7 +19,7 @@ env:
   PACKAGE_NAME: dpbench
   MODULE_NAME: dpbench
   # There is a separate action that removes defaults.
-  CHANNELS: 'dppy/label/dev,conda-forge,intel,nodefaults'
+  CHANNELS: 'dppy/label/dev,conda-forge,https://software.repos.intel.com/python/conda,nodefaults'
   VER_JSON_NAME: 'version.json'
   VER_SCRIPT1: "import json; f = open('version.json', 'r'); j = json.load(f); f.close(); "
   VER_SCRIPT2: "d = j['dpbench'][0]; print('='.join((d[s] for s in ('version', 'build'))))"
@@ -169,7 +169,7 @@ jobs:
           cat ${{ env.VER_JSON_PATH }}
 
       - name: Install dpbench
-        run: conda install ${{ env.PACKAGE_NAME }}=${{ env.PACKAGE_VERSION }} pytest intel::intel-opencl-rt python=${{ matrix.python }} -c ${{ env.CHANNEL_PATH }}
+        run: conda install ${{ env.PACKAGE_NAME }}=${{ env.PACKAGE_VERSION }} pytest intel-opencl-rt python=${{ matrix.python }} -c ${{ env.CHANNEL_PATH }}
 
       - name: Setup OpenCL CPU device
         if: runner.os == 'Windows'

README.md

@@ -24,7 +24,7 @@ SPDX-License-Identifier: Apache-2.0
 1. Create conda environment
 
     ```bash
-    conda create -n dpbench dpbench -c dppy/label/dev -c conda-forge -c intel -c nodefaults --override-channels
+    conda create -n dpbench dpbench -c dppy/label/dev -c conda-forge -c https://software.repos.intel.com/python/conda -c nodefaults --override-channels
     conda activate dpbench
     ```
 

dpbench/configs/bench_info/pca.toml

@@ -21,7 +21,7 @@ output_args = [
     "evalues",
     "evectors",
 ]
-expected_failure_implementations = ["numba_dpex_n"]
+expected_failure_implementations = ["numba_dpex_n", "numba_n", "numpy", "numba_np", "dpnp"]
 
 [benchmark.parameters.S]
 npoints = 1024

dpbench/configs/framework_info/dpcpp.toml

@@ -10,7 +10,7 @@ postfix = "dpcpp"
 class = "DpcppFramework"
 arch = "cpu"
 sycl_device = "cpu"
-dpcpp_version = "IntelLLVM 2024.1.0"
+dpcpp_version = "IntelLLVM 2024.2.1"
 
 [[framework.postfixes]]
 impl_postfix = "sycl"

environments/conda-linux-sycl.yml

@@ -5,8 +5,8 @@
 name: dpbench-dev
 channels:
   - dppy/label/dev
+  - https://software.repos.intel.com/python/conda
   - conda-forge
-  - intel
   - nodefaults
 dependencies:
   - pip
@@ -18,13 +18,13 @@ dependencies:
   - scikit-learn
   - versioneer
   - pandas
-  - intel::numpy
+  - numpy
   - numba
   - dpctl
   - dpnp
-  - numba-dpex
-  - intel::dpcpp_linux-64
-  - intel::dpcpp-cpp-rt
+  - numba-dpex>=0.23.0*
+  - dpcpp_linux-64
+  - dpcpp-cpp-rt
   - cython
   - cmake
   - ninja

environments/conda-win-sycl.yml

@@ -5,8 +5,8 @@
 name: dpbench-dev
 channels:
   - dppy/label/dev
+  - https://software.repos.intel.com/python/conda
   - conda-forge
-  - intel
   - nodefaults
 dependencies:
   - pip
@@ -18,22 +18,22 @@ dependencies:
   - scikit-learn
   - versioneer
   - pandas
-  - intel::numpy
+  - numpy
   - numba
   - dpctl
   - dpnp
   - numba-dpex
   # TODO: switch to conda-forge, but it results in broken OpenCL rt (see below)
   # - conda-forge::dpcpp_win-64
-  - intel::dpcpp_win-64
+  - dpcpp_win-64
   # fixing cmake version here, because we need to apply patch for IntelLLVM
   - cmake==3.26*
   - cython
   - scikit-build
   # TODO: switch to khronos, sycl-ls works fine, but dpctl can't select device.
   # set's OpenCL runtime (better version of intel-opencl-rt)
   # - khronos-opencl-icd-loader
-  - intel::intel-opencl-rt # need for set-intel-ocl-icd-registry.ps1
+  - intel-opencl-rt # need for set-intel-ocl-icd-registry.ps1
   # https://github.com/scikit-build/scikit-build/issues/981
   - setuptools>=42,<64
   - pybind11

environments/conda.yml

@@ -5,8 +5,8 @@
 name: dpbench-dev
 channels:
   - dppy/label/dev
+  - https://software.repos.intel.com/python/conda
   - conda-forge
-  - intel
   - nodefaults
 dependencies:
   - pip
@@ -18,9 +18,9 @@ dependencies:
   - scikit-learn
   - versioneer
   - pandas
-  - intel::intel-opencl-rt # need for set-intel-ocl-icd-registry.ps1
-  - intel::numpy
+  - intel-opencl-rt # need for set-intel-ocl-icd-registry.ps1
+  - numpy
   - numba
   - dpctl
   - dpnp
-  - numba-dpex
+  - numba-dpex>=0.23.0*