mirror of
https://github.com/zebrajr/pytorch.git
synced 2025-12-07 12:21:27 +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
85 lines
2.5 KiB
C++
85 lines
2.5 KiB
C++
#pragma once
|
|
#include <torch/csrc/jit/source_location.h>
|
|
#include <torch/csrc/jit/assertions.h>
|
|
|
|
|
|
namespace torch {
|
|
namespace jit {
|
|
|
|
// a range of a shared string 'file_' with functions to help debug by highlight
|
|
// that
|
|
// range.
|
|
struct SourceRange : public SourceLocation {
|
|
SourceRange(
|
|
std::shared_ptr<std::string> file_,
|
|
size_t start_,
|
|
size_t end_)
|
|
: file_(std::move(file_)), start_(start_), end_(end_) {}
|
|
const std::string text() const {
|
|
return file().substr(start(), end() - start());
|
|
}
|
|
size_t size() const {
|
|
return end() - start();
|
|
}
|
|
|
|
static const size_t CONTEXT = 10;
|
|
void highlight(std::ostream& out) const override {
|
|
const std::string& str = file();
|
|
size_t begin_line = start(); // beginning of line to highlight
|
|
size_t end_line = start(); // end of line to highlight
|
|
while (begin_line > 0 && str[begin_line - 1] != '\n')
|
|
--begin_line;
|
|
while (end_line < str.size() && str[end_line] != '\n')
|
|
++end_line;
|
|
JIT_ASSERT(begin_line == 0 || str[begin_line - 1] == '\n');
|
|
JIT_ASSERT(end_line == str.size() || str[end_line] == '\n');
|
|
|
|
size_t begin_highlight = begin_line; // beginning of context, CONTEXT lines before the highlight line
|
|
for(size_t i = 0; begin_highlight > 0; --begin_highlight) {
|
|
if(str[begin_highlight - 1] == '\n')
|
|
++i;
|
|
if(i >= CONTEXT)
|
|
break;
|
|
}
|
|
JIT_ASSERT(begin_highlight == 0 || str[begin_highlight - 1] == '\n');
|
|
|
|
size_t end_highlight = end_line; // end of context, CONTEXT lines after the highlight line
|
|
for(size_t i = 0; end_highlight < str.size(); ++end_highlight) {
|
|
if(str[end_highlight] == '\n')
|
|
++i;
|
|
if(i >= CONTEXT)
|
|
break;
|
|
}
|
|
JIT_ASSERT(end_highlight == str.size() || str[end_highlight] == '\n');
|
|
|
|
out << str.substr(begin_highlight, end_line - begin_highlight) << "\n";
|
|
out << std::string(start() - begin_line, ' ');
|
|
size_t len = std::min(size(), end_line - start());
|
|
out << std::string(len, '~')
|
|
<< (len < size() ? "... <--- HERE" : " <--- HERE");
|
|
out << str.substr(end_line, end_highlight - end_line);
|
|
if (!str.empty() && str.back() != '\n')
|
|
out << "\n";
|
|
}
|
|
const std::string& file() const {
|
|
return *file_;
|
|
}
|
|
const std::shared_ptr<std::string>& file_ptr() const {
|
|
return file_;
|
|
}
|
|
size_t start() const {
|
|
return start_;
|
|
}
|
|
size_t end() const {
|
|
return end_;
|
|
}
|
|
|
|
private:
|
|
std::shared_ptr<std::string> file_;
|
|
size_t start_;
|
|
size_t end_;
|
|
};
|
|
|
|
} // namespace jit
|
|
} // namespace torch
|