From patchwork Sun Aug 4 22:15:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 66729 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 607A927BBEB; Sun, 4 Aug 2024 23:18:35 +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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, URIBL_BLOCKED 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 7BF5227BBE9 for ; Sun, 4 Aug 2024 23:18:33 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sajXq-0007Xa-KQ; Sun, 04 Aug 2024 18:17:42 -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 1sajXo-0007Wt-Di for guix-patches@gnu.org; Sun, 04 Aug 2024 18:17:40 -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 1sajXo-0000qi-4G for guix-patches@gnu.org; Sun, 04 Aug 2024 18:17:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=p1q4i48FcQFlB8aFA6mq27Ab4ETZuAKF4C8A2uy3+NY=; b=ePUmLyGleAqbI5HqZcGEfVqRJPFbDoMIKBaeLDiaHCGPdTOMeezybFGhUPhxy+TJFliYAdoAI2cAWKJgkjtHndDmfrXfJ0HMRaKysFbFTV8yijpnIeWAxz6QWs/MyLCSO/GSmxMefyKMavnLwPCuPX2+d3RbWBpdLcx6TybWaDf8gs04z/sxdyF6NNzeI2ONar+u95QqIHtJ99X7ZbWjwd0U6Xo5qUEvJgLafkAY9Zzm1WT+5IO//F5dBBLZkJl5Nst2nJGSMxsQwbSopKyv69I4yYJ/m5IG5ESK7c9uPSa+wjid6uAwkaNMVngcPyEUGdWnR2YsCT3O7iggZfvSUQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sajY9-0004Rl-Kq for guix-patches@gnu.org; Sun, 04 Aug 2024 18:18:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72471] [PATCH 01/24] gnu: asmjit: Update to commit 062e69c. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 04 Aug 2024 22:18:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72471 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72471@debbugs.gnu.org Cc: David Elsing Received: via spool by 72471-submit@debbugs.gnu.org id=B72471.172280983716624 (code B ref 72471); Sun, 04 Aug 2024 22:18:01 +0000 Received: (at 72471) by debbugs.gnu.org; 4 Aug 2024 22:17:17 +0000 Received: from localhost ([127.0.0.1]:57464 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sajXR-0004K4-Iy for submit@debbugs.gnu.org; Sun, 04 Aug 2024 18:17:17 -0400 Received: from mout01.posteo.de ([185.67.36.65]:33295) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sajXQ-0004JR-Mp for 72471@debbugs.gnu.org; Sun, 04 Aug 2024 18:17:17 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id DF928240027 for <72471@debbugs.gnu.org>; Mon, 5 Aug 2024 00:16:47 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1722809807; bh=hLRAD6QU8DeMOFyOGhPtQOwFMDFBe8utaF3Y2FvWpBM=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=jvYVi2PUP3frfFrb3ZODlRT28IQUTUFT6ATC/MOwWG6laIpVGvTyARyyh38sjZkhY omBER18FZ6a5dzWo9Oyj6AvCw64Sm7HyrGIT4WXplTxRU0J2t9UtxX/DkTOFlR1PoA 44KDNXGtPHbJNvGJFUQqMoT+frk03MweN4jqOWwkfvnTwqHLTjlOvwVhGXTT4m3AEV 1f1Jc7uGKoCl/6Jk5l94EdAEHxoKsFgKZWbB1HNsiLpXwa+lSESD6zGjpjpELH8M9L 1y+t2lXfx81oAPUG8RRA2fWzIhrE6bcaxJTzMpC2vPuclt+Fs8Ezg3fMkwswlKmcMF 5jwLgOedtQk2A== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4WcYnq1gT7z6tlh; Mon, 5 Aug 2024 00:16:46 +0200 (CEST) From: David Elsing Date: Sun, 4 Aug 2024 22:15:39 +0000 Message-ID: <20240804221635.3805-1-david.elsing@posteo.net> In-Reply-To: <20240804220847.15842-1-david.elsing@posteo.net> References: <20240804220847.15842-1-david.elsing@posteo.net> 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/cpp.scm (asmjit): Update to commit 062e69c. --- gnu/packages/cpp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index c1c2a4028b..6b46465abf 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -158,7 +158,7 @@ (define-public argagg (license license:expat)))) (define-public asmjit - (let ((commit "3ca5c186bf8922e5fe3018432e93651fd2fa4053") + (let ((commit "062e69ca81defa35eb0ee15f7412f49a0dad3cdb") (revision "1")) (package (name "asmjit") @@ -172,7 +172,7 @@ (define-public asmjit (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "10k1zc0w8m0vnh52id9qlm1sb99qmpvr6k0ha8ag2h223n0d591g")))) + (base32 "0lcwqzbv2628g3c7sflkwagyh49lp471px8bhg7lr77w9y94srqq")))) (build-system cmake-build-system) (arguments (list #:configure-flags #~(list "-DASMJIT_TEST=TRUE"))) From patchwork Sun Aug 4 22:15:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 66724 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 748B027BBEA; Sun, 4 Aug 2024 23:18:27 +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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, URIBL_BLOCKED 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 ECB2E27BBE2 for ; Sun, 4 Aug 2024 23:18:26 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sajXq-0007XP-0F; Sun, 04 Aug 2024 18:17:42 -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 1sajXo-0007X3-Ss for guix-patches@gnu.org; Sun, 04 Aug 2024 18:17:40 -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 1sajXo-0000r7-J0 for guix-patches@gnu.org; Sun, 04 Aug 2024 18:17:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=iwyJTbbnnI7uA3aOmEoPx9A835Ti93O/k8V7BbmPCQk=; b=EddC3qtIWJz6vpbg+CKsX/OxHkPDzLN67RuUfiLVSpE5ggSv7f9XKJ+4aITmqfaWQ1mPFXSk/JIlBR8jfhbaovXC5VT+SXacKiWHUYs6YRimie6fgXldQsk91ZDJmHuVmmYDOADT4lktmN2y/ae6piPU1UONq4NAFjrTxvkKId9F9f5NE/yuJJ4Ue+OLojUbA8SgTVp0LSwEUCXYsxWbuyNoa0WYxuwsikJZIy1uHMww7tHXwbDysLntcmiQENLEhOxX1wp2QWHt0lrAvR8HSaCVxkjDeDrm6iyXzYP6MH+l0KnYaUw6N8gHnWBvvtf/lBg2XDJpWVrVzUfsTOTLeQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sajYA-0004Rt-3V for guix-patches@gnu.org; Sun, 04 Aug 2024 18:18:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72471] [PATCH 02/24] gnu: Remove python-typing-extensions-4.10. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 04 Aug 2024 22:18:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72471 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72471@debbugs.gnu.org Cc: David Elsing Received: via spool by 72471-submit@debbugs.gnu.org id=B72471.172280984416689 (code B ref 72471); Sun, 04 Aug 2024 22:18:02 +0000 Received: (at 72471) by debbugs.gnu.org; 4 Aug 2024 22:17:24 +0000 Received: from localhost ([127.0.0.1]:57471 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sajXW-0004L2-Tf for submit@debbugs.gnu.org; Sun, 04 Aug 2024 18:17:23 -0400 Received: from mout02.posteo.de ([185.67.36.66]:60449) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sajXV-0004Jq-Gc for 72471@debbugs.gnu.org; Sun, 04 Aug 2024 18:17:21 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 37558240101 for <72471@debbugs.gnu.org>; Mon, 5 Aug 2024 00:16:53 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1722809813; bh=5RIBTqJTVREq34OeWLJWo0Y1TQow1HXFfNBtrac5GGw=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=Otbv3zhacZqJ0FcfkAks1Ekny2wpvo9Fk32C1m5NpBk0lDIKgL+ysxxHA+ccQUVHu cmp1zOi61U7tnZXF5/mJDfgcdgP5j0goaSYkEaLCEF3QUdRHamVZzbD82D6CIzCnkN vYNhCerQK0H3Y2jkeJji244yyTMuJ7ZeOIY9BwotFDr/uBf/dAKOuhJOhBwNb/PTnA 3lul5q0LAE8YXVJEOv0lG8J6/xXDH7zQ3C3KHIxcS5kudjjjl3sirL3PReTMLDlD3n Vp0VfiX9wngvYxX0ZZij9bctGfI1p8FJYNzeVgvCAEKfBq1VWUx+b3O6315yJ+oFGJ RZHRyJAltloCg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4WcYnw4wBzz6tlh; Mon, 5 Aug 2024 00:16:52 +0200 (CEST) From: David Elsing Date: Sun, 4 Aug 2024 22:15:40 +0000 Message-ID: <20240804221635.3805-2-david.elsing@posteo.net> In-Reply-To: <20240804220847.15842-1-david.elsing@posteo.net> References: <20240804220847.15842-1-david.elsing@posteo.net> 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 (python-typing-extensions-4.10): Delete variable. * gnu/packages/machine-learning.scm (python-pytorch)[native-inputs] Replace python-typing-extensions-4.10 with python-typing-extensions. --- gnu/packages/machine-learning.scm | 2 +- gnu/packages/python-build.scm | 12 ------------ 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 4c5b713cbf..418bfb5d03 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -4666,7 +4666,7 @@ (define-public python-pytorch python-pytest-xdist python-hypothesis python-types-dataclasses - python-typing-extensions-4.10 + python-typing-extensions shaderc valgrind)) (inputs diff --git a/gnu/packages/python-build.scm b/gnu/packages/python-build.scm index 72da369208..43fc018d4c 100644 --- a/gnu/packages/python-build.scm +++ b/gnu/packages/python-build.scm @@ -264,18 +264,6 @@ (define-public python-typing-extensions @end enumerate\n") (license license:psfl))) -(define-public python-typing-extensions-4.10 - (package - (inherit python-typing-extensions) - (version "4.10.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "typing_extensions" version)) - (sha256 - (base32 - "1jxkj4pni8pdyrn79sq441lsp40xzw363n0qvfc6zfcgkv4dgaxh")))))) - ;;; ;;; Python builder packages. From patchwork Sun Aug 4 22:15:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 66719 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 4CF8E27BBEC; Sun, 4 Aug 2024 23:18: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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, URIBL_BLOCKED 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 C30E327BBE2 for ; Sun, 4 Aug 2024 23:18:14 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sajXt-0007YQ-Hl; Sun, 04 Aug 2024 18:17:45 -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 1sajXq-0007XQ-6Z for guix-patches@gnu.org; Sun, 04 Aug 2024 18:17:42 -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 1sajXp-0000rd-Fr for guix-patches@gnu.org; Sun, 04 Aug 2024 18:17:41 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=yp39/ev5CSy3a59FpdGfRMsCLQbOXYAh+JFHP0OWaic=; b=O6wDGSha7thHLSRejjVX4aHnUhuH3xzracpTwikrbZDT3FvbwTa5Z6xNd1nR5gMmIffShbp9NFP53SRKk90VCpxEllj3JO4xZLjF6qstKNhU9qFOQ/di4J4ChiWpvDS8Z19Msc02iZS9o1hNzVKjXLjnt3XKm5m2fzdTF5BT87wpc2VHcRLK2tNBZHaVAy/hx8cDDXqZesusHJ9xaJ6DwgXeQ2loxG0ipC0hQe9kg4YFATG5/3aRJXDvDDiiW1DKa+0g9aX7mY3dB3k74ofjEoXxekCYw+SkEUOpn4FGncNNZ2X91/FEtiiFU2JVNE4tU2EZoA0iI/II6e8JpJ1Ezw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sajYB-0004SA-12 for guix-patches@gnu.org; Sun, 04 Aug 2024 18:18:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72471] [PATCH 03/24] gnu: python-optree: Update to 0.11.0. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 04 Aug 2024 22:18:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72471 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72471@debbugs.gnu.org Cc: David Elsing Received: via spool by 72471-submit@debbugs.gnu.org id=B72471.172280985016789 (code B ref 72471); Sun, 04 Aug 2024 22:18:02 +0000 Received: (at 72471) by debbugs.gnu.org; 4 Aug 2024 22:17:30 +0000 Received: from localhost ([127.0.0.1]:57483 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sajXb-0004MB-RA for submit@debbugs.gnu.org; Sun, 04 Aug 2024 18:17:29 -0400 Received: from mout02.posteo.de ([185.67.36.66]:39921) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sajXV-0004Js-Jk for 72471@debbugs.gnu.org; Sun, 04 Aug 2024 18:17:22 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 6BEFB240101 for <72471@debbugs.gnu.org>; Mon, 5 Aug 2024 00:16:53 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1722809814; bh=OTRN9rfOQrTinp513VyuKdIsxrNBW4uxwIhGZXtxtPI=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=bZH3zpvem4gtQ/qiSEE0yvET4oganJAITG4ja0XUnBwQXyqNRSwAr6DM48jiPfNKu qzro5dQDtFwy1/7jj6lf2jZxKN9bFoGrJhu+xDSlbPEErQfL93QKdVVU/Slxhj/uZr Zbbq2qKltjZQtoQ6KlJMq3pUQQxzTIUe/DdcFfV0ZmFKzVmH/8WUMzlq+1NLlBY0cy EhMdoAAMxF4GOf/irsSESUEJ9uIAkUR/MgnauGVO6oUA/bb0SN05b+uuUD7rQ9N8ZW 3adgm0QvSo5XGeZXu+o8NeS2rBz/+81XpuuD2n90H9HeXqGhklKuRfTU9g/14i1E3Z izQe+tZ2yJARg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4WcYnx1XJLz6tlh; Mon, 5 Aug 2024 00:16:53 +0200 (CEST) From: David Elsing Date: Sun, 4 Aug 2024 22:15:41 +0000 Message-ID: <20240804221635.3805-3-david.elsing@posteo.net> In-Reply-To: <20240804220847.15842-1-david.elsing@posteo.net> References: <20240804220847.15842-1-david.elsing@posteo.net> 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/python-xyz.scm (python-optree): Update to 0.11.0. [arguments]<#:test-flags>: Disable failing test. --- gnu/packages/python-xyz.scm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index ce33b330a3..ae34bd7dcb 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -12300,7 +12300,7 @@ (define-public python-treelib (define-public python-optree (package (name "python-optree") - (version "0.10.0") + (version "0.11.0") (source (origin (method git-fetch) @@ -12310,9 +12310,14 @@ (define-public python-optree (file-name (git-file-name name version)) (sha256 (base32 - "1q3wljk7cyl5rsam02sfsj8zjrqx4c3x9vic8j6xx13p8czpsisg")) + "0sk5lm1xyxi7z0yjckip77qvbidyb7i1znmn9fz96q74hl9ffyan")) (patches (search-patches "python-optree-fix-32-bit.patch")))) (build-system pyproject-build-system) + (arguments + (list + #:test-flags + ;; This test fails due to a circular import + ''("-k" "not test_treespec_pickle_missing_registration"))) (propagated-inputs (list python-typing-extensions)) (native-inputs (list python-pytest From patchwork Sun Aug 4 22:15:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 66725 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 4DCA827BBEA; Sun, 4 Aug 2024 23:18:28 +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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, URIBL_BLOCKED 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 DEA4C27BBE2 for ; Sun, 4 Aug 2024 23:18:27 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sajXq-0007Xm-TT; Sun, 04 Aug 2024 18:17:42 -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 1sajXp-0007XH-CL for guix-patches@gnu.org; Sun, 04 Aug 2024 18:17:41 -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 1sajXp-0000rV-2O for guix-patches@gnu.org; Sun, 04 Aug 2024 18:17:41 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=AHNirhYuZwC1eM37h7qXDjc/3A488D0g7jz4xUor0D4=; b=Qg66MVJpJ5fKJN4BlyPF7WYnKhnJSr7TK4JNoNjrTHjiOPhicCY/nHdWY5B2ZT0ndacD9VngbTTd5mbCSJTPK74ompFpWNs6WgAXIb03KKT5nTcQMZ9/RVZ0fvqkyqE5nIUx8nATrpl47wo5gJTFtFXC4VwxwnJWTuTSbPV1T5BBl+7K1zIirdL++r+Z6PNiInEnLfJYLEiYCuwcR7NWNkiYpUr71WZgGTh7g9akdIOv23kmgacwYgFgGouC+hOwO34ML60EvdnfmluCDCEJsgJqOLfNOc0xrIgsdKlml04pajznfzDJjQ6xjht5Hf6Uh9sYRPBR72stsAHwVnhrqg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sajYA-0004S2-Ic for guix-patches@gnu.org; Sun, 04 Aug 2024 18:18:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72471] [PATCH 04/24] gnu: flatbuffers-next: Update to 24.3.25. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 04 Aug 2024 22:18:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72471 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72471@debbugs.gnu.org Cc: David Elsing Received: via spool by 72471-submit@debbugs.gnu.org id=B72471.172280984516710 (code B ref 72471); Sun, 04 Aug 2024 22:18:02 +0000 Received: (at 72471) by debbugs.gnu.org; 4 Aug 2024 22:17:25 +0000 Received: from localhost ([127.0.0.1]:57473 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sajXX-0004L7-LP for submit@debbugs.gnu.org; Sun, 04 Aug 2024 18:17:24 -0400 Received: from mout02.posteo.de ([185.67.36.66]:52525) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sajXV-0004Jo-G4 for 72471@debbugs.gnu.org; Sun, 04 Aug 2024 18:17:21 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 0C94E240101 for <72471@debbugs.gnu.org>; Mon, 5 Aug 2024 00:16:54 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1722809814; bh=wpEiUjypKa8bwwdO8Fa9jMPvXP0AOtAcYfWHauxoovw=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=Au8Qt1KJkalq2Bf/GZhH+LBdZbpJC3EFlC+RUHLbhlP6abBeS5ZkCWiVM+1O+RH3n qQa0EOw5ifNw2yRNZfGxo6VGK9Ox66ZGnXyhy4xc89SKv+ZPqYQEna8aeo0Tmi6hk9 Hc2LVHgt0LnStUH5Wmf7bZnCwjK2nyGYnu4fj5D1Z0HaE6isCZJrXVjIfx7/kCJa9G /hxCEmuiCZKox/HznDItVV1ry2evbjEhdvkUugU+HX6pZ7ZC4yNsh4rj7HvZTJzZPx BIBOqf23RC05bptmTLgPZ+/tOqnwnfXgZ2ZWgrQY6xEbhlCrQdjEym45g91bEUQN7P ZE6MydCmK7VeQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4WcYnx55V7z6tlh; Mon, 5 Aug 2024 00:16:53 +0200 (CEST) From: David Elsing Date: Sun, 4 Aug 2024 22:15:42 +0000 Message-ID: <20240804221635.3805-4-david.elsing@posteo.net> In-Reply-To: <20240804220847.15842-1-david.elsing@posteo.net> References: <20240804220847.15842-1-david.elsing@posteo.net> 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/serialization.scm (flatbuffers-next): Update to 24.3.25. --- gnu/packages/serialization.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm index 6aaf416467..8c7e7d9116 100644 --- a/gnu/packages/serialization.scm +++ b/gnu/packages/serialization.scm @@ -902,7 +902,7 @@ (define-public flatbuffers (define-public flatbuffers-next (package (inherit flatbuffers) - (version "23.5.26") + (version "24.3.25") (source (origin (method git-fetch) (uri (git-reference @@ -911,7 +911,7 @@ (define-public flatbuffers-next (file-name (git-file-name "flatbuffers" version)) (sha256 (base32 - "0cd12dvkzqdafz46q4302mzgpzbz589zmmiga7bq07f2sqy4vrvv")))))) + "0q066x1h0x9225aj25jv40gxgz46yvwmiqc2g6q06mkkg1144kxq")))))) (define-public python-flatbuffers (package From patchwork Sun Aug 4 22:15:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 66716 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 D011F27BBEA; Sun, 4 Aug 2024 23:17:56 +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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, URIBL_BLOCKED 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 4355727BBE2 for ; Sun, 4 Aug 2024 23:17:56 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sajXw-0007ao-7z; Sun, 04 Aug 2024 18:17:48 -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 1sajXq-0007XX-Ds for guix-patches@gnu.org; Sun, 04 Aug 2024 18:17:42 -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 1sajXq-0000rg-1v for guix-patches@gnu.org; Sun, 04 Aug 2024 18:17:42 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=zmS+R2Bm7s7w16pE+wa/bmkjN5E8wcwsgOMU0OLh1nA=; b=tKWa+QTA0ZtAGR4f3y040ovmVHxNCMPADIgSkNYzwRUTqkshE41Y4lL2fIhw639LUyhA/eUz6sJyUUkMnTIZA2iesfd472tjHUw2YX43BNBrgyQaa2F66x9f3JIn7cSy/QpDceDTYn4oWvfKU0jHKiChn6NHjpnmJvGXg7EsH6qpX7ZUCZmbX/EeC+C4cuQl9uhZFvuHzT+jP7C9OAyRV5SvLMeVddidEKKLAV1xveqk1hVarc30z6PhuAqGvpg/k5+baVhAX4WyzdTs32t45dCUiWVoG44MldQeoENsg6ttLzf0+WeiwRXjSaWRFwl9he64K/3+cg9o/TLV6ATWLw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sajYB-0004SH-IC for guix-patches@gnu.org; Sun, 04 Aug 2024 18:18:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72471] [PATCH 05/24] gnu: pthreadpool: Update to commit 560c60d. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 04 Aug 2024 22:18:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72471 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72471@debbugs.gnu.org Cc: David Elsing Received: via spool by 72471-submit@debbugs.gnu.org id=B72471.172280985116807 (code B ref 72471); Sun, 04 Aug 2024 22:18:03 +0000 Received: (at 72471) by debbugs.gnu.org; 4 Aug 2024 22:17:31 +0000 Received: from localhost ([127.0.0.1]:57486 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sajXe-0004Md-1m for submit@debbugs.gnu.org; Sun, 04 Aug 2024 18:17:31 -0400 Received: from mout02.posteo.de ([185.67.36.66]:54399) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sajXW-0004Jv-5Q for 72471@debbugs.gnu.org; Sun, 04 Aug 2024 18:17:22 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 7C464240103 for <72471@debbugs.gnu.org>; Mon, 5 Aug 2024 00:16:54 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1722809814; bh=ik0RJP5pPseApoArZ9r95LGxod3JkhWhV8lICRE9Wsw=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=hmZy9zSadwgsNnXtzznUy7rxh4VzKRK3CVGusPZAXwKc60AcqKYDv0da87mbWUa2r kFFe+J45xHTdXRDtOrtZGsLzetAONaLyrheeIUdNlPPMiZA9bUouPPPePkxRoztl08 IG00YR20C2zi+O73gEJPCAWzsaFmtWl+9D4M+r2zy7dqgoJS1nMH6oxsYNGT6hDVYC 77qRGlcvr5emGkdqgCqk6eVDuWmyQ46CXUK4J7/37JSN8oAOcGIIEU6Z4bpul/f0VN 9BmwWRv9Z18c2+10rTWJ5h7Y2TaxcsjxUOPsmiOjeFD9X1PYcL07yEZKWsuZZ6B0wP myCrsoZDEtD6g== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4WcYny1dTDz6tlh; Mon, 5 Aug 2024 00:16:54 +0200 (CEST) From: David Elsing Date: Sun, 4 Aug 2024 22:15:43 +0000 Message-ID: <20240804221635.3805-5-david.elsing@posteo.net> In-Reply-To: <20240804220847.15842-1-david.elsing@posteo.net> References: <20240804220847.15842-1-david.elsing@posteo.net> 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/parallel.scm (pthreadpool): Update to commit 560c60d. --- gnu/packages/parallel.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm index 2e00701582..ca1e92963a 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -488,9 +488,9 @@ (define-public python-slurm-magic (define-public pthreadpool ;; This repository has only one tag, 0.1, which is older than what users ;; such as XNNPACK expect. - (let ((commit "178e3e0646cc671708bf78e77c273940130ac637") + (let ((commit "560c60d342a76076f0557a3946924c6478470044") (version "0.1") - (revision "2")) + (revision "3")) (package (name "pthreadpool") (version (git-version version revision commit)) @@ -501,7 +501,7 @@ (define-public pthreadpool (file-name (git-file-name name version)) (sha256 (base32 - "1s86lnq9bahacf5wxn7y14w70jh3g9lq1l7y16ijwhifd01nc2km")) + "0l82ix1h8pmjikf15bvmlap355gmyfjpahmgz4lbd6g40ab3ls5c")) (patches (search-patches "pthreadpool-system-libraries.patch")))) (build-system cmake-build-system) (arguments '(#:configure-flags '("-DBUILD_SHARED_LIBS=ON"))) From patchwork Sun Aug 4 22:15:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 66735 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 BB0D927BBEA; Sun, 4 Aug 2024 23:18:56 +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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, URIBL_BLOCKED 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 1A1AD27BBE2 for ; Sun, 4 Aug 2024 23:18:56 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sajXs-0007YG-ES; Sun, 04 Aug 2024 18:17:44 -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 1sajXq-0007Xp-UH for guix-patches@gnu.org; Sun, 04 Aug 2024 18:17:42 -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 1sajXq-0000rv-Fn for guix-patches@gnu.org; Sun, 04 Aug 2024 18:17:42 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=OSuWuPfZOSJB5ziBKrpDrhdZUshdhbgbzftccgRspwM=; b=jXFOzXRAXUqFqj6bk/drfsW2IZAxgiPU/S5Vx3cE3ggze7HjaesUCWe7qMNO1bRNTeJPFMnBHqlREM9IUW27iOYKlIGx4wADcqWr3SujxLAO7v27PJ5+CaT+QdoA9hxU6wWDl438T9XtJzYRYscn3cj0/Hiro9rcI5hgfXAOdUg4Fcs4jL+Tc22gOKjrNnT4fcXB1IFzfnnisQOu7+XUU7ycjsLWmsAND7Xn1yTwiRiBBkCjlDYfbxL5Srq3nVvmZW+onXCrshVlTN/btkMRVdoFQBtRDSkhzFe3y5s2dw5/BkK/lWMEyOen4wdx3/dr1HTZgx07ONM3fPTuvDLrig==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sajYC-0004SP-0K for guix-patches@gnu.org; Sun, 04 Aug 2024 18:18:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72471] [PATCH 06/24] gnu: cpuinfo: Update to commit 05332fd. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 04 Aug 2024 22:18:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72471 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72471@debbugs.gnu.org Cc: David Elsing Received: via spool by 72471-submit@debbugs.gnu.org id=B72471.172280985316829 (code B ref 72471); Sun, 04 Aug 2024 22:18:03 +0000 Received: (at 72471) by debbugs.gnu.org; 4 Aug 2024 22:17:33 +0000 Received: from localhost ([127.0.0.1]:57489 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sajXf-0004N1-7g for submit@debbugs.gnu.org; Sun, 04 Aug 2024 18:17:32 -0400 Received: from mout02.posteo.de ([185.67.36.66]:55163) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sajXW-0004K2-NS for 72471@debbugs.gnu.org; Sun, 04 Aug 2024 18:17:24 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 2C5D7240101 for <72471@debbugs.gnu.org>; Mon, 5 Aug 2024 00:16:55 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1722809815; bh=SLqW3VWg6TJQflL97/56NvX6MshzPiSw7wGJtilfG/I=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=q4Ulnbu5uv5QjTFpv44gzW1ngEf5SN/WTGOhm8e7b3J+SRzX8bHDmHkzWH8WAYmzz BHKOOUgYUVRc1UlRQ2Xn9o7uHsb6UZheGJBpXdRJrFKfrc8vjgqJboNNYhK7w+tQwE WZMLzIWpeYQ8Ml1K6uH5AuXhulxDM1zuyRfJWtASxZAtrPb6EB0OcrjlqweUr1qzcf q6gs/kP63/wFglte67LJx2HUYESWOeI4ygYCjqbLs5zHxbMSkmSJp27fT7L5H8QdLU fikpsjgAtUg5Ai/ym7GmEbrZTqAxliyION8w8GDkxdMuFScBINakpT6QdsnI3l+2cy nLG/3lEY/2N4g== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4WcYny5DSkz6tlh; Mon, 5 Aug 2024 00:16:54 +0200 (CEST) From: David Elsing Date: Sun, 4 Aug 2024 22:15:44 +0000 Message-ID: <20240804221635.3805-6-david.elsing@posteo.net> In-Reply-To: <20240804220847.15842-1-david.elsing@posteo.net> References: <20240804220847.15842-1-david.elsing@posteo.net> 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 Also disable tests on aarch64, because they fail in the build container. * gnu/packages/parallel.scm (cpuinfo): Update to commit 05332fd. [arguments]<#:tests?>: Disable on aarch64. [supported-systems]: Remove field. --- gnu/packages/parallel.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm index ca1e92963a..9be6e993e7 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -519,7 +519,7 @@ (define-public cpuinfo ;; There's currently no tag on this repo. (let ((version "0.0") (revision "3") - (commit "aa4b2163b99ac9534194520f70b93eeefb0b3b4e")) + (commit "05332fd802d9109a2a151ec32154b107c1e5caf9")) (package (name "cpuinfo") (version (git-version version revision commit)) @@ -530,10 +530,13 @@ (define-public cpuinfo (file-name (git-file-name name version)) (sha256 (base32 - "12x4krkyzxngf1l2ck33lnsp8pyzf6gyjj9mp9cnka9mw3h6617m")))) + "0w0kfc1fn9viirkhbr8dgfy9m5clfsg3k9p6kdxhzqpyjhgd252n")))) (build-system cmake-build-system) (arguments (list + ;; cpuinfo does not work in the build container for aarch64: + ;; https://github.com/pytorch/cpuinfo/issues/143 + #:tests? (not (target-aarch64?)) #:configure-flags '(list "-DBUILD_SHARED_LIBS=ON" "-DUSE_SYSTEM_LIBS=ON") @@ -552,9 +555,6 @@ (define-public cpuinfo "The cpuinfo library provides a C/C++ and a command-line interface to obtain information about the CPU being used: supported instruction set, processor name, cache information, and topology information.") - ;; On aarch64-linux, there is a bug reported upstream: - ;; https://github.com/pytorch/cpuinfo/issues/14 - (supported-systems '("armhf-linux" "i686-linux" "x86_64-linux")) (license license:bsd-2)))) (define-public clog From patchwork Sun Aug 4 22:15:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 66718 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 88EDB27BBEA; Sun, 4 Aug 2024 23:18:10 +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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, URIBL_BLOCKED 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 0528C27BBE2 for ; Sun, 4 Aug 2024 23:18:10 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sajY4-0007gD-Cg; Sun, 04 Aug 2024 18:17: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 1sajXt-0007YY-Q3 for guix-patches@gnu.org; Sun, 04 Aug 2024 18:17:45 -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 1sajXt-0000sS-FM for guix-patches@gnu.org; Sun, 04 Aug 2024 18:17:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=HrUeIbjY8L+Q6k7mUmUQiKxAUZX/CMuFQOgRiUcVBsg=; b=hU86yeTaPuU1lnIOQXSuxDtaeBOHHJGkRs/gxzMbQPUeElOXazd9dA2Z57dXBjy9870ThyeRCNJfUMUMrDw7HJwGB+qWIkvWtkbwm2HabsBOvYV3GgQOimxCWSRnhB6dl0HF4UtkZqIV8DuGyMrYhfpigaYSuK1RnR8HyjvX6pUTpinTtsudyjxNOrTO/YHSgzsaBPCG4RhqOlLjWooxTzJ0vMFiA48KH1QPIPQp4nqT9cQVC8Aj8KS7UsHTQzhbIMzUHSv/d/8hIJh/mHWqaA7fHjMGDLpNu3puWvpX3xa4vChYGv60CKWO8nqBUDnd8eOZC0PnJFU3ouRf45z4fA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sajYE-0004T9-Vg for guix-patches@gnu.org; Sun, 04 Aug 2024 18:18:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72471] [PATCH 07/24] gnu: nnpack: Depend on python-peachpy only for x86_64. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 04 Aug 2024 22:18:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72471 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72471@debbugs.gnu.org Cc: David Elsing Received: via spool by 72471-submit@debbugs.gnu.org id=B72471.172280986416943 (code B ref 72471); Sun, 04 Aug 2024 22:18:06 +0000 Received: (at 72471) by debbugs.gnu.org; 4 Aug 2024 22:17:44 +0000 Received: from localhost ([127.0.0.1]:57507 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sajXr-0004P3-Ch for submit@debbugs.gnu.org; Sun, 04 Aug 2024 18:17:43 -0400 Received: from mout02.posteo.de ([185.67.36.66]:45593) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sajXb-0004Km-Aw for 72471@debbugs.gnu.org; Sun, 04 Aug 2024 18:17:28 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 9259F240103 for <72471@debbugs.gnu.org>; Mon, 5 Aug 2024 00:16:55 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1722809815; bh=B0M3QB0s7Kw6RSAeF8L0GF9d9XUULTUzKibOKl0Ca9Y=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=k8Lc9+PvtNu6ea9zsyr1nvdsgC/Hu78PO8+kO1xrialJxjplum7ORvGLxMe0plVXV qzJrXAyVctX2ju6sI3cia88nTnbF8klu019gRlLuiCvRwzNiij75wILDQ2XixN6nhO dMSvX8mEu4Q7OPApUfPoYSbNLTvZBD8IIcsCHupGQmy2lytb3S/MzwlhjV+jBbM3Oc dutRfSgnGOvrjDLLSsPR52C5gA1A57waru1IqK6TjrpeZ12YqpUt5nxnCazh9SOOQh 54rTkIZC3V2skqZG6J8I6sWalyH85m/jkD3XxIOfugbGryBQB18Z6Twkyh0zIz+gsv GfZw+02sr2R/g== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4WcYnz1zkYz6tlh; Mon, 5 Aug 2024 00:16:55 +0200 (CEST) From: David Elsing Date: Sun, 4 Aug 2024 22:15:45 +0000 Message-ID: <20240804221635.3805-7-david.elsing@posteo.net> In-Reply-To: <20240804220847.15842-1-david.elsing@posteo.net> References: <20240804220847.15842-1-david.elsing@posteo.net> 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 (nnpack)[native-inputs]: Provide python-peachpy only when 'target-x86-64?'. --- gnu/packages/machine-learning.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 418bfb5d03..99f0185942 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -4045,7 +4045,9 @@ (define-public nnpack pthreadpool googletest)) (native-inputs - (list python python-peachpy python-six)) + `(,python + ,@(if (target-x86-64?) (list python-peachpy) '()) + ,python-six)) ;; Supported for Linux. (supported-systems '("x86_64-linux" "armhf-linux" "aarch64-linux")) (license license:bsd-2)))) From patchwork Sun Aug 4 22:15:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 66738 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 6873627BBEC; Sun, 4 Aug 2024 23:19:01 +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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, URIBL_BLOCKED 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 26C2627BBE2 for ; Sun, 4 Aug 2024 23:19:01 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sajY5-0007gk-E6; Sun, 04 Aug 2024 18:17: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 1sajXv-0007Zg-LZ for guix-patches@gnu.org; Sun, 04 Aug 2024 18:17:47 -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 1sajXu-0000ss-Iu for guix-patches@gnu.org; Sun, 04 Aug 2024 18:17:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=DEAy/ncz9uNBGPPZz5HvimiTCWFoPGrCxjHftyVnUOA=; b=LNMhZAx2EFzIHQUv2ZMpvn04hp7StUiwUB/AH/JZsFwdbM8NNnNyLaXF43zot1E8NJT1mCVTuRILads/UN04bXmSfir6yk+56wBkx3GX01DvZZ3iid09Bg+WgztRoKnbIQUdnDmPPdDtkNQ8rgWYFc+l56/E2tlmMYQhDuayXK0xXeD/u915Sdd2hc4nPRSeUJFjxyhVS2zqthvn2VCz6hRVQf9369qH699GisxOen4M0F3FnIwcDO3sdfk2sn7rn64X0IFQ0qrzjbcs/l62Ufwh85Z66bA79CLHvqz9eeMgsn+DZ6zVxmjqUHKviJa7iz+xgDxigc96OE+4p3exVw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sajYG-0004TS-2D for guix-patches@gnu.org; Sun, 04 Aug 2024 18:18:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72471] [PATCH 08/24] gnu: oneapi-dnnl: Update to 3.5.3. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 04 Aug 2024 22:18:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72471 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72471@debbugs.gnu.org Cc: David Elsing Received: via spool by 72471-submit@debbugs.gnu.org id=B72471.172280987016985 (code B ref 72471); Sun, 04 Aug 2024 22:18:08 +0000 Received: (at 72471) by debbugs.gnu.org; 4 Aug 2024 22:17:50 +0000 Received: from localhost ([127.0.0.1]:57511 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sajXx-0004Pk-Oj for submit@debbugs.gnu.org; Sun, 04 Aug 2024 18:17:50 -0400 Received: from mout02.posteo.de ([185.67.36.66]:34439) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sajXb-0004Kn-BD for 72471@debbugs.gnu.org; Sun, 04 Aug 2024 18:17:29 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 19461240101 for <72471@debbugs.gnu.org>; Mon, 5 Aug 2024 00:16:56 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1722809816; bh=anFk5AvRGy5y6R2U/ZIlyHOVa3oC/xTWoBOl9L7ZI1k=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=IrlvHFIdlNeorUI3k05HkdQuZm2qSca5Yhye/Zwzgys+LlUjS3qYqqJ6JuIstoBsx V4UPA6pbrG3vY/x4fBbOrCeccrhf+nWxV4XvxEB3mRz9Hf+y9a/ZCqbu3YwXmXZdqv IpbAMleC3jPrPUq13bfKDSuDlu8gFpC8LCifIFurHhXpPxqw+NBu1eORSs6xfJzGKQ rochCgK4Zqhvns290UY6+8KW69qkb7UJpxMeDJ9MuYZbasoNvC8Fcvyke8L9E8WlJW oVTpNkcNWgf5pvPbYR2lIKnxRqfYTUAF1acsFEmWBgXp7b7OzUsaylXdMob6b9hhMa CEo2q6c789gbA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4WcYnz5X01z6tlh; Mon, 5 Aug 2024 00:16:55 +0200 (CEST) From: David Elsing Date: Sun, 4 Aug 2024 22:15:46 +0000 Message-ID: <20240804221635.3805-8-david.elsing@posteo.net> In-Reply-To: <20240804220847.15842-1-david.elsing@posteo.net> References: <20240804220847.15842-1-david.elsing@posteo.net> 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 (oneapi-dnnl): Update to 3.5.3. --- gnu/packages/machine-learning.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 99f0185942..1de08eda66 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -5903,7 +5903,7 @@ (define-public python-brian2tools (define-public oneapi-dnnl (package (name "oneapi-dnnl") - (version "3.3.5") + (version "3.5.3") (source (origin (method git-fetch) @@ -5912,7 +5912,7 @@ (define-public oneapi-dnnl (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "05ra5zziys2hvn29y6ysiqzsf4jr9bf2bci5sc3swvf3bs2y5ihf")))) + (base32 "1m2d7qlbfk86rmvmpvx2k3rc2k0l9hf9qpa54jl44670ls9n8i7w")))) (build-system cmake-build-system) (arguments (if (target-riscv64?) (list #:configure-flags #~'("-DDNNL_CPU_RUNTIME=SEQ")) From patchwork Sun Aug 4 22:15:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 66734 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 73E2027BBE2; Sun, 4 Aug 2024 23:18:50 +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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, URIBL_BLOCKED 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 1F4C127BBE9 for ; Sun, 4 Aug 2024 23:18:49 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sajXy-0007by-5O; Sun, 04 Aug 2024 18:17:50 -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 1sajXv-0007Zh-Ln for guix-patches@gnu.org; Sun, 04 Aug 2024 18:17:47 -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 1sajXv-0000sv-8s for guix-patches@gnu.org; Sun, 04 Aug 2024 18:17:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=h4MWw/DgvKSA/mQD/sspFcpMXvrfQiIZ6pE9N2d9Q8A=; b=Q/sGsww1JJdljn4i4Rtt4IBn+8n8trv49857c2tFKAzWeb0UlTu7M6ADCxmUFgXsn+J8RjOn+eOx4Gkesc+LfI6YW0PDa1CZzyJ2pp7MKAfORqYrD+SCAyXNNvPSvqR4/GMKzqR0ds+2aZwmuMJ1EMyVGcjguphbqQrGjubf2RL20Yusk/s7TSsNxkZDA/6arNgYrPkizrGd6VTKdX07f9giPTsDV4sA7vmghuvUajDCp+lolsRB3S3pqphb330eb+PxJCPPAWRfPkedUckAczpO3VAndpFzif7dMjuHoapL73h3ijHTvFS/PK8loeNR/gwy37CWPr+EerLWW2OICg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sajYG-0004Tf-Oe for guix-patches@gnu.org; Sun, 04 Aug 2024 18:18:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72471] [PATCH 09/24] gnu: fbgemm: Update to 0.7.0. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 04 Aug 2024 22:18:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72471 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72471@debbugs.gnu.org Cc: David Elsing Received: via spool by 72471-submit@debbugs.gnu.org id=B72471.172280987116992 (code B ref 72471); Sun, 04 Aug 2024 22:18:08 +0000 Received: (at 72471) by debbugs.gnu.org; 4 Aug 2024 22:17:51 +0000 Received: from localhost ([127.0.0.1]:57513 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sajXy-0004Pt-E8 for submit@debbugs.gnu.org; Sun, 04 Aug 2024 18:17:50 -0400 Received: from mout02.posteo.de ([185.67.36.66]:50359) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sajXb-0004Kp-BZ for 72471@debbugs.gnu.org; Sun, 04 Aug 2024 18:17:29 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id D411F240101 for <72471@debbugs.gnu.org>; Mon, 5 Aug 2024 00:16:56 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1722809816; bh=EQfeY6RhlQSHABe4fbWkmVGFclH0zFp6TmLoQ2nXIug=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=IhxBVKV+C+PxE7+LLBiyVv81DVsjnhNgH+/971+7K9yEqaJbY45l8HImPeibqidzW N6YLEm8963S5wa5Ek6W5ZlfoPnKK8Q9jfK1F9mV59ltxdleTkzoQIL2d93g/oURnaT LyEv4Brdr8hmnu1ijgEY+DIdEldy4T1yCdXyi18+zD5IexQWgaGgL0OCrX5gfeZpWZ KAWyMk7II+K1CVAuTzvVx2yoxOL2ao5xkaCYVzLCOOCXIMe3vgPHcCeTfm79mLTmXC OtTctFOsLMfu3GtxzjeMbrfI1Q0GcO6ccDtxcssu+ryiPZnV3eq0G7qz8Kk7vrSjgi RrLTR+dAdm+hw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4WcYp01znvz6tlh; Mon, 5 Aug 2024 00:16:56 +0200 (CEST) From: David Elsing Date: Sun, 4 Aug 2024 22:15:47 +0000 Message-ID: <20240804221635.3805-9-david.elsing@posteo.net> In-Reply-To: <20240804220847.15842-1-david.elsing@posteo.net> References: <20240804220847.15842-1-david.elsing@posteo.net> 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 (fbgemm): Update to 0.7.0. --- gnu/packages/machine-learning.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 1de08eda66..5a909311e2 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -4227,7 +4227,7 @@ (define-public xnnpack (define-public fbgemm (package (name "fbgemm") - (version "0.6.0") + (version "0.7.0") (source (origin (method git-fetch) (uri (git-reference @@ -4236,7 +4236,7 @@ (define-public fbgemm (file-name (git-file-name name version)) (sha256 (base32 - "0mw30v55aicqdbh3xwfj9p8f38nw70ks5cxiwpgwjsk0dylah9rf")) + "1dzw9w82ca0hss1lvshix6piwsd0k11lyq9pzm8yg8k7j56hmyig")) (patches (search-patches "fbgemm-use-system-libraries.patch")) (modules '((guix build utils))) (snippet From patchwork Sun Aug 4 22:15:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 66717 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 728C327BBE9; Sun, 4 Aug 2024 23:18:07 +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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, URIBL_BLOCKED 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 A326D27BBE2 for ; Sun, 4 Aug 2024 23:18:00 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sajXt-0007YV-Pg; Sun, 04 Aug 2024 18:17:45 -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 1sajXr-0007Y6-D6 for guix-patches@gnu.org; Sun, 04 Aug 2024 18:17:43 -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 1sajXr-0000sA-0k for guix-patches@gnu.org; Sun, 04 Aug 2024 18:17:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=maBAhaYM58JSqwv9+TJSEsTm2Q7tVNni+//OuIfz/Jw=; b=gBy6GYp5hAX1wmKy2gJV3yEM++dvkBYW8folVszIAGzy5jqJGYwhwr7kuKbeN35IlKOtnqS+vLfZQZUN2OUNFVMKDs6iJ6qT5UNDMeRSXTtZYAlKwAjIk25/9xz8v8bW+J1iG+WP2gABhq2w5x4a79sv5l4FmlHac64JF2NQbb6e2/BALldN5YDJ2fx3bLpd9vAylwyTKf6vcjf1CnwFBEZPnucH3Q37xjyHcmYnGAjz3MjnA/eKYPfJ94itR74eSwVW4ytnccqf8Jq6KhdKpHZcGWqna32A5zKbavp2nZ/Xz3ykrApe15picucjNDaceb9DsYTUCybfx1xw3bvSGw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sajYC-0004SW-G2 for guix-patches@gnu.org; Sun, 04 Aug 2024 18:18:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72471] [PATCH 10/24] gnu: xnnpack: Update to commit 08f1489. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 04 Aug 2024 22:18:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72471 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72471@debbugs.gnu.org Cc: David Elsing Received: via spool by 72471-submit@debbugs.gnu.org id=B72471.172280985316835 (code B ref 72471); Sun, 04 Aug 2024 22:18:04 +0000 Received: (at 72471) by debbugs.gnu.org; 4 Aug 2024 22:17:33 +0000 Received: from localhost ([127.0.0.1]:57498 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sajXg-0004NO-PC for submit@debbugs.gnu.org; Sun, 04 Aug 2024 18:17:32 -0400 Received: from mout01.posteo.de ([185.67.36.65]:44689) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sajXZ-0004KJ-AI for 72471@debbugs.gnu.org; Sun, 04 Aug 2024 18:17:25 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id D2EC8240028 for <72471@debbugs.gnu.org>; Mon, 5 Aug 2024 00:16:57 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1722809818; bh=qMIevIzIPFi6HEr8wLAIBs61gcACXnNuIX/4J7orYk4=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=EAr7tzufFRAkQbKrwp93w2VxikQt+dDTrstEyZ8Cd5LdxvSIExvgVPrBpsz7pCGpk FxiaqXb3fDnAPNBR7DRyCu0G5lt5cmuTQ0/GvufFnkarG7dKP9WAyoi/Cqx8ckUpPa 0++Fg9YjHOiSuHvv6i2VgcpS8wW51vOtigfBcgOtX72bgOgDKu7JgHcpZb/RURCMKN tuVPiI1UI1QAzCE05JRKiCzvlXJnL+xH3dLvG4ccuFuETXzPTnzy0Dw6Th0FYcL9JP xJI7rIwjdoD5NwB1egGXVhnEPew3e4ptvlaUL0mzD/5UWmkr0+2eab4AiEbjVSjLWj fdUxnm+WFQTsA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4WcYp05gf9z6tlh; Mon, 5 Aug 2024 00:16:56 +0200 (CEST) From: David Elsing Date: Sun, 4 Aug 2024 22:15:48 +0000 Message-ID: <20240804221635.3805-10-david.elsing@posteo.net> In-Reply-To: <20240804220847.15842-1-david.elsing@posteo.net> References: <20240804220847.15842-1-david.elsing@posteo.net> 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 More tests fail when building the shared library, so they are disabled. The scripts to generate the autogenerated files run all commands at once, so they are converted to Makefiles first. * gnu/packages/machine-learning.scm (xnnpack): Update to commit 08f1489. [source]: Remove patch. Adjust snippet. [arguments]<#:configure-flags>: Add "-DXNNPACK_BUILD_TESTS=OFF". <#:tests?>: Disable tests. <#:phases>: Adjust 'fix-cmake' phase. Convert code generation scripts to Makefiles and run them. Run different missing scripts. * gnu/packages/patches/xnnpack-remove-broken-tests.patch: Remove file. * gnu/packages/patches/xnnpack-system-libraries.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Remove them. --- gnu/local.mk | 2 - gnu/packages/machine-learning.scm | 102 +- .../patches/xnnpack-remove-broken-tests.patch | 337 --- .../patches/xnnpack-system-libraries.patch | 2660 ----------------- 4 files changed, 65 insertions(+), 3036 deletions(-) delete mode 100644 gnu/packages/patches/xnnpack-remove-broken-tests.patch delete mode 100644 gnu/packages/patches/xnnpack-system-libraries.patch diff --git a/gnu/local.mk b/gnu/local.mk index 6d2b14e72d..fd8262de55 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2259,8 +2259,6 @@ dist_patch_DATA = \ %D%/packages/patches/xfce4-settings-defaults.patch \ %D%/packages/patches/xgboost-use-system-dmlc-core.patch \ %D%/packages/patches/xmonad-dynamic-linking.patch \ - %D%/packages/patches/xnnpack-remove-broken-tests.patch \ - %D%/packages/patches/xnnpack-system-libraries.patch \ %D%/packages/patches/xplanet-1.3.1-cxx11-eof.patch \ %D%/packages/patches/xplanet-1.3.1-libdisplay_DisplayOutput.cpp.patch \ %D%/packages/patches/xplanet-1.3.1-libimage_gif.c.patch \ diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 5a909311e2..6fcfc1d167 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -4106,7 +4106,7 @@ (define-public qnnpack (define-public xnnpack ;; There's currently no tag on this repo. (let ((version "0.0") - (commit "51a987591a6fc9f0fc0707077f53d763ac132cbf") + (commit "08f1489fc815e8f121d4d2676c4863d2b51bfe73") (revision "3")) (package (name "xnnpack") @@ -4119,34 +4119,14 @@ (define-public xnnpack (file-name (git-file-name name version)) (sha256 (base32 - "1rzby82xq8d0rl1d148yz88jh9cpsw5c8b2yw7yg39mi7qmr55rm")) - ;; Some tests fail to link as they use internal symbols, which are - ;; not included in the shared library. - ;; XXX: Additionally, these tests fail on i686 due to incorrect results: - ;; 171 - f32-vlrelu-test (Failed) - ;; 211 - qs8-gavgpool-minmax-fp32-test (Failed) - ;; 224 - qu8-avgpool-minmax-fp32-test (Failed) - ;; 228 - qu8-gavgpool-minmax-fp32-test (Failed) - ;; 263 - x32-packx-test (Failed) - (patches (search-patches "xnnpack-remove-broken-tests.patch")) + "00jjhz0nfggbdnqqvcznba03pcyy7gssd24yhhzjhincnz9qh8jr")) (modules '((guix build utils) (ice-9 ftw) (ice-9 textual-ports) (srfi srfi-26))) (snippet '(begin - ;; Remove autogenerated files - (for-each - (lambda (dir) - (let ((gendir (string-append "src/" dir "/gen"))) - (when (file-exists? gendir) - (delete-file-recursively gendir) - ;; Needed for the scripts generating the files - (mkdir gendir)))) - (scandir "src" (negate (cut member <> '("." ".."))))) - (delete-file-recursively "google3") - (delete-file "cmake/microkernels.cmake") - ;; Additional autogenerated files which contain the string + ;; Remove autogenerated files, which contain the string ;; "Auto-generated file" (for-each (lambda (dir) @@ -4159,8 +4139,18 @@ (define-public xnnpack (get-string-all port) "Auto-generated file"))) (delete-file path)))) - (scandir dir (negate (cut member <> '("." "..")))))) - '("test" "bench" "eval" "models" "src/enums" "src/xnnpack")))))) + (scandir dir (negate (cut member <> '("." ".." "simd")))))) + (cons* + "test" "bench" "eval" "models" "src/enums" "src/xnnpack" + "gen" "cmake/gen" + (filter + identity + (map + (lambda (dir) + (let ((path + (string-append "src/" dir "/gen"))) + (and (file-exists? path) path))) + (scandir "src" (negate (cut member <> '("." "..")))))))))))) (build-system cmake-build-system) (arguments (list @@ -4169,7 +4159,11 @@ (define-public xnnpack "-DBUILD_SHARED_LIBS=ON" "-DCMAKE_POSITION_INDEPENDENT_CODE=ON" "-DXNNPACK_LIBRARY_TYPE=shared" - "-DXNNPACK_BUILD_BENCHMARKS=FALSE") + "-DXNNPACK_BUILD_BENCHMARKS=FALSE" + ;; Tests fail to build with -DXNNPACK_LIBRARY_TYPE=shared: + ;; https://github.com/google/XNNPACK/issues/6285 + "-DXNNPACK_BUILD_TESTS=OFF") + #:tests? #f #:modules '((ice-9 ftw) (guix build cmake-build-system) (guix build utils)) @@ -4179,27 +4173,61 @@ (define-public xnnpack (lambda _ (substitute* "CMakeLists.txt" (("TARGET_INCLUDE_DIRECTORIES\\((pthreadpool|cpuinfo).*") "") - ((".*IF\\(NOT TARGET gtest\\).*") - "IF(FALSE)\n") - (("SET\\(CMAKE_CXX_STANDARD 11\\)") - "SET(CMAKE_CXX_STANDARD 14)") (("AMD64") "x86_64")))) (add-after 'patch-source-shebangs 'generate-files (lambda _ + ;; This script just calls two other scripts. + (delete-file "scripts/generate-tests-and-benchmarks.sh") + ;; The bash scripts run all jobs at once and then wait, so we + ;; convert them to Makefiles. (for-each (lambda (name) + (define counter 0) ; For the targets + (define target-deps "") (when (and (string-prefix? "generate" name) - (string-suffix? ".sh" name) - (not (equal? "generate-amalgamation.sh" name))) - (display (string-append name "\n")) - (invoke "bash" (string-append "scripts/" name)))) + (string-suffix? ".sh" name)) + (let ((file (string-append "scripts/" name))) + (substitute* file + ;; Turn the commands into targets and remove trailing + ;; '&' characters + (("(.*(\\.sh|\\.py|-o |--output)[^&]*)&?[[:space:]]*$" _ command) + (begin + (set! counter (+ counter 1)) + (string-append "target" (number->string counter) + ":" target-deps + "\n\t" command "\n"))) + (("[[:space:]]*wait[[:space:]]*") "") + ;; The commands after this line depend on the + ;; previous commands in the file. + (("JIT requires assembly files to be generated first.*" all) + (begin + (set! target-deps + (string-append + target-deps " target" + (string-join + (map number->string (iota counter 1)) " target"))) + all))) + (display (string-append "Running " name "\n")) + (apply invoke "make" "-s" "-f" file "-j" + (number->string (parallel-job-count)) + (map + (lambda (i) + (string-append "target" (number->string i))) + (iota counter 1)))))) (scandir "scripts")) ;; These need to run after the above scripts (display "Remaining files\n") (invoke "python3" "tools/update-microkernels.py") - (substitute* "tools/amalgamate-microkernels.py" - (("BUILD") "BUILD.bazel")) - (invoke "bash" "scripts/generate-amalgamation.sh")))))) + (invoke "python3" "tools/update-microkernels.py" "-a") + (invoke "python3" "tools/generate-lut-norm-test.py" + "--spec" "test/u8-lut32norm.yaml" + "--output" "test/u8-lut32norm.cc") + (invoke "python3" "tools/generate-gemm-test.py" + "--spec" "test/qd8-f16-qb4w-gemm-minmax.yaml" + "--output-test" "test/qd8-f16-qb4w-gemm-minmax.cc") + (invoke "python3" "tools/generate-gemm-test.py" + "--spec" "test/qd8-f32-qb4w-gemm-minmax.yaml" + "--output-test" "test/qd8-f32-qb4w-gemm-minmax.cc")))))) (inputs (list clog cpuinfo diff --git a/gnu/packages/patches/xnnpack-remove-broken-tests.patch b/gnu/packages/patches/xnnpack-remove-broken-tests.patch deleted file mode 100644 index 91b7ca9998..0000000000 --- a/gnu/packages/patches/xnnpack-remove-broken-tests.patch +++ /dev/null @@ -1,337 +0,0 @@ -These tests fail to build because we are building a shared library. - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 95df99eae..ab57d5efa 100755 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -978,16 +978,6 @@ IF(XNNPACK_BUILD_TESTS) - TARGET_LINK_LIBRARIES(add-nd-eager-test PRIVATE XNNPACK fp16 gtest gtest_main) - ADD_TEST(NAME add-nd-eager-test COMMAND add-nd-eager-test) - -- ADD_EXECUTABLE(argmax-pooling-nhwc-test test/argmax-pooling-nhwc.cc) -- TARGET_INCLUDE_DIRECTORIES(argmax-pooling-nhwc-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(argmax-pooling-nhwc-test PRIVATE XNNPACK gtest gtest_main) -- ADD_TEST(NAME argmax-pooling-nhwc-test COMMAND argmax-pooling-nhwc-test) -- -- ADD_EXECUTABLE(average-pooling-nhwc-test test/average-pooling-nhwc.cc) -- TARGET_INCLUDE_DIRECTORIES(average-pooling-nhwc-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(average-pooling-nhwc-test PRIVATE XNNPACK fp16 gtest gtest_main) -- ADD_TEST(NAME average-pooling-nhwc-test COMMAND average-pooling-nhwc-test) -- - ADD_EXECUTABLE(bankers-rounding-nc-test test/bankers-rounding-nc.cc) - TARGET_INCLUDE_DIRECTORIES(bankers-rounding-nc-test PRIVATE src test) - TARGET_LINK_LIBRARIES(bankers-rounding-nc-test PRIVATE XNNPACK fp16 gtest gtest_main) -@@ -1066,11 +1056,6 @@ IF(XNNPACK_BUILD_TESTS) - TARGET_LINK_LIBRARIES(copy-nc-eager-test PRIVATE XNNPACK gtest gtest_main) - ADD_TEST(NAME copy-nc-eager-test COMMAND copy-nc-eager-test) - -- ADD_EXECUTABLE(deconvolution-nhwc-test test/deconvolution-nhwc.cc) -- TARGET_INCLUDE_DIRECTORIES(deconvolution-nhwc-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(deconvolution-nhwc-test PRIVATE XNNPACK fp16 gtest gtest_main) -- ADD_TEST(NAME deconvolution-nhwc-test COMMAND deconvolution-nhwc-test) -- - ADD_EXECUTABLE(depth-to-space-nchw2nhwc-test test/depth-to-space-nchw2nhwc.cc) - TARGET_INCLUDE_DIRECTORIES(depth-to-space-nchw2nhwc-test PRIVATE src test) - TARGET_LINK_LIBRARIES(depth-to-space-nchw2nhwc-test PRIVATE XNNPACK gtest gtest_main) -@@ -1116,11 +1101,6 @@ IF(XNNPACK_BUILD_TESTS) - TARGET_LINK_LIBRARIES(floor-nc-eager-test PRIVATE XNNPACK fp16 gtest gtest_main) - ADD_TEST(NAME floor-nc-eager-test COMMAND floor-nc-eager-test) - -- ADD_EXECUTABLE(global-average-pooling-nwc-test test/global-average-pooling-nwc.cc) -- TARGET_INCLUDE_DIRECTORIES(global-average-pooling-nwc-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(global-average-pooling-nwc-test PRIVATE XNNPACK fp16 gtest gtest_main) -- ADD_TEST(NAME global-average-pooling-nwc-test COMMAND global-average-pooling-nwc-test) -- - ADD_EXECUTABLE(global-average-pooling-ncw-test test/global-average-pooling-ncw.cc) - TARGET_INCLUDE_DIRECTORIES(global-average-pooling-ncw-test PRIVATE src test) - TARGET_LINK_LIBRARIES(global-average-pooling-ncw-test PRIVATE XNNPACK fp16 gtest gtest_main) -@@ -1146,11 +1126,6 @@ IF(XNNPACK_BUILD_TESTS) - TARGET_LINK_LIBRARIES(leaky-relu-nc-eager-test PRIVATE XNNPACK fp16 gtest gtest_main) - ADD_TEST(NAME leaky-relu-nc-eager-test COMMAND leaky-relu-nc-eager-test) - -- ADD_EXECUTABLE(max-pooling-nhwc-test test/max-pooling-nhwc.cc) -- TARGET_INCLUDE_DIRECTORIES(max-pooling-nhwc-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(max-pooling-nhwc-test PRIVATE XNNPACK fp16 gtest gtest_main) -- ADD_TEST(NAME max-pooling-nhwc-test COMMAND max-pooling-nhwc-test) -- - ADD_EXECUTABLE(maximum-nd-test test/maximum-nd.cc) - TARGET_INCLUDE_DIRECTORIES(maximum-nd-test PRIVATE src test) - TARGET_LINK_LIBRARIES(maximum-nd-test PRIVATE XNNPACK fp16 gtest gtest_main) -@@ -1191,11 +1166,6 @@ IF(XNNPACK_BUILD_TESTS) - TARGET_LINK_LIBRARIES(negate-nc-eager-test PRIVATE XNNPACK fp16 gtest gtest_main) - ADD_TEST(NAME negate-nc-eager-test COMMAND negate-nc-eager-test) - -- ADD_EXECUTABLE(prelu-nc-test test/prelu-nc.cc) -- TARGET_INCLUDE_DIRECTORIES(prelu-nc-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(prelu-nc-test PRIVATE XNNPACK fp16 gtest gtest_main) -- ADD_TEST(NAME prelu-nc-test COMMAND prelu-nc-test) -- - ADD_EXECUTABLE(resize-bilinear-nhwc-test test/resize-bilinear-nhwc.cc) - TARGET_INCLUDE_DIRECTORIES(resize-bilinear-nhwc-test PRIVATE src test) - TARGET_LINK_LIBRARIES(resize-bilinear-nhwc-test PRIVATE XNNPACK fp16 gtest gtest_main) -@@ -1312,16 +1282,6 @@ IF(XNNPACK_BUILD_TESTS) - TARGET_LINK_LIBRARIES(fusion-test PRIVATE XNNPACK gtest gtest_main) - ADD_TEST(NAME fusion-test COMMAND fusion-test) - -- ADD_EXECUTABLE(memory-planner-test test/memory-planner-test.cc) -- TARGET_INCLUDE_DIRECTORIES(memory-planner-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(memory-planner-test PRIVATE XNNPACK gtest gtest_main) -- ADD_TEST(NAME memory-planner-test COMMAND memory-planner-test) -- -- ADD_EXECUTABLE(subgraph-fp16-test test/subgraph-fp16.cc) -- TARGET_INCLUDE_DIRECTORIES(subgraph-fp16-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(subgraph-fp16-test PRIVATE XNNPACK gtest gtest_main) -- ADD_TEST(NAME subgraph-fp16-test COMMAND subgraph-fp16-test) -- - ADD_EXECUTABLE(subgraph-nchw-test test/subgraph-nchw.cc) - TARGET_INCLUDE_DIRECTORIES(subgraph-nchw-test PRIVATE src test) - TARGET_LINK_LIBRARIES(subgraph-nchw-test PRIVATE XNNPACK gtest gtest_main) -@@ -1347,226 +1307,6 @@ IF(XNNPACK_BUILD_TESTS) - TARGET_INCLUDE_DIRECTORIES(argmax-pooling-2d-test PRIVATE src test) - TARGET_LINK_LIBRARIES(argmax-pooling-2d-test PRIVATE XNNPACK gtest gtest_main) - ADD_TEST(NAME argmax-pooling-2d-test COMMAND argmax-pooling-2d-test) -- -- ADD_EXECUTABLE(average-pooling-2d-test test/average-pooling-2d.cc) -- TARGET_INCLUDE_DIRECTORIES(average-pooling-2d-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(average-pooling-2d-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) -- ADD_TEST(NAME average-pooling-2d-test COMMAND average-pooling-2d-test) -- -- ADD_EXECUTABLE(bankers-rounding-test test/bankers-rounding.cc) -- TARGET_INCLUDE_DIRECTORIES(bankers-rounding-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(bankers-rounding-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) -- ADD_TEST(NAME bankers-rounding-test COMMAND bankers-rounding-test) -- -- ADD_EXECUTABLE(ceiling-test test/ceiling.cc) -- TARGET_INCLUDE_DIRECTORIES(ceiling-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(ceiling-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) -- ADD_TEST(NAME ceiling-test COMMAND ceiling-test) -- -- ADD_EXECUTABLE(clamp-test test/clamp.cc) -- TARGET_INCLUDE_DIRECTORIES(clamp-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(clamp-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) -- ADD_TEST(NAME clamp-test COMMAND clamp-test) -- -- ADD_EXECUTABLE(concatenate2-test test/concatenate2.cc) -- TARGET_INCLUDE_DIRECTORIES(concatenate2-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(concatenate2-test PRIVATE XNNPACK gtest gtest_main subgraph) -- ADD_TEST(NAME concatenate2-test COMMAND concatenate2-test) -- -- ADD_EXECUTABLE(concatenate3-test test/concatenate3.cc) -- TARGET_INCLUDE_DIRECTORIES(concatenate3-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(concatenate3-test PRIVATE XNNPACK gtest gtest_main subgraph) -- ADD_TEST(NAME concatenate3-test COMMAND concatenate3-test) -- -- ADD_EXECUTABLE(concatenate4-test test/concatenate4.cc) -- TARGET_INCLUDE_DIRECTORIES(concatenate4-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(concatenate4-test PRIVATE XNNPACK gtest gtest_main subgraph) -- ADD_TEST(NAME concatenate4-test COMMAND concatenate4-test) -- -- ADD_EXECUTABLE(convert-test test/convert.cc) -- TARGET_INCLUDE_DIRECTORIES(convert-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(convert-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) -- ADD_TEST(NAME convert-test COMMAND convert-test) -- -- ADD_EXECUTABLE(convolution-2d-test test/convolution-2d.cc) -- SET_TARGET_PROPERTIES(convolution-2d-test PROPERTIES CXX_EXTENSIONS YES) -- TARGET_INCLUDE_DIRECTORIES(convolution-2d-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(convolution-2d-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph convolution-test-helpers) -- ADD_TEST(NAME convolution-2d-test COMMAND convolution-2d-test) -- -- ADD_EXECUTABLE(copy-test test/copy.cc) -- TARGET_INCLUDE_DIRECTORIES(copy-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(copy-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) -- ADD_TEST(NAME copy-test COMMAND copy-test) -- -- ADD_EXECUTABLE(deconvolution-2d-test test/deconvolution-2d.cc) -- SET_TARGET_PROPERTIES(deconvolution-2d-test PROPERTIES CXX_EXTENSIONS YES) -- TARGET_INCLUDE_DIRECTORIES(deconvolution-2d-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(deconvolution-2d-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph convolution-test-helpers) -- ADD_TEST(NAME deconvolution-2d-test COMMAND deconvolution-2d-test) -- -- ADD_EXECUTABLE(depth-to-space-test test/depth-to-space.cc) -- TARGET_INCLUDE_DIRECTORIES(depth-to-space-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(depth-to-space-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) -- ADD_TEST(NAME depth-to-space-test COMMAND depth-to-space-test) -- -- ADD_EXECUTABLE(depthwise-convolution-2d-test test/depthwise-convolution-2d.cc) -- SET_TARGET_PROPERTIES(depthwise-convolution-2d-test PROPERTIES CXX_EXTENSIONS YES) -- TARGET_INCLUDE_DIRECTORIES(depthwise-convolution-2d-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(depthwise-convolution-2d-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph convolution-test-helpers) -- ADD_TEST(NAME depthwise-convolution-2d-test COMMAND depthwise-convolution-2d-test) -- -- ADD_EXECUTABLE(divide2-test test/divide2.cc) -- TARGET_INCLUDE_DIRECTORIES(divide2-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(divide2-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) -- ADD_TEST(NAME divide2-test COMMAND divide2-test) -- -- ADD_EXECUTABLE(elu-test test/elu.cc) -- TARGET_INCLUDE_DIRECTORIES(elu-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(elu-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) -- ADD_TEST(NAME elu-test COMMAND elu-test) -- -- ADD_EXECUTABLE(even-split2-test test/even-split2.cc) -- TARGET_INCLUDE_DIRECTORIES(even-split2-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(even-split2-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) -- ADD_TEST(NAME even-split2-test COMMAND even-split2-test) -- -- ADD_EXECUTABLE(even-split3-test test/even-split3.cc) -- TARGET_INCLUDE_DIRECTORIES(even-split3-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(even-split3-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) -- ADD_TEST(NAME even-split3-test COMMAND even-split3-test) -- -- ADD_EXECUTABLE(even-split4-test test/even-split4.cc) -- TARGET_INCLUDE_DIRECTORIES(even-split4-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(even-split4-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) -- ADD_TEST(NAME even-split4-test COMMAND even-split4-test) -- -- ADD_EXECUTABLE(floor-test test/floor.cc) -- TARGET_INCLUDE_DIRECTORIES(floor-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(floor-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) -- ADD_TEST(NAME floor-test COMMAND floor-test) -- -- ADD_EXECUTABLE(fully-connected-test test/fully-connected.cc) -- TARGET_INCLUDE_DIRECTORIES(fully-connected-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(fully-connected-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) -- ADD_TEST(NAME fully-connected-test COMMAND fully-connected-test) -- -- ADD_EXECUTABLE(global-average-pooling-1d-test test/global-average-pooling-1d.cc) -- TARGET_INCLUDE_DIRECTORIES(global-average-pooling-1d-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(global-average-pooling-1d-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) -- ADD_TEST(NAME global-average-pooling-1d-test COMMAND global-average-pooling-1d-test) -- -- ADD_EXECUTABLE(global-average-pooling-2d-test test/global-average-pooling-2d.cc) -- TARGET_INCLUDE_DIRECTORIES(global-average-pooling-2d-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(global-average-pooling-2d-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) -- ADD_TEST(NAME global-average-pooling-2d-test COMMAND global-average-pooling-2d-test) -- -- ADD_EXECUTABLE(hardswish-test test/hardswish.cc) -- TARGET_INCLUDE_DIRECTORIES(hardswish-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(hardswish-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) -- ADD_TEST(NAME hardswish-test COMMAND hardswish-test) -- -- ADD_EXECUTABLE(leaky-relu-test test/leaky-relu.cc) -- TARGET_INCLUDE_DIRECTORIES(leaky-relu-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(leaky-relu-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) -- ADD_TEST(NAME leaky-relu-test COMMAND leaky-relu-test) -- -- ADD_EXECUTABLE(max-pooling-2d-test test/max-pooling-2d.cc) -- TARGET_INCLUDE_DIRECTORIES(max-pooling-2d-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(max-pooling-2d-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) -- ADD_TEST(NAME max-pooling-2d-test COMMAND max-pooling-2d-test) -- -- ADD_EXECUTABLE(maximum2-test test/maximum2.cc) -- TARGET_INCLUDE_DIRECTORIES(maximum2-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(maximum2-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) -- ADD_TEST(NAME maximum2-test COMMAND maximum2-test) -- -- ADD_EXECUTABLE(minimum2-test test/minimum2.cc) -- TARGET_INCLUDE_DIRECTORIES(minimum2-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(minimum2-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) -- ADD_TEST(NAME minimum2-test COMMAND minimum2-test) -- -- ADD_EXECUTABLE(multiply2-test test/multiply2.cc) -- TARGET_INCLUDE_DIRECTORIES(multiply2-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(multiply2-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) -- ADD_TEST(NAME multiply2-test COMMAND multiply2-test) -- -- ADD_EXECUTABLE(negate-test test/negate.cc) -- TARGET_INCLUDE_DIRECTORIES(negate-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(negate-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) -- ADD_TEST(NAME negate-test COMMAND negate-test) -- -- ADD_EXECUTABLE(prelu-test test/prelu.cc) -- TARGET_INCLUDE_DIRECTORIES(prelu-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(prelu-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) -- ADD_TEST(NAME prelu-test COMMAND prelu-test) -- -- ADD_EXECUTABLE(sigmoid-test test/sigmoid.cc) -- SET_TARGET_PROPERTIES(sigmoid-test PROPERTIES CXX_EXTENSIONS YES) -- TARGET_INCLUDE_DIRECTORIES(sigmoid-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(sigmoid-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) -- ADD_TEST(NAME sigmoid-test COMMAND sigmoid-test) -- -- ADD_EXECUTABLE(static-slice-test test/static-slice.cc) -- SET_TARGET_PROPERTIES(static-slice-test PROPERTIES CXX_EXTENSIONS YES) -- TARGET_INCLUDE_DIRECTORIES(static-slice-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(static-slice-test PRIVATE XNNPACK fp16 gmock gtest gtest_main subgraph) -- ADD_TEST(NAME static-slice-test COMMAND static-slice-test) -- -- ADD_EXECUTABLE(softmax-test test/softmax.cc) -- TARGET_INCLUDE_DIRECTORIES(softmax-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(softmax-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) -- ADD_TEST(NAME softmax-test COMMAND softmax-test) -- -- ADD_EXECUTABLE(space-to-depth-2d-test test/space-to-depth-2d.cc) -- TARGET_INCLUDE_DIRECTORIES(space-to-depth-2d-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(space-to-depth-2d-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) -- ADD_TEST(NAME space-to-depth-2d-test COMMAND space-to-depth-2d-test) -- -- ADD_EXECUTABLE(square-test test/square.cc) -- TARGET_INCLUDE_DIRECTORIES(square-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(square-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) -- ADD_TEST(NAME square-test COMMAND square-test) -- -- ADD_EXECUTABLE(square-root-test test/square.cc) -- TARGET_INCLUDE_DIRECTORIES(square-root-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(square-root-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) -- ADD_TEST(NAME square-root-test COMMAND square-root-test) -- -- ADD_EXECUTABLE(squared-difference-test test/squared-difference.cc) -- TARGET_INCLUDE_DIRECTORIES(squared-difference-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(squared-difference-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) -- ADD_TEST(NAME squared-difference-test COMMAND squared-difference-test) -- -- ADD_EXECUTABLE(static-constant-pad-test test/static-constant-pad.cc) -- TARGET_INCLUDE_DIRECTORIES(static-constant-pad-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(static-constant-pad-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) -- ADD_TEST(NAME static-constant-pad-test COMMAND static-constant-pad-test) -- -- ADD_EXECUTABLE(static-reshape-test test/static-reshape.cc) -- TARGET_INCLUDE_DIRECTORIES(static-reshape-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(static-reshape-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) -- ADD_TEST(NAME static-reshape-test COMMAND static-reshape-test) -- -- ADD_EXECUTABLE(static-resize-bilinear-2d-test test/static-resize-bilinear-2d.cc) -- TARGET_INCLUDE_DIRECTORIES(static-resize-bilinear-2d-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(static-resize-bilinear-2d-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) -- ADD_TEST(NAME static-resize-bilinear-2d-test COMMAND static-resize-bilinear-2d-test) -- -- ADD_EXECUTABLE(static-transpose-test test/static-transpose.cc) -- TARGET_INCLUDE_DIRECTORIES(static-transpose-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(static-transpose-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) -- ADD_TEST(NAME static-transpose-test COMMAND static-transpose-test) -- -- ADD_EXECUTABLE(subtract2-test test/subtract2.cc) -- TARGET_INCLUDE_DIRECTORIES(subtract2-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(subtract2-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) -- ADD_TEST(NAME subtract2-test COMMAND subtract2-test) -- -- ADD_EXECUTABLE(unpooling-2d-test test/unpooling-2d.cc) -- TARGET_INCLUDE_DIRECTORIES(unpooling-2d-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(unpooling-2d-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) -- ADD_TEST(NAME unpooling-2d-test COMMAND unpooling-2d-test) - ENDIF() - - # ---[ Normalization unit tests -@@ -2834,21 +2574,7 @@ IF(XNNPACK_BUILD_TESTS) - ADD_EXECUTABLE(microkernel-utils-test test/microkernel-utils.cc) - TARGET_INCLUDE_DIRECTORIES(microkernel-utils-test PRIVATE include src) - TARGET_LINK_LIBRARIES(microkernel-utils-test PRIVATE microkernel-utils gtest gtest_main pthreadpool) -- -- ADD_EXECUTABLE(operator-utils-test test/operator-utils.cc) -- TARGET_INCLUDE_DIRECTORIES(operator-utils-test PRIVATE include src) -- TARGET_LINK_LIBRARIES(operator-utils-test PRIVATE XNNPACK gtest gtest_main pthreadpool) - ENDIF() -- -- ADD_EXECUTABLE(packing-test test/packing.cc) -- TARGET_INCLUDE_DIRECTORIES(packing-test PRIVATE include src) -- TARGET_LINK_LIBRARIES(packing-test PRIVATE fp16 gtest gtest_main pthreadpool) -- TARGET_LINK_LIBRARIES(packing-test PRIVATE XNNPACK microkernel-utils operator-utils packing) -- -- ADD_EXECUTABLE(indirection-test test/indirection.cc) -- TARGET_INCLUDE_DIRECTORIES(indirection-test PRIVATE include src) -- TARGET_LINK_LIBRARIES(indirection-test PRIVATE gtest gtest_main pthreadpool) -- TARGET_LINK_LIBRARIES(indirection-test PRIVATE XNNPACK indirection) - ENDIF() - - # ---[ XNNPACK microbenchmarks diff --git a/gnu/packages/patches/xnnpack-system-libraries.patch b/gnu/packages/patches/xnnpack-system-libraries.patch deleted file mode 100644 index a711aa0d6c..0000000000 --- a/gnu/packages/patches/xnnpack-system-libraries.patch +++ /dev/null @@ -1,2660 +0,0 @@ -This patch allows the build process to use the provided dependencies instead -of adding their source as CMake sub-directories (in which case "make install" -would install googletest's and googlebenchmark's libraries and headers). - -diff a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt -+++ b/CMakeLists.txt 2023-12-27 13:29:04.608138355 +0100 -@@ -850,25 +850,8 @@ - SET_PROPERTY(TARGET pthreadpool PROPERTY IMPORTED_IMPLIB "${PTHREADPOOL_LIBRARY}") - ENDIF() - ENDIF() --TARGET_LINK_LIBRARIES(microkernels-all PRIVATE pthreadpool) --TARGET_LINK_LIBRARIES(microkernels-prod PRIVATE pthreadpool) --TARGET_LINK_LIBRARIES(hardware-config PRIVATE pthreadpool) --TARGET_LINK_LIBRARIES(indirection PRIVATE pthreadpool) --TARGET_LINK_LIBRARIES(jit PRIVATE pthreadpool) --TARGET_LINK_LIBRARIES(logging PRIVATE pthreadpool) --TARGET_LINK_LIBRARIES(microparams-init PRIVATE pthreadpool) --TARGET_LINK_LIBRARIES(normalization PRIVATE pthreadpool) --TARGET_LINK_LIBRARIES(packing PRIVATE pthreadpool) - IF(XNNPACK_BUILD_LIBRARY) - TARGET_LINK_LIBRARIES(XNNPACK PUBLIC pthreadpool) -- TARGET_LINK_LIBRARIES(allocator PRIVATE pthreadpool) -- TARGET_LINK_LIBRARIES(cache PRIVATE memory pthreadpool) -- TARGET_LINK_LIBRARIES(subgraph PRIVATE pthreadpool) -- TARGET_LINK_LIBRARIES(operators PRIVATE pthreadpool) -- TARGET_LINK_LIBRARIES(operator-run PRIVATE pthreadpool) -- TARGET_LINK_LIBRARIES(operator-utils PRIVATE pthreadpool) -- TARGET_LINK_LIBRARIES(mutex PRIVATE pthreadpool) -- TARGET_LINK_LIBRARIES(memory PRIVATE pthreadpool) - TARGET_LINK_LIBRARIES(post-operation PUBLIC pthreadpool allocator) - ENDIF() - -@@ -889,12 +872,6 @@ - SET_PROPERTY(TARGET fxdiv PROPERTY LINKER_LANGUAGE C) - ENDIF() - ENDIF() --TARGET_LINK_LIBRARIES(microkernels-all PRIVATE fxdiv) --TARGET_LINK_LIBRARIES(microkernels-prod PRIVATE fxdiv) --TARGET_LINK_LIBRARIES(indirection PRIVATE fxdiv) --IF(XNNPACK_BUILD_LIBRARY) -- TARGET_LINK_LIBRARIES(XNNPACK PRIVATE fxdiv) --ENDIF() - - # ---[ Configure FP16 - IF(NOT TARGET fp16) -@@ -913,17 +890,7 @@ - SET_PROPERTY(TARGET fp16 PROPERTY LINKER_LANGUAGE C) - ENDIF() - ENDIF() --TARGET_LINK_LIBRARIES(microkernels-all PRIVATE fp16) --TARGET_LINK_LIBRARIES(microkernels-prod PRIVATE fp16) --TARGET_LINK_LIBRARIES(microparams-init PRIVATE fp16) --TARGET_LINK_LIBRARIES(packing PRIVATE fp16) --TARGET_LINK_LIBRARIES(indirection PRIVATE fp16) - IF(XNNPACK_BUILD_LIBRARY) -- TARGET_LINK_LIBRARIES(subgraph PRIVATE fp16) -- TARGET_LINK_LIBRARIES(operators PRIVATE fp16) -- TARGET_LINK_LIBRARIES(operator-run PRIVATE fp16) -- -- TARGET_LINK_LIBRARIES(XNNPACK PRIVATE fp16) - INSTALL(TARGETS XNNPACK - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -@@ -943,7 +910,7 @@ - # Helper libraries - ADD_LIBRARY(gemm-microkernel-tester STATIC test/gemm-microkernel-tester.cc) - TARGET_INCLUDE_DIRECTORIES(gemm-microkernel-tester PRIVATE . include src test) -- TARGET_LINK_LIBRARIES(gemm-microkernel-tester PRIVATE fp16 pthreadpool gtest) -+ TARGET_LINK_LIBRARIES(gemm-microkernel-tester PRIVATE gtest) - TARGET_LINK_LIBRARIES(gemm-microkernel-tester PRIVATE jit packing) - IF(XNNPACK_BUILD_LIBRARY) - TARGET_LINK_LIBRARIES(gemm-microkernel-tester PRIVATE XNNPACK post-operation) -@@ -960,22 +927,22 @@ - # ---[ Build operator-level unit tests - ADD_EXECUTABLE(abs-nc-test test/abs-nc.cc) - TARGET_INCLUDE_DIRECTORIES(abs-nc-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(abs-nc-test PRIVATE XNNPACK fp16 gtest gtest_main) -+ TARGET_LINK_LIBRARIES(abs-nc-test PRIVATE XNNPACK gtest gtest_main) - ADD_TEST(NAME abs-nc-test COMMAND abs-nc-test) - - ADD_EXECUTABLE(abs-nc-eager-test test/abs-nc-eager.cc) - TARGET_INCLUDE_DIRECTORIES(abs-nc-eager-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(abs-nc-eager-test PRIVATE XNNPACK fp16 gtest gtest_main) -+ TARGET_LINK_LIBRARIES(abs-nc-eager-test PRIVATE XNNPACK gtest gtest_main) - ADD_TEST(NAME abs-nc-eager-test COMMAND abs-nc-eager-test) - - ADD_EXECUTABLE(add-nd-test test/add-nd.cc) - TARGET_INCLUDE_DIRECTORIES(add-nd-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(add-nd-test PRIVATE XNNPACK fp16 gtest gtest_main) -+ TARGET_LINK_LIBRARIES(add-nd-test PRIVATE XNNPACK gtest gtest_main) - ADD_TEST(NAME add-nd-test COMMAND add-nd-test) - - ADD_EXECUTABLE(add-nd-eager-test test/add-nd-eager.cc) - TARGET_INCLUDE_DIRECTORIES(add-nd-eager-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(add-nd-eager-test PRIVATE XNNPACK fp16 gtest gtest_main) -+ TARGET_LINK_LIBRARIES(add-nd-eager-test PRIVATE XNNPACK gtest gtest_main) - ADD_TEST(NAME add-nd-eager-test COMMAND add-nd-eager-test) - - ADD_EXECUTABLE(argmax-pooling-nhwc-test test/argmax-pooling-nhwc.cc) -@@ -985,27 +952,27 @@ - - ADD_EXECUTABLE(average-pooling-nhwc-test test/average-pooling-nhwc.cc) - TARGET_INCLUDE_DIRECTORIES(average-pooling-nhwc-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(average-pooling-nhwc-test PRIVATE XNNPACK fp16 gtest gtest_main) -+ TARGET_LINK_LIBRARIES(average-pooling-nhwc-test PRIVATE XNNPACK gtest gtest_main) - ADD_TEST(NAME average-pooling-nhwc-test COMMAND average-pooling-nhwc-test) - - ADD_EXECUTABLE(bankers-rounding-nc-test test/bankers-rounding-nc.cc) - TARGET_INCLUDE_DIRECTORIES(bankers-rounding-nc-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(bankers-rounding-nc-test PRIVATE XNNPACK fp16 gtest gtest_main) -+ TARGET_LINK_LIBRARIES(bankers-rounding-nc-test PRIVATE XNNPACK gtest gtest_main) - ADD_TEST(NAME bankers-rounding-nc-test COMMAND bankers-rounding-nc-test) - - ADD_EXECUTABLE(bankers-rounding-nc-eager-test test/bankers-rounding-nc-eager.cc) - TARGET_INCLUDE_DIRECTORIES(bankers-rounding-nc-eager-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(bankers-rounding-nc-eager-test PRIVATE XNNPACK fp16 gtest gtest_main) -+ TARGET_LINK_LIBRARIES(bankers-rounding-nc-eager-test PRIVATE XNNPACK gtest gtest_main) - ADD_TEST(NAME bankers-rounding-nc-eager-test COMMAND bankers-rounding-nc-eager-test) - - ADD_EXECUTABLE(ceiling-nc-test test/ceiling-nc.cc) - TARGET_INCLUDE_DIRECTORIES(ceiling-nc-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(ceiling-nc-test PRIVATE XNNPACK fp16 gtest gtest_main) -+ TARGET_LINK_LIBRARIES(ceiling-nc-test PRIVATE XNNPACK gtest gtest_main) - ADD_TEST(NAME ceiling-nc-test COMMAND ceiling-nc-test) - - ADD_EXECUTABLE(ceiling-nc-eager-test test/ceiling-nc-eager.cc) - TARGET_INCLUDE_DIRECTORIES(ceiling-nc-eager-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(ceiling-nc-eager-test PRIVATE XNNPACK fp16 gtest gtest_main) -+ TARGET_LINK_LIBRARIES(ceiling-nc-eager-test PRIVATE XNNPACK gtest gtest_main) - ADD_TEST(NAME ceiling-nc-eager-test COMMAND ceiling-nc-eager-test) - - ADD_EXECUTABLE(channel-shuffle-nc-test test/channel-shuffle-nc.cc) -@@ -1015,12 +982,12 @@ - - ADD_EXECUTABLE(clamp-nc-test test/clamp-nc.cc) - TARGET_INCLUDE_DIRECTORIES(clamp-nc-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(clamp-nc-test PRIVATE XNNPACK fp16 gtest gtest_main) -+ TARGET_LINK_LIBRARIES(clamp-nc-test PRIVATE XNNPACK gtest gtest_main) - ADD_TEST(NAME clamp-nc-test COMMAND clamp-nc-test) - - ADD_EXECUTABLE(clamp-nc-eager-test test/clamp-nc-eager.cc) - TARGET_INCLUDE_DIRECTORIES(clamp-nc-eager-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(clamp-nc-eager-test PRIVATE XNNPACK fp16 gtest gtest_main) -+ TARGET_LINK_LIBRARIES(clamp-nc-eager-test PRIVATE XNNPACK gtest gtest_main) - ADD_TEST(NAME clamp-nc-eager-test COMMAND clamp-nc-eager-test) - - ADD_EXECUTABLE(constant-pad-nd-test test/constant-pad-nd.cc) -@@ -1035,25 +1002,25 @@ - - ADD_EXECUTABLE(convert-nc-test test/convert-nc.cc) - TARGET_INCLUDE_DIRECTORIES(convert-nc-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(convert-nc-test PRIVATE XNNPACK fp16 gtest gtest_main) -+ TARGET_LINK_LIBRARIES(convert-nc-test PRIVATE XNNPACK gtest gtest_main) - ADD_TEST(NAME convert-nc-test COMMAND convert-nc-test) - - ADD_EXECUTABLE(convert-nc-eager-test test/convert-nc-eager.cc) - TARGET_INCLUDE_DIRECTORIES(convert-nc-eager-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(convert-nc-eager-test PRIVATE XNNPACK fp16 gtest gtest_main) -+ TARGET_LINK_LIBRARIES(convert-nc-eager-test PRIVATE XNNPACK gtest gtest_main) - ADD_TEST(NAME convert-nc-eager-test COMMAND convert-nc-eager-test) - - ADD_EXECUTABLE(convolution-nhwc-test test/convolution-nhwc.cc) - SET_TARGET_PROPERTIES(convolution-nhwc-test PROPERTIES CXX_EXTENSIONS YES) - TARGET_INCLUDE_DIRECTORIES(convolution-nhwc-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(convolution-nhwc-test PRIVATE XNNPACK fp16 gtest gtest_main) -+ TARGET_LINK_LIBRARIES(convolution-nhwc-test PRIVATE XNNPACK gtest gtest_main) - TARGET_LINK_LIBRARIES(convolution-nhwc-test PRIVATE convolution-test-helpers) - ADD_TEST(NAME convolution-nhwc-test COMMAND convolution-nhwc-test) - - ADD_EXECUTABLE(convolution-nchw-test test/convolution-nchw.cc) - SET_TARGET_PROPERTIES(convolution-nchw-test PROPERTIES CXX_EXTENSIONS YES) - TARGET_INCLUDE_DIRECTORIES(convolution-nchw-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(convolution-nchw-test PRIVATE XNNPACK fp16 gtest gtest_main) -+ TARGET_LINK_LIBRARIES(convolution-nchw-test PRIVATE XNNPACK gtest gtest_main) - ADD_TEST(NAME convolution-nchw-test COMMAND convolution-nchw-test) - - ADD_EXECUTABLE(copy-nc-test test/copy-nc.cc) -@@ -1068,7 +1035,7 @@ - - ADD_EXECUTABLE(deconvolution-nhwc-test test/deconvolution-nhwc.cc) - TARGET_INCLUDE_DIRECTORIES(deconvolution-nhwc-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(deconvolution-nhwc-test PRIVATE XNNPACK fp16 gtest gtest_main) -+ TARGET_LINK_LIBRARIES(deconvolution-nhwc-test PRIVATE XNNPACK gtest gtest_main) - ADD_TEST(NAME deconvolution-nhwc-test COMMAND deconvolution-nhwc-test) - - ADD_EXECUTABLE(depth-to-space-nchw2nhwc-test test/depth-to-space-nchw2nhwc.cc) -@@ -1083,197 +1050,197 @@ - - ADD_EXECUTABLE(divide-nd-test test/divide-nd.cc) - TARGET_INCLUDE_DIRECTORIES(divide-nd-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(divide-nd-test PRIVATE XNNPACK fp16 gtest gtest_main) -+ TARGET_LINK_LIBRARIES(divide-nd-test PRIVATE XNNPACK gtest gtest_main) - ADD_TEST(NAME divide-nd-test COMMAND divide-nd-test) - - ADD_EXECUTABLE(divide-nd-eager-test test/divide-nd-eager.cc) - TARGET_INCLUDE_DIRECTORIES(divide-nd-eager-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(divide-nd-eager-test PRIVATE XNNPACK fp16 gtest gtest_main) -+ TARGET_LINK_LIBRARIES(divide-nd-eager-test PRIVATE XNNPACK gtest gtest_main) - ADD_TEST(NAME divide-nd-eager-test COMMAND divide-nd-eager-test) - - ADD_EXECUTABLE(elu-nc-test test/elu-nc.cc) - TARGET_INCLUDE_DIRECTORIES(elu-nc-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(elu-nc-test PRIVATE XNNPACK fp16 gtest gtest_main) -+ TARGET_LINK_LIBRARIES(elu-nc-test PRIVATE XNNPACK gtest gtest_main) - ADD_TEST(NAME elu-nc-test COMMAND elu-nc-test) - - ADD_EXECUTABLE(elu-nc-eager-test test/elu-nc-eager.cc) - TARGET_INCLUDE_DIRECTORIES(elu-nc-eager-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(elu-nc-eager-test PRIVATE XNNPACK fp16 gtest gtest_main) -+ TARGET_LINK_LIBRARIES(elu-nc-eager-test PRIVATE XNNPACK gtest gtest_main) - ADD_TEST(NAME elu-nc-eager-test COMMAND elu-nc-eager-test) - - ADD_EXECUTABLE(fully-connected-nc-test test/fully-connected-nc.cc) - TARGET_INCLUDE_DIRECTORIES(fully-connected-nc-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(fully-connected-nc-test PRIVATE XNNPACK fp16 gtest gtest_main) -+ TARGET_LINK_LIBRARIES(fully-connected-nc-test PRIVATE XNNPACK gtest gtest_main) - ADD_TEST(NAME fully-connected-nc-test COMMAND fully-connected-nc-test) - - ADD_EXECUTABLE(floor-nc-test test/floor-nc.cc) - TARGET_INCLUDE_DIRECTORIES(floor-nc-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(floor-nc-test PRIVATE XNNPACK fp16 gtest gtest_main) -+ TARGET_LINK_LIBRARIES(floor-nc-test PRIVATE XNNPACK gtest gtest_main) - ADD_TEST(NAME floor-nc-test COMMAND floor-nc-test) - - ADD_EXECUTABLE(floor-nc-eager-test test/floor-nc-eager.cc) - TARGET_INCLUDE_DIRECTORIES(floor-nc-eager-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(floor-nc-eager-test PRIVATE XNNPACK fp16 gtest gtest_main) -+ TARGET_LINK_LIBRARIES(floor-nc-eager-test PRIVATE XNNPACK gtest gtest_main) - ADD_TEST(NAME floor-nc-eager-test COMMAND floor-nc-eager-test) - - ADD_EXECUTABLE(global-average-pooling-nwc-test test/global-average-pooling-nwc.cc) - TARGET_INCLUDE_DIRECTORIES(global-average-pooling-nwc-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(global-average-pooling-nwc-test PRIVATE XNNPACK fp16 gtest gtest_main) -+ TARGET_LINK_LIBRARIES(global-average-pooling-nwc-test PRIVATE XNNPACK gtest gtest_main) - ADD_TEST(NAME global-average-pooling-nwc-test COMMAND global-average-pooling-nwc-test) - - ADD_EXECUTABLE(global-average-pooling-ncw-test test/global-average-pooling-ncw.cc) - TARGET_INCLUDE_DIRECTORIES(global-average-pooling-ncw-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(global-average-pooling-ncw-test PRIVATE XNNPACK fp16 gtest gtest_main) -+ TARGET_LINK_LIBRARIES(global-average-pooling-ncw-test PRIVATE XNNPACK gtest gtest_main) - ADD_TEST(NAME global-average-pooling-ncw-test COMMAND global-average-pooling-ncw-test) - - ADD_EXECUTABLE(hardswish-nc-test test/hardswish-nc.cc) - TARGET_INCLUDE_DIRECTORIES(hardswish-nc-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(hardswish-nc-test PRIVATE XNNPACK fp16 gtest gtest_main) -+ TARGET_LINK_LIBRARIES(hardswish-nc-test PRIVATE XNNPACK gtest gtest_main) - ADD_TEST(NAME hardswish-nc-test COMMAND hardswish-nc-test) - - ADD_EXECUTABLE(hardswish-nc-eager-test test/hardswish-nc-eager.cc) - TARGET_INCLUDE_DIRECTORIES(hardswish-nc-eager-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(hardswish-nc-eager-test PRIVATE XNNPACK fp16 gtest gtest_main) -+ TARGET_LINK_LIBRARIES(hardswish-nc-eager-test PRIVATE XNNPACK gtest gtest_main) - ADD_TEST(NAME hardswish-nc-eager-test COMMAND hardswish-nc-eager-test) - - ADD_EXECUTABLE(leaky-relu-nc-test test/leaky-relu-nc.cc) - TARGET_INCLUDE_DIRECTORIES(leaky-relu-nc-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(leaky-relu-nc-test PRIVATE XNNPACK fp16 gtest gtest_main) -+ TARGET_LINK_LIBRARIES(leaky-relu-nc-test PRIVATE XNNPACK gtest gtest_main) - ADD_TEST(NAME leaky-relu-nc-test COMMAND leaky-relu-nc-test) - - ADD_EXECUTABLE(leaky-relu-nc-eager-test test/leaky-relu-nc-eager.cc) - TARGET_INCLUDE_DIRECTORIES(leaky-relu-nc-eager-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(leaky-relu-nc-eager-test PRIVATE XNNPACK fp16 gtest gtest_main) -+ TARGET_LINK_LIBRARIES(leaky-relu-nc-eager-test PRIVATE XNNPACK gtest gtest_main) - ADD_TEST(NAME leaky-relu-nc-eager-test COMMAND leaky-relu-nc-eager-test) - - ADD_EXECUTABLE(max-pooling-nhwc-test test/max-pooling-nhwc.cc) - TARGET_INCLUDE_DIRECTORIES(max-pooling-nhwc-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(max-pooling-nhwc-test PRIVATE XNNPACK fp16 gtest gtest_main) -+ TARGET_LINK_LIBRARIES(max-pooling-nhwc-test PRIVATE XNNPACK gtest gtest_main) - ADD_TEST(NAME max-pooling-nhwc-test COMMAND max-pooling-nhwc-test) - - ADD_EXECUTABLE(maximum-nd-test test/maximum-nd.cc) - TARGET_INCLUDE_DIRECTORIES(maximum-nd-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(maximum-nd-test PRIVATE XNNPACK fp16 gtest gtest_main) -+ TARGET_LINK_LIBRARIES(maximum-nd-test PRIVATE XNNPACK gtest gtest_main) - ADD_TEST(NAME maximum-nd-test COMMAND maximum-nd-test) - - ADD_EXECUTABLE(maximum-nd-eager-test test/maximum-nd-eager.cc) - TARGET_INCLUDE_DIRECTORIES(maximum-nd-eager-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(maximum-nd-eager-test PRIVATE XNNPACK fp16 gtest gtest_main) -+ TARGET_LINK_LIBRARIES(maximum-nd-eager-test PRIVATE XNNPACK gtest gtest_main) - ADD_TEST(NAME maximum-nd-eager-test COMMAND maximum-nd-eager-test) - - ADD_EXECUTABLE(minimum-nd-test test/minimum-nd.cc) - TARGET_INCLUDE_DIRECTORIES(minimum-nd-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(minimum-nd-test PRIVATE XNNPACK fp16 gtest gtest_main) -+ TARGET_LINK_LIBRARIES(minimum-nd-test PRIVATE XNNPACK gtest gtest_main) - ADD_TEST(NAME minimum-nd-test COMMAND minimum-nd-test) - - ADD_EXECUTABLE(minimum-nd-eager-test test/minimum-nd-eager.cc) - TARGET_INCLUDE_DIRECTORIES(minimum-nd-eager-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(minimum-nd-eager-test PRIVATE XNNPACK fp16 gtest gtest_main) -+ TARGET_LINK_LIBRARIES(minimum-nd-eager-test PRIVATE XNNPACK gtest gtest_main) - ADD_TEST(NAME minimum-nd-eager-test COMMAND minimum-nd-eager-test) - - ADD_EXECUTABLE(multiply-nd-test test/multiply-nd.cc) - TARGET_INCLUDE_DIRECTORIES(multiply-nd-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(multiply-nd-test PRIVATE XNNPACK fp16 gtest gtest_main) -+ TARGET_LINK_LIBRARIES(multiply-nd-test PRIVATE XNNPACK gtest gtest_main) - ADD_TEST(NAME multiply-nd-test COMMAND multiply-nd-test) - - ADD_EXECUTABLE(multiply-nd-eager-test test/multiply-nd-eager.cc) - TARGET_INCLUDE_DIRECTORIES(multiply-nd-eager-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(multiply-nd-eager-test PRIVATE XNNPACK fp16 gtest gtest_main) -+ TARGET_LINK_LIBRARIES(multiply-nd-eager-test PRIVATE XNNPACK gtest gtest_main) - ADD_TEST(NAME multiply-nd-eager-test COMMAND multiply-nd-eager-test) - - ADD_EXECUTABLE(negate-nc-test test/negate-nc.cc) - TARGET_INCLUDE_DIRECTORIES(negate-nc-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(negate-nc-test PRIVATE XNNPACK fp16 gtest gtest_main) -+ TARGET_LINK_LIBRARIES(negate-nc-test PRIVATE XNNPACK gtest gtest_main) - ADD_TEST(NAME negate-nc-test COMMAND negate-nc-test) - - ADD_EXECUTABLE(negate-nc-eager-test test/negate-nc-eager.cc) - TARGET_INCLUDE_DIRECTORIES(negate-nc-eager-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(negate-nc-eager-test PRIVATE XNNPACK fp16 gtest gtest_main) -+ TARGET_LINK_LIBRARIES(negate-nc-eager-test PRIVATE XNNPACK gtest gtest_main) - ADD_TEST(NAME negate-nc-eager-test COMMAND negate-nc-eager-test) - - ADD_EXECUTABLE(prelu-nc-test test/prelu-nc.cc) - TARGET_INCLUDE_DIRECTORIES(prelu-nc-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(prelu-nc-test PRIVATE XNNPACK fp16 gtest gtest_main) -+ TARGET_LINK_LIBRARIES(prelu-nc-test PRIVATE XNNPACK gtest gtest_main) - ADD_TEST(NAME prelu-nc-test COMMAND prelu-nc-test) - - ADD_EXECUTABLE(resize-bilinear-nhwc-test test/resize-bilinear-nhwc.cc) - TARGET_INCLUDE_DIRECTORIES(resize-bilinear-nhwc-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(resize-bilinear-nhwc-test PRIVATE XNNPACK fp16 gtest gtest_main) -+ TARGET_LINK_LIBRARIES(resize-bilinear-nhwc-test PRIVATE XNNPACK gtest gtest_main) - ADD_TEST(NAME resize-bilinear-nhwc-test COMMAND resize-bilinear-nhwc-test) - - ADD_EXECUTABLE(resize-bilinear-nchw-test test/resize-bilinear-nchw.cc) - TARGET_INCLUDE_DIRECTORIES(resize-bilinear-nchw-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(resize-bilinear-nchw-test PRIVATE XNNPACK fp16 gtest gtest_main) -+ TARGET_LINK_LIBRARIES(resize-bilinear-nchw-test PRIVATE XNNPACK gtest gtest_main) - ADD_TEST(NAME resize-bilinear-nchw-test COMMAND resize-bilinear-nchw-test) - - ADD_EXECUTABLE(sigmoid-nc-test test/sigmoid-nc.cc) - TARGET_INCLUDE_DIRECTORIES(sigmoid-nc-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(sigmoid-nc-test PRIVATE XNNPACK fp16 gtest gtest_main) -+ TARGET_LINK_LIBRARIES(sigmoid-nc-test PRIVATE XNNPACK gtest gtest_main) - ADD_TEST(NAME sigmoid-nc-test COMMAND sigmoid-nc-test) - - ADD_EXECUTABLE(sigmoid-nc-eager-test test/sigmoid-nc-eager.cc) - TARGET_INCLUDE_DIRECTORIES(sigmoid-nc-eager-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(sigmoid-nc-eager-test PRIVATE XNNPACK fp16 gtest gtest_main) -+ TARGET_LINK_LIBRARIES(sigmoid-nc-eager-test PRIVATE XNNPACK gtest gtest_main) - ADD_TEST(NAME sigmoid-nc-eager-test COMMAND sigmoid-nc-eager-test) - - ADD_EXECUTABLE(slice-nd-test test/slice-nd.cc) - TARGET_INCLUDE_DIRECTORIES(slice-nd-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(slice-nd-test PRIVATE XNNPACK fp16 gtest gtest_main) -+ TARGET_LINK_LIBRARIES(slice-nd-test PRIVATE XNNPACK gtest gtest_main) - ADD_TEST(NAME slice-nd-test COMMAND slice-nd-test) - - ADD_EXECUTABLE(slice-nd-eager-test test/slice-nd-eager.cc) - TARGET_INCLUDE_DIRECTORIES(slice-nd-eager-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(slice-nd-eager-test PRIVATE XNNPACK fp16 gtest gtest_main) -+ TARGET_LINK_LIBRARIES(slice-nd-eager-test PRIVATE XNNPACK gtest gtest_main) - ADD_TEST(NAME slice-nd-eager-test COMMAND slice-nd-eager-test) - - ADD_EXECUTABLE(softmax-nc-test test/softmax-nc.cc) - TARGET_INCLUDE_DIRECTORIES(softmax-nc-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(softmax-nc-test PRIVATE XNNPACK fp16 gtest gtest_main) -+ TARGET_LINK_LIBRARIES(softmax-nc-test PRIVATE XNNPACK gtest gtest_main) - ADD_TEST(NAME softmax-nc-test COMMAND softmax-nc-test) - - ADD_EXECUTABLE(space-to-depth-nhwc-test test/space-to-depth-nhwc.cc) - TARGET_INCLUDE_DIRECTORIES(space-to-depth-nhwc-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(space-to-depth-nhwc-test PRIVATE XNNPACK fp16 gtest gtest_main) -+ TARGET_LINK_LIBRARIES(space-to-depth-nhwc-test PRIVATE XNNPACK gtest gtest_main) - ADD_TEST(NAME space-to-depth-nhwc-test COMMAND space-to-depth-nhwc-test) - - ADD_EXECUTABLE(square-nc-test test/square-nc.cc) - TARGET_INCLUDE_DIRECTORIES(square-nc-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(square-nc-test PRIVATE XNNPACK fp16 gtest gtest_main) -+ TARGET_LINK_LIBRARIES(square-nc-test PRIVATE XNNPACK gtest gtest_main) - ADD_TEST(NAME square-nc-test COMMAND square-nc-test) - - ADD_EXECUTABLE(square-nc-eager-test test/square-nc-eager.cc) - TARGET_INCLUDE_DIRECTORIES(square-nc-eager-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(square-nc-eager-test PRIVATE XNNPACK fp16 gtest gtest_main) -+ TARGET_LINK_LIBRARIES(square-nc-eager-test PRIVATE XNNPACK gtest gtest_main) - ADD_TEST(NAME square-nc-eager-test COMMAND square-nc-eager-test) - - ADD_EXECUTABLE(square-root-nc-test test/square-root-nc.cc) - TARGET_INCLUDE_DIRECTORIES(square-root-nc-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(square-root-nc-test PRIVATE XNNPACK fp16 gtest gtest_main) -+ TARGET_LINK_LIBRARIES(square-root-nc-test PRIVATE XNNPACK gtest gtest_main) - ADD_TEST(NAME square-root-nc-test COMMAND square-root-nc-test) - - ADD_EXECUTABLE(square-root-nc-eager-test test/square-root-nc-eager.cc) - TARGET_INCLUDE_DIRECTORIES(square-root-nc-eager-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(square-root-nc-eager-test PRIVATE XNNPACK fp16 gtest gtest_main) -+ TARGET_LINK_LIBRARIES(square-root-nc-eager-test PRIVATE XNNPACK gtest gtest_main) - ADD_TEST(NAME square-root-nc-eager-test COMMAND square-root-nc-eager-test) - - ADD_EXECUTABLE(squared-difference-nd-test test/squared-difference-nd.cc) - TARGET_INCLUDE_DIRECTORIES(squared-difference-nd-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(squared-difference-nd-test PRIVATE XNNPACK fp16 gtest gtest_main) -+ TARGET_LINK_LIBRARIES(squared-difference-nd-test PRIVATE XNNPACK gtest gtest_main) - ADD_TEST(NAME squared-difference-nd-test COMMAND squared-difference-nd-test) - - ADD_EXECUTABLE(squared-difference-nd-eager-test test/squared-difference-nd-eager.cc) - TARGET_INCLUDE_DIRECTORIES(squared-difference-nd-eager-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(squared-difference-nd-eager-test PRIVATE XNNPACK fp16 gtest gtest_main) -+ TARGET_LINK_LIBRARIES(squared-difference-nd-eager-test PRIVATE XNNPACK gtest gtest_main) - ADD_TEST(NAME squared-difference-nd-eager-test COMMAND squared-difference-nd-eager-test) - - ADD_EXECUTABLE(subtract-nd-test test/subtract-nd.cc) - TARGET_INCLUDE_DIRECTORIES(subtract-nd-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(subtract-nd-test PRIVATE XNNPACK fp16 gtest gtest_main) -+ TARGET_LINK_LIBRARIES(subtract-nd-test PRIVATE XNNPACK gtest gtest_main) - ADD_TEST(NAME subtract-nd-test COMMAND subtract-nd-test) - - ADD_EXECUTABLE(subtract-nd-eager-test test/subtract-nd-eager.cc) - TARGET_INCLUDE_DIRECTORIES(subtract-nd-eager-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(subtract-nd-eager-test PRIVATE XNNPACK fp16 gtest gtest_main) -+ TARGET_LINK_LIBRARIES(subtract-nd-eager-test PRIVATE XNNPACK gtest gtest_main) - ADD_TEST(NAME subtract-nd-eager-test COMMAND subtract-nd-eager-test) - - ADD_EXECUTABLE(tanh-nc-test test/tanh-nc.cc) -@@ -1293,12 +1260,12 @@ - - ADD_EXECUTABLE(truncation-nc-test test/truncation-nc.cc) - TARGET_INCLUDE_DIRECTORIES(truncation-nc-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(truncation-nc-test PRIVATE XNNPACK fp16 gtest gtest_main) -+ TARGET_LINK_LIBRARIES(truncation-nc-test PRIVATE XNNPACK gtest gtest_main) - ADD_TEST(NAME truncation-nc-test COMMAND truncation-nc-test) - - ADD_EXECUTABLE(truncation-nc-eager-test test/truncation-nc-eager.cc) - TARGET_INCLUDE_DIRECTORIES(truncation-nc-eager-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(truncation-nc-eager-test PRIVATE XNNPACK fp16 gtest gtest_main) -+ TARGET_LINK_LIBRARIES(truncation-nc-eager-test PRIVATE XNNPACK gtest gtest_main) - ADD_TEST(NAME truncation-nc-eager-test COMMAND truncation-nc-eager-test) - - ADD_EXECUTABLE(unpooling-nhwc-test test/unpooling-nhwc.cc) -@@ -1350,22 +1317,22 @@ - - ADD_EXECUTABLE(average-pooling-2d-test test/average-pooling-2d.cc) - TARGET_INCLUDE_DIRECTORIES(average-pooling-2d-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(average-pooling-2d-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) -+ TARGET_LINK_LIBRARIES(average-pooling-2d-test PRIVATE XNNPACK gtest gtest_main subgraph) - ADD_TEST(NAME average-pooling-2d-test COMMAND average-pooling-2d-test) - - ADD_EXECUTABLE(bankers-rounding-test test/bankers-rounding.cc) - TARGET_INCLUDE_DIRECTORIES(bankers-rounding-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(bankers-rounding-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) -+ TARGET_LINK_LIBRARIES(bankers-rounding-test PRIVATE XNNPACK gtest gtest_main subgraph) - ADD_TEST(NAME bankers-rounding-test COMMAND bankers-rounding-test) - - ADD_EXECUTABLE(ceiling-test test/ceiling.cc) - TARGET_INCLUDE_DIRECTORIES(ceiling-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(ceiling-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) -+ TARGET_LINK_LIBRARIES(ceiling-test PRIVATE XNNPACK gtest gtest_main subgraph) - ADD_TEST(NAME ceiling-test COMMAND ceiling-test) - - ADD_EXECUTABLE(clamp-test test/clamp.cc) - TARGET_INCLUDE_DIRECTORIES(clamp-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(clamp-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) -+ TARGET_LINK_LIBRARIES(clamp-test PRIVATE XNNPACK gtest gtest_main subgraph) - ADD_TEST(NAME clamp-test COMMAND clamp-test) - - ADD_EXECUTABLE(concatenate2-test test/concatenate2.cc) -@@ -1385,187 +1352,187 @@ - - ADD_EXECUTABLE(convert-test test/convert.cc) - TARGET_INCLUDE_DIRECTORIES(convert-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(convert-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) -+ TARGET_LINK_LIBRARIES(convert-test PRIVATE XNNPACK gtest gtest_main subgraph) - ADD_TEST(NAME convert-test COMMAND convert-test) - - ADD_EXECUTABLE(convolution-2d-test test/convolution-2d.cc) - SET_TARGET_PROPERTIES(convolution-2d-test PROPERTIES CXX_EXTENSIONS YES) - TARGET_INCLUDE_DIRECTORIES(convolution-2d-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(convolution-2d-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph convolution-test-helpers) -+ TARGET_LINK_LIBRARIES(convolution-2d-test PRIVATE XNNPACK gtest gtest_main subgraph convolution-test-helpers) - ADD_TEST(NAME convolution-2d-test COMMAND convolution-2d-test) - - ADD_EXECUTABLE(copy-test test/copy.cc) - TARGET_INCLUDE_DIRECTORIES(copy-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(copy-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) -+ TARGET_LINK_LIBRARIES(copy-test PRIVATE XNNPACK gtest gtest_main subgraph) - ADD_TEST(NAME copy-test COMMAND copy-test) - - ADD_EXECUTABLE(deconvolution-2d-test test/deconvolution-2d.cc) - SET_TARGET_PROPERTIES(deconvolution-2d-test PROPERTIES CXX_EXTENSIONS YES) - TARGET_INCLUDE_DIRECTORIES(deconvolution-2d-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(deconvolution-2d-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph convolution-test-helpers) -+ TARGET_LINK_LIBRARIES(deconvolution-2d-test PRIVATE XNNPACK gtest gtest_main subgraph convolution-test-helpers) - ADD_TEST(NAME deconvolution-2d-test COMMAND deconvolution-2d-test) - - ADD_EXECUTABLE(depth-to-space-test test/depth-to-space.cc) - TARGET_INCLUDE_DIRECTORIES(depth-to-space-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(depth-to-space-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) -+ TARGET_LINK_LIBRARIES(depth-to-space-test PRIVATE XNNPACK gtest gtest_main subgraph) - ADD_TEST(NAME depth-to-space-test COMMAND depth-to-space-test) - - ADD_EXECUTABLE(depthwise-convolution-2d-test test/depthwise-convolution-2d.cc) - SET_TARGET_PROPERTIES(depthwise-convolution-2d-test PROPERTIES CXX_EXTENSIONS YES) - TARGET_INCLUDE_DIRECTORIES(depthwise-convolution-2d-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(depthwise-convolution-2d-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph convolution-test-helpers) -+ TARGET_LINK_LIBRARIES(depthwise-convolution-2d-test PRIVATE XNNPACK gtest gtest_main subgraph convolution-test-helpers) - ADD_TEST(NAME depthwise-convolution-2d-test COMMAND depthwise-convolution-2d-test) - - ADD_EXECUTABLE(divide2-test test/divide2.cc) - TARGET_INCLUDE_DIRECTORIES(divide2-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(divide2-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) -+ TARGET_LINK_LIBRARIES(divide2-test PRIVATE XNNPACK gtest gtest_main subgraph) - ADD_TEST(NAME divide2-test COMMAND divide2-test) - - ADD_EXECUTABLE(elu-test test/elu.cc) - TARGET_INCLUDE_DIRECTORIES(elu-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(elu-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) -+ TARGET_LINK_LIBRARIES(elu-test PRIVATE XNNPACK gtest gtest_main subgraph) - ADD_TEST(NAME elu-test COMMAND elu-test) - - ADD_EXECUTABLE(even-split2-test test/even-split2.cc) - TARGET_INCLUDE_DIRECTORIES(even-split2-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(even-split2-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) -+ TARGET_LINK_LIBRARIES(even-split2-test PRIVATE XNNPACK gtest gtest_main subgraph) - ADD_TEST(NAME even-split2-test COMMAND even-split2-test) - - ADD_EXECUTABLE(even-split3-test test/even-split3.cc) - TARGET_INCLUDE_DIRECTORIES(even-split3-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(even-split3-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) -+ TARGET_LINK_LIBRARIES(even-split3-test PRIVATE XNNPACK gtest gtest_main subgraph) - ADD_TEST(NAME even-split3-test COMMAND even-split3-test) - - ADD_EXECUTABLE(even-split4-test test/even-split4.cc) - TARGET_INCLUDE_DIRECTORIES(even-split4-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(even-split4-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) -+ TARGET_LINK_LIBRARIES(even-split4-test PRIVATE XNNPACK gtest gtest_main subgraph) - ADD_TEST(NAME even-split4-test COMMAND even-split4-test) - - ADD_EXECUTABLE(floor-test test/floor.cc) - TARGET_INCLUDE_DIRECTORIES(floor-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(floor-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) -+ TARGET_LINK_LIBRARIES(floor-test PRIVATE XNNPACK gtest gtest_main subgraph) - ADD_TEST(NAME floor-test COMMAND floor-test) - - ADD_EXECUTABLE(fully-connected-test test/fully-connected.cc) - TARGET_INCLUDE_DIRECTORIES(fully-connected-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(fully-connected-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) -+ TARGET_LINK_LIBRARIES(fully-connected-test PRIVATE XNNPACK gtest gtest_main subgraph) - ADD_TEST(NAME fully-connected-test COMMAND fully-connected-test) - - ADD_EXECUTABLE(global-average-pooling-1d-test test/global-average-pooling-1d.cc) - TARGET_INCLUDE_DIRECTORIES(global-average-pooling-1d-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(global-average-pooling-1d-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) -+ TARGET_LINK_LIBRARIES(global-average-pooling-1d-test PRIVATE XNNPACK gtest gtest_main subgraph) - ADD_TEST(NAME global-average-pooling-1d-test COMMAND global-average-pooling-1d-test) - - ADD_EXECUTABLE(global-average-pooling-2d-test test/global-average-pooling-2d.cc) - TARGET_INCLUDE_DIRECTORIES(global-average-pooling-2d-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(global-average-pooling-2d-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) -+ TARGET_LINK_LIBRARIES(global-average-pooling-2d-test PRIVATE XNNPACK gtest gtest_main subgraph) - ADD_TEST(NAME global-average-pooling-2d-test COMMAND global-average-pooling-2d-test) - - ADD_EXECUTABLE(hardswish-test test/hardswish.cc) - TARGET_INCLUDE_DIRECTORIES(hardswish-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(hardswish-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) -+ TARGET_LINK_LIBRARIES(hardswish-test PRIVATE XNNPACK gtest gtest_main subgraph) - ADD_TEST(NAME hardswish-test COMMAND hardswish-test) - - ADD_EXECUTABLE(leaky-relu-test test/leaky-relu.cc) - TARGET_INCLUDE_DIRECTORIES(leaky-relu-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(leaky-relu-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) -+ TARGET_LINK_LIBRARIES(leaky-relu-test PRIVATE XNNPACK gtest gtest_main subgraph) - ADD_TEST(NAME leaky-relu-test COMMAND leaky-relu-test) - - ADD_EXECUTABLE(max-pooling-2d-test test/max-pooling-2d.cc) - TARGET_INCLUDE_DIRECTORIES(max-pooling-2d-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(max-pooling-2d-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) -+ TARGET_LINK_LIBRARIES(max-pooling-2d-test PRIVATE XNNPACK gtest gtest_main subgraph) - ADD_TEST(NAME max-pooling-2d-test COMMAND max-pooling-2d-test) - - ADD_EXECUTABLE(maximum2-test test/maximum2.cc) - TARGET_INCLUDE_DIRECTORIES(maximum2-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(maximum2-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) -+ TARGET_LINK_LIBRARIES(maximum2-test PRIVATE XNNPACK gtest gtest_main subgraph) - ADD_TEST(NAME maximum2-test COMMAND maximum2-test) - - ADD_EXECUTABLE(minimum2-test test/minimum2.cc) - TARGET_INCLUDE_DIRECTORIES(minimum2-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(minimum2-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) -+ TARGET_LINK_LIBRARIES(minimum2-test PRIVATE XNNPACK gtest gtest_main subgraph) - ADD_TEST(NAME minimum2-test COMMAND minimum2-test) - - ADD_EXECUTABLE(multiply2-test test/multiply2.cc) - TARGET_INCLUDE_DIRECTORIES(multiply2-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(multiply2-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) -+ TARGET_LINK_LIBRARIES(multiply2-test PRIVATE XNNPACK gtest gtest_main subgraph) - ADD_TEST(NAME multiply2-test COMMAND multiply2-test) - - ADD_EXECUTABLE(negate-test test/negate.cc) - TARGET_INCLUDE_DIRECTORIES(negate-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(negate-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) -+ TARGET_LINK_LIBRARIES(negate-test PRIVATE XNNPACK gtest gtest_main subgraph) - ADD_TEST(NAME negate-test COMMAND negate-test) - - ADD_EXECUTABLE(prelu-test test/prelu.cc) - TARGET_INCLUDE_DIRECTORIES(prelu-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(prelu-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) -+ TARGET_LINK_LIBRARIES(prelu-test PRIVATE XNNPACK gtest gtest_main subgraph) - ADD_TEST(NAME prelu-test COMMAND prelu-test) - - ADD_EXECUTABLE(sigmoid-test test/sigmoid.cc) - SET_TARGET_PROPERTIES(sigmoid-test PROPERTIES CXX_EXTENSIONS YES) - TARGET_INCLUDE_DIRECTORIES(sigmoid-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(sigmoid-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) -+ TARGET_LINK_LIBRARIES(sigmoid-test PRIVATE XNNPACK gtest gtest_main subgraph) - ADD_TEST(NAME sigmoid-test COMMAND sigmoid-test) - - ADD_EXECUTABLE(static-slice-test test/static-slice.cc) - SET_TARGET_PROPERTIES(static-slice-test PROPERTIES CXX_EXTENSIONS YES) - TARGET_INCLUDE_DIRECTORIES(static-slice-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(static-slice-test PRIVATE XNNPACK fp16 gmock gtest gtest_main subgraph) -+ TARGET_LINK_LIBRARIES(static-slice-test PRIVATE XNNPACK gmock gtest gtest_main subgraph) - ADD_TEST(NAME static-slice-test COMMAND static-slice-test) - - ADD_EXECUTABLE(softmax-test test/softmax.cc) - TARGET_INCLUDE_DIRECTORIES(softmax-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(softmax-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) -+ TARGET_LINK_LIBRARIES(softmax-test PRIVATE XNNPACK gtest gtest_main subgraph) - ADD_TEST(NAME softmax-test COMMAND softmax-test) - - ADD_EXECUTABLE(space-to-depth-2d-test test/space-to-depth-2d.cc) - TARGET_INCLUDE_DIRECTORIES(space-to-depth-2d-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(space-to-depth-2d-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) -+ TARGET_LINK_LIBRARIES(space-to-depth-2d-test PRIVATE XNNPACK gtest gtest_main subgraph) - ADD_TEST(NAME space-to-depth-2d-test COMMAND space-to-depth-2d-test) - - ADD_EXECUTABLE(square-test test/square.cc) - TARGET_INCLUDE_DIRECTORIES(square-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(square-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) -+ TARGET_LINK_LIBRARIES(square-test PRIVATE XNNPACK gtest gtest_main subgraph) - ADD_TEST(NAME square-test COMMAND square-test) - - ADD_EXECUTABLE(square-root-test test/square.cc) - TARGET_INCLUDE_DIRECTORIES(square-root-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(square-root-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) -+ TARGET_LINK_LIBRARIES(square-root-test PRIVATE XNNPACK gtest gtest_main subgraph) - ADD_TEST(NAME square-root-test COMMAND square-root-test) - - ADD_EXECUTABLE(squared-difference-test test/squared-difference.cc) - TARGET_INCLUDE_DIRECTORIES(squared-difference-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(squared-difference-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) -+ TARGET_LINK_LIBRARIES(squared-difference-test PRIVATE XNNPACK gtest gtest_main subgraph) - ADD_TEST(NAME squared-difference-test COMMAND squared-difference-test) - - ADD_EXECUTABLE(static-constant-pad-test test/static-constant-pad.cc) - TARGET_INCLUDE_DIRECTORIES(static-constant-pad-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(static-constant-pad-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) -+ TARGET_LINK_LIBRARIES(static-constant-pad-test PRIVATE XNNPACK gtest gtest_main subgraph) - ADD_TEST(NAME static-constant-pad-test COMMAND static-constant-pad-test) - - ADD_EXECUTABLE(static-reshape-test test/static-reshape.cc) - TARGET_INCLUDE_DIRECTORIES(static-reshape-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(static-reshape-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) -+ TARGET_LINK_LIBRARIES(static-reshape-test PRIVATE XNNPACK gtest gtest_main subgraph) - ADD_TEST(NAME static-reshape-test COMMAND static-reshape-test) - - ADD_EXECUTABLE(static-resize-bilinear-2d-test test/static-resize-bilinear-2d.cc) - TARGET_INCLUDE_DIRECTORIES(static-resize-bilinear-2d-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(static-resize-bilinear-2d-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) -+ TARGET_LINK_LIBRARIES(static-resize-bilinear-2d-test PRIVATE XNNPACK gtest gtest_main subgraph) - ADD_TEST(NAME static-resize-bilinear-2d-test COMMAND static-resize-bilinear-2d-test) - - ADD_EXECUTABLE(static-transpose-test test/static-transpose.cc) - TARGET_INCLUDE_DIRECTORIES(static-transpose-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(static-transpose-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) -+ TARGET_LINK_LIBRARIES(static-transpose-test PRIVATE XNNPACK gtest gtest_main subgraph) - ADD_TEST(NAME static-transpose-test COMMAND static-transpose-test) - - ADD_EXECUTABLE(subtract2-test test/subtract2.cc) - TARGET_INCLUDE_DIRECTORIES(subtract2-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(subtract2-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) -+ TARGET_LINK_LIBRARIES(subtract2-test PRIVATE XNNPACK gtest gtest_main subgraph) - ADD_TEST(NAME subtract2-test COMMAND subtract2-test) - - ADD_EXECUTABLE(unpooling-2d-test test/unpooling-2d.cc) - TARGET_INCLUDE_DIRECTORIES(unpooling-2d-test PRIVATE src test) -- TARGET_LINK_LIBRARIES(unpooling-2d-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) -+ TARGET_LINK_LIBRARIES(unpooling-2d-test PRIVATE XNNPACK gtest gtest_main subgraph) - ADD_TEST(NAME unpooling-2d-test COMMAND unpooling-2d-test) - ENDIF() - -@@ -1591,355 +1558,355 @@ - - ADD_EXECUTABLE(f16-f32-vcvt-test test/f16-f32-vcvt.cc) - TARGET_INCLUDE_DIRECTORIES(f16-f32-vcvt-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f16-f32-vcvt-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f16-f32-vcvt-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f16-f32-vcvt-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME f16-f32-vcvt-test COMMAND f16-f32-vcvt-test) - - ADD_EXECUTABLE(f16-gavgpool-cw-test test/f16-gavgpool-cw.cc) - TARGET_INCLUDE_DIRECTORIES(f16-gavgpool-cw-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f16-gavgpool-cw-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f16-gavgpool-cw-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f16-gavgpool-cw-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME f16-gavgpool-cw-test COMMAND f16-gavgpool-cw-test) - - ADD_EXECUTABLE(f16-avgpool-minmax-test test/f16-avgpool-minmax.cc) - TARGET_INCLUDE_DIRECTORIES(f16-avgpool-minmax-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f16-avgpool-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f16-avgpool-minmax-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f16-avgpool-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME f16-avgpool-minmax-test COMMAND f16-avgpool-minmax-test) - - ADD_EXECUTABLE(f16-conv-hwc2chw-test test/f16-conv-hwc2chw.cc) - TARGET_INCLUDE_DIRECTORIES(f16-conv-hwc2chw-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f16-conv-hwc2chw-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f16-conv-hwc2chw-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f16-conv-hwc2chw-test PRIVATE hardware-config logging microkernels-all microparams-init packing) - ADD_TEST(NAME f16-conv-hwc2chw-test COMMAND f16-conv-hwc2chw-test) - - ADD_EXECUTABLE(f16-dwconv-unipass-minmax-test test/f16-dwconv-unipass-minmax.cc) - TARGET_INCLUDE_DIRECTORIES(f16-dwconv-unipass-minmax-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f16-dwconv-unipass-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f16-dwconv-unipass-minmax-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f16-dwconv-unipass-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init packing) - ADD_TEST(NAME f16-dwconv-unipass-minmax-test COMMAND f16-dwconv-unipass-minmax-test) - - ADD_EXECUTABLE(f16-dwconv2d-chw-test test/f16-dwconv2d-chw.cc) - TARGET_INCLUDE_DIRECTORIES(f16-dwconv2d-chw-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f16-dwconv2d-chw-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f16-dwconv2d-chw-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f16-dwconv2d-chw-test PRIVATE hardware-config logging microkernels-all microparams-init packing) - ADD_TEST(NAME f16-dwconv2d-chw-test COMMAND f16-dwconv2d-chw-test) - - ADD_EXECUTABLE(f16-gavgpool-minmax-test test/f16-gavgpool-minmax.cc) - TARGET_INCLUDE_DIRECTORIES(f16-gavgpool-minmax-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f16-gavgpool-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f16-gavgpool-minmax-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f16-gavgpool-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME f16-gavgpool-minmax-test COMMAND f16-gavgpool-minmax-test) - - ADD_EXECUTABLE(f16-gemm-minmax-test test/f16-gemm-minmax.cc) - TARGET_INCLUDE_DIRECTORIES(f16-gemm-minmax-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f16-gemm-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f16-gemm-minmax-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f16-gemm-minmax-test PRIVATE gemm-microkernel-tester hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME f16-gemm-minmax-test COMMAND f16-gemm-minmax-test) - - ADD_EXECUTABLE(f16-ibilinear-chw-test test/f16-ibilinear-chw.cc) - TARGET_INCLUDE_DIRECTORIES(f16-ibilinear-chw-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f16-ibilinear-chw-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f16-ibilinear-chw-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f16-ibilinear-chw-test PRIVATE hardware-config logging microkernels-all) - ADD_TEST(NAME f16-ibilinear-chw-test COMMAND f16-ibilinear-chw-test) - - ADD_EXECUTABLE(f16-ibilinear-test test/f16-ibilinear.cc) - TARGET_INCLUDE_DIRECTORIES(f16-ibilinear-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f16-ibilinear-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f16-ibilinear-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f16-ibilinear-test PRIVATE hardware-config logging microkernels-all) - ADD_TEST(NAME f16-ibilinear-test COMMAND f16-ibilinear-test) - - ADD_EXECUTABLE(f16-igemm-minmax-test test/f16-igemm-minmax.cc) - TARGET_INCLUDE_DIRECTORIES(f16-igemm-minmax-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f16-igemm-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f16-igemm-minmax-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f16-igemm-minmax-test PRIVATE gemm-microkernel-tester hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME f16-igemm-minmax-test COMMAND f16-igemm-minmax-test) - - ADD_EXECUTABLE(f16-maxpool-minmax-test test/f16-maxpool-minmax.cc) - TARGET_INCLUDE_DIRECTORIES(f16-maxpool-minmax-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f16-maxpool-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f16-maxpool-minmax-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f16-maxpool-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME f16-maxpool-minmax-test COMMAND f16-maxpool-minmax-test) - - ADD_EXECUTABLE(f16-spmm-minmax-test test/f16-spmm-minmax.cc) - TARGET_INCLUDE_DIRECTORIES(f16-spmm-minmax-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f16-spmm-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f16-spmm-minmax-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f16-spmm-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME f16-spmm-minmax-test COMMAND f16-spmm-minmax-test) - - ADD_EXECUTABLE(f16-rmax-test test/f16-rmax.cc) - TARGET_INCLUDE_DIRECTORIES(f16-rmax-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f16-rmax-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f16-rmax-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f16-rmax-test PRIVATE hardware-config logging microkernels-all) - ADD_TEST(NAME f16-rmax-test COMMAND f16-rmax-test) - - ADD_EXECUTABLE(f16-vabs-test test/f16-vabs.cc) - TARGET_INCLUDE_DIRECTORIES(f16-vabs-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f16-vabs-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f16-vabs-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f16-vabs-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME f16-vabs-test COMMAND f16-vabs-test) - - ADD_EXECUTABLE(f16-vadd-minmax-test test/f16-vadd-minmax.cc) - TARGET_INCLUDE_DIRECTORIES(f16-vadd-minmax-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f16-vadd-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f16-vadd-minmax-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f16-vadd-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME f16-vadd-minmax-test COMMAND f16-vadd-minmax-test) - - ADD_EXECUTABLE(f16-vaddc-minmax-test test/f16-vaddc-minmax.cc) - TARGET_INCLUDE_DIRECTORIES(f16-vaddc-minmax-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f16-vaddc-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f16-vaddc-minmax-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f16-vaddc-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME f16-vaddc-minmax-test COMMAND f16-vaddc-minmax-test) - - ADD_EXECUTABLE(f16-vclamp-test test/f16-vclamp.cc) - TARGET_INCLUDE_DIRECTORIES(f16-vclamp-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f16-vclamp-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f16-vclamp-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f16-vclamp-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME f16-vclamp-test COMMAND f16-vclamp-test) - - ADD_EXECUTABLE(f16-vdiv-minmax-test test/f16-vdiv-minmax.cc) - TARGET_INCLUDE_DIRECTORIES(f16-vdiv-minmax-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f16-vdiv-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f16-vdiv-minmax-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f16-vdiv-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME f16-vdiv-minmax-test COMMAND f16-vdiv-minmax-test) - - ADD_EXECUTABLE(f16-vdivc-minmax-test test/f16-vdivc-minmax.cc) - TARGET_INCLUDE_DIRECTORIES(f16-vdivc-minmax-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f16-vdivc-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f16-vdivc-minmax-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f16-vdivc-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME f16-vdivc-minmax-test COMMAND f16-vdivc-minmax-test) - - ADD_EXECUTABLE(f16-vrdivc-minmax-test test/f16-vrdivc-minmax.cc) - TARGET_INCLUDE_DIRECTORIES(f16-vrdivc-minmax-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f16-vrdivc-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f16-vrdivc-minmax-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f16-vrdivc-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME f16-vrdivc-minmax-test COMMAND f16-vrdivc-minmax-test) - - ADD_EXECUTABLE(f16-velu-test test/f16-velu.cc) - TARGET_INCLUDE_DIRECTORIES(f16-velu-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f16-velu-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f16-velu-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f16-velu-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME f16-velu-test COMMAND f16-velu-test) - - ADD_EXECUTABLE(f16-vhswish-test test/f16-vhswish.cc) - TARGET_INCLUDE_DIRECTORIES(f16-vhswish-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f16-vhswish-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f16-vhswish-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f16-vhswish-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME f16-vhswish-test COMMAND f16-vhswish-test) - - ADD_EXECUTABLE(f16-vlrelu-test test/f16-vlrelu.cc) - TARGET_INCLUDE_DIRECTORIES(f16-vlrelu-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f16-vlrelu-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f16-vlrelu-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f16-vlrelu-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME f16-vlrelu-test COMMAND f16-vlrelu-test) - - ADD_EXECUTABLE(f16-vmax-test test/f16-vmax.cc) - TARGET_INCLUDE_DIRECTORIES(f16-vmax-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f16-vmax-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f16-vmax-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f16-vmax-test PRIVATE hardware-config logging microkernels-all) - ADD_TEST(NAME f16-vmax-test COMMAND f16-vmax-test) - - ADD_EXECUTABLE(f16-vmaxc-test test/f16-vmaxc.cc) - TARGET_INCLUDE_DIRECTORIES(f16-vmaxc-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f16-vmaxc-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f16-vmaxc-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f16-vmaxc-test PRIVATE hardware-config logging microkernels-all) - ADD_TEST(NAME f16-vmaxc-test COMMAND f16-vmaxc-test) - - ADD_EXECUTABLE(f16-vmin-test test/f16-vmin.cc) - TARGET_INCLUDE_DIRECTORIES(f16-vmin-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f16-vmin-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f16-vmin-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f16-vmin-test PRIVATE hardware-config logging microkernels-all) - ADD_TEST(NAME f16-vmin-test COMMAND f16-vmin-test) - - ADD_EXECUTABLE(f16-vminc-test test/f16-vminc.cc) - TARGET_INCLUDE_DIRECTORIES(f16-vminc-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f16-vminc-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f16-vminc-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f16-vminc-test PRIVATE hardware-config logging microkernels-all) - ADD_TEST(NAME f16-vminc-test COMMAND f16-vminc-test) - - ADD_EXECUTABLE(f16-vmul-minmax-test test/f16-vmul-minmax.cc) - TARGET_INCLUDE_DIRECTORIES(f16-vmul-minmax-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f16-vmul-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f16-vmul-minmax-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f16-vmul-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME f16-vmul-minmax-test COMMAND f16-vmul-minmax-test) - - ADD_EXECUTABLE(f16-vmulc-minmax-test test/f16-vmulc-minmax.cc) - TARGET_INCLUDE_DIRECTORIES(f16-vmulc-minmax-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f16-vmulc-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f16-vmulc-minmax-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f16-vmulc-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME f16-vmulc-minmax-test COMMAND f16-vmulc-minmax-test) - - ADD_EXECUTABLE(f16-vmulcaddc-minmax-test test/f16-vmulcaddc-minmax.cc) - TARGET_INCLUDE_DIRECTORIES(f16-vmulcaddc-minmax-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f16-vmulcaddc-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f16-vmulcaddc-minmax-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f16-vmulcaddc-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init packing) - ADD_TEST(NAME f16-vmulcaddc-minmax-test COMMAND f16-vmulcaddc-minmax-test) - - ADD_EXECUTABLE(f16-vneg-test test/f16-vneg.cc) - TARGET_INCLUDE_DIRECTORIES(f16-vneg-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f16-vneg-test PRIVATE fp16 pthreadpool gtest gtest_main microparams-init) -+ TARGET_LINK_LIBRARIES(f16-vneg-test PRIVATE gtest gtest_main microparams-init) - TARGET_LINK_LIBRARIES(f16-vneg-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME f16-vneg-test COMMAND f16-vneg-test) - - ADD_EXECUTABLE(f16-pavgpool-minmax-test test/f16-pavgpool-minmax.cc) - TARGET_INCLUDE_DIRECTORIES(f16-pavgpool-minmax-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f16-pavgpool-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f16-pavgpool-minmax-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f16-pavgpool-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME f16-pavgpool-minmax-test COMMAND f16-pavgpool-minmax-test) - - ADD_EXECUTABLE(f16-prelu-test test/f16-prelu.cc) - TARGET_INCLUDE_DIRECTORIES(f16-prelu-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f16-prelu-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f16-prelu-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f16-prelu-test PRIVATE hardware-config logging microkernels-all) - ADD_TEST(NAME f16-prelu-test COMMAND f16-prelu-test) - - ADD_EXECUTABLE(f16-raddstoreexpminusmax-test test/f16-raddstoreexpminusmax.cc) - TARGET_INCLUDE_DIRECTORIES(f16-raddstoreexpminusmax-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f16-raddstoreexpminusmax-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f16-raddstoreexpminusmax-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f16-raddstoreexpminusmax-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME f16-raddstoreexpminusmax-test COMMAND f16-raddstoreexpminusmax-test) - - ADD_EXECUTABLE(f16-vrndne-test test/f16-vrndne.cc) - TARGET_INCLUDE_DIRECTORIES(f16-vrndne-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f16-vrndne-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f16-vrndne-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f16-vrndne-test PRIVATE hardware-config logging microkernels-all) - ADD_TEST(NAME f16-vrndne-test COMMAND f16-vrndne-test) - - ADD_EXECUTABLE(f16-vrndz-test test/f16-vrndz.cc) - TARGET_INCLUDE_DIRECTORIES(f16-vrndz-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f16-vrndz-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f16-vrndz-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f16-vrndz-test PRIVATE hardware-config logging microkernels-all) - ADD_TEST(NAME f16-vrndz-test COMMAND f16-vrndz-test) - - ADD_EXECUTABLE(f16-vrndu-test test/f16-vrndu.cc) - TARGET_INCLUDE_DIRECTORIES(f16-vrndu-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f16-vrndu-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f16-vrndu-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f16-vrndu-test PRIVATE hardware-config logging microkernels-all) - ADD_TEST(NAME f16-vrndu-test COMMAND f16-vrndu-test) - - ADD_EXECUTABLE(f16-vrndd-test test/f16-vrndd.cc) - TARGET_INCLUDE_DIRECTORIES(f16-vrndd-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f16-vrndd-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f16-vrndd-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f16-vrndd-test PRIVATE hardware-config logging microkernels-all) - ADD_TEST(NAME f16-vrndd-test COMMAND f16-vrndd-test) - - ADD_EXECUTABLE(f16-vsigmoid-test test/f16-vsigmoid.cc) - TARGET_INCLUDE_DIRECTORIES(f16-vsigmoid-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f16-vsigmoid-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f16-vsigmoid-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f16-vsigmoid-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME f16-vsigmoid-test COMMAND f16-vsigmoid-test) - - ADD_EXECUTABLE(f16-vsqr-test test/f16-vsqr.cc) - TARGET_INCLUDE_DIRECTORIES(f16-vsqr-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f16-vsqr-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f16-vsqr-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f16-vsqr-test PRIVATE hardware-config logging microkernels-all) - ADD_TEST(NAME f16-vsqr-test COMMAND f16-vsqr-test) - - ADD_EXECUTABLE(f16-vsqrt-test test/f16-vsqrt.cc) - TARGET_INCLUDE_DIRECTORIES(f16-vsqrt-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f16-vsqrt-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f16-vsqrt-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f16-vsqrt-test PRIVATE hardware-config logging microkernels-all) - ADD_TEST(NAME f16-vsqrt-test COMMAND f16-vsqrt-test) - - ADD_EXECUTABLE(f16-vsub-minmax-test test/f16-vsub-minmax.cc) - TARGET_INCLUDE_DIRECTORIES(f16-vsub-minmax-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f16-vsub-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f16-vsub-minmax-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f16-vsub-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME f16-vsub-minmax-test COMMAND f16-vsub-minmax-test) - - ADD_EXECUTABLE(f16-vsubc-minmax-test test/f16-vsubc-minmax.cc) - TARGET_INCLUDE_DIRECTORIES(f16-vsubc-minmax-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f16-vsubc-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f16-vsubc-minmax-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f16-vsubc-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME f16-vsubc-minmax-test COMMAND f16-vsubc-minmax-test) - - ADD_EXECUTABLE(f16-vrsubc-minmax-test test/f16-vrsubc-minmax.cc) - TARGET_INCLUDE_DIRECTORIES(f16-vrsubc-minmax-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f16-vrsubc-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f16-vrsubc-minmax-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f16-vrsubc-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME f16-vrsubc-minmax-test COMMAND f16-vrsubc-minmax-test) - - ADD_EXECUTABLE(f32-argmaxpool-test test/f32-argmaxpool.cc) - TARGET_INCLUDE_DIRECTORIES(f32-argmaxpool-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f32-argmaxpool-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f32-argmaxpool-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f32-argmaxpool-test PRIVATE hardware-config logging microkernels-all) - ADD_TEST(NAME f32-argmaxpool-test COMMAND f32-argmaxpool-test) - - ADD_EXECUTABLE(f32-avgpool-minmax-test test/f32-avgpool-minmax.cc) - TARGET_INCLUDE_DIRECTORIES(f32-avgpool-minmax-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f32-avgpool-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f32-avgpool-minmax-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f32-avgpool-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME f32-avgpool-minmax-test COMMAND f32-avgpool-minmax-test) - - ADD_EXECUTABLE(f32-conv-hwc-test test/f32-conv-hwc.cc) - TARGET_INCLUDE_DIRECTORIES(f32-conv-hwc-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f32-conv-hwc-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f32-conv-hwc-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f32-conv-hwc-test PRIVATE hardware-config logging microkernels-all microparams-init packing) - ADD_TEST(NAME f32-conv-hwc-test COMMAND f32-conv-hwc-test) - - ADD_EXECUTABLE(f32-conv-hwc2chw-test test/f32-conv-hwc2chw.cc) - TARGET_INCLUDE_DIRECTORIES(f32-conv-hwc2chw-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f32-conv-hwc2chw-test PRIVATE fp16 pthreadpool gtest gtest_main microparams-init) -+ TARGET_LINK_LIBRARIES(f32-conv-hwc2chw-test PRIVATE gtest gtest_main microparams-init) - TARGET_LINK_LIBRARIES(f32-conv-hwc2chw-test PRIVATE hardware-config logging microkernels-all microparams-init packing) - ADD_TEST(NAME f32-conv-hwc2chw-test COMMAND f32-conv-hwc2chw-test) - - ADD_EXECUTABLE(f32-dwconv2d-chw-test test/f32-dwconv2d-chw.cc) - TARGET_INCLUDE_DIRECTORIES(f32-dwconv2d-chw-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f32-dwconv2d-chw-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f32-dwconv2d-chw-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f32-dwconv2d-chw-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME f32-dwconv2d-chw-test COMMAND f32-dwconv2d-chw-test) - - ADD_EXECUTABLE(f32-dwconv-multipass-test test/f32-dwconv-multipass.cc) - TARGET_INCLUDE_DIRECTORIES(f32-dwconv-multipass-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f32-dwconv-multipass-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f32-dwconv-multipass-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f32-dwconv-multipass-test PRIVATE hardware-config logging microkernel-utils microkernels-all microparams-init packing) - ADD_TEST(NAME f32-dwconv-multipass-test COMMAND f32-dwconv-multipass-test) - - ADD_EXECUTABLE(f32-dwconv-multipass-minmax-test test/f32-dwconv-multipass-minmax.cc) - TARGET_INCLUDE_DIRECTORIES(f32-dwconv-multipass-minmax-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f32-dwconv-multipass-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f32-dwconv-multipass-minmax-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f32-dwconv-multipass-minmax-test PRIVATE hardware-config logging microkernel-utils microkernels-all microparams-init packing) - ADD_TEST(NAME f32-dwconv-multipass-minmax-test COMMAND f32-dwconv-multipass-minmax-test) - - ADD_EXECUTABLE(f32-dwconv-unipass-test test/f32-dwconv-unipass.cc) - TARGET_INCLUDE_DIRECTORIES(f32-dwconv-unipass-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f32-dwconv-unipass-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f32-dwconv-unipass-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f32-dwconv-unipass-test PRIVATE hardware-config logging microkernels-all microparams-init packing) - ADD_TEST(NAME f32-dwconv-unipass-test COMMAND f32-dwconv-unipass-test) - - ADD_EXECUTABLE(f32-dwconv-unipass-minmax-test test/f32-dwconv-unipass-minmax.cc) - TARGET_INCLUDE_DIRECTORIES(f32-dwconv-unipass-minmax-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f32-dwconv-unipass-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f32-dwconv-unipass-minmax-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f32-dwconv-unipass-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init packing) - ADD_TEST(NAME f32-dwconv-unipass-minmax-test COMMAND f32-dwconv-unipass-minmax-test) - - ADD_EXECUTABLE(f32-f16-vcvt-test test/f32-f16-vcvt.cc) - TARGET_INCLUDE_DIRECTORIES(f32-f16-vcvt-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f32-f16-vcvt-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f32-f16-vcvt-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f32-f16-vcvt-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME f32-f16-vcvt-test COMMAND f32-f16-vcvt-test) - - ADD_EXECUTABLE(f32-qs8-vcvt-test test/f32-qs8-vcvt.cc) - TARGET_INCLUDE_DIRECTORIES(f32-qs8-vcvt-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f32-qs8-vcvt-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f32-qs8-vcvt-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f32-qs8-vcvt-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME f32-qs8-vcvt-test COMMAND f32-qs8-vcvt-test) - - ADD_EXECUTABLE(f32-qu8-vcvt-test test/f32-qu8-vcvt.cc) - TARGET_INCLUDE_DIRECTORIES(f32-qu8-vcvt-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f32-qu8-vcvt-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f32-qu8-vcvt-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f32-qu8-vcvt-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME f32-qu8-vcvt-test COMMAND f32-qu8-vcvt-test) - - ADD_EXECUTABLE(f32-gavgpool-cw-test test/f32-gavgpool-cw.cc) - TARGET_INCLUDE_DIRECTORIES(f32-gavgpool-cw-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f32-gavgpool-cw-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f32-gavgpool-cw-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f32-gavgpool-cw-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME f32-gavgpool-cw-test COMMAND f32-gavgpool-cw-test) - - ADD_EXECUTABLE(f32-gavgpool-minmax-test test/f32-gavgpool-minmax.cc) - TARGET_INCLUDE_DIRECTORIES(f32-gavgpool-minmax-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f32-gavgpool-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f32-gavgpool-minmax-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f32-gavgpool-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME f32-gavgpool-minmax-test COMMAND f32-gavgpool-minmax-test) - -@@ -1975,13 +1942,13 @@ - - ADD_EXECUTABLE(f32-ibilinear-test test/f32-ibilinear.cc) - TARGET_INCLUDE_DIRECTORIES(f32-ibilinear-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f32-ibilinear-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f32-ibilinear-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f32-ibilinear-test PRIVATE hardware-config logging microkernels-all) - ADD_TEST(NAME f32-ibilinear-test COMMAND f32-ibilinear-test) - - ADD_EXECUTABLE(f32-ibilinear-chw-test test/f32-ibilinear-chw.cc) - TARGET_INCLUDE_DIRECTORIES(f32-ibilinear-chw-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f32-ibilinear-chw-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f32-ibilinear-chw-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f32-ibilinear-chw-test PRIVATE hardware-config logging microkernels-all) - ADD_TEST(NAME f32-ibilinear-chw-test COMMAND f32-ibilinear-chw-test) - -@@ -2016,13 +1983,13 @@ - - ADD_EXECUTABLE(f32-maxpool-minmax-test test/f32-maxpool-minmax.cc) - TARGET_INCLUDE_DIRECTORIES(f32-maxpool-minmax-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f32-maxpool-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f32-maxpool-minmax-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f32-maxpool-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME f32-maxpool-minmax-test COMMAND f32-maxpool-minmax-test) - - ADD_EXECUTABLE(f32-pavgpool-minmax-test test/f32-pavgpool-minmax.cc) - TARGET_INCLUDE_DIRECTORIES(f32-pavgpool-minmax-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f32-pavgpool-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f32-pavgpool-minmax-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f32-pavgpool-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME f32-pavgpool-minmax-test COMMAND f32-pavgpool-minmax-test) - -@@ -2034,259 +2001,259 @@ - - ADD_EXECUTABLE(f32-prelu-test test/f32-prelu.cc) - TARGET_INCLUDE_DIRECTORIES(f32-prelu-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f32-prelu-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f32-prelu-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f32-prelu-test PRIVATE hardware-config logging microkernels-all) - ADD_TEST(NAME f32-prelu-test COMMAND f32-prelu-test) - - ADD_EXECUTABLE(f32-raddexpminusmax-test test/f32-raddexpminusmax.cc) - TARGET_INCLUDE_DIRECTORIES(f32-raddexpminusmax-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f32-raddexpminusmax-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f32-raddexpminusmax-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f32-raddexpminusmax-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME f32-raddexpminusmax-test COMMAND f32-raddexpminusmax-test) - - ADD_EXECUTABLE(f32-raddextexp-test test/f32-raddextexp.cc) - TARGET_INCLUDE_DIRECTORIES(f32-raddextexp-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f32-raddextexp-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f32-raddextexp-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f32-raddextexp-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME f32-raddextexp-test COMMAND f32-raddextexp-test) - - ADD_EXECUTABLE(f32-raddstoreexpminusmax-test test/f32-raddstoreexpminusmax.cc) - TARGET_INCLUDE_DIRECTORIES(f32-raddstoreexpminusmax-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f32-raddstoreexpminusmax-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f32-raddstoreexpminusmax-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f32-raddstoreexpminusmax-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME f32-raddstoreexpminusmax-test COMMAND f32-raddstoreexpminusmax-test) - - ADD_EXECUTABLE(f32-rmax-test test/f32-rmax.cc) - TARGET_INCLUDE_DIRECTORIES(f32-rmax-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f32-rmax-test PRIVATE fp16 pthreadpool gtest gtest_main microparams-init) -+ TARGET_LINK_LIBRARIES(f32-rmax-test PRIVATE gtest gtest_main microparams-init) - TARGET_LINK_LIBRARIES(f32-rmax-test PRIVATE hardware-config logging microkernels-all) - ADD_TEST(NAME f32-rmax-test COMMAND f32-rmax-test) - - ADD_EXECUTABLE(f32-spmm-minmax-test test/f32-spmm-minmax.cc) - TARGET_INCLUDE_DIRECTORIES(f32-spmm-minmax-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f32-spmm-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f32-spmm-minmax-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f32-spmm-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME f32-spmm-minmax-test COMMAND f32-spmm-minmax-test) - - ADD_EXECUTABLE(f32-vabs-test test/f32-vabs.cc) - TARGET_INCLUDE_DIRECTORIES(f32-vabs-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f32-vabs-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f32-vabs-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f32-vabs-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME f32-vabs-test COMMAND f32-vabs-test) - - ADD_EXECUTABLE(f32-vadd-test test/f32-vadd.cc) - TARGET_INCLUDE_DIRECTORIES(f32-vadd-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f32-vadd-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f32-vadd-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f32-vadd-test PRIVATE hardware-config logging microkernels-all) - ADD_TEST(NAME f32-vadd-test COMMAND f32-vadd-test) - - ADD_EXECUTABLE(f32-vadd-minmax-test test/f32-vadd-minmax.cc) - TARGET_INCLUDE_DIRECTORIES(f32-vadd-minmax-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f32-vadd-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f32-vadd-minmax-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f32-vadd-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME f32-vadd-minmax-test COMMAND f32-vadd-minmax-test) - - ADD_EXECUTABLE(f32-vadd-relu-test test/f32-vadd-relu.cc) - TARGET_INCLUDE_DIRECTORIES(f32-vadd-relu-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f32-vadd-relu-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f32-vadd-relu-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f32-vadd-relu-test PRIVATE hardware-config logging microkernels-all) - ADD_TEST(NAME f32-vadd-relu-test COMMAND f32-vadd-relu-test) - - ADD_EXECUTABLE(f32-vaddc-test test/f32-vaddc.cc) - TARGET_INCLUDE_DIRECTORIES(f32-vaddc-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f32-vaddc-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f32-vaddc-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f32-vaddc-test PRIVATE hardware-config logging microkernels-all) - ADD_TEST(NAME f32-vaddc-test COMMAND f32-vaddc-test) - - ADD_EXECUTABLE(f32-vaddc-minmax-test test/f32-vaddc-minmax.cc) - TARGET_INCLUDE_DIRECTORIES(f32-vaddc-minmax-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f32-vaddc-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f32-vaddc-minmax-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f32-vaddc-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME f32-vaddc-minmax-test COMMAND f32-vaddc-minmax-test) - - ADD_EXECUTABLE(f32-vaddc-relu-test test/f32-vaddc-relu.cc) - TARGET_INCLUDE_DIRECTORIES(f32-vaddc-relu-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f32-vaddc-relu-test PRIVATE fp16 pthreadpool gtest gtest_main microparams-init) -+ TARGET_LINK_LIBRARIES(f32-vaddc-relu-test PRIVATE gtest gtest_main microparams-init) - TARGET_LINK_LIBRARIES(f32-vaddc-relu-test PRIVATE hardware-config logging microkernels-all) - ADD_TEST(NAME f32-vaddc-relu-test COMMAND f32-vaddc-relu-test) - - ADD_EXECUTABLE(f32-vclamp-test test/f32-vclamp.cc) - TARGET_INCLUDE_DIRECTORIES(f32-vclamp-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f32-vclamp-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f32-vclamp-test PRIVATE test gtest_main) - TARGET_LINK_LIBRARIES(f32-vclamp-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME f32-vclamp-test COMMAND f32-vclamp-test) - - ADD_EXECUTABLE(f32-vhswish-test test/f32-vhswish.cc) - TARGET_INCLUDE_DIRECTORIES(f32-vhswish-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f32-vhswish-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f32-vhswish-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f32-vhswish-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME f32-vhswish-test COMMAND f32-vhswish-test) - - ADD_EXECUTABLE(f32-vdiv-test test/f32-vdiv.cc) - TARGET_INCLUDE_DIRECTORIES(f32-vdiv-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f32-vdiv-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f32-vdiv-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f32-vdiv-test PRIVATE hardware-config logging microkernels-all) - ADD_TEST(NAME f32-vdiv-test COMMAND f32-vdiv-test) - - ADD_EXECUTABLE(f32-vdiv-minmax-test test/f32-vdiv-minmax.cc) - TARGET_INCLUDE_DIRECTORIES(f32-vdiv-minmax-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f32-vdiv-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f32-vdiv-minmax-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f32-vdiv-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME f32-vdiv-minmax-test COMMAND f32-vdiv-minmax-test) - - ADD_EXECUTABLE(f32-vdiv-relu-test test/f32-vdiv-relu.cc) - TARGET_INCLUDE_DIRECTORIES(f32-vdiv-relu-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f32-vdiv-relu-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f32-vdiv-relu-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f32-vdiv-relu-test PRIVATE hardware-config logging microkernels-all) - ADD_TEST(NAME f32-vdiv-relu-test COMMAND f32-vdiv-relu-test) - - ADD_EXECUTABLE(f32-vdivc-test test/f32-vdivc.cc) - TARGET_INCLUDE_DIRECTORIES(f32-vdivc-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f32-vdivc-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f32-vdivc-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f32-vdivc-test PRIVATE hardware-config logging microkernels-all) - ADD_TEST(NAME f32-vdivc-test COMMAND f32-vdivc-test) - - ADD_EXECUTABLE(f32-vdivc-minmax-test test/f32-vdivc-minmax.cc) - TARGET_INCLUDE_DIRECTORIES(f32-vdivc-minmax-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f32-vdivc-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f32-vdivc-minmax-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f32-vdivc-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME f32-vdivc-minmax-test COMMAND f32-vdivc-minmax-test) - - ADD_EXECUTABLE(f32-vdivc-relu-test test/f32-vdivc-relu.cc) - TARGET_INCLUDE_DIRECTORIES(f32-vdivc-relu-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f32-vdivc-relu-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f32-vdivc-relu-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f32-vdivc-relu-test PRIVATE hardware-config logging microkernels-all) - ADD_TEST(NAME f32-vdivc-relu-test COMMAND f32-vdivc-relu-test) - - ADD_EXECUTABLE(f32-vrdivc-test test/f32-vrdivc.cc) - TARGET_INCLUDE_DIRECTORIES(f32-vrdivc-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f32-vrdivc-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f32-vrdivc-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f32-vrdivc-test PRIVATE hardware-config logging microkernels-all) - ADD_TEST(NAME f32-vrdivc-test COMMAND f32-vrdivc-test) - - ADD_EXECUTABLE(f32-vrdivc-minmax-test test/f32-vrdivc-minmax.cc) - TARGET_INCLUDE_DIRECTORIES(f32-vrdivc-minmax-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f32-vrdivc-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f32-vrdivc-minmax-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f32-vrdivc-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME f32-vrdivc-minmax-test COMMAND f32-vrdivc-minmax-test) - - ADD_EXECUTABLE(f32-vrdivc-relu-test test/f32-vrdivc-relu.cc) - TARGET_INCLUDE_DIRECTORIES(f32-vrdivc-relu-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f32-vrdivc-relu-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f32-vrdivc-relu-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f32-vrdivc-relu-test PRIVATE hardware-config logging microkernels-all) - ADD_TEST(NAME f32-vrdivc-relu-test COMMAND f32-vrdivc-relu-test) - - ADD_EXECUTABLE(f32-velu-test test/f32-velu.cc) - TARGET_INCLUDE_DIRECTORIES(f32-velu-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f32-velu-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f32-velu-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f32-velu-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME f32-velu-test COMMAND f32-velu-test) - - ADD_EXECUTABLE(f32-vlrelu-test test/f32-vlrelu.cc) - TARGET_INCLUDE_DIRECTORIES(f32-vlrelu-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f32-vlrelu-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f32-vlrelu-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f32-vlrelu-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME f32-vlrelu-test COMMAND f32-vlrelu-test) - - ADD_EXECUTABLE(f32-vmax-test test/f32-vmax.cc) - TARGET_INCLUDE_DIRECTORIES(f32-vmax-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f32-vmax-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f32-vmax-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f32-vmax-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME f32-vmax-test COMMAND f32-vmax-test) - - ADD_EXECUTABLE(f32-vmaxc-test test/f32-vmaxc.cc) - TARGET_INCLUDE_DIRECTORIES(f32-vmaxc-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f32-vmaxc-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f32-vmaxc-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f32-vmaxc-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME f32-vmaxc-test COMMAND f32-vmaxc-test) - - ADD_EXECUTABLE(f32-vmin-test test/f32-vmin.cc) - TARGET_INCLUDE_DIRECTORIES(f32-vmin-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f32-vmin-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f32-vmin-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f32-vmin-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME f32-vmin-test COMMAND f32-vmin-test) - - ADD_EXECUTABLE(f32-vminc-test test/f32-vminc.cc) - TARGET_INCLUDE_DIRECTORIES(f32-vminc-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f32-vminc-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f32-vminc-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f32-vminc-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME f32-vminc-test COMMAND f32-vminc-test) - - ADD_EXECUTABLE(f32-vmul-test test/f32-vmul.cc) - TARGET_INCLUDE_DIRECTORIES(f32-vmul-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f32-vmul-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f32-vmul-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f32-vmul-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME f32-vmul-test COMMAND f32-vmul-test) - - ADD_EXECUTABLE(f32-vmul-minmax-test test/f32-vmul-minmax.cc) - TARGET_INCLUDE_DIRECTORIES(f32-vmul-minmax-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f32-vmul-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f32-vmul-minmax-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f32-vmul-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME f32-vmul-minmax-test COMMAND f32-vmul-minmax-test microparams-init) - - ADD_EXECUTABLE(f32-vmul-relu-test test/f32-vmul-relu.cc) - TARGET_INCLUDE_DIRECTORIES(f32-vmul-relu-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f32-vmul-relu-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f32-vmul-relu-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f32-vmul-relu-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME f32-vmul-relu-test COMMAND f32-vmul-relu-test) - - ADD_EXECUTABLE(f32-vmulc-test test/f32-vmulc.cc) - TARGET_INCLUDE_DIRECTORIES(f32-vmulc-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f32-vmulc-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f32-vmulc-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f32-vmulc-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME f32-vmulc-test COMMAND f32-vmulc-test) - - ADD_EXECUTABLE(f32-vmulc-minmax-test test/f32-vmulc-minmax.cc) - TARGET_INCLUDE_DIRECTORIES(f32-vmulc-minmax-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f32-vmulc-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f32-vmulc-minmax-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f32-vmulc-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME f32-vmulc-minmax-test COMMAND f32-vmulc-minmax-test) - - ADD_EXECUTABLE(f32-vmulc-relu-test test/f32-vmulc-relu.cc) - TARGET_INCLUDE_DIRECTORIES(f32-vmulc-relu-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f32-vmulc-relu-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f32-vmulc-relu-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f32-vmulc-relu-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME f32-vmulc-relu-test COMMAND f32-vmulc-relu-test) - - ADD_EXECUTABLE(f32-vmulcaddc-minmax-test test/f32-vmulcaddc-minmax.cc) - TARGET_INCLUDE_DIRECTORIES(f32-vmulcaddc-minmax-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f32-vmulcaddc-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f32-vmulcaddc-minmax-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f32-vmulcaddc-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init packing) - ADD_TEST(NAME f32-vmulcaddc-minmax-test COMMAND f32-vmulcaddc-minmax-test) - - ADD_EXECUTABLE(f32-vneg-test test/f32-vneg.cc) - TARGET_INCLUDE_DIRECTORIES(f32-vneg-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f32-vneg-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f32-vneg-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f32-vneg-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME f32-vneg-test COMMAND f32-vneg-test) - - ADD_EXECUTABLE(f32-vrelu-test test/f32-vrelu.cc) - TARGET_INCLUDE_DIRECTORIES(f32-vrelu-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f32-vrelu-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f32-vrelu-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f32-vrelu-test PRIVATE hardware-config logging microkernels-all) - ADD_TEST(NAME f32-vrelu-test COMMAND f32-vrelu-test) - - ADD_EXECUTABLE(f32-vrndne-test test/f32-vrndne.cc) - TARGET_INCLUDE_DIRECTORIES(f32-vrndne-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f32-vrndne-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f32-vrndne-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f32-vrndne-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME f32-vrndne-test COMMAND f32-vrndne-test) - - ADD_EXECUTABLE(f32-vrndz-test test/f32-vrndz.cc) - TARGET_INCLUDE_DIRECTORIES(f32-vrndz-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f32-vrndz-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f32-vrndz-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f32-vrndz-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME f32-vrndz-test COMMAND f32-vrndz-test) - - ADD_EXECUTABLE(f32-vrndu-test test/f32-vrndu.cc) - TARGET_INCLUDE_DIRECTORIES(f32-vrndu-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f32-vrndu-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f32-vrndu-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f32-vrndu-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME f32-vrndu-test COMMAND f32-vrndu-test) - - ADD_EXECUTABLE(f32-vrndd-test test/f32-vrndd.cc) - TARGET_INCLUDE_DIRECTORIES(f32-vrndd-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f32-vrndd-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f32-vrndd-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f32-vrndd-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME f32-vrndd-test COMMAND f32-vrndd-test) - -@@ -2304,91 +2271,91 @@ - - ADD_EXECUTABLE(f32-vsigmoid-test test/f32-vsigmoid.cc) - TARGET_INCLUDE_DIRECTORIES(f32-vsigmoid-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f32-vsigmoid-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f32-vsigmoid-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f32-vsigmoid-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME f32-vsigmoid-test COMMAND f32-vsigmoid-test) - - ADD_EXECUTABLE(f32-vsqr-test test/f32-vsqr.cc) - TARGET_INCLUDE_DIRECTORIES(f32-vsqr-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f32-vsqr-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f32-vsqr-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f32-vsqr-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME f32-vsqr-test COMMAND f32-vsqr-test) - - ADD_EXECUTABLE(f32-vsqrdiff-test test/f32-vsqrdiff.cc) - TARGET_INCLUDE_DIRECTORIES(f32-vsqrdiff-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f32-vsqrdiff-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f32-vsqrdiff-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f32-vsqrdiff-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME f32-vsqrdiff-test COMMAND f32-vsqrdiff-test) - - ADD_EXECUTABLE(f32-vsqrdiffc-test test/f32-vsqrdiffc.cc) - TARGET_INCLUDE_DIRECTORIES(f32-vsqrdiffc-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f32-vsqrdiffc-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f32-vsqrdiffc-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f32-vsqrdiffc-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME f32-vsqrdiffc-test COMMAND f32-vsqrdiffc-test) - - ADD_EXECUTABLE(f32-vsqrt-test test/f32-vsqrt.cc) - TARGET_INCLUDE_DIRECTORIES(f32-vsqrt-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f32-vsqrt-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f32-vsqrt-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f32-vsqrt-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME f32-vsqrt-test COMMAND f32-vsqrt-test) - - ADD_EXECUTABLE(f32-vsub-test test/f32-vsub.cc) - TARGET_INCLUDE_DIRECTORIES(f32-vsub-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f32-vsub-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f32-vsub-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f32-vsub-test PRIVATE hardware-config logging microkernels-all) - ADD_TEST(NAME f32-vsub-test COMMAND f32-vsub-test) - - ADD_EXECUTABLE(f32-vsub-minmax-test test/f32-vsub-minmax.cc) - TARGET_INCLUDE_DIRECTORIES(f32-vsub-minmax-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f32-vsub-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f32-vsub-minmax-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f32-vsub-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME f32-vsub-minmax-test COMMAND f32-vsub-minmax-test) - - ADD_EXECUTABLE(f32-vsub-relu-test test/f32-vsub-relu.cc) - TARGET_INCLUDE_DIRECTORIES(f32-vsub-relu-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f32-vsub-relu-test PRIVATE fp16 pthreadpool gtest gtest_main microparams-init) -+ TARGET_LINK_LIBRARIES(f32-vsub-relu-test PRIVATE gtest gtest_main microparams-init) - TARGET_LINK_LIBRARIES(f32-vsub-relu-test PRIVATE hardware-config logging microkernels-all) - ADD_TEST(NAME f32-vsub-relu-test COMMAND f32-vsub-relu-test) - - ADD_EXECUTABLE(f32-vsubc-test test/f32-vsubc.cc) - TARGET_INCLUDE_DIRECTORIES(f32-vsubc-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f32-vsubc-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f32-vsubc-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f32-vsubc-test PRIVATE hardware-config logging microkernels-all) - ADD_TEST(NAME f32-vsubc-test COMMAND f32-vsubc-test) - - ADD_EXECUTABLE(f32-vsubc-minmax-test test/f32-vsubc-minmax.cc) - TARGET_INCLUDE_DIRECTORIES(f32-vsubc-minmax-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f32-vsubc-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f32-vsubc-minmax-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f32-vsubc-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME f32-vsubc-minmax-test COMMAND f32-vsubc-minmax-test) - - ADD_EXECUTABLE(f32-vsubc-relu-test test/f32-vsubc-relu.cc) - TARGET_INCLUDE_DIRECTORIES(f32-vsubc-relu-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f32-vsubc-relu-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f32-vsubc-relu-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f32-vsubc-relu-test PRIVATE hardware-config logging microkernels-all) - ADD_TEST(NAME f32-vsubc-relu-test COMMAND f32-vsubc-relu-test) - - ADD_EXECUTABLE(f32-vrsubc-test test/f32-vrsubc.cc) - TARGET_INCLUDE_DIRECTORIES(f32-vrsubc-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f32-vrsubc-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f32-vrsubc-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f32-vrsubc-test PRIVATE hardware-config logging microkernels-all) - ADD_TEST(NAME f32-vrsubc-test COMMAND f32-vrsubc-test) - - ADD_EXECUTABLE(f32-vrsubc-minmax-test test/f32-vrsubc-minmax.cc) - TARGET_INCLUDE_DIRECTORIES(f32-vrsubc-minmax-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f32-vrsubc-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f32-vrsubc-minmax-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f32-vrsubc-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME f32-vrsubc-minmax-test COMMAND f32-vrsubc-minmax-test) - - ADD_EXECUTABLE(f32-vrsubc-relu-test test/f32-vrsubc-relu.cc) - TARGET_INCLUDE_DIRECTORIES(f32-vrsubc-relu-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(f32-vrsubc-relu-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f32-vrsubc-relu-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f32-vrsubc-relu-test PRIVATE hardware-config logging microkernels-all) - ADD_TEST(NAME f32-vrsubc-relu-test COMMAND f32-vrsubc-relu-test) - - ADD_EXECUTABLE(qc8-dwconv-unipass-minmax-fp32-test test/qc8-dwconv-unipass-minmax-fp32.cc) - TARGET_INCLUDE_DIRECTORIES(qc8-dwconv-unipass-minmax-fp32-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(qc8-dwconv-unipass-minmax-fp32-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(qc8-dwconv-unipass-minmax-fp32-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(qc8-dwconv-unipass-minmax-fp32-test PRIVATE hardware-config logging microkernels-all microparams-init packing) - ADD_TEST(NAME qc8-dwconv-unipass-minmax-fp32-test COMMAND qc8-dwconv-unipass-minmax-fp32-test) - -@@ -2406,31 +2373,31 @@ - - ADD_EXECUTABLE(qs8-dwconv-unipass-minmax-fp32-test test/qs8-dwconv-unipass-minmax-fp32.cc) - TARGET_INCLUDE_DIRECTORIES(qs8-dwconv-unipass-minmax-fp32-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(qs8-dwconv-unipass-minmax-fp32-test PRIVATE fp16 pthreadpool gtest gtest_main microparams-init) -+ TARGET_LINK_LIBRARIES(qs8-dwconv-unipass-minmax-fp32-test PRIVATE gtest gtest_main microparams-init) - TARGET_LINK_LIBRARIES(qs8-dwconv-unipass-minmax-fp32-test PRIVATE hardware-config logging microkernels-all microparams-init packing) - ADD_TEST(NAME qs8-dwconv-unipass-minmax-fp32-test COMMAND qs8-dwconv-unipass-minmax-fp32-test) - - ADD_EXECUTABLE(qs8-dwconv-unipass-minmax-rndnu-test test/qs8-dwconv-unipass-minmax-rndnu.cc) - TARGET_INCLUDE_DIRECTORIES(qs8-dwconv-unipass-minmax-rndnu-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(qs8-dwconv-unipass-minmax-rndnu-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(qs8-dwconv-unipass-minmax-rndnu-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(qs8-dwconv-unipass-minmax-rndnu-test PRIVATE hardware-config logging microkernels-all microparams-init packing) - ADD_TEST(NAME qs8-dwconv-unipass-minmax-rndnu-test COMMAND qs8-dwconv-unipass-minmax-rndnu-test) - - ADD_EXECUTABLE(qs8-f32-vcvt-test test/f32-f16-vcvt.cc) - TARGET_INCLUDE_DIRECTORIES(qs8-f32-vcvt-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(qs8-f32-vcvt-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(qs8-f32-vcvt-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(qs8-f32-vcvt-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME qs8-f32-vcvt-test COMMAND qs8-f32-vcvt-test) - - ADD_EXECUTABLE(qs8-gavgpool-minmax-fp32-test test/qs8-gavgpool-minmax-fp32.cc) - TARGET_INCLUDE_DIRECTORIES(qs8-gavgpool-minmax-fp32-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(qs8-gavgpool-minmax-fp32-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(qs8-gavgpool-minmax-fp32-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(qs8-gavgpool-minmax-fp32-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME qs8-gavgpool-minmax-fp32-test COMMAND qs8-gavgpool-minmax-fp32-test) - - ADD_EXECUTABLE(qs8-gavgpool-minmax-rndnu-test test/qs8-gavgpool-minmax-rndnu.cc) - TARGET_INCLUDE_DIRECTORIES(qs8-gavgpool-minmax-rndnu-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(qs8-gavgpool-minmax-rndnu-test PRIVATE fp16 pthreadpool gtest gtest_main microparams-init) -+ TARGET_LINK_LIBRARIES(qs8-gavgpool-minmax-rndnu-test PRIVATE gtest gtest_main microparams-init) - TARGET_LINK_LIBRARIES(qs8-gavgpool-minmax-rndnu-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME qs8-gavgpool-minmax-rndnu-test COMMAND qs8-gavgpool-minmax-rndnu-test) - -@@ -2461,81 +2428,81 @@ - ADD_EXECUTABLE(qs8-requantization-test test/qs8-requantization.cc) - SET_TARGET_PROPERTIES(qs8-requantization-test PROPERTIES CXX_EXTENSIONS YES) - TARGET_INCLUDE_DIRECTORIES(qs8-requantization-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(qs8-requantization-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(qs8-requantization-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(qs8-requantization-test PRIVATE hardware-config logging microkernels-all) - ADD_TEST(NAME qs8-requantization-test COMMAND qs8-requantization-test) - - ADD_EXECUTABLE(qs8-vadd-minmax-test test/qs8-vadd-minmax.cc) - TARGET_INCLUDE_DIRECTORIES(qs8-vadd-minmax-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(qs8-vadd-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(qs8-vadd-minmax-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(qs8-vadd-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME qs8-vadd-minmax-test COMMAND qs8-vadd-minmax-test) - - ADD_EXECUTABLE(qs8-vaddc-minmax-test test/qs8-vaddc-minmax.cc) - TARGET_INCLUDE_DIRECTORIES(qs8-vaddc-minmax-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(qs8-vaddc-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(qs8-vaddc-minmax-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(qs8-vaddc-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME qs8-vaddc-minmax-test COMMAND qs8-vaddc-minmax-test) - - ADD_EXECUTABLE(qs8-vcvt-test test/qs8-vcvt.cc) - TARGET_INCLUDE_DIRECTORIES(qs8-vcvt-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(qs8-vcvt-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(qs8-vcvt-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(qs8-vcvt-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME qs8-vcvt-test COMMAND qs8-vcvt-test) - - ADD_EXECUTABLE(qs8-vlrelu-test test/qs8-vlrelu.cc) - TARGET_INCLUDE_DIRECTORIES(qs8-vlrelu-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(qs8-vlrelu-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(qs8-vlrelu-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(qs8-vlrelu-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME qs8-vlrelu-test COMMAND qs8-vlrelu-test) - - ADD_EXECUTABLE(qs8-vmul-minmax-fp32-test test/qs8-vmul-minmax-fp32.cc) - SET_TARGET_PROPERTIES(qs8-vmul-minmax-fp32-test PROPERTIES CXX_EXTENSIONS YES) - TARGET_INCLUDE_DIRECTORIES(qs8-vmul-minmax-fp32-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(qs8-vmul-minmax-fp32-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(qs8-vmul-minmax-fp32-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(qs8-vmul-minmax-fp32-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME qs8-vmul-minmax-fp32-test COMMAND qs8-vmul-minmax-fp32-test) - - ADD_EXECUTABLE(qs8-vmulc-minmax-fp32-test test/qs8-vmulc-minmax-fp32.cc) - SET_TARGET_PROPERTIES(qs8-vmulc-minmax-fp32-test PROPERTIES CXX_EXTENSIONS YES) - TARGET_INCLUDE_DIRECTORIES(qs8-vmulc-minmax-fp32-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(qs8-vmulc-minmax-fp32-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(qs8-vmulc-minmax-fp32-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(qs8-vmulc-minmax-fp32-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME qs8-vmulc-minmax-fp32-test COMMAND qs8-vmulc-minmax-fp32-test) - - ADD_EXECUTABLE(qu8-avgpool-minmax-fp32-test test/qu8-avgpool-minmax-fp32.cc) - TARGET_INCLUDE_DIRECTORIES(qu8-avgpool-minmax-fp32-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(qu8-avgpool-minmax-fp32-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(qu8-avgpool-minmax-fp32-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(qu8-avgpool-minmax-fp32-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME qu8-avgpool-minmax-fp32-test COMMAND qu8-avgpool-minmax-fp32-test) - - ADD_EXECUTABLE(qu8-dwconv-unipass-minmax-fp32-test test/qu8-dwconv-unipass-minmax-fp32.cc) - TARGET_INCLUDE_DIRECTORIES(qu8-dwconv-unipass-minmax-fp32-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(qu8-dwconv-unipass-minmax-fp32-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(qu8-dwconv-unipass-minmax-fp32-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(qu8-dwconv-unipass-minmax-fp32-test PRIVATE hardware-config logging microkernels-all microparams-init packing) - ADD_TEST(NAME qu8-dwconv-unipass-minmax-fp32-test COMMAND qu8-dwconv-unipass-minmax-fp32-test) - - ADD_EXECUTABLE(qu8-dwconv-unipass-minmax-rndnu-test test/qu8-dwconv-unipass-minmax-rndnu.cc) - TARGET_INCLUDE_DIRECTORIES(qu8-dwconv-unipass-minmax-rndnu-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(qu8-dwconv-unipass-minmax-rndnu-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(qu8-dwconv-unipass-minmax-rndnu-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(qu8-dwconv-unipass-minmax-rndnu-test PRIVATE hardware-config logging microkernels-all microparams-init packing) - ADD_TEST(NAME qu8-dwconv-unipass-minmax-rndnu-test COMMAND qu8-dwconv-unipass-minmax-rndnu-test) - - ADD_EXECUTABLE(qu8-f32-vcvt-test test/f32-f16-vcvt.cc) - TARGET_INCLUDE_DIRECTORIES(qu8-f32-vcvt-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(qu8-f32-vcvt-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(qu8-f32-vcvt-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(qu8-f32-vcvt-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME qu8-f32-vcvt-test COMMAND qu8-f32-vcvt-test) - - ADD_EXECUTABLE(qu8-gavgpool-minmax-fp32-test test/qu8-gavgpool-minmax-fp32.cc) - TARGET_INCLUDE_DIRECTORIES(qu8-gavgpool-minmax-fp32-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(qu8-gavgpool-minmax-fp32-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(qu8-gavgpool-minmax-fp32-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(qu8-gavgpool-minmax-fp32-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME qu8-gavgpool-minmax-fp32-test COMMAND qu8-gavgpool-minmax-fp32-test) - - ADD_EXECUTABLE(qu8-gavgpool-minmax-rndnu-test test/qu8-gavgpool-minmax-rndnu.cc) - TARGET_INCLUDE_DIRECTORIES(qu8-gavgpool-minmax-rndnu-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(qu8-gavgpool-minmax-rndnu-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(qu8-gavgpool-minmax-rndnu-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(qu8-gavgpool-minmax-rndnu-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME qu8-gavgpool-minmax-rndnu-test COMMAND qu8-gavgpool-minmax-rndnu-test) - -@@ -2566,161 +2533,161 @@ - ADD_EXECUTABLE(qu8-requantization-test test/qu8-requantization.cc) - SET_TARGET_PROPERTIES(qu8-requantization-test PROPERTIES CXX_EXTENSIONS YES) - TARGET_INCLUDE_DIRECTORIES(qu8-requantization-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(qu8-requantization-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(qu8-requantization-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(qu8-requantization-test PRIVATE hardware-config logging microkernels-all) - ADD_TEST(NAME qu8-requantization-test COMMAND qu8-requantization-test) - - ADD_EXECUTABLE(qu8-vadd-minmax-test test/qu8-vadd-minmax.cc) - TARGET_INCLUDE_DIRECTORIES(qu8-vadd-minmax-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(qu8-vadd-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main microparams-init) -+ TARGET_LINK_LIBRARIES(qu8-vadd-minmax-test PRIVATE gtest gtest_main microparams-init) - TARGET_LINK_LIBRARIES(qu8-vadd-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME qu8-vadd-minmax-test COMMAND qu8-vadd-minmax-test) - - ADD_EXECUTABLE(qu8-vaddc-minmax-test test/qu8-vaddc-minmax.cc) - TARGET_INCLUDE_DIRECTORIES(qu8-vaddc-minmax-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(qu8-vaddc-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(qu8-vaddc-minmax-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(qu8-vaddc-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME qu8-vaddc-minmax-test COMMAND qu8-vaddc-minmax-test) - - ADD_EXECUTABLE(qu8-vcvt-test test/qu8-vcvt.cc) - TARGET_INCLUDE_DIRECTORIES(qu8-vcvt-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(qu8-vcvt-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(qu8-vcvt-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(qu8-vcvt-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME qu8-vcvt-test COMMAND qu8-vcvt-test) - - ADD_EXECUTABLE(qu8-vlrelu-test test/qu8-vlrelu.cc) - TARGET_INCLUDE_DIRECTORIES(qu8-vlrelu-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(qu8-vlrelu-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(qu8-vlrelu-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(qu8-vlrelu-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME qu8-vlrelu-test COMMAND qu8-vlrelu-test) - - ADD_EXECUTABLE(qu8-vmul-minmax-fp32-test test/qu8-vmul-minmax-fp32.cc) - SET_TARGET_PROPERTIES(qu8-vmul-minmax-fp32-test PROPERTIES CXX_EXTENSIONS YES) - TARGET_INCLUDE_DIRECTORIES(qu8-vmul-minmax-fp32-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(qu8-vmul-minmax-fp32-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(qu8-vmul-minmax-fp32-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(qu8-vmul-minmax-fp32-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME qu8-vmul-minmax-fp32-test COMMAND qu8-vmul-minmax-fp32-test) - - ADD_EXECUTABLE(qu8-vmul-minmax-rndnu-test test/qu8-vmul-minmax-rndnu.cc) - SET_TARGET_PROPERTIES(qu8-vmul-minmax-rndnu-test PROPERTIES CXX_EXTENSIONS YES) - TARGET_INCLUDE_DIRECTORIES(qu8-vmul-minmax-rndnu-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(qu8-vmul-minmax-rndnu-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(qu8-vmul-minmax-rndnu-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(qu8-vmul-minmax-rndnu-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME qu8-vmul-minmax-rndnu-test COMMAND qu8-vmul-minmax-rndnu-test) - - ADD_EXECUTABLE(qu8-vmulc-minmax-fp32-test test/qu8-vmulc-minmax-fp32.cc) - SET_TARGET_PROPERTIES(qu8-vmulc-minmax-fp32-test PROPERTIES CXX_EXTENSIONS YES) - TARGET_INCLUDE_DIRECTORIES(qu8-vmulc-minmax-fp32-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(qu8-vmulc-minmax-fp32-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(qu8-vmulc-minmax-fp32-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(qu8-vmulc-minmax-fp32-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME qu8-vmulc-minmax-fp32-test COMMAND qu8-vmulc-minmax-fp32-test) - - ADD_EXECUTABLE(qu8-vmulc-minmax-rndnu-test test/qu8-vmulc-minmax-rndnu.cc) - SET_TARGET_PROPERTIES(qu8-vmulc-minmax-rndnu-test PROPERTIES CXX_EXTENSIONS YES) - TARGET_INCLUDE_DIRECTORIES(qu8-vmulc-minmax-rndnu-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(qu8-vmulc-minmax-rndnu-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(qu8-vmulc-minmax-rndnu-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(qu8-vmulc-minmax-rndnu-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME qu8-vmulc-minmax-rndnu-test COMMAND qu8-vmulc-minmax-rndnu-test) - - ADD_EXECUTABLE(s16-rmaxabs-test test/s16-rmaxabs.cc) - TARGET_INCLUDE_DIRECTORIES(s16-rmaxabs-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(s16-rmaxabs-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(s16-rmaxabs-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(s16-rmaxabs-test PRIVATE hardware-config logging microkernels-all) - ADD_TEST(NAME s16-rmaxabs-test COMMAND s16-rmaxabs-test) - - ADD_EXECUTABLE(s16-window-test test/s16-window.cc) - TARGET_INCLUDE_DIRECTORIES(s16-window-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(s16-window-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(s16-window-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(s16-window-test PRIVATE hardware-config logging microkernels-all) - ADD_TEST(NAME s16-window-test COMMAND s16-window-test) - - ADD_EXECUTABLE(u32-filterbank-accumulate-test test/u32-filterbank-accumulate.cc) - TARGET_INCLUDE_DIRECTORIES(u32-filterbank-accumulate-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(u32-filterbank-accumulate-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(u32-filterbank-accumulate-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(u32-filterbank-accumulate-test PRIVATE hardware-config logging microkernels-all) - ADD_TEST(NAME u32-filterbank-accumulate-test COMMAND u32-filterbank-accumulate-test) - - ADD_EXECUTABLE(u32-filterbank-subtract-test test/u32-filterbank-subtract.cc) - TARGET_INCLUDE_DIRECTORIES(u32-filterbank-subtract-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(u32-filterbank-subtract-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(u32-filterbank-subtract-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(u32-filterbank-subtract-test PRIVATE hardware-config logging microkernels-all) - ADD_TEST(NAME u32-filterbank-subtract-test COMMAND u32-filterbank-subtract-test) - - ADD_EXECUTABLE(u32-vlog-test test/u32-vlog.cc) - TARGET_INCLUDE_DIRECTORIES(u32-vlog-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(u32-vlog-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(u32-vlog-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(u32-vlog-test PRIVATE hardware-config logging microkernels-all) - ADD_TEST(NAME u32-vlog-test COMMAND u32-vlog-test) - - ADD_EXECUTABLE(i16-vlshift-test test/i16-vlshift.cc) - TARGET_INCLUDE_DIRECTORIES(i16-vlshift-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(i16-vlshift-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(i16-vlshift-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(i16-vlshift-test PRIVATE hardware-config logging microkernels-all) - ADD_TEST(NAME i16-vlshift-test COMMAND i16-vlshift-test) - - ADD_EXECUTABLE(cs16-vsquareabs-test test/cs16-vsquareabs.cc) - TARGET_INCLUDE_DIRECTORIES(cs16-vsquareabs-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(cs16-vsquareabs-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(cs16-vsquareabs-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(cs16-vsquareabs-test PRIVATE hardware-config logging microkernels-all) - ADD_TEST(NAME cs16-vsquareabs-test COMMAND cs16-vsquareabs-test) - - ADD_EXECUTABLE(cs16-bfly4-test test/cs16-bfly4.cc) - TARGET_INCLUDE_DIRECTORIES(cs16-bfly4-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(cs16-bfly4-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(cs16-bfly4-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(cs16-bfly4-test PRIVATE hardware-config logging microkernels-all) - ADD_TEST(NAME cs16-bfly4-test COMMAND cs16-bfly4-test) - - ADD_EXECUTABLE(cs16-fftr-test test/cs16-fftr.cc) - TARGET_INCLUDE_DIRECTORIES(cs16-fftr-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(cs16-fftr-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(cs16-fftr-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(cs16-fftr-test PRIVATE hardware-config logging microkernels-all) - ADD_TEST(NAME cs16-fftr-test COMMAND cs16-fftr-test) - - ADD_EXECUTABLE(s8-ibilinear-test test/s8-ibilinear.cc) - TARGET_INCLUDE_DIRECTORIES(s8-ibilinear-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(s8-ibilinear-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(s8-ibilinear-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(s8-ibilinear-test PRIVATE hardware-config logging microkernels-all) - ADD_TEST(NAME s8-ibilinear-test COMMAND s8-ibilinear-test) - - ADD_EXECUTABLE(s8-maxpool-minmax-test test/s8-maxpool-minmax.cc) - TARGET_INCLUDE_DIRECTORIES(s8-maxpool-minmax-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(s8-maxpool-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(s8-maxpool-minmax-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(s8-maxpool-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME s8-maxpool-minmax-test COMMAND s8-maxpool-minmax-test) - - ADD_EXECUTABLE(s8-vclamp-test test/s8-vclamp.cc) - TARGET_INCLUDE_DIRECTORIES(s8-vclamp-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(s8-vclamp-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(s8-vclamp-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(s8-vclamp-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME s8-vclamp-test COMMAND s8-vclamp-test) - - ADD_EXECUTABLE(u8-lut32norm-test test/u8-lut32norm.cc) - TARGET_INCLUDE_DIRECTORIES(u8-lut32norm-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(u8-lut32norm-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(u8-lut32norm-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(u8-lut32norm-test PRIVATE hardware-config logging microkernels-all) - ADD_TEST(NAME u8-lut32norm-test COMMAND u8-lut32norm-test) - - ADD_EXECUTABLE(u8-ibilinear-test test/u8-ibilinear.cc) - TARGET_INCLUDE_DIRECTORIES(u8-ibilinear-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(u8-ibilinear-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(u8-ibilinear-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(u8-ibilinear-test PRIVATE hardware-config logging microkernels-all) - ADD_TEST(NAME u8-ibilinear-test COMMAND u8-ibilinear-test) - - ADD_EXECUTABLE(u8-maxpool-minmax-test test/u8-maxpool-minmax.cc) - TARGET_INCLUDE_DIRECTORIES(u8-maxpool-minmax-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(u8-maxpool-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main microparams-init) -+ TARGET_LINK_LIBRARIES(u8-maxpool-minmax-test PRIVATE gtest gtest_main microparams-init) - TARGET_LINK_LIBRARIES(u8-maxpool-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME u8-maxpool-minmax-test COMMAND u8-maxpool-minmax-test) - - ADD_EXECUTABLE(u8-rmax-test test/u8-rmax.cc) - TARGET_INCLUDE_DIRECTORIES(u8-rmax-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(u8-rmax-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(u8-rmax-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(u8-rmax-test PRIVATE hardware-config logging microkernels-all) - ADD_TEST(NAME u8-rmax-test COMMAND u8-rmax-test) - - ADD_EXECUTABLE(u8-vclamp-test test/u8-vclamp.cc) - TARGET_INCLUDE_DIRECTORIES(u8-vclamp-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(u8-vclamp-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(u8-vclamp-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(u8-vclamp-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME u8-vclamp-test COMMAND u8-vclamp-test) - -@@ -2762,25 +2729,25 @@ - - ADD_EXECUTABLE(x32-zip-test test/x32-zip.cc) - TARGET_INCLUDE_DIRECTORIES(x32-zip-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(x32-zip-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(x32-zip-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(x32-zip-test PRIVATE hardware-config logging microkernels-all) - ADD_TEST(NAME x32-zip-test COMMAND x32-zip-test) - - ADD_EXECUTABLE(x64-transpose-test test/x64-transpose.cc) - TARGET_INCLUDE_DIRECTORIES(x64-transpose-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(x64-transpose-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(x64-transpose-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(x64-transpose-test PRIVATE hardware-config logging microkernels-all microparams-init) - ADD_TEST(NAME x64-transpose-test COMMAND x64-transpose-test) - - ADD_EXECUTABLE(x8-lut-test test/x8-lut.cc) - TARGET_INCLUDE_DIRECTORIES(x8-lut-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(x8-lut-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(x8-lut-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(x8-lut-test PRIVATE hardware-config logging microkernels-all) - ADD_TEST(NAME x8-lut-test COMMAND x8-lut-test) - - ADD_EXECUTABLE(x8-zip-test test/x8-zip.cc) - TARGET_INCLUDE_DIRECTORIES(x8-zip-test PRIVATE include src test) -- TARGET_LINK_LIBRARIES(x8-zip-test PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(x8-zip-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(x8-zip-test PRIVATE hardware-config logging microkernels-all) - ADD_TEST(NAME x8-zip-test COMMAND x8-zip-test) - -@@ -2842,12 +2809,12 @@ - - ADD_EXECUTABLE(packing-test test/packing.cc) - TARGET_INCLUDE_DIRECTORIES(packing-test PRIVATE include src) -- TARGET_LINK_LIBRARIES(packing-test PRIVATE fp16 gtest gtest_main pthreadpool) -+ TARGET_LINK_LIBRARIES(packing-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(packing-test PRIVATE XNNPACK microkernel-utils operator-utils packing) - - ADD_EXECUTABLE(indirection-test test/indirection.cc) - TARGET_INCLUDE_DIRECTORIES(indirection-test PRIVATE include src) -- TARGET_LINK_LIBRARIES(indirection-test PRIVATE gtest gtest_main pthreadpool) -+ TARGET_LINK_LIBRARIES(indirection-test PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(indirection-test PRIVATE XNNPACK indirection) - ENDIF() - -@@ -2864,7 +2831,7 @@ - ADD_LIBRARY(bench-utils STATIC bench/utils.cc) - TARGET_INCLUDE_DIRECTORIES(bench-utils PRIVATE .) - TARGET_INCLUDE_DIRECTORIES(bench-utils PUBLIC include src) -- TARGET_LINK_LIBRARIES(bench-utils PRIVATE benchmark cpuinfo pthreadpool) -+ TARGET_LINK_LIBRARIES(bench-utils PRIVATE benchmark cpuinfo) - TARGET_LINK_LIBRARIES(bench-utils PRIVATE hardware-config) - IF(XNNPACK_BUILD_LIBRARY) - TARGET_LINK_LIBRARIES(bench-utils PRIVATE logging memory) -@@ -2873,134 +2840,134 @@ - # ---[ Build accuracy microbenchmarks - ADD_EXECUTABLE(f16-exp-ulp-eval eval/f16-exp-ulp.cc) - TARGET_INCLUDE_DIRECTORIES(f16-exp-ulp-eval PRIVATE . src) -- TARGET_LINK_LIBRARIES(f16-exp-ulp-eval PRIVATE benchmark cpuinfo fp16 pthreadpool) -+ TARGET_LINK_LIBRARIES(f16-exp-ulp-eval PRIVATE benchmark cpuinfo) - TARGET_LINK_LIBRARIES(f16-exp-ulp-eval PRIVATE bench-utils microkernels-all) - - ADD_EXECUTABLE(f16-expminus-ulp-eval eval/f16-expminus-ulp.cc) - TARGET_INCLUDE_DIRECTORIES(f16-expminus-ulp-eval PRIVATE . src) -- TARGET_LINK_LIBRARIES(f16-expminus-ulp-eval PRIVATE benchmark cpuinfo fp16 pthreadpool) -+ TARGET_LINK_LIBRARIES(f16-expminus-ulp-eval PRIVATE benchmark cpuinfo) - TARGET_LINK_LIBRARIES(f16-expminus-ulp-eval PRIVATE bench-utils microkernels-all) - - ADD_EXECUTABLE(f16-expm1minus-ulp-eval eval/f16-expm1minus-ulp.cc) - TARGET_INCLUDE_DIRECTORIES(f16-expm1minus-ulp-eval PRIVATE . src) -- TARGET_LINK_LIBRARIES(f16-expm1minus-ulp-eval PRIVATE benchmark cpuinfo fp16 pthreadpool) -+ TARGET_LINK_LIBRARIES(f16-expm1minus-ulp-eval PRIVATE benchmark cpuinfo) - TARGET_LINK_LIBRARIES(f16-expm1minus-ulp-eval PRIVATE bench-utils microkernels-all) - - ADD_EXECUTABLE(f16-sigmoid-ulp-eval eval/f16-sigmoid-ulp.cc) - TARGET_INCLUDE_DIRECTORIES(f16-sigmoid-ulp-eval PRIVATE . src) -- TARGET_LINK_LIBRARIES(f16-sigmoid-ulp-eval PRIVATE benchmark cpuinfo fp16 pthreadpool) -+ TARGET_LINK_LIBRARIES(f16-sigmoid-ulp-eval PRIVATE benchmark cpuinfo) - TARGET_LINK_LIBRARIES(f16-sigmoid-ulp-eval PRIVATE bench-utils microkernels-all) - - ADD_EXECUTABLE(f16-sqrt-ulp-eval eval/f16-sqrt-ulp.cc) - TARGET_INCLUDE_DIRECTORIES(f16-sqrt-ulp-eval PRIVATE . src) -- TARGET_LINK_LIBRARIES(f16-sqrt-ulp-eval PRIVATE benchmark cpuinfo fp16 pthreadpool) -+ TARGET_LINK_LIBRARIES(f16-sqrt-ulp-eval PRIVATE benchmark cpuinfo) - TARGET_LINK_LIBRARIES(f16-sqrt-ulp-eval PRIVATE bench-utils microkernels-all) - - ADD_EXECUTABLE(f32-exp-ulp-eval eval/f32-exp-ulp.cc) - TARGET_INCLUDE_DIRECTORIES(f32-exp-ulp-eval PRIVATE . src) -- TARGET_LINK_LIBRARIES(f32-exp-ulp-eval PRIVATE benchmark cpuinfo fp16 pthreadpool) -+ TARGET_LINK_LIBRARIES(f32-exp-ulp-eval PRIVATE benchmark cpuinfo) - TARGET_LINK_LIBRARIES(f32-exp-ulp-eval PRIVATE bench-utils microkernels-all) - - ADD_EXECUTABLE(f32-expminus-ulp-eval eval/f32-expminus-ulp.cc) - TARGET_INCLUDE_DIRECTORIES(f32-expminus-ulp-eval PRIVATE . src) -- TARGET_LINK_LIBRARIES(f32-expminus-ulp-eval PRIVATE benchmark cpuinfo fp16 pthreadpool) -+ TARGET_LINK_LIBRARIES(f32-expminus-ulp-eval PRIVATE benchmark cpuinfo) - TARGET_LINK_LIBRARIES(f32-expminus-ulp-eval PRIVATE bench-utils microkernels-all) - - ADD_EXECUTABLE(f32-expm1minus-ulp-eval eval/f32-expm1minus-ulp.cc) - TARGET_INCLUDE_DIRECTORIES(f32-expm1minus-ulp-eval PRIVATE . src) -- TARGET_LINK_LIBRARIES(f32-expm1minus-ulp-eval PRIVATE benchmark cpuinfo fp16 pthreadpool) -+ TARGET_LINK_LIBRARIES(f32-expm1minus-ulp-eval PRIVATE benchmark cpuinfo) - TARGET_LINK_LIBRARIES(f32-expm1minus-ulp-eval PRIVATE bench-utils microkernels-all) - - ADD_EXECUTABLE(f32-extexp-ulp-eval eval/f32-extexp-ulp.cc) - SET_TARGET_PROPERTIES(f32-extexp-ulp-eval PROPERTIES CXX_EXTENSIONS YES) - TARGET_INCLUDE_DIRECTORIES(f32-extexp-ulp-eval PRIVATE . src) -- TARGET_LINK_LIBRARIES(f32-extexp-ulp-eval PRIVATE benchmark cpuinfo fp16 pthreadpool) -+ TARGET_LINK_LIBRARIES(f32-extexp-ulp-eval PRIVATE benchmark cpuinfo) - TARGET_LINK_LIBRARIES(f32-extexp-ulp-eval PRIVATE bench-utils microkernels-all) - - ADD_EXECUTABLE(f32-sigmoid-ulp-eval eval/f32-sigmoid-ulp.cc) - TARGET_INCLUDE_DIRECTORIES(f32-sigmoid-ulp-eval PRIVATE . src) -- TARGET_LINK_LIBRARIES(f32-sigmoid-ulp-eval PRIVATE benchmark cpuinfo fp16 pthreadpool) -+ TARGET_LINK_LIBRARIES(f32-sigmoid-ulp-eval PRIVATE benchmark cpuinfo) - TARGET_LINK_LIBRARIES(f32-sigmoid-ulp-eval PRIVATE bench-utils microkernels-all) - - ADD_EXECUTABLE(f32-sqrt-ulp-eval eval/f32-sqrt-ulp.cc) - TARGET_INCLUDE_DIRECTORIES(f32-sqrt-ulp-eval PRIVATE . src) -- TARGET_LINK_LIBRARIES(f32-sqrt-ulp-eval PRIVATE benchmark cpuinfo fp16 pthreadpool) -+ TARGET_LINK_LIBRARIES(f32-sqrt-ulp-eval PRIVATE benchmark cpuinfo) - TARGET_LINK_LIBRARIES(f32-sqrt-ulp-eval PRIVATE bench-utils microkernels-all) - - ADD_EXECUTABLE(f32-tanh-ulp-eval eval/f32-tanh-ulp.cc) - TARGET_INCLUDE_DIRECTORIES(f32-tanh-ulp-eval PRIVATE . src) -- TARGET_LINK_LIBRARIES(f32-tanh-ulp-eval PRIVATE benchmark cpuinfo fp16 pthreadpool) -+ TARGET_LINK_LIBRARIES(f32-tanh-ulp-eval PRIVATE benchmark cpuinfo) - TARGET_LINK_LIBRARIES(f32-tanh-ulp-eval PRIVATE bench-utils microkernels-all) - - # ---[ Build accuracy tests - ADD_EXECUTABLE(f16-sqrt-eval eval/f16-sqrt.cc) - TARGET_INCLUDE_DIRECTORIES(f16-sqrt-eval PRIVATE include src) -- TARGET_LINK_LIBRARIES(f16-sqrt-eval PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f16-sqrt-eval PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f16-sqrt-eval PRIVATE hardware-config logging microkernels-all) - - ADD_EXECUTABLE(f16-f32-cvt-eval eval/f16-f32-cvt.cc) - TARGET_INCLUDE_DIRECTORIES(f16-f32-cvt-eval PRIVATE include src) -- TARGET_LINK_LIBRARIES(f16-f32-cvt-eval PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f16-f32-cvt-eval PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f16-f32-cvt-eval PRIVATE hardware-config logging microkernels-all) - - ADD_EXECUTABLE(f32-f16-cvt-eval eval/f32-f16-cvt.cc) - TARGET_INCLUDE_DIRECTORIES(f32-f16-cvt-eval PRIVATE include src) -- TARGET_LINK_LIBRARIES(f32-f16-cvt-eval PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f32-f16-cvt-eval PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f32-f16-cvt-eval PRIVATE hardware-config logging microkernels-all) - - ADD_EXECUTABLE(f32-qs8-cvt-eval eval/f32-qs8-cvt.cc) - TARGET_INCLUDE_DIRECTORIES(f32-qs8-cvt-eval PRIVATE include src) -- TARGET_LINK_LIBRARIES(f32-qs8-cvt-eval PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f32-qs8-cvt-eval PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f32-qs8-cvt-eval PRIVATE hardware-config logging microkernels-all) - - ADD_EXECUTABLE(f32-qu8-cvt-eval eval/f32-qu8-cvt.cc) - TARGET_INCLUDE_DIRECTORIES(f32-qu8-cvt-eval PRIVATE include src) -- TARGET_LINK_LIBRARIES(f32-qu8-cvt-eval PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f32-qu8-cvt-eval PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f32-qu8-cvt-eval PRIVATE hardware-config logging microkernels-all) - - ADD_EXECUTABLE(f32-exp-eval eval/f32-exp.cc) - TARGET_INCLUDE_DIRECTORIES(f32-exp-eval PRIVATE include src) -- TARGET_LINK_LIBRARIES(f32-exp-eval PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f32-exp-eval PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f32-exp-eval PRIVATE hardware-config logging microkernels-all) - - ADD_EXECUTABLE(f32-expm1minus-eval eval/f32-expm1minus.cc) - TARGET_INCLUDE_DIRECTORIES(f32-expm1minus-eval PRIVATE include src) -- TARGET_LINK_LIBRARIES(f32-expm1minus-eval PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f32-expm1minus-eval PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f32-expm1minus-eval PRIVATE hardware-config logging microkernels-all) - - ADD_EXECUTABLE(f32-expminus-eval eval/f32-expminus.cc) - TARGET_INCLUDE_DIRECTORIES(f32-expminus-eval PRIVATE include src) -- TARGET_LINK_LIBRARIES(f32-expminus-eval PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f32-expminus-eval PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f32-expminus-eval PRIVATE hardware-config logging microkernels-all) - - ADD_EXECUTABLE(f32-roundne-eval eval/f32-roundne.cc) - TARGET_INCLUDE_DIRECTORIES(f32-roundne-eval PRIVATE include src) -- TARGET_LINK_LIBRARIES(f32-roundne-eval PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f32-roundne-eval PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f32-roundne-eval PRIVATE hardware-config logging microkernels-all) - - ADD_EXECUTABLE(f32-roundd-eval eval/f32-roundd.cc) - TARGET_INCLUDE_DIRECTORIES(f32-roundd-eval PRIVATE include src) -- TARGET_LINK_LIBRARIES(f32-roundd-eval PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f32-roundd-eval PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f32-roundd-eval PRIVATE hardware-config logging microkernels-all) - - ADD_EXECUTABLE(f32-roundu-eval eval/f32-roundu.cc) - TARGET_INCLUDE_DIRECTORIES(f32-roundu-eval PRIVATE include src) -- TARGET_LINK_LIBRARIES(f32-roundu-eval PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f32-roundu-eval PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f32-roundu-eval PRIVATE hardware-config logging microkernels-all) - - ADD_EXECUTABLE(f32-roundz-eval eval/f32-roundz.cc) - TARGET_INCLUDE_DIRECTORIES(f32-roundz-eval PRIVATE include src) -- TARGET_LINK_LIBRARIES(f32-roundz-eval PRIVATE fp16 pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(f32-roundz-eval PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(f32-roundz-eval PRIVATE hardware-config logging microkernels-all) - - ADD_EXECUTABLE(u32-sqrt-eval eval/u32-sqrt.cc) - TARGET_INCLUDE_DIRECTORIES(u32-sqrt-eval PRIVATE include src) -- TARGET_LINK_LIBRARIES(u32-sqrt-eval PRIVATE pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(u32-sqrt-eval PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(u32-sqrt-eval PRIVATE hardware-config logging microkernels-all) - - ADD_EXECUTABLE(u64-sqrt-eval eval/u64-sqrt.cc) - TARGET_INCLUDE_DIRECTORIES(u64-sqrt-eval PRIVATE include src) -- TARGET_LINK_LIBRARIES(u64-sqrt-eval PRIVATE pthreadpool gtest gtest_main) -+ TARGET_LINK_LIBRARIES(u64-sqrt-eval PRIVATE gtest gtest_main) - TARGET_LINK_LIBRARIES(u64-sqrt-eval PRIVATE hardware-config logging microkernels-all) - - IF(XNNPACK_BUILD_LIBRARY) -@@ -3030,7 +2997,7 @@ - models/qu8-mobilenet-v2.cc) - SET_TARGET_PROPERTIES(bench-models PROPERTIES CXX_EXTENSIONS YES) - TARGET_INCLUDE_DIRECTORIES(bench-models PRIVATE .) -- TARGET_LINK_LIBRARIES(bench-models PRIVATE fp16 benchmark) -+ TARGET_LINK_LIBRARIES(bench-models PRIVATE benchmark) - TARGET_LINK_LIBRARIES(bench-models PRIVATE XNNPACK bench-utils) - - ADD_EXECUTABLE(end2end-bench bench/end2end.cc) -@@ -3039,7 +3006,7 @@ - - ADD_EXECUTABLE(f16-gemm-e2e-bench bench/f16-gemm-e2e.cc) - TARGET_INCLUDE_DIRECTORIES(f16-gemm-e2e-bench PRIVATE . src) -- TARGET_LINK_LIBRARIES(f16-gemm-e2e-bench PRIVATE fp16 benchmark) -+ TARGET_LINK_LIBRARIES(f16-gemm-e2e-bench PRIVATE benchmark) - TARGET_LINK_LIBRARIES(f16-gemm-e2e-bench PRIVATE XNNPACK bench-models bench-utils hardware-config logging microkernels-all microparams-init) - - ADD_EXECUTABLE(f32-dwconv-e2e-bench bench/f32-dwconv-e2e.cc) -@@ -3049,33 +3016,33 @@ - - ADD_EXECUTABLE(f32-gemm-e2e-bench bench/f32-gemm-e2e.cc) - TARGET_INCLUDE_DIRECTORIES(f32-gemm-e2e-bench PRIVATE . src) -- TARGET_LINK_LIBRARIES(f32-gemm-e2e-bench PRIVATE fp16 benchmark) -+ TARGET_LINK_LIBRARIES(f32-gemm-e2e-bench PRIVATE benchmark) - TARGET_LINK_LIBRARIES(f32-gemm-e2e-bench PRIVATE XNNPACK bench-models bench-utils hardware-config logging microkernels-all microparams-init) - - ADD_EXECUTABLE(qs8-dwconv-e2e-bench bench/qs8-dwconv-e2e.cc) - TARGET_INCLUDE_DIRECTORIES(qs8-dwconv-e2e-bench PRIVATE . src) -- TARGET_LINK_LIBRARIES(qs8-dwconv-e2e-bench PRIVATE fp16 benchmark) -+ TARGET_LINK_LIBRARIES(qs8-dwconv-e2e-bench PRIVATE benchmark) - TARGET_LINK_LIBRARIES(qs8-dwconv-e2e-bench PRIVATE XNNPACK bench-models bench-utils hardware-config logging microkernels-all microparams-init) - - ADD_EXECUTABLE(qs8-gemm-e2e-bench bench/qs8-gemm-e2e.cc) - TARGET_INCLUDE_DIRECTORIES(qs8-gemm-e2e-bench PRIVATE . src) -- TARGET_LINK_LIBRARIES(qs8-gemm-e2e-bench PRIVATE fp16 benchmark) -+ TARGET_LINK_LIBRARIES(qs8-gemm-e2e-bench PRIVATE benchmark) - TARGET_LINK_LIBRARIES(qs8-gemm-e2e-bench PRIVATE XNNPACK bench-models bench-utils hardware-config logging microkernels-all microparams-init) - - ADD_EXECUTABLE(qu8-gemm-e2e-bench bench/qu8-gemm-e2e.cc) - TARGET_INCLUDE_DIRECTORIES(qu8-gemm-e2e-bench PRIVATE . src) -- TARGET_LINK_LIBRARIES(qu8-gemm-e2e-bench PRIVATE fp16 benchmark) -+ TARGET_LINK_LIBRARIES(qu8-gemm-e2e-bench PRIVATE benchmark) - TARGET_LINK_LIBRARIES(qu8-gemm-e2e-bench PRIVATE XNNPACK bench-models bench-utils hardware-config logging microkernels-all microparams-init) - - ADD_EXECUTABLE(qu8-dwconv-e2e-bench bench/qu8-dwconv-e2e.cc) - TARGET_INCLUDE_DIRECTORIES(qu8-dwconv-e2e-bench PRIVATE . src) -- TARGET_LINK_LIBRARIES(qu8-dwconv-e2e-bench PRIVATE fp16 benchmark) -+ TARGET_LINK_LIBRARIES(qu8-dwconv-e2e-bench PRIVATE benchmark) - TARGET_LINK_LIBRARIES(qu8-dwconv-e2e-bench PRIVATE XNNPACK bench-models bench-utils hardware-config logging microkernels-all microparams-init) - - # ---[ Build operator-level microbenchmarks - ADD_EXECUTABLE(abs-bench bench/abs.cc) - TARGET_INCLUDE_DIRECTORIES(abs-bench PRIVATE .) -- TARGET_LINK_LIBRARIES(abs-bench PRIVATE XNNPACK fp16 benchmark bench-utils) -+ TARGET_LINK_LIBRARIES(abs-bench PRIVATE XNNPACK benchmark bench-utils) - - ADD_EXECUTABLE(average-pooling-bench bench/average-pooling.cc) - TARGET_INCLUDE_DIRECTORIES(average-pooling-bench PRIVATE .) -@@ -3083,11 +3050,11 @@ - - ADD_EXECUTABLE(bankers-rounding-bench bench/bankers-rounding.cc) - TARGET_INCLUDE_DIRECTORIES(bankers-rounding-bench PRIVATE .) -- TARGET_LINK_LIBRARIES(bankers-rounding-bench PRIVATE XNNPACK fp16 benchmark bench-utils) -+ TARGET_LINK_LIBRARIES(bankers-rounding-bench PRIVATE XNNPACK benchmark bench-utils) - - ADD_EXECUTABLE(ceiling-bench bench/ceiling.cc) - TARGET_INCLUDE_DIRECTORIES(ceiling-bench PRIVATE .) -- TARGET_LINK_LIBRARIES(ceiling-bench PRIVATE XNNPACK fp16 benchmark bench-utils) -+ TARGET_LINK_LIBRARIES(ceiling-bench PRIVATE XNNPACK benchmark bench-utils) - - ADD_EXECUTABLE(channel-shuffle-bench bench/channel-shuffle.cc) - TARGET_INCLUDE_DIRECTORIES(channel-shuffle-bench PRIVATE .) -@@ -3095,11 +3062,11 @@ - - ADD_EXECUTABLE(convert-bench bench/convert.cc) - TARGET_INCLUDE_DIRECTORIES(convert-bench PRIVATE .) -- TARGET_LINK_LIBRARIES(convert-bench PRIVATE XNNPACK fp16 benchmark bench-utils) -+ TARGET_LINK_LIBRARIES(convert-bench PRIVATE XNNPACK benchmark bench-utils) - - ADD_EXECUTABLE(convolution-bench bench/convolution.cc) - TARGET_INCLUDE_DIRECTORIES(convolution-bench PRIVATE .) -- TARGET_LINK_LIBRARIES(convolution-bench PRIVATE XNNPACK fp16 benchmark bench-utils) -+ TARGET_LINK_LIBRARIES(convolution-bench PRIVATE XNNPACK benchmark bench-utils) - - ADD_EXECUTABLE(deconvolution-bench bench/deconvolution.cc) - TARGET_INCLUDE_DIRECTORIES(deconvolution-bench PRIVATE .) -@@ -3107,23 +3074,23 @@ - - ADD_EXECUTABLE(elu-bench bench/elu.cc) - TARGET_INCLUDE_DIRECTORIES(elu-bench PRIVATE .) -- TARGET_LINK_LIBRARIES(elu-bench PRIVATE XNNPACK fp16 benchmark bench-utils) -+ TARGET_LINK_LIBRARIES(elu-bench PRIVATE XNNPACK benchmark bench-utils) - - ADD_EXECUTABLE(floor-bench bench/floor.cc) - TARGET_INCLUDE_DIRECTORIES(floor-bench PRIVATE .) -- TARGET_LINK_LIBRARIES(floor-bench PRIVATE XNNPACK fp16 benchmark bench-utils) -+ TARGET_LINK_LIBRARIES(floor-bench PRIVATE XNNPACK benchmark bench-utils) - - ADD_EXECUTABLE(global-average-pooling-bench bench/global-average-pooling.cc) - TARGET_INCLUDE_DIRECTORIES(global-average-pooling-bench PRIVATE .) -- TARGET_LINK_LIBRARIES(global-average-pooling-bench PRIVATE XNNPACK fp16 benchmark bench-utils) -+ TARGET_LINK_LIBRARIES(global-average-pooling-bench PRIVATE XNNPACK benchmark bench-utils) - - ADD_EXECUTABLE(hardswish-bench bench/hardswish.cc) - TARGET_INCLUDE_DIRECTORIES(hardswish-bench PRIVATE .) -- TARGET_LINK_LIBRARIES(hardswish-bench PRIVATE XNNPACK fp16 benchmark bench-utils) -+ TARGET_LINK_LIBRARIES(hardswish-bench PRIVATE XNNPACK benchmark bench-utils) - - ADD_EXECUTABLE(leaky-relu-bench bench/leaky-relu.cc) - TARGET_INCLUDE_DIRECTORIES(leaky-relu-bench PRIVATE .) -- TARGET_LINK_LIBRARIES(leaky-relu-bench PRIVATE XNNPACK fp16 benchmark bench-utils) -+ TARGET_LINK_LIBRARIES(leaky-relu-bench PRIVATE XNNPACK benchmark bench-utils) - - ADD_EXECUTABLE(max-pooling-bench bench/max-pooling.cc) - TARGET_INCLUDE_DIRECTORIES(max-pooling-bench PRIVATE .) -@@ -3139,7 +3106,7 @@ - - ADD_EXECUTABLE(sigmoid-bench bench/sigmoid.cc) - TARGET_INCLUDE_DIRECTORIES(sigmoid-bench PRIVATE .) -- TARGET_LINK_LIBRARIES(sigmoid-bench PRIVATE XNNPACK fp16 benchmark bench-utils) -+ TARGET_LINK_LIBRARIES(sigmoid-bench PRIVATE XNNPACK benchmark bench-utils) - - ADD_EXECUTABLE(softmax-bench bench/softmax.cc) - TARGET_INCLUDE_DIRECTORIES(softmax-bench PRIVATE .) -@@ -3161,378 +3128,378 @@ - # ---[ Build microkernel-level microbenchmarks - ADD_EXECUTABLE(bf16-gemm-bench bench/bf16-gemm.cc) - TARGET_INCLUDE_DIRECTORIES(bf16-gemm-bench PRIVATE . include src) -- TARGET_LINK_LIBRARIES(bf16-gemm-bench PRIVATE benchmark fp16 pthreadpool) -+ TARGET_LINK_LIBRARIES(bf16-gemm-bench PRIVATE benchmark) - TARGET_LINK_LIBRARIES(bf16-gemm-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init packing) - - ADD_EXECUTABLE(f16-conv-hwc2chw-bench bench/f16-conv-hwc2chw.cc) - TARGET_INCLUDE_DIRECTORIES(f16-conv-hwc2chw-bench PRIVATE . include src) -- TARGET_LINK_LIBRARIES(f16-conv-hwc2chw-bench PRIVATE benchmark fp16 pthreadpool) -+ TARGET_LINK_LIBRARIES(f16-conv-hwc2chw-bench PRIVATE benchmark) - TARGET_LINK_LIBRARIES(f16-conv-hwc2chw-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init packing) - - ADD_EXECUTABLE(f16-dwconv-bench bench/f16-dwconv.cc) - TARGET_INCLUDE_DIRECTORIES(f16-dwconv-bench PRIVATE . include src) -- TARGET_LINK_LIBRARIES(f16-dwconv-bench PRIVATE benchmark fp16 pthreadpool) -+ TARGET_LINK_LIBRARIES(f16-dwconv-bench PRIVATE benchmark) - TARGET_LINK_LIBRARIES(f16-dwconv-bench PRIVATE bench-utils indirection hardware-config logging microkernels-all microparams-init packing) - - ADD_EXECUTABLE(f16-dwconv2d-chw-bench bench/f16-dwconv2d-chw.cc) - TARGET_INCLUDE_DIRECTORIES(f16-dwconv2d-chw-bench PRIVATE . include src) -- TARGET_LINK_LIBRARIES(f16-dwconv2d-chw-bench PRIVATE benchmark fp16 pthreadpool) -+ TARGET_LINK_LIBRARIES(f16-dwconv2d-chw-bench PRIVATE benchmark) - TARGET_LINK_LIBRARIES(f16-dwconv2d-chw-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init packing) - - ADD_EXECUTABLE(f16-gavgpool-cw-bench bench/f16-gavgpool-cw.cc) - TARGET_INCLUDE_DIRECTORIES(f16-gavgpool-cw-bench PRIVATE . include src) -- TARGET_LINK_LIBRARIES(f16-gavgpool-cw-bench PRIVATE benchmark fp16 pthreadpool) -+ TARGET_LINK_LIBRARIES(f16-gavgpool-cw-bench PRIVATE benchmark) - TARGET_LINK_LIBRARIES(f16-gavgpool-cw-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) - - ADD_EXECUTABLE(f16-gemm-bench bench/f16-gemm.cc) - TARGET_INCLUDE_DIRECTORIES(f16-gemm-bench PRIVATE . include src) -- TARGET_LINK_LIBRARIES(f16-gemm-bench PRIVATE benchmark fp16 pthreadpool) -+ TARGET_LINK_LIBRARIES(f16-gemm-bench PRIVATE benchmark) - TARGET_LINK_LIBRARIES(f16-gemm-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init packing) - - ADD_EXECUTABLE(f16-igemm-bench bench/f16-igemm.cc) - TARGET_INCLUDE_DIRECTORIES(f16-igemm-bench PRIVATE . include src) -- TARGET_LINK_LIBRARIES(f16-igemm-bench PRIVATE benchmark fp16 pthreadpool) -+ TARGET_LINK_LIBRARIES(f16-igemm-bench PRIVATE benchmark) - TARGET_LINK_LIBRARIES(f16-igemm-bench PRIVATE bench-utils indirection hardware-config logging microkernels-all microparams-init packing) - - ADD_EXECUTABLE(f16-raddstoreexpminusmax-bench bench/f16-raddstoreexpminusmax.cc) - TARGET_INCLUDE_DIRECTORIES(f16-raddstoreexpminusmax-bench PRIVATE . include src) -- TARGET_LINK_LIBRARIES(f16-raddstoreexpminusmax-bench PRIVATE benchmark fp16 pthreadpool) -+ TARGET_LINK_LIBRARIES(f16-raddstoreexpminusmax-bench PRIVATE benchmark) - TARGET_LINK_LIBRARIES(f16-raddstoreexpminusmax-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) - - ADD_EXECUTABLE(f16-spmm-bench bench/f16-spmm.cc) - TARGET_INCLUDE_DIRECTORIES(f16-spmm-bench PRIVATE . include src) -- TARGET_LINK_LIBRARIES(f16-spmm-bench PRIVATE benchmark fp16 pthreadpool) -+ TARGET_LINK_LIBRARIES(f16-spmm-bench PRIVATE benchmark) - TARGET_LINK_LIBRARIES(f16-spmm-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) - - ADD_EXECUTABLE(f16-velu-bench bench/f16-velu.cc) - TARGET_INCLUDE_DIRECTORIES(f16-velu-bench PRIVATE . include src) -- TARGET_LINK_LIBRARIES(f16-velu-bench PRIVATE benchmark fp16 pthreadpool) -+ TARGET_LINK_LIBRARIES(f16-velu-bench PRIVATE benchmark) - TARGET_LINK_LIBRARIES(f16-velu-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) - - ADD_EXECUTABLE(f16-vsigmoid-bench bench/f16-vsigmoid.cc) - TARGET_INCLUDE_DIRECTORIES(f16-vsigmoid-bench PRIVATE . include src) -- TARGET_LINK_LIBRARIES(f16-vsigmoid-bench PRIVATE benchmark fp16 pthreadpool) -+ TARGET_LINK_LIBRARIES(f16-vsigmoid-bench PRIVATE benchmark) - TARGET_LINK_LIBRARIES(f16-vsigmoid-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) - - ADD_EXECUTABLE(f16-vsqrt-bench bench/f16-vsqrt.cc) - TARGET_INCLUDE_DIRECTORIES(f16-vsqrt-bench PRIVATE . include src) -- TARGET_LINK_LIBRARIES(f16-vsqrt-bench PRIVATE benchmark fp16 pthreadpool) -+ TARGET_LINK_LIBRARIES(f16-vsqrt-bench PRIVATE benchmark) - TARGET_LINK_LIBRARIES(f16-vsqrt-bench PRIVATE bench-utils microkernels-all) - - ADD_EXECUTABLE(f16-f32-vcvt-bench bench/f16-f32-vcvt.cc) - TARGET_INCLUDE_DIRECTORIES(f16-f32-vcvt-bench PRIVATE . include src) -- TARGET_LINK_LIBRARIES(f16-f32-vcvt-bench PRIVATE benchmark fp16 pthreadpool) -+ TARGET_LINK_LIBRARIES(f16-f32-vcvt-bench PRIVATE benchmark) - TARGET_LINK_LIBRARIES(f16-f32-vcvt-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) - - ADD_EXECUTABLE(f32-conv-hwc-bench bench/f32-conv-hwc.cc) - TARGET_INCLUDE_DIRECTORIES(f32-conv-hwc-bench PRIVATE . include src) -- TARGET_LINK_LIBRARIES(f32-conv-hwc-bench PRIVATE benchmark pthreadpool) -+ TARGET_LINK_LIBRARIES(f32-conv-hwc-bench PRIVATE benchmark) - TARGET_LINK_LIBRARIES(f32-conv-hwc-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init packing) - - ADD_EXECUTABLE(f32-conv-hwc2chw-bench bench/f32-conv-hwc2chw.cc) - TARGET_INCLUDE_DIRECTORIES(f32-conv-hwc2chw-bench PRIVATE . include src) -- TARGET_LINK_LIBRARIES(f32-conv-hwc2chw-bench PRIVATE benchmark pthreadpool) -+ TARGET_LINK_LIBRARIES(f32-conv-hwc2chw-bench PRIVATE benchmark) - TARGET_LINK_LIBRARIES(f32-conv-hwc2chw-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init packing) - - ADD_EXECUTABLE(f32-dwconv-bench bench/f32-dwconv.cc) - TARGET_INCLUDE_DIRECTORIES(f32-dwconv-bench PRIVATE . include src) -- TARGET_LINK_LIBRARIES(f32-dwconv-bench PRIVATE benchmark pthreadpool) -+ TARGET_LINK_LIBRARIES(f32-dwconv-bench PRIVATE benchmark) - TARGET_LINK_LIBRARIES(f32-dwconv-bench PRIVATE bench-utils indirection hardware-config logging microkernel-utils microkernels-all microparams-init packing) - - ADD_EXECUTABLE(f32-dwconv2d-chw-bench bench/f32-dwconv2d-chw.cc) - TARGET_INCLUDE_DIRECTORIES(f32-dwconv2d-chw-bench PRIVATE . include src) -- TARGET_LINK_LIBRARIES(f32-dwconv2d-chw-bench PRIVATE benchmark pthreadpool) -+ TARGET_LINK_LIBRARIES(f32-dwconv2d-chw-bench PRIVATE benchmark) - TARGET_LINK_LIBRARIES(f32-dwconv2d-chw-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) - - ADD_EXECUTABLE(f32-f16-vcvt-bench bench/f32-f16-vcvt.cc) - TARGET_INCLUDE_DIRECTORIES(f32-f16-vcvt-bench PRIVATE . include src) -- TARGET_LINK_LIBRARIES(f32-f16-vcvt-bench PRIVATE benchmark pthreadpool) -+ TARGET_LINK_LIBRARIES(f32-f16-vcvt-bench PRIVATE benchmark) - TARGET_LINK_LIBRARIES(f32-f16-vcvt-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) - - ADD_EXECUTABLE(f32-gavgpool-cw-bench bench/f32-gavgpool-cw.cc) - TARGET_INCLUDE_DIRECTORIES(f32-gavgpool-cw-bench PRIVATE . include src) -- TARGET_LINK_LIBRARIES(f32-gavgpool-cw-bench PRIVATE benchmark pthreadpool) -+ TARGET_LINK_LIBRARIES(f32-gavgpool-cw-bench PRIVATE benchmark) - TARGET_LINK_LIBRARIES(f32-gavgpool-cw-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) - - ADD_EXECUTABLE(f32-gemm-bench bench/f32-gemm.cc) - TARGET_INCLUDE_DIRECTORIES(f32-gemm-bench PRIVATE . include src) -- TARGET_LINK_LIBRARIES(f32-gemm-bench PRIVATE benchmark pthreadpool) -+ TARGET_LINK_LIBRARIES(f32-gemm-bench PRIVATE benchmark) - TARGET_LINK_LIBRARIES(f32-gemm-bench PRIVATE jit bench-utils hardware-config logging microkernels-all microparams-init packing) - - ADD_EXECUTABLE(f32-igemm-bench bench/f32-igemm.cc) - TARGET_INCLUDE_DIRECTORIES(f32-igemm-bench PRIVATE . include src) -- TARGET_LINK_LIBRARIES(f32-igemm-bench PRIVATE benchmark pthreadpool) -+ TARGET_LINK_LIBRARIES(f32-igemm-bench PRIVATE benchmark) - TARGET_LINK_LIBRARIES(f32-igemm-bench PRIVATE jit bench-utils indirection hardware-config logging microkernels-all microparams-init packing) - - ADD_EXECUTABLE(f32-im2col-gemm-bench bench/f32-im2col-gemm.cc src/im2col.c) - TARGET_INCLUDE_DIRECTORIES(f32-im2col-gemm-bench PRIVATE . include src) -- TARGET_LINK_LIBRARIES(f32-im2col-gemm-bench PRIVATE benchmark pthreadpool) -+ TARGET_LINK_LIBRARIES(f32-im2col-gemm-bench PRIVATE benchmark) - TARGET_LINK_LIBRARIES(f32-im2col-gemm-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init packing) - - ADD_EXECUTABLE(f32-qs8-vcvt-bench bench/f32-qs8-vcvt.cc) - TARGET_INCLUDE_DIRECTORIES(f32-qs8-vcvt-bench PRIVATE . include src) -- TARGET_LINK_LIBRARIES(f32-qs8-vcvt-bench PRIVATE benchmark pthreadpool) -+ TARGET_LINK_LIBRARIES(f32-qs8-vcvt-bench PRIVATE benchmark) - TARGET_LINK_LIBRARIES(f32-qs8-vcvt-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) - - ADD_EXECUTABLE(f32-qu8-vcvt-bench bench/f32-qu8-vcvt.cc) - TARGET_INCLUDE_DIRECTORIES(f32-qu8-vcvt-bench PRIVATE . include src) -- TARGET_LINK_LIBRARIES(f32-qu8-vcvt-bench PRIVATE benchmark pthreadpool) -+ TARGET_LINK_LIBRARIES(f32-qu8-vcvt-bench PRIVATE benchmark) - TARGET_LINK_LIBRARIES(f32-qu8-vcvt-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) - - ADD_EXECUTABLE(f32-raddstoreexpminusmax-bench bench/f32-raddstoreexpminusmax.cc) - TARGET_INCLUDE_DIRECTORIES(f32-raddstoreexpminusmax-bench PRIVATE . include src) -- TARGET_LINK_LIBRARIES(f32-raddstoreexpminusmax-bench PRIVATE benchmark pthreadpool) -+ TARGET_LINK_LIBRARIES(f32-raddstoreexpminusmax-bench PRIVATE benchmark) - TARGET_LINK_LIBRARIES(f32-raddstoreexpminusmax-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) - - ADD_EXECUTABLE(f32-raddexpminusmax-bench bench/f32-raddexpminusmax.cc) - TARGET_INCLUDE_DIRECTORIES(f32-raddexpminusmax-bench PRIVATE . include src) -- TARGET_LINK_LIBRARIES(f32-raddexpminusmax-bench PRIVATE benchmark pthreadpool) -+ TARGET_LINK_LIBRARIES(f32-raddexpminusmax-bench PRIVATE benchmark) - TARGET_LINK_LIBRARIES(f32-raddexpminusmax-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) - - ADD_EXECUTABLE(f32-raddextexp-bench bench/f32-raddextexp.cc) - TARGET_INCLUDE_DIRECTORIES(f32-raddextexp-bench PRIVATE . include src) -- TARGET_LINK_LIBRARIES(f32-raddextexp-bench PRIVATE benchmark pthreadpool) -+ TARGET_LINK_LIBRARIES(f32-raddextexp-bench PRIVATE benchmark) - TARGET_LINK_LIBRARIES(f32-raddextexp-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) - - ADD_EXECUTABLE(f32-vscaleexpminusmax-bench bench/f32-vscaleexpminusmax.cc) - TARGET_INCLUDE_DIRECTORIES(f32-vscaleexpminusmax-bench PRIVATE . include src) -- TARGET_LINK_LIBRARIES(f32-vscaleexpminusmax-bench PRIVATE benchmark pthreadpool) -+ TARGET_LINK_LIBRARIES(f32-vscaleexpminusmax-bench PRIVATE benchmark) - TARGET_LINK_LIBRARIES(f32-vscaleexpminusmax-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) - - ADD_EXECUTABLE(f32-vscaleextexp-bench bench/f32-vscaleextexp.cc) - TARGET_INCLUDE_DIRECTORIES(f32-vscaleextexp-bench PRIVATE . include src) -- TARGET_LINK_LIBRARIES(f32-vscaleextexp-bench PRIVATE benchmark pthreadpool) -+ TARGET_LINK_LIBRARIES(f32-vscaleextexp-bench PRIVATE benchmark) - TARGET_LINK_LIBRARIES(f32-vscaleextexp-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) - - ADD_EXECUTABLE(f32-rmax-bench bench/f32-rmax.cc) - TARGET_INCLUDE_DIRECTORIES(f32-rmax-bench PRIVATE . include src) -- TARGET_LINK_LIBRARIES(f32-rmax-bench PRIVATE benchmark pthreadpool) -+ TARGET_LINK_LIBRARIES(f32-rmax-bench PRIVATE benchmark) - TARGET_LINK_LIBRARIES(f32-rmax-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) - - ADD_EXECUTABLE(f32-spmm-bench bench/f32-spmm.cc) - TARGET_INCLUDE_DIRECTORIES(f32-spmm-bench PRIVATE . include src) -- TARGET_LINK_LIBRARIES(f32-spmm-bench PRIVATE benchmark pthreadpool) -+ TARGET_LINK_LIBRARIES(f32-spmm-bench PRIVATE benchmark) - TARGET_LINK_LIBRARIES(f32-spmm-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) - - ADD_EXECUTABLE(f32-softmax-bench bench/f32-softmax.cc) - TARGET_INCLUDE_DIRECTORIES(f32-softmax-bench PRIVATE . include src) -- TARGET_LINK_LIBRARIES(f32-softmax-bench PRIVATE benchmark pthreadpool) -+ TARGET_LINK_LIBRARIES(f32-softmax-bench PRIVATE benchmark) - TARGET_LINK_LIBRARIES(f32-softmax-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) - - ADD_EXECUTABLE(f32-velu-bench bench/f32-velu.cc) - TARGET_INCLUDE_DIRECTORIES(f32-velu-bench PRIVATE . include src) -- TARGET_LINK_LIBRARIES(f32-velu-bench PRIVATE benchmark pthreadpool) -+ TARGET_LINK_LIBRARIES(f32-velu-bench PRIVATE benchmark) - TARGET_LINK_LIBRARIES(f32-velu-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) - - ADD_EXECUTABLE(f32-vhswish-bench bench/f32-vhswish.cc) - TARGET_INCLUDE_DIRECTORIES(f32-vhswish-bench PRIVATE . include src) -- TARGET_LINK_LIBRARIES(f32-vhswish-bench PRIVATE benchmark pthreadpool) -+ TARGET_LINK_LIBRARIES(f32-vhswish-bench PRIVATE benchmark) - TARGET_LINK_LIBRARIES(f32-vhswish-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) - - ADD_EXECUTABLE(f32-vlrelu-bench bench/f32-vlrelu.cc) - TARGET_INCLUDE_DIRECTORIES(f32-vlrelu-bench PRIVATE . include src) -- TARGET_LINK_LIBRARIES(f32-vlrelu-bench PRIVATE benchmark pthreadpool) -+ TARGET_LINK_LIBRARIES(f32-vlrelu-bench PRIVATE benchmark) - TARGET_LINK_LIBRARIES(f32-vlrelu-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) - - ADD_EXECUTABLE(f32-vrelu-bench bench/f32-vrelu.cc) - TARGET_INCLUDE_DIRECTORIES(f32-vrelu-bench PRIVATE . include src) -- TARGET_LINK_LIBRARIES(f32-vrelu-bench PRIVATE benchmark pthreadpool) -+ TARGET_LINK_LIBRARIES(f32-vrelu-bench PRIVATE benchmark) - TARGET_LINK_LIBRARIES(f32-vrelu-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) - - ADD_EXECUTABLE(f32-vsigmoid-bench bench/f32-vsigmoid.cc) - TARGET_INCLUDE_DIRECTORIES(f32-vsigmoid-bench PRIVATE . include src) -- TARGET_LINK_LIBRARIES(f32-vsigmoid-bench PRIVATE benchmark pthreadpool) -+ TARGET_LINK_LIBRARIES(f32-vsigmoid-bench PRIVATE benchmark) - TARGET_LINK_LIBRARIES(f32-vsigmoid-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) - - ADD_EXECUTABLE(f32-vsqrt-bench bench/f32-vsqrt.cc) - TARGET_INCLUDE_DIRECTORIES(f32-vsqrt-bench PRIVATE . include src) -- TARGET_LINK_LIBRARIES(f32-vsqrt-bench PRIVATE benchmark pthreadpool) -+ TARGET_LINK_LIBRARIES(f32-vsqrt-bench PRIVATE benchmark) - TARGET_LINK_LIBRARIES(f32-vsqrt-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) - - ADD_EXECUTABLE(qs8-dwconv-bench bench/qs8-dwconv.cc) - TARGET_INCLUDE_DIRECTORIES(qs8-dwconv-bench PRIVATE . include src) -- TARGET_LINK_LIBRARIES(qs8-dwconv-bench PRIVATE benchmark pthreadpool) -+ TARGET_LINK_LIBRARIES(qs8-dwconv-bench PRIVATE benchmark) - TARGET_LINK_LIBRARIES(qs8-dwconv-bench PRIVATE bench-utils indirection hardware-config logging microkernels-all microparams-init packing) - - ADD_EXECUTABLE(qs8-f32-vcvt-bench bench/qs8-f32-vcvt.cc) - TARGET_INCLUDE_DIRECTORIES(qs8-f32-vcvt-bench PRIVATE . include src) -- TARGET_LINK_LIBRARIES(qs8-f32-vcvt-bench PRIVATE benchmark pthreadpool) -+ TARGET_LINK_LIBRARIES(qs8-f32-vcvt-bench PRIVATE benchmark) - TARGET_LINK_LIBRARIES(qs8-f32-vcvt-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) - - ADD_EXECUTABLE(qs8-gemm-bench bench/qs8-gemm.cc) - TARGET_INCLUDE_DIRECTORIES(qs8-gemm-bench PRIVATE . include src) -- TARGET_LINK_LIBRARIES(qs8-gemm-bench PRIVATE benchmark pthreadpool jit microparams-init) -+ TARGET_LINK_LIBRARIES(qs8-gemm-bench PRIVATE benchmark jit microparams-init) - TARGET_LINK_LIBRARIES(qs8-gemm-bench PRIVATE bench-utils jit hardware-config logging microkernels-all microparams-init packing) - - ADD_EXECUTABLE(qs8-requantization-bench bench/qs8-requantization.cc) - SET_TARGET_PROPERTIES(qs8-requantization-bench PROPERTIES CXX_EXTENSIONS YES) - TARGET_INCLUDE_DIRECTORIES(qs8-requantization-bench PRIVATE . include src) -- TARGET_LINK_LIBRARIES(qs8-requantization-bench PRIVATE benchmark pthreadpool) -+ TARGET_LINK_LIBRARIES(qs8-requantization-bench PRIVATE benchmark) - TARGET_LINK_LIBRARIES(qs8-requantization-bench PRIVATE bench-utils microkernels-all) - - ADD_EXECUTABLE(qs8-vadd-bench bench/qs8-vadd.cc) - TARGET_INCLUDE_DIRECTORIES(qs8-vadd-bench PRIVATE . include src) -- TARGET_LINK_LIBRARIES(qs8-vadd-bench PRIVATE benchmark pthreadpool) -+ TARGET_LINK_LIBRARIES(qs8-vadd-bench PRIVATE benchmark) - TARGET_LINK_LIBRARIES(qs8-vadd-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) - - ADD_EXECUTABLE(qs8-vaddc-bench bench/qs8-vaddc.cc) - TARGET_INCLUDE_DIRECTORIES(qs8-vaddc-bench PRIVATE . include src) -- TARGET_LINK_LIBRARIES(qs8-vaddc-bench PRIVATE benchmark pthreadpool) -+ TARGET_LINK_LIBRARIES(qs8-vaddc-bench PRIVATE benchmark) - TARGET_LINK_LIBRARIES(qs8-vaddc-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) - - ADD_EXECUTABLE(qs8-vcvt-bench bench/qs8-vcvt.cc) - TARGET_INCLUDE_DIRECTORIES(qs8-vcvt-bench PRIVATE . include src) -- TARGET_LINK_LIBRARIES(qs8-vcvt-bench PRIVATE benchmark pthreadpool) -+ TARGET_LINK_LIBRARIES(qs8-vcvt-bench PRIVATE benchmark) - TARGET_LINK_LIBRARIES(qs8-vcvt-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) - - ADD_EXECUTABLE(qs8-vlrelu-bench bench/qs8-vlrelu.cc) - TARGET_INCLUDE_DIRECTORIES(qs8-vlrelu-bench PRIVATE . include src) -- TARGET_LINK_LIBRARIES(qs8-vlrelu-bench PRIVATE benchmark pthreadpool) -+ TARGET_LINK_LIBRARIES(qs8-vlrelu-bench PRIVATE benchmark) - TARGET_LINK_LIBRARIES(qs8-vlrelu-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) - - ADD_EXECUTABLE(qs8-vmul-bench bench/qs8-vmul.cc) - TARGET_INCLUDE_DIRECTORIES(qs8-vmul-bench PRIVATE . include src) -- TARGET_LINK_LIBRARIES(qs8-vmul-bench PRIVATE benchmark pthreadpool) -+ TARGET_LINK_LIBRARIES(qs8-vmul-bench PRIVATE benchmark) - TARGET_LINK_LIBRARIES(qs8-vmul-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) - - ADD_EXECUTABLE(qs8-vmulc-bench bench/qs8-vmulc.cc) - TARGET_INCLUDE_DIRECTORIES(qs8-vmulc-bench PRIVATE . include src) -- TARGET_LINK_LIBRARIES(qs8-vmulc-bench PRIVATE benchmark pthreadpool) -+ TARGET_LINK_LIBRARIES(qs8-vmulc-bench PRIVATE benchmark) - TARGET_LINK_LIBRARIES(qs8-vmulc-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) - - ADD_EXECUTABLE(qu8-f32-vcvt-bench bench/qu8-f32-vcvt.cc) - TARGET_INCLUDE_DIRECTORIES(qu8-f32-vcvt-bench PRIVATE . include src) -- TARGET_LINK_LIBRARIES(qu8-f32-vcvt-bench PRIVATE benchmark pthreadpool) -+ TARGET_LINK_LIBRARIES(qu8-f32-vcvt-bench PRIVATE benchmark) - TARGET_LINK_LIBRARIES(qu8-f32-vcvt-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) - - ADD_EXECUTABLE(qu8-gemm-bench bench/qu8-gemm.cc) - TARGET_INCLUDE_DIRECTORIES(qu8-gemm-bench PRIVATE . include src) -- TARGET_LINK_LIBRARIES(qu8-gemm-bench PRIVATE benchmark pthreadpool) -+ TARGET_LINK_LIBRARIES(qu8-gemm-bench PRIVATE benchmark) - TARGET_LINK_LIBRARIES(qu8-gemm-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init packing) - - ADD_EXECUTABLE(qu8-requantization-bench bench/qu8-requantization.cc) - SET_TARGET_PROPERTIES(qu8-requantization-bench PROPERTIES CXX_EXTENSIONS YES) - TARGET_INCLUDE_DIRECTORIES(qu8-requantization-bench PRIVATE . include src) -- TARGET_LINK_LIBRARIES(qu8-requantization-bench PRIVATE benchmark pthreadpool) -+ TARGET_LINK_LIBRARIES(qu8-requantization-bench PRIVATE benchmark) - TARGET_LINK_LIBRARIES(qu8-requantization-bench PRIVATE bench-utils microkernels-all) - - ADD_EXECUTABLE(qu8-vadd-bench bench/qu8-vadd.cc) - TARGET_INCLUDE_DIRECTORIES(qu8-vadd-bench PRIVATE . include src) -- TARGET_LINK_LIBRARIES(qu8-vadd-bench PRIVATE benchmark pthreadpool) -+ TARGET_LINK_LIBRARIES(qu8-vadd-bench PRIVATE benchmark) - TARGET_LINK_LIBRARIES(qu8-vadd-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) - - ADD_EXECUTABLE(qu8-vaddc-bench bench/qu8-vaddc.cc) - TARGET_INCLUDE_DIRECTORIES(qu8-vaddc-bench PRIVATE . include src) -- TARGET_LINK_LIBRARIES(qu8-vaddc-bench PRIVATE benchmark pthreadpool) -+ TARGET_LINK_LIBRARIES(qu8-vaddc-bench PRIVATE benchmark) - TARGET_LINK_LIBRARIES(qu8-vaddc-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) - - ADD_EXECUTABLE(qu8-vcvt-bench bench/qu8-vcvt.cc) - TARGET_INCLUDE_DIRECTORIES(qu8-vcvt-bench PRIVATE . include src) -- TARGET_LINK_LIBRARIES(qu8-vcvt-bench PRIVATE benchmark pthreadpool) -+ TARGET_LINK_LIBRARIES(qu8-vcvt-bench PRIVATE benchmark) - TARGET_LINK_LIBRARIES(qu8-vcvt-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) - - ADD_EXECUTABLE(qu8-vlrelu-bench bench/qu8-vlrelu.cc) - TARGET_INCLUDE_DIRECTORIES(qu8-vlrelu-bench PRIVATE . include src) -- TARGET_LINK_LIBRARIES(qu8-vlrelu-bench PRIVATE benchmark pthreadpool) -+ TARGET_LINK_LIBRARIES(qu8-vlrelu-bench PRIVATE benchmark) - TARGET_LINK_LIBRARIES(qu8-vlrelu-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) - - ADD_EXECUTABLE(qu8-vmul-bench bench/qu8-vmul.cc) - TARGET_INCLUDE_DIRECTORIES(qu8-vmul-bench PRIVATE . include src) -- TARGET_LINK_LIBRARIES(qu8-vmul-bench PRIVATE benchmark pthreadpool) -+ TARGET_LINK_LIBRARIES(qu8-vmul-bench PRIVATE benchmark) - TARGET_LINK_LIBRARIES(qu8-vmul-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) - - ADD_EXECUTABLE(qu8-vmulc-bench bench/qu8-vmulc.cc) - TARGET_INCLUDE_DIRECTORIES(qu8-vmulc-bench PRIVATE . include src) -- TARGET_LINK_LIBRARIES(qu8-vmulc-bench PRIVATE benchmark pthreadpool) -+ TARGET_LINK_LIBRARIES(qu8-vmulc-bench PRIVATE benchmark) - TARGET_LINK_LIBRARIES(qu8-vmulc-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) - - ADD_EXECUTABLE(rounding-bench bench/rounding.cc) - TARGET_INCLUDE_DIRECTORIES(rounding-bench PRIVATE . include src) -- TARGET_LINK_LIBRARIES(rounding-bench PRIVATE benchmark cpuinfo pthreadpool) -+ TARGET_LINK_LIBRARIES(rounding-bench PRIVATE benchmark cpuinfo) - TARGET_LINK_LIBRARIES(rounding-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) - - ADD_EXECUTABLE(s16-rmaxabs-bench bench/s16-rmaxabs.cc) - TARGET_INCLUDE_DIRECTORIES(s16-rmaxabs-bench PRIVATE . include src) -- TARGET_LINK_LIBRARIES(s16-rmaxabs-bench PRIVATE benchmark pthreadpool) -+ TARGET_LINK_LIBRARIES(s16-rmaxabs-bench PRIVATE benchmark) - TARGET_LINK_LIBRARIES(s16-rmaxabs-bench PRIVATE bench-utils microkernels-all) - - ADD_EXECUTABLE(s16-window-bench bench/s16-window.cc) - TARGET_INCLUDE_DIRECTORIES(s16-window-bench PRIVATE . include src) -- TARGET_LINK_LIBRARIES(s16-window-bench PRIVATE benchmark pthreadpool) -+ TARGET_LINK_LIBRARIES(s16-window-bench PRIVATE benchmark) - TARGET_LINK_LIBRARIES(s16-window-bench PRIVATE bench-utils microkernels-all) - - ADD_EXECUTABLE(u32-filterbank-accumulate-bench bench/u32-filterbank-accumulate.cc) - TARGET_INCLUDE_DIRECTORIES(u32-filterbank-accumulate-bench PRIVATE . include src) -- TARGET_LINK_LIBRARIES(u32-filterbank-accumulate-bench PRIVATE benchmark pthreadpool) -+ TARGET_LINK_LIBRARIES(u32-filterbank-accumulate-bench PRIVATE benchmark) - TARGET_LINK_LIBRARIES(u32-filterbank-accumulate-bench PRIVATE bench-utils microkernels-all) - - ADD_EXECUTABLE(u32-filterbank-subtract-bench bench/u32-filterbank-subtract.cc) - TARGET_INCLUDE_DIRECTORIES(u32-filterbank-subtract-bench PRIVATE . include src) -- TARGET_LINK_LIBRARIES(u32-filterbank-subtract-bench PRIVATE benchmark pthreadpool) -+ TARGET_LINK_LIBRARIES(u32-filterbank-subtract-bench PRIVATE benchmark) - TARGET_LINK_LIBRARIES(u32-filterbank-subtract-bench PRIVATE bench-utils microkernels-all) - - ADD_EXECUTABLE(u32-vlog-bench bench/u32-vlog.cc) - TARGET_INCLUDE_DIRECTORIES(u32-vlog-bench PRIVATE . include src) -- TARGET_LINK_LIBRARIES(u32-vlog-bench PRIVATE benchmark pthreadpool) -+ TARGET_LINK_LIBRARIES(u32-vlog-bench PRIVATE benchmark) - TARGET_LINK_LIBRARIES(u32-vlog-bench PRIVATE bench-utils microkernels-all) - - ADD_EXECUTABLE(u64-u32-vsqrtshift-bench bench/u64-u32-vsqrtshift.cc) - TARGET_INCLUDE_DIRECTORIES(u64-u32-vsqrtshift-bench PRIVATE . include src) -- TARGET_LINK_LIBRARIES(u64-u32-vsqrtshift-bench PRIVATE benchmark pthreadpool) -+ TARGET_LINK_LIBRARIES(u64-u32-vsqrtshift-bench PRIVATE benchmark) - TARGET_LINK_LIBRARIES(u64-u32-vsqrtshift-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) - - ADD_EXECUTABLE(i16-vlshift-bench bench/i16-vlshift.cc) - TARGET_INCLUDE_DIRECTORIES(i16-vlshift-bench PRIVATE . include src) -- TARGET_LINK_LIBRARIES(i16-vlshift-bench PRIVATE benchmark pthreadpool) -+ TARGET_LINK_LIBRARIES(i16-vlshift-bench PRIVATE benchmark) - TARGET_LINK_LIBRARIES(i16-vlshift-bench PRIVATE bench-utils microkernels-all) - - ADD_EXECUTABLE(cs16-vsquareabs-bench bench/cs16-vsquareabs.cc) - TARGET_INCLUDE_DIRECTORIES(cs16-vsquareabs-bench PRIVATE . include src) -- TARGET_LINK_LIBRARIES(cs16-vsquareabs-bench PRIVATE benchmark pthreadpool) -+ TARGET_LINK_LIBRARIES(cs16-vsquareabs-bench PRIVATE benchmark) - TARGET_LINK_LIBRARIES(cs16-vsquareabs-bench PRIVATE bench-utils microkernels-all) - - ADD_EXECUTABLE(cs16-bfly4-bench bench/cs16-bfly4.cc) - TARGET_INCLUDE_DIRECTORIES(cs16-bfly4-bench PRIVATE . include src) -- TARGET_LINK_LIBRARIES(cs16-bfly4-bench PRIVATE benchmark pthreadpool) -+ TARGET_LINK_LIBRARIES(cs16-bfly4-bench PRIVATE benchmark) - TARGET_LINK_LIBRARIES(cs16-bfly4-bench PRIVATE bench-utils microkernels-all) - - ADD_EXECUTABLE(cs16-fftr-bench bench/cs16-fftr.cc) - TARGET_INCLUDE_DIRECTORIES(cs16-fftr-bench PRIVATE . include src) -- TARGET_LINK_LIBRARIES(cs16-fftr-bench PRIVATE benchmark pthreadpool) -+ TARGET_LINK_LIBRARIES(cs16-fftr-bench PRIVATE benchmark) - TARGET_LINK_LIBRARIES(cs16-fftr-bench PRIVATE bench-utils microkernels-all) - - ADD_EXECUTABLE(xx-transpose-bench bench/xx-transpose.cc) - TARGET_INCLUDE_DIRECTORIES(xx-transpose-bench PRIVATE . include src) -- TARGET_LINK_LIBRARIES(xx-transpose-bench PRIVATE benchmark pthreadpool) -+ TARGET_LINK_LIBRARIES(xx-transpose-bench PRIVATE benchmark) - TARGET_LINK_LIBRARIES(xx-transpose-bench PRIVATE bench-utils microkernels-all) - - ADD_EXECUTABLE(x8-lut-bench bench/x8-lut.cc) - TARGET_INCLUDE_DIRECTORIES(x8-lut-bench PRIVATE . include src) -- TARGET_LINK_LIBRARIES(x8-lut-bench PRIVATE benchmark pthreadpool) -+ TARGET_LINK_LIBRARIES(x8-lut-bench PRIVATE benchmark) - TARGET_LINK_LIBRARIES(x8-lut-bench PRIVATE bench-utils microkernels-all) - - ADD_EXECUTABLE(x8-transpose-bench bench/x32-transpose.cc) - TARGET_INCLUDE_DIRECTORIES(x8-transpose-bench PRIVATE . include src) -- TARGET_LINK_LIBRARIES(x8-transpose-bench PRIVATE benchmark pthreadpool) -+ TARGET_LINK_LIBRARIES(x8-transpose-bench PRIVATE benchmark) - TARGET_LINK_LIBRARIES(x8-transpose-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) - - ADD_EXECUTABLE(x16-transpose-bench bench/x16-transpose.cc) - TARGET_INCLUDE_DIRECTORIES(x16-transpose-bench PRIVATE . include src) -- TARGET_LINK_LIBRARIES(x16-transpose-bench PRIVATE benchmark pthreadpool) -+ TARGET_LINK_LIBRARIES(x16-transpose-bench PRIVATE benchmark) - TARGET_LINK_LIBRARIES(x16-transpose-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) - - ADD_EXECUTABLE(x24-transpose-bench bench/x16-transpose.cc) - TARGET_INCLUDE_DIRECTORIES(x24-transpose-bench PRIVATE . include src) -- TARGET_LINK_LIBRARIES(x24-transpose-bench PRIVATE benchmark pthreadpool) -+ TARGET_LINK_LIBRARIES(x24-transpose-bench PRIVATE benchmark) - TARGET_LINK_LIBRARIES(x24-transpose-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) - - ADD_EXECUTABLE(x32-transpose-bench bench/x32-transpose.cc) - TARGET_INCLUDE_DIRECTORIES(x32-transpose-bench PRIVATE . include src) -- TARGET_LINK_LIBRARIES(x32-transpose-bench PRIVATE benchmark pthreadpool) -+ TARGET_LINK_LIBRARIES(x32-transpose-bench PRIVATE benchmark) - TARGET_LINK_LIBRARIES(x32-transpose-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) - - ADD_EXECUTABLE(x64-transpose-bench bench/x64-transpose.cc) - TARGET_INCLUDE_DIRECTORIES(x64-transpose-bench PRIVATE . include src) -- TARGET_LINK_LIBRARIES(x64-transpose-bench PRIVATE benchmark pthreadpool) -+ TARGET_LINK_LIBRARIES(x64-transpose-bench PRIVATE benchmark) - TARGET_LINK_LIBRARIES(x64-transpose-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) - ENDIF() From patchwork Sun Aug 4 22:15:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 66730 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 7932C27BBEC; Sun, 4 Aug 2024 23:18:40 +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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, URIBL_BLOCKED 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 EE10927BBE2 for ; Sun, 4 Aug 2024 23:18:36 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sajXv-0007ZS-Aa; Sun, 04 Aug 2024 18:17:47 -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 1sajXr-0007YF-Sl for guix-patches@gnu.org; Sun, 04 Aug 2024 18:17:44 -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 1sajXr-0000sH-Hu for guix-patches@gnu.org; Sun, 04 Aug 2024 18:17:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=bbbtusPINZSF3oz1sBON4FytxvNc+tJ69vN4xPipTLI=; b=NH0IPFfbCy54bMxUt7nzLLo+7JdCuaPmu/PTS7RKv3UOewJlJMe+vXf1z2aTw6uSADKzdl+kbQNRhMrEQonoiTx3jKNlaXq88lMuKjxZCR2IuPJsoPMMHWMG3t6VR3L4VACF9NU0/s8pv5CLcCiLDOZNv+jil2aEqYiYCN+TirnXPKHTXPI4Anfh333ncYynmtpDnaqIJ9uPtQdSW0qw96C8p0ich41T3aLGHqWv0/AnaqdJh7Fs/T05fhm3839PK6AcuJhgHDB9/uRkz5o+JcP5XzsYNNSwTCuW66HdxyX6cthmtKsWxwM1x3KGM1KSmAB+03sTLCBXuDL6ZgqPSw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sajYD-0004Se-1g for guix-patches@gnu.org; Sun, 04 Aug 2024 18:18:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72471] [PATCH 11/24] gnu: Add xnnpack-for-r-torch. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 04 Aug 2024 22:18:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72471 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72471@debbugs.gnu.org Cc: David Elsing Received: via spool by 72471-submit@debbugs.gnu.org id=B72471.172280986016888 (code B ref 72471); Sun, 04 Aug 2024 22:18:05 +0000 Received: (at 72471) by debbugs.gnu.org; 4 Aug 2024 22:17:40 +0000 Received: from localhost ([127.0.0.1]:57499 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sajXg-0004NU-Vp for submit@debbugs.gnu.org; Sun, 04 Aug 2024 18:17:39 -0400 Received: from mout01.posteo.de ([185.67.36.65]:38433) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sajXZ-0004KE-0C for 72471@debbugs.gnu.org; Sun, 04 Aug 2024 18:17:26 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id CBEEF240027 for <72471@debbugs.gnu.org>; Mon, 5 Aug 2024 00:16:57 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1722809817; bh=kpSFbD+vDKoqTbbB1oMtUH8W0T6wyzLKHrQAq7kp5Wo=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=qaOKHnCn08/9rBzwAr6MwRVNMNGg8ECT2aoUsFsfiIEg29QDNyZDI55td9T2MFnVc 23diuTAoHE0VN/71M2NyqvrAHOVfHiRRmVL0zR84txwSrSKiA3zm5UTYECCA1JB6UU Vz5BGiW67o+5pK9Qs6tQYe71F8hqo++hyR+fTGwJngoKoYRqXw1sLfOWxItCyE24M7 XJFBRpClZ9XaDuz6NqjxZC3GPzdxKKJP82mzbkB5M0ad3vukBZmOXMpnPWjVIxQyD0 pWOlZPfo5VBpPEKjF6tWI2jLYDiw1wE4c/3D4/CuL3FLoJLqGyTeYnjMp9Xj/t3ddN 4/gykshV1A9BA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4WcYp13Xr6z6tlh; Mon, 5 Aug 2024 00:16:57 +0200 (CEST) From: David Elsing Date: Sun, 4 Aug 2024 22:15:49 +0000 Message-ID: <20240804221635.3805-11-david.elsing@posteo.net> In-Reply-To: <20240804220847.15842-1-david.elsing@posteo.net> References: <20240804220847.15842-1-david.elsing@posteo.net> 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 (xnnpack-for-r-torch): New variable. (xnnpack)[inputs]: Use xnnpack-for-r-torch instead of xnnpack. --- gnu/packages/machine-learning.scm | 71 ++++++++++++++++++++++++++++++- 1 file changed, 70 insertions(+), 1 deletion(-) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 6fcfc1d167..71683c4df6 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -4251,6 +4251,74 @@ (define target-deps "") "i686-linux" "x86_64-linux")) (license license:bsd-3)))) +(define-public xnnpack-for-r-torch + (let ((version "0.0") + (commit "51a987591a6fc9f0fc0707077f53d763ac132cbf") + (revision "2")) + (package + (inherit xnnpack) + (version (git-version version revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference (url (package-home-page xnnpack)) (commit commit))) + (file-name (git-file-name (package-name xnnpack) version)) + (sha256 + (base32 + "1rzby82xq8d0rl1d148yz88jh9cpsw5c8b2yw7yg39mi7qmr55rm")) + (modules '((guix build utils) + (ice-9 ftw) + (ice-9 textual-ports) + (srfi srfi-26))) + (snippet + '(begin + ;; Remove autogenerated files + (for-each + (lambda (dir) + (let ((gendir (string-append "src/" dir "/gen"))) + (when (file-exists? gendir) + (delete-file-recursively gendir) + ;; Needed for the scripts generating the files + (mkdir gendir)))) + (scandir "src" (negate (cut member <> '("." ".."))))) + (delete-file-recursively "google3") + (delete-file "cmake/microkernels.cmake") + ;; Additional autogenerated files which contain the string + ;; "Auto-generated file" + (for-each + (lambda (dir) + (for-each + (lambda (name) + (let ((path (string-append dir "/" name))) + (when (call-with-input-file path + (lambda (port) + (string-contains + (get-string-all port) + "Auto-generated file"))) + (delete-file path)))) + (scandir dir (negate (cut member <> '("." "..")))))) + '("test" "bench" "eval" "models" "src/enums" "src/xnnpack")))))) + (arguments + (substitute-keyword-arguments (package-arguments xnnpack) + ((#:phases phases) + #~(modify-phases #$phases + (replace 'generate-files + (lambda _ + (for-each + (lambda (name) + (when (and (string-prefix? "generate" name) + (string-suffix? ".sh" name) + (not (equal? "generate-amalgamation.sh" name))) + (display (string-append name "\n")) + (invoke "bash" (string-append "scripts/" name)))) + (scandir "scripts")) + ;; These need to run after the above scripts + (display "Remaining files\n") + (invoke "python3" "tools/update-microkernels.py") + (substitute* "tools/amalgamate-microkernels.py" + (("BUILD") "BUILD.bazel")) + (invoke "bash" "scripts/generate-amalgamation.sh")))))))))) + ;; Warning: This package requires AVX2 or AVX-512 instructions. (define-public fbgemm (package @@ -4851,7 +4919,8 @@ (define-public python-pytorch-for-r-torch (inputs (modify-inputs (package-inputs python-pytorch) (replace "qnnpack-pytorch" qnnpack-pytorch-for-r-torch) - (replace "oneapi-dnnl" oneapi-dnnl-for-r-torch))) + (replace "oneapi-dnnl" oneapi-dnnl-for-r-torch) + (replace "xnnpack" xnnpack-for-r-torch))) (propagated-inputs (modify-inputs (package-propagated-inputs python-pytorch) (append python-filelock From patchwork Sun Aug 4 22:15:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 66723 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 D407927BBEA; Sun, 4 Aug 2024 23:18:25 +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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, URIBL_BLOCKED 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 17FA227BBE2 for ; Sun, 4 Aug 2024 23:18:25 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sajXx-0007bG-JA; Sun, 04 Aug 2024 18:17:49 -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 1sajXt-0007YX-Q0 for guix-patches@gnu.org; Sun, 04 Aug 2024 18:17:45 -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 1sajXr-0000sO-Vk for guix-patches@gnu.org; Sun, 04 Aug 2024 18:17:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=VU/C5ClQZ8i64ww+G1LnEwUPkYs4iapxk5+WbPqSwjA=; b=MzaLF0FNa63gXqvEivT3xJuspUYeG/jYi0qVaNmt82J3nRH+uD0MGyYMMi3bD61lLe8fv6K6nhgMwOHENcQzdBg8de0UL/s6XydEIwz0I2lSQP/fTALP6Ukh7TPIXLgo4b9PvO0IcxqFGTg4EC4kWH7t+mzsD8jnsDfwvEfYPoFs6fUxJY234FnPBvTNkjORWSkJMW0Z2HtG2lpQphJRq+Rv3Rv5ivtW63SjvBlw7YdMpwU3g2ERSKuiDjZM9EZgrAJJkqtiMGpYHdpnGKCVficCiPX4y/kVLfQer8qYO4iUGgUXyKJEyflL51EGbxn+NYN3boN37i0jyFQG/mzOjQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sajYD-0004Sn-Gz for guix-patches@gnu.org; Sun, 04 Aug 2024 18:18:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72471] [PATCH 12/24] gnu: python-nbval: Update to 0.11.0. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 04 Aug 2024 22:18:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72471 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72471@debbugs.gnu.org Cc: David Elsing Received: via spool by 72471-submit@debbugs.gnu.org id=B72471.172280986116905 (code B ref 72471); Sun, 04 Aug 2024 22:18:05 +0000 Received: (at 72471) by debbugs.gnu.org; 4 Aug 2024 22:17:41 +0000 Received: from localhost ([127.0.0.1]:57501 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sajXn-0004OL-Vx for submit@debbugs.gnu.org; Sun, 04 Aug 2024 18:17:41 -0400 Received: from mout01.posteo.de ([185.67.36.65]:39397) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sajXZ-0004KP-HI for 72471@debbugs.gnu.org; Sun, 04 Aug 2024 18:17:26 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 5497B240027 for <72471@debbugs.gnu.org>; Mon, 5 Aug 2024 00:16:58 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1722809818; bh=ioyAlGoDAM+N7Jy1KJ2F+osabt3kqUky9K4qGpoIVyY=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=SXZUrCahZyFfg+JQFUnyyp7ie+pAhkeffBC9jjA1GL9+kpWzSvyTLfnojmc4WKbl6 +bvfSC9LC8vbQkpK5x1qnsTFD29UfJvUW9LBsMbakIsOYgIDMo0k81yhuTZhoCCj23 T67pBHozV3+0NDbQ7FNAgc61tymKRKYfZT7sDAlaTyPhHgx559iG7Fid2VdoVAhVti B0htCNQ5er40gyFLt+GMOHi+SU11Mt40+f9Vi9ZmRSiETjV6r/27UARu07uXpViSxl rhZBi8fuu+MChKPUKVtmNPZdhlrQHOS1HYMlDLltzH1P/tX6XdODP4mpYGl9DqxIm3 6nUQIh7+6GoaA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4WcYp208kbz6tlh; Mon, 5 Aug 2024 00:16:58 +0200 (CEST) From: David Elsing Date: Sun, 4 Aug 2024 22:15:50 +0000 Message-ID: <20240804221635.3805-12-david.elsing@posteo.net> In-Reply-To: <20240804220847.15842-1-david.elsing@posteo.net> References: <20240804220847.15842-1-david.elsing@posteo.net> 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/python-check.scm (python-nbval): Update to 0.11.0. [arguments]<#:phases>: Adjust 'check' phase. [native-inputs]: Remove python-pytest. [propagated-inputs]: Add python-coverage and python-pytest. Remove python-six. --- gnu/packages/python-check.scm | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm index 74e833686f..6b42d3c45c 100644 --- a/gnu/packages/python-check.scm +++ b/gnu/packages/python-check.scm @@ -1585,13 +1585,13 @@ (define-public python-nbmake (define-public python-nbval (package (name "python-nbval") - (version "0.9.6") + (version "0.11.0") (source (origin (method url-fetch) (uri (pypi-uri "nbval" version)) (sha256 - (base32 "0h3xrnw0mj1srigrx2rfnd73h8s0xjycclmjs0vx7qkfyqpcvvyg")))) + (base32 "154h6xpf9h6spgg3ax6k79fd40j197ipwnfjmf5rc2kvc2bmgjbp")))) (build-system python-build-system) (arguments `(#:phases @@ -1605,21 +1605,16 @@ (define-public python-nbval (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? - (invoke "pytest" "-vv" "-k" - (string-append - ;; This only works with Pytest < 5. - "not nbdime_reporter" - ;; https://github.com/computationalmodelling/nbval/pull/148. - " and not test_timeouts" - ;; It seems the output format has changed; the following - ;; test fails with "Unexpected output fields from - ;; running code: {'text/plain'}". - " and not test_conf_ignore_stderr ")))))))) - (native-inputs - (list python-pytest python-pytest-cov python-sympy)) + (invoke "pytest" "-vv" + ;; nbdime forms a dependency cycle + "--ignore=tests/test_nbdime_reporter.py"))))))) + (native-inputs (list python-pytest-cov python-sympy)) (propagated-inputs - (list python-ipykernel python-jupyter-client python-nbformat - python-six)) + (list python-coverage + python-ipykernel + python-jupyter-client + python-nbformat + python-pytest)) (home-page "https://github.com/computationalmodelling/nbval") (synopsis "Pytest plugin to validate Jupyter notebooks") (description From patchwork Sun Aug 4 22:15:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 66720 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 EA2A427BBEB; Sun, 4 Aug 2024 23:18:16 +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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, URIBL_BLOCKED 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 D02D827BBEA for ; Sun, 4 Aug 2024 23:18:14 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sajY4-0007gF-Ct; Sun, 04 Aug 2024 18:17: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 1sajXt-0007YZ-Q5 for guix-patches@gnu.org; Sun, 04 Aug 2024 18:17:45 -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 1sajXs-0000sQ-GO for guix-patches@gnu.org; Sun, 04 Aug 2024 18:17:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=315e9HLP9T6aRLDWa97rhTM610riIzWu3HzZ9u8OMkw=; b=FcwAJD3x+Atr729pD4xVSe5dvjLXDvx5TAc6e9/KXUwlREEzjmnqE79tj4e8/TBR2QLIlOjE+zh10pgV7BdnVDVfgVKDXL1+R/aqW1d7i/NCN4hUQjHyHu/VT98nxls2Ilwn8g8CIGdJvY8B2ESVhvL9e2Auh41Y6dErupmjf9E7ZTkMi5Hgycy0Txbq4w1rUM5PKZFpvDJFeBE1xugKcpfEXEkycxupKqxue6u3NbEGdsbs3K/Sxm/dBYZdWIrmGWYNf+BoY3H3baqDs9fF1vtqmX4ZZ6DPa+2XgZEyXLZj0Z5qhFIty80CapY0gmDdVvo/qsuTLY9dTZO05O6T6A==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sajYE-0004Su-0V for guix-patches@gnu.org; Sun, 04 Aug 2024 18:18:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72471] [PATCH 13/24] gnu: Add python-parameterized-next. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 04 Aug 2024 22:18:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72471 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72471@debbugs.gnu.org Cc: David Elsing Received: via spool by 72471-submit@debbugs.gnu.org id=B72471.172280986216914 (code B ref 72471); Sun, 04 Aug 2024 22:18:05 +0000 Received: (at 72471) by debbugs.gnu.org; 4 Aug 2024 22:17:42 +0000 Received: from localhost ([127.0.0.1]:57503 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sajXp-0004Ob-FB for submit@debbugs.gnu.org; Sun, 04 Aug 2024 18:17:42 -0400 Received: from mout01.posteo.de ([185.67.36.65]:40329) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sajXa-0004KS-18 for 72471@debbugs.gnu.org; Sun, 04 Aug 2024 18:17:26 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id D1183240027 for <72471@debbugs.gnu.org>; Mon, 5 Aug 2024 00:16:58 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1722809818; bh=U+yoyfP1j5nn1z35KuJWPXF+iKL0z8ZpOFcvL4Xkp+s=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=m0lkqusSMeif4QkCWG4w5TZdoQsLh59AajVYdocRiCoIKXXWzU+c971RwGiccJsOW AOY2eZLdY0pw1qXACUahbSneN3JR6C7lBWdrSMLwiS0GlKhIBb1jlMHf2lIx8r/35T NaYVWQmP7uFzxhnHXbGDb401PyRSVpLNxEnHXqtOxbuhXTwno1FJ3BxVod5zfSKtF0 4nRbOgcaiwKMiATCaZTZw9tGHGCloOsyx+VSXiX8b8/Cq9HnWFXSTOzwpKIBDRTfK0 jSRqroYYSJfk3kkPXTz041rpwYDkzzDF6lEc23tKatLNy006I0y/sMUKs4W8TcWqsn BICQzsRVBf/iQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4WcYp23jSgz6tlh; Mon, 5 Aug 2024 00:16:58 +0200 (CEST) From: David Elsing Date: Sun, 4 Aug 2024 22:15:51 +0000 Message-ID: <20240804221635.3805-13-david.elsing@posteo.net> In-Reply-To: <20240804220847.15842-1-david.elsing@posteo.net> References: <20240804220847.15842-1-david.elsing@posteo.net> 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/check.scm (python-parameterized-next): New variable. --- gnu/packages/check.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 21a975f340..9d8772fd4d 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1222,6 +1222,28 @@ (define-public python-parameterized for every Python test framework. It supports nose, py.test, and unittest.") (license license:bsd-2))) +(define-public python-parameterized-next + (package + (inherit python-parameterized) + (version "0.9.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "parameterized" version)) + (sha256 + (base32 "1c89vc40zj5aj2zvbvw875wqpyf0x6xrqhm3q5jg797g5hkhbjbz")))) + (build-system pyproject-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (substitute* "parameterized/test.py" + (("import mock") "from unittest import mock")) + (invoke "python3" "-m" "unittest"))))))) + (native-inputs (list python-jinja2)))) + (define-public python-minimock (package (name "python-minimock") From patchwork Sun Aug 4 22:15:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 66722 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 725C227BBEA; Sun, 4 Aug 2024 23:18:22 +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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, URIBL_BLOCKED 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 E809527BBE2 for ; Sun, 4 Aug 2024 23:18:21 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sajXx-0007bf-S1; Sun, 04 Aug 2024 18:17:49 -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 1sajXv-0007Zf-LW for guix-patches@gnu.org; Sun, 04 Aug 2024 18:17:47 -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 1sajXt-0000so-WD for guix-patches@gnu.org; Sun, 04 Aug 2024 18:17:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=FFzy7sQfI0iCIQsJ6kP0X/NTAuJYYkllKkONrYFbUUE=; b=pEoUcCYbQKnsUziNcWQ0hQgs1wE1T2hD2GxZkJvsDfuQQcpCACyVMbiu9BRaosllEwsIdYPXGzIR8IYAbuEsJE+0hy40iSjhn9fP/hsPnduCmAXOPglPr7gIlVqfXGDGd2Sm0BMk8G2Sk2qGiEn0ctg+FIQX7zZu23dolDsB2j2VVyklfiBOZkVuHmgL9YOBMMpLY6ummi9JUSAhS/8eOyrCNsCYWuCzKY1GZ/4SjAjcBhG3eLwFZd3/fXi2sxKH/J9O5qyBKAqtbAfeX/ZxYiX4Sa8T+D9xcsTjL+1c/gpQ+upBmYK3vGwJtYoEjy2NklHnl4NUFhjIKo/iArWE2w==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sajYF-0004TJ-FD for guix-patches@gnu.org; Sun, 04 Aug 2024 18:18:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72471] [PATCH 14/24] gnu: Remove onnx-optimizer-for-torch2. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 04 Aug 2024 22:18:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72471 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72471@debbugs.gnu.org Cc: David Elsing Received: via spool by 72471-submit@debbugs.gnu.org id=B72471.172280987016975 (code B ref 72471); Sun, 04 Aug 2024 22:18:07 +0000 Received: (at 72471) by debbugs.gnu.org; 4 Aug 2024 22:17:50 +0000 Received: from localhost ([127.0.0.1]:57509 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sajXx-0004Pd-48 for submit@debbugs.gnu.org; Sun, 04 Aug 2024 18:17:49 -0400 Received: from mout02.posteo.de ([185.67.36.66]:60271) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sajXb-0004Ko-BJ for 72471@debbugs.gnu.org; Sun, 04 Aug 2024 18:17:29 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 5B53C240101 for <72471@debbugs.gnu.org>; Mon, 5 Aug 2024 00:16:59 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1722809819; bh=1M5R9RGM5vI9v0mCMsd7lD6h/FAlhA7ev8HqBDzL7Hk=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=SUJ1jX/J1tjpiuuxW3DrC8XkzeoFy1x6ohNcEcZpMKKKJ5KauOTBMmLUm1qdKa23L qnSjRXhhyImSJl0l2qTL1uIHI5kKFXg+C5C6Z7DvwMAg8Wa/vhfiHdBdJM3zCR+mxz vKYv4RYcgLLRQij5PziW7i85IUdcT3T0EOvvPP97suFGmAdJdiEWkRnwEuCh9e3b3e AmGgrsmZLUSwLwj7huUhoueYq2x3QXJrKsXQbkAQsTCOtemYKmO/2BWxUOqNXt9m9G nDvsxboRCSGPVnX/K+vVAgUWD9TcT7/Icdujn37btiVssox9RKMqadER6sw4YG+Xay kI/Wu15jaWuVw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4WcYp309hhz6tlh; Mon, 5 Aug 2024 00:16:59 +0200 (CEST) From: David Elsing Date: Sun, 4 Aug 2024 22:15:52 +0000 Message-ID: <20240804221635.3805-14-david.elsing@posteo.net> In-Reply-To: <20240804220847.15842-1-david.elsing@posteo.net> References: <20240804220847.15842-1-david.elsing@posteo.net> 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-for-torch2): Delete variable. --- gnu/packages/machine-learning.scm | 8 -------- 1 file changed, 8 deletions(-) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 71683c4df6..b9a128dd1b 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -1496,14 +1496,6 @@ (define-public onnx-optimizer with a single function call.") (license license:expat))) -(define-public onnx-optimizer-for-torch2 - (hidden-package - (package - (inherit onnx-optimizer) - (inputs - (modify-inputs (package-inputs onnx-optimizer) - (replace "onnx" onnx-for-torch2)))))) - (define-public rxcpp (package (name "rxcpp") From patchwork Sun Aug 4 22:15:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 66727 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 2937327BBEA; Sun, 4 Aug 2024 23:18:33 +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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, URIBL_BLOCKED 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 B05BE27BBE2 for ; Sun, 4 Aug 2024 23:18:32 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sajXx-0007bF-DI; Sun, 04 Aug 2024 18:17:49 -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 1sajXt-0007Yd-Ql for guix-patches@gnu.org; Sun, 04 Aug 2024 18:17:45 -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 1sajXs-0000sR-V9 for guix-patches@gnu.org; Sun, 04 Aug 2024 18:17:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=FkA+oFZDFfOCUzx2QdWzeDqnVpFDZd9O2ZnF8Aqn7lk=; b=VD6tOiT+2esyt5zjXPCrdJZJfmuWGTVhvET80S39NbIyiqwE3p5eL+umvSgC9AUQWO4+lTDa3jasbzXw0AO8pJBrDP+81/PZrT9bjDyco0pN8RF7WU/Sb8mtASlL2YsbSPvRRA7BEOD5lxL5qB1n2yT0QLpyH5Z3cDcFavNCChYxYYSdcgxqqdah9WOZSUQO5RuSIbULfu0itKIj4L5WUtcelj2qihApLyXSG25THkSn9AlfePVd12NFh1awtRJFHn9/UU90jL8S8H17scuTFAB3mREPer+BP2iiPqf+fhMy5vA4HREmACxkwqhYK89oev+9pveJj8fF99utK0NZmg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sajYE-0004T2-FM for guix-patches@gnu.org; Sun, 04 Aug 2024 18:18:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72471] [PATCH 15/24] gnu: Remove onnx-for-torch2. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 04 Aug 2024 22:18:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72471 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72471@debbugs.gnu.org Cc: David Elsing Received: via spool by 72471-submit@debbugs.gnu.org id=B72471.172280986316932 (code B ref 72471); Sun, 04 Aug 2024 22:18:06 +0000 Received: (at 72471) by debbugs.gnu.org; 4 Aug 2024 22:17:43 +0000 Received: from localhost ([127.0.0.1]:57505 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sajXq-0004Ok-F1 for submit@debbugs.gnu.org; Sun, 04 Aug 2024 18:17:43 -0400 Received: from mout01.posteo.de ([185.67.36.65]:57321) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sajXb-0004Ka-32 for 72471@debbugs.gnu.org; Sun, 04 Aug 2024 18:17:27 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id DD56B240027 for <72471@debbugs.gnu.org>; Mon, 5 Aug 2024 00:16:59 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1722809819; bh=ktt4JRiWyn7HBDLNuzQ8bdSeRuLRZTTemLSV4oKDasI=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=EKYi+Ap0KnS2aZgHV6I2fKa3mWzStP57jeBYEbiZBM+tQgTdp//RJ3Ni+wg1VqnN5 e4G5VSFGNxwwhvVL3SKcacvm+D1ZXffxAB29BPD93OGyaPIaZtGcOAPKRXJqNlXoHx +VCefZ3aKeneh4SAUtWOcg1P6HCka5gHCG9CrSSD8+durJ2vPARp9iZvk0sIdXTd1Y f06xLfJuBavPy9g08uZtLSYojGPNEBMrwBzsSY9KUwyHANjRwNO/0lXp/30X85fuD5 W0Dfj9UQVieGgC3Zp6bnSJg29rKTjZoTVgrP0YbQ7djE2hAoKUN0aRXgfByyHuwhSC WHN/eRaQ7VJkw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4WcYp3400Xz6tlh; Mon, 5 Aug 2024 00:16:59 +0200 (CEST) From: David Elsing Date: Sun, 4 Aug 2024 22:15:53 +0000 Message-ID: <20240804221635.3805-15-david.elsing@posteo.net> In-Reply-To: <20240804220847.15842-1-david.elsing@posteo.net> References: <20240804220847.15842-1-david.elsing@posteo.net> 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-for-torch2): Delete variable. --- gnu/packages/machine-learning.scm | 29 ----------------------------- 1 file changed, 29 deletions(-) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index b9a128dd1b..b1b11b5410 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -1417,35 +1417,6 @@ (define args operators and standard data types.") (license license:expat))) -(define-public onnx-for-torch2 - (package - (inherit onnx) - (name "onnx") - (version "1.13.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/onnx/onnx") - (commit (string-append "v" version)))) - (sha256 - (base32 - "16967dbq2j40diqd0s37r19llsab8q8vbxkg1ppgy0p9fpdhfhyp")) - (file-name (git-file-name name version)) - (patches (search-patches "onnx-1.13.1-use-system-googletest.patch" - "onnx-shared-libraries.patch")) - (modules '((guix build utils))) - (snippet - '(begin - (delete-file-recursively "third_party") - (substitute* "onnx/backend/test/runner/__init__.py" - (("urlretrieve\\(.*") "raise unittest.SkipTest('Skipping download')\n")))))) - (arguments - ;; reuse build system tweaks - (substitute-keyword-arguments (package-arguments onnx) - ((#:phases phases) - #~(modify-phases #$phases - (delete 'relax-requirements))))))) - (define-public python-onnx ;; This used to be called "python-onnx" because it provided nothing but ;; Python bindings. The package now provides shared libraries and C++ From patchwork Sun Aug 4 22:15:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 66732 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 A9E2C27BBE2; Sun, 4 Aug 2024 23:18:41 +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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, URIBL_BLOCKED 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 1D22527BBE9 for ; Sun, 4 Aug 2024 23:18:39 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sajY6-0007hV-7Y; Sun, 04 Aug 2024 18:17: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 1sajY1-0007di-FK for guix-patches@gnu.org; Sun, 04 Aug 2024 18:17: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 1sajXy-0000tp-IK for guix-patches@gnu.org; Sun, 04 Aug 2024 18:17:52 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=XTydPedTlydxxfYhTu+Ro3lpkbW1H9G/UBZV+NpqXF8=; b=X/hf8qy2oVll/4SsPTPYwtE+j/tAwRLMUFAl9yqNJie1eZYk9AR1FqKSCODfjqsSBhmwhcEZ0bNlaYoLbtmcnExF0dFZa6dJhRchyNbJQJ67chrPwhQQy12kdjtLkZPZuaP476qEkLKSam/SvabioDg10lXgmvXR+Qa4Dy5eCAcmiEXRhzEAcQ/aVEboAUufeawir7rR6JUP+1GvikqFV8MLJL4F0ppm4q+6q58sUQDHPK1LZc31i7dSmFIlWcugUXhbohtj4z5L0OdS7QDdVpuJkwx4XqgQ1564dfoILJGf+cqltpuTcy6ZBZUfzliQMmI20AcwP36TPpGa5S+8mg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sajYK-0004Uc-3i for guix-patches@gnu.org; Sun, 04 Aug 2024 18:18:12 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72471] [PATCH 16/24] gnu: onnx: Update to 1.16.2. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 04 Aug 2024 22:18:12 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72471 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72471@debbugs.gnu.org Cc: David Elsing , Andy Tai Received: via spool by 72471-submit@debbugs.gnu.org id=B72471.172280987517052 (code B ref 72471); Sun, 04 Aug 2024 22:18:12 +0000 Received: (at 72471) by debbugs.gnu.org; 4 Aug 2024 22:17:55 +0000 Received: from localhost ([127.0.0.1]:57527 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sajY2-0004Qr-Cv for submit@debbugs.gnu.org; Sun, 04 Aug 2024 18:17:55 -0400 Received: from mout01.posteo.de ([185.67.36.65]:33521) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sajXf-0004Lh-64 for 72471@debbugs.gnu.org; Sun, 04 Aug 2024 18:17:38 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 9DC24240027 for <72471@debbugs.gnu.org>; Mon, 5 Aug 2024 00:17:00 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1722809820; bh=9O8DWgHXbqoctU66EV0kVh51IJXCUImz/VnfbXIZtZo=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type: Content-Transfer-Encoding:From; b=K/xLx/4PutfWRPgXRw1k02J0QSmkmmvPVSit6nmozSHVdd9/Fa6fOVhkhL1p34Hwq kjjrVc+wFQXpLosMEVrrye59epXH6UguVCNxz02L0sHD5e/uJokxZmBEIf8gNkYUoL 4nJfDrW4r8oxKDp0xhwHCt7ygemG+JSuW9Rp8s5W4z4MSFxsNyHOkGbwYKSE46/F45 MBoRDWyKES4FTuW6aEPOFdgWR397JhfPd9af3M22A+bwgdll7jEauanr+GqDCItDc+ mSh9dRRrXYq02u8OS1bK1TSFc+skbjaxQQgngx/5Ao2EcyV5t2mgLy/ECTiq4MoI/K hBOGDPwZ8BnqQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4WcYp40VL0z6tlh; Mon, 5 Aug 2024 00:17:00 +0200 (CEST) From: David Elsing Date: Sun, 4 Aug 2024 22:15:54 +0000 Message-ID: <20240804221635.3805-16-david.elsing@posteo.net> In-Reply-To: <20240804220847.15842-1-david.elsing@posteo.net> References: <20240804220847.15842-1-david.elsing@posteo.net> 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.16.2. [source]: Remove patch. [build-system]: Move to pyproject-build-system. [arguments]<#:tests?>: Disable for systems where python-nbval is not supported. <#:phases>: Remove 'relax-requirements' phase. Pass "-DONNX_BUILD_TESTS" to CMake depending on tests?. [native-inputs]: Add python-fb-re2 and python-parameterized-next. Remove python-nbval on unsupported systems. * gnu/packages/patches/onnx-shared-libraries.patch: Adjust patch. * gnu/packages/patches/onnx-skip-model-downloads.patch: Adjust patch. * gnu/packages/patches/onnx-use-system-googletest.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Remove it. Co-authored-by: Andy Tai --- gnu/local.mk | 1 - gnu/packages/machine-learning.scm | 139 ++++++++++-------- .../patches/onnx-shared-libraries.patch | 18 ++- .../patches/onnx-skip-model-downloads.patch | 16 +- .../patches/onnx-use-system-googletest.patch | 57 ------- 5 files changed, 97 insertions(+), 134 deletions(-) delete mode 100644 gnu/packages/patches/onnx-use-system-googletest.patch diff --git a/gnu/local.mk b/gnu/local.mk index fd8262de55..61fb2f4816 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1792,7 +1792,6 @@ dist_patch_DATA = \ %D%/packages/patches/onionshare-cli-async-mode.patch \ %D%/packages/patches/online-judge-tools.patch \ %D%/packages/patches/onnx-optimizer-system-library.patch \ - %D%/packages/patches/onnx-use-system-googletest.patch \ %D%/packages/patches/onnx-1.13.1-use-system-googletest.patch \ %D%/packages/patches/onnx-shared-libraries.patch \ %D%/packages/patches/onnx-skip-model-downloads.patch \ diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index b1b11b5410..fff7a8c24a 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -28,6 +28,7 @@ ;;; Copyright © 2024 Timothee Mathieu ;;; Copyright © 2024 Spencer King ;;; Copyright © 2024 David Elsing +;;; Copyright © 2024 Andy Tai ;;; ;;; This file is part of GNU Guix. ;;; @@ -1331,7 +1332,7 @@ (define (delete-ifdefs file) (define-public onnx (package (name "onnx") - (version "1.12.0") + (version "1.16.2") (source (origin (method git-fetch) (uri (git-reference @@ -1339,70 +1340,88 @@ (define-public onnx (commit (string-append "v" version)))) (sha256 (base32 - "1g9f1hviksbn7gi6fnd0dsm7nf0w3yia0mjj33d9mggklrl0db6x")) + "0f5h204ksfz4ir3qq38ckxja1jfhf1vn5xzwrj83vkkbfjq6fv16")) (file-name (git-file-name name version)) - (patches (search-patches "onnx-use-system-googletest.patch" - "onnx-shared-libraries.patch" - "onnx-skip-model-downloads.patch")) + (patches (search-patches + "onnx-shared-libraries.patch" + "onnx-skip-model-downloads.patch")) (modules '((guix build utils))) (snippet '(delete-file-recursively "third_party")))) - (build-system python-build-system) + (build-system pyproject-build-system) (arguments - '(#:phases (modify-phases %standard-phases - (add-after 'unpack 'relax-requirements - (lambda _ - ;; Does this difference really matter? - (substitute* "requirements.txt" - (("3.20.1") "3.20.2")))) - (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" - - "-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")))))) + (list + ;; python-nbval depends transitively on Rust. + #:tests? + (->bool (member (or (%current-target-system) + (%current-system)) + (package-transitive-supported-systems python-nbval))) + #:phases + #~(modify-phases %standard-phases + (add-before 'build 'pass-cmake-arguments + (lambda* (#:key outputs tests? #:allow-other-keys) + ;; For derived package use + (substitute* "CMakeLists.txt" + (("set\\(ONNX_ROOT.*") + (string-append "set(ONNX_ROOT "#$(package-source this-package) ")\n")) + (("\\$\\{ROOT_DIR\\}(/tools.*)" _ rest) + (string-append "${PROJECT_SOURCE_DIR}" rest))) + ;; 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" + (string-append "-DONNX_BUILD_TESTS=" + (if tests? "ON" "OFF")) + "-DBUILD_SHARED_LIBS=ON" + "-DONNX_USE_PROTOBUF_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 - pybind11 - python-coverage - python-nbval - python-pytest - python-pytest-runner)) + (append + (list cmake-minimal + googletest + pybind11 + python-coverage + python-fb-re2 + python-parameterized-next + python-pytest + python-pytest-runner) + (filter + (lambda (pkg) + (member (or (%current-target-system) + (%current-system)) + (package-transitive-supported-systems pkg))) + (list python-nbval)))) (inputs (list protobuf)) (propagated-inputs diff --git a/gnu/packages/patches/onnx-shared-libraries.patch b/gnu/packages/patches/onnx-shared-libraries.patch index 00583b35da..5a3fd658d0 100644 --- a/gnu/packages/patches/onnx-shared-libraries.patch +++ b/gnu/packages/patches/onnx-shared-libraries.patch @@ -1,13 +1,12 @@ -These linker options for the 'onnx_cpp2py_export.cpython-38-*-gnu.so' -(or similar) extension are meant to be used when building 'libonn.a', -a static archive. This patch adapts the link flags to linking with -'libonnx.so'. +These linker options for the 'onnx_cpp2py_export.cpython-310-*-gnu.so' (or +similar) extension are meant to be used when building 'libonn.a', a static +archive. This patch adapts the link flags to linking with 'libonnx.so'. diff --git a/CMakeLists.txt b/CMakeLists.txt -index cede3073..52f846ed 100644 +index b666eec4..1525b219 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -475,11 +475,10 @@ if(BUILD_ONNX_PYTHON) +@@ -585,16 +585,15 @@ if(BUILD_ONNX_PYTHON) PRIVATE $) else() # Assume everything else is like gcc @@ -15,10 +14,15 @@ index cede3073..52f846ed 100644 - PRIVATE "-Wl,--whole-archive" $ - "-Wl,--no-whole-archive") + target_link_libraries(onnx_cpp2py_export PRIVATE onnx) + # Prevent "undefined symbol: _ZNSt10filesystem7__cxx114path14_M_split_cmptsEv" + # (std::filesystem::__cxx11::path::_M_split_cmpts()) on gcc 8 + if (CMAKE_CXX_STANDARD EQUAL 17 AND CMAKE_COMPILER_IS_GNUCC AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9.0) + target_link_libraries(onnx_cpp2py_export PRIVATE "-lstdc++fs") + endif() set_target_properties(onnx_cpp2py_export - PROPERTIES LINK_FLAGS "-Wl,--exclude-libs,ALL") + PROPERTIES LINK_FLAGS -+ "-Wl,-rpath=${CMAKE_INSTALL_PREFIX}/lib") ++ "-Wl,-rpath=${CMAKE_INSTALL_PREFIX}/lib") endif() target_link_libraries(onnx_cpp2py_export PRIVATE onnx) diff --git a/gnu/packages/patches/onnx-skip-model-downloads.patch b/gnu/packages/patches/onnx-skip-model-downloads.patch index 4ab55b4ceb..55925a3ebf 100644 --- a/gnu/packages/patches/onnx-skip-model-downloads.patch +++ b/gnu/packages/patches/onnx-skip-model-downloads.patch @@ -1,16 +1,14 @@ -A few tests require downloading models from URLs such as - . -Skip those. +A few tests require downloading models. Skip those. diff --git a/onnx/backend/test/runner/__init__.py b/onnx/backend/test/runner/__init__.py -index 049ed57b..f236f1bf 100644 +index 5b60e7c0..838c7ba5 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)) +@@ -236,6 +236,7 @@ class Runner: + 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') + print("Done") with tarfile.open(download_file.name) as t: diff --git a/gnu/packages/patches/onnx-use-system-googletest.patch b/gnu/packages/patches/onnx-use-system-googletest.patch deleted file mode 100644 index 5dfcbc6dc3..0000000000 --- a/gnu/packages/patches/onnx-use-system-googletest.patch +++ /dev/null @@ -1,57 +0,0 @@ -ONNX will build googletest from a Git checkout. Patch CMake to use our -googletest package and enable tests by default. - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0aa9fda2..a573170c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -22,7 +22,7 @@ option(BUILD_ONNX_PYTHON "Build Python binaries" OFF) - option(ONNX_GEN_PB_TYPE_STUBS "Generate protobuf python type stubs" ON) - option(ONNX_WERROR "Build with Werror" OFF) - option(ONNX_COVERAGE "Build with coverage instrumentation" OFF) --option(ONNX_BUILD_TESTS "Build ONNX C++ APIs Tests" OFF) -+option(ONNX_BUILD_TESTS "Build ONNX C++ APIs Tests" ON) - option(ONNX_USE_LITE_PROTO "Use lite protobuf instead of full." OFF) - option(ONNXIFI_ENABLE_EXT "Enable onnxifi extensions." OFF) - if(NOT DEFINED ONNX_ML) -@@ -82,8 +82,10 @@ if(CMAKE_SYSTEM_NAME STREQUAL "AIX") - endif() - - if(ONNX_BUILD_TESTS) -- list(APPEND CMAKE_MODULE_PATH ${ONNX_ROOT}/cmake/external) -- include(googletest) -+ find_package(GTest REQUIRED) -+ if(NOT GTest_FOUND) -+ message(FATAL_ERROR "cannot find googletest") -+ endif() - endif() - - 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 ---- a/cmake/unittest.cmake -+++ b/cmake/unittest.cmake -@@ -6,8 +6,8 @@ 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) - list(REMOVE_DUPLICATES _UT_SOURCES) - - add_executable(${_UT_TARGET} ${_UT_SOURCES}) -- add_dependencies(${_UT_TARGET} onnx onnx_proto googletest) -+ add_dependencies(${_UT_TARGET} onnx onnx_proto) - - target_include_directories(${_UT_TARGET} -- PUBLIC ${googletest_INCLUDE_DIRS} -+ PUBLIC ${GTEST_INCLUDE_DIRS} - ${ONNX_INCLUDE_DIRS} - ${PROTOBUF_INCLUDE_DIRS} - ${ONNX_ROOT} From patchwork Sun Aug 4 22:15:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 66739 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 8076E27BBE9; Sun, 4 Aug 2024 23:19:03 +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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, URIBL_BLOCKED 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 5615827BBEB for ; Sun, 4 Aug 2024 23:19:01 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sajY5-0007gm-Ei; Sun, 04 Aug 2024 18:17: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 1sajY1-0007dg-Ex for guix-patches@gnu.org; Sun, 04 Aug 2024 18:17: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 1sajXx-0000ti-Kg for guix-patches@gnu.org; Sun, 04 Aug 2024 18:17:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=m+eMODtXRZG2InATlVA2JSoN0i+nEVRZ1zp1Su2FkgU=; b=FKKRZpq6PREIsLQevu1WlJNHUUuDS2yPvs0aN2zYytSQBuKiIvKfWvgoncE4rRcoiLQkroqAfMwI5rYmmTJRGsUfyX8QRHdkkkA2vSeHlA4EiIH0FEIE75+lpg1ThIJA1HSUF5VemXDhm8Lly7Wa77Gi4gtz6apseeNar6lj7vS46zOnxncln+lrSCyNoSGexy0c+tMNMs49EiFUjPqQeOjnpz1DxEHQevMw1R4MAKjGAVw+JA+GT5mAnuv5v/vk869QyUuPcS0gfVVJA1jH63eQuB6y5rs6lUo7/qgG4a95rrEKgCzxkX/q4i+ZiYrOtbFBvZmc/IY+vmytoTCWLg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sajYJ-0004UL-5H for guix-patches@gnu.org; Sun, 04 Aug 2024 18:18:11 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72471] [PATCH 17/24] gnu: onnx-optimizer: Update to 0.3.19. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 04 Aug 2024 22:18:11 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72471 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72471@debbugs.gnu.org Cc: David Elsing , Andy Tai Received: via spool by 72471-submit@debbugs.gnu.org id=B72471.172280987417037 (code B ref 72471); Sun, 04 Aug 2024 22:18:11 +0000 Received: (at 72471) by debbugs.gnu.org; 4 Aug 2024 22:17:54 +0000 Received: from localhost ([127.0.0.1]:57523 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sajY1-0004Qc-7J for submit@debbugs.gnu.org; Sun, 04 Aug 2024 18:17:53 -0400 Received: from mout01.posteo.de ([185.67.36.65]:33057) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sajXf-0004Li-5k for 72471@debbugs.gnu.org; Sun, 04 Aug 2024 18:17:36 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 2CC84240027 for <72471@debbugs.gnu.org>; Mon, 5 Aug 2024 00:17:01 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1722809821; bh=WLL3PaAPyxeKPsvaL8abFSnuTssAMOCYT0PGof8pp2M=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=MKUlfblDNUb+RWu9OjnnkBgpAUgP0laKDwOPKeU4WqNVmbfeNdoxR7i79sqcPWq5A zU3f/kelz9SKgRJ5bjBrbNhziZHZy11lz13sfig2huSZbseNyHrqRPJ2F3y6956SwB CdnVKiSK0ioz7PihnTSWmKVNKe1rglOZSrQPINMpj6ruYaYj/PqQx7zosSqM6tcl3S LB8U+xoPXJ84gr95P/822JqUoY2d4eFOBpQ/X9XbRJgW+V6it1H8yzvGMVskY5+abI SLsRYYZUXyRprCy6U8aFHe6dElH2LHQmjBLbvXmClmQiwdTvjkEs5rKpdLBOs7W2Un zLxAMgypi/tMw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4WcYp45nMHz6tlh; Mon, 5 Aug 2024 00:17:00 +0200 (CEST) From: David Elsing Date: Sun, 4 Aug 2024 22:15:55 +0000 Message-ID: <20240804221635.3805-17-david.elsing@posteo.net> In-Reply-To: <20240804220847.15842-1-david.elsing@posteo.net> References: <20240804220847.15842-1-david.elsing@posteo.net> 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.19. * gnu/packages/patches/onnx-optimizer-system-library.patch: Adjust patch. Co-authored-by: Andy Tai --- gnu/packages/machine-learning.scm | 47 +++++++++++---- .../onnx-optimizer-system-library.patch | 60 +++++++++---------- 2 files changed, 66 insertions(+), 41 deletions(-) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index fff7a8c24a..eb7315730a 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -1361,8 +1361,7 @@ (define-public onnx (lambda* (#:key outputs tests? #:allow-other-keys) ;; For derived package use (substitute* "CMakeLists.txt" - (("set\\(ONNX_ROOT.*") - (string-append "set(ONNX_ROOT "#$(package-source this-package) ")\n")) + (("set\\(ONNX_ROOT.*") "") (("\\$\\{ROOT_DIR\\}(/tools.*)" _ rest) (string-append "${PROJECT_SOURCE_DIR}" rest))) ;; Pass options to the CMake-based build process. @@ -1382,14 +1381,15 @@ (define args (string-append "-DONNX_BUILD_TESTS=" (if tests? "ON" "OFF")) "-DBUILD_SHARED_LIBS=ON" - "-DONNX_USE_PROTOBUF_SHARED_LIBS=ON")) + "-DONNX_USE_PROTOBUF_SHARED_LIBS=ON" + (string-append + "-DONNX_ROOT=" #$(package-source this-package)))) ;; 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'. + ;; 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 @@ -1445,8 +1445,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.3.x is *more* recent than 1.5.0. + (version "0.3.19") (home-page "https://github.com/onnx/optimizer") (source (origin (method git-fetch) @@ -1455,7 +1455,7 @@ (define-public onnx-optimizer (commit (string-append "v" version)))) (sha256 (base32 - "1wkqqdxcxpfbf8zpbdfdd3zz5jkw775g31gyykj11z4y6pp659l6")) + "1mx3hsl42na6fr05nh2x3j9kxm56cpfmwk6lwl2cfq9zs3gv929w")) (file-name (git-file-name name version)) (patches (search-patches "onnx-optimizer-system-library.patch")) (modules '((guix build utils))) @@ -1466,10 +1466,35 @@ (define-public onnx-optimizer (substitute-keyword-arguments (package-arguments onnx) ((#:phases phases) #~(modify-phases #$phases - (delete 'relax-requirements))))) + (add-after 'pass-cmake-arguments + 'pass-onnx-optimizer-cmake-arguments + (lambda _ + (setenv + "CMAKE_ARGS" + (string-append + (getenv "CMAKE_ARGS") + " -DONNX_OPT_USE_SYSTEM_PROTOBUF=ON" + " -DCMAKE_CXX_FLAGS=\"-DONNX_ML=1 -DONNX_NAMESPACE=onnx\"")))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (if tests? + (invoke "pytest" "-vv" "-k" + ;; These tests fail with upstream ONNX: + ;; https://github.com/onnx/optimizer/issues/138 + (string-append + "not test_fuse_matmul" + " and not test_fuse_consecutive" + " and not test_fuse_transpose"))))))))) (native-inputs - (list cmake python-pytest python-pytest-runner python-nbval - python-coverage)) + (append + (list cmake-minimal python-pytest python-pytest-runner + python-coverage) + (filter + (lambda (pkg) + (member (or (%current-target-system) + (%current-system)) + (package-transitive-supported-systems pkg))) + (list python-nbval)))) (inputs (list onnx protobuf pybind11)) (propagated-inputs diff --git a/gnu/packages/patches/onnx-optimizer-system-library.patch b/gnu/packages/patches/onnx-optimizer-system-library.patch index 5c592597e0..513623fe05 100644 --- a/gnu/packages/patches/onnx-optimizer-system-library.patch +++ b/gnu/packages/patches/onnx-optimizer-system-library.patch @@ -1,53 +1,53 @@ -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. +Arrange so that onnx-optimizer uses our own ONNX build, and links against the +shared libraries of ONNX. diff --git a/CMakeLists.txt b/CMakeLists.txt -index c2e48b35..8af51076 100644 +index 00633856..76a73853 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -9,8 +9,6 @@ endif(NOT MSVC) +@@ -27,8 +27,6 @@ if(NOT ONNX_OPT_USE_SYSTEM_PROTOBUF) + endif() - set(CMAKE_POSITION_INDEPENDENT_CODE ON) -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,14 @@ 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) - PRIVATE $) - else() - # Assume everything else is like gcc -- target_link_libraries(onnx_opt_cpp2py_export -- PRIVATE "-Wl,--whole-archive" $ -- "-Wl,--no-whole-archive") -+ target_link_libraries(onnx_opt_cpp2py_export PRIVATE onnx_optimizer) ++target_link_libraries(onnx_optimizer_exec onnx_optimizer onnx_proto) + + + file(GLOB onnx_opt_c_api_srcs "onnxoptimizer/c_api/*.cc" +@@ -116,7 +114,8 @@ if(BUILD_ONNX_PYTHON) + PRIVATE "-Wl,--whole-archive" $ + "-Wl,--no-whole-archive") set_target_properties(onnx_opt_cpp2py_export - PROPERTIES LINK_FLAGS "-Wl,--exclude-libs,ALL") -+ PROPERTIES LINK_FLAGS -+ "-Wl,-rpath=${CMAKE_INSTALL_PREFIX}/lib") ++ PROPERTIES LINK_FLAGS "-Wl,--exclude-libs,ALL,-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) From patchwork Sun Aug 4 22:15:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 66728 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 C2D6B27BBE2; Sun, 4 Aug 2024 23:18:34 +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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, URIBL_BLOCKED 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 BCC6D27BBE2 for ; Sun, 4 Aug 2024 23:18:33 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sajY0-0007dS-FA; Sun, 04 Aug 2024 18:17:52 -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 1sajXx-0007bK-Ku for guix-patches@gnu.org; Sun, 04 Aug 2024 18:17:49 -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 1sajXx-0000tN-4H for guix-patches@gnu.org; Sun, 04 Aug 2024 18:17:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=xRlsLi2wkB217RunQ+NIC6v0H2d3EtOQkhsA8pyLjik=; b=rf0V4tsd4RbJDEpM2+IexJyfsoc9U46LlSC2yjaa/gmfwDZqwWHWwZRGl4/BcT3IqlxPNucq5ynfMziLgqytT+pGi0FO5Jfv574dNnJW/qTseCJl1w0JtAL5EBgFYpLHGuibmDknL/m0DT/W7arETK0R15MEuV9y8GX8/AU7+6gErX3CAZttge0GhjtCHSjEWPN3TelGWvZC7raYtBsgPDg+pPhd86U/kMsXX/zzuxgn8vIAcCj6vb/8gNAVMWgto4o7K+nhiJ6nttGF46S4CNbVWXUvQgskitM/H+UChLJ349fZ0tcpX6NSOA/CZiItpbV3Qef/JIVfGDlDuKjTGQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sajYI-0004UB-LG for guix-patches@gnu.org; Sun, 04 Aug 2024 18:18:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72471] [PATCH 18/24] gnu: gloo: Update to commit 81925d1. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 04 Aug 2024 22:18:10 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72471 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72471@debbugs.gnu.org Cc: David Elsing Received: via spool by 72471-submit@debbugs.gnu.org id=B72471.172280987317029 (code B ref 72471); Sun, 04 Aug 2024 22:18:10 +0000 Received: (at 72471) by debbugs.gnu.org; 4 Aug 2024 22:17:53 +0000 Received: from localhost ([127.0.0.1]:57521 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sajY0-0004QS-KG for submit@debbugs.gnu.org; Sun, 04 Aug 2024 18:17:53 -0400 Received: from mout01.posteo.de ([185.67.36.65]:42501) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sajXf-0004Lq-Ll for 72471@debbugs.gnu.org; Sun, 04 Aug 2024 18:17:35 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id B080F240027 for <72471@debbugs.gnu.org>; Mon, 5 Aug 2024 00:17:01 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1722809821; bh=4JOeI7RPVaUmIutWt0VBpuMe/0FTgnHSdsU/XjpX3XE=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=WFx1hD0yXE3+8wxM4qhQ0u/OkPiSicT9vlW/NdUZyYOFVNuX+872tar53DKvt0on/ jYjdl+ccstuqjB1tnMz33GhC4VbpgihtjrJVuESiilWAE5PcYStoK1ZKyGWYUr1te2 Rv8PCq3+5h68B2RSti29/BiWZy03/hx2bpYCUSF0fBcAf5rhbJlE1nFh5u1dutiusI nutb3ptQTUxYplBqB76kMlT0Oxvw6EpisvjPcmoNj0Rn+6QNVKQkUhdENONv2YxW+I GAVTMlHvs9MYLfisP5IsNCxqfi/mHfKLLGH96CIMFrVIYdRfvYK/79tAGAtTZVcU9w RoV1AwjDq70Lw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4WcYp52Zs9z6tlh; Mon, 5 Aug 2024 00:17:01 +0200 (CEST) From: David Elsing Date: Sun, 4 Aug 2024 22:15:56 +0000 Message-ID: <20240804221635.3805-18-david.elsing@posteo.net> In-Reply-To: <20240804220847.15842-1-david.elsing@posteo.net> References: <20240804220847.15842-1-david.elsing@posteo.net> 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 (gloo): Update to commit 81925d1. [arguments]: Add -DCMAKE_CXX_STANDARD=17 to #:configure-flags. [supported-systems]: New field. --- gnu/packages/machine-learning.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index eb7315730a..b66071effc 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -3888,8 +3888,8 @@ (define-public python-keras (define-public gloo (let ((version "0.0.0") ; no proper version tag - (commit "c22a5cfba94edf8ea4f53a174d38aa0c629d070f") - (revision "1")) + (commit "81925d1c674c34f0dc34dd9a0f2151c1b6f701eb") + (revision "2")) (package (name "gloo") (version (git-version version revision commit)) @@ -3902,7 +3902,7 @@ (define-public gloo (file-name (git-file-name name version)) (sha256 (base32 - "1crmqgybzkgkpbmcx16912gsl5qsj49swa0ikx6mhqgph0chrh11")))) + "16zs8ndbiv9nppn8bv6lfanzyyssz7g5pawxiqcnafwq3nvxpj9m")))) (build-system cmake-build-system) (native-inputs (list googletest)) @@ -3914,6 +3914,7 @@ (define-public gloo (arguments (list #:configure-flags #~'("-DBUILD_SHARED_LIBS=ON" "-DBUILD_TEST=1" + "-DCMAKE_CXX_STANDARD=17" #$@(if (this-package-input "rdma-core") #~("-DUSE_IBVERBS=ON") #~())) @@ -3929,6 +3930,7 @@ (define-public gloo number of collective algorithms useful for machine learning applications. These include a barrier, broadcast, and allreduce.") (home-page "https://github.com/facebookincubator/gloo") + (supported-systems %64bit-supported-systems) (license license:bsd-3)))) (define-public python-tensorly From patchwork Sun Aug 4 22:15:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 66726 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 5328027BBE2; Sun, 4 Aug 2024 23:18:31 +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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, URIBL_BLOCKED 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 77E2127BBE9 for ; Sun, 4 Aug 2024 23:18:30 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sajY0-0007dU-Fj; Sun, 04 Aug 2024 18:17:52 -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 1sajXx-0007bH-Jk for guix-patches@gnu.org; Sun, 04 Aug 2024 18:17:49 -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 1sajXv-0000tC-Nv for guix-patches@gnu.org; Sun, 04 Aug 2024 18:17:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=Kg95tXuigpqvKYUmZUO3QUiixGGhsujGyg/sLaX3AZI=; b=aLIdeBB6CxwchNtmMOIIE+v9OK+emySV1FbyQnXnxvO82L1TOg2YRwq2uZGY1YGGzolrTKihfHXHcdx9SFHM1B/AaTtHkh3x/xbK+Nww3F5Btv9DsaCAR0XcbdaelBSfMYGejy38MJEm64PfLKj7wiKH/Gz+N1YEExyztSAgKvz9QlUEauSfzp+x+boK1TQQ/1trsn6gcbjpyAyMpYjEcreg49lFGlJQd1A//PA8TeEhbcKh7EmrN1oMFRFB4q2bAF5ufx41xZ8r6xnlzd1gqMAoDNkXpFbkXC2CY4ITQ/AV2yOwbeWvwt89IQxn4R1K/GcU2Ix7+DToXR9mD2ADbQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sajYH-0004Tn-8A for guix-patches@gnu.org; Sun, 04 Aug 2024 18:18:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72471] [PATCH 19/24] gnu: cpp-httplib: Update to 0.16.0. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 04 Aug 2024 22:18:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72471 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72471@debbugs.gnu.org Cc: David Elsing Received: via spool by 72471-submit@debbugs.gnu.org id=B72471.172280987116999 (code B ref 72471); Sun, 04 Aug 2024 22:18:09 +0000 Received: (at 72471) by debbugs.gnu.org; 4 Aug 2024 22:17:51 +0000 Received: from localhost ([127.0.0.1]:57515 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sajXy-0004Q1-S7 for submit@debbugs.gnu.org; Sun, 04 Aug 2024 18:17:51 -0400 Received: from mout02.posteo.de ([185.67.36.66]:48223) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sajXd-0004LI-DS for 72471@debbugs.gnu.org; Sun, 04 Aug 2024 18:17:30 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 3B2AB240101 for <72471@debbugs.gnu.org>; Mon, 5 Aug 2024 00:17:02 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1722809822; bh=r4tCgGfwkL4dh0tS4btHi98cKTC5GqybgrB/eZmb86Q=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=LTsb9fgiEf2wMOEAyqvAxT1RkVVYB6Z3/vVFXniHkBRX3RXA2C5p0bIq5T+y2eo85 Snen4uY+fbdRvydi8HVKhKxrVIbbZC6Y0Lk42JUX6DqI8gSdHfaLxUCHHREIu6NTAB B/G0TaGGDZ1lS4UPOt64XAA4KKETKz/e4IZ/0L+3l6AgUWlcksXxU0KFOhzA2NkQSz JiQsLU5Kv50s2O94DphPnZcgb1s/3JFEC+IO2pD5aAKwZ1a6Zp0gNN0mZnPIz6fmFC Gk4/rkWdcXc8d0acXr1tHIAgq3Fnm9eWj0VzIINLP9k8GudFhOmiJMKRyPY8xxy39Y C6sUFZKy5SdQg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4WcYp56PpFz6tlh; Mon, 5 Aug 2024 00:17:01 +0200 (CEST) From: David Elsing Date: Sun, 4 Aug 2024 22:15:57 +0000 Message-ID: <20240804221635.3805-19-david.elsing@posteo.net> In-Reply-To: <20240804220847.15842-1-david.elsing@posteo.net> References: <20240804220847.15842-1-david.elsing@posteo.net> 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/cpp.scm (cpp-httplib): Update to 0.16.0. --- gnu/packages/cpp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 6b46465abf..2c80bd8ba5 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -1086,7 +1086,7 @@ (define-public cpp-httplib ;; header (package (name "cpp-httplib") - (version "0.12.5") + (version "0.16.0") (source (origin (method git-fetch) @@ -1094,7 +1094,7 @@ (define-public cpp-httplib (url "https://github.com/yhirose/cpp-httplib") (commit (string-append "v" version)))) (sha256 - (base32 "1m1p6h1dsxg4kg5zziffb6xl8zgjbkw7gmgmmlnrhpl3bswam87n")) + (base32 "0n4ribq7c6lqj0hn50pdvy7wml62fqbgrgysb038fq1qc6xyw3np")) (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments From patchwork Sun Aug 4 22:15:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 66731 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 1837C27BBE2; Sun, 4 Aug 2024 23:18:41 +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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, URIBL_BLOCKED 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 8428027BBEA for ; Sun, 4 Aug 2024 23:18:34 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sajY5-0007gt-Nb; Sun, 04 Aug 2024 18:17: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 1sajY1-0007dk-FR for guix-patches@gnu.org; Sun, 04 Aug 2024 18:17: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 1sajXz-0000u0-MV for guix-patches@gnu.org; Sun, 04 Aug 2024 18:17:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=Ucc3R75wzB9K7siWon8u+2TaSacWufahrHyP9VUUYl0=; b=LWkaeum7hWUXTqUIHQpWEeG8wNCwoVFilSJH3XFE2BuUhSIgReQjnOpiH2K3GFZgBSZQ5XQGtuVIY4hqDtk7UTj67BH3McGHawzKuNTGkt3O43XpFh6/GL2mmJCPaeiqlitZ/Hv6OIAdHD3D+C0/qhC0sVZTX+SnlBZZ6c5bG2K5bwpNQIr6mz6V1rokiy+Z6dXsqNv7AwSClcH5ctTlDmKBpudlTyiVqG8UU2MuAYoC8muviySScuzB1Ej1LZnuQ8EJ/pKjZ1NjrjOZ2mCT/K2d9MMkQ6pnZz7V3mLO+PtSLd385Jiedx83NaSDlvqizk7g5l8U+rUDeX8oDsXZ4A==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sajYL-0004Uw-6g for guix-patches@gnu.org; Sun, 04 Aug 2024 18:18:13 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72471] [PATCH 20/24] gnu: python-pytorch: Update to 2.4.0. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 04 Aug 2024 22:18:13 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72471 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72471@debbugs.gnu.org Cc: David Elsing Received: via spool by 72471-submit@debbugs.gnu.org id=B72471.172280987817073 (code B ref 72471); Sun, 04 Aug 2024 22:18:13 +0000 Received: (at 72471) by debbugs.gnu.org; 4 Aug 2024 22:17:58 +0000 Received: from localhost ([127.0.0.1]:57531 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sajY4-0004RB-Me for submit@debbugs.gnu.org; Sun, 04 Aug 2024 18:17:58 -0400 Received: from mout01.posteo.de ([185.67.36.65]:47789) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sajXf-0004Lr-Lk for 72471@debbugs.gnu.org; Sun, 04 Aug 2024 18:17:42 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id C1279240027 for <72471@debbugs.gnu.org>; Mon, 5 Aug 2024 00:17:02 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1722809822; bh=Wjbm8GYCWn3lav6zBPjTwj40JFT6E0CbnWf9BN5QGsg=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=auQSigOzb6i5t3nI9TwQ8ThlvHNYSE+ZHYbqdAnMTfz7ZyKQXuUYyWdKDnZieF+I5 ZvMCLq+rS927de2o5hbP//0EuYd/f1EyCAMMT9mQ5OatxYIdzImPh/pwpRmFbejuXQ 6hvgiWnJ82iqPNChWstYYzVmk++sCb8gHg1q2t5o+V25xHIQAZ2lzvYP/QOxYo3DHB COxTvqU3iGMJB0k2NwkvAlMrt0VI9pg4e9RIwheIfSMW2ni0dMMKjZ4hfs0GeMJM3K 1ZYZp3J+L6wWpnYJ5IpHvwnmyHQXVZOptKXOJJGQhM4+47EkfQgVqkEiTe/l0hCi+3 1wYZ9E1jq+5CA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4WcYp62yNnz6twJ; Mon, 5 Aug 2024 00:17:02 +0200 (CEST) From: David Elsing Date: Sun, 4 Aug 2024 22:15:58 +0000 Message-ID: <20240804221635.3805-20-david.elsing@posteo.net> In-Reply-To: <20240804220847.15842-1-david.elsing@posteo.net> References: <20240804220847.15842-1-david.elsing@posteo.net> 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 This also updates the qnnpack-pytorch package. * gnu/packages/machine-learning.scm (%python-pytorch-version): Set to 2.4.0. (%python-pytorch-src): Adjust hash accordingly. [source]: Remove obsolete file deletions in snippet. (python-pytorch)[arguments]<#:phases>: Disable telemetry and set Python install directory. Remove obsolete USE_FFMPEG, USE_OPENCV and USE_PYTORCH_QNNPACK environment variables. [native-inputs]: Remove python-typing-extensions. [inputs]: Add brotli, cpp-httplib and zlib. Remove qnnpack. Use oneapi-dnnl, qnnpack-pytorch and xnnpack for all systems. [propagated-inputs]: Add onnx and python-typing-extensions. Use cpuinfo for all systems. [supported-systems]: New field. (python-pytorch-for-r-torch)[inputs]: Add qnnpack. * gnu/packages/patches/python-pytorch-fix-codegen.patch: Adjust patch. * gnu/packages/patches/python-pytorch-runpath.patch: Adjust patch. * gnu/packages/patches/python-pytorch-system-libraries.patch: Adjust patch. * gnu/packages/patches/python-pytorch-without-kineto.patch: Adjust patch. --- gnu/packages/machine-learning.scm | 76 +++++------ .../patches/python-pytorch-fix-codegen.patch | 26 ++-- .../patches/python-pytorch-runpath.patch | 19 +-- .../python-pytorch-system-libraries.patch | 122 +++++++++--------- .../python-pytorch-without-kineto.patch | 10 +- 5 files changed, 119 insertions(+), 134 deletions(-) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index b66071effc..822881f15a 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -4466,7 +4466,7 @@ (define-public ideep-pytorch-for-r-torch (base32 "0hdpkhcjry22fjx2zg2r48v7f4ljrclzj0li2pgk76kvyblfbyvm")))))) -(define %python-pytorch-version "2.2.1") +(define %python-pytorch-version "2.4.0") (define %python-pytorch-src (origin @@ -4477,7 +4477,7 @@ (define %python-pytorch-src (file-name (git-file-name "python-pytorch" %python-pytorch-version)) (sha256 (base32 - "03mm0pwwb5lxdsmmiw3cch9fijgjw81kmmc4ln9rlyazkm7l1r48")) + "18hdhzr12brj0b7ppyiscax0dbra30207qx0cckw78midfkcn7cn")) (patches (search-patches "python-pytorch-system-libraries.patch" "python-pytorch-runpath.patch" "python-pytorch-without-kineto.patch" @@ -4505,14 +4505,6 @@ (define %python-pytorch-src delete-file '("aten/src/ATen/nnapi/nnapi_wrapper.cpp" "aten/src/ATen/nnapi/nnapi_wrapper.h" - "caffe2/mobile/contrib/ios/mpscnn/mpscnn_kernels.h" - "caffe2/proto/caffe2_legacy_pb2.pyi" - "caffe2/proto/caffe2_pb2.pyi" - "caffe2/proto/hsm_pb2.pyi" - "caffe2/proto/metanet_pb2.pyi" - "caffe2/proto/predictor_consts_pb2.pyi" - "caffe2/proto/prof_dag_pb2.pyi" - "caffe2/proto/torch_pb2.pyi" ;; These files contain just lists of floating point values and ;; might be as well hand-written. ;; "test/cpp/api/init_baseline.h" @@ -4619,7 +4611,18 @@ (define-public python-pytorch #$(this-package-native-input "pocketfft-cpp") "/include")) (("#FP16_INCLUDE_DIR") (string-append - #$(this-package-input "fp16") "/include"))))) + #$(this-package-input "fp16") "/include")) + ;; Disable opentelemetry + ((".*(add_library|target_include_directories).*opentelemetry.*") + "")) + (substitute* "torch/CMakeLists.txt" + ((".*opentelemetry.*") "")) + ;; Fix Python install directory + (substitute* "caffe2/CMakeLists.txt" + (("\\$\\{Python_SITELIB\\}") + (string-append #$output "/lib/python" + #$(version-major+minor (package-version python)) + "/site-packages"))))) (add-before 'build 'use-system-libraries (lambda _ (substitute* '("caffe2/serialize/crc.cc" @@ -4641,9 +4644,7 @@ (define-public python-pytorch name)) '("compat_bindings.cpp" "timer_callgrind_template.cpp"))) (("") "")) - (setenv "USE_FFMPEG" "1") (setenv "USE_VULKAN" "1") - (setenv "USE_OPENCV" "1") ;; Tell 'setup.py' to let 'CMakeLists.txt' know that we ;; want to use "system libraries" instead of the bundled ;; ones. @@ -4659,8 +4660,7 @@ (define-public python-pytorch (or (%current-target-system) (%current-system)) (package-transitive-supported-systems qnnpack))) - (setenv "USE_QNNPACK" "0") - (setenv "USE_PYTORCH_QNNPACK" "0")))) + (setenv "USE_QNNPACK" "0")))) ;; PyTorch is still built with AVX2 and AVX-512 support selected at ;; runtime, but these dependencies require it (nnpack only for ;; x86_64). @@ -4773,15 +4773,15 @@ (define-public python-pytorch python-pytest-xdist python-hypothesis python-types-dataclasses - python-typing-extensions shaderc valgrind)) (inputs (append (list asmjit + brotli ; for cpp-httplib clog + cpp-httplib eigen - ffmpeg flatbuffers-next fmt foxi @@ -4793,38 +4793,33 @@ (define-public python-pytorch googlebenchmark libuv miniz-for-pytorch + oneapi-dnnl openblas - opencv openmpi + openssl ; for cpp-httplib pthreadpool protobuf pybind11 + ;; qnnpack + qnnpack-pytorch sleef tensorpipe vulkan-headers vulkan-loader vulkan-memory-allocator + xnnpack + zlib ; for cpp-httplib zstd) - ;; TODO: fix build on 32 bit systems once Rust is available. - (filter - (lambda (pkg) - (member (or (%current-target-system) - (%current-system)) - (package-transitive-supported-systems pkg))) - (list oneapi-dnnl - qnnpack - qnnpack-pytorch - xnnpack)) ;; nnpack requires AVX2 for x86_64-linux - (filter - (lambda (pkg) - (member (or (%current-target-system) - (%current-system)) - '("armhf-linux" "aarch64-linux"))) - (list nnpack)))) + (if (equal? (or (%current-target-system) + (%current-system)) + '("aarch64-linux")) + (list nnpack) + '()))) (propagated-inputs (append - (list onnx ;propagated for its Python modules + (list cpuinfo + onnx ;propagated for its Python modules onnx-optimizer python-astunparse python-click @@ -4841,15 +4836,11 @@ (define-public python-pytorch python-pyyaml python-requests python-sympy - python-typing-extensions) - (filter - (lambda (pkg) - (member (or (%current-target-system) - (%current-system)) - (package-transitive-supported-systems pkg))) - (list cpuinfo)))) + python-typing-extensions))) (home-page "https://pytorch.org/") (synopsis "Python library for tensor computation and deep neural networks") + ;; TODO: Support other 64-bit systems. + (supported-systems '("x86_64-linux" "aarch64-linux")) (description "PyTorch is a Python package that provides two high-level features: @@ -4927,6 +4918,7 @@ (define-public python-pytorch-for-r-torch (replace "ideep-pytorch" ideep-pytorch-for-r-torch))) (inputs (modify-inputs (package-inputs python-pytorch) + (prepend qnnpack) (replace "qnnpack-pytorch" qnnpack-pytorch-for-r-torch) (replace "oneapi-dnnl" oneapi-dnnl-for-r-torch) (replace "xnnpack" xnnpack-for-r-torch))) diff --git a/gnu/packages/patches/python-pytorch-fix-codegen.patch b/gnu/packages/patches/python-pytorch-fix-codegen.patch index cb246b25de..b30094de09 100644 --- a/gnu/packages/patches/python-pytorch-fix-codegen.patch +++ b/gnu/packages/patches/python-pytorch-fix-codegen.patch @@ -6,7 +6,7 @@ is later corrected. codegen_external.py is patched to avoid duplicate functions and add the static keyword as in the existing generated file. diff --git a/tools/gen_flatbuffers.sh b/tools/gen_flatbuffers.sh -index cc0263dbbf..ac34e84b82 100644 +index cc0263d..ac34e84 100644 --- a/tools/gen_flatbuffers.sh +++ b/tools/gen_flatbuffers.sh @@ -1,13 +1,13 @@ @@ -32,10 +32,10 @@ index cc0263dbbf..ac34e84b82 100644 -c "$ROOT/torch/csrc/jit/serialization/mobile_bytecode.fbs" echo '// @generated' >> "$ROOT/torch/csrc/jit/serialization/mobile_bytecode_generated.h" diff --git a/torch/csrc/jit/tensorexpr/codegen_external.py b/torch/csrc/jit/tensorexpr/codegen_external.py -index bc69b05162..0f8df81de3 100644 +index 5dcf1b2..0e20b0c 100644 --- a/torch/csrc/jit/tensorexpr/codegen_external.py +++ b/torch/csrc/jit/tensorexpr/codegen_external.py -@@ -20,9 +20,14 @@ def gen_external(native_functions_path, tags_path, external_path): +@@ -21,9 +21,14 @@ def gen_external(native_functions_path, tags_path, external_path): native_functions = parse_native_yaml(native_functions_path, tags_path) func_decls = [] func_registrations = [] @@ -51,7 +51,7 @@ index bc69b05162..0f8df81de3 100644 args = schema.arguments # Only supports extern calls for functions with out variants if not schema.is_out_fn(): -@@ -62,7 +67,7 @@ def gen_external(native_functions_path, tags_path, external_path): +@@ -63,7 +68,7 @@ def gen_external(native_functions_path, tags_path, external_path): # print(tensor_decls, name, arg_names) func_decl = f"""\ @@ -61,7 +61,7 @@ index bc69b05162..0f8df81de3 100644 void** buf_data, int64_t* buf_ranks, diff --git a/torchgen/decompositions/gen_jit_decompositions.py b/torchgen/decompositions/gen_jit_decompositions.py -index 7cfbb803f9..2e69bb1868 100644 +index 7a0024f..6b2445f 100644 --- a/torchgen/decompositions/gen_jit_decompositions.py +++ b/torchgen/decompositions/gen_jit_decompositions.py @@ -1,8 +1,12 @@ @@ -88,12 +88,12 @@ index 7cfbb803f9..2e69bb1868 100644 write_decomposition_util_file(str(upgrader_path)) diff --git a/torchgen/operator_versions/gen_mobile_upgraders.py b/torchgen/operator_versions/gen_mobile_upgraders.py -index dab1568580..55c58715fc 100644 +index 2907076..6866332 100644 --- a/torchgen/operator_versions/gen_mobile_upgraders.py +++ b/torchgen/operator_versions/gen_mobile_upgraders.py -@@ -2,10 +2,12 @@ - import os +@@ -3,10 +3,12 @@ import os from enum import Enum + from operator import itemgetter from pathlib import Path +import sys from typing import Any, Dict, List @@ -106,7 +106,7 @@ index dab1568580..55c58715fc 100644 from torchgen.code_template import CodeTemplate from torchgen.operator_versions.gen_mobile_upgraders_constant import ( -@@ -262,7 +264,10 @@ def construct_register_size(register_size_from_yaml: int) -> str: +@@ -263,7 +265,10 @@ def construct_register_size(register_size_from_yaml: int) -> str: def construct_version_maps( upgrader_bytecode_function_to_index_map: Dict[str, Any] ) -> str: @@ -115,10 +115,10 @@ index dab1568580..55c58715fc 100644 + version_map = torch._C._get_operator_version_map() + else: + version_map = {} - sorted_version_map_ = sorted(version_map.items(), key=lambda item: item[0]) # type: ignore[no-any-return] + sorted_version_map_ = sorted(version_map.items(), key=itemgetter(0)) # type: ignore[no-any-return] sorted_version_map = dict(sorted_version_map_) -@@ -378,7 +383,10 @@ def sort_upgrader(upgrader_list: List[Dict[str, Any]]) -> List[Dict[str, Any]]: +@@ -379,7 +384,10 @@ def sort_upgrader(upgrader_list: List[Dict[str, Any]]) -> List[Dict[str, Any]]: def main() -> None: @@ -131,12 +131,12 @@ index dab1568580..55c58715fc 100644 for up in sorted_upgrader_list: print("after sort upgrader : ", next(iter(up))) diff --git a/torchgen/shape_functions/gen_jit_shape_functions.py b/torchgen/shape_functions/gen_jit_shape_functions.py -index c6336a6951..34e394d818 100644 +index bdfd5c7..72b237a 100644 --- a/torchgen/shape_functions/gen_jit_shape_functions.py +++ b/torchgen/shape_functions/gen_jit_shape_functions.py @@ -18,16 +18,20 @@ you are in the root directory of the Pytorch git repo""" if not file_path.exists(): - raise Exception(err_msg) + raise Exception(err_msg) # noqa: TRY002 -spec = importlib.util.spec_from_file_location(module_name, file_path) -assert spec is not None diff --git a/gnu/packages/patches/python-pytorch-runpath.patch b/gnu/packages/patches/python-pytorch-runpath.patch index 2c1724cdb0..811de9e288 100644 --- a/gnu/packages/patches/python-pytorch-runpath.patch +++ b/gnu/packages/patches/python-pytorch-runpath.patch @@ -2,21 +2,8 @@ Libraries (such as 'libtorch_cpu.so') and executables (such as 'torch_shm_manage get installed, quite surprisingly, to 'lib/python3.8/site-packages/{bin,lib}'. Make sure RUNPATH matches that. -diff --git a/caffe2/CMakeLists.txt b/caffe2/CMakeLists.txt -index 74836372..c8eb69d1 100644 ---- a/caffe2/CMakeLists.txt -+++ b/caffe2/CMakeLists.txt -@@ -1910,7 +1910,7 @@ if(BUILD_PYTHON) - if(${BUILDING_WITH_TORCH_LIBS}) - # site-packages/caffe2/python/caffe2_pybind11_state - # site-packages/torch/lib -- set(caffe2_pybind11_rpath "${_rpath_portable_origin}/../../torch/lib") -+ set(caffe2_pybind11_rpath $ORIGIN/../../torch/lib) - endif(${BUILDING_WITH_TORCH_LIBS}) - - # Must also include `CMAKE_SHARED_LINKER_FLAGS` in linker flags for diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake -index acc95842..8f8fb7d7 100644 +index f1f2eb7..cb5caea 100644 --- a/cmake/Dependencies.cmake +++ b/cmake/Dependencies.cmake @@ -4,7 +4,7 @@ if(APPLE) @@ -29,10 +16,10 @@ index acc95842..8f8fb7d7 100644 # Use separate rpaths during build and install phases set(CMAKE_SKIP_BUILD_RPATH FALSE) diff --git a/functorch/CMakeLists.txt b/functorch/CMakeLists.txt -index f2f32745..db21b656 100644 +index bdfa4bf..2a75e38 100644 --- a/functorch/CMakeLists.txt +++ b/functorch/CMakeLists.txt -@@ -21,7 +21,7 @@ target_link_libraries(${PROJECT_NAME} PRIVATE pybind::pybind11) +@@ -26,7 +26,7 @@ target_link_libraries(${PROJECT_NAME} PRIVATE pybind::pybind11) set_target_properties(${PROJECT_NAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/functorch) diff --git a/gnu/packages/patches/python-pytorch-system-libraries.patch b/gnu/packages/patches/python-pytorch-system-libraries.patch index 99f999f32f..025b3241a1 100644 --- a/gnu/packages/patches/python-pytorch-system-libraries.patch +++ b/gnu/packages/patches/python-pytorch-system-libraries.patch @@ -1,16 +1,14 @@ Patch build files to also system libraries instead of bundled ones for the libraries not supported or working only by specifying USE_SYSTEM_LIBS. This includes using the clog, cpuinfo, fbgemm, foxi, fp16, fxdiv, googletest, -ideep, miniz, nnpack, oneapi-dnnl, pocketfft, pthreadpool, qnnpack, +httlib, ideep, miniz, nnpack, oneapi-dnnl, pocketfft, pthreadpool, qnnpack-pytorch, tensorpipe, valgrind and xnnpack packages. -For QNNPACK, two versions were bundled and are required: The upstream one and -an internal fork (now in the package qnnpack-pytorch). diff --git a/aten/src/ATen/CMakeLists.txt b/aten/src/ATen/CMakeLists.txt -index 2c2b967..5ac5fa6 100644 +index 0087dd9..0235fa1 100644 --- a/aten/src/ATen/CMakeLists.txt +++ b/aten/src/ATen/CMakeLists.txt -@@ -371,9 +371,9 @@ if(AT_NNPACK_ENABLED) +@@ -419,9 +419,9 @@ if(AT_NNPACK_ENABLED) list(APPEND ATen_CPU_DEPENDENCY_LIBS nnpack) # cpuinfo is added below endif() @@ -24,10 +22,10 @@ index 2c2b967..5ac5fa6 100644 if(NOT CMAKE_SYSTEM_PROCESSOR MATCHES "^(s390x|ppc64le)$") list(APPEND ATen_CPU_DEPENDENCY_LIBS cpuinfo) diff --git a/caffe2/CMakeLists.txt b/caffe2/CMakeLists.txt -index 7483637..093de40 100644 +index 89c31fa..e6d9ef1 100644 --- a/caffe2/CMakeLists.txt +++ b/caffe2/CMakeLists.txt -@@ -111,9 +111,6 @@ if(NOT MSVC AND USE_XNNPACK) +@@ -91,9 +91,6 @@ if(NOT MSVC AND USE_XNNPACK) if(NOT TARGET fxdiv) set(FXDIV_BUILD_TESTS OFF CACHE BOOL "") set(FXDIV_BUILD_BENCHMARKS OFF CACHE BOOL "") @@ -37,7 +35,7 @@ index 7483637..093de40 100644 endif() endif() -@@ -1055,7 +1052,6 @@ elseif(USE_CUDA) +@@ -1075,7 +1072,6 @@ if(USE_XPU) endif() if(NOT MSVC AND USE_XNNPACK) @@ -45,7 +43,17 @@ index 7483637..093de40 100644 endif() # ========================================================== -@@ -1396,6 +1392,7 @@ target_link_libraries(torch_cpu PUBLIC c10) +@@ -1189,6 +1185,9 @@ endif() + target_include_directories(torch_cpu PRIVATE + ${TORCH_ROOT}/third_party/cpp-httplib) + ++find_package(httplib REQUIRED) ++target_link_libraries(torch_cpu PUBLIC httplib::httplib) ++ + install(DIRECTORY "${TORCH_SRC_DIR}/csrc" + DESTINATION ${TORCH_INSTALL_INCLUDE_DIR}/torch + FILES_MATCHING PATTERN "*.h" PATTERN "*.hpp") +@@ -1417,6 +1416,7 @@ target_link_libraries(torch_cpu PUBLIC c10) target_link_libraries(torch_cpu PUBLIC ${Caffe2_PUBLIC_DEPENDENCY_LIBS}) target_link_libraries(torch_cpu PRIVATE ${Caffe2_DEPENDENCY_LIBS}) target_link_libraries(torch_cpu PRIVATE ${Caffe2_DEPENDENCY_WHOLE_LINK_LIBS}) @@ -53,7 +61,7 @@ index 7483637..093de40 100644 if(USE_MPI) target_link_libraries(torch_cpu PRIVATE MPI::MPI_CXX) endif() -@@ -1653,7 +1650,7 @@ if(BUILD_STATIC_RUNTIME_BENCHMARK) +@@ -1694,7 +1694,7 @@ if(BUILD_STATIC_RUNTIME_BENCHMARK) add_executable(static_runtime_bench "${STATIC_RUNTIME_BENCHMARK_SRCS}") add_executable(static_runtime_test "${STATIC_RUNTIME_TEST_SRCS}") target_link_libraries(static_runtime_bench torch_library benchmark) @@ -61,8 +69,8 @@ index 7483637..093de40 100644 + target_link_libraries(static_runtime_test torch_library gtest_main gtest) endif() - if(BUILD_TENSOREXPR_BENCHMARK) -@@ -1680,7 +1677,7 @@ if(BUILD_MOBILE_TEST) + if(BUILD_MOBILE_BENCHMARK) +@@ -1713,7 +1713,7 @@ if(BUILD_MOBILE_TEST) foreach(test_src ${ATen_MOBILE_TEST_SRCS}) get_filename_component(test_name ${test_src} NAME_WE) add_executable(${test_name} "${test_src}") @@ -71,7 +79,7 @@ index 7483637..093de40 100644 target_include_directories(${test_name} PRIVATE $) target_include_directories(${test_name} PRIVATE $) target_include_directories(${test_name} PRIVATE ${ATen_CPU_INCLUDE}) -@@ -1701,7 +1698,7 @@ if(BUILD_TEST) +@@ -1734,7 +1734,7 @@ if(BUILD_TEST) if(NOT MSVC) add_executable(${test_name}_${CPU_CAPABILITY} "${test_src}" ../aten/src/ATen/native/quantized/AffineQuantizerBase.cpp) # TODO: Get rid of c10 dependency (which is only needed for the implementation of AT_ERROR) @@ -80,25 +88,25 @@ index 7483637..093de40 100644 if(USE_FBGEMM) target_link_libraries(${test_name}_${CPU_CAPABILITY} fbgemm) endif() -@@ -1715,7 +1712,7 @@ if(BUILD_TEST) +@@ -1748,7 +1748,7 @@ if(BUILD_TEST) endif() else() add_executable(${test_name}_${CPU_CAPABILITY} "${test_src}") -- target_link_libraries(${test_name}_${CPU_CAPABILITY} torch_library gtest_main) -+ target_link_libraries(${test_name}_${CPU_CAPABILITY} torch_library gtest_main gtest) +- target_link_libraries(${test_name}_${CPU_CAPABILITY} torch_library sleef gtest_main) ++ target_link_libraries(${test_name}_${CPU_CAPABILITY} torch_library sleef gtest_main gtest) endif() target_include_directories(${test_name}_${CPU_CAPABILITY} PRIVATE $) target_include_directories(${test_name}_${CPU_CAPABILITY} PRIVATE $) -@@ -1732,7 +1729,7 @@ if(BUILD_TEST) +@@ -1765,7 +1765,7 @@ if(BUILD_TEST) foreach(test_src ${Caffe2_CPU_TEST_SRCS}) get_filename_component(test_name ${test_src} NAME_WE) add_executable(${test_name} "${test_src}") - target_link_libraries(${test_name} torch_library gtest_main) + target_link_libraries(${test_name} torch_library gtest_main gtest) - target_include_directories(${test_name} PRIVATE $) - target_include_directories(${test_name} PRIVATE $) - target_include_directories(${test_name} PRIVATE ${Caffe2_CPU_INCLUDE}) -@@ -1795,7 +1792,7 @@ if(BUILD_TEST) + if(NOT MSVC) + target_link_libraries(${test_name} stdc++) + endif() +@@ -1845,7 +1845,7 @@ if(BUILD_TEST) foreach(test_src ${Caffe2_VULKAN_TEST_SRCS}) get_filename_component(test_name ${test_src} NAME_WE) add_executable(${test_name} "${test_src}") @@ -120,10 +128,10 @@ index 1552b59..67e1a9a 100644 ${CMAKE_CURRENT_SOURCE_DIR}/istream_adapter.cc ${CMAKE_CURRENT_SOURCE_DIR}/file_adapter.cc diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake -index acc9584..97275bf 100644 +index f1f2eb7..b4d2033 100644 --- a/cmake/Dependencies.cmake +++ b/cmake/Dependencies.cmake -@@ -283,7 +283,7 @@ endif() +@@ -263,7 +263,7 @@ endif() # --- [ PocketFFT set(AT_POCKETFFT_ENABLED 0) if(NOT AT_MKL_ENABLED) @@ -132,27 +140,7 @@ index acc9584..97275bf 100644 if(NOT EXISTS "${POCKETFFT_INCLUDE_DIR}") message(FATAL_ERROR "pocketfft directory not found, expected ${POCKETFFT_INCLUDE_DIR}") elif(NOT EXISTS "${POCKETFFT_INCLUDE_DIR}/pocketfft_hdronly.h") -@@ -489,19 +489,6 @@ if(USE_QNNPACK) - set(QNNPACK_BUILD_TESTS OFF CACHE BOOL "") - set(QNNPACK_BUILD_BENCHMARKS OFF CACHE BOOL "") - set(QNNPACK_LIBRARY_TYPE "static" CACHE STRING "") -- add_subdirectory( -- "${QNNPACK_SOURCE_DIR}" -- "${CONFU_DEPENDENCIES_BINARY_DIR}/QNNPACK") -- -- # TODO: See https://github.com/pytorch/pytorch/issues/56285 -- if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "GNU") -- target_compile_options(qnnpack PRIVATE -Wno-deprecated-declarations) -- endif() -- -- # We build static versions of QNNPACK and pthreadpool but link -- # them into a shared library for Caffe2, so they need PIC. -- set_property(TARGET qnnpack PROPERTY POSITION_INDEPENDENT_CODE ON) -- set_property(TARGET cpuinfo PROPERTY POSITION_INDEPENDENT_CODE ON) - - if(QNNPACK_CUSTOM_THREADPOOL) - target_compile_definitions( -@@ -550,13 +537,6 @@ if(USE_PYTORCH_QNNPACK) +@@ -458,15 +458,6 @@ if(USE_PYTORCH_QNNPACK) set(PYTORCH_QNNPACK_BUILD_TESTS OFF CACHE BOOL "") set(PYTORCH_QNNPACK_BUILD_BENCHMARKS OFF CACHE BOOL "") set(PYTORCH_QNNPACK_LIBRARY_TYPE "static" CACHE STRING "") @@ -163,10 +151,12 @@ index acc9584..97275bf 100644 - # them into a shared library for Caffe2, so they need PIC. - set_property(TARGET pytorch_qnnpack PROPERTY POSITION_INDEPENDENT_CODE ON) - set_property(TARGET cpuinfo PROPERTY POSITION_INDEPENDENT_CODE ON) +- # QNNPACK depends on gemmlowp headers +- target_include_directories(pytorch_qnnpack PRIVATE "${CAFFE2_THIRD_PARTY_ROOT}/gemmlowp") if(PYTORCH_QNNPACK_CUSTOM_THREADPOOL) target_compile_definitions( -@@ -728,11 +708,6 @@ if(BUILD_TEST OR BUILD_MOBILE_BENCHMARK OR BUILD_MOBILE_TEST) +@@ -653,11 +644,6 @@ if(BUILD_TEST OR BUILD_MOBILE_BENCHMARK OR BUILD_MOBILE_TEST) # this shouldn't be necessary anymore. get_property(INC_DIR_temp DIRECTORY PROPERTY INCLUDE_DIRECTORIES) set_property(DIRECTORY PROPERTY INCLUDE_DIRECTORIES "") @@ -178,7 +168,7 @@ index acc9584..97275bf 100644 # We will not need to test benchmark lib itself. set(BENCHMARK_ENABLE_TESTING OFF CACHE BOOL "Disable benchmark testing as we don't need it.") -@@ -810,16 +785,6 @@ if(USE_FBGEMM) +@@ -735,16 +721,6 @@ if(USE_FBGEMM) if(USE_ASAN) set(USE_SANITIZER "address,undefined" CACHE STRING "-fsanitize options for FBGEMM") endif() @@ -195,7 +185,7 @@ index acc9584..97275bf 100644 endif() if(USE_FBGEMM) -@@ -979,7 +944,7 @@ if(NOT TARGET fp16 AND NOT USE_SYSTEM_FP16) +@@ -812,7 +788,7 @@ if(NOT TARGET fp16 AND NOT USE_SYSTEM_FP16) "${FP16_SOURCE_DIR}" "${CONFU_DEPENDENCIES_BINARY_DIR}/FP16") elseif(NOT TARGET fp16 AND USE_SYSTEM_FP16) @@ -204,7 +194,7 @@ index acc9584..97275bf 100644 set_target_properties(fp16 PROPERTIES LINKER_LANGUAGE C) endif() list(APPEND Caffe2_DEPENDENCY_LIBS fp16) -@@ -1362,7 +1327,6 @@ if(USE_DISTRIBUTED AND USE_TENSORPIPE) +@@ -1159,7 +1135,6 @@ if(USE_DISTRIBUTED AND USE_TENSORPIPE) # Tensorpipe uses cuda_add_library torch_update_find_cuda_flags() @@ -212,7 +202,7 @@ index acc9584..97275bf 100644 list(APPEND Caffe2_DEPENDENCY_LIBS tensorpipe) if(USE_CUDA) -@@ -1529,7 +1493,6 @@ if(CAFFE2_CMAKE_BUILDING_WITH_MAIN_REPO AND NOT INTERN_DISABLE_ONNX) +@@ -1288,7 +1263,6 @@ if(CAFFE2_CMAKE_BUILDING_WITH_MAIN_REPO AND NOT INTERN_DISABLE_ONNX) set_target_properties(onnx_proto PROPERTIES CXX_STANDARD 17) endif() endif() @@ -220,7 +210,7 @@ index acc9584..97275bf 100644 add_definitions(-DONNX_NAMESPACE=${ONNX_NAMESPACE}) if(NOT USE_SYSTEM_ONNX) -@@ -1560,7 +1523,7 @@ if(CAFFE2_CMAKE_BUILDING_WITH_MAIN_REPO AND NOT INTERN_DISABLE_ONNX) +@@ -1319,7 +1293,7 @@ if(CAFFE2_CMAKE_BUILDING_WITH_MAIN_REPO AND NOT INTERN_DISABLE_ONNX) endif() set_property(TARGET onnx_proto PROPERTY IMPORTED_LOCATION ${ONNX_PROTO_LIBRARY}) message("-- Found onnx: ${ONNX_LIBRARY} ${ONNX_PROTO_LIBRARY}") @@ -229,7 +219,7 @@ index acc9584..97275bf 100644 endif() include_directories(${FOXI_INCLUDE_DIRS}) list(APPEND Caffe2_DEPENDENCY_LIBS foxi_loader) -@@ -1739,9 +1702,8 @@ if(NOT INTERN_BUILD_MOBILE) +@@ -1476,9 +1450,8 @@ if(NOT INTERN_BUILD_MOBILE) endif() if(USE_MKLDNN) include(${CMAKE_CURRENT_LIST_DIR}/public/mkldnn.cmake) @@ -237,10 +227,10 @@ index acc9584..97275bf 100644 + if(DNNL_FOUND) set(AT_MKLDNN_ENABLED 1) - include_directories(AFTER SYSTEM ${MKLDNN_INCLUDE_DIR}) - if(BUILD_CAFFE2_OPS) - list(APPEND Caffe2_DEPENDENCY_LIBS caffe2::mkldnn) - endif(BUILD_CAFFE2_OPS) -@@ -1796,7 +1758,7 @@ endif() + else() + message(WARNING "MKLDNN could not be found.") + caffe2_update_option(USE_MKLDNN OFF) +@@ -1530,7 +1503,7 @@ endif() # set(TEMP_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS}) set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared libs" FORCE) @@ -249,7 +239,7 @@ index acc9584..97275bf 100644 # Disable compiler feature checks for `fmt`. # -@@ -1805,7 +1767,6 @@ add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/fmt) +@@ -1539,7 +1512,6 @@ add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/fmt) # CMAKE_CXX_FLAGS in ways that break feature checks. Since we already know # `fmt` is compatible with a superset of the compilers that PyTorch is, it # shouldn't be too bad to just disable the checks. @@ -299,10 +289,10 @@ index 8793562..9f8fa3d 100644 - ${MKLDNN_LIBRARIES}) + DNNL::dnnl) diff --git a/setup.py b/setup.py -index 81f3c6c..3251cab 100644 +index 9ec41cd..1f505fe 100644 --- a/setup.py +++ b/setup.py -@@ -482,13 +482,9 @@ def build_deps(): +@@ -494,13 +494,9 @@ def build_deps(): # Windows has very poor support for them. sym_files = [ "tools/shared/_utils_internal.py", @@ -384,10 +374,10 @@ index 5c89748..ef84c57 100644 endif() diff --git a/test/cpp/tensorexpr/CMakeLists.txt b/test/cpp/tensorexpr/CMakeLists.txt -index 012471d..d39b625 100644 +index 179270c..72f5582 100644 --- a/test/cpp/tensorexpr/CMakeLists.txt +++ b/test/cpp/tensorexpr/CMakeLists.txt -@@ -54,7 +54,7 @@ target_include_directories(tutorial_tensorexpr PRIVATE ${ATen_CPU_INCLUDE}) +@@ -51,7 +51,7 @@ target_include_directories(tutorial_tensorexpr PRIVATE ${ATen_CPU_INCLUDE}) # pthreadpool header. For some build environment we need add the dependency # explicitly. if(USE_PTHREADPOOL) @@ -396,3 +386,15 @@ index 012471d..d39b625 100644 endif() if(USE_CUDA) target_compile_definitions(test_tensorexpr PRIVATE USE_CUDA) +diff --git a/torch/CMakeLists.txt b/torch/CMakeLists.txt +index 10a44af..33e2df4 100644 +--- a/torch/CMakeLists.txt ++++ b/torch/CMakeLists.txt +@@ -81,7 +81,6 @@ set(TORCH_PYTHON_LINK_LIBRARIES + Python::Module + pybind::pybind11 + opentelemetry::api +- httplib + shm + fmt::fmt-header-only + ATEN_CPU_FILES_GEN_LIB) diff --git a/gnu/packages/patches/python-pytorch-without-kineto.patch b/gnu/packages/patches/python-pytorch-without-kineto.patch index f956316866..896e11dcc2 100644 --- a/gnu/packages/patches/python-pytorch-without-kineto.patch +++ b/gnu/packages/patches/python-pytorch-without-kineto.patch @@ -1,12 +1,12 @@ Even when building without Kineto, the header is still imported and the ActivityType type is used. This patch was copied from -https://github.com/pytorch/pytorch/pull/111048. +https://github.com/pytorch/pytorch/pull/111048 and adapted. diff --git a/torch/csrc/profiler/kineto_shim.h b/torch/csrc/profiler/kineto_shim.h -index e92cbf00..68985ab7 100644 +index 7a3b788..7f49d18 100644 --- a/torch/csrc/profiler/kineto_shim.h +++ b/torch/csrc/profiler/kineto_shim.h -@@ -12,7 +12,51 @@ +@@ -12,7 +12,55 @@ #undef USE_KINETO #endif @@ -48,6 +48,10 @@ index e92cbf00..68985ab7 100644 + MTIA_CCP_EVENTS, // MTIA ondevice CCP events + HPU_OP, // HPU host side runtime event + XPU_RUNTIME, // host side xpu runtime events ++ MTIA_WORKLOADD, ++ ++ PRIVATEUSE1_RUNTIME, ++ PRIVATEUSE1_DRIVER, + + ENUM_COUNT, // This is to add buffer and not used for any profiling logic. Add your new type before it. + OPTIONAL_ACTIVITY_TYPE_START = CUDA_SYNC, From patchwork Sun Aug 4 22:15:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 66737 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 907FF27BBE2; Sun, 4 Aug 2024 23:19:00 +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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, URIBL_BLOCKED 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 0D31127BBE9 for ; Sun, 4 Aug 2024 23:19:00 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sajY5-0007hD-W0; Sun, 04 Aug 2024 18:17: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 1sajY1-0007dj-Fc for guix-patches@gnu.org; Sun, 04 Aug 2024 18:17: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 1sajXy-0000tn-22 for guix-patches@gnu.org; Sun, 04 Aug 2024 18:17:52 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=ubFTnzQ3dTycZTYEZbPFIFo/qKqeewpEV6IdkbgyJWE=; b=PGkeYpuxAI0fl8fsh0zjF2yQcgUmvJd1pQIhQrvx4RP8pBm2DvkhqsyFtYfM28OWhQ6whodbbCMkZBsB9CqDmLuX9J/hMpRDXJQ0GHyhf4U9TeyY+4IhRtD9jO6uOaLL0Ex3s4atkI3MtTlY3V/ONt1ufQ2o2bzJRHPcwZTW5v7CGS3K317+S5782OPEvSkqUs7tMUhD/lfLa2liXXGAIyLvYmHyLrfsijFKAYdob57Lqn4wU+DoUp5cDSNl7o2fKkdcr/R9+aIPtfr6vIosX97Ebtfsw89NCF+O3BdiNYE6HbYkHNM0BgSL2VhDhpQlPF/kT4Fek8LvLcpvxY+6UA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sajYJ-0004UT-Ia for guix-patches@gnu.org; Sun, 04 Aug 2024 18:18:11 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72471] [PATCH 21/24] gnu: python-torchvision: Update to 0.19.0. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 04 Aug 2024 22:18:11 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72471 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72471@debbugs.gnu.org Cc: David Elsing Received: via spool by 72471-submit@debbugs.gnu.org id=B72471.172280987417044 (code B ref 72471); Sun, 04 Aug 2024 22:18:11 +0000 Received: (at 72471) by debbugs.gnu.org; 4 Aug 2024 22:17:54 +0000 Received: from localhost ([127.0.0.1]:57525 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sajY1-0004Ql-V2 for submit@debbugs.gnu.org; Sun, 04 Aug 2024 18:17:54 -0400 Received: from mout01.posteo.de ([185.67.36.65]:60037) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sajXf-0004Ly-UX for 72471@debbugs.gnu.org; Sun, 04 Aug 2024 18:17:38 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 57065240027 for <72471@debbugs.gnu.org>; Mon, 5 Aug 2024 00:17:03 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1722809823; bh=I3DiqOBLzD/nhQYzvUen8Al56f8dGjALpR9k6KtxS3Y=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=JW2IigmD8kiGLaTyvKwFwqnhQTbXruOxuwLHxjMJZmP0D4HcfA6p4CKauwIujdFob AidvoA3eXx1MZ2ay7V8wHgc7BFRs7BnndWVD+ZnkCLc4wSs9ExmztrAHX+fWBG+RxD wr91zAFfPvzZlywqU1W/+DM2pkdghdHyKTUnQQMMoq+BHmtahBXXofGugrv0YmsuUv 94PduEoA5r0F5ssN8zqJlJJmNlHz913VDaYDWIdEsfNk3ClEeqK5b90meAejZqqOWo YnCeciCLBHSQQO/Yi/YqABoDrXv2X/cK/xxFZaszfUhuitsBwBUq83tPQ6xSa70boK QL12fAfR+wGXg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4WcYp66gwLz6tlh; Mon, 5 Aug 2024 00:17:02 +0200 (CEST) From: David Elsing Date: Sun, 4 Aug 2024 22:15:59 +0000 Message-ID: <20240804221635.3805-21-david.elsing@posteo.net> In-Reply-To: <20240804220847.15842-1-david.elsing@posteo.net> References: <20240804220847.15842-1-david.elsing@posteo.net> 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 (python-torchvision): Update to 0.19.0. [arguments]: Add 'setenv' phase for finding libjpeg-turbo. [inputs]: Add ffmpeg. --- gnu/packages/machine-learning.scm | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 822881f15a..006e31892c 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -5330,7 +5330,7 @@ (define-public python-torchmetrics (define-public python-torchvision (package (name "python-torchvision") - (version "0.17.1") + (version "0.19.0") (source (origin (method git-fetch) (uri (git-reference @@ -5340,7 +5340,7 @@ (define-public python-torchvision (file-name (git-file-name name version)) (sha256 (base32 - "094jz0ryzh0yjxf687r61r482fdh3bax8ix2csghraps0z1sns1b")) + "15zyq2k4x9yapx7qfghhslznz1mwybhf086pirsr98c4l891sp1r")) (modules '((guix build utils))) (snippet '(begin @@ -5348,10 +5348,21 @@ (define-public python-torchvision (delete-file-recursively "ios"))))) (build-system pyproject-build-system) (arguments - (list #:tests? #false)) ;the test suite is expensive and there is no easy - ;way to subset it. + (list + ;; The test suite is expensive and there is no easy way to subset it. + #:tests? #f + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'setenv + (lambda _ + (let ((jpegdir #$(this-package-input "libjpeg-turbo"))) + (setenv "TORCHVISION_INCLUDE" + (string-append jpegdir "/include/")) + (setenv "TORCHVISION_LIBRARY" + (string-append jpegdir "/lib/")))))))) (inputs - (list libpng + (list ffmpeg + libpng libjpeg-turbo)) (propagated-inputs (list python-numpy From patchwork Sun Aug 4 22:16:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 66733 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 9E13927BBE9; Sun, 4 Aug 2024 23:18:44 +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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, URIBL_BLOCKED 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 000F227BBE2 for ; Sun, 4 Aug 2024 23:18:42 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sajY0-0007da-Pr; Sun, 04 Aug 2024 18:17:52 -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 1sajXx-0007bJ-Kj for guix-patches@gnu.org; Sun, 04 Aug 2024 18:17:49 -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 1sajXw-0000tD-5h for guix-patches@gnu.org; Sun, 04 Aug 2024 18:17:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=5OL0UA/90agfoClCdr6aTYRJSbM0KbH2z8d7wsLu6ZI=; b=OLt/wdvhHZWtoay2Q9CpWYgdxCmviY+nnPEW1M3CM/jF6mCEt5KK/vFYsyCbGiqUgyQnUNcIqxVp5olos8GXEF7pPGcqmbSR7Tkf8bCFt1uAp8yHrWyaWYLcVVMiMLpmyU6PVPu7yMegX8qv9ZGzBLQEAVw0rflVkPz2NgIkAWwdnIYiAJnFDEUCa562cSKGK4eCb/T0aB8MCoMbKZ9r4bfnGnMgY6j0okDr4d+DloqRlj2M3LkerUzySkYZhdnTtDsLrJ5UCe1jET4RXDDBUA0JEJj9QxsoiCdsKPNarMcvuZobBdqO+jrN1IUeh7/7qmxBEnowa47GiSH/k3rcJA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sajYH-0004Tw-MT for guix-patches@gnu.org; Sun, 04 Aug 2024 18:18:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72471] [PATCH 22/24] gnu: python-lightning-utilities: Update to 0.11.6. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 04 Aug 2024 22:18:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72471 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72471@debbugs.gnu.org Cc: David Elsing Received: via spool by 72471-submit@debbugs.gnu.org id=B72471.172280987217012 (code B ref 72471); Sun, 04 Aug 2024 22:18:09 +0000 Received: (at 72471) by debbugs.gnu.org; 4 Aug 2024 22:17:52 +0000 Received: from localhost ([127.0.0.1]:57517 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sajXz-0004Q8-7b for submit@debbugs.gnu.org; Sun, 04 Aug 2024 18:17:51 -0400 Received: from mout02.posteo.de ([185.67.36.66]:55463) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sajXe-0004La-Vg for 72471@debbugs.gnu.org; Sun, 04 Aug 2024 18:17:32 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id C6C25240101 for <72471@debbugs.gnu.org>; Mon, 5 Aug 2024 00:17:03 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1722809823; bh=oEwST9WgYgzGevHI4/qGTbyA+tT4bAftSLEhidPoFFQ=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=eTXeLjC9odnG5WdWIPz7em9Jh+KZcRBvFIjpPX/N42DNI4lXfeqVBC613q7dQ+i+Z Abzwh9DUr21t7nS/6XMm6MYfwJPZRARd4lrSQuudXCD1OB9zRlZ9z3h+1yg8e5Jf8O 027Lfdn1uYw+GYrAehFK+MMRV5qBo+J21mdra2jdhbyNl0NohlqiIHvMYAWVhyJ0SK yvSNe2uv6Z9tKfK9zuVUtHOsqNrdZEqVCSiMf4GNaske11mYFdhlk0Md1AKYQSamH/ lL8f/JSusJZPo4nEtO7U7eQZiErqTb2GRdPnyFqVUrffjC1A0QfT7EELC34fTRatt3 2gr/N81Uiv4VQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4WcYp73D3zz6tlh; Mon, 5 Aug 2024 00:17:03 +0200 (CEST) From: David Elsing Date: Sun, 4 Aug 2024 22:16:00 +0000 Message-ID: <20240804221635.3805-22-david.elsing@posteo.net> In-Reply-To: <20240804220847.15842-1-david.elsing@posteo.net> References: <20240804220847.15842-1-david.elsing@posteo.net> 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 (python-lightning-utilities): Update to 0.11.6. [source] Adjust URI. [build-system]: Move to pyproject-build-system. --- gnu/packages/machine-learning.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 006e31892c..85db721ebd 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -5040,14 +5040,14 @@ (define-public python-lightning-cloud (define-public python-lightning-utilities (package (name "python-lightning-utilities") - (version "0.8.0") + (version "0.11.6") (source (origin (method url-fetch) - (uri (pypi-uri "lightning-utilities" version)) + (uri (pypi-uri "lightning_utilities" version)) (sha256 (base32 - "084pn8fizxrcn1699jb8x2jsg4wcx01l65bwxpgnq0kzqp3rapcf")))) - (build-system python-build-system) + "016zikn39apig3y6xyipw34w0w02c73z483radddbf68ivpjgz3r")))) + (build-system pyproject-build-system) (propagated-inputs (list python-importlib-metadata python-packaging python-typing-extensions)) (native-inputs (list python-coverage)) From patchwork Sun Aug 4 22:16:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 66721 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 AAD6127BBEA; Sun, 4 Aug 2024 23:18:17 +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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, URIBL_BLOCKED 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 B541C27BBE2 for ; Sun, 4 Aug 2024 23:18:16 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sajY0-0007dZ-HL; Sun, 04 Aug 2024 18:17:52 -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 1sajXx-0007bI-Kb for guix-patches@gnu.org; Sun, 04 Aug 2024 18:17:49 -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 1sajXw-0000tI-M8 for guix-patches@gnu.org; Sun, 04 Aug 2024 18:17:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=6hKNPnQbZ6G6O7cVj2vUitRAHycsSyXUTWckNgaC7ZQ=; b=bUJd15rIRXJirsJZxCDr1aYEutbtnoFA9k0/dV4PpK6ASdBd9pEFmOMc7tXdP2hfIyV+rkJvlYmtPSChfFNSvaJEIM9YG2pUpVD5+mbb860p8nbKa5HYQhvKAtrlwsbzhlzMPqoHoCw4ISnPJoIwm0CssMY2U169RgeshK5G4JhfpkniciRLHie5BOn7pNuUh4IzSbvCJc3UghTzVJ9GOoUApTpDxWsMtEk2gbjr8n/d5GXN8XhNPP+yM+/T60rewgz/22RAXYecaruPYRFlx9vHVv9tOs1AKRJ+0BMqSryc4Mw7CbFkyUyoKz45X4NCAMiL3fdBolVzU7br0rL91w==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sajYI-0004U3-6K for guix-patches@gnu.org; Sun, 04 Aug 2024 18:18:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72471] [PATCH 23/24] gnu: python-torchmetrics: Update to 1.4.1. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 04 Aug 2024 22:18:10 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72471 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72471@debbugs.gnu.org Cc: David Elsing Received: via spool by 72471-submit@debbugs.gnu.org id=B72471.172280987217020 (code B ref 72471); Sun, 04 Aug 2024 22:18:10 +0000 Received: (at 72471) by debbugs.gnu.org; 4 Aug 2024 22:17:52 +0000 Received: from localhost ([127.0.0.1]:57519 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sajXz-0004QL-V7 for submit@debbugs.gnu.org; Sun, 04 Aug 2024 18:17:52 -0400 Received: from mout02.posteo.de ([185.67.36.66]:42341) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sajXf-0004Lk-Fb for 72471@debbugs.gnu.org; Sun, 04 Aug 2024 18:17:34 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 4D4F9240101 for <72471@debbugs.gnu.org>; Mon, 5 Aug 2024 00:17:04 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1722809824; bh=ZhVnvrJEdyUzj04kRu5hSQNLQk1vWW2Qyyx0DPTaetw=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=d4jOg3U1y9ZX0TrjP56NaTnr1/89qm+G5+N95VjXGbZ1bAeHqeoL0+URl17tYhJSi t4sXk7ZZcdims/4dHQuH/gy12vv4k0gb3K5AakkZYknOlcv6T5y8f33f7oy7ujJLQc IiQWtbMDp0ftMuIU1L0GFdT6nDCqPWLqgdd7Ll+oCZajs5te2oAZjpjHPnBwwjuXeT slbWsBAumsZvDd93FpC88ayaFv/NfsAkddPn7g2bA4rPrRbiwIBOWo2agkvCauA4QI j4tlMSAJg2ChzlpN3HylDUCQ2H3AGDE4eZSbet403ofre+yPnc0/w1OTe5uZpuanTy fwEUrFlCa5xMA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4WcYp770zjz6txL; Mon, 5 Aug 2024 00:17:03 +0200 (CEST) From: David Elsing Date: Sun, 4 Aug 2024 22:16:01 +0000 Message-ID: <20240804221635.3805-23-david.elsing@posteo.net> In-Reply-To: <20240804220847.15842-1-david.elsing@posteo.net> References: <20240804220847.15842-1-david.elsing@posteo.net> 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 (python-torchmetrics): Update to 1.4.1. [source]: Switch to GitHub repository. [arguments]: New field. [propagated-inputs]: Add python-lightning-utilities. [home-page]: Update URL. --- gnu/packages/machine-learning.scm | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 85db721ebd..5449e884d5 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -5281,17 +5281,25 @@ (define-public python-pytorch-lightning (define-public python-torchmetrics (package (name "python-torchmetrics") - (version "0.11.4") + (version "1.4.1") (source (origin - (method url-fetch) - (uri (pypi-uri "torchmetrics" version)) + (method git-fetch) + (uri (git-reference + (url "https://github.com/Lightning-AI/torchmetrics") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "150lcy6c20n42rwxl4d3m1b8s4js9ddds5wh3685vmjdnha5mr0z")))) + "0371kx2fpp46rlhzkafa7397kp1lirgykpzk9g12kxsqypb67v1l")))) (build-system pyproject-build-system) + (arguments + (list + ;; Tests require many additional dependencies + #:tests? #f)) (propagated-inputs (list python-numpy python-packaging python-pytorch - python-typing-extensions)) + python-typing-extensions + python-lightning-utilities)) (native-inputs (list python-cloudpickle python-coverage @@ -5311,7 +5319,7 @@ (define-public python-torchmetrics python-scipy python-types-protobuf python-types-setuptools)) - (home-page "https://github.com/Lightning-AI/metrics") + (home-page "https://github.com/Lightning-AI/torchmetrics") (synopsis "Machine learning metrics for PyTorch applications") (description "TorchMetrics is a collection of 100+ PyTorch metrics implementations and an easy-to-use API to create custom metrics. It offers: From patchwork Sun Aug 4 22:16:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 66736 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 7470827BBE9; Sun, 4 Aug 2024 23:18:58 +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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, URIBL_BLOCKED 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 3736F27BBE2 for ; Sun, 4 Aug 2024 23:18:57 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sajY5-0007gu-Ni; Sun, 04 Aug 2024 18:17: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 1sajY1-0007dh-FM for guix-patches@gnu.org; Sun, 04 Aug 2024 18:17: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 1sajXz-0000tq-6t for guix-patches@gnu.org; Sun, 04 Aug 2024 18:17:52 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=iKPNr7LgFup0w32VEZ+6D5OcTF7dFI6Tpr2T07rh7Y0=; b=koIcyyqOEyd29oDChZzTtqsFgzvdhVe6168b8BQR7BnpgwOkCjFxTzPnnmhm/ki70rakVzmA405AKaONDvR8BnrKEROJ8Cch2ogdFtxF7tgobAUtDUY2DHq4L3PCqcLK97BUGpBABnKIz9/EmBQDgshrbMe7PYeYe7LJE9rp9oBrc/0miNIYWmcrWsjXzXP1WCvgYQrhJuoxnPjGcVXhZNInb8vFOIV64BSVerAT9hJnlOuzaWrhbs8pKDPoM32pYS19K7fP8rkmhvY9bV8jan+xxupLMv6KYrkWp0L18GFNcMwZi8hOUBwQufpLSs7dtyZ4REu57Q1Pzvz+6DR3NA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sajYK-0004Un-NG for guix-patches@gnu.org; Sun, 04 Aug 2024 18:18:12 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72471] [PATCH 24/24] gnu: python-pytorch-lightning: Update to commit 2064887. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 04 Aug 2024 22:18:12 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72471 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72471@debbugs.gnu.org Cc: David Elsing Received: via spool by 72471-submit@debbugs.gnu.org id=B72471.172280987617064 (code B ref 72471); Sun, 04 Aug 2024 22:18:12 +0000 Received: (at 72471) by debbugs.gnu.org; 4 Aug 2024 22:17:56 +0000 Received: from localhost ([127.0.0.1]:57529 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sajY3-0004R0-FX for submit@debbugs.gnu.org; Sun, 04 Aug 2024 18:17:56 -0400 Received: from mout02.posteo.de ([185.67.36.66]:36313) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sajXg-0004Lz-0O for 72471@debbugs.gnu.org; Sun, 04 Aug 2024 18:17:41 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id C976B240101 for <72471@debbugs.gnu.org>; Mon, 5 Aug 2024 00:17:04 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1722809824; bh=Zhy5denNuJLcyOQ+blmcbYL2Dk4+YLsRn3gXvBj2awM=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=JXSFdvf5SX3+q0aRwzpKoYVdaFp2gVyJ/qn/IHpRuVT8i+ENyVM58vWUApVq+izuk MoPzoDvwRbp1bFJhmZ8uqWAAeL3dWwz+iPe/5R7TzDeQWw8ubB8GdAU1jUQVRqPcFT Db/fxcj93Vdt4zzxZBsfABmeKo4wT6b67UErmp/FwAuJ+1BdAVRn8hjgHC0InerKnN YyNK2M2LZgw/XcDvwJk7iMjMNEfaBmmrjk2YJ0QO2yNNo18pF7e+6PHZCLUJPGifgb D9AhLQ7L7FCaPY7WpsFuSbTI6B1eIbh0UlDTWBGoSXb/UqFxBeERt1pWOpqz8RLDBN xbagwW9lbPbNA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4WcYp83S3tz6tlh; Mon, 5 Aug 2024 00:17:04 +0200 (CEST) From: David Elsing Date: Sun, 4 Aug 2024 22:16:02 +0000 Message-ID: <20240804221635.3805-24-david.elsing@posteo.net> In-Reply-To: <20240804220847.15842-1-david.elsing@posteo.net> References: <20240804220847.15842-1-david.elsing@posteo.net> 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 (python-pytorch-lightning): Update to commit 2064887. [source]: Update URL. [arguments]<#:tests-flags>: Skip additional failing tests. <#:phases>: Adjust 'patch-version-detection' phase. --- gnu/packages/machine-learning.scm | 249 ++++++++++++++++-------------- 1 file changed, 130 insertions(+), 119 deletions(-) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 5449e884d5..73bb520ffc 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -5157,126 +5157,137 @@ (define-public python-inquirer (license license:expat))) (define-public python-pytorch-lightning - (package - (name "python-pytorch-lightning") - (version "2.0.2") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/Lightning-AI/lightning") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1w4lajiql4y5nnhqf6i5wii1mrwnhp5f4bzbwdzb5zz0d0lysb1i")))) - (build-system pyproject-build-system) - (arguments - (list - #:test-flags - '(list "-m" "not cloud and not tpu" "tests/tests_pytorch" - ;; we don't have onnxruntime - "--ignore=tests/tests_pytorch/models/test_onnx.py" - - ;; We don't have tensorboard, so we skip all those tests that - ;; require it for logging. - "--ignore=tests/tests_pytorch/checkpointing/test_model_checkpoint.py" - "--ignore=tests/tests_pytorch/loggers/test_all.py" - "--ignore=tests/tests_pytorch/loggers/test_logger.py" - "--ignore=tests/tests_pytorch/loggers/test_tensorboard.py" - "--ignore=tests/tests_pytorch/models/test_cpu.py" - "--ignore=tests/tests_pytorch/models/test_hparams.py" - "--ignore=tests/tests_pytorch/models/test_restore.py" - "--ignore=tests/tests_pytorch/profilers/test_profiler.py" - "--ignore=tests/tests_pytorch/trainer/flags/test_fast_dev_run.py" - "--ignore=tests/tests_pytorch/trainer/logging_/test_eval_loop_logging.py" - "--ignore=tests/tests_pytorch/trainer/logging_/test_train_loop_logging.py" - "--ignore=tests/tests_pytorch/trainer/properties/test_loggers.py" - "--ignore=tests/tests_pytorch/trainer/properties/test_log_dir.py" - "--ignore=tests/tests_pytorch/trainer/test_trainer.py" - - ;; This needs internet access - "--ignore=tests/tests_pytorch/helpers/test_models.py" - "--ignore=tests/tests_pytorch/helpers/test_datasets.py" - "--ignore=tests/tests_pytorch/helpers/datasets.py" - - ;; We have no legacy checkpoints - "--ignore=tests/tests_pytorch/checkpointing/test_legacy_checkpoints.py" - - ;; TypeError: _FlakyPlugin._make_test_flaky() got an unexpected keyword argument 'reruns' - "--ignore=tests/tests_pytorch/models/test_amp.py" - "--ignore=tests/tests_pytorch/profilers/test_profiler.py" - - "--ignore=tests/tests_pytorch/graveyard/test_legacy_import_unpickler.py" - - "-k" - (string-append - ;; We don't have tensorboard - "not test_property_logger" - " and not test_cli_logger_shorthand" - ;; Something wrong with Flaky - " and not test_servable_module_validator_with_trainer")) - #:phases - '(modify-phases %standard-phases - (add-after 'unpack 'patch-version-detection - (lambda _ - ;; We do have pytorch 1.13.1, but the version comparison fails. - (substitute* "src/lightning/fabric/utilities/imports.py" - (("_TORCH_GREATER_EQUAL_1_13 =.*") - "_TORCH_GREATER_EQUAL_1_13 = True\n")))) - (add-before 'build 'pre-build - (lambda _ (setenv "PACKAGE_NAME" "lightning"))) - (add-after 'install 'pre-build-pytorch - (lambda _ - ;; pyproject-build-system only tolerates unicycles. - (for-each delete-file (find-files "dist" "\\.whl")) - (setenv "PACKAGE_NAME" "pytorch"))) - (add-after 'pre-build-pytorch 'build-pytorch - (assoc-ref %standard-phases 'build)) - (add-after 'build-pytorch 'install-pytorch - (assoc-ref %standard-phases 'install)) - (add-before 'check 'pre-check - (lambda _ - ;; We don't have Tensorboard - (substitute* "tests/tests_pytorch/test_cli.py" - ((" TensorBoardLogger\\(\".\"\\)") ""))))))) - (propagated-inputs - (list python-arrow - python-beautifulsoup4 - python-croniter - python-dateutils - python-deepdiff - python-fastapi-for-pytorch-lightning - python-fsspec - python-inquirer - python-jsonargparse - python-lightning-cloud - python-lightning-utilities - python-numpy - python-packaging - python-pytorch - python-pyyaml - python-starsessions-for-pytorch-lightning - python-torchmetrics - python-torchvision - python-tqdm - python-traitlets - python-typing-extensions)) - (native-inputs - (list python-aiohttp - python-cloudpickle - python-coverage - python-flaky - python-pympler - python-pytest - python-psutil - python-requests-mock - python-scikit-learn)) - (home-page "https://lightning.ai/") - (synopsis "Deep learning framework to train, deploy, and ship AI products") - (description - "PyTorch Lightning is just organized PyTorch; Lightning disentangles + (let ((commit "2064887b12dd934a5f9a2bf45897f29e3bfc74d1") + (revision "0")) + (package + (name "python-pytorch-lightning") + (version (git-version "2.3.3" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Lightning-AI/pytorch-lightning") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1pfmwgzh21i21i4ixank488615q7j8nkvlxd82kmmam97gsd6krg")))) + (build-system pyproject-build-system) + (arguments + (list + #:test-flags + '(list "-m" "not cloud and not tpu" "tests/tests_pytorch" + ;; we don't have onnxruntime + "--ignore=tests/tests_pytorch/models/test_onnx.py" + + ;; We don't have tensorboard, so we skip all those tests that + ;; require it for logging. + "--ignore=tests/tests_pytorch/checkpointing/test_model_checkpoint.py" + "--ignore=tests/tests_pytorch/loggers/test_all.py" + "--ignore=tests/tests_pytorch/loggers/test_logger.py" + "--ignore=tests/tests_pytorch/loggers/test_tensorboard.py" + "--ignore=tests/tests_pytorch/loggers/test_wandb.py" + "--ignore=tests/tests_pytorch/models/test_cpu.py" + "--ignore=tests/tests_pytorch/models/test_hparams.py" + "--ignore=tests/tests_pytorch/models/test_restore.py" + "--ignore=tests/tests_pytorch/profilers/test_profiler.py" + "--ignore=tests/tests_pytorch/test_cli.py" + "--ignore=tests/tests_pytorch/trainer/flags/test_fast_dev_run.py" + "--ignore=tests/tests_pytorch/trainer/logging_/test_eval_loop_logging.py" + "--ignore=tests/tests_pytorch/trainer/logging_/test_train_loop_logging.py" + "--ignore=tests/tests_pytorch/trainer/properties/test_loggers.py" + "--ignore=tests/tests_pytorch/trainer/properties/test_log_dir.py" + "--ignore=tests/tests_pytorch/trainer/test_trainer.py" + + ;; This needs internet access + "--ignore=tests/tests_pytorch/helpers/test_models.py" + "--ignore=tests/tests_pytorch/helpers/test_datasets.py" + "--ignore=tests/tests_pytorch/helpers/datasets.py" + + ;; We have no legacy checkpoints + "--ignore=tests/tests_pytorch/checkpointing/test_legacy_checkpoints.py" + + ;; TypeError: _FlakyPlugin._make_test_flaky() got an unexpected + ;; keyword argument 'reruns' + "--ignore=tests/tests_pytorch/models/test_amp.py" + "--ignore=tests/tests_pytorch/utilities/test_all_gather_grad.py" + + ;; Requires CUDA + "--ignore=tests/tests_pytorch/plugins/precision/test_bitsandbytes.py" + + "-k" + (string-append + ;; We don't have tensorboard + "not test_property_logger" + " and not test_cli_logger_shorthand" + ;; Wrong module appears in sys.modules + " and not test_patch_legacy_imports_unified" + ;; Missing log message + " and not test_should_stop_early_stopping_conditions_met" + " and not test_fit_loop_done_log_messages" + ;; Something wrong with Flaky + " and not test_servable_module_validator_with_trainer")) + #:phases + '(modify-phases %standard-phases + (add-after 'unpack 'patch-version-detection + (lambda _ + ;; We do have pytorch 2.4.0, but the version comparison fails. + (substitute* "src/lightning/fabric/utilities/imports.py" + (("_TORCH_GREATER_EQUAL_2_4 =.*") + "_TORCH_GREATER_EQUAL_2_4 = True\n")))) + (add-before 'build 'pre-build + (lambda _ (setenv "PACKAGE_NAME" "lightning"))) + (add-after 'install 'pre-build-pytorch + (lambda _ + ;; pyproject-build-system only tolerates unicycles. + (for-each delete-file (find-files "dist" "\\.whl")) + (setenv "PACKAGE_NAME" "pytorch"))) + (add-after 'pre-build-pytorch 'build-pytorch + (assoc-ref %standard-phases 'build)) + (add-after 'build-pytorch 'install-pytorch + (assoc-ref %standard-phases 'install)) + (add-before 'check 'pre-check + (lambda _ + ;; We don't have Tensorboard + (substitute* "tests/tests_pytorch/test_cli.py" + ((" TensorBoardLogger\\(\".\"\\)") ""))))))) + (propagated-inputs + (list python-arrow + python-beautifulsoup4 + python-croniter + python-dateutils + python-deepdiff + python-fastapi-for-pytorch-lightning + python-fsspec + python-inquirer + python-jsonargparse + python-lightning-cloud + python-lightning-utilities + python-numpy + python-packaging + python-pytorch + python-pyyaml + python-starsessions-for-pytorch-lightning + python-torchmetrics + python-torchvision + python-tqdm + python-traitlets + python-typing-extensions)) + (native-inputs + (list python-aiohttp + python-cloudpickle + python-coverage + python-flaky + python-pympler + python-pytest + python-psutil + python-requests-mock + python-scikit-learn)) + (home-page "https://lightning.ai/") + (synopsis "Deep learning framework to train, deploy, and ship AI products") + (description + "PyTorch Lightning is just organized PyTorch; Lightning disentangles PyTorch code to decouple the science from the engineering.") - (license license:asl2.0))) + (license license:asl2.0)))) (define-public python-torchmetrics (package