Skip to content
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

feature: knn kd tree fix for parallel #3007

Open
wants to merge 11 commits into
base: main
Choose a base branch
from
+176 −151
Open

feature: knn kd tree fix for parallel #3007

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8d103c1
minor fix and reordering
Alexandr-Solovev Dec 3, 2024
7cc577d
Merge branch 'uxlfoundation:main' into dev/asolovev_knn_fix
Alexandr-Solovev Dec 3, 2024
37f9ecd
minor fix
Alexandr-Solovev Dec 5, 2024
a943270
remove unused
Alexandr-Solovev Dec 5, 2024
696b5c4
minor fixes
Alexandr-Solovev Dec 10, 2024
4a0a329
Merge branch 'main' into dev/asolovev_knn_fix
Alexandr-Solovev Dec 11, 2024
24a904c
Merge branch 'uxlfoundation:main' into dev/asolovev_knn_fix
Alexandr-Solovev Dec 11, 2024
9d1c082
Merge branch 'uxlfoundation:main' into dev/asolovev_knn_fix
Alexandr-Solovev Dec 12, 2024
a5e7fd7
minor fixes
Alexandr-Solovev Dec 16, 2024
3436179
minor fixes
Alexandr-Solovev Dec 17, 2024
116d5cb
fixes
Alexandr-Solovev Dec 18, 2024
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
10 changes: 6 additions & 4 deletions ...gorithms/k_nearest_neighbors/kdtree_knn_classification_predict_dense_default_batch_impl.i
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,11 +145,15 @@ Status KNNClassificationPredictKernel<algorithmFpType, defaultDense, cpu>::compu

if (par3 == NULL) return Status(ErrorNullParameterNotSupported);

const Model * const model = static_cast<const Model *>(m);
const auto & kdTreeTable = *(model->impl()->getKDTreeTable());
const Model * const model = static_cast<const Model *>(m);
const KDTreeTable & kdTreeTable = *(model->impl()->getKDTreeTable());
const size_t xRowCount = x->getNumberOfRows();
const algorithmFpType base = 2.0;

const auto rootTreeNodeIndex = model->impl()->getRootNodeIndex();
const NumericTable & data = *(model->impl()->getData());
const NumericTable * labels = nullptr;

if (resultsToEvaluate != 0)
{
labels = model->impl()->getLabels().get();
Expand All @@ -164,8 +168,6 @@ Status KNNClassificationPredictKernel<algorithmFpType, defaultDense, cpu>::compu
}
const size_t heapSize = (iSize / 16 + 1) * 16;

const size_t xRowCount = x->getNumberOfRows();
const algorithmFpType base = 2.0;
const size_t expectedMaxDepth = (Math::sLog(xRowCount) / Math::sLog(base) + 1) * __KDTREE_DEPTH_MULTIPLICATION_FACTOR;
const size_t stackSize = Math::sPowx(base, Math::sCeil(Math::sLog(expectedMaxDepth) / Math::sLog(base)));
struct Local
Expand Down
Loading
Loading