From 11901e77de03fa347f511748698590636af81193 Mon Sep 17 00:00:00 2001 From: Rodrigo Arias Mallo Date: Mon, 27 Jul 2020 13:17:08 +0200 Subject: [PATCH 1/2] Rename gauss-seidel to heat --- bsc/apps/{gauss-seidel => heat}/default.nix | 2 +- default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename bsc/apps/{gauss-seidel => heat}/default.nix (94%) diff --git a/bsc/apps/gauss-seidel/default.nix b/bsc/apps/heat/default.nix similarity index 94% rename from bsc/apps/gauss-seidel/default.nix rename to bsc/apps/heat/default.nix index 6c32a90..c249b41 100644 --- a/bsc/apps/gauss-seidel/default.nix +++ b/bsc/apps/heat/default.nix @@ -8,7 +8,7 @@ }: stdenv.mkDerivation rec { - name = "gauss-seidel"; + name = "heat"; src = builtins.fetchGit { url = "ssh://git@bscpm02.bsc.es/benchmarks/ompss-2/heat-conflict-kevin.git"; diff --git a/default.nix b/default.nix index 46a9412..e003f67 100644 --- a/default.nix +++ b/default.nix @@ -124,7 +124,7 @@ let tampi = tampi; }; - gauss-seidel = callPackage ./bsc/apps/gauss-seidel/default.nix { + heat = callPackage ./bsc/apps/heat/default.nix { stdenv = pkgs.gcc7Stdenv; mpi = intel-mpi; tampi = tampi; From 76ec5d5f16f296c1ac070108261ba8b303ba860b Mon Sep 17 00:00:00 2001 From: Rodrigo Arias Mallo Date: Mon, 27 Jul 2020 13:17:52 +0200 Subject: [PATCH 2/2] Add dummy app --- bsc/apps/dummy/default.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 bsc/apps/dummy/default.nix diff --git a/bsc/apps/dummy/default.nix b/bsc/apps/dummy/default.nix new file mode 100644 index 0000000..79fb138 --- /dev/null +++ b/bsc/apps/dummy/default.nix @@ -0,0 +1,18 @@ +{ + stdenv +, branch ? null +, srcPath ? null +}: + +#assert if srcPath == null then branch != null else true; + +stdenv.mkDerivation rec { + name = "dummy"; + + src = (if srcPath != null then srcPath else + builtins.fetchGit { + url = "ssh://git@bscpm02.bsc.es/rarias/dummy.git"; + ref = "${branch}"; + } + ); +}