Skip to content
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

Jump to bottom

[Fix] Fix setup on non-linux-x64 #811

Merged
merged 2 commits into from
Jul 27, 2022
Merged

[Fix] Fix setup on non-linux-x64 #811

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e995078
fix setup
Jul 25, 2022
b092014
replace long to int64_t
Jul 26, 2022
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 csrc/mmdeploy/backend_ops/torchscript/optimizer/ir/subgraph_matcher.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ bool SubgraphMatcher::SubgraphMatcherImpl::matchAttributes(const Node* n1, Node*
"' did not match:\n", *n1, *n2);
return false;
}
std::vector<long int> n1is, n2is;
std::vector<int64_t> n1is, n2is;
std::vector<double> n1fs, n2fs;
switch (n1->kindOf(attr_name)) {
case AttributeKind::s:
Expand Down
2 changes: 1 addition & 1 deletion csrc/mmdeploy/backend_ops/torchscript/optimizer/passes/onnx/flatten_cls_head.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ static bool matchClsHead(const Match& match, const std::unordered_map<std::strin
if (!is_kind(const_node, "onnx::Constant")) return false;
auto ival = const_node->t(Symbol::attr("value"));
if (ival.dim() != 0) return false;
auto ival_dataptr = ival.data_ptr<long>();
auto ival_dataptr = ival.data_ptr<int64_t>();
if (ival_dataptr[0] != 0) return false;
}

Expand Down
6 changes: 3 additions & 3 deletions csrc/mmdeploy/backend_ops/torchscript/optimizer/passes/onnx/fuse_select_assign.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ bool FuseSelectAssign(Node* node, std::unordered_map<std::string, Tensor>& param
Node* shape = values_map[vmap["reshape_1_shape"]]->node();
auto shape_val = shape->t(Symbol::attr("value"));
if (shape_val.dim() != 1) return false;
if (shape_val.data_ptr<long>()[0] != -1) return false;
if (shape_val.data_ptr<int64_t>()[0] != -1) return false;
}

{
Expand All @@ -83,7 +83,7 @@ bool FuseSelectAssign(Node* node, std::unordered_map<std::string, Tensor>& param
Node* gather_inds = values_map[vmap["gather_inds_2"]]->node();
auto inds_val = gather_inds->t(Symbol::attr("value"));
if (inds_val.dim() != 0) return false;
if (inds_val.data_ptr<long>()[0] != 0) return false;
if (inds_val.data_ptr<int64_t>()[0] != 0) return false;
}

{
Expand All @@ -92,7 +92,7 @@ bool FuseSelectAssign(Node* node, std::unordered_map<std::string, Tensor>& param
auto start_name = slice->inputs()[1]->debugName();
auto start_val = params[start_name];
if (start_val.dim() != 1) return false;
if (start_val.data_ptr<long>()[0] != 0) return false;
if (start_val.data_ptr<int64_t>()[0] != 0) return false;
}

// create new node
Expand Down
4 changes: 2 additions & 2 deletions csrc/mmdeploy/backend_ops/torchscript/optimizer/passes/onnx/merge_shape_concate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ using torch::jit::Value;
void MergeShapeConcate(Node* node) {
auto inputs = node->inputs();

std::vector<long> gather_value;
std::vector<int64_t> gather_value;
Value* shape_from = nullptr;

std::vector<Node*> node_to_remove{node};
Expand Down Expand Up @@ -54,7 +54,7 @@ void MergeShapeConcate(Node* node) {
if (!is_kind(constant_node, "onnx::Constant")) return;

auto gather_indices_val = constant_node->t(Symbol::attr("value"));
long* data_ptr = gather_indices_val.data_ptr<long>();
int64_t* data_ptr = gather_indices_val.data_ptr<int64_t>();
if (gather_indices_val.dim() == 0) {
gather_value.push_back(data_ptr[0]);
} else {
Expand Down