From 970c25b0574b1891f54d9f540731cd4a0032a0ef Mon Sep 17 00:00:00 2001 From: ShvetsKS <33296480+ShvetsKS@users.noreply.github.com> Date: Sun, 3 Nov 2019 11:16:29 +0300 Subject: [PATCH] fix one-algorithm build and spicific prediction case after probability feature (#177) --- .../df_classification_predict_dense_default_batch_impl.i | 5 +++-- makefile.lst | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/algorithms/kernel/dtrees/forest/classification/df_classification_predict_dense_default_batch_impl.i b/algorithms/kernel/dtrees/forest/classification/df_classification_predict_dense_default_batch_impl.i index 1e726c15e32..c0848812837 100755 --- a/algorithms/kernel/dtrees/forest/classification/df_classification_predict_dense_default_batch_impl.i +++ b/algorithms/kernel/dtrees/forest/classification/df_classification_predict_dense_default_batch_impl.i @@ -652,6 +652,7 @@ Status PredictClassificationTask::predictByBlocksOfTrees( DAAL_CHECK_BLOCK_STATUS(resBD); WriteOnlyRows probBD(_prob, 0, 1); DAAL_CHECK_BLOCK_STATUS(probBD); + algorithmFPType* const probBDPtr = probBD.get(); const size_t nThreads = daal::threader_get_threads_number(); daal::SafeStatus safeStat; @@ -671,9 +672,9 @@ Status PredictClassificationTask::predictByBlocksOfTrees( ReadRows xBD(const_cast(_data), iStartRow, nRowsToProcess); DAAL_CHECK_BLOCK_STATUS_THR(xBD); algorithmFPType* res = resBD.get() + iStartRow; - algorithmFPType* prob = probBD.get() + iStartRow * _nClasses; + algorithmFPType* prob = probBDPtr + iStartRow * _nClasses; - if(prob != nullptr) + if(probBDPtr != nullptr) { if(nRowsToProcess < 2 * nThreads || cpu == __avx512_mic__) { diff --git a/makefile.lst b/makefile.lst index c4cc829817f..5721acecf55 100755 --- a/makefile.lst +++ b/makefile.lst @@ -49,7 +49,7 @@ coordinate_descent += optimization_solver/coordinate_descent objective_function objective_function += objective_function/inner objective_function/cross_entropy_loss objective_function/cross_entropy_loss/inner objective_function/logistic_loss objective_function/logistic_loss/inner objective_function/mse objective_function/mse/inner decision_tree += decision_tree/inner regression classifier dtrees/gbt += dtrees dtrees/gbt/classification dtrees/gbt/classification/inner dtrees/gbt/regression engines classifier regression objective_function -dtrees/forest += dtrees dtrees/regression dtrees/forest/classification dtrees/forest/classification/inner dtrees/forest/regression engines classifier regression distributions +dtrees/forest += dtrees dtrees/regression dtrees/forest/classification dtrees/forest/classification/inner dtrees/forest/regression engines classifier classifier/inner regression distributions linear_regression += linear_model regression lasso_regression += linear_model regression optimization_solver objective_function engines ridge_regression += linear_model regression