some small changes, only details in pathes and packages

diff --git a/DTM++.toolbox/platforms/supported/fedora20.platform b/DTM++.toolbox/platforms/supported/fedora20.platform
index 75d2e12e6032b66d4b069de41f7d4cc900aa18e5..505d97f36545f85112dc6e515b9216a9c4bb56cf 100644 (file)
--- a/DTM++.toolbox/platforms/supported/fedora20.platform
+++ b/DTM++.toolbox/platforms/supported/fedora20.platform
@@ -28,7 +28,6 @@ default UMFPACK_INCLUDE_DIR=/usr/include/suitesparse
 # Define the packages this platform needs
 PACKAGES=(
 #once:hwloc
-once:superlu_dist
 once:hdf5
 once:p4est
 once:trilinos

diff --git a/local-DTM++.toolbox.cfg b/local-DTM++.toolbox.cfg
index aad0bdc3916c47e27be9f3734f2fa62165b13310..d233520c0f18d6609acda431c3a00ec1809dfac8 100644 (file)
--- a/local-DTM++.toolbox.cfg
+++ b/local-DTM++.toolbox.cfg
@@ -6,8 +6,13 @@
 # Meta-project to build
 PROJECT=DTM++.toolbox
 CLEAN_BUILD=false
+
 COMPILER=native-openmpi
-#COMPILER=gcc-4.9.0-mvapich2-1.9
+#COMPILERBASE=gcc-4.9.0
+#COMPILERBASE=llvm
+#COMPILERMPI=openmpi-1.6.5
+#COMPILERMPI=mpich-3.0.4
+#COMPILER=${COMPILERBASE}-${COMPILERMPI}
 
 # How many processes would you like to build using?
 PROCS=1

diff --git a/local-FEniCS.cfg b/local-FEniCS.cfg
index 2bbc77c6299d05b5825b8ee4456fb5acc55dbc53..49de3309bbc2f85774fb40c27f198fa950ff8640 100644 (file)
--- a/local-FEniCS.cfg
+++ b/local-FEniCS.cfg
@@ -6,8 +6,13 @@
 # Meta-project to build
 PROJECT=FEniCS
 CLEAN_BUILD=false
+
 COMPILER=native-openmpi
-#COMPILER=gcc-4.9.0-openmpi-1.6.5
+#COMPILERBASE=gcc-4.9.0
+#COMPILERBASE=llvm
+#COMPILERMPI=openmpi-1.6.5
+#COMPILERMPI=mpich-3.0.4
+#COMPILER=${COMPILERBASE}-${COMPILERMPI}
 
 PREFIX_PATH=~/apps/candi
 

diff --git a/local-deal.II.cfg b/local-deal.II.cfg
index fa9dbd174176d8b573072b995165a91bdb450bde..aea62e0c274b7c8f03eb5b92bc2c18c4c0941ba0 100644 (file)
--- a/local-deal.II.cfg
+++ b/local-deal.II.cfg
@@ -52,7 +52,11 @@ DEAL_CONFOPTS=" \
 # Prefix directory
 PREFIX_PATH=~/apps/candi
 COMPILER=native-openmpi
-#COMPILER=gcc-4.9.0-openmpi-1.6.5
+#COMPILERBASE=gcc-4.9.0
+#COMPILERBASE=llvm
+#COMPILERMPI=openmpi-1.6.5
+#COMPILERMPI=mpich-3.0.4
+#COMPILER=${COMPILERBASE}-${COMPILERMPI}
 
 # Where do you want the downloaded source files to go?
 DOWNLOAD_PATH=${PREFIX_PATH}/src

diff --git a/local-gcc.cfg b/local-gcc.cfg
index 2da7c27f3b2f35dab407d5476f36efdef5b08058..7aa53fc3440ec4cb3190fe1ddfcd38f2650b74d0 100644 (file)
--- a/local-gcc.cfg
+++ b/local-gcc.cfg
@@ -6,7 +6,7 @@
 # Meta-project to build
 PROJECT=gcc
 #VERSION=4.7.3
-#VERSION=4.8.2
+#VERSION=4.8.3
 VERSION=4.9.0
 
 # How many processes would you like to build using?

diff --git a/local-mpi.cfg b/local-mpi.cfg
index 34697517542bc20ffc624abf84f131a82dbaf7b1..58d676e3c3ae4704d927d040c972cab58814663a 100644 (file)
--- a/local-mpi.cfg
+++ b/local-mpi.cfg
@@ -5,9 +5,9 @@
 
 # Meta-project to build
 PROJECT=mpi
-#COMPILER=llvm
-#COMPILER=gcc-4.8.2
-COMPILER=gcc-4.9.0
+COMPILER=llvm
+#COMPILER=gcc-4.8.3
+#COMPILER=gcc-4.9.0
 
 # How many processes would you like to build using?
 PROCS=1

diff --git a/mpi/packages/mpich.package b/mpi/packages/mpich.package
index 10f7f22e078c192bfcb84f7f333171aff97acb0e..a01dfe3443e055065110ac3e2394b614160c421e 100644 (file)
--- a/mpi/packages/mpich.package
+++ b/mpi/packages/mpich.package
@@ -7,10 +7,9 @@ CHECKSUM=9c5d5d4fe1e17dd12153f40bc5b6dbc0
 BUILDCHAIN=autotools
 PROCS=1
 CONFOPTS="-q CFLAGS=-fPIC CXXFLAGS=-fPIC FFLAGS=-fPIC FCFLAGS=-fPIC"
-INSTALL_PATH=${INSTALL_PATH}/${COMPILER}/${NAME}
 
 INSTALL_PATH=${INSTALL_PATH}/${NAME}
-MODULEFILE_PATH=${INSTALL_PATH}/conf/modulefiles/compiler/mpi/${COMPILER}
+MODULEFILE_PATH=${INSTALL_PATH}/conf/modulefiles/candi/compiler/mpi/${COMPILER}
 CONFIG_FILE=${MODULEFILE_PATH}/${NAME}
 
 # **********************************************************************************
@@ -24,6 +23,9 @@ package_specific_conf() {
 #
 # ${NAME} against ${COMPILER}
 #
+conflict compiler
+conflict candi/compiler
+conflict mpi
 
 prepend-path           PATH            ${PATH}
 prepend-path           MANPATH         ${MANPATH}

diff --git a/mpi/packages/mpich2.package b/mpi/packages/mpich2.package
index 0a32aad81f21bf7e9c29ce0a730b76d1781eaea4..a0e958611c7f922f74550720b3a83cc2bb039234 100644 (file)
--- a/mpi/packages/mpich2.package
+++ b/mpi/packages/mpich2.package
@@ -7,10 +7,9 @@ CHECKSUM=b470666749bcb4a0449a072a18e2c204
 BUILDCHAIN=autotools
 PROCS=1
 CONFOPTS="-q CFLAGS=-fPIC CXXFLAGS=-fPIC FFLAGS=-fPIC FCFLAGS=-fPIC"
-INSTALL_PATH=${INSTALL_PATH}/${COMPILER}/${NAME}
 
 INSTALL_PATH=${INSTALL_PATH}/${NAME}
-MODULEFILE_PATH=${INSTALL_PATH}/conf/modulefiles/compiler/mpi/${COMPILER}
+MODULEFILE_PATH=${INSTALL_PATH}/conf/modulefiles/candi/compiler/mpi/${COMPILER}
 CONFIG_FILE=${MODULEFILE_PATH}/${NAME}
 
 # **********************************************************************************
@@ -24,6 +23,9 @@ package_specific_conf() {
 #
 # ${NAME} against ${COMPILER}
 #
+conflict compiler
+conflict candi/compiler
+conflict mpi
 
 prepend-path           PATH            ${PATH}
 prepend-path           MANPATH         ${MANPATH}

diff --git a/mpi/packages/mvapich2.package b/mpi/packages/mvapich2.package
index d0c6a4dadaadf6c14359908496c5f35232aed362..5b8d29f16b58f50d2ab472dd8b17a9a4b8a8ff45 100644 (file)
--- a/mpi/packages/mvapich2.package
+++ b/mpi/packages/mvapich2.package
@@ -9,7 +9,7 @@ CONFOPTS="--enable-shared"
 #CONFOPTS="--enable-error-messages=all --enable-g=dbg --enable-debuginfo" // for debugging
 
 INSTALL_PATH=${INSTALL_PATH}/${NAME}
-MODULEFILE_PATH=${INSTALL_PATH}/conf/modulefiles/compiler/mpi/${COMPILER}
+MODULEFILE_PATH=${INSTALL_PATH}/conf/modulefiles/candi/compiler/mpi/${COMPILER}
 CONFIG_FILE=${MODULEFILE_PATH}/${NAME}
 
 # **********************************************************************************
@@ -23,6 +23,9 @@ package_specific_conf() {
 #
 # ${NAME} against ${COMPILER}
 #
+conflict compiler
+conflict candi/compiler
+conflict mpi
 
 prepend-path           PATH            ${PATH}
 prepend-path           MANPATH         ${MANPATH}

diff --git a/mpi/packages/openmpi.package b/mpi/packages/openmpi.package
index 0e0607e8dc36182be9ae34be3988ac9a02eb7507..fbd5bad03f43efa4d1f217c95827c8c5be9e7bec 100644 (file)
--- a/mpi/packages/openmpi.package
+++ b/mpi/packages/openmpi.package
@@ -10,7 +10,7 @@ PROCS=1
 TARGETS=('' all install)
 
 INSTALL_PATH=${INSTALL_PATH}/${NAME}
-MODULEFILE_PATH=${INSTALL_PATH}/conf/modulefiles/compiler/mpi/${COMPILER}
+MODULEFILE_PATH=${INSTALL_PATH}/conf/modulefiles/candi/compiler/mpi/${COMPILER}
 CONFIG_FILE=${MODULEFILE_PATH}/${NAME}
 
 # **********************************************************************************
@@ -24,6 +24,9 @@ package_specific_conf() {
 #
 # ${NAME} against ${COMPILER}
 #
+conflict compiler
+conflict candi/compiler
+conflict mpi
 
 prepend-path           PATH            ${PATH}
 prepend-path           MANPATH         ${MANPATH}

diff --git a/mpi/platforms/supported/fedora20.platform b/mpi/platforms/supported/fedora20.platform
index b4c08d5d6244ff3aaa4d19f168c7a2ebceceff8b..f3d05c5896ef1111ee6937598fe40b9034ce43f1 100644 (file)
--- a/mpi/platforms/supported/fedora20.platform
+++ b/mpi/platforms/supported/fedora20.platform
@@ -7,9 +7,9 @@
 
 # Define the packages this platform needs
 PACKAGES=(
-#once:mpich2
-#once:mpich
-#once:openmpi
-once:mvapich2
+once:mpich2
+once:mpich
+once:openmpi
+#once:mvapich2
 )