From patchwork Thu Apr 13 20:24:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 49143 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 3249617532; Thu, 13 Apr 2023 21:26:29 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4A362174FC for ; Thu, 13 Apr 2023 21:26:27 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pn3WC-0002nZ-Bs; Thu, 13 Apr 2023 16:26:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pn3WA-0002ml-Cn for guix-patches@gnu.org; Thu, 13 Apr 2023 16:26:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pn3WA-0002Wj-4o for guix-patches@gnu.org; Thu, 13 Apr 2023 16:26:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pn3W6-0001ty-8J; Thu, 13 Apr 2023 16:26:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62819] [PATCH core-updates 1/2] gnu: julia: Fix test suite regression. Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, efraim@flashner.co.il, guix-patches@gnu.org Resent-Date: Thu, 13 Apr 2023 20:26:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 62819 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62819@debbugs.gnu.org Cc: Simon Tournier , Andreas Enge , Efraim Flashner X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Andreas Enge , Efraim Flashner Received: via spool by submit@debbugs.gnu.org id=B.16814175227262 (code B ref -1); Thu, 13 Apr 2023 20:26:01 +0000 Received: (at submit) by debbugs.gnu.org; 13 Apr 2023 20:25:22 +0000 Received: from localhost ([127.0.0.1]:44856 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pn3VR-0001t3-EC for submit@debbugs.gnu.org; Thu, 13 Apr 2023 16:25:22 -0400 Received: from lists.gnu.org ([209.51.188.17]:56824) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pn3VN-0001ss-Ed for submit@debbugs.gnu.org; Thu, 13 Apr 2023 16:25:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pn3VJ-0002QW-BF for guix-patches@gnu.org; Thu, 13 Apr 2023 16:25:14 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pn3V0-00026i-Et for guix-patches@gnu.org; Thu, 13 Apr 2023 16:25:11 -0400 Received: by mail-wr1-x434.google.com with SMTP id ffacd0b85a97d-2f67111b2d0so73457f8f.0 for ; Thu, 13 Apr 2023 13:24:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681417489; x=1684009489; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=I4vaGhBUEEVczoRd2aUieJzDrqOMBxSZhI8ZkWGw5Nc=; b=fkttXF8/qzJIljecymaCmBfd2eb8L2ZSHoSA06dhKRy62Z9sXInW2bpx1ZZzJb15cE 9/oq5EPzX6W1U6SVVRqq9f9PkISLC6IcR863yevLz4h8GcYE30z7+ieTrkhEsBkJHaWO QvXkHIPnT2UwYR+XzxedBghrbUOoIsleNFsqMA5lEknU1nQsaKTAuaLuO3WcqxHAbEfR s7Hzo+jB0II2PRZBi4YoYruPeOgCn2BYBXVNJ+kjvtBN5ZBvEnuIME0xJD67Pz/BY2cw SRr/OnR5apfCqSQl1tt2M/49rtchVsHWYk78toJqZkVoSHzIxM0w+Ypji7Ftv44ZmMbS +p2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681417489; x=1684009489; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=I4vaGhBUEEVczoRd2aUieJzDrqOMBxSZhI8ZkWGw5Nc=; b=gQxXSvQfY0teRwWlxMuJW3tbJ9X6I9ZjKzMK0ZJPAglPkNdhitMpxeS5zV2ylLWkm+ ZSHLUo0OBPTZHjdCir4CvSHlKPlzdf3lzGCV1iJbs5MlT63rER9Vvc0nmmtffvv+PPH4 0RFwGY/zvwWkDxF6Fa1eCqdTh5yxY2Ai7dMUt+lX6XopUppPcNXkneUwx/6eV5HoWC8q FzE+1BcLFZk8rUJnJP0jWAKs/jwpnrS6j69WAs56JwvnR1mDHAl0SAPOSoPJ2LFf3weo ThI1W59/CRdMKY0A88S4oyq7YIjT5zAZO6zr9+UCTVsOwA70qQLM3kHoVtXDIbuKDBaJ gTUg== X-Gm-Message-State: AAQBX9ea9h41Jxy96pSeSQFaXUBx/s+6ZCYViy1XPVd8pwaYyaJtat/V n+vtn75KLr8AEnBUNfjfrqgqGB2dyPs= X-Google-Smtp-Source: AKy350b0de642LkNn3IuVqHW9kHmsoq3U8K4FENBwoaZvQ3EEatpzI9khVhGG9MmBvrgs75eW0WhQg== X-Received: by 2002:a5d:6352:0:b0:2f5:7487:7b3d with SMTP id b18-20020a5d6352000000b002f574877b3dmr70231wrw.1.1681417488739; Thu, 13 Apr 2023 13:24:48 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.117]) by smtp.gmail.com with ESMTPSA id s15-20020adfea8f000000b002d1801018e2sm1971244wrm.63.2023.04.13.13.24.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Apr 2023 13:24:48 -0700 (PDT) From: Simon Tournier Date: Thu, 13 Apr 2023 22:24:45 +0200 Message-Id: <20230413202445.2098413-1-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::434; envelope-from=zimon.toutoune@gmail.com; helo=mail-wr1-x434.google.com X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_INVALID=0.1, DKIM_SIGNED=0.1, FREEMAIL_FROM=0.001, SPF_HELO_NONE=0.001, T_SPF_TEMPERROR=0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches The update of 'mpfr' to 4.2.0 by commit d26814f8b936911d48bb004093713a525f2c6cf8 introduces a Julia test suite regression. The patch backports the Julia upstream fix. * gnu/packages/julia.scm (julia)[source]: Add patch. * gnu/packages/patches/julia-Use-MPFR-4.2.patch: New file. * gnu/local.mk: Add it. --- gnu/local.mk | 1 + gnu/packages/julia.scm | 3 +- gnu/packages/patches/julia-Use-MPFR-4.2.patch | 228 ++++++++++++++++++ 3 files changed, 231 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/julia-Use-MPFR-4.2.patch base-commit: a957171bc41e98e29674f99cf3dd2940ff45a0d3 diff --git a/gnu/local.mk b/gnu/local.mk index b07811f1cb..ed064937d7 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1380,6 +1380,7 @@ dist_patch_DATA = \ %D%/packages/patches/json-c-0.13-CVE-2020-12762.patch \ %D%/packages/patches/json-c-0.12-CVE-2020-12762.patch \ %D%/packages/patches/julia-SOURCE_DATE_EPOCH-mtime.patch \ + %D%/packages/patches/julia-Use-MPFR-4.2.patch \ %D%/packages/patches/libgeotiff-fix-tests-with-proj-9.1.1.patch \ %D%/packages/patches/libobjc2-unbundle-robin-map.patch \ %D%/packages/patches/librime-fix-build-with-gcc10.patch \ diff --git a/gnu/packages/julia.scm b/gnu/packages/julia.scm index 906cb4b94c..ba54175822 100644 --- a/gnu/packages/julia.scm +++ b/gnu/packages/julia.scm @@ -150,7 +150,8 @@ (define-public julia (sha256 (base32 "0jf8dr5j7y8cjnr65kn38xps5h9m2qvi8g1yd8qgiip5r87ld3ad")) - (patches (search-patches "julia-SOURCE_DATE_EPOCH-mtime.patch")))) + (patches (search-patches "julia-SOURCE_DATE_EPOCH-mtime.patch" + "julia-Use-MPFR-4.2.patch")))) (build-system gnu-build-system) (arguments `(#:test-target "test" diff --git a/gnu/packages/patches/julia-Use-MPFR-4.2.patch b/gnu/packages/patches/julia-Use-MPFR-4.2.patch new file mode 100644 index 0000000000..73a395c89e --- /dev/null +++ b/gnu/packages/patches/julia-Use-MPFR-4.2.patch @@ -0,0 +1,228 @@ +This patch backports part of Julia upstream commit: + + 1e5fdb29f8858f3244f6aff116ee12e4c8247f3a + Author: Simon Byrne + AuthorDate: Tue Jan 10 14:52:36 2023 -0800 + Commit: GitHub + CommitDate: Tue Jan 10 17:52:36 2023 -0500 + + update MPFR to 4.2.0 (#48165) + + Co-authored-by: Mosè Giordano + + 6 files changed, 112 insertions(+), 79 deletions(-) + base/mpfr.jl | 34 ++++++++++++++-- + deps/checksums/mpfr | 68 ++++++++++++++++---------------- + deps/mpfr.version | 2 +- + stdlib/MPFR_jll/Project.toml | 2 +- + stdlib/MPFR_jll/test/runtests.jl | 2 +- + test/math.jl | 83 +++++++++++++++++++++------------------- + + +diff -ur julia-1.8.3-orig/base/mpfr.jl julia-1.8.3-patch/base/mpfr.jl +--- julia-1.8.3-orig/base/mpfr.jl 2023-04-13 17:50:58.394891391 +0200 ++++ julia-1.8.3-patch/base/mpfr.jl 2023-04-13 20:42:52.551833467 +0200 +@@ -16,7 +16,8 @@ + cosh, sinh, tanh, sech, csch, coth, acosh, asinh, atanh, lerpi, + cbrt, typemax, typemin, unsafe_trunc, floatmin, floatmax, rounding, + setrounding, maxintfloat, widen, significand, frexp, tryparse, iszero, +- isone, big, _string_n, decompose ++ isone, big, _string_n, decompose, minmax, ++ sinpi, cospi, sincospi, sind, cosd, tand, asind, acosd, atand + + import ..Rounding: rounding_raw, setrounding_raw + +@@ -745,7 +746,7 @@ + end + + # Functions for which NaN results are converted to DomainError, following Base +-for f in (:sin, :cos, :tan, :sec, :csc, :acos, :asin, :atan, :acosh, :asinh, :atanh) ++for f in (:sin, :cos, :tan, :sec, :csc, :acos, :asin, :atan, :acosh, :asinh, :atanh, :sinpi, :cospi) + @eval begin + function ($f)(x::BigFloat) + isnan(x) && return x +@@ -756,6 +757,7 @@ + end + end + end ++sincospi(x::BigFloat) = (sinpi(x), cospi(x)) + + function atan(y::BigFloat, x::BigFloat) + z = BigFloat() +@@ -763,6 +765,32 @@ + return z + end + ++# degree functions ++for f in (:sin, :cos, :tan) ++ @eval begin ++ function ($(Symbol(f,:d)))(x::BigFloat) ++ isnan(x) && return x ++ z = BigFloat() ++ ccall(($(string(:mpfr_,f,:u)), :libmpfr), Int32, (Ref{BigFloat}, Ref{BigFloat}, Culong, MPFRRoundingMode), z, x, 360, ROUNDING_MODE[]) ++ isnan(z) && throw(DomainError(x, "NaN result for non-NaN input.")) ++ return z ++ end ++ function ($(Symbol(:a,f,:d)))(x::BigFloat) ++ isnan(x) && return x ++ z = BigFloat() ++ ccall(($(string(:mpfr_a,f,:u)), :libmpfr), Int32, (Ref{BigFloat}, Ref{BigFloat}, Culong, MPFRRoundingMode), z, x, 360, ROUNDING_MODE[]) ++ isnan(z) && throw(DomainError(x, "NaN result for non-NaN input.")) ++ return z ++ end ++ end ++end ++function atand(y::BigFloat, x::BigFloat) ++ z = BigFloat() ++ ccall((:mpfr_atan2u, :libmpfr), Int32, (Ref{BigFloat}, Ref{BigFloat}, Ref{BigFloat}, Culong, MPFRRoundingMode), z, y, x, 360, ROUNDING_MODE[]) ++ return z ++end ++ ++ + # Utility functions + ==(x::BigFloat, y::BigFloat) = ccall((:mpfr_equal_p, :libmpfr), Int32, (Ref{BigFloat}, Ref{BigFloat}), x, y) != 0 + <=(x::BigFloat, y::BigFloat) = ccall((:mpfr_lessequal_p, :libmpfr), Int32, (Ref{BigFloat}, Ref{BigFloat}), x, y) != 0 +@@ -1018,7 +1046,7 @@ + isfinite(x) || return string(Float64(x)) + _prettify_bigfloat(string_mpfr(x, fmt)) + end +-_string(x::BigFloat) = _string(x, "%.Re") ++_string(x::BigFloat) = _string(x, "%Re") + _string(x::BigFloat, k::Integer) = _string(x, "%.$(k)Re") + + string(b::BigFloat) = _string(b) +diff -ur julia-1.8.3-orig/test/math.jl julia-1.8.3-patch/test/math.jl +--- julia-1.8.3-orig/test/math.jl 2023-04-13 17:50:58.382891276 +0200 ++++ julia-1.8.3-patch/test/math.jl 2023-04-13 21:13:55.377279761 +0200 +@@ -411,47 +411,51 @@ + @test rad2deg(pi + (pi/3)*im) ≈ 180 + 60im + end + ++# ensure zeros are signed the same ++⩲(x,y) = typeof(x) == typeof(y) && x == y && signbit(x) == signbit(y) ++⩲(x::Tuple, y::Tuple) = length(x) == length(y) && all(map(⩲,x,y)) ++ + @testset "degree-based trig functions" begin +- @testset "$T" for T = (Float32,Float64,Rational{Int}) ++ @testset "$T" for T = (Float32,Float64,Rational{Int},BigFloat) + fT = typeof(float(one(T))) + fTsc = typeof( (float(one(T)), float(one(T))) ) + for x = -400:40:400 +- @test sind(convert(T,x))::fT ≈ convert(fT,sin(pi/180*x)) atol=eps(deg2rad(convert(fT,x))) +- @test cosd(convert(T,x))::fT ≈ convert(fT,cos(pi/180*x)) atol=eps(deg2rad(convert(fT,x))) ++ @test sind(convert(T,x))::fT ≈ sin(pi*convert(fT,x)/180) atol=eps(deg2rad(convert(fT,x))) ++ @test cosd(convert(T,x))::fT ≈ cos(pi*convert(fT,x)/180) atol=eps(deg2rad(convert(fT,x))) + + s,c = sincosd(convert(T,x)) +- @test s::fT ≈ convert(fT,sin(pi/180*x)) atol=eps(deg2rad(convert(fT,x))) +- @test c::fT ≈ convert(fT,cos(pi/180*x)) atol=eps(deg2rad(convert(fT,x))) ++ @test s::fT ≈ sin(pi*convert(fT,x)/180) atol=eps(deg2rad(convert(fT,x))) ++ @test c::fT ≈ cos(pi*convert(fT,x)/180) atol=eps(deg2rad(convert(fT,x))) + end + @testset "sind" begin +- @test sind(convert(T,0.0))::fT === zero(fT) +- @test sind(convert(T,180.0))::fT === zero(fT) +- @test sind(convert(T,360.0))::fT === zero(fT) +- T != Rational{Int} && @test sind(convert(T,-0.0))::fT === -zero(fT) +- @test sind(convert(T,-180.0))::fT === -zero(fT) +- @test sind(convert(T,-360.0))::fT === -zero(fT) ++ @test sind(convert(T,0.0))::fT ⩲ zero(fT) ++ @test sind(convert(T,180.0))::fT ⩲ zero(fT) ++ @test sind(convert(T,360.0))::fT ⩲ zero(fT) ++ T != Rational{Int} && @test sind(convert(T,-0.0))::fT ⩲ -zero(fT) ++ @test sind(convert(T,-180.0))::fT ⩲ -zero(fT) ++ @test sind(convert(T,-360.0))::fT ⩲ -zero(fT) + if T <: AbstractFloat + @test isnan(sind(T(NaN))) + end + end + @testset "cosd" begin +- @test cosd(convert(T,90))::fT === zero(fT) +- @test cosd(convert(T,270))::fT === zero(fT) +- @test cosd(convert(T,-90))::fT === zero(fT) +- @test cosd(convert(T,-270))::fT === zero(fT) ++ @test cosd(convert(T,90))::fT ⩲ zero(fT) ++ @test cosd(convert(T,270))::fT ⩲ zero(fT) ++ @test cosd(convert(T,-90))::fT ⩲ zero(fT) ++ @test cosd(convert(T,-270))::fT ⩲ zero(fT) + if T <: AbstractFloat + @test isnan(cosd(T(NaN))) + end + end + @testset "sincosd" begin +- @test sincosd(convert(T,-360))::fTsc === ( -zero(fT), one(fT) ) +- @test sincosd(convert(T,-270))::fTsc === ( one(fT), zero(fT) ) +- @test sincosd(convert(T,-180))::fTsc === ( -zero(fT), -one(fT) ) +- @test sincosd(convert(T, -90))::fTsc === ( -one(fT), zero(fT) ) +- @test sincosd(convert(T, 0))::fTsc === ( zero(fT), one(fT) ) +- @test sincosd(convert(T, 90))::fTsc === ( one(fT), zero(fT) ) +- @test sincosd(convert(T, 180))::fTsc === ( zero(fT), -one(fT) ) +- @test sincosd(convert(T, 270))::fTsc === ( -one(fT), zero(fT) ) ++ @test sincosd(convert(T,-360))::fTsc ⩲ ( -zero(fT), one(fT) ) ++ @test sincosd(convert(T,-270))::fTsc ⩲ ( one(fT), zero(fT) ) ++ @test sincosd(convert(T,-180))::fTsc ⩲ ( -zero(fT), -one(fT) ) ++ @test sincosd(convert(T, -90))::fTsc ⩲ ( -one(fT), zero(fT) ) ++ @test sincosd(convert(T, 0))::fTsc ⩲ ( zero(fT), one(fT) ) ++ @test sincosd(convert(T, 90))::fTsc ⩲ ( one(fT), zero(fT) ) ++ @test sincosd(convert(T, 180))::fTsc ⩲ ( zero(fT), -one(fT) ) ++ @test sincosd(convert(T, 270))::fTsc ⩲ ( -one(fT), zero(fT) ) + if T <: AbstractFloat + @test_throws DomainError sincosd(T(Inf)) + @test all(isnan.(sincosd(T(NaN)))) +@@ -463,22 +467,22 @@ + "sincospi" => (x->sincospi(x)[1], x->sincospi(x)[2]) + ) + @testset "pi * $x" for x = -3:0.3:3 +- @test sinpi(convert(T,x))::fT ≈ convert(fT,sin(pi*x)) atol=eps(pi*convert(fT,x)) +- @test cospi(convert(T,x))::fT ≈ convert(fT,cos(pi*x)) atol=eps(pi*convert(fT,x)) ++ @test sinpi(convert(T,x))::fT ≈ sin(pi*convert(fT,x)) atol=eps(pi*convert(fT,x)) ++ @test cospi(convert(T,x))::fT ≈ cos(pi*convert(fT,x)) atol=eps(pi*convert(fT,x)) + end + +- @test sinpi(convert(T,0.0))::fT === zero(fT) +- @test sinpi(convert(T,1.0))::fT === zero(fT) +- @test sinpi(convert(T,2.0))::fT === zero(fT) +- T != Rational{Int} && @test sinpi(convert(T,-0.0))::fT === -zero(fT) +- @test sinpi(convert(T,-1.0))::fT === -zero(fT) +- @test sinpi(convert(T,-2.0))::fT === -zero(fT) ++ @test sinpi(convert(T,0.0))::fT ⩲ zero(fT) ++ @test sinpi(convert(T,1.0))::fT ⩲ zero(fT) ++ @test sinpi(convert(T,2.0))::fT ⩲ zero(fT) ++ T != Rational{Int} && @test sinpi(convert(T,-0.0))::fT ⩲ -zero(fT) ++ @test sinpi(convert(T,-1.0))::fT ⩲ -zero(fT) ++ @test sinpi(convert(T,-2.0))::fT ⩲ -zero(fT) + @test_throws DomainError sinpi(convert(T,Inf)) + +- @test cospi(convert(T,0.5))::fT === zero(fT) +- @test cospi(convert(T,1.5))::fT === zero(fT) +- @test cospi(convert(T,-0.5))::fT === zero(fT) +- @test cospi(convert(T,-1.5))::fT === zero(fT) ++ @test cospi(convert(T,0.5))::fT ⩲ zero(fT) ++ @test cospi(convert(T,1.5))::fT ⩲ zero(fT) ++ @test cospi(convert(T,-0.5))::fT ⩲ zero(fT) ++ @test cospi(convert(T,-1.5))::fT ⩲ zero(fT) + @test_throws DomainError cospi(convert(T,Inf)) + end + @testset "Check exact values" begin +@@ -489,8 +493,8 @@ + @test sincospi(one(T)/convert(T,6))[1] == 0.5 + @test_throws DomainError sind(convert(T,Inf)) + @test_throws DomainError cosd(convert(T,Inf)) +- T != Float32 && @test cospi(one(T)/convert(T,3)) == 0.5 +- T != Float32 && @test sincospi(one(T)/convert(T,3))[2] == 0.5 ++ fT == Float64 && @test isapprox(cospi(one(T)/convert(T,3)), 0.5) ++ fT == Float64 && @test isapprox(sincospi(one(T)/convert(T,3))[2], 0.5) + T == Rational{Int} && @test sinpi(5//6) == 0.5 + T == Rational{Int} && @test sincospi(5//6)[1] == 0.5 + end +@@ -538,8 +542,8 @@ + end + end + end +- @test @inferred(sinc(0//1)) === 1.0 +- @test @inferred(cosc(0//1)) === -0.0 ++ @test @inferred(sinc(0//1)) ⩲ 1.0 ++ @test @inferred(cosc(0//1)) ⩲ -0.0 + + # test right before/after thresholds of Taylor series + @test sinc(0.001) ≈ 0.999998355066745 rtol=1e-15 From patchwork Thu Apr 13 20:26:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 49144 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 7030517532; Thu, 13 Apr 2023 21:28:09 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CC066174FC for ; Thu, 13 Apr 2023 21:28:08 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pn3Y5-00039B-VW; Thu, 13 Apr 2023 16:28:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pn3Y4-000380-1X for guix-patches@gnu.org; Thu, 13 Apr 2023 16:28:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pn3Y2-0002ui-NM for guix-patches@gnu.org; Thu, 13 Apr 2023 16:28:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pn3Y2-0001xJ-84; Thu, 13 Apr 2023 16:28:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62819] [PATCH core-updates 2/2] gnu: ghc-8.10: Increase 'max-silent-time'. References: <20230413202445.2098413-1-zimon.toutoune@gmail.com> In-Reply-To: <20230413202445.2098413-1-zimon.toutoune@gmail.com> Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: lars@6xq.net, guix-patches@gnu.org Resent-Date: Thu, 13 Apr 2023 20:28:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62819 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62819@debbugs.gnu.org Cc: Simon Tournier , Lars-Dominik Braun X-Debbugs-Original-Xcc: Lars-Dominik Braun Received: via spool by 62819-submit@debbugs.gnu.org id=B62819.16814176287456 (code B ref 62819); Thu, 13 Apr 2023 20:28:02 +0000 Received: (at 62819) by debbugs.gnu.org; 13 Apr 2023 20:27:08 +0000 Received: from localhost ([127.0.0.1]:44863 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pn3X7-0001w9-Eg for submit@debbugs.gnu.org; Thu, 13 Apr 2023 16:27:08 -0400 Received: from mail-wm1-f46.google.com ([209.85.128.46]:40050) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pn3X4-0001vR-IH for 62819@debbugs.gnu.org; Thu, 13 Apr 2023 16:27:04 -0400 Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-3f05f61adbeso3588375e9.0 for <62819@debbugs.gnu.org>; Thu, 13 Apr 2023 13:27:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681417615; x=1684009615; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=BvDkvLAfirw7GT+FBqOWWm0IYc/gUA+xQcKIpPRZ9QY=; b=FDWR/xS/H6QlIeC/odhhGDvZ5evvpej5/FIHJ/Ohjshwa9FEu0VggSVIW/RgT+ksPz G9I4/qI5tE5p54Pzges9CqlNC7jfL5aStFN6I6/CMssCPHSqKcdC5QlEjWLZlmL9SaZw H4iWBlFx4X66IRND+W8+KSiPzqOkZ53l6dMRaCQxgM2P18PxvVxAchSDjVIpfH5zGSQ3 vnawlPVwIBct9QQCqVd5a+bmfsBi9pPRZrQN5k9FV3+0ygN0ByPsOe9yY3kSmUq/bft2 0i1s0I2eGLF6okNzQq1q7RWvWxjwWzoc5n+uNR3+QmVb7HQuKE030LxZksvJwVl8KLZX 6aNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681417615; x=1684009615; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=BvDkvLAfirw7GT+FBqOWWm0IYc/gUA+xQcKIpPRZ9QY=; b=eCrD9el/gc46K9OQFjntHHPksMrN0FTPYEOQNhkNiHROhMBbLZ/xDDvd4HPmE3qjIe cR/eyePcMt8Jb26jQyS9cOouJd3VUHBsIW2eEfJO3R+tghcdlxls9WbIXxQFbPsFYnS1 8aqTHR51oQR/DYWIMFV0Lth519IVtgia0Y99a7uf4Kxs6uhpMrftoshf6TEruoEIEqAm jD+GjkOTL2eF0Ez0YMcIaNW6h5JyjVunm87eA/R16NO+Ox0h1td/Sa0gHAwecTwDdhKh 8v8O9ew3IAu2ofYRYV4vage66JnZLSRO48UTVva4sXtxz7vaO5zkh2s08PKBaC0nraLR UFmA== X-Gm-Message-State: AAQBX9dCazG1qb2er4OnUtyVcvkveo2eJQv7+fotnhr56zaNsv8WGe29 hC+ScGXyXxeTF+N7vmw9hvDuUFUIPC8= X-Google-Smtp-Source: AKy350aCxwpkXnodR0L0IxmgmBN8HXV7EDgoXRLiMEIyx/fYL6EvrKkGeAMKL1hhhnsYCd6Iee+QoA== X-Received: by 2002:a5d:4250:0:b0:2ef:5b62:7873 with SMTP id s16-20020a5d4250000000b002ef5b627873mr63513wrr.4.1681417615450; Thu, 13 Apr 2023 13:26:55 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.117]) by smtp.gmail.com with ESMTPSA id y18-20020adff6d2000000b002daf0b52598sm1996364wrp.18.2023.04.13.13.26.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Apr 2023 13:26:55 -0700 (PDT) From: Simon Tournier Date: Thu, 13 Apr 2023 22:26:48 +0200 Message-Id: <20230413202648.2098476-1-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/haskell.scm (ghc-8.10)[properties]: Add 'max-silent-time' to build on i686-linux system. --- gnu/packages/haskell.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index c6d301c76c..451ac65276 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -1261,6 +1261,9 @@ (define-public ghc-8.10 (substitute* '("testsuite/tests/quasiquotation/all.T") (("unless\\(config.have_ext_interp, skip\\),") "unless(config.have_ext_interp, skip), when(arch('i386'), skip),")))))))) + (properties + ;; 3 hours to avoid time-out in the check phase. + `((max-silent-time . 10800))) (native-search-paths (list (search-path-specification (variable "GHC_PACKAGE_PATH") (files (list