From patchwork Mon May 10 07:07:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Nicol=C3=B2_Balzarotti?= X-Patchwork-Id: 29233 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 B0E2427BC81; Mon, 10 May 2021 08:09:20 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0614627BC82 for ; Mon, 10 May 2021 08:09:20 +0100 (BST) Received: from localhost ([::1]:47436 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lg02Z-0007BE-6m for patchwork@mira.cbaines.net; Mon, 10 May 2021 03:09:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35272) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lg02I-0007AU-Dz for guix-patches@gnu.org; Mon, 10 May 2021 03:09:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45672) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lg02I-0004h5-6T for guix-patches@gnu.org; Mon, 10 May 2021 03:09:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lg02H-0003V7-Vi for guix-patches@gnu.org; Mon, 10 May 2021 03:09:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48325] julia-1.6 guix Resent-From: =?utf-8?q?Nicol=C3=B2?= Balzarotti Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 10 May 2021 07:09: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 Received: via spool by 48325-submit@debbugs.gnu.org id=B48325.162063048913377 (code B ref 48325); Mon, 10 May 2021 07:09:01 +0000 Received: (at 48325) by debbugs.gnu.org; 10 May 2021 07:08:09 +0000 Received: from localhost ([127.0.0.1]:57217 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lg01Q-0003Th-BA for submit@debbugs.gnu.org; Mon, 10 May 2021 03:08:08 -0400 Received: from mail-ej1-f49.google.com ([209.85.218.49]:35563) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lg01N-0003TB-TE for 48325@debbugs.gnu.org; Mon, 10 May 2021 03:08:07 -0400 Received: by mail-ej1-f49.google.com with SMTP id m12so22918259eja.2 for <48325@debbugs.gnu.org>; Mon, 10 May 2021 00:08:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:in-reply-to:references:date:message-id :mime-version; bh=mHBpqZZU/QfbRnjojxOy64JAY1wxLqiQtz01WJvcBoM=; b=eGdqe3kVFDXGRcQMsXXiB9MKgvdcfUOOtk/0YQFcUPkM8Tao29jUISyfFg7Mutnf+7 aR2N2To65WHs2lIbAg8jT+HWVmKrYJaAZem5y56705j98wQSjhH+e8+aiz/4iKZ2X6n/ 9XaML3M4qQsiM7gzaW3Z6y+7OpnuSDF2EirLrddzzGwLeJzAr8102fp677SKKgs2LlEm PbG/w/qIoOF687JbZhHvZoqOvZ05CWbv4yqcQ4XkaVIta1ZndytbrsShqRN1DwLgr9gq 7a6SwFGFXpw9+fGYyHBaoJ3SkbUzuWMi0WKpTkeEWRmKQPd31GDJsg3FupYClskHTohH 0Zvg== 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:in-reply-to:references:date :message-id:mime-version; bh=mHBpqZZU/QfbRnjojxOy64JAY1wxLqiQtz01WJvcBoM=; b=TWp3PkLYLX4WJnAX3cptqBCoUsLKTXdRzwy6z93NQvoXpTplPIniCLBbTLr8y6UsAs wcGTlqgsqBSMsJsIujRZcnFgQgo+akeAelwS2OOLfHQvvA2p9Q9TQH9tzFXsZbQQbmkj LtdvGi6fGLOJzq0w1MqyhpjrYHdndB8qfqMMJEOCCwSjMrLB5h+VRwGZDvxAwEuhX/ZU jQ8NA8LaESzVDYGfTGSjXWxFDVAVxpbEIMBPfJG3mHItiCrZUOMikJ569UtRptxK3FuE WSXs4+2piCX9/+4g7MdbD9dJYhW3Q+yJ2IJovLcSuTDr3i9+IMUE2Im15nB06Mdv5J5K 2ehw== X-Gm-Message-State: AOAM5304qaSy/YdHHDyx1kvoAGdaaokF3TteQy7okfbrYChI5WvsZu1t KQ29jYRSeAiz1IWyjoOsgv+TFCk9Pfg= X-Google-Smtp-Source: ABdhPJzMWCOJCh1z6M8shGPX7kDHEsRg++zWyaeQ0GaO87YduxIeZi4unIYnTPH7djNyc3ZcAk3qcQ== X-Received: by 2002:a17:906:a2d1:: with SMTP id by17mr25175217ejb.426.1620630480136; Mon, 10 May 2021 00:08:00 -0700 (PDT) Received: from guixSD (host-79-17-142-89.retail.telecomitalia.it. [79.17.142.89]) by smtp.gmail.com with ESMTPSA id h4sm9321549edv.97.2021.05.10.00.07.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 May 2021 00:07:59 -0700 (PDT) From: =?utf-8?q?Nicol=C3=B2?= Balzarotti In-Reply-To: <87pmxzfth8.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> 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> Date: Mon, 10 May 2021 09:07:58 +0200 Message-ID: <87mtt3f4mp.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> 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 I'll forward here the review I sent you privately. I want to add that it built ok. I tried building but julia-benchmarktools and julia-staticarrays are failing. Version 0.7.0 works fine and should work both on 1.6 (tested) and 1.5 (untested) [fn:1] so we should apply it before the julia update. I tried updating StaticArrays, but the build still fails. I opened a bug report here [fn:2]. I attached here the patch, if you can please apply it before yours, apply my suggestions and send the updated patch [fn:1] https://github.com/JuliaCI/BenchmarkTools.jl/blob/e058ff249215671c196f2c24a0a3f401de27b718/test/TrialsTests.jl#L217 [fn:2] https://github.com/JuliaArrays/StaticArrays.jl/issues/912 Nicolò Balzarotti writes: > seems to be ok (applied fine). A few notes about the patch > > [...] >> `(list ;; Taken from NixOS. Only way I could get libLLVM-6.0.so >> - "-DCMAKE_BUILD_TYPE=Release" >> + "-DCMAKE_BUILD_TYPE=Release" >> + >> + ;; Build a native compiler and the NVPTX backend (NVIDIA) since >> + ;; Julia insists on it, nothing more. This reduces build times and >> + ;; disk usage. >> + ,(string-append "-DLLVM_TARGETS_TO_BUILD=" (system->llvm-target)) >> + "-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=NVPTX" >> >> - ;; Build a native compiler and the NVPTX backend (NVIDIA) since >> - ;; Julia insists on it, nothing more. This reduces build times and >> - ;; disk usage. >> - ,(string-append "-DLLVM_TARGETS_TO_BUILD=" (system->llvm-target)) >> - "-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=NVPTX" > Here it's difficult to see if there are changes, you should undo the > indent edit. If indentation is wrong, it should be fixed in a separate commit. > >> + ;; "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" >> + ;; "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" >> + ;; "-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly" > Those seems to be taken from nixos, but is there a reason why are those > commented? > >> + (invoke "patch" flag "-i" (string-append >> "julia-src/deps/patches/" patchname ".patch"))))) > Line too long > >> + (mkdir-p "julia-src") >> + (invoke "tar" "xf" (assoc-ref inputs "julia-source") >> "-C" "julia-src" "--strip-components=1") > DITTO > >> + (map (lambda (patchname) >> + (patch patchname "-p1")) (list >> "llvm-D27629-AArch64-large_model_6.0.1" > Here we can slpit the line before (list > >> >> - "-DLLVM_LINK_LLVM_DYLIB=ON")))))) >> + #t))))))) > Returning #t should not be needed anymore > >> + (inputs >> + `(("julia-source" ,(package-source julia)) >> + ,@(package-inputs llvm-11))))) >> >> - "suitesparse")) >> + "suitesparse" "libfortran")) >> ":")) >> #t)) > We can remove this #t now > >> + (string-append "stdlib/" pkgname "_jll/src/" >> pkgname "_jll.jl"))) > Long line >> + (lambda* (#:key inputs #:allow-other-keys) >> + ;; some tests execute julia in an environment that needs >> to propagate GUIX_LOCPATH > Good catch, I was wondering which ENV variable was needed > >> + (substitute* "test/cmdlineargs.jl" >> + (("\"HOME\"\\s=>\\shomedir\\(\\)") "\"HOME\" => >> homedir(), \"GUIX_LOCPATH\" => ENV[\"GUIX_LOCPATH\"]")) >> #t)) > again, long line and #t >> + (add-before 'install 'symlink-libraries ;; FIXME change >> build to install > What does this comment refer to? >> (string-append "prefix=" (assoc-ref %outputs "out")) >> >> - ;; Passing the MARCH flag is necessary to build binary substitutes for >> - ;; the supported architectures. >> - ,(match (or (%current-target-system) >> - (%current-system)) >> - ("x86_64-linux" "MARCH=x86-64") >> - ("i686-linux" "MARCH=pentium4") >> - ("aarch64-linux" "MARCH=armv8-a") >> - ;; Prevent errors when querying this package on unsupported >> - ;; platforms, e.g. when running "guix package --search=" >> - (_ "MARCH=UNSUPPORTED")) >> + ;; Passing the MARCH flag is necessary to build binary substitutes for >> + ;; the supported architectures. >> + ,(match (or (%current-target-system) >> + (%current-system)) >> + ("x86_64-linux" "MARCH=x86-64") >> + ("i686-linux" "MARCH=pentium4") >> + ("aarch64-linux" "MARCH=armv8-a") >> + ;; Prevent errors when querying this package on unsupported >> + ;; platforms, e.g. when running "guix package --search=" >> + (_ "MARCH=UNSUPPORTED")) >> > Again the indentation stuff > > From 1376c9103b315492b123eeea1ffc93f81163a809 Mon Sep 17 00:00:00 2001 From: nixo Date: Mon, 10 May 2021 08:55:16 +0200 Subject: [PATCH] gnu: julia-benchmarktools: Update to 0.7.0. * gnu/packages/julia-xyz.scm (julia-benchmarktools): Update to 0.7.0. --- gnu/packages/julia-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index 9812162ce1..04eddbd8b2 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -76,7 +76,7 @@ be GPU compatible without throwing away the wrapper.") (define-public julia-benchmarktools (package (name "julia-benchmarktools") - (version "0.5.0") + (version "0.7.0") (source (origin (method git-fetch) @@ -85,7 +85,7 @@ be GPU compatible without throwing away the wrapper.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0nsx21m3i5h22lkgyrmfj6r085va6ag40khwssqs8y7l0wz98lvp")))) + (base32 "000izw9pj7cbh9r35nnwg2ijkb9dpfd5nkl2889b8b2dpsh4fi63")))) (build-system julia-build-system) (propagated-inputs `(("julia-json" ,julia-json))) (home-page "https://github.com/JuliaCI/BenchmarkTools.jl") -- 2.31.1