rarias/bscpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add ifort to intel compilers

Browse Source
This commit is contained in:
Rodrigo Arias 2020-07-10 13:42:55 +02:00
parent 0daa0b9c35
commit 261d304961
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bsc/intel-compiler/default.nix
View File

@ -5,7 +5,7 @@
, icc-unwrapped , icc-unwrapped
, wrapCCWith , wrapCCWith
, libstdcxxHook , libstdcxxHook
, icc-license , intel-license
}: }:
let let
@ -18,7 +18,7 @@ in wrapCCWith rec {
echo "-L${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}" >> $out/nix-support/cc-ldflags echo "-L${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}" >> $out/nix-support/cc-ldflags
echo "-L${gcc.cc.lib}/lib" >> $out/nix-support/cc-ldflags echo "-L${gcc.cc.lib}/lib" >> $out/nix-support/cc-ldflags
echo "export INTEL_LICENSE_FILE=${icc-license}" \ echo "export INTEL_LICENSE_FILE=${intel-license}" \
>> $out/nix-support/setup-hook >> $out/nix-support/setup-hook
# Create the wrappers for icc and icpc # Create the wrappers for icc and icpc

3
bsc/intel-compiler/icc2020.nix
View File

@ -3,6 +3,7 @@
, rpmextract , rpmextract
, autoPatchelfHook , autoPatchelfHook
, gcc , gcc
, intel-mpi
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -27,6 +28,7 @@ stdenv.mkDerivation rec {
rpmextract rpmextract
autoPatchelfHook autoPatchelfHook
gcc.cc.lib gcc.cc.lib
intel-mpi
]; ];
installPhase = '' installPhase = ''
@ -34,6 +36,7 @@ stdenv.mkDerivation rec {
rpmextract rpm/intel-comp-*.rpm rpmextract rpm/intel-comp-*.rpm
rpmextract rpm/intel-c-comp-*.rpm rpmextract rpm/intel-c-comp-*.rpm
rpmextract rpm/intel-openmp*.rpm rpmextract rpm/intel-openmp*.rpm
rpmextract rpm/intel-ifort*.rpm
mkdir -p $out/{bin,lib,include} mkdir -p $out/{bin,lib,include}

5
default.nix
View File

@ -47,15 +47,16 @@ let
# By default we use Intel compiler 2020 update 1 # By default we use Intel compiler 2020 update 1
icc-unwrapped = icc2020-unwrapped; icc-unwrapped = icc2020-unwrapped;
icc2020-unwrapped = callPackage ./bsc/intel-compiler/icc2020.nix { icc2020-unwrapped = callPackage ./bsc/intel-compiler/icc2020.nix {
intel-mpi = intel-mpi-2019;
}; };
# A wrapper script that puts all the flags and environment vars properly and # A wrapper script that puts all the flags and environment vars properly and
# calls the intel compiler binary # calls the intel compiler binary
icc = callPackage bsc/intel-compiler/default.nix { icc = callPackage bsc/intel-compiler/default.nix {
inherit icc-unwrapped icc-license; inherit icc-unwrapped intel-license;
}; };
icc-license = callPackage bsc/intel-compiler/license.nix { intel-license = callPackage bsc/intel-compiler/license.nix {
}; };
fftw = callPackage ./bsc/fftw/default.nix { fftw = callPackage ./bsc/fftw/default.nix {