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: converter renaming already named tensors #1167

Merged
merged 6 commits into from
Jul 23, 2022
Merged

fix: converter renaming already named tensors #1167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a901b0c
fix: add a warning msg when renaming itensors
bowang007 Jul 6, 2022
c169a81
chore: change the function names
bowang007 Jul 14, 2022
cb5c06b
refactor: refactor the RecordNewTensor function
bowang007 Jul 22, 2022
8b66d3d
chore: fix a typo
bowang007 Jul 22, 2022
74d4df1
chore: Minor renaming
peri044 Jul 23, 2022
248d8aa
Merge branch 'master' into fix_renaming_itensor
peri044 Jul 23, 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 core/conversion/conversion.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ void AddInputs(
ctx->input_is_dynamic = true;
}

ctx->value_tensor_map[in] = trt_in;
ctx->RecordNewITensor(in, trt_in);
ctx->num_inputs += 1;
}

Expand Down
13 changes: 11 additions & 2 deletions core/conversion/conversionctx/ConversionCtx.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,8 +143,8 @@ ConversionCtx::~ConversionCtx() {
}

nvinfer1::ITensor* ConversionCtx::AssociateValueAndTensor(const torch::jit::Value* value, nvinfer1::ITensor* tensor) {
tensor->setName(value->debugName().c_str());
this->value_tensor_map[value] = tensor;
RecordNewITensor(value, tensor);

return tensor;
}

Expand All @@ -153,6 +153,15 @@ torch::jit::IValue* ConversionCtx::AssociateValueAndIValue(const torch::jit::Val
return &this->evaluated_value_map[value];
}

void ConversionCtx::RecordNewITensor(const torch::jit::Value* value, nvinfer1::ITensor* tensor) {
value_tensor_map[value] = tensor;
auto ret = seen_itensors.insert(tensor);
if (!ret.second) {
LOG_WARNING(
"Trying to record the value " << value->debugName() << " with the ITensor " << tensor->getName() << " again.");
}
}

std::string ConversionCtx::SerializeEngine() {
#if NV_TENSORRT_MAJOR > 7
auto serialized_network = builder->buildSerializedNetwork(*net, *cfg);
Expand Down
4 changes: 4 additions & 0 deletions core/conversion/conversionctx/ConversionCtx.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ struct ConversionCtx {
ConversionCtx(BuilderSettings settings);
std::string SerializeEngine();
nvinfer1::ITensor* AssociateValueAndTensor(const torch::jit::Value* value, nvinfer1::ITensor* tensor);
void RecordNewITensor(const torch::jit::Value* value, nvinfer1::ITensor* tensor);
torch::jit::IValue* AssociateValueAndIValue(const torch::jit::Value* value, torch::jit::IValue tensor);
bool CheckLayerAddition(const torch::jit::Node* n);

Expand All @@ -71,6 +72,9 @@ struct ConversionCtx {

std::unordered_map<const torch::jit::Value*, nvinfer1::ITensor*> value_tensor_map;
std::unordered_map<const torch::jit::Value*, torch::jit::IValue> evaluated_value_map;

// record already named ITensors to prevent rewriting another name to the same tensor
std::unordered_set<nvinfer1::ITensor*> seen_itensors;
};

} // namespace conversion
Expand Down