From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id MK0wLoo0mmN6jQAAbAwnHQ (envelope-from ) for ; Wed, 14 Dec 2022 21:39:38 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id SHM5Loo0mmO2XgEA9RJhRA (envelope-from ) for ; Wed, 14 Dec 2022 21:39:38 +0100 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 6D3137EC6 for ; Wed, 14 Dec 2022 21:39:38 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p5YW5-0007Hh-Sq; Wed, 14 Dec 2022 15:38:15 -0500 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 1p5YVu-0007FQ-P5 for guix-patches@gnu.org; Wed, 14 Dec 2022 15:38:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p5YVu-0003IF-CI for guix-patches@gnu.org; Wed, 14 Dec 2022 15:38:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p5YVu-0001kx-1s; Wed, 14 Dec 2022 15:38:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60075] [PATCH 34/58] gnu: julia-tracker: Update to 0.2.22. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: zimon.toutoune@gmail.com, guix-patches@gnu.org Resent-Date: Wed, 14 Dec 2022 20:38:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60075 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60075@debbugs.gnu.org Cc: Efraim Flashner , zimon.toutoune@gmail.com X-Debbugs-Original-Xcc: zimon.toutoune@gmail.com Received: via spool by 60075-submit@debbugs.gnu.org id=B60075.16710502496493 (code B ref 60075); Wed, 14 Dec 2022 20:38:01 +0000 Received: (at 60075) by debbugs.gnu.org; 14 Dec 2022 20:37:29 +0000 Received: from localhost ([127.0.0.1]:41643 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p5YVM-0001ge-Uf for submit@debbugs.gnu.org; Wed, 14 Dec 2022 15:37:29 -0500 Received: from mail-wm1-f43.google.com ([209.85.128.43]:38910) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p5YV7-0001VM-2H for 60075@debbugs.gnu.org; Wed, 14 Dec 2022 15:37:14 -0500 Received: by mail-wm1-f43.google.com with SMTP id i64-20020a1c3b43000000b003d1e906ca23so128199wma.3 for <60075@debbugs.gnu.org>; Wed, 14 Dec 2022 12:37:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=ItToxDv86U61L28TMrt3YY0JKDFiQmgcjkR5kj548Xo=; b=J1GlXiJ6g/w4IEzsBaJOcu2Hh6pN41doy7m0roI+BYW6Vibh78u/Sm/+pEqpE7DCPC D/P6Pt1geH3cYWrOIFQOMr5a5wq4nugubk0CQpQSk/5w2qjzkS0TkBZbIsLtsT07Fiui N/bAVi6L8obV9Y7M7BkhKaOG/VrMlIoNsyT8YsOiA8/sxnNbpc/cTEXETTM8Pg87q5qo IW+A4q9I47uCQtkJww6+Oc4l4hcyzHT0iqyg1fNjXKFdqPrl8nKryZ54155kNqB+UgI7 OGqgyv4AFrcftuiG4d2bjMt1M6iix8rO16re4yw+/gCnnOAZGUVbRxS3sdlrDXQCiDKF BV8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=ItToxDv86U61L28TMrt3YY0JKDFiQmgcjkR5kj548Xo=; b=YGSU8NUBH1fepCfwsMoY2kUxpUgrl26PeUL+VVK5J2n+R7B+Pdp/o1mn1JKPue9V0Y x5yaHdaTTNBeZVtPi931tKSYkubFEkuHfWBxpXbNk5eFg+e5OmBS2PWHxm6D+vlrseUI RD8Z1FDwWZEAWpPpPJpK74wkenJjcKnwNFS++QZL+xIYWapW3pa0NWZTLF/63vaB3tMh HZ9w2foNTtV3MOe8amWzZbNi+2eGYy+Nnd37i7MeFyI5kmZcp0wZCZjwRgpDoYfskUjD g2xupUFLtb7mbauw7x5NfKWcYO8cAKVOcrHF4yd3ZbrKCHLsPtRy6vL3M7fMuYAwTQVa 6Klg== X-Gm-Message-State: ANoB5pkhRoU/Kut+2DOSwlehOMrEN0Ey/mez+Y8BSXoei1dXUZnHvrvC KPQKjNlY+JidKyhRxAsfwpU8knqjZwPuTA== X-Google-Smtp-Source: AA0mqf7Djvnry1xeJoAPM3iPbX0mDFTCdxoXf7gwrQAg2J8trFhkYUzQuxZudhuj9C1tFuwnfOz2LQ== X-Received: by 2002:a05:600c:350a:b0:3cf:fc0b:335a with SMTP id h10-20020a05600c350a00b003cffc0b335amr19805655wmq.40.1671050232741; Wed, 14 Dec 2022 12:37:12 -0800 (PST) Received: from localhost ([2a02:ed3:914:7800:b62e:99ff:fef0:7bc0]) by smtp.gmail.com with ESMTPSA id 1-20020a05600c228100b003d23928b654sm3640289wmf.11.2022.12.14.12.37.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Dec 2022 12:37:12 -0800 (PST) From: Efraim Flashner Date: Wed, 14 Dec 2022 22:35:32 +0200 Message-Id: <7490ca86f350dd1604e9bf8cd5f1727f8d75e804.1671049574.git.efraim@flashner.co.il> X-Mailer: git-send-email 2.38.1 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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-Country: US X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1671050378; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: 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=ItToxDv86U61L28TMrt3YY0JKDFiQmgcjkR5kj548Xo=; b=q6n3FHoxxtrnoerKTX9pJuW2kk1/+iSovLwo2urGnsqqRfIH2tpym9qEgM2nwj8UId8RTu gWC9/PwvKI6Nu/rXfZFvI3UKxOifPiDrJvejzFhWy4ujJwgh2MT/1Vy36KyBA28U2uWTwJ 0H48ATjXG1wOkjgpyIDyTojsKzv231Suy6AvXrzmoVhbinE2od5xOZqTO5H0zVlHmbaSel o7vWtyvYMrbljlxMQ+ht0t/tSWpixzy9wR5J7dw/lWNdpglsvFqybAc5Wrh6At5TACigpQ QlNs4qrt4q6VlXLTrkpBUWOkLU8mYCvi21Sl+P18Ug90xgfxCupkgHTf3Lox7Q== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=J1GlXiJ6; 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=none ARC-Seal: i=1; s=key1; d=yhetil.org; t=1671050378; a=rsa-sha256; cv=none; b=g5P3N8AwHx0zhebDoKA1aUo11zhQtf/p2dOpveEyKw0KRBVfyzFe63D7jI9HBlSrBuZX4y PTVYtM3HWk/KEx/E96WN1aoBVd5P/FfL//FHbFhwI3qtAzb3kinrTtJSckZ5W1mS9y1yz3 sHFlzwtk0H3RklzVwM5gaK0/q8ED2y5C7LM+o6G99IeQgbwrh0JhhGMwfHTlKEe1tseHd2 NG28jhnqj8VuB0Nwrv0J1aAHpNy/b0KUkiCF3YuhegtiQsjjlrvYD92fnXYXBHaHFDc+2r Ca/nIZAhHUiWqJNVRCoZFl86Nu6BEmU3mt1+uHCpktTY2BjgE8W4KcyfCt8Ksg== X-Migadu-Spam-Score: 1.43 X-Spam-Score: 1.43 X-Migadu-Queue-Id: 6D3137EC6 X-Migadu-Scanner: scn0.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=J1GlXiJ6; 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=none X-TUID: hKY192hmVWSn * gnu/packages/julia-xyz.scm (julia-tracker): Update to 0.2.22. [source]: Remove patch. [propagated-inputs]: Add julia-functors, julia-logexpfunctions, julia-optimisers. * gnu/packages/patches/julia-tracker-16-compat.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/julia-xyz.scm | 8 ++-- .../patches/julia-tracker-16-compat.patch | 40 ------------------- 3 files changed, 5 insertions(+), 44 deletions(-) delete mode 100644 gnu/packages/patches/julia-tracker-16-compat.patch diff --git a/gnu/local.mk b/gnu/local.mk index 60a422fd7e..ae6cc38abb 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1376,7 +1376,6 @@ dist_patch_DATA = \ %D%/packages/patches/json-c-0.12-CVE-2020-12762.patch \ %D%/packages/patches/jsoncpp-pkg-config-version.patch \ %D%/packages/patches/julia-SOURCE_DATE_EPOCH-mtime.patch \ - %D%/packages/patches/julia-tracker-16-compat.patch \ %D%/packages/patches/libffi-3.3-powerpc-fixes.patch \ %D%/packages/patches/libffi-float128-powerpc64le.patch \ %D%/packages/patches/libobjc2-unbundle-robin-map.patch \ diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index b844070f56..55e96e53ea 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -5758,7 +5758,7 @@ (define-public julia-testimages (define-public julia-tracker (package (name "julia-tracker") - (version "0.2.12") + (version "0.2.22") (source (origin (method git-fetch) @@ -5767,16 +5767,18 @@ (define-public julia-tracker (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1s4mdywbp7nli7z985fqaj1rs4i6d92b1jx3lhg0qhk1s5wc0v8j")) - (patches (search-patches "julia-tracker-16-compat.patch")))) + (base32 "0sxncn999dc5j15y0h3cw28x41pv5qjaw64drhy1y4rn3na48504")))) (build-system julia-build-system) (propagated-inputs (list julia-adapt julia-diffrules julia-forwarddiff + julia-functors + julia-logexpfunctions julia-macrotools julia-nanmath julia-nnlib + julia-optimisers julia-requires julia-specialfunctions)) (native-inputs diff --git a/gnu/packages/patches/julia-tracker-16-compat.patch b/gnu/packages/patches/julia-tracker-16-compat.patch deleted file mode 100644 index 4fff423e44..0000000000 --- a/gnu/packages/patches/julia-tracker-16-compat.patch +++ /dev/null @@ -1,40 +0,0 @@ -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 -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 - -- 2.38.1