From patchwork Tue Mar 12 22:51: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: 61729 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 D39BC27BBF1; Tue, 12 Mar 2024 22:55:12 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,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 A88B227BBE2 for ; Tue, 12 Mar 2024 22:55:10 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rkB0a-0000SH-D1; Tue, 12 Mar 2024 18:54:08 -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 1rkB05-0000BJ-Jk for guix-patches@gnu.org; Tue, 12 Mar 2024 18:53:39 -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 1rkB04-0000Lc-H6 for guix-patches@gnu.org; Tue, 12 Mar 2024 18:53:36 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rkB0d-0001nw-6H for guix-patches@gnu.org; Tue, 12 Mar 2024 18:54:11 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69591] [PATCH v2 19/31] gnu: Add fbgemm. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Mar 2024 22:54:11 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69591 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69591@debbugs.gnu.org Cc: David Elsing Received: via spool by 69591-submit@debbugs.gnu.org id=B69591.17102840226692 (code B ref 69591); Tue, 12 Mar 2024 22:54:11 +0000 Received: (at 69591) by debbugs.gnu.org; 12 Mar 2024 22:53:42 +0000 Received: from localhost ([127.0.0.1]:44099 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rkB09-0001jl-IW for submit@debbugs.gnu.org; Tue, 12 Mar 2024 18:53:42 -0400 Received: from mout02.posteo.de ([185.67.36.66]:51649) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rkAzj-0001el-9c for 69591@debbugs.gnu.org; Tue, 12 Mar 2024 18:53:17 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id C01C8240101 for <69591@debbugs.gnu.org>; Tue, 12 Mar 2024 23:52:34 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1710283954; bh=9JiiBMg+b3MQuxlM4cgy4v4c8pfsyc2+2sDoz8Fsx3g=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=fWVHcui8St9ixnNZev7n6JyZCXqlGvErIc70zyEtYQNwZtV8fbNUveRcfd7ehHkU9 Kwlk+Q12UH++9XfdKSi9r6V0ya8hGlb7gEeFgHbqSnqgJV+R4DELwfQ2zL1JUWKXeM qRwaQLZdw4qG4pcIQRlk2PjYvteUXKIO2dLpVL5pA+Up6QsA40codLucvn5bxLR86r f/Cam/BMH9lRpFO03ThI9ABpw1EJdYt09G857jzC0zLAcjLiEkknQ9q9QBTlq7mgre B38Rd0r2tE3Fg/gw92btustWxKJObxjYeke4MQ5lFiGRaOivXhI/T/uFKaNScGfnIx 41MO/CdnSEzOQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4TvTS22y9Lz6tx2; Tue, 12 Mar 2024 23:52:34 +0100 (CET) From: David Elsing Date: Tue, 12 Mar 2024 22:51:47 +0000 Message-ID: <20240312225211.16427-19-david.elsing@posteo.net> In-Reply-To: <20240312224712.15578-1-david.elsing@posteo.net> References: <20240312224712.15578-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): New variable. * gnu/packages/patches/fbgemm-use-system-libraries.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. --- gnu/local.mk | 1 + gnu/packages/machine-learning.scm | 31 ++++++++++ .../patches/fbgemm-use-system-libraries.patch | 62 +++++++++++++++++++ 3 files changed, 94 insertions(+) create mode 100644 gnu/packages/patches/fbgemm-use-system-libraries.patch diff --git a/gnu/local.mk b/gnu/local.mk index 75295a8250..2f685e2f7d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1174,6 +1174,7 @@ dist_patch_DATA = \ %D%/packages/patches/fasthenry-spUtils.patch \ %D%/packages/patches/fasthenry-spSolve.patch \ %D%/packages/patches/fasthenry-spFactor.patch \ + %D%/packages/patches/fbgemm-use-system-libraries.patch \ %D%/packages/patches/fbreader-curl-7.62.patch \ %D%/packages/patches/fbreader-fix-icon.patch \ %D%/packages/patches/fenics-dolfin-algorithm.patch \ diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index ad8b8c9960..72b11cca5f 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -4101,6 +4101,37 @@ (define-public xnnpack-for-torch2 "-DXNNPACK_BUILD_TESTS=FALSE" ;FIXME: see below "-DXNNPACK_BUILD_BENCHMARKS=FALSE")))))) +(define-public fbgemm + (package + (name "fbgemm") + (version "0.6.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/pytorch/fbgemm") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0mw30v55aicqdbh3xwfj9p8f38nw70ks5cxiwpgwjsk0dylah9rf")) + (patches (search-patches "fbgemm-use-system-libraries.patch")) + (modules '((guix build utils))) + (snippet + '(delete-file-recursively "third_party")))) + (build-system cmake-build-system) + (arguments + (list + #:configure-flags + ''("-DFBGEMM_LIBRARY_TYPE=shared"))) + (inputs (list asmjit cpuinfo)) + (native-inputs (list pkg-config python googletest)) + (home-page "https://github.com/pytorch/fbgemm") + (synopsis "Facebook GEneral Matrix Multiplication") + (description "Low-precision, high-performance matrix-matrix +multiplications and convolution library for server-side inference.") + (supported-systems '("x86_64-linux")) + (license license:bsd-3))) + (define-public tensorpipe (let ((commit "bb1473a4b38b18268e8693044afdb8635bc8351b") (revision "0")) diff --git a/gnu/packages/patches/fbgemm-use-system-libraries.patch b/gnu/packages/patches/fbgemm-use-system-libraries.patch new file mode 100644 index 0000000000..456bc3021c --- /dev/null +++ b/gnu/packages/patches/fbgemm-use-system-libraries.patch @@ -0,0 +1,62 @@ +Use the asmjit and cpuinfo packages. + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 134523e..b88b0e7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -235,7 +235,7 @@ message(WARNING "CMAKE_CXX_FLAGS_DEBUG is ${CMAKE_CXX_FLAGS_DEBUG}") + message(WARNING "CMAKE_CXX_FLAGS_RELEASE is ${CMAKE_CXX_FLAGS_RELEASE}") + message(WARNING "==========") + +-if(NOT TARGET asmjit) ++if(FALSE) + #Download asmjit from github if ASMJIT_SRC_DIR is not specified. + if(NOT DEFINED ASMJIT_SRC_DIR) + set(ASMJIT_SRC_DIR "${FBGEMM_SOURCE_DIR}/third_party/asmjit" +@@ -264,7 +264,7 @@ if(NOT TARGET asmjit) + endif() + endif() + +-if(NOT TARGET cpuinfo) ++if(FALSE) + #Download cpuinfo from github if CPUINFO_SOURCE_DIR is not specified. + if(NOT DEFINED CPUINFO_SOURCE_DIR) + set(CPUINFO_SOURCE_DIR "${FBGEMM_SOURCE_DIR}/third_party/cpuinfo" +@@ -340,9 +340,12 @@ target_include_directories(fbgemm BEFORE + target_link_libraries(fbgemm + $ + $) +-add_dependencies(fbgemm +- asmjit +- cpuinfo) ++ ++find_package(asmjit) ++find_package(PkgConfig REQUIRED) ++pkg_check_modules(libcpuinfo REQUIRED IMPORTED_TARGET libcpuinfo) ++ ++target_link_libraries(fbgemm asmjit::asmjit PkgConfig::libcpuinfo) + + if(OpenMP_FOUND) + target_link_libraries(fbgemm OpenMP::OpenMP_CXX) +diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt +index 2cffddf..bd4d409 100644 +--- a/test/CMakeLists.txt ++++ b/test/CMakeLists.txt +@@ -14,7 +14,7 @@ set(CMAKE_C_STANDARD 11) + set(CMAKE_C_EXTENSIONS OFF) + set(CMAKE_C_STANDARD_REQUIRED ON) + +-if(FBGEMM_BUILD_TESTS AND NOT TARGET gtest) ++if(FALSE) + #Download Googletest framework from github if + #GOOGLETEST_SOURCE_DIR is not specified. + if(NOT DEFINED GOOGLETEST_SOURCE_DIR) +@@ -78,7 +78,7 @@ macro(add_gtest TESTNAME) + target_link_libraries(${TESTNAME} ${OpenMP_CXX_LIBRARIES}) + endif() + +- add_dependencies(${TESTNAME} gtest fbgemm) ++ add_dependencies(${TESTNAME} fbgemm) + add_test(${TESTNAME} ${TESTNAME}) + set_target_properties(${TESTNAME} PROPERTIES FOLDER test) + endmacro()