Skip to content

Commit 8915c84

Browse files
authored
Revert "[Feature] Setting number of apiserver workers automatically (#3794)" (#3918)
This reverts commit d1d063e.
1 parent 77c1bd0 commit 8915c84

File tree

3 files changed

+2
-22
lines changed

3 files changed

+2
-22
lines changed

fastdeploy/engine/common_engine.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -587,7 +587,7 @@ def _insert_zmq_task_to_scheduler(self):
587587
else:
588588
err, data = self.zmq_server.receive_pyobj_once(block)
589589
if err is not None:
590-
llm_logger.error(f"Engine stops inserting zmq task into scheduler, err:{err}")
590+
llm_logger.error("Engine stops inserting zmq task into scheduler, err:{err}")
591591
break
592592

593593
request, insert_task = None, []

fastdeploy/entrypoints/openai/api_server.py

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -60,15 +60,14 @@
6060
StatefulSemaphore,
6161
api_server_logger,
6262
console_logger,
63-
is_package_installed,
6463
is_port_available,
6564
retrive_model_from_server,
6665
)
6766

6867
parser = FlexibleArgumentParser()
6968
parser.add_argument("--port", default=8000, type=int, help="port to the http server")
7069
parser.add_argument("--host", default="0.0.0.0", type=str, help="host to the http server")
71-
parser.add_argument("--workers", default=None, type=int, help="number of workers")
70+
parser.add_argument("--workers", default=1, type=int, help="number of workers")
7271
parser.add_argument("--metrics-port", default=8001, type=int, help="port for metrics server")
7372
parser.add_argument("--controller-port", default=-1, type=int, help="port for controller server")
7473
parser.add_argument(
@@ -83,16 +82,6 @@
8382
)
8483
parser = EngineArgs.add_cli_args(parser)
8584
args = parser.parse_args()
86-
87-
88-
if args.workers is None:
89-
# In GPU, the workers of uvicorn will be set according to the parameter `max-num-seqs`
90-
if is_package_installed("paddlepaddle-gpu"):
91-
args.workers = max(min(int(args.max_num_seqs // 32), 8), 1)
92-
else:
93-
args.workers = 1
94-
console_logger.info(f"Number of api-server workers: {args.workers}.")
95-
9685
args.model = retrive_model_from_server(args.model, args.revision)
9786
chat_template = load_chat_template(args.chat_template, args.model)
9887
if args.tool_parser_plugin:

fastdeploy/utils.py

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import tarfile
2828
import time
2929
from datetime import datetime
30-
from importlib.metadata import PackageNotFoundError, distribution
3130
from logging.handlers import BaseRotatingHandler
3231
from pathlib import Path
3332
from typing import Literal, TypeVar, Union
@@ -669,14 +668,6 @@ def import_from_path(module_name: str, file_path: Union[str, os.PathLike]):
669668
return module
670669

671670

672-
def is_package_installed(package_name):
673-
try:
674-
distribution(package_name)
675-
return True
676-
except PackageNotFoundError:
677-
return False
678-
679-
680671
def version():
681672
"""
682673
Prints the contents of the version.txt file located in the parent directory of this script.

0 commit comments

Comments
 (0)