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

Dev user op set default is_dynamic #5223

Merged
merged 7 commits into from
Jun 17, 2021
Merged

Dev user op set default is_dynamic #5223

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b305266
user_op set default is_dynamic
guo-ran May 31, 2021
4bec97c
Merge branch 'master' of https://github.com/Oneflow-Inc/oneflow into …
ShawnXuan Jun 17, 2021
2348e04
return first valid blob desc
ShawnXuan Jun 17, 2021
21150c0
auto format by CI
oneflow-ci-bot Jun 17, 2021
bd75af4
Merge branch 'master' into dev_user_op_set_default_is_dynamic_merge_m…
oneflow-ci-bot Jun 17, 2021
bd99f4c
Merge branch 'master' into dev_user_op_set_default_is_dynamic_merge_m…
oneflow-ci-bot Jun 17, 2021
a375258
Merge branch 'master' into dev_user_op_set_default_is_dynamic_merge_m…
oneflow-ci-bot Jun 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 9 additions & 2 deletions oneflow/core/operator/user_op.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,18 @@ namespace {
BlobDesc* FindValidBlobDescOfBnsInOp(
std::function<BlobDesc*(const std::string&)> GetBlobDesc4BnInOp,
const PbRpf<std::string>& bn_in_ops) {
BlobDesc* valid = nullptr;
for (const std::string& bn_in_op : bn_in_ops) {
BlobDesc* blob_desc = GetBlobDesc4BnInOp(bn_in_op);
if (blob_desc) { return blob_desc; }
if (blob_desc) {
const bool is_dynamic = blob_desc->is_dynamic();
if (valid == nullptr || is_dynamic) {
valid = blob_desc;
if (is_dynamic) { break; }
}
}
}
return nullptr;
return valid;
}

user_op::NaiveTensorDesc GenTensorDescFromBlobDesc(const BlobDesc* blob_desc) {
Expand Down