diff --git a/CMakeLists.txt b/CMakeLists.txt index 3130d38..980e5a2 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 2 CACHE STRING "Project patch version number.") +set(VERSION_PATCH 3 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/README.md b/README.md index 56e4601..46551f5 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # HPCombi -High Performance Combinatorics in C++ using vector instructions v1.0.2 +High Performance Combinatorics in C++ using vector instructions v1.0.3 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 diff --git a/etc/deploy-doc.sh b/etc/deploy-doc.sh index af0e3ea..2f8677c 100755 --- a/etc/deploy-doc.sh +++ b/etc/deploy-doc.sh @@ -7,6 +7,17 @@ if ! [[ -d "gh-pages" ]] ; then exit 1 fi +if ! [[ $# == 0 || $# == 1 ]] ; then + echo "Usage : $0 [-DDOXYGEN_EXECUTABLE=/path/to/doxygen/executable]" + exit 1 +fi + +if [[ $# == 1 && "${1:0:21}" != "-DDOXYGEN_EXECUTABLE=" ]] ; then + echo "Usage : $0 [-DDOXYGEN_EXECUTABLE=/path/to/doxygen/executable]" + exit 1 +fi + +printf "\033[0;32m\033[0m\n" printf "\033[0;32mDeploying updates to GitHub...\033[0m\n" mkdir -p build @@ -14,7 +25,7 @@ cd build if [[ -f Makefile ]] ; then make clean fi -cmake .. +cmake .. $1 make doc cd .. cp -r build/doc/html/* gh-pages diff --git a/include/hpcombi/epu8.hpp b/include/hpcombi/epu8.hpp index 4367477..c1af055 100644 --- a/include/hpcombi/epu8.hpp +++ b/include/hpcombi/epu8.hpp @@ -41,8 +41,15 @@ eg simde_mm_testz_si128(a,a) → is_all_zero(a) */ #pragma GCC diagnostic ignored "-Wswitch-default" #pragma GCC diagnostic ignored "-Wpacked" #endif +#if defined(__clang__) +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wbitwise-instead-of-logical" +#endif #include "simde/x86/sse4.1.h" // for simde_mm_max_epu8, simde... #include "simde/x86/sse4.2.h" // for ??? +#if defined(__clang__) +#pragma clang diagnostic pop +#endif #if defined(__GNUC__) && !defined(__clang__) #pragma GCC diagnostic pop #endif diff --git a/include/hpcombi/perm16.hpp b/include/hpcombi/perm16.hpp index 707bf7c..4bf7a8d 100644 --- a/include/hpcombi/perm16.hpp +++ b/include/hpcombi/perm16.hpp @@ -44,8 +44,15 @@ #pragma GCC diagnostic ignored "-Wswitch-default" #pragma GCC diagnostic ignored "-Wpacked" #endif +#if defined(__clang__) +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wbitwise-instead-of-logical" +#endif #include "simde/x86/sse4.1.h" #include "simde/x86/sse4.2.h" +#if defined(__clang__) +#pragma clang diagnostic pop +#endif #if defined(__GNUC__) && !defined(__clang__) #pragma GCC diagnostic pop #endif