Skip to content

DataTable created and Trainer adjusted accordingly #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rdabra merged 2 commits into from
Mar 29, 2025
Merged

DataTable created and Trainer adjusted accordingly #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
14d6ca1
Organizing includes with IWYU
rdabra Mar 28, 2025
a3798a5
DataTable class created and Trainer adjusted accordingly
rdabra Mar 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions examples/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,22 @@ add_executable(txeo_tensors txeo_tensors.cpp)
add_executable(txeo_tensorio txeo_tensorio.cpp)
add_executable(txeo_olsGD txeo_olsGD.cpp)

target_precompile_headers(txeo_example PRIVATE
"$<$<COMPILE_LANGUAGE:CXX>:${CMAKE_SOURCE_DIR}/include/txeo/detail/pch.h>"
)
target_precompile_headers(txeo_shapes PRIVATE
"$<$<COMPILE_LANGUAGE:CXX>:${CMAKE_SOURCE_DIR}/include/txeo/detail/pch.h>"
)
target_precompile_headers(txeo_tensors PRIVATE
"$<$<COMPILE_LANGUAGE:CXX>:${CMAKE_SOURCE_DIR}/include/txeo/detail/pch.h>"
)
target_precompile_headers(txeo_tensorio PRIVATE
"$<$<COMPILE_LANGUAGE:CXX>:${CMAKE_SOURCE_DIR}/include/txeo/detail/pch.h>"
)
target_precompile_headers(txeo_olsGD PRIVATE
"$<$<COMPILE_LANGUAGE:CXX>:${CMAKE_SOURCE_DIR}/include/txeo/detail/pch.h>"
)

target_link_libraries(txeo_example txeo_shared)
target_link_libraries(txeo_shapes txeo_shared)
target_link_libraries(txeo_tensors txeo_shared)
Expand Down
42 changes: 26 additions & 16 deletions examples/txeo_example.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@

#include "txeo/DataTable.h"
#include "txeo/Loss.h"
#include "txeo/Matrix.h"
#include "txeo/MatrixIO.h"
Expand All @@ -24,6 +25,15 @@ using namespace tensorflow::ops;

int main() {

// txeo::Matrix<double> data(100, 5);
// txeo::DataTable<double> dt(data, {0, 1, 2}, {3, 4}, 30);

// std::cout << dt.x_eval()->row_size() << std::endl;

// txeo::Tensor<double> t;

// std::cout << t.shape().calculate_capacity() << std::endl;

// txeo::Matrix<double> X({{1.0}, {2.0}, {3.0}}); // 3x1
// txeo::Matrix<double> y({{3.0}, {5.0}, {7.0}}); // 3x1

Expand All @@ -46,26 +56,26 @@ int main() {

// Data downloaded at
// https://media.geeksforgeeks.org/wp-content/uploads/20240319120216/housing.csv
auto train_data =
txeo::MatrixIO::one_hot_encode_text_file("/home/roberto/Downloads/housing.csv", ',', true,
"/home/roberto/Downloads/housing_one_hot.csv");
// auto train_data =
// txeo::MatrixIO::one_hot_encode_text_file("/home/roberto/Downloads/housing.csv", ',', true,
// "/home/roberto/Downloads/housing_one_hot.csv");

auto x_train = txeo::TensorPart<double>::sub_matrix_cols_exclude(
train_data.read_text_file<double>(true), {8});
auto y_train =
txeo::TensorPart<double>::sub_matrix_cols(train_data.read_text_file<double>(true), {8});
// auto x_train = txeo::TensorPart<double>::sub_matrix_cols_exclude(
// train_data.read_text_file<double>(true), {8});
// auto y_train =
// txeo::TensorPart<double>::sub_matrix_cols(train_data.read_text_file<double>(true), {8});

x_train.normalize_columns(txeo::NormalizationType::MIN_MAX);
// x_train.normalize_columns(txeo::NormalizationType::MIN_MAX);

std::cout << "X: " << x_train.shape() << std::endl;
std::cout << "Y: " << y_train.shape() << std::endl;
// std::cout << "X: " << x_train.shape() << std::endl;
// std::cout << "Y: " << y_train.shape() << std::endl;

txeo::OlsGDTrainer<double> ols{x_train, y_train};
// txeo::OlsGDTrainer<double> ols{x_train, y_train};

ols.enable_variable_lr();
ols.fit(100, txeo::LossFunc::MAE);
// ols.enable_variable_lr();
// ols.fit(100, txeo::LossFunc::MAE);

std::cout << "Weight-Bias: " << ols.weight_bias() << std::endl;
std::cout << "Minimun loss: " << ols.min_loss() << std::endl;
std::cout << "min Y:" << txeo::TensorAgg<double>::reduce_min(y_train, {0})() << std::endl;
// std::cout << "Weight-Bias: " << ols.weight_bias() << std::endl;
// std::cout << "Minimun loss: " << ols.min_loss() << std::endl;
// std::cout << "min Y:" << txeo::TensorAgg<double>::reduce_min(y_train, {0})() << std::endl;
}
Loading