Received: (at 65630) by debbugs.gnu.org; 4 Jan 2024 14:11:51 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Jan 04 09:11:51 2024
Received: from localhost ([127.0.0.1]:53912 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rLORr-0005o6-23
for submit <at> debbugs.gnu.org; Thu, 04 Jan 2024 09:11:51 -0500
Received: from mail-lj1-x236.google.com ([2a00:1450:4864:20::236]:56720)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <sharlatanus@HIDDEN>) id 1rLORm-0005nq-Kz
for 65630 <at> debbugs.gnu.org; Thu, 04 Jan 2024 09:11:50 -0500
Received: by mail-lj1-x236.google.com with SMTP id
38308e7fff4ca-2cd0d05838fso6249561fa.1
for <65630 <at> debbugs.gnu.org>; Thu, 04 Jan 2024 06:11:42 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1704377497; x=1704982297; darn=debbugs.gnu.org;
h=content-transfer-encoding:to:subject:message-id:date:from
:mime-version:from:to:cc:subject:date:message-id:reply-to;
bh=lEifQUO+fuNc2ObSI7QKoADmOLWwAviMf+A6szECV3g=;
b=S/b9/7lcme1OL5QjI1nODVp3z99jeFhcYUNbM4/aAg/Vn0VHACxLqayq0M1S5LFuuP
a6bqGAzOWCBXwOO2H3VXIJcIMFA0E+m8vYLqvIM6WM4XG8ZsObJpsJ13gFrpw+bcnWRG
JyI6rqH+X+1BO0T2B9If27u1LddTUQOSwdNV0dfVK+woAl0fMS+VBnhTyNfVMdEi9tFF
PfzrI1QZhDisoL4+CH9DAaXHRwN8MW4oI6r/FkelC1yqC0gsWhuwpUp1gN00NLyVnd+n
frxbwlRPBmyd6nBm7HMNyRIrpShiJSDT5zOSEXfbY2Omh5e+lQh9ovCINTFuOxykdPa/
gxUQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1704377497; x=1704982297;
h=content-transfer-encoding:to:subject:message-id:date:from
:mime-version:x-gm-message-state:from:to:cc:subject:date:message-id
:reply-to;
bh=lEifQUO+fuNc2ObSI7QKoADmOLWwAviMf+A6szECV3g=;
b=Lj1fHE4RXjrlldTPTyBhYMJcTW0dcRwrASe/2KJj8CBvj+L5ylSsfnezSDX081DQLB
NZ5MQJBxv7guCP4jGDb8dmXt0yG9+6i33FEq/0WnFZ7ZCU4t1JGnYCl4A1BnBYPneneY
zGwoIIFL48PHT3f//VpDH8ScRqOEpwnx6Og5R80ZAwg7zJKH4EtnsiXb2wHgsYXJDg/N
6vqXREt5yH5//Fhq/i/h8+rJaez0mFiQzLoy32x8CNODvlCsk0XkJETAw4j0Va6+4FnD
4t8yai74bvj+1JtEhUwWNSeswe3s5p9H+0Cj4AmWwKil+u0L7GryqprBODWxJxWWHywt
+eeQ==
X-Gm-Message-State: AOJu0YwB0kNvzo2bYlMq8J0TxWJjg4Mqh8uLTGDTdj3O+yTgmX4lOWaj
tUP3HCM6aOmqpV762+8MFXkHFDL13XCIRvX6Oz6WYyoLPz72Zw==
X-Google-Smtp-Source: AGHT+IGk5tgMSpn2w3vQuuoc1olKNzWAui/Oo17oA6eSL7SDTmXTj5ctqov+uHoBEcUZaMsXKangDOIvIvJBTqn1cMA=
X-Received: by 2002:a05:6512:e9f:b0:50e:85be:e03b with SMTP id
bi31-20020a0565120e9f00b0050e85bee03bmr373636lfb.115.1704377496609; Thu, 04
Jan 2024 06:11:36 -0800 (PST)
MIME-Version: 1.0
From: Sharlatan Hellseher <sharlatanus@HIDDEN>
Date: Thu, 4 Jan 2024 17:11:24 +0000
Message-ID: <CAO+9K5p7KeUvMpqCJvTsgEUt4iA6oDe48n62moctzMwJzxOdZA@HIDDEN>
Subject:
To: 65630 <at> debbugs.gnu.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: 2.0 (++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
has NOT identified this incoming email as spam. The original
message has been attached to this so you can view it or label
similar future email. If you have any questions, see
the administrator of that system for details.
Content preview: Hi, name: onnx version: 1.12.0 Is broken on commit:
Content analysis details: (2.0 points, 10.0 required)
pts rule name description
---- ---------------------- --------------------------------------------------
-0.0 SPF_PASS SPF: sender matches SPF record
0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail
provider (sharlatanus[at]gmail.com)
0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record
-0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/,
no trust [2a00:1450:4864:20:0:0:0:236 listed in]
[list.dnswl.org]
-0.0 T_SCC_BODY_TEXT_LINE No description available.
2.0 BLANK_SUBJECT Subject is present but empty
X-Debbugs-Envelope-To: 65630
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 1.0 (+)
Hi,
name: onnx
version: 1.12.0
Is broken on commit:
guix describe
Generation 498 Jan 04 2024 10:55:58 (current)
guix 7b0863f
repository URL: https://git.savannah.gnu.org/git/guix.git
branch: master
commit: 7b0863f07a113caef26fea13909bd97d250b629e
phase `make-test-directory-writable' succeeded after 0.0 seconds
starting phase `check'
running "python setup.py" with command "test" and parameters ()
running pytest
/gnu/store/91wasjkmy50p8fq0rf9jby80mnmq1fxr-python-3.10.7/lib/python3.10/si=
te-packages/setuptools/command/easy_install.py:144:
EasyInstallDeprecationWarning: easy_install command is deprecated. Use
build and pip and other standards-based tools.
warnings.warn(
/gnu/store/91wasjkmy50p8fq0rf9jby80mnmq1fxr-python-3.10.7/lib/python3.10/si=
te-packages/setuptools/command/install.py:34:
SetuptoolsDeprecationWarning: setup.py install is deprecated. Use
build and pip and other standards-based tools.
warnings.warn(
Searching for protobuf<=3D3.20.1,>=3D3.12.2
Reading https://pypi.org/simple/protobuf/
Download error on https://pypi.org/simple/protobuf/: [Errno -3]
Temporary failure in name resolution -- Some packages may not be
found!
Couldn't find index page for 'protobuf' (maybe misspelled?)
Scanning index of all packages (this may take a while)
Reading https://pypi.org/simple/
Download error on https://pypi.org/simple/: [Errno -3] Temporary
failure in name resolution -- Some packages may not be found!
No local packages or working download links found for protobuf<=3D3.20.1,>=
=3D3.12.2
It would be nice to have it fixed with this update.
Thanks,
Oleg
--
=E2=80=A6 =D0=BD=D0=B0=D1=88 =D1=80=D0=B0=D0=B7=D1=83=D0=BC - =D0=BF=D1=80=
=D0=B5=D0=B2=D0=BE=D1=81=D1=85=D0=BE=D0=B4=D0=BD=D0=B0=D1=8F =D0=BE=D0=B1=
=D1=8A=D1=8F=D1=81=D0=BD=D0=B8=D1=82=D0=B5=D0=BB=D1=8C=D0=BD=D0=B0=D1=8F =
=D0=BC=D0=B0=D1=88=D0=B8=D0=BD=D0=B0 =D0=BA=D0=BE=D1=82=D0=BE=D1=80=D0=B0=
=D1=8F =D1=81=D0=BF=D0=BE=D1=81=D0=BE=D0=B1=D0=BD=D0=B0
=D0=BD=D0=B0=D0=B9=D1=82=D0=B8 =D1=81=D0=BC=D1=8B=D1=81=D0=BB =D0=BF=D0=BE=
=D1=87=D1=82=D0=B8 =D0=B2 =D1=87=D0=B5=D0=BC =D1=83=D0=B3=D0=BE=D0=B4=D0=BD=
=D0=BE, =D0=B8=D1=81=D1=82=D0=BE=D0=BB=D0=BA=D0=BE=D0=B2=D0=B0=D1=82=D1=8C =
=D0=BB=D1=8E=D0=B1=D0=BE=D0=B9 =D1=84=D0=B5=D0=BD=D0=BE=D0=BC=D0=B5=D0=BD, =
=D0=BD=D0=BE
=D1=81=D0=BE=D0=B2=D0=B5=D1=80=D1=88=D0=B5=D0=BD=D0=BD=D0=BE =D0=BD=D0=B5 =
=D0=B2 =D1=81=D0=BE=D1=81=D1=82=D0=BE=D1=8F=D0=BD=D0=B8=D0=B8 =D0=BF=D1=80=
=D0=B8=D0=BD=D1=8F=D1=82=D1=8C =D0=BC=D1=8B=D1=81=D0=BB=D1=8C =D0=BE =D0=BD=
=D0=B5=D0=BF=D1=80=D0=B5=D0=B4=D1=81=D0=BA=D0=B0=D0=B7=D1=83=D0=B5=D0=BC=D0=
=BE=D1=81=D1=82=D0=B8.
guix-patches@HIDDEN:bug#65630; Package guix-patches.
Full text available.Andy Tai <atai@HIDDEN>
to control <at> debbugs.gnu.org.
Full text available.Andy Tai <atai@HIDDEN>
to control <at> debbugs.gnu.org.
Full text available.
Received: (at 65630) by debbugs.gnu.org; 10 Sep 2023 20:01:40 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Sep 10 16:01:40 2023
Received: from localhost ([127.0.0.1]:51435 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qfQcl-0007y3-Ez
for submit <at> debbugs.gnu.org; Sun, 10 Sep 2023 16:01:39 -0400
Received: from mail-pj1-x102d.google.com ([2607:f8b0:4864:20::102d]:45103)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <lichengtai@HIDDEN>) id 1qfQch-0007xD-2t
for 65630 <at> debbugs.gnu.org; Sun, 10 Sep 2023 16:01:35 -0400
Received: by mail-pj1-x102d.google.com with SMTP id
98e67ed59e1d1-26d5970cd28so2872918a91.2
for <65630 <at> debbugs.gnu.org>; Sun, 10 Sep 2023 13:01:31 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20221208; t=1694376085; x=1694980885; darn=debbugs.gnu.org;
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=TI04TfOupiziYlUgS+1jMTuVpqh+F1s7mpTPxHn/m6w=;
b=CRUB8aaiwEfeDOR0RNIQSAnpbi7QwkhJGR+oQfagcjXw3hYgyl0zjiBEIPNbO+n+pI
4bU1wxRaiZL3uK2nSyyX2k8YRhl7YQ5EBCPV4jzA0Qb993AWfdZmKEnqByyB0xaBNvfG
p2GDIGeY2WvfrgOYKqwGwsV4xCivyjNSEDX6WdTA/cvlL+P9pfUbeOzB2Z6/4m3HYQgl
RsJs5EicUwJbJrDpPpLIVKK7SEycw+ath0Xih0gFyY50kAndo+2b9fEnaMpOYfcYiy+V
QIOIYa6i0JtMT0Lke7e0KoDmfh4uEpTHiZf8zSnxLdeB4hTc4EfsNq47s4v9S7Khge1N
Lfew==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1694376085; x=1694980885;
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=TI04TfOupiziYlUgS+1jMTuVpqh+F1s7mpTPxHn/m6w=;
b=b0m12/3fgKnU3wvMiC2yIbm9OMlET8LAtoXf0amTi/c+ffDF/hg8aK3W1cvE9F1Mnv
7YcTLzKnOpsIKs+peT6QGY6WuFNFwm+VOyzx0u86DbSOUZwSz7PlH4cEGWWAQBSa5KkU
IMcshWp1OU3B7a1/Gc4aj58YtQE+jaAy8V1BE9SC/DQq97xctCAXF5M9q+L34othcN38
N6z0nZqjNhEFNyxfubPtAnA2RlgV40Bf3tn7bpZeJiX1QB3p1BPKfoYpc3gRIhMTDWtp
JUj/7Q5MoRydRrQAhk1pSYX/BBvd1SQqKh3RNE35QheEkPemVikfNQZvKZTHpLHMDmZq
eaug==
X-Gm-Message-State: AOJu0YwogohofwHLhv1jTIwU33Twq1n8/jtOv1+0hmLQWG7RsLkFiBxH
0LtHaS0eGb3gMYo56puFZYPpdxEqxKehHA==
X-Google-Smtp-Source: AGHT+IHBapP4FiF3G3MeqRvcAvVGv6xONATKHEomOi5jHZ/GKRTrkXAQ/uYJevHZKaoQETuXJ2uXPg==
X-Received: by 2002:a17:90a:dc85:b0:268:d716:4b62 with SMTP id
j5-20020a17090adc8500b00268d7164b62mr6071063pjv.0.1694376085490;
Sun, 10 Sep 2023 13:01:25 -0700 (PDT)
Received: from localhost.localdomain ([98.37.226.98])
by smtp.googlemail.com with ESMTPSA id
i8-20020a17090a2ac800b002696aeb72e5sm6703783pjg.2.2023.09.10.13.01.24
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Sun, 10 Sep 2023 13:01:25 -0700 (PDT)
From: Andy Tai <atai@HIDDEN>
To: 65630 <at> debbugs.gnu.org
Subject: [PATCH v3 4/4] gnu: onnx-optimizer: Update to 0.3.17
Date: Sun, 10 Sep 2023 13:01:15 -0700
Message-ID: <298ff69fb8f8e7501dd2f2d0eebc9d40405e2ac6.1694375976.git.atai@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <e118be2a4cca96322298560791afc5434f4c2927.1694375976.git.atai@HIDDEN>
References: <e118be2a4cca96322298560791afc5434f4c2927.1694375976.git.atai@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.5 (/)
X-Debbugs-Envelope-To: 65630
Cc: Andy Tai <atai@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.5 (/)
* gnu/packages/machine-learning.scm (onnx-optimizer): Update to 0.3.17
* gnu/packages/patches/onnx-optimizer-system-library.patch:
Adapt to onnx-optimizer 0.3.17
---
gnu/packages/machine-learning.scm | 12 +++--
.../onnx-optimizer-system-library.patch | 48 +++++++++++--------
2 files changed, 36 insertions(+), 24 deletions(-)
diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm
index 3c26eb4e64..dfba9f666a 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -1098,8 +1098,10 @@ (define-public onnx
"-DONNX_USE_PROTOBUF_SHARED_LIBS=ON"
"-DONNX_OPT_USE_SYSTEM_PROTOBUF=ON"
; force system copy use;
- "-DBUILD_SHARED_LIBS=ON"))
-
+ "-DBUILD_SHARED_LIBS=ON"
+ (string-append "-DONNX_ROOT="
+ #$(package-source this-package))))
+ ;; for derived package use
;; This environment variable is honored by 'setup.py',
;; which passes it down to 'cmake'.
(setenv "CMAKE_ARGS"
@@ -1157,8 +1159,8 @@ (define-public python-onnx
(define-public onnx-optimizer
(package
(name "onnx-optimizer")
- ;; Note: 0.2.x is *more* recent than 1.5.0.
- (version "0.2.6")
+ ;; Note: 0.2.x or 0.3.x is *more* recent than 1.5.0.
+ (version "0.3.17")
(home-page "https://github.com/onnx/optimizer")
(source (origin
(method git-fetch)
@@ -1167,7 +1169,7 @@ (define-public onnx-optimizer
(commit (string-append "v" version))))
(sha256
(base32
- "1wkqqdxcxpfbf8zpbdfdd3zz5jkw775g31gyykj11z4y6pp659l6"))
+ "0j8civ0vf2vxyk5ihb9zxvwsqv8yzbfmkg42rnxwf59gdzgz48li"))
(file-name (git-file-name name version))
(patches (search-patches "onnx-optimizer-system-library.patch"))
(modules '((guix build utils)))
diff --git a/gnu/packages/patches/onnx-optimizer-system-library.patch b/gnu/packages/patches/onnx-optimizer-system-library.patch
index 5c592597e0..7890bee045 100644
--- a/gnu/packages/patches/onnx-optimizer-system-library.patch
+++ b/gnu/packages/patches/onnx-optimizer-system-library.patch
@@ -1,42 +1,42 @@
-Arrange so that onnx-optimizer (1) uses our own ONNX build,
+Arrange so that onnx-optimizer (1) uses our own ONNX build,
(2) builds as a shared library, and (3) links against the shared
libraries of ONNX.
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c2e48b35..8af51076 100644
+index 00633856..c6f3188d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -9,8 +9,6 @@ endif(NOT MSVC)
-
- set(CMAKE_POSITION_INDEPENDENT_CODE ON)
-
+@@ -27,8 +27,6 @@ if(NOT ONNX_OPT_USE_SYSTEM_PROTOBUF)
+ endif()
+
+
-set(ONNX_ROOT ${PROJECT_SOURCE_DIR}/third_party/onnx)
--add_subdirectory(${ONNX_ROOT})
-
+-add_subdirectory_if_no_target(${ONNX_ROOT} ${ONNX_TARGET_NAME})
+
file(READ "${PROJECT_SOURCE_DIR}/VERSION_NUMBER" ONNX_OPTIMIZER_VERSION)
string(STRIP "${ONNX_OPTIMIZER_VERSION}" ONNX_OPTIMIZER_VERSION)
-@@ -21,14 +19,18 @@ file(GLOB_RECURSE onnx_opt_srcs "onnxoptimizer/*.cc"
+@@ -41,14 +39,18 @@ file(GLOB onnx_opt_srcs "onnxoptimizer/*.cc"
list(REMOVE_ITEM onnx_opt_srcs "${PROJECT_SOURCE_DIR}/onnxoptimizer/cpp2py_export.cc")
- add_library(onnx_optimizer ${onnx_opt_srcs})
--target_link_libraries(onnx_optimizer PUBLIC onnx)
-+target_link_libraries(onnx_optimizer PUBLIC onnx onnx_proto)
+ onnxopt_add_library(onnx_optimizer ${onnx_opt_srcs})
+-target_link_libraries(onnx_optimizer PUBLIC ${ONNX_TARGET_NAME})
++target_link_libraries(onnx_optimizer PUBLIC ${ONNX_TARGET_NAME} onnx_proto)
target_include_directories(onnx_optimizer PUBLIC
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}>
$<INSTALL_INTERFACE:include>
)
-
+
+# These cpp macros must be defined so the ONNX headers behave
+# correctly.
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DONNX_ML=1 -DONNX_NAMESPACE=onnx")
+
- add_executable(onnx_optimizer_exec examples/onnx_optimizer_exec.cpp)
+ onnxopt_add_executable(onnx_optimizer_exec examples/onnx_optimizer_exec.cpp)
-target_link_libraries(onnx_optimizer_exec onnx_optimizer)
+target_link_libraries(onnx_optimizer_exec onnx_optimizer protobuf)
-
- if(BUILD_ONNX_PYTHON)
- if("${PY_EXT_SUFFIX}" STREQUAL "")
-@@ -79,11 +81,10 @@ if(BUILD_ONNX_PYTHON)
+
+
+ file(GLOB onnx_opt_c_api_srcs "onnxoptimizer/c_api/*.cc"
+@@ -112,11 +114,10 @@ if(BUILD_ONNX_PYTHON)
PRIVATE $<TARGET_OBJECTS:onnx_optimizer>)
else()
# Assume everything else is like gcc
@@ -49,5 +49,15 @@ index c2e48b35..8af51076 100644
+ PROPERTIES LINK_FLAGS
+ "-Wl,-rpath=${CMAKE_INSTALL_PREFIX}/lib")
endif()
-
+
target_link_libraries(onnx_opt_cpp2py_export PRIVATE onnx_optimizer)
+diff --git a/cmake/utils.cmake b/cmake/utils.cmake
+index 6cca9f36..8e39d5c4 100644
+--- a/cmake/utils.cmake
++++ b/cmake/utils.cmake
+@@ -1,4 +1,4 @@
+-include(${PROJECT_SOURCE_DIR}/third_party/onnx/cmake/Utils.cmake)
++include(${ONNX_ROOT}/cmake/Utils.cmake)
+
+ # Poor man's FetchContent
+ function(add_subdirectory_if_no_target dir target)
--
2.41.0
guix-patches@HIDDEN:bug#65630; Package guix-patches.
Full text available.
Received: (at 65630) by debbugs.gnu.org; 10 Sep 2023 20:01:39 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Sep 10 16:01:39 2023
Received: from localhost ([127.0.0.1]:51433 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qfQcl-0007xu-3M
for submit <at> debbugs.gnu.org; Sun, 10 Sep 2023 16:01:39 -0400
Received: from mail-pl1-x629.google.com ([2607:f8b0:4864:20::629]:62497)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <lichengtai@HIDDEN>) id 1qfQce-0007x8-Ej
for 65630 <at> debbugs.gnu.org; Sun, 10 Sep 2023 16:01:35 -0400
Received: by mail-pl1-x629.google.com with SMTP id
d9443c01a7336-1bf11b1c7d0so32874035ad.0
for <65630 <at> debbugs.gnu.org>; Sun, 10 Sep 2023 13:01:28 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20221208; t=1694376082; x=1694980882; darn=debbugs.gnu.org;
h=content-transfer-encoding:mime-version:message-id:date:subject:cc
:to:from:sender:from:to:cc:subject:date:message-id:reply-to;
bh=j4D/0pIpJNc+hdL93bWHx2blNeDIVm5JKHK4A35Ytcg=;
b=OoR5IVpMVirNq9QDjE+8jv4mhI28j1Ki5gx67kFFE6OvUI/1aLSqpLOZu3q89BxhmL
sEWXApPTSPxXvT/tLvar0EXV6/LfLSok/0Of+VeVpBfEZ46DGxXP0Bu927ZtRu92LpYc
bfT+OU5X76XAbUp69p9IXflS5gsMH4U8jvBM9wKtjWJ8aMyRUwR6aBCFcVcK9bqNdWxo
bOB2BpkByuvgzFTyxQXbzAUCxXo7rKZdc6mXH4eOjZFznbDhfy5UyoHW5YOyeRRiKyGO
UBNkQjs6IZVLpP3EDWMoi1jjahzlkn+4l19nYFAZHnQKW/l+ciO0sQq8wks7kn6i1Pvb
Pa9Q==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1694376082; x=1694980882;
h=content-transfer-encoding:mime-version:message-id:date:subject:cc
:to:from:sender:x-gm-message-state:from:to:cc:subject:date
:message-id:reply-to;
bh=j4D/0pIpJNc+hdL93bWHx2blNeDIVm5JKHK4A35Ytcg=;
b=Y6jhMzXajkUP7gs/U3In44JOKxjcuTs4osgXzdHX5MzFsV3KFsdhFJRj4aD4dNzCmK
ihxVd6i4iLTf4+GsokYXvQnY4rfkJ5nK99//JeS++bA1mFhiQuMvo/U9i0E1BcsamJPs
Ggmb4WJYs9tWAaqV6UNrueoAy1xk18g7GJv7oAJaTHmC2nzhLAGawHPU3gEmFNfcBDcK
Obsjgx1g8M0H03qdsuIT4rqOSIMfHQVpqpZBSs1aGqXHITtWtOv4qfXW3d8PNl0Hv+R2
a0J3wSTsUgrfO8T3XQSlcNCvIFSDMwEh1x4+QJf4d13ZjjAdlka9mPfq4e9CUeUICDRz
LrTg==
X-Gm-Message-State: AOJu0Yz85ebVobll0sbBQslqdQRKnUaMTGmEldpv+vfcpDKU9UdJLhsg
NBuXERZfD17j6QwOJ3SynfUBAdM4OxvAcA==
X-Google-Smtp-Source: AGHT+IGDJyEkzky484sc2ZwNO+RXMUV3+Eq00cE7TZDHq04lLoyugr3GhOLveu08P4oLVRB1pT+NnQ==
X-Received: by 2002:a17:90b:4f4a:b0:26d:d3a:5e48 with SMTP id
pj10-20020a17090b4f4a00b0026d0d3a5e48mr14904153pjb.15.1694376082215;
Sun, 10 Sep 2023 13:01:22 -0700 (PDT)
Received: from localhost.localdomain ([98.37.226.98])
by smtp.googlemail.com with ESMTPSA id
i8-20020a17090a2ac800b002696aeb72e5sm6703783pjg.2.2023.09.10.13.01.21
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Sun, 10 Sep 2023 13:01:21 -0700 (PDT)
From: Andy Tai <atai@HIDDEN>
To: 65630 <at> debbugs.gnu.org
Subject: [PATCH v3 1/4] gnu: python-protobuf: Update to 3.20.3
Date: Sun, 10 Sep 2023 13:01:12 -0700
Message-ID: <e118be2a4cca96322298560791afc5434f4c2927.1694375976.git.atai@HIDDEN>
X-Mailer: git-send-email 2.41.0
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.5 (/)
X-Debbugs-Envelope-To: 65630
Cc: Andy Tai <atai@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.5 (/)
* gnu/packages/protobuf.scm (python-protobuf): Update to 3.20.3
---
gnu/packages/protobuf.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/protobuf.scm b/gnu/packages/protobuf.scm
index 8cd805799e..dc3ba72ee1 100644
--- a/gnu/packages/protobuf.scm
+++ b/gnu/packages/protobuf.scm
@@ -425,14 +425,14 @@ (define-public python-nanopb
(define-public python-protobuf
(package
(name "python-protobuf")
- (version "3.20.1")
+ (version "3.20.3")
(source
(origin
(method url-fetch)
(uri (pypi-uri "protobuf" version))
(sha256
(base32
- "1ja2vpk9nklllmsirmil2s4l7ni9yfqvbvj47zz5xx17s1k1bhxd"))))
+ "1wh5f4rnzbv46xy1rx62cprhg5hqf2py06s9b7rfpzwwki12fd1f"))))
(build-system python-build-system)
(inputs (list protobuf))
(arguments
base-commit: 5db78e7c1b06d1b4892bdb3e153b95b21577271e
--
2.41.0
guix-patches@HIDDEN:bug#65630; Package guix-patches.
Full text available.
Received: (at 65630) by debbugs.gnu.org; 10 Sep 2023 20:01:39 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Sep 10 16:01:39 2023
Received: from localhost ([127.0.0.1]:51431 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qfQck-0007xq-K5
for submit <at> debbugs.gnu.org; Sun, 10 Sep 2023 16:01:39 -0400
Received: from mail-pg1-x529.google.com ([2607:f8b0:4864:20::529]:46377)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <lichengtai@HIDDEN>) id 1qfQcg-0007xC-4T
for 65630 <at> debbugs.gnu.org; Sun, 10 Sep 2023 16:01:34 -0400
Received: by mail-pg1-x529.google.com with SMTP id
41be03b00d2f7-573f722b86eso2602674a12.1
for <65630 <at> debbugs.gnu.org>; Sun, 10 Sep 2023 13:01:30 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20221208; t=1694376084; x=1694980884; darn=debbugs.gnu.org;
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=SQRdchcqV6HeZ1YSFpwcwE8DDZsd8pdjOhfk+S+3GcY=;
b=KovIyaykERpXUj2w9a5YRwpjyWnTbPgTbE0KOCcas9VhaELDiHopOB7OPSmucDhOFk
evr+cjXroSFcdsmGH0miHdkkjMWL01hCNQAKV+Bedo9ZjVFebwk/TWyXqJeDTdDt0ySQ
KO1tYYh06WCaS4knw+69srbkWVc9Z3zljOOZrBNQxaIVgko1vRLZBJ46eWxKCJwxTKgd
USFH8dOAPf+0FtmehBUrd5vMN2FgQK2R4K7BljQBzP7c789lvejBPQ7qQNCM15iOmslT
VsXiXEa3lImXddGXjXRDGwHpO5yQH8Dy1sN+SXb2+TSw3HuJPyPtAyJxGdcoBhtWRHvx
tcKQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1694376084; x=1694980884;
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=SQRdchcqV6HeZ1YSFpwcwE8DDZsd8pdjOhfk+S+3GcY=;
b=w3vratwj5Am7XCDN8hZaKGusy7SHWp8DJ+ibLbECmrGFFCm6azio+p/SuEEMLrr43p
8rBecHL/DBtn6kOGiguCrknBN2t13E/Z3yuX3JcWTEull/HwVLl9sb43yBUZpQoEPhPY
beI6H6jjNiAAS071mv4C5pbMkIR4vhWbY1ipAcgYduyBeLm4zxM97pKgKETY1V8ubZQU
eQYW3/Q2tQvcELoekAVU+7dDdT6JKw+58O+Z8bYx8epofhkTyYTLNZvUkHJVnNbScAau
P9OjRAZ+vvQQxvV1raUOTPLFUAMPEjXRsQEFM0kmxW3jEuSlq89c2zK16Yn4m8kwtKKj
wTSQ==
X-Gm-Message-State: AOJu0YyPkIxgJewYbPBq0gNbM6KAKHVK+xPIKPAkpeDFFpofT4G+G0W2
fCvko4OGQDVkVnLy9bBg2zFhw8i/BR93Vg==
X-Google-Smtp-Source: AGHT+IEaSe0JhfOcDBBjDkTdpc9kWxPUxKCO8pLmrPkUs5NMBkY66kIBJSXDbP/Vq5sWWrPKOesPxw==
X-Received: by 2002:a17:90b:1256:b0:271:ab23:6288 with SMTP id
gx22-20020a17090b125600b00271ab236288mr5610289pjb.14.1694376084440;
Sun, 10 Sep 2023 13:01:24 -0700 (PDT)
Received: from localhost.localdomain ([98.37.226.98])
by smtp.googlemail.com with ESMTPSA id
i8-20020a17090a2ac800b002696aeb72e5sm6703783pjg.2.2023.09.10.13.01.23
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Sun, 10 Sep 2023 13:01:23 -0700 (PDT)
From: Andy Tai <atai@HIDDEN>
To: 65630 <at> debbugs.gnu.org
Subject: [PATCH v3 3/4] gnu: onnx: Use G-Expressions.
Date: Sun, 10 Sep 2023 13:01:14 -0700
Message-ID: <fd00927eff034ac9fad34ddea933b35a46afa179.1694375976.git.atai@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <e118be2a4cca96322298560791afc5434f4c2927.1694375976.git.atai@HIDDEN>
References: <e118be2a4cca96322298560791afc5434f4c2927.1694375976.git.atai@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.5 (/)
X-Debbugs-Envelope-To: 65630
Cc: Andy Tai <atai@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.5 (/)
* gnu/packages/machine-learning.scm (onnx)[arguments]: Convert to list of G-Expressions.
---
gnu/packages/machine-learning.scm | 88 ++++++++++++++++---------------
1 file changed, 45 insertions(+), 43 deletions(-)
diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm
index c1f5925b11..3c26eb4e64 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -1078,50 +1078,52 @@ (define-public onnx
(snippet '(delete-file-recursively "third_party"))))
(build-system python-build-system)
(arguments
- '(#:phases (modify-phases %standard-phases
- (add-before 'build 'pass-cmake-arguments
- (lambda* (#:key outputs #:allow-other-keys)
- ;; Pass options to the CMake-based build process.
- (define out
- (assoc-ref outputs "out"))
-
- (define args
- ;; Copy arguments from 'cmake-build-system', plus ask
- ;; for shared libraries.
- (list "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
- (string-append "-DCMAKE_INSTALL_PREFIX=" out)
- "-DCMAKE_INSTALL_LIBDIR=lib"
- "-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=TRUE"
- (string-append "-DCMAKE_INSTALL_RPATH=" out
- "/lib")
- "-DCMAKE_VERBOSE_MAKEFILE=ON"
- "-DONNX_USE_PROTOBUF_SHARED_LIBS=ON"
- "-DONNX_OPT_USE_SYSTEM_PROTOBUF=ON"
+ (list #:phases #~(modify-phases %standard-phases
+ (add-before 'build 'pass-cmake-arguments
+ (lambda* (#:key outputs #:allow-other-keys)
+ ;; Pass options to the CMake-based build process.
+ (define out
+ (assoc-ref outputs "out"))
+
+ (define args
+ ;; Copy arguments from 'cmake-build-system', plus ask
+ ;; for shared libraries.
+ (list "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
+ (string-append "-DCMAKE_INSTALL_PREFIX=" out)
+ "-DCMAKE_INSTALL_LIBDIR=lib"
+ "-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=TRUE"
+ (string-append "-DCMAKE_INSTALL_RPATH=" out
+ "/lib")
+ "-DCMAKE_VERBOSE_MAKEFILE=ON"
+ "-DONNX_USE_PROTOBUF_SHARED_LIBS=ON"
+ "-DONNX_OPT_USE_SYSTEM_PROTOBUF=ON"
; force system copy use;
- "-DBUILD_SHARED_LIBS=ON"))
-
- ;; This environment variable is honored by 'setup.py',
- ;; which passes it down to 'cmake'.
- (setenv "CMAKE_ARGS" (string-join args))
-
- ;; This one is honored by 'setup.py' and passed to 'make
- ;; -j'.
- (setenv "MAX_JOBS"
- (number->string (parallel-job-count)))))
- (add-before 'check 'make-test-directory-writable
- (lambda _
- ;; Make things writable for tests.
- (setenv "HOME" (getcwd))
- (for-each make-file-writable
- (find-files "onnx/examples" "."
- #:directories? #t))))
- (add-after 'install 'install-from-cmake
- (lambda _
- ;; Run "make install" in the build tree 'setup.py'
- ;; created for CMake so that libonnx.so,
- ;; libonnx_proto.so, etc. are installed.
- (invoke "make" "install"
- "-C" ".setuptools-cmake-build"))))))
+ "-DBUILD_SHARED_LIBS=ON"))
+
+ ;; This environment variable is honored by 'setup.py',
+ ;; which passes it down to 'cmake'.
+ (setenv "CMAKE_ARGS"
+ (string-join args))
+
+ ;; This one is honored by 'setup.py' and passed to 'make
+ ;; -j'.
+ (setenv "MAX_JOBS"
+ (number->string (parallel-job-count)))))
+ (add-before 'check 'make-test-directory-writable
+ (lambda _
+ ;; Make things writable for tests.
+ (setenv "HOME"
+ (getcwd))
+ (for-each make-file-writable
+ (find-files "onnx/examples" "."
+ #:directories? #t))))
+ (add-after 'install 'install-from-cmake
+ (lambda _
+ ;; Run "make install" in the build tree 'setup.py'
+ ;; created for CMake so that libonnx.so,
+ ;; libonnx_proto.so, etc. are installed.
+ (invoke "make" "install" "-C"
+ ".setuptools-cmake-build"))))))
(native-inputs
(list cmake
googletest
--
2.41.0
guix-patches@HIDDEN:bug#65630; Package guix-patches.
Full text available.
Received: (at 65630) by debbugs.gnu.org; 10 Sep 2023 20:01:35 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Sep 10 16:01:35 2023
Received: from localhost ([127.0.0.1]:51428 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qfQcg-0007xR-M3
for submit <at> debbugs.gnu.org; Sun, 10 Sep 2023 16:01:35 -0400
Received: from mail-pj1-x1030.google.com ([2607:f8b0:4864:20::1030]:49661)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <lichengtai@HIDDEN>) id 1qfQcf-0007xA-95
for 65630 <at> debbugs.gnu.org; Sun, 10 Sep 2023 16:01:34 -0400
Received: by mail-pj1-x1030.google.com with SMTP id
98e67ed59e1d1-26f38171174so3010436a91.3
for <65630 <at> debbugs.gnu.org>; Sun, 10 Sep 2023 13:01:29 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20221208; t=1694376083; x=1694980883; darn=debbugs.gnu.org;
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=TclGmTPiPh3wpYXJZ1Sn0LmzGYtYq3uANIHIIfZWBPY=;
b=SGedcC5R+OredUSnoZ+JG8CIDNjBdQi8LqpTrCujzRwHagsBHflcR4dkuo2As/sqK2
GrZ12QmIUWtvWFaedjGRBM0G74u/OyiZHf74bQowRz8MH0Cv1QfO/akHdobakPzZxeVV
ZYKFIZIwy6Rd/mQECfe7ckeCMnm+vpdR//DlXWzD3idvme7fiiTzkgCSnwkK+LDDrnMI
M6THxDo1ftPYgHl4fz+0jpsnE85Ug6AqN4Z3jxNpnI+b4Z8ZBDWy0jM4lMHA63Gx2uV5
S9lRVfqufWPV2fitVY3wLpUnEQpmQBcKAZyUE4WlwyrJXgpWwR4sQeeODPxzOeOt1ykm
VMMA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1694376083; x=1694980883;
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=TclGmTPiPh3wpYXJZ1Sn0LmzGYtYq3uANIHIIfZWBPY=;
b=QptyxzyYBqOxCyc8ajEGgfnxb/H9mCSSlWFqr5MyPAqCPpYc1vvWL3ezzHWMthCyWt
dsy+1vYODE5RreqOxYccmdOqOi2HuiWkTNuWDh6zY1vEEmJ4v0CO7LN/vzc+GBLaUfgI
1QsHBlk/LSbJpXEVBr/kj7Wrni8suHtbu/VLFi8CLMlY4rzvflr/rNobRqfmPzrE4yb7
7f/tVEdFu2QSZVktrmMXXAkI9ysbMA9KIcsExYWD0gTmIrlztwM/3pts7+K+QaUjTocR
92uza9hTifCqkqhcLVOvFQ3Kp1HwQ+nD3wD1higa86uhzxb/qQKtaKLc1hKfaWhix3SM
vCtw==
X-Gm-Message-State: AOJu0YxV07EwEGArKvBV6hWj2otvQYm6meSXT0tSVagIwiUFZdCgxwN4
uhwXanmzklZKA6C8ltE1/Oql8DDrySKwkg==
X-Google-Smtp-Source: AGHT+IF3f8YWrumo7OCMpt9yrxCMkMVxC7eCHwN3v6VXnO5dgrS+x9hwf9MFMGEePXhujcc0z0MznQ==
X-Received: by 2002:a17:90a:5148:b0:26b:66f7:c9be with SMTP id
k8-20020a17090a514800b0026b66f7c9bemr7577261pjm.10.1694376083261;
Sun, 10 Sep 2023 13:01:23 -0700 (PDT)
Received: from localhost.localdomain ([98.37.226.98])
by smtp.googlemail.com with ESMTPSA id
i8-20020a17090a2ac800b002696aeb72e5sm6703783pjg.2.2023.09.10.13.01.22
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Sun, 10 Sep 2023 13:01:22 -0700 (PDT)
From: Andy Tai <atai@HIDDEN>
To: 65630 <at> debbugs.gnu.org
Subject: [PATCH v3 2/4] gnu: onnx: Update to 1.14.1
Date: Sun, 10 Sep 2023 13:01:13 -0700
Message-ID: <de14e30c24a0621443d35986d1ecd233f4212cf8.1694375976.git.atai@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <e118be2a4cca96322298560791afc5434f4c2927.1694375976.git.atai@HIDDEN>
References: <e118be2a4cca96322298560791afc5434f4c2927.1694375976.git.atai@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.5 (/)
X-Debbugs-Envelope-To: 65630
Cc: Andy Tai <atai@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.5 (/)
* gnu/packages/machine-learning.scm (onnx): Update to 1.14.1
* gnu/packages/patches/onnx-skip-model-downloads.patch: Adjust to onnx 1.14.1
* gnu/packages/patches/onnx-use-system-googletest.patch: Adjust to onnx 1.14.1
---
gnu/packages/machine-learning.scm | 12 ++++++++----
gnu/packages/patches/onnx-skip-model-downloads.patch | 8 ++++----
.../patches/onnx-use-system-googletest.patch | 8 +++-----
3 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm
index fd0be8d500..c1f5925b11 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -1061,7 +1061,7 @@ (define-public shogun
(define-public onnx
(package
(name "onnx")
- (version "1.12.0")
+ (version "1.14.1")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -1069,7 +1069,7 @@ (define-public onnx
(commit (string-append "v" version))))
(sha256
(base32
- "1g9f1hviksbn7gi6fnd0dsm7nf0w3yia0mjj33d9mggklrl0db6x"))
+ "1lg67z5kzky5qmfcll6dg9pkbdric4d2zwxs89ljc0nyla9rsm35"))
(file-name (git-file-name name version))
(patches (search-patches "onnx-use-system-googletest.patch"
"onnx-shared-libraries.patch"
@@ -1095,7 +1095,9 @@ (define-public onnx
(string-append "-DCMAKE_INSTALL_RPATH=" out
"/lib")
"-DCMAKE_VERBOSE_MAKEFILE=ON"
-
+ "-DONNX_USE_PROTOBUF_SHARED_LIBS=ON"
+ "-DONNX_OPT_USE_SYSTEM_PROTOBUF=ON"
+ ; force system copy use;
"-DBUILD_SHARED_LIBS=ON"))
;; This environment variable is honored by 'setup.py',
@@ -1126,10 +1128,12 @@ (define-public onnx
pybind11
python-coverage
python-nbval
+ python-parameterized
+ python-protobuf
python-pytest
python-pytest-runner))
(inputs
- (list protobuf))
+ (list protobuf ))
(propagated-inputs
(list python-numpy python-protobuf python-six python-tabulate
python-typing-extensions))
diff --git a/gnu/packages/patches/onnx-skip-model-downloads.patch b/gnu/packages/patches/onnx-skip-model-downloads.patch
index 4ab55b4ceb..e96f4cb7d9 100644
--- a/gnu/packages/patches/onnx-skip-model-downloads.patch
+++ b/gnu/packages/patches/onnx-skip-model-downloads.patch
@@ -6,10 +6,10 @@ diff --git a/onnx/backend/test/runner/__init__.py b/onnx/backend/test/runner/__i
index 049ed57b..f236f1bf 100644
--- a/onnx/backend/test/runner/__init__.py
+++ b/onnx/backend/test/runner/__init__.py
-@@ -202,6 +202,7 @@ class Runner(object):
- print('Start downloading model {} from {}'.format(
- model_test.model_name,
- model_test.url))
+@@ -227,6 +227,7 @@ class Runner(object):
+ print(
+ f"Start downloading model {model_test.model_name} from {model_test.url}"
+ )
+ raise unittest.SkipTest('Skipping download')
urlretrieve(model_test.url, download_file.name)
print('Done')
diff --git a/gnu/packages/patches/onnx-use-system-googletest.patch b/gnu/packages/patches/onnx-use-system-googletest.patch
index 5dfcbc6dc3..4279ea37c6 100644
--- a/gnu/packages/patches/onnx-use-system-googletest.patch
+++ b/gnu/packages/patches/onnx-use-system-googletest.patch
@@ -28,21 +28,19 @@ index 0aa9fda2..a573170c 100644
if((ONNX_USE_LITE_PROTO AND TARGET protobuf::libprotobuf-lite) OR ((NOT ONNX_USE_LITE_PROTO) AND TARGET protobuf::libprotobuf))
diff --git a/cmake/unittest.cmake b/cmake/unittest.cmake
-index e29a93ff..ae146390 100644
+index e71b92a7..30c446ce 100644
--- a/cmake/unittest.cmake
+++ b/cmake/unittest.cmake
-@@ -6,8 +6,8 @@ include(${ONNX_ROOT}/cmake/Utils.cmake)
+@@ -7,7 +7,7 @@ include(${ONNX_ROOT}/cmake/Utils.cmake)
find_package(Threads)
-set(${UT_NAME}_libs ${googletest_STATIC_LIBRARIES})
--set(${ONNXIFI_TEST_DRIVER}_libs ${googletest_STATIC_LIBRARIES})
+set(${UT_NAME}_libs ${GTEST_LIBRARIES})
-+set(${ONNXIFI_TEST_DRIVER}_libs ${GTEST_LIBRARIES})
list(APPEND ${UT_NAME}_libs onnx)
list(APPEND ${UT_NAME}_libs onnx_proto)
-@@ -31,10 +31,10 @@ function(AddTest)
+@@ -22,10 +22,10 @@ function(AddTest)
list(REMOVE_DUPLICATES _UT_SOURCES)
add_executable(${_UT_TARGET} ${_UT_SOURCES})
--
2.41.0
guix-patches@HIDDEN:bug#65630; Package guix-patches.
Full text available.Received: (at 65630) by debbugs.gnu.org; 9 Sep 2023 17:54:46 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sat Sep 09 13:54:46 2023 Received: from localhost ([127.0.0.1]:48454 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1qf2AP-0005xU-1u for submit <at> debbugs.gnu.org; Sat, 09 Sep 2023 13:54:46 -0400 Received: from mail-oi1-x22e.google.com ([2607:f8b0:4864:20::22e]:52492) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <lichengtai@HIDDEN>) id 1qf2AK-0005xE-5D for 65630 <at> debbugs.gnu.org; Sat, 09 Sep 2023 13:54:43 -0400 Received: by mail-oi1-x22e.google.com with SMTP id 5614622812f47-3a7e68f4214so2319017b6e.1 for <65630 <at> debbugs.gnu.org>; Sat, 09 Sep 2023 10:54:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=atai-org.20230601.gappssmtp.com; s=20230601; t=1694282071; x=1694886871; darn=debbugs.gnu.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=oTltyZFLOH83t5/xoDM747fRZ4NeWKsiUMy+eI4W1VY=; b=CAoLLnBwvoXs7dO78PmmqD9Jc9WyIkY09ESHX76KYENlnEpkZUu63t283RON7guNNm mYFY0uvHJRRl5T5+6EU8RVmVRX4lQJ1u/IvjcVztRG1yoySPrmDLHLyL4Uaai4YvI/w7 FQVv52q3cdGZzYUKNJcf7Sd+qup9ZZMPvv59mmZl66p9EyxvFK9I4eNuVECxmLXA/zLE mLR+lf4J277tD/sGdtqJqq90f3Bhu9ttSM+DB+/ZTxjmsWNXQ7paI/8KTM0uGm6kVURk dt7MSsjriU2LDc0cgvoH8UC4n8vhj/LDApUGkqEtdeQxoUabqNHMcuVcaj4jw937bMuT eZSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694282071; x=1694886871; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=oTltyZFLOH83t5/xoDM747fRZ4NeWKsiUMy+eI4W1VY=; b=i01uCSRnRYnpNrk27wwK9wI1w+nB77nTqFC3WCq0HDv2IFOmvhcPo63BqMkVTYuUxB 3UFSXKaXVfOS2l1hSb1Sj0biyAyg3A0qsGfaC5EyyUu+DVXiwszFbm8kNsq/IqNCpD0I tzygmu87RkT2+SuJKSYdq9K8HIIgmLaoltpr1+T8bZnPbuPQab11oDh/g3+zmfTznvWA YswYjNNIx9PJ9/Iyf4RYPbI3E4YgDIYAQEySitjLpfOpL6nmWBdhey3z4Gsmk45SELvE cinx8kPhuN0V9jQiJRFX0S/O6ev5STpwWMarFJleB7Ho6Eig5gh98WO0GG/nGHLJIKZM deww== X-Gm-Message-State: AOJu0YyS2tc8G9GVNKFb2H96fSglDu9kTiVPFMhYsIa7KvbFEj0gzpVg arw1BBu8UTOqclLDDeJmzJbb2L+6wIqil3zmEFg= X-Google-Smtp-Source: AGHT+IHcxLVT6CHeRn+lOd37g8qShn1xJdoJdXlwPBphdTogBtU9kocXIchVTJ9lO1nLzOeV+uVzg9ljeUr+pnpvROU= X-Received: by 2002:a05:6870:a706:b0:1cd:24a1:1c56 with SMTP id g6-20020a056870a70600b001cd24a11c56mr7453136oam.19.1694282071136; Sat, 09 Sep 2023 10:54:31 -0700 (PDT) MIME-Version: 1.0 References: <0293efc03e0aba3e3ae0268062ed37639433fc1e.1693712577.git.atai@HIDDEN> <049b3335f4196044edf950e48a0f6f370878426e.1693712577.git.atai@HIDDEN> <87edj7xy2b.fsf_-_@HIDDEN> In-Reply-To: <87edj7xy2b.fsf_-_@HIDDEN> From: Andy Tai <atai@HIDDEN> Date: Sat, 9 Sep 2023 10:53:54 -0700 Message-ID: <CAJsg1E8=q5ALrz=UXYvpfpgsaa4j3ywuHYVX+kS=8EuuRZb4hg@HIDDEN> Subject: Re: bug#65630: [PATCH] gnu: onnx: Update to 1.14.1 To: =?UTF-8?Q?Ludovic_Court=C3=A8s?= <ludo@HIDDEN> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: base64 X-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: 65630 Cc: 65630 <at> debbugs.gnu.org X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -0.5 (/) U3VyZS4NCg0KT24gU2F0LCBTZXAgOSwgMjAyMyBhdCA2OjQy4oCvQU0gTHVkb3ZpYyBDb3VydMOo cyA8bHVkb0BnbnUub3JnPiB3cm90ZToNCj4NCj4gSGkgQW5keSwNCj4NCj4gVGhpcyBhcHBhcmVu dGx5IGNhdXNlcyAzMCBmYWlsdXJlcyBvbiB4ODZfNjQtbGludXg6DQo+DQo+ICAgaHR0cHM6Ly9x YS5ndWl4LmdudS5vcmcvaXNzdWUvNjU2MzANCj4NCj4gQ291bGQgeW91IHRha2UgYSBsb29rPw0K Pg0KPiBUSUEsDQo+IEx1ZG/igJkuDQoNCg0KDQotLSANCkFuZHkgVGFpLCBhdGFpQGF0YWkub3Jn LCBTa3lwZTogbGljaGVuZy50YWksIExpbmU6IGFuZHlfdGFpLCBXZUNoYXQ6IGFuZHl0YWkxMDEw DQpZZWFyIDIwMjMg5rCR5ZyLMTEy5bm0DQroh6rli5XnmoTnsr7npZ7lipvmmK/kv6Hku7DoiIfo prrmgp8NCuiHquWLleeahOihjOeCuuWKm+aYr+WLnuWLleiIh+aKgOiDvQ0K
guix-patches@HIDDEN:bug#65630; Package guix-patches.
Full text available.Received: (at 65630) by debbugs.gnu.org; 9 Sep 2023 13:42:49 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sat Sep 09 09:42:49 2023 Received: from localhost ([127.0.0.1]:46432 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1qeyEb-0002C3-1V for submit <at> debbugs.gnu.org; Sat, 09 Sep 2023 09:42:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40262) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <ludo@HIDDEN>) id 1qeyEZ-0002Bk-FV for 65630 <at> debbugs.gnu.org; Sat, 09 Sep 2023 09:42:47 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <ludo@HIDDEN>) id 1qeyEQ-0003vM-SF; Sat, 09 Sep 2023 09:42:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=rd2jX7WcIsi7WMl7eWos0FM/JTtowzqI5kl4irggMHE=; b=Bk47UMU94uWwJgRTfxBX Qfu8MCy8PDhiaxCtiojNS2ulZ3t9tFaXK2iI7AEaw4EqNVgbz9IVFRLFW/VkF9Ro8hD+VCQLlO+tH 8W2il9DAqKdrWEli0aPTa3RhsSoMQDBtrFVfTXeAyBqrqvsmQqzQCJrE4ByheKLfuehAtrjLR37H+ JzO82mcrfR6RjyjKlswS8Ah8ScuzimseF+82J3tz24aCHMmQ2oS9Y/WFqaP4g+Mi85idFcyf22bhT puLOP5XUCGWR3Ew15kWga3SijU5yxd8HsDDNV8CYIDGDHhAQOgE5/HQxc5L4P5DT59ZUldntnzOl+ 7WurSZfBKFI2vQ==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= <ludo@HIDDEN> To: Andy Tai <atai@HIDDEN> Subject: Re: bug#65630: [PATCH] gnu: onnx: Update to 1.14.1 References: <0293efc03e0aba3e3ae0268062ed37639433fc1e.1693712577.git.atai@HIDDEN> <049b3335f4196044edf950e48a0f6f370878426e.1693712577.git.atai@HIDDEN> Date: Sat, 09 Sep 2023 15:42:36 +0200 In-Reply-To: <049b3335f4196044edf950e48a0f6f370878426e.1693712577.git.atai@HIDDEN> (Andy Tai's message of "Sat, 2 Sep 2023 20:44:17 -0700") Message-ID: <87edj7xy2b.fsf_-_@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 65630 Cc: 65630 <at> debbugs.gnu.org X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -3.3 (---) Hi Andy, This apparently causes 30 failures on x86_64-linux: https://qa.guix.gnu.org/issue/65630 Could you take a look? TIA, Ludo=E2=80=99.
guix-patches@HIDDEN:bug#65630; Package guix-patches.
Full text available.
Received: (at 65630) by debbugs.gnu.org; 3 Sep 2023 03:44:47 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sat Sep 02 23:44:47 2023
Received: from localhost ([127.0.0.1]:38993 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qce2Z-0003RS-2O
for submit <at> debbugs.gnu.org; Sat, 02 Sep 2023 23:44:47 -0400
Received: from mail-qk1-x72f.google.com ([2607:f8b0:4864:20::72f]:47197)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <lichengtai@HIDDEN>) id 1qce2R-0003Qy-5w
for 65630 <at> debbugs.gnu.org; Sat, 02 Sep 2023 23:44:44 -0400
Received: by mail-qk1-x72f.google.com with SMTP id
af79cd13be357-76f14d80ea6so24580885a.2
for <65630 <at> debbugs.gnu.org>; Sat, 02 Sep 2023 20:44:28 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20221208; t=1693712663; x=1694317463; darn=debbugs.gnu.org;
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=EZMn+yWTQSb00BqFfSeIxO0dcConJPtmOQGBl0K/xxI=;
b=S/vQG6x/WIowHnp1Fla4VYnI3RW7Knr7CKyP5+5OdvaI07t3Lq2G30wuRwqdOwBvIf
3WIZJu/34+7xt7M1TO0Qgjtu2H5a9MBGP0fvQ7kPBeSHXW+Icc437V9wsfeIo0vOZEQ5
Djknpc+SlB5hrMavkla1dLrIhcSURePKiwvnFUlZ+rQtXfyXSuYWuN4IiElob05nex9p
U3U47gtAUMrUVnvVI6FVH+TGSSAEqWlx046B87jvUJ+1/afdhBYzlo5jBZWYg/WqdqTr
bLy6T+a/YHzCVMq44H1MmZeHQRV9xMoXGvvvBkIT/nUAgJP0Eg4AaDJEdNZ4NyODtSZJ
V73A==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20221208; t=1693712663; x=1694317463;
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=EZMn+yWTQSb00BqFfSeIxO0dcConJPtmOQGBl0K/xxI=;
b=i9M8s78xf5TXl0PR0QKOMWkbCcQPXJLG9BRs/GfmQ/Pk5yZC9SKOEmupqcZpCaRYzv
hI7kcLe1+9eqVvrcwkgRh0sKG762A0cPgwO3ZUf6ygJWWKZzR3OxwQnNv5BXyn1OU6Ny
iAjlIb6ZoqYYZWC74G7l1rfcYL8PLjj7iiCPgqL52tGjUg9XuUT4NzvM2a9GKUv9lLmN
Bun2Vk0+fnxJgBtMDEEWQHJ9V0kpZEDOfFou0kOXZlCGoc1FiniRZWpT6uLgvYUfYBmd
6ksH96RInFZ5qr1+ITBTrD2zzBwg0zUfRpBcs5fkt81xsda3MTZq37Q13gaOXs7+GrAQ
flzw==
X-Gm-Message-State: AOJu0Ywt34488pxa71g/NscG26ZeRfERJg88n96d5rmJxE86hT8IF+Q6
RWl7RHwSSxGKmp8L8DfFxmQ7P710p/HJHg==
X-Google-Smtp-Source: AGHT+IEfI/E2eCf3hod1613FTOJpH9uBIAXneVAEe92v+pjpCcJXUgw6nXZBBMnkt/olrnf741o75A==
X-Received: by 2002:a05:620a:2889:b0:76c:bdbd:c521 with SMTP id
j9-20020a05620a288900b0076cbdbdc521mr7318512qkp.22.1693712663265;
Sat, 02 Sep 2023 20:44:23 -0700 (PDT)
Received: from localhost.localdomain ([98.37.226.98])
by smtp.googlemail.com with ESMTPSA id
z14-20020aa785ce000000b00689f10adef9sm5169789pfn.67.2023.09.02.20.44.22
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Sat, 02 Sep 2023 20:44:22 -0700 (PDT)
From: Andy Tai <atai@HIDDEN>
To: 65630 <at> debbugs.gnu.org
Subject: [PATCH v2 2/2] gnu: onnx: Update to 1.14.1
Date: Sat, 2 Sep 2023 20:44:17 -0700
Message-ID: <049b3335f4196044edf950e48a0f6f370878426e.1693712577.git.atai@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <0293efc03e0aba3e3ae0268062ed37639433fc1e.1693712577.git.atai@HIDDEN>
References: <0293efc03e0aba3e3ae0268062ed37639433fc1e.1693712577.git.atai@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.5 (/)
X-Debbugs-Envelope-To: 65630
Cc: Andy Tai <atai@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.5 (/)
* gnu/packages/machine-learning.scm (onnx): Update to 1.14.1
* gnu/packages/patches/onnx-skip-model-downloads.patch: Adjust to onnx 1.14.1
* gnu/packages/patches/onnx-use-system-googletest.patch: Adjust to onnx 1.14.1
---
gnu/packages/machine-learning.scm | 12 ++++++++----
gnu/packages/patches/onnx-skip-model-downloads.patch | 8 ++++----
.../patches/onnx-use-system-googletest.patch | 8 +++-----
3 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm
index 53778114eb..d8d99addd1 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -1025,7 +1025,7 @@ (define-public shogun
(define-public onnx
(package
(name "onnx")
- (version "1.12.0")
+ (version "1.14.1")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -1033,7 +1033,7 @@ (define-public onnx
(commit (string-append "v" version))))
(sha256
(base32
- "1g9f1hviksbn7gi6fnd0dsm7nf0w3yia0mjj33d9mggklrl0db6x"))
+ "1lg67z5kzky5qmfcll6dg9pkbdric4d2zwxs89ljc0nyla9rsm35"))
(file-name (git-file-name name version))
(patches (search-patches "onnx-use-system-googletest.patch"
"onnx-shared-libraries.patch"
@@ -1059,7 +1059,9 @@ (define-public onnx
(string-append "-DCMAKE_INSTALL_RPATH=" out
"/lib")
"-DCMAKE_VERBOSE_MAKEFILE=ON"
-
+ "-DONNX_USE_PROTOBUF_SHARED_LIBS=ON"
+ "-DONNX_OPT_USE_SYSTEM_PROTOBUF=ON"
+ ; force system copy use;
"-DBUILD_SHARED_LIBS=ON"))
;; This environment variable is honored by 'setup.py',
@@ -1090,10 +1092,12 @@ (define-public onnx
pybind11
python-coverage
python-nbval
+ python-parameterized
+ python-protobuf
python-pytest
python-pytest-runner))
(inputs
- (list protobuf))
+ (list protobuf ))
(propagated-inputs
(list python-numpy python-protobuf python-six python-tabulate
python-typing-extensions))
diff --git a/gnu/packages/patches/onnx-skip-model-downloads.patch b/gnu/packages/patches/onnx-skip-model-downloads.patch
index 4ab55b4ceb..e96f4cb7d9 100644
--- a/gnu/packages/patches/onnx-skip-model-downloads.patch
+++ b/gnu/packages/patches/onnx-skip-model-downloads.patch
@@ -6,10 +6,10 @@ diff --git a/onnx/backend/test/runner/__init__.py b/onnx/backend/test/runner/__i
index 049ed57b..f236f1bf 100644
--- a/onnx/backend/test/runner/__init__.py
+++ b/onnx/backend/test/runner/__init__.py
-@@ -202,6 +202,7 @@ class Runner(object):
- print('Start downloading model {} from {}'.format(
- model_test.model_name,
- model_test.url))
+@@ -227,6 +227,7 @@ class Runner(object):
+ print(
+ f"Start downloading model {model_test.model_name} from {model_test.url}"
+ )
+ raise unittest.SkipTest('Skipping download')
urlretrieve(model_test.url, download_file.name)
print('Done')
diff --git a/gnu/packages/patches/onnx-use-system-googletest.patch b/gnu/packages/patches/onnx-use-system-googletest.patch
index 5dfcbc6dc3..4279ea37c6 100644
--- a/gnu/packages/patches/onnx-use-system-googletest.patch
+++ b/gnu/packages/patches/onnx-use-system-googletest.patch
@@ -28,21 +28,19 @@ index 0aa9fda2..a573170c 100644
if((ONNX_USE_LITE_PROTO AND TARGET protobuf::libprotobuf-lite) OR ((NOT ONNX_USE_LITE_PROTO) AND TARGET protobuf::libprotobuf))
diff --git a/cmake/unittest.cmake b/cmake/unittest.cmake
-index e29a93ff..ae146390 100644
+index e71b92a7..30c446ce 100644
--- a/cmake/unittest.cmake
+++ b/cmake/unittest.cmake
-@@ -6,8 +6,8 @@ include(${ONNX_ROOT}/cmake/Utils.cmake)
+@@ -7,7 +7,7 @@ include(${ONNX_ROOT}/cmake/Utils.cmake)
find_package(Threads)
-set(${UT_NAME}_libs ${googletest_STATIC_LIBRARIES})
--set(${ONNXIFI_TEST_DRIVER}_libs ${googletest_STATIC_LIBRARIES})
+set(${UT_NAME}_libs ${GTEST_LIBRARIES})
-+set(${ONNXIFI_TEST_DRIVER}_libs ${GTEST_LIBRARIES})
list(APPEND ${UT_NAME}_libs onnx)
list(APPEND ${UT_NAME}_libs onnx_proto)
-@@ -31,10 +31,10 @@ function(AddTest)
+@@ -22,10 +22,10 @@ function(AddTest)
list(REMOVE_DUPLICATES _UT_SOURCES)
add_executable(${_UT_TARGET} ${_UT_SOURCES})
--
2.41.0
guix-patches@HIDDEN:bug#65630; Package guix-patches.
Full text available.
Received: (at 65630) by debbugs.gnu.org; 3 Sep 2023 03:44:44 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sat Sep 02 23:44:44 2023
Received: from localhost ([127.0.0.1]:38991 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qce2V-0003RD-Os
for submit <at> debbugs.gnu.org; Sat, 02 Sep 2023 23:44:44 -0400
Received: from mail-qk1-x732.google.com ([2607:f8b0:4864:20::732]:50470)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <lichengtai@HIDDEN>) id 1qce2Q-0003Qw-Ag
for 65630 <at> debbugs.gnu.org; Sat, 02 Sep 2023 23:44:41 -0400
Received: by mail-qk1-x732.google.com with SMTP id
af79cd13be357-76ef27a8e4dso30493585a.1
for <65630 <at> debbugs.gnu.org>; Sat, 02 Sep 2023 20:44:28 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20221208; t=1693712662; x=1694317462; darn=debbugs.gnu.org;
h=content-transfer-encoding:mime-version:message-id:date:subject:cc
:to:from:sender:from:to:cc:subject:date:message-id:reply-to;
bh=Mggkt2zw1gZK2b1DsGk0TrnNIujf4wq+WWjxDgbPjsA=;
b=XYO2Ci7WUOt2XLIMhVpGsHElIdkGo5A8wDaRCdg6y+JwteRMSrX6wxnfr8yNfmT0Y8
mK1gKOx+n+z0uO2g0iJIb5EhIbR/mC11Iig3pyrNyvVUM91SJw4+cvR+p1NBbdoKaeeg
yPOZXdzeJqNi1r9eU8cAD2mfguop+zbZ+TnX1DbqFJXAMbhEECbX6wzN9CQpqizfCXkg
Kmlg6tE5jmDAAdrTiT8nC9fSK/gVAJyUz4EAjBF59ZbTrHRIaZ5pKkYwENyx6nTj69Nc
pCxfYRN5kgrqIaHkm24nV9Emg3QY75/QoEZiK7/dpV2Tn1op/y6gonWu1DuXEwcr1Ui6
LbDQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20221208; t=1693712662; x=1694317462;
h=content-transfer-encoding:mime-version:message-id:date:subject:cc
:to:from:sender:x-gm-message-state:from:to:cc:subject:date
:message-id:reply-to;
bh=Mggkt2zw1gZK2b1DsGk0TrnNIujf4wq+WWjxDgbPjsA=;
b=JarAzMb/km3wVR0zPG+g0pXSGf1Qa382O3DUigb8lh+dqhnHAFtlnbrCr2GRqPUaPm
iCIdRd5P+LvYQshR1waKNd6mGdIREibf+SNz8h1CMEwIzPko+xky6f71FoQ2ke50xeJG
n3ssGVYK3L2bfY0zT/qLbWlvId5BZDidfld5hIgoYzwTbt/9/63PMlZcgPRqxP6hnD1H
1s/H7c1kQ29wzFOx7p1PTa1XspJtzEZoY096dPRiC4A8BBXkZyZWyIleLeGA+4aiwjxB
uybGtsSVSwbc4s55mgMLilWN3v3oQ2CxSUnVRMSE7QUbI+WIwp0JutCdKu98qiZzQxTi
eHww==
X-Gm-Message-State: AOJu0Yx91gB7jQth9m9+cMuS2bk46tPNhMiGUZqdF70BMw0FUf+osJkb
sHFvbSVaaZnkKG5w8NI3X3eqJ4FPHNvsBw==
X-Google-Smtp-Source: AGHT+IF9BaXhMUkZ2xuJ1G8ONk1Z4DqFGkXzkYFJb5VuQYDf60S9dYTk4UHMpxCtj2sPoYLKq4J/BA==
X-Received: by 2002:a05:620a:448b:b0:76f:d8b:d6bf with SMTP id
x11-20020a05620a448b00b0076f0d8bd6bfmr10634300qkp.22.1693712662331;
Sat, 02 Sep 2023 20:44:22 -0700 (PDT)
Received: from localhost.localdomain ([98.37.226.98])
by smtp.googlemail.com with ESMTPSA id
z14-20020aa785ce000000b00689f10adef9sm5169789pfn.67.2023.09.02.20.44.21
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Sat, 02 Sep 2023 20:44:21 -0700 (PDT)
From: Andy Tai <atai@HIDDEN>
To: 65630 <at> debbugs.gnu.org
Subject: [PATCH v2 1/2] gnu: python-protobuf: Update to 3.20.3
Date: Sat, 2 Sep 2023 20:44:16 -0700
Message-ID: <0293efc03e0aba3e3ae0268062ed37639433fc1e.1693712577.git.atai@HIDDEN>
X-Mailer: git-send-email 2.41.0
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.5 (/)
X-Debbugs-Envelope-To: 65630
Cc: Andy Tai <atai@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.5 (/)
* gnu/packages/protobuf.scm (python-protobuf): Update to 3.20.3
---
gnu/packages/protobuf.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/protobuf.scm b/gnu/packages/protobuf.scm
index 8cd805799e..dc3ba72ee1 100644
--- a/gnu/packages/protobuf.scm
+++ b/gnu/packages/protobuf.scm
@@ -425,14 +425,14 @@ (define-public python-nanopb
(define-public python-protobuf
(package
(name "python-protobuf")
- (version "3.20.1")
+ (version "3.20.3")
(source
(origin
(method url-fetch)
(uri (pypi-uri "protobuf" version))
(sha256
(base32
- "1ja2vpk9nklllmsirmil2s4l7ni9yfqvbvj47zz5xx17s1k1bhxd"))))
+ "1wh5f4rnzbv46xy1rx62cprhg5hqf2py06s9b7rfpzwwki12fd1f"))))
(build-system python-build-system)
(inputs (list protobuf))
(arguments
base-commit: 4818ad5ba204e094fd8995c90c16ee1940e76210
--
2.41.0
guix-patches@HIDDEN:bug#65630; Package guix-patches.
Full text available.Andy Tai <atai@HIDDEN>
to control <at> debbugs.gnu.org.
Full text available.
Received: (at 65630) by debbugs.gnu.org; 30 Aug 2023 17:06:25 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Aug 30 13:06:25 2023
Received: from localhost ([127.0.0.1]:53898 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qbOe9-0008EX-DL
for submit <at> debbugs.gnu.org; Wed, 30 Aug 2023 13:06:25 -0400
Received: from mail-pf1-x42f.google.com ([2607:f8b0:4864:20::42f]:54300)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <lichengtai@HIDDEN>) id 1qbOe6-0008EK-If
for 65630 <at> debbugs.gnu.org; Wed, 30 Aug 2023 13:06:24 -0400
Received: by mail-pf1-x42f.google.com with SMTP id
d2e1a72fcca58-68a3cae6d94so4995506b3a.0
for <65630 <at> debbugs.gnu.org>; Wed, 30 Aug 2023 10:06:14 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20221208; t=1693415168; x=1694019968; darn=debbugs.gnu.org;
h=content-transfer-encoding:mime-version:message-id:date:subject:cc
:to:from:sender:from:to:cc:subject:date:message-id:reply-to;
bh=HRjqE+JUWqiWyqLK3/lSZYilSFZbYcDTcaHifZpfAeI=;
b=XMtEGiIpIONXQnpyCmoMMFEgN+Q2Um5sNduublmCzdF6YV8TU+AW/N2TWlo3OXGo3q
MTS45pLR+l0ZfrG9UtzXol0O/TtmwJx8jLRn0q2U6KfYBawJK5J+9Ws6VDbFoK7xKwHL
yajvbXYvlOwVdeUqcHyQhHvDTqbg7gqhVSrRNS0ds714CO8hMfG6pNCwZ8+hYzb5j3Yh
i34ASKNs4Y90HiGpy0FIhQtakmmWGPnVP/jS0bkZ8c8Lt03DkA5v7yE1XOHE0hpmtgk5
B2jXqA1DNTaW6pcuRW/afGxDcwmj260ruFxjL5+GVT2oNkcvgn+HDGfOF8FYXnKeo/Ln
ADJQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20221208; t=1693415168; x=1694019968;
h=content-transfer-encoding:mime-version:message-id:date:subject:cc
:to:from:sender:x-gm-message-state:from:to:cc:subject:date
:message-id:reply-to;
bh=HRjqE+JUWqiWyqLK3/lSZYilSFZbYcDTcaHifZpfAeI=;
b=ZFZiBmBKdUFO6kiYI6JXhbpDTuUKtDJdf5xqHbwMjRLv5Vkwy053Tw8MGYxUDQPNw3
JVdjIgMjGOtuJa8espUCm33oGbQ4NUqQxYmPRKTmkPHZ5xbxS4OMVvINS+eqrME+S6Tj
Xubk19neRUykqJRZ7xA2zeya0QpI76oDpHuw0vI8qwQhTcwtt50VEuvdQXtFgfnRWEcI
pQLziMOIOBBYsp0xRW8eeaoOF4ZnUTHj138+cIR4sM9roMOIP4wwRsZLo63qYjhP8LWK
447UL5cuBaroI45BlAEoF+WIYgtdFyJ05OB0QmH2zZ1l1rmON914j0i9NyW8MwPjapQ6
Fwow==
X-Gm-Message-State: AOJu0YzGhBbJUjYh65TGTTrRTxOIJjV+BiXxPTOopq+a54aa+nwBtB6T
8oUNA4TH5f4AeQIKJYzoAKODWZYCFz2Mog==
X-Google-Smtp-Source: AGHT+IFHB9qnKrmvEPAkuCq6/EH+iaIOQDqZAkESf59QzLGWOIx+toXiKjJ00ONSKEFPp/2mJt53fg==
X-Received: by 2002:a05:6a20:9146:b0:13a:43e8:3fb5 with SMTP id
x6-20020a056a20914600b0013a43e83fb5mr3368772pzc.51.1693415168200;
Wed, 30 Aug 2023 10:06:08 -0700 (PDT)
Received: from localhost.localdomain ([98.37.226.98])
by smtp.googlemail.com with ESMTPSA id
y17-20020aa78051000000b00688c733fe92sm10237347pfm.215.2023.08.30.10.06.07
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Wed, 30 Aug 2023 10:06:07 -0700 (PDT)
From: Andy Tai <atai@HIDDEN>
To: 65630 <at> debbugs.gnu.org
Subject: [PATCH v2] gnu: onnx: Update to 1.14.1
Date: Wed, 30 Aug 2023 10:06:04 -0700
Message-ID: <5bf5b37e1a443ec05011f7acef4a3b96b88b70be.1693415134.git.atai@HIDDEN>
X-Mailer: git-send-email 2.41.0
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.5 (/)
X-Debbugs-Envelope-To: 65630
Cc: Andy Tai <atai@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.5 (/)
* gnu/packages/machine-learning.scm (onnx): Update to 1.14.1
* gnu/packages/patches/onnx-skip-model-downloads.patch: Adjust to onnx 1.14.1
* gnu/packages/patches/onnx-use-system-googletest.patch: Adjust to onnx 1.14.1
---
gnu/packages/machine-learning.scm | 9 ++++++---
gnu/packages/patches/onnx-skip-model-downloads.patch | 8 ++++----
gnu/packages/patches/onnx-use-system-googletest.patch | 8 +++-----
3 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm
index ca7ca0ff09..626afeb030 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -1025,7 +1025,7 @@ (define-public shogun
(define-public onnx
(package
(name "onnx")
- (version "1.12.0")
+ (version "1.14.1")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -1033,7 +1033,7 @@ (define-public onnx
(commit (string-append "v" version))))
(sha256
(base32
- "1g9f1hviksbn7gi6fnd0dsm7nf0w3yia0mjj33d9mggklrl0db6x"))
+ "1lg67z5kzky5qmfcll6dg9pkbdric4d2zwxs89ljc0nyla9rsm35"))
(file-name (git-file-name name version))
(patches (search-patches "onnx-use-system-googletest.patch"
"onnx-shared-libraries.patch"
@@ -1059,7 +1059,10 @@ (define-public onnx
(string-append "-DCMAKE_INSTALL_RPATH=" out
"/lib")
"-DCMAKE_VERBOSE_MAKEFILE=ON"
-
+ "-DCMAKE_POLICY_DEFAULT_CMP0074=NEW"
+ ; honor packagename_ROOT defines
+ (string-append "-DGTest_ROOT="
+ (assoc-ref %build-inputs "googletest"))
"-DBUILD_SHARED_LIBS=ON"))
;; This environment variable is honored by 'setup.py',
diff --git a/gnu/packages/patches/onnx-skip-model-downloads.patch b/gnu/packages/patches/onnx-skip-model-downloads.patch
index 4ab55b4ceb..e96f4cb7d9 100644
--- a/gnu/packages/patches/onnx-skip-model-downloads.patch
+++ b/gnu/packages/patches/onnx-skip-model-downloads.patch
@@ -6,10 +6,10 @@ diff --git a/onnx/backend/test/runner/__init__.py b/onnx/backend/test/runner/__i
index 049ed57b..f236f1bf 100644
--- a/onnx/backend/test/runner/__init__.py
+++ b/onnx/backend/test/runner/__init__.py
-@@ -202,6 +202,7 @@ class Runner(object):
- print('Start downloading model {} from {}'.format(
- model_test.model_name,
- model_test.url))
+@@ -227,6 +227,7 @@ class Runner(object):
+ print(
+ f"Start downloading model {model_test.model_name} from {model_test.url}"
+ )
+ raise unittest.SkipTest('Skipping download')
urlretrieve(model_test.url, download_file.name)
print('Done')
diff --git a/gnu/packages/patches/onnx-use-system-googletest.patch b/gnu/packages/patches/onnx-use-system-googletest.patch
index 5dfcbc6dc3..4279ea37c6 100644
--- a/gnu/packages/patches/onnx-use-system-googletest.patch
+++ b/gnu/packages/patches/onnx-use-system-googletest.patch
@@ -28,21 +28,19 @@ index 0aa9fda2..a573170c 100644
if((ONNX_USE_LITE_PROTO AND TARGET protobuf::libprotobuf-lite) OR ((NOT ONNX_USE_LITE_PROTO) AND TARGET protobuf::libprotobuf))
diff --git a/cmake/unittest.cmake b/cmake/unittest.cmake
-index e29a93ff..ae146390 100644
+index e71b92a7..30c446ce 100644
--- a/cmake/unittest.cmake
+++ b/cmake/unittest.cmake
-@@ -6,8 +6,8 @@ include(${ONNX_ROOT}/cmake/Utils.cmake)
+@@ -7,7 +7,7 @@ include(${ONNX_ROOT}/cmake/Utils.cmake)
find_package(Threads)
-set(${UT_NAME}_libs ${googletest_STATIC_LIBRARIES})
--set(${ONNXIFI_TEST_DRIVER}_libs ${googletest_STATIC_LIBRARIES})
+set(${UT_NAME}_libs ${GTEST_LIBRARIES})
-+set(${ONNXIFI_TEST_DRIVER}_libs ${GTEST_LIBRARIES})
list(APPEND ${UT_NAME}_libs onnx)
list(APPEND ${UT_NAME}_libs onnx_proto)
-@@ -31,10 +31,10 @@ function(AddTest)
+@@ -22,10 +22,10 @@ function(AddTest)
list(REMOVE_DUPLICATES _UT_SOURCES)
add_executable(${_UT_TARGET} ${_UT_SOURCES})
base-commit: 74d72046bdc1ed6c859565570d0db58d20c9ddd7
--
2.41.0
guix-patches@HIDDEN:bug#65630; Package guix-patches.
Full text available.
Received: (at submit) by debbugs.gnu.org; 30 Aug 2023 16:40:33 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Aug 30 12:40:33 2023
Received: from localhost ([127.0.0.1]:53851 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qbOF7-0007UC-5b
for submit <at> debbugs.gnu.org; Wed, 30 Aug 2023 12:40:33 -0400
Received: from lists.gnu.org ([2001:470:142::17]:37964)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <lichengtai@HIDDEN>) id 1qbOF4-0007Ty-60
for submit <at> debbugs.gnu.org; Wed, 30 Aug 2023 12:40:31 -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 <lichengtai@HIDDEN>)
id 1qbOEr-00012r-2S
for guix-patches@HIDDEN; Wed, 30 Aug 2023 12:40:17 -0400
Received: from mail-pf1-x432.google.com ([2607:f8b0:4864:20::432])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <lichengtai@HIDDEN>)
id 1qbOEo-0001Tq-I3
for guix-patches@HIDDEN; Wed, 30 Aug 2023 12:40:16 -0400
Received: by mail-pf1-x432.google.com with SMTP id
d2e1a72fcca58-68becf931d0so4233523b3a.3
for <guix-patches@HIDDEN>; Wed, 30 Aug 2023 09:40:13 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20221208; t=1693413612; x=1694018412; darn=gnu.org;
h=content-transfer-encoding:mime-version:message-id:date:subject:cc
:to:from:sender:from:to:cc:subject:date:message-id:reply-to;
bh=zHr36RdJgS7bTm9NFxaIavWTy+UGziwnwEXZe0DlPIs=;
b=LP4xk/wB6Oxc0IiPsefrCtWLboV20yns7VJxqWLTyvWZ8nTTlnfBY4BCVL+0NfpNTK
LWGHIjx1UYyP/M+HpzW1V35aP+qMaMkUR8AneZ4w3qq/Ju2Kpw+a6Wj3H0WBWpQBUO6H
UADUflZoqvC7cmROosCVCnyxnTVnaEvvjQQLV1uH/Far4m3jHqsogGeOUm38WvQV152n
nII5D1pRsl6mQvKEoJKvZ+D56C2Ao7JpQ+EADWDCfAtkErC+DqM8LiKFGXq7AQRIQ771
g0j5sQ3tHo5qwTrrapEM9HI11hn6o9yobwzw77Ppb63SHuuNECRvJlMsOIAyelzU3l93
FA7g==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20221208; t=1693413612; x=1694018412;
h=content-transfer-encoding:mime-version:message-id:date:subject:cc
:to:from:sender:x-gm-message-state:from:to:cc:subject:date
:message-id:reply-to;
bh=zHr36RdJgS7bTm9NFxaIavWTy+UGziwnwEXZe0DlPIs=;
b=HO4vM7wWJKQjf+9/WNrx7YHOJz8qh9F+GZTOsJGMXu7CuVp7idwU1iTbYrNHVhTpTG
GhbCpIDUOdGY0LcdSRemSNXBcCvJewn6rBaEaB2LtSjHfapLczQJoXzDpUrZ4UxGJutB
7grpwFCRnaEmDvceAekzTpYGNhasz22xoZcSwjMEewgtAUhnV2+1yqlF1r5qirI4neHA
aZO3cdbFVltOuZRYNqoXcLeMUWO2rI+e12zyXRvN6stStfTgOPcRKw4GTf4rOY7Bkrm5
ETpOmmi3F//NGnLxVoDz/4dK+garvh+v105JoGeEaiFOeHCG691J5UppKm7sIIzihVyN
gn5w==
X-Gm-Message-State: AOJu0YyAHp0O5RaL6kxkDHfjJ8Vn0wlnS+fVlzoKeBMwj9Ulq4I0PfeI
TOEL85B85kQCjJ3FD526j1rBxi930y02ig==
X-Google-Smtp-Source: AGHT+IGKEvPd5gD0w9HVyHVsjFIK7+F+D9Wc2++GcFUWLJGHqrT9yA2RqUx3O3nAr0HSX+DxQ+C0Cw==
X-Received: by 2002:a17:90a:fc82:b0:269:2356:19fb with SMTP id
ci2-20020a17090afc8200b00269235619fbmr2508392pjb.15.1693413612395;
Wed, 30 Aug 2023 09:40:12 -0700 (PDT)
Received: from localhost.localdomain ([98.37.226.98])
by smtp.googlemail.com with ESMTPSA id
ev1-20020a17090aeac100b00267ee71f463sm2380805pjb.0.2023.08.30.09.40.11
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Wed, 30 Aug 2023 09:40:11 -0700 (PDT)
From: Andy Tai <atai@HIDDEN>
To: guix-patches@HIDDEN,
guix-patches@HIDDEN
Subject: [PATCH] gnu: onnx: Update to 1.14.1
Date: Wed, 30 Aug 2023 09:40:07 -0700
Message-ID: <a5f1270005a0be3f958485d2395f0238a4eeb757.1693413551.git.atai@HIDDEN>
X-Mailer: git-send-email 2.41.0
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Received-SPF: pass client-ip=2607:f8b0:4864:20::432;
envelope-from=lichengtai@HIDDEN; helo=mail-pf1-x432.google.com
X-Spam_score_int: -14
X-Spam_score: -1.5
X-Spam_bar: -
X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249,
FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249,
RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,
SPF_PASS=-0.001 autolearn=no autolearn_force=no
X-Spam_action: no action
X-Spam-Score: 1.5 (+)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
has NOT identified this incoming email as spam. The original
message has been attached to this so you can view it or label
similar future email. If you have any questions, see
the administrator of that system for details.
Content preview: * gnu/packages/machine-learning.scm (onnx): Update to 1.14.1
* gnu/packages/patches/onnx-skip-model-downloads.patch: Adjust to onnx 1.14.1
* gnu/packages/patches/onnx-use-system-googletest.patch: Adju [...]
Content analysis details: (1.5 points, 10.0 required)
pts rule name description
---- ---------------------- --------------------------------------------------
-0.0 SPF_HELO_PASS SPF: HELO matches SPF record
0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail
provider (lichengtai[at]gmail.com)
1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail)
0.2 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level
mail domains are different
0.2 FREEMAIL_FORGED_FROMDOMAIN 2nd level domains in From and
EnvelopeFrom freemail headers are different
X-Debbugs-Envelope-To: submit
Cc: Andy Tai <atai@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 0.5 (/)
* gnu/packages/machine-learning.scm (onnx): Update to 1.14.1
* gnu/packages/patches/onnx-skip-model-downloads.patch: Adjust to onnx 1.14.1
* gnu/packages/patches/onnx-use-system-googletest.patch: Adjust to onnx 1.14.1
---
gnu/packages/machine-learning.scm | 8 +++++---
gnu/packages/patches/onnx-skip-model-downloads.patch | 8 ++++----
gnu/packages/patches/onnx-use-system-googletest.patch | 8 +++-----
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm
index ca7ca0ff09..267033ef56 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -1025,7 +1025,7 @@ (define-public shogun
(define-public onnx
(package
(name "onnx")
- (version "1.12.0")
+ (version "1.14.1")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -1033,7 +1033,7 @@ (define-public onnx
(commit (string-append "v" version))))
(sha256
(base32
- "1g9f1hviksbn7gi6fnd0dsm7nf0w3yia0mjj33d9mggklrl0db6x"))
+ "1lg67z5kzky5qmfcll6dg9pkbdric4d2zwxs89ljc0nyla9rsm35"))
(file-name (git-file-name name version))
(patches (search-patches "onnx-use-system-googletest.patch"
"onnx-shared-libraries.patch"
@@ -1059,7 +1059,9 @@ (define-public onnx
(string-append "-DCMAKE_INSTALL_RPATH=" out
"/lib")
"-DCMAKE_VERBOSE_MAKEFILE=ON"
-
+ "-DCMAKE_POLICY_DEFAULT_CMP0074=NEW" ; honor packagename_ROOT defines
+ (string-append "-DGTest_ROOT="
+ (assoc-ref %build-inputs "googletest"))
"-DBUILD_SHARED_LIBS=ON"))
;; This environment variable is honored by 'setup.py',
diff --git a/gnu/packages/patches/onnx-skip-model-downloads.patch b/gnu/packages/patches/onnx-skip-model-downloads.patch
index 4ab55b4ceb..e96f4cb7d9 100644
--- a/gnu/packages/patches/onnx-skip-model-downloads.patch
+++ b/gnu/packages/patches/onnx-skip-model-downloads.patch
@@ -6,10 +6,10 @@ diff --git a/onnx/backend/test/runner/__init__.py b/onnx/backend/test/runner/__i
index 049ed57b..f236f1bf 100644
--- a/onnx/backend/test/runner/__init__.py
+++ b/onnx/backend/test/runner/__init__.py
-@@ -202,6 +202,7 @@ class Runner(object):
- print('Start downloading model {} from {}'.format(
- model_test.model_name,
- model_test.url))
+@@ -227,6 +227,7 @@ class Runner(object):
+ print(
+ f"Start downloading model {model_test.model_name} from {model_test.url}"
+ )
+ raise unittest.SkipTest('Skipping download')
urlretrieve(model_test.url, download_file.name)
print('Done')
diff --git a/gnu/packages/patches/onnx-use-system-googletest.patch b/gnu/packages/patches/onnx-use-system-googletest.patch
index 5dfcbc6dc3..4279ea37c6 100644
--- a/gnu/packages/patches/onnx-use-system-googletest.patch
+++ b/gnu/packages/patches/onnx-use-system-googletest.patch
@@ -28,21 +28,19 @@ index 0aa9fda2..a573170c 100644
if((ONNX_USE_LITE_PROTO AND TARGET protobuf::libprotobuf-lite) OR ((NOT ONNX_USE_LITE_PROTO) AND TARGET protobuf::libprotobuf))
diff --git a/cmake/unittest.cmake b/cmake/unittest.cmake
-index e29a93ff..ae146390 100644
+index e71b92a7..30c446ce 100644
--- a/cmake/unittest.cmake
+++ b/cmake/unittest.cmake
-@@ -6,8 +6,8 @@ include(${ONNX_ROOT}/cmake/Utils.cmake)
+@@ -7,7 +7,7 @@ include(${ONNX_ROOT}/cmake/Utils.cmake)
find_package(Threads)
-set(${UT_NAME}_libs ${googletest_STATIC_LIBRARIES})
--set(${ONNXIFI_TEST_DRIVER}_libs ${googletest_STATIC_LIBRARIES})
+set(${UT_NAME}_libs ${GTEST_LIBRARIES})
-+set(${ONNXIFI_TEST_DRIVER}_libs ${GTEST_LIBRARIES})
list(APPEND ${UT_NAME}_libs onnx)
list(APPEND ${UT_NAME}_libs onnx_proto)
-@@ -31,10 +31,10 @@ function(AddTest)
+@@ -22,10 +22,10 @@ function(AddTest)
list(REMOVE_DUPLICATES _UT_SOURCES)
add_executable(${_UT_TARGET} ${_UT_SOURCES})
base-commit: 74d72046bdc1ed6c859565570d0db58d20c9ddd7
--
2.41.0
Andy Tai <atai@HIDDEN>:guix-patches@HIDDEN.
Full text available.guix-patches@HIDDEN:bug#65630; Package guix-patches.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.