python-torchaudio: upgrade to 0.13.0

* Make build system patching more robust
* Update for git submodules
* Sync CUDA architectures with python-pytorch

1 files changed, 0 insertions, 136 deletions

diff --git a/use-system-libs.diff b/use-system-libs.diff
index f3449fae0853..1c83367799a0 100644
--- a/use-system-libs.diff
+++ b/use-system-libs.diff
@@ -1,92 +1,3 @@
-diff --git a/third_party/bzip2/CMakeLists.txt b/third_party/bzip2/CMakeLists.txt
-index dfccfc7b..7d4a8d66 100644
---- a/third_party/bzip2/CMakeLists.txt
-+++ b/third_party/bzip2/CMakeLists.txt
-@@ -1,34 +1 @@
--include(ExternalProject)
--
--set(INSTALL_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../install)
--set(ARCHIVE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../archives)
--
--set(
--  BZIP_LIBRARIES
--  ${INSTALL_DIR}/lib/libbz2.a
--  )
--
--ExternalProject_Add(bzip2-
--  PREFIX ${CMAKE_CURRENT_BINARY_DIR}
--  DOWNLOAD_DIR ${ARCHIVE_DIR}
--  URL https://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz
--  URL_HASH SHA256=ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269
--  BUILD_BYPRODUCTS ${BZIP_LIBRARIES}
--  BUILD_IN_SOURCE 1
--  CONFIGURE_COMMAND ""
--  BUILD_COMMAND make VERBOSE=1 "CFLAGS=-fPIC -fvisibility=hidden -Wall -Winline -O2 -g -D_FILE_OFFSET_BITS=64"
--  INSTALL_COMMAND make install PREFIX=${INSTALL_DIR}
--  DOWNLOAD_NO_PROGRESS ON
--  LOG_DOWNLOAD ON
--  LOG_UPDATE ON
--  LOG_CONFIGURE ON
--  LOG_BUILD ON
--  LOG_INSTALL ON
--  LOG_MERGED_STDOUTERR ON
--  LOG_OUTPUT_ON_FAILURE ON
--)
--
- add_library(bzip2 INTERFACE)
--add_dependencies(bzip2 bzip2-)
--target_include_directories(bzip2 INTERFACE ${INSTALL_DIR}/include)
--target_link_libraries(bzip2 INTERFACE ${BZIP_LIBRARIES})
-diff --git a/third_party/lzma/CMakeLists.txt b/third_party/lzma/CMakeLists.txt
-index e8d8cb87..b6c9dd79 100644
---- a/third_party/lzma/CMakeLists.txt
-+++ b/third_party/lzma/CMakeLists.txt
-@@ -1,45 +1 @@
--include(ExternalProject)
--
--set(INSTALL_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../install)
--set(ARCHIVE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../archives)
--set(patch_dir ${PROJECT_SOURCE_DIR}/third_party/patches)
--
--# To pass custom environment variables to ExternalProject_Add command,
--# we need to do `${CMAKE_COMMAND} -E env ${envs} <COMMANAD>`.
--# https://stackoverflow.com/a/62437353
--# We constrcut the custom environment variables here
--set(envs
--  "PKG_CONFIG_PATH=${INSTALL_DIR}/lib/pkgconfig"
--  "LDFLAGS=-L${INSTALL_DIR}/lib $ENV{LDFLAGS}"
--  "CFLAGS=-I${INSTALL_DIR}/include -fvisibility=hidden -fPIC $ENV{CFLAGS}"
--)
--
--set(
--  LZMA_LIBRARIES
--  ${INSTALL_DIR}/lib/liblzma.a
--  )
--
--ExternalProject_Add(lzma-
--  PREFIX ${CMAKE_CURRENT_BINARY_DIR}
--  DOWNLOAD_DIR ${ARCHIVE_DIR}
--  URL https://tukaani.org/xz/xz-5.2.5.tar.gz
--  URL_HASH SHA256=f6f4910fd033078738bd82bfba4f49219d03b17eb0794eb91efbae419f4aba10
--  BUILD_BYPRODUCTS ${LZMA_LIBRARIES}
--  PATCH_COMMAND cp ${patch_dir}/config.guess ${patch_dir}/config.sub ${CMAKE_CURRENT_BINARY_DIR}/src/lzma-/build-aux/
--  CONFIGURE_COMMAND ${CMAKE_COMMAND} -E env ${envs} ${CMAKE_CURRENT_BINARY_DIR}/src/lzma-/configure --prefix=${INSTALL_DIR} --disable-xz --disable-xzdec --disable-lzmadec --disable-lzmainfo --disable-lzma-links --disable-scripts --disable-doc --enable-static --disable-shared
--  BUILD_COMMAND  ${CMAKE_COMMAND} -E env ${envs} make VERBOSE=1
--  DOWNLOAD_NO_PROGRESS ON
--  LOG_DOWNLOAD ON
--  LOG_UPDATE ON
--  LOG_CONFIGURE ON
--  LOG_BUILD ON
--  LOG_INSTALL ON
--  LOG_MERGED_STDOUTERR ON
--  LOG_OUTPUT_ON_FAILURE ON
--)
--
--
- add_library(lzma INTERFACE)
--add_dependencies(lzma lzma-)
--target_include_directories(lzma INTERFACE ${INSTALL_DIR}/include)
--target_link_libraries(lzma INTERFACE ${LZMA_LIBRARIES})
 diff --git a/third_party/sox/CMakeLists.txt b/third_party/sox/CMakeLists.txt
 index 50e5cc91..1e841ad4 100644
 --- a/third_party/sox/CMakeLists.txt
@@ -252,50 +163,3 @@ index 50e5cc91..1e841ad4 100644
    )
  
  ExternalProject_Add(sox
-diff --git a/third_party/zlib/CMakeLists.txt b/third_party/zlib/CMakeLists.txt
-index 77551b12..e10d6a42 100644
---- a/third_party/zlib/CMakeLists.txt
-+++ b/third_party/zlib/CMakeLists.txt
-@@ -1,42 +1 @@
--include(ExternalProject)
--
--set(INSTALL_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../install)
--set(ARCHIVE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../archives)
--
--# To pass custom environment variables to ExternalProject_Add command,
--# we need to do `${CMAKE_COMMAND} -E env ${envs} <COMMANAD>`.
--# https://stackoverflow.com/a/62437353
--# We constrcut the custom environment variables here
--set(envs
--  "PKG_CONFIG_PATH=${INSTALL_DIR}/lib/pkgconfig"
--  "LDFLAGS=-L${INSTALL_DIR}/lib $ENV{LDFLAGS}"
--  "CFLAGS=-I${INSTALL_DIR}/include -fvisibility=hidden -fPIC $ENV{CFLAGS}"
--  "prefix=${INSTALL_DIR}"
--)
--
--set(
--  ZLIB_LIBRARIES
--  ${INSTALL_DIR}/lib/libz.a
--  )
--
--ExternalProject_Add(zlib-
--  PREFIX ${CMAKE_CURRENT_BINARY_DIR}
--  DOWNLOAD_DIR ${ARCHIVE_DIR}
--  URL https://github.com/madler/zlib/archive/refs/tags/v1.2.12.tar.gz
--  URL_HASH SHA256=d8688496ea40fb61787500e863cc63c9afcbc524468cedeb478068924eb54932
--  BUILD_BYPRODUCTS ${ZLIB_LIBRARIES}
--  CONFIGURE_COMMAND ${CMAKE_COMMAND} -E env ${envs} ${CMAKE_CURRENT_BINARY_DIR}/src/zlib-/configure --static
--  BUILD_COMMAND ${CMAKE_COMMAND} -E env ${envs} make VERBOSE=1
--  LOG_DOWNLOAD ON
--  LOG_UPDATE ON
--  LOG_CONFIGURE ON
--  LOG_BUILD ON
--  LOG_INSTALL ON
--  LOG_MERGED_STDOUTERR ON
--  LOG_OUTPUT_ON_FAILURE ON
--)
--
- add_library(zlib INTERFACE)
--add_dependencies(zlib zlib-)
--target_include_directories(zlib INTERFACE ${INSTALL_DIR}/include)
--target_link_libraries(zlib INTERFACE ${ZLIB_LIBRARIES})