From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id YDCbFUjH6GVTBgAAqHPOHw:P1 (envelope-from ) for ; Wed, 06 Mar 2024 20:43:04 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id YDCbFUjH6GVTBgAAqHPOHw (envelope-from ) for ; Wed, 06 Mar 2024 20:43:04 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=P7hTO4dT; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1709754184; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=Z29iWkc8je6LcNSbpNwRGzfjJA+czmp8fbgI6qx+D3k=; b=WdEuDZBmpGyonQyi12xYoGGzMakB09Dx0OeghkBLR+yvbcCpthzthBY6GFnVgi6QFmYMuN G1gsj1KcBF1IJ9yv1lNdpYghoJNBbSWTB3KbqulHiKkulGEWUIkggUm/VjZ2nN4k/ofiwA sKk166/2WgMOQLwWyShYhJRQkPrS5TM3l/CWbRuV2hEOp7wYbO322LTas5CPtlZEwlSCYv 2PSFzWSKhThCRNdlb/HXpQXu+4+F/dHlpknlhGyoVmWyXPIdGsFYxf8fZDZN+dkTu5U8FW jk1ZhRxEMzsgToMS3ka5uCI7uxinfHV1oYZMDTj2OHAcL0nnvdoxPJ1h6xTdHw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=P7hTO4dT; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1709754184; a=rsa-sha256; cv=none; b=rdXOyvRE4vdRah6JQwL8y/hTS7SpCNDLv/ctyt9ngz0rgPNYxVnAdlrIOdQt1cysoHmEzN wwe+mo4Wyb8JWIn9iZ2x2YyX3vM9UVl8Vqn8bMNd25HrCfIsPfXTi1etiVyA10K+QaZ4gH 6r/FjxaUGakYzWbSYrY2q1tLvzI3/kryWy74uIPKMmljonOD4b1m6CjeAqhLlBpKnWOjI/ fPSwT89YbSnOaZ6nKBueUE5LymY3UKgG4VZ/OORnULsajngeyVAASHoZzd0b6n7GuJDTph jLUFQt879JU8j4f9mNoCuCawv877L1vj46666GzmSrQFoW/fuFGZjryESooahg== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 22B89604DA for ; Wed, 6 Mar 2024 20:43:03 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rhx9z-0002aL-KA; Wed, 06 Mar 2024 14:42:39 -0500 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 1rhx9w-0002TF-Ia for guix-patches@gnu.org; Wed, 06 Mar 2024 14:42:36 -0500 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 1rhx9v-0006T7-9v for guix-patches@gnu.org; Wed, 06 Mar 2024 14:42:35 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rhxAQ-0008K7-7I for guix-patches@gnu.org; Wed, 06 Mar 2024 14:43:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69591] [PATCH 19/31] gnu: Add fbgemm. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 06 Mar 2024 19:43:06 +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.170975414831818 (code B ref 69591); Wed, 06 Mar 2024 19:43:06 +0000 Received: (at 69591) by debbugs.gnu.org; 6 Mar 2024 19:42:28 +0000 Received: from localhost ([127.0.0.1]:51575 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rhx9m-0008H6-LH for submit@debbugs.gnu.org; Wed, 06 Mar 2024 14:42:28 -0500 Received: from mout02.posteo.de ([185.67.36.66]:40203) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rhx93-0008Ag-7a for 69591@debbugs.gnu.org; Wed, 06 Mar 2024 14:41:44 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 9B79E240104 for <69591@debbugs.gnu.org>; Wed, 6 Mar 2024 20:41:04 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1709754064; bh=9+Hnz6Fhu7wyWjP8S6SYKQNuWPWQUsZ23O2WjAE5i84=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=P7hTO4dT0mgrpGHl1hKiiWfxFGNOfZmlZ26Zttu61L3YwaosJ8qzg4qW2XxOX1tBQ tu3dEtT3r9ideO1KBU8n5wucJpA2pdP72rhEEdFHviQjU7kW05rW8g1bexWt/jBpL9 pK7ygOZCkE4x2IsIu6G8CbdE3Sul5Y7M8Nj8sUvspYvjE+QBpupn4N/eUbr04pX++b 5ID+fAcAbFrfYreEi3j4wXX4lSxT87DK6533MO5BYE+dF5a0p7kir/fwV98ZvrWhgQ VvJATxT0LSX6w7WtvguhhDQnfTwNZkzC73ZpoWcdPL16KAG/lKgrN8rfuzJmTUVjaM pgayUlpFJnRhw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4TqjTr15Hvz6twD; Wed, 6 Mar 2024 20:41:04 +0100 (CET) From: David Elsing Date: Wed, 6 Mar 2024 19:40:25 +0000 Message-ID: <20240306194037.17992-19-david.elsing@posteo.net> In-Reply-To: <20240306193725.17463-1-david.elsing@posteo.net> References: <20240306193725.17463-1-david.elsing@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: 5.52 X-Spam-Score: 5.52 X-Migadu-Queue-Id: 22B89604DA X-TUID: e1bLRywcO07v * 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 c290d91cbb..f81ea13031 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1172,6 +1172,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 a58ccfbd5c..5825955d3e 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -4100,6 +4100,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() -- 2.41.0