Commit b5391770 authored by Valentin Reis's avatar Valentin Reis

Merge branch 'nrm-gen'

parents bdc6f729 4b6fdf4d
Pipeline #7317 passed with stages
in 33 minutes and 52 seconds
...@@ -6,6 +6,8 @@ let cn = "testContainer" ...@@ -6,6 +6,8 @@ let cn = "testContainer"
let basicManifest = lib.manifestDir ++ "basic.json" let basicManifest = lib.manifestDir ++ "basic.json"
let singularityManifest = lib.manifestDir ++ "singularity.json"
let argIfTest = let argIfTest =
λ(isTest : Bool) λ(isTest : Bool)
→ { isTest = → { isTest =
...@@ -16,7 +18,24 @@ let argIfTest = ...@@ -16,7 +18,24 @@ let argIfTest =
let Powercap = < Cap : Text | NoCap : {} > let Powercap = < Cap : Text | NoCap : {} >
in { run = in { run-singularity =
lib.makeBase
( lib.emptyMakeBaseArg "echo" singularityManifest cn
⫽ { args =
[ message ]
, verbose =
True
, singularity =
True
, cmdwants =
[] : List Text
, cmdavoids =
[ "Traceback" ]
, timeout =
[ 600 ] : Optional Natural
}
)
, run =
lib.makeBase lib.makeBase
( lib.emptyMakeBaseArg "echo" basicManifest cn ( lib.emptyMakeBaseArg "echo" basicManifest cn
⫽ { args = ⫽ { args =
......
...@@ -67,6 +67,8 @@ let MakeBaseArg = ...@@ -67,6 +67,8 @@ let MakeBaseArg =
List Text List Text
, verbose : , verbose :
Bool Bool
, singularity :
Bool
, cmdwants : , cmdwants :
List Text List Text
, cmdavoids : , cmdavoids :
...@@ -96,6 +98,8 @@ let emptyMakeBaseArg = ...@@ -96,6 +98,8 @@ let emptyMakeBaseArg =
, args = , args =
[] : List Text [] : List Text
, verbose = , verbose =
True
, singularity =
False False
, cmdwants = , cmdwants =
[] : List Text [] : List Text
...@@ -116,6 +120,10 @@ let emptyMakeBaseArg = ...@@ -116,6 +120,10 @@ let emptyMakeBaseArg =
let addVerbose = λ(v : Bool) → if v then [ "--verbose" ] else [] : List Text let addVerbose = λ(v : Bool) → if v then [ "--verbose" ] else [] : List Text
let addSingularity =
λ(v : Bool)
→ if v then [ "--container-runtime", "singularity" ] else [] : List Text
let addPowercap = let addPowercap =
λ(p : Powercap) λ(p : Powercap)
→ merge → merge
...@@ -142,6 +150,7 @@ let makeBase = ...@@ -142,6 +150,7 @@ let makeBase =
⫽ { args = ⫽ { args =
[ "--nrm_log", "./nrm_log" ] [ "--nrm_log", "./nrm_log" ]
# addVerbose args.verbose # addVerbose args.verbose
# addSingularity args.singularity
# addPowercap args.powercap # addPowercap args.powercap
, vars = , vars =
[ { varname = [ { varname =
...@@ -269,6 +278,8 @@ let appTest = ...@@ -269,6 +278,8 @@ let appTest =
args.args args.args
, verbose = , verbose =
True True
, singularity =
False
, cmdwants = , cmdwants =
[] : List Text [] : List Text
, cmdavoids = , cmdavoids =
......
{
"acKind": "ImageManifest",
"acVersion": "0.6.0",
"name": "test",
"app": {
"isolators": [
{
"name": "argo/scheduler",
"value": {
"policy": "SCHED_OTHER",
"priority": "0"
}
},
{
"name": "argo/container",
"value": {
"cpus": "1",
"mems": "1"
}
},
{
"name": "argo/perfwrapper",
"value": {
"enabled": "0"
}
},
{
"name": "argo/power",
"value": {
"enabled": "1",
"profile": "1",
"policy": "NONE",
"damper": "1e9",
"slowdown": "1.1"
}
},
{
"name": "argo/monitoring",
"value": {
"enabled": "1",
"ratelimit": "10000000"
}
},
{
"name": "argo/hwbind",
"value": {
"enabled": "0"
}
}
]
},
"image": {
"path": "docker://ubuntu",
"type": "docker"
}
}
...@@ -28,52 +28,52 @@ ...@@ -28,52 +28,52 @@
buildAMG: buildAMG:
extends: .build extends: .build
script: script:
- "argonix build amg -g --argopkgs $ARGOPKGS $EXTRA --verbose" - "argonix build amg --argopkgs $ARGOPKGS $EXTRA --verbose"
buildQMCPack: buildQMCPack:
extends: .build extends: .build
script: script:
- "argonix build qmcpack -g --argopkgs $ARGOPKGS $EXTRA --verbose" - "argonix build qmcpack --argopkgs $ARGOPKGS $EXTRA --verbose"
buildOpenMC: buildOpenMC:
extends: .build extends: .build
script: script:
- "argonix build openmc -g --argopkgs $ARGOPKGS $EXTRA --verbose" - "argonix build openmc --argopkgs $ARGOPKGS $EXTRA --verbose"
buildSTREAM: buildSTREAM:
extends: .build extends: .build
script: script:
- "argonix build stream -g --argopkgs $ARGOPKGS $EXTRA --verbose" - "argonix build stream --argopkgs $ARGOPKGS $EXTRA --verbose"
buildLAMMPS: buildLAMMPS:
extends: .build extends: .build
script: script:
- "argonix build lammps -g --argopkgs $ARGOPKGS $EXTRA --verbose" - "argonix build lammps --argopkgs $ARGOPKGS $EXTRA --verbose"
testAMG: testAMG:
extends: .applications extends: .applications
script: script:
- "argonix build testAMG -g --argopkgs $ARGOPKGS $EXTRA --verbose" - "argonix build testAMG --argopkgs $ARGOPKGS $EXTRA --verbose"
testSTREAM: testSTREAM:
extends: .applications extends: .applications
script: script:
- "argonix build testSTREAM -g --argopkgs $ARGOPKGS $EXTRA --verbose" - "argonix build testSTREAM --argopkgs $ARGOPKGS $EXTRA --verbose"
testOpenMC: testOpenMC:
extends: .applications extends: .applications
script: script:
- "argonix build testOpenMC -g --argopkgs $ARGOPKGS $EXTRA --verbose" - "argonix build testOpenMC --argopkgs $ARGOPKGS $EXTRA --verbose"
testQMCPack: testQMCPack:
extends: .applications extends: .applications
script: script:
- "argonix build testQMCPack -g --argopkgs $ARGOPKGS $EXTRA --verbose" - "argonix build testQMCPack --argopkgs $ARGOPKGS $EXTRA --verbose"
testLAMMPS: testLAMMPS:
extends: .applications extends: .applications
script: script:
- "argonix build testLAMMPS -g --argopkgs $ARGOPKGS $EXTRA --verbose" - "argonix build testLAMMPS --argopkgs $ARGOPKGS $EXTRA --verbose"
#testQMCPack: #testQMCPack:
#extends: .applications #extends: .applications
......
...@@ -18,27 +18,27 @@ ...@@ -18,27 +18,27 @@
testPwd: testPwd:
extends: .test extends: .test
script: script:
- "argonix build testPwd --argopkgs $ARGOPKGS $EXTRA --verbose" - "argonix test pwd --argopkgs $ARGOPKGS $EXTRA --verbose"
testRun: testRun:
extends: .test extends: .test
script: script:
- "argonix build testRun --argopkgs $ARGOPKGS $EXTRA --verbose" - "argonix test run --argopkgs $ARGOPKGS $EXTRA --verbose"
testHello: testHello:
extends: .test extends: .test
script: script:
- "argonix build testHello --argopkgs $ARGOPKGS $EXTRA --verbose" - "argonix test hello --argopkgs $ARGOPKGS $EXTRA --verbose"
testListen: testListen:
extends: .test extends: .test
script: script:
- "argonix build testListen --argopkgs $ARGOPKGS $EXTRA --verbose" - "argonix test listen --argopkgs $ARGOPKGS $EXTRA --verbose"
testPerfwrapper: testPerfwrapper:
extends: .test extends: .test
script: script:
- "argonix build testPerfwrapper --argopkgs $ARGOPKGS $EXTRA --verbose" - "argonix test performance --argopkgs $ARGOPKGS $EXTRA --verbose"
tags: tags:
- performance - performance
- integration - integration
...@@ -46,6 +46,6 @@ testPerfwrapper: ...@@ -46,6 +46,6 @@ testPerfwrapper:
testPower: testPower:
extends: .test extends: .test
script: script:
- "argonix build testPower --argopkgs $ARGOPKGS $EXTRA --verbose" - "argonix test power --argopkgs $ARGOPKGS $EXTRA --verbose"
tags: tags:
- knl - knl
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
"fetch": { "fetch": {
"args": { "args": {
"fetchSubmodules": false, "fetchSubmodules": false,
"rev": "bc7b9efd7f55c4e8f4257ce0813d935fa729326e", "rev": "0ea6332d6101f3b72a9d5c737a268973a0bd84ef",
"sha256": "0x6xgp5gjn2kp7n1j8v9f5f04fc8wl3dv5b3x40a37x4bvph5npr", "sha256": "0f5j1kl5gi8ll3s1mszw650hhsvww5vl9n220my1jvqqi3qrx9ah",
"url": "https://xgitlab.cels.anl.gov/argo/argonix.git" "url": "https://xgitlab.cels.anl.gov/argo/argonix.git"
}, },
"fn": "fetchgit" "fn": "fetchgit"
......
...@@ -50,8 +50,11 @@ let ...@@ -50,8 +50,11 @@ let
(old:{buildInputs=old.buildInputs ++ [ bi ];}); (old:{buildInputs=old.buildInputs ++ [ bi ];});
argopkgs = rec { argopkgs = rec {
# library of nix expressions # library of nix expressions
argolib = import ../lib/utils.nix; argolib = import ../lib/utils.nix;
flatcc = callPackage ./flatcc {};
# Argo components (source overridabel via argument) # Argo components (source overridabel via argument)
aml = callPackage ./aml { aml = callPackage ./aml {
src=aml-src; src=aml-src;
...@@ -61,7 +64,11 @@ let ...@@ -61,7 +64,11 @@ let
}; };
numabench = callPackage ./numabench {src=numabench-src; hwloc = hwloc2;}; numabench = callPackage ./numabench {src=numabench-src; hwloc = hwloc2;};
excit = callPackage ./excit {src=excit-src;}; excit = callPackage ./excit {src=excit-src;};
nrm = callPackage ./nrm {src=nrm-src;}; nrm = (callPackage ./nrm {src=nrm-src;}).overrideAttrs (o:{
installPhase=o.installPhase+''
cp -r nrm/schemas $out/lib/python2.7/site-packages/nrm/
'';
});
containers = callPackage ./containers {src=containers-src;}; containers = callPackage ./containers {src=containers-src;};
libnrm = callPackage ./libnrm {src=libnrm-src;}; libnrm = callPackage ./libnrm {src=libnrm-src;};
libnrm-pinned = callPackage ./libnrm {src=fetched libnrm/pin.json;}; libnrm-pinned = callPackage ./libnrm {src=fetched libnrm/pin.json;};
...@@ -70,6 +77,13 @@ let ...@@ -70,6 +77,13 @@ let
buildInputs = oldAttrs.buildInputs ++ [ pkgs.mpich2 ]; buildInputs = oldAttrs.buildInputs ++ [ pkgs.mpich2 ];
}); });
#jsonschema3 = pkgs.pythonPackages.jsonschema.overrideAttrs(o:{
#src=pkgs.fetchurl{
#url="https://files.pythonhosted.org/packages/1f/7f/a020327823b9c405ee6f85ab3053ff171e10801b19cfe55c78bb0b3810e7/jsonschema-3.0.1.tar.gz";
#sha256 = "03g20i1xfg4qdlk4475pl4pp7y0h37g1fbgs5qhy678q9xb822hc";
#};
#});
nrm-pytest = nrm.overrideAttrs (old:{checkPhase="py.test --deselect=test/test_messaging.py";}); nrm-pytest = nrm.overrideAttrs (old:{checkPhase="py.test --deselect=test/test_messaging.py";});
aml-check = aml.overrideAttrs (old:{ aml-check = aml.overrideAttrs (old:{
...@@ -165,6 +179,7 @@ let ...@@ -165,6 +179,7 @@ let
monad-mock = doJailbreak super.monad-mock; monad-mock = doJailbreak super.monad-mock;
generic-pretty = doJailbreak super.generic-pretty; generic-pretty = doJailbreak super.generic-pretty;
jsonschema-gen = doJailbreak super.jsonschema-gen; jsonschema-gen = doJailbreak super.jsonschema-gen;
aeson-t = doJailbreak super.aeson-t;
#minor cabal and version fix #minor cabal and version fix
panhandle = (self.callCabal2nix "panhandle" (builtins.fetchGit { panhandle = (self.callCabal2nix "panhandle" (builtins.fetchGit {
...@@ -268,6 +283,7 @@ let ...@@ -268,6 +283,7 @@ let
# argo components # argo components
containers containers
nrm nrm
libnrm
]; ];
#required to be able to build the drv. #required to be able to build the drv.
...@@ -455,12 +471,9 @@ let ...@@ -455,12 +471,9 @@ let
doDhrun dhrunscript; doDhrun dhrunscript;
testGeneric = doDhrunKey genericTestName; testGeneric = doDhrunKey genericTestName;
testHello = doDhrunKey "hello"; testSingularity = (doDhrunKey "run-singularity").overrideAttrs (o:{
testRun = doDhrunKey "run"; buildInputs=o.buildInputs++[ pkgs.singularity ];
testPwd = doDhrunKey "pwd"; });
testListen = doDhrunKey "listen";
testPerfwrapper = doDhrunKey "performance";
testPower = doDhrunKey "power";
testSTREAM = addBI (doDhrunApp "stream") stream; testSTREAM = addBI (doDhrunApp "stream") stream;
testAMG = addBI (doDhrunApp "amg") amg; testAMG = addBI (doDhrunApp "amg") amg;
...@@ -500,6 +513,5 @@ let ...@@ -500,6 +513,5 @@ let
bld = bleeding; bld = bleeding;
}; };
# re-exporting a full nixpkgs-like package set # re-exporting a full nixpkgs-like package set
in pkgs // argopkgs in pkgs // argopkgs
{ stdenv
, fetchFromGitHub
, cmake
}:
stdenv.mkDerivation rec {
name = "flatcc";
version = "0.5.3";
src = fetchFromGitHub {
owner = "dvidelabs";
repo = "flatcc";
rev = "v${version}";
sha256 = "06wnwvnkhw1rk0y3nncjmcyjy3bgpw8i9xqd5gpbhbrm38718cjk";
};
nativeBuildInputs = [ cmake ];
cmakeFlags = [
"-DFLATCC_INSTALL=on"
"-DCMAKE_BUILD_TYPE=Release"
];
meta = {
description = "FlatBuffers Compiler and Library in C for C ";
homepage = https://github.com/dvidelabs/flatcc;
license = [ stdenv.lib.licenses.asl20 ];
};
}
...@@ -2,13 +2,13 @@ ...@@ -2,13 +2,13 @@
"fetch": { "fetch": {
"args": { "args": {
"fetchSubmodules": false, "fetchSubmodules": false,
"rev": "9b52e9fb9209a0a19ba21a830e6a2c0cbddf3052", "rev": "70720b12e5e3d25436738ebc05963c847b671134",
"sha256": "1canjww3igzd8d1wxpjfvzjalc0iacqljxl0nbpc5j0s6clj0q45", "sha256": "0xq8s47saza5ml9pmkf5sb6ia0ilbnly2r5v6m770hzw50b4q7cf",
"url": "https://xgitlab.cels.anl.gov/argo/libnrm.git" "url": "https://xgitlab.cels.anl.gov/argo/libnrm.git"
}, },
"fn": "fetchgit" "fn": "fetchgit"
}, },
"rev": "refs/heads/master", "rev": "refs/heads/nrm-gen",
"type": "fetchgit", "type": "fetchgit",
"url": "https://xgitlab.cels.anl.gov/argo/libnrm.git" "url": "https://xgitlab.cels.anl.gov/argo/libnrm.git"
} }
\ No newline at end of file
...@@ -11,6 +11,7 @@ pythonPackages.buildPythonPackage { ...@@ -11,6 +11,7 @@ pythonPackages.buildPythonPackage {
linuxPackages.perf linuxPackages.perf
pythonPackages.docopt pythonPackages.docopt
pythonPackages.scipy pythonPackages.scipy
pythonPackages.warlock
containers containers
]; ];
checkInputs = [ pythonPackages.pytest ]; checkInputs = [ pythonPackages.pytest ];
......
...@@ -2,13 +2,13 @@ ...@@ -2,13 +2,13 @@
"fetch": { "fetch": {
"args": { "args": {
"fetchSubmodules": false, "fetchSubmodules": false,
"rev": "753c0048f999255ca42dce10e18e71c109af7ed7", "rev": "cd1d86b30e13aabeacc782075f0dafe957fc7aed",
"sha256": "01wngv506nx43h6jjrbzg7axwpnfn7920nn9dajm7das0mbfv9bx", "sha256": "1vhx340mkvag11qfiwcm6dkqs4qf5laqfi1zmh0pr1f6pyqn1l62",
"url": "https://xgitlab.cels.anl.gov/argo/nrm.git" "url": "https://xgitlab.cels.anl.gov/argo/nrm.git"
}, },
"fn": "fetchgit" "fn": "fetchgit"
}, },
"rev": "refs/heads/master", "rev": "refs/heads/nrm-gen",
"type": "fetchgit", "type": "fetchgit",
"url": "https://xgitlab.cels.anl.gov/argo/nrm.git" "url": "https://xgitlab.cels.anl.gov/argo/nrm.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