Merge branch 'master' into feature_dynamic_dims

* master: [CONVERTER2TNN][UPD] 1. default do not clean build directory; (#694) Feature fp16 arm32 (#690) pose demo (#665) # Conflicts: # examples/base/tnn_sdk_sample.cc # source/tnn/layer/upsample_layer.cc # tools/convert2tnn/utils/align_model.py
Tencent · Jan 4, 2021 · f231dfe · f231dfe
1 parent 9b30550
commit f231dfe
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/source/tnn/layer/upsample_layer.cc b/source/tnn/layer/upsample_layer.cc
@@ -63,13 +63,8 @@ Status UpsampleLayer::InferOutputShape() {
     int width_out    = 0;
     int height_out   = 0;
 
-<<<<<<< HEAD
-    if (layer_param->mode == 1 || layer_param->mode == 2) {
-        // floor is wrong for some model
-=======
     if (layer_param->mode == 1 || layer_param->mode == 2 || layer_param->mode == 3) {
         //floor is wrong for some model
->>>>>>> master
         width_out  = int(round(width * layer_param->scales[0]));
         height_out = int(round(height * layer_param->scales[1]));
     } else {