From 82d4cf1bcef086aec24785f3d2e49324a186729c Mon Sep 17 00:00:00 2001 From: "Edward Z. Yang" Date: Wed, 9 Oct 2019 13:00:03 -0700 Subject: [PATCH 1/4] 0.3.1 point release Signed-off-by: Edward Z. Yang --- .circleci/config.yml | 154 ++++++++++++++++++++++++++++++++++++++- .circleci/config.yml.in | 8 +- packaging/build_conda.sh | 2 +- packaging/build_wheel.sh | 2 +- 4 files changed, 156 insertions(+), 10 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index cc15b07ec1..239b5c557f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -12,11 +12,11 @@ binary_common: &binary_common build_version: description: "version number of release binary; by default, build a nightly" type: string - default: "0.3.0" + default: "0.3.1" pytorch_version: description: "PyTorch version to build against; by default, use a nightly" type: string - default: "1.2.0" + default: "1.3.0" # Don't edit these python_version: description: "Python version to build against (e.g., 3.7)" @@ -159,7 +159,7 @@ workflows: build: jobs: - circleci_consistency - + # - binary_linux_wheel: name: binary_linux_wheel_py2.7 python_version: "2.7" @@ -216,4 +216,150 @@ workflows: - binary_macos_conda: name: binary_macos_conda_py3.7 python_version: "3.7" - # workflows(prefix="nightly_", upload=True) \ No newline at end of file + + - binary_linux_wheel: + name: nightly_binary_linux_wheel_py2.7 + python_version: "2.7" + - binary_wheel_upload: + name: nightly_binary_linux_wheel_py2.7_upload + context: org-member + requires: + - nightly_binary_linux_wheel_py2.7 + - binary_linux_wheel: + name: nightly_binary_linux_wheel_py2.7_unicode + python_version: "2.7" + unicode_abi: "1" + - binary_wheel_upload: + name: nightly_binary_linux_wheel_py2.7_unicode_upload + context: org-member + requires: + - nightly_binary_linux_wheel_py2.7_unicode + - binary_linux_wheel: + name: nightly_binary_linux_wheel_py3.5 + python_version: "3.5" + - binary_wheel_upload: + name: nightly_binary_linux_wheel_py3.5_upload + context: org-member + requires: + - nightly_binary_linux_wheel_py3.5 + - binary_linux_wheel: + name: nightly_binary_linux_wheel_py3.6 + python_version: "3.6" + - binary_wheel_upload: + name: nightly_binary_linux_wheel_py3.6_upload + context: org-member + requires: + - nightly_binary_linux_wheel_py3.6 + - binary_linux_wheel: + name: nightly_binary_linux_wheel_py3.7 + python_version: "3.7" + - binary_wheel_upload: + name: nightly_binary_linux_wheel_py3.7_upload + context: org-member + requires: + - nightly_binary_linux_wheel_py3.7 + - binary_macos_wheel: + name: nightly_binary_macos_wheel_py2.7 + python_version: "2.7" + - binary_wheel_upload: + name: nightly_binary_macos_wheel_py2.7_upload + context: org-member + requires: + - nightly_binary_macos_wheel_py2.7 + - binary_macos_wheel: + name: nightly_binary_macos_wheel_py2.7_unicode + python_version: "2.7" + unicode_abi: "1" + - binary_wheel_upload: + name: nightly_binary_macos_wheel_py2.7_unicode_upload + context: org-member + requires: + - nightly_binary_macos_wheel_py2.7_unicode + - binary_macos_wheel: + name: nightly_binary_macos_wheel_py3.5 + python_version: "3.5" + - binary_wheel_upload: + name: nightly_binary_macos_wheel_py3.5_upload + context: org-member + requires: + - nightly_binary_macos_wheel_py3.5 + - binary_macos_wheel: + name: nightly_binary_macos_wheel_py3.6 + python_version: "3.6" + - binary_wheel_upload: + name: nightly_binary_macos_wheel_py3.6_upload + context: org-member + requires: + - nightly_binary_macos_wheel_py3.6 + - binary_macos_wheel: + name: nightly_binary_macos_wheel_py3.7 + python_version: "3.7" + - binary_wheel_upload: + name: nightly_binary_macos_wheel_py3.7_upload + context: org-member + requires: + - nightly_binary_macos_wheel_py3.7 + - binary_linux_conda: + name: nightly_binary_linux_conda_py2.7 + python_version: "2.7" + - binary_conda_upload: + name: nightly_binary_linux_conda_py2.7_upload + context: org-member + requires: + - nightly_binary_linux_conda_py2.7 + - binary_linux_conda: + name: nightly_binary_linux_conda_py3.5 + python_version: "3.5" + - binary_conda_upload: + name: nightly_binary_linux_conda_py3.5_upload + context: org-member + requires: + - nightly_binary_linux_conda_py3.5 + - binary_linux_conda: + name: nightly_binary_linux_conda_py3.6 + python_version: "3.6" + - binary_conda_upload: + name: nightly_binary_linux_conda_py3.6_upload + context: org-member + requires: + - nightly_binary_linux_conda_py3.6 + - binary_linux_conda: + name: nightly_binary_linux_conda_py3.7 + python_version: "3.7" + - binary_conda_upload: + name: nightly_binary_linux_conda_py3.7_upload + context: org-member + requires: + - nightly_binary_linux_conda_py3.7 + - binary_macos_conda: + name: nightly_binary_macos_conda_py2.7 + python_version: "2.7" + - binary_conda_upload: + name: nightly_binary_macos_conda_py2.7_upload + context: org-member + requires: + - nightly_binary_macos_conda_py2.7 + - binary_macos_conda: + name: nightly_binary_macos_conda_py3.5 + python_version: "3.5" + - binary_conda_upload: + name: nightly_binary_macos_conda_py3.5_upload + context: org-member + requires: + - nightly_binary_macos_conda_py3.5 + - binary_macos_conda: + name: nightly_binary_macos_conda_py3.6 + python_version: "3.6" + - binary_conda_upload: + name: nightly_binary_macos_conda_py3.6_upload + context: org-member + requires: + - nightly_binary_macos_conda_py3.6 + - binary_macos_conda: + name: nightly_binary_macos_conda_py3.7 + python_version: "3.7" + - binary_conda_upload: + name: nightly_binary_macos_conda_py3.7_upload + context: org-member + requires: + - nightly_binary_macos_conda_py3.7 \ No newline at end of file diff --git a/.circleci/config.yml.in b/.circleci/config.yml.in index db1fa083d7..2cdea55090 100644 --- a/.circleci/config.yml.in +++ b/.circleci/config.yml.in @@ -12,11 +12,11 @@ binary_common: &binary_common build_version: description: "version number of release binary; by default, build a nightly" type: string - default: "0.3.0" + default: "0.3.1" pytorch_version: description: "PyTorch version to build against; by default, use a nightly" type: string - default: "1.2.0" + default: "1.3.0" # Don't edit these python_version: description: "Python version to build against (e.g., 3.7)" @@ -189,5 +189,5 @@ workflows: build: jobs: - circleci_consistency - {{ workflows() }} - # workflows(prefix="nightly_", upload=True) + # {{ workflows() }} + {{ workflows(prefix="nightly_", upload=True) }} diff --git a/packaging/build_conda.sh b/packaging/build_conda.sh index 47b428e773..bb828929f5 100755 --- a/packaging/build_conda.sh +++ b/packaging/build_conda.sh @@ -6,7 +6,7 @@ script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" export BUILD_TYPE="conda" export NO_CUDA_PACKAGE=1 -setup_env 0.4.0 +setup_env 0.3.1 export SOURCE_ROOT_DIR="$PWD" setup_conda_pytorch_constraint conda build $CONDA_CHANNEL_FLAGS --no-anaconda-upload --python "$PYTHON_VERSION" packaging/torchaudio diff --git a/packaging/build_wheel.sh b/packaging/build_wheel.sh index 00def0928e..c7332519cf 100755 --- a/packaging/build_wheel.sh +++ b/packaging/build_wheel.sh @@ -6,7 +6,7 @@ script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" export BUILD_TYPE="wheel" export NO_CUDA_PACKAGE=1 -setup_env 0.4.0 +setup_env 0.3.1 setup_wheel_python "$script_dir/build_from_source.sh" "$(pwd)" # Build static dependencies pip_install numpy future From 257c18c90746cb316238bbd10b140a873111018c Mon Sep 17 00:00:00 2001 From: engineerchuan Date: Mon, 16 Sep 2019 15:26:51 -0400 Subject: [PATCH 2/4] Add a retry and change timeout to adjust for network failures when downloading from sourceforge (#280) * Add a retry to adjust for network failures when downloading from sourceforge * try to fix packaging by adding longer connection timeout --- packaging/build_from_source.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/packaging/build_from_source.sh b/packaging/build_from_source.sh index 3e16da5ede..082353a2b6 100755 --- a/packaging/build_from_source.sh +++ b/packaging/build_from_source.sh @@ -10,10 +10,12 @@ rm -rf /tmp/torchaudio-deps mkdir /tmp/torchaudio-deps pushd /tmp/torchaudio-deps -curl -L -o sox-14.4.2.tar.bz2 "http://downloads.sourceforge.net/project/sox/sox/14.4.2/sox-14.4.2.tar.bz2?r=http%3A%2F%2Fsourceforge.net%2Fprojects%2Fsox%2Ffiles%2Fsox%2F14.4.2%2F&ts=1416316415&use_mirror=heanet" -curl -L -o lame-3.99.5.tar.gz "http://downloads.sourceforge.net/project/lame/lame/3.99/lame-3.99.5.tar.gz?r=http%3A%2F%2Fsourceforge.net%2Fprojects%2Flame%2Ffiles%2Flame%2F3.99%2F&ts=1416316457&use_mirror=kent" -curl -L -o flac-1.3.2.tar.xz "https://superb-dca2.dl.sourceforge.net/project/flac/flac-src/flac-1.3.2.tar.xz" -curl -L -o libmad-0.15.1b.tar.gz "https://downloads.sourceforge.net/project/mad/libmad/0.15.1b/libmad-0.15.1b.tar.gz" +CURL_OPTS=" --retry 8 --connect-timeout 8 " + +curl -L $CURL_OPTS -o sox-14.4.2.tar.bz2 "http://downloads.sourceforge.net/project/sox/sox/14.4.2/sox-14.4.2.tar.bz2?r=http%3A%2F%2Fsourceforge.net%2Fprojects%2Fsox%2Ffiles%2Fsox%2F14.4.2%2F&ts=1416316415&use_mirror=heanet" +curl -L $CURL_OPTS -o lame-3.99.5.tar.gz "http://downloads.sourceforge.net/project/lame/lame/3.99/lame-3.99.5.tar.gz?r=http%3A%2F%2Fsourceforge.net%2Fprojects%2Flame%2Ffiles%2Flame%2F3.99%2F&ts=1416316457&use_mirror=kent" +curl -L $CURL_OPTS -o flac-1.3.2.tar.xz "https://superb-dca2.dl.sourceforge.net/project/flac/flac-src/flac-1.3.2.tar.xz" +curl -L $CURL_OPTS -o libmad-0.15.1b.tar.gz "https://downloads.sourceforge.net/project/mad/libmad/0.15.1b/libmad-0.15.1b.tar.gz" # unpack the dependencies tar xfp sox-14.4.2.tar.bz2 From a263118ab85c86288d092a1171281d4187bce93e Mon Sep 17 00:00:00 2001 From: engineerchuan Date: Wed, 18 Sep 2019 11:03:23 -0400 Subject: [PATCH 3/4] Curl Settings for Build Script (#284) * Add a retry to adjust for network failures when downloading from sourceforge * fix packaging by adding longer connection timeout --- packaging/build_from_source.sh | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/packaging/build_from_source.sh b/packaging/build_from_source.sh index 082353a2b6..240cc4600d 100755 --- a/packaging/build_from_source.sh +++ b/packaging/build_from_source.sh @@ -10,12 +10,16 @@ rm -rf /tmp/torchaudio-deps mkdir /tmp/torchaudio-deps pushd /tmp/torchaudio-deps -CURL_OPTS=" --retry 8 --connect-timeout 8 " -curl -L $CURL_OPTS -o sox-14.4.2.tar.bz2 "http://downloads.sourceforge.net/project/sox/sox/14.4.2/sox-14.4.2.tar.bz2?r=http%3A%2F%2Fsourceforge.net%2Fprojects%2Fsox%2Ffiles%2Fsox%2F14.4.2%2F&ts=1416316415&use_mirror=heanet" -curl -L $CURL_OPTS -o lame-3.99.5.tar.gz "http://downloads.sourceforge.net/project/lame/lame/3.99/lame-3.99.5.tar.gz?r=http%3A%2F%2Fsourceforge.net%2Fprojects%2Flame%2Ffiles%2Flame%2F3.99%2F&ts=1416316457&use_mirror=kent" -curl -L $CURL_OPTS -o flac-1.3.2.tar.xz "https://superb-dca2.dl.sourceforge.net/project/flac/flac-src/flac-1.3.2.tar.xz" -curl -L $CURL_OPTS -o libmad-0.15.1b.tar.gz "https://downloads.sourceforge.net/project/mad/libmad/0.15.1b/libmad-0.15.1b.tar.gz" +# Curl Settings +# 3 minutes is the absolute max for the curl command +# Retry up to 10 times, wait to connect at most 5s per time +CURL_OPTS="-L --retry 10 --connect-timeout 5 --max-time 180" + +curl $CURL_OPTS -o sox-14.4.2.tar.bz2 "http://downloads.sourceforge.net/project/sox/sox/14.4.2/sox-14.4.2.tar.bz2" +curl $CURL_OPTS -o lame-3.99.5.tar.gz "http://downloads.sourceforge.net/project/lame/lame/3.99/lame-3.99.5.tar.gz" +curl $CURL_OPTS -o flac-1.3.2.tar.xz "https://superb-dca2.dl.sourceforge.net/project/flac/flac-src/flac-1.3.2.tar.xz" +curl $CURL_OPTS -o libmad-0.15.1b.tar.gz "https://downloads.sourceforge.net/project/mad/libmad/0.15.1b/libmad-0.15.1b.tar.gz" # unpack the dependencies tar xfp sox-14.4.2.tar.bz2 From 120f69311050d3b96cc89b5c0f562dc63731f345 Mon Sep 17 00:00:00 2001 From: engineerchuan Date: Wed, 25 Sep 2019 14:35:45 -0400 Subject: [PATCH 4/4] Updated URL for downloading flac, changed http to https download (#297) * Updated URL for downloading flac, changed http to https download * Removed comments that are documented in the code --- packaging/build_from_source.sh | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/packaging/build_from_source.sh b/packaging/build_from_source.sh index 240cc4600d..6bdad82c5c 100755 --- a/packaging/build_from_source.sh +++ b/packaging/build_from_source.sh @@ -12,13 +12,11 @@ pushd /tmp/torchaudio-deps # Curl Settings -# 3 minutes is the absolute max for the curl command -# Retry up to 10 times, wait to connect at most 5s per time CURL_OPTS="-L --retry 10 --connect-timeout 5 --max-time 180" -curl $CURL_OPTS -o sox-14.4.2.tar.bz2 "http://downloads.sourceforge.net/project/sox/sox/14.4.2/sox-14.4.2.tar.bz2" -curl $CURL_OPTS -o lame-3.99.5.tar.gz "http://downloads.sourceforge.net/project/lame/lame/3.99/lame-3.99.5.tar.gz" -curl $CURL_OPTS -o flac-1.3.2.tar.xz "https://superb-dca2.dl.sourceforge.net/project/flac/flac-src/flac-1.3.2.tar.xz" +curl $CURL_OPTS -o sox-14.4.2.tar.bz2 "https://downloads.sourceforge.net/project/sox/sox/14.4.2/sox-14.4.2.tar.bz2" +curl $CURL_OPTS -o lame-3.99.5.tar.gz "https://downloads.sourceforge.net/project/lame/lame/3.99/lame-3.99.5.tar.gz" +curl $CURL_OPTS -o flac-1.3.2.tar.xz "https://downloads.sourceforge.net/project/flac/flac-src/flac-1.3.2.tar.xz" curl $CURL_OPTS -o libmad-0.15.1b.tar.gz "https://downloads.sourceforge.net/project/mad/libmad/0.15.1b/libmad-0.15.1b.tar.gz" # unpack the dependencies