mirror of
https://git.savannah.gnu.org/git/guix.git
synced 2025-02-07 11:29:59 +01:00
9a6221e76c
* 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>
62 lines
2 KiB
Diff
62 lines
2 KiB
Diff
Use the asmjit and cpuinfo packages.
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 0243f686..f40dc408 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -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.
|
|
if(NOT DEFINED ASMJIT_SRC_DIR)
|
|
set(ASMJIT_SRC_DIR "${FBGEMM_SOURCE_DIR}/external/asmjit"
|
|
@@ -280,7 +280,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}/external/cpuinfo"
|
|
@@ -367,9 +367,12 @@ target_include_directories(fbgemm BEFORE
|
|
target_link_libraries(fbgemm
|
|
$<BUILD_INTERFACE:asmjit>
|
|
$<BUILD_INTERFACE:cpuinfo>)
|
|
-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 da0be7fe..615f34ae 100644
|
|
--- a/test/CMakeLists.txt
|
|
+++ b/test/CMakeLists.txt
|
|
@@ -14,7 +14,7 @@ set(CMAKE_C_STANDARD 17)
|
|
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()
|