Commit d12b8320 authored by Valentin Reis's avatar Valentin Reis
Browse files

Refactoring.

parent 77726a9d
{
"url": "https://xgitlab.cels.anl.gov/argo/applications/amg.git",
"rev": "0dba2c6921427179967cc7a0ed634d15f1aef332",
"date": "2018-11-01T09:06:46-05:00",
"sha256": "0fblwhf9kcciak9f8mkn3gqxs5f907n2wfiflhmr1cc3d1cn80dx",
"rev": "09fe8a78baf6ba5eaef7d2804f7b653885d60fee",
"date": "2018-02-07T02:03:46-08:00",
"sha256": "1iqdbkg4dm36qskbyfi30w6rw70g2r6mi0qhzavc21338bf4j9hy",
"fetchSubmodules": true
}
{ stdenv, fetchgit, mpich2}:
{ stdenv, src, fetchgit, mpich2}:
stdenv.mkDerivation {
inherit src;
name = "AMG";
src = fetchgit {
url="https://github.com/freuk/AMG.git";
sha256="1iqdbkg4dm36qskbyfi30w6rw70g2r6mi0qhzavc21338bf4j9hy";
rev = "09fe8a78baf6ba5eaef7d2804f7b653885d60fee";
};
#phases = ["unpackPhase" "installPhase"];
buildInputs = [mpich2];
#buildPhase = "make ZMQ_PATH=${zeromq} MPI_INCLUDE=${mpich2}";
#propagatedBuildInputs = [zulu];
installPhase = ''
mkdir -p $out/bin
cp test/amg $out/bin
......
{
"url": "https://xgitlab.cels.anl.gov/argo/applications/amg.git",
"rev": "d6440a7dd0b40b5dc353e3647ee7931f116eaed1",
"date": "2018-11-02T11:27:07-05:00",
"sha256": "1pw862lg4rm54dgccsr5qbj4dm55qb4blaf837ij7iyqa8f5w2da",
"fetchSubmodules": true
}
#!/usr/bin/env bash
nix-prefetch-git https://xgitlab.cels.anl.gov/argo/applications/amg.git refs/heads/progress-nrm > nrm.json
#!/usr/bin/env bash
nix-prefetch-git https://xgitlab.cels.anl.gov/argo/applications/openmc.git refs/heads/progress-nrm > nrm.json
{
"url": "https://xgitlab.cels.anl.gov/argo/applications/qmcpack.git",
"rev": "1009b07ad6fa873d71a0755747e6a7f610eb169b",
"date": "2018-08-01T17:48:30-05:00",
"sha256": "0fdlvmg0ri4mpwdxx4ky8mxc4rlkrq25smqld8b02lgjw1dvclki",
"fetchSubmodules": true
}
#!/usr/bin/env bash
nix-prefetch-git https://xgitlab.cels.anl.gov/argo/applications/qmcpack.git refs/heads/progress-nrm > nrm.json
#!/usr/bin/env bash
nix-prefetch-git https://xgitlab.cels.anl.gov/argo/applications/stream.git refs/heads/progress-nrm > nrm.json
......@@ -29,6 +29,7 @@ let
cpDefaultPin = folderPath: depset: callPackagePinWith { inherit folderPath depset;};
cpAlternatePin = folderPath: depset: jsonName: callPackagePinWith {inherit folderPath depset jsonName;};
cpBothAlternatePin = folderPath: depset: jsonName: callPackagePinWith {inherit folderPath depset jsonName; nixName=jsonName;};
pythonPackages = pkgs.python27Packages;
in rec {
#NRM components
......@@ -43,14 +44,21 @@ in rec {
#Instrumented applications
applications = rec {
#lammps = pkgs.lammps-mpi;
amg = cpDefaultPin applications/amg;
qmcpack = cpDefaultPin applications/qmcpack;
openmc = cpDefaultPin applications/openmc;
stream = cpDefaultPin applications/stream;
lammps = cpDefaultPin applications/lammps;
graph500 = cpAlternatePin applications/simple {} "graph500";
simple = cpAlternatePin applications/simple {inherit intel; inherit (nodelevel) libnrm;} "dgemm_randomwalk";
paths = {
amg = applications/amg;
qmcpack = applications/qmcpack;
openmc = applications/openmc;
stream = applications/stream;
lammps = applications/lammps;
};
raw = builtins.mapAttrs (n: path: cpDefaultPin path {}) paths;
nrm = builtins.mapAttrs (n: path: (cpAlternatePin path {} "nrm").overrideAttrs (oldAttrs: {buildInputs = oldAttrs.buildInputs ++ [nodelevel.libnrm];})) paths;
#{inherit (nodelevel) libnrm;};
dgemm_randomwalk = cpBothAlternatePin applications/simple {inherit intel; inherit (nodelevel) libnrm;} "dgemm_randomwalk";
graph500 = cpBothAlternatePin applications/simple { inherit (nodelevel) libnrm;} "graph500";
};
#Intel compilers
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment