mirror of
https://github.com/zebrajr/pytorch.git
synced 2025-12-06 12:20:52 +01: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
83 lines
2.4 KiB
C++
83 lines
2.4 KiB
C++
#pragma once
|
|
|
|
#include <functional>
|
|
#include <vector>
|
|
#include <torch/csrc/Types.h>
|
|
|
|
typedef std::function<void(PyObject*, PyObject*, bool)> THPCopyFunction;
|
|
struct THPCopyInfo {
|
|
PyTypeObject* srcType; // Python type of src tensor/storage
|
|
THPCopyFunction copy; // copy function
|
|
bool non_blocking; // true if copy implements an 'non_blocking' copy
|
|
bool broadcast; // true if the copy implements a broadcast copy
|
|
};
|
|
typedef std::vector<THPCopyInfo> THPCopyList;
|
|
|
|
inline bool tryTHPCopy(const THPCopyList& v, PyObject* dst, PyObject* src, bool non_blocking, bool broadcast)
|
|
{
|
|
for (auto& i : v) {
|
|
if (i.non_blocking == non_blocking && PyType_IsSubtype(Py_TYPE(src), i.srcType)) {
|
|
(i.copy)(dst, src, broadcast);
|
|
return true;
|
|
}
|
|
}
|
|
return false;
|
|
}
|
|
|
|
inline bool THPCopy(const THPCopyList& v, PyObject* dst, PyObject* src, bool non_blocking, bool broadcast)
|
|
{
|
|
if (tryTHPCopy(v, dst, src, non_blocking, broadcast)) {
|
|
return true;
|
|
} else if (non_blocking && tryTHPCopy(v, dst, src, false, broadcast)) {
|
|
return true;
|
|
}
|
|
THPUtils_setError("copy from %s to %s isn't implemented",
|
|
THPUtils_typename(src), THPUtils_typename(dst));
|
|
return false;
|
|
}
|
|
|
|
inline PyObject * THPStorageCopyMethod(const THPCopyList& v, PyObject *self, PyObject *args, PyObject *kwargs)
|
|
{
|
|
PyObject *src;
|
|
int non_blocking = 0;
|
|
static char *kwlist[] = {"source", "non_blocking", nullptr};
|
|
// use int as parse type because bool not available in python2.
|
|
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|i:copy_", kwlist, &src, &non_blocking)) {
|
|
return nullptr;
|
|
}
|
|
|
|
if (!THPCopy(v, self, src, non_blocking, false)) {
|
|
return nullptr;
|
|
}
|
|
|
|
Py_INCREF(self);
|
|
return self;
|
|
}
|
|
|
|
template <typename THPStorageDst, typename THPStorageSrc, typename StorageDst, typename StorageSrc>
|
|
void THPInsertStorageCopyFunction(
|
|
PyTypeObject *srcType,
|
|
THPCopyList& copyList,
|
|
void (*copyFunc)(LIBRARY_STATE_TYPE StorageDst* x, StorageSrc* z),
|
|
bool non_blocking=false)
|
|
{
|
|
auto wrapper = [copyFunc](PyObject* dst_, PyObject* src_, bool broadcast) {
|
|
auto dst = ((THPStorageDst*)dst_)->cdata;
|
|
auto src = ((THPStorageSrc*)src_)->cdata;
|
|
|
|
PyThreadState *_save = nullptr;
|
|
try {
|
|
Py_UNBLOCK_THREADS;
|
|
copyFunc(LIBRARY_STATE dst, src);
|
|
Py_BLOCK_THREADS;
|
|
} catch (...) {
|
|
if (_save) {
|
|
Py_BLOCK_THREADS;
|
|
}
|
|
throw;
|
|
}
|
|
};
|
|
|
|
copyList.push_back({ srcType, wrapper, non_blocking, false });
|
|
}
|