From db17c140424fe4cb04f442a952077e1f7dfdc26b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Montan=CC=83ana?= Date: Fri, 29 Sep 2023 09:17:50 +0200 Subject: [PATCH] Change names of executables to b_... --- Makefile | 33 +++++++++------------------------ src/Platform/CMakeLists.txt | 20 ++++++++++---------- 2 files changed, 19 insertions(+), 34 deletions(-) diff --git a/Makefile b/Makefile index 99eff8e..85870e4 100644 --- a/Makefile +++ b/Makefile @@ -11,36 +11,21 @@ setup: ## Install dependencies for tests and coverage pip install gcovr; \ fi -dest ?= ../discretizbench -dest2 ?= ../covbench -dest3 ?= ../odtebench -copy: ## Copy binary files to selected folder +dest ?= ${HOME}/bin +install: ## Copy binary files to bin folder @echo "Destination folder: $(dest)" - @echo "Destination folder: $(dest2)" - @echo "Destination folder: $(dest3)" make build @echo ">>> Copying files to $(dest)" - @cp build/src/Platform/main $(dest) - @cp build/src/Platform/list $(dest) - @cp build/src/Platform/manage $(dest) - @cp build/src/Platform/best $(dest) - @echo ">>> Copying files to $(dest2)" - @cp build/src/Platform/main $(dest2) - @cp build/src/Platform/list $(dest2) - @cp build/src/Platform/manage $(dest2) - @cp build/src/Platform/best $(dest2) - @echo ">>> Copying files to $(dest3)" - @cp build/src/Platform/main $(dest3) - @cp build/src/Platform/list $(dest3) - @cp build/src/Platform/manage $(dest3) - @cp build/src/Platform/best $(dest3) - @echo ">>> Done" + @cp build/src/Platform/b_main $(dest) + @cp build/src/Platform/b_list $(dest) + @cp build/src/Platform/b_manage $(dest) + @cp build/src/Platform/b_best $(dest) dependency: ## Create a dependency graph diagram of the project (build/dependency.png) cd build && cmake .. --graphviz=dependency.dot && dot -Tpng dependency.dot -o dependency.png build: ## Build the main and BayesNetSample - cmake --build build -t main -t BayesNetSample -t manage -t list -t best -j 32 + cmake --build build -t b_main -t BayesNetSample -t b_manage -t b_list -t b_best -j 32 clean: ## Clean the debug info @echo ">>> Cleaning Debug BayesNet ..."; @@ -55,7 +40,7 @@ debug: ## Build a debug version of the project @if [ -d ./build ]; then rm -rf ./build; fi @mkdir build; cmake -S . -B build -D CMAKE_BUILD_TYPE=Debug -D ENABLE_TESTING=ON -D CODE_COVERAGE=ON; \ - cmake --build build -t main -t BayesNetSample -t manage -t list -t best -t unit_tests -j 32; + cmake --build build -t b_main -t BayesNetSample -t b_manage -t b_list -t b_best -t unit_tests -j 32; @echo ">>> Done"; release: ## Build a Release version of the project @@ -63,7 +48,7 @@ release: ## Build a Release version of the project @if [ -d ./build ]; then rm -rf ./build; fi @mkdir build; cmake -S . -B build -D CMAKE_BUILD_TYPE=Release; \ - cmake --build build -t main -t BayesNetSample -t manage -t list -t best -j 32; + cmake --build build -t b_main -t BayesNetSample -t b_manage -t b_list -t b_best -j 32; @echo ">>> Done"; test: ## Run tests diff --git a/src/Platform/CMakeLists.txt b/src/Platform/CMakeLists.txt index dcf5de7..b36916b 100644 --- a/src/Platform/CMakeLists.txt +++ b/src/Platform/CMakeLists.txt @@ -5,16 +5,16 @@ include_directories(${BayesNet_SOURCE_DIR}/lib/mdlp) include_directories(${BayesNet_SOURCE_DIR}/lib/argparse/include) include_directories(${BayesNet_SOURCE_DIR}/lib/json/include) include_directories(${BayesNet_SOURCE_DIR}/lib/libxlsxwriter/include) -add_executable(main main.cc Folding.cc platformUtils.cc Experiment.cc Datasets.cc Models.cc ReportConsole.cc ReportBase.cc) -add_executable(manage manage.cc Results.cc Result.cc ReportConsole.cc ReportExcel.cc ReportBase.cc Datasets.cc platformUtils.cc ExcelFile.cc) -add_executable(list list.cc platformUtils Datasets.cc) -add_executable(best best.cc BestResults.cc Result.cc Statistics.cc BestResultsExcel.cc ExcelFile.cc) -target_link_libraries(main BayesNet ArffFiles mdlp "${TORCH_LIBRARIES}") +add_executable(b_main main.cc Folding.cc platformUtils.cc Experiment.cc Datasets.cc Models.cc ReportConsole.cc ReportBase.cc) +add_executable(b_manage manage.cc Results.cc Result.cc ReportConsole.cc ReportExcel.cc ReportBase.cc Datasets.cc platformUtils.cc ExcelFile.cc) +add_executable(b_list list.cc platformUtils Datasets.cc) +add_executable(b_best best.cc BestResults.cc Result.cc Statistics.cc BestResultsExcel.cc ExcelFile.cc) +target_link_libraries(b_main BayesNet ArffFiles mdlp "${TORCH_LIBRARIES}") if (${CMAKE_HOST_SYSTEM_NAME} MATCHES "Linux") - target_link_libraries(manage "${TORCH_LIBRARIES}" libxlsxwriter.so ArffFiles mdlp stdc++fs) - target_link_libraries(best Boost::boost libxlsxwriter.so stdc++fs) + target_link_libraries(b_manage "${TORCH_LIBRARIES}" libxlsxwriter.so ArffFiles mdlp stdc++fs) + target_link_libraries(b_best Boost::boost libxlsxwriter.so stdc++fs) else() - target_link_libraries(manage "${TORCH_LIBRARIES}" "${XLSXWRITER_LIB}" ArffFiles mdlp) - target_link_libraries(best Boost::boost "${XLSXWRITER_LIB}") + target_link_libraries(b_manage "${TORCH_LIBRARIES}" "${XLSXWRITER_LIB}" ArffFiles mdlp) + target_link_libraries(b_best Boost::boost "${XLSXWRITER_LIB}") endif() -target_link_libraries(list ArffFiles mdlp "${TORCH_LIBRARIES}") \ No newline at end of file +target_link_libraries(b_list ArffFiles mdlp "${TORCH_LIBRARIES}") \ No newline at end of file