fix one-algorithm build and spicific prediction case after probabilit…

…y feature (#177)
uxlfoundation · Nov 3, 2019 · 970c25b · 970c25b
1 parent 520798d
commit 970c25b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.../kernel/dtrees/forest/classification/df_classification_predict_dense_default_batch_impl.i b/.../kernel/dtrees/forest/classification/df_classification_predict_dense_default_batch_impl.i
@@ -652,6 +652,7 @@ Status PredictClassificationTask<algorithmFPType, cpu>::predictByBlocksOfTrees(
     DAAL_CHECK_BLOCK_STATUS(resBD);
     WriteOnlyRows<algorithmFPType, cpu> 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<algorithmFPType, cpu>::predictByBlocksOfTrees(
             ReadRows<algorithmFPType, cpu> xBD(const_cast<NumericTable*>(_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
@@ -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