From 47b72c4d1c005a4061942fdb8f6f95820c12e952 Mon Sep 17 00:00:00 2001 From: Christoph Niethammer Date: Wed, 26 Jun 2013 09:52:12 +0000 Subject: [PATCH] Updated packae-list file with nested "dependency-attributes". --- etc/platform-configs/laki/package-list | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/etc/platform-configs/laki/package-list b/etc/platform-configs/laki/package-list index 5fcd86d..9919365 100644 --- a/etc/platform-configs/laki/package-list +++ b/etc/platform-configs/laki/package-list @@ -4,12 +4,13 @@ # seperate different versions of a module by ',' compiler/gnu/(4.6.3,4.7.3): # the following line is eqivalent to -# compiler/gnu/4.6.3 -# compiler/gnu/4.7.3 +# compiler/gnu/4.6.3: +# compiler/gnu/4.7.3: compiler/intel/13.1.2: -mpi/openmpi/(1.6.4,1.7.1): compiler/gnu/(4.6.3,4.7.3),compiler/intel/13.1.2 +mpi/openmpi/(1.6.4,1.7.1): compiler/gnu/(4.6.3,4.7.3) +mpi/openmpi/(1.6.4,1.7.1): compiler/intel/13.1.2 # build every version with all listed compilers: # mpi/openmpi/1.6.4: compiler/gnu/4.6.3 # mpi/openmpi/1.6.4: compiler/gnu/4.7.3 @@ -18,20 +19,23 @@ mpi/openmpi/(1.6.4,1.7.1): compiler/gnu/(4.6.3,4.7.3),compiler/intel/13.1.2 # mpi/openmpi/1.7.1: compiler/gnu/4.7.3 # mpi/openmpi/1.7.1: compiler/intel/13.1.2 +numlib/mkl/3.3.0: mpi/openmpi/(1.6.4,1.7.1) -performance/extrae/2.3: mpi/openmpi/(1.6.4,1.7.1) | cuda/(4.2,5.0) +performance/extrae/2.3: mpi/openmpi/1.6.4{compiler/gnu/4.6.3} | cuda/(4.2,5.0) +performance/extrae/2.3: mpi/openmpi/1.7.1{compiler/intel/13.1.2} | cuda/(4.2,5.0) # performance/extrae/2.3: mpi/openmpi/1.6.4 cuda/4.2 # performance/extrae/2.3: mpi/openmpi/1.6.4 cuda/5.0 # performance/extrae/2.3: mpi/openmpi/1.7.1 cuda/4.2 # performance/extrae/2.3: mpi/openmpi/1.7.1 cuda/5.0 -performance/vampirtrace/(5.14.3,5.14.4): mpi/openmpi/(1.6.4,1.7.1) | cuda/(4.2,5.0) +performance/vampirtrace/(5.14.3,5.14.4): mpi/openmpi/(1.6.4) | cuda/(4.2,5.0) | numlib/mkl/3.3.0{mpi/openmpi/1.6.4{compiler/gnu/4.6.3}} | compiler/gnu/4.6.3 # performance/vampirtrace/5.14.3: mpi/openmpi/1.6.4 cuda/4.2 # performance/vampirtrace/5.14.3: mpi/openmpi/1.6.4 cuda/5.0 -# performance/vampirtrace/5.14.3: mpi/openmpi/1.7.1 cuda/4.2 -# performance/vampirtrace/5.14.3: mpi/openmpi/1.7.1 cuda/5.0 # performance/vampirtrace/5.14.4: mpi/openmpi/1.6.4 cuda/4.2 # performance/vampirtrace/5.14.4: mpi/openmpi/1.6.4 cuda/5.0 +performance/vampirtrace/(5.14.3,5.14.4): mpi/openmpi/(1.7.1) | cuda/(4.2,5.0) | numlib/mkl/3.3.0{mpi/openmpi/1.7.1{compiler/gnu/4.6.3}} +# performance/vampirtrace/5.14.3: mpi/openmpi/1.7.1 cuda/4.2 +# performance/vampirtrace/5.14.3: mpi/openmpi/1.7.1 cuda/5.0 # performance/vampirtrace/5.14.4: mpi/openmpi/1.7.1 cuda/4.2 # performance/vampirtrace/5.14.4: mpi/openmpi/1.7.1 cuda/5.0 @@ -64,4 +68,4 @@ performance/vampirtrace/(5.14.3,5.14.4): mpi/openmpi/(1.6.4,1.7.1) | cuda/(4.2, # # specify module tags in [] # be aware of default->version association; current and past! -# compiler/gnu/(4.6.3,4.7.3[default]): +# compiler/gnu/(4.6.3[testing],4.7.3[default]):