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

fwi: disable nanos6 in ModelGenerator

Browse Source
This commit is contained in:
Rodrigo Arias 2020-12-04 11:17:15 +01:00
parent eb4adf9520
commit d70316a25a
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
garlic/apps/fwi/default.nix
View File

@ -8,16 +8,14 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "nbody"; name = "fwi";
variant = "4_MPI_ompss"; variant = "oss+task";
src = builtins.fetchGit { src = builtins.fetchGit {
url = "https://gitlab.com/srodrb/BSC-FWI.git"; url = "https://gitlab.com/srodrb/BSC-FWI.git";
ref = "ompss-mpi-nocache"; ref = "${variant}";
}; };
postUnpack = "sourceRoot=$sourceRoot/${variant}";
enableParallelBuilding = true; enableParallelBuilding = true;
buildInputs = [ buildInputs = [
@ -33,8 +31,17 @@ stdenv.mkDerivation rec {
# to define them before mcc includes nanos6.h from the command line. So the # to define them before mcc includes nanos6.h from the command line. So the
# only chance is by setting it at the command line with -D. Using the DEFINES # only chance is by setting it at the command line with -D. Using the DEFINES
# below, reaches the command line of the preprocessing stage with gcc. # below, reaches the command line of the preprocessing stage with gcc.
preBuild = '' preConfigure = ''
export DEFINES=-D_GNU_SOURCE export DEFINES=-D_GNU_SOURCE
export NANOS6_CONFIG_OVERRIDE=version.debug=true
'';
# We compile the ModelGenerator using gcc *only*, as otherwise it will
# be compiled with nanos6, which requires access to /sys to determine
# hardware capabilities. So it will fail in the nix-build environment,
# as there is no /sys mounted.
preBuild = ''
make COMPILER=GNU ModelGenerator
''; '';
makeFlags = [ makeFlags = [
@ -46,7 +53,7 @@ stdenv.mkDerivation rec {
installPhase = '' installPhase = ''
mkdir -p $out/bin mkdir -p $out/bin
cp fwi.* $out/bin cp fwi $out/bin
cp ModelGenerator $out/bin cp ModelGenerator $out/bin
''; '';
} }

4
overlay.nix
View File

@ -310,6 +310,8 @@ let
ifsker = callPackage ./garlic/apps/ifsker/default.nix { }; ifsker = callPackage ./garlic/apps/ifsker/default.nix { };
fwi = callPackage ./garlic/apps/fwi { };
# heat = callPackage ./garlic/apps/heat/default.nix { # heat = callPackage ./garlic/apps/heat/default.nix {
# # FIXME: The heat program must be able to compile with gcc9 and newer # # FIXME: The heat program must be able to compile with gcc9 and newer
# stdenv = self.gcc7Stdenv; # stdenv = self.gcc7Stdenv;
@ -330,8 +332,6 @@ let
# }; # };
# #
# hpccg = callPackage ./garlic/apps/hpccg { }; # hpccg = callPackage ./garlic/apps/hpccg { };
#
# fwi = callPackage ./garlic/apps/fwi { };
}; };
# Execution stages # Execution stages