From 6a161ada9047d756ff741312349882dfba381576 Mon Sep 17 00:00:00 2001 From: Sevag Hanssian Date: Wed, 8 Feb 2023 14:02:57 -0500 Subject: [PATCH 1/6] Bump pinned pip wheel deps to 23.4 --- python/_custom_build/backend.py | 4 ++-- python/setup.py | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/python/_custom_build/backend.py b/python/_custom_build/backend.py index 01745fcfa8..c58d3f84a7 100644 --- a/python/_custom_build/backend.py +++ b/python/_custom_build/backend.py @@ -21,8 +21,8 @@ def wrapper(config_settings=None): orig_list = getattr(_orig, func.__name__)(config_settings) cuda_suffix = os.getenv('RAPIDS_PY_WHEEL_CUDA_SUFFIX', default='') append_list = [ - f"rmm{cuda_suffix}==23.2.*", - f"pylibraft{cuda_suffix}==23.2.*", + f"rmm{cuda_suffix}==23.4.*", + f"pylibraft{cuda_suffix}==23.4.*", ] return orig_list + append_list diff --git a/python/setup.py b/python/setup.py index d204f9e46c..fb9e60217d 100644 --- a/python/setup.py +++ b/python/setup.py @@ -147,10 +147,10 @@ def get_versions(): "seaborn", "treelite==3.1.0", "treelite_runtime==3.1.0", - f"cudf{cuda_suffix}==23.2.*", - f"dask-cudf{cuda_suffix}==23.2.*", - f"pylibraft{cuda_suffix}==23.2.*", - f"raft-dask{cuda_suffix}==23.2.*", + f"cudf{cuda_suffix}==23.4.*", + f"dask-cudf{cuda_suffix}==23.4.*", + f"pylibraft{cuda_suffix}==23.4.*", + f"raft-dask{cuda_suffix}==23.4.*", ], extras_require={ "test": [ From 32800a597c1530ecfe1b9816debb324a675cee1c Mon Sep 17 00:00:00 2001 From: Sevag Hanssian Date: Thu, 9 Feb 2023 13:49:54 -0500 Subject: [PATCH 2/6] Adjust license string to Apache 2.0 --- python/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/setup.py b/python/setup.py index fb9e60217d..9f11396726 100644 --- a/python/setup.py +++ b/python/setup.py @@ -127,7 +127,7 @@ def get_versions(): description="cuML - RAPIDS ML Algorithms", url="https://github.com/rapidsai/cuml", author="NVIDIA Corporation", - license="Apache", + license="Apache 2.0", classifiers=[ "Intended Audience :: Developers", "Programming Language :: Python", From a6683ba5d6836cf0c6b1772567879f35296bf0d7 Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Fri, 10 Feb 2023 13:57:42 -0800 Subject: [PATCH 3/6] Test building wheel with the new commit. --- cpp/cmake/thirdparty/get_raft.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cpp/cmake/thirdparty/get_raft.cmake b/cpp/cmake/thirdparty/get_raft.cmake index 3306e0a7ce..8d00715c91 100644 --- a/cpp/cmake/thirdparty/get_raft.cmake +++ b/cpp/cmake/thirdparty/get_raft.cmake @@ -92,8 +92,8 @@ endfunction() # To use a different RAFT locally, set the CMake variable # CPM_raft_SOURCE=/path/to/local/raft find_and_configure_raft(VERSION ${CUML_MIN_VERSION_raft} - FORK rapidsai - PINNED_TAG branch-${CUML_BRANCH_VERSION_raft} + FORK vyasr + PINNED_TAG fix/remove_extern_template EXCLUDE_FROM_ALL ${CUML_EXCLUDE_RAFT_FROM_ALL} # When PINNED_TAG above doesn't match cuml, # force local raft clone in build directory From 3f4de17e8e8a627e979cc34df4550812a9f4d2fd Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Fri, 10 Feb 2023 15:04:48 -0800 Subject: [PATCH 4/6] Fix branch name. --- cpp/cmake/thirdparty/get_raft.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpp/cmake/thirdparty/get_raft.cmake b/cpp/cmake/thirdparty/get_raft.cmake index 8d00715c91..552446a4d5 100644 --- a/cpp/cmake/thirdparty/get_raft.cmake +++ b/cpp/cmake/thirdparty/get_raft.cmake @@ -93,7 +93,7 @@ endfunction() # CPM_raft_SOURCE=/path/to/local/raft find_and_configure_raft(VERSION ${CUML_MIN_VERSION_raft} FORK vyasr - PINNED_TAG fix/remove_extern_template + PINNED_TAG fix/remove_extern_templates EXCLUDE_FROM_ALL ${CUML_EXCLUDE_RAFT_FROM_ALL} # When PINNED_TAG above doesn't match cuml, # force local raft clone in build directory From 8bf8873223c718c495e06ba2013abb7ef86a3f5f Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Fri, 10 Feb 2023 17:20:41 -0800 Subject: [PATCH 5/6] Revert "Fix branch name." This reverts commit 1bfa786060c96c0fc8c76d742710d996a90171f7. --- cpp/cmake/thirdparty/get_raft.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpp/cmake/thirdparty/get_raft.cmake b/cpp/cmake/thirdparty/get_raft.cmake index 552446a4d5..8d00715c91 100644 --- a/cpp/cmake/thirdparty/get_raft.cmake +++ b/cpp/cmake/thirdparty/get_raft.cmake @@ -93,7 +93,7 @@ endfunction() # CPM_raft_SOURCE=/path/to/local/raft find_and_configure_raft(VERSION ${CUML_MIN_VERSION_raft} FORK vyasr - PINNED_TAG fix/remove_extern_templates + PINNED_TAG fix/remove_extern_template EXCLUDE_FROM_ALL ${CUML_EXCLUDE_RAFT_FROM_ALL} # When PINNED_TAG above doesn't match cuml, # force local raft clone in build directory From 8f7e288144ed2a998d8fa6720a49aceb46b7ab59 Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Fri, 10 Feb 2023 17:20:47 -0800 Subject: [PATCH 6/6] Revert "Test building wheel with the new commit." This reverts commit bbe5ffc23b0a80549e280f2556258b25eeeb7659. --- cpp/cmake/thirdparty/get_raft.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cpp/cmake/thirdparty/get_raft.cmake b/cpp/cmake/thirdparty/get_raft.cmake index 8d00715c91..3306e0a7ce 100644 --- a/cpp/cmake/thirdparty/get_raft.cmake +++ b/cpp/cmake/thirdparty/get_raft.cmake @@ -92,8 +92,8 @@ endfunction() # To use a different RAFT locally, set the CMake variable # CPM_raft_SOURCE=/path/to/local/raft find_and_configure_raft(VERSION ${CUML_MIN_VERSION_raft} - FORK vyasr - PINNED_TAG fix/remove_extern_template + FORK rapidsai + PINNED_TAG branch-${CUML_BRANCH_VERSION_raft} EXCLUDE_FROM_ALL ${CUML_EXCLUDE_RAFT_FROM_ALL} # When PINNED_TAG above doesn't match cuml, # force local raft clone in build directory