From eb70815972b6deed9baf27bc37e626f3cb513daa Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Mon, 5 Dec 2022 17:41:13 -0600 Subject: [PATCH 1/4] Revert "Upgrade to spdlog 1.10 (#1173)" This reverts commit 7bf7a763a3b6a32a7a57f900de35e2e5f30f17c0. --- .pre-commit-config.yaml | 2 +- conda/environments/all_cuda-115_arch-x86_64.yaml | 2 +- conda/environments/all_cuda-116_arch-x86_64.yaml | 2 +- conda/recipes/librmm/conda_build_config.yaml | 3 --- conda/recipes/librmm/meta.yaml | 2 +- conda/recipes/rmm/meta.yaml | 1 + dependencies.yaml | 2 +- 7 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 356c35db7..10a6cbcd6 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -13,7 +13,7 @@ repos: hooks: - id: black args: ["--config=python/pyproject.toml"] - - repo: https://github.com/PyCQA/flake8 + - repo: https://gitlab.com/pycqa/flake8 rev: 3.8.3 hooks: - id: flake8 diff --git a/conda/environments/all_cuda-115_arch-x86_64.yaml b/conda/environments/all_cuda-115_arch-x86_64.yaml index 5177051a9..0f6da8e09 100644 --- a/conda/environments/all_cuda-115_arch-x86_64.yaml +++ b/conda/environments/all_cuda-115_arch-x86_64.yaml @@ -22,5 +22,5 @@ dependencies: - pytest-cov - python>=3.8,<3.10 - scikit-build>=0.13.1 -- spdlog=1.10 +- spdlog>=1.8.5,<1.9 name: all_cuda-115_arch-x86_64 diff --git a/conda/environments/all_cuda-116_arch-x86_64.yaml b/conda/environments/all_cuda-116_arch-x86_64.yaml index 368b008f6..646565a90 100644 --- a/conda/environments/all_cuda-116_arch-x86_64.yaml +++ b/conda/environments/all_cuda-116_arch-x86_64.yaml @@ -22,5 +22,5 @@ dependencies: - pytest-cov - python>=3.8,<3.10 - scikit-build>=0.13.1 -- spdlog=1.10 +- spdlog>=1.8.5,<1.9 name: all_cuda-116_arch-x86_64 diff --git a/conda/recipes/librmm/conda_build_config.yaml b/conda/recipes/librmm/conda_build_config.yaml index 9f3f371a6..6a90ac289 100644 --- a/conda/recipes/librmm/conda_build_config.yaml +++ b/conda/recipes/librmm/conda_build_config.yaml @@ -13,8 +13,5 @@ cmake_version: gtest_version: - "=1.10.0" -spdlog_version: - - "1.10" - sysroot_version: - "2.17" diff --git a/conda/recipes/librmm/meta.yaml b/conda/recipes/librmm/meta.yaml index a6599bb33..0fadd41a2 100644 --- a/conda/recipes/librmm/meta.yaml +++ b/conda/recipes/librmm/meta.yaml @@ -53,7 +53,7 @@ outputs: - cmake {{ cmake_version }} run: - cudatoolkit {{ cuda_spec }} - - spdlog {{ spdlog_version }} + - spdlog>=1.8.5,<1.9 test: commands: - test -f $PREFIX/include/rmm/thrust_rmm_allocator.h diff --git a/conda/recipes/rmm/meta.yaml b/conda/recipes/rmm/meta.yaml index 0edc9df5a..9628df6e7 100644 --- a/conda/recipes/rmm/meta.yaml +++ b/conda/recipes/rmm/meta.yaml @@ -48,6 +48,7 @@ requirements: - python - scikit-build>=0.13.1 - setuptools + - spdlog>=1.8.5,<2.0.0a0 run: - cuda-python >=11.7.1,<12.0 - numba >=0.49 diff --git a/dependencies.yaml b/dependencies.yaml index 8c838e96e..bd9b36122 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -43,7 +43,7 @@ dependencies: - scikit-build>=0.13.1 - output_types: conda packages: - - spdlog=1.10 + - spdlog>=1.8.5,<1.9 cudatoolkit: specific: - output_types: conda From c4f60e08d065343480724e27c475a5fe097f54b5 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Mon, 5 Dec 2022 17:49:36 -0600 Subject: [PATCH 2/4] Keep flake8 changes. --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 10a6cbcd6..356c35db7 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -13,7 +13,7 @@ repos: hooks: - id: black args: ["--config=python/pyproject.toml"] - - repo: https://gitlab.com/pycqa/flake8 + - repo: https://github.com/PyCQA/flake8 rev: 3.8.3 hooks: - id: flake8 From e150d2b4aca3edc093f8726c287d15b057d424f6 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Mon, 5 Dec 2022 17:51:06 -0600 Subject: [PATCH 3/4] Keep using conda_build_config.yaml --- conda/recipes/librmm/conda_build_config.yaml | 3 +++ conda/recipes/librmm/meta.yaml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/conda/recipes/librmm/conda_build_config.yaml b/conda/recipes/librmm/conda_build_config.yaml index 6a90ac289..ce0bbeec5 100644 --- a/conda/recipes/librmm/conda_build_config.yaml +++ b/conda/recipes/librmm/conda_build_config.yaml @@ -13,5 +13,8 @@ cmake_version: gtest_version: - "=1.10.0" +spdlog_version: + - ">=1.8.5,<1.9" + sysroot_version: - "2.17" diff --git a/conda/recipes/librmm/meta.yaml b/conda/recipes/librmm/meta.yaml index 0fadd41a2..a6599bb33 100644 --- a/conda/recipes/librmm/meta.yaml +++ b/conda/recipes/librmm/meta.yaml @@ -53,7 +53,7 @@ outputs: - cmake {{ cmake_version }} run: - cudatoolkit {{ cuda_spec }} - - spdlog>=1.8.5,<1.9 + - spdlog {{ spdlog_version }} test: commands: - test -f $PREFIX/include/rmm/thrust_rmm_allocator.h From 14fd5465d14ef3105a44e5f4f97fbbfc67624ccb Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Mon, 5 Dec 2022 17:51:43 -0600 Subject: [PATCH 4/4] Don't require spdlog in rmm meta.yaml. --- conda/recipes/rmm/meta.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/conda/recipes/rmm/meta.yaml b/conda/recipes/rmm/meta.yaml index 9628df6e7..0edc9df5a 100644 --- a/conda/recipes/rmm/meta.yaml +++ b/conda/recipes/rmm/meta.yaml @@ -48,7 +48,6 @@ requirements: - python - scikit-build>=0.13.1 - setuptools - - spdlog>=1.8.5,<2.0.0a0 run: - cuda-python >=11.7.1,<12.0 - numba >=0.49