Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
argopkgs
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
argo
argopkgs
Commits
9f78ce0d
Commit
9f78ce0d
authored
Jun 12, 2019
by
Valentin Reis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
massive testset refactor.
parent
b2a822e8
Pipeline
#7689
failed with stages
in 27 minutes and 12 seconds
Changes
8
Pipelines
1
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
244 additions
and
321 deletions
+244
-321
dhrun/all-tests.dh
dhrun/all-tests.dh
+146
-227
dhrun/argo/basicCommand.dh
dhrun/argo/basicCommand.dh
+2
-2
dhrun/argo/listen.dh
dhrun/argo/listen.dh
+6
-8
dhrun/argo/nrmd.dh
dhrun/argo/nrmd.dh
+5
-7
dhrun/argo/package.dh
dhrun/argo/package.dh
+1
-1
dhrun/argo/run.dh
dhrun/argo/run.dh
+11
-17
dhrun/argo/types.dh
dhrun/argo/types.dh
+11
-10
dhrun/lib.dh
dhrun/lib.dh
+62
-49
No files found.
dhrun/all-tests.dh
View file @
9f78ce0d
This diff is collapsed.
Click to expand it.
dhrun/argo/
internal/
basicCommand.dh
→
dhrun/argo/basicCommand.dh
View file @
9f78ce0d
let values = ../
../
resources/package.dh
let values = ../resources/package.dh
let types = ../
../
resources/types.dh
let types = ../resources/types.dh
in λ ( args
: { name :
...
...
dhrun/argo/listen.dh
View file @
9f78ce0d
...
...
@@ -4,14 +4,13 @@ let types = ../resources/types.dh
let argotypes = ./types.dh
let basicCommand = ./
internal/
basicCommand.dh
let basicCommand = ./basicCommand.dh
let defaultMkListen =
λ(containerName : Text)
→ λ(attr : Text)
→ { attr =
"performance"
,
isTest
=
,
doFilter
=
False
, filter =
","
...
...
@@ -30,20 +29,19 @@ let listen =
, outavoids =
[] : List Text
, outwants =
if a.
isTest
then [ a.filter ] else [] : List Text
if a.
doFilter
then [ a.filter ] else [] : List Text
}
⫽ { args = [ "listen", "-u", a.containerName, "--filter", a.filter ] }
: types.Cmd
let default =
λ(containerName : Text)
→ λ(attr : Text)
→ listen (defaultMkListen containerName attr) : types.Cmd
→ listen (defaultMkListen containerName) : types.Cmd
in { defarg =
defaultMkListen : Text →
Text →
argotypes.MkListen
defaultMkListen : Text → argotypes.MkListen
, mk =
listen : argotypes.MkListen → types.Cmd
, default =
default : Text →
Text →
types.Cmd
default : Text → types.Cmd
}
dhrun/argo/nrmd.dh
View file @
9f78ce0d
...
...
@@ -4,7 +4,7 @@ let types = ../resources/types.dh
let argotypes = ./types.dh
let basicCommand = ./
internal/
basicCommand.dh
let basicCommand = ./basicCommand.dh
let addVerbose = λ(v : Bool) → if v then [ "--verbose" ] else [] : List Text
...
...
@@ -28,7 +28,9 @@ let defaultMkDaemon =
, powercap =
< NoCap = {=} | Cap : Text >
, singularity =
True
False
, daemonavoids =
[] : List Text
}
: argotypes.MkDaemon
...
...
@@ -53,11 +55,7 @@ let daemon =
{ filename =
"nrmd.out"
, filecheck =
{ wants =
[] : List Text
, avoids =
[ "Traceback", "ValueError" ] : List Text
}
{ wants = [] : List Text, avoids = a.daemonavoids }
}
, vars =
[ { varname =
...
...
dhrun/argo/package.dh
View file @
9f78ce0d
{ nrmd = ./nrmd.dh, run = ./run.dh, listen = ./listen.dh }
{
basic = ./basicCommand.dh,
nrmd = ./nrmd.dh, run = ./run.dh, listen = ./listen.dh }
dhrun/argo/run.dh
View file @
9f78ce0d
...
...
@@ -4,33 +4,26 @@ let types = ../resources/types.dh
let argotypes = ./types.dh
let basicCommand = ./
internal/
basicCommand.dh
let basicCommand = ./basicCommand.dh
let defaultMkRun =
λ(cmd : Text)
→ λ(manifest : Text)
→ λ(containerName : Text)
→ { manifest =
manifest
, cmd =
cmd
, containerName =
"containerName"
containerName
, args =
[] : List Text
, cmdwants =
[] : List Text
, cmdavoids =
[] : List Text
, vars =
values.emptyVars
, timeout =
[] : Optional Natural
, runExitcode =
[] : Optional Integer
, passvars =
[] : List Text
, runwd =
[] : Optional Text
}
: argotypes.MkRun
...
...
@@ -54,25 +47,26 @@ let run =
, passvars =
b.passvars # a.passvars
, vars =
a.v
ars
values.emptyV
ars
, timeout =
a.timeout
[] : Optional Natural
, exitcode =
a.runExitcode
[] : Optional Integer
, otherwd =
a.runwd
[] : Optional Text
}
: types.Cmd
let default =
λ(cmd : Text)
→ λ(manifest : Text)
→ run (defaultMkRun cmd manifest) : types.Cmd
→ λ(containerName : Text)
→ run (defaultMkRun cmd manifest containerName) : types.Cmd
in { defarg =
defaultMkRun : Text → Text → argotypes.MkRun
defaultMkRun : Text → Text →
Text →
argotypes.MkRun
, mk =
run : argotypes.MkRun → types.Cmd
, default =
default : Text → Text → types.Cmd
default : Text → Text →
Text →
types.Cmd
}
dhrun/argo/types.dh
View file @
9f78ce0d
...
...
@@ -2,7 +2,16 @@ let types = ../resources/types.dh
let Powercap = < Cap : Text | NoCap : {} >
let MkDaemon = { verbose : Bool, powercap : Powercap, singularity : Bool }
let MkDaemon =
{ verbose :
Bool
, powercap :
Powercap
, singularity :
Bool
, daemonavoids :
List Text
}
let MkRun =
{ manifest :
...
...
@@ -17,20 +26,12 @@ let MkRun =
List Text
, cmdavoids :
List Text
, vars :
List types.EnvVar
, timeout :
Optional Natural
, runExitcode :
Optional Integer
, passvars :
List Text
, runwd :
Optional Text
}
let MkListen =
{ attr : Text, containerName : Text,
isTest
: Bool, filter : Text }
{ attr : Text, containerName : Text,
doFilter
: Bool, filter : Text }
in { MkRun =
MkRun
...
...
dhrun/lib.dh
View file @
9f78ce0d
λ(dataDir : Text)
→ λ(manifestDir : Text)
→ let values = ./resources/package.dh
let types = ./resources/types.dh
let argotypes = ./argo/types.dh
let argo = ./argo/package.dh
let assetDir = dataDir ++ "assets/"
let openmcDir = assetDir ++ "openmc/"
let lammpsDir = assetDir
let qmcPackDir = assetDir
let Powercap = < Cap : Text | NoCap : {} >
let makeBase =
let id = λ(a : Type) → λ(x : a) → x
let idCmd = id types.Cmd
let makeExtended =
λ(daemonArg : argotypes.MkDaemon)
→ λ(daemonOverrides : types.Cmd → types.Cmd)
→ λ(runArg : argotypes.MkRun)
→ λ(runOverrides : types.Cmd → types.Cmd)
→ λ(extraCmds : List types.Cmd)
→ { cmds =
[ argo.nrmd.mk daemonArg, argo.run.mk runArg ]
[ daemonOverrides (argo.nrmd.mk daemonArg)
, runOverrides (argo.run.mk runArg)
]
# extraCmds
, verbose =
True
, cleaning =
...
...
@@ -35,13 +45,7 @@
[] : List Text
}
: types.Config
let makeExtended =
λ(daemonArg : argotypes.MkDaemon)
→ λ(runArg : argotypes.MkRun)
→ λ(cmds : List types.Cmd)
→ let b = makeBase daemonArg runArg in b ⫽ { cmds = b.cmds # cmds }
let FilterTestArgs =
{ manifestname :
Text
...
...
@@ -64,7 +68,7 @@
, powercap :
Powercap
}
let emptyFilterTestArgs =
λ(filter : Text)
→ λ(cmd : Text)
...
...
@@ -90,19 +94,28 @@
< NoCap = {=} | Cap : Text >
}
: FilterTestArgs
let appTest =
let cn = "
testContainer
"
let cn = "
containerName
"
in λ(args : FilterTestArgs)
→ makeExtended
{ powercap = args.powercap, verbose = True, singularity = False }
{ powercap =
args.powercap
, verbose =
True
, singularity =
False
, daemonavoids =
[ "Traceback", "ValueError" ]
}
idCmd
{ manifest =
manifestDir
++ ( if args.isTest
then args.manifestname
else "parallel.yml"
)
, containerName =
...
...
@@ -115,19 +128,16 @@
[] : List Text
, cmdavoids =
args.cmdavoids
, vars =
args.vars
, passvars =
args.passvars
, timeout =
args.timeout
, runwd =
[] : Optional Text
, runExitcode =
[] : Optional Integer
}
[ argo.listen.default cn args.filter ]
( λ(c : types.Cmd)
→ c ⫽ { timeout = args.timeout, vars = args.vars }
)
[ argo.listen.mk
(argo.listen.defarg cn ⫽ { filter = args.filter })
]
let ProgressAppTestArg =
{ cmd :
Text
...
...
@@ -146,7 +156,7 @@
, powercap :
Powercap
}
let emptyProgressAppTestArg =
λ(cmd : Text)
→ λ(args : List Text)
...
...
@@ -168,7 +178,7 @@
< NoCap = {=} | Cap : Text >
}
: ProgressAppTestArg
let progressAppTest =
λ(args : ProgressAppTestArg)
→ appTest
...
...
@@ -191,7 +201,7 @@
args.powercap
}
)
let mkListen =
λ(cn : Text)
→ λ(filter : Text)
...
...
@@ -204,25 +214,26 @@
, errfile =
filter ++ ".err"
}
in b ⫽ { args = [ "listen", "-u", cn, "--filter", filter ] }
let powerexpeCmds =
[ argo.listen.default "testContainer" "power"
, argo.listen.default "testContainer" "performance"
, argo.listen.default "testContainer" "control"
]
: List types.Cmd
let cn = "containerName"
in [ argo.listen.mk (argo.listen.defarg cn ⫽ { filter = "power" })
, argo.listen.mk
(argo.listen.defarg cn ⫽ { filter = "performance" })
, argo.listen.mk (argo.listen.defarg cn ⫽ { filter = "control" })
]
: List types.Cmd
let extendApp =
λ(c : types.Config)
→ λ(isTest : Bool)
→ if isTest then c else c ⫽ { cmds = c.cmds # powerexpeCmds }
in { values =
values
, makeBase =
makeBase
, makeExtended =
makeExtended
, appTest =
...
...
@@ -245,4 +256,6 @@
powerexpeCmds
, extendApp =
extendApp
, idCmd =
id types.Cmd
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment