From 62d1d9650d403d6a6ba3cf9c227fbfcfecb06126 Mon Sep 17 00:00:00 2001 From: pkubaj Date: Mon, 15 Mar 2021 19:02:32 +0000 Subject: [PATCH 1/2] Fix build on non-x86 cpuid is not available outside of amd64/i386. --- src/contraction_hierarchies/src/libch.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/contraction_hierarchies/src/libch.cpp b/src/contraction_hierarchies/src/libch.cpp index 8dad3b88..d591c055 100644 --- a/src/contraction_hierarchies/src/libch.cpp +++ b/src/contraction_hierarchies/src/libch.cpp @@ -20,7 +20,7 @@ or see http://www.gnu.org/licenses/agpl.txt. #include "libch.h" #include "POIIndex/POIIndex.h" -#ifdef _OPENMP +#if defined(_OPENMP) && (defined(__amd64__) || defined(__i386__)) #include "Util/HyperThreading.h" #endif namespace CH { From 09f8f57c5acb8c217ba1e3c34ccd58c6316757d7 Mon Sep 17 00:00:00 2001 From: Sam Maurer Date: Mon, 15 Mar 2021 13:59:32 -0700 Subject: [PATCH 2/2] Bump dev version --- pandana/__init__.py | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pandana/__init__.py b/pandana/__init__.py index d46f0c76..8d93da96 100644 --- a/pandana/__init__.py +++ b/pandana/__init__.py @@ -1,3 +1,3 @@ from .network import Network -version = __version__ = '0.6.1.dev0' +version = __version__ = '0.6.1.dev1' diff --git a/setup.py b/setup.py index 7ac824c9..7ede0849 100644 --- a/setup.py +++ b/setup.py @@ -126,7 +126,7 @@ def run(self): ## Standard setup ############################################### -version = '0.6.1.dev0' +version = '0.6.1.dev1' packages = find_packages(exclude=["*.tests", "*.tests.*", "tests.*", "tests"])