nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

* gnu/packages/graph.scm (python-faiss)[arguments]: Adjust custom
'build-swig phase to change build flags for different archictures.
This commit is contained in:
Efraim Flashner 2019-03-29 17:06:58 +03:00
parent 3776dc094c
commit 8339ccac5f
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gnu/packages/graph.scm
View File

@ -358,16 +358,15 @@ CPUFLAGS = ~{~a ~}~%"
(assoc-ref inputs "python*") python-version (assoc-ref inputs "python*") python-version
(assoc-ref inputs "python-numpy") python-version (assoc-ref inputs "python-numpy") python-version
python-version python-version
(cons "-mpopcnt"
(list ,@(let ((system (or (%current-target-system) (list ,@(let ((system (or (%current-target-system)
(%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* "Makefile" (substitute* "Makefile"
(("../libfaiss.a") "")) (("../libfaiss.a") ""))
(invoke "make" "cpu")))))) (invoke "make" "cpu"))))))