Skip to content

Commit

Permalink
Merge pull request #1241 from IntelPython/workaround/pin_dpcpp_version
Browse files Browse the repository at this point in the history
Workaround: pin dpcpp version to 2024.0.0
  • Loading branch information
Diptorup Deb authored Dec 12, 2023
2 parents a92e9b3 + cdefeac commit f562bd6
Show file tree
Hide file tree
Showing 5 changed files with 96 additions and 96 deletions.
2 changes: 1 addition & 1 deletion conda-recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ build:
requirements:
build:
- {{ compiler('cxx') }}
- {{ compiler('dpcpp') }} # [not osx]
- {{ compiler('dpcpp') }} <2024.0.1 # [not osx]
host:
- python
- setuptools >=63.*
Expand Down
54 changes: 27 additions & 27 deletions environment.yml
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
name: dev
channels:
- defaults
- dppy/label/dev
- numba
- intel
- numba/label/dev
- nodefaults
- defaults
- dppy/label/dev
- numba
- intel
- numba/label/dev
- nodefaults
dependencies:
- python=3.9
- gxx_linux-64
- dpcpp_linux-64
- numba ==0.58*
- dpctl >=0.14*
- dpnp >=0.11*
- mkl >=2021.3.0 # for dpnp
- dpcpp-llvm-spirv
- packaging
- scikit-build >=0.15*
- cmake >=3.26*
- pytest
- pip
- pip:
- coverage
- pre-commit
- flake8
- black==20.8b1
- pytest-cov
- pytest-xdist
- pexpect
- python=3.9
- gxx_linux-64
- dpcpp_linux-64==2024.0.0
- numba ==0.58*
- dpctl >=0.14*
- dpnp >=0.11*
- mkl >=2021.3.0 # for dpnp
- dpcpp-llvm-spirv
- packaging
- scikit-build >=0.15*
- cmake >=3.26*
- pytest
- pip
- pip:
- coverage
- pre-commit
- flake8
- black==20.8b1
- pytest-cov
- pytest-xdist
- pexpect
variables:
CHANNELS: -c defaults -c numba -c intel -c numba/label/dev -c dppy/label/dev --override-channels
CHANNELS_DEV: -c dppy/label/dev -c defaults -c numba -c intel -c numba/label/dev --override-channels
40 changes: 20 additions & 20 deletions environment/coverage.yml
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
name: dev
channels:
- dppy/label/dev
- numba
- intel
- conda-forge
- nodefaults
- dppy/label/dev
- numba
- intel
- conda-forge
- nodefaults
dependencies:
- libffi
- gxx_linux-64
- dpcpp_linux-64
- numba==0.58*
- dpctl
- dpnp
- dpcpp-llvm-spirv
- opencl_rt
- coverage
- pytest
- pytest-cov
- pytest-xdist
- pexpect
- scikit-build>=0.15*
- cmake>=3.26*
- libffi
- gxx_linux-64
- dpcpp_linux-64==2024.0.0
- numba==0.58*
- dpctl
- dpnp
- dpcpp-llvm-spirv
- opencl_rt
- coverage
- pytest
- pytest-cov
- pytest-xdist
- pexpect
- scikit-build>=0.15*
- cmake>=3.26*
52 changes: 26 additions & 26 deletions environment/docs.yml
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
name: dpex-docs-dev
channels:
- dppy/label/dev
- numba
- intel
- conda-forge
- nodefaults
- dppy/label/dev
- numba
- intel
- conda-forge
- nodefaults
dependencies:
- libffi
- gxx_linux-64
- dpcpp_linux-64
- numba==0.58*
- scikit-build>=0.15*
- cmake>=3.26*
- dpctl
- dpnp
- dpcpp-llvm-spirv
- opencl_rt
- pip
- pip:
- sphinx
- autodoc # there is no conda package
- recommonmark
- sphinx-rtd-theme
- sphinxcontrib-apidoc
- sphinxcontrib-googleanalytics
- sphinxcontrib.programoutput
- pydata-sphinx-theme
- myst-parser
- libffi
- gxx_linux-64
- dpcpp_linux-64==2024.0.0
- numba==0.58*
- scikit-build>=0.15*
- cmake>=3.26*
- dpctl
- dpnp
- dpcpp-llvm-spirv
- opencl_rt
- pip
- pip:
- sphinx
- autodoc # there is no conda package
- recommonmark
- sphinx-rtd-theme
- sphinxcontrib-apidoc
- sphinxcontrib-googleanalytics
- sphinxcontrib.programoutput
- pydata-sphinx-theme
- myst-parser
44 changes: 22 additions & 22 deletions environment/pre-commit.yml
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
name: dev
channels:
- dppy/label/dev
- numba
- intel
- conda-forge
- nodefaults
- dppy/label/dev
- numba
- intel
- conda-forge
- nodefaults
dependencies:
- libffi
- gxx_linux-64
- dpcpp_linux-64
- numba==0.58*
- dpctl
- dpnp
- dpcpp-llvm-spirv
- opencl_rt
- coverage
- pytest
- pytest-cov
- pytest-xdist
- pexpect
- scikit-build>=0.15*
- cmake>=3.26*
- pre-commit
- pylint
- libffi
- gxx_linux-64
- dpcpp_linux-64==2024.0.0
- numba==0.58*
- dpctl
- dpnp
- dpcpp-llvm-spirv
- opencl_rt
- coverage
- pytest
- pytest-cov
- pytest-xdist
- pexpect
- scikit-build>=0.15*
- cmake>=3.26*
- pre-commit
- pylint

0 comments on commit f562bd6

Please sign in to comment.