Skip to content

Commit

Permalink
Merge pull request #34 from oneapi-src/main
Browse files Browse the repository at this point in the history 
Pull changes from main
  • Loading branch information
@Vika-F
Vika-F authored Nov 26, 2024
2 parents c746a21 + 1bef482 commit 8ff36ed
Show file tree
Hide file tree
Showing 8 changed files with 257 additions and 53 deletions.
6 changes: 6 additions & 0 deletions cpp/oneapi/dal/algo/decision_forest/backend/gpu/train_helpers.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,12 @@ inline void merge_stat(Float& dst_count,
Float src_s2c) {
if (Float(0) == src_count)
return;
if (!dst_count) {
dst_count = src_count;
dst_mean = src_mean;
dst_s2c = src_s2c;
return;
}

Float sum_n1n2 = dst_count + src_count;
Float mul_n1n2 = dst_count * src_count;
Expand Down
7 changes: 2 additions & 5 deletions cpp/oneapi/dal/algo/kmeans/detail/infer_ops_dpc.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,10 @@ struct infer_ops_dispatcher<Policy, Float, Method, Task> {
template struct ONEDAL_EXPORT \
infer_ops_dispatcher<dal::detail::spmd_data_parallel_policy, F, M, T>;

#define INSTANTIATE_NON_DISTRIBUTED(F, M, T) \
template struct ONEDAL_EXPORT infer_ops_dispatcher<dal::detail::data_parallel_policy, F, M, T>;

INSTANTIATE(float, method::lloyd_dense, task::clustering)
INSTANTIATE(double, method::lloyd_dense, task::clustering)
INSTANTIATE_NON_DISTRIBUTED(float, method::lloyd_csr, task::clustering)
INSTANTIATE_NON_DISTRIBUTED(double, method::lloyd_csr, task::clustering)
INSTANTIATE(float, method::lloyd_csr, task::clustering)
INSTANTIATE(double, method::lloyd_csr, task::clustering)

} // namespace v1
} // namespace oneapi::dal::kmeans::detail
7 changes: 2 additions & 5 deletions cpp/oneapi/dal/algo/kmeans/detail/train_ops_dpc.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,10 @@ struct train_ops_dispatcher<Policy, Float, Method, Task> {
template struct ONEDAL_EXPORT \
train_ops_dispatcher<dal::detail::spmd_data_parallel_policy, F, M, T>;

#define INSTANTIATE_NON_DISTRIBUTED(F, M, T) \
template struct ONEDAL_EXPORT train_ops_dispatcher<dal::detail::data_parallel_policy, F, M, T>;

INSTANTIATE(float, method::lloyd_dense, task::clustering)
INSTANTIATE(double, method::lloyd_dense, task::clustering)
INSTANTIATE_NON_DISTRIBUTED(float, method::lloyd_csr, task::clustering)
INSTANTIATE_NON_DISTRIBUTED(double, method::lloyd_csr, task::clustering)
INSTANTIATE(float, method::lloyd_csr, task::clustering)
INSTANTIATE(double, method::lloyd_csr, task::clustering)

} // namespace v1
} // namespace oneapi::dal::kmeans::detail
3 changes: 2 additions & 1 deletion cpp/oneapi/dal/algo/linear_regression/test/batch.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,10 @@ TEMPLATE_LIST_TEST_M(lr_batch_test, "LR common flow", "[lr][batch]", lr_types) {
}

TEMPLATE_LIST_TEST_M(lr_batch_test, "LR with non-PSD matrix", "[lr][batch-nonpsd]", lr_types) {
SKIP_IF(this->non_psd_system_not_supported_on_device());
SKIP_IF(this->not_float64_friendly());

this->generate(777);

this->run_and_check_linear_indefinite();
this->run_and_check_linear_indefinite_multioutput();
}
Expand Down
78 changes: 39 additions & 39 deletions cpp/oneapi/dal/algo/linear_regression/test/fixture.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,6 @@ class lr_test : public te::crtp_algo_fixture<TestType, Derived> {
return static_cast<Derived*>(this);
}

bool non_psd_system_not_supported_on_device() {
return this->get_policy().is_gpu();
}

table compute_responses(const table& beta, const table& bias, const table& data) const {
const auto s_count = data.get_row_count();

Expand Down Expand Up @@ -299,18 +295,20 @@ class lr_test : public te::crtp_algo_fixture<TestType, Derived> {
here is not positive-definite, thus it has an infinite number of possible solutions. The
solution here is the one with minimum norm, which is typically more desirable. */
void run_and_check_linear_indefinite(double tol = 1e-3) {
const double X[] = { -0.98912135, -0.36778665, 1.28792526, 0.19397442, 0.9202309,
0.57710379, -0.63646365, 0.54195222, -0.31659545, -0.32238912,
0.09716732, -1.52593041, 1.1921661, -0.67108968, 1.00026942 };
const double y[] = { 0.13632112, 1.53203308, -0.65996941 };
const auto dtype =
std::is_same<float_t, double>::value ? data_type::float64 : data_type::float32;
const float_t X[] = { -0.98912135, -0.36778665, 1.28792526, 0.19397442, 0.9202309,
0.57710379, -0.63646365, 0.54195222, -0.31659545, -0.32238912,
0.09716732, -1.52593041, 1.1921661, -0.67108968, 1.00026942 };
const float_t y[] = { 0.13632112, 1.53203308, -0.65996941 };
auto X_tbl = oneapi::dal::detail::homogen_table_builder()
.set_data_type(data_type::float64)
.set_data_type(dtype)
.set_layout(data_layout::row_major)
.allocate(3, 5)
.copy_data(X, 3, 5)
.build();
auto y_tbl = oneapi::dal::detail::homogen_table_builder()
.set_data_type(data_type::float64)
.set_data_type(dtype)
.set_layout(data_layout::row_major)
.allocate(3, 1)
.copy_data(y, 3, 1)
Expand All @@ -321,20 +319,20 @@ class lr_test : public te::crtp_algo_fixture<TestType, Derived> {
const auto coefs = train_res.get_coefficients();

if (desc.get_result_options().test(result_options::intercept)) {
const double expected_beta[] = { 0.27785494,
0.53011669,
0.34352259,
0.40506216,
-1.26026447 };
const double expected_intercept[] = { 1.24485441 };
const float_t expected_beta[] = { 0.27785494,
0.53011669,
0.34352259,
0.40506216,
-1.26026447 };
const float_t expected_intercept[] = { 1.24485441 };
const auto expected_beta_tbl = oneapi::dal::detail::homogen_table_builder()
.set_data_type(data_type::float64)
.set_data_type(dtype)
.set_layout(data_layout::row_major)
.allocate(1, 5)
.copy_data(expected_beta, 1, 5)
.build();
const auto expected_intercept_tbl = oneapi::dal::detail::homogen_table_builder()
.set_data_type(data_type::float64)
.set_data_type(dtype)
.set_layout(data_layout::row_major)
.allocate(1, 1)
.copy_data(expected_intercept, 1, 1)
Expand All @@ -351,13 +349,13 @@ class lr_test : public te::crtp_algo_fixture<TestType, Derived> {
}

else {
const double expected_beta[] = { 0.38217445,
0.2732197,
1.87135517,
0.63458468,
-2.08473134 };
const float_t expected_beta[] = { 0.38217445,
0.2732197,
1.87135517,
0.63458468,
-2.08473134 };
const auto expected_beta_tbl = oneapi::dal::detail::homogen_table_builder()
.set_data_type(data_type::float64)
.set_data_type(dtype)
.set_layout(data_layout::row_major)
.allocate(1, 5)
.copy_data(expected_beta, 1, 5)
Expand All @@ -369,19 +367,21 @@ class lr_test : public te::crtp_algo_fixture<TestType, Derived> {
}

void run_and_check_linear_indefinite_multioutput(double tol = 1e-3) {
const double X[] = { -0.98912135, -0.36778665, 1.28792526, 0.19397442, 0.9202309,
0.57710379, -0.63646365, 0.54195222, -0.31659545, -0.32238912,
0.09716732, -1.52593041, 1.1921661, -0.67108968, 1.00026942 };
const double y[] = { 0.13632112, 1.53203308, -0.65996941,
-0.31179486, 0.33776913, -2.2074711 };
const auto dtype =
std::is_same<float_t, double>::value ? data_type::float64 : data_type::float32;
const float_t X[] = { -0.98912135, -0.36778665, 1.28792526, 0.19397442, 0.9202309,
0.57710379, -0.63646365, 0.54195222, -0.31659545, -0.32238912,
0.09716732, -1.52593041, 1.1921661, -0.67108968, 1.00026942 };
const float_t y[] = { 0.13632112, 1.53203308, -0.65996941,
-0.31179486, 0.33776913, -2.2074711 };
auto X_tbl = oneapi::dal::detail::homogen_table_builder()
.set_data_type(data_type::float64)
.set_data_type(dtype)
.set_layout(data_layout::row_major)
.allocate(3, 5)
.copy_data(X, 3, 5)
.build();
auto y_tbl = oneapi::dal::detail::homogen_table_builder()
.set_data_type(data_type::float64)
.set_data_type(dtype)
.set_layout(data_layout::row_major)
.allocate(3, 2)
.copy_data(y, 3, 2)
Expand All @@ -392,19 +392,19 @@ class lr_test : public te::crtp_algo_fixture<TestType, Derived> {
const auto coefs = train_res.get_coefficients();

if (desc.get_result_options().test(result_options::intercept)) {
const double expected_beta[] = {
const float_t expected_beta[] = {
-0.18692112, -0.20034801, -0.09590892, -0.13672683, 0.56229012,
-0.97006008, 1.39413595, 0.49238012, 1.11041239, -0.79213452,
};
const double expected_intercept[] = { -0.48964358, 0.96467681 };
const float_t expected_intercept[] = { -0.48964358, 0.96467681 };
const auto expected_beta_tbl = oneapi::dal::detail::homogen_table_builder()
.set_data_type(data_type::float64)
.set_data_type(dtype)
.set_layout(data_layout::row_major)
.allocate(2, 5)
.copy_data(expected_beta, 2, 5)
.build();
const auto expected_intercept_tbl = oneapi::dal::detail::homogen_table_builder()
.set_data_type(data_type::float64)
.set_data_type(dtype)
.set_layout(data_layout::row_major)
.allocate(1, 2)
.copy_data(expected_intercept, 1, 2)
Expand All @@ -421,11 +421,11 @@ class lr_test : public te::crtp_algo_fixture<TestType, Derived> {
}

else {
const double expected_beta[] = { -0.22795353, -0.09930168, -0.69685744, -0.22700585,
0.88658098, -0.88921961, 1.19505839, 1.67634561,
1.2882766, -1.43103981 };
const float_t expected_beta[] = { -0.22795353, -0.09930168, -0.69685744, -0.22700585,
0.88658098, -0.88921961, 1.19505839, 1.67634561,
1.2882766, -1.43103981 };
const auto expected_beta_tbl = oneapi::dal::detail::homogen_table_builder()
.set_data_type(data_type::float64)
.set_data_type(dtype)
.set_layout(data_layout::row_major)
.allocate(2, 5)
.copy_data(expected_beta, 2, 5)
Expand Down
Loading

0 comments on commit 8ff36ed

Please sign in to comment.