From 4ec0a884bf21c5d04e20482399d73a62b3ac9305 Mon Sep 17 00:00:00 2001 From: Robert Maynard Date: Thu, 17 Nov 2022 14:37:51 -0500 Subject: [PATCH] Don't use CMake 3.25.0 as it has a FindCUDAToolkit show stopping bug --- conda/environments/raft_dev_cuda11.2.yml | 2 +- conda/environments/raft_dev_cuda11.4.yml | 2 +- conda/environments/raft_dev_cuda11.5.yml | 2 +- conda/recipes/libraft/conda_build_config.yaml | 2 +- conda/recipes/pylibraft/conda_build_config.yaml | 2 +- conda/recipes/raft-dask/conda_build_config.yaml | 2 +- python/pylibraft/pyproject.toml | 2 +- python/raft-dask/pyproject.toml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/conda/environments/raft_dev_cuda11.2.yml b/conda/environments/raft_dev_cuda11.2.yml index 4a6e7e6fc4..a7b5f1728e 100644 --- a/conda/environments/raft_dev_cuda11.2.yml +++ b/conda/environments/raft_dev_cuda11.2.yml @@ -14,7 +14,7 @@ dependencies: - clang=11.1.0 - clang-tools=11.1.0 - cython>=0.29,<0.30 -- cmake>=3.23.1 +- cmake>=3.23.1,!=3.25.0 - dask>=2022.9.2 - distributed>=2022.9.2 - scikit-build>=0.13.1 diff --git a/conda/environments/raft_dev_cuda11.4.yml b/conda/environments/raft_dev_cuda11.4.yml index f2acaed40e..fb07bacf7d 100644 --- a/conda/environments/raft_dev_cuda11.4.yml +++ b/conda/environments/raft_dev_cuda11.4.yml @@ -14,7 +14,7 @@ dependencies: - clang=11.1.0 - clang-tools=11.1.0 - cython>=0.29,<0.30 -- cmake>=3.23.1 +- cmake>=3.23.1,!=3.25.0 - dask>=2022.9.2 - distributed>=2022.9.2 - scikit-build>=0.13.1 diff --git a/conda/environments/raft_dev_cuda11.5.yml b/conda/environments/raft_dev_cuda11.5.yml index f106e12959..3a8a8effef 100644 --- a/conda/environments/raft_dev_cuda11.5.yml +++ b/conda/environments/raft_dev_cuda11.5.yml @@ -14,7 +14,7 @@ dependencies: - clang=11.1.0 - clang-tools=11.1.0 - cython>=0.29,<0.30 -- cmake>=3.23.1 +- cmake>=3.23.1,!=3.25.0 - dask>=2022.9.2 - distributed>=2022.9.2 - scikit-build>=0.13.1 diff --git a/conda/recipes/libraft/conda_build_config.yaml b/conda/recipes/libraft/conda_build_config.yaml index c4d0c2a087..fc77dfc89b 100644 --- a/conda/recipes/libraft/conda_build_config.yaml +++ b/conda/recipes/libraft/conda_build_config.yaml @@ -11,7 +11,7 @@ sysroot_version: - "2.17" cmake_version: - - ">=3.23.1" + - ">=3.23.1,!=3.25.0" nccl_version: - ">=2.9.9" diff --git a/conda/recipes/pylibraft/conda_build_config.yaml b/conda/recipes/pylibraft/conda_build_config.yaml index 725c38cb6a..f16406336b 100644 --- a/conda/recipes/pylibraft/conda_build_config.yaml +++ b/conda/recipes/pylibraft/conda_build_config.yaml @@ -11,4 +11,4 @@ sysroot_version: - "2.17" cmake_version: - - ">=3.23.1" + - ">=3.23.1,!=3.25.0" diff --git a/conda/recipes/raft-dask/conda_build_config.yaml b/conda/recipes/raft-dask/conda_build_config.yaml index a6ca533504..3b42dab182 100644 --- a/conda/recipes/raft-dask/conda_build_config.yaml +++ b/conda/recipes/raft-dask/conda_build_config.yaml @@ -14,4 +14,4 @@ ucx_version: - "1.13.0" cmake_version: - - ">=3.23.1" + - ">=3.23.1,!=3.25.0" diff --git a/python/pylibraft/pyproject.toml b/python/pylibraft/pyproject.toml index 03b3c7fa96..c6657a979e 100644 --- a/python/pylibraft/pyproject.toml +++ b/python/pylibraft/pyproject.toml @@ -19,6 +19,6 @@ requires = [ "setuptools", "cython>=0.29,<0.30", "scikit-build>=0.13.1", - "cmake>=3.23.1", + "cmake>=3.23.1,!=3.25.0", "ninja" ] diff --git a/python/raft-dask/pyproject.toml b/python/raft-dask/pyproject.toml index dcdc3bbf71..ec202359ac 100644 --- a/python/raft-dask/pyproject.toml +++ b/python/raft-dask/pyproject.toml @@ -19,7 +19,7 @@ requires = [ "setuptools", "cython>=0.29,<0.30", "scikit-build>=0.13.1", - "cmake>=3.23.1", + "cmake>=3.23.1,!=3.25.0", "ninja", "pylibraft" ]