Skip to content

Commit c1afcb9

Browse files
Remove BUILD_SOX and USE_FFMPEG flags (#4100)
1 parent c46153f commit c1afcb9

File tree

4 files changed

+0
-25
lines changed

4 files changed

+0
-25
lines changed

CMakeLists.txt

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,11 @@ endif()
5252

5353

5454
# Options
55-
option(BUILD_SOX "Build libsox statically" ON)
5655
option(BUILD_RIR "Enable RIR simulation" ON)
5756
option(BUILD_RNNT "Enable RNN transducer" ON)
5857
option(BUILD_ALIGN "Enable forced alignment" ON)
5958
option(BUILD_CUDA_CTC_DECODER "Build CUCTC decoder" OFF)
6059
option(BUILD_TORCHAUDIO_PYTHON_EXTENSION "Build Python extension" OFF)
61-
option(USE_FFMPEG "Enable ffmpeg-based features" OFF)
6260
option(USE_CUDA "Enable CUDA support" OFF)
6361
option(USE_ROCM "Enable ROCM support" OFF)
6462
option(USE_OPENMP "Enable OpenMP support" OFF)
@@ -166,14 +164,6 @@ else()
166164
endif()
167165

168166
add_subdirectory(src/libtorchaudio)
169-
if (USE_FFMPEG)
170-
if (DEFINED ENV{FFMPEG_ROOT})
171-
add_subdirectory(third_party/ffmpeg/single)
172-
else()
173-
message(STATUS "Building FFmpeg integration with multi version support")
174-
add_subdirectory(third_party/ffmpeg/multi)
175-
endif()
176-
endif()
177167
if (BUILD_CUDA_CTC_DECODER)
178168
if (NOT USE_CUDA)
179169
message(FATAL "BUILD_CUDA_CTC_DECODER=1 but USE_CUDA=0.")

packaging/torchaudio/meta.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ build:
4343
- USE_CUDA
4444
- CUDA_HOME
4545
- TORCH_CUDA_ARCH_LIST
46-
- USE_FFMPEG
4746
- USE_OPENMP
4847
- MACOSX_DEPLOYMENT_TARGET
4948

third_party/ffmpeg/multi/CMakeLists.txt

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -87,16 +87,6 @@ elseif (UNIX)
8787
URL ${base_url}/2023-07-06/linux_x86_64/6.0.tar.gz
8888
URL_HASH SHA256=04d3916404bab5efadd29f68361b7d13ea71e6242c6473edcb747a41a9fb97a6
8989
)
90-
else ()
91-
# Possible case ppc64le (though it's not officially supported.)
92-
message(
93-
FATAL_ERROR
94-
"${CMAKE_SYSTEM_PROCESSOR} is not supported for FFmpeg multi-version integration. "
95-
"If you have FFmpeg libraries installed in the system,"
96-
" setting FFMPEG_ROOT environment variable to the root directory of FFmpeg installation"
97-
" (the directory where `include` and `lib` sub directories with corresponding headers"
98-
" and library files are present) will invoke the FFmpeg single-version integration. "
99-
"If you do not need the FFmpeg integration, setting USE_FFMPEG=0 will bypass the issue.")
10090
endif()
10191
elseif(MSVC)
10292
FetchContent_Declare(

tools/setup_helpers/extension.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,8 @@ def _get_build(var, default=False):
3434

3535

3636
_BUILD_CPP_TEST = _get_build("BUILD_CPP_TEST", False)
37-
_BUILD_SOX = False if platform.system() == "Windows" else _get_build("BUILD_SOX", True)
3837
_BUILD_RIR = _get_build("BUILD_RIR", True)
3938
_BUILD_RNNT = _get_build("BUILD_RNNT", True)
40-
_USE_FFMPEG = _get_build("USE_FFMPEG", True)
4139
_USE_ROCM = _get_build("USE_ROCM", torch.backends.cuda.is_built() and torch.version.hip is not None)
4240
_USE_CUDA = _get_build("USE_CUDA", torch.backends.cuda.is_built() and torch.version.hip is None)
4341
_BUILD_ALIGN = _get_build("BUILD_ALIGN", True)
@@ -102,7 +100,6 @@ def build_extension(self, ext):
102100
"-DCMAKE_VERBOSE_MAKEFILE=ON",
103101
f"-DPython_INCLUDE_DIR={distutils.sysconfig.get_python_inc()}",
104102
f"-DBUILD_CPP_TEST={'ON' if _BUILD_CPP_TEST else 'OFF'}",
105-
f"-DBUILD_SOX:BOOL={'ON' if _BUILD_SOX else 'OFF'}",
106103
f"-DBUILD_RIR:BOOL={'ON' if _BUILD_RIR else 'OFF'}",
107104
f"-DBUILD_RNNT:BOOL={'ON' if _BUILD_RNNT else 'OFF'}",
108105
f"-DBUILD_ALIGN:BOOL={'ON' if _BUILD_ALIGN else 'OFF'}",
@@ -112,7 +109,6 @@ def build_extension(self, ext):
112109
f"-DUSE_ROCM:BOOL={'ON' if _USE_ROCM else 'OFF'}",
113110
f"-DUSE_CUDA:BOOL={'ON' if _USE_CUDA else 'OFF'}",
114111
f"-DUSE_OPENMP:BOOL={'ON' if _USE_OPENMP else 'OFF'}",
115-
f"-DUSE_FFMPEG:BOOL={'ON' if _USE_FFMPEG else 'OFF'}",
116112
]
117113
build_args = ["--target", "install"]
118114
# Pass CUDA architecture to cmake

0 commit comments

Comments
 (0)