Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[gpuCI] Forward-merge branch-22.02 to branch-22.04 [skip gpuci] #215

Merged
merged 2 commits into from
Feb 1, 2022
Merged

[gpuCI] Forward-merge branch-22.02 to branch-22.04 [skip gpuci] #215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c73c643
Fix segfault for preferred_memory_capacity in Python 3.9+
gigony Feb 1, 2022
9d70348
Merge pull request #214 from gigony/fix_segfault_py39
jjacobelli Feb 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion python/pybind11/cache/cache_py.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion python/pybind11/cache/cache_py.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down