Merge bscpkgs into jungle #189

Manually merged
rarias merged 1013 commits from merge-bscpkgs into master 2025-10-07 16:12:34 +02:00
Showing only changes of commit 376ab9b32a - Show all commits

View File

@@ -303,7 +303,6 @@ let
# Experiments
exp = {
nbody = rec {
test = callPackage ./garlic/exp/nbody/test.nix { };
tampi = callPackage ./garlic/exp/nbody/tampi.nix { };
# Experiment variants
@@ -336,7 +335,6 @@ let
# Datasets used in the figures
ds = with self.bsc.garlic; with pp; {
nbody = with exp.nbody; {
test = merge [ test ];
baseline = merge [ baseline ];
jemalloc = merge [ baseline jemalloc ];
freeCpu = merge [ baseline freeCpu ];
@@ -347,9 +345,9 @@ let
fig = with self.bsc.garlic; {
nbody = {
test = pp.rPlot {
script = ./garlic/fig/nbody/test.R;
dataset = ds.nbody.test;
baseline = pp.rPlot {
script = ./garlic/fig/nbody/baseline.R;
dataset = ds.nbody.baseline;
};
jemalloc = pp.rPlot {