From patchwork Wed Aug 30 17:06:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Tai X-Patchwork-Id: 53297 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 CFD6327BBEA; Wed, 30 Aug 2023 18:07: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=ham 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 83F7327BBE2 for ; Wed, 30 Aug 2023 18:07:29 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qbOef-0007Gk-MK; Wed, 30 Aug 2023 13:06:57 -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 1qbOed-0007Ea-EW for guix-patches@gnu.org; Wed, 30 Aug 2023 13:06: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 1qbOed-0007UM-6v for guix-patches@gnu.org; Wed, 30 Aug 2023 13:06:55 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qbOek-0008Fk-R0 for guix-patches@gnu.org; Wed, 30 Aug 2023 13:07:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65630] [PATCH v2] gnu: onnx: Update to 1.14.1 References: In-Reply-To: Resent-From: Andy Tai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 30 Aug 2023 17:07:02 +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.169341518531658 (code B ref 65630); Wed, 30 Aug 2023 17:07:02 +0000 Received: (at 65630) by debbugs.gnu.org; 30 Aug 2023 17:06:25 +0000 Received: from localhost ([127.0.0.1]:53898 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qbOe9-0008EX-DL for submit@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 ) id 1qbOe6-0008EK-If for 65630@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@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 Date: Wed, 30 Aug 2023 10:06:04 -0700 Message-ID: <5bf5b37e1a443ec05011f7acef4a3b96b88b70be.1693415134.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/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(-) base-commit: 74d72046bdc1ed6c859565570d0db58d20c9ddd7 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})