diff --git a/setup.py b/setup.py index fa498420..a47a6be8 100644 --- a/setup.py +++ b/setup.py @@ -98,8 +98,8 @@ elif 'linux' in sys.platform: '-DTCL_INCLUDE_PATH=/usr/include', '-DTK_INCLUDE_PATH=/usr/include', ] - mpich_include = '/usr/include/mpich-3.2-x86_64' - openmpi_include = '/usr/include/openmpi-x86_64' + mpich_include = '/opt/mpich/include' + openmpi_include = '/opt/openmpi/include' if os.path.exists(mpich_include+'/mpi.h'): have_mpi = True cmake_args += [ diff --git a/tests/build_pip.sh b/tests/build_pip.sh index 35766960..2ba93c59 100755 --- a/tests/build_pip.sh +++ b/tests/build_pip.sh @@ -1,7 +1,18 @@ set -e ulimit -n 1024000 # lower open file limit, seems to affect performance yum -y update -yum -y install ninja-build fontconfig-devel tk-devel tcl-devel libXmu-devel mesa-libGLU-devel ccache mpich-3.2-devel openmpi-devel +yum -y install ninja-build fontconfig-devel tk-devel tcl-devel libXmu-devel mesa-libGLU-devel ccache dpkg + + +curl http://ftp.de.debian.org/debian/pool/main/o/openmpi/libopenmpi-dev_4.1.6-13.3_amd64.deb -o openmpi-dev.deb +dpkg-deb -R openmpi-dev.deb /opt/openmpi +mv /opt/openmpi/usr/lib/x86_64-linux-gnu/openmpi/include /opt/openmpi/include + + +curl http://ftp.de.debian.org/debian/pool/main/m/mpich/libmpich-dev_4.2.0-5.1_amd64.deb -o mpich.deb +dpkg-deb -R mpich.deb /opt/mpich +mv /opt/mpich/usr/lib/x86_64-linux-gnu/mpich/include /opt/mpich/include + rm -rf wheelhouse export NETGEN_CCACHE=1