From 9fc2a2025cf0039cb324837d9c180766cc31e2ac Mon Sep 17 00:00:00 2001 From: Rodrigo Arias Mallo Date: Tue, 20 Apr 2021 18:42:19 +0200 Subject: [PATCH] lulesh: add gitTable --- garlic/apps/lulesh/default.nix | 52 ++++++++++++++++++-------------- garlic/apps/lulesh/git-table.nix | 12 ++++++++ 2 files changed, 41 insertions(+), 23 deletions(-) create mode 100644 garlic/apps/lulesh/git-table.nix diff --git a/garlic/apps/lulesh/default.nix b/garlic/apps/lulesh/default.nix index 3659caf..5a43ee5 100644 --- a/garlic/apps/lulesh/default.nix +++ b/garlic/apps/lulesh/default.nix @@ -3,38 +3,44 @@ , impi , mcxx , icc -, gitBranch ? "garlic/tampi+isend+oss+taskfor" , tampi ? null +, gitBranch ? "garlic/mpi+isend+seq" +, gitCommit ? null +, garlicTools }: with stdenv.lib; -stdenv.mkDerivation rec { - name = "lulesh"; - - src = builtins.fetchGit { - url = "ssh://git@bscpm03.bsc.es/garlic/apps/lulesh.git"; - ref = gitBranch; +let + gitSource = garlicTools.fetchGarlicApp { + appName = "lulesh"; + inherit gitCommit gitBranch; + gitTable = import ./git-table.nix; }; +in + stdenv.mkDerivation rec { + name = "lulesh"; - dontConfigure = true; + inherit (gitSource) src gitBranch gitCommit; - preBuild = optionalString (tampi != null) "export TAMPI_HOME=${tampi}"; + dontConfigure = true; - #TODO: Allow multiple MPI implementations and compilers - buildInputs = [ - impi - icc - mcxx - ]; + preBuild = optionalString (tampi != null) "export TAMPI_HOME=${tampi}"; - enableParallelBuilding = true; + #TODO: Allow multiple MPI implementations and compilers + buildInputs = [ + impi + icc + mcxx + ]; - #TODO: Can we build an executable named "lulesh" in all branches? - installPhase = '' - mkdir -p $out/bin - find . -name 'lulesh*' -type f -executable -exec cp \{\} $out/bin/${name} \; - ''; - programPath = "/bin/${name}"; + enableParallelBuilding = true; -} + #TODO: Can we build an executable named "lulesh" in all branches? + installPhase = '' + mkdir -p $out/bin + find . -name 'lulesh*' -type f -executable -exec cp \{\} $out/bin/${name} \; + ''; + programPath = "/bin/${name}"; + + } diff --git a/garlic/apps/lulesh/git-table.nix b/garlic/apps/lulesh/git-table.nix new file mode 100644 index 0000000..49c2bba --- /dev/null +++ b/garlic/apps/lulesh/git-table.nix @@ -0,0 +1,12 @@ +{ + # Auto-generated with garlic-git-table on 2021-04-20 for repo: + # ssh://git@bscpm03.bsc.es/garlic/apps/lulesh.git + + "garlic/mpi+isend+omp+fork" = "6cc85c55cb4840d6cde12bb285f5ab1ae7878618"; + "garlic/mpi+isend+oss+task" = "0a9e2cd1d64ab4fcf1860ace02866278ad289637"; + "garlic/mpi+isend+seq" = "9df5475c7dd2b345559fae5bd07ceea38f2e7b91"; + "garlic/tampi+isend+oss+task" = "28ce0cd69f9b4e65eff8141ec455d5f60e9b98b3"; + "garlic/tampi+isend+oss+taskfor" = "928f315ea426585a32231d950da651399e48d762"; + "garlic/tampi+isend+oss+taskloop" = "7957c1a2c84ae80edddcec9eafe7efdeefa68d58"; + "garlic/tampi+isend+oss+taskloopfor" = "7efa0535130a6726f5a46669cf171412d21adc9b"; +}