diff --git a/.github/workflows/build_and_run.yml b/.github/workflows/build_and_run.yml index b2d90013..7c6fcf04 100644 --- a/.github/workflows/build_and_run.yml +++ b/.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 diff --git a/.github/workflows/conda-package.yml b/.github/workflows/conda-package.yml index 77afa344..9346d611 100644 --- a/.github/workflows/conda-package.yml +++ b/.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,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' diff --git a/README.md b/README.md index 2bc8489e..4bf5e4d0 100644 --- a/README.md +++ b/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 nodefaults --override-channels conda activate dpbench ``` diff --git a/dpbench/configs/framework_info/dpcpp.toml b/dpbench/configs/framework_info/dpcpp.toml index c1655e91..b3b227e2 100644 --- a/dpbench/configs/framework_info/dpcpp.toml +++ b/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" diff --git a/environments/conda-linux-sycl.yml b/environments/conda-linux-sycl.yml index d0b4113a..77b9a022 100644 --- a/environments/conda-linux-sycl.yml +++ b/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 diff --git a/environments/conda-win-sycl.yml b/environments/conda-win-sycl.yml index d3160f22..c3e06861 100644 --- a/environments/conda-win-sycl.yml +++ b/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,14 +18,14 @@ 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 @@ -33,7 +33,7 @@ dependencies: # 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 diff --git a/environments/conda.yml b/environments/conda.yml index 9491b1a8..fd1cc797 100644 --- a/environments/conda.yml +++ b/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*