Moving commits from master to v0.2.0 (#181)

Author: jamarshon

build_tools/packaging/README.md

@@ -5,6 +5,7 @@
  ### Linux
 
  ```bash
+# NB: We don't actually need CUDA; you don't have to run this on nvidia-docker
 nvidia-docker run -it --ipc=host --rm -v $(pwd):/remote soumith/conda-cuda bash
 pushd remote/conda
 conda config --add channels pytorch

build_tools/packaging/wheel/build_from_source.sh

@@ -5,30 +5,39 @@ cd source_code
 wget -q -O sox-14.4.2.tar.bz2 "http://downloads.sourceforge.net/project/sox/sox/14.4.2/sox-14.4.2.tar.bz2?r=http%3A%2F%2Fsourceforge.net%2Fprojects%2Fsox%2Ffiles%2Fsox%2F14.4.2%2F&ts=1416316415&use_mirror=heanet"
 wget -q -O lame-3.99.5.tar.gz "http://downloads.sourceforge.net/project/lame/lame/3.99/lame-3.99.5.tar.gz?r=http%3A%2F%2Fsourceforge.net%2Fprojects%2Flame%2Ffiles%2Flame%2F3.99%2F&ts=1416316457&use_mirror=kent"
 wget -q -O flac-1.3.2.tar.xz "https://superb-dca2.dl.sourceforge.net/project/flac/flac-src/flac-1.3.2.tar.xz"
+wget -q -O libmad-0.15.1b.tar.gz "https://downloads.sourceforge.net/project/mad/libmad/0.15.1b/libmad-0.15.1b.tar.gz"
 
 # unpack the dependencies
 tar xfp sox-14.4.2.tar.bz2
 tar xfp lame-3.99.5.tar.gz
 tar xfp flac-1.3.2.tar.xz
+tar xfp libmad-0.15.1b.tar.gz
 
 # build lame, statically
 pushd lame-3.99.5
 ./configure --disable-shared --enable-static --prefix="$PREFIX/audio/third_party/lame" CFLAGS=-fPIC CXXFLAGS=-fPIC --with-pic --disable-debug --disable-dependency-tracking --enable-nasm
-make -s && make install
+make -s -j && make install
 popd
 
 # build flac, statically
 pushd flac-1.3.2
 ./configure --disable-shared --enable-static --prefix="$PREFIX/audio/third_party/flac" CFLAGS=-fPIC CXXFLAGS=-fPIC \
-	--with-pic --disable-debug --disable-dependency-tracking
-make -s && make install
+    --with-pic --disable-debug --disable-dependency-tracking
+make -s -j && make install
+popd
+
+# build mad, statically
+pushd libmad-0.15.1b
+./configure --disable-shared --enable-static --prefix="$PREFIX/audio/third_party/mad" CFLAGS=-fPIC CXXFLAGS=-fPIC \
+    --with-pic --disable-debug --disable-dependency-tracking
+make -s -j && make install
 popd
 
 # build sox, statically
 pushd sox-14.4.2
 ./configure --disable-shared --enable-static --prefix="$PREFIX/audio/third_party/sox" \
-    LDFLAGS="-L$PREFIX/audio/third_party/lame/lib -L$PREFIX/audio/third_party/flac/lib" \
-    CPPFLAGS="-I$PREFIX/audio/third_party/lame/include -I$PREFIX/audio/third_party/flac/include" \
-    --with-lame --with-flac --without-oggvorbis --without-oss --without-sndfile CFLAGS=-fPIC CXXFLAGS=-fPIC --with-pic --disable-debug --disable-dependency-tracking
-make -s && make install
+    LDFLAGS="-L$PREFIX/audio/third_party/lame/lib -L$PREFIX/audio/third_party/flac/lib -L$PREFIX/audio/third_party/mad/lib" \
+    CPPFLAGS="-I$PREFIX/audio/third_party/lame/include -I$PREFIX/audio/third_party/flac/include -I$PREFIX/audio/third_party/mad/include" \
+    --with-lame --with-flac --with-mad --without-oggvorbis --without-oss --without-sndfile CFLAGS=-fPIC CXXFLAGS=-fPIC --with-pic --disable-debug --disable-dependency-tracking
+make -s -j && make install
 popd

setup.py

@@ -76,6 +76,8 @@ def check_env_flag(name, default=''):
     f.write("__version__ = '{}'\n".format(version))
     f.write("git_version = {}\n".format(repr(sha)))
 
+pytorch_package_name = os.getenv('TORCHAUDIO_PYTORCH_DEPENDENCY_NAME', 'torch')
+
 setup(
     name="torchaudio",
     version="0.2",
@@ -111,5 +113,5 @@ def check_env_flag(name, default=''):
             extra_link_args=ela),
     ],
     cmdclass={'build_ext': BuildExtension},
-    install_requires=['torch']
+    install_requires=[pytorch_package_name]
 )