diff options
| -rw-r--r-- | .SRCINFO | 104 | ||||
| -rw-r--r-- | 010-caffe2-fix-include-system-path.patch | 11 | ||||
| -rw-r--r-- | 020-caffe2-use-system-libuv.patch | 11 | ||||
| -rw-r--r-- | 030-caffe2-disable-non-x86_64.patch | 13 | ||||
| -rw-r--r-- | PKGBUILD | 249 |
5 files changed, 265 insertions, 123 deletions
@@ -1,7 +1,7 @@ pkgbase = caffe2 pkgdesc = A new lightweight, modular, and scalable deep learning framework - pkgver = 0.8.2_1.1.0 - pkgrel = 2 + pkgver = 0.8.2_1.8.1 + pkgrel = 1 url = https://caffe2.ai/ arch = x86_64 license = BSD @@ -12,15 +12,23 @@ pkgbase = caffe2 makedepends = cuda makedepends = cudnn makedepends = nccl + makedepends = pybind11 + makedepends = qt5-base depends = google-glog depends = protobuf + depends = openmp depends = python depends = python-numpy depends = python-protobuf + depends = python-typing_extensions depends = python-yaml depends = blas depends = lapack depends = gflags + depends = numactl + depends = intel-mkl + depends = opencv + depends = libuv optdepends = python-flask optdepends = graphviz optdepends = python-hypothesis @@ -38,35 +46,49 @@ pkgbase = caffe2 optdepends = python-lmdb conflicts = python-pytorch options = !emptydirs - source = git+https://github.com/pytorch/pytorch.git#tag=v1.1.0 - source = git+https://github.com/pybind/pybind11 - source = git+https://github.com/NVlabs/cub - source = git+https://github.com/eigenteam/eigen-git-mirror - source = git+https://github.com/google/googletest - source = git+https://github.com/google/benchmark - source = git+https://github.com/google/protobuf - source = git+https://github.com/Yangqing/ios-cmake - source = git+https://github.com/Maratyszcza/NNPACK - source = git+https://github.com/facebookincubator/gloo - source = git+https://github.com/Maratyszcza/pthreadpool - source = git+https://github.com/Maratyszcza/FXdiv - source = git+https://github.com/Maratyszcza/FP16 - source = git+https://github.com/Maratyszcza/psimd - source = git+https://github.com/facebook/zstd - source = git+https://github.com/Maratyszcza/cpuinfo - source = git+https://github.com/PeachPy/enum34 - source = git+https://github.com/Maratyszcza/PeachPy - source = git+https://github.com/benjaminp/six - source = git+https://github.com/onnx/onnx - source = git+https://github.com/onnx/onnx-tensorrt - source = sleef-zdevito::git+https://github.com/zdevito/sleef - source = git+https://github.com/intel/ideep + source = git+https://github.com/pytorch/pytorch.git#tag=v1.8.1 + source = git+https://github.com/pybind/pybind11.git + source = cub-nvlabs::git+https://github.com/NVlabs/cub.git + source = git+https://github.com/eigenteam/eigen-git-mirror.git + source = git+https://github.com/google/googletest.git + source = git+https://github.com/google/benchmark.git + source = protobuf-protocolbuffers::git+https://github.com/protocolbuffers/protobuf.git + source = git+https://github.com/Yangqing/ios-cmake.git + source = git+https://github.com/Maratyszcza/NNPACK.git + source = git+https://github.com/facebookincubator/gloo.git + source = git+https://github.com/Maratyszcza/pthreadpool.git + source = git+https://github.com/Maratyszcza/FXdiv.git + source = git+https://github.com/Maratyszcza/FP16.git + source = git+https://github.com/Maratyszcza/psimd.git + source = git+https://github.com/facebook/zstd.git + source = cpuinfo-pytorch::git+https://github.com/pytorch/cpuinfo.git + source = git+https://github.com/PeachPy/enum34.git + source = git+https://github.com/Maratyszcza/PeachPy.git + source = git+https://github.com/benjaminp/six.git + source = git+https://github.com/onnx/onnx.git + source = git+https://github.com/onnx/onnx-tensorrt.git + source = git+https://github.com/shibatch/sleef.git + source = git+https://github.com/intel/ideep.git source = git+https://github.com/NVIDIA/nccl.git - source = git+https://github.com/google/gemmlowp - source = git+https://github.com/pytorch/QNNPACK - source = git+https://github.com/intel/ARM_NEON_2_x86_SSE - source = git+https://github.com/pytorch/fbgemm - source = git+https://github.com/houseroad/foxi + source = git+https://github.com/google/gemmlowp.git + source = git+https://github.com/pytorch/QNNPACK.git + source = git+https://github.com/intel/ARM_NEON_2_x86_SSE.git + source = git+https://github.com/pytorch/fbgemm.git + source = git+https://github.com/houseroad/foxi.git + source = git+https://github.com/01org/tbb.git + source = git+https://github.com/facebookincubator/fbjni.git + source = XNNPACK-malfet::git+https://github.com/malfet/XNNPACK.git + source = git+https://github.com/fmtlib/fmt.git + source = git+https://github.com/pytorch/tensorpipe.git + source = git+https://github.com/pytorch/kineto.git + source = git+https://github.com/asmjit/asmjit.git + source = git+https://github.com/01org/mkl-dnn.git + source = git+https://github.com/emil-e/rapidcheck.git + source = git+https://github.com/libuv/libuv.git + source = git+https://github.com/google/libnop.git + source = 010-caffe2-fix-include-system-path.patch + source = 020-caffe2-use-system-libuv.patch + source = 030-caffe2-disable-non-x86_64.patch sha256sums = SKIP sha256sums = SKIP sha256sums = SKIP @@ -96,10 +118,25 @@ pkgbase = caffe2 sha256sums = SKIP sha256sums = SKIP sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = c68ddbd539e2a8ef3a1874a65e9c6701fc9d136b592be095b953cdcab38815fd + sha256sums = 5bf80f75ce07be91043e78e0cd096146b312373fd7a7abb0628a5d9f6515d870 + sha256sums = 7385ac0742f00245c3bd7560e33648566a25b950964806c55b6c3eaee25981ac pkgname = caffe2 pkgdesc = A new lightweight, modular, and scalable deep learning framework (cpu only) provides = caffe2-cpu + conflicts = python-pytorch conflicts = caffe2-cpu replaces = caffe2-cpu @@ -107,16 +144,23 @@ pkgname = caffe2-cuda pkgdesc = A new lightweight, modular, and scalable deep learning framework (with cuda support) depends = google-glog depends = protobuf + depends = openmp depends = python depends = python-numpy depends = python-protobuf + depends = python-typing_extensions depends = python-yaml depends = blas depends = lapack depends = gflags + depends = numactl + depends = intel-mkl + depends = opencv + depends = libuv depends = cuda depends = cudnn depends = nccl provides = caffe2 + conflicts = python-pytorch conflicts = caffe2 diff --git a/010-caffe2-fix-include-system-path.patch b/010-caffe2-fix-include-system-path.patch new file mode 100644 index 000000000000..5c72921f0dfc --- /dev/null +++ b/010-caffe2-fix-include-system-path.patch @@ -0,0 +1,11 @@ +--- 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))] + diff --git a/020-caffe2-use-system-libuv.patch b/020-caffe2-use-system-libuv.patch new file mode 100644 index 000000000000..6628bcf76292 --- /dev/null +++ b/020-caffe2-use-system-libuv.patch @@ -0,0 +1,11 @@ +--- 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) diff --git a/030-caffe2-disable-non-x86_64.patch b/030-caffe2-disable-non-x86_64.patch new file mode 100644 index 000000000000..a9f4c449b12d --- /dev/null +++ b/030-caffe2-disable-non-x86_64.patch @@ -0,0 +1,13 @@ +--- a/tools/setup_helpers/cmake.py ++++ b/tools/setup_helpers/cmake.py +@@ -295,6 +295,10 @@ class CMake: + build_options.update(cmake__options) + + CMake.defines(args, ++ DISABLE_AVX2=1, ++ DISABLE_AVX512F=1, ++ DISABLE_FMA4=1, ++ DISABLE_SSE4=1, + PYTHON_EXECUTABLE=sys.executable, + PYTHON_LIBRARY=cmake_python_library, + PYTHON_INCLUDE_DIR=distutils.sysconfig.get_python_inc(), @@ -1,52 +1,71 @@ -# Maintainer : Daniel Bermond <dbermond@archlinux.org> +# Maintainer: Daniel Bermond <dbermond@archlinux.org> + +# select the desired cuda architecture(s) +# default is to build for all (takes a very long time to build) +_cuda_archs='5.2;5.3;6.0;6.1;6.2;7.0;7.0+PTX;7.2;7.2+PTX;7.5;7.5+PTX;8.0;8.0+PTX;8.6;8.6+PTX' pkgbase=caffe2 pkgname=('caffe2' 'caffe2-cuda') -_pytorchver=1.1.0 # pytorch stable release version +_pytorchver=1.8.1 pkgver="0.8.2_${_pytorchver}" -pkgrel=2 +pkgrel=1 pkgdesc='A new lightweight, modular, and scalable deep learning framework' arch=('x86_64') url='https://caffe2.ai/' license=('BSD') -depends=('google-glog' 'protobuf' 'python' 'python-numpy' 'python-protobuf' - 'python-yaml' 'blas' 'lapack' 'gflags') +depends=('google-glog' 'protobuf' 'openmp' 'python' 'python-numpy' 'python-protobuf' + 'python-typing_extensions' 'python-yaml' 'blas' 'lapack' 'gflags' 'numactl' + 'intel-mkl' 'opencv' 'libuv') optdepends=('python-flask' 'graphviz' 'python-hypothesis' 'python-matplotlib' 'python-pydot' 'python-nvd3' 'python-yaml' 'python-requests' 'python-scikit-image' 'python-scipy' 'python-setuptools' 'python-future' 'python-tornado' 'python-six' 'python-lmdb') -makedepends=('git' 'cmake' 'gtest' 'snappy' 'cuda' 'cudnn' 'nccl') +makedepends=('git' 'cmake' 'gtest' 'snappy' 'cuda' 'cudnn' 'nccl' 'pybind11' 'qt5-base') conflicts=('python-pytorch') options=('!emptydirs') source=("git+https://github.com/pytorch/pytorch.git#tag=v${_pytorchver}" - 'git+https://github.com/pybind/pybind11' - 'git+https://github.com/NVlabs/cub' - 'git+https://github.com/eigenteam/eigen-git-mirror' - 'git+https://github.com/google/googletest' - 'git+https://github.com/google/benchmark' - 'git+https://github.com/google/protobuf' - 'git+https://github.com/Yangqing/ios-cmake' - 'git+https://github.com/Maratyszcza/NNPACK' - 'git+https://github.com/facebookincubator/gloo' - 'git+https://github.com/Maratyszcza/pthreadpool' - 'git+https://github.com/Maratyszcza/FXdiv' - 'git+https://github.com/Maratyszcza/FP16' - 'git+https://github.com/Maratyszcza/psimd' - 'git+https://github.com/facebook/zstd' - 'git+https://github.com/Maratyszcza/cpuinfo' - 'git+https://github.com/PeachPy/enum34' - 'git+https://github.com/Maratyszcza/PeachPy' - 'git+https://github.com/benjaminp/six' - 'git+https://github.com/onnx/onnx' - 'git+https://github.com/onnx/onnx-tensorrt' - 'sleef-zdevito'::'git+https://github.com/zdevito/sleef' - 'git+https://github.com/intel/ideep' + 'git+https://github.com/pybind/pybind11.git' + 'cub-nvlabs'::'git+https://github.com/NVlabs/cub.git' + 'git+https://github.com/eigenteam/eigen-git-mirror.git' + 'git+https://github.com/google/googletest.git' + 'git+https://github.com/google/benchmark.git' + 'protobuf-protocolbuffers'::'git+https://github.com/protocolbuffers/protobuf.git' + 'git+https://github.com/Yangqing/ios-cmake.git' + 'git+https://github.com/Maratyszcza/NNPACK.git' + 'git+https://github.com/facebookincubator/gloo.git' + 'git+https://github.com/Maratyszcza/pthreadpool.git' + 'git+https://github.com/Maratyszcza/FXdiv.git' + 'git+https://github.com/Maratyszcza/FP16.git' + 'git+https://github.com/Maratyszcza/psimd.git' + 'git+https://github.com/facebook/zstd.git' + 'cpuinfo-pytorch'::'git+https://github.com/pytorch/cpuinfo.git' + 'git+https://github.com/PeachPy/enum34.git' + 'git+https://github.com/Maratyszcza/PeachPy.git' + 'git+https://github.com/benjaminp/six.git' + 'git+https://github.com/onnx/onnx.git' + 'git+https://github.com/onnx/onnx-tensorrt.git' + 'git+https://github.com/shibatch/sleef.git' + 'git+https://github.com/intel/ideep.git' 'git+https://github.com/NVIDIA/nccl.git' - 'git+https://github.com/google/gemmlowp' - 'git+https://github.com/pytorch/QNNPACK' - 'git+https://github.com/intel/ARM_NEON_2_x86_SSE' - 'git+https://github.com/pytorch/fbgemm' - 'git+https://github.com/houseroad/foxi') + 'git+https://github.com/google/gemmlowp.git' + 'git+https://github.com/pytorch/QNNPACK.git' + 'git+https://github.com/intel/ARM_NEON_2_x86_SSE.git' + 'git+https://github.com/pytorch/fbgemm.git' + 'git+https://github.com/houseroad/foxi.git' + 'git+https://github.com/01org/tbb.git' + 'git+https://github.com/facebookincubator/fbjni.git' + 'XNNPACK-malfet'::'git+https://github.com/malfet/XNNPACK.git' + 'git+https://github.com/fmtlib/fmt.git' + 'git+https://github.com/pytorch/tensorpipe.git' + 'git+https://github.com/pytorch/kineto.git' + 'git+https://github.com/asmjit/asmjit.git' + 'git+https://github.com/01org/mkl-dnn.git' + 'git+https://github.com/emil-e/rapidcheck.git' + 'git+https://github.com/libuv/libuv.git' + 'git+https://github.com/google/libnop.git' + '010-caffe2-fix-include-system-path.patch' + '020-caffe2-use-system-libuv.patch' + '030-caffe2-disable-non-x86_64.patch') sha256sums=('SKIP' 'SKIP' 'SKIP' @@ -75,16 +94,25 @@ sha256sums=('SKIP' 'SKIP' 'SKIP' 'SKIP' - 'SKIP') + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'c68ddbd539e2a8ef3a1874a65e9c6701fc9d136b592be095b953cdcab38815fd' + '5bf80f75ce07be91043e78e0cd096146b312373fd7a7abb0628a5d9f6515d870' + '7385ac0742f00245c3bd7560e33648566a25b950964806c55b6c3eaee25981ac') prepare() { - mkdir -p pytorch/{build-cpu-only,build-cuda} - - cd pytorch - - # submodules which clone dir coincide with the submodule name + # submodules which clone dir coincides with the submodule name local _submodule_list=('pybind11' - 'cub' 'googletest' 'benchmark' 'protobuf' @@ -98,116 +126,151 @@ prepare() { 'ideep' 'QNNPACK' 'fbgemm' - 'foxi') + 'foxi' + 'tbb' + 'fmt' + 'tensorpipe' + 'kineto') + + git -C pytorch submodule init + local _submodule for _submodule in "${_submodule_list[@]}" do - git config --local "submodule.third_party/${_submodule}.url" "${srcdir}/${_submodule}" + git -C pytorch config --local "submodule.third_party/${_submodule}.url" "${srcdir}/${_submodule}" done # submodules which clone dir does not coincide with the submodule name - git config --local "submodule.third_party/eigen.url" "${srcdir}/eigen-git-mirror" - git config --local "submodule.third_party/NNPACK_deps/pthreadpool.url" "${srcdir}/pthreadpool" - git config --local "submodule.third_party/NNPACK_deps/FXdiv.url" "${srcdir}/FXdiv" - git config --local "submodule.third_party/NNPACK_deps/FP16.url" "${srcdir}/FP16" - git config --local "submodule.third_party/NNPACK_deps/psimd.url" "${srcdir}/psimd" - git config --local "submodule.third_party/python-enum.url" "${srcdir}/enum34" - git config --local "submodule.third_party/python-peachpy.url" "${srcdir}/PeachPy" - git config --local "submodule.third_party/python-six.url" "${srcdir}/six" - git config --local "submodule.third_party/sleef.url" "${srcdir}/sleef-zdevito" - git config --local "submodule.third_party/neon2sse.url" "${srcdir}/ARM_NEON_2_x86_SSE" - git config --local "submodule.third_party/nccl/nccl.url" "${srcdir}/nccl" - git config --local "submodule.third_party/gemmlowp/gemmlowp.url" "${srcdir}/gemmlowp" + git -C pytorch config --local submodule.third_party/cub.url "${srcdir}/cub-nvlabs" + git -C pytorch config --local submodule.third_party/eigen.url "${srcdir}/eigen-git-mirror" + git -C pytorch config --local submodule.third_party/protobuf.url "${srcdir}/protobuf-protocolbuffers" + git -C pytorch config --local submodule.third_party/NNPACK_deps/pthreadpool.url "${srcdir}/pthreadpool" + git -C pytorch config --local submodule.third_party/NNPACK_deps/FXdiv.url "${srcdir}/FXdiv" + git -C pytorch config --local submodule.third_party/NNPACK_deps/FP16.url "${srcdir}/FP16" + git -C pytorch config --local submodule.third_party/NNPACK_deps/psimd.url "${srcdir}/psimd" + git -C pytorch config --local submodule.third_party/python-enum.url "${srcdir}/enum34" + git -C pytorch config --local submodule.third_party/python-peachpy.url "${srcdir}/PeachPy" + git -C pytorch config --local submodule.third_party/python-six.url "${srcdir}/six" + git -C pytorch config --local submodule.third_party/neon2sse.url "${srcdir}/ARM_NEON_2_x86_SSE" + git -C pytorch config --local submodule.third_party/nccl/nccl.url "${srcdir}/nccl" + git -C pytorch config --local submodule.third_party/gemmlowp/gemmlowp.url "${srcdir}/gemmlowp" + git -C pytorch config --local submodule.android/libs/fbjni.url "${srcdir}/fbjni" + git -C pytorch config --local submodule.third_party/XNNPACK.url "${srcdir}/XNNPACK-malfet" # special case (upstream uses third-party instead of third_party) - git config --local 'submodule.third-party/cpuinfo.url' "${srcdir}/cpuinfo" + git -C pytorch config --local submodule.third-party/cpuinfo.url "${srcdir}/cpuinfo-pytorch" + + git -C pytorch submodule update + + # fbgemm submodules + git -C pytorch/third_party/fbgemm submodule init + git -C pytorch/third_party/fbgemm config --local submodule.third_party/asmjit.url "${srcdir}/asmjit" + git -C pytorch/third_party/fbgemm config --local submodule.third_party/cpuinfo.url "${srcdir}/cpuinfo-pytorch" + git -C pytorch/third_party/fbgemm config --local submodule.third_party/googletest.url "${srcdir}/googletest" + git -C pytorch/third_party/fbgemm submodule update + + # ideep submodules + git -C pytorch/third_party/ideep submodule init + git -C pytorch/third_party/ideep config --local submodule.mkl-dnn.url "${srcdir}/mkl-dnn" + git -C pytorch/third_party/ideep config --local submodule.tests/googletest.url "${srcdir}/googletest" + git -C pytorch/third_party/ideep config --local submodule.tests/rapidcheck.url "${srcdir}/rapidcheck" + git -C pytorch/third_party/ideep submodule update + + # tensorpipe submodules + git -C pytorch/third_party/tensorpipe submodule init + git -C pytorch/third_party/tensorpipe config --local submodule.third_party/pybind11.url "${srcdir}/pybind11" + git -C pytorch/third_party/tensorpipe config --local submodule.third_party/libuv.url "${srcdir}/libuv" + git -C pytorch/third_party/tensorpipe config --local submodule.third_party/googletest.url "${srcdir}/googletest" + git -C pytorch/third_party/tensorpipe config --local submodule.third_party/libnop.url "${srcdir}/libnop" + git -C pytorch/third_party/tensorpipe submodule update - git submodule update + patch -d pytorch -Np1 -i "${srcdir}/010-caffe2-fix-include-system-path.patch" + patch -d pytorch -Np1 -i "${srcdir}/020-caffe2-use-system-libuv.patch" + patch -d pytorch -Np1 -i "${srcdir}/030-caffe2-disable-non-x86_64.patch" } build() { - local _common_opts=('..' - '-DBLAS:STRING=Eigen' - '-DBUILD_BINARY:BOOL=ON' + local _common_opts=('-DBUILD_BINARY:BOOL=ON' '-DBUILD_CUSTOM_PROTOBUF:BOOL=OFF' '-DBUILD_SHARED_LIBS:BOOL=ON' '-DCMAKE_BUILD_TYPE:STRING=None' - '-DCMAKE_INSTALL_LIBDIR:PATH=lib' '-DCMAKE_INSTALL_PREFIX:PATH=/usr' '-DCMAKE_SKIP_INSTALL_RPATH:BOOL=YES' - '-DCXX_AVX2_FOUND:BOOL=FALSE' - '-DCXX_AVX_FOUND:BOOL=FALSE' - '-DC_AVX2_FOUND:BOOL=FALSE' - '-DC_AVX_FOUND:BOOL=FALSE' '-DUSE_GFLAGS:BOOL=ON' '-DUSE_GLOG:BOOL=ON' - '-DUSE_MPI:BOOL=OFF' - '-DUSE_NUMA:BOOL=OFF' - '-DUSE_OPENCV:BOOL=OFF' + '-DUSE_OPENCV:BOOL=ON' '-Wno-dev') # caffe2-cuda - cd pytorch/build-cuda - cmake \ + cmake -B build-cuda -S pytorch \ "${_common_opts[@]}" \ -DCMAKE_CXX_COMPILER:FILEPATH='/opt/cuda/bin/g++' \ -DCMAKE_C_COMPILER:FILEPATH='/opt/cuda/bin/gcc' \ -DCUDA_HOST_COMPILER:FILEPATH='/opt/cuda/bin/gcc' \ -DCUDA_NVCC_FLAGS:STRING='-Xfatbin -compress-all' \ - -DTORCH_CUDA_ARCH_LIST='3.0;3.2;3.5;3.7;5.0;5.2;5.3;6.0;6.1;6.2;7.0;7.2;7.5' \ + -DTORCH_CUDA_ARCH_LIST="$_cuda_archs" \ + -DNCCL_INCLUDE_DIR:PATH='/usr/include' \ -DUSE_CUDA:BOOL='ON' \ -DUSE_CUDNN:BOOL='ON' \ -DUSE_METAL:BOOL='OFF' \ -DUSE_NCCL:BOOL='ON' \ -DUSE_SYSTEM_NCCL:BOOL='ON' + ## fix: avoid a second compilation in package() - sed -i 's/^preinstall:[[:space:]]all/preinstall:/' Makefile - make + sed -i 's/^preinstall:[[:space:]]all/preinstall:/' build-cuda/Makefile + make -C build-cuda # caffe2 (cpu only, without cuda support) - cd "${srcdir}/pytorch/build-cpu-only" - cmake "${_common_opts[@]}" -DUSE_CUDA:BOOL='OFF' -DUSE_NCCL:BOOL='OFF' - make + cmake -B build-cpu-only -S pytorch "${_common_opts[@]}" -DUSE_CUDA:BOOL='OFF' -DUSE_NCCL:BOOL='OFF' + make -C build-cpu-only } _package_common() { - make DESTDIR="$pkgdir" install + make -C "$1" DESTDIR="$pkgdir" install # remove unneeded files - rm "$pkgdir"/usr/include/*.h - rm "$pkgdir"/usr/lib/{*.a,lib{foxi*,onnxifi*}.so*} - rm -r "$pkgdir"/usr/share/{ATen,cmake/{ATen,Gloo,ONNX}} - rm -r "$pkgdir"/torch + rm "$pkgdir"/usr/include/*.h* local _dir + local _file + while read -r -d '' _dir + do + rm -r "$_dir" + done < <(find "${pkgdir}/usr"/{include,share/doc} -mindepth 1 -maxdepth 1 -type d ! -name 'ATen*' ! -name 'caffe*' \ + ! -name 'c10*' ! -name 'TH*' ! -name '*torch*' -print0) while read -r -d '' _dir do - rm -rf "$_dir" - done < <(find "${pkgdir}/usr/include" -mindepth 1 -maxdepth 1 -type d ! -name 'caffe*' ! -name 'c10' -print0) + rm -r "$_dir" + done < <(find "${pkgdir}/usr"/{lib,share}/cmake -mindepth 1 -maxdepth 1 -type d ! -name 'ATen*' ! -name 'Caffe*' \ + ! -name 'Torch*' -print0) + while read -r -d '' _file + do + rm "$_file" + done < <(find -L "${pkgdir}/usr/lib" -mindepth 1 -maxdepth 1 -type f ! -name '*c10*.so*' ! -name '*caffe*' \ + ! -name '*shm*' ! -name '*torch*.so*' -print0) + while read -r -d '' _file + do + rm "$_file" + done < <(find -L "${pkgdir}/usr/lib/pkgconfig" -mindepth 1 -maxdepth 1 -type f ! -name '*c10*' ! -name '*caffe*' \ + ! -name '*shm*' ! -name '*torch*' -print0) # license - cd "${srcdir}/pytorch" - install -D -m644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}" - install -D -m644 NOTICE -t "${pkgdir}/usr/share/licenses/${pkgname}" + install -D -m644 pytorch/{LICENSE,NOTICE} -t "${pkgdir}/usr/share/licenses/${pkgname}" } package_caffe2-cuda() { pkgdesc+=' (with cuda support)' depends+=('cuda' 'cudnn' 'nccl') provides=('caffe2') - conflicts=('caffe2') - - cd pytorch/build-cuda + conflicts+=('caffe2') - _package_common + _package_common 'build-cuda' } package_caffe2() { pkgdesc+=' (cpu only)' provides=('caffe2-cpu') - conflicts=('caffe2-cpu') + conflicts+=('caffe2-cpu') replaces=('caffe2-cpu') - cd pytorch/build-cpu-only - - _package_common + _package_common 'build-cpu-only' } |