small changes for v1.0.7

Author: oma219

CHANGELOG.md

@@ -1,6 +1,9 @@
 # PFP-Doc Change Log
 
-## v1.0.6 - latest
+## v1.0.7 - latest
+- Updated compilation to avoid specific architecture flags
+
+## v1.0.6
 - Added another method to trim the construction queue in scenarios such as large block of suffixes that 
   begin with Ns or any character that is not a usual DNA/RNA character.
 

CMakeLists.txt

@@ -54,6 +54,6 @@ endif()
 add_subdirectory(include)
 add_subdirectory(src)
 
-install(TARGETS pfp_doc pfp_doc64 DESTINATION ${PROJECT_BINARY_DIR})
+install(TARGETS pfp_doc64 DESTINATION ${PROJECT_BINARY_DIR})
 install(TARGETS newscanNT.x pscan.x newscan.x 
         DESTINATION ${PROJECT_BINARY_DIR}/bin)

include/pfp_doc.hpp

@@ -19,22 +19,21 @@
                               std::fprintf(stderr, "\n\n"); std::exit(1);} while(0)
 #define ASSERT(condition, msg) do {if (!condition){std::fprintf(stderr, "\n\n\033[31mAssertion Failed:\033[m %s\n\n", msg); \
                                                    std::exit(1);}} while(0)
-#define STATUS_LOG(x, ...) do {std::fprintf(stderr, "[%s] ", x); std::fprintf(stderr, __VA_ARGS__ ); \
+#define STATUS_LOG(x, ...) do {std::fprintf(stderr, "\033[32m[%s] \033[0m", x); std::fprintf(stderr, __VA_ARGS__ ); \
                                std::fprintf(stderr, " ... ");} while(0)
 #define DONE_LOG(x) do {auto sec = std::chrono::duration<double>(x); \
                         std::fprintf(stderr, "done.  (%.3f sec)\n", sec.count());} while(0)
-#define FORCE_LOG(func, ...)  do {std::fprintf(stderr, "[%s] ", func); \
+#define FORCE_LOG(func, ...)  do {std::fprintf(stderr, "\033[32m[%s] \033[m", func); \
                                   std::fprintf(stderr, __VA_ARGS__); \
                                   std::fprintf(stderr, "\n");} while (0)
 
 // Defintions
-#define PFPDOC_VERSION "1.0.6"
+#define PFPDOC_VERSION "1.0.7"
 
 #define DOCWIDTH 2
 #define MAXQUEUELENGTH 1000000
 #define MAXLCPVALUE 65535 // 2^16 - 1
 #define MAXDOCS 65535
-//#define NUMCOLSFORTABLE 7
 
 #define AVX2_PRESENT __AVX2__ 
 #define AVX512BW_PRESENT __AVX512BW__ 

src/CMakeLists.txt

@@ -1,14 +1,13 @@
-add_executable(pfp_doc pfp_doc.cpp ref_builder.cpp)
-target_link_libraries(pfp_doc common pfp gsacak sdsl ri "-fopenmp")
-target_include_directories(pfp_doc PUBLIC "../include/")
-target_compile_options(pfp_doc PUBLIC "-std=c++17" "-fopenmp" "-mavx2" "-mavx512bw" "-mavx512f" 
-"-mavx512cd" "-mavx512dq" "-mavx512vl" "-mavx512ifma" "-mavx512vbmi" "-mavx512pf" )
+# add_executable(pfp_doc pfp_doc.cpp ref_builder.cpp)
+# target_link_libraries(pfp_doc common pfp gsacak sdsl ri "-fopenmp")
+# target_include_directories(pfp_doc PUBLIC "../include/")
+# target_compile_options(pfp_doc PUBLIC "-std=c++17" "-fopenmp" "-mavx2" "-mavx512bw" "-mavx512f" 
+# "-mavx512cd" "-mavx512dq" "-mavx512vl" "-mavx512ifma" "-mavx512vbmi" "-mavx512pf" )
 
 add_executable(pfp_doc64 pfp_doc.cpp ref_builder.cpp)
 target_link_libraries(pfp_doc64 common pfp gsacak64 sdsl ri "-fopenmp")
 target_include_directories(pfp_doc64 PUBLIC "../include/")
-target_compile_options(pfp_doc64 PUBLIC "-std=c++17" "-fopenmp" "-DM64" "-mavx2" "-mavx512bw" "-mavx512f" 
-"-mavx512cd" "-mavx512dq" "-mavx512vl" "-mavx512ifma" "-mavx512vbmi" "-mavx512pf" )
+target_compile_options(pfp_doc64 PUBLIC "-std=c++17" "-fopenmp" "-DM64" "-march=native")
 
 
 

src/pfp_doc.cpp

@@ -367,7 +367,7 @@ int pfpdoc_usage() {
 
 int main(int argc, char** argv) {
     /* main method for pfp_doc */
-    std::fprintf(stderr, "\033[32m\npfp-doc version: %s\033[m\n", PFPDOC_VERSION);
+    std::fprintf(stderr, "\033[1m\033[31m\npfp-doc version: %s\033[m\033[0m\n", PFPDOC_VERSION);
 
     if (argc > 1) {
         if (std::strcmp(argv[1], "build") == 0)