Merge branch 'main' of github.com:HuangMason320/cluster4npu

cluster4npu_ui/core/functions/InferencePipeline.py

@@ -244,10 +244,12 @@ class PipelineStage:
                     # Handle tuple results like (probability, result_string)
                     prob, result_str = result
                     if prob is not None and result_str is not None:
-                        print(f"[Stage {self.stage_id}] ✅ Inference result: prob={prob:.3f}, result={result_str}")
+                        # Avoid duplicate logging - handled by GUI callback formatting
+                        # print(f"[Stage {self.stage_id}] ✅ Inference result: prob={prob:.3f}, result={result_str}")
                         inference_result = result
                 elif isinstance(result, dict) and result:  # Non-empty dict
-                    print(f"[Stage {self.stage_id}] ✅ Dict result: {result}")
+                    # Avoid duplicate logging - handled by GUI callback formatting  
+                    # print(f"[Stage {self.stage_id}] ✅ Dict result: {result}")
                     inference_result = result
                 else:
                     inference_result = result
@@ -348,6 +350,11 @@ class InferencePipeline:
         self.completed_counter = 0
         self.error_counter = 0
         
+        # FPS calculation based on output queue throughput
+        self.fps_window_size = 10.0  # 10 second window
+        self.output_timestamps = []  # Track when outputs are generated
+        self.fps_lock = threading.Lock()  # Thread safety for FPS calculation
+        
     def initialize(self):
         """Initialize all stages"""
         print(f"[{self.pipeline_name}] Initializing pipeline with {len(self.stages)} stages...")
@@ -365,8 +372,43 @@ class InferencePipeline:
         
         print(f"[{self.pipeline_name}] All stages initialized successfully")
     
+    def _record_output_timestamp(self):
+        """Record timestamp when output is generated for FPS calculation"""
+        with self.fps_lock:
+            current_time = time.time()
+            self.output_timestamps.append(current_time)
+            
+            # Remove timestamps older than window
+            cutoff_time = current_time - self.fps_window_size
+            self.output_timestamps = [t for t in self.output_timestamps if t > cutoff_time]
+    
+    def get_current_fps(self) -> float:
+        """Calculate current FPS based on output queue throughput"""
+        with self.fps_lock:
+            if len(self.output_timestamps) < 2:
+                return 0.0
+            
+            current_time = time.time()
+            # Clean old timestamps
+            cutoff_time = current_time - self.fps_window_size
+            valid_timestamps = [t for t in self.output_timestamps if t > cutoff_time]
+            
+            if len(valid_timestamps) < 2:
+                return 0.0
+            
+            # Calculate FPS over the time window
+            time_span = valid_timestamps[-1] - valid_timestamps[0]
+            if time_span > 0:
+                return (len(valid_timestamps) - 1) / time_span
+            
+            return 0.0
+    
     def start(self):
         """Start the pipeline"""
+        # Clear previous FPS data when starting
+        with self.fps_lock:
+            self.output_timestamps.clear()
+            
         print(f"[{self.pipeline_name}] Starting pipeline...")
         
         # Start all stages
@@ -477,6 +519,9 @@ class InferencePipeline:
                         self.pipeline_output_queue.put(current_data, block=False)
                         self.completed_counter += 1
                         
+                        # Record output timestamp for FPS calculation
+                        self._record_output_timestamp()
+                        
                         # Call result callback
                         if self.result_callback:
                             self.result_callback(current_data)
@@ -486,6 +531,8 @@ class InferencePipeline:
                         try:
                             self.pipeline_output_queue.get_nowait()
                             self.pipeline_output_queue.put(current_data, block=False)
+                            # Record output timestamp even when queue was full
+                            self._record_output_timestamp()
                         except queue.Empty:
                             pass
                 else:
@@ -541,6 +588,7 @@ class InferencePipeline:
             'pipeline_errors': self.error_counter,
             'pipeline_input_queue_size': self.pipeline_input_queue.qsize(),
             'pipeline_output_queue_size': self.pipeline_output_queue.qsize(),
+            'current_fps': self.get_current_fps(),  # Add real-time FPS
             'stage_statistics': stage_stats
         }
     

cluster4npu_ui/ui/dialogs/deployment.py

@@ -190,6 +190,9 @@ class DeploymentWorker(QThread):
                     
                     # Set up both GUI and terminal result callbacks
                     def combined_result_callback(result_dict):
+                        # Add current FPS from pipeline to result_dict
+                        result_dict['current_pipeline_fps'] = pipeline.get_current_fps()
+                        
                         # Send to GUI terminal and results display
                         terminal_output = self._format_terminal_results(result_dict)
                         self.terminal_output.emit(terminal_output)
@@ -286,11 +289,13 @@ class DeploymentWorker(QThread):
             if 'total_processing_time' in metadata:
                 processing_time = metadata['total_processing_time']
                 output_lines.append(f"   ⏱️  Processing Time: {processing_time:.3f}s")
-                
-                # Add FPS calculation
-                if processing_time > 0:
-                    fps = 1.0 / processing_time
-                    output_lines.append(f"   🚄 Theoretical FPS: {fps:.2f}")
+            
+            # Real-time FPS calculation based on output queue throughput
+            current_fps = result_dict.get('current_pipeline_fps', 0.0)
+            if current_fps > 0:
+                output_lines.append(f"   🚄 Pipeline FPS: {current_fps:.2f}")
+            else:
+                output_lines.append(f"   🚄 Pipeline FPS: Calculating...")
             
             # Additional metadata
             if metadata: