From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:403:4789::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id aNjBL7foBmWsPwEA9RJhRA:P1 (envelope-from ) for ; Sun, 17 Sep 2023 13:53:27 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:4789::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id aNjBL7foBmWsPwEA9RJhRA (envelope-from ) for ; Sun, 17 Sep 2023 13:53:27 +0200 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 69C6144FB8 for ; Sun, 17 Sep 2023 13:53:27 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=InHZvCoM; 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"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1694951607; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: 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=uSnoEmNFwBvT0GRGBykD/LakiKM3JbQSWS9i2t5st+8=; b=Rb3+0M4LXU+BU5BcvXot/2jov7xNV/2NeFG6H/JzAz2/0bFbEA3dV8mm9pYM2a6kSMMvZg vsoHO+n3u1YiNkTkgPya8I+B9yaa8arDx+EAr1jjU8gIXRwnBNR7hloOx8bWkZJ1bC9yR8 rpO0YV1Dp7h+h2+1czNJcg0izHt34PA4Je5UO2arYe6A2/XVqXdWO2QySVZIbNYXN9x/a+ ZIfdWH0hcli8ZulxdLWKTuo7WX7Vm3KYbj1lINyzOlL/xxsd3nS/0ury+yXVJFF243+JHY rCXiV+VEbrxcQUEspI8BBgkxGjgL/5EgHsXXQ8r8QzVfw7C3nnocyQR9lPV2aw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=InHZvCoM; 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"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1694951607; a=rsa-sha256; cv=none; b=BW5gf9WIhjrUaDuzfaN7EKtD5++dLfljcJ8vnE+4Ctes9gHhdTtxXXeoxY3kCnGVLxdLqI Yphda8ThdAw6D9wM7yhPMpj9kHke6/aLj/dnDEXGFASbItefqn7QbKF4jE6+h5YTinQ4gr 2gExIBgkl3QgF/Z1+GNrHJbLY9t+HHboWhLva9z5yv8Xbt0G+D3m1FtZA+b0eoHkAQn8Zl 9sygMw5Ul9S4bs73UoRTTMe1swuIFEpyNeVIYp1cOi2eFQESIejHzYoO9P7tsKDjvmio9M 6xaB9E4rra2dHq3fKISxniSYfCN72HdGTIqZ4iSUiTxgIt5RquO/Xq/ZBz2tvg== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qhqKf-0000qK-Pw; Sun, 17 Sep 2023 07:52: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 1qhqKe-0000q1-EO for guix-patches@gnu.org; Sun, 17 Sep 2023 07:52: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 1qhqKe-0007Sw-5h for guix-patches@gnu.org; Sun, 17 Sep 2023 07:52:56 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qhqKl-00067n-Ng for guix-patches@gnu.org; Sun, 17 Sep 2023 07:53:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66030] [PATCH v2 2/3] gnu: julia: Conditionally use openblas with ILP64 support. Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 17 Sep 2023 11:53:03 +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.169495157923519 (code B ref 66030); Sun, 17 Sep 2023 11:53:03 +0000 Received: (at 66030) by debbugs.gnu.org; 17 Sep 2023 11:52:59 +0000 Received: from localhost ([127.0.0.1]:49265 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhqKh-00067E-C8 for submit@debbugs.gnu.org; Sun, 17 Sep 2023 07:52:59 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:40304) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhqKX-00066U-VS for 66030@debbugs.gnu.org; Sun, 17 Sep 2023 07:52:53 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-4046f7d49a9so10740565e9.1 for <66030@debbugs.gnu.org>; Sun, 17 Sep 2023 04:52:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1694951556; x=1695556356; 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=InHZvCoMqupR4cwrDFqNlc5wa886PaXox+/8up6PuTHInUtwYWi4tCseQ+Y99AYG57 6oqt2ev1qZ8/gZUnIxwMxP/lhUdBZfN4YDQAgVlR1UH+m3G0npaZCRPullx9SZPrxoLF AN571o3JIsRSnWFBzXxWEn6QpjdcsGczdVJ+NWpCc7XIAPM2vMDh5XRDzKf7Bij9g8OG UJUxqkcbzYhrv0Gu8NObM76e2+/h18jtEC8A3WAEa1NadkMw4YbahC0zRctjk81v11ix ztqX0MJN3+6101celvbIew5BSA6uJ2pp6SHkmONnS9iwGEBZzmx9eiMJxcbxGNcSeO9q 6NqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694951556; x=1695556356; 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=Q2BM9XawxrE+yGfZGkQPX8U8VObg4mhXtsNHQSH0W4ORma+Z/yiESTEKi+nMUPp7w8 qPBOhJERTItsQnXa97vWVXxXd22fD58J70iqrGOiE/y6FOKqR3GB9XmJNvWeZLbB+Be4 mB6euhHcLgC/Kydt2cmRq6cVYTAFtVLSk4QodENyYJXUs1kWluNaWqbsX/R0xUsQPADq vKkLaK0WBRLotkYIpnyY6gM/FgvcB2IpCxCNVlrkYD7sMjfN+qeSRxmrKqFLsx4NWmoS 6rqdBAxRgkwseCTG68d+Ciq0lnKFN4kv9Ks2UjOTOir8TPSHihubcCpQXJimRFToojM7 Ni4w== X-Gm-Message-State: AOJu0Yzhu+yAUAxhtkaNiMejlM6FqpsseXYDQBJreTANeA05JdZgc9Za FZPFQThmHpmMb36Y7S9WQ0rJ0L/3Tsg= X-Google-Smtp-Source: AGHT+IEzI26R/1Lbxn+jP0bo543vlC42XlXLuVxePTGo9IoPx3V4kW26DQ11N03OE7mXOi/cbMVDSw== X-Received: by 2002:adf:ecc7:0:b0:31f:899b:a47 with SMTP id s7-20020adfecc7000000b0031f899b0a47mr5173514wro.4.1694951556508; Sun, 17 Sep 2023 04:52:36 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id ci8-20020a5d5d88000000b0031fedb25b85sm7321398wrb.84.2023.09.17.04.52.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Sep 2023 04:52:36 -0700 (PDT) From: Simon Tournier Date: Sun, 17 Sep 2023 13:52:27 +0200 Message-Id: <47e7e9f130ea7c7a8065e9b7a9b499d23c553929.1694951428.git.zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Scanner: mx1.migadu.com X-Migadu-Spam-Score: 0.19 X-Spam-Score: 0.19 X-Migadu-Queue-Id: 69C6144FB8 X-TUID: QgqwaW78yp0D 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) -- 2.38.1