v0.2.1

Author: escherba

pip-freeze.txt

@@ -2,14 +2,13 @@ attrs==21.4.0
 backcall==0.2.0
 Cython==0.29.26
 decorator==5.1.0
-importlib-metadata==4.10.0
 iniconfig==1.1.1
 ipdb==0.13.9
 ipython==7.30.1
 jedi==0.18.1
 matplotlib-inline==0.1.3
--e git+https://github.com/escherba/python-metrohash@c5c37595134dcb929a5fa8fcaf3fb64d4d987ef4#egg=metrohash
-numpy==1.21.5
+-e git+https://github.com/escherba/python-metrohash@87edc58d0a222d0b7a94f9497c3cc035296be72b#egg=metrohash
+numpy==1.22.0
 packaging==21.3
 parso==0.8.3
 pexpect==4.8.0
@@ -24,6 +23,4 @@ pyparsing==3.0.6
 pytest==6.2.5
 toml==0.10.2
 traitlets==5.1.1
-typing_extensions==4.0.1
 wcwidth==0.2.5
-zipp==3.7.0

setup.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 import os
+import struct
 from os.path import join, dirname
 
 from setuptools import setup
@@ -34,13 +35,23 @@ def is_pure(self):
         return False
 
 
+def get_system_bits():
+    """Return 32 for 32-bit systems and 64 for 64-bit"""
+    return struct.calcsize("P") * 8
+
+
+SYSTEM = os.name
+BITS = get_system_bits()
+HAVE_SSE42 = "sse4_2" in CPU_FLAGS
+HAVE_AES = "aes" in CPU_FLAGS
+
 CXXFLAGS = []
 
-print("building on platform:", os.name)
+print("system: %s-%d" % (SYSTEM, BITS))
 print("available CPU flags:", CPU_FLAGS)
 print("environment:", ", ".join(["%s=%s" % (k, v) for k, v in os.environ.items()]))
 
-if os.name == "nt":
+if SYSTEM == "nt":
     CXXFLAGS.extend(["/O2"])
 else:
     CXXFLAGS.extend(
@@ -53,18 +64,23 @@ def is_pure(self):
 
 # The "cibuildwheel" tool sets the variable below to
 # something like x86_64, aarch64, i686, and so on.
-ARCH = os.environ.get("AUDITWHEEL_ARCH")
+TARGET_ARCH = os.environ.get("AUDITWHEEL_ARCH")
 
-# Note: Only -msse4.2 has significant effect on performance;
-# so not using other flags such as -maes and -mavx
-if "sse4_2" in CPU_FLAGS:
-    if (ARCH in [None, "x86_64"]) and (os.name != "nt"):
-        print("enabling SSE4.2 on compile")
+if HAVE_SSE42 and (TARGET_ARCH in [None, "x86_64"]) and (BITS == 64):
+    print("enabling SSE4.2 on compile")
+    if SYSTEM == "nt":
+        CXXFLAGS.append("/D__SSE4_2__")
+    else:
         CXXFLAGS.append("-msse4.2")
-else:
-    print("the CPU does not appear to support SSE4.2")
 
 
+if HAVE_AES and (TARGET_ARCH in [None, "x86_64"]) and (BITS == 64):
+    print("enabling AES on compile")
+    if SYSTEM == "nt":
+        CXXFLAGS.append("/D__AES__")
+    else:
+        CXXFLAGS.append("-maes")
+
 CXXHEADERS = [
     "src/metro.h",
     "src/metrohash.h",
@@ -78,6 +94,7 @@ def is_pure(self):
     "src/metrohash128.cc",
 ]
 
+
 if USE_CYTHON:
     print("building extension using Cython")
     CMDCLASS = {"build_ext": build_ext}
@@ -99,7 +116,7 @@ def is_pure(self):
     ),
 ]
 
-VERSION = "0.2.0.post1"
+VERSION = "0.2.1"
 URL = "https://github.com/escherba/python-metrohash"
 
 

src/metrohash.cpp

@@ -10,7 +10,7 @@ Python wrapper for MetroHash, a fast non-cryptographic hashing algorithm
 
 __author__  = "Eugene Scherba"
 __email__   = "escherba+metrohash@gmail.com"
-__version__ = "0.2.0"
+__version__ = "0.2.1"
 __all__     = [
     "MetroHash64",
     "MetroHash128",