Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
OpenDAS
Torchaudio
Commits
eb1b3f1f
Unverified
Commit
eb1b3f1f
authored
Feb 19, 2021
by
Eli Uriegas
Committed by
GitHub
Feb 19, 2021
Browse files
Add Python 3.9 support (#1242)
Signed-off-by:
Eli Uriegas
<
eliuriegas@fb.com
>
parent
3488f314
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
338 additions
and
18 deletions
+338
-18
.circleci/config.yml
.circleci/config.yml
+247
-2
.circleci/config.yml.in
.circleci/config.yml.in
+28
-2
.circleci/regenerate.py
.circleci/regenerate.py
+1
-1
.circleci/unittest/linux/scripts/install.sh
.circleci/unittest/linux/scripts/install.sh
+16
-8
.circleci/unittest/windows/scripts/environment.yml
.circleci/unittest/windows/scripts/environment.yml
+16
-0
.circleci/unittest/windows/scripts/install.sh
.circleci/unittest/windows/scripts/install.sh
+13
-3
.circleci/unittest/windows/scripts/setup_env.sh
.circleci/unittest/windows/scripts/setup_env.sh
+6
-0
packaging/pkg_helpers.bash
packaging/pkg_helpers.bash
+8
-2
packaging/torchaudio/meta.yaml
packaging/torchaudio/meta.yaml
+2
-0
setup.py
setup.py
+1
-0
No files found.
.circleci/config.yml
View file @
eb1b3f1f
...
...
@@ -45,6 +45,16 @@ commands:
name
:
Install pkg-config
command
:
HOMEBREW_NO_AUTO_UPDATE=1 brew install pkg-config wget
# Disable brew auto update which is very slow
load_conda_channel_flags
:
description
:
"
Determines
whether
we
need
extra
conda
channels"
steps
:
-
run
:
name
:
Adding CONDA_CHANNEL_FLAGS to BASH_ENV
command
:
|
CONDA_CHANNEL_FLAGS=""
if [[ "${PYTHON_VERSION}" = *3.9* ]]; then
echo "export CONDA_CHANNEL_FLAGS=-c=conda-forge" >> ${BASH_ENV}
fi
binary_common
:
&binary_common
parameters
:
...
...
@@ -117,7 +127,7 @@ jobs:
binary_linux_wheel
:
<<
:
*binary_common
docker
:
-
image
:
"
pytorch/manylinux-cuda10
0
"
-
image
:
"
pytorch/manylinux-cuda10
2
"
resource_class
:
2xlarge+
steps
:
-
checkout
...
...
@@ -138,6 +148,7 @@ jobs:
resource_class
:
2xlarge+
steps
:
-
checkout
-
load_conda_channel_flags
-
attach_workspace
:
at
:
third_party
-
run
:
packaging/build_conda.sh
...
...
@@ -155,6 +166,7 @@ jobs:
steps
:
-
checkout
-
install_build_tools_macos
-
load_conda_channel_flags
-
attach_workspace
:
at
:
third_party
-
run
:
...
...
@@ -180,6 +192,7 @@ jobs:
steps
:
-
checkout
-
install_build_tools_macos
-
load_conda_channel_flags
-
attach_workspace
:
at
:
third_party
-
run
:
...
...
@@ -202,6 +215,7 @@ jobs:
name
:
windows-cpu
steps
:
-
checkout
-
load_conda_channel_flags
-
run
:
name
:
build
command
:
|
...
...
@@ -221,6 +235,7 @@ jobs:
name
:
windows-cpu
steps
:
-
checkout
-
load_conda_channel_flags
-
run
:
name
:
build
command
:
|
...
...
@@ -278,6 +293,7 @@ jobs:
-
attach_workspace
:
at
:
~/workspace
-
designate_upload_channel
-
load_conda_channel_flags
-
run
:
name
:
install binaries
command
:
|
...
...
@@ -297,6 +313,7 @@ jobs:
-
attach_workspace
:
at
:
~/workspace
-
designate_upload_channel
-
load_conda_channel_flags
-
run
:
name
:
install binaries
command
:
|
...
...
@@ -317,6 +334,7 @@ jobs:
-
attach_workspace
:
at
:
~/workspace
-
designate_upload_channel
-
load_conda_channel_flags
-
run
:
name
:
install binaries
command
:
|
...
...
@@ -342,6 +360,7 @@ jobs:
-
attach_workspace
:
at
:
~/workspace
-
designate_upload_channel
-
load_conda_channel_flags
-
run
:
name
:
install binaries
command
:
|
...
...
@@ -395,6 +414,7 @@ jobs:
-
attach_workspace
:
at
:
third_party
-
designate_upload_channel
-
load_conda_channel_flags
-
run
:
name
:
Setup
command
:
.circleci/unittest/linux/scripts/setup_env.sh
...
...
@@ -423,6 +443,7 @@ jobs:
-
attach_workspace
:
at
:
third_party
-
designate_upload_channel
-
load_conda_channel_flags
-
run
:
name
:
Pull Docker image
command
:
docker pull --quiet "${image_name}"
...
...
@@ -431,7 +452,7 @@ jobs:
command
:
docker run -t --gpus all -e PYTHON_VERSION -v $PWD:$PWD -w $PWD "${image_name}" .circleci/unittest/linux/scripts/setup_env.sh
-
run
:
name
:
Install torchaudio
command
:
docker run -t --gpus all -e UPLOAD_CHANNEL -v $PWD:$PWD -w $PWD "${image_name}" .circleci/unittest/linux/scripts/install.sh
command
:
docker run -t --gpus all -e UPLOAD_CHANNEL
-e CONDA_CHANNEL_FLAGS
-v $PWD:$PWD -w $PWD "${image_name}" .circleci/unittest/linux/scripts/install.sh
-
run
:
name
:
Run tests
command
:
docker run -t --gpus all -v $PWD:$PWD -w $PWD "${image_name}" .circleci/unittest/linux/scripts/run_test.sh
...
...
@@ -448,6 +469,7 @@ jobs:
steps
:
-
checkout
-
designate_upload_channel
-
load_conda_channel_flags
-
run
:
name
:
Setup
command
:
.circleci/unittest/windows/scripts/setup_env.sh
...
...
@@ -473,6 +495,7 @@ jobs:
steps
:
-
checkout
-
designate_upload_channel
-
load_conda_channel_flags
-
run
:
name
:
Setup
command
:
.circleci/unittest/windows/scripts/setup_env.sh
...
...
@@ -496,6 +519,7 @@ jobs:
steps
:
-
checkout
-
install_build_tools_macos
-
load_conda_channel_flags
-
attach_workspace
:
at
:
third_party
-
designate_upload_channel
...
...
@@ -522,6 +546,7 @@ jobs:
steps
:
-
checkout
-
designate_upload_channel
-
load_conda_channel_flags
-
run
:
name
:
Setup
command
:
.circleci/unittest/linux/scripts/setup_env.sh
...
...
@@ -538,6 +563,7 @@ jobs:
-
attach_workspace
:
at
:
~/workspace
-
checkout
-
load_conda_channel_flags
-
run
:
name
:
Install pytorch-audio
command
:
.circleci/build_docs/install_wheels.sh
...
...
@@ -610,6 +636,11 @@ workflows:
python_version
:
'
3.8'
requires
:
-
download_third_parties_nix
-
binary_linux_wheel
:
name
:
binary_linux_wheel_py3.9
python_version
:
'
3.9'
requires
:
-
download_third_parties_nix
-
binary_macos_wheel
:
name
:
binary_macos_wheel_py3.6
python_version
:
'
3.6'
...
...
@@ -625,6 +656,11 @@ workflows:
python_version
:
'
3.8'
requires
:
-
download_third_parties_nix
-
binary_macos_wheel
:
name
:
binary_macos_wheel_py3.9
python_version
:
'
3.9'
requires
:
-
download_third_parties_nix
-
binary_windows_wheel
:
name
:
binary_windows_wheel_py3.6
python_version
:
'
3.6'
...
...
@@ -634,6 +670,9 @@ workflows:
-
binary_windows_wheel
:
name
:
binary_windows_wheel_py3.8
python_version
:
'
3.8'
-
binary_windows_wheel
:
name
:
binary_windows_wheel_py3.9
python_version
:
'
3.9'
-
binary_linux_conda
:
name
:
binary_linux_conda_py3.6
python_version
:
'
3.6'
...
...
@@ -649,6 +688,11 @@ workflows:
python_version
:
'
3.8'
requires
:
-
download_third_parties_nix
-
binary_linux_conda
:
name
:
binary_linux_conda_py3.9
python_version
:
'
3.9'
requires
:
-
download_third_parties_nix
-
binary_macos_conda
:
name
:
binary_macos_conda_py3.6
python_version
:
'
3.6'
...
...
@@ -664,6 +708,11 @@ workflows:
python_version
:
'
3.8'
requires
:
-
download_third_parties_nix
-
binary_macos_conda
:
name
:
binary_macos_conda_py3.9
python_version
:
'
3.9'
requires
:
-
download_third_parties_nix
-
binary_windows_conda
:
name
:
binary_windows_conda_py3.6
python_version
:
'
3.6'
...
...
@@ -673,6 +722,9 @@ workflows:
-
binary_windows_conda
:
name
:
binary_windows_conda_py3.8
python_version
:
'
3.8'
-
binary_windows_conda
:
name
:
binary_windows_conda_py3.9
python_version
:
'
3.9'
-
build_docs
:
name
:
build_docs
python_version
:
'
3.8'
...
...
@@ -717,6 +769,11 @@ workflows:
python_version
:
'
3.8'
requires
:
-
download_third_parties_nix
-
unittest_linux_cpu
:
name
:
unittest_linux_cpu_py3.9
python_version
:
'
3.9'
requires
:
-
download_third_parties_nix
-
unittest_linux_gpu
:
name
:
unittest_linux_gpu_py3.6
python_version
:
'
3.6'
...
...
@@ -732,6 +789,11 @@ workflows:
python_version
:
'
3.8'
requires
:
-
download_third_parties_nix
-
unittest_linux_gpu
:
name
:
unittest_linux_gpu_py3.9
python_version
:
'
3.9'
requires
:
-
download_third_parties_nix
-
unittest_windows_cpu
:
name
:
unittest_windows_cpu_py3.6
python_version
:
'
3.6'
...
...
@@ -741,6 +803,9 @@ workflows:
-
unittest_windows_cpu
:
name
:
unittest_windows_cpu_py3.8
python_version
:
'
3.8'
-
unittest_windows_cpu
:
name
:
unittest_windows_cpu_py3.9
python_version
:
'
3.9'
-
unittest_windows_gpu
:
name
:
unittest_windows_gpu_py3.6
python_version
:
'
3.6'
...
...
@@ -750,6 +815,9 @@ workflows:
-
unittest_windows_gpu
:
name
:
unittest_windows_gpu_py3.8
python_version
:
'
3.8'
-
unittest_windows_gpu
:
name
:
unittest_windows_gpu_py3.9
python_version
:
'
3.9'
-
unittest_macos_cpu
:
name
:
unittest_macos_cpu_py3.6
python_version
:
'
3.6'
...
...
@@ -765,6 +833,11 @@ workflows:
python_version
:
'
3.8'
requires
:
-
download_third_parties_nix
-
unittest_macos_cpu
:
name
:
unittest_macos_cpu_py3.9
python_version
:
'
3.9'
requires
:
-
download_third_parties_nix
nightly
:
jobs
:
-
circleci_consistency
:
...
...
@@ -878,6 +951,39 @@ workflows:
python_version
:
'
3.8'
requires
:
-
nightly_binary_linux_wheel_py3.8_upload
-
binary_linux_wheel
:
filters
:
branches
:
only
:
-
nightly
tags
:
only
:
/v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name
:
nightly_binary_linux_wheel_py3.9
python_version
:
'
3.9'
requires
:
-
download_third_parties_nix
-
binary_wheel_upload
:
context
:
org-member
filters
:
branches
:
only
:
-
nightly
tags
:
only
:
/v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name
:
nightly_binary_linux_wheel_py3.9_upload
requires
:
-
nightly_binary_linux_wheel_py3.9
-
smoke_test_linux_pip
:
filters
:
branches
:
only
:
-
nightly
tags
:
only
:
/v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name
:
nightly_binary_linux_wheel_py3.9_smoke_test_pip
python_version
:
'
3.9'
requires
:
-
nightly_binary_linux_wheel_py3.9_upload
-
binary_macos_wheel
:
filters
:
branches
:
...
...
@@ -944,6 +1050,28 @@ workflows:
name
:
nightly_binary_macos_wheel_py3.8_upload
requires
:
-
nightly_binary_macos_wheel_py3.8
-
binary_macos_wheel
:
filters
:
branches
:
only
:
-
nightly
tags
:
only
:
/v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name
:
nightly_binary_macos_wheel_py3.9
python_version
:
'
3.9'
requires
:
-
download_third_parties_nix
-
binary_wheel_upload
:
context
:
org-member
filters
:
branches
:
only
:
-
nightly
tags
:
only
:
/v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name
:
nightly_binary_macos_wheel_py3.9_upload
requires
:
-
nightly_binary_macos_wheel_py3.9
-
binary_windows_wheel
:
filters
:
branches
:
...
...
@@ -1037,6 +1165,37 @@ workflows:
python_version
:
'
3.8'
requires
:
-
nightly_binary_windows_wheel_py3.8_upload
-
binary_windows_wheel
:
filters
:
branches
:
only
:
-
nightly
tags
:
only
:
/v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name
:
nightly_binary_windows_wheel_py3.9
python_version
:
'
3.9'
-
binary_wheel_upload
:
context
:
org-member
filters
:
branches
:
only
:
-
nightly
tags
:
only
:
/v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name
:
nightly_binary_windows_wheel_py3.9_upload
requires
:
-
nightly_binary_windows_wheel_py3.9
-
smoke_test_windows_pip
:
filters
:
branches
:
only
:
-
nightly
tags
:
only
:
/v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name
:
nightly_binary_windows_wheel_py3.9_smoke_test_pip
python_version
:
'
3.9'
requires
:
-
nightly_binary_windows_wheel_py3.9_upload
-
binary_linux_conda
:
filters
:
branches
:
...
...
@@ -1136,6 +1295,39 @@ workflows:
python_version
:
'
3.8'
requires
:
-
nightly_binary_linux_conda_py3.8_upload
-
binary_linux_conda
:
filters
:
branches
:
only
:
-
nightly
tags
:
only
:
/v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name
:
nightly_binary_linux_conda_py3.9
python_version
:
'
3.9'
requires
:
-
download_third_parties_nix
-
binary_conda_upload
:
context
:
org-member
filters
:
branches
:
only
:
-
nightly
tags
:
only
:
/v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name
:
nightly_binary_linux_conda_py3.9_upload
requires
:
-
nightly_binary_linux_conda_py3.9
-
smoke_test_linux_conda
:
filters
:
branches
:
only
:
-
nightly
tags
:
only
:
/v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name
:
nightly_binary_linux_conda_py3.9_smoke_test_conda
python_version
:
'
3.9'
requires
:
-
nightly_binary_linux_conda_py3.9_upload
-
binary_macos_conda
:
filters
:
branches
:
...
...
@@ -1202,6 +1394,28 @@ workflows:
name
:
nightly_binary_macos_conda_py3.8_upload
requires
:
-
nightly_binary_macos_conda_py3.8
-
binary_macos_conda
:
filters
:
branches
:
only
:
-
nightly
tags
:
only
:
/v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name
:
nightly_binary_macos_conda_py3.9
python_version
:
'
3.9'
requires
:
-
download_third_parties_nix
-
binary_conda_upload
:
context
:
org-member
filters
:
branches
:
only
:
-
nightly
tags
:
only
:
/v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name
:
nightly_binary_macos_conda_py3.9_upload
requires
:
-
nightly_binary_macos_conda_py3.9
-
binary_windows_conda
:
filters
:
branches
:
...
...
@@ -1295,6 +1509,37 @@ workflows:
python_version
:
'
3.8'
requires
:
-
nightly_binary_windows_conda_py3.8_upload
-
binary_windows_conda
:
filters
:
branches
:
only
:
-
nightly
tags
:
only
:
/v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name
:
nightly_binary_windows_conda_py3.9
python_version
:
'
3.9'
-
binary_conda_upload
:
context
:
org-member
filters
:
branches
:
only
:
-
nightly
tags
:
only
:
/v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name
:
nightly_binary_windows_conda_py3.9_upload
requires
:
-
nightly_binary_windows_conda_py3.9
-
smoke_test_windows_conda
:
filters
:
branches
:
only
:
-
nightly
tags
:
only
:
/v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name
:
nightly_binary_windows_conda_py3.9_smoke_test_conda
python_version
:
'
3.9'
requires
:
-
nightly_binary_windows_conda_py3.9_upload
docker_build
:
triggers
:
-
schedule
:
...
...
.circleci/config.yml.in
View file @
eb1b3f1f
...
...
@@ -45,6 +45,16 @@ commands:
name: Install pkg-config
command: HOMEBREW_NO_AUTO_UPDATE=1 brew install pkg-config wget
# Disable brew auto update which is very slow
load_conda_channel_flags:
description: "Determines whether we need extra conda channels"
steps:
- run:
name: Adding CONDA_CHANNEL_FLAGS to BASH_ENV
command: |
CONDA_CHANNEL_FLAGS=""
if [[ "${PYTHON_VERSION}" = *3.9* ]]; then
echo "export CONDA_CHANNEL_FLAGS=-c=conda-forge" >> ${BASH_ENV}
fi
binary_common: &binary_common
parameters:
...
...
@@ -117,7 +127,7 @@ jobs:
binary_linux_wheel:
<<: *binary_common
docker:
- image: "pytorch/manylinux-cuda10
0
"
- image: "pytorch/manylinux-cuda10
2
"
resource_class: 2xlarge+
steps:
- checkout
...
...
@@ -138,6 +148,7 @@ jobs:
resource_class: 2xlarge+
steps:
- checkout
- load_conda_channel_flags
- attach_workspace:
at: third_party
- run: packaging/build_conda.sh
...
...
@@ -155,6 +166,7 @@ jobs:
steps:
- checkout
- install_build_tools_macos
- load_conda_channel_flags
- attach_workspace:
at: third_party
- run:
...
...
@@ -180,6 +192,7 @@ jobs:
steps:
- checkout
- install_build_tools_macos
- load_conda_channel_flags
- attach_workspace:
at: third_party
- run:
...
...
@@ -202,6 +215,7 @@ jobs:
name: windows-cpu
steps:
- checkout
- load_conda_channel_flags
- run:
name: build
command: |
...
...
@@ -221,6 +235,7 @@ jobs:
name: windows-cpu
steps:
- checkout
- load_conda_channel_flags
- run:
name: build
command: |
...
...
@@ -278,6 +293,7 @@ jobs:
- attach_workspace:
at: ~/workspace
- designate_upload_channel
- load_conda_channel_flags
- run:
name: install binaries
command: |
...
...
@@ -297,6 +313,7 @@ jobs:
- attach_workspace:
at: ~/workspace
- designate_upload_channel
- load_conda_channel_flags
- run:
name: install binaries
command: |
...
...
@@ -317,6 +334,7 @@ jobs:
- attach_workspace:
at: ~/workspace
- designate_upload_channel
- load_conda_channel_flags
- run:
name: install binaries
command: |
...
...
@@ -342,6 +360,7 @@ jobs:
- attach_workspace:
at: ~/workspace
- designate_upload_channel
- load_conda_channel_flags
- run:
name: install binaries
command: |
...
...
@@ -395,6 +414,7 @@ jobs:
- attach_workspace:
at: third_party
- designate_upload_channel
- load_conda_channel_flags
- run:
name: Setup
command: .circleci/unittest/linux/scripts/setup_env.sh
...
...
@@ -423,6 +443,7 @@ jobs:
- attach_workspace:
at: third_party
- designate_upload_channel
- load_conda_channel_flags
- run:
name: Pull Docker image
command: docker pull --quiet "${image_name}"
...
...
@@ -431,7 +452,7 @@ jobs:
command: docker run -t --gpus all -e PYTHON_VERSION -v $PWD:$PWD -w $PWD "${image_name}" .circleci/unittest/linux/scripts/setup_env.sh
- run:
name: Install torchaudio
command: docker run -t --gpus all -e UPLOAD_CHANNEL -v $PWD:$PWD -w $PWD "${image_name}" .circleci/unittest/linux/scripts/install.sh
command: docker run -t --gpus all -e UPLOAD_CHANNEL
-e CONDA_CHANNEL_FLAGS
-v $PWD:$PWD -w $PWD "${image_name}" .circleci/unittest/linux/scripts/install.sh
- run:
name: Run tests
command: docker run -t --gpus all -v $PWD:$PWD -w $PWD "${image_name}" .circleci/unittest/linux/scripts/run_test.sh
...
...
@@ -448,6 +469,7 @@ jobs:
steps:
- checkout
- designate_upload_channel
- load_conda_channel_flags
- run:
name: Setup
command: .circleci/unittest/windows/scripts/setup_env.sh
...
...
@@ -473,6 +495,7 @@ jobs:
steps:
- checkout
- designate_upload_channel
- load_conda_channel_flags
- run:
name: Setup
command: .circleci/unittest/windows/scripts/setup_env.sh
...
...
@@ -496,6 +519,7 @@ jobs:
steps:
- checkout
- install_build_tools_macos
- load_conda_channel_flags
- attach_workspace:
at: third_party
- designate_upload_channel
...
...
@@ -522,6 +546,7 @@ jobs:
steps:
- checkout
- designate_upload_channel
- load_conda_channel_flags
- run:
name: Setup
command: .circleci/unittest/linux/scripts/setup_env.sh
...
...
@@ -538,6 +563,7 @@ jobs:
- attach_workspace:
at: ~/workspace
- checkout
- load_conda_channel_flags
- run:
name: Install pytorch-audio
command: .circleci/build_docs/install_wheels.sh
...
...
.circleci/regenerate.py
View file @
eb1b3f1f
...
...
@@ -19,7 +19,7 @@ import yaml
import
os.path
PYTHON_VERSIONS
=
[
"3.6"
,
"3.7"
,
"3.8"
]
PYTHON_VERSIONS
=
[
"3.6"
,
"3.7"
,
"3.8"
,
"3.9"
]
DOC_VERSION
=
(
'linux'
,
'3.8'
)
...
...
.circleci/unittest/linux/scripts/install.sh
View file @
eb1b3f1f
...
...
@@ -34,7 +34,11 @@ else
cudatoolkit
=
"cudatoolkit=
${
version
}
"
fi
printf
"Installing PyTorch with %s
\n
"
"
${
cudatoolkit
}
"
conda
install
-y
-c
"pytorch-
${
UPLOAD_CHANNEL
}
"
pytorch
${
cudatoolkit
}
(
set
-x
conda
install
${
CONDA_CHANNEL_FLAGS
:-}
-y
defaults::numpy
conda
install
${
CONDA_CHANNEL_FLAGS
:-}
-y
-c
"pytorch-
${
UPLOAD_CHANNEL
}
"
"pytorch-
${
UPLOAD_CHANNEL
}
::pytorch"
${
cudatoolkit
}
)
# 2. Install torchaudio
printf
"* Installing torchaudio
\n
"
...
...
@@ -43,11 +47,15 @@ BUILD_TRANSDUCER=1 BUILD_SOX=1 python setup.py install
# 3. Install Test tools
printf
"* Installing test tools
\n
"
if
[
"
${
os
}
"
==
Linux
]
;
then
conda
install
-y
-c
conda-forge codecov pytest pytest-cov
pip
install
kaldi-io
'librosa>=0.8.0'
parameterized SoundFile scipy
'requests>=2.20'
else
# Note: installing librosa via pip fail because it will try to compile numba.
conda
install
-y
-c
conda-forge codecov pytest pytest-cov
'librosa>=0.8.0'
parameterized scipy
pip
install
kaldi-io SoundFile
'requests>=2.20'
NUMBA_DEV_CHANNEL
=
""
if
[[
"
$(
python
--version
)
"
=
*
3.9
*
]]
;
then
# Numba isn't available for Python 3.9 except on the numba dev channel and building from source fails
# See https://github.com/librosa/librosa/issues/1270#issuecomment-759065048
NUMBA_DEV_CHANNEL
=
"-c numba/label/dev"
fi
# Note: installing librosa via pip fail because it will try to compile numba.
(
set
-x
conda
install
-y
-c
conda-forge
${
NUMBA_DEV_CHANNEL
}
'librosa>=0.8.0'
parameterized
'requests>=2.20'
pip
install
kaldi-io SoundFile codecov pytest pytest-cov scipy
)
.circleci/unittest/windows/scripts/environment.yml
0 → 100644
View file @
eb1b3f1f
channels
:
-
conda-forge
-
defaults
dependencies
:
-
flake8
-
pytest
-
pytest-cov
-
codecov
-
scipy >= 1.4.1
-
pip
-
pip
:
-
kaldi-io
-
PySoundFile
-
future
-
parameterized
-
dataclasses
.circleci/unittest/windows/scripts/install.sh
View file @
eb1b3f1f
...
...
@@ -25,7 +25,7 @@ else
cudatoolkit
=
"cudatoolkit=
${
version
}
"
fi
printf
"Installing PyTorch with %s
\n
"
"
${
cudatoolkit
}
"
conda
install
-y
-c
"pytorch-
${
UPLOAD_CHANNEL
}
"
pytorch
"
${
cudatoolkit
}
"
conda
install
${
CONDA_CHANNEL_FLAGS
:-}
-y
-c
"pytorch-
${
UPLOAD_CHANNEL
}
"
"
pytorch
-
${
UPLOAD_CHANNEL
}
::pytorch"
${
cudatoolkit
}
# 2. Install torchaudio
printf
"* Installing torchaudio
\n
"
...
...
@@ -33,5 +33,15 @@ python setup.py install
# 3. Install Test tools
printf
"* Installing test tools
\n
"
conda
install
-y
-c
conda-forge codecov pytest pytest-cov
pip
install
kaldi-io
'librosa>=0.8.0'
parameterized PySoundFile scipy
NUMBA_DEV_CHANNEL
=
""
if
[[
"
$(
python
--version
)
"
=
*
3.9
*
]]
;
then
# Numba isn't available for Python 3.9 except on the numba dev channel and building from source fails
# See https://github.com/librosa/librosa/issues/1270#issuecomment-759065048
NUMBA_DEV_CHANNEL
=
"-c numba/label/dev"
fi
# Note: installing librosa via pip fail because it will try to compile numba.
(
set
-x
conda
install
-y
-c
conda-forge
${
NUMBA_DEV_CHANNEL
}
'librosa>=0.8.0'
parameterized
'requests>=2.20'
pip
install
kaldi-io SoundFile codecov pytest pytest-cov scipy
)
.circleci/unittest/windows/scripts/setup_env.sh
View file @
eb1b3f1f
...
...
@@ -37,3 +37,9 @@ if [ ! -d "${env_dir}" ]; then
conda create
--prefix
"
${
env_dir
}
"
-y
python
=
"
${
PYTHON_VERSION
}
"
fi
conda activate
"
${
env_dir
}
"
NUMPY_PIN
=
"1.11"
if
[[
"
${
PYTHON_VERSION
}
"
=
"3.9"
]]
;
then
NUMPY_PIN
=
"1.20"
fi
printf
"* Installing numpy>=%s
\n
"
"
${
NUMPY_PIN
}
\n
"
conda
install
-y
-c
conda-forge numpy>
=
"
${
NUMPY_PIN
}
"
packaging/pkg_helpers.bash
View file @
eb1b3f1f
...
...
@@ -141,6 +141,7 @@ setup_wheel_python() {
3.6
)
python_abi
=
cp36-cp36m
;;
3.7
)
python_abi
=
cp37-cp37m
;;
3.8
)
python_abi
=
cp38-cp38
;;
3.9
)
python_abi
=
cp39-cp39
;;
*
)
echo
"Unrecognized PYTHON_VERSION=
$PYTHON_VERSION
"
exit
1
...
...
@@ -176,11 +177,16 @@ setup_pip_pytorch_version() {
#
# You MUST have populated PYTORCH_VERSION_SUFFIX before hand.
setup_conda_pytorch_constraint
()
{
CONDA_CHANNEL_FLAGS
=
"
${
CONDA_CHANNEL_FLAGS
}
"
if
[[
-z
"
$PYTORCH_VERSION
"
]]
;
then
export
CONDA_CHANNEL_FLAGS
=
"-c pytorch-nightly"
export
CONDA_CHANNEL_FLAGS
=
"
${
CONDA_CHANNEL_FLAGS
}
-c pytorch-nightly"
export
PYTORCH_VERSION
=
"
$(
conda search
--json
'pytorch[channel=pytorch-nightly]'
| python
-c
"import sys, json, re; print(re.sub(r'
\\
+.*
$'
, '', json.load(sys.stdin)['pytorch'][-1]['version']))"
)
"
else
export
CONDA_CHANNEL_FLAGS
=
"-c pytorch -c pytorch-
${
UPLOAD_CHANNEL
}
"
export
CONDA_CHANNEL_FLAGS
=
"
${
CONDA_CHANNEL_FLAGS
}
-c pytorch -c pytorch-test -c pytorch-nightly"
fi
# Some dependencies for Python 3.9 are only on conda-forge
if
[[
"
${
PYTHON_VERSION
}
"
=
"3.9"
]]
;
then
export
CONDA_CHANNEL_FLAGS
=
"
${
CONDA_CHANNEL_FLAGS
}
-c conda-forge"
fi
if
[[
"
$CU_VERSION
"
==
cpu
]]
;
then
export
CONDA_PYTORCH_BUILD_CONSTRAINT
=
"- pytorch==
$PYTORCH_VERSION
${
PYTORCH_VERSION_SUFFIX
}
"
...
...
packaging/torchaudio/meta.yaml
View file @
eb1b3f1f
...
...
@@ -16,10 +16,12 @@ requirements:
-
cpuonly
-
cmake
-
ninja
-
defaults::numpy >=1.11
{{
environ.get('CONDA_PYTORCH_BUILD_CONSTRAINT')
}}
run
:
-
python
-
defaults::numpy >=1.11
{{
environ.get('CONDA_PYTORCH_CONSTRAINT')
}}
build
:
...
...
setup.py
View file @
eb1b3f1f
...
...
@@ -76,6 +76,7 @@ setup(
"Programming Language :: Python :: 3.6"
,
"Programming Language :: Python :: 3.7"
,
"Programming Language :: Python :: 3.8"
,
"Programming Language :: Python :: 3.9"
,
"Programming Language :: Python :: Implementation :: CPython"
,
"Topic :: Multimedia :: Sound/Audio"
,
"Topic :: Scientific/Engineering :: Artificial Intelligence"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment