scnc
/
pyFAI
mirror of https://github.com/silx-kit/pyFAI.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix to install in user account on linux

This commit is contained in:
jonwright 2012-09-14 16:31:33 +02:00
parent 86347889a6
commit afcd301bb0
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
setup.py
View File

@ -222,8 +222,9 @@ setup(name='pyFAI',
# data_files=data_files, # data_files=data_files,
test_suite="test", test_suite="test",
cmdclass={'build_ext': build_ext_pyFAI}, cmdclass={'build_ext': build_ext_pyFAI},
data_files=[(installDir, [os.path.join("openCL", i) for i in #
("ocl_azim_kernel_2.cl", "ocl_azim_kernel2d_2.cl")])] data_files=[('openCL', [os.path.join('openCL',o) for o in [
"ocl_azim_kernel_2.cl", "ocl_azim_kernel2d_2.cl"]])]
) )
################################################################################ ################################################################################
@ -250,12 +251,14 @@ for mod in sys.modules.copy():
sys.modules.pop(mod) sys.modules.pop(mod)
try: try:
import pyFAI import pyFAI
print pyFAI.__file__
except ImportError as E: except ImportError as E:
print("Unable to import pyFAI: %s" % E) print("Unable to import pyFAI: %s" % E)
else: else:
print("PyFAI is installed in %s" % pyFAI.__file__) print("PyFAI is installed in %s" % pyFAI.__file__)
try: try:
import pyFAI.histogram import pyFAI.histogram
print pyFAI.histogram.__file__
except ImportError as E: except ImportError as E:
print("PyFAI.histogram failed to import. It is likely there is an OpenMP error: %s" % E) print("PyFAI.histogram failed to import. It is likely there is an OpenMP error: %s" % E)
else: else: