diff --git a/.mailmap b/.mailmap index 81da1df..3602a18 100644 --- a/.mailmap +++ b/.mailmap @@ -1,6 +1,9 @@ +Reinis Cirpons reiniscirpons +Reinis Cirpons Reinis Cirpons <43414125+reiniscirpons@users.noreply.github.com> +Joe Edwards Joe Edwards <80713360+Joseph-Edwards@users.noreply.github.com> Florent Hivert Florent Hivert Florent Hivert Florent Hivert Florent Hivert Florent Hivert -Reinis Cirpons reiniscirpons -Reinis Cirpons Reinis Cirpons <43414125+reiniscirpons@users.noreply.github.com> James Mitchell James Mitchell +James Mitchell James Mitchell +Jean-Baptiste Rouquier jrouquie <741299+jrouquie@users.noreply.github.com> diff --git a/CMakeLists.txt b/CMakeLists.txt index dda3987..3130d38 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,7 +28,7 @@ set(DESCRIPTION "High Performance Combinatorics in C++ using vector instruction CACHE STRING "Project description.") set(VERSION_MAJOR 1 CACHE STRING "Project major version number.") set(VERSION_MINOR 0 CACHE STRING "Project minor version number.") -set(VERSION_PATCH 1 CACHE STRING "Project patch version number.") +set(VERSION_PATCH 2 CACHE STRING "Project patch version number.") mark_as_advanced(VERSION_MAJOR VERSION_MINOR VERSION_PATCH) message(STATUS "**** Build type = ${CMAKE_BUILD_TYPE}") diff --git a/CPPLINT.cfg b/CPPLINT.cfg index 903aa4b..15d3b7b 100644 --- a/CPPLINT.cfg +++ b/CPPLINT.cfg @@ -1,3 +1,3 @@ set noparent -filter=-build/c++14,-build/include_subdir,-runtime/indentation_namespace,-runtime/references,-build/include,-readability/todo,-runtime/printf +filter=-build/c++14,-build/include_subdir,-whitespace/indent_namespace,-runtime/references,-build/include,-readability/todo,-runtime/printf linelength=80 diff --git a/README.md b/README.md index ed2333d..56e4601 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # HPCombi -High Performance Combinatorics in C++ using vector instructions v1.0.1 +High Performance Combinatorics in C++ using vector instructions v1.0.2 HPCombi is a C++17 header-only library using the SSE and AVX instruction sets, and some equivalents, for very fast manipulation of small combinatorial objects @@ -7,7 +7,7 @@ such as transformations, permutations, and boolean matrices. HPCombi implements new algorithms and benchmarks them on various compilers and architectures. HPCombi was initially designed using the SSE and AVX instruction sets, and did -not work on machines without these instructions (such as ARM). From v1.0.1 +not work on machines without these instructions (such as ARM). From v1 HPCombi supports processors with other instruction sets also, via [SIMD Everywhere][]. It might be the case that the greatest performance gains are achieved on processors supporting the SSE and AVX instruction sets, but the @@ -23,6 +23,8 @@ other processors too. ## Contributors - Reinis Cirpons : CI +- Jean-Baptiste Rouquier : improvements to the doc +- Joe Edwards : improvements to the CI - Finn Smith : discussions + BMat8 reference code - Viviane Pons : algorithms discussions - Daniel Vanzo : GPU experiments diff --git a/include/hpcombi/perm16.hpp b/include/hpcombi/perm16.hpp index da455a6..707bf7c 100644 --- a/include/hpcombi/perm16.hpp +++ b/include/hpcombi/perm16.hpp @@ -508,7 +508,7 @@ template <> struct hash { template <> struct hash { //! A hash operator for #HPCombi::Transf16 size_t operator()(const HPCombi::Transf16 &ar) const { - return uint64_t(ar); + return static_cast(ar); } }; @@ -525,7 +525,9 @@ template <> struct hash { //! HPCombi::Perm16. template <> struct hash { //! A hash operator for #HPCombi::Perm16 - size_t operator()(const HPCombi::Perm16 &ar) const { return uint64_t(ar); } + size_t operator()(const HPCombi::Perm16 &ar) const { + return static_cast(ar); + } }; } // namespace std