Sync master into develop. Triggered by PR (#1407)

* Allow region_layer_map json to be loaded into BrainModel during commitment (#1314) * Add load_region_layer_map_from_json * Cleaned up load_region_layer_map_json function and added error handling. * Replaced print with logging * Recommended fix: - logger - Path instead of OS - Avoid cwd * Recommended fix: - logger - Path instead of OS - Avoid cwd * Layer Mapping Orchestrator (build:114) (#1399) * Add region_layer_map directories with .gitkeep for models: resnet18_imagenet_full resnet34_imagenet_full resnet50_imagenet_full * Add resnet18_imagenet_full.json to region_layer_map for model resnet18_imagenet_full * Add resnet34_imagenet_full.json to region_layer_map for model resnet34_imagenet_full * Add resnet50_imagenet_full.json to region_layer_map for model resnet50_imagenet_full * Delete brainscore_vision/models/scaling_models/region_layer_map/.gitkeep --------- Co-authored-by: Jenkins <[email protected]> Co-authored-by: Kartik Pradeepan <[email protected]> * Add layer-mapping workflow to trigger Jenkins (#1361) * Create map_new_plugins workflow * Create map_new_plugins workflow --------- Co-authored-by: Katherine Fairchild <[email protected]> Co-authored-by: Jenkins <[email protected]>
brain-score · Oct 30, 2024 · 17addcd · 17addcd
1 parent 6babacc
commit 17addcd
Showing 1 changed file with 144 additions and 0 deletions.
diff --git a/.github/workflows/map_new_plugins.yml b/.github/workflows/map_new_plugins.yml
@@ -0,0 +1,144 @@
+name: Perform layer mapping
+
+
+# THIS WORKFLOW ONLY WORKS WHEN NEW_MODEL CHANGES ARE MADE. BENCHMARKS ARE NOT SUPPORTED
+
+on:
+  pull_request_target:
+    branches:
+      - master
+    types: [opened, synchronize, reopened, labeled]
+
+jobs:
+  # Trigger Layer Mapping only on web_submissions OR if trigger-mapping label is added to PR
+  trigger_layer_mapping:
+    name: Trigger Layer Mapping
+    runs-on: ubuntu-latest
+    if: |
+      (
+        (
+          startsWith(github.head_ref, 'web_submission_') &&
+          endsWith(github.head_ref, '/add_plugins')
+        )
+        || contains(github.event.pull_request.labels.*.name, 'trigger-mapping')
+      )
+    steps:
+      # Check if Plugins Unit test has passed
+      - name: Wait for plugin unit test checks
+        uses: lewagon/[email protected]
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+          check-name: 'Brain-Score Plugins Unit tests (AWS Jenkins, AWS Execution)'
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          wait-interval: 15
+
+      # Check if Non-Plugin Unit test has passed
+      - name: Wait for non-plugin unit test checks
+        uses: lewagon/[email protected]
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+          check-name: 'Brain-Score Plugins Unit tests (AWS Jenkins, AWS Execution)'
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          wait-interval: 15
+
+      # Check out PR head
+      - name: Check out repository code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.head_ref }}
+          fetch-depth: 0
+
+      # Set up Python 3.11 because we are using some brainscore_core functions
+      - name: Set up Python 3.11
+        uses: actions/setup-python@v4
+        with:
+          python-version: 3.11
+
+      # Install dependencies
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip setuptools
+          python -m pip install ".[test]"
+
+      # Get a list of changed files. `score_new_plugins.yml` version was not working on my forked branch
+      # because it was always comparing to origin/masster. Can revert back to score version of this step
+      - name: Get Changed Files
+        id: changed_files
+        uses: actions/github-script@v6
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            const prNumber = ${{ github.event.number }};
+            const { data: files } = await github.rest.pulls.listFiles({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              pull_number: prNumber,
+              per_page: 100,
+            });
+            const changedFiles = files.map(f => f.filename).join(' ');
+            core.setOutput('files', changedFiles);
+
+      # Store changed files as a variable
+      - name: Set CHANGED_FILES
+        run: |
+          echo "CHANGED_FILES=${{ steps.changed_files.outputs.files }}" >> $GITHUB_ENV
+
+      # Parse changes for relevant information
+      - name: Get plugin info
+        id: getplugininfo
+        run: |
+          set -e
+          # Execute the Python script and capture the JSON output
+          PLUGIN_INFO=$(python -c "from brainscore_core.plugin_management.parse_plugin_changes import get_scoring_info; get_scoring_info('${{ env.CHANGED_FILES }}', 'brainscore_vision')")
+          # Set the output correctly without extra quotes
+          echo "PLUGIN_INFO=$PLUGIN_INFO" >> $GITHUB_OUTPUT
+          # Debug output to verify
+          echo "PLUGIN_INFO is $PLUGIN_INFO"
+
+      # Extract run_score and store in RUN_MAPPING
+      - name: Check if layer mapping needed
+        id: mappingneeded
+        run: |
+          RUN_MAPPING=$(echo '${{ steps.getplugininfo.outputs.PLUGIN_INFO }}' | jq -r '.run_score')
+          echo "RUN_MAPPING=$RUN_MAPPING" >> $GITHUB_OUTPUT
+          echo "RUN_MAPPING is $RUN_MAPPING"
+
+      # Extract list of new_models and the pr_number and store as env var
+      - name: Extract new_models and pr_number
+        run: |
+          set -e
+          PLUGIN_INFO="${PLUGIN_INFO}"
+          NEW_MODELS=$(echo '${{ steps.getplugininfo.outputs.PLUGIN_INFO }}' | jq -r '.new_models')
+          PR_NUMBER="${{ github.event.number }}"
+          echo "NEW_MODELS=$NEW_MODELS"
+          echo "PR_NUMBER=$PR_NUMBER"
+          echo "NEW_MODELS=$NEW_MODELS" >> $GITHUB_ENV
+          echo "PR_NUMBER=$PR_NUMBER" >> $GITHUB_ENV
+
+      # If new_models is not empty and run_mapping is true, trigger Jenkins with correct payload
+      - name: Trigger Jenkins
+        if: ${{ steps.mappingneeded.outputs.RUN_MAPPING == 'True' && env.NEW_MODELS != '' }}
+        env:
+          JENKINS_USER: ${{ secrets.JENKINS_MAPPING_USER }}
+          JENKINS_USER_API: ${{ secrets.JENKINS_MAPPING_USER_API }}
+          JENKINS_TOKEN: ${{ secrets.JENKINS_MAPPING_TOKEN }}
+          JENKINS_TRIGGER: ${{ secrets.JENKINS_MAPPING_URL }}
+          # Relevant parameters for the Jenkins job
+          NEW_MODELS: ${{ env.NEW_MODELS }}
+          SOURCE_REPO: ${{ github.event.pull_request.head.repo.clone_url }}
+          SOURCE_BRANCH: ${{ github.head_ref }}
+          PR_NUMBER: ${{ env.PR_NUMBER }}
+        run: |
+          if [[ -z "$JENKINS_TRIGGER" || -z "$JENKINS_USER" || -z "$JENKINS_USER_API" || -z "$JENKINS_TOKEN" ]]; then
+            echo "One or more Jenkins environment variables are empty. Aborting."
+            exit 1
+          fi
+      
+          curl -X POST "$JENKINS_TRIGGER" \
+            --user "$JENKINS_USER:$JENKINS_USER_API" \
+            --data-urlencode "NEW_MODELS=$NEW_MODELS" \
+            --data-urlencode "PR_NUMBER=$PR_NUMBER" \
+            --data-urlencode "SOURCE_REPO=$SOURCE_REPO" \
+            --data-urlencode "SOURCE_BRANCH=$SOURCE_BRANCH" \
+            --data-urlencode "TOKEN=$JENKINS_TOKEN"
+