Merge remote-tracking branch 'origin/main' into riedgar-ms/causal-freeze

microsoft · May 17, 2022 · 92c4174 · 92c4174
2 parents 3a7f91f + b982016
commit 92c4174
Show file tree

Hide file tree

Showing 27 changed files with 814 additions and 58 deletions.
diff --git a/.azure-devops/component-governance.yml b/.azure-devops/component-governance.yml
@@ -2,6 +2,7 @@
 
 trigger:
   - main
+  - postbuild
 
 pool:
   vmImage: "ubuntu-latest"

diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml
@@ -19,7 +19,7 @@ on:
   push:
     branches: [main]
   pull_request:
-    branches: [main]
+    branches: [main, postbuild]
   workflow_dispatch:
 
 jobs:

diff --git a/.github/workflows/Ci-raiwigets-python-typescript.yml b/.github/workflows/Ci-raiwigets-python-typescript.yml
@@ -45,8 +45,10 @@ jobs:
         run: yarn buildall
 
       - if: ${{ matrix.operatingSystem == 'macos-latest' }}
-        name: Use Homebrew to install libomp on MacOS for lightgbm
-        run: brew install https://publictestdatasets.blob.core.windows.net/data/libomp-11.1.0.catalina.bottle.tar.gz
+        name: Install latest numpy from conda-forge for MacOS
+        shell: bash -l {0}
+        run: |
+          conda install --yes --quiet -c conda-forge numpy
 
       - if: ${{ matrix.operatingSystem != 'macos-latest' }}
         name: Install pytorch on non-MacOS
@@ -60,6 +62,12 @@ jobs:
         run: |
           conda install --yes --quiet pytorch torchvision captum -c pytorch
 
+      - if: ${{ matrix.operatingSystem == 'macos-latest' }}
+        name: Install latest lightgbm from conda-forge for MacOS
+        shell: bash -l {0}
+        run: |
+          conda install --yes --quiet lightgbm -c conda-forge
+
       - name: Setup tools
         shell: bash -l {0}
         run: |

diff --git a/.github/workflows/GitHubPages.yml b/.github/workflows/GitHubPages.yml
@@ -4,7 +4,7 @@ on:
   push:
     branches: [main]
   pull_request:
-    branches: [main]
+    branches: [main, postbuild]
 
 jobs:
   website-build-and-deploy:

diff --git a/apps/dashboard/src/app/applications.ts b/apps/dashboard/src/app/applications.ts
@@ -28,6 +28,7 @@ import { breastCancerData } from "../interpret/__mock_data__/breastCancerData";
 import { ebmData } from "../interpret/__mock_data__/ebmData";
 import { ibmData } from "../interpret/__mock_data__/ibmData";
 import { ibmDataInconsistent } from "../interpret/__mock_data__/ibmDataInconsistent";
+import { ibmDataMissingValues } from "../interpret/__mock_data__/ibmDataMissingValues";
 import { ibmNoClass } from "../interpret/__mock_data__/ibmNoClass";
 import { irisData } from "../interpret/__mock_data__/irisData";
 import { irisDataNoLocal } from "../interpret/__mock_data__/irisDataNoLocal";
@@ -179,6 +180,7 @@ export const applications: IApplications = <const>{
       ebmData: { classDimension: 2, data: ebmData },
       ibmData: { classDimension: 2, data: ibmData },
       ibmDataInconsistent: { classDimension: 2, data: ibmDataInconsistent },
+      ibmDataMissingValues: { classDimension: 2, data: ibmDataMissingValues },
       ibmNoClass: { classDimension: 2, data: ibmNoClass },
       irisData: { classDimension: 3, data: irisData },
       irisDataNoLocal: { classDimension: 3, data: irisDataNoLocal },

diff --git a/apps/dashboard/src/fairness/utils.ts b/apps/dashboard/src/fairness/utils.ts
@@ -6,6 +6,7 @@ import {
   IMetricRequest,
   IMetricResponse
 } from "@responsible-ai/core-ui";
+import _ from "lodash";
 
 export const supportedBinaryClassificationPerformanceKeys = [
   "accuracy_score",
@@ -65,7 +66,7 @@ export function generateRandomMetrics(
   request: IMetricRequest,
   abortSignal?: AbortSignal
 ): Promise<IMetricResponse> {
-  const binSize = Math.max(...request.binVector);
+  const binSize = _.max(request.binVector) || 0;
   const bins: number[] = new Array(binSize + 1)
     .fill(0)
     .map(() => Math.random() / 3 + 0.33);