Merge bscpkgs into jungle #189

Manually merged
rarias merged 1013 commits from merge-bscpkgs into master 2025-10-07 16:12:34 +02:00
2 changed files with 2 additions and 11 deletions
Showing only changes of commit 4d629fe8f7 - Show all commits

View File

@@ -51,11 +51,7 @@
#mpi = callPackage ./hpcg/mpi.nix { };
#omp = callPackage ./hpcg/omp.nix { };
#mpi_omp = callPackage ./hpcg/mpi+omp.nix { };
#input = callPackage ./hpcg/gen.nix {
# inherit (bsc.garlic.pp) resultFromTrebuchet;
#};
genInput = callPackage ./hpcg/gen.nix {
};
genInput = callPackage ./hpcg/gen.nix { };
oss = callPackage ./hpcg/oss.nix {
inherit genInput;
@@ -65,13 +61,10 @@
inherit genInput;
};
# ossScalability = callPackage ./hpcg/oss.scalability.192.nix {
# inherit genInput;
# };
ossSlicesWeakscaling = callPackage ./hpcg/oss.slices.weakscaling.nix {
inherit genInput;
};
ossSlicesStrongscaling = callPackage ./hpcg/oss.slices.strongscaling.nix {
inherit genInput;
};

View File

@@ -41,8 +41,6 @@ in
# /nix/store/8dr191vch1nw7vfz8nj36d5nhwnbdnf3-plot
ossGranularity = stdPlot ./hpcg/oss.granularity.R [ ossGranularity ];
# ossScalability = stdPlot ./hpcg/oss.scalability.R [ ossScalability ];
# /nix/store/a3x76fbnfbacn2xhz3q65fklfp0qbb6p-plot
ossWeakscalingPerAxisPerBlock = stdPlot ./hpcg/oss.slices.weakscaling.R [ ossSlicesWeakscaling ];