Files
pytorch/torch/csrc/jit/python/python_tree_views.cpp
Han Qi b34b192d6b Reland "Make debug_pkl smaller by only emitting unique traces." (#73368)
Summary:
## Original commit message:
Pull Request resolved: https://github.com/pytorch/pytorch/pull/73368

debug_pkl file inside of pytorch's .pt file consists of a list of SourceRanges. Each SourceRange points to a Source which is a stack track, filename, and start, end numbers. Those are emitted in debug_pkl file as strings.
Since many SourceRange shares the same source, the string for trace can be deduped.
The newer format saves a set of unique traces in a tuple, then each SourceRange will save the offset of it's trace w.r.t. position in that tuple. (i.e. manually applying dictionary compression).
The above helps with smaller file size. On loading, if we copy each trace to Source as string the runtime memory would still blowup.
To mitigate this, we use SourceView directly instead of source which will take the reference of string inside of Deserializer and make that into string_view. This is safe because Deserializer is hold by Unpickler by shared_ptr, and Unpickler is also hold by shared_ptr by another Source object. That Source object will be alive during the model construction.

Test Plan:
## Original Test plan
unit test

Took original file (312271638_930.predictor.disagg.local); loaded with `torch.jit.load` save again with `torch.jit.save`. Unzip both, look at contents:
```
[qihan@devvm5585.vll0 ~]$ du archive -h
4.0K    archive/xl_model_weights
3.7M    archive/extra
8.0K    archive/code/__torch__/caffe2/torch/fb/model_transform/splitting
8.0K    archive/code/__torch__/caffe2/torch/fb/model_transform
8.0K    archive/code/__torch__/caffe2/torch/fb
8.0K    archive/code/__torch__/caffe2/torch
8.0K    archive/code/__torch__/caffe2
20M     archive/code/__torch__/torch/fx/graph_module
20M     archive/code/__torch__/torch/fx
8.0K    archive/code/__torch__/torch/classes
20M     archive/code/__torch__/torch
20M     archive/code/__torch__
20M     archive/code
2.7M    archive/constants
35M     archive
[qihan@devvm5585.vll0 ~]$ du resaved -h
4.0K    resaved/extra
8.0K    resaved/code/__torch__/caffe2/torch/fb/model_transform/splitting
8.0K    resaved/code/__torch__/caffe2/torch/fb/model_transform
8.0K    resaved/code/__torch__/caffe2/torch/fb
8.0K    resaved/code/__torch__/caffe2/torch
8.0K    resaved/code/__torch__/caffe2
1.3M    resaved/code/__torch__/torch/fx/graph_module
1.3M    resaved/code/__torch__/torch/fx
8.0K    resaved/code/__torch__/torch/classes
1.4M    resaved/code/__torch__/torch
1.4M    resaved/code/__torch__
1.4M    resaved/code
2.7M    resaved/constants
13M     resaved
[qihan@devvm5585.vll0 ~]$
```
## Additional test:
`buck test mode/dev-tsan //caffe2/benchmarks/static_runtime:static_runtime_cpptest -- --exact 'caffe2/benchmarks/static_runtime:static_runtime_cpptest - StaticRuntime.to'` passes

 test jest.fbios.startup_cold_start.local.simulator f333356873 -

Differential Revision: D35196883

Pull Request resolved: https://github.com/pytorch/pytorch/pull/74869
Approved by: https://github.com/gmagogsfm
2022-04-18 22:34:21 +00:00

414 lines
16 KiB
C++

#include <torch/csrc/jit/python/python_tree_views.h>
#include <torch/csrc/jit/frontend/tree_views.h>
#include <pybind11/pybind11.h>
#include <pybind11/stl.h>
#include <torch/csrc/utils/pybind.h>
#include <sstream>
namespace py = pybind11;
namespace torch {
namespace jit {
c10::optional<std::string> maybeConvertToString(const py::object& obj) {
if (obj.is_none()) {
return c10::nullopt;
}
std::stringstream ss;
ss << py::str(obj);
return ss.str();
}
struct SourceRangeFactory {
SourceRangeFactory(
std::string text,
const py::object& filename,
size_t file_lineno,
size_t leading_whitespace_chars)
: source_(std::make_shared<Source>(
std::move(text),
maybeConvertToString(filename),
file_lineno)),
leading_whitespace_chars_(leading_whitespace_chars) {}
SourceRange create(int line, int start_col, int end_col) {
// NOLINTNEXTLINE(cppcoreguidelines-init-variables)
size_t start_byte_offset, end_byte_offset;
std::tie(start_byte_offset, end_byte_offset) = line_col_to_byte_offs(
line,
// NOLINTNEXTLINE(cppcoreguidelines-narrowing-conversions,bugprone-narrowing-conversions)
start_col + leading_whitespace_chars_,
// NOLINTNEXTLINE(cppcoreguidelines-narrowing-conversions,bugprone-narrowing-conversions)
end_col + leading_whitespace_chars_);
return SourceRange(source_, start_byte_offset, end_byte_offset);
}
std::tuple<size_t, size_t> line_col_to_byte_offs(
int line,
int start_col,
int end_col) {
// lines are counted from 1.
line--;
auto line_start = source_->offset_for_line(line);
return std::make_tuple<size_t, size_t>(
line_start + start_col, line_start + end_col);
}
std::shared_ptr<Source> source_;
std::vector<size_t> line_len_prefix_sum_;
size_t leading_whitespace_chars_;
};
template <typename T>
List<T> wrap_list(const SourceRange& fallback_pos, std::vector<T>&& vec) {
if (vec.empty())
return List<T>::create(fallback_pos, std::move(vec));
return List<T>::create(vec.front().range(), std::move(vec));
}
template <typename T>
Maybe<T> wrap_maybe(const SourceRange& fallback_pos, T* val) {
return val ? Maybe<T>::create(val->range(), *val)
: Maybe<T>::create(fallback_pos);
}
void initTreeViewBindings(PyObject* module) {
auto _C = py::handle(module).cast<py::module>();
auto m = _C.def_submodule("_jit_tree_views");
py::class_<SourceRange>(m, "SourceRange")
.def(
"highlight",
[](const SourceRange& self) {
std::ostringstream stream;
self.highlight(stream);
return stream.str();
})
.def("__repr__", [](const SourceRange& self) { return self.str(); })
.def(
"__str__",
[](const SourceRange& self) {
return "SourceRange at:\n" + self.str();
})
.def_property_readonly("start", &SourceRange::start)
.def_property_readonly("end", &SourceRange::end);
py::class_<SourceRangeFactory>(m, "SourceRangeFactory")
.def(py::init<std::string&&, py::object, size_t, size_t>())
.def("make_range", &SourceRangeFactory::create)
.def(
"make_raw_range",
[](const SourceRangeFactory& self, size_t start, size_t end) {
return SourceRange(self.source_, start, end);
})
.def_property_readonly("source", [](const SourceRangeFactory& self) {
auto text_view = self.source_->text_str().str();
return text_view;
});
py::class_<TreeView>(m, "TreeView")
.def("range", &TreeView::range)
.def(
"__str__",
[](const TreeView& tree) {
std::ostringstream stream;
stream << tree.get();
return stream.str();
})
.def("dump", [](const TreeView& tree) { tree.dump(); });
py::class_<Ident, TreeView>(m, "Ident")
.def(py::init(&Ident::create))
.def_property_readonly(
"name", [](const Ident& self) { return self.name(); });
py::class_<Param, TreeView>(m, "Param")
.def(py::init([](const Expr& type, const Ident& name, bool kwarg_only) {
return Param::create(
name.range(),
name,
Maybe<Expr>::create(type.range(), type),
Maybe<Expr>::create(name.range()),
kwarg_only);
}))
.def(py::init(
[](const Maybe<Expr>& type, const Ident& name, bool kwarg_only) {
return Param::create(
name.range(),
name,
type,
Maybe<Expr>::create(name.range()),
kwarg_only);
}));
py::class_<Attribute, TreeView>(m, "Attribute")
.def(py::init([](const Ident& name, const Expr& value) {
return Attribute::create(name.range(), name, value);
}));
m.def("TrueLiteral", [](const SourceRange& range) {
return Expr(Compound::create(TK_TRUE, range, {}));
});
m.def("FalseLiteral", [](const SourceRange& range) {
return Expr(Compound::create(TK_FALSE, range, {}));
});
m.def("NoneLiteral", [](const SourceRange& range) {
return Expr(Compound::create(TK_NONE, range, {}));
});
py::class_<Stmt, TreeView>(m, "Stmt") // NOLINT(bugprone-unused-raii)
.def(py::init([](const TreeView& thing) { return Stmt(thing.get()); }));
py::class_<Expr, TreeView>(m, "Expr"); // NOLINT(bugprone-unused-raii)
py::class_<Def, TreeView>(m, "Def")
.def(py::init(
[](const Ident& name, const Decl& decl, std::vector<Stmt> body) {
const auto& r = name.range();
return Def::create(r, name, decl, wrap_list(r, std::move(body)));
}))
.def("decl", [](const Def& def) { return def.decl(); })
.def("name", [](const Def& def) { return def.name(); });
py::class_<Property, TreeView>(m, "Property")
.def(py::init([](const SourceRange& r,
const Ident& name,
const Def& getter,
Def* setter) {
return Property::create(r, name, getter, wrap_maybe(r, setter));
}))
.def("name", [](const Property& property) { return property.name(); })
.def(
"getter_name",
[](const Property& property) { return property.getter().name(); })
.def("setter_name", [](const Property& property) {
if (property.setter().present()) {
return c10::optional<Ident>(property.setter().get().name());
}
return c10::optional<Ident>(c10::nullopt);
});
py::class_<ClassDef, TreeView>(m, "ClassDef")
.def(py::init([](const Ident& name,
std::vector<Stmt> body,
std::vector<Property> props,
std::vector<Assign> assigns) {
const auto& r = name.range();
return ClassDef::create(
r,
name,
Maybe<Expr>::create(r),
wrap_list(r, std::move(body)),
wrap_list(r, std::move(props)),
wrap_list(r, std::move(assigns)));
}));
py::class_<Decl, TreeView>(m, "Decl").def(py::init(
[](const SourceRange& r, std::vector<Param> params, Expr* return_type) {
return Decl::create(
r, wrap_list(r, std::move(params)), wrap_maybe(r, return_type));
}));
py::class_<Delete, Stmt>(m, "Delete")
.def(py::init([](const SourceRange& range, std::vector<Expr> targets) {
return Delete::create(range, wrap_list(range, std::move(targets)));
}));
py::class_<WithItem, Expr>(m, "WithItem")
.def(py::init([](const SourceRange& range, const Expr& target, Var* var) {
return WithItem::create(range, target, wrap_maybe(range, var));
}));
py::class_<Assign, Stmt>(m, "Assign")
.def(py::init([](std::vector<Expr> lhs, const Expr& rhs) {
auto li = wrap_list(rhs.range(), std::move(lhs));
return Assign::create(
li.range(),
li,
Maybe<Expr>::create(rhs.range(), rhs),
Maybe<Expr>::create(li.range()));
}))
.def(py::init([](std::vector<Expr> lhs, const Expr& rhs, Expr* type) {
auto li = wrap_list(rhs.range(), std::move(lhs));
return Assign::create(
li.range(),
li,
Maybe<Expr>::create(rhs.range(), rhs),
wrap_maybe(li.range(), type));
}));
py::class_<AugAssign, Stmt>(m, "AugAssign")
.def(py::init(
[](const Expr& lhs, const std::string& kind_str, const Expr& rhs) {
const auto& r = lhs.range();
auto kind =
AugAssignKind(Compound::create(stringToKind(kind_str), r, {}));
return AugAssign::create(r, lhs, kind, rhs);
}));
py::class_<Return, Stmt>(m, "Return")
.def(py::init([](const SourceRange& range, Expr* value) {
return Return::create(
range, value ? *value : Expr(Compound::create(TK_NONE, range, {})));
}));
py::class_<Raise, Stmt>(m, "Raise")
.def(py::init([](const SourceRange& range, const Expr& expr) {
return Raise::create(range, expr);
}));
py::class_<Assert, Stmt>(m, "Assert")
.def(py::init([](const SourceRange& range, const Expr& test, Expr* msg) {
return Assert::create(range, test, wrap_maybe(range, msg));
}));
py::class_<Pass, Stmt>(m, "Pass").def(
py::init([](const SourceRange& range) { return Pass::create(range); }));
py::class_<Break, Stmt>(m, "Break")
.def(py::init(
[](const SourceRange& range) { return Break::create(range); }));
py::class_<Continue, Stmt>(m, "Continue")
.def(py::init(
[](const SourceRange& range) { return Continue::create(range); }));
py::class_<Dots, Expr>(m, "Dots").def(
py::init([](const SourceRange& range) { return Dots::create(range); }));
py::class_<If, Stmt>(m, "If").def(
py::init([](const SourceRange& range,
const Expr& cond,
std::vector<Stmt> true_branch,
std::vector<Stmt> false_branch) {
return If::create(
range,
cond,
wrap_list(range, std::move(true_branch)),
wrap_list(range, std::move(false_branch)));
}));
py::class_<While, Stmt>(m, "While")
.def(py::init([](const SourceRange& range,
const Expr& cond,
std::vector<Stmt> body) {
return While::create(range, cond, wrap_list(range, std::move(body)));
}));
py::class_<With, Stmt>(m, "With").def(
py::init([](const SourceRange& range,
std::vector<WithItem> targets,
std::vector<Stmt> body) {
return With::create(
range,
wrap_list(range, std::move(targets)),
wrap_list(range, std::move(body)));
}));
py::class_<For, Stmt>(m, "For").def(py::init([](const SourceRange& range,
std::vector<Expr>& targets,
std::vector<Expr>& itrs,
std::vector<Stmt> body) {
return For::create(
range,
wrap_list(range, std::move(targets)),
wrap_list(range, std::move(itrs)),
wrap_list(range, std::move(body)));
}));
py::class_<ExprStmt, Stmt>(m, "ExprStmt").def(py::init([](const Expr& expr) {
return ExprStmt::create(expr.range(), expr);
}));
py::class_<Var, Expr>(m, "Var")
.def(py::init(
[](const Ident& name) { return Var::create(name.range(), name); }))
.def_property_readonly("name", [](const Var& var) { return var.name(); });
py::class_<BinOp, Expr>(m, "BinOp")
.def(py::init(
[](const std::string& kind, const Expr& lhs, const Expr& rhs) {
return BinOp::create(lhs.range(), stringToKind(kind), lhs, rhs);
}));
// NB: we take range here, because unary ops precede their exprs, so we need
// to include them
py::class_<UnaryOp, Expr>(m, "UnaryOp")
.def(py::init([](const SourceRange& range,
const std::string& kind,
const Expr& expr) {
auto resolved_kind = stringToKind(kind);
resolved_kind = resolved_kind == '-' ? TK_UNARY_MINUS : resolved_kind;
return UnaryOp::create(range, resolved_kind, expr);
}));
py::class_<Const, Expr>(m, "Const")
.def(py::init([](const SourceRange& range, const std::string& value) {
return Const::create(range, value);
}));
py::class_<StringLiteral, Expr>(m, "StringLiteral")
.def(py::init([](const SourceRange& range, const std::string& value) {
return StringLiteral::create(range, value);
}));
py::class_<Apply, Expr>(m, "Apply")
.def(py::init([](const Expr& expr,
std::vector<Expr> args,
std::vector<Attribute> kwargs) {
const auto& r = expr.range();
return Apply::create(
expr.range(),
expr,
wrap_list(r, std::move(args)),
wrap_list(r, std::move(kwargs)));
}));
py::class_<Select, Expr>(m, "Select")
.def(py::init([](const Expr& expr, const Ident& field) {
return Select::create(expr.range(), expr, field);
}));
py::class_<TernaryIf, Expr>(m, "TernaryIf")
.def(py::init(
[](const Expr& cond, const Expr& true_expr, const Expr& false_expr) {
return TernaryIf::create(cond.range(), cond, true_expr, false_expr);
}));
py::class_<ListComp, Expr>(m, "ListComp")
.def(py::init([](const SourceRange& range,
const Expr& elt,
const Expr& target,
const Expr& iter) {
return ListComp::create(range, elt, target, iter);
}));
py::class_<DictComp, Expr>(m, "DictComp")
.def(py::init([](const SourceRange& range,
const Expr& key,
const Expr& value,
const Expr& target,
const Expr& iter) {
return DictComp::create(range, key, value, target, iter);
}));
py::class_<ListLiteral, Expr>(m, "ListLiteral")
.def(py::init([](const SourceRange& range, std::vector<Expr> args) {
return ListLiteral::create(range, wrap_list(range, std::move(args)));
}));
py::class_<TupleLiteral, Expr>(m, "TupleLiteral")
.def(py::init([](const SourceRange& range, std::vector<Expr> args) {
return TupleLiteral::create(range, wrap_list(range, std::move(args)));
}));
py::class_<DictLiteral, Expr>(m, "DictLiteral")
.def(py::init([](const SourceRange& range,
std::vector<Expr> keys,
std::vector<Expr> values) {
return DictLiteral::create(
range,
wrap_list(range, std::move(keys)),
wrap_list(range, std::move(values)));
}));
py::class_<Subscript, Expr>(m, "Subscript")
.def(py::init([](const Expr& base, std::vector<Expr> subscript_exprs) {
return Subscript::create(
base.range(),
base,
wrap_list(base.range(), std::move(subscript_exprs)));
}));
py::class_<SliceExpr, Expr>(m, "SliceExpr")
.def(py::init(
[](const SourceRange& range, Expr* lower, Expr* upper, Expr* step) {
return SliceExpr::create(
range,
wrap_maybe(range, lower),
wrap_maybe(range, upper),
wrap_maybe(range, step));
}));
py::class_<Starred, Expr>(m, "Starred")
.def(py::init([](const SourceRange& range, const Expr& expr) {
return Starred::create(range, expr);
}));
py::class_<Maybe<Expr>, TreeView>(m, "EmptyTypeAnnotation")
.def(py::init(
[](const SourceRange& range) { return Maybe<Expr>::create(range); }));
}
} // namespace jit
} // namespace torch