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

Cleanup GIL stuff #157

Merged
merged 9 commits into from
Jan 5, 2024
Merged

Cleanup GIL stuff #157

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6bcdde9
executeStream already does GIL release, we don't need to do it. pybin…
hobu Jan 4, 2024
86ee4e2
wip
hobu Jan 4, 2024
d37647b
put back acq
hobu Jan 4, 2024
55374d7
wip
hobu Jan 4, 2024
5f30171
wip2
hobu Jan 4, 2024
e28d84c
wip3
hobu Jan 4, 2024
caf64ff
wip4
hobu Jan 4, 2024
60bd6bc
wip4
hobu Jan 4, 2024
ad69d18
comment why we need gil_scope_acquire for getExecutor
hobu Jan 5, 2024
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
12 changes: 4 additions & 8 deletions pdal/libpdalpython.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ namespace pdal {
};

std::vector<py::dict> getDrivers() {
py::gil_scoped_acquire acquire;
std::vector<py::dict> drivers;

pdal::StageFactory f(false);
Expand Down Expand Up @@ -59,7 +58,6 @@ namespace pdal {
};

py::object getOptions() {
py::gil_scoped_acquire acquire;
py::object json = py::module_::import("json");
py::dict stageOptions;

Expand Down Expand Up @@ -94,7 +92,6 @@ namespace pdal {
};

std::vector<py::dict> getDimensions() {
py::gil_scoped_acquire acquire;
py::object np = py::module_::import("numpy");
py::object dtype = np.attr("dtype");
std::vector<py::dict> dims;
Expand All @@ -112,13 +109,11 @@ namespace pdal {

std::string getReaderDriver(std::filesystem::path const& p)
{
py::gil_scoped_acquire acquire;
return StageFactory::inferReaderDriver(p.string());
}

std::string getWriterDriver(std::filesystem::path const& p)
{
py::gil_scoped_acquire acquire;
return StageFactory::inferWriterDriver(p.string());
}

Expand All @@ -142,7 +137,6 @@ namespace pdal {
}

py::object getMetadata() {
py::gil_scoped_acquire acquire;
py::object json = py::module_::import("json");

std::stringstream strm;
Expand Down Expand Up @@ -190,7 +184,6 @@ namespace pdal {
}

void setInputs(std::vector<py::array> ndarrays) {
py::gil_scoped_acquire acquire;
_inputs.clear();
for (const auto& ndarray: ndarrays) {
PyArrayObject* ndarray_ptr = (PyArrayObject*)ndarray.ptr();
Expand All @@ -209,7 +202,6 @@ namespace pdal {
std::string getSrsWKT2() { return getExecutor()->getSrsWKT2(); }

py::object getQuickInfo() {
py::gil_scoped_acquire acquire;
py::object json = py::module_::import("json");

std::string response;
Expand Down Expand Up @@ -275,6 +267,10 @@ namespace pdal {
void delExecutor() { _executor.reset(); }

PipelineExecutor* getExecutor() {
// We need to acquire the GIL before we create the executor
// because this method does Python init stuff but pybind11 doesn't
// automatically encapsulate it with a gil_scoped_acquire like it
// does for all of the other methods it knows about
py::gil_scoped_acquire acquire;
if (!_executor)
_executor.reset(new PipelineExecutor(getJson(), _inputs, _loglevel));
Expand Down
Loading