diff options
| -rw-r--r-- | .SRCINFO | 10 | ||||
| -rw-r--r-- | PKGBUILD | 11 | ||||
| -rw-r--r-- | use_system_eigen.patch | 29 |
3 files changed, 20 insertions, 30 deletions
@@ -1,9 +1,8 @@ pkgbase = python-cvxcanon pkgdesc = C++ library to convert high-level optimization problems into canonical form. - pkgver = 0.1.1 + pkgver = 0.1.2 pkgrel = 1 url = https://github.com/cvxgrp/CVXcanon - arch = i686 arch = x86_64 license = unknown makedepends = python-setuptools @@ -12,10 +11,9 @@ pkgbase = python-cvxcanon depends = python depends = python-numpy depends = python-scipy - source = https://github.com/cvxgrp/CVXcanon/archive/v0.1.1.tar.gz + source = https://github.com/cvxgrp/CVXcanon/archive/v0.1.2.tar.gz source = use_system_eigen.patch - md5sums = ea900f44c30596d96999aa61eab89f08 - md5sums = ee7c698d9fb8bdd767c96015850a6869 + sha256sums = cf5a506258d9acadfec83529d175027bd9b7c821702c6f28b1eea7cbd61d842b + sha256sums = 9bf618a0634bbe855ec67dd0e2b9c1f32528297a5316ec7b0b302932f4de544f pkgname = python-cvxcanon - @@ -1,7 +1,6 @@ -pkgbase=('python-cvxcanon') -pkgname=('python-cvxcanon') +pkgname='python-cvxcanon' _module='CVXcanon' -pkgver='0.1.1' +pkgver='0.1.2' pkgrel=1 pkgdesc="C++ library to convert high-level optimization problems into canonical form." url="https://github.com/cvxgrp/CVXcanon" @@ -12,11 +11,11 @@ makedepends=('python-setuptools' 'swig' 'eigen') license=('unknown') -arch=('i686' 'x86_64') +arch=('x86_64') source=("https://github.com/cvxgrp/CVXcanon/archive/v${pkgver}.tar.gz" "use_system_eigen.patch") -md5sums=('ea900f44c30596d96999aa61eab89f08' - 'ee7c698d9fb8bdd767c96015850a6869') +sha256sums=('cf5a506258d9acadfec83529d175027bd9b7c821702c6f28b1eea7cbd61d842b' + '9bf618a0634bbe855ec67dd0e2b9c1f32528297a5316ec7b0b302932f4de544f') prepare() { cd "${srcdir}/${_module}-${pkgver}" diff --git a/use_system_eigen.patch b/use_system_eigen.patch index 6be37efb23ab..0571ecbf1ac4 100644 --- a/use_system_eigen.patch +++ b/use_system_eigen.patch @@ -1,20 +1,19 @@ -Only in CVXcanon-0.1.1-orig/build: temp.linux-x86_64-3.6 -diff -aur CVXcanon-0.1.1-orig/setup.py CVXcanon-0.1.1/setup.py ---- CVXcanon-0.1.1-orig/setup.py 2017-01-10 13:39:21.161947185 -0500 -+++ CVXcanon-0.1.1/setup.py 2017-01-10 13:39:54.981932516 -0500 -@@ -7,7 +7,7 @@ +diff -urN CVXcanon-0.1.2-orig/setup.py CVXcanon-0.1.2/setup.py +--- CVXcanon-0.1.2-orig/setup.py 2020-09-18 14:25:26.000000000 -0400 ++++ CVXcanon-0.1.2/setup.py 2021-08-30 03:50:55.922117288 -0400 +@@ -12,7 +12,7 @@ canon = Extension( '_CVXcanon', sources=['src/CVXcanon.cpp', 'src/LinOpOperations.cpp', 'src/python/CVXcanon_wrap.cpp'], -- include_dirs=['src/', 'src/python/', 'include/Eigen', numpy.get_include()] -+ include_dirs=['src/', 'src/python/', '/usr/include/eigen3', numpy.get_include()] +- include_dirs=['src/', 'src/python/', 'include/Eigen', get_numpy_include()] ++ include_dirs=['src/', 'src/python/', '/usr/include/eigen3', get_numpy_include()] ) - base_dir = os.path.dirname(__file__) -diff -aur CVXcanon-0.1.1-orig/src/Utils.hpp CVXcanon-0.1.1/src/Utils.hpp ---- CVXcanon-0.1.1-orig/src/Utils.hpp 2017-01-10 13:38:30.215304531 -0500 -+++ CVXcanon-0.1.1/src/Utils.hpp 2017-01-10 13:40:18.425256236 -0500 -@@ -15,12 +15,12 @@ + +diff -urN CVXcanon-0.1.2-orig/src/Utils.hpp CVXcanon-0.1.2/src/Utils.hpp +--- CVXcanon-0.1.2-orig/src/Utils.hpp 2020-09-18 14:25:26.000000000 -0400 ++++ CVXcanon-0.1.2/src/Utils.hpp 2021-08-30 03:51:31.438834630 -0400 +@@ -14,8 +14,8 @@ // Some useful defines for Matricies/etc. @@ -25,9 +24,3 @@ diff -aur CVXcanon-0.1.1-orig/src/Utils.hpp CVXcanon-0.1.1/src/Utils.hpp #define NULL_MATRIX Eigen::SparseMatrix<double>(0,0) - typedef Eigen::Matrix<int, Eigen::Dynamic, 1> Vector; - typedef Eigen::SparseMatrix<double> Matrix; - typedef std::map<int, Matrix> CoeffMap; --typedef Eigen::Triplet<double> Triplet; -\ No newline at end of file -+typedef Eigen::Triplet<double> Triplet; |