Re: [FEniCS] Try out the new one-click FEniCS HashDist installation

Wed, 10 Dec 2014 02:45:07 -0800 

On 12/06/2014 01:58 PM, Anders Logg wrote:

Dear all,

Johannes and I have created an experimental "one-click" installation of
FEniCS based on HashDist.



The build went smooth on an Opensuse 13.2 box, gcc 4.9.2

The question is: where we have to look in order to customize the build?
For example, in dorsal I had to

- build atlas
- patch metis
- build suitesparse with metis support (this requires a patch)
- make sure that hdf5 was built with CXX=mpicxx, and that both h5pcc and h5cc are installed 

...
In dorsal it was easy (rough patch attached), and one could save his work using git. 

What is the equivalent workflow with HashDist ?

Also, I would rather avoid building python. Is this possible?
suse.yaml, just like debian.yaml, seems to force the use of the system mpicc. How can we use a custom-built mpi? And check that we are using the version we want? 



Thanks,

Marco


diff --git a/FEniCS/packages/armadillo.package b/FEniCS/packages/armadillo.package
index a179917..cb3bcdd 100644
--- a/FEniCS/packages/armadillo.package
+++ b/FEniCS/packages/armadillo.package
@@ -10,7 +10,9 @@ CONFOPTS="-D CMAKE_INSTALL_PREFIX:PATH=${INSTALL_PATH}
 if [ ! -z "${ATLAS_LIB_DIR}" ]; then
     CONFOPTS="${CONFOPTS}
               -D LAPACK_LIBRARY:FILEPATH=${ATLAS_LIB_DIR}/liblapack.a
-              -D BLAS_LIBRARY:FILEPATH=${ATLAS_LIB_DIR}/libatlas.a"
+              -D BLAS_LIBRARY:FILEPATH=${ATLAS_LIB_DIR}
+              -D CBLAS_LIBRARY:FILEPATH=${ATLAS_LIB_DIR}
+	      "
 fi
 
 package_specific_setup() {
diff --git a/FEniCS/packages/atlas.package b/FEniCS/packages/atlas.package
index 5599c38..741cdd4 100644
--- a/FEniCS/packages/atlas.package
+++ b/FEniCS/packages/atlas.package
@@ -1,6 +1,7 @@
 # ATLAS package. This package also provides LAPACK.
 
-NAME=atlas3.10.0-with-lapack-3.4.2
+#NAME=atlas3.10.0-with-lapack-3.4.2
+NAME=atlas3.10.1
 SOURCE=http://fenicsproject.org/pub/software/contrib/
 PACKING=.tar.bz2
 BUILDCHAIN=custom
@@ -50,7 +51,7 @@ package_specific_build () {
       -b $ATLAS_POINTER_BITWIDTH \
       -D c -DPentiumCPS=$CPU_MHZ --shared \
       --prefix=$INSTALL_PATH \
-      --with-netlib-lapack-tarfile=../lapack-3.4.2.tgz
+      --with-netlib-lapack-tarfile=../../lapack-3.5.0.tgz
 
     # Build
     make build
diff --git a/FEniCS/packages/boost.package b/FEniCS/packages/boost.package
index f2db3f9..959db15 100644
--- a/FEniCS/packages/boost.package
+++ b/FEniCS/packages/boost.package
@@ -1,4 +1,4 @@
-NAME=boost_1_51_0
+NAME=boost_1_55_0
 SOURCE=http://downloads.sourceforge.net/boost/
 PACKING=.tar.bz2
 BUILDCHAIN=custom
diff --git a/FEniCS/packages/cgal.package b/FEniCS/packages/cgal.package
index 7a534f4..61bc26c 100644
--- a/FEniCS/packages/cgal.package
+++ b/FEniCS/packages/cgal.package
@@ -1,7 +1,7 @@
-NAME=CGAL-4.3
+NAME=CGAL-4.4
 SOURCE=http://fenicsproject.org/pub/software/contrib/
 PACKING=.tar.gz
-CHECKSUM=3fa2d43adbf5c05d76c5ec01f5033cc9
+CHECKSUM=a7fb658c86f231b96500d07ad7d4e964
 BUILDCHAIN=cmake
 
 CONFOPTS="-D CMAKE_BUILD_TYPE:STRING=Release
diff --git a/FEniCS/packages/cmake.package b/FEniCS/packages/cmake.package
index bf42ef4..f9bd24e 100644
--- a/FEniCS/packages/cmake.package
+++ b/FEniCS/packages/cmake.package
@@ -1,8 +1,7 @@
-NAME=cmake-2.8.5
-SOURCE=http://www.cmake.org/files/v2.8/
+NAME=cmake-3.0.2
+SOURCE=http://www.cmake.org/files/v3.0/
 PACKING=.tar.gz
 BUILDCHAIN=autotools
-CHECKSUM=3c5d32cec0f4c2dc45f4c2e84f4a20c5
 
 package_specific_setup () {
     rm -f Source/cmConfigure.h
diff --git a/FEniCS/packages/dolfin.package b/FEniCS/packages/dolfin.package
index 01081bf..1eafde7 100644
--- a/FEniCS/packages/dolfin.package
+++ b/FEniCS/packages/dolfin.package
@@ -2,7 +2,7 @@ NAME=dolfin
 SOURCE=https://bitbucket.org/fenics-project/
 PACKING=git
 BUILDCHAIN=cmake
-CONFOPTS="-DCMAKE_SKIP_RPATH:BOOL=ON -DCGAL_DISABLE_ROUNDING_MATH_CHECK:BOOL=ON"
+CONFOPTS="-DDOLFIN_ENABLE_TESTING:BOOL=ON -DCMAKE_SKIP_RPATH:BOOL=ON -DCGAL_DISABLE_ROUNDING_MATH_CHECK:BOOL=ON"
 
 if [ -x "${SWIG_EXECUTABLE}" ]; then
     CONFOPTS="${CONFOPTS} -D SWIG_EXECUTABLE:FILEPATH=${SWIG_EXECUTABLE}"
@@ -36,5 +36,5 @@ fi
 
 if [ ! -z "${HDF5_DIR}" ]; then
     CONFOPTS="${CONFOPTS}
-              -D HDF5_INCLUDE_DIRS=${HDF5_DIR}/include"
+              -D HDF5_INCLUDE_DIRS:PATH=${HDF5_DIR}/include"
 fi
diff --git a/FEniCS/packages/eigen.package b/FEniCS/packages/eigen.package
index 5dfa917..7b51ff4 100644
--- a/FEniCS/packages/eigen.package
+++ b/FEniCS/packages/eigen.package
@@ -1,8 +1,8 @@
-NAME=eigen3_3.2.0
-SOURCE=http://fenicsproject.org/pub/software/contrib/
+NAME=eigen-eigen-1306d75b4a21
+SOURCE=http://bitbucket.org/eigen/eigen/get/
 PACKING=.tar.bz2
 BUILDCHAIN=cmake
-EXTRACTSTO=eigen-eigen-ffa86ffb5570
+EXTRACTSTO=eigen-eigen-1306d75b4a21
 
 package_specific_register () {
     export EIGEN_DIR=${INSTALL_PATH}
diff --git a/FEniCS/packages/fenics-solid-mechanics.package b/FEniCS/packages/fenics-solid-mechanics.package
new file mode 100644
index 0000000..dc8a26c
--- /dev/null
+++ b/FEniCS/packages/fenics-solid-mechanics.package
@@ -0,0 +1,26 @@
+NAME=fenics-solid-mechanics
+SOURCE=https://bitbucket.org/fenics-apps/
+PACKING=git
+BUILDCHAIN=cmake
+CONFOPTS="-DCMAKE_SKIP_RPATH:BOOL=ON"
+
+if [ -x "${SWIG_EXECUTABLE}" ]; then
+    CONFOPTS="${CONFOPTS} -D SWIG_EXECUTABLE:FILEPATH=${SWIG_EXECUTABLE}"
+fi
+
+#if [ ! -z "${PYTHON_EXECUTABLE}" ]; then
+#    CONFOPTS="${CONFOPTS} -D PYTHON_EXECUTABLE:FILEPATH=${PYTHON_EXECUTABLE}"
+#fi
+
+#if [ ! -z "${PYTHON_INCLUDE_DIR}" ]; then
+#    CONFOPTS="${CONFOPTS} -D PYTHON_INCLUDE_DIR:PATH=${PYTHON_INCLUDE_DIR}"
+#fi
+
+#if [ ! -z "${PYTHON_LIBRARY}" ]; then
+#    CONFOPTS="${CONFOPTS} -D PYTHON_LIBRARY:PATH=${PYTHON_LIBRARY}"
+#fi
+
+#if [ ! -z "${BOOST_USE_MULTITHREADED}" ]; then
+#    CONFOPTS="${CONFOPTS} -D Boost_USE_MULTITHREADED:BOOL=${BOOST_USE_MULTITHREADED}"
+#fi
+
diff --git a/FEniCS/packages/hdf5.package b/FEniCS/packages/hdf5.package
index f7fc371..e96916c 100644
--- a/FEniCS/packages/hdf5.package
+++ b/FEniCS/packages/hdf5.package
@@ -6,6 +6,7 @@ BUILDCHAIN=autotools
 CONFOPTS="--with-pthread
           --enable-unsupported
           --enable-shared
+	  --enable-cxx
           --enable-production=yes
           --disable-sharedlib-rpath
           --enable-parallel=yes
@@ -15,3 +16,11 @@ CONFOPTS="--with-pthread
 package_specific_register () {
     export HDF5_DIR=${INSTALL_PATH}
 }
+
+package_specific_setup () {
+    export CXX=mpicxx
+}
+
+package_specific_install () {
+    ln -sf ${INSTALL_PATH}/bin/h5pcc ${INSTALL_PATH}/bin/h5cc
+}
diff --git a/FEniCS/packages/lapack.package b/FEniCS/packages/lapack.package
index 304740c..625200b 100644
--- a/FEniCS/packages/lapack.package
+++ b/FEniCS/packages/lapack.package
@@ -1,4 +1,4 @@
-VERSION=3.3.1
+VERSION=3.5.0
 NAME=lapack-${VERSION}
 SOURCE=http://www.netlib.org/lapack/
 PACKING=.tgz
diff --git a/FEniCS/packages/mshr.package b/FEniCS/packages/mshr.package
index 93d98df..47a87e0 100644
--- a/FEniCS/packages/mshr.package
+++ b/FEniCS/packages/mshr.package
@@ -2,3 +2,25 @@ NAME=mshr
 SOURCE=https://bitbucket.org/benjamik/
 PACKING=git
 BUILDCHAIN=cmake
+CONFOPTS="-DCMAKE_SKIP_RPATH:BOOL=ON"
+
+if [ -x "${SWIG_EXECUTABLE}" ]; then
+    CONFOPTS="${CONFOPTS} -D SWIG_EXECUTABLE:FILEPATH=${SWIG_EXECUTABLE}"
+fi
+
+#if [ ! -z "${PYTHON_EXECUTABLE}" ]; then
+#    CONFOPTS="${CONFOPTS} -D PYTHON_EXECUTABLE:FILEPATH=${PYTHON_EXECUTABLE}"
+#fi
+
+#if [ ! -z "${PYTHON_INCLUDE_DIR}" ]; then
+#    CONFOPTS="${CONFOPTS} -D PYTHON_INCLUDE_DIR:PATH=${PYTHON_INCLUDE_DIR}"
+#fi
+
+#if [ ! -z "${PYTHON_LIBRARY}" ]; then
+#    CONFOPTS="${CONFOPTS} -D PYTHON_LIBRARY:PATH=${PYTHON_LIBRARY}"
+#fi
+
+if [ ! -z "${BOOST_USE_MULTITHREADED}" ]; then
+    CONFOPTS="${CONFOPTS} -D Boost_USE_MULTITHREADED:BOOL=${BOOST_USE_MULTITHREADED}"
+fi
+
diff --git a/FEniCS/packages/numpy.package b/FEniCS/packages/numpy.package
index 04cf657..14ae112 100644
--- a/FEniCS/packages/numpy.package
+++ b/FEniCS/packages/numpy.package
@@ -1,4 +1,4 @@
-NAME=numpy-1.6.2
+NAME=numpy-1.9.1
 SOURCE=http://downloads.sourceforge.net/numpy/
 PACKING=.tar.gz
 BUILDCHAIN=python
diff --git a/FEniCS/packages/openmpi.package b/FEniCS/packages/openmpi.package
index 829ee26..a684f7b 100644
--- a/FEniCS/packages/openmpi.package
+++ b/FEniCS/packages/openmpi.package
@@ -1,4 +1,4 @@
-NAME=openmpi-1.6.2
+NAME=openmpi-1.6.5
 SOURCE=http://www.open-mpi.org/software/ompi/v1.6/downloads/
 PACKING=.tar.bz2
 BUILDCHAIN=autotools
diff --git a/FEniCS/packages/petsc-hpc.package b/FEniCS/packages/petsc-hpc.package
index 019b574..2330b7f 100644
--- a/FEniCS/packages/petsc-hpc.package
+++ b/FEniCS/packages/petsc-hpc.package
@@ -45,7 +45,7 @@ fi
 if [ "${SUITESPARSE_DIR}" ]; then
     CONFOPTS="${CONFOPTS} --with-suitesparse=1
               --with-suitesparse-include=${SUITESPARSE_DIR}/include/suitesparse
-              --with-suitesparse-lib=[${SUITESPARSE_DIR}/lib/libumfpack.a,libklu.a,libcholmod.a,libbtf.a,libccolamd.a,libcolamd.a,libcamd.a,libamd.a,libsuitesparseconfig.a]"
+              --with-suitesparse-lib=[${SUITESPARSE_DIR}/lib/libumfpack.a,libklu.a,libcholmod.a,libbtf.a,libccolamd.a,libcolamd.a,libcamd.a,libamd.a,libsuitesparseconfig.a,${PARMETIS_DIR}/lib/libmetis.so]"
 else
     EXTERNAL_PACKAGES="${EXTERNAL_PACKAGES} suitesparse"
 fi
@@ -67,6 +67,8 @@ package_specific_build () {
 }
 
 package_specific_register () {
+    export PETSC_SRC_DIR=${PWD}
+    export PETSC_SRC_ARCH=${PETSC_ARCH}
     export PETSC_DIR=${INSTALL_PATH}
     unset PETSC_ARCH
 }
diff --git a/FEniCS/packages/petsc.package b/FEniCS/packages/petsc.package
index 8dd69bb..4e12123 100644
--- a/FEniCS/packages/petsc.package
+++ b/FEniCS/packages/petsc.package
@@ -31,6 +31,7 @@ package_specific_build () {
 }
 
 package_specific_register () {
+    export PETSC_SOURCE_DIR=${PWD}
     export PETSC_DIR=${INSTALL_PATH}
     unset PETSC_ARCH
 }
diff --git a/FEniCS/packages/petsc4py.package b/FEniCS/packages/petsc4py.package
index 978d7f7..0175fa8 100644
--- a/FEniCS/packages/petsc4py.package
+++ b/FEniCS/packages/petsc4py.package
@@ -1,7 +1,6 @@
-NAME=petsc4py-3.4
-SOURCE=https://bitbucket.org/petsc/petsc4py/downloads/
+NAME=petsc4py-3.5
+SOURCE=http://bitbucket.org/petsc/petsc4py/downloads/
 PACKING=.tar.gz
-CHECKSUM=f6a2914fe3c057b0bf0eac4330a071ea
 BUILDCHAIN=python
 
 package_specific_setup () {
diff --git a/FEniCS/packages/petsc_intel.package b/FEniCS/packages/petsc_intel.package
index 6f49ada..d201e11 100644
--- a/FEniCS/packages/petsc_intel.package
+++ b/FEniCS/packages/petsc_intel.package
@@ -33,6 +33,7 @@ package_specific_setup () {
 }
 
 package_specific_register () {
+    export PETSC_SOURCE_DIR=${PWD}
     export PETSC_DIR=${INSTALL_PATH}
     unset PETSC_ARCH
 }
diff --git a/FEniCS/packages/petsccore.package b/FEniCS/packages/petsccore.package
index aae8f65..d74ee83 100644
--- a/FEniCS/packages/petsccore.package
+++ b/FEniCS/packages/petsccore.package
@@ -18,6 +18,7 @@ package_specific_install () {
 }
 
 package_specific_register () {
+    export PETSC_SOURCE_DIR=${PWD}
     export PETSC_DIR=${INSTALL_PATH}
     unset PETSC_ARCH
 }
diff --git a/FEniCS/packages/scipy.package b/FEniCS/packages/scipy.package
index f837bd9..f2ee307 100644
--- a/FEniCS/packages/scipy.package
+++ b/FEniCS/packages/scipy.package
@@ -1,4 +1,4 @@
-NAME=scipy-0.12.0
+NAME=scipy-0.14.0
 SOURCE=http://downloads.sourceforge.net/scipy/
 PACKING=.tar.gz
 BUILDCHAIN=python
diff --git a/FEniCS/packages/suitesparse.package b/FEniCS/packages/suitesparse.package
index a357820..e77694b 100644
--- a/FEniCS/packages/suitesparse.package
+++ b/FEniCS/packages/suitesparse.package
@@ -1,14 +1,24 @@
-NAME=SuiteSparse-4.0.2
-SOURCE=http://www.cise.ufl.edu/research/sparse/SuiteSparse/
+NAME=SuiteSparse-4.4.0
+SOURCE=http://faculty.cse.tamu.edu/davis/SuiteSparse/
 PACKING=.tar.gz
 BUILDCHAIN=custom
 EXTRACTSTO=SuiteSparse
 
 package_specific_build () {
     mkdir -p ${INSTALL_PATH}/include/suitesparse
+    if [ ! -z "${PARMETIS_DIR}" ]; then
+       rm -rf metis-4.0
+       mkdir metis-4.0
+       echo "all:" > metis-4.0/Makefile; echo "" >> metis-4.0/Makefile
+       sed s/"METIS_NodeComputeSeparator (\&nn, Mp, Mi, Mnw, Mew, Opt, \&csp, Mpart)"/"METIS_ComputeVertexSeparator (\&nn, Mp, Mi, Mnw, Opt, \&csp, Mpart)"/ -i CHOLMOD/Partition/cholmod_metis.c 
+       METIS_SPEC_BUILD="-Didxtype=idx_t"
+    else
+       METIS_CHOLMOD_OPTION=-DNMETIS
+    fi
     cat > SuiteSparse_config/SuiteSparse_config.mk << EOF
 #CF = \$(CFLAGS) \$(CPPFLAGS) \$(TARGET_ARCH) -O3 -fexceptions -fPIC
-CF = \$(CFLAGS) \$(CPPFLAGS) \$(TARGET_ARCH) -O3 -fexceptions -fPIC -DNTIMER
+CC = gcc
+CF = \$(CFLAGS) \$(CPPFLAGS) \$(TARGET_ARCH) ${METIS_SPEC_BUILD} -I${INSTALL_PATH}/include -Ofast -march=native -ftree-vectorize -fexceptions -fPIC -DNTIMER
 RANLIB = ranlib
 ARCHIVE = \$(AR) \$(ARFLAGS)
 CP = cp -f
@@ -24,15 +34,17 @@ XERBLA =
 GPU_BLAS_PATH =
 GPU_CONFIG =
 UMFPACK_CONFIG =
-CHOLMOD_CONFIG = \$(GPU_CONFIG) -DNPARTITION
+CHOLMOD_CONFIG = \$(GPU_CONFIG) ${METIS_CHOLMOD_OPTION}
 SPQR_CONFIG =
+METIS_PATH = ../../metis-4.0
+METIS = -lmetis
 TBB =
 CLEAN = *.o *.obj *.ln *.bb *.bbg *.da *.tcov *.gcov gmon.out *.bak *.d *.gcda *.gcno
 EOF
 
-    if [ ! -z "${ATLAS_LIB_DIR}" ]; then
+if [ ! -z "${ATLAS_LIB_DIR}" ]; then
         cat >> SuiteSparse_config/SuiteSparse_config.mk << EOF
-BLAS = -L${ATLAS_LIB_DIR} -lcblas -lf77blas -latlas
+BLAS = -L${ATLAS_LIB_DIR} -lcblas -lf77blas -lgfortran -latlas
 LAPACK = -L${ATLAS_LIB_DIR} -llapack
 EOF
     else
diff --git a/FEniCS/packages/swig.package b/FEniCS/packages/swig.package
index 873cf6f..c70ac80 100644
--- a/FEniCS/packages/swig.package
+++ b/FEniCS/packages/swig.package
@@ -1,4 +1,4 @@
-NAME=swig-2.0.3
+NAME=swig-2.0.11
 SOURCE=http://downloads.sourceforge.net/swig/
 PACKING=.tar.gz
 BUILDCHAIN=autotools
diff --git a/FEniCS/packages/tao.package b/FEniCS/packages/tao.package
new file mode 100644
index 0000000..4b122bd
--- /dev/null
+++ b/FEniCS/packages/tao.package
@@ -0,0 +1,24 @@
+NAME=tao-2.2.0
+SOURCE=http://www.mcs.anl.gov/research/projects/tao/download/
+PACKING=.tar.gz
+BUILDCHAIN=custom
+
+package_specific_build () {
+    export PETSC_DIR=${PETSC_SRC_DIR}
+    export PETSC_ARCH=${PETSC_SRC_ARCH} 
+    echo $PETSC_DIR
+    echo $PETSC_ARCH
+    export TAO_DIR=${PWD}
+#    mkdir -p ${TAO_DIR}/${PETSC_ARCH}
+#    mkdir -p ${TAO_DIR}/${PETSC_ARCH}/lib
+    make all
+    make install
+}
+
+package_specific_register () {
+    export TAO_DIR=${INSTALL_PATH}
+#    export PETSC_DIR=${INSTALL_PATH}
+    unset PETSC_ARCH
+}
+
+
diff --git a/FEniCS/packages/trilinos.package b/FEniCS/packages/trilinos.package
index bfa288c..1a859b3 100644
--- a/FEniCS/packages/trilinos.package
+++ b/FEniCS/packages/trilinos.package
@@ -6,6 +6,7 @@ BUILDCHAIN=cmake
 
 CONFOPTS="-D CMAKE_CXX_COMPILER:FILEPATH=mpicxx
           -D CMAKE_C_COMPILER:FILEPATH=mpicc
+	  -D CMAKE_INSTALL_PREFIX:PATH=${INSTALL_PATH}
           -D Trilinos_INSTALL_INCLUDE_DIR:PATH=include/trilinos
           -D Trilinos_ENABLE_ALL_OPTIONAL_PACKAGES:BOOL=ON
           -D Trilinos_ENABLE_Epetra:BOOL=ON
@@ -41,7 +42,7 @@ if [ ! -z "${UMFPACK_DIR}" ]; then
     CONFOPTS="${CONFOPTS}
               -D UMFPACK_INCLUDE_DIRS=${UMFPACK_DIR}/include/suitesparse
               -D UMFPACK_LIBRARY_DIRS=${UMFPACK_DIR}/lib
-              -D UMFPACK_LIBRARY_NAMES=\"umfpack;cholmod;camd;ccolamd;colamd;amd;suitesparseconfig\""
+              -D UMFPACK_LIBRARY_NAMES=\"umfpack;cholmod;camd;ccolamd;colamd;amd;suitesparseconfig;metis\""
 elif [ ! -z "${UMFPACK_INCLUDE_DIR}" ]; then
     CONFOPTS="${CONFOPTS} -D UMFPACK_INCLUDE_DIRS=${UMFPACK_INCLUDE_DIR}"
 fi
diff --git a/FEniCS/packages/vtk.package b/FEniCS/packages/vtk.package
index 93ea33e..bc26516 100644
--- a/FEniCS/packages/vtk.package
+++ b/FEniCS/packages/vtk.package
@@ -1,16 +1,22 @@
-NAME=vtk-5.8.0
-SOURCE=http://www.vtk.org/files/release/5.8/
+NAME=vtk-5.10.1
+SOURCE=http://www.vtk.org/files/release/5.10/
 PACKING=.tar.gz
 CHECKSUM=37b7297d02d647cc6ca95b38174cb41f
 BUILDCHAIN=cmake
-EXTRACTSTO=VTK
+EXTRACTSTO=VTK5.10.1
+
+MPICC=`which mpicc`
+MPICXX=`which mpicxx`
 
 CONFOPTS="-D CMAKE_BUILD_TYPE:STRING=Release
           -D BUILD_TESTING:BOOL=OFF
           -D BUILD_SHARED_LIBS:BOOL=ON
           -D VTK_WRAP_PYTHON:BOOL=ON
           -D VTK_USE_TK:BOOL=ON
-          -D VTK_USE_GL2PS:BOOL=ON"
+          -D VTK_USE_GL2PS:BOOL=ON
+	  -D HDF5_ENABLE_PARALLEL:BOOL=ON
+	  -D CMAKE_C_COMPILER=${MPICC}
+	  -D CMAKE_CXX_COMPILER=${MPICXX}"
 
 if [ -d "${VTK_DATA_ROOT}" ]; then
     CONFOPTS="${CONFOPTS} -D VTK_DATA_ROOT:PATH=${VTK_DATA_ROOT}"
diff --git a/FEniCS/packages/vtkwithqt.package b/FEniCS/packages/vtkwithqt.package
index c566805..f1530ce 100644
--- a/FEniCS/packages/vtkwithqt.package
+++ b/FEniCS/packages/vtkwithqt.package
@@ -1,8 +1,11 @@
-NAME=vtk-5.8.0
-SOURCE=http://www.vtk.org/files/release/5.8/
+NAME=VTK-6.1.0
+SOURCE=http://www.vtk.org/files/release/6.1/
 PACKING=.tar.gz
 BUILDCHAIN=cmake
-EXTRACTSTO=VTK
+EXTRACTSTO=VTK-6.1.0
+
+MPICC=`which mpicc`
+MPICXX=`which mpicxx`
 
 CONFOPTS="-D CMAKE_BUILD_TYPE:STRING=Release
           -D BUILD_TESTING:BOOL=OFF
@@ -10,17 +13,17 @@ CONFOPTS="-D CMAKE_BUILD_TYPE:STRING=Release
           -D VTK_WRAP_PYTHON:BOOL=ON
           -D VTK_USE_TK:BOOL=ON
           -D VTK_USE_GL2PS:BOOL=ON
-          -D VTK_USE_QT=ON"
+          -D VTK_USE_QT:BOOL=ON
+	  -D VTK_Group_Qt:BOOL=ON
+	  -D HDF5_ENABLE_PARALLEL:BOOL=ON
+	  -D CMAKE_C_COMPILER=${MPICC}
+	  -D CMAKE_CXX_COMPILER=${MPICXX}"
 
 if [ -d "${VTK_DATA_ROOT}" ]; then
     CONFOPTS="${CONFOPTS} -D VTK_DATA_ROOT:PATH=${VTK_DATA_ROOT}"
 fi
 
-package_specific_setup () {
-    chmod 600 Utilities/vtktiff/tif_fax3sm.c
-}
-
 package_specific_register () {
-    export LD_LIBRARY_PATH=${INSTALL_PATH}/lib/vtk-5.8:${LD_LIBRARY_PATH}
-    export DYLD_LIBRARY_PATH=${INSTALL_PATH}/lib/vtk-5.8:${DYLD_LIBRARY_PATH}
+    export LD_LIBRARY_PATH=${INSTALL_PATH}/lib/vtk-6.1.0:${LD_LIBRARY_PATH}
+    export DYLD_LIBRARY_PATH=${INSTALL_PATH}/lib/vtk-6.1.0:${DYLD_LIBRARY_PATH}
 }
diff --git a/FEniCS/platforms/contributed/precise-hpc.platform b/FEniCS/platforms/contributed/precise-hpc.platform
index e90be71..bbcccb4 100644
--- a/FEniCS/platforms/contributed/precise-hpc.platform
+++ b/FEniCS/platforms/contributed/precise-hpc.platform
@@ -75,25 +75,34 @@ default PETSC_ARCH=linux-gnu-cxx-opt
 default SCOTCH_ARCH=pc_linux2
 default PASTIX_ARCH=i686_pc_linux
 
+#skip:ufc
 # Define the packages this platform needs
 PACKAGES=(
-atlas
-openmpi
-boost
-cgal
-parmetis
-scotch
-vtk
-hdf5
-armadillo
-pastix
-suitesparse
-trilinos
-petsc-hpc
-slepc
+skip:cmake
+skip:atlas
+skip:openmpi
+skip:boost
+skip:parmetis
+skip:scotch
+skip:hdf5
+skip:vtkwithqt
+skip:armadillo
+skip:pastix
+skip:suitesparse
+skip:swig
+skip:trilinos
+skip:petsc-hpc
+skip:petsc4py
+skip:slepc
+skip:eigen
+skip:numpy
+skip:sympy
 fiat
 ufl
+uflacs
 ffc
 instant
 dolfin
+mshr
+fenics-solid-mechanics
 )
diff --git a/dorsal.cfg b/dorsal.cfg
index d48f5d1..19a8606 100644
--- a/dorsal.cfg
+++ b/dorsal.cfg
@@ -6,12 +6,12 @@
 # Meta-project to build
 PROJECT=FEniCS
 # Where do you want the downloaded source files to go?
-DOWNLOAD_PATH=${HOME}/Work/${PROJECT}/src
+DOWNLOAD_PATH=${HOME}/Programmi/Dolphin/src_from_dorsal
 # Where do you want the compiled software installed?
-INSTALL_PATH=${HOME}/Work/${PROJECT}
+INSTALL_PATH=${HOME}/local/Fenics
 # How many processes would you like to build using?
-PROCS=1
+PROCS=4
 # Would you like to build stable versions of FEniCS projects?
-STABLE_BUILD=true
+STABLE_BUILD=false
 # Would you like to use snapshots when using STABLE_BUILD=false?
 USE_SNAPSHOTS=false

_______________________________________________
fenics mailing list
[email protected]
http://fenicsproject.org/mailman/listinfo/fenics

Reply via email to