From patchwork Wed Nov 24 14:20:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 34791 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 005DF27BBEA; Wed, 24 Nov 2021 14:21:23 +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 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 BC94F27BBE9 for ; Wed, 24 Nov 2021 14:21:23 +0000 (GMT) Received: from localhost ([::1]:40934 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mpt9F-0004zY-Oq for patchwork@mira.cbaines.net; Wed, 24 Nov 2021 09:21:21 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35276) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mpt8w-0004xu-45 for guix-patches@gnu.org; Wed, 24 Nov 2021 09:21:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:42023) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mpt8v-0005Ch-RO for guix-patches@gnu.org; Wed, 24 Nov 2021 09:21:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mpt8v-0000m6-NR for guix-patches@gnu.org; Wed, 24 Nov 2021 09:21:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52078] [PATCH 2/2] gnu: julia: Allow parallel tests. References: <20211124141907.64286-1-zimon.toutoune@gmail.com> In-Reply-To: <20211124141907.64286-1-zimon.toutoune@gmail.com> Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 24 Nov 2021 14:21:01 +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: zimoun Received: via spool by 52078-submit@debbugs.gnu.org id=B52078.16377636412936 (code B ref 52078); Wed, 24 Nov 2021 14:21:01 +0000 Received: (at 52078) by debbugs.gnu.org; 24 Nov 2021 14:20:41 +0000 Received: from localhost ([127.0.0.1]:53569 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mpt8b-0000lI-Ix for submit@debbugs.gnu.org; Wed, 24 Nov 2021 09:20:41 -0500 Received: from mail-wm1-f53.google.com ([209.85.128.53]:36526) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mpt8a-0000l5-4u for 52078@debbugs.gnu.org; Wed, 24 Nov 2021 09:20:41 -0500 Received: by mail-wm1-f53.google.com with SMTP id i8-20020a7bc948000000b0030db7b70b6bso5584510wml.1 for <52078@debbugs.gnu.org>; Wed, 24 Nov 2021 06:20:40 -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:mime-version :content-transfer-encoding; bh=kzA4v1g9+0Qd6RHmT2Yk8LHeMPrdlIZXt3+h2Wk7sA4=; b=F3OoOJm3HhHcs3YJaIn1K2scxIc2kt2CBaLxzLkAqaC1WjumRjTNEomCMnACkf7SVx DDgQpxQC5L2hODBTB5eNRZIk0QL0k2aoAPVWZJQGWlWjsioihBVOUV1v8LUycC+NOPXI qB8wXBF30VkOuHyAHIjB2QVol0w4yeyU5rZvsIUWtMkaJ5cb59x5HjRI5wk4sgKEK3Km oL0GHmTAnEEi/4v/VNre5UVgRkardOj4AKcrdiM3bJAd9890SVaCopO/RctzCe7neJQq ryGvaLuREw4kKEsDk/QTYcVmtqGgy8dJ1q4OqCMt3yieafJyQ+hgyt0Sb5ewBz4UPCxt kB4g== 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:mime-version :content-transfer-encoding; bh=kzA4v1g9+0Qd6RHmT2Yk8LHeMPrdlIZXt3+h2Wk7sA4=; b=Zr+Ytkm/lMsSTAvfLlz3H3pZbu+KLlsund00p4qVZrJ+FYHfDHKaOIu1UchDeSrRBn NAO5L1Qu8fHPepxiqIJAZTLIX3by+ZJw6xf956xeEIPHDREf7ZlZmexA9qGYFYS7HPHD XIc5M4yPHbQoE4xwitZve42kBvpbTIQ+fimZ9DtC23uqaH67dYyA5biSYR3DfPPzdNMa RGkS5pSOFbBN2ysuIu3KNY3QIv9zY8s7nMijxc1168ulBUhU/bw26mC72+2uCOW7wFcC 39dvFfKowEK60e1a9M0LqHOIERZzrmAxFEMkGNaXJRqR33ggGWyBq4Jv+6leSVFCN42b tQJA== X-Gm-Message-State: AOAM531mr+P/q9xfYOK23x1vWb2c+Jd/XugY4q7PvTZ4fknbSqWE9oee EFBAj+IneoOLbrR5GWfCLYwto3Fz89A= X-Google-Smtp-Source: ABdhPJzWUoqz8LI0mmv1Je5en12lBMBG8nuniVJCA4WTsiA1Kb+WiHFOopuekhOkXLHtAlkbRajdNw== X-Received: by 2002:a1c:7e41:: with SMTP id z62mr16300433wmc.62.1637763633894; Wed, 24 Nov 2021 06:20:33 -0800 (PST) Received: from localhost.localdomain ([193.48.40.110]) by smtp.gmail.com with ESMTPSA id q4sm15008463wrs.56.2021.11.24.06.20.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Nov 2021 06:20:33 -0800 (PST) From: zimoun Date: Wed, 24 Nov 2021 15:20:31 +0100 Message-Id: <20211124142031.64364-1-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.32.0 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]: Patch. * gnu/packages/patches/julia-Allow-parallel-build.patch: New file. --- gnu/packages/julia.scm | 3 ++- .../patches/julia-Allow-parallel-build.patch | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/julia-Allow-parallel-build.patch diff --git a/gnu/packages/julia.scm b/gnu/packages/julia.scm index 0d4dd2b7f2..2394cb3d5a 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..1eb6a4f1f1 --- /dev/null +++ b/gnu/packages/patches/julia-Allow-parallel-build.patch @@ -0,0 +1,18 @@ +diff --git a/test/runtests.jl b/test/runtests.jl +index 2f9cd058bb..d8d6d15b8c 100644 +--- a/test/runtests.jl ++++ b/test/runtests.jl +@@ -83,8 +83,11 @@ prepend!(tests, linalg_tests) + import LinearAlgebra + cd(@__DIR__) do + n = 1 +- if net_on +- n = min(Sys.CPU_THREADS, length(tests)) ++ # Allow parallel tests with isolated environment ++ # https://github.com/JuliaLang/julia/issues/43205 ++ if net_on || haskey(ENV, "JULIA_CPU_THREADS") ++ x = haskey(ENV, "JULIA_CPU_THREADS") ? parse(Int, ENV["JULIA_CPU_THREADS"]) : Sys.CPU_THREADS ++ n = min(x, length(tests)) + n > 1 && addprocs_with_testenv(n) + LinearAlgebra.BLAS.set_num_threads(1) + end