Changeset 6291


Ignore:
Timestamp:
Jan 19, 2019, 2:44:55 PM (3 months ago)
Author:
cameron
Message:

Cleaning out various items.

Location:
icGREP/icgrep-devel/icgrep
Files:
20 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • icGREP/icgrep-devel/icgrep/CMakeLists.txt

    r6288 r6291  
    138138add_executable(editd editd/editd.cpp editd/pattern_compiler.cpp editd/editdscan_kernel.cpp editd/editd_gpu_kernel.cpp editd/editd_cpu_kernel.cpp kernels/streams_merge.cpp)
    139139# add_executable(lz4d lz4d.cpp lz4/lz4_frame_decoder.cpp kernels/lz4/lz4_index_decoder.cpp kernels/lz4/lz4_bytestream_decoder.cpp)
    140 add_executable(core combine/core.cpp combine/regexGen.cpp combine/stringGen.cpp combine/propGen.cpp combine/icgrep-test/icgrep-test.cpp grep_interface.cpp grep/grep_engine.cpp kernels/scanmatchgen.cpp kernels/u8u32_kernel.cpp kernels/delmask_kernel.cpp  kernels/cc_scan_kernel.cpp kernels/charclasses.cpp kernels/linebreak_kernel.cpp kernels/streams_merge.cpp kernels/grep_kernel.cpp kernels/until_n.cpp)
    141140add_executable(lz4_decoder lz4_decoder.cpp)
    142141add_executable(lz4_grep grep_interface.cpp lz4_grep.cpp lz4/grep/lz4_grep_base_generator.cpp lz4/grep/lz4_grep_bytestream_generator.cpp lz4/grep/lz4_grep_bytestream_generator.h lz4/grep/lz4_grep_bitstream_generator.cpp lz4/grep/lz4_grep_bitstream_generator.h lz4/grep/lz4_grep_swizzle_generator.cpp lz4/grep/lz4_grep_swizzle_generator.h)
    143142add_executable(idisa_test idisa_test.cpp)
    144143add_executable(cachejanitord ${OBJECT_CACHE_DAEMON_SRC})
    145 
    146 #Exclude CoRE from default build.
    147 set_target_properties(core PROPERTIES EXCLUDE_FROM_ALL 1)
    148144
    149145target_link_libraries (icgrep GrepEngine UCDlib PabloADT RegExpCompiler CCADT CodeGen FileSelect ${REQ_LLVM_LIBRARIES} ${Boost_LIBRARIES} ${CUDA_LIB})
     
    154150target_link_libraries (editd PabloADT CCADT CodeGen ${REQ_LLVM_LIBRARIES} ${Boost_LIBRARIES} ${CUDA_LIB})
    155151# target_link_libraries (lz4d PabloADT CCADT CodeGen ${REQ_LLVM_LIBRARIES} ${Boost_LIBRARIES} ${CUDA_LIB})
    156 target_link_libraries (core RegExpCompiler ${REQ_LLVM_LIBRARIES} ${Boost_LIBRARIES})
    157152target_link_libraries (lz4_decoder LZ4_Lib PabloADT CCADT CodeGen ${REQ_LLVM_LIBRARIES} ${Boost_LIBRARIES} ${CUDA_LIB})
    158153target_link_libraries (lz4_grep LZ4_Lib UCDlib PabloADT RegExpCompiler CodeGen CCADT CodeGen FileSelect ${REQ_LLVM_LIBRARIES} ${Boost_LIBRARIES} ${CUDA_LIB})
     
    243238SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DPARABIX_VERSION='\"${Parabix_REVISION}\"'")
    244239IF (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
    245   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fuse-ld=gold")
     240  IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
     241     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fuse-ld=gold")
     242  ENDIF()
    246243ENDIF()
    247244
     
    307304  COMMAND python base64test.py ${CMAKE_BINARY_DIR}/base64)
    308305
    309 add_test(
    310   NAME pdep64_test
    311   WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/../QA/IDISA_test
    312   COMMAND ${CMAKE_BINARY_DIR}/idisa_test simd_pdep 64 randhex65536a randhex65536b)
    313306
    314307#add_test(
  • icGREP/icgrep-devel/icgrep/icgrep.files

    r6288 r6291  
    296296kernels/callback.cpp
    297297kernels/callback.h
    298 kernels/cc_kernel.cpp
    299298kernels/cc_scan_kernel.cpp
    300299kernels/cc_scan_kernel.h
  • icGREP/icgrep-devel/icgrep/u8u16.cpp

    r6288 r6291  
    4141static cl::opt<std::string> outputFile(cl::Positional, cl::desc("<output file>"), cl::cat(u8u16Options));
    4242static cl::opt<bool> enableAVXdel("enable-AVX-deletion", cl::desc("Enable AVX2 deletion algorithms."), cl::cat(u8u16Options));
    43 static cl::opt<bool> mMapBuffering("mmap-buffering", cl::desc("Enable mmap buffering."), cl::cat(u8u16Options));
    44 static cl::opt<bool> memAlignBuffering("memalign-buffering", cl::desc("Enable posix_memalign buffering."), cl::cat(u8u16Options));
    4543
    4644static cl::opt<bool> BranchingMode("branch", cl::desc("Use Experimental branching pipeline mode"), cl::cat(u8u16Options));
Note: See TracChangeset for help on using the changeset viewer.