Merge pull request #51 from kan-bayashi/fix/Makefile

Fixed pysptk installation problem (#49)

Author: kan-bayashi

.travis.yml

@@ -11,11 +11,10 @@ matrix:
 
 install:
   - pip3 install -U pip wheel
+  - pip3 install numpy
+  - pip3 install https://download.pytorch.org/whl/cpu/torch-1.0.1.post2-cp36-cp36m-linux_x86_64.whl
+  - pip3 install -r tools/requirements.txt
   - pip3 install -r ./tools/test_requirements.txt
-  - grep -v torch ./tools/requirements.txt | pip3 install -r /dev/stdin
-    # use pytorch cpu v0.4.1 (1.0.0 is super slow)
-  - pip3 install https://download.pytorch.org/whl/cpu/torch-0.4.1-cp36-cp36m-linux_x86_64.whl
-  - pip3 install torchvision
 
 script:
   - flake8 src test

test/test_generator.py

@@ -7,12 +7,13 @@
 import argparse
 import os
 
-from decode import decode_generator
 from feature_extract import melspectrogram_extract
 from feature_extract import world_feature_extract
-from train import train_generator
 from utils import find_files
 
+from decode import decode_generator
+from train import train_generator
+
 from test_preprocessing import make_args as make_feature_args
 from test_preprocessing import make_dummy_wav
 

tools/Makefile

@@ -5,6 +5,7 @@ all: venv/bin/activate
 venv/bin/activate:
 	test -d venv || virtualenv -p python3.6 venv
 	. venv/bin/activate; pip install --upgrade pip
+	. venv/bin/activate; pip install numpy
 	. venv/bin/activate; pip install -r requirements.txt
 	touch venv/bin/activate
 

tools/requirements.txt

@@ -1,8 +1,7 @@
-numpy==1.13.3
 h5py>=2.9.0
 scikit-learn>=0.20.2
 librosa>=0.6.2
 soundfile>=0.10.2
-torch>=1.0.0
+torch>=1.0.1
 torchvision>=0.2.1
 sprocket-vc>=0.18.2