From patchwork Sun Sep 17 19:12:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 53999 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 0890A27BBEB; Sun, 17 Sep 2023 20:14:15 +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=ham 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 7856327BBE9 for ; Sun, 17 Sep 2023 20:14:14 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qhxDR-0002W7-3Q; Sun, 17 Sep 2023 15:13: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 1qhxDP-0002V2-6v for guix-patches@gnu.org; Sun, 17 Sep 2023 15:13:55 -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 1qhxDO-0007B3-VN for guix-patches@gnu.org; Sun, 17 Sep 2023 15:13:54 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qhxDW-0000zu-Fz for guix-patches@gnu.org; Sun, 17 Sep 2023 15:14:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66030] [PATCH v3 2/6] 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 19:14: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.16949779893711 (code B ref 66030); Sun, 17 Sep 2023 19:14:02 +0000 Received: (at 66030) by debbugs.gnu.org; 17 Sep 2023 19:13:09 +0000 Received: from localhost ([127.0.0.1]:51448 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhxCf-0000xg-2s for submit@debbugs.gnu.org; Sun, 17 Sep 2023 15:13:09 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:40354) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhxCc-0000wg-9O for 66030@debbugs.gnu.org; Sun, 17 Sep 2023 15:13:07 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-4046f7d49a9so11603145e9.1 for <66030@debbugs.gnu.org>; Sun, 17 Sep 2023 12:12:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1694977972; x=1695582772; 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=SKwG6Ee1Rdw3c+bGAttMV9g09r+w7vih0qULsmKDkprPkx/cNYgJTJET1BxZOWyvvJ l0kTkt2mWIyKauzC1CoE4mBwcXvUjp6j/T5xfVR5QrXpr7r7MYah6JI6uPZvL6v5IAgd 3ZfwLG4FL/DkxNPfGHbUW/5YvQcHG8dZR1jdFcIZx3jjLn8f3XwDfFj27+1BnSPZtEJC ZZt/KC5YS7VToMn3cpzsJDDxfZCpre8dfeHsI7pntTSRpY1m1sV8G2m2oKtvmhTLo9tb QbGZInEyZMqBMRKoXLLpTruzTmrnL+d0hyirbpU0GD5e4CGQDWNel6zs6XGePqlg0Bok JVgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694977972; x=1695582772; 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=QuH2umNX05hYMeILa88kaH2I2BtAGyTExk5RQnFF5kHBxc/Z4Wr5OzWP95B4Qn2Mf4 45FCnPwkhE6urgrxvLDB8zxX1douP05SbKygamlmKKyBMjbfpEWaf8jIb99HZkUPUOFI /4T9pMAdAuFE7eHkx+YVjSBNm56urPIfdwcTPfmdQrpF763+6dkzOy/8Ev8vHmHqERDa 5HPKiSqukSGUzfvQZPqrA9zVrU9vHvu/BIxVTeQYdQB0TrwyX8GM7+EDVOQJrLKyt7y2 u+x3PksUYAqpqpzhUhw50c8uKY7qPsZ2d/3cMaJz9RVoFPH2V5O/PXaJLdRczRL2taPL Kodw== X-Gm-Message-State: AOJu0YxrSw0b+c8Vh0BZwRK9L5wflOsyX0wroczZ24rkLP6Kl1X6nE3y FNYWBp/VYIl6kFaqy777ZiEge9K/iLg= X-Google-Smtp-Source: AGHT+IEGI0wRKNpDaAGerJitGUmgE1f5XsMFSoEznMBKeFOT4ym+6RrJIWcz4oO89ShmnnQLOozq9w== X-Received: by 2002:adf:ef88:0:b0:317:3d36:b2c1 with SMTP id d8-20020adfef88000000b003173d36b2c1mr5903883wro.7.1694977972419; Sun, 17 Sep 2023 12:12:52 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id r6-20020a5d4e46000000b003198a9d758dsm10416451wrt.78.2023.09.17.12.12.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Sep 2023 12:12:51 -0700 (PDT) From: Simon Tournier Date: Sun, 17 Sep 2023 21:12:36 +0200 Message-Id: X-Mailer: git-send-email 2.39.2 In-Reply-To: <7b66989703be17ad1f850c2d53bed6ba63446567.1694977883.git.zimon.toutoune@gmail.com> References: <7b66989703be17ad1f850c2d53bed6ba63446567.1694977883.git.zimon.toutoune@gmail.com> 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)