Skip to content

Defining object destructor in c10 #21984

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
zdevito wants to merge 1 commit into from
Closed

Defining object destructor in c10 #21984

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions aten/src/ATen/core/ivalue_inl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,14 +277,19 @@ struct C10_EXPORT ivalue::Future final : c10::intrusive_ptr_target {
// User-defined object.
struct C10_EXPORT ivalue::Object final : c10::intrusive_ptr_target {
public:
Object(std::shared_ptr<ClassType> type, size_t numSlots) : type_(std::move(type)) {
// temporary way to break cyclic dependencies in modules by forcing the deletion
// of functions when the module object is destructed
typedef void (*OnDelete)(ivalue::Object*);
Object(std::shared_ptr<ClassType> type, size_t numSlots, OnDelete on_delete)
: type_(std::move(type)), on_delete_(on_delete) {
slots_.resize(numSlots);
}

static c10::intrusive_ptr<Object> create(
std::shared_ptr<ClassType> type,
size_t numSlots) {
return c10::make_intrusive<Object>(std::move(type), numSlots);
size_t numSlots,
OnDelete on_delete = nullptr) {
return c10::make_intrusive<Object>(std::move(type), numSlots, on_delete);
}

/**
Expand Down Expand Up @@ -337,6 +342,7 @@ struct C10_EXPORT ivalue::Object final : c10::intrusive_ptr_target {
void resizeObject(size_t slot);
std::shared_ptr<ClassType> type_;
std::vector<IValue> slots_;
OnDelete on_delete_;
};

std::vector<std::pair<IValue, IValue>> iterationOrder(const c10::DictPtr<IValue, IValue>& dict);
Expand Down
8 changes: 5 additions & 3 deletions aten/src/ATen/core/type.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,13 @@
#include <c10/macros/Macros.h>
namespace c10 {

#ifdef C10_ANDROID
namespace ivalue {
Object::~Object() {}
Object::~Object() {
if (on_delete_) {
on_delete_(this);
}
}
} // namespace ivalue
#endif

std::ostream& operator<<(std::ostream & out, const Type & t) {
if(auto value = t.cast<CompleteTensorType>()) {
Expand Down
10 changes: 0 additions & 10 deletions torch/csrc/jit/script/class_type.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,6 @@ namespace c10 {
// This file exists because we need to reference module.h, which we can't from
// c10. Sigh...

#ifndef C10_ANDROID
namespace ivalue {
Object::~Object() {
if (type_->is_module()) {
type_->compilation_unit()->drop_all_functions();
}
}
} // namespace ivalue
#endif

std::shared_ptr<Function> ClassType::getMethod(const std::string& name) const {
return compilation_unit_->find_function(name);
}
Expand Down
6 changes: 5 additions & 1 deletion torch/csrc/jit/script/module.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,9 @@ struct TORCH_API Method {
// first-class function in class_compilation_unit()
std::shared_ptr<Function> function_;
};
static void clearMethods(c10::ivalue::Object* self) {
self->type()->compilation_unit()->drop_all_functions();
}

struct TORCH_API Module {
Module(std::string class_name)
Expand All @@ -112,7 +115,8 @@ struct TORCH_API Module {
QualifiedName(std::move(class_name)),
std::make_shared<CompilationUnit>(),
/*is_module=*/true),
0)) {}
0,
clearMethods)) {}
Module() : Module("$Module") {}
Module(ModulePtr module_value) : module_value_(std::move(module_value)) {}
~Module() {}
Expand Down