public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #114415 from nagy/dlib-sse4

Browse Source 
dlib: support sse4
This commit is contained in:
Maximilian Bosch 2021-02-26 00:32:38 +01:00 committed by GitHub
commit f4c6b379d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/dlib/default.nix
View File

@ -2,6 +2,7 @@
, guiSupport ? false, libX11 , guiSupport ? false, libX11
# see http://dlib.net/compile.html # see http://dlib.net/compile.html
, sse4Support ? stdenv.hostPlatform.sse4_1Support
, avxSupport ? stdenv.hostPlatform.avxSupport , avxSupport ? stdenv.hostPlatform.avxSupport
, cudaSupport ? true , cudaSupport ? true
}: }:
@ -23,6 +24,7 @@ stdenv.mkDerivation rec {
cmakeFlags = [ cmakeFlags = [
"-DUSE_DLIB_USE_CUDA=${if cudaSupport then "1" else "0"}" "-DUSE_DLIB_USE_CUDA=${if cudaSupport then "1" else "0"}"
"-DUSE_SSE4_INSTRUCTIONS=${if sse4Support then "yes" else "no"}"
"-DUSE_AVX_INSTRUCTIONS=${if avxSupport then "yes" else "no"}" ]; "-DUSE_AVX_INSTRUCTIONS=${if avxSupport then "yes" else "no"}" ];
nativeBuildInputs = [ cmake pkg-config ]; nativeBuildInputs = [ cmake pkg-config ];

6
pkgs/development/python-modules/dlib/default.nix
View File

@ -1,4 +1,5 @@
{ buildPythonPackage, stdenv, lib, dlib, python, pytest, more-itertools { buildPythonPackage, stdenv, lib, dlib, python, pytest, more-itertools
, sse4Support ? stdenv.hostPlatform.sse4_1Support
, avxSupport ? stdenv.hostPlatform.avxSupport , avxSupport ? stdenv.hostPlatform.avxSupport
}: }:
@ -12,7 +13,10 @@ buildPythonPackage {
${python.interpreter} nix_run_setup test --no USE_AVX_INSTRUCTIONS ${python.interpreter} nix_run_setup test --no USE_AVX_INSTRUCTIONS
''; '';
setupPyBuildFlags = lib.optional avxSupport "--no USE_AVX_INSTRUCTIONS"; setupPyBuildFlags = [
"--set USE_SSE4_INSTRUCTIONS=${if sse4Support then "yes" else "no"}"
"--set USE_AVX_INSTRUCTIONS=${if avxSupport then "yes" else "no"}"
];
patches = [ ./build-cores.patch ]; patches = [ ./build-cores.patch ];