gallo/atrip
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix mkl nix

Browse Source
This commit is contained in:
Alejandro Gallo 2022-08-08 18:13:32 +02:00
parent 0b9ec59599
commit a30c424781
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
shell.nix
View File

@ -1,6 +1,6 @@
{ compiler ? "gcc" { compiler ? "gcc"
, pkgs ? import <nixpkgs> {} , pkgs ? import <nixpkgs> {}
, with-mkl ? false , mkl ? false
, cuda ? false , cuda ? false
, docs ? true , docs ? true
}: }:
@ -13,7 +13,7 @@ let
openblas = import ./etc/nix/openblas.nix { inherit pkgs; }; openblas = import ./etc/nix/openblas.nix { inherit pkgs; };
mkl = import ./etc/nix/mkl.nix { pkgs = unfree-pkgs; }; mkl-pkg = import ./etc/nix/mkl.nix { pkgs = unfree-pkgs; };
cuda-pkg = if cuda then (import ./cuda.nix { pkgs = unfree-pkgs; }) else {}; cuda-pkg = if cuda then (import ./cuda.nix { pkgs = unfree-pkgs; }) else {};
in in
@ -73,7 +73,7 @@ pkgs.mkShell rec {
automake automake
pkg-config pkg-config
] ]
++ (if with-mkl then mkl.buildInputs else openblas.buildInputs) ++ (if mkl then mkl-pkg.buildInputs else openblas.buildInputs)
++ (if docs then docInputs else []) ++ (if docs then docInputs else [])
; ;
@ -90,6 +90,7 @@ pkgs.mkShell rec {
CC=${CC} CC=${CC}
LD=${LD} LD=${LD}
'' ''
+ (if mkl then mkl-pkg.shellHook else openblas.shellHook)
+ (if cuda then cuda-pkg.shellHook else "") + (if cuda then cuda-pkg.shellHook else "")
; ;