Merge pull request #18 from james-d-mitchell/master

Update version number to 0.0.8 and rename `VERSION`
libsemigroups · Oct 23, 2023 · 3846007 · 3846007
2 parents c52af7b + 4847454
commit 3846007
Show file tree

Hide file tree

Showing 15 changed files with 44 additions and 11 deletions.
diff --git a/.VERSION b/.VERSION
@@ -0,0 +1 @@
+0.0.8
diff --git a/VERSION.in → .VERSION.in b/VERSION.in → .VERSION.in
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -138,7 +138,7 @@ ENDIF(BUILD_TESTING)
 #####################
 # config.h file stuff
 configure_file(${CMAKE_SOURCE_DIR}/config.h.in ${CMAKE_BINARY_DIR}/HPCombi-config.h)
-configure_file(${CMAKE_SOURCE_DIR}/VERSION.in ${CMAKE_BINARY_DIR}/VERSION)
+configure_file(${CMAKE_SOURCE_DIR}/.VERSION.in ${CMAKE_BINARY_DIR}/.VERSION)
 
 set(AUTOGENERATED_WARNING "WARNING: THIS IS A CMAKE AUTO-GENERATED FILE.")
 
@@ -151,7 +151,7 @@ foreach(f ${install_misc})
     DESTINATION share/${CMAKE_PROJECT_NAME})
 endforeach(f)
 
-install (FILES ${CMAKE_CURRENT_BINARY_DIR}/VERSION DESTINATION ".")
+install (FILES ${CMAKE_CURRENT_BINARY_DIR}/.VERSION DESTINATION ".")
 
 install (FILES ${CMAKE_CURRENT_BINARY_DIR}/HPCombi-config.h
   DESTINATION include/${CMAKE_PROJECT_NAME})

diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 # HPCombi   ![build status](https://api.travis-ci.org/hivert/HPCombi.svg?branch=master)
-High Performance Combinatorics in C++ using vector instructions v0.0.6
+High Performance Combinatorics in C++ using vector instructions v0.0.8
 
 SSE and AVX instruction sets allows for very fast manipulation of
 combinatorial objects such as transformations, permutations, boolean matrices

diff --git a/VERSION b/VERSION
diff --git a/etc/check-list-intrin.sh b/etc/check-list-intrin.sh
@@ -0,0 +1,33 @@
+#!/bin/bash
+set -e
+
+bold() {
+  printf "\033[1m%s\033[0m\n" "$*"
+}
+
+if [[ $# -ne 0 ]]; then
+  bold "error expected no arguments, got $#!"
+  exit 1
+fi
+
+echo "Checking intrinsics used in code base versus declared in 'list_intrin.txt' . . ."
+
+grep -oh -e "_mm\w*\b" include/*.* | sort | uniq > intrin_actuals.txt
+
+python3 - <<END
+import sys
+with open('intrin_actuals.txt', 'r') as f:
+  intrin_actuals = [x.strip() for x in f.readlines()]
+with open('list_intrin.txt', 'r') as f:
+  list_intrin = [x.strip()[:x.find(';')] for x in f.readlines() if not x.startswith('#')]
+
+for intrin_actual in intrin_actuals:
+  if not intrin_actual in list_intrin:
+    print(f"\033[41m{('\`' + intrin_actual + '\`').ljust(16, ' ')} found in \`include/*.hpp\`   but not in \`list_intrin.txt\`!\033[0m")
+
+for intrin in list_intrin:
+  if not intrin in intrin_actuals:
+    print(f"\033[41m{('\`' + intrin + '\`').ljust(16, ' ')} found in \`list_intrin.txt\` but not in \`include/*.hpp\`!\033[0m")
+END
+
+rm -f intrin_actuals.txt
diff --git a/experiments/Perm32/README.md b/experiments/Perm32/README.md
@@ -0,0 +1,3 @@
+# HPCombi Experimental files
+
+These files contains experiments to be later incorporated into the sources.
diff --git a/src/Perm32/demovect.cpp → experiments/Perm32/demovect.cpp b/src/Perm32/demovect.cpp → experiments/Perm32/demovect.cpp
diff --git a/src/Perm32/demovect32_avx2.cpp → experiments/Perm32/demovect32_avx2.cpp b/src/Perm32/demovect32_avx2.cpp → experiments/Perm32/demovect32_avx2.cpp
diff --git a/src/Perm32/perm32.cpp → experiments/Perm32/perm32.cpp b/src/Perm32/perm32.cpp → experiments/Perm32/perm32.cpp
diff --git a/src/Perm32/perm64.cpp → experiments/Perm32/perm64.cpp b/src/Perm32/perm64.cpp → experiments/Perm32/perm64.cpp
diff --git a/src/Perm32/permbig.cpp → experiments/Perm32/permbig.cpp b/src/Perm32/permbig.cpp → experiments/Perm32/permbig.cpp
diff --git a/src/Perm32/permdesc_red.cpp → experiments/Perm32/permdesc_red.cpp b/src/Perm32/permdesc_red.cpp → experiments/Perm32/permdesc_red.cpp
diff --git a/list_intrin.txt b/list_intrin.txt
@@ -4,20 +4,21 @@
 _mm_blendv_epi8;__m128i(),__m128i(),__m128i()
 _mm_bslli_si128;__m128i(),1
 _mm_bsrli_si128;__m128i(),1
-_mm_cmpeq_epi8;__m128i(),__m128i()
 _mm_cmpestri;__m128i(),1,__m128i(),1,1
 _mm_cmpestrm;__m128i(),1,__m128i(),1,1
-_mm_cmplt_epi8;__m128i(),__m128i()
 _mm_extract_epi64;__m128i(),1
-_mm_max_epi8;__m128i(),__m128i()
 _mm_max_epu8;__m128i(),__m128i()
 _mm_min_epi8;__m128i(),__m128i()
 _mm_min_epu8;__m128i(),__m128i()
 _mm_movemask_epi8;__m128i()
 _mm_popcnt_u32;1
+_mm_popcnt_u64;1
 _mm_set_epi64x;1,1
 _mm_shuffle_epi8;__m128i(),__m128i()
 _mm_slli_epi32;__m128i(),1
 _mm_testc_si128;__m128i(),__m128i()
 _mm_testz_si128;__m128i(),__m128i()
 _mm_xor_si128;__m128i(),__m128i()
+# _mm_cmpeq_epi8;__m128i(),__m128i()
+# _mm_cmplt_epi8;__m128i(),__m128i()
+# _mm_max_epi8
diff --git a/src/Perm32/README.md b/src/Perm32/README.md
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		# HPCombi Experimental files

		These files contains experiments to be later incorporated into the sources.