From patchwork Wed Aug 30 16:40:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Tai X-Patchwork-Id: 53296 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 EF68827BBE9; Wed, 30 Aug 2023 17:41:37 +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 88E1D27BBE2 for ; Wed, 30 Aug 2023 17:41:34 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qbOFW-0002VI-3S; Wed, 30 Aug 2023 12:40:58 -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 1qbOFT-0002QE-A2 for guix-patches@gnu.org; Wed, 30 Aug 2023 12:40:55 -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 1qbOFT-0001dV-1d for guix-patches@gnu.org; Wed, 30 Aug 2023 12:40:55 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qbOFa-0007VU-LX for guix-patches@gnu.org; Wed, 30 Aug 2023 12:41:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65630] [PATCH] gnu: onnx: Update to 1.14.1 Resent-From: Andy Tai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 30 Aug 2023 16:41:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 65630 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: guix-patches@gnu.or, 65630@debbugs.gnu.org Cc: Andy Tai X-Debbugs-Original-To: guix-patches@gnu.or, guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.169341363328785 (code B ref -1); Wed, 30 Aug 2023 16:41:02 +0000 Received: (at submit) by debbugs.gnu.org; 30 Aug 2023 16:40:33 +0000 Received: from localhost ([127.0.0.1]:53851 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qbOF7-0007UC-5b for submit@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 ) id 1qbOF4-0007Ty-60 for submit@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 ) id 1qbOEr-00012r-2S for guix-patches@gnu.org; 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 ) id 1qbOEo-0001Tq-I3 for guix-patches@gnu.org; Wed, 30 Aug 2023 12:40:16 -0400 Received: by mail-pf1-x432.google.com with SMTP id d2e1a72fcca58-68becf931d0so4233523b3a.3 for ; 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 Date: Wed, 30 Aug 2023 09:40:07 -0700 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::432; envelope-from=lichengtai@gmail.com; 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-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 | 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(-) base-commit: 74d72046bdc1ed6c859565570d0db58d20c9ddd7 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})