diff options
| author | Jingbei Li | 2018-04-11 21:55:25 +0800 |
|---|---|---|
| committer | Jingbei Li | 2018-04-11 21:55:25 +0800 |
| commit | bfd316b9e914c205ed95851ee20e71106ad99c55 (patch) | |
| tree | eada46491f6747906d6f6dbe2e6303f8505d9e67 | |
| parent | 7d32e231745bcc891dc7c600a749d50bdce5b383 (diff) | |
| download | aur-bfd316b9e914c205ed95851ee20e71106ad99c55.tar.gz | |
upgraded to 2.5
| -rw-r--r-- | .SRCINFO | 8 | ||||
| -rw-r--r-- | PKGBUILD | 16 |
2 files changed, 10 insertions, 14 deletions
@@ -1,8 +1,6 @@ -# Generated by mksrcinfo v8 -# Sat Dec 9 08:03:20 UTC 2017 pkgbase = cntk pkgdesc = Microsoft Cognitive Toolkit (CNTK), an open source deep-learning toolkit - pkgver = 2.3 + pkgver = 2.5 pkgrel = 1 url = https://github.com/Microsoft/CNTK arch = x86_64 @@ -18,7 +16,7 @@ pkgbase = cntk depends = boost depends = cub depends = cuda - depends = cudnn6 + depends = cudnn depends = libzip depends = nccl depends = nvidia-utils @@ -31,7 +29,7 @@ pkgbase = cntk depends = python-scipy optdepends = swig optdepends = java-environment - source = git+https://github.com/Microsoft/CNTK#tag=v2.3 + source = git+https://github.com/Microsoft/CNTK#tag=v2.5 md5sums = SKIP pkgname = cntk @@ -1,15 +1,15 @@ # Maintainer: Jingbei Li <i@jingbei.li> pkgname=cntk _gitname=CNTK -pkgver=2.3 +pkgver=2.5 pkgrel=1 pkgdesc="Microsoft Cognitive Toolkit (CNTK), an open source deep-learning toolkit" arch=('x86_64') url="https://github.com/Microsoft/$_gitname" license=('CUSTOM') -depends=('boost' 'cub' 'cuda' 'cudnn6' 'libzip' 'nccl' 'nvidia-utils' 'openblas-lapack' 'opencv' 'openmp' 'openmpi' 'protobuf' 'python-numpy' 'python-scipy') +depends=('boost' 'cub' 'cuda' 'cudnn' 'libzip' 'nccl' 'nvidia-utils' 'openblas-lapack' 'opencv' 'openmp' 'openmpi' 'protobuf' 'python-numpy' 'python-scipy') makedepends=('cmake' 'git' 'inetutils' 'java-environment' 'python-pip' 'python-setuptools' 'python-wheel' 'swig' ) -optdepends=('swig' 'java-environment' ) +optdepends=('swig' 'java-environment') source=("git+$url#tag=v$pkgver") md5sums=('SKIP') @@ -17,10 +17,6 @@ prepare(){ cd $srcdir/$_gitname git submodule update --init --recursive - # https://github.com/Microsoft/CNTK/pull/2429 - # https://github.com/Microsoft/CNTK/pull/2186 - sed '115s/);/, CUB_PTX_WARP_THREADS, 0xffffffff);/' -i Source/Math/CntkBatchNormalization.cuh - sed \ -e 's|libprotobuf.a|libprotobuf.so|' \ -e 's|cuda/include/cudnn.h|include/cudnn.h|' \ @@ -40,7 +36,7 @@ prepare(){ --with-cub=/usr/include \ --with-gdk-include=/opt/cuda/include \ --with-gdk-nvml-lib=/opt/cuda/lib64/stubs \ - --with-cudnn=/opt/cudnn6 \ + --with-cudnn=/opt/cuda \ --with-nccl=/opt/cuda \ --with-swig #--with-kaldi=/opt/kaldi \ @@ -51,7 +47,9 @@ prepare(){ -e '/DOpenMP_C_FLAGS/a\\t\t-DMPI_LIBRARY="/usr/include" \\' \ -e '/DOpenMP_C_FLAGS/a\\t\t-DMPI_LIBRARIES="/usr/include" \\' \ -e '/DOpenMP_C_FLAGS/a\\t\t-DMPI_CXX_LIBRARIES="/usr/include" \\' \ + -e '/DOpenMP_C_FLAGS/a\\t\t-DMPI_include_LIBRARY="/usr/include" \\' \ -i Makefile + sed '10,11d' -i Source/Multiverso/Test/CMakeLists.txt sed \ -e 's|libmpi.so.12|libmpi.so|g' \ -i bindings/python/cntk/train/distributed.py @@ -69,7 +67,7 @@ package() { cp -r bin lib $pkgdir/usr cd $srcdir/$_gitname/build/python - pip install --root=$pkgdir $pkgname-$pkgver-cp36-cp36m-linux_x86_64.whl + pip install --root=$pkgdir ${pkgname}_gpu-$pkgver-cp36-cp36m-linux_x86_64.whl install -Dm644 $srcdir/$_gitname/LICENSE.md "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } |