Fixes after tensor/variable merge (pytorch#33)

Author: goldsborough

torchaudio/__init__.py

@@ -18,10 +18,14 @@ def _bytes(s, e):
         return s.encode(e)
 
 
+def get_tensor_type_name(tensor):
+    return tensor.type().replace('torch.', '').replace('Tensor', '')
+
+
 def check_input(src):
     if not torch.is_tensor(src):
         raise TypeError('Expected a tensor, got %s' % type(src))
-    if not src.__module__ == 'torch':
+    if src.is_cuda:
         raise TypeError('Expected a CPU based tensor, got %s' % type(src))
 
 
@@ -57,7 +61,7 @@ def load(filepath, out=None, normalization=None):
     else:
         out = torch.FloatTensor()
     # load audio signal
-    typename = type(out).__name__.replace('Tensor', '')
+    typename = get_tensor_type_name(out)
     func = getattr(th_sox, 'libthsox_{}_read_audio_file'.format(typename))
     sample_rate_p = ffi.new('int*')
     func(str(filepath).encode("utf-8"), out, sample_rate_p)
@@ -109,7 +113,7 @@ def save(filepath, src, sample_rate):
     # save data to file
     filename, extension = os.path.splitext(filepath)
     check_input(src)
-    typename = type(src).__name__.replace('Tensor', '')
+    typename = get_tensor_type_name(src)
     func = getattr(th_sox, 'libthsox_{}_write_audio_file'.format(typename))
     func(_bytes(filepath, "utf-8"), src,
          _bytes(extension[1:], "utf-8"), sample_rate)