Complete configuration xlsxwriter is still with the old config

.gitignore

@@ -42,3 +42,4 @@ puml/**
 diagrams/html/**
 diagrams/latex/**
 .cache
+vcpkg_installed

.gitmodules

@@ -1,21 +0,0 @@
-[submodule "lib/catch2"]
-	path = lib/catch2
-	url = https://github.com/catchorg/Catch2.git
-[submodule "lib/argparse"]
-	path = lib/argparse
-	url = https://github.com/p-ranav/argparse
-[submodule "lib/json"]
-	path = lib/json
-	url = https://github.com/nlohmann/json
-[submodule "lib/libxlsxwriter"]
-	path = lib/libxlsxwriter
-	url = https://github.com/jmcnamara/libxlsxwriter.git
-[submodule "lib/folding"]
-	path = lib/folding
-	url = https://github.com/rmontanana/folding
-[submodule "lib/Files"]
-	path = lib/Files
-	url = https://github.com/rmontanana/ArffFiles
-[submodule "lib/mdlp"]
-	path = lib/mdlp
-	url = https://github.com/rmontanana/mdlp

CMakeLists.txt

@@ -7,11 +7,7 @@ project(Platform
   LANGUAGES CXX
 )
 
-find_package(Torch REQUIRED)
 
-if (POLICY CMP0135)
-  cmake_policy(SET CMP0135 NEW)
-endif ()
 
 # Global CMake variables
 # ----------------------
@@ -26,62 +22,69 @@ set(CMAKE_CXX_FLAGS_DEBUG " ${CMAKE_CXX_FLAGS} -fprofile-arcs -ftest-coverage -O
 
 # Options
 # -------
-option(ENABLE_CLANG_TIDY "Enable to add clang tidy."              OFF)
 option(ENABLE_TESTING "Unit testing build"                        OFF)
 option(CODE_COVERAGE "Collect coverage from test library"         OFF)
 
+# CMakes modules
+# --------------
+set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH})
+
 # MPI
 find_package(MPI REQUIRED)
 message("MPI_CXX_LIBRARIES=${MPI_CXX_LIBRARIES}")
 message("MPI_CXX_INCLUDE_DIRS=${MPI_CXX_INCLUDE_DIRS}")
 
 # Boost Library
+cmake_policy(SET CMP0135 NEW)
+cmake_policy(SET CMP0167 NEW) # For FindBoost
 set(Boost_USE_STATIC_LIBS OFF) 
 set(Boost_USE_MULTITHREADED ON)  
 set(Boost_USE_STATIC_RUNTIME OFF) 
+
 find_package(Boost 1.66.0 REQUIRED COMPONENTS python3 numpy3) 
+
+# # Python
+find_package(Python3 REQUIRED COMPONENTS Development)
+# # target_include_directories(MyTarget SYSTEM PRIVATE ${Python3_INCLUDE_DIRS})
+# message("Python_LIBRARIES=${Python_LIBRARIES}")
+
+# # Boost Python
+# find_package(boost_python${Python3_VERSION_MAJOR}${Python3_VERSION_MINOR} CONFIG REQUIRED COMPONENTS python${Python3_VERSION_MAJOR}${Python3_VERSION_MINOR})
+# # target_link_libraries(MyTarget PRIVATE Boost::python${Python3_VERSION_MAJOR}${Python3_VERSION_MINOR})
+
+
 if(Boost_FOUND)
     message("Boost_INCLUDE_DIRS=${Boost_INCLUDE_DIRS}")
+    message("Boost_LIBRARIES=${Boost_LIBRARIES}")
+    message("Boost_VERSION=${Boost_VERSION}")
     include_directories(${Boost_INCLUDE_DIRS}) 
 endif()
 
-# Python
-find_package(Python3 3.11 COMPONENTS Interpreter Development REQUIRED)
-message("Python3_LIBRARIES=${Python3_LIBRARIES}")
 
-# CMakes modules
-# --------------
-set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH})
-include(AddGitSubmodule)
-
-if (CODE_COVERAGE)
-    enable_testing()
-    include(CodeCoverage)
-    MESSAGE("Code coverage enabled")
-    SET(GCC_COVERAGE_LINK_FLAGS " ${GCC_COVERAGE_LINK_FLAGS} -lgcov --coverage")
-endif (CODE_COVERAGE)
-
-if (ENABLE_CLANG_TIDY)
-  include(StaticAnalyzers) # clang-tidy
-endif (ENABLE_CLANG_TIDY)
 
 # External libraries - dependencies of Platform
 # ---------------------------------------------
-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)
-message("XLSXWRITER_LIB=${XLSXWRITER_LIB}")
+# find_path(XLSXWRITER_INCLUDE_DIR xlsxwriter.h)
+# find_library(XLSXWRITER_LIBRARY xlsxwriter)
+# message("XLSXWRITER_INCLUDE_DIR=${XLSXWRITER_INCLUDE_DIR}")
+# message("XLSXWRITER_LIBRARY=${XLSXWRITER_LIBRARY}")
+find_package(Torch CONFIG REQUIRED)
+find_package(fimdlp CONFIG REQUIRED)
+find_package(folding CONFIG REQUIRED)
+find_package(argparse CONFIG REQUIRED)
+find_package(Boost REQUIRED COMPONENTS python)
+find_package(arff-files CONFIG REQUIRED)
+find_package(bayesnet CONFIG REQUIRED)
+find_package(ZLIB REQUIRED)
+find_library(LIBZIP_LIBRARY NAMES zip)
 
 find_library(PyClassifiers NAMES libPyClassifiers PyClassifiers libPyClassifiers.a PATHS ${Platform_SOURCE_DIR}/../lib/lib REQUIRED)
 find_path(PyClassifiers_INCLUDE_DIRS REQUIRED NAMES pyclassifiers PATHS ${Platform_SOURCE_DIR}/../lib/include)
-find_library(BayesNet NAMES libBayesNet BayesNet libBayesNet.a PATHS ${Platform_SOURCE_DIR}/../lib/lib REQUIRED)
-find_path(Bayesnet_INCLUDE_DIRS REQUIRED NAMES bayesnet PATHS ${Platform_SOURCE_DIR}/../lib/include)
 
 message(STATUS "PyClassifiers=${PyClassifiers}")
 message(STATUS "PyClassifiers_INCLUDE_DIRS=${PyClassifiers_INCLUDE_DIRS}")
-message(STATUS "BayesNet=${BayesNet}")
-message(STATUS "Bayesnet_INCLUDE_DIRS=${Bayesnet_INCLUDE_DIRS}")
 
 # Subdirectories
 # --------------
@@ -90,16 +93,20 @@ cmake_path(SET TEST_DATA_PATH "${CMAKE_CURRENT_SOURCE_DIR}/tests/data")
 configure_file(src/common/SourceData.h.in "${CMAKE_BINARY_DIR}/configured_files/include/SourceData.h")
 add_subdirectory(config)
 add_subdirectory(src)
-add_subdirectory(sample)
+# add_subdirectory(sample)
 file(GLOB Platform_SOURCES CONFIGURE_DEPENDS ${Platform_SOURCE_DIR}/src/*.cpp)
 
 # Testing
 # -------
 if (ENABLE_TESTING)
+  enable_testing()
   MESSAGE("Testing enabled")
-  if (NOT TARGET Catch2::Catch2)
+  find_package(Catch2 CONFIG REQUIRED)
-    add_git_submodule("lib/catch2")
-  endif (NOT TARGET Catch2::Catch2)
   include(CTest)
   add_subdirectory(tests)
 endif (ENABLE_TESTING)
+if (CODE_COVERAGE)
+    include(CodeCoverage)
+    MESSAGE("Code coverage enabled")
+    SET(GCC_COVERAGE_LINK_FLAGS " ${GCC_COVERAGE_LINK_FLAGS} -lgcov --coverage")
+endif (CODE_COVERAGE)

Makefile

@@ -1,9 +1,9 @@
 SHELL := /bin/bash
 .DEFAULT_GOAL := help
-.PHONY: coverage setup help build test clean debug release submodules buildr buildd install dependency testp testb clang-uml
+.PHONY: init clean coverage setup help build test clean debug release buildr buildd install dependency testp testb clang-uml
 
-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 b_results
 test_targets = unit_tests_platform
 
@@ -20,14 +20,22 @@ define ClearTests
 	fi ; 
 endef
 
+init: ## Initialize the project installing dependencies
+	@echo ">>> Installing dependencies"
+	@vcpkg install
+	@echo ">>> Done";
 
-sub-init: ## Initialize submodules
+clean: ## Clean the project
-	@git submodule update --init --recursive
+	@echo ">>> Cleaning the project..."
-
+	@if test -f CMakeCache.txt ; then echo "- Deleting CMakeCache.txt"; rm -f CMakeCache.txt; fi
-sub-update: ## Initialize submodules
+	@for folder in $(f_release) $(f_debug) vpcpkg_installed install_test ; do \
-	@git submodule update --remote --merge
+	if test -d "$$folder" ; then \
-	@git submodule foreach git pull origin master
+		echo "- Deleting $$folder folder" ; \
-
+		rm -rf "$$folder"; \
+	fi; \
+	done
+	$(call ClearTests)
+	@echo ">>> Done";
 setup: ## Install dependencies for tests and coverage
 	@if [ "$(shell uname)" = "Darwin" ]; then \
 		brew install gcovr; \
@@ -60,16 +68,11 @@ dependency: ## Create a dependency graph diagram of the project (build/dependenc
 	cd $(f_debug) && cmake .. --graphviz=dependency.dot && dot -Tpng dependency.dot -o dependency.png
 
 buildd: ## Build the debug targets
-	@cmake --build $(f_debug) -t $(app_targets) PlatformSample --parallel
+	@cmake --build $(f_debug) -t $(app_targets) PlatformSample --parallel 
 
 buildr: ## Build the release targets
 	@cmake --build $(f_release) -t $(app_targets) --parallel
 
-clean: ## Clean the tests info
-	@echo ">>> Cleaning Debug Platform tests...";
-	$(call ClearTests)
-	@echo ">>> Done";
-
 clang-uml: ## Create uml class and sequence diagrams
 	clang-uml -p --add-compile-flag -I /usr/lib/gcc/x86_64-redhat-linux/8/include/
 
@@ -77,14 +80,14 @@ debug: ## Build a debug version of the project
 	@echo ">>> Building Debug Platform...";
 	@if [ -d ./$(f_debug) ]; then rm -rf ./$(f_debug); fi
 	@mkdir $(f_debug); 
-	@cmake -S . -B $(f_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 -D CMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake
 	@echo ">>> Done";
 
 release: ## Build a Release version of the project
 	@echo ">>> Building Release Platform...";
 	@if [ -d ./$(f_release) ]; then rm -rf ./$(f_release); fi
 	@mkdir $(f_release); 
-	@cmake -S . -B $(f_release) -D CMAKE_BUILD_TYPE=Release
+	@cmake -S . -B $(f_release) -D CMAKE_BUILD_TYPE=Release -D CMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake
 	@echo ">>> Done";	
 
 opt = ""

remove_submodules.sh

@@ -0,0 +1,14 @@
+git config --file .gitmodules --get-regexp path | awk '{ print $2 }' | while read line; do
+    echo "Removing $line"
+    # Deinit the submodule
+    git submodule deinit -f "$line"
+    
+    # Remove the submodule from the working tree
+    git rm -f "$line"
+    
+    # Remove the submodule from .git/modules
+    rm -rf ".git/modules/$line"
+done
+
+# Remove the .gitmodules file
+git rm -f .gitmodules

sample/CMakeLists.txt

@@ -1,15 +1,11 @@
 include_directories(
+    ${TORCH_INCLUDE_DIRS}
     ${Platform_SOURCE_DIR}/src/common
     ${Platform_SOURCE_DIR}/src/main
     ${Python3_INCLUDE_DIRS}
-    ${Platform_SOURCE_DIR}/lib/Files
-    ${Platform_SOURCE_DIR}/lib/mdlp/src
-    ${Platform_SOURCE_DIR}/lib/argparse/include
-    ${Platform_SOURCE_DIR}/lib/folding
-    ${Platform_SOURCE_DIR}/lib/json/include
     ${CMAKE_BINARY_DIR}/configured_files/include
     ${PyClassifiers_INCLUDE_DIRS}
-    ${Bayesnet_INCLUDE_DIRS}
+    ${bayesnet_INCLUDE_DIRS}
 )
 add_executable(PlatformSample sample.cpp ${Platform_SOURCE_DIR}/src/main/Models.cpp) 
-target_link_libraries(PlatformSample "${PyClassifiers}" "${BayesNet}" fimdlp ${Python3_LIBRARIES} "${TORCH_LIBRARIES}" ${LIBTORCH_PYTHON} Boost::python Boost::numpy)
+target_link_libraries(PlatformSample "${PyClassifiers}" "${BayesNet}" fimdlp ${Python3_LIBRARIES} "${TORCH_LIBRARIES}" ${LIBTORCH_PYTHON} ${Boost_LIBRARIES})

src/CMakeLists.txt

@@ -1,12 +1,5 @@
 include_directories(
     ## Libs
-    ${Platform_SOURCE_DIR}/lib/log
-    ${Platform_SOURCE_DIR}/lib/Files
-    ${Platform_SOURCE_DIR}/lib/folding
-    ${Platform_SOURCE_DIR}/lib/mdlp/src
-    ${Platform_SOURCE_DIR}/lib/argparse/include
-    ${Platform_SOURCE_DIR}/lib/json/include
-    ${Platform_SOURCE_DIR}/lib/libxlsxwriter/include
     ${Python3_INCLUDE_DIRS}
     ${MPI_CXX_INCLUDE_DIRS}
     ${TORCH_INCLUDE_DIRS}
@@ -29,7 +22,7 @@ add_executable(
     experimental_clfs/XA1DE.cpp
     experimental_clfs/ExpClf.cpp
 )
-target_link_libraries(b_best Boost::boost "${PyClassifiers}" "${BayesNet}" fimdlp ${Python3_LIBRARIES} "${TORCH_LIBRARIES}" ${LIBTORCH_PYTHON} Boost::python Boost::numpy "${XLSXWRITER_LIB}")
+target_link_libraries(b_best Boost::boost "${PyClassifiers}" bayesnet::bayesnet fimdlp ${Python3_LIBRARIES} "${TORCH_LIBRARIES}" Boost::python Boost::numpy "${XLSXWRITER_LIB}")
 
 # b_grid
 set(grid_sources GridSearch.cpp GridData.cpp GridExperiment.cpp GridBase.cpp )
@@ -42,7 +35,7 @@ add_executable(b_grid commands/b_grid.cpp ${grid_sources}
     experimental_clfs/XA1DE.cpp
     experimental_clfs/ExpClf.cpp
 )
-target_link_libraries(b_grid ${MPI_CXX_LIBRARIES} "${PyClassifiers}" "${BayesNet}" fimdlp ${Python3_LIBRARIES} "${TORCH_LIBRARIES}" ${LIBTORCH_PYTHON} Boost::python Boost::numpy)
+target_link_libraries(b_grid ${MPI_CXX_LIBRARIES} "${PyClassifiers}" bayesnet::bayesnet fimdlp ${Python3_LIBRARIES} "${TORCH_LIBRARIES}" ${LIBTORCH_PYTHON} Boost::python Boost::numpy)
 
 # b_list
 add_executable(b_list commands/b_list.cpp
@@ -53,7 +46,7 @@ add_executable(b_list commands/b_list.cpp
     experimental_clfs/XA1DE.cpp
     experimental_clfs/ExpClf.cpp
 )
-target_link_libraries(b_list "${PyClassifiers}" "${BayesNet}" fimdlp ${Python3_LIBRARIES} "${TORCH_LIBRARIES}" ${LIBTORCH_PYTHON} Boost::python Boost::numpy "${XLSXWRITER_LIB}")
+target_link_libraries(b_list "${PyClassifiers}" bayesnet::bayesnet fimdlp ${Python3_LIBRARIES} "${TORCH_LIBRARIES}" ${LIBTORCH_PYTHON} Boost::python Boost::numpy "${XLSXWRITER_LIB}")
 
 # b_main
 set(main_sources Experiment.cpp Models.cpp HyperParameters.cpp Scores.cpp ArgumentsExperiment.cpp)
@@ -65,7 +58,7 @@ add_executable(b_main commands/b_main.cpp ${main_sources}
     experimental_clfs/XA1DE.cpp
     experimental_clfs/ExpClf.cpp
 )
-target_link_libraries(b_main "${PyClassifiers}" "${BayesNet}" fimdlp ${Python3_LIBRARIES} "${TORCH_LIBRARIES}" ${LIBTORCH_PYTHON} Boost::python Boost::numpy)
+target_link_libraries(b_main "${PyClassifiers}" bayesnet::bayesnet fimdlp ${Python3_LIBRARIES} "${TORCH_LIBRARIES}" ${LIBTORCH_PYTHON} Boost::python Boost::numpy)
 
 # b_manage
 set(manage_sources ManageScreen.cpp OptionsMenu.cpp ResultsManager.cpp)
@@ -77,7 +70,7 @@ add_executable(
     results/Result.cpp results/ResultsDataset.cpp results/ResultsDatasetConsole.cpp
     main/Scores.cpp
 )
-target_link_libraries(b_manage "${TORCH_LIBRARIES}" "${XLSXWRITER_LIB}" fimdlp "${BayesNet}")
+target_link_libraries(b_manage "${TORCH_LIBRARIES}" "${XLSXWRITER_LIB}" fimdlp bayesnet::bayesnet)
 
 # b_results
 add_executable(b_results commands/b_results.cpp)

src/common/Dataset.cpp

@@ -1,4 +1,4 @@
-#include <ArffFiles.hpp>
+#include <ArffFiles/ArffFiles.hpp>
 #include <fstream>
 #include "Dataset.h"
 namespace platform {

vcpkg-configuration.json

@@ -0,0 +1,21 @@
+{
+  "default-registry": {
+    "kind": "git",
+    "baseline": "760bfd0c8d7c89ec640aec4df89418b7c2745605",
+    "repository": "https://github.com/microsoft/vcpkg"
+  },
+  "registries": [
+    {
+      "kind": "git",
+      "repository": "https://github.com/rmontanana/vcpkg-stash",
+      "baseline": "1ea69243c0e8b0de77c9d1dd6e1d7593ae7f3627",
+      "packages": [
+        "arff-files",
+        "bayesnet",
+        "fimdlp",
+        "folding",
+        "libtorch-bin"
+      ]
+    }
+  ]
+}

vcpkg.json

@@ -0,0 +1,48 @@
+  {
+    "name": "platform",
+    "version-string": "1.1.0",
+    "dependencies": [
+      "arff-files",
+      "nlohmann-json",
+      "fimdlp",
+      "libtorch-bin",
+      "folding",
+      "bayesnet",
+      "argparse",
+      "libxlsxwriter"
+    ],
+    "overrides": [
+      {
+        "name": "arff-files",
+        "version": "1.1.0"
+      },
+      {
+        "name": "fimdlp",
+        "version": "2.0.1"
+      },
+      {
+        "name": "libtorch-bin",
+        "version": "2.7.0"
+      },
+      {
+        "name": "bayesnet",
+        "version": "1.1.1"
+      },
+      {
+        "name": "folding",
+        "version": "1.1.1"
+      },
+      {
+        "name": "argpase",
+        "version": "3.2"
+      },
+      {
+        "name": "libxlsxwriter",
+        "version": "1.2.2"
+      },
+      {
+        "name": "nlohmann-json",
+        "version": "3.11.3"
+      }
+    ]
+  }