Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update to KMC fork to eliminate patching and allow compilation on AMD w/SIMD #39

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -184,17 +184,14 @@ endif()
message("Build system will fetch and install KMC3")
ExternalProject_Add(prj_kmc
DOWNLOAD_DIR ${CMAKE_SOURCE_DIR}/external
DOWNLOAD_COMMAND curl -k -L https://github.com/refresh-bio/KMC/archive/refs/tags/v3.2.1.tar.gz -o KMC-3.2.1.tar.gz &&
tar -xzf KMC-3.2.1.tar.gz &&
rm KMC-3.2.1.tar.gz
PATCH_COMMAND patch --strip 1 < ${CMAKE_SOURCE_DIR}/patches/kmc_patch.diff
SOURCE_DIR ${CMAKE_SOURCE_DIR}/external/KMC-3.2.1
DOWNLOAD_COMMAND curl -k -L https://github.com/ggraham/KMC/archive/refs/tags/v3.2.4e.tar.gz | tar -xz
SOURCE_DIR ${CMAKE_SOURCE_DIR}/external/KMC-3.2.4e
BUILD_IN_SOURCE TRUE
INSTALL_DIR ${CMAKE_SOURCE_DIR}/external/
CONFIGURE_COMMAND ""
BUILD_COMMAND make -j4 CC=${CMAKE_CXX_COMPILER} simde && make -j4 CC=${CMAKE_CXX_COMPILER} kmc
INSTALL_COMMAND cp bin/libkmc_core.a ${EXT_LIB} &&
cp include/kmc_runner.h ${EXT_INCLUDE}
CONFIGURE_COMMAND ./configure
BUILD_COMMAND make -j4
INSTALL_COMMAND cp libkmc_core.a ${EXT_LIB} &&
cp src/kmc_core/kmc_runner.h ${EXT_INCLUDE}
)

add_library(kmc STATIC IMPORTED)
Expand Down
271 changes: 0 additions & 271 deletions patches/kmc-v3.2.1_cuttlefish-dev.diff

This file was deleted.

Loading