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

Adds libnrm grafting.

parent ff1fe40c
Pipeline #5481 failed with stages
in 3 minutes and 45 seconds
......@@ -2,8 +2,8 @@
"fetch": {
"args": {
"fetchSubmodules": false,
"rev": "578c83c5f257844444e5823cb8e020087ae6e8d9",
"sha256": "0b1w29jsgp9spgxj6f5nlsshxrh5l6wvi75w0mg9p4fqbzy13ab9",
"rev": "221e2f59e4a8ed093f35cdf01340dd6560a93e09",
"sha256": "1cdcqxrpqa7syc6sv5imr3a3b9mav4hb9slzfc1wzirabrckw62r",
"url": "https://xgitlab.cels.anl.gov/argo/argonix.git"
},
"fn": "fetchgit"
......
......@@ -23,13 +23,16 @@
, stream-src ? fetched stream/pin.json
, lammps-src ? fetched lammps/pin.json
, #source overrides :tooling
, #source overrides: tooling
argotk-src ? builtins.fetchGit {inherit (fetched argotk/pin.json) url rev;}
, repoquality-src ? builtins.fetchGit {inherit (fetched repoquality/pin.json) url rev;}
, argonix-src ? builtins.fetchGit {inherit (fetched argonix/pin.json) url rev;}
, #used for hardware experiments.
sudoPath ? null
, #whether to rebuild apps when libnrm changes.
rebuildApps ? true
}:
let
callPackage = pkgs.lib.callPackageWith (pkgs // argopkgs);
......@@ -38,21 +41,35 @@ let
# library of nix expressions
argolib = import ../lib/utils.nix;
# Argo components (source overridabel via argument)
aml = callPackage ./aml {src=aml-src;};
nrm = callPackage ./nrm {src=nrm-src;};
containers = callPackage ./containers {src=containers-src;};
libnrm = callPackage ./libnrm {src=libnrm-src;};
libnrm-pmpi = libnrm.overrideAttrs (oldAttrs: rec {
aml = callPackage ./aml {src=aml-src;};
nrm = callPackage ./nrm {src=nrm-src;};
containers = callPackage ./containers {src=containers-src;};
libnrm = callPackage ./libnrm {src=libnrm-src;};
libnrm-pinned = callPackage ./libnrm {src=fetched libnrm/pin.json;};
libnrm-pmpi = libnrm.overrideAttrs (oldAttrs: rec {
configureFlags = "--enable-pmpi";
buildInputs = oldAttrs.buildInputs ++ [ pkgs.mpich2 ];
});
# applications (source overridable via argument)
amg = callPackage ./amg {nrmSupport=true;src=amg-src;};
qmcpack = callPackage ./qmcpack {nrmSupport=true;src=qmcpack-src;};
openmc = callPackage ./openmc {nrmSupport=true;src=openmc-src;};
stream = callPackage ./stream {nrmSupport=true;src=stream-src;};
lammps = callPackage ./lammps {nrmSupport=true;src=lammps-src;};
# applications with replaceDependency for libnrm.
repLibnrm = path: src: extra:
let
drv = callPackage path {
nrmSupport=true;
src=src;
libnrm=libnrm-pinned;
};
in if !rebuildApps then drv else pkgs.replaceLibnrm {
drv = drv;
oldDependency = libnrm-pinned;
newDependency = libnrm;
};
amg = repLibnrm ./amg amg-src {};
qmcpack = repLibnrm ./qmcpack qmcpack-src {};
openmc = repLibnrm ./openmc openmc-src {};
lammps = repLibnrm ./lammps lammps-src {};
stream = repLibnrm ./stream stream-src {iterationCount="20000";};
stream_test = repLibnrm ./stream stream-src {iterationCount="20";};
# data (static, non source overridable via arguments)
openmc-data = fetched openmc/data.json;
......@@ -161,13 +178,14 @@ let
zymake
#applications
(stream.override {iterationCount = "20000";})
#lammps
lammps
qmcpack
#openmc
#openmc-data
openmc
## amg is not ready, its progress report loop isn't tight enough.
#amg
amg
#data
openmc-data
];
OPENMC_CROSS_SECTIONS = "${openmc-data}/cross_sections.xml";
OPENMC_PWD = "${argotk}/share/openmc";
......
......@@ -2,8 +2,8 @@
"fetch": {
"args": {
"fetchSubmodules": false,
"rev": "15ad6c3e7f5ca96aea7459fa213b71cd18d3072f",
"sha256": "0papjvv6592z511qhmdqi6q4gfxm16w1nalkfp1p2k2vs9ijbfls",
"rev": "adccd038b8f335ee2e24dc04a1a969bc77636791",
"sha256": "1zvppkzchwjm961libh60y2izzrhsd00c9fccmp4icbdclf1i4bs",
"url": "https://xgitlab.cels.anl.gov/argo/libnrm.git"
},
"fn": "fetchgit"
......@@ -11,4 +11,4 @@
"rev": "refs/heads/master",
"type": "fetchgit",
"url": "https://xgitlab.cels.anl.gov/argo/libnrm.git"
}
}
\ No newline at end of file
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