From 81ce1602e5b8684fc44f50ccdc35612883d4fd93 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Mon, 24 Jun 2024 10:04:40 -0500 Subject: [PATCH 1/2] remove openmpi pin --- conda/environments/all_cuda-118_arch-x86_64.yaml | 2 +- conda/environments/all_cuda-122_arch-x86_64.yaml | 2 +- dependencies.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index 4a235eac7c4..a3c4cc6adf8 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -42,7 +42,7 @@ dependencies: - numpy>=1.23,<2.0a0 - numpydoc - nvcc_linux-64=11.8 -- openmpi<5.0.3 +- openmpi - packaging>=21 - pandas - pre-commit diff --git a/conda/environments/all_cuda-122_arch-x86_64.yaml b/conda/environments/all_cuda-122_arch-x86_64.yaml index 8275634e55b..7e229dd66f9 100644 --- a/conda/environments/all_cuda-122_arch-x86_64.yaml +++ b/conda/environments/all_cuda-122_arch-x86_64.yaml @@ -47,7 +47,7 @@ dependencies: - numba>=0.57 - numpy>=1.23,<2.0a0 - numpydoc -- openmpi<5.0.3 +- openmpi - packaging>=21 - pandas - pre-commit diff --git a/dependencies.yaml b/dependencies.yaml index 91593bf9168..8c8cf8f9de7 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -366,7 +366,7 @@ dependencies: - libraft-headers==24.8.* - libraft==24.8.* - librmm==24.8.* - - openmpi<5.0.3 # Required for building cpp-mgtests (multi-GPU tests) + - openmpi # Required for building cpp-mgtests (multi-GPU tests) specific: - output_types: [conda] matrices: From 27e69c47d5d9648ae5f00dc8fd25ba9c9ff505a6 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 26 Jun 2024 16:26:01 -0700 Subject: [PATCH 2/2] pin thriftpy2 --- conda/environments/all_cuda-118_arch-x86_64.yaml | 1 + conda/environments/all_cuda-122_arch-x86_64.yaml | 1 + dependencies.yaml | 3 +++ 3 files changed, 5 insertions(+) diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index a3c4cc6adf8..40aaef5b6ed 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -70,6 +70,7 @@ dependencies: - sphinx-markdown-tables - sphinx<6 - sphinxcontrib-websupport +- thriftpy2<=0.5.0 - ucx-proc=*=gpu - ucx-py==0.39.* - wget diff --git a/conda/environments/all_cuda-122_arch-x86_64.yaml b/conda/environments/all_cuda-122_arch-x86_64.yaml index 7e229dd66f9..1c42ad39fb1 100644 --- a/conda/environments/all_cuda-122_arch-x86_64.yaml +++ b/conda/environments/all_cuda-122_arch-x86_64.yaml @@ -75,6 +75,7 @@ dependencies: - sphinx-markdown-tables - sphinx<6 - sphinxcontrib-websupport +- thriftpy2<=0.5.0 - ucx-proc=*=gpu - ucx-py==0.39.* - wget diff --git a/dependencies.yaml b/dependencies.yaml index 8c8cf8f9de7..c37d2080771 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -545,6 +545,9 @@ dependencies: - output_types: [conda] packages: - pylibwholegraph==24.8.* + # this thriftpy2 entry can be removed entirely (or switched to a '!=') + # once a new release of that project resolves https://github.com/Thriftpy/thriftpy2/issues/281 + - thriftpy2<=0.5.0 test_python_pylibcugraph: common: - output_types: [conda, pyproject]