* Re: [PR PATCH] [Updated] primecount: update to 7.11 / primesieve: update to 12.1.
2024-03-24 20:51 [PR PATCH] primecount: update to 7.11 / primesieve: update to 12.1 tornaria
@ 2024-03-25 3:27 ` tornaria
2024-04-03 2:10 ` tornaria
2024-04-03 13:39 ` [PR PATCH] [Merged]: primecount: update to 7.12 " cinerea0
2 siblings, 0 replies; 4+ messages in thread
From: tornaria @ 2024-03-25 3:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1282 bytes --]
There is an updated pull request by tornaria against master on the void-packages repository
https://github.com/tornaria/void-packages primesieve
https://github.com/void-linux/void-packages/pull/49513
primecount: update to 7.11 / primesieve: update to 12.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### 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
-->
A patch file from https://github.com/void-linux/void-packages/pull/49513.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-primesieve-49513.patch --]
[-- Type: text/x-diff, Size: 9697 bytes --]
From b7455267394430588d950ddd46c187067348df48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Fri, 15 Mar 2024 13:21:34 -0300
Subject: [PATCH 1/2] primesieve: update to 12.1.
---
srcpkgs/primesieve/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/primesieve/template b/srcpkgs/primesieve/template
index 265f340d8153aa..a383f696d8cfab 100644
--- a/srcpkgs/primesieve/template
+++ b/srcpkgs/primesieve/template
@@ -1,6 +1,6 @@
# Template file for 'primesieve'
pkgname=primesieve
-version=12.0
+version=12.1
revision=1
build_style=cmake
configure_args="-DBUILD_TESTS=ON -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=OFF"
@@ -10,7 +10,7 @@ license="BSD-2-Clause"
homepage="https://github.com/kimwalisch/primesieve"
changelog="https://raw.githubusercontent.com/kimwalisch/primesieve/master/ChangeLog"
distfiles="https://github.com/kimwalisch/primesieve/archive/refs/tags/v${version}.tar.gz"
-checksum=4278bf145a74a5a4405deaaa92a7cd2ee22a50dc8dcae082c33c8e4cfa25ebe4
+checksum=64e7f5d3ce680262b865c7aec1381ffb13d13f75dd985b964ce33806e1bbf386
post_install() {
vlicense COPYING
From 2fa47b049afdb749ca8ce24ff5f2770f71497a4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Fri, 15 Mar 2024 13:21:37 -0300
Subject: [PATCH 2/2] primecount: update to 7.11.
---
...3f0590da190d2174f9d4e4781879dfd326d8.patch | 249 ++++++++++++++++++
srcpkgs/primecount/template | 6 +-
2 files changed, 252 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/primecount/patches/fix_i686-7cae3f0590da190d2174f9d4e4781879dfd326d8.patch
diff --git a/srcpkgs/primecount/patches/fix_i686-7cae3f0590da190d2174f9d4e4781879dfd326d8.patch b/srcpkgs/primecount/patches/fix_i686-7cae3f0590da190d2174f9d4e4781879dfd326d8.patch
new file mode 100644
index 00000000000000..73f71566374661
--- /dev/null
+++ b/srcpkgs/primecount/patches/fix_i686-7cae3f0590da190d2174f9d4e4781879dfd326d8.patch
@@ -0,0 +1,249 @@
+See: https://github.com/kimwalisch/primecount/issues/66
+
+From 7cae3f0590da190d2174f9d4e4781879dfd326d8 Mon Sep 17 00:00:00 2001
+From: Kim Walisch <kim.walisch@gmail.com>
+Date: Sun, 17 Mar 2024 17:54:38 +0100
+Subject: [PATCH] Fix infinite loop in Li(x) & RiemannR(x) on Linux i386 #66
+
+---
+ src/LogarithmicIntegral.cpp | 30 ++++++++++-------------
+ src/RiemannR.cpp | 48 +++++++++++++++++++++++--------------
+ 2 files changed, 42 insertions(+), 36 deletions(-)
+
+diff --git a/src/LogarithmicIntegral.cpp b/src/LogarithmicIntegral.cpp
+index 148c99c3..8c525f08 100644
+--- a/src/LogarithmicIntegral.cpp
++++ b/src/LogarithmicIntegral.cpp
+@@ -53,7 +53,7 @@ T li(T x)
+ T logx = std::log(x);
+ int k = 0;
+
+- for (int n = 1; true; n++)
++ for (int n = 1; n < 1000; n++)
+ {
+ p *= -logx;
+ factorial *= n;
+@@ -67,7 +67,7 @@ T li(T x)
+ sum += (p / q) * inner_sum;
+
+ // Not converging anymore
+- if (std::abs(sum - old_sum) < std::numeric_limits<T>::epsilon())
++ if (std::abs(sum - old_sum) <= std::numeric_limits<T>::epsilon())
+ break;
+ }
+
+@@ -81,12 +81,9 @@ T li(T x)
+ template <typename T>
+ T Li(T x)
+ {
+- const T li2 = (T) 1.045163780117492784844588889194613136L;
+-
+- if (x <= li2)
+- return 0;
+- else
+- return li(x) - li2;
++ T li2 = (T) 1.045163780117492784844588889194613136L;
++ T lix = li(x);
++ return std::max(T(0), lix - li2);
+ }
+
+ /// Calculate the inverse Eulerian logarithmic integral which
+@@ -110,9 +107,9 @@ T Li_inverse(T x)
+ return 0;
+
+ T t = x * std::log(x);
+- T old_term = std::numeric_limits<T>::infinity();
++ T old_term = std::numeric_limits<T>::max();
+
+- while (true)
++ for (int i = 0; i < 100; i++)
+ {
+ T term = (Li(t) - x) * std::log(t);
+
+@@ -148,7 +145,7 @@ __float128 li(__float128 x)
+ __float128 logx = logq(x);
+ int k = 0;
+
+- for (int n = 1; true; n++)
++ for (int n = 1; n < 1000; n++)
+ {
+ p *= -logx;
+ factorial *= n;
+@@ -162,7 +159,7 @@ __float128 li(__float128 x)
+ sum += (p / q) * inner_sum;
+
+ // Not converging anymore
+- if (fabsq(sum - old_sum) < FLT128_EPSILON)
++ if (fabsq(sum - old_sum) <= FLT128_EPSILON)
+ break;
+ }
+
+@@ -176,11 +173,8 @@ __float128 li(__float128 x)
+ __float128 Li(__float128 x)
+ {
+ __float128 li2 = 1.045163780117492784844588889194613136Q;
+-
+- if (x <= li2)
+- return 0;
+- else
+- return li(x) - li2;
++ __float128 lix = li(x);
++ return (lix < li2) ? 0 : lix - li2;
+ }
+
+ /// Calculate the inverse Eulerian logarithmic integral which
+@@ -205,7 +199,7 @@ __float128 Li_inverse(__float128 x)
+ __float128 t = x * logq(x);
+ __float128 old_term = FLT128_MAX;
+
+- while (true)
++ for (int i = 0; i < 100; i++)
+ {
+ __float128 term = (Li(t) - x) * logq(t);
+
+diff --git a/src/RiemannR.cpp b/src/RiemannR.cpp
+index 4c17055f..a29e28a1 100644
+--- a/src/RiemannR.cpp
++++ b/src/RiemannR.cpp
+@@ -217,24 +217,27 @@ T RiemannR_prime(T x)
+ // RiemannR_prime(1) = NaN.
+ // Hence we return RiemannR_prime(1.0000000000000001).
+ // Required because: sum / log(1) = 0 / 0.
+- if (std::abs(x - 1.0) < epsilon)
++ if (std::abs(x - 1.0) <= epsilon)
+ return (T) 0.60792710185402643042L;
+
+ T sum = 0;
+- T old_sum = -1;
+ T term = 1;
+ T logx = std::log(x);
+
+- for (unsigned k = 1; std::abs(old_sum - sum) >= epsilon; k++)
++ for (unsigned k = 1; k < 1000; k++)
+ {
+ term *= logx / k;
+- old_sum = sum;
++ T old_sum = sum;
+
+ if (k + 1 < zeta.size())
+ sum += term / T(zeta[k + 1]);
+ else
+ // For k >= 127, approximate zeta(k + 1) by 1
+ sum += term;
++
++ // Not converging anymore
++ if (std::abs(old_sum - sum) <= epsilon)
++ break;
+ }
+
+ return sum / (x * logx);
+@@ -254,20 +257,23 @@ T RiemannR(T x)
+
+ T epsilon = std::numeric_limits<T>::epsilon();
+ T sum = 1;
+- T old_sum = -1;
+ T term = 1;
+ T logx = std::log(x);
+
+- for (unsigned k = 1; std::abs(old_sum - sum) >= epsilon; k++)
++ for (unsigned k = 1; k < 1000; k++)
+ {
+ term *= logx / k;
+- old_sum = sum;
++ T old_sum = sum;
+
+ if (k + 1 < zeta.size())
+ sum += term / (T(zeta[k + 1]) * k);
+ else
+ // For k >= 127, approximate zeta(k + 1) by 1
+ sum += term / k;
++
++ // Not converging anymore
++ if (std::abs(old_sum - sum) <= epsilon)
++ break;
+ }
+
+ return sum;
+@@ -290,9 +296,9 @@ T RiemannR_inverse(T x)
+ return 0;
+
+ T t = (T) initialNthPrimeApprox((double) x);
+- T old_term = std::numeric_limits<T>::infinity();
++ T old_term = std::numeric_limits<T>::max();
+
+- while (true)
++ for (int i = 0; i < 100; i++)
+ {
+ T term = (RiemannR(t) - x) / RiemannR_prime(t);
+
+@@ -457,24 +463,27 @@ __float128 RiemannR_prime(__float128 x)
+ // RiemannR_prime(1) = NaN.
+ // Hence we return RiemannR_prime(1.0000000000000001).
+ // Required because: sum / log(1) = 0 / 0.
+- if (fabsq(x - 1.0) < FLT128_EPSILON)
++ if (fabsq(x - 1.0) <= FLT128_EPSILON)
+ return 0.60792710185402643042Q;
+
+ __float128 sum = 0;
+- __float128 old_sum = -1;
+ __float128 term = 1;
+ __float128 logx = logq(x);
+
+- for (unsigned k = 1; fabsq(old_sum - sum) >= FLT128_EPSILON; k++)
++ for (unsigned k = 1; k < 1000; k++)
+ {
+ term *= logx / k;
+- old_sum = sum;
++ __float128 old_sum = sum;
+
+ if (k + 1 < zeta_f128.size())
+ sum += term / zeta_f128[k + 1];
+ else
+ // For k >= 127, approximate zeta(k + 1) by 1
+ sum += term;
++
++ // Not converging anymore
++ if (std::abs(old_sum - sum) <= FLT128_EPSILON)
++ break;
+ }
+
+ return sum / (x * logx);
+@@ -492,20 +501,23 @@ __float128 RiemannR(__float128 x)
+ return 0;
+
+ __float128 sum = 1;
+- __float128 old_sum = -1;
+ __float128 term = 1;
+ __float128 logx = logq(x);
+
+- for (unsigned k = 1; fabsq(old_sum - sum) >= FLT128_EPSILON; k++)
++ for (unsigned k = 1; k < 1000; k++)
+ {
+ term *= logx / k;
+- old_sum = sum;
++ __float128 old_sum = sum;
+
+ if (k + 1 < zeta_f128.size())
+ sum += term / (zeta_f128[k + 1] * k);
+ else
+ // For k >= 127, approximate zeta(k + 1) by 1
+ sum += term / k;
++
++ // Not converging anymore
++ if (std::abs(old_sum - sum) <= FLT128_EPSILON)
++ break;
+ }
+
+ return sum;
+@@ -527,9 +539,9 @@ __float128 RiemannR_inverse(__float128 x)
+ return 0;
+
+ __float128 t = (__float128) initialNthPrimeApprox((double) x);
+- __float128 old_term = HUGE_VALQ;
++ __float128 old_term = FLT128_MAX;
+
+- while (true)
++ for (int i = 0; i < 100; i++)
+ {
+ __float128 term = (RiemannR(t) - x) / RiemannR_prime(t);
+
diff --git a/srcpkgs/primecount/template b/srcpkgs/primecount/template
index 32f64bbc992fd6..d2b371e0843a72 100644
--- a/srcpkgs/primecount/template
+++ b/srcpkgs/primecount/template
@@ -1,7 +1,7 @@
# Template file for 'primecount'
pkgname=primecount
-version=7.10
-revision=2
+version=7.11
+revision=1
build_style=cmake
configure_args="-DBUILD_TESTS=ON -DBUILD_LIBPRIMESIEVE=OFF
-DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=OFF"
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
homepage="https://github.com/kimwalisch/primecount/"
changelog="https://raw.githubusercontent.com/kimwalisch/primecount/master/ChangeLog"
distfiles="https://github.com/kimwalisch/primecount/archive/refs/tags/v${version}.tar.gz"
-checksum=0a0e9aaa25d8c24d06f0612fc01cd0c31f3eac4e096a9248fc041dd42dc60afb
+checksum=e5b015555b50f4f19ae5c9f902bbee08082218862d15ed4ca45deb72f6c9c3f9
build_options="native_build"
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PR PATCH] [Updated] primecount: update to 7.11 / primesieve: update to 12.1.
2024-03-24 20:51 [PR PATCH] primecount: update to 7.11 / primesieve: update to 12.1 tornaria
2024-03-25 3:27 ` [PR PATCH] [Updated] " tornaria
@ 2024-04-03 2:10 ` tornaria
2024-04-03 13:39 ` [PR PATCH] [Merged]: primecount: update to 7.12 " cinerea0
2 siblings, 0 replies; 4+ messages in thread
From: tornaria @ 2024-04-03 2:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1282 bytes --]
There is an updated pull request by tornaria against master on the void-packages repository
https://github.com/tornaria/void-packages primesieve
https://github.com/void-linux/void-packages/pull/49513
primecount: update to 7.11 / primesieve: update to 12.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### 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
-->
A patch file from https://github.com/void-linux/void-packages/pull/49513.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-primesieve-49513.patch --]
[-- Type: text/x-diff, Size: 2515 bytes --]
From dfb6cc339359f3e07639c5d2c3a23b9ff25b57f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Fri, 15 Mar 2024 13:21:34 -0300
Subject: [PATCH 1/2] primesieve: update to 12.1.
---
srcpkgs/primesieve/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/primesieve/template b/srcpkgs/primesieve/template
index 265f340d8153aa..a383f696d8cfab 100644
--- a/srcpkgs/primesieve/template
+++ b/srcpkgs/primesieve/template
@@ -1,6 +1,6 @@
# Template file for 'primesieve'
pkgname=primesieve
-version=12.0
+version=12.1
revision=1
build_style=cmake
configure_args="-DBUILD_TESTS=ON -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=OFF"
@@ -10,7 +10,7 @@ license="BSD-2-Clause"
homepage="https://github.com/kimwalisch/primesieve"
changelog="https://raw.githubusercontent.com/kimwalisch/primesieve/master/ChangeLog"
distfiles="https://github.com/kimwalisch/primesieve/archive/refs/tags/v${version}.tar.gz"
-checksum=4278bf145a74a5a4405deaaa92a7cd2ee22a50dc8dcae082c33c8e4cfa25ebe4
+checksum=64e7f5d3ce680262b865c7aec1381ffb13d13f75dd985b964ce33806e1bbf386
post_install() {
vlicense COPYING
From 878f0495c63f80404cbc01c2567f114b657f117a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Fri, 15 Mar 2024 13:21:37 -0300
Subject: [PATCH 2/2] primecount: update to 7.12.
---
srcpkgs/primecount/template | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/primecount/template b/srcpkgs/primecount/template
index 32f64bbc992fd6..466b74330458f7 100644
--- a/srcpkgs/primecount/template
+++ b/srcpkgs/primecount/template
@@ -1,7 +1,7 @@
# Template file for 'primecount'
pkgname=primecount
-version=7.10
-revision=2
+version=7.12
+revision=1
build_style=cmake
configure_args="-DBUILD_TESTS=ON -DBUILD_LIBPRIMESIEVE=OFF
-DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=OFF"
@@ -12,13 +12,7 @@ license="BSD-2-Clause"
homepage="https://github.com/kimwalisch/primecount/"
changelog="https://raw.githubusercontent.com/kimwalisch/primecount/master/ChangeLog"
distfiles="https://github.com/kimwalisch/primecount/archive/refs/tags/v${version}.tar.gz"
-checksum=0a0e9aaa25d8c24d06f0612fc01cd0c31f3eac4e096a9248fc041dd42dc60afb
-
-build_options="native_build"
-
-if [ -z "$build_option_native_build" ]; then
- configure_args+=" -DWITH_POPCNT=OFF"
-fi
+checksum=b801aa95e434d1b7575e42cb9009286b5f94618a417888bb6bd3217ef2f1321c
post_install() {
vlicense COPYING
^ permalink raw reply [flat|nested] 4+ messages in thread