From patchwork Thu Nov 25 01:24:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 34795 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 5B6AC27BBEA; Thu, 25 Nov 2021 01:25:39 +0000 (GMT) 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=unavailable 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 D22BA27BBE9 for ; Thu, 25 Nov 2021 01:25:38 +0000 (GMT) Received: from localhost ([::1]:38038 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mq3W6-0005kf-1B for patchwork@mira.cbaines.net; Wed, 24 Nov 2021 20:25:38 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55604) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mq3VW-0005js-Ts for guix-patches@gnu.org; Wed, 24 Nov 2021 20:25:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:43798) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mq3VW-0001v2-LO for guix-patches@gnu.org; Wed, 24 Nov 2021 20:25:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mq3VW-0007tQ-HK for guix-patches@gnu.org; Wed, 24 Nov 2021 20:25:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52078] [PATCH v2 2/3] gnu: julia: Allow parallel tests. Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 25 Nov 2021 01:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52078 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52078@debbugs.gnu.org Cc: maxim.cournoyer@gmail.com, zimoun Received: via spool by 52078-submit@debbugs.gnu.org id=B52078.163780350030316 (code B ref 52078); Thu, 25 Nov 2021 01:25:02 +0000 Received: (at 52078) by debbugs.gnu.org; 25 Nov 2021 01:25:00 +0000 Received: from localhost ([127.0.0.1]:55340 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mq3VU-0007ss-9O for submit@debbugs.gnu.org; Wed, 24 Nov 2021 20:25:00 -0500 Received: from mail-wr1-f46.google.com ([209.85.221.46]:37717) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mq3VS-0007sU-DC for 52078@debbugs.gnu.org; Wed, 24 Nov 2021 20:24:59 -0500 Received: by mail-wr1-f46.google.com with SMTP id b12so7878687wrh.4 for <52078@debbugs.gnu.org>; Wed, 24 Nov 2021 17:24:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Dbi//WRcLaDreUGryCZWzaBlSA6bB0ZByvbv/snFC6o=; b=NSNrlqV3ZHX1avls2ToFCRTx6B60oOTWJBKlXhaitudQSN9QLsDD3vkm1OSma3G1mC XgZHZTkdgrQY+R01rIZ3jXqvPxSITgmSsqdd0e9E2uBEvhw6SPXTswbPrR9oXqR67fFc O2WEDIdrGjlOh5XfOfBPOdJBtEuDyLFpCIWmWGa1K6YXmYcyy7rJH8HdAp3yUE1g/7x6 J6Q3LhOT+m1LZuPCqJBqMMxC9PJs/6RjsEgcDhOMTxm9ET4ltpjX37khzYqjlhumIQSt edSMRhUlGBPdbRKRxQyNhqYLLezwBYrb1ZlBc+9/JoodRO5J7QjBmVRa28VAj73AISWX GEKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Dbi//WRcLaDreUGryCZWzaBlSA6bB0ZByvbv/snFC6o=; b=wnTp6i0yrODgLk0BmXwwxxXo974TAJQGLju26zaATsPv3oi2emsLRYzI/OrY7pBHcC CKY+1f5K8gwv/mbgOnuQos/YdfY1eH38823teAoe9pfArrT4EE6y3n1wn+3vNjey2p+p YEJOrRE9LzFbEOwdRIIbYYKtR1skjgtoIujz4dbObKtDgYAVbW6dpmoJp4xycn5gGME4 42gEnocdu+yJ/p258/OaBCDDYud/7Pr1xrgj4/JqjItrn0nT5fxum/vapr/A9RKvc9md jkT2nPByW3+4WIZ0Y3a02S/BaGKXz+PMm5ndEWj9HPTu+6vCAPR7yfdweIAXlpat8A3L /XFg== X-Gm-Message-State: AOAM5333dDZojrnXMKqQiNPNwVxfG/Q++1gdvjbJy4tgv1figGcciG06 qGPzRlcUHyfYm7W3sOZlY1ErhEdRIX4= X-Google-Smtp-Source: ABdhPJwjH3hbe5/nKFsotm3fvSUuu3Wscet6YAjSAOM2i88gPzPMiih3irGjujE5FnImagMPPN7X/w== X-Received: by 2002:adf:db8d:: with SMTP id u13mr1900918wri.583.1637803492763; Wed, 24 Nov 2021 17:24:52 -0800 (PST) Received: from localhost.localdomain ([193.48.40.110]) by smtp.gmail.com with ESMTPSA id p27sm1214691wmi.28.2021.11.24.17.24.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Nov 2021 17:24:52 -0800 (PST) From: zimoun Date: Thu, 25 Nov 2021 02:24:42 +0100 Message-Id: <20211125012443.21840-2-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211125012443.21840-1-zimon.toutoune@gmail.com> References: <20211125012443.21840-1-zimon.toutoune@gmail.com> 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/julia.scm (julia)[origin]: New patch. * gnu/packages/patches/julia-Allow-parallel-build.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. --- gnu/local.mk | 2 ++ gnu/packages/julia.scm | 3 +- .../patches/julia-allow-parallel-build.patch | 30 +++++++++++++++++++ 3 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/julia-allow-parallel-build.patch diff --git a/gnu/local.mk b/gnu/local.mk index ea8a203ac9..706725965b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -46,6 +46,7 @@ # Copyright © 2021 Sharlatan Hellseher # Copyright © 2021 Dmitry Polyakov # Copyright © 2021 Andrew Tropin +# Copyright © 2021 Simon Tournier # # This file is part of GNU Guix. # @@ -1296,6 +1297,7 @@ dist_patch_DATA = \ %D%/packages/patches/jfsutils-include-systypes.patch \ %D%/packages/patches/julia-SOURCE_DATE_EPOCH-mtime.patch \ %D%/packages/patches/julia-tracker-16-compat.patch \ + %D%/packages/patches/julia-allow-parallel-build.patch \ %D%/packages/patches/kdbusaddons-kinit-file-name.patch \ %D%/packages/patches/libffi-3.3-powerpc-fixes.patch \ %D%/packages/patches/libffi-float128-powerpc64le.patch \ diff --git a/gnu/packages/julia.scm b/gnu/packages/julia.scm index 649ffb8ee4..cf76cfa23c 100644 --- a/gnu/packages/julia.scm +++ b/gnu/packages/julia.scm @@ -145,7 +145,8 @@ (define-public julia (base32 "1515x8fs25l3f9csbmd1v4nm041zvjnvigy6s5iidy4yrkwdx4r5")) (patches - (search-patches "julia-SOURCE_DATE_EPOCH-mtime.patch")))) + (search-patches "julia-SOURCE_DATE_EPOCH-mtime.patch" + "julia-allow-parallel-build.patch")))) (build-system gnu-build-system) (arguments `(#:test-target "test" diff --git a/gnu/packages/patches/julia-allow-parallel-build.patch b/gnu/packages/patches/julia-allow-parallel-build.patch new file mode 100644 index 0000000000..5a382e7c89 --- /dev/null +++ b/gnu/packages/patches/julia-allow-parallel-build.patch @@ -0,0 +1,30 @@ +diff --git a/test/runtests.jl b/test/runtests.jl +index 2f9cd058bb..150395e78c 100644 +--- a/test/runtests.jl ++++ b/test/runtests.jl +@@ -4,7 +4,7 @@ using Test + using Distributed + using Dates + import REPL +-using Printf: @sprintf ++using Printf: @sprintf, @printf + using Base: Experimental + + include("choosetests.jl") +@@ -83,11 +83,15 @@ prepend!(tests, linalg_tests) + import LinearAlgebra + cd(@__DIR__) do + n = 1 +- if net_on ++ # Allow parallel tests with isolated environment ++ # https://github.com/JuliaLang/julia/issues/43205 ++ # https://github.com/JuliaLang/julia/pull/43211 ++ if net_on || haskey(ENV, "JULIA_CPU_THREADS") + n = min(Sys.CPU_THREADS, length(tests)) + n > 1 && addprocs_with_testenv(n) + LinearAlgebra.BLAS.set_num_threads(1) + end ++ @printf("Number of threads: %i\n", n) + skipped = 0 + + @everywhere include("testdefs.jl")