未验证 提交 39715861 编写于 作者: T Tao Luo 提交者: GitHub

Merge pull request #5600 from luotao1/warning

fix compile warning in test_MKLDNN.cpp and ROIPoolLayer.cpp
...@@ -98,7 +98,7 @@ void ROIPoolLayer::forward(PassType passType) { ...@@ -98,7 +98,7 @@ void ROIPoolLayer::forward(PassType passType) {
size_t roiStartH = round(bottomROIs[2] * spatialScale_); size_t roiStartH = round(bottomROIs[2] * spatialScale_);
size_t roiEndW = round(bottomROIs[3] * spatialScale_); size_t roiEndW = round(bottomROIs[3] * spatialScale_);
size_t roiEndH = round(bottomROIs[4] * spatialScale_); size_t roiEndH = round(bottomROIs[4] * spatialScale_);
CHECK_GE(roiBatchIdx, 0); CHECK_GE(roiBatchIdx, 0UL);
CHECK_LT(roiBatchIdx, batchSize); CHECK_LT(roiBatchIdx, batchSize);
size_t roiHeight = std::max(roiEndH - roiStartH + 1, 1UL); size_t roiHeight = std::max(roiEndH - roiStartH + 1, 1UL);
size_t roiWidth = std::max(roiEndW - roiStartW + 1, 1UL); size_t roiWidth = std::max(roiEndW - roiStartW + 1, 1UL);
......
...@@ -297,7 +297,7 @@ static void getAddtoConfig(TestConfig& cfg, ...@@ -297,7 +297,7 @@ static void getAddtoConfig(TestConfig& cfg,
} }
void testAddtoLayer(const testImageDesc& pm, const size_t nInputs) { void testAddtoLayer(const testImageDesc& pm, const size_t nInputs) {
CHECK_GE(nInputs, 1); CHECK_GE(nInputs, 1UL);
TestConfig dnnConfig; TestConfig dnnConfig;
getAddtoConfig(dnnConfig, pm, nInputs); getAddtoConfig(dnnConfig, pm, nInputs);
dnnConfig.layerConfig.set_type("mkldnn_addto"); dnnConfig.layerConfig.set_type("mkldnn_addto");
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册