From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id IJdxO0LNmWBnxAAAgWs5BA (envelope-from ) for ; Tue, 11 May 2021 02:18:10 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id kOoCN0LNmWCXXgAAbx9fmQ (envelope-from ) for ; Tue, 11 May 2021 00:18:10 +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 F202216B86 for ; Tue, 11 May 2021 02:18:09 +0200 (CEST) Received: from localhost ([::1]:34246 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lgG6C-0000Z0-JH for larch@yhetil.org; Mon, 10 May 2021 20:18:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59952) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lgG66-0000Yn-26 for guix-patches@gnu.org; Mon, 10 May 2021 20:18:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51253) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lgG65-0003bl-RA for guix-patches@gnu.org; Mon, 10 May 2021 20:18:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lgG65-0005lb-LQ for guix-patches@gnu.org; Mon, 10 May 2021 20:18:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48325] julia-1.6 guix Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 11 May 2021 00:18:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48325 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Jean-Baptiste Volatier Cc: 48325@debbugs.gnu.org, =?UTF-8?Q?Nicol=C3=B2?= Balzarotti Received: via spool by 48325-submit@debbugs.gnu.org id=B48325.162069223922119 (code B ref 48325); Tue, 11 May 2021 00:18:01 +0000 Received: (at 48325) by debbugs.gnu.org; 11 May 2021 00:17:19 +0000 Received: from localhost ([127.0.0.1]:34566 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lgG5H-0005kY-2M for submit@debbugs.gnu.org; Mon, 10 May 2021 20:17:19 -0400 Received: from mail-wm1-f41.google.com ([209.85.128.41]:52806) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lgG5E-0005kK-Q7 for 48325@debbugs.gnu.org; Mon, 10 May 2021 20:17:09 -0400 Received: by mail-wm1-f41.google.com with SMTP id g65so10118934wmg.2 for <48325@debbugs.gnu.org>; Mon, 10 May 2021 17:17:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-transfer-encoding; bh=SsCevE61mv95Bz6OBp7vx6cTImYz7eXNs/EgAkQDzjs=; b=E3bFL3GBHvUToJIEc0vfk+5b3UaYv2bhY9w1dZLouuAY3UZoe6ofJ1wObFGYgi2yFs i+Xi+g1RPGdltoNH9hrXDO27Gnk9PAXZUmDRWd1zICw/FLuq5Gu/ub2GUvtBeDLqWvxy yO/bTr2b7ZVBIUF8gmRdWzrDrV/kYz7+ulHXslwK956Gdt/lo5B3aFgf6M1Zl/pY2OJC Yv8DownQLgx7IQ4R7ESxdtV5Qhfswn9nGv9m8r590xkfcrxy5Ad6bfeKoTGzViUscIDL ai1qiCqekYE/7fiB0tMrb+3VW7xfmzWmsg3oXGlJRHGZ4dWQ0AJNkIuWXdqDlKo/9f80 PBEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version:content-transfer-encoding; bh=SsCevE61mv95Bz6OBp7vx6cTImYz7eXNs/EgAkQDzjs=; b=A9AptZMFW0Wc92Dguzq1A4CYusli3t7CNYVVkosnPp/K2xtaM4xbbCYfDx5OU77xx+ pbseePLkqrwGAFnjyc5LXCXnDDD8Fav/qR38m9dnt6osG6x1BtTc/rHUv/BrzfVh7chG Z/UXh/k+LMdl4reJogMOc6gv7JeAt+18AwWg3NQbwfswaoA4v8OBiALkS0Il3x8K31pg EW9RaWvL+fp5tY+l6EFPvRJWvQaT9lOs3SMcSKzBk1rU1nOyoZQ+HzmvCQ9m5kcWFwdb e0B5ybI48arHUV3HY3ePS19hTEMjqK3BsrnfXlMcrofjGdQ+W7lww4HhE2pqmYJfZ5wo ziwA== X-Gm-Message-State: AOAM533jsYXxRr9rUmAB1NC0NGkdfHE+W684nREeVkbs+rkr1FrlK/E0 4SbiqhgZ1OGvmH21vR8ZQ1AnP7k1CjA= X-Google-Smtp-Source: ABdhPJzH9gyrwzZdYvF/Z3IiASTPFE79TSuOsffPpavn7BH+YJYYUtS798k6Ady3KE76MPEIG4zF2w== X-Received: by 2002:a05:600c:293:: with SMTP id 19mr29312271wmk.144.1620692222953; Mon, 10 May 2021 17:17:02 -0700 (PDT) Received: from lili ([2a01:e0a:59b:9120:65d2:2476:f637:db1e]) by smtp.gmail.com with ESMTPSA id g129sm1505668wmg.27.2021.05.10.17.17.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 May 2021 17:17:02 -0700 (PDT) From: zimoun References: <87bl9xqx5c.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> <87pmxzfth8.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> <87mtt3f4mp.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> Date: Tue, 11 May 2021 02:07:20 +0200 In-Reply-To: (Jean-Baptiste Volatier's message of "Mon, 10 May 2021 11:29:41 +0000") Message-ID: <86a6p22kw7.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1620692290; 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: content-transfer-encoding:content-transfer-encoding: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=SsCevE61mv95Bz6OBp7vx6cTImYz7eXNs/EgAkQDzjs=; b=euvl/LJ1GICLFP9y2FL14kSwwIXeSDROEM2GF7fD1d3mWvWuqzmnLU/1bqC3Z/4NOSs8ED +40OpKb84oPtFmqqJ+eJlXTfj0Cd6l/XaHwteYnQ/6/wvnVpq9+KQgJiFXh5d+naitoJYO Ubly1VQcBbd2N+095ruFkDVKj4x3BgWLwEtcuYKG6OLSzXYRi11uNQwgcxb9JaValCsqeP LR6XdXz3AW8NLpcQPNw5g2Ro1m3YoH8Y80CHHj8kifdhvgebbjXrVEKpkAz9m9K1NV/WCv 2ZHh2rghR0F71GzG+CxzM8Yo30aMAiuXDJ26wUus6lmPNQDmLH/fLBS5xH6lPg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1620692290; a=rsa-sha256; cv=none; b=FOw4PFua6VaVo4pGzuIOJj2Q8H/xqLLxTaIBtsskm+Yh2PR6Ik//oaYPNiy2d5GX1brg6S 0nbVpEHgksR+XAtpg0t3OfNJrFCbNUSiCPVMu1UmAcB2yXXLvdIEr3XcnEL6dlPjySS5f1 JuvnZkL24QI0ETnJjVyXPPCAf+aqa44+COi2o/QwtHJvb0bEW8kZai1l0QzSRLOimiUZH9 cg7aIa10v2K2uZ1t9AbVP0TTuvx08F5PhAZqw9aS+Y3/onOHUralPYbCuScyP7RHjYIbc/ mSeHBreKGn2C3L4KYaIdj4CZ2CFjY9b9VLxy3vgHYI1chXOBr5XFIsS6IUluTw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20161025 header.b=E3bFL3GB; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 0.15 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20161025 header.b=E3bFL3GB; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: F202216B86 X-Spam-Score: 0.15 X-Migadu-Scanner: scn0.migadu.com X-TUID: /vM3gDGUB6Sv Hi Jean-Baptiste, Thanks for the patch. Here some minor comments. On Mon, 10 May 2021 at 11:29, Jean-Baptiste Volatier wrote: > From e610dacab669ce84fe8f263a01aefff1fe49b6aa Mon Sep 17 00:00:00 2001 > From: Jean-Baptiste Volatier > Date: Mon, 10 May 2021 09:57:23 +0200 > Subject: [PATCH] gnu: julia: update to 1.6.1 > > gnu: openlibm: update to 0.7.4 > gnu: pcre2: update to 10.56 > gnu: utf8proc: update to 2.6.1 > gnu: julia-benchmarktools: update to 0.7.0 Please, split this patch. One per update, i.e., 5 patches I guess. > diff --git a/gnu/packages/julia.scm b/gnu/packages/julia.scm > index 13c9f7baf1..39627eeed0 100644 > --- a/gnu/packages/julia.scm > +++ b/gnu/packages/julia.scm > @@ -1,9 +1,10 @@ > ;;; GNU Guix --- Functional package management for GNU > ;;; Copyright =C2=A9 2015, 2016, 2017 Ricardo Wurmus > ;;; Copyright =C2=A9 2016, 2020 Efraim Flashner > -;;; Copyright =C2=A9 2020 Nicol=C3=B2 Balzarotti > +;;; Copyright =C2=A9 2020, 2021 Nicol=C3=B2 Balzarotti Just to be sure, if Nicol=C3=B3 is co-author, it should be worth to add them in the commit message, something like: Co-Authored-By: Nicol=C3=B2 Balzarotti . > - (source (origin > - (inherit (package-source llvm-9)) > - ;; Those patches are inside the Julia source repo. > - ;; They are _not_ Julia specific (https://github.com/julia= lang/julia#llvm) > - ;; but they are required to build Julia. > - ;; Discussion: https://bugs.debian.org/cgi-bin/bugreport.c= gi?bug=3D919628 > - (patches > - (map (match-lambda > - ((name hash) > - (julia-patch name hash))) > - (list > - '("llvm-D27629-AArch64-large_model_6.0.1" > - "1qrshmlqvnasdyc158vfn3hnbigqph3lsq7acb9w8lwkpnnm= 2j4z") > - '("llvm8-D34078-vectorize-fdiv" > - "19spqc3xsazn1xs9gpcgv9ldadfkv49rmc5khl7sf1dlmhgi= 4602") > - '("llvm-7.0-D44650" > - "1h55kkmkiisfj6sk956if2bcj9s0v6n5czn8dxb870vp5ncc= j3ir") > - '("llvm9-D50010-VNCoercion-ni" > - "1s1d3sjsiq4vxg7ncy5cz56zgy5vcq6ls3iqaiqkvr23wyry= qmdx") > - '("llvm-exegesis-mingw" > - "0ph1cj1j7arvf1xq2xcr7qf9g0cpdl14fincgr67vpi520zv= d3vp") > - '("llvm-test-plugin-mingw" > - "12z738cnahbf6n381im7i0hxp1m6k9hrnfjlmq9sac46nxly= 9gnj") > - '("llvm7-revert-D44485" > - "0f59kq3p3mpwsbmskypbi4zn01l6ig0x7v2rjp08k2r8z8m6= fa8n") > - '("llvm-8.0-D66657-codegen-degenerate" > - "1n1ddx19h90bbpimdyd9dh8fsm6gb93xxyqm4ljkxa1k3cx2= vm72") > - '("llvm-8.0-D71495-vectorize-freduce" > - "1zff08wvji9lnpskk4b3p5zyjsy5hhy23ynxjqlj9dw7jvvf= rf0p") > - '("llvm-D75072-SCEV-add-type" > - "029a3fywsm233vf48mscina24idd50dc75wr70lmimrhwnw2= 7p0z") > - '("llvm-9.0-D65174-limit-merge-stores" > - "04bff1mnblfj9mxfdwr1qdnw3i3szmp60gnhxwas5y68qg33= z6j0") > - '("llvm9-D71443-PPC-MC-redef-symbol" > - "1c93nv7rgc9jg5mqrnvv08xib1789qvlql94fwggh18mp3b9= hbgy") > - '("llvm-9.0-D78196" > - "08a43hyg7yyqjq2vmfsmppf34xcz60wq6y9zw5fdyhw2h1mc= nmns") > - '("llvm-julia-tsan-custom-as" > - "0awh40kf6lm4wn1nsjd1bmhfwq7rqj811szanp2xkpspykw9= hg9s") > - '("llvm-9.0-D85499" > - "0vxlr35srvbvihlgrxq15v6dylp90vgi0qahj22j01jgqmda= sjkm")))) > - (patch-flags '("-p1")))) > (arguments > - (substitute-keyword-arguments (package-arguments llvm-9) > + (substitute-keyword-arguments (package-arguments llvm-11) > ((#:configure-flags flags) > `(list ;; Taken from NixOS. Only way I could get libLLVM-6.0.so > "-DCMAKE_BUILD_TYPE=3DRelease" > @@ -177,7 +140,61 @@ > ;; "-DLLVM_DEFAULT_TARGET_TRIPLE=3D${stdenv.hostPlatform.conf= ig}" > ;; "-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=3DWebAssembly" > "-DLLVM_ENABLE_DUMP=3DON" > - "-DLLVM_LINK_LLVM_DYLIB=3DON")))))) > + "-DLLVM_LINK_LLVM_DYLIB=3DON")) > + ((#:phases phases) > + `(modify-phases ,phases > + ;; applying patches from julia > + ;; list of patches can be found in deps/llvm.mk in julia sour= ce > + (add-after 'unpack 'julia-patches > + (lambda* (#:key inputs outputs #:allow-other-keys) > + (let ((patch > + (lambda (patchname flag) > + (invoke "patch" flag "-i" > + (string-append > + "julia-src/deps/patches/" > + patchname > + ".patch"))))) > + (mkdir-p "julia-src") > + (invoke "tar" "xf" > + (assoc-ref inputs "julia-source") > + "-C" "julia-src" "--strip-components=3D1") > + (map (lambda (patchname) > + (patch patchname "-p1")) > + (list "llvm-D27629-AArch64-large_model_6.0.1" > + "llvm8-D34078-vectorize-fdiv" > + "llvm-7.0-D44650" > + "llvm-6.0-DISABLE_ABI_CHECKS" > + "llvm9-D50010-VNCoercion-ni" > + "llvm7-revert-D44485" > + "llvm-11-D75072-SCEV-add-type" > + "llvm-julia-tsan-custom-as" > + "llvm-D80101" > + "llvm-D84031" > + "llvm-10-D85553" > + "llvm-10-unique_function_clang-sa" > + "llvm-11-D85313-debuginfo-empty-arange" > + "llvm-11-D90722-rtdyld-absolute-relocs" > + "llvm-invalid-addrspacecast-sink" > + "llvm-11-D92906-ppc-setjmp" > + "llvm-11-PR48458-X86ISelDAGToDAG" > + "llvm-11-D93092-ppc-knownbits" > + "llvm-11-D93154-globalisel-as" > + "llvm-11-ppc-half-ctr" > + "llvm-11-ppc-sp-from-bp" > + "llvm-rGb498303066a6-gcc11-header-fix" > + "llvm-11-D94813-mergeicmps" > + "llvm-11-D94980-CTR-half" > + "llvm-11-D94058-sext-atomic-ops" > + "llvm-11-D96283-dagcombine-half")) > + (map (lambda (patchname) > + (patch patchname "-p2")) > + (list "llvm-11-AArch64-FastIsel-bug" > + "llvm-11-D97435-AArch64-movaddrreg" > + "llvm-11-D97571-AArch64-loh" > + "llvm-11-aarch64-addrspace"))))))))) I am not convinced by this move of patches from =E2=80=99source=E2=80=99 to= =E2=80=99phases=E2=80=99. My understanding about the usual way is to let the patch in the source field. Is this move motivated by something special? > - '("arpack-ng" "curl" "dsfmt" I have not read the Julia ChangeLog. Do they remove Arpack? This should be mentioned in the commit message. > + '("curl" "dsfmt" > "gmp" "lapack" > - "libssh2" "libgit2" > + "libssh2" "libnghttp2" "libgit2" Idem for libnghttp2. > "mbedtls" "mpfr" > "openblas" "openlibm" "pcre2" > - "suitesparse")) > - ":")) > - #t)) > + "suitesparse" "libfortran")) Idem for libfortran. > - (add-before 'build 'fix-precompile > - (lambda _ > - (substitute* "base/loading.jl" > - (("something(Base.active_project(), \"\")") "\"\"")) > + (add-before 'build 'shared-objects-paths > + (lambda* (#:key inputs #:allow-other-keys) [...] > + ;; FAILING: OpenBLAS What does it mean? > + (add-before 'install 'symlink-libraries [...] > + (link "zlib" "usr/lib/julia/" "libz\\.so") Does this fix ? If yes, cool and thank you! :-) So it should be mentioned in the commit message, something like: --8<---------------cut here---------------start------------->8--- * gnu: julia: Update to 1.6.1. Fixes . * gnu/packages/julia.scm (julia): Update to 1.6.1. [arguments]: =E2=80=A6stuff that changed=E2=80=A6 [inputs]: Add foo, Remove bar. Co-Authored-By: Nicol=C3=B2 Balzarotti . --8<---------------cut here---------------end--------------->8--- Does it make sense? > - "USE_SYSTEM_ARPACK=3D1" What is the motivation for removing Arpack? Sorry if my question is naive. > "USE_SYSTEM_LIBGIT2=3D1" > "USE_SYSTEM_ZLIB=3D1"))) > (inputs > `(("llvm" ,llvm-julia) > ("p7zip" ,p7zip) > - ;; The bundled version is 3.3.0 so stick to that version. With o= ther > - ;; versions, we get test failures in 'linalg/arnoldi' as describe= d in > - ;; . > - ("arpack-ng" ,arpack-ng-3.3.0) > - > - ("coreutils" ,coreutils) ;for bindings to "mkdir" and the like > + ("coreutils" ,coreutils) ;for bindings to "mkdir" and the= like This is not a change. Even if the new indentation is correct, please let avoid cosmetic change in the same commit updating a complex package. Because then digging in the history becomes more complex. :-) > ("lapack" ,lapack) > - ("openblas" ,openblas) ;Julia does not build with Atlas > + ("openblas" ,openblas) ;Julia does not build with Atlas Idem. > ("libunwind" ,libunwind-julia) > ("openlibm" ,openlibm) > ("mbedtls" ,mbedtls-apache) > ("curl" ,curl) > - ("libgit2" ,libgit2-0.28) > + ("libnghttp2" ,nghttp2 "lib") > + ("libgit2" ,libgit2) > ("libssh2" ,libssh2) > ("fortran" ,gfortran) > + ;; required for libgcc_s.so > + ("libfortran" ,gfortran "lib") > ("libuv" ,libuv-julia) > ("pcre2" ,pcre2) > ("utf8proc" ,utf8proc) > ("mpfr" ,mpfr) > + ("nss-certs" ,nss-certs) ; required to precompile Hum? Is it really necessary? > + ("glibc-locales" ,glibc-locales) Idem. Is it really necessary? Because it is a =E2=80=9Cbig=E2=80=9C packa= ges which drastically increases the closure size of the Julia package. Thanks again for the patch. Cheers, simon