Merge pull request #18783 from sl-sergei:fix_conv1d
Add support for Conv1D on OpenCV backend * Add support for Conv1D on OpenCV backend * disable tests on other targets/backends * Fix formatting * Restore comment * Remove unnecessary flag and fix test logic * Fix perf test * fix braces * Fix indentation, assert check and remove unnecessary condition * Remove unnecessary changes * Add test cases for variable weights and bias * dnn(conv): fallback on OpenCV+CPU instead of failures * coding style
This commit is contained in:
committed by
GitHub
parent
d23435baac
commit
61144f935e
@@ -533,7 +533,7 @@ struct ConvParamID
|
||||
CONV_100 = 100,
|
||||
CONV_LAST = sizeof(testConvolutionConfigs) / sizeof(testConvolutionConfigs[0])
|
||||
};
|
||||
int val_; \
|
||||
int val_;
|
||||
ConvParamID(int val = 0) : val_(val) {}
|
||||
operator int() const { return val_; }
|
||||
static ::testing::internal::ParamGenerator<ConvParamID> all()
|
||||
@@ -546,7 +546,7 @@ struct ConvParamID
|
||||
ConvParamID v_[NUM]; for (int i = 0; i < NUM; ++i) { v_[i] = ConvParamID(i); } // reduce generated code size
|
||||
return ::testing::ValuesIn(v_, v_ + NUM);
|
||||
}
|
||||
}; \
|
||||
};
|
||||
static inline void PrintTo(const ConvParamID& v, std::ostream* os)
|
||||
{
|
||||
CV_Assert((int)v >= 0); CV_Assert((int)v < ConvParamID::CONV_LAST);
|
||||
|
||||
Reference in New Issue
Block a user