resolve merge confilcts

51679bbd · zhuwenwen · 4095d0db · 1af090b5 · 51679bbd · 51679bbd
Commit 51679bbd authored Feb 01, 2024 by zhuwenwen
20 changed files
--- a/vllm/entrypoints/api_server.py
+++ b/vllm/entrypoints/api_server.py
--- a/vllm/entrypoints/llm.py
+++ b/vllm/entrypoints/llm.py
--- a/vllm/entrypoints/openai/api_server.py
+++ b/vllm/entrypoints/openai/api_server.py
--- a/vllm/entrypoints/openai/protocol.py
+++ b/vllm/entrypoints/openai/protocol.py
--- a/vllm/entrypoints/openai/serving_chat.py
+++ b/vllm/entrypoints/openai/serving_chat.py
--- a/vllm/entrypoints/openai/serving_completion.py
+++ b/vllm/entrypoints/openai/serving_completion.py
--- a/vllm/entrypoints/openai/serving_engine.py
+++ b/vllm/entrypoints/openai/serving_engine.py
--- a/vllm/lora/__init__.py
+++ b/vllm/lora/__init__.py
--- a/vllm/lora/layers.py
+++ b/vllm/lora/layers.py
--- a/vllm/lora/lora.py
+++ b/vllm/lora/lora.py
--- a/vllm/lora/models.py
+++ b/vllm/lora/models.py
--- a/vllm/lora/punica.py
+++ b/vllm/lora/punica.py
--- a/vllm/lora/request.py
+++ b/vllm/lora/request.py
--- a/vllm/lora/utils.py
+++ b/vllm/lora/utils.py
--- a/vllm/lora/worker_manager.py
+++ b/vllm/lora/worker_manager.py
--- a/vllm/model_executor/input_metadata.py
+++ b/vllm/model_executor/input_metadata.py
--- a/vllm/model_executor/layers/attention.py
+++ b/vllm/model_executor/layers/attention.py
--- a/vllm/model_executor/layers/fused_moe.py
+++ b/vllm/model_executor/layers/fused_moe.py
--- a/vllm/model_executor/layers/linear.py
+++ b/vllm/model_executor/layers/linear.py
--- a/vllm/model_executor/layers/quantization/awq.py
+++ b/vllm/model_executor/layers/quantization/awq.py