Skip to content

Commit

Permalink
Making mpi4py 3.1.5 new minimum version for build (#356)
Browse files Browse the repository at this point in the history
* pinning build mpi4py version to 3.1.5

* Minor conda recipe update
  • Loading branch information
timryanb authored Dec 13, 2024
1 parent 75ea914 commit c162e4c
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 9 deletions.
2 changes: 1 addition & 1 deletion conda/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@ mkdir ${PREFIX}/include/funtofem
cp ${F2F_DIR}/include/*.h ${PREFIX}/include/funtofem

# make the python package
CFLAGS=${PIP_FLAGS} ${PYTHON} -m pip install --no-deps --prefix=${PREFIX} . -vv;
CPPFLAGS=${PIP_FLAGS} ${PYTHON} -m pip install --no-deps --prefix=${PREFIX} . -vv;
6 changes: 3 additions & 3 deletions conda/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ requirements:
- mpich # [mpi == "mpich" and build_platform != target_platform]
- openmpi-mpicxx # [mpi == "openmpi" and build_platform != target_platform]
- mpich-mpicxx # [mpi == "mpich" and build_platform != target_platform]
- mpi4py >=3.1.1 # [build_platform != target_platform]
- mpi4py >=3.1.5,<4.0.0 # [build_platform != target_platform]
- cython >=0.29,<3.0 # [build_platform != target_platform]
- setuptools # [build_platform != target_platform]
- tacs >=3.4.0 # [build_platform != target_platform]
Expand All @@ -56,7 +56,7 @@ requirements:
- mpich # [mpi == "mpich"]
- libopenblas
- lapack
- mpi4py >=3.1.1
- mpi4py >=3.1.5,<4.0.0
- cython >=0.29,<3.0
- tacs >=3.4.0

Expand All @@ -68,7 +68,7 @@ requirements:
- mpich # [mpi == "mpich"]
- libopenblas
- lapack
- mpi4py >=3.1.1
- mpi4py >=3.1.5,<4.0.0
- tacs >=3.4.0

test:
Expand Down
5 changes: 1 addition & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,4 @@
[build-system]
# Minimum requirements for the build system to execute.
requires = ['setuptools>=45.0,<72.0', 'wheel', 'cython>=0.29,<3.0', 'numpy>=1.25,<2.0.0',
# Build against an old version (3.1.1) of mpi4py for forward compatibility
"mpi4py==3.1.1; python_version<'3.11'",
# Python 3.11 requires 3.1.4+
"mpi4py==3.1.4; python_version>='3.11'"]
"mpi4py==3.1.5"]
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ def get_mpi_flags():
author_email="[email protected]",
python_requires=">=3.9.0",
extras_require=optional_dependencies,
install_requires=["numpy<2.0.0", "mpi4py>=3.1.1"],
install_requires=["numpy<2.0.0", "mpi4py>=3.1.5"],
packages=find_packages(include=["funtofem*"]),
ext_modules=cythonize(exts, include_path=inc_dirs),
)

0 comments on commit c162e4c

Please sign in to comment.