summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Bermond2018-11-10 12:53:59 +0000
committerDaniel Bermond2018-11-10 12:53:59 +0000
commit371e15aa8a0759b700c747e8b263451b5713c919 (patch)
tree2add7332a41f07d832486979b949c73e283b28a2
parent81a571e0be333224a0b292d872e4c1632e947ff1 (diff)
downloadaur-371e15aa8a0759b700c747e8b263451b5713c919.tar.gz
Do not rename source clones
-rw-r--r--.SRCINFO62
-rw-r--r--PKGBUILD117
2 files changed, 90 insertions, 89 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 93f4553ea38..b5e00234324 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = caffe2-git
pkgdesc = A new lightweight, modular, and scalable deep learning framework (git version)
- pkgver = 0.8.2.r14502.g7978ba45ba
+ pkgver = 0.8.2.r14563.g4f622c26b9
pkgrel = 1
epoch = 1
url = https://caffe2.ai/
@@ -55,36 +55,36 @@ pkgbase = caffe2-git
conflicts = caffe2-cpu-git
replaces = caffe2-cpu-git
options = !emptydirs
- source = pytorch-git::git+https://github.com/pytorch/pytorch.git
- source = caffe2-submodule-pybind11::git+https://github.com/pybind/pybind11.git
- source = caffe2-submodule-cub::git+https://github.com/NVlabs/cub.git
- source = caffe2-submodule-eigen::git+https://github.com/eigenteam/eigen-git-mirror.git
- source = caffe2-submodule-googletest::git+https://github.com/google/googletest.git
- source = caffe2-submodule-benchmark::git+https://github.com/google/benchmark.git
- source = caffe2-submodule-protobuf::git+https://github.com/google/protobuf.git
- source = caffe2-submodule-ios-cmake::git+https://github.com/Yangqing/ios-cmake.git
- source = caffe2-submodule-NNPACK::git+https://github.com/Maratyszcza/NNPACK.git
- source = caffe2-submodule-gloo::git+https://github.com/facebookincubator/gloo
- source = caffe2-submodule-NNPACK_deps-pthreadpool::git+https://github.com/Maratyszcza/pthreadpool.git
- source = caffe2-submodule-NNPACK_deps-FXdiv::git+https://github.com/Maratyszcza/FXdiv.git
- source = caffe2-submodule-NNPACK_deps-FP16::git+https://github.com/Maratyszcza/FP16.git
- source = caffe2-submodule-NNPACK_deps-psimd::git+https://github.com/Maratyszcza/psimd.git
- source = caffe2-submodule-zstd::git+https://github.com/facebook/zstd.git
- source = caffe2-submodule-cpuinfo::git+https://github.com/Maratyszcza/cpuinfo.git
- source = caffe2-submodule-python-enum::git+https://github.com/PeachPy/enum34.git
- source = caffe2-submodule-python-peachpy::git+https://github.com/Maratyszcza/PeachPy.git
- source = caffe2-submodule-python-six::git+https://github.com/benjaminp/six.git
- source = caffe2-submodule-ComputeLibrary::git+https://github.com/ARM-software/ComputeLibrary.git
- source = caffe2-submodule-onnx::git+https://github.com/onnx/onnx.git
- source = caffe2-submodule-onnx-tensorrt::git+https://github.com/onnx/onnx-tensorrt
- source = caffe2-submodule-sleef::git+https://github.com/shibatch/sleef
- source = caffe2-submodule-ideep::git+https://github.com/intel/ideep
- source = caffe2-submodule-nccl::git+https://github.com/NVIDIA/nccl
- source = caffe2-submodule-gemmlowp::git+https://github.com/google/gemmlowp.git
- source = caffe2-submodule-QNNPACK::git+https://github.com/pytorch/QNNPACK
- source = caffe2-submodule-neon2sse::git+https://github.com/intel/ARM_NEON_2_x86_SSE.git
- source = caffe2-submodule-fbgemm::git+https://github.com/pytorch/fbgemm
- source = asmjit-git::git+https://github.com/asmjit/asmjit.git
+ source = git+https://github.com/pytorch/pytorch.git
+ source = git+https://github.com/pybind/pybind11.git
+ source = 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 = git+https://github.com/google/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
+ 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 = git+https://github.com/Maratyszcza/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/ARM-software/ComputeLibrary.git
+ source = git+https://github.com/onnx/onnx.git
+ source = git+https://github.com/onnx/onnx-tensorrt
+ source = git+https://github.com/shibatch/sleef
+ source = git+https://github.com/intel/ideep
+ source = git+https://github.com/NVIDIA/nccl
+ source = git+https://github.com/google/gemmlowp.git
+ source = git+https://github.com/pytorch/QNNPACK
+ source = git+https://github.com/intel/ARM_NEON_2_x86_SSE.git
+ source = git+https://github.com/pytorch/fbgemm
+ source = git+https://github.com/asmjit/asmjit.git
sha256sums = SKIP
sha256sums = SKIP
sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 23963bf270b..bc8d3b53d45 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,8 @@
# Maintainer : Daniel Bermond < gmail-com: danielbermond >
pkgname=caffe2-git
-pkgver=0.8.2.r14502.g7978ba45ba
+_srcname=pytorch
+pkgver=0.8.2.r14563.g4f622c26b9
pkgrel=1
epoch=1
pkgdesc='A new lightweight, modular, and scalable deep learning framework (git version)'
@@ -34,38 +35,38 @@ replaces=('caffe2-cpu-git')
options=('!emptydirs')
source=(
# main source:
- 'pytorch-git'::'git+https://github.com/pytorch/pytorch.git'
+ 'git+https://github.com/pytorch/pytorch.git'
# git submodules:
- 'caffe2-submodule-pybind11'::'git+https://github.com/pybind/pybind11.git'
- 'caffe2-submodule-cub'::'git+https://github.com/NVlabs/cub.git'
- 'caffe2-submodule-eigen'::'git+https://github.com/eigenteam/eigen-git-mirror.git'
- 'caffe2-submodule-googletest'::'git+https://github.com/google/googletest.git'
- 'caffe2-submodule-benchmark'::'git+https://github.com/google/benchmark.git'
- 'caffe2-submodule-protobuf'::'git+https://github.com/google/protobuf.git'
- 'caffe2-submodule-ios-cmake'::'git+https://github.com/Yangqing/ios-cmake.git'
- 'caffe2-submodule-NNPACK'::'git+https://github.com/Maratyszcza/NNPACK.git'
- 'caffe2-submodule-gloo'::'git+https://github.com/facebookincubator/gloo'
- 'caffe2-submodule-NNPACK_deps-pthreadpool'::'git+https://github.com/Maratyszcza/pthreadpool.git'
- 'caffe2-submodule-NNPACK_deps-FXdiv'::'git+https://github.com/Maratyszcza/FXdiv.git'
- 'caffe2-submodule-NNPACK_deps-FP16'::'git+https://github.com/Maratyszcza/FP16.git'
- 'caffe2-submodule-NNPACK_deps-psimd'::'git+https://github.com/Maratyszcza/psimd.git'
- 'caffe2-submodule-zstd'::'git+https://github.com/facebook/zstd.git'
- 'caffe2-submodule-cpuinfo'::'git+https://github.com/Maratyszcza/cpuinfo.git'
- 'caffe2-submodule-python-enum'::'git+https://github.com/PeachPy/enum34.git'
- 'caffe2-submodule-python-peachpy'::'git+https://github.com/Maratyszcza/PeachPy.git'
- 'caffe2-submodule-python-six'::'git+https://github.com/benjaminp/six.git'
- 'caffe2-submodule-ComputeLibrary'::'git+https://github.com/ARM-software/ComputeLibrary.git'
- 'caffe2-submodule-onnx'::'git+https://github.com/onnx/onnx.git'
- 'caffe2-submodule-onnx-tensorrt'::'git+https://github.com/onnx/onnx-tensorrt'
- 'caffe2-submodule-sleef'::'git+https://github.com/shibatch/sleef'
- 'caffe2-submodule-ideep'::'git+https://github.com/intel/ideep'
- 'caffe2-submodule-nccl'::'git+https://github.com/NVIDIA/nccl'
- 'caffe2-submodule-gemmlowp'::'git+https://github.com/google/gemmlowp.git'
- 'caffe2-submodule-QNNPACK'::'git+https://github.com/pytorch/QNNPACK'
- 'caffe2-submodule-neon2sse'::'git+https://github.com/intel/ARM_NEON_2_x86_SSE.git'
- 'caffe2-submodule-fbgemm'::'git+https://github.com/pytorch/fbgemm'
+ 'git+https://github.com/pybind/pybind11.git'
+ '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'
+ 'git+https://github.com/google/protobuf.git'
+ 'git+https://github.com/Yangqing/ios-cmake.git'
+ 'git+https://github.com/Maratyszcza/NNPACK.git'
+ 'git+https://github.com/facebookincubator/gloo'
+ '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'
+ 'git+https://github.com/Maratyszcza/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/ARM-software/ComputeLibrary.git'
+ 'git+https://github.com/onnx/onnx.git'
+ 'git+https://github.com/onnx/onnx-tensorrt'
+ 'git+https://github.com/shibatch/sleef'
+ 'git+https://github.com/intel/ideep'
+ 'git+https://github.com/NVIDIA/nccl'
+ 'git+https://github.com/google/gemmlowp.git'
+ 'git+https://github.com/pytorch/QNNPACK'
+ 'git+https://github.com/intel/ARM_NEON_2_x86_SSE.git'
+ 'git+https://github.com/pytorch/fbgemm'
# others:
- 'asmjit-git'::'git+https://github.com/asmjit/asmjit.git'
+ 'git+https://github.com/asmjit/asmjit.git'
)
sha256sums=('SKIP'
'SKIP'
@@ -99,40 +100,42 @@ sha256sums=('SKIP'
'SKIP')
prepare() {
- cd pytorch-git
+ cd "$_srcname"
local _submodule
- local _submodule_dir
-
- local _submodule_list="pybind11 cub eigen googletest benchmark protobuf ios-cmake \
- NNPACK gloo NNPACK_deps/pthreadpool NNPACK_deps/FXdiv \
- NNPACK_deps/FP16 NNPACK_deps/psimd zstd python-enum \
- python-peachpy python-six ComputeLibrary onnx onnx-tensorrt \
- sleef ideep QNNPACK neon2sse fbgemm"
+ local _submodule_list="pybind11 cub googletest benchmark protobuf ios-cmake \
+ NNPACK gloo zstd ComputeLibrary onnx onnx-tensorrt \
+ sleef ideep QNNPACK fbgemm"
git submodule init
- git config --local 'submodule.third-party/cpuinfo.url' "${srcdir}/caffe2-submodule-cpuinfo"
-
+ # 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/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"
+
+ # submodules which clone dir coincide with the submodule name
for _submodule in $_submodule_list
do
- _submodule_dir="caffe2-submodule-${_submodule/\//-}"
- git config --local "submodule.third_party/${_submodule}.url" "${srcdir}/${_submodule_dir}"
+ git config --local "submodule.third_party/${_submodule}.url" "${srcdir}/${_submodule}"
done
- _submodule_list='nccl gemmlowp' # upstream names this submodules as nccl/nccl and gemmlowp/gemmlowp
-
- for _submodule in $_submodule_list
- do
- _submodule_dir="caffe2-submodule-${_submodule}"
- git config --local "submodule.third_party/${_submodule}/${_submodule}.url" "${srcdir}/${_submodule_dir}"
- done
+ # special case (upstream uses third.party instead of third_party)
+ git config --local 'submodule.third-party/cpuinfo.url' "${srcdir}/cpuinfo"
git submodule update
}
pkgver() {
- cd pytorch-git
+ cd "$_srcname"
local _version
local _revision
@@ -146,10 +149,10 @@ pkgver() {
}
build() {
- cd pytorch-git
+ cd "$_srcname"
local _pythonver
- _pythonver="$(python --version | awk '{ print $2 }' | grep -o '^[0-9]*\.[0-9]*')"
+ _pythonver="$(python -c 'import sys; print("%s.%s" %sys.version_info[0:2])')"
mkdir -p build
cd build
@@ -162,15 +165,13 @@ build() {
-DBUILD_PYTHON:BOOL='ON' \
-DBUILD_SHARED_LIBS:BOOL='ON' \
\
- -DBUILD_TEST:BOOL='OFF' \
- \
-DCMAKE_INSTALL_LIBDIR:PATH='lib' \
-DCMAKE_INSTALL_PREFIX:PATH='/usr' \
\
-DGLOO_STATIC_OR_SHARED:STRING='STATIC' \
\
-DOpenCV_DIR:PATH='/usr/share/OpenCV' \
- -DASMJIT_SRC_DIR:STRING="${srcdir}/asmjit-git" \
+ -DASMJIT_SRC_DIR:STRING="${srcdir}/asmjit" \
\
-DPYTHON_EXECUTABLE:FILEPATH="/usr/bin/python${_pythonver}" \
-DPYTHON_INCLUDE_DIR:PATH="/usr/include/python${_pythonver}m" \
@@ -223,7 +224,7 @@ build() {
}
package() {
- cd pytorch-git/build
+ cd "${_srcname}/build"
make DESTDIR="$pkgdir" install
@@ -246,7 +247,7 @@ package() {
done
# license
- cd "${srcdir}/pytorch-git"
+ cd "${srcdir}/${_srcname}"
install -D -m644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
install -D -m644 NOTICE -t "${pkgdir}/usr/share/licenses/${pkgname}"
}