From d330b621dcfa31d84b62a5691540b90852f4bb38 Mon Sep 17 00:00:00 2001 From: Rong Ou Date: Fri, 11 Dec 2020 12:11:59 -0800 Subject: [PATCH 01/12] upgrade spdlog to 1.8.2 --- cmake/Modules/RMM_thirdparty.cmake | 2 +- conda/environments/rmm_dev_cuda10.1.yml | 2 +- conda/environments/rmm_dev_cuda10.2.yml | 2 +- conda/environments/rmm_dev_cuda11.0.yml | 2 +- conda/recipes/librmm/meta.yaml | 2 +- conda/recipes/rmm/meta.yaml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cmake/Modules/RMM_thirdparty.cmake b/cmake/Modules/RMM_thirdparty.cmake index 0591d08d2..52e45ef72 100644 --- a/cmake/Modules/RMM_thirdparty.cmake +++ b/cmake/Modules/RMM_thirdparty.cmake @@ -1,6 +1,6 @@ # spdlog -set(RMM_MIN_VERSION_spdlog 1.7.0) +set(RMM_MIN_VERSION_spdlog 1.8.2) CPMFindPackage( NAME spdlog diff --git a/conda/environments/rmm_dev_cuda10.1.yml b/conda/environments/rmm_dev_cuda10.1.yml index fc8be856e..75cc2c4d5 100644 --- a/conda/environments/rmm_dev_cuda10.1.yml +++ b/conda/environments/rmm_dev_cuda10.1.yml @@ -16,5 +16,5 @@ dependencies: - cffi>=1.10.0 - pytest - cudatoolkit=10.1 -- spdlog=1.7.0 +- spdlog>=1.8.2 - cython>=0.29,<0.30 diff --git a/conda/environments/rmm_dev_cuda10.2.yml b/conda/environments/rmm_dev_cuda10.2.yml index 6bf142338..17ade38a2 100644 --- a/conda/environments/rmm_dev_cuda10.2.yml +++ b/conda/environments/rmm_dev_cuda10.2.yml @@ -16,5 +16,5 @@ dependencies: - cffi>=1.10.0 - pytest - cudatoolkit=10.2 -- spdlog=1.7.0 +- spdlog>=1.8.2 - cython>=0.29,<0.30 diff --git a/conda/environments/rmm_dev_cuda11.0.yml b/conda/environments/rmm_dev_cuda11.0.yml index ef2d5b6c7..998fd8168 100644 --- a/conda/environments/rmm_dev_cuda11.0.yml +++ b/conda/environments/rmm_dev_cuda11.0.yml @@ -16,5 +16,5 @@ dependencies: - cffi>=1.10.0 - pytest - cudatoolkit=11.0 -- spdlog=1.7.0 +- spdlog>=1.8.2 - cython>=0.29,<0.30 diff --git a/conda/recipes/librmm/meta.yaml b/conda/recipes/librmm/meta.yaml index eba6cf8f8..7057e7fd3 100644 --- a/conda/recipes/librmm/meta.yaml +++ b/conda/recipes/librmm/meta.yaml @@ -28,7 +28,7 @@ requirements: - cudatoolkit {{ cuda_version }}.* run: - {{ pin_compatible('cudatoolkit', max_pin='x.x') }} - - spdlog=1.7.0 + - spdlog>=1.8.2 test: commands: diff --git a/conda/recipes/rmm/meta.yaml b/conda/recipes/rmm/meta.yaml index 3514f3314..6dc3a757c 100644 --- a/conda/recipes/rmm/meta.yaml +++ b/conda/recipes/rmm/meta.yaml @@ -26,7 +26,7 @@ requirements: - librmm {{ version }} - setuptools - cython >=0.29,<0.30 - - spdlog=1.7.0 + - spdlog>=1.8.2 - cudatoolkit {{ cuda_version }}.* run: - python From c5fe1674749b687111fcbd71ce7b9bb616714374 Mon Sep 17 00:00:00 2001 From: Rong Ou Date: Tue, 15 Dec 2020 20:14:01 -0800 Subject: [PATCH 02/12] pin version --- conda/environments/rmm_dev_cuda10.1.yml | 2 +- conda/environments/rmm_dev_cuda10.2.yml | 2 +- conda/environments/rmm_dev_cuda11.0.yml | 2 +- conda/recipes/librmm/meta.yaml | 2 +- conda/recipes/rmm/meta.yaml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/conda/environments/rmm_dev_cuda10.1.yml b/conda/environments/rmm_dev_cuda10.1.yml index 75cc2c4d5..b6c247371 100644 --- a/conda/environments/rmm_dev_cuda10.1.yml +++ b/conda/environments/rmm_dev_cuda10.1.yml @@ -16,5 +16,5 @@ dependencies: - cffi>=1.10.0 - pytest - cudatoolkit=10.1 -- spdlog>=1.8.2 +- spdlog>=1.8.2,<2.0.0a0 - cython>=0.29,<0.30 diff --git a/conda/environments/rmm_dev_cuda10.2.yml b/conda/environments/rmm_dev_cuda10.2.yml index 17ade38a2..6909e2dc8 100644 --- a/conda/environments/rmm_dev_cuda10.2.yml +++ b/conda/environments/rmm_dev_cuda10.2.yml @@ -16,5 +16,5 @@ dependencies: - cffi>=1.10.0 - pytest - cudatoolkit=10.2 -- spdlog>=1.8.2 +- spdlog>=1.8.2,<2.0.0a0 - cython>=0.29,<0.30 diff --git a/conda/environments/rmm_dev_cuda11.0.yml b/conda/environments/rmm_dev_cuda11.0.yml index 998fd8168..6eb8921d6 100644 --- a/conda/environments/rmm_dev_cuda11.0.yml +++ b/conda/environments/rmm_dev_cuda11.0.yml @@ -16,5 +16,5 @@ dependencies: - cffi>=1.10.0 - pytest - cudatoolkit=11.0 -- spdlog>=1.8.2 +- spdlog>=1.8.2,<2.0.0a0 - cython>=0.29,<0.30 diff --git a/conda/recipes/librmm/meta.yaml b/conda/recipes/librmm/meta.yaml index 7057e7fd3..dd48fe6b4 100644 --- a/conda/recipes/librmm/meta.yaml +++ b/conda/recipes/librmm/meta.yaml @@ -28,7 +28,7 @@ requirements: - cudatoolkit {{ cuda_version }}.* run: - {{ pin_compatible('cudatoolkit', max_pin='x.x') }} - - spdlog>=1.8.2 + - spdlog>=1.8.2,<2.0.0a0 test: commands: diff --git a/conda/recipes/rmm/meta.yaml b/conda/recipes/rmm/meta.yaml index 6dc3a757c..c5b0b4f4a 100644 --- a/conda/recipes/rmm/meta.yaml +++ b/conda/recipes/rmm/meta.yaml @@ -26,7 +26,7 @@ requirements: - librmm {{ version }} - setuptools - cython >=0.29,<0.30 - - spdlog>=1.8.2 + - spdlog>=1.8.2,<2.0.0a0 - cudatoolkit {{ cuda_version }}.* run: - python From 0f1fb3fb57d24ca50117598728cd9373c2441834 Mon Sep 17 00:00:00 2001 From: Rong Ou Date: Tue, 5 Jan 2021 14:58:49 -0800 Subject: [PATCH 03/12] install spdlog 1.8.2 in ci/gpu build script --- ci/gpu/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/gpu/build.sh b/ci/gpu/build.sh index d0ad9ba2d..7eeab812e 100755 --- a/ci/gpu/build.sh +++ b/ci/gpu/build.sh @@ -42,8 +42,8 @@ conda activate rapids gpuci_conda_retry install rapids-build-env=${MINOR_VERSION}.* # https://docs.rapids.ai/maintainers/depmgmt/ -# conda remove -f rapids-build-env -# gpuci_conda_retry install "your-pkg=1.0.0" +conda remove -f rapids-build-env +gpuci_conda_retry install "spdlog=1.8.2" gpuci_logger "Check versions" python --version From e1ba64bafe32321c340acc3b71a01ae676c51a4b Mon Sep 17 00:00:00 2001 From: Rong Ou Date: Tue, 5 Jan 2021 15:29:27 -0800 Subject: [PATCH 04/12] fix conda call --- ci/gpu/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/gpu/build.sh b/ci/gpu/build.sh index 7eeab812e..f44b6cff3 100755 --- a/ci/gpu/build.sh +++ b/ci/gpu/build.sh @@ -42,7 +42,7 @@ conda activate rapids gpuci_conda_retry install rapids-build-env=${MINOR_VERSION}.* # https://docs.rapids.ai/maintainers/depmgmt/ -conda remove -f rapids-build-env +conda remove --force rapids-build-env gpuci_conda_retry install "spdlog=1.8.2" gpuci_logger "Check versions" From 213229abe74fd52a85fbf6fa152f5fea6dc531ec Mon Sep 17 00:00:00 2001 From: Rong Ou Date: Wed, 6 Jan 2021 10:58:05 -0800 Subject: [PATCH 05/12] use conda-forge for spdlog --- ci/gpu/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/gpu/build.sh b/ci/gpu/build.sh index f44b6cff3..4e9d51545 100755 --- a/ci/gpu/build.sh +++ b/ci/gpu/build.sh @@ -43,7 +43,7 @@ gpuci_conda_retry install rapids-build-env=${MINOR_VERSION}.* # https://docs.rapids.ai/maintainers/depmgmt/ conda remove --force rapids-build-env -gpuci_conda_retry install "spdlog=1.8.2" +gpuci_conda_retry install -c conda-forge "spdlog=1.8.2" gpuci_logger "Check versions" python --version From d2fe3860617b63701f9f9e3d783d4a55997eccf7 Mon Sep 17 00:00:00 2001 From: Rong Ou Date: Wed, 6 Jan 2021 13:54:36 -0800 Subject: [PATCH 06/12] reinstall spdlog from conda-forge --- ci/gpu/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/gpu/build.sh b/ci/gpu/build.sh index 4e9d51545..85e164683 100755 --- a/ci/gpu/build.sh +++ b/ci/gpu/build.sh @@ -42,8 +42,8 @@ conda activate rapids gpuci_conda_retry install rapids-build-env=${MINOR_VERSION}.* # https://docs.rapids.ai/maintainers/depmgmt/ -conda remove --force rapids-build-env -gpuci_conda_retry install -c conda-forge "spdlog=1.8.2" +conda remove --force spdlog +gpuci_conda_retry install "spdlog=1.8.2" -c conda-forge gpuci_logger "Check versions" python --version From b2b3dcc88348750b3f22e5d4f79668452ce0e206 Mon Sep 17 00:00:00 2001 From: Rong Ou Date: Wed, 6 Jan 2021 23:51:48 -0800 Subject: [PATCH 07/12] maybe this will work --- ci/gpu/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/gpu/build.sh b/ci/gpu/build.sh index 85e164683..a0f63ed4f 100755 --- a/ci/gpu/build.sh +++ b/ci/gpu/build.sh @@ -42,7 +42,7 @@ conda activate rapids gpuci_conda_retry install rapids-build-env=${MINOR_VERSION}.* # https://docs.rapids.ai/maintainers/depmgmt/ -conda remove --force spdlog +conda remove --force rapids-build-env gpuci_conda_retry install "spdlog=1.8.2" -c conda-forge gpuci_logger "Check versions" From 6a4b42f67dd23bcdf8858d556ab537503490b51b Mon Sep 17 00:00:00 2001 From: Rong Ou Date: Mon, 19 Apr 2021 14:29:55 -0700 Subject: [PATCH 08/12] update to 1.8.5 --- ci/gpu/build.sh | 4 ++-- cmake/Modules/RMM_thirdparty.cmake | 2 +- conda/environments/rmm_dev_cuda10.1.yml | 2 +- conda/environments/rmm_dev_cuda10.2.yml | 2 +- conda/environments/rmm_dev_cuda11.0.yml | 2 +- conda/recipes/rmm/meta.yaml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ci/gpu/build.sh b/ci/gpu/build.sh index a0f63ed4f..d0ad9ba2d 100755 --- a/ci/gpu/build.sh +++ b/ci/gpu/build.sh @@ -42,8 +42,8 @@ conda activate rapids gpuci_conda_retry install rapids-build-env=${MINOR_VERSION}.* # https://docs.rapids.ai/maintainers/depmgmt/ -conda remove --force rapids-build-env -gpuci_conda_retry install "spdlog=1.8.2" -c conda-forge +# conda remove -f rapids-build-env +# gpuci_conda_retry install "your-pkg=1.0.0" gpuci_logger "Check versions" python --version diff --git a/cmake/Modules/RMM_thirdparty.cmake b/cmake/Modules/RMM_thirdparty.cmake index c80efb5bf..7e91f1f94 100644 --- a/cmake/Modules/RMM_thirdparty.cmake +++ b/cmake/Modules/RMM_thirdparty.cmake @@ -1,6 +1,6 @@ # spdlog -set(RMM_MIN_VERSION_spdlog 1.8.2) +set(RMM_MIN_VERSION_spdlog 1.8.5) CPMFindPackage( NAME spdlog diff --git a/conda/environments/rmm_dev_cuda10.1.yml b/conda/environments/rmm_dev_cuda10.1.yml index 8ab6a8dac..455fa7239 100644 --- a/conda/environments/rmm_dev_cuda10.1.yml +++ b/conda/environments/rmm_dev_cuda10.1.yml @@ -16,5 +16,5 @@ dependencies: - cffi>=1.10.0 - pytest - cudatoolkit=10.1 -- spdlog>=1.8.2,<2.0.0a0 +- spdlog>=1.8.5,<2.0.0a0 - cython>=0.29,<0.30 diff --git a/conda/environments/rmm_dev_cuda10.2.yml b/conda/environments/rmm_dev_cuda10.2.yml index 33229acc7..916892680 100644 --- a/conda/environments/rmm_dev_cuda10.2.yml +++ b/conda/environments/rmm_dev_cuda10.2.yml @@ -16,5 +16,5 @@ dependencies: - cffi>=1.10.0 - pytest - cudatoolkit=10.2 -- spdlog>=1.8.2,<2.0.0a0 +- spdlog>=1.8.5,<2.0.0a0 - cython>=0.29,<0.30 diff --git a/conda/environments/rmm_dev_cuda11.0.yml b/conda/environments/rmm_dev_cuda11.0.yml index 96d5a1156..f3e174d5d 100644 --- a/conda/environments/rmm_dev_cuda11.0.yml +++ b/conda/environments/rmm_dev_cuda11.0.yml @@ -16,5 +16,5 @@ dependencies: - cffi>=1.10.0 - pytest - cudatoolkit=11.0 -- spdlog>=1.8.2,<2.0.0a0 +- spdlog>=1.8.5,<2.0.0a0 - cython>=0.29,<0.30 diff --git a/conda/recipes/rmm/meta.yaml b/conda/recipes/rmm/meta.yaml index 1bbb0a5d9..c4a7f21fc 100644 --- a/conda/recipes/rmm/meta.yaml +++ b/conda/recipes/rmm/meta.yaml @@ -26,7 +26,7 @@ requirements: - librmm {{ version }} - setuptools - cython >=0.29,<0.30 - - spdlog>=1.8.2,<2.0.0a0 + - spdlog>=1.8.5,<2.0.0a0 - cudatoolkit {{ cuda_version }}.* run: - python From bfda4a7991529b77d27480c1bf4a895b88a99e3c Mon Sep 17 00:00:00 2001 From: Rong Ou Date: Thu, 22 Apr 2021 12:46:59 -0700 Subject: [PATCH 09/12] fix librmm recipe --- conda/recipes/librmm/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/recipes/librmm/meta.yaml b/conda/recipes/librmm/meta.yaml index 7f8907d1d..e45983b05 100644 --- a/conda/recipes/librmm/meta.yaml +++ b/conda/recipes/librmm/meta.yaml @@ -35,7 +35,7 @@ requirements: - cudatoolkit {{ cuda_version }}.* run: - {{ pin_compatible('cudatoolkit', max_pin='x.x') }} - - spdlog>=1.8.2,<2.0.0a0 + - spdlog>=1.8.5,<2.0.0a0 test: commands: From fb08b677b7dddcd2cad9fc19d02a6eb312b72cf0 Mon Sep 17 00:00:00 2001 From: Rong Ou Date: Thu, 22 Apr 2021 12:53:20 -0700 Subject: [PATCH 10/12] test spdlog 1.8.5 --- ci/gpu/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/gpu/build.sh b/ci/gpu/build.sh index d0ad9ba2d..7e72e4a60 100755 --- a/ci/gpu/build.sh +++ b/ci/gpu/build.sh @@ -42,8 +42,8 @@ conda activate rapids gpuci_conda_retry install rapids-build-env=${MINOR_VERSION}.* # https://docs.rapids.ai/maintainers/depmgmt/ -# conda remove -f rapids-build-env -# gpuci_conda_retry install "your-pkg=1.0.0" +conda remove -f rapids-build-env +gpuci_conda_retry install "spdlog=1.8.5" gpuci_logger "Check versions" python --version From 35a1d684aa4df1faf3399bdb0eb98964d7348515 Mon Sep 17 00:00:00 2001 From: Rong Ou Date: Thu, 22 Apr 2021 15:41:56 -0700 Subject: [PATCH 11/12] fix conda remove --- ci/gpu/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/gpu/build.sh b/ci/gpu/build.sh index 7e72e4a60..d74c5e7dd 100755 --- a/ci/gpu/build.sh +++ b/ci/gpu/build.sh @@ -42,7 +42,7 @@ conda activate rapids gpuci_conda_retry install rapids-build-env=${MINOR_VERSION}.* # https://docs.rapids.ai/maintainers/depmgmt/ -conda remove -f rapids-build-env +conda remove --force -y rapids-build-env gpuci_conda_retry install "spdlog=1.8.5" gpuci_logger "Check versions" From ecbd264f0e274632de1784bc26489e1e7afcc7f0 Mon Sep 17 00:00:00 2001 From: Rong Ou Date: Fri, 21 May 2021 12:39:56 -0700 Subject: [PATCH 12/12] revert test change --- ci/gpu/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/gpu/build.sh b/ci/gpu/build.sh index d74c5e7dd..54ff1e8c1 100755 --- a/ci/gpu/build.sh +++ b/ci/gpu/build.sh @@ -42,8 +42,8 @@ conda activate rapids gpuci_conda_retry install rapids-build-env=${MINOR_VERSION}.* # https://docs.rapids.ai/maintainers/depmgmt/ -conda remove --force -y rapids-build-env -gpuci_conda_retry install "spdlog=1.8.5" +# conda remove --force rapids-build-env +# gpuci_conda_retry install "your-pkg=1.0.0" gpuci_logger "Check versions" python --version