Try alternative xxhash implementation (#148)

* Try alternative xxhash implementation

Hopefully it can compile on non-x86 arch

* Pin formatting CI python version

To work around python/mypy#13627

* Revert adding pypy to builds

* Add includes in makefile as well

Author: nsmith-

.github/workflows/ci.yml

@@ -18,6 +18,8 @@ jobs:
       with:
         submodules: recursive
     - uses: actions/setup-python@v3
+      with:
+        python-version: 3.10.6
     - uses: pre-commit/[email protected]
       with:
         extra_args: --hook-stage manual --all-files

.gitmodules

@@ -12,4 +12,4 @@
 	url = https://github.com/imneme/pcg-cpp.git
 [submodule "xxhash"]
 	path = xxhash
-	url = https://github.com/RedSpah/xxhash_cpp.git
+	url = https://github.com/Cyan4973/xxHash.git

CMakeLists.txt

@@ -44,7 +44,7 @@ target_include_directories(correctionlib
   PRIVATE
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/rapidjson/include>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/cpp-peglib>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/xxhash/include>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/xxhash>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/pcg-cpp/include>
   )
 target_compile_features(correctionlib PUBLIC cxx_std_17)

Makefile

@@ -10,7 +10,7 @@ else
 	PYLDFLAG=-Wl,-rpath,'$$ORIGIN/lib'
 endif
 OSXFLAG=$(shell uname|grep -q Darwin && echo "-undefined dynamic_lookup")
-CFLAGS=--std=c++17 -O3 -Wall -fPIC -Irapidjson/include -Ipybind11/include -Icpp-peglib $(PYINC) -Iinclude
+CFLAGS=--std=c++17 -O3 -Wall -fPIC -Irapidjson/include -Ipybind11/include -Icpp-peglib -Ixxhash -Ipcg-cpp/include $(PYINC) -Iinclude
 PREFIX ?= correctionlib
 STRVER=$(shell git describe --tags)
 MAJOR=$(shell git describe --tags|sed -n "s/v\([0-9]\+\)\..*/\1/p")

pyproject.toml

@@ -14,7 +14,7 @@ build-backend = "setuptools.build_meta"
 write_to = "src/correctionlib/version.py"
 
 [tool.cibuildwheel]
-skip = ["cp311-*"]
+skip = ["pp*-*", "cp311-*"]
 test-extras = "test"
 test-command = "python -m pytest {package}/tests"
 # update skip when numpy wheels become available

src/correction.cc

@@ -7,7 +7,8 @@
 #include <cmath>
 #include <random>
 #include "correction.h"
-#include "xxhash.hpp"
+#define XXH_INLINE_ALL 1
+#include "xxhash.h"
 #include "pcg_random.hpp"
 #if __has_include(<zlib.h>)
 #include <zlib.h>
@@ -288,7 +289,7 @@ double HashPRNG::evaluate(const std::vector<Variable::Type>& values) const {
     }
     else { throw std::logic_error("I should not have ever seen a string"); }
   }
-  gen.seed(xxh::xxhash<64>((const void*) seedData, nbytes));
+  gen.seed(XXH64((const void*) seedData, nbytes, 0ul));
   switch (dist_) {
     case Distribution::stdflat:
       return std::uniform_real_distribution<>()(gen);