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
4e9321e6
Commit
4e9321e6
authored
May 16, 2019
by
Valentin Reis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dhrun changes
parent
4a425bbd
Pipeline
#7379
failed with stages
in 36 minutes and 49 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
32 deletions
+10
-32
dhrun/manifests/perfwrap.json
dhrun/manifests/perfwrap.json
+1
-1
pkgs/default.nix
pkgs/default.nix
+9
-31
No files found.
dhrun/manifests/perfwrap.json
View file @
4e9321e6
...
...
@@ -6,6 +6,6 @@
"cpus"
:
2
,
"mems"
:
1
},
perfwrapper
:
true
"perfwrapper"
:
true
}
}
pkgs/default.nix
View file @
4e9321e6
...
...
@@ -411,7 +411,7 @@ let
''
;
});
dhrun
Specs
=
pkgs
.
stdenv
.
mkDerivation
rec
{
dhrun
TestConfigLayer
=
pkgs
.
stdenv
.
mkDerivation
rec
{
name
=
"dhrunSpecs"
;
src
=
../dhrun
;
installPhase
=
''
...
...
@@ -432,45 +432,23 @@ let
unpackPhase
=
"true"
;
};
doDhrun
=
dh
rscript
:
test
.
overrideAttrs
(
old
:{
doDhrun
=
dh
allcall
:
test
.
overrideAttrs
(
old
:{
buildPhase
=
''
cat $DHRUNSCRIPT | dhall resolve | dhall normalize | dhall-to-yaml | dhrun run "-"
dhrun run <<< 'let all =
${
dhrunTestConfigLayer
}
/all-tests.dh
"
${
dhrunTestConfigLayer
}
/" in all.
${
dhallcall
}
'
''
;
buildInputs
=
old
.
buildInputs
++
[
dhall-json
pkgs
.
yq
dhall
];
DHRUNSCRIPT
=
"
${
dhrscript
}
"
;
DHRUNSPECS
=
"
${
dhrunSpecs
}
"
;
installPhase
=
''
mkdir -p $out
cp _output/* $out/
''
;
});
doDhrunApp
=
app
:
let
dhrunscript
=
pkgs
.
writeText
"test.dhall"
''
let all =
${
dhrunSpecs
}
/all-tests.dh "
${
dhrunSpecs
}
/"
in all.
${
app
}
True < NoCap = {=} | Cap : Text >
''
;
in
doDhrun
dhrunscript
;
doDhrunKey
=
key
:
let
dhrunscript
=
pkgs
.
writeText
"test.dhall"
''
let all =
${
dhrunSpecs
}
/all-tests.dh "
${
dhrunSpecs
}
/" in all.
${
key
}
''
;
in
doDhrun
dhrunscript
;
testGeneric
=
doDhrunKey
genericTestName
;
testSingularity
=
(
doDhrunKey
"run-singularity"
)
.
overrideAttrs
(
o
:{
__noChroot
=
true
;
# singularity needs an OS-based install.
testGeneric
=
doDhrun
genericTestName
;
testSingularity
=
(
doDhrun
"run-singularity"
)
.
overrideAttrs
(
o
:{
__noChroot
=
true
;
# the test needs OS singularity installation so we disable sanboxing here.
});
doDhrunApp
=
app
:
doDhrun
"
${
app
}
True < NoCap = {=} | Cap : Text >"
;
testSTREAM
=
addBI
(
doDhrunApp
"stream"
)
stream
;
testAMG
=
addBI
(
doDhrunApp
"amg"
)
amg
;
testOpenMC
=
(
addBI
(
doDhrunApp
"openmc"
)
openmc
)
.
overrideAttrs
...
...
@@ -478,7 +456,7 @@ let
testLAMMPS
=
addBI
(
doDhrunApp
"lammps"
)
lammps
;
testQMCPack
=
addBI
(
doDhrunApp
"qmcpack"
)
qmcpack
;
testAll
=
(
doDhrun
Key
"hello"
)
.
overrideAttrs
testAll
=
(
doDhrun
"hello"
)
.
overrideAttrs
(
old
:{
buildInputs
=
old
.
buildInputs
++
[
lammps
...
...
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