Commit 55ce80b1 authored by moto's avatar moto Committed by Facebook GitHub Bot
Browse files

Update notes around nightly build and third parties (#2632)

Summary:
Google Colab now has torchaudio 0.12 pre-installed.
This commit removes the note about nightly build.

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

Reviewed By: carolineechen

Differential Revision: D38827632

Pulled By: mthrok

fbshipit-source-id: ac769780868b741c3012357d589ec0019d9af6eb
parent cab2bb44
...@@ -10,16 +10,11 @@ on laptop. ...@@ -10,16 +10,11 @@ on laptop.
.. note:: .. note::
This tutorial requires Streaming API, FFmpeg libraries (>=4.1, <5), This tutorial requires FFmpeg libraries (>=4.1, <4.4) and SentencePiece.
and SentencePiece.
The Streaming API is available in nightly build.
Please refer to https://pytorch.org/get-started/locally
for instructions.
There are multiple ways to install FFmpeg libraries. There are multiple ways to install FFmpeg libraries.
If you are using Anaconda Python distribution, If you are using Anaconda Python distribution,
``conda install 'ffmpeg<5'`` will install ``conda install 'ffmpeg<4.4'`` will install
the required FFmpeg libraries. the required FFmpeg libraries.
You can install SentencePiece by running ``pip install sentencepiece``. You can install SentencePiece by running ``pip install sentencepiece``.
......
...@@ -13,16 +13,11 @@ to perform online speech recognition. ...@@ -13,16 +13,11 @@ to perform online speech recognition.
# #
# .. note:: # .. note::
# #
# This tutorial requires Streaming API, FFmpeg libraries (>=4.1, <5), # This tutorial requires FFmpeg libraries (>=4.1, <4.4) and SentencePiece.
# and SentencePiece.
#
# The Streaming API is available in nightly builds.
# Please refer to https://pytorch.org/get-started/locally/
# for instructions.
# #
# There are multiple ways to install FFmpeg libraries. # There are multiple ways to install FFmpeg libraries.
# If you are using Anaconda Python distribution, # If you are using Anaconda Python distribution,
# ``conda install 'ffmpeg<5'`` will install # ``conda install 'ffmpeg<4.4'`` will install
# the required FFmpeg libraries. # the required FFmpeg libraries.
# #
# You can install SentencePiece by running ``pip install sentencepiece``. # You can install SentencePiece by running ``pip install sentencepiece``.
...@@ -44,10 +39,16 @@ to perform online speech recognition. ...@@ -44,10 +39,16 @@ to perform online speech recognition.
# -------------- # --------------
# #
import IPython
import torch import torch
import torchaudio import torchaudio
print(torch.__version__)
print(torchaudio.__version__)
######################################################################
#
import IPython
try: try:
from torchaudio.io import StreamReader from torchaudio.io import StreamReader
except ModuleNotFoundError: except ModuleNotFoundError:
...@@ -56,13 +57,9 @@ except ModuleNotFoundError: ...@@ -56,13 +57,9 @@ except ModuleNotFoundError:
print( print(
""" """
To enable running this notebook in Google Colab, install nightly To enable running this notebook in Google Colab, install the requisite
torch and torchaudio builds and the requisite third party libraries by third party libraries by running the following code block:
adding the following code block to the top of the notebook before running it:
!pip3 uninstall -y torch torchvision torchaudio
!pip3 install --pre torch torchaudio --extra-index-url https://download.pytorch.org/whl/nightly/cpu
!pip3 install sentencepiece
!add-apt-repository -y ppa:savoury1/ffmpeg4 !add-apt-repository -y ppa:savoury1/ffmpeg4
!apt-get -qq install -y ffmpeg !apt-get -qq install -y ffmpeg
""" """
...@@ -71,9 +68,6 @@ except ModuleNotFoundError: ...@@ -71,9 +68,6 @@ except ModuleNotFoundError:
pass pass
raise raise
print(torch.__version__)
print(torchaudio.__version__)
###################################################################### ######################################################################
# 3. Construct the pipeline # 3. Construct the pipeline
......
...@@ -29,12 +29,9 @@ except ModuleNotFoundError: ...@@ -29,12 +29,9 @@ except ModuleNotFoundError:
print( print(
""" """
To enable running this notebook in Google Colab, install nightly To enable running this notebook in Google Colab, install the requisite
torch and torchaudio builds and the requisite third party libraries by third party libraries by running the following code:
adding the following code block to the top of the notebook before running it:
!pip3 uninstall -y torch torchvision torchaudio
!pip3 install --pre torch torchaudio --extra-index-url https://download.pytorch.org/whl/nightly/cpu
!add-apt-repository -y ppa:savoury1/ffmpeg4 !add-apt-repository -y ppa:savoury1/ffmpeg4
!apt-get -qq install -y ffmpeg !apt-get -qq install -y ffmpeg
""" """
......
...@@ -12,15 +12,11 @@ libavfilter provides. ...@@ -12,15 +12,11 @@ libavfilter provides.
# #
# .. note:: # .. note::
# #
# This tutorial requires Streaming API and FFmpeg libraries (>=4.1, <5). # This tutorial requires FFmpeg libraries (>=4.1, <4.4).
#
# The Streaming API is available in nightly builds.
# Please refer to https://pytorch.org/get-started/locally/
# for instructions.
# #
# There are multiple ways to install FFmpeg libraries. # There are multiple ways to install FFmpeg libraries.
# If you are using Anaconda Python distribution, # If you are using Anaconda Python distribution,
# ``conda install -c anaconda 'ffmpeg<5'`` will install # ``conda install -c anaconda 'ffmpeg<4.4'`` will install
# the required libraries. # the required libraries.
# #
...@@ -78,12 +74,9 @@ except ModuleNotFoundError: ...@@ -78,12 +74,9 @@ except ModuleNotFoundError:
print( print(
""" """
To enable running this notebook in Google Colab, install nightly To enable running this notebook in Google Colab, install the requisite
torch and torchaudio builds and the requisite third party libraries by third party libraries by running the following code:
adding the following code block to the top of the notebook before running it:
!pip3 uninstall -y torch torchvision torchaudio
!pip3 install --pre torch torchaudio --extra-index-url https://download.pytorch.org/whl/nightly/cpu
!add-apt-repository -y ppa:savoury1/ffmpeg4 !add-apt-repository -y ppa:savoury1/ffmpeg4
!apt-get -qq install -y ffmpeg !apt-get -qq install -y ffmpeg
""" """
...@@ -92,7 +85,6 @@ except ModuleNotFoundError: ...@@ -92,7 +85,6 @@ except ModuleNotFoundError:
pass pass
raise raise
import IPython
import matplotlib.pyplot as plt import matplotlib.pyplot as plt
base_url = "https://download.pytorch.org/torchaudio/tutorial-assets" base_url = "https://download.pytorch.org/torchaudio/tutorial-assets"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment