Skip to content

Commit

Permalink
math/sleef: Update to latest upstream commit (2021-04-05)
Browse files Browse the repository at this point in the history
This updates sleef to latest upstream commit
85440a5e87dae36ca1b891de14bc83b441ae7c43 which fixes a bunch of things
including AVX2 detection. DFT library is now disabled by default because
it has issues indicated by issue reports in upstream repo. There are
also some issues with unit tests and/or library itself which may
results in bugs however unit tests works fine on 13.2-RELEASE amd64
at least. Import patch from Debian to fix build of unit tests

References:
shibatch/sleef#439
https://salsa.debian.org/science-team/sleef/-/blob/master/debian/patches/disable-duplicate-mpfr-funcs.patch

PR:		266784
Reviewed by:	jmd (maintainer)
  • Loading branch information
Daniel Engberg authored and Daniel Engberg committed Apr 12, 2023
1 parent f6aa9a8 commit 515a9b9
Show file tree
Hide file tree
Showing 7 changed files with 59 additions and 55 deletions.
9 changes: 6 additions & 3 deletions math/sleef/Makefile
@@ -1,6 +1,6 @@
PORTNAME= sleef
DISTVERSION= 3.5.0
PORTREVISION= 3
DISTVERSION= 3.5.1-62
DISTVERSIONSUFFIX= -g85440a5
CATEGORIES= math

MAINTAINER= jmd@FreeBSD.org
Expand All @@ -10,12 +10,15 @@ WWW= https://sleef.org
LICENSE= BSL
LICENSE_FILE= ${WRKSRC}/LICENSE.txt

USES= cmake compiler:c11
USES= cmake:testing compiler:c11 pathfix
USE_LDCONFIG= yes

USE_GITHUB= yes
GH_ACCOUNT= shibatch

CMAKE_OFF= BUILD_TESTS
CMAKE_TESTING_ON= BUILD_TESTS

.include <bsd.port.options.mk>

.if ${ARCH:Mpowerpc64*} || ${ARCH:Marmv?}
Expand Down
6 changes: 3 additions & 3 deletions math/sleef/distinfo
@@ -1,3 +1,3 @@
TIMESTAMP = 1599336132
SHA256 (shibatch-sleef-3.5.0_GH0.tar.gz) = 6b952560cec091477affcb18baf06bf50cef9f932ff6aba491a744ee8e77ffea
SIZE (shibatch-sleef-3.5.0_GH0.tar.gz) = 1205317
TIMESTAMP = 1664661522
SHA256 (shibatch-sleef-3.5.1-62-g85440a5_GH0.tar.gz) = 6544ea223bdf6f5d7bfc58afb55942066125f5325b535dd0cb136248ece53c43
SIZE (shibatch-sleef-3.5.1-62-g85440a5_GH0.tar.gz) = 1659120
21 changes: 0 additions & 21 deletions math/sleef/files/patch-src_libm-tester_iutsimdmain.c

This file was deleted.

11 changes: 0 additions & 11 deletions math/sleef/files/patch-src_libm-tester_tester2simdsp.c

This file was deleted.

42 changes: 33 additions & 9 deletions math/sleef/files/patch-src_libm-tester_testerutil.c
@@ -1,11 +1,35 @@
--- src/libm-tester/testerutil.c.orig 2021-11-18 16:26:40 UTC
--- src/libm-tester/testerutil.c.orig 2021-04-05 11:53:56 UTC
+++ src/libm-tester/testerutil.c
@@ -45,7 +45,7 @@ int isMinusZero(double x) { return x == 0 && copysign(
double sign(double d) { return d < 0 ? -1 : 1; }
int xisnan(double x) { return x != x; }
@@ -289,32 +289,6 @@ double countULP2sp(float d, mpfr_t c0) {

-int isnumberf(float x) { return !isinff(x) && !isnanf(x); }
+int isnumberf(float x) { return !isinf(x) && !isnanf(x); }
int isPlusZerof(float x) { return x == 0 && copysignf(1, x) == 1; }
int isMinusZerof(float x) { return x == 0 && copysignf(1, x) == -1; }
float signf(float d) { return d < 0 ? -1 : 1; }
//

-void mpfr_sinpi(mpfr_t ret, mpfr_t arg, mpfr_rnd_t rnd) {
- mpfr_t frpi, frd;
- mpfr_inits(frpi, frd, NULL);
-
- mpfr_const_pi(frpi, GMP_RNDN);
- mpfr_set_d(frd, 1.0, GMP_RNDN);
- mpfr_mul(frpi, frpi, frd, GMP_RNDN);
- mpfr_mul(frd, frpi, arg, GMP_RNDN);
- mpfr_sin(ret, frd, GMP_RNDN);
-
- mpfr_clears(frpi, frd, NULL);
-}
-
-void mpfr_cospi(mpfr_t ret, mpfr_t arg, mpfr_rnd_t rnd) {
- mpfr_t frpi, frd;
- mpfr_inits(frpi, frd, NULL);
-
- mpfr_const_pi(frpi, GMP_RNDN);
- mpfr_set_d(frd, 1.0, GMP_RNDN);
- mpfr_mul(frpi, frpi, frd, GMP_RNDN);
- mpfr_mul(frd, frpi, arg, GMP_RNDN);
- mpfr_cos(ret, frd, GMP_RNDN);
-
- mpfr_clears(frpi, frd, NULL);
-}
-
void mpfr_lgamma_nosign(mpfr_t ret, mpfr_t arg, mpfr_rnd_t rnd) {
int s;
mpfr_lgamma(ret, &s, arg, rnd);
10 changes: 10 additions & 0 deletions math/sleef/files/patch-src_libm-tester_testerutil.h
@@ -0,0 +1,10 @@
--- src/libm-tester/testerutil.h.orig 2021-04-05 11:53:56 UTC
+++ src/libm-tester/testerutil.h
@@ -90,7 +90,5 @@ int cmpDenormsp(float x, mpfr_t fry);
double countULPsp(float d, mpfr_t c);
double countULP2sp(float d, mpfr_t c);

-void mpfr_sinpi(mpfr_t ret, mpfr_t arg, mpfr_rnd_t rnd);
-void mpfr_cospi(mpfr_t ret, mpfr_t arg, mpfr_rnd_t rnd);
void mpfr_lgamma_nosign(mpfr_t ret, mpfr_t arg, mpfr_rnd_t rnd);
#endif
15 changes: 7 additions & 8 deletions math/sleef/pkg-plist
@@ -1,12 +1,11 @@
include/sleef.h
include/sleefdft.h
lib/cmake/sleef/sleefConfig.cmake
lib/cmake/sleef/sleefConfigVersion.cmake
lib/cmake/sleef/sleefTargets-%%CMAKE_BUILD_TYPE%%.cmake
lib/cmake/sleef/sleefTargets.cmake
lib/libsleef.so
lib/libsleef.so.3
lib/libsleef.so.3.5.0
lib/libsleefdft.so
lib/libsleefdft.so.3
lib/libsleefdft.so.3.5.0
%%GNUABI%%lib/libsleefgnuabi.so
%%GNUABI%%lib/libsleefgnuabi.so.3
%%GNUABI%%lib/libsleefgnuabi.so.3.5
lib/libsleef.so.3.6.0
libdata/pkgconfig/sleef.pc
%%GNUABI%%lib/libsleefgnuabi.so.3
%%GNUABI%%lib/libsleefgnuabi.so.3.6

0 comments on commit 515a9b9

Please sign in to comment.