rmontanana/Platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove source bayesnet & pyclassifiers libraries dependency

Browse Source
This commit is contained in:
Ricardo Montañana Gómez
2024-03-08 12:27:28 +01:00
parent 5c4efa08db
commit 7a3adaf4a9
12 changed files with 36 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.gitmodules vendored
View File

@@ -14,6 +14,6 @@
path = lib/mdlp path = lib/mdlp
url = https://github.com/rmontanana/mdlp url = https://github.com/rmontanana/mdlp
update = merge update = merge
[submodule "lib/PyClassifiers"] [submodule "lib/folding"]
path = lib/PyClassifiers path = lib/folding
url = git@github.com:rmontanana/PyClassifiers url = https://github.com/rmontanana/folding

6
CMakeLists.txt
View File

@@ -70,14 +70,18 @@ endif (ENABLE_CLANG_TIDY)
# External libraries - dependencies of Platform # External libraries - dependencies of Platform
# --------------------------------------------- # ---------------------------------------------
add_git_submodule("lib/PyClassifiers")
add_git_submodule("lib/argparse") add_git_submodule("lib/argparse")
add_git_submodule("lib/mdlp")
find_library(XLSXWRITER_LIB NAMES libxlsxwriter.dylib libxlsxwriter.so PATHS ${Platform_SOURCE_DIR}/lib/libxlsxwriter/lib) find_library(XLSXWRITER_LIB NAMES libxlsxwriter.dylib libxlsxwriter.so PATHS ${Platform_SOURCE_DIR}/lib/libxlsxwriter/lib)
message("XLSXWRITER_LIB=${XLSXWRITER_LIB}") message("XLSXWRITER_LIB=${XLSXWRITER_LIB}")
find_library(PyClassifiers NAMES libPyClassifiers PyClassifiers)
find_library(BayesNet NAMES libBayesNet BayesNet)
# Subdirectories # Subdirectories
# -------------- # --------------
add_subdirectory(lib/Files)
add_subdirectory(config) add_subdirectory(config)
add_subdirectory(src) add_subdirectory(src)
add_subdirectory(sample) add_subdirectory(sample)

2
Makefile
View File

@@ -5,7 +5,7 @@ SHELL := /bin/bash
f_release = build_release f_release = build_release
f_debug = build_debug f_debug = build_debug
app_targets = b_best b_list b_main b_manage b_grid app_targets = b_best b_list b_main b_manage b_grid
test_targets = unit_tests_bayesnet unit_tests_platform test_targets = unit_tests_platform
n_procs = -j 16 n_procs = -j 16
define ClearTests define ClearTests

3
gitmodules
View File

@@ -23,9 +23,6 @@
url = https://github.com/jmcnamara/libxlsxwriter.git url = https://github.com/jmcnamara/libxlsxwriter.git
main = main main = main
update = merge update = merge
[submodule "lib/PyClassifiers"]
path = lib/PyClassifiers
url = https://github.com/rmontanana/PyClassifiers
[submodule "lib/folding"] [submodule "lib/folding"]
path = lib/folding path = lib/folding
url = https://github.com/rmontanana/Folding url = https://github.com/rmontanana/Folding

1
lib/PyClassifiers

Submodule lib/PyClassifiers deleted from 11ee490c1c

1
lib/folding Submodule

Submodule lib/folding added at 37316a54e0

2
lib/libxlsxwriter

Submodule lib/libxlsxwriter updated: f6d73b0ae1...b0c76b3396

2
sample/CMakeLists.txt
View File

@@ -5,8 +5,8 @@ include_directories(
${Python3_INCLUDE_DIRS} ${Python3_INCLUDE_DIRS}
${Platform_SOURCE_DIR}/lib/Files ${Platform_SOURCE_DIR}/lib/Files
${Platform_SOURCE_DIR}/lib/argparse/include ${Platform_SOURCE_DIR}/lib/argparse/include
${Platform_SOURCE_DIR}/lib/folding
${Platform_SOURCE_DIR}/lib/PyClassifiers/lib/BayesNet/src ${Platform_SOURCE_DIR}/lib/PyClassifiers/lib/BayesNet/src
${Platform_SOURCE_DIR}/lib/PyClassifiers/lib/BayesNet/lib/folding
${Platform_SOURCE_DIR}/lib/PyClassifiers/lib/BayesNet/lib/mdlp ${Platform_SOURCE_DIR}/lib/PyClassifiers/lib/BayesNet/lib/mdlp
${Platform_SOURCE_DIR}/lib/PyClassifiers/lib/BayesNet/lib/json/include ${Platform_SOURCE_DIR}/lib/PyClassifiers/lib/BayesNet/lib/json/include
${CMAKE_BINARY_DIR}/configured_files/include ${CMAKE_BINARY_DIR}/configured_files/include

25
src/CMakeLists.txt
View File

@@ -1,23 +1,17 @@
include_directories( include_directories(
## Libs ## Libs
${Platform_SOURCE_DIR}/lib/PyClassifiers/lib/BayesNet/src
${Platform_SOURCE_DIR}/lib/PyClassifiers/lib/BayesNet/src/classifiers
${Platform_SOURCE_DIR}/lib/PyClassifiers/lib/BayesNet/src/ensembles
${Platform_SOURCE_DIR}/lib/PyClassifiers/lib/BayesNet/src/bayesian_network
${Platform_SOURCE_DIR}/lib/PyClassifiers/lib/BayesNet/src/feature_selection
${Platform_SOURCE_DIR}/lib/PyClassifiers/lib/BayesNet/src/utils
${Platform_SOURCE_DIR}/lib/PyClassifiers/lib/BayesNet/lib/folding
${Platform_SOURCE_DIR}/lib/PyClassifiers/lib/BayesNet/lib/mdlp
${Platform_SOURCE_DIR}/lib/PyClassifiers/lib/BayesNet/lib/json/include
${Platform_SOURCE_DIR}/lib/PyClassifiers/src
${Platform_SOURCE_DIR}/lib/Files ${Platform_SOURCE_DIR}/lib/Files
${Platform_SOURCE_DIR}/lib/folding
${Platform_SOURCE_DIR}/lib/mdlp ${Platform_SOURCE_DIR}/lib/mdlp
${Platform_SOURCE_DIR}/lib/argparse/include ${Platform_SOURCE_DIR}/lib/argparse/include
${Platform_SOURCE_DIR}/lib/json/include ${Platform_SOURCE_DIR}/lib/json/include
${Platform_SOURCE_DIR}/lib/libxlsxwriter/include ${Platform_SOURCE_DIR}/lib/libxlsxwriter/include
${Python3_INCLUDE_DIRS} ${Python3_INCLUDE_DIRS}
${MPI_CXX_INCLUDE_DIRS} ${MPI_CXX_INCLUDE_DIRS}
${TORCH_INCLUDE_DIRS}
${CMAKE_BINARY_DIR}/configured_files/include ${CMAKE_BINARY_DIR}/configured_files/include
/usr/local/include/bayesnet
/usr/local/include/pyclassifiers
## Platform ## Platform
${Platform_SOURCE_DIR}/src/common ${Platform_SOURCE_DIR}/src/common
${Platform_SOURCE_DIR}/src/best ${Platform_SOURCE_DIR}/src/best
@@ -30,14 +24,16 @@ include_directories(
# b_best # b_best
set(best_sources b_best.cc BestResults.cc Statistics.cc BestResultsExcel.cc) set(best_sources b_best.cc BestResults.cc Statistics.cc BestResultsExcel.cc)
list(TRANSFORM best_sources PREPEND best/) list(TRANSFORM best_sources PREPEND best/)
add_executable(b_best ${best_sources} main/Result.cc reports/ReportExcel.cc reports/ReportBase.cc reports/ExcelFile.cc common/Datasets.cc common/Dataset.cc) add_executable(
b_best ${best_sources} main/Result.cc
reports/ReportExcel.cc reports/ReportBase.cc reports/ExcelFile.cc common/Datasets.cc common/Dataset.cc)
target_link_libraries(b_best Boost::boost "${TORCH_LIBRARIES}" "${XLSXWRITER_LIB}" ArffFiles mdlp) target_link_libraries(b_best Boost::boost "${TORCH_LIBRARIES}" "${XLSXWRITER_LIB}" ArffFiles mdlp)
# b_grid # b_grid
set(grid_sources b_grid.cc GridSearch.cc GridData.cc) set(grid_sources b_grid.cc GridSearch.cc GridData.cc)
list(TRANSFORM grid_sources PREPEND grid/) list(TRANSFORM grid_sources PREPEND grid/)
add_executable(b_grid ${grid_sources} main/HyperParameters.cc main/Models.cc common/Datasets.cc common/Dataset.cc) add_executable(b_grid ${grid_sources} main/HyperParameters.cc main/Models.cc common/Datasets.cc common/Dataset.cc)
target_link_libraries(b_grid PyClassifiers ${MPI_CXX_LIBRARIES} ArffFiles) target_link_libraries(b_grid ${MPI_CXX_LIBRARIES} "${PyClassifiers}" "${BayesNet}" ArffFiles mdlp ${Python3_LIBRARIES} "${TORCH_LIBRARIES}" ${LIBTORCH_PYTHON} Boost::python Boost::numpy)
# b_list # b_list
set(list_sources b_list.cc DatasetsExcel.cc) set(list_sources b_list.cc DatasetsExcel.cc)
@@ -49,12 +45,13 @@ target_link_libraries(b_list "${TORCH_LIBRARIES}" "${XLSXWRITER_LIB}" ArffFiles
set(main_sources b_main.cc Experiment.cc Models.cc HyperParameters.cc) set(main_sources b_main.cc Experiment.cc Models.cc HyperParameters.cc)
list(TRANSFORM main_sources PREPEND main/) list(TRANSFORM main_sources PREPEND main/)
add_executable(b_main ${main_sources} common/Datasets.cc common/Dataset.cc reports/ReportConsole.cc reports/ReportBase.cc main/Result.cc) add_executable(b_main ${main_sources} common/Datasets.cc common/Dataset.cc reports/ReportConsole.cc reports/ReportBase.cc main/Result.cc)
target_link_libraries(b_main PyClassifiers BayesNet ArffFiles mdlp) target_link_libraries(b_main "${PyClassifiers}" "${BayesNet}" ArffFiles mdlp ${Python3_LIBRARIES} "${TORCH_LIBRARIES}" ${LIBTORCH_PYTHON} Boost::python Boost::numpy)
# b_manage # b_manage
set(manage_sources b_manage.cc ManageResults.cc CommandParser.cc Results.cc) set(manage_sources b_manage.cc ManageResults.cc CommandParser.cc Results.cc)
list(TRANSFORM manage_sources PREPEND manage/) list(TRANSFORM manage_sources PREPEND manage/)
add_executable(b_manage ${manage_sources} main/Result.cc add_executable(
b_manage ${manage_sources} main/Result.cc
reports/ReportConsole.cc reports/ReportExcel.cc reports/ReportExcelCompared.cc reports/ReportBase.cc reports/ExcelFile.cc reports/ReportConsole.cc reports/ReportExcel.cc reports/ReportExcelCompared.cc reports/ReportBase.cc reports/ExcelFile.cc
common/Datasets.cc common/Dataset.cc common/Datasets.cc common/Dataset.cc
) )

18
src/main/Models.h
View File

@@ -2,15 +2,15 @@
#define MODELS_H #define MODELS_H
#include <map> #include <map>
#include "BaseClassifier.h" #include "BaseClassifier.h"
#include "AODE.h" #include "ensembles/AODE.h"
#include "TAN.h" #include "ensembles/AODELd.h"
#include "KDB.h" #include "ensembles/BoostAODE.h"
#include "SPODE.h" #include "classifiers/TAN.h"
#include "TANLd.h" #include "classifiers/KDB.h"
#include "KDBLd.h" #include "classifiers/SPODE.h"
#include "SPODELd.h" #include "classifiers/TANLd.h"
#include "AODELd.h" #include "classifiers/KDBLd.h"
#include "BoostAODE.h" #include "classifiers/SPODELd.h"
#include "STree.h" #include "STree.h"
#include "ODTE.h" #include "ODTE.h"
#include "SVC.h" #include "SVC.h"

5
tests/CMakeLists.txt
View File

@@ -3,9 +3,10 @@ if(ENABLE_TESTING)
include_directories( include_directories(
${Platform_SOURCE_DIR}/src ${Platform_SOURCE_DIR}/src
${Platform_SOURCE_DIR}/lib/argparse/include ${Platform_SOURCE_DIR}/lib/argparse/include
${Platform_SOURCE_DIR}/lib/PyClassifiers/lib/BayesNet/lib/mdlp ${Platform_SOURCE_DIR}/lib/mdlp
${Platform_SOURCE_DIR}/lib/Files ${Platform_SOURCE_DIR}/lib/Files
${CMAKE_BINARY_DIR}/configured_files/include /usr/local/include/bayesnet
/usr/local/include/pyclassifiers
) )
set(TEST_SOURCES_PLATFORM TestUtils.cc TestPlatform.cc) set(TEST_SOURCES_PLATFORM TestUtils.cc TestPlatform.cc)
add_executable(${TEST_PLATFORM} ${TEST_SOURCES_PLATFORM}) add_executable(${TEST_PLATFORM} ${TEST_SOURCES_PLATFORM})

2
tests/TestPlatform.cc
View File

@@ -12,5 +12,5 @@
TEST_CASE("Test Python Classifiers score", "[PyClassifiers]") TEST_CASE("Test Python Classifiers score", "[PyClassifiers]")
{ {
std::string version = { project_version.begin(), project_version.end() }; std::string version = { project_version.begin(), project_version.end() };
REQUIRE(version == "1.0.2"); REQUIRE(version == "1.0.4");
} }