Move to using protogen's .pyi file generator

.github/workflows/main.yml

@@ -2,15 +2,15 @@ name: CI
 
 on:
   schedule:
-    - cron: '0 0 * * *'  # every day at midnight for reporting code coverage to codecov
+    - cron: "0 0 * * *" # every day at midnight for reporting code coverage to codecov
   push:
     branches:
       - main
   pull_request:
   merge_group:
   workflow_dispatch:
 
-permissions:  # set top-level default permissions as security best practice
+permissions: # set top-level default permissions as security best practice
   contents: read
 
 concurrency:
@@ -23,34 +23,34 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest,macos-latest]
-        python_version: ['3.12', '3.11', '3.10', '3.9', '3.8']
+        os: [ubuntu-latest, windows-latest, macos-latest]
+        python_version: ["3.12", "3.11", "3.10", "3.9", "3.8"]
         include:
-          - python_version: '3.12'
+          - python_version: "3.12"
             onnx_ml: 1
             debug_build: 1
             documentation: 1
-            protobuf_type: 'Internal'
-          - python_version: '3.11'
+            protobuf_type: "Internal"
+          - python_version: "3.11"
             onnx_ml: 1
             debug_build: 0
             documentation: 0
-            protobuf_type: 'External'
-          - python_version: '3.10'
+            protobuf_type: "External"
+          - python_version: "3.10"
             onnx_ml: 0
             debug_build: 0
             documentation: 0
-            protobuf_type: 'Internal'
-          - python_version: '3.9'
+            protobuf_type: "Internal"
+          - python_version: "3.9"
             onnx_ml: 1
             debug_build: 0
             documentation: 0
-            protobuf_type: 'External'
-          - python_version: '3.8'
+            protobuf_type: "External"
+          - python_version: "3.8"
             onnx_ml: 0
             debug_build: 0
             documentation: 0
-            protobuf_type: 'Internal'
+            protobuf_type: "Internal"
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout repository
@@ -70,6 +70,8 @@ jobs:
         if: matrix.protobuf_type == 'External' && matrix.os == 'ubuntu-latest'
         run: |
           sudo apt-get install libprotobuf-dev protobuf-compiler
+        env:
+          CMAKE_ARGS: "-DONNX_GEN_PB_TYPE_STUBS=OFF"
 
       - name: Install external protobuf - MacOS
         if: matrix.protobuf_type == 'External' && matrix.os == 'macos-latest'

.gitignore

@@ -81,7 +81,6 @@ compile_commands.json
 # generated files
 onnx/version.py
 compile_commands.json
-tools/protoc-gen-mypy.sh
 
 # test generated files
 .cache
@@ -112,4 +111,4 @@ docs/docsgen/**/*.onnx
 docs/docsgen/**/*.pb
 
 # PyEnv files
-.python-version
+.python-version

.reuse/dep5

@@ -130,11 +130,11 @@ Files: cmake/ONNXConfig*.in CMakeLists.txt cmake/*cmake cmake/
 COPYRIGHT: Copyright (c) ONNX Project Contributors
 License: Apache-2.0
 
-Files: .vscode/settings.json docs/docsgen/source/_templates/layout.html docs/docsgen/source/_templates/sidebar-nav-bs.html docs/images/onnx_hub_arch.svg docs/onnx-horizontal-color.png tools/protoc-gen-mypy.sh.in
+Files: .vscode/settings.json docs/docsgen/source/_templates/layout.html docs/docsgen/source/_templates/sidebar-nav-bs.html docs/images/onnx_hub_arch.svg docs/onnx-horizontal-color.png
 COPYRIGHT: Copyright (c) ONNX Project Contributors
 License: Apache-2.0
 
-Files: onnx/gen_proto.py tools/protoc-gen-mypy.bat onnx/reference/op_run.py
+Files: onnx/gen_proto.py onnx/reference/op_run.py
 COPYRIGHT: Copyright (c) ONNX Project Contributors
 License: Apache-2.0
 

CMakeLists.txt

@@ -373,29 +373,11 @@ function(RELATIVE_PROTOBUF_GENERATE_CPP NAME SRCS HDRS ROOT_DIR DEPEND)
         --cpp_out
         ${ONNX_DLLEXPORT_STR}${CMAKE_CURRENT_BINARY_DIR})
     if(BUILD_ONNX_PYTHON)
-      list(APPEND PROTOC_ARGS --python_out
-                  ${CMAKE_CURRENT_BINARY_DIR})
+      list(APPEND PROTOC_ARGS --python_out)
       if(ONNX_GEN_PB_TYPE_STUBS)
-        if(NOT WIN32)
-          # use PYTHON_EXECUTABLE to python protoc-gen-mypy.py
-          configure_file(
-            ${ROOT_DIR}/tools/protoc-gen-mypy.sh.in
-            ${PROJECT_BINARY_DIR}/tools/protoc-gen-mypy.sh
-            @ONLY)
-          execute_process(COMMAND chmod +x ${PROJECT_BINARY_DIR}/tools/protoc-gen-mypy.sh)
-          configure_file(
-            ${ROOT_DIR}/tools/protoc-gen-mypy.py
-            ${PROJECT_BINARY_DIR}/tools/protoc-gen-mypy.py
-            COPYONLY)
-          set(PROTOC_MYPY_PLUGIN_FILE ${PROJECT_BINARY_DIR}/tools/protoc-gen-mypy.sh)
-        else()
-          set(PROTOC_MYPY_PLUGIN_FILE ${ROOT_DIR}/tools/protoc-gen-mypy.bat)
-        endif()
-        list(APPEND PROTOC_ARGS
-                    --plugin
-                    protoc-gen-mypy=${PROTOC_MYPY_PLUGIN_FILE}
-                    --mypy_out
-                    ${ONNX_DLLEXPORT_STR}${CMAKE_CURRENT_BINARY_DIR})
+        list(APPEND PROTOC_ARGS pyi_out:${CMAKE_CURRENT_BINARY_DIR})
+      else()
+        list(APPEND PROTOC_ARGS ${CMAKE_CURRENT_BINARY_DIR})
       endif()
     endif()
     if(NOT ONNX_PROTOC_EXECUTABLE)

tools/protoc-gen-mypy.py

@@ -6,6 +6,9 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+# NOTE: This is presently deprecated in favour of protogen's own .pyi generation method.
+#       See: https://github.com/onnx/onnx/pull/6096
+
 # Taken from https://github.com/dropbox/mypy-protobuf/blob/d984389124eae6dbbb517f766b9266bb32171510/python/protoc-gen-mypy
 # (Apache 2.0 License)
 # with own fixes to