From 9f55578af2aeaed10ae826072541d508d9266b50 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Uwe=20K=C3=B6cher?= Date: Fri, 30 May 2014 10:24:34 +0200 Subject: [PATCH] Updated packages for FEniCS 1.3.0+(unstable); the unstable version is now fully compatible with fedora20 (VTK-6.0) --- FEniCS/packages/FEniCS.package | 4 ++-- FEniCS/packages/mpi4py.package | 3 ++- FEniCS/packages/pastix.package | 3 ++- FEniCS/packages/petsc.package | 4 ++-- FEniCS/packages/slepc.package | 6 +++--- FEniCS/packages/swig.package | 4 ++-- FEniCS/packages/trilinos.package | 12 ++++++------ FEniCS/platforms/supported/fedora20.platform | 11 +++++++---- local-DTM++.toolbox.cfg | 4 ++-- local-FEniCS.cfg | 3 ++- local-gcc.cfg | 2 +- local.cfg | 2 +- 12 files changed, 32 insertions(+), 26 deletions(-) diff --git a/FEniCS/packages/FEniCS.package b/FEniCS/packages/FEniCS.package index 6d65396..11353d5 100644 --- a/FEniCS/packages/FEniCS.package +++ b/FEniCS/packages/FEniCS.package @@ -2,7 +2,7 @@ NAME=FEniCS VERSION=1.3.0 BUILDCHAIN=ignore -MODULEFILE_PATH=${INSTALL_PATH}/conf/modulefiles/NVRI.software/toolbox/${NAME} +MODULEFILE_PATH=${INSTALL_PATH}/conf/modulefiles/candi/toolbox/${NAME} CONFIG_FILE=${MODULEFILE_PATH}/${VERSION} CURRENT_MODULES=$(echo ${LOADEDMODULES} | sed 's/:/\ /') @@ -17,7 +17,7 @@ package_specific_conf() { # FEniCS module for use with 'environment-modules' package: # -conflict NVRI.software/toolbox +conflict candi/toolbox module load ${CURRENT_MODULES} diff --git a/FEniCS/packages/mpi4py.package b/FEniCS/packages/mpi4py.package index 9d6c1fa..40c1018 100644 --- a/FEniCS/packages/mpi4py.package +++ b/FEniCS/packages/mpi4py.package @@ -1,5 +1,6 @@ VERSION=1.3.1 NAME=mpi4py-${VERSION} -SOURCE=https://mpi4py.googlecode.com/files/ +SOURCE=https://bitbucket.org/mpi4py/mpi4py/downloads/ PACKING=.tar.gz +CHECKSUM=dbe9d22bdc8ed965c23a7ceb6f32fc3c BUILDCHAIN=python diff --git a/FEniCS/packages/pastix.package b/FEniCS/packages/pastix.package index 8596d27..600ca41 100644 --- a/FEniCS/packages/pastix.package +++ b/FEniCS/packages/pastix.package @@ -1,6 +1,7 @@ NAME=pastix_release_4030 SOURCE=https://gforge.inria.fr/frs/download.php/32044/ PACKING=.tar.bz2 +CHECKSUM=d2395bca420901b93d8d2a66cda2062d BUILDCHAIN=custom package_specific_build () { @@ -28,7 +29,7 @@ package_specific_build () { fi # Create config file - cd src + cd ${UNPACK_PATH}/${EXTRACTSTO}/src cat > config.in << EOF HOSTARCH = ${PASTIX_ARCH} VERSIONBIT = ${VERSIONBIT} diff --git a/FEniCS/packages/petsc.package b/FEniCS/packages/petsc.package index b44c4c9..dd08758 100644 --- a/FEniCS/packages/petsc.package +++ b/FEniCS/packages/petsc.package @@ -1,7 +1,7 @@ -NAME=petsc-3.4.2 +NAME=petsc-3.4.4 SOURCE=http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/ PACKING=.tar.gz -CHECKSUM=449e27f3c9a37d0bd9d7941cc79a09a9 +CHECKSUM=7edbc68aa6d8d6a3295dd5f6c2f6979d BUILDCHAIN=custom CONFOPTS="COPTFLAGS=-O2 diff --git a/FEniCS/packages/slepc.package b/FEniCS/packages/slepc.package index 1bb716a..c100862 100644 --- a/FEniCS/packages/slepc.package +++ b/FEniCS/packages/slepc.package @@ -1,7 +1,7 @@ -NAME=slepc-3.4.2 -SOURCE=http://www.fenicsproject.org/pub/software/contrib/ +NAME=slepc-3.4.4 +SOURCE=http://www.grycap.upv.es/slepc/download/download.php?filename= PACKING=.tar.gz -CHECKSUM=78ff6a709f50ccd765fa61589400d5f3 +CHECKSUM=329179c5139027c7b293dd5ab0bc112c BUILDCHAIN=custom package_specific_setup () { diff --git a/FEniCS/packages/swig.package b/FEniCS/packages/swig.package index 395e48a..ecb8354 100644 --- a/FEniCS/packages/swig.package +++ b/FEniCS/packages/swig.package @@ -1,7 +1,7 @@ -NAME=swig-2.0.3 +NAME=swig-2.0.8 SOURCE=http://downloads.sourceforge.net/swig/ PACKING=.tar.gz -CHECKSUM=e548ea3882b994c4907d6be86bef90f2 +CHECKSUM=69f917e870efc0712c06ab53217b28d1 BUILDCHAIN=autotools package_specific_setup () { diff --git a/FEniCS/packages/trilinos.package b/FEniCS/packages/trilinos.package index 43bab49..d380abd 100644 --- a/FEniCS/packages/trilinos.package +++ b/FEniCS/packages/trilinos.package @@ -3,10 +3,10 @@ NAME=trilinos-${VERSION}-Source SOURCE=http://trilinos.sandia.gov/download/files/ PACKING=.tar.gz CHECKSUM=3c9465b6d63d824e9dc0365ca73c3370 -BUILDCHAIN=custom +BUILDCHAIN=cmake package_specific_setup () { -echo "Build ${NAME}" +#echo "Build ${NAME}" CONFOPTS="-D Trilinos_ENABLE_OpenMP:BOOL=OFF \ -D TPL_ENABLE_TBB:BOOL=OFF \ @@ -65,14 +65,14 @@ if [ ! -z "${PYTHON_LIBRARY}" ]; then fi -TRILINOS_SOURCE="${UNPACK_PATH}/${EXTRACTSTO}" +#TRILINOS_SOURCE="${UNPACK_PATH}/${EXTRACTSTO}" # configure -cmake ${CONFOPTS} ${TRILINOS_SOURCE} +#cmake ${CONFOPTS} ${TRILINOS_SOURCE} # make -make -j${PROCS} -make install +#make -j${PROCS} +#make install } package_specific_register () { diff --git a/FEniCS/platforms/supported/fedora20.platform b/FEniCS/platforms/supported/fedora20.platform index 89562c4..4ea59cb 100644 --- a/FEniCS/platforms/supported/fedora20.platform +++ b/FEniCS/platforms/supported/fedora20.platform @@ -10,7 +10,7 @@ # ScientificPython mpfr-devel armadillo-devel gmp-devel CGAL-devel \ # cppunit-devel flex bison bzip2-devel python-ply eigen3 scotch scotch-devel \ # vtk vtkdata vtk-devel vtk-python tk tk-devel tcl tcl-devel \ -# sphinx python-sphinx python-numpydoc' +# sphinx python-sphinx python-numpydoc octave-devel' # # If you have multiple MPI libraries installed, make sure the # appropriate version is selected. For this, on a 32-bit operating @@ -40,15 +40,18 @@ default UMFPACK_INCLUDE_DIR=/usr/include/suitesparse # Define the packages this platform needs PACKAGES=( skip:FEniCS-prepare -#once:hdf5 +once:mpi4py +once:hdf5 once:boost +once:swig once:parmetis once:trilinos once:petsc once:slepc -#once:sphinx +# once:sphinx # swiginac -# once:scotch +once:scotch +# once:pastix fiat ferari ufc diff --git a/local-DTM++.toolbox.cfg b/local-DTM++.toolbox.cfg index cf5a8bb..2fddbac 100644 --- a/local-DTM++.toolbox.cfg +++ b/local-DTM++.toolbox.cfg @@ -6,8 +6,8 @@ # Meta-project to build PROJECT=DTM++.toolbox CLEAN_BUILD=false -COMPILER=native-openmpi - +#COMPILER=native-openmpi +COMPILER=llvm-mpich2-1.4.1p1 # How many processes would you like to build using? PROCS=1 diff --git a/local-FEniCS.cfg b/local-FEniCS.cfg index 42daf31..6ad2087 100644 --- a/local-FEniCS.cfg +++ b/local-FEniCS.cfg @@ -26,6 +26,7 @@ INSTALL_PATH=${PREFIX_PATH}/${PROJECT}/${COMPILER} PROCS=1 # Would you like to build stable versions of projects? -STABLE_BUILD=true +#STABLE_BUILD=true +STABLE_BUILD=false # Would you like to use snapshots when using STABLE_BUILD=false? USE_SNAPSHOTS=false diff --git a/local-gcc.cfg b/local-gcc.cfg index ac39276..7295ec2 100644 --- a/local-gcc.cfg +++ b/local-gcc.cfg @@ -11,7 +11,7 @@ VERSION=4.8.2 # How many processes would you like to build using? PROCS=1 -PREFIX_PATH=~/appl/candi +PREFIX_PATH=~/apps/candi # Where do you want the downloaded source files to go? DOWNLOAD_PATH=${PREFIX_PATH}/src diff --git a/local.cfg b/local.cfg index a980d14..5677a4e 120000 --- a/local.cfg +++ b/local.cfg @@ -1 +1 @@ -local-DTM++.toolbox.cfg \ No newline at end of file +local-deal.II.cfg \ No newline at end of file -- 2.39.5