From bf921afcbef89463c2b8a78c4008d993500fadb4 Mon Sep 17 00:00:00 2001 From: James Zhao Date: Tue, 3 Sep 2024 23:16:21 +0300 Subject: [PATCH] Make sure to import the correct "version" module when installing mlx_whisper and mlx_lm from local source code. (#969) * Make sure to import the correct "version" module when installing the mlx_whisper package from local source code. * Make sure to import the correct "version" module when installing the mlx_lm package from local source code * fix --------- Co-authored-by: Awni Hannun --- llms/mlx_lm/__init__.py | 2 +- llms/mlx_lm/{version.py => _version.py} | 0 llms/setup.py | 2 +- whisper/mlx_whisper/__init__.py | 2 +- whisper/mlx_whisper/{version.py => _version.py} | 0 whisper/setup.py | 2 +- 6 files changed, 4 insertions(+), 4 deletions(-) rename llms/mlx_lm/{version.py => _version.py} (100%) rename whisper/mlx_whisper/{version.py => _version.py} (100%) diff --git a/llms/mlx_lm/__init__.py b/llms/mlx_lm/__init__.py index e971c467..502c78e5 100644 --- a/llms/mlx_lm/__init__.py +++ b/llms/mlx_lm/__init__.py @@ -1,4 +1,4 @@ # Copyright © 2023-2024 Apple Inc. +from ._version import __version__ from .utils import convert, generate, load, stream_generate -from .version import __version__ diff --git a/llms/mlx_lm/version.py b/llms/mlx_lm/_version.py similarity index 100% rename from llms/mlx_lm/version.py rename to llms/mlx_lm/_version.py diff --git a/llms/setup.py b/llms/setup.py index ac294ae1..e2cfe0cd 100644 --- a/llms/setup.py +++ b/llms/setup.py @@ -10,7 +10,7 @@ with open(package_dir / "requirements.txt") as fid: requirements = [l.strip() for l in fid.readlines()] sys.path.append(str(package_dir)) -from version import __version__ +from _version import __version__ setup( name="mlx-lm", diff --git a/whisper/mlx_whisper/__init__.py b/whisper/mlx_whisper/__init__.py index e6de0858..14c5197f 100644 --- a/whisper/mlx_whisper/__init__.py +++ b/whisper/mlx_whisper/__init__.py @@ -1,5 +1,5 @@ # Copyright © 2023-2024 Apple Inc. from . import audio, decoding, load_models +from ._version import __version__ from .transcribe import transcribe -from .version import __version__ diff --git a/whisper/mlx_whisper/version.py b/whisper/mlx_whisper/_version.py similarity index 100% rename from whisper/mlx_whisper/version.py rename to whisper/mlx_whisper/_version.py diff --git a/whisper/setup.py b/whisper/setup.py index 086f6471..0cabd64b 100644 --- a/whisper/setup.py +++ b/whisper/setup.py @@ -12,7 +12,7 @@ with open(package_dir / "requirements.txt") as fid: sys.path.append(str(package_dir)) -from version import __version__ +from _version import __version__ setup( name="mlx-whisper",