This instance will be upgraded to Heptapod 0.23.2 on 2021-08-05 at 11:00 UTC+2 (a few minutes of down time)

Commit 94b98c6c authored by Pierre Augier's avatar Pierre Augier
Browse files

pip install with conda readthedocs (0.2.0.post9)

parent 59c0a59a9a80
......@@ -7,7 +7,6 @@ dependencies:
- python=3.6
- numpy
- cython
- mpi4py
- h5py
- sphinx
- numpydoc
......
......@@ -11,4 +11,4 @@ http://legacy.python.org/dev/peps/pep-0386/
'a' or 'alpha' means alpha version (internal testing),
'b' or 'beta' means beta version (external testing).
"""
__version__ = '0.2.0.post7'
__version__ = '0.2.0.post9'
......@@ -41,7 +41,6 @@ from copy import copy
import importlib
import multiprocessing
import warnings
from shutil import copyfile
from distutils.ccompiler import CCompiler
from setuptools.command.build_ext import build_ext
......@@ -272,24 +271,17 @@ def make_command_obj_from_cpp(obj_file, cpp_file, include_dirs=None,
if can_import_mpi4py and not cpp_file.endswith('.cu'):
command[0] = os.getenv('MPICXX', 'mpicxx')
includepy = [conf_vars['INCLUDEPY']]
includepy = conf_vars['INCLUDEPY']
includedir = os.path.split(includepy)[0]
if os.path.split(includedir)[-1] == 'include':
includepy = [includepy, includedir]
else:
includepy = [includepy]
if include_dirs is None:
include_dirs = includepy
else:
include_dirs = includepy + include_dirs
# this should not be here! No hard-coded path...
# if 'cufft' in cpp_file:
# include_dirs.extend([
# '/opt/cuda/NVIDIA_CUDA-6.0_Samples/common/inc/'])
# cu + mpi ? No hard-coded path...
# if cpp_file.endswith('.cu'):
# include_dirs.extend([
# '/usr/lib/openmpi/include',
# '/usr/lib/openmpi/include/openmpi'])
command += ['-I' + incdir for incdir in include_dirs]
command += ['-c', cpp_file, '-o', obj_file]
return command
......
......@@ -48,7 +48,7 @@ except ImportError:
try:
mkl_libs = get_info('mkl')['libraries']
use_mkl_intel = 'mkl_intel_lp64' in mkl_libs
# Note: No symbol clash occurs if 'mkl_rt' appears in numpy libraries
# Note: No symbol clash occurs if 'mkl_rt' appears in numpy libraries
# instead.
# P.S.: If 'mkl_rt' is detected, use FFTW libraries, not Intel's MKL/FFTW
# implementation.
......@@ -167,27 +167,22 @@ if config['p3dfft']['use']:
base_names.extend(['fft3dmpi_with_p3dfft'])
on_rtd = os.environ.get('READTHEDOCS')
if on_rtd:
base_names = []
ext_modules = []
include_dirs = [
src_cy_dir, src_base, src_cpp_3d, src_cpp_2d,
'include', np.get_include()]
try:
import mpi4py
except ImportError:
warn('ImportError for mpi4py: '
"all extensions based on mpi won't be built.")
base_names = [name for name in base_names if 'mpi' not in name]
else:
import numpy as np
ext_modules = []
include_dirs = [
src_cy_dir, src_base, src_cpp_3d, src_cpp_2d,
'include', np.get_include()]
try:
import mpi4py
except ImportError:
warn('ImportError for mpi4py: '
"all extensions based on mpi won't be built.")
base_names = [name for name in base_names if 'mpi' not in name]
else:
if mpi4py.__version__[0] < '2':
raise ValueError('Please upgrade to mpi4py >= 2.0')
include_dirs.append(mpi4py.get_include())
if mpi4py.__version__[0] < '2':
raise ValueError('Please upgrade to mpi4py >= 2.0')
include_dirs.append(mpi4py.get_include())
def update_with_config(key):
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment