-
Notifications
You must be signed in to change notification settings - Fork 5k
fix(inference): break circular import in ops.transformer.inference #8465
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.
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
Open
chakshu-dhannawat
wants to merge
2
commits into
deepspeedai:master
Choose a base branch
from
chakshu-dhannawat:fix/inference-circular-import-7159
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,5 +4,23 @@ | |
| # DeepSpeed Team | ||
|
|
||
| from .config import DeepSpeedInferenceConfig | ||
| from ....model_implementations.transformers.ds_transformer import DeepSpeedTransformerInference | ||
| from .moe_inference import DeepSpeedMoEInferenceConfig, DeepSpeedMoEInference | ||
|
|
||
| __all__ = [ | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
This non-merge commit has no AGENTS.md reference: AGENTS.md:L8-L8 Useful? React with 👍 / 👎. |
||
| "DeepSpeedInferenceConfig", | ||
| "DeepSpeedMoEInferenceConfig", | ||
| "DeepSpeedMoEInference", | ||
| "DeepSpeedTransformerInference", | ||
| ] | ||
|
|
||
|
|
||
| def __getattr__(name: str): | ||
| # Lazy import breaks the circular dependency between this package and | ||
| # `deepspeed.model_implementations.transformers.ds_transformer`, which | ||
| # imports `deepspeed.ops.transformer.inference.triton.*` at module load | ||
| # time when Triton is installed. Accessing the symbol on demand keeps the | ||
| # package import path acyclic. | ||
| if name == "DeepSpeedTransformerInference": | ||
| from ....model_implementations.transformers.ds_transformer import DeepSpeedTransformerInference | ||
| return DeepSpeedTransformerInference | ||
| raise AttributeError(f"module {__name__!r} has no attribute {name!r}") | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| # Copyright (c) Microsoft Corporation. | ||
| # SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| # DeepSpeed Team | ||
|
|
||
| import pytest | ||
|
|
||
|
|
||
| @pytest.mark.inference | ||
| class TestInferenceImport: | ||
| """CPU-only tests for the public inference package import surface.""" | ||
|
|
||
| def test_transformer_inference_is_lazy_imported(self): | ||
| # Regression test for https://github.com/deepspeedai/DeepSpeed/issues/7159 | ||
| # Importing the inference package must not trigger a circular import even | ||
| # when Triton is installed, and the legacy public symbol must stay reachable. | ||
| from deepspeed.model_implementations.transformers.ds_transformer import ( | ||
| DeepSpeedTransformerInference as DirectTransformerInference, ) | ||
| from deepspeed.ops.transformer.inference import ( | ||
| DeepSpeedTransformerInference as OpsTransformerInference, ) | ||
|
|
||
| assert OpsTransformerInference is DirectTransformerInference |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The commit records
pre-commit run --filesonly for__init__.pyandtest_inference_import.py, but it also changesdeepspeed/inference/config.pyandtest_inference_config.py. Run the required pre-commit command over all four modified files before merging.AGENTS.md reference: AGENTS.md:L10-L10
Useful? React with 👍 / 👎.