Skip to content

Commit f4fe483

Browse files
committed
Remove intel channel and build everything with conda-forge
1 parent 8fb3f33 commit f4fe483

File tree

7 files changed

+11
-24
lines changed

7 files changed

+11
-24
lines changed

.github/workflows/conda-package.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ env:
1616
PACKAGE_NAME: numba-dpex
1717
MODULE_NAME: numba_dpex
1818
# There is a separate action that removes defaults.
19-
CHANNELS: 'dppy/label/dev,conda-forge,https://software.repos.intel.com/python/conda,numba,nodefaults'
19+
CHANNELS: 'dppy/label/dev,conda-forge,numba,nodefaults'
2020
VER_JSON_NAME: 'version.json'
2121
VER_SCRIPT1: "import json; f = open('version.json', 'r'); j = json.load(f); f.close(); "
2222
VER_SCRIPT2: "d = j['numba-dpex'][0]; print('='.join((d[s] for s in ('version', 'build'))))"
@@ -170,7 +170,7 @@ jobs:
170170
# We want to make sure that all dependecies install automatically.
171171
# intel::intel-opencl-rt is needed for set-intel-ocl-icd-registry.ps1
172172
- name: Install built package
173-
run: conda install ${{ env.PACKAGE_NAME }}=${{ env.PACKAGE_VERSION }} https://software.repos.intel.com/python/conda::intel-opencl-rt -c ${{ env.CHANNEL_PATH }} --override-channels
173+
run: conda install ${{ env.PACKAGE_NAME }}=${{ env.PACKAGE_VERSION }} intel-opencl-rt -c ${{ env.CHANNEL_PATH }} --override-channels
174174

175175
- name: Setup OpenCL CPU device
176176
if: runner.os == 'Windows'

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ To install `numba_dpex` from the Intel(R) channel on Anaconda
6868
cloud, use the following command:
6969

7070
```bash
71-
conda install numba-dpex -c https://software.repos.intel.com/python/conda -c conda-forge
71+
conda install numba-dpex -c conda-forge
7272
```
7373

7474
## Pip

conda-recipe/meta.yaml

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
{% set required_compiler_version = "2024.0" %}
2-
{% set excluded_compiler_version1 = "2024.0.1" %}
3-
{% set excluded_compiler_version2 = "2024.0.2" %}
4-
{% set excluded_compiler_version3 = "2024.0.3" %}
1+
{% set required_compiler_version = "2024.2.0" %}
52

63
{% set pyproject = load_file_data('pyproject.toml') %}
74
{% set py_build_deps = pyproject.get('build-system', {}).get('requires', []) %}
@@ -21,18 +18,16 @@ build:
2118
requirements:
2219
# TODO: keep in sync with /pyproject.toml
2320
build:
24-
- {{ compiler('cxx') }}
25-
- {{ compiler('dpcpp') }} >={{ required_compiler_version }},!={{ excluded_compiler_version1 }},!={{ excluded_compiler_version2 }},!={{ excluded_compiler_version3 }} # [win]
26-
- {{ compiler('dpcpp') }} >={{ required_compiler_version }},!={{ excluded_compiler_version1 }},!={{ excluded_compiler_version2 }} # [linux]
21+
- {{ compiler('dpcpp') }} >={{ required_compiler_version }}
2722
# Minimal supported version of sysroot (which is version of glibc) to
2823
# have compatibility with wider range of linux distributions.
2924
# 2.28 is the minimal supported version by dpcpp
3025
- sysroot_linux-64 =2.28 # [linux]
3126
host:
3227
- python
3328
- pip >=24.0
34-
- dpcpp-cpp-rt >={{ required_compiler_version }},!={{ excluded_compiler_version1 }},!={{ excluded_compiler_version2 }},!={{ excluded_compiler_version3 }} # [win]
35-
- dpcpp-cpp-rt >={{ required_compiler_version }},!={{ excluded_compiler_version1 }},!={{ excluded_compiler_version2 }} # [linux]
29+
- dpcpp-cpp-rt
30+
- intel-cmplr-lib-rt
3631
# ensure we are using latest version of setuptools, since we don't need
3732
# editable environments for release.
3833
- setuptools >=69
@@ -53,17 +48,12 @@ requirements:
5348
# pin_compatible at run section.
5449
- dpcpp-llvm-spirv >={{ required_compiler_version }}
5550
run:
56-
- {{ pin_compatible('dpcpp-cpp-rt', min_pin='x.x', max_pin='x') }}
57-
- {{ pin_compatible('intel-cmplr-lib-rt', min_pin='x.x', max_pin='x') }}
5851
# TODO: pick up min version from dep
5952
- {{ pin_compatible('dpcpp-llvm-spirv', min_pin='x.x', max_pin='x') }}
6053
- {{ pin_compatible('dpnp', min_pin='x.x.x', max_pin='x.x') }}
6154
- {{ pin_compatible('dpctl', min_pin='x.x.x', max_pin='x.x') }}
6255
- {{ pin_compatible('numba', min_pin='x.x.x', max_pin='x.x') }}
6356
- {{ pin_compatible('llvmlite', min_pin='x.x.x', max_pin='x.x') }}
64-
# TODO: set max pin +2 from minor version
65-
# https://numpy.org/neps/nep-0023-backwards-compatibility.html#nep23
66-
- {{ pin_compatible('numpy', min_pin='x.x.x', max_pin='x') }}
6757
- python
6858

6959
test:

docs/source/getting_started.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ to get the latest production releases.
2020
2121
conda create -n numba-dpex-env \
2222
numba-dpex dpnp dpctl dpcpp-llvm-spirv \
23-
-c https://software.repos.intel.com/python/conda -c conda-forge
23+
-c conda-forge
2424
2525
To try out the bleeding edge, the latest packages built from tip of the main
2626
source trunk can be installed from the ``dppy/label/dev`` conda channel.
@@ -29,7 +29,7 @@ source trunk can be installed from the ``dppy/label/dev`` conda channel.
2929
3030
conda create -n numba-dpex-env \
3131
numba-dpex dpnp dpctl dpcpp-llvm-spirv \
32-
-c dppy/label/dev -c https://software.repos.intel.com/python/conda -c conda-forge
32+
-c dppy/label/dev -c conda-forge
3333
3434
3535
@@ -53,7 +53,7 @@ Steps to build using ``conda-build``:
5353

5454
.. code-block:: bash
5555
56-
conda build conda-recipe -c https://software.repos.intel.com/python/conda -c conda-forge
56+
conda build conda-recipe -c conda-forge
5757
5858
3. Install the conda package
5959

@@ -71,7 +71,7 @@ first step.
7171
# Create a conda environment that hass needed dependencies installed
7272
conda create -n numba-dpex-env \
7373
scikit-build cmake dpctl dpnp numba dpcpp-llvm-spirv llvmdev pytest \
74-
-c https://software.repos.intel.com/python/conda -c conda-forge
74+
-c conda-forge
7575
# Activate the environment
7676
conda activate numba-dpex-env
7777
# Clone the numba-dpex repository

environment/coverage.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ name: dev
22
channels:
33
- dppy/label/dev
44
- numba
5-
- https://software.repos.intel.com/python/conda
65
- conda-forge
76
- nodefaults
87
dependencies:

environment/docs.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ name: dpex-docs-dev
22
channels:
33
- dppy/label/dev
44
- numba
5-
- https://software.repos.intel.com/python/conda
65
- conda-forge
76
- nodefaults
87
dependencies:

environment/pre-commit.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ name: dev
22
channels:
33
- dppy/label/dev
44
- numba
5-
- https://software.repos.intel.com/python/conda
65
- conda-forge
76
- nodefaults
87
dependencies:

0 commit comments

Comments
 (0)