From 159f295fdbc197e94af88e0852474688b94b8b85 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 10 Jan 2024 15:41:20 -0600 Subject: [PATCH 1/5] refactor CUDA versions in dependencies.yaml --- .pre-commit-config.yaml | 2 +- dependencies.yaml | 36 ++++++++++++++++++++---------------- 2 files changed, 21 insertions(+), 17 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 985843b5..fa889125 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -15,7 +15,7 @@ repos: args: ["--config=.flake8"] files: python/.*$ - repo: https://github.com/rapidsai/dependency-file-generator - rev: v1.7.1 + rev: v1.8.0 hooks: - id: rapids-dependency-file-generator args: ["--clean"] diff --git a/dependencies.yaml b/dependencies.yaml index 0ff1a431..22ecac54 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -7,7 +7,8 @@ files: arch: [x86_64] includes: - build_wheels - - cudatoolkit + - cuda + - cuda_version - checks - docs - notebook @@ -17,13 +18,13 @@ files: test_python: output: none includes: - - cudatoolkit + - cuda_version - py_version - test_python test_notebooks: output: none includes: - - cudatoolkit + - cuda_version - notebook - py_version checks: @@ -34,7 +35,7 @@ files: docs: output: none includes: - - cudatoolkit + - cuda_version - docs - py_version py_build: @@ -71,34 +72,37 @@ dependencies: packages: - wheel - setuptools - cudatoolkit: + cuda_version: specific: - output_types: conda matrices: - matrix: - cuda: "12.0" + cuda: "11.2" packages: - - cuda-version=12.0 + - cuda-version=11.2 + - matrix: + cuda: "11.4" + packages: + - cuda-version=11.4 - matrix: cuda: "11.8" packages: - cuda-version=11.8 - - cudatoolkit - matrix: - cuda: "11.5" + cuda: "12.0" packages: - - cuda-version=11.5 - - cudatoolkit + - cuda-version=12.0 + cuda: + specific: + - output_types: conda + matrices: - matrix: - cuda: "11.4" + cuda: "11.*" packages: - - cuda-version=11.4 - cudatoolkit - matrix: - cuda: "11.2" + cuda: "12.*" packages: - - cuda-version=11.2 - - cudatoolkit checks: common: - output_types: [conda, requirements] From 5d3c90ea3adedcf2abfc7c9c6fca411442e95bbf Mon Sep 17 00:00:00 2001 From: James Lamb Date: Thu, 11 Jan 2024 08:32:34 -0600 Subject: [PATCH 2/5] Update dependencies.yaml Co-authored-by: Bradley Dice --- dependencies.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dependencies.yaml b/dependencies.yaml index 22ecac54..c9023cc2 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -84,6 +84,10 @@ dependencies: cuda: "11.4" packages: - cuda-version=11.4 + - matrix: + cuda: "11.5" + packages: + - cuda-version=11.5 - matrix: cuda: "11.8" packages: From 9ce9fc8094e14cc8d09b05436f39ad94470caa80 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Thu, 11 Jan 2024 10:17:51 -0600 Subject: [PATCH 3/5] try adding cuda toolkit back to test_python env --- dependencies.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/dependencies.yaml b/dependencies.yaml index 22ecac54..3c2c8805 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -18,6 +18,7 @@ files: test_python: output: none includes: + - cuda - cuda_version - py_version - test_python From 84ce513bd76f0dfe68a673363b53f73d1b20d0e2 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Thu, 11 Jan 2024 12:54:40 -0600 Subject: [PATCH 4/5] try putting a ceiling on 'panel' --- conda/environments/all_cuda-118_arch-x86_64.yaml | 2 +- conda/environments/all_cuda-120_arch-x86_64.yaml | 2 +- dependencies.yaml | 2 +- python/pyproject.toml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index 211437eb..88c2c774 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -31,7 +31,7 @@ dependencies: - numpydoc - packaging - pandoc<=2.0.0 -- panel>=1.0 +- panel>=1.0,<=1.3.4 - pre-commit - pydata-sphinx-theme - pytest diff --git a/conda/environments/all_cuda-120_arch-x86_64.yaml b/conda/environments/all_cuda-120_arch-x86_64.yaml index dafb0eaa..78d2d02c 100644 --- a/conda/environments/all_cuda-120_arch-x86_64.yaml +++ b/conda/environments/all_cuda-120_arch-x86_64.yaml @@ -30,7 +30,7 @@ dependencies: - numpydoc - packaging - pandoc<=2.0.0 -- panel>=1.0 +- panel>=1.0,<=1.3.4 - pre-commit - pydata-sphinx-theme - pytest diff --git a/dependencies.yaml b/dependencies.yaml index b4596909..1fd7ef4a 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -169,7 +169,7 @@ dependencies: - numba>=0.57 - numpy>=1.21 - packaging - - panel>=1.0 + - panel>=1.0,<=1.3.4 - output_types: conda packages: - cupy>=12.0.0 diff --git a/python/pyproject.toml b/python/pyproject.toml index 0d6533d7..09fb0228 100644 --- a/python/pyproject.toml +++ b/python/pyproject.toml @@ -30,7 +30,7 @@ dependencies = [ "numba>=0.57", "numpy>=1.21", "packaging", - "panel>=1.0", + "panel>=1.0,<=1.3.4", ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../dependencies.yaml and run `rapids-dependency-file-generator`. classifiers = [ "Intended Audience :: Developers", From d3800f13f30e82e908b2059fd48a85e17a88cb5d Mon Sep 17 00:00:00 2001 From: Ajay Thorve Date: Thu, 11 Jan 2024 11:18:44 -0800 Subject: [PATCH 5/5] add specific panel version pin for test_python env --- conda/environments/all_cuda-118_arch-x86_64.yaml | 1 + conda/environments/all_cuda-120_arch-x86_64.yaml | 1 + dependencies.yaml | 5 ++++- python/pyproject.toml | 2 +- 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index 88c2c774..4e2cc92b 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -31,6 +31,7 @@ dependencies: - numpydoc - packaging - pandoc<=2.0.0 +- panel>=1.0 - panel>=1.0,<=1.3.4 - pre-commit - pydata-sphinx-theme diff --git a/conda/environments/all_cuda-120_arch-x86_64.yaml b/conda/environments/all_cuda-120_arch-x86_64.yaml index 78d2d02c..c78cc8c8 100644 --- a/conda/environments/all_cuda-120_arch-x86_64.yaml +++ b/conda/environments/all_cuda-120_arch-x86_64.yaml @@ -30,6 +30,7 @@ dependencies: - numpydoc - packaging - pandoc<=2.0.0 +- panel>=1.0 - panel>=1.0,<=1.3.4 - pre-commit - pydata-sphinx-theme diff --git a/dependencies.yaml b/dependencies.yaml index 1fd7ef4a..ed759b6f 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -169,7 +169,7 @@ dependencies: - numba>=0.57 - numpy>=1.21 - packaging - - panel>=1.0,<=1.3.4 + - panel>=1.0 - output_types: conda packages: - cupy>=12.0.0 @@ -186,3 +186,6 @@ dependencies: - pytest - pytest-cov - pytest-xdist + - output_types: conda + packages: + - panel>=1.0,<=1.3.4 diff --git a/python/pyproject.toml b/python/pyproject.toml index 09fb0228..0d6533d7 100644 --- a/python/pyproject.toml +++ b/python/pyproject.toml @@ -30,7 +30,7 @@ dependencies = [ "numba>=0.57", "numpy>=1.21", "packaging", - "panel>=1.0,<=1.3.4", + "panel>=1.0", ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../dependencies.yaml and run `rapids-dependency-file-generator`. classifiers = [ "Intended Audience :: Developers",