refactor: update destructors to use default implementation.

yingxudeng · yingxudeng · commit d2eaf8cd3d62 · 2025-12-18T18:05:09.000+08:00
diff --git a/xllm/core/layers/common/qwen2_5_vision_layer.h b/xllm/core/layers/common/qwen2_5_vision_layer.h
@@ -37,7 +37,7 @@ class Qwen2_5_VisionLayerImpl : public torch::nn::Module {
   explicit Qwen2_5_VisionLayerImpl(const ModelContext& context,
                                    bool is_qwen3_style = false);
 
-  ~Qwen2_5_VisionLayerImpl() {};
+  ~Qwen2_5_VisionLayerImpl() override = default;
 
   void load_state_dict(const StateDict& state_dict);
 
diff --git a/xllm/core/layers/common/qwen2_decoder_layer.h b/xllm/core/layers/common/qwen2_decoder_layer.h
@@ -44,7 +44,7 @@ class Qwen2DecoderLayerImpl : public torch::nn::Module {
  public:
   explicit Qwen2DecoderLayerImpl(const ModelContext& context);
 
-  ~Qwen2DecoderLayerImpl() {};
+  ~Qwen2DecoderLayerImpl() override = default;
 
   void load_state_dict(const StateDict& state_dict);
 
diff --git a/xllm/core/layers/common/qwen3_moe_decoder_layer.h b/xllm/core/layers/common/qwen3_moe_decoder_layer.h
@@ -37,7 +37,7 @@ class Qwen3MoeDecoderLayerImpl : public torch::nn::Module {
   explicit Qwen3MoeDecoderLayerImpl(const ModelContext& context,
                                     int32_t layer_id);
 
-  ~Qwen3MoeDecoderLayerImpl() {};
+  ~Qwen3MoeDecoderLayerImpl() override = default;
 
   void load_state_dict(const StateDict& state_dict);
 
diff --git a/xllm/core/layers/mlu/deepseek_v2_decoder_layer_impl.h b/xllm/core/layers/mlu/deepseek_v2_decoder_layer_impl.h
@@ -39,7 +39,7 @@ class DeepseekV2DecoderLayerImpl : public torch::nn::Module {
   explicit DeepseekV2DecoderLayerImpl(const ModelContext& context,
                                       int32_t layer_id);
 
-  ~DeepseekV2DecoderLayerImpl() {};
+  ~DeepseekV2DecoderLayerImpl() override = default;
 
   void load_state_dict(const StateDict& state_dict);
 
diff --git a/xllm/core/layers/npu/buffer/atb_buffer.cpp b/xllm/core/layers/npu/buffer/atb_buffer.cpp
@@ -48,7 +48,7 @@ AtbBuffer::AtbBuffer(uint64_t buffer_size, at::Device device)
   }
 }
 
-AtbBuffer::~AtbBuffer() {}
+AtbBuffer::~AtbBuffer() = default;
 
 void* AtbBuffer::get_buffer(uint64_t buffer_size) {
   if (buffer_size <= buffer_size_) {
diff --git a/xllm/core/layers/npu/buffer/atb_workspace.cpp b/xllm/core/layers/npu/buffer/atb_workspace.cpp
@@ -30,7 +30,7 @@ AtbWorkspace::AtbWorkspace(at::Device device) {
   }
 }
 
-AtbWorkspace::~AtbWorkspace() {}
+AtbWorkspace::~AtbWorkspace() = default;
 
 void* AtbWorkspace::get_workspace_buffer(uint64_t bufferSize) {
   int32_t device_id = 0;
diff --git a/xllm/core/layers/npu/npu_base_layer.h b/xllm/core/layers/npu/npu_base_layer.h
@@ -104,7 +104,7 @@ enum class LinearTypeV2 : int {
 class BaseLayer : public torch::nn::Module {
  public:
   explicit BaseLayer(const ModelContext& context);
-  virtual ~BaseLayer() {};
+  virtual ~BaseLayer() override = default;
 
   atb::Status execute_node(atb_speed::Model::Node& node,
                            int nodeId = 0,
diff --git a/xllm/core/layers/npu/npu_block_copy_impl.h b/xllm/core/layers/npu/npu_block_copy_impl.h
@@ -43,7 +43,7 @@ class NpuBlockCopyImpl : public BaseLayer {
  public:
   explicit NpuBlockCopyImpl(const ModelContext& context);
 
-  ~NpuBlockCopyImpl() {};
+  ~NpuBlockCopyImpl() override = default;
 
   void load_state_dict(const StateDict& state_dict) {};
 
diff --git a/xllm/core/layers/npu/npu_column_parallel_linear_impl.h b/xllm/core/layers/npu/npu_column_parallel_linear_impl.h
@@ -50,7 +50,7 @@ class NpuColumnParallelLinearImpl : public BaseLayer {
  public:
   NpuColumnParallelLinearImpl(const ModelContext& context);
 
-  ~NpuColumnParallelLinearImpl() {};
+  ~NpuColumnParallelLinearImpl() override = default;
 
   virtual void merge_loaded_weights() override;
 
diff --git a/xllm/core/layers/npu/npu_deepseek_v2_decoder_layer_impl.h b/xllm/core/layers/npu/npu_deepseek_v2_decoder_layer_impl.h
@@ -109,7 +109,7 @@ class NpuDeepseekV2DecoderLayerImpl : public BaseLayer {
   explicit NpuDeepseekV2DecoderLayerImpl(const ModelContext& context,
                                          const int32_t layer_id);
 
-  ~NpuDeepseekV2DecoderLayerImpl() {};
+  ~NpuDeepseekV2DecoderLayerImpl() override = default;
 
   virtual void merge_loaded_weights() override;
 
diff --git a/xllm/core/layers/npu/npu_glm4_decoder_layer_impl.h b/xllm/core/layers/npu/npu_glm4_decoder_layer_impl.h
@@ -47,7 +47,7 @@ class NpuGlm4DecoderLayerImpl : public BaseLayer {
  public:
   explicit NpuGlm4DecoderLayerImpl(const ModelContext& context);
 
-  ~NpuGlm4DecoderLayerImpl() {};
+  ~NpuGlm4DecoderLayerImpl() override = default;
 
   virtual void load_state_dict(const StateDict& state_dict) override;
 
diff --git a/xllm/core/layers/npu/npu_glm4_moe_decoder_layer.h b/xllm/core/layers/npu/npu_glm4_moe_decoder_layer.h
@@ -37,7 +37,7 @@ class NpuGlm4MoeDecoderImpl : public BaseLayer {
   explicit NpuGlm4MoeDecoderImpl(const ModelContext& context,
                                  const int32_t layer_id);
 
-  ~NpuGlm4MoeDecoderImpl() {};
+  ~NpuGlm4MoeDecoderImpl() override = default;
 
   void merge_loaded_weights();
 
diff --git a/xllm/core/layers/npu/npu_glm4_vision_encoder_layer_impl.h b/xllm/core/layers/npu/npu_glm4_vision_encoder_layer_impl.h
@@ -47,7 +47,7 @@ class NpuGlm4VisionEncoderLayerImpl : public BaseLayer {
  public:
   explicit NpuGlm4VisionEncoderLayerImpl(const ModelContext& context);
 
-  ~NpuGlm4VisionEncoderLayerImpl() {};
+  ~NpuGlm4VisionEncoderLayerImpl() override = default;
 
   void load_state_dict(const StateDict& state_dict) override;
 
diff --git a/xllm/core/layers/npu/npu_llama_decoder_layer_impl.h b/xllm/core/layers/npu/npu_llama_decoder_layer_impl.h
@@ -47,7 +47,7 @@ class NpuLlamaDecoderLayerImpl : public BaseLayer {
  public:
   explicit NpuLlamaDecoderLayerImpl(const ModelContext& context);
 
-  ~NpuLlamaDecoderLayerImpl() {};
+  ~NpuLlamaDecoderLayerImpl() override = default;
 
   virtual void merge_loaded_weights() override;
 
diff --git a/xllm/core/layers/npu/npu_lm_head_impl.h b/xllm/core/layers/npu/npu_lm_head_impl.h
@@ -46,7 +46,7 @@ class NpuLmHeadImpl : public BaseLayer {
  public:
   explicit NpuLmHeadImpl(const ModelContext& context);
 
-  ~NpuLmHeadImpl() {};
+  ~NpuLmHeadImpl() override = default;
 
   void merge_loaded_weights() override;
 
diff --git a/xllm/core/layers/npu/npu_pos_embedding_impl.h b/xllm/core/layers/npu/npu_pos_embedding_impl.h
@@ -48,7 +48,7 @@ class NpuRotaryEmbeddingImpl : public BaseLayer {
  public:
   explicit NpuRotaryEmbeddingImpl(const ModelContext& context);
 
-  ~NpuRotaryEmbeddingImpl() {};
+  ~NpuRotaryEmbeddingImpl() override = default;
 
   torch::Tensor forward(const torch::Tensor& cos_sin_pos,
                         const torch::Tensor& position,
diff --git a/xllm/core/layers/npu/npu_qwen2_decoder_layer_impl.h b/xllm/core/layers/npu/npu_qwen2_decoder_layer_impl.h
@@ -48,7 +48,7 @@ class NpuQwen2DecoderLayerImpl : public BaseLayer {
  public:
   explicit NpuQwen2DecoderLayerImpl(const ModelContext& context);
 
-  ~NpuQwen2DecoderLayerImpl() {};
+  ~NpuQwen2DecoderLayerImpl() override = default;
 
   virtual void merge_loaded_weights() override;
 
diff --git a/xllm/core/layers/npu/npu_qwen2_vision_encoder_layer_impl.h b/xllm/core/layers/npu/npu_qwen2_vision_encoder_layer_impl.h
@@ -47,7 +47,7 @@ class NpuQwen2VisionEncoderLayerImpl : public BaseLayer {
  public:
   explicit NpuQwen2VisionEncoderLayerImpl(const ModelContext& context);
 
-  ~NpuQwen2VisionEncoderLayerImpl() {};
+  ~NpuQwen2VisionEncoderLayerImpl() override = default;
 
   // void load_state_dict(const StateDict& state_dict) override;
 
diff --git a/xllm/core/layers/npu/npu_qwen2dot5_vision_encoder_layer_impl.h b/xllm/core/layers/npu/npu_qwen2dot5_vision_encoder_layer_impl.h
@@ -47,7 +47,7 @@ class NpuQwen2dot5VisionEncoderLayerImpl : public BaseLayer {
  public:
   explicit NpuQwen2dot5VisionEncoderLayerImpl(const ModelContext& context);
 
-  ~NpuQwen2dot5VisionEncoderLayerImpl() {};
+  ~NpuQwen2dot5VisionEncoderLayerImpl() override = default;
 
   void merge_loaded_weights() override;
 
diff --git a/xllm/core/layers/npu/npu_qwen3_decoder_layer_impl.h b/xllm/core/layers/npu/npu_qwen3_decoder_layer_impl.h
@@ -47,7 +47,7 @@ class NpuQwen3DecoderLayerImpl : public BaseLayer {
  public:
   explicit NpuQwen3DecoderLayerImpl(const ModelContext& context);
 
-  ~NpuQwen3DecoderLayerImpl() {};
+  ~NpuQwen3DecoderLayerImpl() override = default;
 
   virtual void merge_loaded_weights() override;
 
diff --git a/xllm/core/layers/npu/npu_qwen3_moe_decoder_layer_impl.h b/xllm/core/layers/npu/npu_qwen3_moe_decoder_layer_impl.h
@@ -42,7 +42,7 @@ class NpuQwen3MoeDecoderLayerImpl : public BaseLayer {
   explicit NpuQwen3MoeDecoderLayerImpl(const ModelContext& context,
                                        const int32_t layer_id);
 
-  ~NpuQwen3MoeDecoderLayerImpl() {};
+  ~NpuQwen3MoeDecoderLayerImpl() override = default;
 
   virtual void merge_loaded_weights();
 
diff --git a/xllm/core/layers/npu/npu_qwen3_vision_encoder_layer_impl.h b/xllm/core/layers/npu/npu_qwen3_vision_encoder_layer_impl.h
@@ -48,7 +48,7 @@ class NpuQwen3VisionEncoderLayerImpl : public BaseLayer {
  public:
   explicit NpuQwen3VisionEncoderLayerImpl(const ModelContext& context);
 
-  ~NpuQwen3VisionEncoderLayerImpl() {};
+  ~NpuQwen3VisionEncoderLayerImpl() override = default;
 
   // void load_state_dict(const StateDict& state_dict) override;
 
diff --git a/xllm/core/layers/npu/npu_rms_norm_impl.h b/xllm/core/layers/npu/npu_rms_norm_impl.h
@@ -47,7 +47,7 @@ class NpuRMSNormImpl : public BaseLayer {
  public:
   explicit NpuRMSNormImpl(const ModelContext& context);
 
-  ~NpuRMSNormImpl() {};
+  ~NpuRMSNormImpl() override = default;
 
   // void load_state_dict(const StateDict& state_dict) override;
 
diff --git a/xllm/core/layers/npu/npu_siglip_encoder_layer_impl.h b/xllm/core/layers/npu/npu_siglip_encoder_layer_impl.h
@@ -32,7 +32,7 @@ class NpuSiglipEncoderLayerUpImpl : public BaseLayer {
   NpuSiglipEncoderLayerUpImpl(const ModelContext& context,
                               const std::string& prefix = "");
 
-  ~NpuSiglipEncoderLayerUpImpl() {};
+  ~NpuSiglipEncoderLayerUpImpl() override = default;
 
   virtual void load_state_dict(const StateDict& state_dict) override;
 
@@ -57,7 +57,7 @@ class NpuSiglipEncoderLayerDownImpl : public BaseLayer {
   NpuSiglipEncoderLayerDownImpl(const ModelContext& context,
                                 const std::string& prefix = "");
 
-  ~NpuSiglipEncoderLayerDownImpl() {};
+  ~NpuSiglipEncoderLayerDownImpl() override = default;
 
   virtual void load_state_dict(const StateDict& state_dict) override;
 
@@ -82,7 +82,7 @@ class NpuSiglipEncoderLayerImpl : public BaseLayer {
   NpuSiglipEncoderLayerImpl(const ModelContext& context,
                             const std::string& prefix = "");
 
-  ~NpuSiglipEncoderLayerImpl() {};
+  ~NpuSiglipEncoderLayerImpl() override = default;
 
   virtual void load_state_dict(const StateDict& state_dict) override;
 
diff --git a/xllm/core/layers/npu/npu_word_embedding_impl.h b/xllm/core/layers/npu/npu_word_embedding_impl.h
@@ -45,7 +45,7 @@ class NpuWordEmbeddingImpl : public BaseLayer {
  public:
   explicit NpuWordEmbeddingImpl(const ModelContext& context);
 
-  ~NpuWordEmbeddingImpl() {};
+  ~NpuWordEmbeddingImpl() override = default;
 
   void merge_loaded_weights() override;
 
diff --git a/xllm/core/runtime/speculative_worker_impl.cpp b/xllm/core/runtime/speculative_worker_impl.cpp
@@ -195,10 +195,12 @@ bool SpeculativeWorkerImpl::init_model(const std::string& model_weights_path,
       auto word_embedding = impl_->get_npu_word_embedding();
       draft_impl_->set_npu_word_embedding(word_embedding);
     } else {
+      // TODO: Support TORCH backend via torch_npu encapsulation in the future.
+      // Currently, it is explicitly disabled.
       LOG(FATAL)
           << "SpeculativeWorkerImpl::init_model not support TORCH backend";
     }
-#elif
+#else
     auto head = impl_->get_lm_head();
     draft_impl_->set_lm_head(head);
     auto word_embedding = impl_->get_word_embedding();
diff --git a/xllm/models/dit/clip_text_model.h b/xllm/models/dit/clip_text_model.h
@@ -27,7 +27,7 @@ limitations under the License.
 #include "core/framework/kv_cache/kv_cache.h"
 #include "core/framework/model/model_input_params.h"
 #include "core/framework/model_context.h"
-// #include "core/layers/npu_siglip_encoder_layer_impl.h"
+#include "core/layers/npu/npu_siglip_encoder_layer_impl.h"
 #include "dit_linear.h"
 #include "models/model_registry.h"
 #include "processors/clip_image_processor.h"
diff --git a/xllm/models/llm/npu/llm_model_base.h b/xllm/models/llm/npu/llm_model_base.h
@@ -31,6 +31,7 @@ limitations under the License.
 #include "core/layers/common/attention_mask.h"
 #include "core/layers/npu/npu_block_copy_impl.h"
 #include "core/layers/npu/npu_lm_head_impl.h"
+#include "core/layers/npu/npu_pos_embedding_impl.h"
 #include "core/layers/npu/npu_rms_norm_impl.h"
 #include "core/layers/npu/npu_word_embedding_impl.h"
 #include "models/model_registry.h"

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ AtbBuffer::AtbBuffer(uint64_t buffer_size, at::Device device)`
`48`	`48`	`}`
`49`	`49`	`}`
`50`	`50`
`51`		`-AtbBuffer::~AtbBuffer() {}`
	`51`	`+AtbBuffer::~AtbBuffer() = default;`
`52`	`52`
`53`	`53`	`void* AtbBuffer::get_buffer(uint64_t buffer_size) {`
`54`	`54`	`if (buffer_size <= buffer_size_) {`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ AtbWorkspace::AtbWorkspace(at::Device device) {`
`30`	`30`	`}`
`31`	`31`	`}`
`32`	`32`
`33`		`-AtbWorkspace::~AtbWorkspace() {}`
	`33`	`+AtbWorkspace::~AtbWorkspace() = default;`
`34`	`34`
`35`	`35`	`void* AtbWorkspace::get_workspace_buffer(uint64_t bufferSize) {`
`36`	`36`	`int32_t device_id = 0;`