Skip to content

Commit b8fa328

Browse files
committed
Merge branch 'topic/default/fix-check' into 'branch/default'
Fix import check + prepare 0.4.2 See merge request fluiddyn/fluidfft!69
2 parents 2ffe179 + 3b0c47d commit b8fa328

File tree

3 files changed

+16
-3
lines changed

3 files changed

+16
-3
lines changed

CHANGES.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22

33
See also the [unreleased changes].
44

5+
## [0.4.2] (2024-08-22)
6+
7+
- Compatibility mpi4py 4.0
8+
- Fix check import classes and `FLUIDFFT_DISABLE_IMPORT_CHECK`.
9+
510
## [0.4.1] (2024-07-24)
611

712
- Support for Numpy 2.0 and Python 3.12
@@ -114,4 +119,5 @@ See also the [unreleased changes].
114119

115120
[0.4.0]: https://foss.heptapod.net/fluiddyn/fluidfft/-/compare/0.3.5...0.4.0
116121
[0.4.1]: https://foss.heptapod.net/fluiddyn/fluidfft/-/compare/0.4.0...0.4.1
117-
[unreleased changes]: https://foss.heptapod.net/fluiddyn/fluidfft/-/compare/0.4.1...branch%2Fdefault
122+
[0.4.2]: https://foss.heptapod.net/fluiddyn/fluidfft/-/compare/0.4.1...0.4.2
123+
[unreleased changes]: https://foss.heptapod.net/fluiddyn/fluidfft/-/compare/0.4.2...branch%2Fdefault

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ build-backend = 'mesonpy'
55

66
[project]
77
name = "fluidfft"
8-
version = "0.4.1"
8+
version = "0.4.2"
99
description = "Efficient and easy Fast Fourier Transform (FFT) for Python."
1010
authors = [
1111
{name = "Pierre Augier", email = "[email protected]"},

src/fluidfft/__init__.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,9 @@ def _check_failure(method):
177177
if not any(method.endswith(postfix) for postfix in ("pfft", "p3dfft")):
178178
return False
179179

180+
if os.environ.get("FLUIDFFT_DISABLE_IMPORT_CHECK"):
181+
return False
182+
180183
# for few methods, try before real import because importing can lead to
181184
# a fatal error (Illegal instruction)
182185
if mpi.rank == 0:
@@ -186,7 +189,11 @@ def _check_failure(method):
186189
env = {
187190
key: value
188191
for key, value in os.environ.items()
189-
if not ("MPI" in key or key.startswith("PMI_"))
192+
if not (
193+
"MPI" in key
194+
or key.startswith("PMI_")
195+
or key.startswith("PMIX_")
196+
)
190197
}
191198
else:
192199
env = os.environ

0 commit comments

Comments
 (0)