From patchwork Sun Sep 10 20:01:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Tai X-Patchwork-Id: 53709 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 AAA7927BBEC; Sun, 10 Sep 2023 21:02:36 +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 10A0A27BBE2 for ; Sun, 10 Sep 2023 21:02:36 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qfQdA-0002WV-Ki; Sun, 10 Sep 2023 16:02:04 -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 1qfQd5-0002DR-Hf for guix-patches@gnu.org; Sun, 10 Sep 2023 16:01:59 -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 1qfQd5-0006Xf-A0 for guix-patches@gnu.org; Sun, 10 Sep 2023 16:01:59 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qfQd8-0007yx-TK for guix-patches@gnu.org; Sun, 10 Sep 2023 16:02:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65630] [PATCH v3 1/4] 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, 10 Sep 2023 20:02: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.169437609930634 (code B ref 65630); Sun, 10 Sep 2023 20:02:02 +0000 Received: (at 65630) by debbugs.gnu.org; 10 Sep 2023 20:01:39 +0000 Received: from localhost ([127.0.0.1]:51433 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qfQcl-0007xu-3M for submit@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 ) id 1qfQce-0007x8-Ej for 65630@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@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 Date: Sun, 10 Sep 2023 13:01:12 -0700 Message-ID: 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: 5db78e7c1b06d1b4892bdb3e153b95b21577271e 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 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}) From patchwork Sun Sep 10 20:01:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Tai X-Patchwork-Id: 53710 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 32B4827BBE2; Sun, 10 Sep 2023 21:02:38 +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 1F33027BBEA for ; Sun, 10 Sep 2023 21:02:36 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qfQd7-0002JZ-33; 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 1qfQd5-0002DE-0e for guix-patches@gnu.org; Sun, 10 Sep 2023 16:01:59 -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-0006XT-PE 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 1qfQd8-0007yq-Bc for guix-patches@gnu.org; Sun, 10 Sep 2023 16:02:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65630] [PATCH v3 3/4] gnu: onnx: Use G-Expressions. Resent-From: Andy Tai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 10 Sep 2023 20:02: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.169437609930625 (code B ref 65630); Sun, 10 Sep 2023 20:02:02 +0000 Received: (at 65630) by debbugs.gnu.org; 10 Sep 2023 20:01:39 +0000 Received: from localhost ([127.0.0.1]:51431 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qfQck-0007xq-K5 for submit@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 ) id 1qfQcg-0007xC-4T for 65630@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@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 Date: Sun, 10 Sep 2023 13:01:14 -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)[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 From patchwork Sun Sep 10 20:01:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Tai X-Patchwork-Id: 53707 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 89E9527BBE9; Sun, 10 Sep 2023 21:02:13 +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 AEBEB27BBE2 for ; Sun, 10 Sep 2023 21:02:10 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qfQd7-0002NH-F0; 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 1qfQd5-0002EV-UK for guix-patches@gnu.org; Sun, 10 Sep 2023 16:01:59 -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 1qfQd5-0006Xp-MU for guix-patches@gnu.org; Sun, 10 Sep 2023 16:01:59 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qfQd9-0007z4-8t for guix-patches@gnu.org; Sun, 10 Sep 2023 16:02:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65630] [PATCH v3 4/4] gnu: onnx-optimizer: Update to 0.3.17 Resent-From: Andy Tai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 10 Sep 2023 20:02: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.169437610030641 (code B ref 65630); Sun, 10 Sep 2023 20:02:03 +0000 Received: (at 65630) by debbugs.gnu.org; 10 Sep 2023 20:01:40 +0000 Received: from localhost ([127.0.0.1]:51435 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qfQcl-0007y3-Ez for submit@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 ) id 1qfQch-0007xD-2t for 65630@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@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 Date: Sun, 10 Sep 2023 13:01:15 -0700 Message-ID: <298ff69fb8f8e7501dd2f2d0eebc9d40405e2ac6.1694375976.git.atai@atai.org> 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-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 $ $ ) - + +# 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 $) 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)