Add abstraction for download util (#1959)

Summary: Pull Request resolved: https://github.com/pytorch/audio/pull/1959

Reviewed By: hwangjeff

Differential Revision: D32078361

fbshipit-source-id: 50b56bac9593c36197998e89db19cd6d65b793cc

torchaudio/_internal/__init__.py

-from torch.hub import download_url_to_file, load_state_dict_from_url
+try:
+    from .fb import download_url_to_file, load_state_dict_from_url
+except ImportError:
+    from torch.hub import download_url_to_file, load_state_dict_from_url
 
 
 __all__ = [

torchaudio/datasets/cmuarctic.py

@@ -5,8 +5,8 @@ from typing import Tuple, Union
 
 import torchaudio
 from torch import Tensor
-from torch.hub import download_url_to_file
 from torch.utils.data import Dataset
+from torchaudio._internal import download_url_to_file
 from torchaudio.datasets.utils import _extract_tar
 
 URL = "aew"

torchaudio/datasets/cmudict.py

@@ -3,8 +3,9 @@ import re
 from pathlib import Path
 from typing import Iterable, List, Tuple, Union
 
-from torch.hub import download_url_to_file
 from torch.utils.data import Dataset
+from torchaudio._internal import download_url_to_file
+
 
 _CHECKSUMS = {
     "http://svn.code.sf.net/p/cmusphinx/code/trunk/cmudict/cmudict-0.7b": "209a8b4cd265013e96f4658632a9878103b0c5abf62b50d4ef3ae1be226b29e4",  # noqa: E501

torchaudio/datasets/dr_vctk.py

@@ -3,8 +3,8 @@ from typing import Dict, Tuple, Union
 
 import torchaudio
 from torch import Tensor
-from torch.hub import download_url_to_file
 from torch.utils.data import Dataset
+from torchaudio._internal import download_url_to_file
 from torchaudio.datasets.utils import _extract_zip
 
 

torchaudio/datasets/gtzan.py

@@ -4,8 +4,8 @@ from typing import Optional, Tuple, Union
 
 import torchaudio
 from torch import Tensor
-from torch.hub import download_url_to_file
 from torch.utils.data import Dataset
+from torchaudio._internal import download_url_to_file
 from torchaudio.datasets.utils import _extract_tar
 
 # The following lists prefixed with `filtered_` provide a filtered split

torchaudio/datasets/librilight_limited.py

@@ -4,8 +4,8 @@ from typing import List, Tuple, Union
 
 import torchaudio
 from torch import Tensor
-from torch.hub import download_url_to_file
 from torch.utils.data import Dataset
+from torchaudio._internal import download_url_to_file
 from torchaudio.datasets.librispeech import _get_librispeech_metadata
 from torchaudio.datasets.utils import _extract_tar
 

torchaudio/datasets/librispeech.py

@@ -3,8 +3,8 @@ from pathlib import Path
 from typing import Tuple, Union
 
 from torch import Tensor
-from torch.hub import download_url_to_file
 from torch.utils.data import Dataset
+from torchaudio._internal import download_url_to_file
 from torchaudio.datasets.utils import _extract_tar, _load_waveform
 
 URL = "train-clean-100"

torchaudio/datasets/librispeech_biasing.py

@@ -3,8 +3,8 @@ from pathlib import Path
 from typing import List, Tuple, Union
 
 from torch import Tensor
-from torch.hub import download_url_to_file
 from torch.utils.data import Dataset
+from torchaudio._internal import download_url_to_file
 from torchaudio.datasets.utils import _extract_tar, _load_waveform
 
 URL = "train-clean-100"

torchaudio/datasets/libritts.py

@@ -4,8 +4,8 @@ from typing import Tuple, Union
 
 import torchaudio
 from torch import Tensor
-from torch.hub import download_url_to_file
 from torch.utils.data import Dataset
+from torchaudio._internal import download_url_to_file
 from torchaudio.datasets.utils import _extract_tar
 
 URL = "train-clean-100"

torchaudio/datasets/ljspeech.py

@@ -5,8 +5,8 @@ from typing import Tuple, Union
 
 import torchaudio
 from torch import Tensor
-from torch.hub import download_url_to_file
 from torch.utils.data import Dataset
+from torchaudio._internal import download_url_to_file
 from torchaudio.datasets.utils import _extract_tar
 
 

torchaudio/datasets/musdb_hq.py

@@ -4,8 +4,8 @@ from typing import List, Optional, Tuple, Union
 
 import torch
 import torchaudio
-from torch.hub import download_url_to_file
 from torch.utils.data import Dataset
+from torchaudio._internal import download_url_to_file
 from torchaudio.datasets.utils import _extract_zip
 
 _URL = "https://zenodo.org/record/3338373/files/musdb18hq.zip"

torchaudio/datasets/quesst14.py

@@ -4,8 +4,8 @@ from pathlib import Path
 from typing import Optional, Tuple, Union
 
 import torch
-from torch.hub import download_url_to_file
 from torch.utils.data import Dataset
+from torchaudio._internal import download_url_to_file
 from torchaudio.datasets.utils import _extract_tar, _load_waveform
 
 

torchaudio/datasets/speechcommands.py

@@ -3,8 +3,8 @@ from pathlib import Path
 from typing import Optional, Tuple, Union
 
 from torch import Tensor
-from torch.hub import download_url_to_file
 from torch.utils.data import Dataset
+from torchaudio._internal import download_url_to_file
 from torchaudio.datasets.utils import _extract_tar, _load_waveform
 
 FOLDER_IN_ARCHIVE = "SpeechCommands"

torchaudio/datasets/tedlium.py

@@ -4,8 +4,8 @@ from typing import Tuple, Union
 
 import torchaudio
 from torch import Tensor
-from torch.hub import download_url_to_file
 from torch.utils.data import Dataset
+from torchaudio._internal import download_url_to_file
 from torchaudio.datasets.utils import _extract_tar
 
 

torchaudio/datasets/vctk.py

@@ -3,8 +3,8 @@ from typing import Tuple
 
 import torchaudio
 from torch import Tensor
-from torch.hub import download_url_to_file
 from torch.utils.data import Dataset
+from torchaudio._internal import download_url_to_file
 from torchaudio.datasets.utils import _extract_zip
 
 URL = "https://datashare.is.ed.ac.uk/bitstream/handle/10283/3443/VCTK-Corpus-0.92.zip"

torchaudio/datasets/voxceleb1.py

@@ -3,8 +3,8 @@ from pathlib import Path
 from typing import List, Tuple, Union
 
 from torch import Tensor
-from torch.hub import download_url_to_file
 from torch.utils.data import Dataset
+from torchaudio._internal import download_url_to_file
 from torchaudio.datasets.utils import _extract_zip, _load_waveform
 
 

torchaudio/datasets/yesno.py

@@ -4,8 +4,8 @@ from typing import List, Tuple, Union
 
 import torchaudio
 from torch import Tensor
-from torch.hub import download_url_to_file
 from torch.utils.data import Dataset
+from torchaudio._internal import download_url_to_file
 from torchaudio.datasets.utils import _extract_tar
 
 

torchaudio/utils/download.py

@@ -5,7 +5,7 @@ from pathlib import Path
 from typing import Union
 
 import torch
-
+from torchaudio._internal import download_url_to_file
 
 _LG = logging.getLogger(__name__)
 
@@ -18,7 +18,7 @@ def _get_local_path(key):
 
 def _download(key, path, progress):
     url = f"https://download.pytorch.org/torchaudio/{key}"
-    torch.hub.download_url_to_file(url, path, progress=progress)
+    download_url_to_file(url, path, progress=progress)
 
 
 def _get_hash(path, hash, chunk_size=1028):