mirror of
https://github.com/pytorch/pytorch.git
synced 2025-10-20 21:14:14 +08:00
517c7c9861
Summary:
Anywhere we used #include "foo.h", we now say #include <foo.h>
Paths are adjusted to be rooted out of aten/src, torch/lib, or
the root level directory.
I modified CMakeLists.txt by hand to remove TH and THC from
the include paths.
I used the following script to do the canonicalization:
```
import subprocess
import re
import os.path
files = subprocess.check_output(['git', 'ls-files']).decode('utf-8').rstrip().split('\n')
for fn in files:
if not any(fn.endswith(suff) for suff in ['.cu', '.cpp', '.in', '.h', '.hpp', '.cu', '.cuh', '.cc']):
continue
if not any(fn.startswith(pref) for pref in ["aten/", "torch/"]):
continue
with open(fn, 'r') as f:
c = f.read()
def fmt(p):
return "#include <{}>".format(p)
def repl(m):
p = m.group(1)
if p in ["dlfcn.h", "unistd.h", "nvrtc.h", "cuda.h", "cuda_runtime.h", "cstdint", "cudnn.h", "Python.h", "cusparse.h", "cuda_runtime_api.h", "cuda_fp16.h", "cublas_v2.h", "stdint.h", "curand_kernel.h"]:
return fmt(p)
if any(p.startswith(pref) for pref in ["torch/csrc", "c10/", "ATen/", "caffe2/", "TH/", "THC/", "Eigen/", "gtest/", "zdl/", "gloo/", "onnx/", "miopen/"]):
return fmt(p)
for root in ["aten/src", "torch/lib", ""]:
for bad_root in [os.path.dirname(fn), "aten/src/TH", "aten/src/THC", "torch/csrc"]:
new_p = os.path.relpath(os.path.join(bad_root, p), root)
if not new_p.startswith("../") and (os.path.exists(os.path.join(root, new_p)) or os.path.exists(os.path.join(root, new_p + ".in"))):
return fmt(new_p)
print("ERROR: ", fn, p)
return m.group(0)
new_c = re.sub(r'#include "([^"]+)"', repl, c)
if new_c != c:
print(fn)
with open(fn, 'w') as f:
f.write(new_c)
```
Signed-off-by: Edward Z. Yang <ezyang@fb.com>
Pull Request resolved: https://github.com/pytorch/pytorch/pull/14849
Reviewed By: dzhulgakov
Differential Revision: D13363445
Pulled By: ezyang
fbshipit-source-id: 52361f878a672785f9306c9e9ab2513128092b68
103 lines
3.6 KiB
C++
103 lines
3.6 KiB
C++
#include <torch/csrc/python_headers.h>
|
|
#include <ATen/Utils.h>
|
|
#include <functional>
|
|
|
|
static PyObject* THPWrapperClass = nullptr;
|
|
|
|
struct THPWrapper {
|
|
PyObject_HEAD
|
|
void *data;
|
|
void (*destructor)(void*);
|
|
};
|
|
|
|
PyObject * THPWrapper_New(void *data, void (*destructor)(void*))
|
|
{
|
|
PyObject *args = PyTuple_New(0);
|
|
if (!args) {
|
|
return nullptr;
|
|
}
|
|
PyObject *result = PyObject_Call(THPWrapperClass, args, nullptr);
|
|
if (result) {
|
|
THPWrapper* wrapper = (THPWrapper*) result;
|
|
wrapper->data = data;
|
|
wrapper->destructor = destructor;
|
|
}
|
|
Py_DECREF(args);
|
|
return result;
|
|
}
|
|
|
|
bool THPWrapper_check(PyObject * obj)
|
|
{
|
|
return (PyObject*)Py_TYPE(obj) == THPWrapperClass;
|
|
}
|
|
|
|
void * THPWrapper_get(PyObject * obj)
|
|
{
|
|
return ((THPWrapper*)obj)->data;
|
|
}
|
|
|
|
static PyObject * THPWrapper_pynew(PyTypeObject *type, PyObject *args, PyObject *kwargs)
|
|
{
|
|
PyObject* self = type->tp_alloc(type, 0);
|
|
THPWrapper* wrapper = (THPWrapper*) self;
|
|
wrapper->data = nullptr;
|
|
wrapper->destructor = nullptr;
|
|
return self;
|
|
}
|
|
|
|
static void THPWrapper_dealloc(THPWrapper* self)
|
|
{
|
|
self->destructor(self->data);
|
|
Py_TYPE(self)->tp_free((PyObject*)self);
|
|
}
|
|
|
|
PyTypeObject THPWrapperType = {
|
|
PyVarObject_HEAD_INIT(nullptr, 0)
|
|
"torch._C._PtrWrapper", /* tp_name */
|
|
sizeof(THPWrapper), /* tp_basicsize */
|
|
0, /* tp_itemsize */
|
|
(destructor)THPWrapper_dealloc, /* tp_dealloc */
|
|
nullptr, /* tp_print */
|
|
nullptr, /* tp_getattr */
|
|
nullptr, /* tp_setattr */
|
|
nullptr, /* tp_reserved */
|
|
nullptr, /* tp_repr */
|
|
nullptr, /* tp_as_number */
|
|
nullptr, /* tp_as_sequence */
|
|
nullptr, /* tp_as_mapping */
|
|
nullptr, /* tp_hash */
|
|
nullptr, /* tp_call */
|
|
nullptr, /* tp_str */
|
|
nullptr, /* tp_getattro */
|
|
nullptr, /* tp_setattro */
|
|
nullptr, /* tp_as_buffer */
|
|
Py_TPFLAGS_DEFAULT, /* tp_flags */
|
|
nullptr, /* tp_doc */
|
|
nullptr, /* tp_traverse */
|
|
nullptr, /* tp_clear */
|
|
nullptr, /* tp_richcompare */
|
|
0, /* tp_weaklistoffset */
|
|
nullptr, /* tp_iter */
|
|
nullptr, /* tp_iternext */
|
|
nullptr, /* tp_methods */
|
|
nullptr, /* tp_members */
|
|
nullptr, /* tp_getset */
|
|
nullptr, /* tp_base */
|
|
nullptr, /* tp_dict */
|
|
nullptr, /* tp_descr_get */
|
|
nullptr, /* tp_descr_set */
|
|
0, /* tp_dictoffset */
|
|
nullptr, /* tp_init */
|
|
nullptr, /* tp_alloc */
|
|
THPWrapper_pynew, /* tp_new */
|
|
};
|
|
|
|
bool THPWrapper_init(PyObject *module)
|
|
{
|
|
THPWrapperClass = (PyObject*)&THPWrapperType;
|
|
if (PyType_Ready(&THPWrapperType) < 0)
|
|
return false;
|
|
Py_INCREF(&THPWrapperType);
|
|
return true;
|
|
}
|