rmontanana/BayesNet
rmontanana/BayesNet
1
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases 3 Wiki Activity

Refactor makefile to use variables

Browse Source
This commit is contained in:
Ricardo Montañana Gómez 2023-10-07 00:16:25 +02:00
parent 2f58807322
commit 1287160c47
Signed by: rmontanana
GPG Key ID: 46064262FD9A7ADE
3 changed files with 59 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -31,7 +31,9 @@
*.exe *.exe
*.out *.out
*.app *.app
build/ build/**
build_debug/**
build_release/**
*.dSYM/** *.dSYM/**
cmake-build*/** cmake-build*/**
.idea .idea

90
Makefile
View File

@ -2,6 +2,26 @@ SHELL := /bin/bash
.DEFAULT_GOAL := help .DEFAULT_GOAL := help
.PHONY: coverage setup help build test clean debug release .PHONY: coverage setup help build test clean debug release
f_release = build_release
f_debug = build_debug
app_targets = b_best b_list b_main b_manage
test_targets = unit_tests_bayesnet unit_tests_platform
n_procs = -j 16
define ClearTests
@for t in $(test_targets); do \
if [ -f $(f_debug)/tests/$$t ]; then \
echo ">>> Cleaning $$t..." ; \
rm -f $(f_debug)/tests/$$t ; \
fi ; \
done
$(eval nfiles=$(find . -name "*.gcda" -print))
@if test "${nfiles}" != "" ; then \
find . -name "*.gcda" -print0 | xargs -0 rm 2>/dev/null ;\
fi ;
endef
setup: ## Install dependencies for tests and coverage setup: ## Install dependencies for tests and coverage
@if [ "$(shell uname)" = "Darwin" ]; then \ @if [ "$(shell uname)" = "Darwin" ]; then \
brew install gcovr; \ brew install gcovr; \
@ -16,22 +36,24 @@ install: ## Copy binary files to bin folder
@echo "Destination folder: $(dest)" @echo "Destination folder: $(dest)"
make buildr make buildr
@echo ">>> Copying files to $(dest)" @echo ">>> Copying files to $(dest)"
@cp build_release/src/Platform/b_main $(dest) @cp $(f_release)/src/Platform/b_main $(dest)
@cp build_release/src/Platform/b_list $(dest) @cp $(f_release)/src/Platform/b_list $(dest)
@cp build_release/src/Platform/b_manage $(dest) @cp $(f_release)/src/Platform/b_manage $(dest)
@cp build_release/src/Platform/b_best $(dest) @cp $(f_release)/src/Platform/b_best $(dest)
dependency: ## Create a dependency graph diagram of the project (build/dependency.png) 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 @echo ">>> Creating dependency graph diagram of the project...";
$(MAKE) debug
cd $(f_debug) && cmake .. --graphviz=dependency.dot && dot -Tpng dependency.dot -o dependency.png
buildd: ## Build the debug targets buildd: ## Build the debug targets
cmake --build build_debug -t b_main -t BayesNetSample -t b_manage -t b_list -t b_best -j 32 cmake --build $(f_debug) -t $(app_targets) $(n_procs)
buildr: ## Build the release targets buildr: ## Build the release targets
cmake --build build_release -t b_main -t BayesNetSample -t b_manage -t b_list -t b_best -j 32 cmake --build $(f_release) -t $(app_targets) $(n_procs)
clean: ## Clean the debug info clean: ## Clean the tests info
@echo ">>> Cleaning Debug BayesNet..."; @echo ">>> Cleaning Debug BayesNet tests...";
$(call ClearTests) $(call ClearTests)
@echo ">>> Done"; @echo ">>> Done";
@ -40,58 +62,54 @@ clang-uml: ## Create uml class and sequence diagrams
debug: ## Build a debug version of the project debug: ## Build a debug version of the project
@echo ">>> Building Debug BayesNet..."; @echo ">>> Building Debug BayesNet...";
@if [ -d ./build_debug ]; then rm -rf ./build_debug; fi @if [ -d ./$(f_debug) ]; then rm -rf ./$(f_debug); fi
@mkdir build_debug; @mkdir $(f_debug);
@cmake -S . -B build_Debug -D CMAKE_BUILD_TYPE=Debug -D ENABLE_TESTING=ON -D CODE_COVERAGE=ON; @cmake -S . -B $(f_debug) -D CMAKE_BUILD_TYPE=Debug -D ENABLE_TESTING=ON -D CODE_COVERAGE=ON;
@echo ">>> Done"; @echo ">>> Done";
release: ## Build a Release version of the project release: ## Build a Release version of the project
@echo ">>> Building Release BayesNet..."; @echo ">>> Building Release BayesNet...";
@if [ -d ./build_release ]; then rm -rf ./build_release; fi @if [ -d ./$(f_release) ]; then rm -rf ./$(f_release); fi
@mkdir build_release; @mkdir $(f_release);
@cmake -S . -B build_release -D CMAKE_BUILD_TYPE=Release; @cmake -S . -B $(f_release) -D CMAKE_BUILD_TYPE=Release;
@echo ">>> Done"; @echo ">>> Done";
opt = "" opt = ""
test: ## Run tests (opt="-s") to verbose output the tests, (opt="-c='Test Maximum Spanning Tree'") to run only that section test: ## Run tests (opt="-s") to verbose output the tests, (opt="-c='Test Maximum Spanning Tree'") to run only that section
@echo ">>> Running BayesNet & Platform tests..."; @echo ">>> Running BayesNet & Platform tests...";
$(MAKE) clean @$(MAKE) clean
@cmake --build build_debug --target unit_tests_bayesnet --target unit_tests_platform ; @cmake --build $(f_debug) -t $(test_targets) $(n_procs)
@if [ -f build_debug/tests/unit_tests_bayesnet ]; then cd build_debug/tests ; ./unit_tests_bayesnet $(opt) ; fi ; @for t in $(test_targets); do \
@if [ -f build_debug/tests/unit_tests_platform ]; then cd build_debug/tests ; ./unit_tests_platform $(opt) ; fi ; if [ -f $(f_debug)/tests/$$t ]; then \
cd $(f_debug)/tests ; \
./$$t $(opt) ; \
fi ; \
done
@echo ">>> Done"; @echo ">>> Done";
opt = "" opt = ""
testp: ## Run platform tests (opt="-s") to verbose output the tests, (opt="-c='Stratified Fold Test'") to run only that section testp: ## Run platform tests (opt="-s") to verbose output the tests, (opt="-c='Stratified Fold Test'") to run only that section
@echo ">>> Running Platform tests..."; @echo ">>> Running Platform tests...";
$(MAKE) clean @$(MAKE) clean
@cmake --build build_debug --target unit_tests_platform ; @cmake --build $(f_debug) --target unit_tests_platform ;
@if [ -f build_debug/tests/unit_tests_platform ]; then cd build_debug/tests ; ./unit_tests_platform $(opt) ; fi ; @if [ -f $(f_debug)/tests/unit_tests_platform ]; then cd $(f_debug)/tests ; ./unit_tests_platform $(opt) ; fi ;
@echo ">>> Done"; @echo ">>> Done";
opt = "" opt = ""
testb: ## Run BayesNet tests (opt="-s") to verbose output the tests, (opt="-c='Test Maximum Spanning Tree'") to run only that section testb: ## Run BayesNet tests (opt="-s") to verbose output the tests, (opt="-c='Test Maximum Spanning Tree'") to run only that section
@echo ">>> Running BayesNet tests..."; @echo ">>> Running BayesNet tests...";
$(MAKE) clean @$(MAKE) clean
@cmake --build build_debug --target unit_tests_bayesnet ; @cmake --build $(f_debug) --target unit_tests_bayesnet ;
@if [ -f build_debug/tests/unit_tests_bayesnet ]; then cd build_debug/tests ; ./unit_tests_bayesnet $(opt) ; fi ; @if [ -f $(f_debug)/tests/unit_tests_bayesnet ]; then cd $(f_debug)/tests ; ./unit_tests_bayesnet $(opt) ; fi ;
@echo ">>> Done"; @echo ">>> Done";
coverage: ## Run tests and generate coverage report (build/index.html) coverage: ## Run tests and generate coverage report (build/index.html)
@echo ">>> Building tests with coverage..."; @echo ">>> Building tests with coverage...";
$(MAKE) test @$(MAKE) test
@cd build_debug ; \ @cd $(f_debug) ;
gcovr --config ../gcovr.cfg @gcovr --config ../gcovr.cfg ;
@echo ">>> Done"; @echo ">>> Done";
define ClearTests =
$(eval nfiles=$(find . -name "*.gcda" -print))
@if [ -f build_debug/tests/unit_tests_bayesnet ]; then rm -f build_debug/tests/unit_tests_bayesnet ; fi ;
@if [ -f build_debug/tests/unit_tests_platform ]; then rm -f build_debug/tests/unit_tests_platform ; fi ;
@if test "${nfiles}" != "" ; then \
find . -name "*.gcda" -print0 | xargs -0 rm 2>/dev/null ;\
fi ;
endef
help: ## Show help message help: ## Show help message
@IFS=$$'\n' ; \ @IFS=$$'\n' ; \

3
tests/CMakeLists.txt
View File

@ -6,8 +6,9 @@ if(ENABLE_TESTING)
include_directories(${BayesNet_SOURCE_DIR}/lib/Files) include_directories(${BayesNet_SOURCE_DIR}/lib/Files)
include_directories(${BayesNet_SOURCE_DIR}/lib/mdlp) include_directories(${BayesNet_SOURCE_DIR}/lib/mdlp)
include_directories(${BayesNet_SOURCE_DIR}/lib/json/include) include_directories(${BayesNet_SOURCE_DIR}/lib/json/include)
include_directories(${BayesNet_SOURCE_DIR}/lib/argparse/include)
set(TEST_SOURCES_BAYESNET TestBayesModels.cc TestBayesNetwork.cc TestBayesMetrics.cc TestUtils.cc ${BayesNet_SOURCE_DIR}/src/Platform/Folding.cc ${BayesNet_SOURCES}) set(TEST_SOURCES_BAYESNET TestBayesModels.cc TestBayesNetwork.cc TestBayesMetrics.cc TestUtils.cc ${BayesNet_SOURCE_DIR}/src/Platform/Folding.cc ${BayesNet_SOURCES})
set(TEST_SOURCES_PLATFORM TestFolding.cc TestUtils.cc ${Platform_SOURCES}) set(TEST_SOURCES_PLATFORM TestFolding.cc TestUtils.cc ${BayesNet_SOURCE_DIR}/src/Platform/Folding.cc)
add_executable(${TEST_BAYESNET} ${TEST_SOURCES_BAYESNET}) add_executable(${TEST_BAYESNET} ${TEST_SOURCES_BAYESNET})
add_executable(${TEST_PLATFORM} ${TEST_SOURCES_PLATFORM}) add_executable(${TEST_PLATFORM} ${TEST_SOURCES_PLATFORM})
target_link_libraries(${TEST_BAYESNET} PUBLIC "${TORCH_LIBRARIES}" ArffFiles mdlp Catch2::Catch2WithMain) target_link_libraries(${TEST_BAYESNET} PUBLIC "${TORCH_LIBRARIES}" ArffFiles mdlp Catch2::Catch2WithMain)