v2.1.2; add mpi; use split packaging;

2 files changed, 31 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f1b2e8ca2ed6..7e75f9d9bec6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,25 @@
 pkgbase = lightgbm
 	pkgdesc = Distributed gradient boosting framework based on decision tree algorithms.
-	pkgver = 2.1.1
-	pkgrel = 2
+	pkgver = 2.1.2
+	pkgrel = 1
 	url = https://github.com/Microsoft/LightGBM
 	arch = x86_64
 	license = MIT
 	makedepends = boost
 	makedepends = cmake
 	makedepends = opencl-headers
-	depends = python
+	makedepends = python-setuptools
 	depends = boost-libs
 	depends = ocl-icd
-	source = https://github.com/Microsoft/LightGBM/archive/v2.1.1.tar.gz
-	sha256sums = 07da54e835f4d9991fbc526b4e0c9d0d2a47e514c6eb94de2fbb49c33c8a1e6e
+	depends = openmpi
+	source = https://github.com/Microsoft/LightGBM/archive/v2.1.2.tar.gz
+	sha256sums = 2687a6379f9f438eabb2f460f7302bfeb765ff6f283528b821541d83622e80e6
 
 pkgname = lightgbm
 
+pkgname = python-lightgbm
+	depends = lightgbm
+	depends = python-numpy
+	depends = python-scipy
+	depends = python-scikit-learn
+
diff --git a/PKGBUILD b/PKGBUILD
index 01a28faa20af..d20eb8269d58 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,17 +1,18 @@
 # Maintainer: Aleksandar Trifunović <akstrfn at gmail dot com>
 
 _pkgname=LightGBM
-pkgname=lightgbm
-pkgver=2.1.1
-pkgrel=2
+pkgbase=lightgbm
+pkgname=("${pkgbase}" "python-${pkgbase}")
+pkgver=2.1.2
+pkgrel=1
 pkgdesc="Distributed gradient boosting framework based on decision tree algorithms."
 arch=('x86_64')
 url="https://github.com/Microsoft/LightGBM"
 license=('MIT')
-depends=('python' 'boost-libs' 'ocl-icd')
-makedepends=('boost' 'cmake' 'opencl-headers')
-source=("https://github.com/Microsoft/LightGBM/archive/v${pkgver}.tar.gz")
-sha256sums=('07da54e835f4d9991fbc526b4e0c9d0d2a47e514c6eb94de2fbb49c33c8a1e6e')
+depends=('boost-libs' 'ocl-icd' 'openmpi')
+makedepends=('boost' 'cmake' 'opencl-headers' 'python-setuptools')
+source=("${url}/archive/v${pkgver}.tar.gz")
+sha256sums=('2687a6379f9f438eabb2f460f7302bfeb765ff6f283528b821541d83622e80e6')
 
 build() {
     cd "${_pkgname}-${pkgver}"
@@ -24,19 +25,23 @@ build() {
         -DCMAKE_BUILD_TYPE=Release \
         -DUSE_OPENMP=ON \
         -DUSE_GPU=ON \
+        -DUSE_MPI=ON \
 
     cmake --build build
 }
 
-package() {
+package_lightgbm() {
     cd "${_pkgname}-${pkgver}"
     cmake --build build -- DESTDIR="${pkgdir}" install
-    install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+    install -Dm644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}
+
+package_python-lightgbm() {
+    depends=('lightgbm' 'python-numpy' 'python-scipy' 'python-scikit-learn')
 
-    # Python
-    cd python-package
-    python setup.py install --root="$pkgdir/" --optimize=1 --gpu --precompile
+    cd "${_pkgname}-${pkgver}/python-package"
+    # use library from /usr/lib instead of making a copy
+    sed -i 's/..\/..\/lib\//\/usr\/lib\//' lightgbm/libpath.py
+    python setup.py install --root="$pkgdir/" --optimize=1 --gpu --mpi --precompile
     rm "$pkgdir/usr/lib/python3.6/site-packages/lightgbm/lib_lightgbm.so"
-    # they should check the env first and not hardlink
-    ln -s "$pkgdir/usr/lib/lib_lightgbm.so" "$pkgdir/usr/lib/python3.6/site-packages/lightgbm/lib_lightgbm.so"
 }