Subject: [bug#75708] [PATCH v2 10/14] gnu: fbgemm: Update to 1.0.0.

From: David Elsing <[email-masked]>
Date: Wed, 22 Jan 2025 18:32:21 +0000

* gnu/packages/machine-learning.scm (fbgemm): Update to 1.0.0.
[arguments]: Add #:cmake.
* gnu/packages/patches/fbgemm-use-system-libraries.patch: Adjust patch.
---
 gnu/packages/machine-learning.scm              | 10 ++++------
 .../patches/fbgemm-use-system-libraries.patch  | 18 +++++++++---------
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm
index cbeef84f06..7e044f816f 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -4539,7 +4539,7 @@ (define-public xnnpack-for-r-torch
 (define-public fbgemm
   (package
     (name "fbgemm")
-    (version "0.7.0")
+    (version "1.0.0")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -4548,14 +4548,12 @@ (define-public fbgemm
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1dzw9w82ca0hss1lvshix6piwsd0k11lyq9pzm8yg8k7j56hmyig"))
-              (patches (search-patches "fbgemm-use-system-libraries.patch"))
-              (modules '((guix build utils)))
-              (snippet
-               '(delete-file-recursively "third_party"))))
+                "1a5g5f32377fad99xsfggqkwvl7vh5gc1wj77swa06x06lc1qwyw"))
+              (patches (search-patches "fbgemm-use-system-libraries.patch"))))
     (build-system cmake-build-system)
     (arguments
      (list
+      #:cmake cmake-3.30
       #:configure-flags
       ''("-DFBGEMM_LIBRARY_TYPE=shared")
       ;; Tests require AVX2 or AVX-512 instructions
diff --git a/gnu/packages/patches/fbgemm-use-system-libraries.patch b/gnu/packages/patches/fbgemm-use-system-libraries.patch
index 456bc3021c..a799443f1d 100644
--- a/gnu/packages/patches/fbgemm-use-system-libraries.patch
+++ b/gnu/packages/patches/fbgemm-use-system-libraries.patch
@@ -1,19 +1,19 @@
 Use the asmjit and cpuinfo packages.
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 134523e..b88b0e7 100644
+index 0243f686..f40dc408 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -235,7 +235,7 @@ message(WARNING "CMAKE_CXX_FLAGS_DEBUG is ${CMAKE_CXX_FLAGS_DEBUG}")
+@@ -247,7 +247,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.
+   # 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)
+     set(ASMJIT_SRC_DIR "${FBGEMM_SOURCE_DIR}/external/asmjit"
+@@ -280,7 +280,7 @@ if(NOT TARGET asmjit)
    endif()
  endif()
  
@@ -21,8 +21,8 @@ index 134523e..b88b0e7 100644
 +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
+     set(CPUINFO_SOURCE_DIR "${FBGEMM_SOURCE_DIR}/external/cpuinfo"
+@@ -367,9 +367,12 @@ target_include_directories(fbgemm BEFORE
  target_link_libraries(fbgemm
    $<BUILD_INTERFACE:asmjit>
    $<BUILD_INTERFACE:cpuinfo>)
@@ -39,10 +39,10 @@ index 134523e..b88b0e7 100644
  if(OpenMP_FOUND)
    target_link_libraries(fbgemm OpenMP::OpenMP_CXX)
 diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
-index 2cffddf..bd4d409 100644
+index da0be7fe..615f34ae 100644
 --- a/test/CMakeLists.txt
 +++ b/test/CMakeLists.txt
-@@ -14,7 +14,7 @@ set(CMAKE_C_STANDARD 11)
+@@ -14,7 +14,7 @@ set(CMAKE_C_STANDARD 17)
  set(CMAKE_C_EXTENSIONS OFF)
  set(CMAKE_C_STANDARD_REQUIRED ON)
  
-- 
2.46.0