diff options
| author | Marius Bakke <marius@gnu.org> | 2021-07-29 22:34:57 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2021-07-29 22:34:57 +0200 |
| commit | b029be2ee0f81cdcbc14240ff426408085ab0a40 (patch) | |
| tree | ed6d0e1bfdadfd28e1eb804e43763b793baa0b42 /gnu/packages/patches/julia-tracker-16-compat.patch | |
| parent | bc55f3091bac4677df0cf020381c554921fea179 (diff) | |
| parent | ffb381856d0c6cc1a557b789f6b377cfa17002a0 (diff) | |
| download | guix-patches-b029be2ee0f81cdcbc14240ff426408085ab0a40.tar guix-patches-b029be2ee0f81cdcbc14240ff426408085ab0a40.tar.gz | |
Merge branch 'master' into core-updates-frozen
Conflicts:
gnu/packages/bioinformatics.scm
gnu/packages/cmake.scm
gnu/packages/curl.scm
gnu/packages/emacs-xyz.scm
gnu/packages/gpodder.scm
gnu/packages/music.scm
gnu/packages/patches/glibc-bootstrap-system.patch
gnu/packages/python-xyz.scm
gnu/packages/shells.scm
gnu/packages/statistics.scm
Diffstat (limited to 'gnu/packages/patches/julia-tracker-16-compat.patch')
| -rw-r--r-- | gnu/packages/patches/julia-tracker-16-compat.patch | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/gnu/packages/patches/julia-tracker-16-compat.patch b/gnu/packages/patches/julia-tracker-16-compat.patch new file mode 100644 index 0000000000..4fff423e44 --- /dev/null +++ b/gnu/packages/patches/julia-tracker-16-compat.patch @@ -0,0 +1,40 @@ +https://github.com/FluxML/Tracker.jl/commit/f6550ba38a9ea5802e2de4fa9c939929ba711f0d.patch +from an upstream pull request +https://github.com/FluxML/Tracker.jl/pull/94 + + +From f6550ba38a9ea5802e2de4fa9c939929ba711f0d Mon Sep 17 00:00:00 2001 +From: Michael Abbott <me@escbook> +Date: Wed, 3 Feb 2021 22:58:33 +0100 +Subject: [PATCH] two fixes for 1.6 + +--- + src/lib/array.jl | 2 +- + src/lib/real.jl | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/lib/array.jl b/src/lib/array.jl +index 92f2b39..f8cbbac 100644 +--- a/src/lib/array.jl ++++ b/src/lib/array.jl +@@ -298,7 +298,7 @@ Base.reverse(xs::TrackedArray; dims) = track(reverse, xs, dims = dims) + @grad reverse(xs; dims) = reverse(data(xs), dims = dims), Δ -> (reverse(Δ, dims = dims), nothing) + Base.reverse(xs::TrackedVector) = track(reverse, xs) + @grad reverse(xs::TrackedVector) = reverse(data(xs)), Δ -> (reverse(Δ),) +-Base.reverse(xs::TrackedVector, start, stop) = track(reverse, xs, start, stop) ++Base.reverse(xs::TrackedVector, start::Integer, stop::Integer) = track(reverse, xs, start, stop) + @grad reverse(xs, start, stop) = reverse(data(xs), start, stop), Δ -> (reverse(Δ, start, stop), nothing, nothing) + + function _kron(mat1::AbstractMatrix,mat2::AbstractMatrix) +diff --git a/src/lib/real.jl b/src/lib/real.jl +index 737afd8..e1975ac 100644 +--- a/src/lib/real.jl ++++ b/src/lib/real.jl +@@ -55,6 +55,7 @@ for f in :[isinf, isnan, isfinite].args + end + + Printf.fix_dec(x::TrackedReal, n::Int, a...) = Printf.fix_dec(data(x), n, a...) ++Printf.tofloat(x::TrackedReal) = Printf.tofloat(data(x)) + + Base.float(x::TrackedReal) = x + |