Listing options on cmdline

.github/workflows/ci.yml

@@ -61,9 +61,12 @@ jobs:
             sudo apt-get remove libstdc++-10-dev libgcc-10-dev cpp-10
             sudo apt-get remove libstdc++-11-dev libgcc-11-dev cpp-11
           fi
+          sudo add-apt-repository -y 'deb http://mirror.plusserver.com/ubuntu/ubuntu/ bionic-updates main restricted universe multiverse'
           sudo apt-get update
           sudo apt-get install -y libtool m4 autoconf
-          if [ "${{ matrix.compiler }}" = "gcc" ]; then
+          if [ "${cc}" = "gcc" ]; then
+              sudo apt-get install -y g++-7/bionic-updates
+          elif [ "${{ matrix.compiler }}" = "gcc" ]; then
               sudo apt-get install -y "${cxx}"
           else
               echo "TOOLCHAIN=-DCMAKE_TOOLCHAIN_FILE=clang.cmake" >> $GITHUB_ENV

benchmarks/index_perftest.cpp

@@ -9,8 +9,8 @@
 using pisa::do_not_optimize_away;
 using pisa::get_time_usecs;
 
-template <typename IndexType, bool with_freqs>
-void perftest(IndexType const& index, std::string const& type)
+template <bool with_freqs, typename IndexType>
+void perftest(IndexType&& index, std::string const& type)
 {
     std::string freqs_log = with_freqs ? "+freq()" : "";
     {
@@ -103,18 +103,6 @@ void perftest(IndexType const& index, std::string const& type)
     }
 }
 
-template <typename IndexType>
-void perftest(const char* index_filename, std::string const& type)
-{
-    spdlog::info("Loading index from {}", index_filename);
-    IndexType index;
-    mio::mmap_source m(index_filename);
-    pisa::mapper::map(index, m, pisa::mapper::map_flags::warmup);
-
-    perftest<IndexType, false>(index, type);
-    perftest<IndexType, true>(index, type);
-}
-
 int main(int argc, const char** argv)
 {
     using namespace pisa;
@@ -127,17 +115,13 @@ int main(int argc, const char** argv)
     std::string type = argv[1];
     const char* index_filename = argv[2];
 
-    if (false) {
-#define LOOP_BODY(R, DATA, T)                                    \
-    }                                                            \
-    else if (type == BOOST_PP_STRINGIZE(T))                      \
-    {                                                            \
-        perftest<BOOST_PP_CAT(T, _index)>(index_filename, type); \
-        /**/
-
-        BOOST_PP_SEQ_FOR_EACH(LOOP_BODY, _, PISA_INDEX_TYPES);
-#undef LOOP_BODY
-    } else {
-        spdlog::error("Unknown type {}", type);
+    try {
+        IndexType::resolve(type).load_and_execute(index_filename, [&](auto&& index) {
+            perftest<false>(index, type);
+            perftest<true>(index, type);
+        });
+    } catch (std::exception const& err) {
+        spdlog::error("{}", err.what());
+        return 1;
     }
 }

include/pisa/compress.hpp

@@ -246,27 +246,17 @@ void compress(
     binary_freq_collection input(input_basename.c_str());
     global_parameters params;
 
-    if (false) {
-#define LOOP_BODY(R, DATA, T)                                                    \
-    }                                                                            \
-    else if (index_encoding == BOOST_PP_STRINGIZE(T))                            \
-    {                                                                            \
-        compress_index<pisa::BOOST_PP_CAT(T, _index), wand_data<wand_data_raw>>( \
-            input,                                                               \
-            params,                                                              \
-            output_filename,                                                     \
-            check,                                                               \
-            index_encoding,                                                      \
-            wand_data_filename,                                                  \
-            scorer_params,                                                       \
-            quantize);                                                           \
-        /**/
-        BOOST_PP_SEQ_FOR_EACH(LOOP_BODY, _, PISA_INDEX_TYPES);
-#undef LOOP_BODY
-    } else {
-        spdlog::error("Unknown type {}", index_encoding);
-        std::abort();
-    }
+    IndexType::resolve(index_encoding).execute([&](auto type_marker) {
+        compress_index<typename decltype(type_marker)::type, wand_data<wand_data_raw>>(
+            input,
+            params,
+            output_filename,
+            check,
+            index_encoding,
+            wand_data_filename,
+            scorer_params,
+            quantize);
+    });
 }
 
 }  // namespace pisa