From 901b9f16494f37890be17ef4bb66e6efc6873340 Mon Sep 17 00:00:00 2001 From: Jaron Kent-Dobias Date: Fri, 10 Feb 2017 12:18:11 -0500 Subject: changed code to rely on jst --- CMakeLists.txt | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 CMakeLists.txt (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..84b8f0f --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,22 @@ + +cmake_minimum_required(VERSION 3.7) +project(fracture) + +include_directories(src ~/.local/include) +link_directories(~/.local/lib) + +file(GLOB SOURCES lib/*.c) +add_executable(fracture src/fracture.c ${SOURCES}) +add_executable(big_anal_process src/big_anal_process.c ${SOURCES}) +add_executable(anal_process src/anal_process.c ${SOURCES}) +add_executable(cen_anal_process src/cen_anal_process.c ${SOURCES}) +add_executable(long_anal_process src/long_anal_process.c ${SOURCES}) +add_executable(corr_test src/corr_test.c ${SOURCES}) + +target_link_libraries(fracture gsl c cblas lapack dl pthread cholmod amd colamd suitesparseconfig camd ccolamd rt metis m jst profiler) +target_link_libraries(big_anal_process gsl c cblas lapack dl pthread cholmod amd colamd suitesparseconfig camd ccolamd rt metis m jst tcmalloc profiler) +target_link_libraries(cen_anal_process gsl c cblas lapack dl pthread cholmod amd colamd suitesparseconfig camd ccolamd rt metis m jst tcmalloc profiler) +target_link_libraries(long_anal_process gsl c cblas lapack dl pthread cholmod amd colamd suitesparseconfig camd ccolamd rt metis m jst tcmalloc profiler) +target_link_libraries(corr_test gsl c cblas lapack dl pthread cholmod amd colamd suitesparseconfig camd ccolamd rt metis m jst tcmalloc profiler) +target_link_libraries(anal_process gsl c cblas lapack dl pthread cholmod amd colamd suitesparseconfig camd ccolamd rt metis m jst tcmalloc profiler) + -- cgit v1.2.3-70-g09d2 From 8dde8a8c21cbaf7b3e37b0abcb3dc86baae04d2e Mon Sep 17 00:00:00 2001 From: Jaron Kent-Dobias Date: Fri, 10 Feb 2017 12:29:17 -0500 Subject: fixed net_copy: wasn't copying the voltcurmat --- CMakeLists.txt | 2 +- lib/net.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 84b8f0f..76eb685 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,7 +13,7 @@ add_executable(cen_anal_process src/cen_anal_process.c ${SOURCES}) add_executable(long_anal_process src/long_anal_process.c ${SOURCES}) add_executable(corr_test src/corr_test.c ${SOURCES}) -target_link_libraries(fracture gsl c cblas lapack dl pthread cholmod amd colamd suitesparseconfig camd ccolamd rt metis m jst profiler) +target_link_libraries(fracture gsl c cblas lapack dl pthread cholmod amd colamd suitesparseconfig camd ccolamd rt metis m jst tcmalloc profiler) target_link_libraries(big_anal_process gsl c cblas lapack dl pthread cholmod amd colamd suitesparseconfig camd ccolamd rt metis m jst tcmalloc profiler) target_link_libraries(cen_anal_process gsl c cblas lapack dl pthread cholmod amd colamd suitesparseconfig camd ccolamd rt metis m jst tcmalloc profiler) target_link_libraries(long_anal_process gsl c cblas lapack dl pthread cholmod amd colamd suitesparseconfig camd ccolamd rt metis m jst tcmalloc profiler) diff --git a/lib/net.c b/lib/net.c index eb44721..d26b22c 100644 --- a/lib/net.c +++ b/lib/net.c @@ -129,6 +129,7 @@ net_t *net_copy(const net_t *net, cholmod_common *c) { net_copy->boundary_cond = CHOL_F(copy_dense)(net->boundary_cond, c); net_copy->factor = CHOL_F(copy_factor)(net->factor, c); + net_copy->voltcurmat = CHOL_F(copy_sparse)(net->voltcurmat, c); return net_copy; } -- cgit v1.2.3-70-g09d2 From 8044c18f84b6d8e60e89637bccc9ee5771f43624 Mon Sep 17 00:00:00 2001 From: Jaron Kent-Dobias Date: Wed, 7 Jun 2017 14:58:29 -0400 Subject: make the cmake file more sensible --- CMakeLists.txt | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 76eb685..3cb6aeb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,18 +5,15 @@ project(fracture) include_directories(src ~/.local/include) link_directories(~/.local/lib) -file(GLOB SOURCES lib/*.c) -add_executable(fracture src/fracture.c ${SOURCES}) -add_executable(big_anal_process src/big_anal_process.c ${SOURCES}) -add_executable(anal_process src/anal_process.c ${SOURCES}) -add_executable(cen_anal_process src/cen_anal_process.c ${SOURCES}) -add_executable(long_anal_process src/long_anal_process.c ${SOURCES}) -add_executable(corr_test src/corr_test.c ${SOURCES}) +file(GLOB LIB_SOURCES lib/*.c) -target_link_libraries(fracture gsl c cblas lapack dl pthread cholmod amd colamd suitesparseconfig camd ccolamd rt metis m jst tcmalloc profiler) -target_link_libraries(big_anal_process gsl c cblas lapack dl pthread cholmod amd colamd suitesparseconfig camd ccolamd rt metis m jst tcmalloc profiler) -target_link_libraries(cen_anal_process gsl c cblas lapack dl pthread cholmod amd colamd suitesparseconfig camd ccolamd rt metis m jst tcmalloc profiler) -target_link_libraries(long_anal_process gsl c cblas lapack dl pthread cholmod amd colamd suitesparseconfig camd ccolamd rt metis m jst tcmalloc profiler) -target_link_libraries(corr_test gsl c cblas lapack dl pthread cholmod amd colamd suitesparseconfig camd ccolamd rt metis m jst tcmalloc profiler) -target_link_libraries(anal_process gsl c cblas lapack dl pthread cholmod amd colamd suitesparseconfig camd ccolamd rt metis m jst tcmalloc profiler) +add_library(fracture_stuff ${LIB_SOURCES}) + +file(GLOB EXE_SOURCES src/*.c) + +foreach( src_file ${EXE_SOURCES} ) + string( REGEX REPLACE ".*/src/(.*)\.c" "\\1" exe_name ${src_file} ) + add_executable( ${exe_name} ${src_file} ) + target_link_libraries(${exe_name} fracture_stuff gsl c cblas lapack dl pthread cholmod amd colamd suitesparseconfig camd ccolamd rt metis m jst tcmalloc profiler) +endforeach( src_file ${EXE_SOURCES} ) -- cgit v1.2.3-70-g09d2 From a1e4be2ad8e2f2354e6f36bce293e0f07e3c5f2f Mon Sep 17 00:00:00 2001 From: Jaron Kent-Dobias Date: Thu, 22 Jun 2017 16:46:36 -0400 Subject: updated cmake file --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 3cb6aeb..1e0a7f9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ -cmake_minimum_required(VERSION 3.7) +cmake_minimum_required(VERSION 3.5) project(fracture) include_directories(src ~/.local/include) @@ -15,5 +15,6 @@ foreach( src_file ${EXE_SOURCES} ) string( REGEX REPLACE ".*/src/(.*)\.c" "\\1" exe_name ${src_file} ) add_executable( ${exe_name} ${src_file} ) target_link_libraries(${exe_name} fracture_stuff gsl c cblas lapack dl pthread cholmod amd colamd suitesparseconfig camd ccolamd rt metis m jst tcmalloc profiler) + install(TARGETS ${exe_name} DESTINATION bin) endforeach( src_file ${EXE_SOURCES} ) -- cgit v1.2.3-70-g09d2 From 4764d5d407347d4dd5990411b243b3ec4bd75bff Mon Sep 17 00:00:00 2001 From: Jaron Kent-Dobias Date: Thu, 22 Jun 2017 16:47:10 -0400 Subject: updated cmake file agani --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 1e0a7f9..ade950f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.5) project(fracture) -include_directories(src ~/.local/include) +include_directories(src ~/.local/include /usr/include/suitesparse) link_directories(~/.local/lib) file(GLOB LIB_SOURCES lib/*.c) -- cgit v1.2.3-70-g09d2