Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Online weight update [WIP] #2119

Closed
wants to merge 31 commits into from
Closed

Online weight update [WIP] #2119

wants to merge 31 commits into from

Conversation

zhaochenyang20
Copy link
Collaborator

Motivation

Modifications

Checklist

  • Format your code according to the Contributor Guide.
  • Add unit tests as outlined in the Contributor Guide.
  • Update documentation as needed, including docstrings or example tutorials.

@merrymercy merrymercy marked this pull request as draft November 22, 2024 07:42
zhyncs
zhyncs requested changes Nov 22, 2024
View reviewed changes
test/srt/stderr.txt Outdated
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Delete this, it's useless.

test/srt/stdout.txt Outdated
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Delete this, it's useless.

test/srt/test_init_parameter_update_group.py
@classmethod
def init_process(cls, rank, world_size, base_url, model_name, server_pid):
try:
# 设置分布式环境
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do not use Chinese annotations.

@merrymercy
Copy link
Contributor

You can rebase and add your 2-gpu test here

sglang/.github/workflows/pr-test.yml

Lines 106 to 109 in fa27161

unit-test-backend-2-gpu-part-1:
if: github.repository == 'sgl-project/sglang' || github.event_name == 'pull_request'
runs-on: 2-gpu-runner
steps:

github-advanced-security[bot]
github-advanced-security bot found potential problems Nov 26, 2024
View reviewed changes
python/sglang/srt/server.py
return ret
except Exception as e:
return ORJSONResponse(
{"error": {"message": str(e)}}, status_code=HTTPStatus.BAD_REQUEST

Check warning

Code scanning / CodeQL

Information exposure through an exception Medium

Stack trace information
Loading
flows to this location and may be exposed to an external user.

Copilot Autofix AI 2 months ago

To fix the problem, we need to ensure that the exception details are not exposed to the user. Instead, we should log the exception details on the server and return a generic error message to the user. This can be achieved by modifying the exception handling block to log the exception and return a generic error message.

  • Modify the exception handling block in the get_memory_pool_size function to log the exception and return a generic error message.
  • Add the necessary import for logging if it is not already present.
Suggested changeset 1
python/sglang/srt/server.py

Autofix patch

Autofix patch
Run the following command in your local git repository to apply this patch
cat << 'EOF' | git apply
diff --git a/python/sglang/srt/server.py b/python/sglang/srt/server.py
--- a/python/sglang/srt/server.py
+++ b/python/sglang/srt/server.py
@@ -218,4 +218,5 @@
     except Exception as e:
+        logging.error("Exception occurred in get_memory_pool_size: %s", str(e))
         return ORJSONResponse(
-            {"error": {"message": str(e)}}, status_code=HTTPStatus.BAD_REQUEST
+            {"error": {"message": "An internal error has occurred."}}, status_code=HTTPStatus.BAD_REQUEST
         )
EOF
@@ -218,4 +218,5 @@
except Exception as e:
logging.error("Exception occurred in get_memory_pool_size: %s", str(e))
return ORJSONResponse(
{"error": {"message": str(e)}}, status_code=HTTPStatus.BAD_REQUEST
{"error": {"message": "An internal error has occurred."}}, status_code=HTTPStatus.BAD_REQUEST
)
Copilot is powered by AI and may make mistakes. Always verify output.
Positive Feedback
Negative Feedback

Provide additional feedback

Please help us improve GitHub Copilot by sharing more details about this comment.

Please select one or more of the options
python/sglang/srt/server.py Dismissed Show dismissed Hide dismissed
python/sglang/srt/server.py Fixed Show fixed Hide fixed
python/sglang/srt/server.py
return ret
except ValueError as e:
return ORJSONResponse(
{"error": {"message": str(e)}}, status_code=HTTPStatus.BAD_REQUEST

Check warning

Code scanning / CodeQL

Information exposure through an exception Medium

Stack trace information
Loading
flows to this location and may be exposed to an external user.

Copilot Autofix AI 2 months ago

To fix the problem, we need to ensure that detailed exception messages are not exposed to the user. Instead, we should log the detailed error message on the server and return a generic error message to the user. This can be achieved by modifying the exception handling code to log the exception and return a generic error message.

  1. Import the logging module if not already imported.
  2. Modify the exception handling code to log the exception message using the logging module.
  3. Return a generic error message to the user.
Suggested changeset 1
python/sglang/srt/server.py

Autofix patch

Autofix patch
Run the following command in your local git repository to apply this patch
cat << 'EOF' | git apply
diff --git a/python/sglang/srt/server.py b/python/sglang/srt/server.py
--- a/python/sglang/srt/server.py
+++ b/python/sglang/srt/server.py
@@ -325,3 +325,4 @@
             except ValueError as e:
-                out = {"error": {"message": str(e)}}
+                logging.error(f"Error in stream_results: {e}")
+                out = {"error": {"message": "An internal error has occurred."}}
                 yield b"data: " + orjson.dumps(
@@ -341,4 +342,5 @@
         except ValueError as e:
+            logging.error(f"Error in generate_request: {e}")
             return ORJSONResponse(
-                {"error": {"message": str(e)}}, status_code=HTTPStatus.BAD_REQUEST
+                {"error": {"message": "An internal error has occurred."}}, status_code=HTTPStatus.BAD_REQUEST
             )
@@ -356,4 +358,5 @@
     except ValueError as e:
+        logging.error(f"Error in init_parameter_update_group_request: {e}")
         return ORJSONResponse(
-            {"error": {"message": str(e)}}, status_code=HTTPStatus.BAD_REQUEST
+            {"error": {"message": "An internal error has occurred."}}, status_code=HTTPStatus.BAD_REQUEST
         )
@@ -370,4 +373,5 @@
     except ValueError as e:
+        logging.error(f"Error in get_weights_by_parameter_name_request: {e}")
         return ORJSONResponse(
-            {"error": {"message": str(e)}}, status_code=HTTPStatus.BAD_REQUEST
+            {"error": {"message": "An internal error has occurred."}}, status_code=HTTPStatus.BAD_REQUEST
         )
@@ -386,4 +390,5 @@
     except ValueError as e:
+        logging.error(f"Error in update_parameter_from_distributed_request: {e}")
         return ORJSONResponse(
-            {"error": {"message": str(e)}}, status_code=HTTPStatus.BAD_REQUEST
+            {"error": {"message": "An internal error has occurred."}}, status_code=HTTPStatus.BAD_REQUEST
         )
EOF
@@ -325,3 +325,4 @@
except ValueError as e:
out = {"error": {"message": str(e)}}
logging.error(f"Error in stream_results: {e}")
out = {"error": {"message": "An internal error has occurred."}}
yield b"data: " + orjson.dumps(
@@ -341,4 +342,5 @@
except ValueError as e:
logging.error(f"Error in generate_request: {e}")
return ORJSONResponse(
{"error": {"message": str(e)}}, status_code=HTTPStatus.BAD_REQUEST
{"error": {"message": "An internal error has occurred."}}, status_code=HTTPStatus.BAD_REQUEST
)
@@ -356,4 +358,5 @@
except ValueError as e:
logging.error(f"Error in init_parameter_update_group_request: {e}")
return ORJSONResponse(
{"error": {"message": str(e)}}, status_code=HTTPStatus.BAD_REQUEST
{"error": {"message": "An internal error has occurred."}}, status_code=HTTPStatus.BAD_REQUEST
)
@@ -370,4 +373,5 @@
except ValueError as e:
logging.error(f"Error in get_weights_by_parameter_name_request: {e}")
return ORJSONResponse(
{"error": {"message": str(e)}}, status_code=HTTPStatus.BAD_REQUEST
{"error": {"message": "An internal error has occurred."}}, status_code=HTTPStatus.BAD_REQUEST
)
@@ -386,4 +390,5 @@
except ValueError as e:
logging.error(f"Error in update_parameter_from_distributed_request: {e}")
return ORJSONResponse(
{"error": {"message": str(e)}}, status_code=HTTPStatus.BAD_REQUEST
{"error": {"message": "An internal error has occurred."}}, status_code=HTTPStatus.BAD_REQUEST
)
Copilot is powered by AI and may make mistakes. Always verify output.
Positive Feedback
Negative Feedback

Provide additional feedback

Please help us improve GitHub Copilot by sharing more details about this comment.

Please select one or more of the options
python/sglang/srt/server.py Dismissed Show dismissed Hide dismissed
github-advanced-security[bot]
github-advanced-security bot found potential problems Nov 26, 2024
View reviewed changes
python/sglang/srt/server.py Dismissed Show dismissed Hide dismissed
@zhaochenyang20 zhaochenyang20 deleted the online-weight-update branch November 29, 2024 17:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@zhyncs zhyncs zhyncs requested changes

@merrymercy merrymercy Awaiting requested review from merrymercy merrymercy is a code owner

@Ying1123 Ying1123 Awaiting requested review from Ying1123 Ying1123 is a code owner

@hnyls2002 hnyls2002 Awaiting requested review from hnyls2002 hnyls2002 is a code owner

@ispobock ispobock Awaiting requested review from ispobock ispobock is a code owner

@ByronHsu ByronHsu Awaiting requested review from ByronHsu ByronHsu is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@zhaochenyang20 @merrymercy @zhyncs