Skip to content

Commit

Permalink
tested install from tar.gz on my laptop.
Browse files Browse the repository at this point in the history
  • Loading branch information
rainwoodman committed Dec 16, 2014
1 parent 13a416f commit e3587c5
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 8 deletions.
5 changes: 3 additions & 2 deletions MANIFEST.in
@@ -1,4 +1,5 @@
include depends/install_fftw.sh
include depends/install_pfft.sh
include pfft-1.0.7-a95386.tar.gz

include depends/pfft-1.0.7-a95386.tar.gz
include pfft/*.pyx
include tests/*.py
File renamed without changes.
13 changes: 7 additions & 6 deletions setup.py
Expand Up @@ -7,16 +7,15 @@
import mpi4py

package_basedir = os.path.abspath(os.path.dirname(__file__))
dependsdir = os.path.join(package_basedir, 'depends')
dependsdir = os.path.join(package_basedir, 'build', 'depends')
compiler = mpi4py.get_config()['mpicc']
compiler += ' -O0 -g'
# how otherwise do I set the compiler cython uses?
os.environ['CC'] = compiler
os.environ['LDSHARED'] = compiler + " -shared"
print mpi4py.get_include()
def build_fftw():
line = ('CFLAGS="-fPIC -fvisibility=hidden -I%s/include" ' % dependsdir +
'LDFLAGS="-L%s/lib" ' % dependsdir +
line = ('CFLAGS="$CFLAGS -fPIC -fvisibility=hidden -I%s/include" ' % dependsdir +
'LDFLAGS="$LDFLAGS -L%s/lib" ' % dependsdir +
'MPICC="%s" ' % compiler +
'CC="%s" ' % compiler +
'sh depends/install_fftw.sh ' +
Expand All @@ -29,8 +28,8 @@ def build_fftw():
raise ValueError("could not build fftw")

def build_pfft():
line = ('CFLAGS="-fPIC -fvisibility=hidden -I%s/include" ' % dependsdir +
'LDFLAGS="-L%s/lib" ' % dependsdir +
line = ('CFLAGS="$CFLAGS -fPIC -fvisibility=hidden -I%s/include" ' % dependsdir +
'LDFLAGS="$LDFLAGS -L%s/lib" ' % dependsdir +
'MPICC="%s" ' % compiler +
'CC="%s" ' % compiler +
'sh depends/install_pfft.sh ' +
Expand Down Expand Up @@ -67,7 +66,9 @@ def myext(*args):
author="Yu Feng",
author_email="rainwoodman@gmail.com",
description="python binding of PFFT, a massively parallel FFT library",
url="http://github.com/rainwoodman/pfft-python",
#package_dir = {'pfft': 'pfft'},
zip_safe=False,
install_requires=['cython', 'numpy'],
packages= ['pfft'],
requires=['numpy'],
Expand Down

0 comments on commit e3587c5

Please sign in to comment.