fix

.gitignore

@@ -4,3 +4,6 @@
 *.onnx
 *.param
 *.zip
+*.mnn
+*.onnx
+

app.py

@@ -162,20 +162,35 @@ def start_process(input_file, input_url, input2, shape0_str, shape1_str, output_
         yield [], log
         output_base =  output_folder + "/" + input2
         pt_path = output_base + ".pt"
+        command = f"pnnx {pt_path}"
         input_tensor0 = torch.rand(shape0) if any(shape0) else None
         input_tensor1 = torch.rand(shape1) if any(shape1) else None
-        if "Fixed" in output_type and input_tensor0 is not None and input_tensor1 is not None:
+        if input_tensor0 is not None and input_tensor1 is not None:
             example_input = (input_tensor0, input_tensor1)
             # 修改此处，去除 shape 字符串中的空格
-            command = f"pnnx {pt_path} inputshape={str(shape0).replace(' ', '')} inputshape2={str(shape1).replace(' ', '')}"
-        elif "Fixed" in output_type and input_tensor0 is not None:
+            if "Fixed" in output_type:
+                command = f"pnnx {pt_path} inputshape={str(shape0).replace(' ', '')} inputshape2={str(shape1).replace(' ', '')}"
+        elif input_tensor0 is not None:
             example_input = input_tensor0
-            command = f"pnnx {pt_path} inputshape={str(shape0).replace(' ', '')}"
+            if "Fixed" in output_type:
+                command = f"pnnx {pt_path} inputshape={str(shape0).replace(' ', '')}"
         else:
             example_input = input_tensor1
             command = f"pnnx {pt_path}"
-        print_log(task_id, input2, "生成输入张量", "完成")
 
+        input_tensor_str = ""
+        if input_tensor0 is not None:
+            input_tensor_str += str(input_tensor0.shape)
+        else:
+            input_tensor_str += "None"
+
+        if input_tensor1 is not None:
+            input_tensor_str += ", " + str(input_tensor1.shape)
+        else:
+            input_tensor_str += ", None"
+        print_log(task_id, input2, "生成输入张量"+input_tensor_str, "完成")
+        log +=input_tensor_str+ "\n"
+        yield [], log
 
         # 确保 output_folder 存在
         if not os.path.exists(output_folder):
@@ -283,11 +298,13 @@ def start_process(input_file, input_url, input2, shape0_str, shape1_str, output_
                                 yield [], log
                     returncode = process.poll()
                     if returncode != 0:
+                        print_log(task_id, input2, f"转换为MNN模型，返回码: {returncode}，命令: {mnn_command} ", "失败")
                         log += f"执行mnn命令失败，返回码: {returncode}，命令: {mnn_command} \n"
                     else:
                         log += f"执行命令成功: {mnn_command} \n"
                 except Exception as e:
                     log += f"执行命令: {mnn_command} 失败，错误信息: {str(e)}\n"
+                    print_log(task_id, input2, f"转换为MNN模型，错误信息: {str(e)}", "错误")
 
         if "NCNN" in output_type:
             print_log(task_id, input2, "执行命令" + command, "开始")
@@ -310,10 +327,12 @@ def start_process(input_file, input_url, input2, shape0_str, shape1_str, output_
                 returncode = process.poll()
                 if returncode != 0:
                     log += f"执行命令失败，返回码: {returncode}，命令: {command} \n"
+                    print_log(task_id, input2, f"返回码: {returncode}，命令: {command} ", "失败")
                 else:
                     log += f"执行命令成功: {command} \n"
             except Exception as e:
                 log += f"执行命令: {command} 失败，错误信息: {str(e)}\n"
+                print_log(task_id, input2, f"错误信息: {str(e)}", "错误")
                 
             # 查找 output_folder 目录下以 .ncnn.bin 和 .ncnn.param 结尾的文件
             bin_files = [f for f in os.listdir(output_folder) if f.endswith('.ncnn.bin')]
@@ -387,7 +406,7 @@ with gr.Blocks() as demo:
     # 绑定事件，修改输入参数
     process = start_button.click(
         fn=start_process,
-        inputs=[input1_file, input1, input2, output_type, shape0_str, shape1_str,output_type],
+        inputs=[input1_file, input1, input2, shape0_str, shape1_str, output_type],
         outputs=[output, log_textbox]
     )
     # 为取消按钮添加点击事件绑定，使用 cancels 属性取消 start_process 任务
@@ -405,11 +424,11 @@ with gr.Blocks() as demo:
         ["","https://github.com/Phhofm/models/releases/download/1xDeJPG/1xDeJPG_SRFormer_light.pth", "", "1,3,128,128", "0,0,0,0"],
         ["","https://objectstorage.us-phoenix-1.oraclecloud.com/n/ax6ygfvpvzka/b/open-modeldb-files/o/4x-WTP-ColorDS.pth", "", "1,3,128,128", "0,0,0,0"],
     ]
-    gr.Examples(
-        examples=examples,
-        inputs=[input1_file, input1, input2, shape0_str, shape1_str],
-        outputs=[output, log_textbox],
-        fn=start_process
-    )
+    # gr.Examples(
+    #     examples=examples,
+    #     inputs=[input1_file, input1, input2, shape0_str, shape1_str],
+    #     outputs=[output, log_textbox],
+    #     fn=start_process
+    # )
 
 demo.launch()