Skip to content

[RUNTIME] Remove parameter def from runtime #486

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

Merged
merged 1 commit into from
Sep 25, 2017
Merged

[RUNTIME] Remove parameter def from runtime #486

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
2 changes: 1 addition & 1 deletion dmlc-core
Open in desktop
Submodule dmlc-core updated 5 files
+1 −5 include/dmlc/parameter.h
+6 −0 include/dmlc/recordio.h
+23 −4 include/dmlc/type_traits.h
+4 −2 src/data/disk_row_iter.h
+2 −1 tracker/dmlc_tracker/ssh.py
37 changes: 34 additions & 3 deletions src/runtime/graph/graph_runtime.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,37 @@ class GraphRuntime : public ModuleNode {
// control deps
std::vector<uint32_t> control_deps;
// JSON Loader
void LoadAttrs(dmlc::JSONReader *reader, TVMOpParam* param) {
int bitmask = 0;
std::string key, value;
reader->BeginObject();
while (reader->NextObjectItem(&key)) {
if (key == "func_name") {
reader->Read(&value);
param->func_name = value;
bitmask |= 1;
} else if (key == "num_inputs") {
reader->Read(&value);
std::istringstream is(value);
is >> param->num_inputs;
bitmask |= 2;
} else if (key == "num_outputs") {
reader->Read(&value);
std::istringstream is(value);
is >> param->num_outputs;
bitmask |= 4;
} else if (key == "flatten_data") {
reader->Read(&value);
std::istringstream is(value);
is >> param->flatten_data;
bitmask |= 8;
} else {
reader->Read(&value);
}
}
CHECK_EQ(bitmask, 1|2|4|8) << "invalid format";
}
// JSON Loader
void Load(dmlc::JSONReader *reader) {
reader->BeginObject();
std::unordered_map<std::string, std::string> dict;
Expand All @@ -172,8 +203,7 @@ class GraphRuntime : public ModuleNode {
reader->Read(&inputs);
bitmask |= 4;
} else if (key == "attr" || key == "attrs") {
reader->Read(&dict);
param.Init(dict);
this->LoadAttrs(reader, &param);
} else if (key == "control_deps") {
reader->Read(&control_deps);
} else {
Expand Down Expand Up @@ -263,6 +293,8 @@ class GraphRuntime : public ModuleNode {
} else if (key == "attrs") {
reader->Read(&attrs_);
bitmask |= 16;
} else {
LOG(FATAL) << "key " << key << " is not supported";
}
}
CHECK_EQ(bitmask, 1|2|4|8|16) << "invalid format";
Expand Down Expand Up @@ -320,7 +352,6 @@ class GraphRuntime : public ModuleNode {
std::vector<std::function<void()> > op_execs_;
};

DMLC_REGISTER_PARAMETER(TVMOpParam);

bool GraphRuntime::LoadDLTensor(dmlc::Stream* strm, DLTensor* tensor) {
uint64_t header, reserved;
Expand Down
10 changes: 1 addition & 9 deletions src/runtime/graph/graph_runtime.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
#ifndef TVM_RUNTIME_GRAPH_GRAPH_RUNTIME_H_
#define TVM_RUNTIME_GRAPH_GRAPH_RUNTIME_H_

#include <dmlc/parameter.h>
#include <string>

namespace tvm {
Expand All @@ -20,18 +19,11 @@ constexpr uint64_t kTVMNDArrayMagic = 0xDD5E40F096B4A13F;
constexpr uint64_t kTVMNDArrayListMagic = 0xF7E58D4F05049CB7;

/*! \brief operator attributes about tvm op */
struct TVMOpParam : public dmlc::Parameter<TVMOpParam> {
struct TVMOpParam {
std::string func_name;
uint32_t num_inputs;
uint32_t num_outputs;
uint32_t flatten_data;

DMLC_DECLARE_PARAMETER(TVMOpParam) {
DMLC_DECLARE_FIELD(func_name);
DMLC_DECLARE_FIELD(num_inputs).set_default(1);
DMLC_DECLARE_FIELD(num_outputs).set_default(1);
DMLC_DECLARE_FIELD(flatten_data).set_default(0);
}
};

} // namespace runtime
Expand Down