resolve conflicts with master

Author: JackieTien97

iotdb-core/ainode/iotdb/ainode/core/inference/inference_request_pool.py

@@ -144,7 +144,6 @@ def _step(self):
                 batch_output = None
                 self._logger.error("[Inference] Unsupported pipeline type.")
             batch_output = self._inference_pipeline.postprocess(batch_output)
-
             offset = 0
             for request in requests:
                 request.output_tensor = request.output_tensor.to(self.device)

iotdb-core/ainode/iotdb/ainode/core/model/sundial/pipeline_sundial.py

@@ -58,4 +58,4 @@ def postprocess(self, outputs: torch.Tensor):
         """
         outputs = outputs.mean(dim=1).unsqueeze(1)
         outputs = super().postprocess(outputs)
-        return outputs
+        return outputs

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/tvf/ForecastTableFunction.java

@@ -76,6 +76,8 @@
 
 public class ForecastTableFunction implements TableFunction {
 
+  private static final TsBlockSerde SERDE = new TsBlockSerde();
+
   public static class ForecastTableFunctionHandle implements TableFunctionHandle {
     String modelId;
     int maxInputLength;