From patchwork Sun Sep 10 20:01:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Tai X-Patchwork-Id: 53708 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 553E027BBE9; Sun, 10 Sep 2023 21:02:30 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 8278827BBE2 for ; Sun, 10 Sep 2023 21:02:28 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qfQd7-0002Lp-6m; Sun, 10 Sep 2023 16:02:01 -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 ) id 1qfQd4-0002D7-KU for guix-patches@gnu.org; Sun, 10 Sep 2023 16:01:58 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qfQd4-0006XN-DA for guix-patches@gnu.org; Sun, 10 Sep 2023 16:01:58 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qfQd7-0007yi-Vf for guix-patches@gnu.org; Sun, 10 Sep 2023 16:02:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65630] [PATCH v3 2/4] gnu: onnx: Update to 1.14.1 Resent-From: Andy Tai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 10 Sep 2023 20:02:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65630 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65630@debbugs.gnu.org Cc: Andy Tai Received: via spool by 65630-submit@debbugs.gnu.org id=B65630.169437609530608 (code B ref 65630); Sun, 10 Sep 2023 20:02:01 +0000 Received: (at 65630) by debbugs.gnu.org; 10 Sep 2023 20:01:35 +0000 Received: from localhost ([127.0.0.1]:51428 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qfQcg-0007xR-M3 for submit@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 ) id 1qfQcf-0007xA-95 for 65630@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@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 Date: Sun, 10 Sep 2023 13:01:13 -0700 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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})