Skip to content

Commit 3a1798b

Browse files
authored
Merge pull request #4 from NFFT/develop
fixed glibc decision
2 parents ce877ee + a09b8fd commit 3a1798b

2 files changed

Lines changed: 2 additions & 16 deletions

File tree

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
44

55
[project]
66
name = "pyNFFT3"
7-
version = "1.0.0"
7+
version = "1.0.1"
88
authors = [
99
{ name="Michael Nolander", email="nolander.michael@gmail.com" },
1010
]

src/pyNFFT3/__init__.py

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class fastsum_plan(ctypes.Structure):
4141
else: # Linux
4242
ending = ".so"
4343
glibcver = "glibc2.40"
44-
if Version(os.confstr("CS_GNU_LIBC_VERSION").split(" ")[1]) < Version("2.35"):
44+
if Version(os.confstr("CS_GNU_LIBC_VERSION").split(" ")[1]) <= Version("2.35"):
4545
glibcver = "glibc2.22"
4646

4747
if "avx2" in get_cpu_info()["flags"]:
@@ -53,20 +53,6 @@ class fastsum_plan(ctypes.Structure):
5353
else:
5454
raise RuntimeError("CPU type not supported")
5555

56-
glibcver = "glibc2.40"
57-
if Version(os.confstr("CS_GNU_LIBC_VERSION").split(" ")[1]) < Version("2.35"):
58-
glibcver = "glibc2.22"
59-
60-
if "avx2" in get_cpu_info()["flags"]:
61-
flag = "AVX2"
62-
elif "avx" in get_cpu_info()["flags"]:
63-
flag = "AVX"
64-
elif "sse2" in get_cpu_info()["flags"]:
65-
flag = "SSE2"
66-
else:
67-
raise RuntimeError("CPU type not supported")
68-
69-
7056
# Check for CPU features and adjust library paths
7157
package_dir = os.path.dirname(__file__)
7258
lib_path_nfft = os.path.join(

0 commit comments

Comments
 (0)