From patchwork Sun Sep 3 03:44:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Tai X-Patchwork-Id: 53404 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 4486927BBE9; Sun, 3 Sep 2023 04:45:15 +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 4544727BBE2 for ; Sun, 3 Sep 2023 04:45:11 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qce2h-00078c-TM; Sat, 02 Sep 2023 23:44:55 -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 1qce2f-00078J-Rr for guix-patches@gnu.org; Sat, 02 Sep 2023 23:44:53 -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 1qce2f-0001ZN-JD for guix-patches@gnu.org; Sat, 02 Sep 2023 23:44:53 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qce2p-0003SF-BU for guix-patches@gnu.org; Sat, 02 Sep 2023 23:45:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65630] [PATCH v2 1/2] gnu: python-protobuf: Update to 3.20.3 References: In-Reply-To: Resent-From: Andy Tai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 03 Sep 2023 03:45:03 +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.169371268413223 (code B ref 65630); Sun, 03 Sep 2023 03:45:03 +0000 Received: (at 65630) by debbugs.gnu.org; 3 Sep 2023 03:44:44 +0000 Received: from localhost ([127.0.0.1]:38991 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qce2V-0003RD-Os for submit@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 ) id 1qce2Q-0003Qw-Ag for 65630@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@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 Date: Sat, 2 Sep 2023 20:44:16 -0700 Message-ID: <0293efc03e0aba3e3ae0268062ed37639433fc1e.1693712577.git.atai@atai.org> X-Mailer: git-send-email 2.41.0 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/protobuf.scm (python-protobuf): Update to 3.20.3 --- gnu/packages/protobuf.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) base-commit: 4818ad5ba204e094fd8995c90c16ee1940e76210 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 From patchwork Sun Sep 3 03:44:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Tai X-Patchwork-Id: 53405 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 ED81B27BBE9; Sun, 3 Sep 2023 04:45:21 +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 8E7EF27BBE2 for ; Sun, 3 Sep 2023 04:45:19 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qce2i-00078d-48; Sat, 02 Sep 2023 23:44:56 -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 1qce2g-00078U-KJ for guix-patches@gnu.org; Sat, 02 Sep 2023 23:44:54 -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 1qce2g-0001Zm-CF for guix-patches@gnu.org; Sat, 02 Sep 2023 23:44:54 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qce2q-0003SM-8v for guix-patches@gnu.org; Sat, 02 Sep 2023 23:45:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65630] [PATCH v2 2/2] gnu: onnx: Update to 1.14.1 Resent-From: Andy Tai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 03 Sep 2023 03:45:04 +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.169371268713238 (code B ref 65630); Sun, 03 Sep 2023 03:45:04 +0000 Received: (at 65630) by debbugs.gnu.org; 3 Sep 2023 03:44:47 +0000 Received: from localhost ([127.0.0.1]:38993 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qce2Z-0003RS-2O for submit@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 ) id 1qce2R-0003Qy-5w for 65630@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@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 Date: Sat, 2 Sep 2023 20:44:17 -0700 Message-ID: <049b3335f4196044edf950e48a0f6f370878426e.1693712577.git.atai@atai.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <0293efc03e0aba3e3ae0268062ed37639433fc1e.1693712577.git.atai@atai.org> References: <0293efc03e0aba3e3ae0268062ed37639433fc1e.1693712577.git.atai@atai.org> 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 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})