diff --git a/0001-Fix-illegal-opcode-bug-in-caffe2-40584.patch b/0001-Fix-illegal-opcode-bug-in-caffe2-40584.patch new file mode 100644 index 0000000000000000000000000000000000000000..5fef70d7a6a1583577a4fda4272a117c616fd7d4 --- /dev/null +++ b/0001-Fix-illegal-opcode-bug-in-caffe2-40584.patch @@ -0,0 +1,54 @@ +From 7676682584d0caf9243bce74ea0a88711ec4a807 Mon Sep 17 00:00:00 2001 +From: Mitchell Spryn +Date: Fri, 26 Jun 2020 11:08:56 -0700 +Subject: [PATCH] Fix illegal opcode bug in caffe2 (#40584) + +Summary: +Pull Request resolved: https://github.com/pytorch/pytorch/pull/40584 + +Also patch [this github issue](https://github.com/pytorch/pytorch/issues/33124) +involving an illegal assembly instruction in 8x8-dq-aarch64-neon.S. + +Test Plan: +Build binaries, copy to shaker, run executables. Also run all +existing caffe tests. + +Reviewed By: kimishpatel + +Differential Revision: D22240670 + +fbshipit-source-id: 51960266ce58699fe6830bcf75632b92a122f638 +--- + .../cpu/qnnpack/src/q8gemm/8x8-dq-aarch64-neon.S | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +diff --git a/aten/src/ATen/native/quantized/cpu/qnnpack/src/q8gemm/8x8-dq-aarch64-neon.S b/aten/src/ATen/native/quantized/cpu/qnnpack/src/q8gemm/8x8-dq-aarch64-neon.S +index 7a67c6d401..b8bde02006 100644 +--- a/aten/src/ATen/native/quantized/cpu/qnnpack/src/q8gemm/8x8-dq-aarch64-neon.S ++++ b/aten/src/ATen/native/quantized/cpu/qnnpack/src/q8gemm/8x8-dq-aarch64-neon.S +@@ -687,14 +687,14 @@ BEGIN_FUNCTION pytorch_q8gemm_dq_ukernel_8x8__aarch64_neon + + SUB x1, x1, 4 + +- MOV V8.4s, V9.4s +- MOV v10.4s, v11.4s +- MOV v12.4s, V13.4s +- MOV V14.4s, V15.4s +- MOV V16.4s, V17.4s +- MOV V18.4s, V19.4s +- MOV V20.4s, V21.4s +- MOV V22.4s, V23.4s ++ MOV V8.16b, V9.16b ++ MOV v10.16b, v11.16b ++ MOV v12.16b, V13.16b ++ MOV V14.16b, V15.16b ++ MOV V16.16b, V17.16b ++ MOV V18.16b, V19.16b ++ MOV V20.16b, V21.16b ++ MOV V22.16b, V23.16b + + 5: + CMP x1, 2 +-- +2.18.4 + diff --git a/README.en.md b/README.en.md deleted file mode 100644 index 8c6d8300add66eda6ebb914ef66cb2ba16b2aaa7..0000000000000000000000000000000000000000 --- a/README.en.md +++ /dev/null @@ -1,36 +0,0 @@ -# pytorch - -#### Description -python deep learning framework - -#### Software Architecture -Software architecture description - -#### Installation - -1. xxxx -2. xxxx -3. xxxx - -#### Instructions - -1. xxxx -2. xxxx -3. xxxx - -#### Contribution - -1. Fork the repository -2. Create Feat_xxx branch -3. Commit your code -4. Create Pull Request - - -#### Gitee Feature - -1. You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md -2. Gitee blog [blog.gitee.com](https://blog.gitee.com) -3. Explore open source project [https://gitee.com/explore](https://gitee.com/explore) -4. The most valuable open source project [GVP](https://gitee.com/gvp) -5. The manual of Gitee [https://gitee.com/help](https://gitee.com/help) -6. The most popular members [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/README.md b/README.md deleted file mode 100644 index 2e071f27befe173c4fe608825136cf90b5dc16ab..0000000000000000000000000000000000000000 --- a/README.md +++ /dev/null @@ -1,37 +0,0 @@ -# pytorch - -#### 介绍 -python deep learning framework - -#### 软件架构 -软件架构说明 - - -#### 安装教程 - -1. xxxx -2. xxxx -3. xxxx - -#### 使用说明 - -1. xxxx -2. xxxx -3. xxxx - -#### 参与贡献 - -1. Fork 本仓库 -2. 新建 Feat_xxx 分支 -3. 提交代码 -4. 新建 Pull Request - - -#### 码云特技 - -1. 使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md -2. 码云官方博客 [blog.gitee.com](https://blog.gitee.com) -3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解码云上的优秀开源项目 -4. [GVP](https://gitee.com/gvp) 全称是码云最有价值开源项目，是码云综合评定出的优秀开源项目 -5. 码云官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help) -6. 码云封面人物是一档用来展示码云会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/pytorch-1.6.0-include-submodules.tar.bz2 b/pytorch-1.6.0-include-submodules.tar.bz2 new file mode 100644 index 0000000000000000000000000000000000000000..2b59fe20d1ce89da8b776f202e3111766bb5503b Binary files /dev/null and b/pytorch-1.6.0-include-submodules.tar.bz2 differ diff --git a/pytorch.spec b/pytorch.spec new file mode 100644 index 0000000000000000000000000000000000000000..1d7185b3a3f16b6917d33f57bb1a921bcc7c7a71 --- /dev/null +++ b/pytorch.spec @@ -0,0 +1,88 @@ +%global _empty_manifest_terminate_build 0 +Name: pytorch +Version: 1.6.0 +Release: 1 +Summary: Tensors and Dynamic neural networks in Python with strong GPU acceleration +License: BSD-3 +URL: https://pytorch.org/ +#sh -x updateSource.sh +Source0: pytorch-1.6.0-include-submodules.tar.bz2 + +Patch0001: 0001-Fix-illegal-opcode-bug-in-caffe2-40584.patch + +Requires: python3-future +Requires: python3-numpy + +%description +PyTorch is a Python package that provides two high-level features: +- Tensor computation (like NumPy) with strong GPU acceleration +- Deep neural networks built on a tape-based autograd system +You can reuse your favorite Python packages such as NumPy, SciPy and Cython to extend PyTorch when needed. + +%package -n python3-pytorch +Summary: Tensors and Dynamic neural networks in Python with strong GPU acceleration +Provides: python-torch +BuildRequires: python3-devel +BuildRequires: python3-setuptools +BuildRequires: python3-pyyaml +BuildRequires: cmake +BuildRequires: python3-numpy + +%description -n python3-pytorch +PyTorch is a Python package that provides two high-level features: +- Tensor computation (like NumPy) with strong GPU acceleration +- Deep neural networks built on a tape-based autograd system +You can reuse your favorite Python packages such as NumPy, SciPy and Cython to extend PyTorch when needed. + +%package help +Summary: Development documents and examples for torch +Provides: python3-pytorch-doc +%description help +PyTorch is a Python package that provides two high-level features: +- Tensor computation (like NumPy) with strong GPU acceleration +- Deep neural networks built on a tape-based autograd system +You can reuse your favorite Python packages such as NumPy, SciPy and Cython to extend PyTorch when needed. + +%prep +%autosetup -p1 + +%build +%py3_build + +%install +%py3_install +install -d -m755 %{buildroot}/%{_pkgdocdir} +if [ -d doc ]; then cp -arf doc %{buildroot}/%{_pkgdocdir}; fi +if [ -d docs ]; then cp -arf docs %{buildroot}/%{_pkgdocdir}; fi +if [ -d example ]; then cp -arf example %{buildroot}/%{_pkgdocdir}; fi +if [ -d examples ]; then cp -arf examples %{buildroot}/%{_pkgdocdir}; fi +pushd %{buildroot} +if [ -d usr/lib ]; then + find usr/lib -type f -printf "/%h/%f\n" >> filelist.lst +fi +if [ -d usr/lib64 ]; then + find usr/lib64 -type f -printf "/%h/%f\n" >> filelist.lst +fi +if [ -d usr/bin ]; then + find usr/bin -type f -printf "/%h/%f\n" >> filelist.lst +fi +if [ -d usr/sbin ]; then + find usr/sbin -type f -printf "/%h/%f\n" >> filelist.lst +fi +touch doclist.lst +if [ -d usr/share/man ]; then + find usr/share/man -type f -printf "/%h/%f.gz\n" >> doclist.lst +fi +popd +mv %{buildroot}/filelist.lst . +mv %{buildroot}/doclist.lst . + +%files -n python3-pytorch -f filelist.lst +%dir %{python3_sitearch}/* + +%files help -f doclist.lst +%{_docdir}/* + +%changelog +* Sun Sep 27 2020 Zhipeng Xie - 1.6.0-1 +- Package init diff --git a/pytorch.yaml b/pytorch.yaml new file mode 100644 index 0000000000000000000000000000000000000000..cc126e1b80f04e36ae0f55eb95f8977ac917aee6 --- /dev/null +++ b/pytorch.yaml @@ -0,0 +1,4 @@ +version_control: github +src_repo: pytorch/pytorch +tag_prefix: ^v +separator: . diff --git a/updateSource.sh b/updateSource.sh new file mode 100644 index 0000000000000000000000000000000000000000..520c4cf8e26cf33e9340aea6c53a428cc2389ab9 --- /dev/null +++ b/updateSource.sh @@ -0,0 +1,12 @@ +#!/bin/bash +topdir=$(pwd) +version=1.6.0 +rm -rf pytorch-${version} +git clone --recursive https://github.com/pytorch/pytorch pytorch-${version} +cd pytorch-${version} +git checkout v${version} +git submodule sync +git submodule update --init --recursive +rm -rf .git +cd ${topdir} +tar -cjf pytorch-${version}-include-submodules.tar.bz2 pytorch-${version}