From 31c9490208a24ccb0eb0b26c165293cf55f58510 Mon Sep 17 00:00:00 2001
From: AndyVerne <651264571@qq.com>
Date: Fri, 6 Dec 2024 18:07:21 +0800
Subject: [PATCH 1/3] [fix]Update merge_base_model.py: avoid UnboundLocalError
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在transformers  = 4.43.1， peft  = 0.12.0版本中，原代码merge llm_reranker_model时会报错：UnboundLocalError: local variable 'active_adapters' referenced before assignment。

需要将model._hf_peft_config_loaded设为False，可以避免这个问题出现
---
 research/llm_reranker/merge/merge_base_model.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/research/llm_reranker/merge/merge_base_model.py b/research/llm_reranker/merge/merge_base_model.py
index f731c987..6cff8085 100644
--- a/research/llm_reranker/merge/merge_base_model.py
+++ b/research/llm_reranker/merge/merge_base_model.py
@@ -9,6 +9,7 @@ def merge_llm(model_name_or_path, lora_name_or_path, save_path, cache_dir: str =
                                                  trust_remote_code=True)
     model = PeftModel.from_pretrained(model, lora_name_or_path)
     model = model.merge_and_unload()
+    model._hf_peft_config_loaded = False
     model.save_pretrained(save_path)
 
     try:

From 19f056cff80e293b48e9ff7c22d61d4c551edd23 Mon Sep 17 00:00:00 2001
From: AndyVerne <651264571@qq.com>
Date: Fri, 6 Dec 2024 18:07:57 +0800
Subject: [PATCH 2/3] Update merge_layerwise_model_from_finetuned_model.py
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在transformers  = 4.43.1， peft  = 0.12.0版本中，原代码merge llm_reranker_model时会报错：UnboundLocalError: local variable 'active_adapters' referenced before assignment。

需要将model._hf_peft_config_loaded设为False，可以避免这个问题出现
---
 .../merge/merge_layerwise_model_from_finetuned_model.py          | 1 +
 1 file changed, 1 insertion(+)

diff --git a/research/llm_reranker/merge/merge_layerwise_model_from_finetuned_model.py b/research/llm_reranker/merge/merge_layerwise_model_from_finetuned_model.py
index 78ebc65d..f90ab90f 100644
--- a/research/llm_reranker/merge/merge_layerwise_model_from_finetuned_model.py
+++ b/research/llm_reranker/merge/merge_layerwise_model_from_finetuned_model.py
@@ -9,6 +9,7 @@ def merge_layerwise_finetuned_llm(model_name_or_path, lora_name_or_path, save_pa
                                                  trust_remote_code=True)
     model = PeftModel.from_pretrained(model, lora_name_or_path)
     model = model.merge_and_unload()
+    model._hf_peft_config_loaded = False
     model.save_pretrained(save_path)
 
     try:

From 08657c566a03169438c23620ce7d9bae3696e727 Mon Sep 17 00:00:00 2001
From: AndyVerne <651264571@qq.com>
Date: Fri, 6 Dec 2024 18:08:28 +0800
Subject: [PATCH 3/3] Update merge_layerwise_model_from_raw_model.py
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在transformers  = 4.43.1， peft  = 0.12.0版本中，原代码merge llm_reranker_model时会报错：UnboundLocalError: local variable 'active_adapters' referenced before assignment。

需要将model._hf_peft_config_loaded设为False，可以避免这个问题出现
---
 .../llm_reranker/merge/merge_layerwise_model_from_raw_model.py   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/research/llm_reranker/merge/merge_layerwise_model_from_raw_model.py b/research/llm_reranker/merge/merge_layerwise_model_from_raw_model.py
index a6221187..9a073691 100644
--- a/research/llm_reranker/merge/merge_layerwise_model_from_raw_model.py
+++ b/research/llm_reranker/merge/merge_layerwise_model_from_raw_model.py
@@ -43,6 +43,7 @@ def merge_layerwise_raw_llm(model_name_or_path, lora_name_or_path, save_path, ca
 
     model = PeftModel.from_pretrained(model, lora_name_or_path)
     model = model.merge_and_unload()
+    model._hf_peft_config_loaded = False
     model.save_pretrained(save_path)
 
     try: