diff options
| author | David Elsing <[email protected]> | 2024-03-23 22:04:58 +0000 |
|---|---|---|
| committer | Ludovic Courtès <[email protected]> | 2024-06-18 11:43:46 +0200 |
| commit | ca63ef4f5b62bd6b3adcee6e9f00d69be3e26398 (patch) | |
| tree | 2722bf4da7019e690398334c1991eb947acb9e65 /gnu/packages/patches/fbgemm-use-system-libraries.patch | |
| parent | c45b370385e35a9d6444b16017cf08c97e1463ae (diff) | |
gnu: Add fbgemm.
* gnu/packages/machine-learning.scm (fbgemm): New variable.
* gnu/packages/patches/fbgemm-use-system-libraries.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
Diffstat (limited to 'gnu/packages/patches/fbgemm-use-system-libraries.patch')
| -rw-r--r-- | gnu/packages/patches/fbgemm-use-system-libraries.patch | 62 |
1 files changed, 62 insertions, 0 deletions
diff --git a/gnu/packages/patches/fbgemm-use-system-libraries.patch b/gnu/packages/patches/fbgemm-use-system-libraries.patch new file mode 100644 index 0000000000..456bc3021c --- /dev/null +++ b/gnu/packages/patches/fbgemm-use-system-libraries.patch @@ -0,0 +1,62 @@ +Use the asmjit and cpuinfo packages. + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 134523e..b88b0e7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -235,7 +235,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}/third_party/asmjit" +@@ -264,7 +264,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}/third_party/cpuinfo" +@@ -340,9 +340,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 2cffddf..bd4d409 100644 +--- a/test/CMakeLists.txt ++++ b/test/CMakeLists.txt +@@ -14,7 +14,7 @@ set(CMAKE_C_STANDARD 11) + 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() |