diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 0cd1716..5eb2dd9 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -66,9 +66,9 @@ jobs: run: python -m cibuildwheel --output-dir wheelhouse env: CIBW_ARCHS: auto - # for windows setup.py repairwheel step should solve it CIBW_SKIP: pp* cp38-* CIBW_ENVIRONMENT: CMAKE_ARGS="${{ matrix.cmake_args }}" + CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: "" - name: Verify clean directory run: git diff --exit-code diff --git a/setup.py b/setup.py index dc623cf..a4a776e 100644 --- a/setup.py +++ b/setup.py @@ -66,7 +66,7 @@ def build_extension(self, ext: CMakeExtension) -> None: # from Python. cmake_args = [ f"-DCMAKE_LIBRARY_OUTPUT_DIRECTORY={extdir}{os.sep}", - f"-DPYTHON_EXECUTABLE={sys.executable}", + f"-DPython_EXECUTABLE={sys.executable}", f"-DCMAKE_BUILD_TYPE={cfg}", # not used on MSVC, but no harm ] if self.editable_mode: @@ -194,12 +194,8 @@ def copy_extensions_to_source(self): class RepairWheel(bdist_wheel): def run(self): super().run() - if os.environ.get('NO_REPAIR', '0') == '1': - print("Skipping wheel repair") - return - # if os.environ.get('CIBUILDWHEEL', '0') == '0' or sys.platform.startswith('win'): - if sys.platform.startswith('win') or sys.platform.startswith('linux'): - # for linux and macos we use the default wheel repair command from cibuildwheel, for windows we need to do it manually as there is no repair command + if sys.platform.startswith('win'): + # Linux and macOS use cibuildwheel's default repair command. self.repair_wheel() def repair_wheel(self): diff --git a/whisper.cpp b/whisper.cpp index 9386f23..f24588a 160000 --- a/whisper.cpp +++ b/whisper.cpp @@ -1 +1 @@ -Subproject commit 9386f239401074690479731c1e41683fbbeac557 +Subproject commit f24588a272ae8e23280d9c220536437164e6ed28