mirror of
https://github.com/saymrwulf/pytorch.git
synced 2026-05-15 21:00:47 +00:00
Summary: This PR suppresses clang-tidy warnings in the codebase (for now) so that we can re-enable clang-tidy checks on master. I ran this script to add the `NOLINTNEXTLINE` comments (on a devserver): ```bash python3 setup.py develop # Uses same script that's run on CI and adds the -j (parallel), -s (add comments), -k (continue if diagnostic errors are found) options python3 tools/clang_tidy.py \ -j \ -s \ -k \ -v \ --paths torch/csrc/ \ -g"-torch/csrc/jit/passes/onnx/helper.cpp" \ -g"-torch/csrc/jit/passes/onnx/shape_type_inference.cpp" \ -g"-torch/csrc/jit/serialization/onnx.cpp" \ -g"-torch/csrc/jit/serialization/export.cpp" \ -g"-torch/csrc/jit/serialization/import.cpp" \ -g"-torch/csrc/jit/serialization/import_legacy.cpp" \ -g"-torch/csrc/onnx/init.cpp" \ -g"-torch/csrc/cuda/nccl.*" \ -g"-torch/csrc/cuda/python_nccl.cpp" \ -g"-torch/csrc/autograd/FunctionsManual.cpp" \ -g"-torch/csrc/generic/*.cpp" \ -g"-torch/csrc/jit/codegen/cuda/runtime/*" \ -g"-torch/csrc/deploy/interpreter/interpreter.cpp" \ -g"-torch/csrc/deploy/interpreter/interpreter.h" \ -g"-torch/csrc/deploy/interpreter/interpreter_impl.h" \ -g"-torch/csrc/deploy/interpreter/test_main.cpp" ``` Pull Request resolved: https://github.com/pytorch/pytorch/pull/60649 Test Plan: Verified changes by re-running the script (without the `-s` option) and seeing no warnings/errors. Reviewed By: walterddr, janeyx99 Differential Revision: D29504258 Pulled By: 1ntEgr8 fbshipit-source-id: 78310b30ee8213b73ddb4771ad874665323e7a4e
100 lines
3.3 KiB
C++
100 lines
3.3 KiB
C++
#pragma once
|
|
#include <ATen/core/ivalue.h>
|
|
#include <pybind11/pybind11.h>
|
|
#include <torch/csrc/jit/python/pybind_utils.h>
|
|
#include <torch/csrc/python_headers.h>
|
|
|
|
namespace py = pybind11;
|
|
|
|
namespace c10 {
|
|
namespace ivalue {
|
|
|
|
// concrete ivalue Holder that hold a py::object
|
|
struct C10_EXPORT ConcretePyObjectHolder final : PyObjectHolder {
|
|
public:
|
|
static c10::intrusive_ptr<PyObjectHolder> create(py::object py_obj) {
|
|
return c10::make_intrusive<ConcretePyObjectHolder>(std::move(py_obj));
|
|
}
|
|
|
|
static c10::intrusive_ptr<PyObjectHolder> create(const py::handle& handle) {
|
|
py::gil_scoped_acquire ag;
|
|
return c10::make_intrusive<ConcretePyObjectHolder>(
|
|
handle.cast<py::object>());
|
|
}
|
|
|
|
PyObject* getPyObject() override {
|
|
return py_obj_.ptr();
|
|
}
|
|
|
|
InferredType tryToInferType() override {
|
|
pybind11::gil_scoped_acquire ag;
|
|
return torch::jit::tryToInferType(py_obj_);
|
|
}
|
|
|
|
IValue toIValue(const TypePtr& type, c10::optional<int32_t> N = c10::nullopt)
|
|
override {
|
|
pybind11::gil_scoped_acquire ag;
|
|
return torch::jit::toIValue(py_obj_, type, N);
|
|
}
|
|
|
|
std::string toStr() override {
|
|
pybind11::gil_scoped_acquire ag;
|
|
return py::str(py_obj_);
|
|
}
|
|
|
|
std::vector<at::Tensor> extractTensors() override {
|
|
// We could implement this entirely in C++ via pybind11 but it turns out to
|
|
// be substantially slower. Namely, the total time taken by markCompleted on
|
|
// a CUDAFuture is 21.5us with this implementation, but goes up to 58.7us
|
|
// when using C++. The reason is unclear.
|
|
try {
|
|
pybind11::gil_scoped_acquire ag;
|
|
// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
|
|
static py::object& extractorFn = *new py::object(
|
|
py::module::import("torch._jit_internal").attr("_extract_tensors"));
|
|
return extractorFn(py_obj_).cast<std::vector<at::Tensor>>();
|
|
} catch (py::error_already_set& e) {
|
|
auto err = std::runtime_error(
|
|
c10::str("Cannot extract tensors from value: ", e.what()));
|
|
{
|
|
pybind11::gil_scoped_acquire ag;
|
|
e.restore();
|
|
PyErr_Clear();
|
|
}
|
|
throw err;
|
|
}
|
|
}
|
|
|
|
// Note [Destructing py::object]
|
|
// ~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
//
|
|
// (1) Why py_obj_ = py::none(); does not work. Because we also need to
|
|
// acquire GIL when destructing py::object of None that de-references None.
|
|
// https://docs.python.org/3/c-api/none.html#c.Py_RETURN_NONE
|
|
//
|
|
// https://stackoverflow.com/questions/15287590/why-should-py-increfpy-none-be-required-before-returning-py-none-in-c
|
|
//
|
|
// (2) Why we need to call dec_ref() explicitly. Because py::object of
|
|
// nullptr, on destruction, effectively does nothing because of it calls
|
|
// Py_XDECREF(NULL) underlying.
|
|
// https://docs.python.org/3/c-api/refcounting.html#c.Py_XDECREF
|
|
// NOLINTNEXTLINE(modernize-use-override)
|
|
~ConcretePyObjectHolder() {
|
|
pybind11::gil_scoped_acquire ag;
|
|
py_obj_.dec_ref();
|
|
// explicitly setting PyObject* to nullptr to prevent py::object's dtor to
|
|
// decref on the PyObject again.
|
|
py_obj_.ptr() = nullptr;
|
|
}
|
|
|
|
// explicit construction to avoid errornous implicit conversion and
|
|
// copy-initialization
|
|
explicit ConcretePyObjectHolder(py::object py_obj)
|
|
: py_obj_(std::move(py_obj)) {}
|
|
|
|
private:
|
|
py::object py_obj_;
|
|
};
|
|
|
|
} // namespace ivalue
|
|
} // namespace c10
|