Create build tasks
This commit is contained in:
parent
40ae4ad7f9
commit
db9e80a70e
@ -7,6 +7,7 @@ include_directories(${BayesNet_SOURCE_DIR}/lib/argparse/include)
|
|||||||
include_directories(${BayesNet_SOURCE_DIR}/lib/json/include)
|
include_directories(${BayesNet_SOURCE_DIR}/lib/json/include)
|
||||||
include_directories(${BayesNet_SOURCE_DIR}/lib/libxlsxwriter/include)
|
include_directories(${BayesNet_SOURCE_DIR}/lib/libxlsxwriter/include)
|
||||||
include_directories(${Python3_INCLUDE_DIRS})
|
include_directories(${Python3_INCLUDE_DIRS})
|
||||||
|
include_directories(${MPI_CXX_INCLUDE_DIRS})
|
||||||
|
|
||||||
add_executable(b_best b_best.cc BestResults.cc Result.cc Statistics.cc BestResultsExcel.cc ReportExcel.cc ReportBase.cc Datasets.cc Dataset.cc ExcelFile.cc)
|
add_executable(b_best b_best.cc BestResults.cc Result.cc Statistics.cc BestResultsExcel.cc ReportExcel.cc ReportBase.cc Datasets.cc Dataset.cc ExcelFile.cc)
|
||||||
add_executable(b_grid b_grid.cc GridSearch.cc GridData.cc HyperParameters.cc Folding.cc Datasets.cc Dataset.cc)
|
add_executable(b_grid b_grid.cc GridSearch.cc GridData.cc HyperParameters.cc Folding.cc Datasets.cc Dataset.cc)
|
||||||
@ -15,7 +16,7 @@ add_executable(b_main b_main.cc Folding.cc Experiment.cc Datasets.cc Dataset.cc
|
|||||||
add_executable(b_manage b_manage.cc Results.cc ManageResults.cc CommandParser.cc Result.cc ReportConsole.cc ReportExcel.cc ReportBase.cc Datasets.cc Dataset.cc ExcelFile.cc)
|
add_executable(b_manage b_manage.cc Results.cc ManageResults.cc CommandParser.cc Result.cc ReportConsole.cc ReportExcel.cc ReportBase.cc Datasets.cc Dataset.cc ExcelFile.cc)
|
||||||
|
|
||||||
target_link_libraries(b_best Boost::boost "${XLSXWRITER_LIB}" "${TORCH_LIBRARIES}" ArffFiles mdlp)
|
target_link_libraries(b_best Boost::boost "${XLSXWRITER_LIB}" "${TORCH_LIBRARIES}" ArffFiles mdlp)
|
||||||
target_link_libraries(b_grid BayesNet PyWrap)
|
target_link_libraries(b_grid BayesNet PyWrap ${MPI_CXX_LIBRARIES})
|
||||||
target_link_libraries(b_list ArffFiles mdlp "${TORCH_LIBRARIES}")
|
target_link_libraries(b_list ArffFiles mdlp "${TORCH_LIBRARIES}")
|
||||||
target_link_libraries(b_main BayesNet ArffFiles mdlp "${TORCH_LIBRARIES}" PyWrap)
|
target_link_libraries(b_main BayesNet ArffFiles mdlp "${TORCH_LIBRARIES}" PyWrap)
|
||||||
target_link_libraries(b_manage "${TORCH_LIBRARIES}" "${XLSXWRITER_LIB}" ArffFiles mdlp)
|
target_link_libraries(b_manage "${TORCH_LIBRARIES}" "${XLSXWRITER_LIB}" ArffFiles mdlp)
|
@ -63,6 +63,126 @@ namespace platform {
|
|||||||
return Colors::RESET();
|
return Colors::RESET();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
json GridSearch::buildTasks()
|
||||||
|
{
|
||||||
|
auto result = json::array();
|
||||||
|
auto datasets = Datasets(false, Paths::datasets());
|
||||||
|
auto datasets_names = datasets.getNames();
|
||||||
|
auto grid = GridData(Paths::grid_input(config.model));
|
||||||
|
for (const auto& dataset : datasets_names) {
|
||||||
|
for (const auto& seed : config.seeds) {
|
||||||
|
auto combinations = grid.getGrid(dataset);
|
||||||
|
for (const auto& hyperparam_line : combinations) {
|
||||||
|
auto hyperparameters = platform::HyperParameters(datasets.getNames(), hyperparam_line);
|
||||||
|
json task = {
|
||||||
|
{ "dataset", dataset },
|
||||||
|
{ "seed", seed },
|
||||||
|
{ "hyperparameters", hyperparameters.get(dataset) }
|
||||||
|
};
|
||||||
|
result.push_back(task);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
std::pair<int, int> GridSearch::partRange(int n_tasks, int nprocs, int rank)
|
||||||
|
{
|
||||||
|
int assigned = 0;
|
||||||
|
int remainder = n_tasks % nprocs;
|
||||||
|
int start = 0;
|
||||||
|
if (rank < remainder) {
|
||||||
|
assigned = n_tasks / nprocs + 1;
|
||||||
|
} else {
|
||||||
|
assigned = n_tasks / nprocs;
|
||||||
|
start = remainder;
|
||||||
|
}
|
||||||
|
start += rank * assigned;
|
||||||
|
int end = start + assigned;
|
||||||
|
if (rank == nprocs - 1) {
|
||||||
|
end = n_tasks;
|
||||||
|
}
|
||||||
|
return { start, end };
|
||||||
|
}
|
||||||
|
void GridSearch::go_MPI(struct ConfigMPI& config_mpi)
|
||||||
|
{
|
||||||
|
/*
|
||||||
|
* Manager will do the loops dataset, seed, fold (primary) and hyperparameter
|
||||||
|
* Workers will do the loop fold (nested)
|
||||||
|
*
|
||||||
|
* The overall process consists in these steps:
|
||||||
|
* 1. Manager will broadcast the tasks to all the processes
|
||||||
|
* 1.1 Broadcast the number of tasks
|
||||||
|
* 1.2 Broadcast the length of the following string
|
||||||
|
* 1.2 Broadcast the tasks as a char* string
|
||||||
|
* 2. Workers will receive the tasks and start the process
|
||||||
|
* 2.1 A method will tell each worker the range of combinations to process
|
||||||
|
* 2.2 Each worker will process the combinations and return the best score obtained
|
||||||
|
* 3. Manager gather the scores from all the workers and get the best hyperparameters
|
||||||
|
* 3.1 Manager find out which worker has the best score
|
||||||
|
* 3.2 Manager broadcast the winner worker
|
||||||
|
* 3.3 The winner worker send the best hyperparameters to manager
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
char* msg;
|
||||||
|
int tasks_size;
|
||||||
|
if (config_mpi.rank == config_mpi.manager) {
|
||||||
|
auto tasks = buildTasks();
|
||||||
|
auto tasks_str = tasks.dump();
|
||||||
|
tasks_size = tasks_str.size();
|
||||||
|
msg = new char[tasks_size + 1];
|
||||||
|
strcpy(msg, tasks_str.c_str());
|
||||||
|
}
|
||||||
|
//
|
||||||
|
// 1. Manager will broadcast the tasks to all the processes
|
||||||
|
//
|
||||||
|
MPI_Bcast(&tasks_size, 1, MPI_INT, config_mpi.manager, MPI_COMM_WORLD);
|
||||||
|
if (config_mpi.rank != config_mpi.manager) {
|
||||||
|
msg = new char[tasks_size + 1];
|
||||||
|
}
|
||||||
|
MPI_Bcast(msg, tasks_size + 1, MPI_CHAR, config_mpi.manager, MPI_COMM_WORLD);
|
||||||
|
json tasks = json::parse(msg);
|
||||||
|
delete[] msg;
|
||||||
|
//
|
||||||
|
// 2. All Workers will receive the tasks and start the process
|
||||||
|
//
|
||||||
|
int num_tasks = tasks.size();
|
||||||
|
auto [start, end] = partRange(num_tasks, config_mpi.n_procs, config_mpi.rank);
|
||||||
|
// 2.2 Each worker will process the combinations and return the best score obtained
|
||||||
|
for (int i = start; i < end; ++i) {
|
||||||
|
auto task = tasks[i];
|
||||||
|
auto dataset = task["dataset"].get<std::string>();
|
||||||
|
auto seed = task["seed"].get<int>();
|
||||||
|
auto hyperparam_line = task["hyperparameters"];
|
||||||
|
auto datasets = Datasets(config.discretize, Paths::datasets());
|
||||||
|
auto [X, y] = datasets.getTensors(dataset);
|
||||||
|
auto states = datasets.getStates(dataset);
|
||||||
|
auto features = datasets.getFeatures(dataset);
|
||||||
|
auto className = datasets.getClassName(dataset);
|
||||||
|
double bestScore = 0.0;
|
||||||
|
json bestHyperparameters;
|
||||||
|
// First level fold
|
||||||
|
Fold* fold;
|
||||||
|
if (config.stratified)
|
||||||
|
fold = new StratifiedKFold(config.n_folds, y, seed);
|
||||||
|
else
|
||||||
|
fold = new KFold(config.n_folds, y.size(0), seed);
|
||||||
|
for (int nfold = 0; nfold < config.n_folds; nfold++) {
|
||||||
|
|
||||||
|
auto clf = Models::instance()->create(config.model);
|
||||||
|
auto valid = clf->getValidHyperparameters();
|
||||||
|
hyperparameters.check(valid, dataset);
|
||||||
|
clf->setHyperparameters(hyperparameters.get(dataset));
|
||||||
|
auto [train, test] = fold->getFold(nfold);
|
||||||
|
auto train_t = torch::tensor(train);
|
||||||
|
auto test_t = torch::tensor(test);
|
||||||
|
auto X_train = X.index({ "...", train_t });
|
||||||
|
auto y_train = y.index({ train_t });
|
||||||
|
auto X_test = X.index({ "...", test
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
void GridSearch::go()
|
void GridSearch::go()
|
||||||
{
|
{
|
||||||
timer.start();
|
timer.start();
|
||||||
|
@ -26,12 +26,14 @@ namespace platform {
|
|||||||
};
|
};
|
||||||
struct ConfigMPI {
|
struct ConfigMPI {
|
||||||
int rank;
|
int rank;
|
||||||
int nprocs;
|
int n_procs;
|
||||||
}
|
int manager;
|
||||||
|
};
|
||||||
class GridSearch {
|
class GridSearch {
|
||||||
public:
|
public:
|
||||||
explicit GridSearch(struct ConfigGrid& config);
|
explicit GridSearch(struct ConfigGrid& config);
|
||||||
void go();
|
void go();
|
||||||
|
void go_MPI(struct ConfigMPI& config_mpi);
|
||||||
~GridSearch() = default;
|
~GridSearch() = default;
|
||||||
json getResults();
|
json getResults();
|
||||||
static inline std::string NO_CONTINUE() { return "NO_CONTINUE"; }
|
static inline std::string NO_CONTINUE() { return "NO_CONTINUE"; }
|
||||||
@ -42,6 +44,8 @@ namespace platform {
|
|||||||
pair<double, json> processFileSingle(std::string fileName, Datasets& datasets, std::vector<json>& combinations);
|
pair<double, json> processFileSingle(std::string fileName, Datasets& datasets, std::vector<json>& combinations);
|
||||||
pair<double, json> processFileNested(std::string fileName, Datasets& datasets, std::vector<json>& combinations);
|
pair<double, json> processFileNested(std::string fileName, Datasets& datasets, std::vector<json>& combinations);
|
||||||
struct ConfigGrid config;
|
struct ConfigGrid config;
|
||||||
|
pair<int, int> partRange(int n_tasks, int nprocs, int rank);
|
||||||
|
json buildTasks();
|
||||||
Timer timer; // used to measure the time of the whole process
|
Timer timer; // used to measure the time of the whole process
|
||||||
};
|
};
|
||||||
} /* namespace platform */
|
} /* namespace platform */
|
||||||
|
@ -2,6 +2,7 @@
|
|||||||
#include <argparse/argparse.hpp>
|
#include <argparse/argparse.hpp>
|
||||||
#include <map>
|
#include <map>
|
||||||
#include <nlohmann/json.hpp>
|
#include <nlohmann/json.hpp>
|
||||||
|
#include <mpi.h>
|
||||||
#include "DotEnv.h"
|
#include "DotEnv.h"
|
||||||
#include "Models.h"
|
#include "Models.h"
|
||||||
#include "modelRegister.h"
|
#include "modelRegister.h"
|
||||||
@ -164,7 +165,6 @@ int main(int argc, char** argv)
|
|||||||
argparse::ArgumentParser program("b_grid");
|
argparse::ArgumentParser program("b_grid");
|
||||||
manageArguments(program);
|
manageArguments(program);
|
||||||
struct platform::ConfigGrid config;
|
struct platform::ConfigGrid config;
|
||||||
struct platform::ConfigMPI mpi_config;
|
|
||||||
bool dump, compute;
|
bool dump, compute;
|
||||||
try {
|
try {
|
||||||
program.parse_args(argc, argv);
|
program.parse_args(argc, argv);
|
||||||
@ -213,11 +213,13 @@ int main(int argc, char** argv)
|
|||||||
} else {
|
} else {
|
||||||
if (compute) {
|
if (compute) {
|
||||||
if (program.get<bool>("mpi")) {
|
if (program.get<bool>("mpi")) {
|
||||||
MPI_Init(nullptr, nullptr);
|
struct platform::ConfigMPI mpi_config;
|
||||||
MPI_Comm_rank(MPI_COMM_WORLD, &config.rank);
|
mpi_config.manager = 0; // which process is the manager
|
||||||
MPI_Comm_size(MPI_COMM_WORLD, &config.size);
|
MPI_Init(&argc, &argv);
|
||||||
grid_search.go_mpi();
|
MPI_Comm_rank(MPI_COMM_WORLD, &mpi_config.rank);
|
||||||
MPI_Finzalize();
|
MPI_Comm_size(MPI_COMM_WORLD, &mpi_config.n_procs);
|
||||||
|
grid_search.go_MPI(mpi_config);
|
||||||
|
MPI_Finalize();
|
||||||
} else {
|
} else {
|
||||||
grid_search.go();
|
grid_search.go();
|
||||||
std::cout << "Process took " << timer.getDurationString() << std::endl;
|
std::cout << "Process took " << timer.getDurationString() << std::endl;
|
||||||
|
Loading…
Reference in New Issue
Block a user