Updated packages for FEniCS 1.3.0+(unstable); the unstable version is now fully compa...

diff --git a/FEniCS/packages/FEniCS.package b/FEniCS/packages/FEniCS.package
index 6d653969d0f7f480752f9fc4971feae7f0b2fc4a..11353d5e43104775ca5172cf7a699b1994efcc16 100644 (file)
--- 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 9d6c1fa6577b4cb2554363007afd6f2477563e11..40c10182a936a9252042f93a0bac0ee47049d841 100644 (file)
--- 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 8596d27ce7ba221b9ef4b6dc9a1d4869a6aeabb4..600ca4102d9bed6de42aeb2fda278b213cd224c2 100644 (file)
--- 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 b44c4c97a36013a54354667b90aab6102f69c372..dd087586913d5fc43192c346487715320cfefe49 100644 (file)
--- 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 1bb716aa59faf32083f95940fdd1d291cfe134d4..c100862c607de495a0147f2b2dc27d0cfda649e7 100644 (file)
--- 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 395e48adaadaf6ac5f4960fd67a7bd63d2ad0e27..ecb83549c553e0907ced1af24c6e52dce74eb345 100644 (file)
--- 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 43bab492f9afda5ba5b32c95108c950cfa7f66ca..d380abd8e8622e6fc0322e2adae44e3b3de92d0e 100644 (file)
--- 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 89562c438d6cab541c25dce1ac2d7707c443b0e8..4ea59cbdbd13cec080dcb46149d8ecf100b90716 100644 (file)
--- 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 cf5a8bb75e1a9f47081186a4c0fbc127baaa9a39..2fddbac9bebd134c178ca816ee2e6d92ff95ed8a 100644 (file)
--- 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 42daf3146fd27e1e2b5d40d9a5e1744f9bca8c85..6ad2087ef5127cf6dca20ef574927da5552a565b 100644 (file)
--- 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 ac39276038b4b613e3ee7cf6d71b468f0b8eaaa3..7295ec22115c8db757e1068b39fd1c6aca4bc430 100644 (file)
--- 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 a980d145b51dc6dbbaeab33d2fc9e4d5267fef5a..5677a4ee52b27a8d260aa9016ec50b1e16fff716 120000 (symlink)
--- 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