Subject: bug#35388: closed (Re: [bug#35388] [PATCH] gnu: julia: Update to 1.1.0)

From: [email-masked] (GNU bug Tracking System)
Date: Tue, 23 Jul 2019 22:42:04 +0000

Your bug report

#35388: [PATCH] gnu: julia: Update to 1.1.0.

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
35388: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=35388
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: [bug#35388] [PATCH] gnu: julia: Update to 1.1.0
From: Ludovic Courtès <[email-masked]>
To: Nicolò Balzarotti <[email-masked]>
Cc: [email-masked], nixo <[email-masked]>
Date: Wed, 24 Jul 2019 00:40:52 +0200
List-Id: <debbugs-submit.debbugs.gnu.org>

Hi Nicolò!

Nicolò Balzarotti <[email-masked]> skribis:

> After the longest week ever, I'm back. I had to power off my build server
> because is a bit noisy, and building llvm on a laptop is slow.

Heheh.  :-)

> From 76e37b96a5670a0653187e7512eef8776902276c Mon Sep 17 00:00:00 2001
> From: =?UTF-8?q?Nicol=C3=B2=20Balzarotti?= <[email-masked]>
> Date: Sun, 21 Jul 2019 11:18:45 +0200
> Subject: [PATCH] gnu: julia: Update to 1.1.1
> To: [email-masked]
> Cc: Nicolò Balzarotti <[email-masked]>
>
> ---
>  gnu/packages/julia.scm | 335 ++++++++++++++++++++++++++---------------
>  1 file changed, 211 insertions(+), 124 deletions(-)

Pushed as 7304d5623ab5cc35289cb1535cbd0d8a37691fac!  \o/

I changed a few things to your patch to minimize changes (whitespace
changes, etc.), to avoid tabs, and to build only two LLVM backends.  I
also added a commit log that follows our conventions.

Please take a look and let me know if anything is amiss!

Anyway, it took a loooong time but it successfully built for me on
x86_64-linux.  Thank you!

Ludo’.

Subject: [PATCH] gnu: julia: Update to 1.1.0.
From: Nicolò Balzarotti <[email-masked]>
To: [email-masked]
Cc: nixo <[email-masked]>
Date: Tue, 23 Apr 2019 10:52:35 +0200
List-Id: <debbugs-submit.debbugs.gnu.org>

From: nixo <[email-masked]>

---
 gnu/packages/julia.scm | 243 ++++++++++++++++++++++++++---------------
 1 file changed, 152 insertions(+), 91 deletions(-)

diff --git a/gnu/packages/julia.scm b/gnu/packages/julia.scm
index fa9709c40c..7496d6c598 100644
--- a/gnu/packages/julia.scm
+++ b/gnu/packages/julia.scm
@@ -47,20 +47,19 @@
   #:use-module (ice-9 match))
 
 (define libuv-julia
-  (let ((commit "52d72a52cc7ccd570929990f010ed16e2ec604c8")
-        (revision "5"))
-    (package (inherit libuv)
+  (let ((commit "2348256acf5759a544e5ca7935f638d2bc091d60"))
+    (package
+      (inherit libuv)
       (name "libuv-julia")
-      (version (string-append "1.9.0-" revision "." (string-take commit 8)))
+      (version commit)
       (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                      (url "https://github.com/JuliaLang/libuv.git")
-                      (commit commit)))
-                (file-name (string-append name "-" version "-checkout"))
+                (method url-fetch)
+                (uri (string-append
+                      "https://api.github.com/repos/JuliaLang/libuv/tarball/"
+                      commit))
                 (sha256
                  (base32
-                  "1daxh6ci6q7znxxajr3bm16dd53ragm0d681wf4kzg542qnjq3lh"))))
+		  "1363f4vqayfcv5zqg07qmzjff56yhad74k16c22ian45lram8mv8"))))
       (build-system gnu-build-system)
       (arguments
        (substitute-keyword-arguments (package-arguments libuv)
@@ -69,22 +68,64 @@
              (delete 'autogen)))))
       (home-page "https://github.com/JuliaLang/libuv"))))
 
-(define libunwind-for-julia
+(define llvm-julia
   (package
-    (inherit libunwind)
-    (version "1.1-julia2")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://s3.amazonaws.com/julialang/src/"
-                                  "libunwind-" version ".tar.gz"))
-              (sha256
-               (base32
-                "0499x7sg2v18a6cry6l8y713cgmic0adnjph8i0xr1db9p7n8qyv"))))))
+    (inherit llvm-6)
+    (name "llvm-julia")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+	(string-append
+	 "http://releases.llvm.org/6.0.1/llvm-6.0.1.src.tar.xz"))
+       (sha256
+	(base32
+	 "1qpls3vk85lydi5b4axl0809fv932qgsqgdgrk098567z4jc7mmn"))
+       ;; Those patches are inside the julia source repo.
+       ;; They are _not_ julia specific (https://github.com/julialang/julia#llvm)
+       ;; but they are required to build julia.
+       ;; Discussion: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=919628
+       (patches
+        '("./patches/llvm-6.0-D44650.patch"
+      	  "./patches/llvm-6.0-DISABLE_ABI_CHECKS.patch"
+          "./patches/llvm-6.0-NVPTX-addrspaces.patch"
+          "./patches/llvm-6.0.0_D27296-libssp.patch"
+          "./patches/llvm-D27629-AArch64-large_model_6.0.1.patch"
+          "./patches/llvm-D34078-vectorize-fdiv.patch"
+          "./patches/llvm-D42262-jumpthreading-not-i1.patch"
+          "./patches/llvm-D44892-Perf-integration.patch"
+          "./patches/llvm-D46460.patch"
+          "./patches/llvm-D49832-SCEVPred.patch"
+          "./patches/llvm-D50010-VNCoercion-ni.patch"
+          "./patches/llvm-D50167-scev-umin.patch"
+          "./patches/llvm-OProfile-line-num.patch"
+          "./patches/llvm-PPC-addrspaces.patch"
+          "./patches/llvm-rL323946-LSRTy.patch"
+          "./patches/llvm-rL326967-aligned-load.patch"
+          "./patches/llvm-rL327898.patch"
+          ))
+       ))
+    (arguments
+     (substitute-keyword-arguments
+	 (package-arguments llvm-6)
+       ((#:configure-flags flags)
+	'(list ;; Taken from NixOS. Only way I could get libLLVM-6.0.so
+	  "-DCMAKE_BUILD_TYPE=Release"
+	  "-DLLVM_INSTALL_UTILS=ON"
+	  "-DLLVM_BUILD_TESTS=ON"
+	  "-DLLVM_ENABLE_FFI=ON"
+	  "-DLLVM_ENABLE_RTTI=ON"
+	  ;; "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}"
+	  ;; "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}"
+	  "-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly"
+	  "-DLLVM_ENABLE_DUMP=ON"
+	  "-DLLVM_LINK_LLVM_DYLIB=ON")
+	)))))
 
 (define-public julia
   (package
     (name "julia")
-    (version "0.6.0")
+    (version "1.1.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -92,7 +133,7 @@
                     version "/julia-" version ".tar.gz"))
               (sha256
                (base32
-                "0rd6lcc9sic10q1j3c6f9qr901i1c4554m93n2sz5b3mh37byqhw"))))
+                "1bd6c5gqd7f2i837ay8iqi8h36smhcg0lq7f8c2axxaw8x6rcfmx"))))
     (build-system gnu-build-system)
     (arguments
      `(#:test-target "test"
@@ -123,9 +164,25 @@
              (copy-file (string-append (assoc-ref inputs "virtualenv")
                                        "/bin/virtualenv")
                         "julia-env")
-             (copy-file (assoc-ref inputs "unicode-data")
-                        "doc/UnicodeData.txt")
-             #t))
+	     (copy-file (assoc-ref inputs "libwhich")
+			(string-append "deps/srccache/libwhich-"
+                                       "81e9723c0273d78493dc8c8ed570f68d9ce7e89e"
+                                       ".tar.gz"))
+	     (copy-file (assoc-ref inputs "rmath")
+			"deps/srccache/Rmath-julia-0.1.tar.gz")
+	     ;; needed by libwhich
+	     (setenv "LD_LIBRARY_PATH"
+		     (string-join (map
+                                   (lambda (pkg)
+                                     (string-append (assoc-ref inputs pkg)
+                                                    "/lib"))
+                                   (list
+                                    "arpack-ng" "fftw" "gmp" "lapack"
+			            "libgit2" "mpfr" "openblas" "openlibm"
+			            "openspecfun" "pcre2"
+			            ))
+                                  ":"))
+	     #t))
          ;; FIXME: Building the documentation requires Julia packages that
          ;; would be downloaded from the Internet.  We should build them in a
          ;; separate build phase.
@@ -168,19 +225,9 @@
                        ("lapack"      "liblapack"      "liblapack.so")
                        ("libgit2"     "libgit2"        "libgit2.so")
                        ("gmp"         "libgmp"         "libgmp.so")
-                       ("openlibm"    "libopenlibm"    "libopenlibm.so")
                        ("openspecfun" "libopenspecfun" "libopenspecfun.so")
                        ("fftw"        "libfftw3"       "libfftw3_threads.so")
                        ("fftwf"       "libfftw3f"      "libfftw3f_threads.so"))))))
-            (substitute* "base/fft/FFTW.jl"
-              (("const libfftw = Base.libfftw_name")
-               (string-append "const libfftw = \""
-                              (assoc-ref inputs "fftw") "/lib/libfftw3_threads.so"
-                              "\""))
-              (("const libfftwf = Base.libfftwf_name")
-               (string-append "const libfftwf = \""
-                              (assoc-ref inputs "fftwf") "/lib/libfftw3f_threads.so"
-                              "\"")))
             (substitute* "base/math.jl"
               (("const libm = Base.libm_name")
                (string-append "const libm = \""
@@ -192,11 +239,6 @@
                               (assoc-ref inputs "openspecfun")
                               "/lib/libopenspecfun.so"
                               "\"")))
-            (substitute* "base/pcre.jl"
-              (("const PCRE_LIB = \"libpcre2-8\"")
-               (string-append "const PCRE_LIB = \""
-                              (assoc-ref inputs "pcre2")
-                              "/lib/libpcre2-8.so" "\"")))
             #t))
          (add-before 'build 'fix-include-and-link-paths
           (lambda* (#:key inputs #:allow-other-keys)
@@ -209,7 +251,6 @@
                "$(BUILDDIR)/$(EXENAME): $(OBJS) $(LLT_release)")
               (("\\$\\(BUILDDIR\\)/\\$\\(EXENAME\\)-debug: \\$\\(DOBJS\\) \\$\\(LIBFILES_debug\\)")
                "$(BUILDDIR)/$(EXENAME)-debug: $(DOBJS) $(LLT_debug)"))
-
             ;; The REPL must be linked with libuv.
             (substitute* "ui/Makefile"
               (("JLDFLAGS \\+= ")
@@ -220,7 +261,7 @@
             (substitute* "base/Makefile"
               (("\\$\\(build_includedir\\)/uv-errno.h")
                (string-append (assoc-ref inputs "libuv")
-                              "/include/uv-errno.h")))
+                              "/include/uv/errno.h")))
             #t))
          (add-before 'build 'replace-default-shell
           (lambda _
@@ -229,37 +270,37 @@
             #t))
          (add-after 'unpack 'hardcode-paths
            (lambda _
-             (substitute* "base/interactiveutil.jl"
+             (substitute* "stdlib/InteractiveUtils/src/InteractiveUtils.jl"
                (("`which") (string-append "`" (which "which")))
                (("`wget")  (string-append "`" (which "wget"))))
              #t))
          (add-before 'check 'disable-broken-tests
            (lambda _
-             ;; Adjust expected error messages to match what current libgit2
-             ;; provides.
-             (substitute* "test/libgit2.jl"
-               (("Invalid Content-Type") "invalid Content-Type")
-               (("Failed to resolve path") "failed to resolve path"))
-
-             (substitute* "test/choosetests.jl"
-               ;; These tests fail, probably because some of the input
-               ;; binaries have been stripped and thus backtraces don't look
-               ;; as expected.
-               (("\"backtrace\",") "")
-               (("\"compile\",") "")
-               (("\"replutil\",") "")
-               (("\"cmdlineargs\",") "")
-               ;; FIXME: This test fails with the following error:
-               ;; Error in testset file:
-               ;; Test Failed
-               ;;   Expression: download("ba\0d", "good")
-               ;;     Expected: ArgumentError
-               ;;       Thrown: Base.UVError
-               (("\"file\",") ""))
-             #t)))
+             (define (touch file-name)
+               (call-with-output-file file-name (const #t)))
+	     ;; FIXME: All git tests works except this one. But *THIS* "fix"
+             ;; is not working, so right now I'm disabling all libgit2.jl tests
+	     ;; (substitute* "stdlib/LibGit2/test/libgit2.jl"
+	     ;; (("!LibGit2.use_http_path(cfg, github_cred)") "true")
+	     ;; (("LibGit2.use_http_path(cfg, mygit_cred)") "true"))
+             (map (lambda (test)
+                    (delete-file test)
+                    (touch test))
+	      '("stdlib/Sockets/test/runtests.jl"
+		"stdlib/Distributed/test/runtests.jl"
+                ;; FIXME: see above
+		"stdlib/LibGit2/test/libgit2.jl"))
+	     (substitute* "test/choosetests.jl"
+	       ;; These tests fail, probably because some of the input
+	       ;; binaries have been stripped and thus backtraces don't look
+	       ;; as expected.
+	       (("\"backtrace\",") "")
+	       (("\"cmdlineargs\",") ""))
+	     #t)))
        #:make-flags
        (list
         (string-append "prefix=" (assoc-ref %outputs "out"))
+        (string-append "PREFIX=" (assoc-ref %outputs "out"))
 
         ;; Passing the MARCH flag is necessary to build binary substitutes for
         ;; the supported architectures.
@@ -277,7 +318,11 @@
                                 ;build system for a shared library.
         "USE_SYSTEM_LAPACK=1"
         "USE_SYSTEM_BLAS=1"
+
+	;; TODO: What about building blas with 64 support?
         "USE_BLAS64=0"          ;needed when USE_SYSTEM_BLAS=1
+        "LIBBLAS=-lopenblas"
+        "LIBBLASNAME=libopenblas"
 
         "USE_SYSTEM_FFTW=1"
         "LIBFFTWNAME=libfftw3"
@@ -297,25 +342,31 @@
                        "/include")
         "USE_SYSTEM_LLVM=1"
         "USE_LLVM_SHLIB=0" ; FIXME: fails when set to 1
+	"LLVM_VER=6.0.1"
 
-        "USE_SYSTEM_LIBUNWIND=1"
-        "USE_SYSTEM_LIBUV=1"
-        (string-append "LIBUV="
-                       (assoc-ref %build-inputs "libuv")
-                       "/lib/libuv.so")
-        (string-append "LIBUV_INC="
-                       (assoc-ref %build-inputs "libuv")
-                       "/include")
-        "USE_SYSTEM_PATCHELF=1"
-        "USE_SYSTEM_PCRE=1"
-        "USE_SYSTEM_OPENLIBM=1"
-        "USE_SYSTEM_GMP=1"
-        "USE_SYSTEM_MPFR=1"
-        "USE_SYSTEM_ARPACK=1"
-        "USE_SYSTEM_LIBGIT2=1"
-        "USE_SYSTEM_OPENSPECFUN=1")))
+	;; "LLVM_VER=6.0.0"
+	"USE_LLVM_SHLIB=1"		; FIXME: fails when set to 1
+
+	"USE_SYSTEM_LIBUNWIND=1"
+	"USE_SYSTEM_LIBUV=1"
+	(string-append "LIBUV="
+		       (assoc-ref %build-inputs "libuv")
+		       "/lib/libuv.so")
+	(string-append "LIBUV_INC="
+		       (assoc-ref %build-inputs "libuv")
+		       "/include")
+	"USE_SYSTEM_PATCHELF=1"
+	"USE_SYSTEM_PCRE=1"
+	"USE_SYSTEM_OPENLIBM=1"
+
+	"USE_SYSTEM_GMP=1"
+	"USE_SYSTEM_MPFR=1"
+	"USE_SYSTEM_ARPACK=1"
+	"USE_SYSTEM_LIBGIT2=1"
+	"USE_SYSTEM_ZLIB=1"
+	"USE_SYSTEM_OPENSPECFUN=1")))
     (inputs
-     `(("llvm" ,llvm-3.9.1)
+     `(("llvm" ,llvm-julia)
 
        ;; The bundled version is 3.3.0 so stick to that version.  With other
        ;; versions, we get test failures in 'linalg/arnoldi' as described in
@@ -325,7 +376,7 @@
        ("coreutils" ,coreutils) ;for bindings to "mkdir" and the like
        ("lapack" ,lapack)
        ("openblas" ,openblas) ;Julia does not build with Atlas
-       ("libunwind" ,libunwind-for-julia)
+       ("libunwind" ,libunwind)
        ("openlibm" ,openlibm)
        ("openspecfun" ,openspecfun)
        ("libgit2" ,libgit2)
@@ -346,6 +397,13 @@
        ;; would eventually be replaced with proper Guix packages.
 
        ;; TODO: run "make -f contrib/repackage_system_suitesparse4.make" to copy static lib
+       ("rmath"
+	,(origin
+	   (method url-fetch)
+	   (uri "https://api.github.com/repos/JuliaLang/Rmath-julia/tarball/v0.1")
+	   (sha256
+	    (base32
+	     "1qyps217175qhid46l8f5i1v8i82slgp23ia63x2hzxwfmx8617p"))))
        ("suitesparse"
         ,(origin
            (method url-fetch)
@@ -362,6 +420,16 @@
            (sha256
             (base32
              "0wp6ld9vk11f4nnkn56627zmlv9k5vafi99qa3yyn1pgcd61zcfs"))))
+       ("libwhich"
+	,(origin
+	   (method url-fetch)
+	   (uri
+	    (string-append
+	     "https://api.github.com/repos/vtjnash/libwhich/tarball/"
+	     "81e9723c0273d78493dc8c8ed570f68d9ce7e89e"))
+	   (sha256
+	    (base32
+	     "1p7zg31kpmpbmh1znrk1xrbd074agx13b9q4dcw8n2zrwwdlbz3b"))))
        ("dsfmt"
         ,(origin
            (method url-fetch)
@@ -376,14 +444,7 @@
        ("perl" ,perl)
        ("patchelf" ,patchelf)
        ("pkg-config" ,pkg-config)
-       ("python" ,python-2)
-       ("unicode-data"
-        ,(origin
-           (method url-fetch)
-           (uri "http://www.unicode.org/Public/9.0.0/ucd/UnicodeData.txt")
-           (sha256
-            (base32
-             "13zfannnr6sa6s27ggvcvzmh133ndi38pfyxsssvjmw2s8ac9pv8"))))))
+       ("python" ,python-2)))
     ;; Julia is not officially released for ARM and MIPS.
     ;; See https://github.com/JuliaLang/julia/issues/10639
     (supported-systems '("i686-linux" "x86_64-linux" "aarch64-linux"))
-- 
2.21.0