diff options
-rw-r--r-- | .SRCINFO | 17 | ||||
-rw-r--r-- | PKGBUILD | 27 | ||||
-rw-r--r-- | external-nnpack-fix.patch | 24 |
3 files changed, 14 insertions, 54 deletions
@@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Sun Aug 6 15:40:38 UTC 2017 +# Wed Aug 9 17:14:29 UTC 2017 pkgbase = caffe2 pkgdesc = A new lightweight, modular, and scalable deep learning framework (gpu enabled) - pkgver = 0.8.0 + pkgver = 0.8.1 pkgrel = 1 url = http://caffe2.ai/ arch = x86_64 @@ -19,8 +19,7 @@ pkgbase = caffe2 depends = python2-numpy depends = python2-protobuf depends = cuda - depends = cudnn>=5.1 - depends = cudnn<7.0 + depends = cudnn depends = gflags depends = gtest depends = openmp @@ -58,14 +57,13 @@ pkgbase = caffe2 noextract = thirdparty-eigen-3.3.2.tar.gz noextract = thirdparty-protobuf-3.1.0.tar.gz options = !emptydirs - source = caffe2-0.8.0.tar.gz::https://github.com/caffe2/caffe2/archive/v0.8.0.tar.gz - source = external-nnpack-fix.patch + source = caffe2-0.8.1.tar.gz::https://github.com/caffe2/caffe2/archive/v0.8.1.tar.gz source = thirdparty-android-cmake-git::git+https://github.com/taka-no-me/android-cmake.git#commit=556cc14296c226f753a3778d99d8b60778b7df4f source = thirdparty-benchmark-git::git+https://github.com/google/benchmark.git#commit=4bf28e611b55de8a2d4eece3c335e014f8b0f630 source = thirdparty-cnmem-git::git+https://github.com/NVIDIA/cnmem.git#commit=28a182d49529da49f4ac4e3941cec3edf16b3540 - source = thirdparty-cub-git::git+https://github.com/NVlabs/cub.git#commit=89de7ab20167909bc2c4f8acd397671c47cf3c0d + source = thirdparty-cub-git::git+https://github.com/NVlabs/cub.git#commit=b1370adb972a8345de92e2d69e61daf7f9bce43e source = thirdparty-eigen-3.3.2.tar.gz::https://github.com/RLovelett/eigen/archive/3.3.2.tar.gz - source = thirdparty-gloo-git::git+https://github.com/facebookincubator/gloo.git#commit=21a5c8ea5e02edca03068790df3d7f7ba4e2d75b + source = thirdparty-gloo-git::git+https://github.com/facebookincubator/gloo.git#commit=530878247b04c423fd35477208f68e70b8126e2d source = thirdparty-googletest-git::git+https://github.com/google/googletest.git#commit=5e7fd50e17b6edf1cadff973d0ec68966cf3265e source = thirdparty-ios-cmake-git::git+https://github.com/Yangqing/ios-cmake.git#commit=e24081928d9ceec4f4adfcf12293f1e2a20eaedc source = thirdparty-nccl-git::git+https://github.com/NVIDIA/nccl.git#commit=2a974f5ca2aa12b178046b2206b43f1fd69d9fae @@ -77,8 +75,7 @@ pkgbase = caffe2 source = thirdparty-NNPACK_deps-FXdiv-git::git+https://github.com/Maratyszcza/FXdiv.git#commit=8f85044fb41e560508cd69ed26c9afb9cc120e8a source = thirdparty-NNPACK_deps-psimd-git::git+https://github.com/Maratyszcza/psimd.git#commit=0b26a3fb98dd6af7e1f4e0796c56df6b32b1c016 source = thirdparty-NNPACK_deps-pthreadpool-git::git+https://github.com/Maratyszcza/pthreadpool.git#commit=9e17903a3fc963fe86b151aaddae7cf1b1d34815 - sha256sums = 3c46d2324046774e96601bad737cdce05084cab80b9109c48a09f332438b921c - sha256sums = 1c94a1ecc0fe2a52c50c9d1a7bfca655d60c08d48995b27c73aa22b6c375da54 + sha256sums = 2b7938514caf626da3fdde51e88771adc863cbe496d0fc4ae1122603a945e9a8 sha256sums = SKIP sha256sums = SKIP sha256sums = SKIP @@ -4,8 +4,8 @@ _android_cmake_commit='556cc14296c226f753a3778d99d8b60778b7df4f' _benchmark_commit='4bf28e611b55de8a2d4eece3c335e014f8b0f630' _cnmem_commit='28a182d49529da49f4ac4e3941cec3edf16b3540' -_cub_commit='89de7ab20167909bc2c4f8acd397671c47cf3c0d' -_gloo_commit='21a5c8ea5e02edca03068790df3d7f7ba4e2d75b' +_cub_commit='b1370adb972a8345de92e2d69e61daf7f9bce43e' +_gloo_commit='530878247b04c423fd35477208f68e70b8126e2d' _googletest_commit='5e7fd50e17b6edf1cadff973d0ec68966cf3265e' _ios_cmake_commit='e24081928d9ceec4f4adfcf12293f1e2a20eaedc' _nccl_commit='2a974f5ca2aa12b178046b2206b43f1fd69d9fae' @@ -21,14 +21,8 @@ _nnpackdeps_pthreadpool_commit='9e17903a3fc963fe86b151aaddae7cf1b1d34815' _eigen_version='3.3.2' # commit 'ae9889a130bd0a9d3007f41d015563c2e8ac605f' is version '3.3.2' _protobuf_version='3.1.0' # commit 'a428e42072765993ff674fda72863c9f1aa2d268' is version '3.1.0' -# note about modified gloo commit: -# the gloo target commit is 7ea9d9af4e82d20c7c6cee5edd3c52f9bcb42821, but -# it's necessary to use a newer commit to avoid compile errors if using -# '-march=native' in a cpu with AVX2: -# https://github.com/facebookincubator/gloo/issues/43 - pkgname=caffe2 -pkgver=0.8.0 +pkgver=0.8.1 pkgrel=1 pkgdesc='A new lightweight, modular, and scalable deep learning framework (gpu enabled)' arch=('x86_64') @@ -38,7 +32,7 @@ depends=( # official repositories: # required: 'google-glog' 'protobuf' 'python2' 'python2-numpy' 'python2-protobuf' 'cuda' - 'cudnn>=5.1' 'cudnn<7.0' + 'cudnn' # not required but enabled in build: 'gflags' 'gtest' 'openmp' 'leveldb' 'lmdb' 'openmpi' 'snappy' 'zeromq' 'hiredis' @@ -67,7 +61,6 @@ options=('!emptydirs') source=( # main source: "${pkgname}-${pkgver}.tar.gz"::"https://github.com/${pkgname}/${pkgname}/archive/v${pkgver}.tar.gz" - 'external-nnpack-fix.patch' # third party: 'thirdparty-android-cmake-git'::"git+https://github.com/taka-no-me/android-cmake.git#commit=${_android_cmake_commit}" 'thirdparty-benchmark-git'::"git+https://github.com/google/benchmark.git#commit=${_benchmark_commit}" @@ -89,8 +82,7 @@ source=( ) noextract=("thirdparty-eigen-${_eigen_version}.tar.gz" "thirdparty-protobuf-${_protobuf_version}.tar.gz") -sha256sums=('3c46d2324046774e96601bad737cdce05084cab80b9109c48a09f332438b921c' - '1c94a1ecc0fe2a52c50c9d1a7bfca655d60c08d48995b27c73aa22b6c375da54' +sha256sums=('2b7938514caf626da3fdde51e88771adc863cbe496d0fc4ae1122603a945e9a8' 'SKIP' 'SKIP' 'SKIP' @@ -107,8 +99,7 @@ sha256sums=('3c46d2324046774e96601bad737cdce05084cab80b9109c48a09f332438b921c' 'SKIP' 'SKIP' 'SKIP' - 'SKIP' -) + 'SKIP') prepare() { cd "${pkgname}-${pkgver}/third_party" @@ -139,11 +130,6 @@ prepare() { done unset _component - - # avoid compile errors with nnpack if system library is found - # https://github.com/caffe2/caffe2/commit/f070eb99a4a36f12abbdb9af98bb68ff485c840b - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/external-nnpack-fix.patch" } build() { @@ -214,6 +200,7 @@ build() { -DUSE_NERVANA_GPU:BOOL='ON' \ -DUSE_NNPACK:BOOL='ON' \ -DUSE_OPENCV:BOOL='OFF' \ + -DUSE_FFMPEG:BOOL='OFF' \ -DUSE_OPENMP:BOOL='ON' \ -DUSE_REDIS:BOOL='ON' \ -DUSE_ROCKSDB:BOOL='OFF' \ diff --git a/external-nnpack-fix.patch b/external-nnpack-fix.patch deleted file mode 100644 index 08a4e0c4ca29..000000000000 --- a/external-nnpack-fix.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/cmake/Modules/FindNNPACK.cmake b/cmake/Modules/FindNNPACK.cmake -index 547bf88f..29cf5dce 100644 ---- a/cmake/Modules/FindNNPACK.cmake -+++ b/cmake/Modules/FindNNPACK.cmake -@@ -21,12 +21,17 @@ find_library(NNPACK_LIBRARY nnpack - PATHS ${NNPACK_ROOT_DIR} - PATH_SUFFIXES lib lib64) - --find_package_handle_standard_args(NNPACK DEFAULT_MSG NNPACK_INCLUDE_DIR NNPACK_LIBRARY) -+find_library(PTHREADPOOL_LIBRARY pthreadpool -+ PATHS ${NNPACK_ROOT_DIR} -+ PATH_SUFFIXES lib lib64) -+ -+find_package_handle_standard_args(NNPACK DEFAULT_MSG NNPACK_INCLUDE_DIR NNPACK_LIBRARY PTHREADPOOL_LIBRARY) - - if(NNPACK_FOUND) - set(NNPACK_INCLUDE_DIRS ${NNPACK_INCLUDE_DIR}) -- set(NNPACK_LIBRARIES ${NNPACK_LIBRARY}) -+ set(NNPACK_LIBRARIES ${NNPACK_LIBRARY} ${PTHREADPOOL_LIBRARY}) - message(STATUS "Found NNPACK (include: ${NNPACK_INCLUDE_DIR}, library: ${NNPACK_LIBRARY})") -+ message(STATUS "Found PTHREADPOOL (library: ${PTHREADPOOL_LIBRARY})") - mark_as_advanced(NNPACK_ROOT_DIR NNPACK_LIBRARY_RELEASE NNPACK_LIBRARY_DEBUG - NNPACK_LIBRARY NNPACK_INCLUDE_DIR) - endif() |