From dd59a4753c0400c6cbb737a6ee4ba7bf988e4a68 Mon Sep 17 00:00:00 2001 From: shtayerc Date: Mon, 30 Mar 2020 21:50:42 +0200 Subject: [PATCH 1/4] New package: lc0-openblas-0.24.1 --- srcpkgs/lc0-openblas/template | 38 +++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 srcpkgs/lc0-openblas/template diff --git a/srcpkgs/lc0-openblas/template b/srcpkgs/lc0-openblas/template new file mode 100644 index 00000000000..52991fcac85 --- /dev/null +++ b/srcpkgs/lc0-openblas/template @@ -0,0 +1,38 @@ +# Template file for 'lc0-openblas' +pkgname=lc0-openblas +version=0.24.1 +revision=1 +wrksrc="lc0-${version}" +build_style=meson +configure_args="-Dgtest=false --buildtype=release" +meson_builddir="build/release" +_githash=5b8667e4ab51e18b2ea26ac221723d6dd8f95533 +hostmakedepends="tar pkg-config" +makedepends="openblas-devel protobuf-devel zlib-devel" +short_desc="UCI chess engine designed to play via neural network - OpenBLAS backend" +maintainer="shtayerc " +license="GPL-3.0-only" +homepage="http://lczero.org" +distfiles="https://github.com/LeelaChessZero/lc0/archive/v${version}.tar.gz + https://github.com/LeelaChessZero/lczero-common/archive/${_githash}.tar.gz" +checksum="6698e87f1b6e960322d026ab38c6bcc895112b5df30f37b2b1aaaf9e8ff1b33c + ed1012ee5cf86435b5c7fd72d177ee5679b454ef1b2c72825b0f5c437ad8be76" + +alternatives="lc0:lc0:/usr/bin/lc0-openblas" + +if [ "$CROSS_BUILD" ]; then + configure_args+=" -Dopenblas_include=${XBPS_CROSS_BASE}/usr/include/openblas/" +fi + +if [ "$XBPS_TARGET_MACHINE" = "armv6l-musl" ]; then + LDFLAGS+=-latomic + makedepends+=" libatomic-devel" +fi + +post_extract() { + cp -a ../lczero-common-${_githash}/proto/ ./libs/lczero-common/ +} + +do_install() { + vbin build/release/lc0 lc0-openblas +} From b9aa0f38f780d2805b3c82017a46f619238fc881 Mon Sep 17 00:00:00 2001 From: shtayerc Date: Mon, 30 Mar 2020 21:50:51 +0200 Subject: [PATCH 2/4] New package: lc0-opencl-0.24.1 --- srcpkgs/lc0-opencl/template | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 srcpkgs/lc0-opencl/template diff --git a/srcpkgs/lc0-opencl/template b/srcpkgs/lc0-opencl/template new file mode 100644 index 00000000000..bb2d3cca06d --- /dev/null +++ b/srcpkgs/lc0-opencl/template @@ -0,0 +1,34 @@ +# Template file for 'lc0-opencl' +pkgname=lc0-opencl +version=0.24.1 +revision=1 +wrksrc="lc0-${version}" +build_style=meson +configure_args="-Dgtest=false --buildtype=release" +meson_builddir="build/release" +_githash=5b8667e4ab51e18b2ea26ac221723d6dd8f95533 +hostmakedepends="tar pkg-config" +makedepends="ocl-icd-devel protobuf-devel zlib-devel" +short_desc="UCI chess engine designed to play via neural network - OpenCL backend" +maintainer="shtayerc " +license="GPL-3.0-only" +homepage="http://lczero.org" +distfiles="https://github.com/LeelaChessZero/lc0/archive/v${version}.tar.gz + https://github.com/LeelaChessZero/lczero-common/archive/${_githash}.tar.gz" +checksum="6698e87f1b6e960322d026ab38c6bcc895112b5df30f37b2b1aaaf9e8ff1b33c + ed1012ee5cf86435b5c7fd72d177ee5679b454ef1b2c72825b0f5c437ad8be76" + +alternatives="lc0:lc0:/usr/bin/lc0-opencl" + +if [ "$XBPS_TARGET_MACHINE" = "armv6l-musl" ]; then + LDFLAGS+=-latomic + makedepends+=" libatomic-devel" +fi + +post_extract() { + cp -a ../lczero-common-${_githash}/proto/ ./libs/lczero-common/ +} + +do_install() { + vbin build/release/lc0 lc0-opencl +} From 6defbd90da5232985917586c3d2c42888aa894d0 Mon Sep 17 00:00:00 2001 From: shtayerc Date: Mon, 11 May 2020 22:34:15 +0200 Subject: [PATCH 3/4] New package: lc0-openblas-0.25.1 --- .../lc0-openblas/patches/eigen_nowrap.patch | 24 +++++++++++++++++++ srcpkgs/lc0-openblas/template | 10 ++++---- 2 files changed, 29 insertions(+), 5 deletions(-) create mode 100644 srcpkgs/lc0-openblas/patches/eigen_nowrap.patch diff --git a/srcpkgs/lc0-openblas/patches/eigen_nowrap.patch b/srcpkgs/lc0-openblas/patches/eigen_nowrap.patch new file mode 100644 index 00000000000..af8ff7abb65 --- /dev/null +++ b/srcpkgs/lc0-openblas/patches/eigen_nowrap.patch @@ -0,0 +1,24 @@ +From 0e1158f4bf92e8cfcf20b63a8d61687ca3a79a4c Mon Sep 17 00:00:00 2001 +From: shtayerc +Date: Tue, 28 Apr 2020 19:46:13 +0200 +Subject: [PATCH] Check if eigen is availiable before pulling subproject + +This patch will be removed when +https://github.com/LeelaChessZero/lc0/pull/1248 is merged +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git meson.build b/meson.build +index 65591353a..929a48fa0 100644 +--- meson.build ++++ meson.build +@@ -252,7 +252,7 @@ if get_option('build_backends') + + endif + +- deps += subproject('eigen').get_variable('eigen_dep') ++ deps += dependency('eigen3', fallback: ['eigen', 'eigen_dep']) + + ispc = find_program('ispc', required: false) + ispc_extra_args = [] diff --git a/srcpkgs/lc0-openblas/template b/srcpkgs/lc0-openblas/template index 52991fcac85..4f389a64dbd 100644 --- a/srcpkgs/lc0-openblas/template +++ b/srcpkgs/lc0-openblas/template @@ -1,22 +1,22 @@ # Template file for 'lc0-openblas' pkgname=lc0-openblas -version=0.24.1 +version=0.25.1 revision=1 wrksrc="lc0-${version}" build_style=meson configure_args="-Dgtest=false --buildtype=release" meson_builddir="build/release" -_githash=5b8667e4ab51e18b2ea26ac221723d6dd8f95533 +_githash=a6539d613cf9076a0423b776dd5d03fc2ec0c3ac hostmakedepends="tar pkg-config" -makedepends="openblas-devel protobuf-devel zlib-devel" +makedepends="openblas-devel protobuf-devel zlib-devel eigen" short_desc="UCI chess engine designed to play via neural network - OpenBLAS backend" maintainer="shtayerc " license="GPL-3.0-only" homepage="http://lczero.org" distfiles="https://github.com/LeelaChessZero/lc0/archive/v${version}.tar.gz https://github.com/LeelaChessZero/lczero-common/archive/${_githash}.tar.gz" -checksum="6698e87f1b6e960322d026ab38c6bcc895112b5df30f37b2b1aaaf9e8ff1b33c - ed1012ee5cf86435b5c7fd72d177ee5679b454ef1b2c72825b0f5c437ad8be76" +checksum="b3ab5b84f86d52981cff4804821178462028940c22963d544a4af8d19e13ad74 + 6d8e4609b5ad735c924cc8c13d7d2728f90e1eee29f43d761f0b5ac4072f976c" alternatives="lc0:lc0:/usr/bin/lc0-openblas" From 00f2f11ebe358d6a305a82bb0f838e00d3677f35 Mon Sep 17 00:00:00 2001 From: shtayerc Date: Mon, 11 May 2020 22:34:36 +0200 Subject: [PATCH 4/4] New package: lc0-opencl-0.25.1 --- srcpkgs/lc0-opencl/patches/eigen_nowrap.patch | 24 +++++++++++++++++++ srcpkgs/lc0-opencl/template | 10 ++++---- 2 files changed, 29 insertions(+), 5 deletions(-) create mode 100644 srcpkgs/lc0-opencl/patches/eigen_nowrap.patch diff --git a/srcpkgs/lc0-opencl/patches/eigen_nowrap.patch b/srcpkgs/lc0-opencl/patches/eigen_nowrap.patch new file mode 100644 index 00000000000..af8ff7abb65 --- /dev/null +++ b/srcpkgs/lc0-opencl/patches/eigen_nowrap.patch @@ -0,0 +1,24 @@ +From 0e1158f4bf92e8cfcf20b63a8d61687ca3a79a4c Mon Sep 17 00:00:00 2001 +From: shtayerc +Date: Tue, 28 Apr 2020 19:46:13 +0200 +Subject: [PATCH] Check if eigen is availiable before pulling subproject + +This patch will be removed when +https://github.com/LeelaChessZero/lc0/pull/1248 is merged +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git meson.build b/meson.build +index 65591353a..929a48fa0 100644 +--- meson.build ++++ meson.build +@@ -252,7 +252,7 @@ if get_option('build_backends') + + endif + +- deps += subproject('eigen').get_variable('eigen_dep') ++ deps += dependency('eigen3', fallback: ['eigen', 'eigen_dep']) + + ispc = find_program('ispc', required: false) + ispc_extra_args = [] diff --git a/srcpkgs/lc0-opencl/template b/srcpkgs/lc0-opencl/template index bb2d3cca06d..2d3631bbc9e 100644 --- a/srcpkgs/lc0-opencl/template +++ b/srcpkgs/lc0-opencl/template @@ -1,22 +1,22 @@ # Template file for 'lc0-opencl' pkgname=lc0-opencl -version=0.24.1 +version=0.25.1 revision=1 wrksrc="lc0-${version}" build_style=meson configure_args="-Dgtest=false --buildtype=release" meson_builddir="build/release" -_githash=5b8667e4ab51e18b2ea26ac221723d6dd8f95533 +_githash=a6539d613cf9076a0423b776dd5d03fc2ec0c3ac hostmakedepends="tar pkg-config" -makedepends="ocl-icd-devel protobuf-devel zlib-devel" +makedepends="ocl-icd-devel protobuf-devel zlib-devel eigen" short_desc="UCI chess engine designed to play via neural network - OpenCL backend" maintainer="shtayerc " license="GPL-3.0-only" homepage="http://lczero.org" distfiles="https://github.com/LeelaChessZero/lc0/archive/v${version}.tar.gz https://github.com/LeelaChessZero/lczero-common/archive/${_githash}.tar.gz" -checksum="6698e87f1b6e960322d026ab38c6bcc895112b5df30f37b2b1aaaf9e8ff1b33c - ed1012ee5cf86435b5c7fd72d177ee5679b454ef1b2c72825b0f5c437ad8be76" +checksum="b3ab5b84f86d52981cff4804821178462028940c22963d544a4af8d19e13ad74 + 6d8e4609b5ad735c924cc8c13d7d2728f90e1eee29f43d761f0b5ac4072f976c" alternatives="lc0:lc0:/usr/bin/lc0-opencl"