FEniCS updates

.travis.yml

@@ -17,35 +17,37 @@ env:
  - TEST_PROFILE="test.dolfin.yaml"
 python:
  - 2.7
+sudo: required
+dist: trusty
 before_install:
  - sudo apt-get update -qq
- - sudo apt-get install gfortran pv
+ - sudo apt-get -y install gfortran pv
  - if [[ "${TEST_PROFILE}" == "test.packages1.yaml" ]]; then
- sudo apt-get install liblapack-dev;
+ sudo apt-get -y install liblapack-dev;
  fi
  - if [[ "${TEST_PROFILE}" == "test.packages2.yaml" ]]; then
- sudo apt-get install mpich2 liblapack-dev;
+ sudo apt-get -y install mpich2 liblapack-dev;
  fi
  - if [[ "${TEST_PROFILE}" == "test.packages3.yaml" ]]; then
- sudo apt-get install mpich2 liblapack-dev;
+ sudo apt-get -y install mpich2 liblapack-dev;
  fi
  - if [[ "${TEST_PROFILE}" == "test.cmake.yaml" ]]; then
- sudo apt-get install mpich2;
+ sudo apt-get -y install mpich2;
  fi
  - if [[ "${TEST_PROFILE}" == "test.boost.yaml" ]]; then
- sudo apt-get install mpich2;
+ sudo apt-get -y install mpich2;
  fi
  - if [[ "${TEST_PROFILE}" == "test.clawpack.gitsubmodules.yaml" ]]; then
- sudo apt-get install liblapack-dev;
+ sudo apt-get -y install liblapack-dev;
  fi
  - if [[ "${TEST_PROFILE}" == "test.netcdf4.yaml" ]]; then
- sudo apt-get install mpich2;
+ sudo apt-get -y install mpich2;
  fi
  - if [[ "${TEST_PROFILE}" == "test.host-scipy.yaml" ]]; then
- sudo apt-get install python-scipy;
+ sudo apt-get -y install python-scipy;
  fi
  - if [[ "${TEST_PROFILE}" == "test.dolfin.yaml" ]]; then
- sudo apt-get install cmake libopenmpi-dev python-dev libblas-dev liblapack-dev wget libboost-program-options1.48-dev libboost-filesystem1.48-dev libboost-serialization1.48-dev libboost-thread1.48-dev libboost-iostreams1.48-dev libboost-math1.48-dev libboost-timer1.48-dev libboost-chrono1.48-dev;
+ sudo apt-get -y install cmake libopenmpi-dev python-dev libblas-dev liblapack-dev wget libboost-all-dev;
  fi
 install:
  - git clone https://github.com/hashdist/hashdist

base/cmake_package.py

@@ -38,6 +38,9 @@ def configure(ctx, stage_args):
  if stage_args.get('empty_osx_deployment_target', False):
  conf_lines.append('-DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=""')
 
+ if stage_args.get('cmake_osx_sysroot', False):
+ conf_lines.append('-DCMAKE_OSX_SYSROOT:STRING=%s' % stage_args['cmake_osx_sysroot'])
+
  #cmake needs to be given all the dependency dirs as prefix paths
  #so that we search the hashdist directories before the system directories
  #CMake doesn't use the CPPFLAGS implicitly to find libraries

base/cmake_package.yaml

@@ -15,6 +15,8 @@ build_stages:
  - name: configure
  after: setup_builddir
  debug: {{debug}}
+ empty_osx_deployment_target: {{empty_osx_deployment_target}}
+ cmake_osx_sysroot: {{cmake_osx_sysroot}}
 
  - name: make
  after: configure

base/pip_package.yaml

@@ -0,0 +1,29 @@
+# pip_package.yaml
+# Use for installing Python packages using pip.
+
+extends: [base_package]
+
+dependencies:
+ build: [python, pip, setuptools]
+ run: [python, pip, setuptools]
+
+build_stages:
+- name: install
+ after: prologue
+ handler: bash
+ bash: |
+ pip install --verbose --no-deps --upgrade --prefix=${ARTIFACT} .
+
+profile_links:
+- name: python_packages
+ link: 'lib/python{{pyver}}/site-packages/*'
+ dirs: true
+
+- name: python_exclude
+ after: python_packages
+ before: everything
+ exclude: 'lib/python{{pyver}}/site-packages/**/*'
+
+when_build_dependency:
+- prepend_path: PYTHONPATH
+ value: '${ARTIFACT}/lib/python{{pyver}}/site-packages'

pkgs/cython.yaml

@@ -1,8 +1,8 @@
 extends: [distutils_package]
 
 sources:
-- key: tar.gz:lebhjlenxupgftdz3fhlfyxuvzqm5ki2
- url: http://cython.org/release/Cython-0.23.3.tar.gz
+- key: tar.gz:iqajqxtqrijqcfgww7vbkl7dxpgmj333
+ url: https://github.com/cython/cython/archive/0.23.3.tar.gz
 
 when_build_dependency:
  - prepend_path: PATH

pkgs/dijitso.yaml

@@ -0,0 +1,8 @@
+extends: [pip_package]
+dependencies:
+ build: [mpi4py, numpy, six]
+ run: [mpi4py, numpy, six]
+
+sources:
+- key: tar.gz:amakzmnzx6kojxrgbznuf5jklopvcwsw
+ url: https://bitbucket.org/fenics-project/dijitso/downloads/dijitso-2016.1.0.tar.gz

pkgs/dolfin/dolfin.yaml

@@ -15,8 +15,8 @@ dependencies:
  run: [ply]
 
 sources:
-- key: tar.gz:m7vkyx7m43tr3icvtngkqqrrk346tguv
- url: https://bitbucket.org/fenics-project/dolfin/downloads/dolfin-1.6.0.tar.gz
+- key: tar.gz:miuljvsbqknezuzbig742il2cwlke7kz
+ url: https://bitbucket.org/fenics-project/dolfin/downloads/dolfin-2016.1.0.tar.gz
 
 defaults:
  # share/dolfin/DOLFINConfig.cmake contains hard-coded path
@@ -57,7 +57,10 @@ build_stages:
  after: install
  handler: bash
  bash: |
- # FIXME: use install_name_tool to fix rpath
+ for lib in ${ARTIFACT}/lib/python{{pyver}}/site-packages/dolfin/cpp/_*.so; do
+ install_name_tool -add_rpath ${BOOST_DIR}/lib ${lib}
+ install_name_tool -add_rpath ${VTK_DIR}/lib/vtk-5.10 ${lib}
+ done
 
 - when: platform == 'Cygwin'
  name: dll_fix

pkgs/ffc.yaml

@@ -1,11 +1,11 @@
-extends: [distutils_package]
+extends: [pip_package]
 dependencies:
- build: [numpy, swig]
- run: [fiat, instant, numpy, six, ufl]
+ build: [fiat, instant, numpy, six, ufl, swig]
+ run: [fiat, instant, numpy, six, ufl, swig]
 
 sources:
-- key: tar.gz:haxhoe76owljjzpqoudlcrho5llidylj
- url: https://bitbucket.org/fenics-project/ffc/downloads/ffc-1.6.0.tar.gz
+- key: tar.gz:kjbqzzgh2v6odoa6wx5tasmser6jis6g
+ url: https://bitbucket.org/fenics-project/ffc/downloads/ffc-2016.1.0.tar.gz
 
 defaults:
  # share/ufc/UFCConfig.cmake contains hard-coded path
@@ -14,3 +14,5 @@ defaults:
 when_build_dependency:
 - prepend_path: PATH
  value: '${ARTIFACT}/bin'
+- set: UFC_DIR
+ value: '${ARTIFACT}'

pkgs/fiat.yaml

@@ -1,8 +1,8 @@
-extends: [setuptools_package]
+extends: [pip_package]
 dependencies:
- build: []
+ build: [numpy, sympy]
  run: [numpy, sympy]
 
 sources:
-- key: tar.gz:qwhkh2jwvu5tkwfuot74zlukpoo53ovp
- url: https://bitbucket.org/fenics-project/fiat/downloads/fiat-1.6.0.tar.gz
+- key: tar.gz:qulsgetkog6bvyw4jllosmyl3g2u2uw3
+ url: https://bitbucket.org/fenics-project/fiat/downloads/fiat-2016.1.0.tar.gz

pkgs/host-pip.yaml

@@ -0,0 +1,10 @@
+build_stages:
+- handler: bash
+ bash: |
+ mkdir -p ${ARTIFACT}/{{python_site_packages_rel}}
+ ln -s {{python_host_packages}}/pip ${ARTIFACT}/{{python_site_packages_rel}}
+
+profile_links:
+- name: python_packages
+ link: '{{python_site_packages_rel}}/*'
+ dirs: true

pkgs/host-py.yaml

@@ -0,0 +1,10 @@
+build_stages:
+- handler: bash
+ bash: |
+ mkdir -p ${ARTIFACT}/{{python_site_packages_rel}}
+ ln -s {{python_host_packages}}/py ${ARTIFACT}/{{python_site_packages_rel}}
+
+profile_links:
+- name: python_packages
+ link: '{{python_site_packages_rel}}/*'
+ dirs: true

pkgs/instant.yaml

@@ -1,7 +1,8 @@
-extends: [distutils_package]
+extends: [pip_package]
 dependencies:
+ build: [numpy]
  run: [cmake, flufl_lock, numpy, swig]
 
 sources:
-- key: tar.gz:end6aiuvggljbfmrd7nr3yyl2555274b
- url: https://bitbucket.org/fenics-project/instant/downloads/instant-1.6.0.tar.gz
+- key: tar.gz:ppydzct3mh6r4qzlr45aibkbbltirexl
+ url: https://bitbucket.org/fenics-project/instant/downloads/instant-2016.1.0.tar.gz

pkgs/mshr.yaml

@@ -4,8 +4,8 @@ dependencies:
  build: [python, boost, dolfin, gmp, mpfr, mpi, swig, {{build_with}}]
 
 sources:
-- key: tar.gz:afm2l4z7m53oxkxxf4dsfxmth4jnxmsg
- url: https://bitbucket.org/fenics-project/mshr/downloads/mshr-1.6.0.tar.gz
+- key: tar.gz:5ehq6cmiyeclibycpkxslq2h7jxjtrf7
+ url: https://bitbucket.org/fenics-project/mshr/downloads/mshr-2016.1.0.tar.gz
 
 defaults:
  # lib/CMake/mshr/mshr-config.cmake contains hard-coded path

pkgs/parmetis/parmetis.yaml

@@ -62,7 +62,10 @@ build_stages:
  before: configure
  handler: bash
  bash: |
- CMAKE_FLAGS="${CMAKE_FLAGS} -DCMAKE_MACOSX_RPATH:BOOL=ON"
+ CMAKE_FLAGS="
+ ${CMAKE_FLAGS}
+ -DCMAKE_MACOSX_RPATH:BOOL=ON
+ -DCMAKE_OSX_SYSROOT:STRING=/"
 
 - name: configure
  after: cmake-flags

pkgs/petsc/petsc.py

@@ -117,8 +117,8 @@ def configure(ctx, stage_args):
  # Special case, no meaningful BLAS/LAPACK directories when using Accelerate
 
  if ctx.parameters['platform'] != 'Darwin':
- conf_lines.append('--with-blas-dir=$BLAS_DIR')
- conf_lines.append('--with-lapack-dir=$LAPACK_DIR')
+ conf_lines.append('--with-blas-lib=$BLAS_DIR/lib/libblas.so')
+ conf_lines.append('--with-lapack-lib=$LAPACK_DIR/lib/liblapack.so')
 
  # Special case, ParMETIS also provides METIS
  if 'PARMETIS' in ctx.dependency_dir_vars:

pkgs/petsc/petsc.yaml

@@ -1,6 +1,6 @@
 extends: [autotools_package]
 dependencies:
- build: [blas, mpi, python, {{build_with}}]
+ build: [blas, lapack, mpi, python, {{build_with}}]
 
 when version == '3.6.1':
  sources:

pkgs/pip.yaml

@@ -1,9 +1,9 @@
 extends: [setuptools_package]
 
-dependencies:
- build: []
- run: []
-
 sources:
-- key: tar.gz:zichtbxqkkgpvf22ct5z67yqmjy5jygd
- url: https://pypi.python.org/packages/source/p/pip/pip-7.1.2.tar.gz
+- key: tar.gz:gd4ywzxt7yigtrjjusivs7juuhbcjjug
+ url: https://pypi.python.org/packages/source/p/pip/pip-8.0.3.tar.gz
+
+when_build_dependency:
+- prepend_path: PATH
+ value: '${ARTIFACT}/bin'

pkgs/py.yaml

@@ -1,5 +1,5 @@
 extends: [setuptools_package]
 
 sources:
- - url: https://pypi.python.org/packages/source/p/py/py-1.4.29.tar.gz
-  key: tar.gz:e6pbc4rt6ic54hsg5q3ow772lgm7dpct
+- key: tar.gz:uzibsy6hex6ckvg2x7worlu2r626csoa
+ url: https://pypi.python.org/packages/source/p/py/py-1.4.31.tar.gz

pkgs/scipy/scipy.yaml

@@ -3,15 +3,19 @@ when platform != 'linux':
 when platform == 'linux':
  extends: [distutils_package, libflags]
 dependencies:
- build: [lapack, numpy]
- run: [lapack, numpy]
+ build: [blas, lapack, numpy]
+ run: [blas, lapack, numpy]
 
 sources:
  - url: http://downloads.sourceforge.net/scipy/scipy-0.13.3.tar.gz
  key: tar.gz:vhrty7xamdbvzvog5y5mtzpjxo4zegox
 
+defaults:
+ # Build with OpenBLAS
+ with_openblas: false
+
 build_stages:
- - when: platform == 'linux'
+ - when: platform == 'linux' and not with_openblas
  name: set-lapack-paths
  after: libflags
  before: install
@@ -21,3 +25,24 @@ build_stages:
  export ATLAS=$LAPACK_DIR
  export BLAS=$LAPACK_DIR
  export LAPACK=$LAPACK_DIR
+
+ - when: platform == 'linux' and with_openblas
+ name: set-lapack-paths
+ after: libflags
+ before: install
+ handler: bash
+ bash: |
+ export LDFLAGS="-shared -Wl,-rpath=${PYTHON_DIR}/lib -Wl,-rpath=${BLAS_DIR}/lib $(${PYTHON_DIR}/bin/python-config --ldflags)"
+ #export ATLAS=None
+ export LAPACK=${BLAS_DIR}/lib/libopenblas.so
+ export BLAS=${BLAS_DIR}/lib/libopenblas.so
+
+# Make sure that the fortran objects are compiled with -fPIC
+ - when: platform == 'linux'
+ name: compile-fc-with-fPIC
+ after: setup_dirs
+ before: install
+ handler: bash
+ bash: |
+ export FFLAGS="$FFLAGS -fPIC"
+ export FCFLAGS="$FCFLAGS -fPIC"

pkgs/ufl.yaml

@@ -1,8 +1,8 @@
-extends: [distutils_package]
+extends: [pip_package]
 dependencies:
- build: []
+ build: [numpy, six]
  run: [numpy, six]
 
 sources:
-- key: tar.gz:y5oepapfcbcqj4kyznbm3b5m575jauxi
- url: https://bitbucket.org/fenics-project/ufl/downloads/ufl-1.6.0.tar.gz
+- key: tar.gz:rxgp4egreun2jcsniosmnse2xydwhebc
+ url: https://bitbucket.org/fenics-project/ufl/downloads/ufl-2016.1.0.tar.gz

pkgs/uflacs.yaml

@@ -1,7 +1,7 @@
-extends: [distutils_package]
+extends: [setuptools_package]
 dependencies:
- build: []
- run: [ffc, numpy, six, ufl]
+ build: [numpy, six, ufl]
+ run: [numpy, six, ufl]
 
 sources:
 - key: tar.gz:x2ybjis6ms5zjw3hodnelft2gsq32t4x