Skip to content

Comments

Target py310 and modernize codebase with ruff#23401

Merged
justinchuby merged 7 commits intomainfrom
justinchu/ruff-pyversion
Jan 17, 2025
Merged

Target py310 and modernize codebase with ruff#23401
justinchuby merged 7 commits intomainfrom
justinchu/ruff-pyversion

Conversation

@justinchuby
Copy link
Contributor

@justinchuby justinchuby commented Jan 16, 2025 •
edited
Loading

Change target-version = "py310" and modernize the code base with ruff.

github-advanced-security[bot]
github-advanced-security bot found potential problems Jan 16, 2025
View reviewed changes
onnxruntime/python/tools/transformers/convert_generation.py


def test_gpt_model(args: argparse.Namespace, sentences: Optional[List[str]] = None, is_greedy: bool = False):
def test_gpt_model(args: argparse.Namespace, sentences: list[str] | None = None, is_greedy: bool = False):

Check notice

Code scanning / CodeQL

Explicit returns mixed with implicit (fall through) returns Note

Mixing implicit and explicit returns may indicate an error as implicit returns always return None.
onnxruntime/python/tools/transformers/convert_generation.py


def main(argv: Optional[List[str]] = None, sentences: Optional[List[str]] = None):
def main(argv: list[str] | None = None, sentences: list[str] | None = None):

Check notice

Code scanning / CodeQL

Explicit returns mixed with implicit (fall through) returns Note

Mixing implicit and explicit returns may indicate an error, as implicit returns always return None.
onnxruntime/python/tools/transformers/fusion_fastgelu.py
return

def fuse_1(self, tanh_node, input_name_to_nodes, output_name_to_node) -> Optional[bool]:
def fuse_1(self, tanh_node, input_name_to_nodes, output_name_to_node) -> bool | None:

Check notice

Code scanning / CodeQL

Explicit returns mixed with implicit (fall through) returns Note

Mixing implicit and explicit returns may indicate an error, as implicit returns always return None.
onnxruntime/python/tools/transformers/fusion_fastgelu.py
return True

def fuse_2(self, tanh_node, input_name_to_nodes: Dict, output_name_to_node: Dict) -> Optional[bool]:
def fuse_2(self, tanh_node, input_name_to_nodes: dict, output_name_to_node: dict) -> bool | None:

Check notice

Code scanning / CodeQL

Explicit returns mixed with implicit (fall through) returns Note

Mixing implicit and explicit returns may indicate an error, as implicit returns always return None.
onnxruntime/python/tools/transformers/fusion_fastgelu.py
return True

def fuse_3(self, tanh_node, input_name_to_nodes: Dict, output_name_to_node: Dict) -> Optional[bool]:
def fuse_3(self, tanh_node, input_name_to_nodes: dict, output_name_to_node: dict) -> bool | None:

Check notice

Code scanning / CodeQL

Explicit returns mixed with implicit (fall through) returns Note

Mixing implicit and explicit returns may indicate an error, as implicit returns always return None.
onnxruntime/python/tools/transformers/fusion_gelu.py
self.fuse_3(erf_node, input_name_to_nodes, output_name_to_node)

def fuse_1(self, erf_node, input_name_to_nodes: Dict, output_name_to_node: Dict) -> Optional[bool]:
def fuse_1(self, erf_node, input_name_to_nodes: dict, output_name_to_node: dict) -> bool | None:

Check notice

Code scanning / CodeQL

Explicit returns mixed with implicit (fall through) returns Note

Mixing implicit and explicit returns may indicate an error, as implicit returns always return None.
onnxruntime/python/tools/transformers/fusion_gelu.py
return True

def fuse_2(self, erf_node, input_name_to_nodes: Dict, output_name_to_node: Dict) -> Optional[bool]:
def fuse_2(self, erf_node, input_name_to_nodes: dict, output_name_to_node: dict) -> bool | None:

Check notice

Code scanning / CodeQL

Explicit returns mixed with implicit (fall through) returns Note

Mixing implicit and explicit returns may indicate an error, as implicit returns always return None.
onnxruntime/python/tools/transformers/fusion_gelu.py
return True

def fuse_3(self, erf_node, input_name_to_nodes: Dict, output_name_to_node: Dict) -> Optional[bool]:
def fuse_3(self, erf_node, input_name_to_nodes: dict, output_name_to_node: dict) -> bool | None:

Check notice

Code scanning / CodeQL

Explicit returns mixed with implicit (fall through) returns Note

Mixing implicit and explicit returns may indicate an error, as implicit returns always return None.
@justinchuby justinchuby requested a review from snnn January 16, 2025 23:35
@justinchuby justinchuby merged commit 09c4cc7 into main Jan 17, 2025
97 of 98 checks passed
@justinchuby justinchuby deleted the justinchu/ruff-pyversion branch January 17, 2025 03:10
@yf711 yf711 mentioned this pull request Jan 23, 2025
Closed
ashrit-ms pushed a commit that referenced this pull request Jan 23, 2025
@justinchuby @ashrit-ms
Target py310 and modernize codebase with ruff (#23401)
0334414 
Change `target-version = "py310"` and modernize the code base with ruff.
@ashrit-ms ashrit-ms mentioned this pull request Jan 23, 2025
Merged
ashrit-ms added a commit that referenced this pull request Jan 23, 2025
@ashrit-ms @adrianlizarraga
@justinchuby @fs-eire @edgchen1 @peishenyan @tianleiwu @HectorSVC @jchen351 @Zyrin @junchao-loongson @dependabot @sushraja-msft @Honry @qjia7 @carzh
Update win-ort-main to tip main 250123 (#23473)
4b5b5f7 
### Description
This PR is to update the win-ort-main branch to the tip main branch as
of 2025-01-23.

### PR List
ddf0d37 [QNN EP] Add LoggingManager::HasDefaultLogger() to provider
bridge API (#23467)
05fbbdf [QNN EP] Make QNN EP a shared library (#23120)
1336566 Add custom vcpkg ports (#23456)
2e1173c Update the compile flags for vcpkg packages (#23455)
1f628a9 [Mobile] Add BrowserStack Android MAUI Test (#23383)
009cae0 [js/webgpu] Optimize ConvTranspose (Continue) (#23429)
04a4a69 Use onnx_protobuf.h to suppress some GCC warnings (#23453)
2e3b62b Suppress some strict-aliasing related warnings in WebGPU EP
(#23454)
b708f9b Bump ruff from 0.9.1 to 0.9.2 (#23427)
c0afc66 [WebNN] Remove workarounds for TFLite backend (#23406)
8a821ff Bump vite from 6.0.7 to 6.0.11 in
/js/web/test/e2e/exports/testcases/vite-default (#23446)
220c1a2 Make ORT and Dawn use the same protobuf/abseil source code
(#23447)
b7b5792 Change MacOS-13 to ubuntu on for
android-java-api-aar-test.yml. (#23444)
19d0d2a WIP: Dp4MatMulNBits accuracy level 4 matmul for WebGPU EP
(#23365)
95b8eff [QNN EP]: Clean up QNN logging resources if an error occurs
during initialization (#23435)
626134c Bump clang-format from 19.1.6 to 19.1.7 (#23428)
0cf9753 Fix eigen external deps (#23439)
f9440ae Moving RN_CI Android Testing to Linux (#23422)
1aa5902 [QNN EP] workaround for QNN validation bug for Tanh with
uint16 quantized output (#23432)
7f5582a Seperate RN andriod and IOS into 2 separated Stages. (#23400)
73deac2 Implement some missing element wise Add/Sub/Mul/Div/Neg
operations for CPU and CUDA EPs (#23090)
949fe42 Upgrade Java version from react-native/android to Java 17
(#23066)
0892c23 Update Qnn SDK default version to 2.30 (#23411)
94c099b Fix type cast build error (#23423)
d633e57 [WebNN EP] Fix AddInitializersToSkip issues (#23354)
e988ef0 [QNN EP] Fix regression for MatMul with two quantized/dynamic
uint16 inputs (#23419)
7538795 Update onnxruntime binary size checks ci pipeline's docker
image (#23405)
6c5ea41 Revert "[QNN EP] Clean up correctly from a partial setup
(#23320)" (#23420)
e866804 Enable comprehension simplification in ruff rules (#23414)
0a5f1f3 bugfix: string_view of invalid memory (#23417)
4cc38e0 fix crash when first input of BatchNormalization is 1-D
(#23387)
0334414 Target py310 and modernize codebase with ruff (#23401)
87341ac [QNN EP] Fix segfault when unregistering HTP shared memory
handles (#23402)

### Motivation and Context
This update includes the change to make QNN-EP a shared library.

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: Adrian Lizarraga <[email protected]>
Co-authored-by: Justin Chu <[email protected]>
Co-authored-by: Yulong Wang <[email protected]>
Co-authored-by: Edward Chen <[email protected]>
Co-authored-by: Changming Sun <[email protected]>
Co-authored-by: Peishen Yan <[email protected]>
Co-authored-by: Tianlei Wu <[email protected]>
Co-authored-by: Hector Li <[email protected]>
Co-authored-by: Jian Chen <[email protected]>
Co-authored-by: Alexis Tsogias <[email protected]>
Co-authored-by: junchao-zhao <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: sushraja-msft <[email protected]>
Co-authored-by: Wanming Lin <[email protected]>
Co-authored-by: Jiajia Qin <[email protected]>
Co-authored-by: Caroline Zhu <[email protected]>
guschmue pushed a commit that referenced this pull request Mar 6, 2025
@justinchuby @guschmue
Target py310 and modernize codebase with ruff (#23401)
262d77d 
Change `target-version = "py310"` and modernize the code base with ruff.
ashrit-ms pushed a commit that referenced this pull request Mar 17, 2025
@justinchuby @ashrit-ms
Target py310 and modernize codebase with ruff (#23401)
977813f 
Change `target-version = "py310"` and modernize the code base with ruff.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@snnn snnn snnn approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@justinchuby @snnn