mirror of
https://github.com/zebrajr/pytorch.git
synced 2025-12-08 07:39:33 +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
56 lines
1.2 KiB
C++
56 lines
1.2 KiB
C++
#include <torch/csrc/jit/ir.h>
|
|
|
|
|
|
#include <torch/csrc/jit/operator.h>
|
|
#include <torch/csrc/jit/assertions.h>
|
|
|
|
#include <iostream>
|
|
#include <unordered_map>
|
|
#include <unordered_set>
|
|
#include <set>
|
|
#include <stack>
|
|
#include <sstream>
|
|
#include <algorithm>
|
|
#include <string>
|
|
|
|
namespace torch { namespace jit {
|
|
|
|
ScopePtr Scope::push(Symbol name) {
|
|
return c10::make_intrusive<Scope>(intrusive_from_this(), name);
|
|
}
|
|
|
|
ScopePtr Scope::getRoot() {
|
|
ScopePtr current = intrusive_from_this();
|
|
while (current->parent_) {
|
|
current = current->parent_;
|
|
}
|
|
return current;
|
|
}
|
|
|
|
size_t Scope::getDepth() {
|
|
size_t d = 1;
|
|
ScopePtr current = intrusive_from_this();
|
|
while (current->parent_) {
|
|
current = current->parent_;
|
|
d += 1;
|
|
}
|
|
return d;
|
|
}
|
|
|
|
std::string Scope::namesFromRoot(const std::string& separator) const {
|
|
// TODO: I think the answer is we shouldn't have used Symbol here
|
|
std::string out = this->name_.toUnqualString();
|
|
if (this->isRoot()) {
|
|
return out;
|
|
}
|
|
ScopePtr parent = this->parent_;
|
|
while (!parent->isRoot()) {
|
|
// NOLINTNEXTLINE(performance-inefficient-string-concatenation)
|
|
out = std::string(parent->name_.toUnqualString()) + separator + out;
|
|
parent = parent->parent_;
|
|
}
|
|
return out;
|
|
}
|
|
|
|
}} // namespace torch::jit
|