libspeech 0.1.0__tar.gz → 0.2.0__tar.gz

{libspeech-0.1.0 → libspeech-0.2.0}/.github/workflows/wheels.yml

@@ -86,7 +86,20 @@ jobs:
         # ships wheels from cp39-abi3 up on PyPI, not cp38 -- building a
         # cp38 wheel here would require httpp built from source instead.
         CIBW_BUILD: "cp39-* cp310-* cp311-* cp312-*"
-        CIBW_ENVIRONMENT_CP312: "SKBUILD_WHEEL_PY_API=cp312"
+        # Per-Python-version env var overrides (SKBUILD_WHEEL_PY_API=cp312
+        # for the cp312 build only, so scikit-build-core tags it as a
+        # forward-compatible cp312-abi3 wheel instead of a version-locked
+        # cp312-cp312 one -- see the [tool.cibuildwheel.overrides] entry
+        # in pyproject.toml for *why* it has to live there instead of
+        # here) do NOT work as a "CIBW_<OPTION>_<IDENTIFIER>" env var like
+        # CIBW_ENVIRONMENT_CP312: cibuildwheel only recognizes that
+        # suffix pattern for CIBW_ENVIRONMENT_{LINUX,MACOS,WINDOWS} (i.e.
+        # by platform), not by Python-version identifier -- an env var
+        # like that is silently a no-op, not an error, which is exactly
+        # how this went unnoticed (confirmed: the wheel actually
+        # published to PyPI for 0.1.0 came out tagged cp312-cp312, not
+        # cp312-abi3, meaning SKBUILD_WHEEL_PY_API was never really set
+        # during that build despite this line being here).
         # Disable building PyPy wheels on all platforms. Also skip
         # musllinux (Alpine/musl has no official ONNX Runtime build --
         # only glibc-linked releases exist, which fail to link against

{libspeech-0.1.0 → libspeech-0.2.0}/CMakeLists.txt

@@ -117,6 +117,26 @@ include(ONNXRuntime)
 
 add_subdirectory(src/third_party/miniaudio)
 
+# miniaudio.h uses the C23 double-bracket attribute syntax for its
+# fallthrough marker (MA_FALLTHROUGH -> [[fallthrough]], see miniaudio.h)
+# even in the gnu99 translation unit miniaudio.c compiles as. GCC accepts
+# this quietly under gnu99, but (Apple) Clang's -Wc23-extensions flags it
+# -- three warnings, no errors, harmless either way.
+#
+# This is vendored, upstream code pulled in via a git submodule -- editing
+# miniaudio.h directly isn't an option (the fix would silently vanish on
+# the next `git submodule update`), and a project-wide -Wno-c23-extensions
+# would also mute the same warning if it ever showed up in code we
+# actually own. So silence only this one diagnostic, and only on the one
+# target it's known to come from (confirmed: only miniaudio.c itself hits
+# it, not the extra node .c files below, which don't compile the
+# MA_FALLTHROUGH-containing implementation). Safe to drop once upstream
+# miniaudio switches to __attribute__((fallthrough)) or the project moves
+# to a C standard where the warning no longer applies.
+if(CMAKE_C_COMPILER_ID MATCHES "Clang")
+    target_compile_options(miniaudio PRIVATE -Wno-c23-extensions)
+endif()
+
 # ---------------------------------------------------------------------------
 # Model downloading (speech::utils::downloadFile) used to link the SYSTEM
 # libcurl (find_package(CURL REQUIRED) + apt-installed libcurl4-openssl-dev)
@@ -366,7 +386,25 @@ if(DEFINED PYTHON_PROJECT_NAME)
     # the same way this file already bakes VERSION_INFO in below.
     # $<TARGET_FILE_NAME:...> is a generator expression, resolved once CMake
     # knows the real output name of each target.
-    get_filename_component(_ONNXRUNTIME_LIB_FILENAME "${ONNXRUNTIME_LIB_FILE}" NAME)
+    # On Linux, ship (and load) the library under its SONAME
+    # (libonnxruntime.so.1) rather than the fully-versioned filename
+    # (libonnxruntime.so.1.21.0): both names used to be installed as full
+    # ~20MB copies (the SONAME file is a symlink on the upstream release
+    # tarball, but CMake's install(FILES ...)/file(COPY ...) dereference
+    # symlinks, and it turns out the wheel-building step also flattens an
+    # install-time symlink back into a second real copy when zipping -- so
+    # there is no way to keep both names *and* avoid shipping the bytes
+    # twice). Since the SONAME is the one name every consumer .so's
+    # DT_NEEDED entry actually requires at runtime, standardize the
+    # explicit ctypes preload in __init__.py on that same name too and
+    # stop installing the fully-versioned name altogether -- one file,
+    # one name, used both places. Windows/macOS have no such SONAME split
+    # (see cmake/ONNXRuntime.cmake) so they keep using ONNXRUNTIME_LIB_FILE.
+    if(ONNXRUNTIME_SONAME_FILE)
+        get_filename_component(_ONNXRUNTIME_LIB_FILENAME "${ONNXRUNTIME_SONAME_FILE}" NAME)
+    else()
+        get_filename_component(_ONNXRUNTIME_LIB_FILENAME "${ONNXRUNTIME_LIB_FILE}" NAME)
+    endif()
     target_compile_definitions(${NB_MODULE} PRIVATE
             VERSION_INFO=${PROJECT_VERSION}
             NB_MODULE_NAME=${NB_MODULE}
@@ -471,28 +509,53 @@ if(DEFINED PYTHON_PROJECT_NAME)
         # httpp is NOT bundled here -- __init__.py loads it from the
         # separately pip-installed httpp package instead (see __init__.py).
         #
-        # ONNXRUNTIME_SONAME_FILE (see cmake/ONNXRuntime.cmake) additionally
-        # ships a copy under onnxruntime's actual SONAME (libonnxruntime.so.1)
-        # on Linux/macOS -- every compiled .so's DT_NEEDED entry references
-        # that name, not the fully-versioned ONNXRUNTIME_LIB_FILE one, and
-        # without it `auditwheel repair` fails to find/bundle it at all.
+        # ONNXRUNTIME_SONAME_FILE (see cmake/ONNXRuntime.cmake) is the name
+        # every compiled .so's DT_NEEDED entry actually requires at
+        # runtime (libonnxruntime.so.1 on Linux), not the fully-versioned
+        # ONNXRUNTIME_LIB_FILE one -- without a file by that exact name,
+        # `auditwheel repair` fails to find/bundle it at all.
+        #
+        # On disk (in the upstream release tarball) that name is a
+        # symlink to ONNXRUNTIME_LIB_FILE, which is why it used to look
+        # free to ship both: but CMake's install(FILES ...) dereferences
+        # symlinks, AND the wheel-building step separately flattens an
+        # install-time symlink back into a real copy when zipping -- so
+        # shipping *both* names always costs a full second ~20MB copy no
+        # matter which way the symlink is recreated. Since the SONAME is
+        # the only name anything actually needs to dlopen/link against at
+        # runtime (see the ONNXRUNTIME_LIB_PATH comment above), install
+        # the real bytes under that name ONLY and drop the fully-versioned
+        # name from the wheel entirely -- one ~20MB file instead of two.
         # ONNXRUNTIME_PROVIDERS_SHARED_FILE (Windows only) is the companion
         # onnxruntime_providers_shared.dll upstream ships alongside
         # onnxruntime.dll -- see cmake/ONNXRuntime.cmake for why.
-        set(_LIBSPEECH_RUNTIME_LIBS "${ONNXRUNTIME_LIB_FILE}")
         if(ONNXRUNTIME_SONAME_FILE)
-            list(APPEND _LIBSPEECH_RUNTIME_LIBS "${ONNXRUNTIME_SONAME_FILE}")
+            get_filename_component(_ONNXRUNTIME_SONAME_FILENAME "${ONNXRUNTIME_SONAME_FILE}" NAME)
+            # RENAME so only one copy of the (large) file is ever written
+            # -- under the SONAME, not the fully-versioned name.
+            install(FILES "${ONNXRUNTIME_LIB_FILE}"
+                    DESTINATION ${SKBUILD_PROJECT_NAME}
+                    RENAME "${_ONNXRUNTIME_SONAME_FILENAME}")
+        else()
+            install(FILES "${ONNXRUNTIME_LIB_FILE}"
+                    DESTINATION ${SKBUILD_PROJECT_NAME})
         endif()
         if(ONNXRUNTIME_PROVIDERS_SHARED_FILE)
-            list(APPEND _LIBSPEECH_RUNTIME_LIBS "${ONNXRUNTIME_PROVIDERS_SHARED_FILE}")
+            install(FILES "${ONNXRUNTIME_PROVIDERS_SHARED_FILE}"
+                    DESTINATION ${SKBUILD_PROJECT_NAME})
         endif()
-        install (FILES ${_LIBSPEECH_RUNTIME_LIBS}
-                DESTINATION ${SKBUILD_PROJECT_NAME})
     else()
         file(COPY ${PROJECT_SOURCE_DIR}/src/bindings/python/${PROJECT_NAME} DESTINATION ${PYTHON_PROJECT_NAME})
-        file(COPY ${ONNXRUNTIME_LIB_FILE} DESTINATION ${PYTHON_PROJECT_NAME}/${PROJECT_NAME})
         if(ONNXRUNTIME_SONAME_FILE)
-            file(COPY ${ONNXRUNTIME_SONAME_FILE} DESTINATION ${PYTHON_PROJECT_NAME}/${PROJECT_NAME})
+            # Same fix as the scikit-build install(FILES ...) branch above:
+            # ship the real bytes under the SONAME only (one ~20MB file,
+            # not the fully-versioned name too), since that's the only
+            # name anything actually dlopens/links against at runtime.
+            get_filename_component(_ONNXRUNTIME_SONAME_FILENAME "${ONNXRUNTIME_SONAME_FILE}" NAME)
+            file(COPY_FILE "${ONNXRUNTIME_LIB_FILE}"
+                 "${PYTHON_PROJECT_NAME}/${PROJECT_NAME}/${_ONNXRUNTIME_SONAME_FILENAME}")
+        else()
+            file(COPY ${ONNXRUNTIME_LIB_FILE} DESTINATION ${PYTHON_PROJECT_NAME}/${PROJECT_NAME})
         endif()
         if(ONNXRUNTIME_PROVIDERS_SHARED_FILE)
             file(COPY ${ONNXRUNTIME_PROVIDERS_SHARED_FILE} DESTINATION ${PYTHON_PROJECT_NAME}/${PROJECT_NAME})

{libspeech-0.1.0 → libspeech-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: libspeech
-Version: 0.1.0
+Version: 0.2.0
 Summary: Best library for speech
 Author-Email: Mohammad Raziei <mohammadraziei1375@gmail.com>
 Classifier: Development Status :: 4 - Beta

{libspeech-0.1.0 → libspeech-0.2.0}/include/libspeech/version.h

@@ -15,7 +15,7 @@
 #define LIBSPEECH_VERSION_H
 
 #define LIBSPEECH_VERSION_MAJOR 0
-#define LIBSPEECH_VERSION_MINOR 1
+#define LIBSPEECH_VERSION_MINOR 2
 #define LIBSPEECH_VERSION_PATCH 0
 
 #define LIBSPEECH_VERSION_STRINGIFY_IMPL(x) #x

{libspeech-0.1.0 → libspeech-0.2.0}/pyproject.toml

@@ -67,6 +67,39 @@ test-extras = ["test"]
 test-skip = ["*universal2:arm64"]
 #build-verbosity = 1
 
+[[tool.cibuildwheel.overrides]]
+# Only the cp312 build's nanobind extensions are actually compiled
+# against the Limited API (STABLE_ABI in CMakeLists.txt's
+# nanobind_add_module(... STABLE_ABI ...) calls resolves to
+# Py_LIMITED_API=0x030C0000, i.e. Python 3.12+, confirmed by inspecting
+# an actual local build's compile flags -- nanobind's own STABLE_ABI
+# option is a Python-3.12-floor feature, it silently does nothing on
+# older interpreters per nanobind's own docs, so the cp39/cp310/cp311
+# builds really are ordinary version-locked extensions and must keep
+# their default per-version wheel.py-api, or their wheel's tag would be
+# lying about what's actually inside).
+#
+# So only for cp312 do we want scikit-build-core to tag the wheel
+# cp312-abi3 (forward-compatible with 3.12, 3.13, 3.14, 3.15, ...)
+# instead of the default cp312-cp312 (that one Python version only) --
+# set via SKBUILD_WHEEL_PY_API, which is scikit-build-core's env-var
+# spelling of its `wheel.py-api` config option.
+#
+# This has to be an [[overrides]] table with its own `select`, not a
+# top-level `CIBW_ENVIRONMENT_CP312` env var in wheels.yml: cibuildwheel
+# only recognizes CIBW_ENVIRONMENT_{LINUX,MACOS,WINDOWS} as valid
+# per-selector *environment-variable name* suffixes (i.e. by platform),
+# not arbitrary identifiers like "CP312" -- an env var spelled that way
+# is silently ignored rather than erroring, which is exactly how this
+# was never actually applied to the wheels published for 0.1.0 (all
+# four came out version-locked, cp312 included -- confirmed by
+# inspecting the actual .dist-info/WHEEL of the published wheel).
+# `select` here is cibuildwheel's own, real mechanism for the same
+# per-build-identifier scoping that env var name was trying (and
+# failing) to achieve.
+select = "cp312-*"
+environment = { SKBUILD_WHEEL_PY_API = "cp312" }
+
 
 #[tool.scikit-build.cmake.define]
 #SOME_DEFINE = "ON"

{libspeech-0.1.0 → libspeech-0.2.0}/version.py

@@ -171,7 +171,7 @@ def cmd_tag(args):
         new_version = version_str(version)
         tag_name = f"v{new_version}"
         run(["git", "add", str(HEADER_ABS_PATH)])
-        run(["git", "commit", "-m", f"Release {new_version}"])
+        run(["git", "commit", "-m", f"Release {new_version}", "--allow-empty-message"])
         run(["git", "tag", tag_name])
         print(f"Committed and tagged {tag_name}")
         return