Skip to content

Refactor sox pybind source code #2636

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.

Sign up for GitHub

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

Closed
wants to merge 1 commit into from
Closed

Refactor sox pybind source code #2636

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions torchaudio/csrc/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,12 +163,13 @@ if(USE_FFMPEG)
endif()

################################################################################
# TODO: Rename this to _torchaudio_sox.so
# _torchaudio.so
################################################################################
if (BUILD_TORCHAUDIO_PYTHON_EXTENSION)
set(
EXTENSION_SOURCES
pybind/pybind.cpp
sox/pybind/pybind.cpp
)
#----------------------------------------------------------------------------#
# START OF CUSTOMIZATION LOGICS
Expand All @@ -177,10 +178,10 @@ if (BUILD_TORCHAUDIO_PYTHON_EXTENSION)
list(
APPEND
EXTENSION_SOURCES
pybind/sox/effects.cpp
pybind/sox/effects_chain.cpp
pybind/sox/io.cpp
pybind/sox/utils.cpp
sox/pybind/effects.cpp
sox/pybind/effects_chain.cpp
sox/pybind/io.cpp
sox/pybind/utils.cpp
)
endif()
#----------------------------------------------------------------------------#
Expand Down
6 changes: 3 additions & 3 deletions torchaudio/csrc/pybind/sox/effects.cpp → torchaudio/csrc/sox/pybind/effects.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include <torchaudio/csrc/pybind/sox/effects.h>
#include <torchaudio/csrc/pybind/sox/effects_chain.h>
#include <torchaudio/csrc/pybind/sox/utils.h>
#include <torchaudio/csrc/sox/pybind/effects.h>
#include <torchaudio/csrc/sox/pybind/effects_chain.h>
#include <torchaudio/csrc/sox/pybind/utils.h>

using namespace torchaudio::sox_utils;

Expand Down
0 torchaudio/csrc/pybind/sox/effects.h → torchaudio/csrc/sox/pybind/effects.h
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions torchaudio/csrc/pybind/sox/effects_chain.cpp → torchaudio/csrc/sox/pybind/effects_chain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include <sox.h>
#include <torchaudio/csrc/pybind/sox/effects_chain.h>
#include <torchaudio/csrc/pybind/sox/utils.h>
#include <torchaudio/csrc/sox/pybind/effects_chain.h>
#include <torchaudio/csrc/sox/pybind/utils.h>

using namespace torchaudio::sox_utils;

Expand Down
0 torchaudio/csrc/pybind/sox/effects_chain.h → torchaudio/csrc/sox/pybind/effects_chain.h
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions torchaudio/csrc/pybind/sox/io.cpp → torchaudio/csrc/sox/pybind/io.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#include <torchaudio/csrc/pybind/sox/effects.h>
#include <torchaudio/csrc/pybind/sox/effects_chain.h>
#include <torchaudio/csrc/pybind/sox/io.h>
#include <torchaudio/csrc/pybind/sox/utils.h>
#include <torchaudio/csrc/sox/io.h>
#include <torchaudio/csrc/sox/pybind/effects.h>
#include <torchaudio/csrc/sox/pybind/effects_chain.h>
#include <torchaudio/csrc/sox/pybind/io.h>
#include <torchaudio/csrc/sox/pybind/utils.h>
#include <torchaudio/csrc/sox/types.h>

#include <utility>
Expand Down
0 torchaudio/csrc/pybind/sox/io.h → torchaudio/csrc/sox/pybind/io.h
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions torchaudio/csrc/pybind/pybind.cpp → torchaudio/csrc/sox/pybind/pybind.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#include <torch/extension.h>

#ifdef INCLUDE_SOX
#include <torchaudio/csrc/pybind/sox/effects.h>
#include <torchaudio/csrc/pybind/sox/io.h>
#include <torchaudio/csrc/sox/pybind/effects.h>
#include <torchaudio/csrc/sox/pybind/io.h>
#endif

PYBIND11_MODULE(_torchaudio, m) {
Expand Down
2 changes: 1 addition & 1 deletion torchaudio/csrc/pybind/sox/utils.cpp → torchaudio/csrc/sox/pybind/utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <torchaudio/csrc/pybind/sox/utils.h>
#include <torchaudio/csrc/sox/pybind/utils.h>

namespace torchaudio::sox_utils {

Expand Down
0 torchaudio/csrc/pybind/sox/utils.h → torchaudio/csrc/sox/pybind/utils.h
View file
Open in desktop
File renamed without changes.