Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update of DPC dependencies for CI and conda-recipe #2160

Merged
merged 18 commits into from
Nov 14, 2024
Merged

Update of DPC dependencies for CI and conda-recipe #2160

Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
3204792
Update of conda-recipe building dependencies
Alexsandruss Nov 11, 2024
f68ea7a
Update DPC deps in CI
Alexsandruss Nov 11, 2024
49b9e82
Update DPC compiler version to 2025
Alexsandruss Nov 11, 2024
5474ded
Change compiler installation to conda-forge
Alexsandruss Nov 11, 2024
6a7a8bd
Reorder dpep pkgs installation
Alexsandruss Nov 11, 2024
90ca9cb
Move dpcpp-cpp-rt from running deps to optional test deps
Alexsandruss Nov 11, 2024
f384680
Remove duplicated installation of numpy
Alexsandruss Nov 12, 2024
c885723
Change dpep installation to PyPI
Alexsandruss Nov 12, 2024
6ecd411
Change mpich to impi-devel in lnx CI
Alexsandruss Nov 12, 2024
248abbd
Revert dpc compiler installation
Alexsandruss Nov 13, 2024
4c112e6
Update conda recipe
Alexsandruss Nov 13, 2024
67e5430
Fix conda-recipe
Alexsandruss Nov 13, 2024
7bdafbc
Modify py versions for dpep installation
Alexsandruss Nov 13, 2024
6615964
Use dpcpp-rt from apt installation
Alexsandruss Nov 13, 2024
a30692a
Revert "Use dpcpp-rt from apt installation"
Alexsandruss Nov 13, 2024
6df1e68
Remove py312 for dpep installation
Alexsandruss Nov 13, 2024
e97c607
Revert mpi to impi
Alexsandruss Nov 14, 2024
664f3ed
Add comment about dpep installation
Alexsandruss Nov 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .ci/pipeline/build-and-test-lnx.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ steps:
conda config --add channels conda-forge
conda config --set channel_priority strict
conda update -y -q conda
conda create -q -y -n CB -c conda-forge python=$(PYTHON_VERSION) dal-devel mpich pyyaml "dpcpp-cpp-rt=2024.2.0"
conda create -q -y -n CB -c conda-forge python=$(PYTHON_VERSION) dal-devel=2025 mpich pyyaml dpcpp-cpp-rt=2025.0
displayName: "Conda create"
- script: |
. /usr/share/miniconda/etc/profile.d/conda.sh
Expand All @@ -48,7 +48,7 @@ steps:
bash .ci/scripts/setup_sklearn.sh $(SKLEARN_VERSION)
pip install --upgrade -r requirements-test.txt
pip install $(python .ci/scripts/get_compatible_scipy_version.py)
if [ $(echo $(PYTHON_VERSION) | grep '3.9\|3.11') ] && [ $(SKLEARN_VERSION) != "1.0" ]; then conda install -q -y -c https://software.repos.intel.com/python/conda/ dpctl=0.17.0 dpnp=0.15.0; fi
if [ $(echo $(PYTHON_VERSION) | grep '3.9\|3.10\|3.11') ] && [ $(SKLEARN_VERSION) != "1.0" ]; then pip install dpctl==0.18.* dpnp==0.16.*; fi
pip list
displayName: "Install testing requirements"
- script: |
Expand Down
2 changes: 1 addition & 1 deletion .ci/scripts/install_dpcpp.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ rm GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB
echo "deb https://apt.repos.intel.com/oneapi all main" | sudo tee /etc/apt/sources.list.d/oneAPI.list
sudo add-apt-repository -y "deb https://apt.repos.intel.com/oneapi all main"
sudo apt-get update
sudo apt-get install -y intel-dpcpp-cpp-compiler-2024.2
sudo apt-get install -y intel-dpcpp-cpp-compiler-2025.0
sudo bash -c 'echo libintelocl.so > /etc/OpenCL/vendors/intel-cpu.icd'
12 changes: 8 additions & 4 deletions conda-recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ build:
- DPCPPROOT
- DALROOT
- NO_DIST=1 # [win]
ignore_run_exports:
- dpcpp_linux-64 # [linux64]
# - dpcpp_win-64 # [win]

requirements:
build:
Expand All @@ -58,15 +61,15 @@ requirements:
- cython
- jinja2
- pybind11
- numpy {{ numpy }}
- numpy
- impi-devel # [not win]
# dal-devel pinning depends on the recipe location (repo or feedstock)
- dal-devel
# - dal-devel =={{ version }}
run:
- python
- {{ pin_compatible('numpy') }}
- dpcpp-cpp-rt # [linux64]
- numpy
- scikit-learn
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, is scikit-learn needed in build deps or should it remain as test dep?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

scikit-learn is only run time dependency.

# dal pinning depends on the recipe location (repo or feedstock)
- dal
# - dal =={{ version }}
Expand All @@ -75,12 +78,13 @@ test:
requires:
- pyyaml
- impi_rt # [not win]
# DPC part of sklearnex is optional
- dpcpp-cpp-rt # [linux64]
# TODO: enable data parallel frameworks when they are available on conda-forge
# - dpctl
# - dpnp
# next deps are synced with requirements-test.txt
- pytest
- scikit-learn
- pandas
- xgboost
- lightgbm
Expand Down