Cleanup actions and cmake variables (#268)

Also use cpu torch wheel to reduce download

Signed-off-by: take-cheeze <takechi101010@gmail.com>

Author: take-cheeze

.github/workflows/build-and-test.yml

@@ -24,15 +24,14 @@ jobs:
       CIBW_BEFORE_BUILD_LINUX: pip install protobuf
       CIBW_BEFORE_BUILD_WINDOWS: python -m pip install protobuf
       CIBW_BEFORE_BUILD_MACOS: pip install protobuf
-      CIBW_TEST_REQUIRES_LINUX: pytest pytest-xdist ruff mypy onnxruntime
+      CIBW_TEST_REQUIRES_LINUX: pytest pytest-xdist ruff mypy onnxruntime onnxscript
       CIBW_TEST_REQUIRES_MACOS: pytest pytest-xdist
       CIBW_TEST_REQUIRES_WINDOWS: pytest pytest-xdist
-      CIBW_BEFORE_TEST_LINUX: pip install onnxscript torch==2.9.1 torchvision==0.24.1
+      CIBW_BEFORE_TEST_LINUX: pip install torch==2.9.1 torchvision==0.24.1 --index-url https://download.pytorch.org/whl/cpu
       CIBW_TEST_COMMAND: pytest {project}/onnxoptimizer/test
       CIBW_TEST_COMMAND_LINUX: cd {project} && pytest
       CIBW_TEST_SKIP: " *_arm64"
-      CIBW_ENVIRONMENT: CMAKE_ARGS="-DONNX_USE_PROTOBUF_SHARED_LIBS=OFF -DProtobuf_USE_STATIC_LIBS=ON -DONNX_USE_LITE_PROTO=ON -DCMAKE_POLICY_VERSION_MINIMUM=3.5"
-      CIBW_ENVIRONMENT_WINDOWS: USE_MSVC_STATIC_RUNTIME=0 CMAKE_ARGS="-DONNX_USE_PROTOBUF_SHARED_LIBS=OFF -DProtobuf_USE_STATIC_LIBS=ON -DONNX_USE_LITE_PROTO=ON"
+      CIBW_ENVIRONMENT: CMAKE_ARGS="-DONNX_USE_LITE_PROTO=ON"
       CIBW_BUILD: "${{ matrix.python }}-*"      
       CIBW_SKIP: "*-win32 *-manylinux_i686 *-musllinux_*"
     name: Build whls ${{ matrix.os }}${{ matrix.python }}

setup.py

@@ -160,12 +160,10 @@ def run(self):
             cmake_args = [
                 CMAKE,
                 f"-DPython_INCLUDE_DIR={sysconfig.get_python_inc()}",
-                f"-DPYTHON_EXECUTABLE={sys.executable}",
+                f"-DPython_EXECUTABLE={sys.executable}",
                 "-DONNX_BUILD_PYTHON=ON",
-                "-DONNX_USE_LITE_PROTO={}".format("ON" if ONNX_USE_LITE_PROTO else "OFF"),
                 "-DCMAKE_EXPORT_COMPILE_COMMANDS=ON",
                 f"-DONNX_NAMESPACE={ONNX_NAMESPACE}",
-                "-DPY_EXT_SUFFIX={}".format(sysconfig.get_config_var("EXT_SUFFIX") or ""),
                 "-DONNX_OPT_USE_SYSTEM_PROTOBUF={}".format(
                     "ON" if ONNX_OPT_USE_SYSTEM_PROTOBUF else "OFF"
                 ),