From 0781e8b28e3fb1547379171be29a69cac2a829c2 Mon Sep 17 00:00:00 2001
From: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>
Date: Thu, 4 Mar 2021 19:02:08 +0100
Subject: [PATCH] nbody: remove jemalloc experiments

Nanos6 has jemalloc enabled by default
---
 garlic/exp/index.nix         |  7 -------
 garlic/exp/nbody/nblocks.nix | 11 ++---------
 garlic/exp/nbody/scaling.nix | 11 ++---------
 3 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/garlic/exp/index.nix b/garlic/exp/index.nix
index ae3120c..d5ddc20 100644
--- a/garlic/exp/index.nix
+++ b/garlic/exp/index.nix
@@ -14,9 +14,6 @@
     small = baseline.override {
       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
     trace = {
@@ -27,10 +24,6 @@
         steps = 1;
       };
 
-      # Same but with jemalloc enabled
-      jemalloc = trace.baseline.override {
-        enableJemalloc = true;
-      };
     };
 
     scaling = callPackage ./nbody/scaling.nix {
diff --git a/garlic/exp/nbody/nblocks.nix b/garlic/exp/nbody/nblocks.nix
index 447c4ff..c6ec3e7 100644
--- a/garlic/exp/nbody/nblocks.nix
+++ b/garlic/exp/nbody/nblocks.nix
@@ -7,7 +7,6 @@
 , garlicTools
 
 # Options for the experiment
-, enableJemalloc ? false
 , enableCTF ? false
 # Number of cases tested
 , steps ? 7
@@ -56,7 +55,7 @@ let
     cc = bsc.icc;
     mpi = bsc.impi;
     cflags = "-g";
-    inherit timesteps gitBranch enableJemalloc enableCTF loops;
+    inherit timesteps gitBranch enableCTF loops;
 
     # Resources
     qos = "debug";
@@ -91,13 +90,7 @@ let
 
   program = {nextStage, conf, ...}: with conf;
     let
-      /* These changes are propagated to all dependencies. For example,
-      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; };
-      });
+      customPkgs = stdexp.replaceMpi conf.mpi;
     in
       customPkgs.apps.nbody.override ({
         inherit cc blocksize mpi gitBranch cflags;
diff --git a/garlic/exp/nbody/scaling.nix b/garlic/exp/nbody/scaling.nix
index ad0e4f7..900841b 100644
--- a/garlic/exp/nbody/scaling.nix
+++ b/garlic/exp/nbody/scaling.nix
@@ -7,7 +7,6 @@
 , garlicTools
 
 # Options for the experiment
-, enableJemalloc ? false
 , enableCTF ? false
 # Number of cases tested
 , steps ? 6
@@ -63,7 +62,7 @@ let
     cc = bsc.icc;
     mpi = bsc.impi;
     cflags = "-g";
-    inherit timesteps enableJemalloc enableCTF loops;
+    inherit timesteps enableCTF loops;
 
     # Resources
     qos = "debug";
@@ -97,13 +96,7 @@ let
 
   program = {nextStage, conf, ...}: with conf;
     let
-      /* These changes are propagated to all dependencies. For example,
-      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; };
-      });
+      customPkgs = stdexp.replaceMpi conf.mpi;
     in
       customPkgs.apps.nbody.override ({
         inherit (conf) cc blocksize mpi gitBranch cflags;