From 3fbd19d41ac6a50423d2ee7c89adc082120e4311 Mon Sep 17 00:00:00 2001 From: Dante Gama Dessavre Date: Mon, 26 Feb 2024 22:22:55 -0600 Subject: [PATCH] FIX style fixes --- conda/recipes/cuvs/meta.yaml | 2 +- python/cuvs/cuvs/common/__init__.py | 5 +--- python/cuvs/cuvs/common/c_api.pxd | 2 +- python/cuvs/cuvs/common/cydlpack.pxd | 1 + python/cuvs/cuvs/common/cydlpack.pyx | 3 +- python/cuvs/cuvs/common/temp_raft.py | 1 - python/cuvs/cuvs/neighbors/CMakeLists.txt | 2 +- python/cuvs/cuvs/neighbors/__init__.py | 5 +--- .../cuvs/cuvs/neighbors/cagra/CMakeLists.txt | 2 +- python/cuvs/cuvs/neighbors/cagra/cagra.pxd | 17 ++++++----- python/cuvs/cuvs/neighbors/cagra/cagra.pyx | 30 ++++++++++++++----- python/cuvs/cuvs/test/test_cagra.py | 2 +- python/cuvs/cuvs/test/test_doctests.py | 2 +- 13 files changed, 42 insertions(+), 32 deletions(-) diff --git a/conda/recipes/cuvs/meta.yaml b/conda/recipes/cuvs/meta.yaml index 7dd8150d3..19a3d5a2c 100644 --- a/conda/recipes/cuvs/meta.yaml +++ b/conda/recipes/cuvs/meta.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2022-2023, NVIDIA CORPORATION. +# Copyright (c) 2022-2024, NVIDIA CORPORATION. # Usage: # conda build . -c conda-forge -c numba -c rapidsai -c pytorch diff --git a/python/cuvs/cuvs/common/__init__.py b/python/cuvs/cuvs/common/__init__.py index ee66407bb..eb5666659 100644 --- a/python/cuvs/cuvs/common/__init__.py +++ b/python/cuvs/cuvs/common/__init__.py @@ -15,7 +15,4 @@ from .temp_raft import auto_sync_resources - -__all__ = [ - "auto_sync_resources" -] +__all__ = ["auto_sync_resources"] diff --git a/python/cuvs/cuvs/common/c_api.pxd b/python/cuvs/cuvs/common/c_api.pxd index a8b91773f..6addbf16e 100644 --- a/python/cuvs/cuvs/common/c_api.pxd +++ b/python/cuvs/cuvs/common/c_api.pxd @@ -16,8 +16,8 @@ # cython: language_level=3 -from libc.stdint cimport uintptr_t from cuda.ccudart cimport cudaStream_t +from libc.stdint cimport uintptr_t cdef extern from "cuvs/core/c_api.h": diff --git a/python/cuvs/cuvs/common/cydlpack.pxd b/python/cuvs/cuvs/common/cydlpack.pxd index 1da1cf4f3..66c9f3f03 100644 --- a/python/cuvs/cuvs/common/cydlpack.pxd +++ b/python/cuvs/cuvs/common/cydlpack.pxd @@ -17,6 +17,7 @@ from libc.stdint cimport int32_t, int64_t, uint8_t, uint16_t, uint64_t + cdef extern from 'dlpack.h' nogil: ctypedef enum DLDeviceType: kDLCPU diff --git a/python/cuvs/cuvs/common/cydlpack.pyx b/python/cuvs/cuvs/common/cydlpack.pyx index a0976980f..76ec95756 100644 --- a/python/cuvs/cuvs/common/cydlpack.pyx +++ b/python/cuvs/cuvs/common/cydlpack.pyx @@ -29,7 +29,7 @@ cdef void deleter(DLManagedTensor* tensor) noexcept: cdef DLManagedTensor dlpack_c(ary): - #todo(dgd): add checking options/parameters + # todo(dgd): add checking options/parameters cdef DLDeviceType dev_type cdef DLDevice dev cdef DLDataType dtype @@ -65,7 +65,6 @@ cdef DLManagedTensor dlpack_c(ary): else: tensor_ptr = ary.__array_interface__["data"][0] - tensor.data = tensor_ptr tensor.device = dev tensor.dtype = dtype diff --git a/python/cuvs/cuvs/common/temp_raft.py b/python/cuvs/cuvs/common/temp_raft.py index e67a63929..25d6ed0b4 100644 --- a/python/cuvs/cuvs/common/temp_raft.py +++ b/python/cuvs/cuvs/common/temp_raft.py @@ -22,7 +22,6 @@ from pylibraft.common import DeviceResources - _resources_param_string = """ handle : Optional RAFT resource handle for reusing CUDA resources. If a handle isn't supplied, CUDA resources will be diff --git a/python/cuvs/cuvs/neighbors/CMakeLists.txt b/python/cuvs/cuvs/neighbors/CMakeLists.txt index 04c494c46..eaf418c60 100644 --- a/python/cuvs/cuvs/neighbors/CMakeLists.txt +++ b/python/cuvs/cuvs/neighbors/CMakeLists.txt @@ -1,5 +1,5 @@ # ============================================================================= -# Copyright (c) 2022-2024, NVIDIA CORPORATION. +# Copyright (c) 2024, NVIDIA CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except # in compliance with the License. You may obtain a copy of the License at diff --git a/python/cuvs/cuvs/neighbors/__init__.py b/python/cuvs/cuvs/neighbors/__init__.py index c3af93d75..1f8f956d9 100644 --- a/python/cuvs/cuvs/neighbors/__init__.py +++ b/python/cuvs/cuvs/neighbors/__init__.py @@ -15,7 +15,4 @@ from cuvs.neighbors import cagra -__all__ = [ - "common", - "cagra" -] +__all__ = ["common", "cagra"] diff --git a/python/cuvs/cuvs/neighbors/cagra/CMakeLists.txt b/python/cuvs/cuvs/neighbors/cagra/CMakeLists.txt index 882b88646..377cfe779 100644 --- a/python/cuvs/cuvs/neighbors/cagra/CMakeLists.txt +++ b/python/cuvs/cuvs/neighbors/cagra/CMakeLists.txt @@ -1,5 +1,5 @@ # ============================================================================= -# Copyright (c) 2023, NVIDIA CORPORATION. +# Copyright (c) 2023-2024, NVIDIA CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except # in compliance with the License. You may obtain a copy of the License at diff --git a/python/cuvs/cuvs/neighbors/cagra/cagra.pxd b/python/cuvs/cuvs/neighbors/cagra/cagra.pxd index 1861cd6c5..269f046bf 100644 --- a/python/cuvs/cuvs/neighbors/cagra/cagra.pxd +++ b/python/cuvs/cuvs/neighbors/cagra/cagra.pxd @@ -15,11 +15,17 @@ # # cython: language_level=3 -from libc.stdint cimport int8_t, int64_t, uint8_t, uint32_t, uint64_t, uintptr_t - -from cuvs.common.cydlpack cimport DLDataType, DLManagedTensor +from libc.stdint cimport ( + int8_t, + int64_t, + uint8_t, + uint32_t, + uint64_t, + uintptr_t, +) from cuvs.common.c_api cimport cuvsError_t, cuvsResources_t +from cuvs.common.cydlpack cimport DLDataType, DLManagedTensor cdef extern from "cuvs/neighbors/cagra_c.h" nogil: @@ -28,14 +34,12 @@ cdef extern from "cuvs/neighbors/cagra_c.h" nogil: IVF_PQ NN_DESCENT - ctypedef struct cagraIndexParams: size_t intermediate_graph_degree size_t graph_degree cagraGraphBuildAlgo build_algo size_t nn_descent_niter - ctypedef enum cagraSearchAlgo: SINGLE_CTA, MULTI_CTA, @@ -75,7 +79,7 @@ cdef extern from "cuvs/neighbors/cagra_c.h" nogil: cuvsError_t cagraBuild(cuvsResources_t res, cagraIndexParams* params, DLManagedTensor* dataset, - cagraIndex_t index); + cagraIndex_t index) cuvsError_t cagraSearch(cuvsResources_t res, cagraSearchParams* params, @@ -83,4 +87,3 @@ cdef extern from "cuvs/neighbors/cagra_c.h" nogil: DLManagedTensor* queries, DLManagedTensor* neighbors, DLManagedTensor* distances) - diff --git a/python/cuvs/cuvs/neighbors/cagra/cagra.pyx b/python/cuvs/cuvs/neighbors/cagra/cagra.pyx index aef614787..4cc7e4c1b 100644 --- a/python/cuvs/cuvs/neighbors/cagra/cagra.pyx +++ b/python/cuvs/cuvs/neighbors/cagra/cagra.pyx @@ -16,13 +16,15 @@ # cython: language_level=3 import numpy as np + cimport cuvs.common.cydlpack from cuvs.common.temp_raft import auto_sync_resources -from cuvs.common cimport cydlpack from cython.operator cimport dereference as deref +from cuvs.common cimport cydlpack + from pylibraft.common import ( DeviceResources, auto_convert_output, @@ -31,12 +33,19 @@ from pylibraft.common import ( ) from pylibraft.common.cai_wrapper import wrap_array from pylibraft.common.interruptible import cuda_interruptible - from pylibraft.neighbors.common import _check_input_array -from cuvs.common.c_api cimport cuvsError_t, cuvsResources_t + +from libc.stdint cimport ( + int8_t, + int64_t, + uint8_t, + uint32_t, + uint64_t, + uintptr_t, +) from pylibraft.common.handle cimport device_resources -from libc.stdint cimport int8_t, int64_t, uint8_t, uint32_t, uint64_t, uintptr_t +from cuvs.common.c_api cimport cuvsError_t, cuvsResources_t cdef class IndexParams: @@ -186,7 +195,8 @@ def build_index(IndexParams index_params, dataset, resources=None): cdef Index idx = Index() cdef cuvsError_t build_status - cdef cydlpack.DLManagedTensor dataset_dlpack = cydlpack.dlpack_c(dataset_ai) + cdef cydlpack.DLManagedTensor dataset_dlpack = \ + cydlpack.dlpack_c(dataset_ai) cdef cagraIndexParams* params = &index_params.params with cuda_interruptible(): @@ -364,6 +374,7 @@ cdef class SearchParams: def rand_xor_mask(self): return self.params.rand_xor_mask + @auto_sync_resources @auto_convert_output def search(SearchParams search_params, @@ -457,9 +468,12 @@ def search(SearchParams search_params, exp_rows=n_queries, exp_cols=k) cdef cagraSearchParams* params = &search_params.params - cdef cydlpack.DLManagedTensor queries_dlpack = cydlpack.dlpack_c(queries_cai) - cdef cydlpack.DLManagedTensor neighbors_dlpack = cydlpack.dlpack_c(neighbors_cai) - cdef cydlpack.DLManagedTensor distances_dlpack = cydlpack.dlpack_c(distances_cai) + cdef cydlpack.DLManagedTensor queries_dlpack = \ + cydlpack.dlpack_c(queries_cai) + cdef cydlpack.DLManagedTensor neighbors_dlpack = \ + cydlpack.dlpack_c(neighbors_cai) + cdef cydlpack.DLManagedTensor distances_dlpack = \ + cydlpack.dlpack_c(distances_cai) with cuda_interruptible(): cagraSearch( diff --git a/python/cuvs/cuvs/test/test_cagra.py b/python/cuvs/cuvs/test/test_cagra.py index 38745f55b..78fbc5828 100644 --- a/python/cuvs/cuvs/test/test_cagra.py +++ b/python/cuvs/cuvs/test/test_cagra.py @@ -15,10 +15,10 @@ import numpy as np import pytest +from pylibraft.common import device_ndarray from sklearn.neighbors import NearestNeighbors from sklearn.preprocessing import normalize -from pylibraft.common import device_ndarray from cuvs.neighbors import cagra from cuvs.test.ann_utils import calc_recall, generate_data diff --git a/python/cuvs/cuvs/test/test_doctests.py b/python/cuvs/cuvs/test/test_doctests.py index c75f56523..331b0f7f3 100644 --- a/python/cuvs/cuvs/test/test_doctests.py +++ b/python/cuvs/cuvs/test/test_doctests.py @@ -1,5 +1,5 @@ # -# Copyright (c) 2022-2023, NVIDIA CORPORATION. +# Copyright (c) 2022-2024, NVIDIA CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License.