From: Uwe Köcher Date: Sat, 28 Jun 2014 09:10:39 +0000 (+0200) Subject: some small changes, only details in pathes and packages X-Git-Tag: 0.3~18 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aa8bcca88fc08766eb85afd6c13f93f642f2286d;p=candi.git 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 75d2e12..505d97f 100644 --- 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 aad0bdc..d233520 100644 --- 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 2bbc77c..49de330 100644 --- 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 fa9dbd1..aea62e0 100644 --- 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 2da7c27..7aa53fc 100644 --- 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 3469751..58d676e 100644 --- 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 10f7f22..a01dfe3 100644 --- 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 0a32aad..a0e9586 100644 --- 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 d0c6a4d..5b8d29f 100644 --- 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 0e0607e..fbd5bad 100644 --- 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 b4c08d5..f3d05c5 100644 --- 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 )