From 866d4561d3f257ee55dfe9883b81deab69919657 Mon Sep 17 00:00:00 2001 From: Rodrigo Arias Mallo Date: Mon, 19 Apr 2021 16:01:11 +0200 Subject: [PATCH] hpcg: remove old experiments --- garlic/exp/hpcg/mpi+omp.nix | 70 ---------------- garlic/exp/hpcg/mpi.nix | 64 --------------- garlic/exp/hpcg/omp.nix | 71 ---------------- garlic/exp/hpcg/oss.granularity.192.nix | 89 -------------------- garlic/exp/hpcg/oss.nix | 89 -------------------- garlic/exp/hpcg/serial.nix | 63 -------------- garlic/exp/hpcg/slices.nix | 104 ------------------------ 7 files changed, 550 deletions(-) delete mode 100644 garlic/exp/hpcg/mpi+omp.nix delete mode 100644 garlic/exp/hpcg/mpi.nix delete mode 100644 garlic/exp/hpcg/omp.nix delete mode 100644 garlic/exp/hpcg/oss.granularity.192.nix delete mode 100644 garlic/exp/hpcg/oss.nix delete mode 100644 garlic/exp/hpcg/serial.nix delete mode 100644 garlic/exp/hpcg/slices.nix diff --git a/garlic/exp/hpcg/mpi+omp.nix b/garlic/exp/hpcg/mpi+omp.nix deleted file mode 100644 index 6ea245c..0000000 --- a/garlic/exp/hpcg/mpi+omp.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ - stdenv -, stdexp -, bsc -, targetMachine -, stages -}: - -with stdenv.lib; - -let - # Initial variable configuration - varConf = with bsc; { - n = [ { x = 128; y = 192; z = 192; } ]; - nblocks = [ 6 12 24 48 96 192 ]; - }; - - # Generate the complete configuration for each unit - genConf = with bsc; c: targetMachine.config // rec { - # hpcg options - n = c.n; - cc = bsc.icc; - mpi = bsc.impi; - gitBranch = "garlic/mpi+send+omp+fork"; - - # Repeat the execution of each unit 30 times - loops = 30; - - # Resources - qos = "debug"; - ntasksPerNode = 1; - nodes = 4; - time = "02:00:00"; - # Each task in different socket - cpuBind = "verbose,mask_cpu:0x3f"; - jobName = "hpcg-${toString n.x}-${toString n.y}-${toString n.z}-${gitBranch}"; - }; - - # Compute the array of configurations - configs = stdexp.buildConfigs { - inherit varConf genConf; - }; - - exec = {nextStage, conf, ...}: with conf; stages.exec { - inherit nextStage; - env = '' - OMP_PROC_BIND=true - OMP_NUM_THREADS=6 - ''; - argv = [ - "--nx=${toString n.x}" - "--ny=${toString n.y}" - "--nz=${toString n.z}" - "--nblocks=${toString nblocks}" - ]; - }; - - program = {nextStage, conf, ...}: with conf; - let - customPkgs = stdexp.replaceMpi conf.mpi; - in - customPkgs.apps.hpcg.override { - inherit cc mpi gitBranch; - }; - - pipeline = stdexp.stdPipeline ++ [ exec program ]; - -in - - stdexp.genExperiment { inherit configs pipeline; } diff --git a/garlic/exp/hpcg/mpi.nix b/garlic/exp/hpcg/mpi.nix deleted file mode 100644 index a2a2ec4..0000000 --- a/garlic/exp/hpcg/mpi.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ - stdenv -, stdexp -, bsc -, targetMachine -, stages -}: - -with stdenv.lib; - -let - # Initial variable configuration - varConf = with bsc; { - n = [ { x = 96; y = 96; z = 96; } ]; - }; - - # Generate the complete configuration for each unit - genConf = with bsc; c: targetMachine.config // rec { - # hpcg options - n = c.n; - cc = bsc.icc; - mpi = bsc.impi; - gitBranch = "garlic/mpi"; - - # Repeat the execution of each unit 30 times - loops = 30; - - # Resources - qos = "debug"; - ntasksPerNode = 1; - nodes = 24; - time = "02:00:00"; - # Each task in different socket - cpuBind = "verbose,mask_cpu:0x1"; - jobName = "hpcg-${toString n.x}-${toString n.y}-${toString n.z}-${gitBranch}"; - }; - - # Compute the array of configurations - configs = stdexp.buildConfigs { - inherit varConf genConf; - }; - - exec = {nextStage, conf, ...}: with conf; stages.exec { - inherit nextStage; - argv = [ - "--nx=${toString n.x}" - "--ny=${toString n.y}" - "--nz=${toString n.z}" - ]; - }; - - program = {nextStage, conf, ...}: with conf; - let - customPkgs = stdexp.replaceMpi conf.mpi; - in - customPkgs.apps.hpcg.override { - inherit cc mpi gitBranch; - }; - - pipeline = stdexp.stdPipeline ++ [ exec program ]; - -in - - stdexp.genExperiment { inherit configs pipeline; } diff --git a/garlic/exp/hpcg/omp.nix b/garlic/exp/hpcg/omp.nix deleted file mode 100644 index c4dcc8c..0000000 --- a/garlic/exp/hpcg/omp.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ - stdenv -, stdexp -, bsc -, targetMachine -, stages -}: - -with stdenv.lib; - -let - # Initial variable configuration - varConf = with bsc; { - n = [ { x = 256; y = 288; z = 288; } ]; - nblocks = [ 12 24 48 96 192 384 ]; - }; - - # Generate the complete configuration for each unit - genConf = with bsc; c: targetMachine.config // rec { - # hpcg options - n = c.n; - nblocks = c.nblocks; - cc = bsc.icc; - mpi = null; # TODO: Remove this for omp - gitBranch = "garlic/omp+fork"; - - # Repeat the execution of each unit 30 times - loops = 30; - - # Resources - qos = "debug"; - ntasksPerNode = 1; - nodes = 1; - time = "02:00:00"; - # task in one socket - cpuBind = "verbose,mask_cpu:0xffffff"; - jobName = "hpcg-${toString n.x}-${toString n.y}-${toString n.z}-${gitBranch}"; - }; - - # Compute the array of configurations - configs = stdexp.buildConfigs { - inherit varConf genConf; - }; - - exec = {nextStage, conf, ...}: with conf; stages.exec { - inherit nextStage; - env = '' - OMP_PROC_BIND=true - OMP_NUM_THREADS=24 - ''; - argv = [ - "--nx=${toString n.x}" - "--ny=${toString n.y}" - "--nz=${toString n.z}" - "--nblocks=${toString nblocks}" - ]; - }; - - program = {nextStage, conf, ...}: with conf; - let - customPkgs = stdexp.replaceMpi conf.mpi; - in - customPkgs.apps.hpcg.override { - inherit cc gitBranch; - }; - - pipeline = stdexp.stdPipeline ++ [ exec program ]; - -in - - stdexp.genExperiment { inherit configs pipeline; } diff --git a/garlic/exp/hpcg/oss.granularity.192.nix b/garlic/exp/hpcg/oss.granularity.192.nix deleted file mode 100644 index 04a484a..0000000 --- a/garlic/exp/hpcg/oss.granularity.192.nix +++ /dev/null @@ -1,89 +0,0 @@ -{ - stdenv -, stdexp -, bsc -, targetMachine -, stages -, genInput -}: - -with stdenv.lib; - -let - # Initial variable configuration - varConf = { - n = [ { x = 192; y = 192; z = 192; } ]; - nprocs = [ - { x = 2; y = 1; z = 1; } - # { x = 2; y = 2; z = 1; } - # { x = 2; y = 2; z = 2; } - # { x = 4; y = 2; z = 2; } - # { x = 4; y = 4; z = 2; } - ]; - nblocks = [ 12 24 48 96 192 384 768 1536 ]; - # nblocks = [ 384 ]; - ncommblocks = [ 1 ]; - # nodes = [ 1 ]; - # nodes = [ 1 2 4 8 16 ]; - }; - - # Generate the complete configuration for each unit - genConf = c: targetMachine.config // rec { - expName = "hpcg.oss"; - unitName = "${expName}.nb${toString nblocks}"; - - inherit (targetMachine.config) hw; - - # hpcg options - inherit (c) n nprocs nblocks ncommblocks; - - gitBranch = "garlic/tampi+isend+oss+task"; - - # Repeat the execution of each unit 30 times - loops = 3; - - disableAspectRatio = false; - - # Resources - qos = "debug"; - ntasksPerNode = hw.socketsPerNode; - time = "02:00:00"; - # task in one socket - cpusPerTask = hw.cpusPerSocket; - nodes = (nprocs.x * nprocs.y * nprocs.z) / ntasksPerNode; - jobName = "hpcg-${toString n.x}-${toString n.y}-${toString n.z}-${gitBranch}"; - }; - - # Compute the array of configurations - configs = stdexp.buildConfigs { - inherit varConf genConf; - }; - - input = genInput configs; - - exec = {nextStage, conf, ...}: stages.exec { - inherit nextStage; - argv = [ - "--nx=${toString conf.n.x}" - "--ny=${toString conf.n.y}" - "--nz=${toString conf.n.z}" - "--npx=${toString conf.nprocs.x}" - "--npy=${toString conf.nprocs.y}" - "--npz=${toString conf.nprocs.z}" - "--nblocks=${toString conf.nblocks}" - "--ncomms=${toString conf.ncommblocks}" - # The input symlink is generated by the input stage, which is generated by - # the genInput function. - "--load=input" - ]; - }; - - program = {nextStage, conf, ...}: bsc.apps.hpcg.override { - inherit (conf) gitBranch; - }; - - pipeline = stdexp.stdPipeline ++ [ input exec program ]; - -in - - stdexp.genExperiment { inherit configs pipeline; } diff --git a/garlic/exp/hpcg/oss.nix b/garlic/exp/hpcg/oss.nix deleted file mode 100644 index b04215b..0000000 --- a/garlic/exp/hpcg/oss.nix +++ /dev/null @@ -1,89 +0,0 @@ -{ - stdenv -, stdexp -, bsc -, targetMachine -, stages -, genInput -}: - -with stdenv.lib; - -let - # Initial variable configuration - varConf = { - n = [ { x = 192; y = 192; z = 192; } ]; - nprocs = [ - { x = 2; y = 1; z = 1; } - { x = 2; y = 2; z = 1; } - { x = 2; y = 2; z = 2; } - { x = 4; y = 2; z = 2; } - { x = 4; y = 4; z = 2; } - ]; - # nblocks = [ 12 24 48 96 192 384 768 1536 ]; - nblocks = [ 384 768 1536 ]; - ncommblocks = [ 1 ]; - # nodes = [ 1 ]; - # nodes = [ 1 2 4 8 16 ]; - }; - - # Generate the complete configuration for each unit - genConf = c: targetMachine.config // rec { - expName = "hpcg.oss"; - unitName = "${expName}.nb${toString nblocks}"; - - inherit (targetMachine.config) hw; - - # hpcg options - inherit (c) n nprocs nblocks ncommblocks; - - gitBranch = "garlic/tampi+isend+oss+task"; - - # Repeat the execution of each unit 30 times - loops = 3; - - disableAspectRatio = false; - - # Resources - qos = "debug"; - ntasksPerNode = hw.socketsPerNode; - time = "02:00:00"; - # task in one socket - cpusPerTask = hw.cpusPerSocket; - nodes = (nprocs.x * nprocs.y * nprocs.z) / ntasksPerNode; - jobName = "hpcg-${toString n.x}-${toString n.y}-${toString n.z}-${gitBranch}"; - }; - - # Compute the array of configurations - configs = stdexp.buildConfigs { - inherit varConf genConf; - }; - - input = genInput configs; - - exec = {nextStage, conf, ...}: stages.exec { - inherit nextStage; - argv = [ - "--nx=${toString conf.n.x}" - "--ny=${toString conf.n.y}" - "--nz=${toString conf.n.z}" - "--npx=${toString conf.nprocs.x}" - "--npy=${toString conf.nprocs.y}" - "--npz=${toString conf.nprocs.z}" - "--nblocks=${toString conf.nblocks}" - "--ncomms=${toString conf.ncommblocks}" - # The input symlink is generated by the input stage, which is generated by - # the genInput function. - "--load=input" - ]; - }; - - program = {nextStage, conf, ...}: bsc.apps.hpcg.override { - inherit (conf) gitBranch; - }; - - pipeline = stdexp.stdPipeline ++ [ input exec program ]; - -in - - stdexp.genExperiment { inherit configs pipeline; } diff --git a/garlic/exp/hpcg/serial.nix b/garlic/exp/hpcg/serial.nix deleted file mode 100644 index 3c58b42..0000000 --- a/garlic/exp/hpcg/serial.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ - stdenv -, stdexp -, bsc -, targetMachine -, stages -}: - -with stdenv.lib; - -let - # Initial variable configuration - varConf = with bsc; { - n = [ { x = 256; y = 288; z = 288; } ]; - }; - - # Generate the complete configuration for each unit - genConf = with bsc; c: targetMachine.config // rec { - # hpcg options - n = c.n; - cc = icc; - mpi = null; # TODO: Remove this for serial - gitBranch = "garlic/seq"; - - # Repeat the execution of each unit 30 times - loops = 30; - - # Resources - qos = "debug"; - ntasksPerNode = 1; - nodes = 1; - time = "02:00:00"; - cpuBind = "verbose,mask_cpu:0x1"; - jobName = "hpcg-${toString n.x}-${toString n.y}-${toString n.z}-${gitBranch}"; - }; - - # Compute the array of configurations - configs = stdexp.buildConfigs { - inherit varConf genConf; - }; - - exec = {nextStage, conf, ...}: with conf; stages.exec { - inherit nextStage; - argv = [ - "--nx=${toString n.x}" - "--ny=${toString n.y}" - "--nz=${toString n.z}" - ]; - }; - - program = {nextStage, conf, ...}: with conf; - let - customPkgs = stdexp.replaceMpi conf.mpi; - in - customPkgs.apps.hpcg.override { - inherit cc gitBranch; - }; - - pipeline = stdexp.stdPipeline ++ [ exec program ]; - -in - - stdexp.genExperiment { inherit configs pipeline; } diff --git a/garlic/exp/hpcg/slices.nix b/garlic/exp/hpcg/slices.nix deleted file mode 100644 index 4ff467d..0000000 --- a/garlic/exp/hpcg/slices.nix +++ /dev/null @@ -1,104 +0,0 @@ -{ - stdenv -, stdexp -, bsc -, targetMachine -, stages -, genInput -}: - -with stdenv.lib; - -let - # Initial variable configuration - varConf = { - n = [ { x = 192; y = 192; z = 192; } ]; - nprocs = [ - { x = 2; y = 1; z = 1; } - { x = 4; y = 1; z = 1; } - { x = 8; y = 1; z = 1; } - { x = 16; y = 1; z = 1; } - { x = 32; y = 1; z = 1; } - - { x = 1; y = 2; z = 1; } - { x = 1; y = 4; z = 1; } - { x = 1; y = 8; z = 1; } - { x = 1; y = 16; z = 1; } - { x = 1; y = 32; z = 1; } - - { x = 1; y = 1; z = 2; } - { x = 1; y = 1; z = 4; } - { x = 1; y = 1; z = 8; } - { x = 1; y = 1; z = 16; } - { x = 1; y = 1; z = 32; } - - ]; - # nblocks = [ 12 24 48 96 192 384 768 1536 ]; - nblocks = [ 384 768 1536 ]; - ncommblocks = [ 1 ]; - # nodes = [ 1 ]; - # nodes = [ 1 2 4 8 16 ]; - }; - - # Generate the complete configuration for each unit - genConf = c: targetMachine.config // rec { - expName = "hpcg.oss"; - unitName = "${expName}.nb${toString nblocks}"; - - inherit (targetMachine.config) hw; - - # hpcg options - inherit (c) n nprocs nblocks ncommblocks; - - gitBranch = "garlic/tampi+isend+oss+task"; - - # Repeat the execution of each unit 30 times - loops = 10; - - disableAspectRatio = true; - - # Resources - qos = "debug"; - ntasksPerNode = hw.socketsPerNode; - time = "02:00:00"; - # task in one socket - cpusPerTask = hw.cpusPerSocket; - nodes = (nprocs.x * nprocs.y * nprocs.z) / ntasksPerNode; - jobName = "hpcg-${toString n.x}-${toString n.y}-${toString n.z}-${gitBranch}"; - }; - - # Compute the array of configurations - configs = stdexp.buildConfigs { - inherit varConf genConf; - }; - - input = genInput configs; - - exec = {nextStage, conf, ...}: stages.exec { - inherit nextStage; - argv = [ - "--nx=${toString conf.n.x}" - "--ny=${toString conf.n.y}" - "--nz=${toString conf.n.z}" - # Distribute all processes in X axis - "--npx=${toString conf.nprocs.x}" - "--npy=${toString conf.nprocs.y}" - "--npz=${toString conf.nprocs.z}" - "--nblocks=${toString conf.nblocks}" - "--ncomms=${toString conf.ncommblocks}" - # The input symlink is generated by the input stage, which is generated by - # the genInput function. - "--load=input" - # Disable HPCG Aspect Ratio to run any mpi layout - ] ++ optional (conf.disableAspectRatio) "--no-ar=1"; - }; - - program = {nextStage, conf, ...}: bsc.apps.hpcg.override { - inherit (conf) gitBranch; - }; - - pipeline = stdexp.stdPipeline ++ [ input exec program ]; - -in - - stdexp.genExperiment { inherit configs pipeline; }