Merge branch 'main' into romanlutz/heatmap_fix

microsoft · Aug 2, 2023 · 6566cee · 6566cee
2 parents 9293a56 + e68fde8
commit 6566cee
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 29 deletions.
diff --git a/.github/workflows/CI-e2e-notebooks.yml b/.github/workflows/CI-e2e-notebooks.yml
@@ -47,7 +47,7 @@ jobs:
       matrix:
         # TODO: add macos
         operatingSystem: [ubuntu-latest, windows-latest]
-        pythonVersion: [3.6, 3.7, 3.8, 3.9, "3.10"]
+        pythonVersion: [3.8, 3.9, "3.10"]
         flights: ["", "dataBalanceExperience"]
         notebookGroup: ["nb_group_1", "nb_group_2"]
 

diff --git a/libs/e2e/src/lib/describer/modelAssessment/datasets/DiabetesDecisionMaking.ts b/libs/e2e/src/lib/describer/modelAssessment/datasets/DiabetesDecisionMaking.ts
@@ -44,64 +44,64 @@ export const DiabetesDecisionMaking = {
     initialCohorts: [
       {
         metrics: {
-          meanAbsoluteError: "43.363",
-          meanPrediction: "154.102",
-          meanSquaredError: "2 981.101"
+          meanAbsoluteError: "43.324",
+          meanPrediction: "154.043",
+          meanSquaredError: "2 983.258"
         },
         name: "All data",
         sampleSize: "89"
       },
       {
         metrics: {
-          meanAbsoluteError: "51.611",
-          meanPrediction: "196.629",
-          meanSquaredError: "4 014.697"
+          meanAbsoluteError: "51.629",
+          meanPrediction: "196.622",
+          meanSquaredError: "4 018.715"
         },
         name: "Cohort Age and BMI",
         sampleSize: "38"
       },
       {
         metrics: {
-          meanAbsoluteError: "49.176",
+          meanAbsoluteError: "49.167",
           meanPrediction: "142.495",
-          meanSquaredError: "3 829.201"
+          meanSquaredError: "3 839.796"
         },
         name: "Cohort Index",
         sampleSize: "20"
       },
       {
         metrics: {
-          meanAbsoluteError: "40.867",
-          meanPrediction: "115.086",
-          meanSquaredError: "2 416.75"
+          meanAbsoluteError: "40.124",
+          meanPrediction: "116.04",
+          meanSquaredError: "2 374.166"
         },
         name: "Cohort Predicted Y",
-        sampleSize: "51"
+        sampleSize: "52"
       },
       {
         metrics: {
-          meanAbsoluteError: "43.044",
-          meanPrediction: "155.306",
-          meanSquaredError: "2 972.126"
+          meanAbsoluteError: "42.988",
+          meanPrediction: "155.229",
+          meanSquaredError: "2 972.082"
         },
         name: "Cohort True Y",
         sampleSize: "87"
       },
       {
         metrics: {
-          meanAbsoluteError: "57.105",
-          meanPrediction: "157.301",
-          meanSquaredError: "4 154.723"
+          meanAbsoluteError: "57.108",
+          meanPrediction: "157.322",
+          meanSquaredError: "4 157.804"
         },
         name: "Cohort Regression Error",
         sampleSize: "63"
       }
     ],
     newCohort: {
       metrics: {
-        meanAbsoluteError: "43.841",
-        meanPrediction: "153.958",
-        meanSquaredError: "3 014.96"
+        meanAbsoluteError: "43.802",
+        meanPrediction: "153.898",
+        meanSquaredError: "3 017.141"
       },
       name: "CohortCreateE2E-diabetes",
       sampleSize: "88"

diff --git a/libs/e2e/src/lib/describer/modelAssessment/datasets/DiabetesRegressionModelDebugging.ts b/libs/e2e/src/lib/describer/modelAssessment/datasets/DiabetesRegressionModelDebugging.ts
@@ -47,19 +47,19 @@ export const DiabetesRegressionModelDebugging = {
     initialCohorts: [
       {
         metrics: {
-          meanAbsoluteError: "43.363",
-          meanPrediction: "154.102",
-          meanSquaredError: "2 981.101"
+          meanAbsoluteError: "43.324",
+          meanPrediction: "154.043",
+          meanSquaredError: "2 983.258"
         },
         name: "All data",
         sampleSize: "89"
       }
     ],
     newCohort: {
       metrics: {
-        meanAbsoluteError: "43.841",
-        meanPrediction: "153.958",
-        meanSquaredError: "3 014.96"
+        meanAbsoluteError: "43.802",
+        meanPrediction: "153.898",
+        meanSquaredError: "3 017.141"
       },
       name: "CohortCreateE2E-diabetes",
       sampleSize: "88"

diff --git a/responsibleai/requirements.txt b/responsibleai/requirements.txt
@@ -8,7 +8,7 @@ lightgbm>=2.0.11
 numpy>=1.17.2,<1.24.0
 numba<=0.55.2
 pandas>=0.25.1,<2.0.0
-scikit-learn>=0.22.1,<1.1 # See PR 1429 about upper bound
+scikit-learn>=0.22.1,!=1.1 # See PR 1429 about upper bound
 scipy>=1.4.1
 semver~=2.13.0
 ml-wrappers