diff options
| -rw-r--r-- | .SRCINFO | 10 | ||||
| -rw-r--r-- | PKGBUILD | 64 | ||||
| -rw-r--r-- | openmp.patch | 20 |
3 files changed, 46 insertions, 48 deletions
@@ -1,8 +1,6 @@ -# Generated by mksrcinfo v8 -# Mon Jan 25 15:32:50 UTC 2016 pkgbase = libsvm-openmp pkgdesc = A library for Support Vector Machines classification, includes openmp support, binaries and python bindings. - pkgver = 3.21 + pkgver = 3.24 pkgrel = 1 url = http://www.csie.ntu.edu.tw/~cjlin/libsvm/ arch = x86_64 @@ -13,10 +11,10 @@ pkgbase = libsvm-openmp optdepends = java-environment: bindings for java provides = libsvm conflicts = libsvm - source = https://github.com/cjlin1/libsvm/archive/v321.tar.gz + source = https://github.com/cjlin1/libsvm/archive/v324.tar.gz source = openmp.patch - sha256sums = 7f494b23f8a4c9fff2643a0805bbd3dad688854cc488c075ec3909bb346b6685 - sha256sums = d357cc901505cb1aecd055cc953490f617b1baa8ac129ab580acf300c60ca1b0 + md5sums = 45149a776ebfd3470c6e0a4fc2482670 + md5sums = 7ab65af40d705e8d89af2fcaad9b616f pkgname = libsvm-openmp @@ -2,14 +2,15 @@ # Daniel YC Lin <dlin.tw at gmail> # Tim Huetz <tim at huetz biz> # saxonbeta <saxonbeta at gmail> -# Maintainer: Flávio Zavan <flavio.zavan at gmail> -# vim:set ts=2 sw=2 et: +# Submitter: Flávio Zavan <flavio.zavan at gmail> +# Maintainer: Roberto Polverelli Monti <rpolverelli at gmail> pkgname=libsvm-openmp -pkgver=3.21 -_pkgver=321 +pkgver=3.24 +_pkgver=324 _pyver=3.5 pkgrel=1 -pkgdesc="A library for Support Vector Machines classification, includes openmp support, binaries and python bindings." +pkgdesc="A library for Support Vector Machines classification, includes openmp +support, binaries and python bindings." arch=(x86_64 i686) url="http://www.csie.ntu.edu.tw/~cjlin/libsvm/" license=('BSD') @@ -20,36 +21,35 @@ optdepends=('python: bindings for latest python version' 'python2: bindings for python 2' 'java-environment: bindings for java' ) source=("https://github.com/cjlin1/libsvm/archive/v$_pkgver.tar.gz" - "openmp.patch") -sha256sums=('7f494b23f8a4c9fff2643a0805bbd3dad688854cc488c075ec3909bb346b6685' - 'd357cc901505cb1aecd055cc953490f617b1baa8ac129ab580acf300c60ca1b0') + "openmp.patch") +md5sums=('45149a776ebfd3470c6e0a4fc2482670' + '7ab65af40d705e8d89af2fcaad9b616f') build() { - cd "$srcdir/libsvm-$_pkgver" - patch -p1 < "$srcdir/openmp.patch" - make lib all + cd "$srcdir/libsvm-$_pkgver" + patch -p1 < "$srcdir/openmp.patch" + make lib all } -package() { - cd "$srcdir/libsvm-$_pkgver" - install -D -m755 svm-train $pkgdir/usr/bin/svm-train - install -D -m755 svm-predict $pkgdir/usr/bin/svm-predict - install -D -m755 svm-scale $pkgdir/usr/bin/svm-scale - install -D -m644 java/libsvm.jar $pkgdir/usr/share/java/libsvm.jar - install -D -m644 libsvm.so.2 $pkgdir/usr/lib/libsvm.so.2 - install -D -m644 svm.h $pkgdir/usr/include/svm.h - ln -s libsvm.so.2 $pkgdir/usr/lib/libsvm.so - mkdir -p $pkgdir/usr/share/licenses/libsvm - install -D -m644 COPYRIGHT $pkgdir/usr/share/licenses/libsvm/LICENSE - cd "python" - sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' svm.py - sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' svmutil.py - install -D -m644 svm.py $pkgdir/usr/lib/python2.7/svm.py - install -D -m644 svmutil.py $pkgdir/usr/lib/python2.7/svmutil.py - sed -i 's_#!/usr/bin/env python2_#!/usr/bin/env python3_' svm.py - sed -i 's_#!/usr/bin/env python2_#!/usr/bin/env python3_' svmutil.py - install -D -m644 svm.py $pkgdir/usr/lib/python$_pyver/svm.py - install -D -m644 svmutil.py $pkgdir/usr/lib/python$_pyver/svmutil.py +package() { + cd "$srcdir/libsvm-$_pkgver" + install -D -m755 svm-train $pkgdir/usr/bin/svm-train + install -D -m755 svm-predict $pkgdir/usr/bin/svm-predict + install -D -m755 svm-scale $pkgdir/usr/bin/svm-scale + install -D -m644 java/libsvm.jar $pkgdir/usr/share/java/libsvm.jar + install -D -m644 libsvm.so.2 $pkgdir/usr/lib/libsvm.so.2 + install -D -m644 svm.h $pkgdir/usr/include/svm.h + ln -s libsvm.so.2 $pkgdir/usr/lib/libsvm.so + mkdir -p $pkgdir/usr/share/licenses/libsvm + install -D -m644 COPYRIGHT $pkgdir/usr/share/licenses/libsvm/LICENSE + cd "python" + sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' svm.py + sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' svmutil.py + install -D -m644 svm.py $pkgdir/usr/lib/python2.7/svm.py + install -D -m644 svmutil.py $pkgdir/usr/lib/python2.7/svmutil.py + sed -i 's_#!/usr/bin/env python2_#!/usr/bin/env python3_' svm.py + sed -i 's_#!/usr/bin/env python2_#!/usr/bin/env python3_' svmutil.py + install -D -m644 svm.py $pkgdir/usr/lib/python$_pyver/svm.py + install -D -m644 svmutil.py $pkgdir/usr/lib/python$_pyver/svmutil.py } - diff --git a/openmp.patch b/openmp.patch index 37a3c6c81d71..1ec2f2afad81 100644 --- a/openmp.patch +++ b/openmp.patch @@ -1,22 +1,22 @@ -diff -crB libsvm-320/Makefile libsvm-320-openmp/Makefile -*** libsvm-320/Makefile 2014-11-14 21:02:18.000000000 -0200 ---- libsvm-320-openmp/Makefile 2015-11-11 17:42:10.797139235 -0200 +diff -crB libsvm-324/Makefile libsvm-324-openmp/Makefile +*** libsvm-324/Makefile 2019-09-10 21:05:26.000000000 +0200 +--- libsvm-324-openmp/Makefile 2020-02-26 19:47:32.436432315 +0100 *************** *** 1,5 **** CXX ?= g++ ! CFLAGS = -Wall -Wconversion -O3 -fPIC SHVER = 2 OS = $(shell uname) - + --- 1,5 ---- CXX ?= g++ ! CFLAGS = -Wall -Wconversion -O3 -fPIC -fopenmp SHVER = 2 OS = $(shell uname) - -diff -crB libsvm-320/svm.cpp libsvm-320-openmp/svm.cpp -*** libsvm-320/svm.cpp 2014-11-14 21:02:18.000000000 -0200 ---- libsvm-320-openmp/svm.cpp 2015-11-11 17:49:04.329189485 -0200 + +diff -crB libsvm-324/svm.cpp libsvm-324-openmp/svm.cpp +*** libsvm-324/svm.cpp 2019-09-10 21:05:26.000000000 +0200 +--- libsvm-324-openmp/svm.cpp 2020-02-26 19:51:54.833093991 +0100 *************** *** 1282,1287 **** --- 1282,1288 ---- @@ -51,9 +51,9 @@ diff -crB libsvm-320/svm.cpp libsvm-320-openmp/svm.cpp *** 2523,2528 **** --- 2526,2532 ---- int l = model->l; - + double *kvalue = Malloc(double,l); + #pragma omp parallel for private(i) schedule(guided) for(i=0;i<l;i++) kvalue[i] = Kernel::k_function(x,model->SV[i],model->param); - + |