Merge branch 'develop' of github.com:interpretml/interpret into develop

interpretml · Nov 14, 2024 · 7b6416d · 7b6416d
2 parents 9b53328 + 37a2f1b
commit 7b6416d
Show file tree

Hide file tree

Showing 8 changed files with 532 additions and 521 deletions.
diff --git 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.4-py3-none-any.whl', 'powerlift-0.1.12-py3-none-any.whl']\n",
+    "wheel_filepaths = ['interpret_core-0.6.5-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",
@@ -859,7 +859,7 @@
     "        resource_group=resource_group,\n",
     "        pip_install=requirements + \" interpret-core\",\n",
     "        wheel_filepaths=wheel_filepaths,\n",
-    "        n_running_containers=n_containers\n",
+    "        n_instances=n_instances\n",
     "    )\n",
     "    benchmark.run(trial_runner, trial_filter, timeout=TIMEOUT_SEC, n_replicates=n_replicates, executor=executor)\n",
     "else:\n",

diff --git a/python/powerlift/powerlift/bench/benchmark.py b/python/powerlift/powerlift/bench/benchmark.py
@@ -152,6 +152,7 @@ def run(
         # Run trials
         if executor is None:
             from powerlift.executors import LocalMachine
+
             executor = LocalMachine(self._store)
         self._executors.add(executor)
         executor.submit(experiment_id, timeout=timeout)

diff --git a/shared/libebm/GenerateTermUpdate.cpp b/shared/libebm/GenerateTermUpdate.cpp
@@ -321,100 +321,6 @@ static ErrorEbm BoostMultiDimensional(BoosterShell* const pBoosterShell,
 #endif // NDEBUG
    );
 
-   // permutation0
-   // gain_permute0
-   //   divs0
-   //   gain0
-   //     divs00
-   //     gain00
-   //       divs000
-   //       gain000
-   //       divs001
-   //       gain001
-   //     divs01
-   //     gain01
-   //       divs010
-   //       gain010
-   //       divs011
-   //       gain011
-   //   divs1
-   //   gain1
-   //     divs10
-   //     gain10
-   //       divs100
-   //       gain100
-   //       divs101
-   //       gain101
-   //     divs11
-   //     gain11
-   //       divs110
-   //       gain110
-   //       divs111
-   //       gain111
-   //---------------------------
-   // permutation1
-   // gain_permute1
-   //   divs0
-   //   gain0
-   //     divs00
-   //     gain00
-   //       divs000
-   //       gain000
-   //       divs001
-   //       gain001
-   //     divs01
-   //     gain01
-   //       divs010
-   //       gain010
-   //       divs011
-   //       gain011
-   //   divs1
-   //   gain1
-   //     divs10
-   //     gain10
-   //       divs100
-   //       gain100
-   //       divs101
-   //       gain101
-   //     divs11
-   //     gain11
-   //       divs110
-   //       gain110
-   //       divs111
-   //       gain111       *
-
-   // size_t aiDimensionPermutation[k_cDimensionsMax];
-   // for(unsigned int iDimensionInitialize = 0; iDimensionInitialize < cDimensions; ++iDimensionInitialize) {
-   //    aiDimensionPermutation[iDimensionInitialize] = iDimensionInitialize;
-   // }
-   // size_t aiDimensionPermutationBest[k_cDimensionsMax];
-
-   // DO this is a fixed length that we should make variable!
-   // size_t aDOSplits[1000000];
-   // size_t aDOSplitsBest[1000000];
-
-   // do {
-   //    size_t aiDimensions[k_cDimensionsMax];
-   //    memset(aiDimensions, 0, sizeof(aiDimensions[0]) * cDimensions));
-   //    while(true) {
-
-   //      EBM_ASSERT(0 == iDimension);
-   //      while(true) {
-   //         ++aiDimension[iDimension];
-   //         if(aiDimension[iDimension] !=
-   //               pTerms->GetFeatures()[aiDimensionPermutation[iDimension]].m_pFeature->m_cBins) {
-   //            break;
-   //         }
-   //         aiDimension[iDimension] = 0;
-   //         ++iDimension;
-   //         if(iDimension == cDimensions) {
-   //            goto move_next_permutation;
-   //         }
-   //      }
-   //   }
-   //   move_next_permutation:
-   //} while(std::next_permutation(aiDimensionPermutation, &aiDimensionPermutation[cDimensions]));
-
    double* aWeights = nullptr;
    double* pGradient = nullptr;
    double* pHessian = nullptr;
@@ -506,7 +412,6 @@ static ErrorEbm BoostMultiDimensional(BoosterShell* const pBoosterShell,
 
       size_t acPurifyBins[k_cDimensionsMax];
       size_t* pcPurifyBins = acPurifyBins;
-      const size_t* const pcPurifyBinsEnd = &acPurifyBins[pTerm->GetCountRealDimensions()];
       size_t cSurfaceBinsTotal = 0;
       iDimension = 0;
       do {
@@ -519,7 +424,7 @@ static ErrorEbm BoostMultiDimensional(BoosterShell* const pBoosterShell,
             ++pcPurifyBins;
          }
          ++iDimension;
-      } while(pcPurifyBinsEnd != pcPurifyBins);
+      } while(pTerm->GetCountDimensions() != iDimension);
 
       constexpr double tolerance = 0.0; // TODO: for now purify to the max, but test tolerances and profile them