Date: Tuesday, February 21, 2023 @ 10:53:02
Author: tpkessler
Revision: 1403219
archrelease: copy trunk to community-testing-x86_64
Added:
python-pytorch-rocm/repos/community-testing-x86_64/
python-pytorch-rocm/repos/community-testing-x86_64/87773.patch
(from rev 1403218, python-pytorch-rocm/trunk/87773.patch)
python-pytorch-rocm/repos/community-testing-x86_64/PKGBUILD
(from rev 1403218, python-pytorch-rocm/trunk/PKGBUILD)
python-pytorch-rocm/repos/community-testing-x86_64/ffmpeg4.4.patch
(from rev 1403218, python-pytorch-rocm/trunk/ffmpeg4.4.patch)
python-pytorch-rocm/repos/community-testing-x86_64/fix-building-for-torchvision.patch
(from rev 1403218,
python-pytorch-rocm/trunk/fix-building-for-torchvision.patch)
python-pytorch-rocm/repos/community-testing-x86_64/fix_include_system.patch
(from rev 1403218, python-pytorch-rocm/trunk/fix_include_system.patch)
python-pytorch-rocm/repos/community-testing-x86_64/gloo-linux-6.patch
(from rev 1403218, python-pytorch-rocm/trunk/gloo-linux-6.patch)
python-pytorch-rocm/repos/community-testing-x86_64/test.py
(from rev 1403218, python-pytorch-rocm/trunk/test.py)
python-pytorch-rocm/repos/community-testing-x86_64/use-system-libuv.patch
(from rev 1403218, python-pytorch-rocm/trunk/use-system-libuv.patch)
------------------------------------+
87773.patch | 39 ++++
PKGBUILD | 302 +++++++++++++++++++++++++++++++++++
ffmpeg4.4.patch | 51 +++++
fix-building-for-torchvision.patch | 25 ++
fix_include_system.patch | 13 +
gloo-linux-6.patch | 25 ++
test.py | 11 +
use-system-libuv.patch | 13 +
8 files changed, 479 insertions(+)
Copied: python-pytorch-rocm/repos/community-testing-x86_64/87773.patch (from
rev 1403218, python-pytorch-rocm/trunk/87773.patch)
===================================================================
--- community-testing-x86_64/87773.patch (rev 0)
+++ community-testing-x86_64/87773.patch 2023-02-21 10:53:02 UTC (rev
1403219)
@@ -0,0 +1,39 @@
+From 94465d6287e8f54c99f4b0b891a6c618bb80d7ce Mon Sep 17 00:00:00 2001
+From: Arfrever Frehtes Taifersar Arahesis <[email protected]>
+Date: Wed, 26 Oct 2022 07:32:59 +0200
+Subject: [PATCH] Support only GLog >=0.6.0
+
+Fixes https://github.com/pytorch/pytorch/issues/58054
+---
+ c10/util/Logging.cpp | 12 +-----------
+ 1 file changed, 1 insertion(+), 11 deletions(-)
+
+diff --git a/c10/util/Logging.cpp b/c10/util/Logging.cpp
+index fe74e49548646..d8fce12ce4840 100644
+--- a/c10/util/Logging.cpp
++++ b/c10/util/Logging.cpp
+@@ -192,23 +192,13 @@ C10_DEFINE_int(
+ google::GLOG_WARNING,
+ "The minimum log level that caffe2 will output.");
+
+-// Google glog's api does not have an external function that allows one to
check
+-// if glog is initialized or not. It does have an internal function - so we
are
+-// declaring it here. This is a hack but has been used by a bunch of others
too
+-// (e.g. Torch).
+-namespace google {
+-namespace glog_internal_namespace_ {
+-bool IsGoogleLoggingInitialized();
+-} // namespace glog_internal_namespace_
+-} // namespace google
+-
+ namespace c10 {
+ namespace {
+
+ void initGoogleLogging(char const* name) {
+ #if !defined(_MSC_VER)
+ // This trick can only be used on UNIX platforms
+- if (!::google::glog_internal_namespace_::IsGoogleLoggingInitialized())
++ if (!::google::IsGoogleLoggingInitialized())
+ #endif
+ {
+ ::google::InitGoogleLogging(name);
Copied: python-pytorch-rocm/repos/community-testing-x86_64/PKGBUILD (from rev
1403218, python-pytorch-rocm/trunk/PKGBUILD)
===================================================================
--- community-testing-x86_64/PKGBUILD (rev 0)
+++ community-testing-x86_64/PKGBUILD 2023-02-21 10:53:02 UTC (rev 1403219)
@@ -0,0 +1,302 @@
+# Maintainer: Torsten Keßler <tpkessler at archlinux dot org>
+# Contributor: acxz <akashpatel2008 at yahoo dot com>
+# Contributor: Sven-Hendrik Haase <[email protected]>
+# Contributor: Stephen Zhang <zsrkmyn at gmail dot com>
+# Contributor: Federico Zappone <federico dot zappone at unimol dot it>
+
+_pkgname="pytorch"
+pkgbase="python-${_pkgname}-rocm"
+pkgname=("${pkgbase}" "python-pytorch-opt-rocm")
+pkgver=1.13.1
+_pkgver=1.13.1
+pkgrel=2
+_pkgdesc="Tensors and Dynamic neural networks in Python with strong GPU
acceleration"
+pkgdesc="${_pkgdesc}"
+arch=('x86_64')
+url="https://pytorch.org";
+license=('BSD')
+depends=('google-glog' 'gflags' 'opencv' 'openmp' 'rccl' 'pybind11' 'python'
'python-yaml' 'libuv'
+ 'python-numpy' 'protobuf' 'ffmpeg4.4' 'python-future' 'qt5-base'
'intel-oneapi-mkl'
+ 'python-typing_extensions')
+makedepends=('python' 'python-setuptools' 'python-yaml' 'python-numpy' 'cmake'
'rocm-hip-sdk' 'roctracer'
+ 'miopen' 'git' 'hipmagma' 'ninja' 'pkgconfig' 'doxygen' 'gcc11'
'onednn'
+ 'vulkan-headers' 'shaderc')
+source=("${_pkgname}-${pkgver}::git+https://github.com/pytorch/pytorch.git#tag=v$_pkgver";
+ # generated using parse-submodules
+ "${pkgname}-cub::git+https://github.com/NVlabs/cub.git";
+ "${pkgname}-NNPACK::git+https://github.com/Maratyszcza/NNPACK.git";
+ "${pkgname}-ios-cmake::git+https://github.com/Yangqing/ios-cmake.git";
+
"${pkgname}-pthreadpool::git+https://github.com/Maratyszcza/pthreadpool.git";
+ "${pkgname}-FXdiv::git+https://github.com/Maratyszcza/FXdiv.git";
+ "${pkgname}-gloo::git+https://github.com/facebookincubator/gloo";
+ "${pkgname}-benchmark::git+https://github.com/google/benchmark.git";
+ "${pkgname}-pybind11::git+https://github.com/pybind/pybind11.git";
+ "${pkgname}-googletest::git+https://github.com/google/googletest.git";
+ "${pkgname}-enum34::git+https://github.com/PeachPy/enum34.git";
+ "${pkgname}-six::git+https://github.com/benjaminp/six.git";
+ "${pkgname}-cpuinfo::git+https://github.com/pytorch/cpuinfo.git";
+
"${pkgname}-protobuf::git+https://github.com/protocolbuffers/protobuf.git";
+ "${pkgname}-foxi::git+https://github.com/houseroad/foxi.git";
+ "${pkgname}-sleef::git+https://github.com/shibatch/sleef";
+ "${pkgname}-ideep::git+https://github.com/intel/ideep";
+ "${pkgname}-nccl::git+https://github.com/NVIDIA/nccl";
+ "${pkgname}-zstd::git+https://github.com/facebook/zstd.git";
+ "${pkgname}-gemmlowp::git+https://github.com/google/gemmlowp.git";
+ "${pkgname}-QNNPACK::git+https://github.com/pytorch/QNNPACK";
+ "${pkgname}-onnx-tensorrt::git+https://github.com/onnx/onnx-tensorrt";
+ "${pkgname}-onnx::git+https://github.com/onnx/onnx.git";
+
"${pkgname}-cudnn-frontend::git+https://github.com/NVIDIA/cudnn-frontend.git";
+
"${pkgname}-ARM_NEON_2_x86_SSE::git+https://github.com/intel/ARM_NEON_2_x86_SSE.git";
+ "${pkgname}-ittapi::git+https://github.com/intel/ittapi.git";
+ "${pkgname}-fbjni::git+https://github.com/facebookincubator/fbjni.git";
+ "${pkgname}-json::git+https://github.com/nlohmann/json.git";
+ "${pkgname}-fbgemm::git+https://github.com/pytorch/fbgemm";
+ "${pkgname}-fmt::git+https://github.com/fmtlib/fmt.git";
+ "${pkgname}-kineto::git+https://github.com/pytorch/kineto";
+ "${pkgname}-tbb::git+https://github.com/01org/tbb";
+ "${pkgname}-tensorpipe::git+https://github.com/pytorch/tensorpipe.git";
+ "${pkgname}-psimd::git+https://github.com/Maratyszcza/psimd.git";
+ "${pkgname}-XNNPACK::git+https://github.com/google/XNNPACK.git";
+ "${pkgname}-FP16::git+https://github.com/Maratyszcza/FP16.git";
+ "${pkgname}-flatbuffers::git+https://github.com/google/flatbuffers.git";
+ "${pkgname}-eigen::git+https://gitlab.com/libeigen/eigen.git";
+ "${pkgname}-PeachPy::git+https://github.com/malfet/PeachPy.git";
+ "${pkgname}-pocketfft::git+https://github.com/mreineck/pocketfft";
+ fix_include_system.patch
+ use-system-libuv.patch
+ fix-building-for-torchvision.patch
+ 87773.patch
+ ffmpeg4.4.patch
+ gloo-linux-6.patch)
+sha256sums=('SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ '557761502bbd994d9795bef46779e4b8c60ba0b45e7d60841f477d3b7f28a00a'
+ 'cd9ac4aaa9f946ac5eafc57cf66c5c16b3ea7ac8af32c2558fad0705411bb669'
+ '600bd6a4bbcec9f99ab815d82cee1c2875530b2b75f4010da5ba72ce9bf31aff'
+ 'bbc61ba2392bd4c6766cca820d4c5ca51ef9abd188e53884b95abcbe4d89a20e'
+ '75001b59e76831b0c93a547f851cb980e00b0d8cc7b66fb507eaeac217dc6ff9'
+ '91061f2ec36b5aa2002053654e1517d04bc2defa1ce3985ac554944a6497ce52')
+options=('!lto')
+
+get_pyver () {
+ python -c 'import sys; print(str(sys.version_info[0]) + "." +
str(sys.version_info[1]))'
+}
+
+prepare() {
+ cd "${srcdir}/${_pkgname}-${pkgver}"
+
+ # generated using parse-submodules
+ git submodule init
+
+ git config submodule."third_party/pybind11".url
"${srcdir}/${pkgname}"-pybind11
+ git config submodule."third_party/cub".url "${srcdir}/${pkgname}"-cub
+ git config submodule."third_party/eigen".url "${srcdir}/${pkgname}"-eigen
+ git config submodule."third_party/googletest".url
"${srcdir}/${pkgname}"-googletest
+ #https://github.com/rocm-arch/python-pytorch-rocm/issues/49
+ #git config submodule."third_party/benchmark".url
"${srcdir}/${pkgname}"-benchmark
+ git config submodule."third_party/protobuf".url
"${srcdir}/${pkgname}"-protobuf
+ git config submodule."third_party/ios-cmake".url
"${srcdir}/${pkgname}"-ios-cmake
+ git config submodule."third_party/NNPACK".url "${srcdir}/${pkgname}"-NNPACK
+ git config submodule."third_party/gloo".url "${srcdir}/${pkgname}"-gloo
+ git config submodule."third_party/NNPACK_deps/pthreadpool".url
"${srcdir}/${pkgname}"-pthreadpool
+ git config submodule."third_party/NNPACK_deps/FXdiv".url
"${srcdir}/${pkgname}"-FXdiv
+ git config submodule."third_party/NNPACK_deps/FP16".url
"${srcdir}/${pkgname}"-FP16
+ git config submodule."third_party/NNPACK_deps/psimd".url
"${srcdir}/${pkgname}"-psimd
+ git config submodule."third_party/zstd".url "${srcdir}/${pkgname}"-zstd
+ git config submodule."third_party/cpuinfo".url "${srcdir}/${pkgname}"-cpuinfo
+ git config submodule."third_party/python-enum".url
"${srcdir}/${pkgname}"-enum34
+ git config submodule."third_party/python-peachpy".url
"${srcdir}/${pkgname}"-PeachPy
+ git config submodule."third_party/python-six".url "${srcdir}/${pkgname}"-six
+ git config submodule."third_party/onnx".url "${srcdir}/${pkgname}"-onnx
+ git config submodule."third_party/onnx-tensorrt".url
"${srcdir}/${pkgname}"-onnx-tensorrt
+ git config submodule."third_party/sleef".url "${srcdir}/${pkgname}"-sleef
+ git config submodule."third_party/ideep".url "${srcdir}/${pkgname}"-ideep
+ git config submodule."third_party/gemmlowp/gemmlowp".url
"${srcdir}/${pkgname}"-gemmlowp
+ git config submodule."third_party/QNNPACK".url "${srcdir}/${pkgname}"-QNNPACK
+ git config submodule."third_party/neon2sse".url
"${srcdir}/${pkgname}"-ARM_NEON_2_x86_SSE
+ git config submodule."third_party/fbgemm".url "${srcdir}/${pkgname}"-fbgemm
+ git config submodule."third_party/foxi".url "${srcdir}/${pkgname}"-foxi
+ git config submodule."third_party/tbb".url "${srcdir}/${pkgname}"-tbb
+ git config submodule."android/libs/fbjni".url "${srcdir}/${pkgname}"-fbjni
+ git config submodule."third_party/XNNPACK".url "${srcdir}/${pkgname}"-XNNPACK
+ git config submodule."third_party/fmt".url "${srcdir}/${pkgname}"-fmt
+ git config submodule."third_party/tensorpipe".url
"${srcdir}/${pkgname}"-tensorpipe
+ git config submodule."third_party/kineto".url "${srcdir}/${pkgname}"-kineto
+ git config submodule."third_party/pocketfft".url
"${srcdir}/${pkgname}"-pocketfft
+ git config submodule."third_party/ittapi".url "${srcdir}/${pkgname}"-ittapi
+ git config submodule."third_party/flatbuffers".url
"${srcdir}/${pkgname}"-flatbuffers
+ git config submodule."third_party/nlohmann".url "${srcdir}/${pkgname}"-json
+
+ git -c protocol.file.allow=always submodule update --init --recursive
+ sed "1i#include <mutex>" -i
third_party/kineto/libkineto/src/RoctracerActivityApi.h
+
+ # https://bugs.archlinux.org/task/64981
+ patch -N torch/utils/cpp_extension.py "${srcdir}"/fix_include_system.patch
+
+ # Use system libuv
+ patch -Np1 -i "${srcdir}"/use-system-libuv.patch
+
+ # fix https://github.com/pytorch/vision/issues/3695
+ patch -Np1 -i "${srcdir}/fix-building-for-torchvision.patch"
+
+ # Fix building against glog 0.6
+ patch -Np1 -i "${srcdir}/87773.patch"
+
+ # build against ffmpeg4.4
+ patch -Np1 -i "${srcdir}/ffmpeg4.4.patch"
+
+ cd "third_party/gloo"
+ patch -Np1 -i "${srcdir}/gloo-linux-6.patch"
+
+ cd "${srcdir}"
+
+ cp -r "${_pkgname}-${pkgver}" "${_pkgname}-${pkgver}-rocm"
+ cp -r "${_pkgname}-${pkgver}" "${_pkgname}-${pkgver}-opt-rocm"
+
+ export VERBOSE=1
+ export PYTORCH_BUILD_VERSION="${pkgver}"
+ export PYTORCH_BUILD_NUMBER=1
+
+ # Check tools/setup_helpers/cmake.py, setup.py and CMakeLists.txt for a list
of flags that can be set via env vars.
+ export ATEN_NO_TEST=ON # do not build ATen tests
+ export USE_MKLDNN=ON
+ export BUILD_CUSTOM_PROTOBUF=OFF
+ export BUILD_CAFFE2=ON
+ export BUILD_CAFFE2_OPS=ON
+ # export BUILD_SHARED_LIBS=OFF
+ export USE_FFMPEG=ON
+ export USE_GFLAGS=ON
+ export USE_GLOG=ON
+ export BUILD_BINARY=ON
+ export USE_OBSERVERS=ON
+ export USE_OPENCV=ON
+ # export USE_SYSTEM_LIBS=ON # experimental, not all libs present in repos
+ export USE_CUPTI_SO=ON # make sure cupti.so is used as shared lib
+ export CC=/usr/bin/gcc-11
+ export CXX=/usr/bin/g++-11
+ export CUDAHOSTCXX=/usr/bin/g++-11
+ export CUDA_HOST_COMPILER="${CUDAHOSTCXX}"
+}
+
+build() {
+ export PYTORCH_ROCM_ARCH="gfx803;gfx900;gfx906;gfx908;gfx90a;gfx1030"
+
+ echo "Building with rocm and without non-x86-64 optimizations"
+ export USE_CUDA=0
+ export USE_CUDNN=0
+ export USE_ROCM=1
+ cd "${srcdir}/${_pkgname}-${pkgver}-rocm"
+ echo "add_definitions(-march=x86-64)" >> cmake/MiscCheck.cmake
+
+ # Apply changes needed for ROCm
+ python tools/amd_build/build_amd.py
+
+ # this horrible hack is necessary because the current release
+ # ships inconsistent CMake which tries to build objects before
+ # thier dependencies, build twice when dependencies are available
+ python setup.py build || python setup.py build
+
+ echo "Building with rocm and with non-x86-64 optimizations"
+ export USE_CUDA=0
+ export USE_CUDNN=0
+ export USE_ROCM=1
+ cd "${srcdir}/${_pkgname}-${pkgver}-opt-rocm"
+ echo "add_definitions(-march=haswell)" >> cmake/MiscCheck.cmake
+
+ # Apply changes needed for ROCm
+ python tools/amd_build/build_amd.py
+
+ # same horrible hack as above
+ python setup.py build || python setup.py build
+}
+
+_package() {
+ # Prevent setup.py from re-running CMake and rebuilding
+ sed -e 's/RUN_BUILD_DEPS = True/RUN_BUILD_DEPS = False/g' -i setup.py
+
+ python setup.py install --root="${pkgdir}"/ --optimize=1 --skip-build
+
+ install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+
+ pytorchpath="usr/lib/python$(get_pyver)/site-packages/torch"
+ install -d "${pkgdir}/usr/lib"
+
+ # put CMake files in correct place
+ mv "${pkgdir}/${pytorchpath}/share/cmake" "${pkgdir}/usr/lib/cmake"
+
+ # put C++ API in correct place
+ mv "${pkgdir}/${pytorchpath}/include" "${pkgdir}/usr/include"
+ find "${pkgdir}/${pytorchpath}"/lib/ -type f,l \( -iname '*.so' -or -iname
'*.so*' \) -print0 | while read -rd $'\0' _lib; do
+ mv "${_lib}" "${pkgdir}"/usr/lib/
+ done
+
+ # clean up duplicates
+ # TODO: move towards direct shared library dependecy of:
+ # c10, caffe2, libcpuinfo, gloo, GTest, Intel MKL,
+ # ONNX, protobuf, libthreadpool, QNNPACK
+ rm -rf "${pkgdir}/usr/include/pybind11"
+
+ # python module is hardcoded to look there at runtime
+ ln -s /usr/include "${pkgdir}/${pytorchpath}/include"
+ find "${pkgdir}"/usr/lib -maxdepth 1 -type f,l \( -iname '*.so' -or -iname
'*.so*' \) -print0 | while read -rd $'\0' _lib; do
+ ln -s ${_lib#"$pkgdir"} "${pkgdir}/${pytorchpath}/lib/"
+ done
+}
+
+package_python-pytorch-rocm() {
+ pkgdesc="${_pkgdesc} (with ROCm)"
+ depends+=(rocm-hip-sdk roctracer miopen hipmagma)
+ conflicts=(python-pytorch)
+ provides=(python-pytorch)
+
+ cd "${srcdir}/${_pkgname}-${pkgver}-rocm"
+ _package
+}
+
+package_python-pytorch-opt-rocm() {
+ pkgdesc="${_pkgdesc} (with ROCm and AVX2 CPU optimizations)"
+ depends+=(rocm-hip-sdk roctracer miopen hipmagma)
+ conflicts=(python-pytorch)
+ provides=(python-pytorch python-pytorch-rocm)
+
+ cd "${srcdir}/${_pkgname}-${pkgver}-opt-rocm"
+ _package
+}
Copied: python-pytorch-rocm/repos/community-testing-x86_64/ffmpeg4.4.patch
(from rev 1403218, python-pytorch-rocm/trunk/ffmpeg4.4.patch)
===================================================================
--- community-testing-x86_64/ffmpeg4.4.patch (rev 0)
+++ community-testing-x86_64/ffmpeg4.4.patch 2023-02-21 10:53:02 UTC (rev
1403219)
@@ -0,0 +1,51 @@
+diff --git a/cmake/Modules/FindFFmpeg.cmake b/cmake/Modules/FindFFmpeg.cmake
+index 04437562ee..dc8fe4aa5c 100644
+--- a/cmake/Modules/FindFFmpeg.cmake
++++ b/cmake/Modules/FindFFmpeg.cmake
+@@ -14,34 +14,40 @@ else (FFMPEG_LIBRARIES AND FFMPEG_INCLUDE_DIR)
+
+ find_path(FFMPEG_AVCODEC_INCLUDE_DIR
+ NAMES libavcodec/avcodec.h
+- PATHS ${_FFMPEG_AVCODEC_INCLUDE_DIRS} /usr/include /usr/local/include
/opt/local/include /sw/include
++ PATHS /usr/include/ffmpeg4.4 /usr/local/include /opt/local/include
/sw/include
+ PATH_SUFFIXES ffmpeg libav
++ NO_DEFAULT_PATH
+ )
+
+ find_library(FFMPEG_LIBAVCODEC
+ NAMES avcodec
+- PATHS ${_FFMPEG_AVCODEC_LIBRARY_DIRS} /usr/lib /usr/local/lib
/opt/local/lib /sw/lib
++ PATHS /usr/lib/ffmpeg4.4 /usr/local/lib /opt/local/lib /sw/lib
++ NO_DEFAULT_PATH
+ )
+
+ find_library(FFMPEG_LIBAVFORMAT
+ NAMES avformat
+- PATHS ${_FFMPEG_AVFORMAT_LIBRARY_DIRS} /usr/lib /usr/local/lib
/opt/local/lib /sw/lib
++ PATHS /usr/lib/ffmpeg4.4 /usr/local/lib /opt/local/lib /sw/lib
++ NO_DEFAULT_PATH
+ )
+
+ find_library(FFMPEG_LIBAVUTIL
+ NAMES avutil
+- PATHS ${_FFMPEG_AVUTIL_LIBRARY_DIRS} /usr/lib /usr/local/lib
/opt/local/lib /sw/lib
++ PATHS /usr/lib/ffmpeg4.4 /usr/local/lib /opt/local/lib /sw/lib
++ NO_DEFAULT_PATH
+ )
+
+
+ find_library(FFMPEG_LIBSWSCALE
+ NAMES swscale
+- PATHS ${_FFMPEG_SWSCALE_LIBRARY_DIRS} /usr/lib /usr/local/lib
/opt/local/lib /sw/lib
++ PATHS /usr/lib/ffmpeg4.4 /usr/local/lib /opt/local/lib /sw/lib
++ NO_DEFAULT_PATH
+ )
+
+ find_library(FFMPEG_LIBSWRESAMPLE
+ NAMES swresample
+- PATHS ${_FFMPEG_SWSCALE_LIBRARY_DIRS} /usr/lib /usr/local/lib
/opt/local/lib /sw/lib
++ PATHS /usr/lib/ffmpeg4.4 /usr/local/lib /opt/local/lib /sw/lib
++ NO_DEFAULT_PATH
+ )
+
+ if (FFMPEG_LIBAVCODEC AND FFMPEG_LIBAVFORMAT)
Copied:
python-pytorch-rocm/repos/community-testing-x86_64/fix-building-for-torchvision.patch
(from rev 1403218,
python-pytorch-rocm/trunk/fix-building-for-torchvision.patch)
===================================================================
--- community-testing-x86_64/fix-building-for-torchvision.patch
(rev 0)
+++ community-testing-x86_64/fix-building-for-torchvision.patch 2023-02-21
10:53:02 UTC (rev 1403219)
@@ -0,0 +1,25 @@
+From 011495d8045c44527fbd7796ce860618120ae127 Mon Sep 17 00:00:00 2001
+From: Butui Hu <[email protected]>
+Date: Fri, 30 Apr 2021 11:36:30 +0800
+Subject: [PATCH] fix building torchvision
+
+---
+ aten/src/ATen/core/op_registration/op_allowlist.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/aten/src/ATen/core/op_registration/op_allowlist.h
b/aten/src/ATen/core/op_registration/op_allowlist.h
+index f93462bb2cf..12903d1cc09 100644
+--- a/aten/src/ATen/core/op_registration/op_allowlist.h
++++ b/aten/src/ATen/core/op_registration/op_allowlist.h
+@@ -59,7 +59,7 @@ constexpr bool op_allowlist_contains(string_view allowlist,
string_view item) {
+ // Returns true iff the given op name is on the allowlist
+ // and should be registered
+ constexpr bool op_allowlist_check(string_view op_name) {
+- assert(op_name.find("::") != string_view::npos);
++// assert(op_name.find("::") != string_view::npos);
+ // Use assert() instead of throw() due to a gcc bug. See:
+ // https://stackoverflow.com/questions/34280729/throw-in-constexpr-function
+ // https://github.com/fmtlib/fmt/issues/682
+--
+2.31.1
+
Copied:
python-pytorch-rocm/repos/community-testing-x86_64/fix_include_system.patch
(from rev 1403218, python-pytorch-rocm/trunk/fix_include_system.patch)
===================================================================
--- community-testing-x86_64/fix_include_system.patch
(rev 0)
+++ community-testing-x86_64/fix_include_system.patch 2023-02-21 10:53:02 UTC
(rev 1403219)
@@ -0,0 +1,13 @@
+diff --git a/torch/utils/cpp_extension.py b/torch/utils/cpp_extension.py
+index ca673033e1..c79ce8d37b 100644
+--- a/torch/utils/cpp_extension.py
++++ b/torch/utils/cpp_extension.py
+@@ -1760,7 +1760,7 @@ def _write_ninja_file_to_build_library(path,
+ common_cflags.append(f'-DPYBIND11_{pname}=\\"{pval}\\"')
+
+ common_cflags += [f'-I{include}' for include in user_includes]
+- common_cflags += [f'-isystem {include}' for include in system_includes]
++ common_cflags += [f'-I{include}' for include in system_includes]
+
+ common_cflags += ['-D_GLIBCXX_USE_CXX11_ABI=' +
str(int(torch._C._GLIBCXX_USE_CXX11_ABI))]
+
Copied: python-pytorch-rocm/repos/community-testing-x86_64/gloo-linux-6.patch
(from rev 1403218, python-pytorch-rocm/trunk/gloo-linux-6.patch)
===================================================================
--- community-testing-x86_64/gloo-linux-6.patch (rev 0)
+++ community-testing-x86_64/gloo-linux-6.patch 2023-02-21 10:53:02 UTC (rev
1403219)
@@ -0,0 +1,25 @@
+From 4d6acb9dbba04cef9c7626a4633ec651faa03b51 Mon Sep 17 00:00:00 2001
+From: Mo Zhou <[email protected]>
+Date: Tue, 1 Nov 2022 10:58:24 -0400
+Subject: [PATCH] Reorder structure for compatibility with linux-6.0
+
+Fixes: https://github.com/facebookincubator/gloo/issues/345
+See also: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1022319
+---
+ gloo/common/linux.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gloo/common/linux.cc b/gloo/common/linux.cc
+index c5e6c887..423de67b 100644
+--- a/gloo/common/linux.cc
++++ b/gloo/common/linux.cc
+@@ -193,8 +193,8 @@ static int getInterfaceSpeedGLinkSettings(int sock, struct
ifreq* ifr) {
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(4,6,0)
+ constexpr auto link_mode_data_nwords = 3 * 127;
+ struct {
+- struct ethtool_link_settings req;
+ __u32 link_mode_data[link_mode_data_nwords];
++ struct ethtool_link_settings req;
+ } ecmd;
+ int rv;
+
Copied: python-pytorch-rocm/repos/community-testing-x86_64/test.py (from rev
1403218, python-pytorch-rocm/trunk/test.py)
===================================================================
--- community-testing-x86_64/test.py (rev 0)
+++ community-testing-x86_64/test.py 2023-02-21 10:53:02 UTC (rev 1403219)
@@ -0,0 +1,11 @@
+#!/usr/bin/env python
+
+import torch
+
+if torch.cuda.is_available() and torch.version.hip:
+ d = torch.device('cuda')
+ a = torch.rand(1, 2).to(d)
+ print(a + 0)
+ print("TESTS PASSED!")
+else:
+ print("ROCm not supported with PyTorch installation")
Copied:
python-pytorch-rocm/repos/community-testing-x86_64/use-system-libuv.patch (from
rev 1403218, python-pytorch-rocm/trunk/use-system-libuv.patch)
===================================================================
--- community-testing-x86_64/use-system-libuv.patch
(rev 0)
+++ community-testing-x86_64/use-system-libuv.patch 2023-02-21 10:53:02 UTC
(rev 1403219)
@@ -0,0 +1,13 @@
+diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake
+index 06464e799a..93410bc210 100644
+--- a/cmake/Dependencies.cmake
++++ b/cmake/Dependencies.cmake
+@@ -1346,7 +1346,7 @@ if(USE_DISTRIBUTED AND USE_TENSORPIPE)
+ set(TP_USE_CUDA ON CACHE BOOL "" FORCE)
+ set(TP_ENABLE_CUDA_IPC ON CACHE BOOL "" FORCE)
+ endif()
+- set(TP_BUILD_LIBUV ON CACHE BOOL "" FORCE)
++ set(TP_BUILD_LIBUV OFF CACHE BOOL "" FORCE)
+ set(TP_STATIC_OR_SHARED STATIC CACHE STRING "" FORCE)
+
+ add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/tensorpipe)
