From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id SHgdNn+XoWHXXQAAgWs5BA (envelope-from ) for ; Sat, 27 Nov 2021 03:27:11 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id YK/DMX+XoWErCQAA1q6Kng (envelope-from ) for ; Sat, 27 Nov 2021 02:27:11 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 6F7BCCEB5 for ; Sat, 27 Nov 2021 03:27:11 +0100 (CET) Received: from localhost ([::1]:49658 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mqnQj-00080F-Ta for larch@yhetil.org; Fri, 26 Nov 2021 21:27:09 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43012) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mqnQc-000806-7O for guix-patches@gnu.org; Fri, 26 Nov 2021 21:27:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:49334) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mqnQb-0002H7-Vg for guix-patches@gnu.org; Fri, 26 Nov 2021 21:27:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mqnQb-0002uq-SS for guix-patches@gnu.org; Fri, 26 Nov 2021 21:27:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52117] [core-updates-frozen] [PATCH 0/6] Fix Julia packages. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 27 Nov 2021 02:27:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52117 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: zimoun Cc: 52117@debbugs.gnu.org Received: via spool by 52117-submit@debbugs.gnu.org id=B52117.163797997911144 (code B ref 52117); Sat, 27 Nov 2021 02:27:01 +0000 Received: (at 52117) by debbugs.gnu.org; 27 Nov 2021 02:26:19 +0000 Received: from localhost ([127.0.0.1]:60874 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mqnPv-0002tg-GT for submit@debbugs.gnu.org; Fri, 26 Nov 2021 21:26:19 -0500 Received: from mail-qk1-f170.google.com ([209.85.222.170]:38500) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mqnPt-0002tS-0a for 52117@debbugs.gnu.org; Fri, 26 Nov 2021 21:26:17 -0500 Received: by mail-qk1-f170.google.com with SMTP id q64so16598900qkd.5 for <52117@debbugs.gnu.org>; Fri, 26 Nov 2021 18:26:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=scl8lPYf+2pUl+hlBZVaD04oAJDLTLZRXul8qTIohQI=; b=Ru4FmQSurUQyq055SY66veijH7XELbdWLP2jbZNeZigZQDu3skuun7lwWq/OAYiHFi 7M368exSPjqWL47DnEitg+i9O40JmbnKCKgsLvS2eBcVKvuzMY2lg59cZ6P7XCnzcY2w rrk2IUaqdSO2MBi98Kj0lK2wdI/9h3MtrdAMLy5WTsq2QPFAJVFnZAbEHbWqWaozrxmu 5Oj+YxqYcTrvsD37NCDrGVjGOrhvQbiZow6iCh7TwMOdRlm5pqlKWdUyJ4HDO0AZkixg ncQbKa6mjcGYi1xeiHvT3q92cN3XhhRScVBlmOAyNA7lYTF42UKRQjZZk9gnhb24tSf6 Mshw== 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:references:date:in-reply-to :message-id:user-agent:mime-version; bh=scl8lPYf+2pUl+hlBZVaD04oAJDLTLZRXul8qTIohQI=; b=ypGlaQufhvzzI2Q4C7/GAAMcl91oVAj3g/DHUFwEHk2nVlxRg/WN8nzKnj/rCv6/ek cnjtMgjlNPvLohlhMq2UGstnExfqy6P8pCt0/qn3FPnuCy/SSXTtsRPpEGcmhw4Wj/nm kOr+uHRfMDgNiY/zsmoDRHJnfVo1u5+LG641ehr+FsVXtOW1jMIBoJuXqN3kgX2wifj3 bsMRQKiL9Mq4etqxX/D/IgAY3OL06tchb2T+BMHLIgX/MlCBMdOnLDRw4sBg3mhU9kzG bDT4tEEJjBnM+DKw0CLIESXxu653I9g8R0+N0uOU1pIGA51ibnGNjs/DSCHepmOD3o7B eJTw== X-Gm-Message-State: AOAM531F/BXG+JVAnGjM3xRzosQtY2F7uH541KL5bbYbZ50KIeB8tOpd +CBwzUmLLG1nK6OWoF+9KRr2807LDUw6jQ== X-Google-Smtp-Source: ABdhPJxTGQKtCGDt4mueV57C/ayaWvITu8hoPkZvnr/A09RAS5Jxb/oWyTv7i7p9i2nZDVitNBuwTQ== X-Received: by 2002:a05:620a:e0c:: with SMTP id y12mr25775370qkm.109.1637979971183; Fri, 26 Nov 2021 18:26:11 -0800 (PST) Received: from hurd (dsl-148-169.b2b2c.ca. [66.158.148.169]) by smtp.gmail.com with ESMTPSA id w2sm4262589qta.11.2021.11.26.18.26.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Nov 2021 18:26:10 -0800 (PST) From: Maxim Cournoyer References: <20211125233225.34466-1-zimon.toutoune@gmail.com> <20211125233559.34575-1-zimon.toutoune@gmail.com> Date: Fri, 26 Nov 2021 21:26:09 -0500 In-Reply-To: <20211125233559.34575-1-zimon.toutoune@gmail.com> (zimoun's message of "Fri, 26 Nov 2021 00:35:54 +0100") Message-ID: <87k0gu8hby.fsf_-_@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1637980031; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=scl8lPYf+2pUl+hlBZVaD04oAJDLTLZRXul8qTIohQI=; b=YitCYbn+5Xg0mwOs81S5lhGY7vFP4Oetx0A0h8bopcxbEUq4RMIQb6qtM92Pvkb/XmQ7MM tgyt4o9esm7F77uCUHD8bXvEDEGulFIRFwX4XLpvvqA++midCFbTciV7w0IlGbIvaiQ4Vg 1Xxc0zdbruZ/IWFqpK+0pReLu2GgunyKZ6n4OvxT0VRajmXghA9nXvrQmY93SzyBgTR2g1 kvuw9XSd3vUa+VHam56t5SAjxYZEQIMpklAhhyXt4cjp4zShIXRHoFJcqDTmV+VHojKFCB HacbFEdKQ3OCH1Q/f/OYBm4c2tEXtmd3TtdvMFJpeCO7z408UXWYvmClqXld9w== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1637980031; a=rsa-sha256; cv=none; b=TjOdFhvervDsr+z4gb5sz6rwFqPJVOG7JrJMlHXoi0mLzJUiQqjfREqhxZDqOktBDmqy7N AOpzRa6l+lkG2fI80MZMKUTMoGLP9PzM27Bkie1CiIIWCLO6mj8fU7Lr2l5Iaq3oa0v1/G OkvvRslwVRZlCT0DbtSqBn8fgtrHw+4K72Nh8DdKReBo+Yh1lf/W6YlLIQDAw37HWqDxAP SLfo+/Y7hVaJpssRoJAUuecpceBpMs5CYToEgnDqUyA/BoQtKxR9gG8j4WlB64cHcRjyZy XZemu8bmrK2krjH3pIMNxM8CrRHv8Lp1vW9JD0ih4ToD1PHj3ZOu/bdQ/gkMPA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=Ru4FmQSu; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -1.80 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=Ru4FmQSu; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 6F7BCCEB5 X-Spam-Score: -1.80 X-Migadu-Scanner: scn0.migadu.com X-TUID: X5Kf/YPc+rXn Hello Simon! zimoun writes: > * gnu/packages/julia.scm (julia)[arguments]<#:phases>: Fix parallel-test. > --- > gnu/packages/julia.scm | 9 ++++----- > 1 file changed, 4 insertions(+), 5 deletions(-) > > diff --git a/gnu/packages/julia.scm b/gnu/packages/julia.scm > index ac5bf7db25..c123711da5 100644 > --- a/gnu/packages/julia.scm > +++ b/gnu/packages/julia.scm > @@ -315,11 +315,10 @@ (define-public julia > (substitute* (jlpath "Zlib") > (((from "libz")) (to "zlib" "libz")))))) > (add-after 'unpack 'enable-parallel-tests > - ;; FIXME: julia fails at networking in the container and falls back > - ;; to a single worker, which causes the tests to not run in > - ;; parallel (see: https://github.com/JuliaLang/julia/issues/43205). > - (lambda* (#:key parallel-build? #:allow-other-keys) > - (setenv "JULIA_CPU_THREADS" (if parallel-build? > + ;; Parallel tests require 'julia-allow-parallel-build.patch'. > + ;; https://github.com/JuliaLang/julia/issues/43205. > + (lambda* (#:key parallel-tests? #:allow-other-keys) > + (setenv "JULIA_CPU_THREADS" (if parallel-tests? > (number->string (parallel-job-count)) > "1")) > (format #t "JULIA_CPU_THREADS environment variable set to ~a~%" I've moved the comment where I thought it made more sense, at the top of the patch itself, like so: --8<---------------cut here---------------start------------->8--- modified gnu/packages/julia.scm @@ -315,8 +315,6 @@ (define-public julia (substitute* (jlpath "Zlib") (((from "libz")) (to "zlib" "libz")))))) (add-after 'unpack 'enable-parallel-tests - ;; Parallel tests require 'julia-allow-parallel-build.patch'. - ;; https://github.com/JuliaLang/julia/issues/43205. (lambda* (#:key parallel-tests? #:allow-other-keys) (setenv "JULIA_CPU_THREADS" (if parallel-tests? (number->string (parallel-job-count)) modified gnu/packages/patches/julia-allow-parallel-build.patch @@ -1,3 +1,8 @@ +Allow parallel tests with isolated environment. + +See https://github.com/JuliaLang/julia/issues/43205 and +https://github.com/JuliaLang/julia/pull/43211. + diff --git a/test/runtests.jl b/test/runtests.jl index 2f9cd058bb..150395e78c 100644 --- a/test/runtests.jl @@ -11,14 +16,11 @@ index 2f9cd058bb..150395e78c 100644 using Base: Experimental include("choosetests.jl") -@@ -83,11 +83,15 @@ prepend!(tests, linalg_tests) +@@ -83,11 +83,12 @@ 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) --8<---------------cut here---------------end--------------->8--- Maxim