mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
gnu: fbgemm: Update to 1.0.0.
* gnu/packages/machine-learning.scm (fbgemm): Update to 1.0.0. [arguments]: Add #:cmake. * gnu/packages/patches/fbgemm-use-system-libraries.patch: Adjust patch. Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
parent
598907dbd0
commit
9a6221e76c
2 changed files with 13 additions and 15 deletions
|
@ -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)
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue