diff --git a/src/Makefile b/src/Makefile index 2af2a3c6..c754b5ca 100644 --- a/src/Makefile +++ b/src/Makefile @@ -89,9 +89,17 @@ install: @echo "Installing user libraries." ln -s $(ROOT)/src/usr/lib/* $(ROOT)/lib/ @install $(ROOT)/deploy/linux/qss-solver.ini.in $(ROOT)/bin/qss-solver.ini + @echo "Installing partitioners." @install $(ROOT)/src/engine/3rd-party/partitioners/hmetis/khmetis $(ROOT)/bin/ @install $(ROOT)/src/engine/3rd-party/partitioners/patoh/Linux-x86_64/libpatoh.a $(ROOT)/lib/ @install $(ROOT)/src/engine/3rd-party/partitioners/metis/Linux-x86_64/libmetis.a $(ROOT)/lib/ + @mkdir -p $(ROOT)/lib/KaHIP + @mkdir -p $(ROOT)/lib/KaHIP/parallel + @mkdir -p $(ROOT)/bin/KaHIP + @install $(ROOT)/src/engine/usr/lib/KaHIP/*.a $(ROOT)/lib/KaHIP/ + @install $(ROOT)/src/engine/usr/lib/KaHIP/*.so $(ROOT)/lib/KaHIP/ + @install $(ROOT)/src/engine/usr/lib/KaHIP/parallel/* $(ROOT)/lib/KaHIP/parallel/ + @install $(ROOT)/src/engine/usr/bin/KaHIP/* $(ROOT)/bin/KaHIP/ @echo "Installing GTEST libraries." ln -s $(ROOT)/src/3rd-party/gtest/usr/lib/*.a $(ROOT)/lib/ diff --git a/src/engine/3rd-party/Makefile.include b/src/engine/3rd-party/Makefile.include index da8943af..6916e1a5 100644 --- a/src/engine/3rd-party/Makefile.include +++ b/src/engine/3rd-party/Makefile.include @@ -7,6 +7,7 @@ KLU_INCLUDE_DIR := /usr/include/suitesparse/ LIB_CVODE := $(LIB_DIR)/libsundials_cvode.a LIB_IDA := $(LIB_DIR)/libsundials_ida.a LIB_GSL := $(LIB_DIR)/libgsl.a +LIB_KAHIP := $(LIB_DIR)/KaHIP/libkahip.so $(LIB_CVODE): | create-folders tar xvzf $(3RD_PARTY_DIR)/cvode/cvode-2.9.0.tar.gz @@ -29,10 +30,19 @@ $(LIB_IDA): | create-folders rm -rf ./ida-2.9.0 rm -rf ./examples +$(LIB_KAHIP): | create-folders + tar xvzf $(3RD_PARTY_DIR)/partitioners/KaHIP/KaHIP-3.16.tar.gz + cd ./KaHIP-3.16; ./compile_withcmake.sh + mkdir -p $(BIN_DIR)/KaHIP/ + mkdir -p $(LIB_DIR)/KaHIP/ + mv ./KaHIP-3.16/deploy/*.a $(LIB_DIR)/KaHIP/ + mv ./KaHIP-3.16/deploy/*.so $(LIB_DIR)/KaHIP/ + mv ./KaHIP-3.16/deploy/parallel $(LIB_DIR)/KaHIP/ + mv ./KaHIP-3.16/deploy/* $(BIN_DIR)/KaHIP/ + rm -rf ./KaHIP-3.16 + # Rules - cvode: $(LIB_CVODE) - ida: $(LIB_IDA) - gsl: $(LIB_GSL) +kahip: $(LIB_KAHIP) diff --git a/src/engine/3rd-party/partitioners/KaHIP/KaHIP-3.16.tar.gz b/src/engine/3rd-party/partitioners/KaHIP/KaHIP-3.16.tar.gz new file mode 100644 index 00000000..32090fcd Binary files /dev/null and b/src/engine/3rd-party/partitioners/KaHIP/KaHIP-3.16.tar.gz differ diff --git a/src/engine/Makefile b/src/engine/Makefile index 7be58224..4683fb0b 100644 --- a/src/engine/Makefile +++ b/src/engine/Makefile @@ -17,6 +17,7 @@ BUILD_DIR := $(USR_DIR)/obj/release ifeq ($(MODE),Debug) BUILD_DIR := $(USR_DIR)/obj/debug endif +BIN_DIR := $(USR_DIR)/bin LIB_DIR := $(USR_DIR)/lib INCLUDE_DIR := $(USR_DIR)/include @@ -31,7 +32,7 @@ endif vpath %.c $(SRC_DIR) .SUFFIXES: .c -all: cvode ida gsl qss time-step +all: kahip cvode ida gsl qss time-step include 3rd-party/Makefile.include include common/Makefile.include @@ -77,6 +78,7 @@ $(LIB_QSS): $(QSS_OBJS) create-folders:: @mkdir -p $(BUILD_DIR) + @mkdir -p $(BIN_DIR) @mkdir -p $(LIB_DIR) # Rules