-
Notifications
You must be signed in to change notification settings - Fork 633
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
make kaldi selective #1342
make kaldi selective #1342
Changes from 3 commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -19,6 +19,9 @@ | |
|
||
|
||
def _get_build(var): | ||
if (var == "BUILD_KALDI") and not os.environ.get(var): | ||
return True | ||
|
||
val = os.environ.get(var, '0') | ||
trues = ['1', 'true', 'TRUE', 'on', 'ON', 'yes', 'YES'] | ||
falses = ['0', 'false', 'FALSE', 'off', 'OFF', 'no', 'NO'] | ||
|
@@ -32,6 +35,7 @@ def _get_build(var): | |
|
||
|
||
_BUILD_SOX = _get_build("BUILD_SOX") | ||
_BUILD_KALDI = _get_build("BUILD_KALDI") | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Because we currently default to build Kaldi, in case the environment variable is missing, we need to default to Please update the |
||
_BUILD_TRANSDUCER = _get_build("BUILD_TRANSDUCER") | ||
|
||
|
||
|
@@ -68,7 +72,7 @@ def build_extension(self, ext): | |
'-DCMAKE_VERBOSE_MAKEFILE=ON', | ||
f"-DPython_INCLUDE_DIR={distutils.sysconfig.get_python_inc()}", | ||
f"-DBUILD_SOX:BOOL={'ON' if _BUILD_SOX else 'OFF'}", | ||
"-DBUILD_KALDI:BOOL=ON", | ||
f"-DBUILD_KALDI:BOOL={'ON' if _BUILD_KALDI else 'OFF'}", | ||
f"-DBUILD_TRANSDUCER:BOOL={'ON' if _BUILD_TRANSDUCER else 'OFF'}", | ||
"-DBUILD_TORCHAUDIO_PYTHON_EXTENSION:BOOL=ON", | ||
"-DBUILD_LIBTORCHAUDIO:BOOL=OFF", | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -10,7 +10,8 @@ | |
import torchaudio | ||
from torchaudio._internal.module_utils import ( | ||
is_module_available, | ||
is_sox_available | ||
is_sox_available, | ||
is_kaldi_available | ||
) | ||
|
||
from .backend_utils import set_audio_backend | ||
|
@@ -99,11 +100,4 @@ def skipIfNoModule(module, display_name=None): | |
'sox' not in torchaudio.list_audio_backends(), 'Sox backend not available') | ||
skipIfNoCuda = unittest.skipIf(not torch.cuda.is_available(), reason='CUDA not available') | ||
skipIfNoSox = unittest.skipIf(not is_sox_available(), reason='Sox not available') | ||
|
||
|
||
def skipIfNoExtension(test_item): | ||
if is_module_available('torchaudio._torchaudio'): | ||
return test_item | ||
if 'TORCHAUDIO_TEST_FAIL_IF_NO_EXTENSION' in os.environ: | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. follow-up (@mthrok): Revive this mechanism with new semantic.
|
||
raise RuntimeError('torchaudio C++ extension is not available.') | ||
return unittest.skip('torchaudio C++ extension is not available')(test_item) | ||
skipIfNoKaldi = unittest.skipIf(not is_kaldi_available(), reason='Kaldi not available') |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Although this works for our purpose, let's keep this function generic. How about this?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
good point 👍