Update library/extension name

Differential Revision: D50633306

Pull Request resolved: https://github.com/pytorch/audio/pull/3675

cmake/TorchAudioHelper.cmake

@@ -43,7 +43,7 @@ endfunction()
 
 function(torio_library name source include_dirs link_libraries compile_defs)
   _library(
-    torio/lib
+    torchaudio/lib
     "${name}"
     "${source}"
     "${include_dirs}"
@@ -104,7 +104,7 @@ if (BUILD_TORCHAUDIO_PYTHON_EXTENSION)
   endfunction()
   function(torio_extension name sources include_dirs libraries definitions)
     _extension(
-      torio/lib
+      torchaudio/lib
       "${name}"
       "${sources}"
       "${include_dirs}"

src/libtorio/ffmpeg/CMakeLists.txt

@@ -29,65 +29,65 @@ if (USE_CUDA)
 endif()
 
 if (TARGET ffmpeg)
-  torchaudio_library(
-    libtorchaudio_ffmpeg
+  torio_library(
+    libtorio_ffmpeg
     "${sources}"
     ""
     "torch;ffmpeg;${additional_lib}"
     ""
     )
-  if (BUILD_TORCHAUDIO_PYTHON_EXTENSION)
-    torchaudio_extension(
-      _torchaudio_ffmpeg
+  if (BUILD_TORIO_PYTHON_EXTENSION)
+    torio_extension(
+      _torio_ffmpeg
       "${ext_sources}"
       ""
-      "libtorchaudio_ffmpeg"
-      "TORCHAUDIO_FFMPEG_EXT_NAME=_torchaudio_ffmpeg"
+      "libtorio_ffmpeg"
+      "TORIO_FFMPEG_EXT_NAME=_torio_ffmpeg"
       )
   endif()
 else()
-  torchaudio_library(
-    libtorchaudio_ffmpeg4
+  torio_library(
+    libtorio_ffmpeg4
     "${sources}"
     ""
     "torch;ffmpeg4;${additional_lib}"
     ""
     )
-  torchaudio_library(
-    libtorchaudio_ffmpeg5
+  torio_library(
+    libtorio_ffmpeg5
     "${sources}"
     ""
     "torch;ffmpeg5;${additional_lib}"
     ""
     )
-  torchaudio_library(
-    libtorchaudio_ffmpeg6
+  torio_library(
+    libtorio_ffmpeg6
     "${sources}"
     ""
     "torch;ffmpeg6;${additional_lib}"
     ""
     )
-  if (BUILD_TORCHAUDIO_PYTHON_EXTENSION)
-    torchaudio_extension(
-      _torchaudio_ffmpeg4
+  if (BUILD_TORIO_PYTHON_EXTENSION)
+    torio_extension(
+      _torio_ffmpeg4
       "${ext_sources}"
       ""
-      "libtorchaudio_ffmpeg4"
-      "TORCHAUDIO_FFMPEG_EXT_NAME=_torchaudio_ffmpeg4"
+      "libtorio_ffmpeg4"
+      "TORIO_FFMPEG_EXT_NAME=_torio_ffmpeg4"
       )
-    torchaudio_extension(
-      _torchaudio_ffmpeg5
+    torio_extension(
+      _torio_ffmpeg5
       "${ext_sources}"
       ""
-      "libtorchaudio_ffmpeg5"
-      "TORCHAUDIO_FFMPEG_EXT_NAME=_torchaudio_ffmpeg5"
+      "libtorio_ffmpeg5"
+      "TORIO_FFMPEG_EXT_NAME=_torio_ffmpeg5"
       )
-    torchaudio_extension(
-      _torchaudio_ffmpeg6
+    torio_extension(
+      _torio_ffmpeg6
       "${ext_sources}"
       ""
-      "libtorchaudio_ffmpeg6"
-      "TORCHAUDIO_FFMPEG_EXT_NAME=_torchaudio_ffmpeg6"
+      "libtorio_ffmpeg6"
+      "TORIO_FFMPEG_EXT_NAME=_torio_ffmpeg6"
       )
   endif ()
 endif()

src/libtorio/ffmpeg/pybind/pybind.cpp

@@ -241,11 +241,11 @@ struct StreamReaderBytes : private BytesWrapper, public StreamReaderCustomIO {
             option) {}
 };
 
-#ifndef TORCHAUDIO_FFMPEG_EXT_NAME
-#error TORCHAUDIO_FFMPEG_EXT_NAME must be defined.
+#ifndef TORIO_FFMPEG_EXT_NAME
+#error TORIO_FFMPEG_EXT_NAME must be defined.
 #endif
 
-PYBIND11_MODULE(TORCHAUDIO_FFMPEG_EXT_NAME, m) {
+PYBIND11_MODULE(TORIO_FFMPEG_EXT_NAME, m) {
   m.def("init", []() { avdevice_register_all(); });
   m.def("get_log_level", []() { return av_log_get_level(); });
   m.def("set_log_level", [](int level) { av_log_set_level(level); });

src/torchaudio/_extension/utils.py

@@ -113,8 +113,8 @@ _FFMPEG_VERS = ["6", "5", "4", ""]
 def _find_versionsed_ffmpeg_extension(version: str):
     _LG.debug("Attempting to load FFmpeg%s", version)
 
-    ext = f"torchaudio.lib._torchaudio_ffmpeg{version}"
-    lib = f"libtorchaudio_ffmpeg{version}"
+    ext = f"torchaudio.lib._torio_ffmpeg{version}"
+    lib = f"libtorio_ffmpeg{version}"
 
     if not importlib.util.find_spec(ext):
         raise RuntimeError(f"FFmpeg{version} extension is not available.")

tools/setup_helpers/extension.py

@@ -70,19 +70,19 @@ def get_ext_modules():
             # single version ffmpeg mode
             modules.extend(
                 [
-                    Extension(name="torchaudio.lib.libtorchaudio_ffmpeg", sources=[]),
-                    Extension(name="torchaudio.lib._torchaudio_ffmpeg", sources=[]),
+                    Extension(name="torchaudio.lib.libtorio_ffmpeg", sources=[]),
+                    Extension(name="torchaudio.lib._torio_ffmpeg", sources=[]),
                 ]
             )
         else:
             modules.extend(
                 [
-                    Extension(name="torchaudio.lib.libtorchaudio_ffmpeg4", sources=[]),
-                    Extension(name="torchaudio.lib._torchaudio_ffmpeg4", sources=[]),
-                    Extension(name="torchaudio.lib.libtorchaudio_ffmpeg5", sources=[]),
-                    Extension(name="torchaudio.lib._torchaudio_ffmpeg5", sources=[]),
-                    Extension(name="torchaudio.lib.libtorchaudio_ffmpeg6", sources=[]),
-                    Extension(name="torchaudio.lib._torchaudio_ffmpeg6", sources=[]),
+                    Extension(name="torchaudio.lib.libtorio_ffmpeg4", sources=[]),
+                    Extension(name="torchaudio.lib._torio_ffmpeg4", sources=[]),
+                    Extension(name="torchaudio.lib.libtorio_ffmpeg5", sources=[]),
+                    Extension(name="torchaudio.lib._torio_ffmpeg5", sources=[]),
+                    Extension(name="torchaudio.lib.libtorio_ffmpeg6", sources=[]),
+                    Extension(name="torchaudio.lib._torio_ffmpeg6", sources=[]),
                 ]
             )
     return modules
@@ -135,6 +135,7 @@ class CMakeBuild(build_ext):
             f"-DBUILD_ALIGN:BOOL={'ON' if _BUILD_ALIGN else 'OFF'}",
             f"-DBUILD_CUDA_CTC_DECODER:BOOL={'ON' if _BUILD_CUDA_CTC_DECODER else 'OFF'}",
             "-DBUILD_TORCHAUDIO_PYTHON_EXTENSION:BOOL=ON",
+            "-DBUILD_TORIO_PYTHON_EXTENSION:BOOL=ON",
             f"-DUSE_ROCM:BOOL={'ON' if _USE_ROCM else 'OFF'}",
             f"-DUSE_CUDA:BOOL={'ON' if _USE_CUDA else 'OFF'}",
             f"-DUSE_OPENMP:BOOL={'ON' if _USE_OPENMP else 'OFF'}",