Skip to content

Commit c5f7eea

Browse files
peri044narendasan
authored andcommitted
fix: Fix warnings thrown by noexcept functions
Signed-off-by: Dheeraj Peri <[email protected]>
1 parent ed24659 commit c5f7eea

File tree

2 files changed

+262
-264
lines changed

2 files changed

+262
-264
lines changed

Diff for: core/plugins/impl/interpolate_plugin.cpp

+3-5
Original file line numberDiff line numberDiff line change
@@ -206,14 +206,12 @@ bool InterpolatePlugin::supportsFormatCombination(
206206
const nvinfer1::PluginTensorDesc* inOut,
207207
int nbInputs,
208208
int nbOutputs) noexcept {
209-
<<<<<<< HEAD
210209
if (nbInputs != 1) {
211210
LOG_ERROR("Expected a single tensor as input to interpolate plugin");
212211
}
213-
=======
214-
TRTORCH_ASSERT(nbInputs == 1, "Expected a single tensor as input to interpolate plugin");
215-
216-
>>>>>>> chore: Linter fixes
212+
if (nbInputs != 1) {
213+
LOG_ERROR("Expected a single tensor as input to interpolate plugin");
214+
}
217215
if (mode_ == "adaptive_max_pool2d") {
218216
if (nbOutputs != 2) {
219217
LOG_ERROR("Expected 2 tensors as output to interpolate plugin");

0 commit comments

Comments
 (0)