Move libtorchaudio to dedicated directory

Differential Revision: D50086556 Pull Request resolved: #3648
pytorch · Oct 12, 2023 · e65e472 · e65e472
1 parent 03d1270
commit e65e472
Show file tree

Hide file tree

Showing 71 changed files with 67 additions and 61 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -165,10 +165,10 @@ else()
   message(STATUS "Could not find ccache. Consider installing ccache to speed up compilation.")
 endif()
 
-add_subdirectory(src/torchaudio/csrc)
+add_subdirectory(src/libtorchaudio)
 if (BUILD_SOX)
   add_subdirectory(third_party/sox)
-  add_subdirectory(src/torchaudio/csrc/sox)
+  add_subdirectory(src/libtorchaudio/sox)
 endif()
 if (USE_FFMPEG)
   if (DEFINED ENV{FFMPEG_ROOT})
@@ -183,7 +183,7 @@ if (BUILD_CUDA_CTC_DECODER)
   if (NOT USE_CUDA)
     message(FATAL "BUILD_CUDA_CTC_DECODER=1 but USE_CUDA=0.")
   endif()
-  add_subdirectory(src/torchaudio/csrc/cuctc)
+  add_subdirectory(src/libtorchaudio/cuctc)
 endif()
 if (BUILD_CPP_TEST)
   add_subdirectory(test/cpp)

diff --git a/src/torchaudio/csrc/CMakeLists.txt → src/libtorchaudio/CMakeLists.txt b/src/torchaudio/csrc/CMakeLists.txt → src/libtorchaudio/CMakeLists.txt
diff --git a/src/torchaudio/csrc/cuctc/CMakeLists.txt → src/libtorchaudio/cuctc/CMakeLists.txt b/src/torchaudio/csrc/cuctc/CMakeLists.txt → src/libtorchaudio/cuctc/CMakeLists.txt
diff --git a/src/torchaudio/csrc/cuctc/LICENSE → src/libtorchaudio/cuctc/LICENSE b/src/torchaudio/csrc/cuctc/LICENSE → src/libtorchaudio/cuctc/LICENSE
diff --git a/...o/csrc/cuctc/include/ctc_prefix_decoder.h → ...haudio/cuctc/include/ctc_prefix_decoder.h b/...o/csrc/cuctc/include/ctc_prefix_decoder.h → ...haudio/cuctc/include/ctc_prefix_decoder.h
diff --git a/...c/cuctc/include/ctc_prefix_decoder_host.h → ...o/cuctc/include/ctc_prefix_decoder_host.h b/...c/cuctc/include/ctc_prefix_decoder_host.h → ...o/cuctc/include/ctc_prefix_decoder_host.h
diff --git a/...audio/csrc/cuctc/src/bitonic_topk/LICENSE → ...torchaudio/cuctc/src/bitonic_topk/LICENSE b/...audio/csrc/cuctc/src/bitonic_topk/LICENSE → ...torchaudio/cuctc/src/bitonic_topk/LICENSE
diff --git a/...c/cuctc/src/bitonic_topk/bitonic_sort.cuh → ...o/cuctc/src/bitonic_topk/bitonic_sort.cuh b/...c/cuctc/src/bitonic_topk/bitonic_sort.cuh → ...o/cuctc/src/bitonic_topk/bitonic_sort.cuh
@@ -167,8 +167,9 @@ class bitonic {
    * You can think of this function in two ways:
    *
    *   1) Sort any bitonic sequence.
-   *   2) Merge two halfs of the input data assuming they're already sorted, and
-   * their order is opposite (i.e. either ascending, descending or vice-versa).
+   *   2) Merge two halves of the input data assuming they're already sorted,
+   * and their order is opposite (i.e. either ascending, descending or
+   * vice-versa).
    *
    * The input pointers are unique per-thread.
    * See the class description for the description of the data layout.

diff --git a/...src/cuctc/src/bitonic_topk/pow2_utils.cuh → ...dio/cuctc/src/bitonic_topk/pow2_utils.cuh b/...src/cuctc/src/bitonic_topk/pow2_utils.cuh → ...dio/cuctc/src/bitonic_topk/pow2_utils.cuh
diff --git a/.../cuctc/src/bitonic_topk/warpsort_topk.cuh → .../cuctc/src/bitonic_topk/warpsort_topk.cuh b/.../cuctc/src/bitonic_topk/warpsort_topk.cuh → .../cuctc/src/bitonic_topk/warpsort_topk.cuh
@@ -122,7 +122,7 @@ class warp_sort {
 
  public:
   /**
-   *  The `empty` value for the choosen binary operation,
+   *  The `empty` value for the chosen binary operation,
    *  i.e. `Ascending ? upper_bound<T>() : lower_bound<T>()`.
    */
   static constexpr T kDummy = Ascending ? upper_bound<T>() : lower_bound<T>();

diff --git a/...haudio/csrc/cuctc/src/ctc_fast_divmod.cuh → ...btorchaudio/cuctc/src/ctc_fast_divmod.cuh b/...haudio/csrc/cuctc/src/ctc_fast_divmod.cuh → ...btorchaudio/cuctc/src/ctc_fast_divmod.cuh
diff --git a/...dio/csrc/cuctc/src/ctc_prefix_decoder.cpp → ...rchaudio/cuctc/src/ctc_prefix_decoder.cpp b/...dio/csrc/cuctc/src/ctc_prefix_decoder.cpp → ...rchaudio/cuctc/src/ctc_prefix_decoder.cpp
diff --git a/...cuctc/src/ctc_prefix_decoder_kernel_v2.cu → ...cuctc/src/ctc_prefix_decoder_kernel_v2.cu b/...cuctc/src/ctc_prefix_decoder_kernel_v2.cu → ...cuctc/src/ctc_prefix_decoder_kernel_v2.cu
diff --git a/...chaudio/csrc/cuctc/src/device_data_wrap.h → ...ibtorchaudio/cuctc/src/device_data_wrap.h b/...chaudio/csrc/cuctc/src/device_data_wrap.h → ...ibtorchaudio/cuctc/src/device_data_wrap.h
diff --git a/...haudio/csrc/cuctc/src/device_log_prob.cuh → ...btorchaudio/cuctc/src/device_log_prob.cuh b/...haudio/csrc/cuctc/src/device_log_prob.cuh → ...btorchaudio/cuctc/src/device_log_prob.cuh
diff --git a/...chaudio/csrc/cuctc/src/python_binding.cpp → ...ibtorchaudio/cuctc/src/python_binding.cpp b/...chaudio/csrc/cuctc/src/python_binding.cpp → ...ibtorchaudio/cuctc/src/python_binding.cpp
diff --git a/src/torchaudio/csrc/forced_align/compute.cpp → src/libtorchaudio/forced_align/compute.cpp b/src/torchaudio/csrc/forced_align/compute.cpp → src/libtorchaudio/forced_align/compute.cpp
@@ -1,5 +1,5 @@
+#include <libtorchaudio/forced_align/compute.h>
 #include <torch/script.h>
-#include <torchaudio/csrc/forced_align/compute.h>
 
 std::tuple<torch::Tensor, torch::Tensor> forced_align(
     const torch::Tensor& logProbs,

diff --git a/src/torchaudio/csrc/forced_align/compute.h → src/libtorchaudio/forced_align/compute.h b/src/torchaudio/csrc/forced_align/compute.h → src/libtorchaudio/forced_align/compute.h
diff --git a/...chaudio/csrc/forced_align/cpu/compute.cpp → ...ibtorchaudio/forced_align/cpu/compute.cpp b/...chaudio/csrc/forced_align/cpu/compute.cpp → ...ibtorchaudio/forced_align/cpu/compute.cpp
diff --git a/...rchaudio/csrc/forced_align/gpu/compute.cu → ...libtorchaudio/forced_align/gpu/compute.cu b/...rchaudio/csrc/forced_align/gpu/compute.cu → ...libtorchaudio/forced_align/gpu/compute.cu
diff --git a/src/torchaudio/csrc/iir_cuda.cu → src/libtorchaudio/iir_cuda.cu b/src/torchaudio/csrc/iir_cuda.cu → src/libtorchaudio/iir_cuda.cu
diff --git a/src/torchaudio/csrc/iir_cuda.h → src/libtorchaudio/iir_cuda.h b/src/torchaudio/csrc/iir_cuda.h → src/libtorchaudio/iir_cuda.h
diff --git a/src/torchaudio/csrc/lfilter.cpp → src/libtorchaudio/lfilter.cpp b/src/torchaudio/csrc/lfilter.cpp → src/libtorchaudio/lfilter.cpp
@@ -2,7 +2,7 @@
 #include <torch/torch.h>
 
 #ifdef USE_CUDA
-#include <torchaudio/csrc/iir_cuda.h>
+#include <libtorchaudio/iir_cuda.h>
 #endif
 
 namespace {

diff --git a/src/torchaudio/csrc/overdrive.cpp → src/libtorchaudio/overdrive.cpp b/src/torchaudio/csrc/overdrive.cpp → src/libtorchaudio/overdrive.cpp
diff --git a/src/torchaudio/csrc/pybind/pybind.cpp → src/libtorchaudio/pybind/pybind.cpp b/src/torchaudio/csrc/pybind/pybind.cpp → src/libtorchaudio/pybind/pybind.cpp
@@ -1,5 +1,5 @@
+#include <libtorchaudio/utils.h>
 #include <torch/extension.h>
-#include <torchaudio/csrc/utils.h>
 
 namespace torchaudio {
 namespace {

diff --git a/src/torchaudio/csrc/rir/ray_tracing.cpp → src/libtorchaudio/rir/ray_tracing.cpp b/src/torchaudio/csrc/rir/ray_tracing.cpp → src/libtorchaudio/rir/ray_tracing.cpp
@@ -24,9 +24,9 @@ SOFTWARE.
 // Ray tracing implementation. This is heavily based on PyRoomAcoustics:
 // https://github.com/LCAV/pyroomacoustics
 //
+#include <libtorchaudio/rir/wall.h>
 #include <torch/script.h>
 #include <torch/torch.h>
-#include <torchaudio/csrc/rir/wall.h>
 #include <cmath>
 
 namespace torchaudio {

diff --git a/src/torchaudio/csrc/rir/rir.cpp → src/libtorchaudio/rir/rir.cpp b/src/torchaudio/csrc/rir/rir.cpp → src/libtorchaudio/rir/rir.cpp
diff --git a/src/torchaudio/csrc/rir/wall.h → src/libtorchaudio/rir/wall.h b/src/torchaudio/csrc/rir/wall.h → src/libtorchaudio/rir/wall.h
diff --git a/src/torchaudio/csrc/rnnt/autograd.cpp → src/libtorchaudio/rnnt/autograd.cpp b/src/torchaudio/csrc/rnnt/autograd.cpp → src/libtorchaudio/rnnt/autograd.cpp
@@ -1,5 +1,5 @@
+#include <libtorchaudio/rnnt/compute.h>
 #include <torch/script.h>
-#include <torchaudio/csrc/rnnt/compute.h>
 
 namespace torchaudio {
 namespace rnnt {

diff --git a/src/torchaudio/csrc/rnnt/compute.cpp → src/libtorchaudio/rnnt/compute.cpp b/src/torchaudio/csrc/rnnt/compute.cpp → src/libtorchaudio/rnnt/compute.cpp
@@ -1,5 +1,5 @@
+#include <libtorchaudio/rnnt/compute.h>
 #include <torch/script.h>
-#include <torchaudio/csrc/rnnt/compute.h>
 
 std::tuple<torch::Tensor, c10::optional<torch::Tensor>> rnnt_loss(
     torch::Tensor& logits,

diff --git a/src/torchaudio/csrc/rnnt/compute.h → src/libtorchaudio/rnnt/compute.h b/src/torchaudio/csrc/rnnt/compute.h → src/libtorchaudio/rnnt/compute.h
diff --git a/src/torchaudio/csrc/rnnt/compute_alphas.cpp → src/libtorchaudio/rnnt/compute_alphas.cpp b/src/torchaudio/csrc/rnnt/compute_alphas.cpp → src/libtorchaudio/rnnt/compute_alphas.cpp
diff --git a/src/torchaudio/csrc/rnnt/compute_betas.cpp → src/libtorchaudio/rnnt/compute_betas.cpp b/src/torchaudio/csrc/rnnt/compute_betas.cpp → src/libtorchaudio/rnnt/compute_betas.cpp
diff --git a/src/torchaudio/csrc/rnnt/cpu/compute.cpp → src/libtorchaudio/rnnt/cpu/compute.cpp b/src/torchaudio/csrc/rnnt/cpu/compute.cpp → src/libtorchaudio/rnnt/cpu/compute.cpp
@@ -1,5 +1,5 @@
+#include <libtorchaudio/rnnt/cpu/cpu_transducer.h>
 #include <torch/script.h>
-#include <torchaudio/csrc/rnnt/cpu/cpu_transducer.h>
 
 namespace torchaudio {
 namespace rnnt {

diff --git a/...rchaudio/csrc/rnnt/cpu/compute_alphas.cpp → ...libtorchaudio/rnnt/cpu/compute_alphas.cpp b/...rchaudio/csrc/rnnt/cpu/compute_alphas.cpp → ...libtorchaudio/rnnt/cpu/compute_alphas.cpp
@@ -1,5 +1,5 @@
+#include <libtorchaudio/rnnt/cpu/cpu_transducer.h>
 #include <torch/script.h>
-#include <torchaudio/csrc/rnnt/cpu/cpu_transducer.h>
 
 namespace torchaudio {
 namespace rnnt {

diff --git a/...orchaudio/csrc/rnnt/cpu/compute_betas.cpp → src/libtorchaudio/rnnt/cpu/compute_betas.cpp b/...orchaudio/csrc/rnnt/cpu/compute_betas.cpp → src/libtorchaudio/rnnt/cpu/compute_betas.cpp
@@ -1,5 +1,5 @@
+#include <libtorchaudio/rnnt/cpu/cpu_transducer.h>
 #include <torch/script.h>
-#include <torchaudio/csrc/rnnt/cpu/cpu_transducer.h>
 
 namespace torchaudio {
 namespace rnnt {

diff --git a/src/torchaudio/csrc/rnnt/cpu/cpu_kernels.h → src/libtorchaudio/rnnt/cpu/cpu_kernels.h b/src/torchaudio/csrc/rnnt/cpu/cpu_kernels.h → src/libtorchaudio/rnnt/cpu/cpu_kernels.h
@@ -1,8 +1,10 @@
 #pragma once
 
-#include <torchaudio/csrc/rnnt/cpu/math.h>
-#include <torchaudio/csrc/rnnt/options.h>
-#include <torchaudio/csrc/rnnt/types.h>
+#include <libtorchaudio/rnnt/cpu/math.h>
+#include <libtorchaudio/rnnt/options.h>
+#include <libtorchaudio/rnnt/types.h>
+
+#include <c10/util/Logging.h>
 
 #include <cstring>
 #include <limits>

diff --git a/...torchaudio/csrc/rnnt/cpu/cpu_transducer.h → src/libtorchaudio/rnnt/cpu/cpu_transducer.h b/...torchaudio/csrc/rnnt/cpu/cpu_transducer.h → src/libtorchaudio/rnnt/cpu/cpu_transducer.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <torchaudio/csrc/rnnt/cpu/cpu_kernels.h>
-#include <torchaudio/csrc/rnnt/workspace.h>
+#include <libtorchaudio/rnnt/cpu/cpu_kernels.h>
+#include <libtorchaudio/rnnt/workspace.h>
 
 namespace torchaudio {
 namespace rnnt {

diff --git a/src/torchaudio/csrc/rnnt/cpu/kernel_utils.h → src/libtorchaudio/rnnt/cpu/kernel_utils.h b/src/torchaudio/csrc/rnnt/cpu/kernel_utils.h → src/libtorchaudio/rnnt/cpu/kernel_utils.h
@@ -2,7 +2,7 @@
 
 #include <cassert>
 
-#include <torchaudio/csrc/rnnt/cpu/math.h>
+#include <libtorchaudio/rnnt/cpu/math.h>
 
 namespace torchaudio {
 namespace rnnt {

diff --git a/src/torchaudio/csrc/rnnt/cpu/math.h → src/libtorchaudio/rnnt/cpu/math.h b/src/torchaudio/csrc/rnnt/cpu/math.h → src/libtorchaudio/rnnt/cpu/math.h
@@ -1,6 +1,7 @@
 #pragma once
 
-#include <torchaudio/csrc/rnnt/macros.h>
+#include <libtorchaudio/rnnt/macros.h>
+#include <math.h>
 
 namespace torchaudio {
 namespace rnnt {

diff --git a/src/torchaudio/csrc/rnnt/gpu/compute.cu → src/libtorchaudio/rnnt/gpu/compute.cu b/src/torchaudio/csrc/rnnt/gpu/compute.cu → src/libtorchaudio/rnnt/gpu/compute.cu
@@ -1,6 +1,6 @@
 #include <c10/cuda/CUDAStream.h>
+#include <libtorchaudio/rnnt/gpu/gpu_transducer.h>
 #include <torch/types.h>
-#include <torchaudio/csrc/rnnt/gpu/gpu_transducer.h>
 
 namespace torchaudio {
 namespace rnnt {

diff --git a/...orchaudio/csrc/rnnt/gpu/compute_alphas.cu → src/libtorchaudio/rnnt/gpu/compute_alphas.cu b/...orchaudio/csrc/rnnt/gpu/compute_alphas.cu → src/libtorchaudio/rnnt/gpu/compute_alphas.cu
@@ -1,6 +1,6 @@
 #include <c10/cuda/CUDAStream.h>
+#include <libtorchaudio/rnnt/gpu/gpu_transducer.h>
 #include <torch/types.h>
-#include <torchaudio/csrc/rnnt/gpu/gpu_transducer.h>
 
 namespace torchaudio {
 namespace rnnt {

diff --git a/...torchaudio/csrc/rnnt/gpu/compute_betas.cu → src/libtorchaudio/rnnt/gpu/compute_betas.cu b/...torchaudio/csrc/rnnt/gpu/compute_betas.cu → src/libtorchaudio/rnnt/gpu/compute_betas.cu
@@ -1,6 +1,6 @@
 #include <c10/cuda/CUDAStream.h>
+#include <libtorchaudio/rnnt/gpu/gpu_transducer.h>
 #include <torch/types.h>
-#include <torchaudio/csrc/rnnt/gpu/gpu_transducer.h>
 
 namespace torchaudio {
 namespace rnnt {

diff --git a/...haudio/csrc/rnnt/gpu/gpu_kernel_utils.cuh → ...btorchaudio/rnnt/gpu/gpu_kernel_utils.cuh b/...haudio/csrc/rnnt/gpu/gpu_kernel_utils.cuh → ...btorchaudio/rnnt/gpu/gpu_kernel_utils.cuh
@@ -2,7 +2,7 @@
 
 #ifdef USE_CUDA
 
-#include <torchaudio/csrc/rnnt/gpu/math.cuh>
+#include <libtorchaudio/rnnt/gpu/math.cuh>
 
 namespace torchaudio {
 namespace rnnt {

diff --git a/src/torchaudio/csrc/rnnt/gpu/gpu_kernels.cuh → src/libtorchaudio/rnnt/gpu/gpu_kernels.cuh b/src/torchaudio/csrc/rnnt/gpu/gpu_kernels.cuh → src/libtorchaudio/rnnt/gpu/gpu_kernels.cuh
@@ -4,9 +4,9 @@
 
 #include <cassert>
 
-#include <torchaudio/csrc/rnnt/gpu/kernel_utils.h>
-#include <torchaudio/csrc/rnnt/gpu/kernels.h>
-#include <torchaudio/csrc/rnnt/gpu/math.cuh>
+#include <libtorchaudio/rnnt/gpu/kernel_utils.h>
+#include <libtorchaudio/rnnt/gpu/kernels.h>
+#include <libtorchaudio/rnnt/gpu/math.cuh>
 
 namespace torchaudio {
 namespace rnnt {

diff --git a/...torchaudio/csrc/rnnt/gpu/gpu_transducer.h → src/libtorchaudio/rnnt/gpu/gpu_transducer.h b/...torchaudio/csrc/rnnt/gpu/gpu_transducer.h → src/libtorchaudio/rnnt/gpu/gpu_transducer.h
@@ -2,9 +2,9 @@
 
 #ifdef USE_CUDA
 
-#include <torchaudio/csrc/rnnt/workspace.h>
-#include <torchaudio/csrc/rnnt/gpu/gpu_kernel_utils.cuh>
-#include <torchaudio/csrc/rnnt/gpu/gpu_kernels.cuh>
+#include <libtorchaudio/rnnt/workspace.h>
+#include <libtorchaudio/rnnt/gpu/gpu_kernel_utils.cuh>
+#include <libtorchaudio/rnnt/gpu/gpu_kernels.cuh>
 
 namespace torchaudio {
 namespace rnnt {

diff --git a/src/torchaudio/csrc/rnnt/gpu/half.cuh → src/libtorchaudio/rnnt/gpu/half.cuh b/src/torchaudio/csrc/rnnt/gpu/half.cuh → src/libtorchaudio/rnnt/gpu/half.cuh
@@ -4,7 +4,7 @@
 #include "c10/util/Half.h"
 #endif // USE_C10_HALF
 
-#include <torchaudio/csrc/rnnt/macros.h>
+#include <libtorchaudio/rnnt/macros.h>
 
 namespace torchaudio {
 namespace rnnt {

diff --git a/src/torchaudio/csrc/rnnt/gpu/kernel_utils.h → src/libtorchaudio/rnnt/gpu/kernel_utils.h b/src/torchaudio/csrc/rnnt/gpu/kernel_utils.h → src/libtorchaudio/rnnt/gpu/kernel_utils.h
@@ -2,7 +2,7 @@
 
 #include <cassert>
 
-#include <torchaudio/csrc/rnnt/gpu/math.cuh>
+#include <libtorchaudio/rnnt/gpu/math.cuh>
 
 namespace torchaudio {
 namespace rnnt {

diff --git a/src/torchaudio/csrc/rnnt/gpu/kernels.h → src/libtorchaudio/rnnt/gpu/kernels.h b/src/torchaudio/csrc/rnnt/gpu/kernels.h → src/libtorchaudio/rnnt/gpu/kernels.h
@@ -2,8 +2,8 @@
 
 #include <cassert>
 
-#include <torchaudio/csrc/rnnt/gpu/kernel_utils.h>
-#include <torchaudio/csrc/rnnt/gpu/math.cuh>
+#include <libtorchaudio/rnnt/gpu/kernel_utils.h>
+#include <libtorchaudio/rnnt/gpu/math.cuh>
 
 namespace torchaudio {
 namespace rnnt {

diff --git a/src/torchaudio/csrc/rnnt/gpu/math.cuh → src/libtorchaudio/rnnt/gpu/math.cuh b/src/torchaudio/csrc/rnnt/gpu/math.cuh → src/libtorchaudio/rnnt/gpu/math.cuh
@@ -6,7 +6,7 @@
 
 #endif // USE_CUDA
 
-#include <torchaudio/csrc/rnnt/gpu/half.cuh>
+#include <libtorchaudio/rnnt/gpu/half.cuh>
 
 namespace torchaudio {
 namespace rnnt {

diff --git a/src/torchaudio/csrc/rnnt/macros.cpp → src/libtorchaudio/rnnt/macros.cpp b/src/torchaudio/csrc/rnnt/macros.cpp → src/libtorchaudio/rnnt/macros.cpp
@@ -1,4 +1,4 @@
-#include <torchaudio/csrc/rnnt/macros.h>
+#include <libtorchaudio/rnnt/macros.h>
 
 const char* ToString(level_t level) {
   switch (level) {

diff --git a/src/torchaudio/csrc/rnnt/macros.h → src/libtorchaudio/rnnt/macros.h b/src/torchaudio/csrc/rnnt/macros.h → src/libtorchaudio/rnnt/macros.h
diff --git a/src/torchaudio/csrc/rnnt/options.h → src/libtorchaudio/rnnt/options.h b/src/torchaudio/csrc/rnnt/options.h → src/libtorchaudio/rnnt/options.h
@@ -6,8 +6,8 @@
 #include <cuda_runtime.h>
 #endif // USE_CUDA
 
-#include <torchaudio/csrc/rnnt/macros.h>
-#include <torchaudio/csrc/rnnt/types.h>
+#include <libtorchaudio/rnnt/macros.h>
+#include <libtorchaudio/rnnt/types.h>
 
 namespace torchaudio {
 namespace rnnt {

diff --git a/src/torchaudio/csrc/rnnt/types.cpp → src/libtorchaudio/rnnt/types.cpp b/src/torchaudio/csrc/rnnt/types.cpp → src/libtorchaudio/rnnt/types.cpp
@@ -1,4 +1,4 @@
-#include <torchaudio/csrc/rnnt/types.h>
+#include <libtorchaudio/rnnt/types.h>
 
 namespace torchaudio {
 namespace rnnt {

diff --git a/src/torchaudio/csrc/rnnt/types.h → src/libtorchaudio/rnnt/types.h b/src/torchaudio/csrc/rnnt/types.h → src/libtorchaudio/rnnt/types.h
diff --git a/src/torchaudio/csrc/rnnt/workspace.h → src/libtorchaudio/rnnt/workspace.h b/src/torchaudio/csrc/rnnt/workspace.h → src/libtorchaudio/rnnt/workspace.h
@@ -3,7 +3,9 @@
 #include <cstring>
 #include <vector>
 
-#include <torchaudio/csrc/rnnt/options.h>
+#include <libtorchaudio/rnnt/options.h>
+
+#include <c10/util/Logging.h>
 
 namespace torchaudio {
 namespace rnnt {

diff --git a/src/torchaudio/csrc/sox/CMakeLists.txt → src/libtorchaudio/sox/CMakeLists.txt b/src/torchaudio/csrc/sox/CMakeLists.txt → src/libtorchaudio/sox/CMakeLists.txt
diff --git a/src/torchaudio/csrc/sox/effects.cpp → src/libtorchaudio/sox/effects.cpp b/src/torchaudio/csrc/sox/effects.cpp → src/libtorchaudio/sox/effects.cpp
@@ -1,7 +1,7 @@
+#include <libtorchaudio/sox/effects.h>
+#include <libtorchaudio/sox/effects_chain.h>
+#include <libtorchaudio/sox/utils.h>
 #include <sox.h>
-#include <torchaudio/csrc/sox/effects.h>
-#include <torchaudio/csrc/sox/effects_chain.h>
-#include <torchaudio/csrc/sox/utils.h>
 
 namespace torchaudio::sox {
 namespace {

diff --git a/src/torchaudio/csrc/sox/effects.h → src/libtorchaudio/sox/effects.h b/src/torchaudio/csrc/sox/effects.h → src/libtorchaudio/sox/effects.h
@@ -1,8 +1,8 @@
 #ifndef TORCHAUDIO_SOX_EFFECTS_H
 #define TORCHAUDIO_SOX_EFFECTS_H
 
+#include <libtorchaudio/sox/utils.h>
 #include <torch/script.h>
-#include <torchaudio/csrc/sox/utils.h>
 
 namespace torchaudio::sox {
 

diff --git a/src/torchaudio/csrc/sox/effects_chain.cpp → src/libtorchaudio/sox/effects_chain.cpp b/src/torchaudio/csrc/sox/effects_chain.cpp → src/libtorchaudio/sox/effects_chain.cpp
@@ -1,5 +1,5 @@
-#include <torchaudio/csrc/sox/effects_chain.h>
-#include <torchaudio/csrc/sox/utils.h>
+#include <libtorchaudio/sox/effects_chain.h>
+#include <libtorchaudio/sox/utils.h>
 #include "c10/util/Exception.h"
 
 using namespace torch::indexing;

diff --git a/src/torchaudio/csrc/sox/effects_chain.h → src/libtorchaudio/sox/effects_chain.h b/src/torchaudio/csrc/sox/effects_chain.h → src/libtorchaudio/sox/effects_chain.h
@@ -1,8 +1,8 @@
 #ifndef TORCHAUDIO_SOX_EFFECTS_CHAIN_H
 #define TORCHAUDIO_SOX_EFFECTS_CHAIN_H
 
+#include <libtorchaudio/sox/utils.h>
 #include <sox.h>
-#include <torchaudio/csrc/sox/utils.h>
 
 namespace torchaudio::sox {
 

diff --git a/src/torchaudio/csrc/sox/io.cpp → src/libtorchaudio/sox/io.cpp b/src/torchaudio/csrc/sox/io.cpp → src/libtorchaudio/sox/io.cpp
@@ -1,8 +1,8 @@
-#include <torchaudio/csrc/sox/effects.h>
-#include <torchaudio/csrc/sox/effects_chain.h>
-#include <torchaudio/csrc/sox/io.h>
-#include <torchaudio/csrc/sox/types.h>
-#include <torchaudio/csrc/sox/utils.h>
+#include <libtorchaudio/sox/effects.h>
+#include <libtorchaudio/sox/effects_chain.h>
+#include <libtorchaudio/sox/io.h>
+#include <libtorchaudio/sox/types.h>
+#include <libtorchaudio/sox/utils.h>
 
 using namespace torch::indexing;
 

diff --git a/src/torchaudio/csrc/sox/io.h → src/libtorchaudio/sox/io.h b/src/torchaudio/csrc/sox/io.h → src/libtorchaudio/sox/io.h
@@ -1,8 +1,8 @@
 #ifndef TORCHAUDIO_SOX_IO_H
 #define TORCHAUDIO_SOX_IO_H
 
+#include <libtorchaudio/sox/utils.h>
 #include <torch/script.h>
-#include <torchaudio/csrc/sox/utils.h>
 
 namespace torchaudio::sox {
 

diff --git a/src/torchaudio/csrc/sox/pybind/pybind.cpp → src/libtorchaudio/sox/pybind/pybind.cpp b/src/torchaudio/csrc/sox/pybind/pybind.cpp → src/libtorchaudio/sox/pybind/pybind.cpp
@@ -1,5 +1,5 @@
+#include <libtorchaudio/sox/utils.h>
 #include <torch/extension.h>
-#include <torchaudio/csrc/sox/utils.h>
 
 namespace torchaudio {
 namespace sox {

diff --git a/src/torchaudio/csrc/sox/types.cpp → src/libtorchaudio/sox/types.cpp b/src/torchaudio/csrc/sox/types.cpp → src/libtorchaudio/sox/types.cpp
@@ -1,4 +1,4 @@
-#include <torchaudio/csrc/sox/types.h>
+#include <libtorchaudio/sox/types.h>
 
 namespace torchaudio::sox {
 

diff --git a/src/torchaudio/csrc/sox/types.h → src/libtorchaudio/sox/types.h b/src/torchaudio/csrc/sox/types.h → src/libtorchaudio/sox/types.h
diff --git a/src/torchaudio/csrc/sox/utils.cpp → src/libtorchaudio/sox/utils.cpp b/src/torchaudio/csrc/sox/utils.cpp → src/libtorchaudio/sox/utils.cpp
@@ -1,7 +1,7 @@
 #include <c10/core/ScalarType.h>
+#include <libtorchaudio/sox/types.h>
+#include <libtorchaudio/sox/utils.h>
 #include <sox.h>
-#include <torchaudio/csrc/sox/types.h>
-#include <torchaudio/csrc/sox/utils.h>
 
 namespace torchaudio::sox {
 

diff --git a/src/torchaudio/csrc/sox/utils.h → src/libtorchaudio/sox/utils.h b/src/torchaudio/csrc/sox/utils.h → src/libtorchaudio/sox/utils.h
diff --git a/src/torchaudio/csrc/utils.cpp → src/libtorchaudio/utils.cpp b/src/torchaudio/csrc/utils.cpp → src/libtorchaudio/utils.cpp
@@ -1,5 +1,5 @@
 #include <ATen/DynamicLibrary.h>
-#include <torchaudio/csrc/utils.h>
+#include <libtorchaudio/utils.h>
 
 #ifdef USE_CUDA
 #include <cuda.h>

diff --git a/src/torchaudio/csrc/utils.h → src/libtorchaudio/utils.h b/src/torchaudio/csrc/utils.h → src/libtorchaudio/utils.h
diff --git a/test/cpp/rir/wall_collision.cpp b/test/cpp/rir/wall_collision.cpp
@@ -1,5 +1,5 @@
 #include <gtest/gtest.h>
-#include <torchaudio/csrc/rir/wall.h>
+#include <libtorchaudio/rir/wall.h>
 
 using namespace torchaudio::rir;