scnc
/
phono3py
mirror of https://github.com/phonopy/phono3py.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #32 from flokno/setup_mkl 

rename (optional) mkl.py to setup_mkl.py to avoids namespace clash with numpy
This commit is contained in:
Atsushi Togo 2020-02-29 09:13:09 +09:00 committed by GitHub
parent 7fa353b66b 6b79e59d49
commit ad633524fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/install.rst
View File

@ -73,9 +73,9 @@ MKL LAPACKE (with multithread BLAS)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Phono3py can be compiled with MKL for using LAPACKE. If ``setup.py``
finds the file named ``mkl.py``, the contents of ``mkl.py`` is read
finds the file named ``setup_mkl.py``, the contents of ``setup_mkl.py`` is read
and those are included in the compilation setting. For example, the
following setting prepared as ``mkl.py`` seems working on Ubuntu 16.04
following setting prepared as ``setup_mkl.py`` seems working on Ubuntu 16.04
system::
intel_root = "/opt/intel/composer_xe_2015.7.235"

8
setup.py
View File

@ -67,16 +67,16 @@ use_mkl = False
# Phono3py complex values are handled based on those provided by Netlib
# lapacke. However MKL lapacke doesn't provide some macros and functions
# that provided Netlib. This macro defines those used in phono3py among them.
if os.path.isfile("mkl.py"):
if os.path.isfile("setup_mkl.py"):
# This supposes that MKL multithread BLAS is used.
# This is invoked when mkl.py exists on the current directory.
# This is invoked when setup_mkl.py exists on the current directory.
print("MKL LAPACKE is to be used.")
print("Use of icc is assumed (CC='icc').")
from mkl import mkl_extra_link_args_lapacke, mkl_include_dirs_lapacke
from setup_mkl import mkl_extra_link_args_lapacke, mkl_include_dirs_lapacke
#### Examples of mkl.py ####
#### Examples of setup_mkl.py ####
# For 2015
# intel_root = "/opt/intel/composer_xe_2015.7.235"
# mkl_root = "%s/mkl" % intel_root