fwi: split into input and solver

All branches compile with several hacks.

garlic/apps/fwi/default.nix

@@ -4,7 +4,8 @@
 , tampi ? null
 , mcxx ? null
 , cc
-, gitBranch
+, gitBranch ? "garlic/tampi+send+oss+task"
+, fwiInput
 }:
 
 with stdenv.lib;
@@ -12,6 +13,7 @@ with stdenv.lib;
 assert !(tampi != null && mcxx == null);
 
 stdenv.mkDerivation rec {
+  inherit gitBranch;
   name = "fwi";
 
   src = builtins.fetchGit {
@@ -19,14 +21,20 @@ stdenv.mkDerivation rec {
     ref = "${gitBranch}";
   };
 
-  enableParallelBuilding = true;
+  enableParallelBuilding = false;
 
   buildInputs = [
     cc
   ]
-  ++ optional (mpi != null) mpi
+  ++ optional (mpi   != null) mpi
   ++ optional (tampi != null) tampi
-  ++ optional (mcxx != null) mcxx;
+  ++ optional (mcxx  != null) mcxx;
+
+  # FIXME: Correct this on the Makefile so we can just type "make fwi"
+  # FIXME: Allow multiple MPI implementations
+  postPatch = ''
+    sed -i 's/= OPENMPI$/= INTEL/g' Makefile
+  '';
 
   # FIXME: This is an ugly hack.
   # When using _GNU_SOURCE or any other definition used in features.h, we need
@@ -35,33 +43,25 @@ stdenv.mkDerivation rec {
   # below, reaches the command line of the preprocessing stage with gcc.
   preConfigure = ''
     export DEFINES=-D_GNU_SOURCE
-    export NANOS6_CONFIG_OVERRIDE=version.debug=true
+
+    make depend
+
+    cp ${fwiInput}/generated_model_params.h src/
   '';
   
   # 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 = [
-    "CC=${cc.cc.CC}"
+    #"COMPILER=GNU"
+    #"CC=${cc.cc.CC}"
+    "fwi"
   ];
 
-  postBuild = ''
-    make input
-  '';
-
-  #FIXME split the input in another derivation
   installPhase = ''
     mkdir -p $out/bin
     cp fwi $out/bin
-    cp ModelGenerator $out/bin
-    mv InputModels $out/bin
-    mkdir -p $out/etc/fwi
-    cp SetupParams/{fwi_frequencies.txt,fwi_params.txt} $out/etc/fwi
   '';
 
   programPath = "/bin/fwi";

garlic/apps/fwi/input.nix

@@ -0,0 +1,40 @@
+{
+  stdenv
+}:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+  name = "fwi-header";
+
+  src = builtins.fetchGit {
+    url = "https://gitlab.com/srodrb/BSC-FWI.git";
+    ref = "garlic/seq";
+  };
+
+  enableParallelBuilding = false;
+
+  # FIXME: This is an ugly hack.
+  # When using _GNU_SOURCE or any other definition used in features.h, we need
+  # 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
+  # below, reaches the command line of the preprocessing stage with gcc.
+  preConfigure = ''
+    export DEFINES=-D_GNU_SOURCE
+  '';
+  
+  # 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.
+  # Also, we need to compile it with the builder platform as target, as is going
+  # to be executed during the build to generate the src/generated_model_params.h
+  # header.
+  makeFlags = [ "COMPILER=GNU" "params" "input" ];
+
+  installPhase = ''
+    mkdir -p $out/
+    cp src/generated_model_params.h $out/
+    cp -r InputModels $out/
+  '';
+}

garlic/apps/index.nix

@@ -53,5 +53,10 @@
 
   hpccg = callPackage ./hpccg/default.nix { };
 
-  fwi = callPackage ./fwi/default.nix { };
+  fwi = rec {
+    input = callPackage ./fwi/input.nix { };
+    solver = callPackage ./fwi/default.nix {
+      fwiInput = input;
+    };
+  };
 }