all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Simon Tournier <zimon.toutoune@gmail.com>
To: 66030@debbugs.gnu.org
Cc: Efraim Flashner <efraim@flashner.co.il>,
	Simon Tournier <zimon.toutoune@gmail.com>
Subject: [bug#66030] [PATCH v3 2/6] gnu: julia: Conditionally use openblas with ILP64 support.
Date: Sun, 17 Sep 2023 21:12:36 +0200	[thread overview]
Message-ID: <b07cb54b9d3501d120cb334f14480488958172c7.1694977883.git.zimon.toutoune@gmail.com> (raw)
In-Reply-To: <7b66989703be17ad1f850c2d53bed6ba63446567.1694977883.git.zimon.toutoune@gmail.com>

From: Efraim Flashner <efraim@flashner.co.il>

Fixes <https://bugs.gnu.org/63986>.
Reported by Cayetano Santos <csantosb@inventati.org>.

* 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 <zimon.toutoune@gmail.com>
---
 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





  reply	other threads:[~2023-09-17 19:14 UTC|newest]

Thread overview: 48+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-06-09 21:42 bug#63986: Julia is very slow Cayetano Santos via Bug reports for GNU Guix
2023-06-14 16:00 ` Ludovic Courtès
2023-06-19 16:13   ` Simon Tournier
2023-06-21 14:36     ` Ludovic Courtès
2023-06-21 20:39       ` Cayetano Santos via Bug reports for GNU Guix
2023-06-22 13:26         ` Cayetano Santos via Bug reports for GNU Guix
2023-06-22 14:37           ` Efraim Flashner
2023-06-22 15:52           ` Simon Tournier
2023-06-22 16:25             ` Efraim Flashner
2023-06-22 16:56               ` Cayetano Santos via Bug reports for GNU Guix
2023-06-22 17:12               ` Simon Tournier
2023-06-23  9:09                 ` Ludovic Courtès
2023-06-23  9:16                   ` Efraim Flashner
2023-06-23 12:11                     ` Simon Tournier
2023-06-23 13:23                     ` Simon Tournier
2023-06-23 14:16                       ` Efraim Flashner
2023-07-06 14:13                         ` Ludovic Courtès
2023-08-20 20:53                           ` Ludovic Courtès
2023-09-14 10:33                             ` Efraim Flashner
2023-09-15 19:45                               ` Cayetano Santos via Bug reports for GNU Guix
2023-09-16 10:47                               ` Simon Tournier
2023-09-16 11:18                                 ` Simon Tournier
2023-09-20 15:57                               ` Simon Tournier
2023-09-24  8:37                                 ` Cayetano Santos via Bug reports for GNU Guix
2023-09-25 14:46                                 ` Ludovic Courtès
2023-09-26  9:27                                   ` Efraim Flashner
2023-09-29  8:46                                     ` Ludovic Courtès
2023-09-29 10:12                                       ` Efraim Flashner
2023-09-28 11:41                                 ` Efraim Flashner
2023-06-22 18:47               ` Simon Tournier
2023-06-22 18:55                 ` Efraim Flashner
2023-06-22 20:13                 ` Efraim Flashner
2023-06-23 12:06                   ` Simon Tournier
2023-09-15 19:49 ` bug#63986: Fixed Cayetano Santos via Bug reports for GNU Guix
2023-09-16 10:23 ` bug#63986: [PATCH 0/2] Fix bug#63986: Julia is very slow Simon Tournier
2023-09-16 10:55   ` [bug#66030] [PATCH 1/2] gnu: openblas-ilp64: Add symbol suffix Simon Tournier
2023-09-16 10:55   ` [bug#66030] [PATCH 2/2] gnu: julia: Conditionally use openblas with ILP64 support Simon Tournier
2023-09-17 11:49   ` [bug#66030] [PATCH 0/2] Fix: Julia is very slow Simon Tournier
2023-09-17 11:52   ` [bug#66030] [PATCH v2 1/3] gnu: openblas-ilp64: Add symbol suffix Simon Tournier
2023-09-17 11:52     ` [bug#66030] [PATCH v2 2/3] gnu: julia: Conditionally use openblas with ILP64 support Simon Tournier
2023-09-17 11:52     ` [bug#66030] [PATCH v2 3/3] gnu: julia-arraylayouts: Fix tests Simon Tournier
2023-09-17 19:12   ` [bug#66030] [PATCH v3 1/6] gnu: openblas-ilp64: Add symbol suffix Simon Tournier
2023-09-17 19:12     ` Simon Tournier [this message]
2023-09-17 19:12     ` [bug#66030] [PATCH v3 3/6] gnu: julia-arraylayouts: Fix tests Simon Tournier
2023-09-17 19:12     ` [bug#66030] [PATCH v3 4/6] gnu: julia-scanbyte: Update to 0.4.0 Simon Tournier
2023-09-17 19:12     ` [bug#66030] [PATCH v3 5/6] gnu: Add wcslib-7.12 Simon Tournier
2023-09-17 19:12     ` [bug#66030] [PATCH v3 6/6] gnu: julia-wcslib-jll: Downgrade wcslib version Simon Tournier
     [not found] ` <handler.63986.D63986.169480740431199.notifdone@debbugs.gnu.org>
2023-09-16 11:03   ` bug#63986: Julia is very slow Simon Tournier

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=b07cb54b9d3501d120cb334f14480488958172c7.1694977883.git.zimon.toutoune@gmail.com \
    --to=zimon.toutoune@gmail.com \
    --cc=66030@debbugs.gnu.org \
    --cc=efraim@flashner.co.il \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.