summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnirudh Subramanian <anirudh2290@ufl.edu>2020-06-29 18:36:00 +0000
committerAnirudh Subramanian <anirudh2290@ufl.edu>2020-06-30 00:46:57 +0000
commite29f5d8a70f40a2b6a438d08dac6e9ce66609f5b (patch)
tree9c6fa3f72037bf51432b84466705543b9f9245e9
parent76924ed0158eab8afa59b3bea84c69924edd04f1 (diff)
downloadnumpy-e29f5d8a70f40a2b6a438d08dac6e9ce66609f5b.tar.gz
MAINT: Disable use_hugepages in case of ValueError
-rw-r--r--numpy/__init__.py17
1 files changed, 12 insertions, 5 deletions
diff --git a/numpy/__init__.py b/numpy/__init__.py
index 550fb1772..0fe8818ef 100644
--- a/numpy/__init__.py
+++ b/numpy/__init__.py
@@ -338,11 +338,18 @@ else:
import os
use_hugepage = os.environ.get("NUMPY_MADVISE_HUGEPAGE", None)
if sys.platform == "linux" and use_hugepage is None:
- use_hugepage = 1
- kernel_version = os.uname().release.split(".")[:2]
- kernel_version = tuple(int(v) for v in kernel_version)
- if kernel_version < (4, 6):
- use_hugepage = 0
+ # If there is an issue with parsing the kernel version,
+ # set use_hugepages to 0. Usage of LooseVersion will handle
+ # the kernel version parsing better, but avoided since it
+ # will increase the import time. See: #16679 for related discussion.
+ try:
+ use_hugepage = 1
+ kernel_version = os.uname().release.split(".")[:2]
+ kernel_version = tuple(int(v) for v in kernel_version)
+ if kernel_version < (4, 6):
+ use_hugepage = 0
+ except ValueError:
+ use_hugepages = 0
elif use_hugepage is None:
# This is not Linux, so it should not matter, just enable anyway
use_hugepage = 1