diff --git a/shared/libebm/CalcInteractionStrength.cpp b/shared/libebm/CalcInteractionStrength.cpp index e78112cfa..c6ee49d53 100644 --- a/shared/libebm/CalcInteractionStrength.cpp +++ b/shared/libebm/CalcInteractionStrength.cpp @@ -112,7 +112,6 @@ extern double PartitionMultiDimensionalFull(InteractionCore* const pInteractionC BinBase* aAuxiliaryBinsBase, BinBase* const aBinsBase); - // there is a race condition for decrementing this variable, but if a thread loses the // race then it just doesn't get decremented as quickly, which we can live with static int g_cLogCalcInteractionStrength = 10; diff --git a/shared/libebm/PartitionMultiDimensionalFull.cpp b/shared/libebm/PartitionMultiDimensionalFull.cpp index 9738aa0b0..fc90a3e75 100644 --- a/shared/libebm/PartitionMultiDimensionalFull.cpp +++ b/shared/libebm/PartitionMultiDimensionalFull.cpp @@ -35,8 +35,7 @@ template class PartitionMultiDimensionalF const FloatCalc regLambda, const FloatCalc deltaStepMax, BinBase* const aAuxiliaryBinsBase, - BinBase* const aBinsBase - ) { + BinBase* const aBinsBase) { auto* const aAuxiliaryBins = aAuxiliaryBinsBase ->Specialize(); @@ -46,7 +45,6 @@ template class PartitionMultiDimensionalF const size_t cScores = GET_COUNT_SCORES(cCompilerScores, pInteractionCore->GetCountScores()); const size_t cBytesPerBin = GetBinSize(true, true, bHessian, cScores); - Bin totalBin; static constexpr bool bUseStackMemory = k_dynamicScores != cCompilerScores; auto* const aTotalGradPair = bUseStackMemory ? totalBin.GetGradientPairs() : aAuxiliaryBins->GetGradientPairs(); @@ -103,28 +101,13 @@ template class PartitionMultiDimensionalF const FloatCalc regLambda, const FloatCalc deltaStepMax, BinBase* aAuxiliaryBinsBase, - BinBase* const aBinsBase - ) { + BinBase* const aBinsBase) { if(cPossibleScores == pInteractionCore->GetCountScores()) { - return PartitionMultiDimensionalFullInternal::Func(pInteractionCore, - cTensorBins, - flags, - regAlpha, - regLambda, - deltaStepMax, - aAuxiliaryBinsBase, - aBinsBase - ); + return PartitionMultiDimensionalFullInternal::Func( + pInteractionCore, cTensorBins, flags, regAlpha, regLambda, deltaStepMax, aAuxiliaryBinsBase, aBinsBase); } else { - return PartitionMultiDimensionalFullTarget::Func(pInteractionCore, - cTensorBins, - flags, - regAlpha, - regLambda, - deltaStepMax, - aAuxiliaryBinsBase, - aBinsBase - ); + return PartitionMultiDimensionalFullTarget::Func( + pInteractionCore, cTensorBins, flags, regAlpha, regLambda, deltaStepMax, aAuxiliaryBinsBase, aBinsBase); } } }; @@ -140,17 +123,9 @@ template class PartitionMultiDimensionalFullTarget::Func(pInteractionCore, - cTensorBins, - flags, - regAlpha, - regLambda, - deltaStepMax, - aAuxiliaryBinsBase, - aBinsBase - ); + BinBase* const aBinsBase) { + return PartitionMultiDimensionalFullInternal::Func( + pInteractionCore, cTensorBins, flags, regAlpha, regLambda, deltaStepMax, aAuxiliaryBinsBase, aBinsBase); } }; @@ -161,56 +136,27 @@ extern double PartitionMultiDimensionalFull(InteractionCore* const pInteractionC const FloatCalc regLambda, const FloatCalc deltaStepMax, BinBase* aAuxiliaryBinsBase, - BinBase* const aBinsBase -) { + BinBase* const aBinsBase) { const size_t cRuntimeScores = pInteractionCore->GetCountScores(); EBM_ASSERT(1 <= cRuntimeScores); if(pInteractionCore->IsHessian()) { if(size_t{1} != cRuntimeScores) { // muticlass - return PartitionMultiDimensionalFullTarget::Func(pInteractionCore, - cTensorBins, - flags, - regAlpha, - regLambda, - deltaStepMax, - aAuxiliaryBinsBase, - aBinsBase - ); + return PartitionMultiDimensionalFullTarget::Func( + pInteractionCore, cTensorBins, flags, regAlpha, regLambda, deltaStepMax, aAuxiliaryBinsBase, aBinsBase); } else { - return PartitionMultiDimensionalFullInternal::Func(pInteractionCore, - cTensorBins, - flags, - regAlpha, - regLambda, - deltaStepMax, - aAuxiliaryBinsBase, - aBinsBase - ); + return PartitionMultiDimensionalFullInternal::Func( + pInteractionCore, cTensorBins, flags, regAlpha, regLambda, deltaStepMax, aAuxiliaryBinsBase, aBinsBase); } } else { if(size_t{1} != cRuntimeScores) { // Odd: gradient multiclass. Allow it, but do not optimize for it - return PartitionMultiDimensionalFullInternal::Func(pInteractionCore, - cTensorBins, - flags, - regAlpha, - regLambda, - deltaStepMax, - aAuxiliaryBinsBase, - aBinsBase - ); + return PartitionMultiDimensionalFullInternal::Func( + pInteractionCore, cTensorBins, flags, regAlpha, regLambda, deltaStepMax, aAuxiliaryBinsBase, aBinsBase); } else { - return PartitionMultiDimensionalFullInternal::Func(pInteractionCore, - cTensorBins, - flags, - regAlpha, - regLambda, - deltaStepMax, - aAuxiliaryBinsBase, - aBinsBase - ); + return PartitionMultiDimensionalFullInternal::Func( + pInteractionCore, cTensorBins, flags, regAlpha, regLambda, deltaStepMax, aAuxiliaryBinsBase, aBinsBase); } } }