Revert "Get rid of copy-pasted sources and put them in fork"

This reverts commit dbe8039.

.circleci/torchscript_bc_test/common.sh

@@ -66,7 +66,5 @@ build_master() {
     conda install -y -q pytorch "cpuonly" -c pytorch-nightly
     printf "* Installing torchaudio\n"
     cd "${_root_dir}" || exit 1
-    git submodule sync
-    git submodule update --init --recursive
     BUILD_SOX=1 python setup.py clean install
 }

.circleci/unittest/linux/scripts/install.sh

@@ -38,8 +38,6 @@ conda install -y -c "pytorch-${UPLOAD_CHANNEL}" pytorch ${cudatoolkit}
 
 # 2. Install torchaudio
 printf "* Installing torchaudio\n"
-git submodule sync
-git submodule update --init --recursive
 BUILD_SOX=1 python setup.py install
 
 # 3. Install Test tools

.circleci/unittest/windows/scripts/install.sh

@@ -29,8 +29,6 @@ conda install -y -c "pytorch-${UPLOAD_CHANNEL}" pytorch "${cudatoolkit}"
 
 # 2. Install torchaudio
 printf "* Installing torchaudio\n"
-git submodule sync
-git submodule update --init --recursive
 python setup.py install
 
 # 3. Install Test tools

build_tools/setup_helpers/extension.py

@@ -18,7 +18,6 @@
 _CSRC_DIR = _ROOT_DIR / 'torchaudio' / 'csrc'
 _TP_BASE_DIR = _ROOT_DIR / 'third_party'
 _TP_INSTALL_DIR = _TP_BASE_DIR / 'install'
-_KALDI_SRC_DIR = _TP_BASE_DIR / 'kaldi' / 'src'
 
 
 def _get_build_sox():
@@ -58,34 +57,15 @@ def _get_ela(debug):
     return ela
 
 
-def _get_kaldi_srcs():
-    srcs = [str(p) for p in (_CSRC_DIR / 'kaldi').glob('**/*.cc')]
-    srcs += [
-        str(p) for p in [
-            _KALDI_SRC_DIR / 'base' / 'kaldi-error.cc',
-            _KALDI_SRC_DIR / 'base' / 'kaldi-math.cc',
-            _KALDI_SRC_DIR / 'feat' / 'feature-functions.cc',
-            _KALDI_SRC_DIR / 'feat' / 'pitch-functions.cc',
-            _KALDI_SRC_DIR / 'feat' / 'resample.cc',
-        ]
-    ]
-    return srcs
-
-
-def _get_kaldi_header_dirs():
-    return [
-        str(_CSRC_DIR / 'kaldi'),
-        str(_KALDI_SRC_DIR),
-    ]
-
-
 def _get_srcs():
-    return [str(p) for p in _CSRC_DIR.glob('**/*.cpp')] + _get_kaldi_srcs()
+    return [str(p) for p in _CSRC_DIR.glob('**/*.cpp')] + [str(p) for p in _CSRC_DIR.glob('**/*.cc')]
 
 
 def _get_include_dirs():
-    dirs = [str(_ROOT_DIR)]
-    dirs += _get_kaldi_header_dirs()
+    dirs = [
+        str(_ROOT_DIR),
+        str(_CSRC_DIR / 'kaldi'),
+    ]
     if _BUILD_SOX:
         dirs.append(str(_TP_INSTALL_DIR / 'include'))
     return dirs

packaging/build_wheel.sh

@@ -10,8 +10,6 @@ setup_env 0.8.0
 setup_wheel_python
 pip_install numpy future
 setup_pip_pytorch_version
-git submodule sync
-git submodule update --init --recursive
 python setup.py clean
 if [[ "$OSTYPE" == "msys" ]]; then
     python_tag="$(echo "cp$PYTHON_VERSION" | tr -d '.')"

packaging/torchaudio/bld.bat

@@ -2,6 +2,4 @@
 
 set IS_CONDA=1
 
-git submodule sync
-git submodule update --init --recursive
 python setup.py install --single-version-externally-managed --record=record.txt

packaging/torchaudio/build.sh

@@ -1,6 +1,4 @@
 #!/usr/bin/env bash
 set -ex
 
-git submodule sync
-git submodule update --init --recursive
 BUILD_SOX=1 python setup.py install --single-version-externally-managed --record=record.txt