mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
gnu: fbgemm: Update to 1.2.0.
Fixes guix/guix#2093 * gnu/packages/machine-learning.scm (fbgemm): Update to 1.2.0. * gnu/packages/patches/fbgemm-use-system-libraries.patch: Refresh for 1.2.0. Change-Id: Ibd93d254f64343eed11b6fd6f1d6075427b91678 Reviewed-by: David Elsing <david.elsing@posteo.net> @dtelsing Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
This commit is contained in:
parent
32795f39a4
commit
e86a3fe8e4
2 changed files with 15 additions and 15 deletions
|
@ -4720,7 +4720,7 @@ TensorFlow.js, PyTorch, and MediaPipe.")
|
||||||
(define-public fbgemm
|
(define-public fbgemm
|
||||||
(package
|
(package
|
||||||
(name "fbgemm")
|
(name "fbgemm")
|
||||||
(version "1.0.0")
|
(version "1.2.0")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
(uri (git-reference
|
(uri (git-reference
|
||||||
|
@ -4729,7 +4729,7 @@ TensorFlow.js, PyTorch, and MediaPipe.")
|
||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1a5g5f32377fad99xsfggqkwvl7vh5gc1wj77swa06x06lc1qwyw"))
|
"0fjs7179iq5hy6nl4nyswnmk90fz87zsg14p7i5bk2vbd2vrq8a3"))
|
||||||
(patches (search-patches "fbgemm-use-system-libraries.patch"))))
|
(patches (search-patches "fbgemm-use-system-libraries.patch"))))
|
||||||
(build-system cmake-build-system)
|
(build-system cmake-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
|
|
|
@ -1,19 +1,19 @@
|
||||||
Use the asmjit and cpuinfo packages.
|
Use the asmjit and cpuinfo packages.
|
||||||
|
|
||||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
diff --git i/CMakeLists.txt w/CMakeLists.txt
|
||||||
index 0243f686..f40dc408 100644
|
index 73b043ac..703204dd 100644
|
||||||
--- a/CMakeLists.txt
|
--- i/CMakeLists.txt
|
||||||
+++ b/CMakeLists.txt
|
+++ w/CMakeLists.txt
|
||||||
@@ -247,7 +247,7 @@ message(WARNING "CMAKE_CXX_FLAGS_DEBUG is ${CMAKE_CXX_FLAGS_DEBUG}")
|
@@ -258,7 +258,7 @@ message(STATUS "CMAKE_CXX_FLAGS_DEBUG is ${CMAKE_CXX_FLAGS_DEBUG}")
|
||||||
message(WARNING "CMAKE_CXX_FLAGS_RELEASE is ${CMAKE_CXX_FLAGS_RELEASE}")
|
message(STATUS "CMAKE_CXX_FLAGS_RELEASE is ${CMAKE_CXX_FLAGS_RELEASE}")
|
||||||
message(WARNING "==========")
|
message(STATUS "==========")
|
||||||
|
|
||||||
-if(NOT TARGET asmjit)
|
-if(NOT TARGET asmjit)
|
||||||
+if(FALSE)
|
+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)
|
if(NOT DEFINED ASMJIT_SRC_DIR)
|
||||||
set(ASMJIT_SRC_DIR "${FBGEMM_SOURCE_DIR}/external/asmjit"
|
set(ASMJIT_SRC_DIR "${FBGEMM_SOURCE_DIR}/external/asmjit"
|
||||||
@@ -280,7 +280,7 @@ if(NOT TARGET asmjit)
|
@@ -291,7 +291,7 @@ if(NOT TARGET asmjit)
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
@ -22,7 +22,7 @@ index 0243f686..f40dc408 100644
|
||||||
#Download cpuinfo from github if CPUINFO_SOURCE_DIR is not specified.
|
#Download cpuinfo from github if CPUINFO_SOURCE_DIR is not specified.
|
||||||
if(NOT DEFINED CPUINFO_SOURCE_DIR)
|
if(NOT DEFINED CPUINFO_SOURCE_DIR)
|
||||||
set(CPUINFO_SOURCE_DIR "${FBGEMM_SOURCE_DIR}/external/cpuinfo"
|
set(CPUINFO_SOURCE_DIR "${FBGEMM_SOURCE_DIR}/external/cpuinfo"
|
||||||
@@ -367,9 +367,12 @@ target_include_directories(fbgemm BEFORE
|
@@ -378,9 +378,12 @@ target_include_directories(fbgemm BEFORE
|
||||||
target_link_libraries(fbgemm
|
target_link_libraries(fbgemm
|
||||||
$<BUILD_INTERFACE:asmjit>
|
$<BUILD_INTERFACE:asmjit>
|
||||||
$<BUILD_INTERFACE:cpuinfo>)
|
$<BUILD_INTERFACE:cpuinfo>)
|
||||||
|
@ -38,10 +38,10 @@ index 0243f686..f40dc408 100644
|
||||||
|
|
||||||
if(OpenMP_FOUND)
|
if(OpenMP_FOUND)
|
||||||
target_link_libraries(fbgemm OpenMP::OpenMP_CXX)
|
target_link_libraries(fbgemm OpenMP::OpenMP_CXX)
|
||||||
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
|
diff --git i/test/CMakeLists.txt w/test/CMakeLists.txt
|
||||||
index da0be7fe..615f34ae 100644
|
index 1ddb2882..6e81c902 100644
|
||||||
--- a/test/CMakeLists.txt
|
--- i/test/CMakeLists.txt
|
||||||
+++ b/test/CMakeLists.txt
|
+++ w/test/CMakeLists.txt
|
||||||
@@ -14,7 +14,7 @@ set(CMAKE_C_STANDARD 17)
|
@@ -14,7 +14,7 @@ set(CMAKE_C_STANDARD 17)
|
||||||
set(CMAKE_C_EXTENSIONS OFF)
|
set(CMAKE_C_EXTENSIONS OFF)
|
||||||
set(CMAKE_C_STANDARD_REQUIRED ON)
|
set(CMAKE_C_STANDARD_REQUIRED ON)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue