summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/machine-learning.scm4
-rw-r--r--gnu/packages/patches/fbgemm-use-system-libraries.patch26
2 files changed, 15 insertions, 15 deletions
diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm
index 015451f4a7f..d231c98beba 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -4720,7 +4720,7 @@ TensorFlow.js, PyTorch, and MediaPipe.")
4720(define-public fbgemm 4720(define-public fbgemm
4721 (package 4721 (package
4722 (name "fbgemm") 4722 (name "fbgemm")
4723 (version "1.0.0") 4723 (version "1.2.0")
4724 (source (origin 4724 (source (origin
4725 (method git-fetch) 4725 (method git-fetch)
4726 (uri (git-reference 4726 (uri (git-reference
@@ -4729,7 +4729,7 @@ TensorFlow.js, PyTorch, and MediaPipe.")
4729 (file-name (git-file-name name version)) 4729 (file-name (git-file-name name version))
4730 (sha256 4730 (sha256
4731 (base32 4731 (base32
4732 "1a5g5f32377fad99xsfggqkwvl7vh5gc1wj77swa06x06lc1qwyw")) 4732 "0fjs7179iq5hy6nl4nyswnmk90fz87zsg14p7i5bk2vbd2vrq8a3"))
4733 (patches (search-patches "fbgemm-use-system-libraries.patch")))) 4733 (patches (search-patches "fbgemm-use-system-libraries.patch"))))
4734 (build-system cmake-build-system) 4734 (build-system cmake-build-system)
4735 (arguments 4735 (arguments
diff --git a/gnu/packages/patches/fbgemm-use-system-libraries.patch b/gnu/packages/patches/fbgemm-use-system-libraries.patch
index a799443f1da..37d690f156a 100644
--- a/gnu/packages/patches/fbgemm-use-system-libraries.patch
+++ b/gnu/packages/patches/fbgemm-use-system-libraries.patch
@@ -1,19 +1,19 @@
1Use the asmjit and cpuinfo packages. 1Use the asmjit and cpuinfo packages.
2 2
3diff --git a/CMakeLists.txt b/CMakeLists.txt 3diff --git i/CMakeLists.txt w/CMakeLists.txt
4index 0243f686..f40dc408 100644 4index 73b043ac..703204dd 100644
5--- a/CMakeLists.txt 5--- i/CMakeLists.txt
6+++ b/CMakeLists.txt 6+++ w/CMakeLists.txt
7@@ -247,7 +247,7 @@ message(WARNING "CMAKE_CXX_FLAGS_DEBUG is ${CMAKE_CXX_FLAGS_DEBUG}") 7@@ -258,7 +258,7 @@ message(STATUS "CMAKE_CXX_FLAGS_DEBUG is ${CMAKE_CXX_FLAGS_DEBUG}")
8 message(WARNING "CMAKE_CXX_FLAGS_RELEASE is ${CMAKE_CXX_FLAGS_RELEASE}") 8 message(STATUS "CMAKE_CXX_FLAGS_RELEASE is ${CMAKE_CXX_FLAGS_RELEASE}")
9 message(WARNING "==========") 9 message(STATUS "==========")
10 10
11-if(NOT TARGET asmjit) 11-if(NOT TARGET asmjit)
12+if(FALSE) 12+if(FALSE)
13 # Download asmjit from github if ASMJIT_SRC_DIR is not specified. 13 # Download asmjit from github if ASMJIT_SRC_DIR is not specified.
14 if(NOT DEFINED ASMJIT_SRC_DIR) 14 if(NOT DEFINED ASMJIT_SRC_DIR)
15 set(ASMJIT_SRC_DIR "${FBGEMM_SOURCE_DIR}/external/asmjit" 15 set(ASMJIT_SRC_DIR "${FBGEMM_SOURCE_DIR}/external/asmjit"
16@@ -280,7 +280,7 @@ if(NOT TARGET asmjit) 16@@ -291,7 +291,7 @@ if(NOT TARGET asmjit)
17 endif() 17 endif()
18 endif() 18 endif()
19 19
@@ -22,7 +22,7 @@ index 0243f686..f40dc408 100644
22 #Download cpuinfo from github if CPUINFO_SOURCE_DIR is not specified. 22 #Download cpuinfo from github if CPUINFO_SOURCE_DIR is not specified.
23 if(NOT DEFINED CPUINFO_SOURCE_DIR) 23 if(NOT DEFINED CPUINFO_SOURCE_DIR)
24 set(CPUINFO_SOURCE_DIR "${FBGEMM_SOURCE_DIR}/external/cpuinfo" 24 set(CPUINFO_SOURCE_DIR "${FBGEMM_SOURCE_DIR}/external/cpuinfo"
25@@ -367,9 +367,12 @@ target_include_directories(fbgemm BEFORE 25@@ -378,9 +378,12 @@ target_include_directories(fbgemm BEFORE
26 target_link_libraries(fbgemm 26 target_link_libraries(fbgemm
27 $<BUILD_INTERFACE:asmjit> 27 $<BUILD_INTERFACE:asmjit>
28 $<BUILD_INTERFACE:cpuinfo>) 28 $<BUILD_INTERFACE:cpuinfo>)
@@ -38,10 +38,10 @@ index 0243f686..f40dc408 100644
38 38
39 if(OpenMP_FOUND) 39 if(OpenMP_FOUND)
40 target_link_libraries(fbgemm OpenMP::OpenMP_CXX) 40 target_link_libraries(fbgemm OpenMP::OpenMP_CXX)
41diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt 41diff --git i/test/CMakeLists.txt w/test/CMakeLists.txt
42index da0be7fe..615f34ae 100644 42index 1ddb2882..6e81c902 100644
43--- a/test/CMakeLists.txt 43--- i/test/CMakeLists.txt
44+++ b/test/CMakeLists.txt 44+++ w/test/CMakeLists.txt
45@@ -14,7 +14,7 @@ set(CMAKE_C_STANDARD 17) 45@@ -14,7 +14,7 @@ set(CMAKE_C_STANDARD 17)
46 set(CMAKE_C_EXTENSIONS OFF) 46 set(CMAKE_C_EXTENSIONS OFF)
47 set(CMAKE_C_STANDARD_REQUIRED ON) 47 set(CMAKE_C_STANDARD_REQUIRED ON)