Merge pull request #215 from rapidsai/branch-22.02

[gpuCI] Forward-merge branch-22.02 to branch-22.04 [skip gpuci]
rapidsai · Feb 1, 2022 · 0861858 · 0861858
2 parents 0210e58 + 9d70348
commit 0861858
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/python/pybind11/cache/cache_py.cpp b/python/pybind11/cache/cache_py.cpp
@@ -122,7 +122,7 @@ void py_image_cache_reserve(ImageCache& cache, uint32_t memory_capacity, py::kwa
     cache.reserve(config);
 }
 
-py::int_ py_preferred_memory_capacity(const py::object& img,
+uint32_t py_preferred_memory_capacity(const py::object& img,
                                       const std::optional<const std::vector<uint64_t>>& image_size,
                                       const std::optional<const std::vector<uint32_t>>& tile_size,
                                       const std::optional<const std::vector<uint32_t>>& patch_size,

diff --git a/python/pybind11/cache/cache_py.h b/python/pybind11/cache/cache_py.h
@@ -39,7 +39,7 @@ py::dict py_config(ImageCache& cache);
 
 void py_image_cache_reserve(ImageCache& cache, uint32_t memory_capacity, py::kwargs kwargs);
 
-py::int_ py_preferred_memory_capacity(const py::object& img,
+uint32_t py_preferred_memory_capacity(const py::object& img,
                                       const std::optional<const std::vector<uint64_t>>& image_size,
                                       const std::optional<const std::vector<uint32_t>>& tile_size,
                                       const std::optional<const std::vector<uint32_t>>& patch_size,