rarias/bscpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nbody: remove jemalloc experiments

Browse Source 
Nanos6 has jemalloc enabled by default
This commit is contained in:
Rodrigo Arias 2021-03-04 19:02:08 +01:00
parent 88087bb4b7
commit 0781e8b28e
3 changed files with 4 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
garlic/exp/index.nix
View File

@ -14,9 +14,6 @@
small = baseline.override { small = baseline.override {
particles = 12 * 4096; particles = 12 * 4096;
}; };
# TODO: Update freeCpu using a non-standard pipeline
#freeCpu = baseline.override { freeCpu = true; };
jemalloc = baseline.override { enableJemalloc = true; };
# Some experiments with traces # Some experiments with traces
trace = { trace = {
@ -27,10 +24,6 @@
steps = 1; steps = 1;
}; };
# Same but with jemalloc enabled
jemalloc = trace.baseline.override {
enableJemalloc = true;
};
}; };
scaling = callPackage ./nbody/scaling.nix { scaling = callPackage ./nbody/scaling.nix {

11
garlic/exp/nbody/nblocks.nix
View File

@ -7,7 +7,6 @@
, garlicTools , garlicTools
# Options for the experiment # Options for the experiment
, enableJemalloc ? false
, enableCTF ? false , enableCTF ? false
# Number of cases tested # Number of cases tested
, steps ? 7 , steps ? 7
@ -56,7 +55,7 @@ let
cc = bsc.icc; cc = bsc.icc;
mpi = bsc.impi; mpi = bsc.impi;
cflags = "-g"; cflags = "-g";
inherit timesteps gitBranch enableJemalloc enableCTF loops; inherit timesteps gitBranch enableCTF loops;
# Resources # Resources
qos = "debug"; qos = "debug";
@ -91,13 +90,7 @@ let
program = {nextStage, conf, ...}: with conf; program = {nextStage, conf, ...}: with conf;
let let
/* These changes are propagated to all dependencies. For example, customPkgs = stdexp.replaceMpi conf.mpi;
when changing nanos6+jemalloc, we will get tampi built with
nanos6+jemalloc as well. */
customPkgs = bsc.extend (self: super: {
mpi = conf.mpi;
nanos6 = super.nanos6.override { inherit enableJemalloc; };
});
in in
customPkgs.apps.nbody.override ({ customPkgs.apps.nbody.override ({
inherit cc blocksize mpi gitBranch cflags; inherit cc blocksize mpi gitBranch cflags;

11
garlic/exp/nbody/scaling.nix
View File

@ -7,7 +7,6 @@
, garlicTools , garlicTools
# Options for the experiment # Options for the experiment
, enableJemalloc ? false
, enableCTF ? false , enableCTF ? false
# Number of cases tested # Number of cases tested
, steps ? 6 , steps ? 6
@ -63,7 +62,7 @@ let
cc = bsc.icc; cc = bsc.icc;
mpi = bsc.impi; mpi = bsc.impi;
cflags = "-g"; cflags = "-g";
inherit timesteps enableJemalloc enableCTF loops; inherit timesteps enableCTF loops;
# Resources # Resources
qos = "debug"; qos = "debug";
@ -97,13 +96,7 @@ let
program = {nextStage, conf, ...}: with conf; program = {nextStage, conf, ...}: with conf;
let let
/* These changes are propagated to all dependencies. For example, customPkgs = stdexp.replaceMpi conf.mpi;
when changing nanos6+jemalloc, we will get tampi built with
nanos6+jemalloc as well. */
customPkgs = bsc.extend (self: super: {
mpi = conf.mpi;
nanos6 = super.nanos6.override { inherit enableJemalloc; };
});
in in
customPkgs.apps.nbody.override ({ customPkgs.apps.nbody.override ({
inherit (conf) cc blocksize mpi gitBranch cflags; inherit (conf) cc blocksize mpi gitBranch cflags;