From 8b1691f1e9ba3ab643914fe7e9ce3cac9d59ccda Mon Sep 17 00:00:00 2001 From: Vahid Tavanashad Date: Tue, 7 Nov 2023 11:41:03 -0600 Subject: [PATCH 1/4] update dpctl version --- .github/workflows/build-sphinx.yml | 2 +- conda-recipe/meta.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-sphinx.yml b/.github/workflows/build-sphinx.yml index 8dc54185f0a..f852e305978 100644 --- a/.github/workflows/build-sphinx.yml +++ b/.github/workflows/build-sphinx.yml @@ -91,7 +91,7 @@ jobs: - name: Install dpnp dependencies run: | - conda install numpy"<1.24" dpctl">=0.15.0" mkl-devel-dpcpp onedpl-devel tbb-devel dpcpp_linux-64 \ + conda install numpy"<1.24" dpctl">=0.15.1" mkl-devel-dpcpp onedpl-devel tbb-devel dpcpp_linux-64 \ cmake cython pytest ninja scikit-build sysroot_linux-64">=2.28" ${{ env.CHANNELS }} - name: Install cuPy dependencies diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index dd77870dee5..3113a96c853 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -13,7 +13,7 @@ requirements: - cmake >=3.21 - ninja - git - - dpctl >=0.15.0 + - dpctl >=0.15.1 - mkl-devel-dpcpp {{ environ.get('MKL_VER', '>=2023.2.0') }} - onedpl-devel - tbb-devel @@ -25,7 +25,7 @@ requirements: - sysroot_linux-64 >=2.28 # [linux] run: - python - - dpctl >=0.15.0 + - dpctl >=0.15.1 - {{ pin_compatible('dpcpp-cpp-rt', min_pin='x.x', max_pin='x') }} - {{ pin_compatible('mkl-dpcpp', min_pin='x.x', max_pin='x') }} - {{ pin_compatible('numpy', min_pin='x.x', max_pin='x') }} From 2ce88319af3bf64290ff8492daebc38037cfc7c0 Mon Sep 17 00:00:00 2001 From: Oleksandr Pavlyk Date: Wed, 8 Nov 2023 05:18:51 -0600 Subject: [PATCH 2/4] Requite 0.15.1dev1 or higher --- conda-recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index 3113a96c853..2827b74b53e 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -13,7 +13,7 @@ requirements: - cmake >=3.21 - ninja - git - - dpctl >=0.15.1 + - dpctl >=0.15.1dev1 - mkl-devel-dpcpp {{ environ.get('MKL_VER', '>=2023.2.0') }} - onedpl-devel - tbb-devel @@ -25,7 +25,7 @@ requirements: - sysroot_linux-64 >=2.28 # [linux] run: - python - - dpctl >=0.15.1 + - dpctl >=0.15.1dev1 - {{ pin_compatible('dpcpp-cpp-rt', min_pin='x.x', max_pin='x') }} - {{ pin_compatible('mkl-dpcpp', min_pin='x.x', max_pin='x') }} - {{ pin_compatible('numpy', min_pin='x.x', max_pin='x') }} From 3f4fe8ae46e6088ec89aad347c1770f7f3d02c13 Mon Sep 17 00:00:00 2001 From: Oleksandr Pavlyk Date: Wed, 8 Nov 2023 05:19:05 -0600 Subject: [PATCH 3/4] Require 0.15.1dev1 or higher --- .github/workflows/build-sphinx.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-sphinx.yml b/.github/workflows/build-sphinx.yml index f852e305978..a35480e25ee 100644 --- a/.github/workflows/build-sphinx.yml +++ b/.github/workflows/build-sphinx.yml @@ -91,7 +91,7 @@ jobs: - name: Install dpnp dependencies run: | - conda install numpy"<1.24" dpctl">=0.15.1" mkl-devel-dpcpp onedpl-devel tbb-devel dpcpp_linux-64 \ + conda install numpy"<1.24" dpctl">=0.15.1dev1" mkl-devel-dpcpp onedpl-devel tbb-devel dpcpp_linux-64 \ cmake cython pytest ninja scikit-build sysroot_linux-64">=2.28" ${{ env.CHANNELS }} - name: Install cuPy dependencies From aa330a2bc3828dbcfeb7b4e6c0be8de3b754927f Mon Sep 17 00:00:00 2001 From: Oleksandr Pavlyk Date: Wed, 8 Nov 2023 05:31:50 -0600 Subject: [PATCH 4/4] Do not pin numpy in host section --- conda-recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index 2827b74b53e..dce60269660 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -8,7 +8,7 @@ requirements: host: - python - setuptools - - numpy >=1.19,<1.25a0 + - numpy - cython - cmake >=3.21 - ninja