diff --git a/.github/workflows/run_tests.yaml b/.github/workflows/run_tests.yaml index 13bc7a6..dffa56f 100644 --- a/.github/workflows/run_tests.yaml +++ b/.github/workflows/run_tests.yaml @@ -21,7 +21,7 @@ jobs: # Development tracker: https://github.com/scikit-learn/scikit-learn/pull/25535/ # TODO: Remove this step when the plugin API is officially released - name: Install pytest, sklearn branch "feature/engine-api", and sklearn-numba-dpex - run: pip install pytest git+https://github.com/scikit-learn/scikit-learn.git@2ccfc8c4bdf66db005d7681757b4145842944fb9#egg=scikit-learn -e . + run: pip install pytest git+https://github.com/scikit-learn/scikit-learn.git@7d52073b15ee920c6f49208c777e7ce7663ff74b#egg=scikit-learn -e . - name: Check device run: python -c "import dpctl; dpctl.select_default_device().print_device_info()" diff --git a/README.md b/README.md index 50e0259..215a108 100644 --- a/README.md +++ b/README.md @@ -163,7 +163,7 @@ conda create --yes --name sklearn-dev \ conda activate sklearn-dev git clone https://github.com/scikit-learn/scikit-learn -b "feature/engine-api" --depth 1 cd scikit-learn -git checkout 2ccfc8c4bdf66db005d7681757b4145842944fb9 +git checkout 7d52073b15ee920c6f49208c777e7ce7663ff74b python setup.py bdist_wheel conda activate $CONDA_DPEX_ENV_NAME cd dist/ @@ -226,7 +226,7 @@ Once you have loaded into the container, follow those instructions to install th ```bash git clone https://github.com/scikit-learn/scikit-learn -b "feature/engine-api" --depth 1 cd scikit-learn -git checkout 2ccfc8c4bdf66db005d7681757b4145842944fb9 +git checkout 7d52073b15ee920c6f49208c777e7ce7663ff74b pip install -e . cd .. ``` diff --git a/docker/Dockerfile b/docker/Dockerfile index 8b53e1b..9d88d68 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -24,7 +24,7 @@ # # TODO: make a custom build with other base images to test compatibility # with other OSes. -ARG BASE_IMAGE_VERSION=latest-57b016e6e031950e5e5abda2d69afc355e7c7b61 +ARG BASE_IMAGE_VERSION=latest-865092f2b51feebd7aa8caaba486e7b66951d982 ARG BASE_IMAGE_TAG=ghcr.io/intel/llvm/ubuntu2204_intel_drivers ARG BASE=${BASE_IMAGE_TAG}:${BASE_IMAGE_VERSION} @@ -39,7 +39,7 @@ ARG BASE=${BASE_IMAGE_TAG}:${BASE_IMAGE_VERSION} # FIXME: The base image is missing a package required for enabling the `level_zero` # backend, see https://github.com/intel/llvm/issues/6342 # Until it is fixed upstream we need to explicitly install the oneAPI level_zero loader. -ARG L0_LOADER_DEB_VERSION=1.14.0 +ARG L0_LOADER_DEB_VERSION=1.15.8 ARG L0_LOADER_DEB_PLATFORM=u22.04 ARG INTEL_PYPI_URL=https://pypi.anaconda.org/intel/simple @@ -53,24 +53,23 @@ ARG PYTHON_VERSION=3.10.13 # It can be found at https://www.intel.com/content/www/us/en/developer/tools/oneapi/base-toolkit-download.html?operatingsystem=linux&distributions=webdownload&options=online # The installer CLI is documented here: https://www.intel.com/content/www/us/en/develop/documentation/installation-guide-for-intel-oneapi-toolkits-linux/top/installation/install-with-command-line.html#install-with-command-line_interactive -ARG ONEAPI_INSTALLER_URL=https://registrationcenter-download.intel.com/akdlm/IRC_NAS/992857b9-624c-45de-9701-f6445d845359 -ARG ONEAPI_INSTALL_BINARY_NAME=l_BaseKit_p_2023.2.0.49397.sh +ARG ONEAPI_INSTALLER_URL=https://registrationcenter-download.intel.com/akdlm/IRC_NAS/163da6e4-56eb-4948-aba3-debcec61c064 +ARG ONEAPI_INSTALL_BINARY_NAME=l_BaseKit_p_2024.0.1.46.sh ARG ONEAPI_INSTALL_DIR=/opt/intel/oneapi # Some build steps require a high enough version of cmake. # Bump it if necessary. -ARG CMAKE_VERSION=3.27 -ARG CMAKE_VERSION_BUILD=6 - +ARG CMAKE_VERSION=3.28 +ARG CMAKE_VERSION_BUILD=1 # Versions of the intel python packages -ARG DPCTL_GIT_BRANCH=0.15.1dev0 +ARG DPCTL_GIT_BRANCH=0.15.1dev2 ARG DPCTL_GIT_URL=https://github.com/IntelPython/dpctl.git -ARG DPNP_GIT_BRANCH=0.13.1dev0 +ARG DPNP_GIT_BRANCH=0.13.1dev2 ARG DPNP_GIT_URL=https://github.com/IntelPython/dpnp.git # `numba_dpex` often requires to install from arbitrary git commits, so the @@ -304,7 +303,7 @@ RUN --mount=type=bind,target=$ONEAPI_INSTALL_DIR,source=$ONEAPI_INSTALL_DIR,from && python setup.py clean --all \ && python setup.py bdist_wheel \ && cp dist/dpcpp_llvm_spirv*.whl $TMPDIR \ - && cp $ONEAPI_INSTALL_DIR/compiler/latest/linux/bin-llvm/llvm-spirv $TMPDIR \ + && cp $ONEAPI_INSTALL_DIR/2024.0/bin/compiler/llvm-spirv $TMPDIR \ && rm -Rf $DPCPP_LLVM_SPIRV_BUILD_DIR FROM build_environment AS numba_dpex_builder