From 2daf53802cf4150cc5aae74c6e9a8288d2571c3f Mon Sep 17 00:00:00 2001 From: Paul Koch Date: Fri, 17 Jan 2025 03:02:33 -0800 Subject: [PATCH] fix size_t conversion issue that was failing to build on some compilers in the sdist --- docs/benchmarks/ebm-benchmark.ipynb | 2 +- shared/libebm/PartitionMultiDimensionalCorner.cpp | 6 +++--- shared/libebm/tests/boosting_unusual_inputs.cpp | 5 +++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/docs/benchmarks/ebm-benchmark.ipynb b/docs/benchmarks/ebm-benchmark.ipynb index c07b32b01..6ab7f020e 100644 --- a/docs/benchmarks/ebm-benchmark.ipynb +++ b/docs/benchmarks/ebm-benchmark.ipynb @@ -17,7 +17,7 @@ "force_recreate = False\n", "exist_ok = True\n", "TIMEOUT_SEC = 60 * 60 * 24 * 180 # 180 days\n", - "wheel_filepaths = ['interpret_core-0.6.8-py3-none-any.whl', 'powerlift-0.1.12-py3-none-any.whl']\n", + "wheel_filepaths = ['interpret_core-0.6.9-py3-none-any.whl', 'powerlift-0.1.12-py3-none-any.whl']\n", "\n", "import datetime\n", "experiment_name = datetime.datetime.now().strftime('%Y_%m_%d_%H%M__') + 'myexperiment'\n", diff --git a/shared/libebm/PartitionMultiDimensionalCorner.cpp b/shared/libebm/PartitionMultiDimensionalCorner.cpp index 241a16862..b8b284dce 100644 --- a/shared/libebm/PartitionMultiDimensionalCorner.cpp +++ b/shared/libebm/PartitionMultiDimensionalCorner.cpp @@ -240,7 +240,7 @@ template class PartitionMultiDimensionalC } while(cRealDimensions != iDimInit); } - const size_t cTotalSamples = pTotal->GetCountSamples(); + const size_t cTotalSamples = static_cast(pTotal->GetCountSamples()); TensorSumDimension aDimensions[k_dynamicDimensions == cCompilerDimensions ? k_cDimensionsMax : cCompilerDimensions]; @@ -286,8 +286,8 @@ template class PartitionMultiDimensionalC #endif // NDEBUG ); - if(cSamplesLeafMin <= pTempBin->GetCountSamples()) { - const size_t cSamplesOther = cTotalSamples - pTempBin->GetCountSamples(); + if(cSamplesLeafMin <= static_cast(pTempBin->GetCountSamples())) { + const size_t cSamplesOther = cTotalSamples - static_cast(pTempBin->GetCountSamples()); if(cSamplesLeafMin <= cSamplesOther) { EBM_ASSERT(1 <= cScores); size_t iScore = 0; diff --git a/shared/libebm/tests/boosting_unusual_inputs.cpp b/shared/libebm/tests/boosting_unusual_inputs.cpp index 45099db7e..fb8dd423f 100644 --- a/shared/libebm/tests/boosting_unusual_inputs.cpp +++ b/shared/libebm/tests/boosting_unusual_inputs.cpp @@ -2289,7 +2289,8 @@ static double RandomizedTesting(const AccelerationFlags acceleration) { TermBoostFlags_PurifyUpdate, // TermBoostFlags_GradientSums, // does not return a metric TermBoostFlags_DisableNewtonUpdate, - TermBoostFlags_RandomSplits}; + TermBoostFlags_RandomSplits, + TermBoostFlags_Corners}; std::vector boostFlagsChoose{ TermBoostFlags_Default, TermBoostFlags_MissingLow, TermBoostFlags_MissingHigh, TermBoostFlags_MissingSeparate}; @@ -2367,7 +2368,7 @@ static double RandomizedTesting(const AccelerationFlags acceleration) { } TEST_CASE("stress test, boosting") { - const double expected = 12298977636064.098; + const double expected = 14219338182453.824; double validationMetricExact = RandomizedTesting(AccelerationFlags_NONE); CHECK(validationMetricExact == expected);