Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
argo
argopkgs
Commits
77726a9d
Commit
77726a9d
authored
Nov 02, 2018
by
Valentin Reis
Browse files
Refactoring the pinning.
parent
87be7f6b
Changes
10
Hide whitespace changes
Inline
Side-by-side
pkgs/default.nix
View file @
77726a9d
...
...
@@ -11,51 +11,53 @@
packagepins
?
import
./pins.nix
{
inherit
(
pkgs
)
stdenv
fetchgit
fetchgitPrivate
;}
}:
let
toPath
=
s
:
./.
+
s
;
gitpin
=
f
:
pkgs
.
fetchgit
{
inherit
(
pkgs
.
lib
.
importJSON
f
)
url
sha256
rev
fetchSubmodules
;};
compiler_path
=
"/opt/intel/compilers_and_libraries_2017.1.132/linux"
;
callPackage
=
pkgs
.
lib
.
callPackageWith
pkgs
;
callPackagePinWith
=
{
p
ath
{
folderP
ath
,
nixName
?
"default"
,
jsonName
?
nixName
,
depset
?
{}
,
pkgs
?
pkgs
}
:
let
jsonPath
=
toPath
"/
${
path
}
/
${
jsonName
}
.json"
;
nixPath
=
folderPath
+
"/
${
nixName
}
.nix"
;
jsonPath
=
folderPath
+
"/
${
jsonName
}
.json"
;
src
=
gitpin
jsonPath
;
in
pkgs
.
lib
.
callPackageWith
pkgs
(
toPath
"/
${
path
}
/
${
nixName
}
.nix"
)
(
depset
//
{
src
=
gitpin
jsonPath
;});
cpDefaultPin
=
path
:
depset
:
callPackagePinWith
{
inherit
path
depset
;};
cpAlternatePin
=
path
:
depset
:
alternate
:
callPackagePinWith
{
inherit
path
depset
jsonName
;};
callPackage
nixPath
(
depset
//
{
inherit
src
;});
cpDefaultPin
=
folderPath
:
depset
:
callPackagePinWith
{
inherit
folderPath
depset
;};
cpAlternatePin
=
folderPath
:
depset
:
jsonName
:
callPackagePinWith
{
inherit
folderPath
depset
jsonName
;};
pythonPackages
=
pkgs
.
python27Packages
;
in
rec
{
#NRM components
nodelevel
=
rec
{
libnrm
=
c
allPackagePin
{
path
=
"
libnrm
"
;
};
containers
=
cpDefaultPin
"
./containers
"
{
inherit
pythonPackages
;
};
containers-bandit
=
cpAlternatePin
"
./containers
"
{
inherit
pythonPackages
;
}
"bandit"
;
nrm
=
cpDefaultPin
"
./nrm
"
{
inherit
pythonPackages
containers
;
};
nrm-bandit
=
cpAlternatePin
"
./nrm
"
{
inherit
pythonPackages
containers-bandit
;
}
"bandit"
;
libnrm
=
c
pDefaultPin
./
libnrm
{
};
containers
=
cpDefaultPin
./containers
{
inherit
pythonPackages
;
};
containers-bandit
=
cpAlternatePin
./containers
{
inherit
pythonPackages
;
}
"bandit"
;
nrm
=
cpDefaultPin
./nrm
{
inherit
pythonPackages
;
nrm-containers
=
containers
;
};
nrm-bandit
=
cpAlternatePin
./nrm
{
inherit
pythonPackages
;
nrm-containers
=
containers-bandit
;
}
"bandit"
;
};
#Instrumented applications
applications
=
rec
{
lammps
=
pkgs
.
lammps-mpi
;
stream
=
callPackage
{
path
=
"applications/stream"
;};
openmc
=
callPackage
{
path
=
"applications/openmc"
;};
qmcpack
=
callPackage
{
path
=
"applications/qmcpack"
;};
amg
=
callPackage
{
path
=
"applications/amg"
;};
graph500
=
cpAlternatePin
"applications/simple"
{}
"graph500"
;
simple
=
cpAlternatePin
"applications/simple"
{
inherit
intel
;
inherit
(
nodelevel
)
libnrm
;}
"dgemm_randomwalk"
;
#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"
;
};
#Intel compilers
intel
=
with
pkgs
;
rec
{
icc
=
callPackage
intel/icc
{
inherit
compiler_path
;
};
mkl
=
callPackage
intel/mkl
{
inherit
compiler_path
;
};
WrappedICC
=
(
import
../patches
/cc-wrapper
{
WrappedICC
=
(
import
intel
/cc-wrapper
{
inherit
stdenv
binutils
coreutils
;
libc
=
glibc
;
nativeTools
=
false
;
...
...
p
atches
/cc-wrapper/add-flags
→
p
kgs/intel
/cc-wrapper/add-flags
View file @
77726a9d
File moved
p
atches
/cc-wrapper/cc-wrapper.sh
→
p
kgs/intel
/cc-wrapper/cc-wrapper.sh
View file @
77726a9d
File moved
p
atches
/cc-wrapper/default.nix
→
p
kgs/intel
/cc-wrapper/default.nix
View file @
77726a9d
File moved
p
atches
/cc-wrapper/gnat-wrapper.sh
→
p
kgs/intel
/cc-wrapper/gnat-wrapper.sh
View file @
77726a9d
File moved
p
atches
/cc-wrapper/gnatlink-wrapper.sh
→
p
kgs/intel
/cc-wrapper/gnatlink-wrapper.sh
View file @
77726a9d
File moved
p
atches
/cc-wrapper/ld-solaris-wrapper.sh
→
p
kgs/intel
/cc-wrapper/ld-solaris-wrapper.sh
View file @
77726a9d
File moved
p
atches
/cc-wrapper/ld-wrapper.sh
→
p
kgs/intel
/cc-wrapper/ld-wrapper.sh
View file @
77726a9d
File moved
p
atches
/cc-wrapper/setup-hook.sh
→
p
kgs/intel
/cc-wrapper/setup-hook.sh
View file @
77726a9d
File moved
p
atches
/cc-wrapper/utils.sh
→
p
kgs/intel
/cc-wrapper/utils.sh
View file @
77726a9d
File moved
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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