From patchwork Sat Sep 16 10:55:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 53956 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 49F6B27BBE2; Sat, 16 Sep 2023 11:56:23 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, 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 0777127BBE9 for ; Sat, 16 Sep 2023 11:56:22 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qhSxx-0004QU-FH; Sat, 16 Sep 2023 06:55:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qhSxw-0004QC-5E for guix-patches@gnu.org; Sat, 16 Sep 2023 06:55:56 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qhSxv-000058-TJ for guix-patches@gnu.org; Sat, 16 Sep 2023 06:55:55 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qhSy2-00050W-Rd for guix-patches@gnu.org; Sat, 16 Sep 2023 06:56:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66030] [PATCH 2/2] gnu: julia: Conditionally use openblas with ILP64 support. Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 16 Sep 2023 10:56:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66030 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66030@debbugs.gnu.org Cc: Efraim Flashner , Simon Tournier Received: via spool by 66030-submit@debbugs.gnu.org id=B66030.169486173119200 (code B ref 66030); Sat, 16 Sep 2023 10:56:02 +0000 Received: (at 66030) by debbugs.gnu.org; 16 Sep 2023 10:55:31 +0000 Received: from localhost ([127.0.0.1]:45517 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhSxW-0004zW-Bv for submit@debbugs.gnu.org; Sat, 16 Sep 2023 06:55:30 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:40013) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhSxQ-0004z7-JY for 66030@debbugs.gnu.org; Sat, 16 Sep 2023 06:55:25 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-40471c054f9so7866565e9.0 for <66030@debbugs.gnu.org>; Sat, 16 Sep 2023 03:55:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1694861712; x=1695466512; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=uSnoEmNFwBvT0GRGBykD/LakiKM3JbQSWS9i2t5st+8=; b=FCbHExF3i+ixwSOCQl0ZQwVfb+LzZC90voTfLdl1ZH98bkBrejUmzd+nF2qkaLT37Y +3aOn2UKws6OELAl0QVy5dVO/qq96pSNGlpOWDjnANqCNpjnVSYr5C/O8v5FkeVypoBh aWX+D2zq7/Qds8mNxhUael8ebebGwfgEDwJvhQOvZ9LAp0Uh1Zlt8DVBH/kwPDUeL2Tw GzdWjpZyJtoS7rXvIYeeIzfzSxuKvssvmaBqZt5bCnh8mRndEshg83kw4RYzgxXMrgzR sZxOoLxxwL6dIuLRLn5Vhv8BSqBnZvXjiJXFDFl0ThCSGL1Mz0/LZQKANaprdKd8WFPT BNgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694861712; x=1695466512; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=uSnoEmNFwBvT0GRGBykD/LakiKM3JbQSWS9i2t5st+8=; b=QYAPbGAxgF/rNOnBlEasPdtZHtmDHZ73N95nhKUI2WKIcSmhtifs3voH8qf9Y0BhqY g8rcSMFLfU915i2ApjAydkk0k4W9b69Z4c/MoIT5lNUKx4sSBFP+EaJ+gj0jnwf7naJR PqNcs/FzdB2gV4KPmKjjp0Cbbo4Uvzsrmm8skG3M3B1u+sLBfGsS2LbhpCJauUiZDGOo V+LEtNspY6x/4oHOSgiweW3jCG045dxjc6mD/FATvLTiw1UGebsjlkUYQsX0AeLDYF4b EhyNOPCoBJ/HK592B8iqtg85C/dcfgTZCaySTTlEjwmZPPi5D6bRWbubhuda80gfuP7t kHSw== X-Gm-Message-State: AOJu0YwAuqOt5TTHSyTdwKjGQnU4k6YOr9cAAqK0jxKUMS0Ncj1zMfBA b3yFQlu9ZyGP0Bhg72Avdr7A/p+4ta0= X-Google-Smtp-Source: AGHT+IFW7pWcy4KPox/fbxx3MaUeCR/5CsWDdFVJ4biSyct2Twpz8EUz2BwPT6/4TOfKRnl3JwBrgA== X-Received: by 2002:adf:fdcf:0:b0:319:7624:4c8d with SMTP id i15-20020adffdcf000000b0031976244c8dmr3091506wrs.0.1694861711626; Sat, 16 Sep 2023 03:55:11 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id g14-20020a5d698e000000b0031759e6b43fsm6888656wru.39.2023.09.16.03.55.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 Sep 2023 03:55:11 -0700 (PDT) From: Simon Tournier Date: Sat, 16 Sep 2023 12:55:03 +0200 Message-Id: <7f2347d8e64562e1de563cf1e4cdfd192e81a9df.1694859477.git.zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Efraim Flashner Fixes . Reported by Cayetano Santos . * gnu/packages/julia.scm (julia)[arguments]<#:phases>: Conditionally use OpenBLAS with ILP64 support for x86-64 target. <#:make-flags>: Likewise. [inputs]: Conditionally replace openblas by openblas-ilp64 for x86-64 target. Co-authored-by: Simon Tournier --- gnu/packages/julia.scm | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/gnu/packages/julia.scm b/gnu/packages/julia.scm index ba541758223e..8ba2b480ce55 100644 --- a/gnu/packages/julia.scm +++ b/gnu/packages/julia.scm @@ -269,7 +269,10 @@ (define-public julia (substitute* (jlpath "nghttp2") (((from "libnghttp2")) (to "libnghttp2" "libnghttp2"))) (substitute* (jlpath "OpenBLAS") - (((from "libopenblas")) (to "openblas" "libopenblas"))) + (((from "libopenblas")) + ,@(if (target-x86-64?) + `((to "openblas" "libopenblas64_" "libopenblas")) + `((to "openblas" "libopenblas"))))) (substitute* (jlpath "OpenLibm") (((from "libopenlibm")) (to "openlibm" "libopenlibm"))) (substitute* (jlpath "PCRE2") @@ -479,12 +482,13 @@ (define-public julia "NO_GIT=1" ; build from release tarball. "USE_GPL_LIBS=1" ; proudly - ,@(if (target-aarch64?) - `("USE_BLAS64=0") - '()) - - "LIBBLAS=-lopenblas" - "LIBBLASNAME=libopenblas" + ,@(if (target-x86-64?) + `("USE_BLAS64=1" + "LIBBLAS=-lopenblas64_" + "LIBBLASNAME=libopenblas64_") + `("USE_BLAS64=0" + "LIBBLAS=-lopenblas" + "LIBBLASNAME=libopenblas")) (string-append "UTF8PROC_INC=" (assoc-ref %build-inputs "utf8proc") @@ -513,7 +517,9 @@ (define-public julia ("llvm" ,llvm-julia) ("mbedtls-apache" ,mbedtls-apache) ("mpfr" ,mpfr) - ("openblas" ,openblas) + ,@(if (target-x86-64?) + `(("openblas" ,openblas-ilp64)) + `(("openblas" ,openblas))) ("openlibm" ,openlibm) ("p7zip" ,p7zip) ("pcre2" ,pcre2)