me
/
guix
Archived
1
0
Fork 0
Code

gnu: faiss: Fix building on non-Intel architectures. 

* gnu/packages/graph.scm (faiss)[source]: Add snippet to wrap Intel
specific headers.
[arguments]: Adjust custom 'prepare-build phase to adjust compile flags
for different architectures.
master
Efraim Flashner 2019-03-29 17:06:00 +03:00
parent 4774677228
commit 3776dc094c
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gnu/packages/graph.scm
View File

@ -2,6 +2,7 @@
;;; Copyright © 2017, 2018, 2019 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2017, 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2018 Joshua Sierles, Nextjournal <joshua@nextjournal.com> ;;; Copyright © 2018 Joshua Sierles, Nextjournal <joshua@nextjournal.com>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Efraim Flashner <efraim@flashner.co.il>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -256,7 +257,14 @@ subplots, multiple-axes, polar charts, and bubble charts. ")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0pk15jfa775cy2pqmzq62nhd6zfjxmpvz5h731197c28aq3zw39w")))) "0pk15jfa775cy2pqmzq62nhd6zfjxmpvz5h731197c28aq3zw39w"))
(modules '((guix build utils)))
(snippet
'(begin
(substitute* "utils.cpp"
(("#include <immintrin.h>")
"#ifdef __SSE__\n#include <immintrin.h>\n#endif"))
#t))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags
@ -270,12 +278,14 @@ subplots, multiple-axes, polar charts, and bubble charts. ")
(%current-system)))) (%current-system))))
(cond (cond
((string-prefix? "x86_64" system) ((string-prefix? "x86_64" system)
'("-mavx" "-msse2")) '("-mavx" "-msse2" "-mpopcnt"))
((string-prefix? "i686" system) ((string-prefix? "i686" system)
'("-msse2")) '("-msse2" "-mpopcnt"))
(else (else
'())))))) '()))))))
(substitute* "CMakeLists.txt" (substitute* "CMakeLists.txt"
(("-m64") "")
(("-mpopcnt") "") ; only some architectures
(("-msse4") (("-msse4")
(string-append (string-append
(string-join features) (string-join features)