Skip to content

Commit 23f70e6

Browse files
committed
update
1 parent 71872d6 commit 23f70e6

File tree

3 files changed

+0
-69
lines changed

3 files changed

+0
-69
lines changed

fastdeploy/model_executor/model_loader/default_loader.py

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -95,31 +95,3 @@ def load_model(self, fd_config: FDConfig) -> nn.Layer:
9595
# TODO(gongshaotian): Now, only support safetensor
9696
self.load_weights(model, fd_config, architectures)
9797
return model
98-
99-
def load_rl_mock_model(self, fd_config: FDConfig) -> nn.Layer:
100-
"""use for rl model load"""
101-
# (TODO:gaoziyuan) optimze
102-
assert fd_config.load_config.load_strategy == "normal", fd_config.load_config.load_strategy
103-
original_architectures = fd_config.model_config.architectures[0]
104-
logger.info(f"Starting to load model {original_architectures}.")
105-
106-
import fastdeploy.rl # noqa
107-
108-
if fd_config.speculative_config.model_type != "mtp":
109-
model_architectures = original_architectures.replace("Ernie5ForCausalLM", "Ernie5MoeForCausalLM")
110-
else:
111-
model_architectures = original_architectures.replace("Ernie5ForCausalLM", "Ernie5MTPForCausalLM")
112-
113-
model_architectures += "RL"
114-
context = contextlib.nullcontext()
115-
116-
with context:
117-
model_cls = ModelRegistry.get_class(model_architectures)
118-
model = model_cls(fd_config)
119-
120-
model.eval()
121-
122-
# normal strategy need load weight and architectures need without "RL"
123-
self.load_weights(model, fd_config, original_architectures)
124-
# RL model not need set_state_dict
125-
return model

fastdeploy/model_executor/model_loader/default_loader_v1.py

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -98,30 +98,3 @@ def load_model(self, fd_config: FDConfig) -> nn.Layer:
9898
return model
9999
self.load_weights(model, fd_config, enable_cache)
100100
return model
101-
102-
def load_rl_mock_model(self, fd_config: FDConfig) -> nn.Layer:
103-
"""use for rl model load"""
104-
# (TODO:gaoziyuan) optimze
105-
assert fd_config.load_config.load_strategy == "normal", fd_config.load_config.load_strategy
106-
original_architectures = fd_config.model_config.architectures[0]
107-
108-
import fastdeploy.rl # noqa
109-
110-
if fd_config.speculative_config.model_type != "mtp":
111-
model_architectures = original_architectures.replace("Ernie5ForCausalLM", "Ernie5MoeForCausalLM")
112-
else:
113-
model_architectures = original_architectures.replace("Ernie5ForCausalLM", "Ernie5MTPForCausalLM")
114-
115-
model_architectures += "RL"
116-
context = paddle.LazyGuard()
117-
118-
with context:
119-
model_cls = ModelRegistry.get_class(model_architectures)
120-
model = model_cls(fd_config)
121-
122-
model.eval()
123-
124-
# normal strategy need load weight and architectures need without "RL"
125-
self.load_weights(model, fd_config, original_architectures)
126-
# RL model not need set_state_dict
127-
return model

fastdeploy/rl/dynamic_weight_manager.py

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
# limitations under the License.
1515
"""
1616

17-
import gc
1817
import os
1918
import time
2019
from multiprocessing.shared_memory import SharedMemory
@@ -88,7 +87,6 @@ def update_parameters(self, pid: int = 0, restart_process_group=False) -> None:
8887
strategy_handlers = {
8988
"ipc_snapshot": self._update_ipc_snapshot,
9089
"ipc": self._update_ipc,
91-
"normal": self._normal_load_weight,
9290
}
9391

9492
if handler := strategy_handlers.get(self.load_config.load_strategy):
@@ -103,18 +101,6 @@ def update_parameters(self, pid: int = 0, restart_process_group=False) -> None:
103101
# step5: recapture cuda_graph
104102
# step6: update weight status signal
105103

106-
def _normal_load_weight(self):
107-
"""use for RL mock."""
108-
from fastdeploy.model_executor.model_loader import get_model_loader
109-
110-
model_loader = get_model_loader(load_config=self.fd_config.load_config)
111-
model = model_loader.load_rl_mock_model(fd_config=self.fd_config)
112-
state_dict = model.state_dict()
113-
self._update_model_from_state(state_dict, "raw")
114-
del model
115-
del state_dict
116-
gc.collect()
117-
118104
def _update_ipc_snapshot(self):
119105
"""Update using IPC snapshot strategy for elastic recovery."""
120106
model_path = os.path.join(

0 commit comments

Comments
 (0)