conflict

Author: Laicheng0830

tensorlayer/app/computer_vision.py

@@ -51,11 +51,10 @@ def __call__(self, input_data):
         if self.model_name == 'yolo4-mscoco':
             batch_data = yolo4_input_processing(input_data)
             feature_maps = self.model(batch_data, is_train=False)
-            output = yolo4_output_processing(feature_maps)
-        elif self.model_name == 'lcn':
-            output = self.model(input_data)
             pred_bbox = yolo4_output_processing(feature_maps)
             output = result_to_json(input_data, pred_bbox)
+        elif self.model_name == 'lcn':
+            output = self.model(input_data)
         else:
             raise NotImplementedError