Re: [PR PATCH] [Updated] [WIP] New package: KataGo-1.11.0

[jason1987d <jason1987d@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1650 bytes --]

There is an updated pull request by jason1987d against master on the void-packages repository

https://github.com/jason1987d/void-packages KataGo
https://github.com/void-linux/void-packages/pull/38190

[WIP] New package: KataGo-1.11.0
#### Testing the changes
- I tested the changes in this PR: NO
This is a work in progress.

#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): YES

<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->

Main question so far, CMakeLists.txt is found in ${wrksrc}/cpp, what configure_flag or other variable do I set to make it work and find that? I've set cmake_builddir to that which didn't work.

I discussed briefly with @Chocimier about this package when I submitted the new package q5go https://github.com/void-linux/void-packages/pull/35831 and will have other architecture questions.

This package has multiple backends: OpenCL, Eigen, TensorRT. I use an AMD Ryzen system and notice I already have mesa-opencl installed, I see there is another opencl implementation for Nvidia cards, and I suppose others (i.e. Intel) could even be ported to void. Eigen is available in the repos. Would this be multiple templates i.e. KataGo-OpenCL KataGo-Eigen etc or would I need to set up KataGo as some sort of metapackage?

A patch file from https://github.com/void-linux/void-packages/pull/38190.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-KataGo-38190.patch --]
[-- Type: text/x-diff, Size: 9784 bytes --]

From da7e6459de101feef7c6ce6e5dfb8be3b6ea1db9 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Thu, 21 Jul 2022 23:01:22 -0500
Subject: [PATCH] New package: KataGo-1.11.0

---
 srcpkgs/KataGo-OpenCL/patches/rand.cpp.patch  | 11 +++++++
 srcpkgs/KataGo-OpenCL/patches/rand.h.patch    | 11 +++++++
 .../KataGo-OpenCL/patches/runtests.cpp.patch  | 10 +++++++
 .../KataGo-OpenCL/patches/search.cpp.patch    | 11 +++++++
 srcpkgs/KataGo-OpenCL/template                | 30 +++++++++++++++++++
 srcpkgs/KataGo-eigen/patches/rand.cpp.patch   | 11 +++++++
 srcpkgs/KataGo-eigen/patches/rand.h.patch     | 11 +++++++
 .../KataGo-eigen/patches/runtests.cpp.patch   | 10 +++++++
 srcpkgs/KataGo-eigen/patches/search.cpp.patch | 11 +++++++
 srcpkgs/KataGo-eigen/template                 | 30 +++++++++++++++++++
 srcpkgs/eigen/template                        |  6 ++--
 11 files changed, 149 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/KataGo-OpenCL/patches/rand.cpp.patch
 create mode 100644 srcpkgs/KataGo-OpenCL/patches/rand.h.patch
 create mode 100644 srcpkgs/KataGo-OpenCL/patches/runtests.cpp.patch
 create mode 100644 srcpkgs/KataGo-OpenCL/patches/search.cpp.patch
 create mode 100644 srcpkgs/KataGo-OpenCL/template
 create mode 100644 srcpkgs/KataGo-eigen/patches/rand.cpp.patch
 create mode 100644 srcpkgs/KataGo-eigen/patches/rand.h.patch
 create mode 100644 srcpkgs/KataGo-eigen/patches/runtests.cpp.patch
 create mode 100644 srcpkgs/KataGo-eigen/patches/search.cpp.patch
 create mode 100644 srcpkgs/KataGo-eigen/template

diff --git a/srcpkgs/KataGo-OpenCL/patches/rand.cpp.patch b/srcpkgs/KataGo-OpenCL/patches/rand.cpp.patch
new file mode 100644
index 000000000000..3c15d2f13955
--- /dev/null
+++ b/srcpkgs/KataGo-OpenCL/patches/rand.cpp.patch
@@ -0,0 +1,11 @@
+--- a/cpp/core/rand.cpp	2022-03-20 15:12:06.000000000 -0500
++++ b/cpp/core/rand.cpp	2022-07-23 09:15:36.383995796 -0500
+@@ -322,7 +322,7 @@
+ {
+   assert(n > 0);
+   assert(n < 0xFFFFFFFF);
+-  double_t sum = cumRelProbs[n-1];
++  double sum = cumRelProbs[n-1];
+   double d = nextDouble(sum);
+   size_t r = BSearch::findFirstGt(cumRelProbs,d,0,n);
+   if(r == n)
diff --git a/srcpkgs/KataGo-OpenCL/patches/rand.h.patch b/srcpkgs/KataGo-OpenCL/patches/rand.h.patch
new file mode 100644
index 000000000000..ebed7ab7a96a
--- /dev/null
+++ b/srcpkgs/KataGo-OpenCL/patches/rand.h.patch
@@ -0,0 +1,11 @@
+--- a/cpp/core/rand.h	2022-03-20 15:12:06.000000000 -0500
++++ b/cpp/core/rand.h	2022-07-23 09:15:25.583181534 -0500
+@@ -209,7 +209,7 @@
+ {
+   assert(n > 0);
+   assert(n < 0xFFFFFFFF);
+-  double_t sum = 0;
++  double sum = 0;
+   for(uint32_t i = 0; i<n; i++)
+   {
+     assert(relProbs[i] >= 0);
diff --git a/srcpkgs/KataGo-OpenCL/patches/runtests.cpp.patch b/srcpkgs/KataGo-OpenCL/patches/runtests.cpp.patch
new file mode 100644
index 000000000000..e0b5d79efc50
--- /dev/null
+++ b/srcpkgs/KataGo-OpenCL/patches/runtests.cpp.patch
@@ -0,0 +1,10 @@
+--- a/cpp/command/runtests.cpp	2022-03-20 15:12:06.000000000 -0500
++++ b/cpp/command/runtests.cpp	2022-07-29 16:04:10.666595008 -0500
+@@ -24,7 +24,6 @@
+ 
+ int MainCmds::runtests(const vector<string>& args) {
+   (void)args;
+-  testAssert(sizeof(size_t) == 8);
+   Board::initHash();
+   ScoreValue::initTables();
+ 
diff --git a/srcpkgs/KataGo-OpenCL/patches/search.cpp.patch b/srcpkgs/KataGo-OpenCL/patches/search.cpp.patch
new file mode 100644
index 000000000000..864219e11441
--- /dev/null
+++ b/srcpkgs/KataGo-OpenCL/patches/search.cpp.patch
@@ -0,0 +1,11 @@
+--- a/cpp/search/search.cpp	2022-03-20 15:12:06.000000000 -0500
++++ b/cpp/search/search.cpp	2022-07-23 09:11:16.099471820 -0500
+@@ -458,7 +458,7 @@
+   //Compute caps on search
+   int64_t maxVisits = pondering ? searchParams.maxVisitsPondering : searchParams.maxVisits;
+   int64_t maxPlayouts = pondering ? searchParams.maxPlayoutsPondering : searchParams.maxPlayouts;
+-  double_t maxTime = pondering ? searchParams.maxTimePondering : searchParams.maxTime;
++  double maxTime = pondering ? searchParams.maxTimePondering : searchParams.maxTime;
+ 
+   {
+     //Possibly reduce computation time, for human friendliness
diff --git a/srcpkgs/KataGo-OpenCL/template b/srcpkgs/KataGo-OpenCL/template
new file mode 100644
index 000000000000..faf2e73bb7d2
--- /dev/null
+++ b/srcpkgs/KataGo-OpenCL/template
@@ -0,0 +1,30 @@
+# Template file for 'KataGo-OpenCL'
+pkgname=KataGo-OpenCL
+version=1.11.0
+revision=1
+wrksrc="KataGo-${version}"
+build_wrksrc=cpp
+build_style=cmake
+configure_args="-DUSE_BACKEND=OPENCL -DNO_GIT_REVISION=1"
+makedepends="ocl-icd-devel zlib-devel libzip-devel"
+depends="mesa-opencl"
+short_desc="KataGo Go/Weiqi/Baduk analysis engine (OpenCL backend)"
+maintainer="Jason Manley <jason@jasondavid.tv>"
+license="MIT"
+homepage="https://github.com/lightvector/KataGo/"
+distfiles="https://github.com/lightvector/KataGo/archive/refs/tags/v${version}.tar.gz"
+checksum=3f63aa5dfaab861360fd6f9548aa7f552b007cac7e90c99089d3bb4bb4b9d451
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
+	makedepends+=" libatomic-devel"
+fi
+
+do_check() {
+	build/katago runtests
+}
+
+do_install() {
+	vbin build/katago
+	vlicense "${wrksrc}"/LICENSE
+}
diff --git a/srcpkgs/KataGo-eigen/patches/rand.cpp.patch b/srcpkgs/KataGo-eigen/patches/rand.cpp.patch
new file mode 100644
index 000000000000..3c15d2f13955
--- /dev/null
+++ b/srcpkgs/KataGo-eigen/patches/rand.cpp.patch
@@ -0,0 +1,11 @@
+--- a/cpp/core/rand.cpp	2022-03-20 15:12:06.000000000 -0500
++++ b/cpp/core/rand.cpp	2022-07-23 09:15:36.383995796 -0500
+@@ -322,7 +322,7 @@
+ {
+   assert(n > 0);
+   assert(n < 0xFFFFFFFF);
+-  double_t sum = cumRelProbs[n-1];
++  double sum = cumRelProbs[n-1];
+   double d = nextDouble(sum);
+   size_t r = BSearch::findFirstGt(cumRelProbs,d,0,n);
+   if(r == n)
diff --git a/srcpkgs/KataGo-eigen/patches/rand.h.patch b/srcpkgs/KataGo-eigen/patches/rand.h.patch
new file mode 100644
index 000000000000..ebed7ab7a96a
--- /dev/null
+++ b/srcpkgs/KataGo-eigen/patches/rand.h.patch
@@ -0,0 +1,11 @@
+--- a/cpp/core/rand.h	2022-03-20 15:12:06.000000000 -0500
++++ b/cpp/core/rand.h	2022-07-23 09:15:25.583181534 -0500
+@@ -209,7 +209,7 @@
+ {
+   assert(n > 0);
+   assert(n < 0xFFFFFFFF);
+-  double_t sum = 0;
++  double sum = 0;
+   for(uint32_t i = 0; i<n; i++)
+   {
+     assert(relProbs[i] >= 0);
diff --git a/srcpkgs/KataGo-eigen/patches/runtests.cpp.patch b/srcpkgs/KataGo-eigen/patches/runtests.cpp.patch
new file mode 100644
index 000000000000..e0b5d79efc50
--- /dev/null
+++ b/srcpkgs/KataGo-eigen/patches/runtests.cpp.patch
@@ -0,0 +1,10 @@
+--- a/cpp/command/runtests.cpp	2022-03-20 15:12:06.000000000 -0500
++++ b/cpp/command/runtests.cpp	2022-07-29 16:04:10.666595008 -0500
+@@ -24,7 +24,6 @@
+ 
+ int MainCmds::runtests(const vector<string>& args) {
+   (void)args;
+-  testAssert(sizeof(size_t) == 8);
+   Board::initHash();
+   ScoreValue::initTables();
+ 
diff --git a/srcpkgs/KataGo-eigen/patches/search.cpp.patch b/srcpkgs/KataGo-eigen/patches/search.cpp.patch
new file mode 100644
index 000000000000..864219e11441
--- /dev/null
+++ b/srcpkgs/KataGo-eigen/patches/search.cpp.patch
@@ -0,0 +1,11 @@
+--- a/cpp/search/search.cpp	2022-03-20 15:12:06.000000000 -0500
++++ b/cpp/search/search.cpp	2022-07-23 09:11:16.099471820 -0500
+@@ -458,7 +458,7 @@
+   //Compute caps on search
+   int64_t maxVisits = pondering ? searchParams.maxVisitsPondering : searchParams.maxVisits;
+   int64_t maxPlayouts = pondering ? searchParams.maxPlayoutsPondering : searchParams.maxPlayouts;
+-  double_t maxTime = pondering ? searchParams.maxTimePondering : searchParams.maxTime;
++  double maxTime = pondering ? searchParams.maxTimePondering : searchParams.maxTime;
+ 
+   {
+     //Possibly reduce computation time, for human friendliness
diff --git a/srcpkgs/KataGo-eigen/template b/srcpkgs/KataGo-eigen/template
new file mode 100644
index 000000000000..830a8b987afd
--- /dev/null
+++ b/srcpkgs/KataGo-eigen/template
@@ -0,0 +1,30 @@
+# Template file for 'KataGo-eigen'
+pkgname=KataGo-eigen
+version=1.11.0
+revision=1
+wrksrc="KataGo-${version}"
+build_wrksrc=cpp
+build_style=cmake
+configure_args="-DUSE_BACKEND=EIGEN -DNO_GIT_REVISION=1"
+makedepends="zlib-devel libzip-devel eigen"
+depends="eigen"
+short_desc="KataGo Go/Weiqi/Baduk analysis engine (OpenCL backend)"
+maintainer="Jason Manley <jason@jasondavid.tv>"
+license="MIT"
+homepage="https://github.com/lightvector/KataGo/"
+distfiles="https://github.com/lightvector/KataGo/archive/refs/tags/v${version}.tar.gz"
+checksum=3f63aa5dfaab861360fd6f9548aa7f552b007cac7e90c99089d3bb4bb4b9d451
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
+	makedepends+=" libatomic-devel"
+fi
+
+do_check() {
+	build/katago runtests
+}
+
+do_install() {
+	vbin build/katago
+	vlicense "${wrksrc}"/LICENSE
+}
diff --git a/srcpkgs/eigen/template b/srcpkgs/eigen/template
index 072228c16915..ba6347bc94e5 100644
--- a/srcpkgs/eigen/template
+++ b/srcpkgs/eigen/template
@@ -1,15 +1,15 @@
 # Template file for 'eigen'
 pkgname=eigen
-version=3.3.9
+version=3.4.0
 revision=1
 build_style=cmake
 configure_args="-DCMAKE_BUILD_TYPE=Release"
 short_desc="C++ template library for linear algebra (version 3.x)"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Jason Manley <jason@jasondavid.tv>"
 license="MPL-2.0, GPL-3.0-or-later, LGPL-2.1-or-later, BSD-3-Clause"
 homepage="https://eigen.tuxfamily.org/"
 distfiles="https://gitlab.com/libeigen/eigen/-/archive/${version}/eigen-${version}.tar.bz2"
-checksum=0fa5cafe78f66d2b501b43016858070d52ba47bd9b1016b0165a7b8e04675677
+checksum=b4c198460eba6f28d34894e3a5710998818515104d6e74e5cc331ce31e46e626
 
 post_install() {
 	vlicense COPYING.BSD