Skip to content

Commit

Permalink
Merge branch 'dev' into milo/remove-orig-params-check
Browse files Browse the repository at this point in the history
  • Loading branch information
milocress authored Feb 14, 2024
2 parents 3139b5c + 83257c5 commit 03cbf4a
Show file tree
Hide file tree
Showing 258 changed files with 8,911 additions and 12,350 deletions.
2 changes: 0 additions & 2 deletions .ci/FILE_HEADER

This file was deleted.

4 changes: 2 additions & 2 deletions CODEOWNERS → .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
/composer/algorithms/ @mosaicml/composer-team-eng
/composer/cli/ @mosaicml/composer-team-eng
/composer/datasets/ @mosaicml/composer-team-eng
/composer/functional/ @mosaicml/composer-team-eng @dblalock
/composer/loggers/ @mosaicml/composer-team-eng @eracah @dakinggg
/composer/functional/ @mosaicml/composer-team-eng
/composer/loggers/ @mosaicml/composer-team-eng
/composer/loss/ @mosaicml/composer-team-eng
/composer/metrics/ @mosaicml/composer-team-eng
/composer/models/ @mosaicml/composer-team-eng
Expand Down
10 changes: 5 additions & 5 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

version: 2
updates:
- package-ecosystem: "pip" # See documentation for possible values
directory: "/" # Location of package manifests
schedule:
interval: "weekly"
open-pull-requests-limit: 5
- package-ecosystem: "pip" # See documentation for possible values
directory: "/" # Location of package manifests
schedule:
interval: "weekly"
open-pull-requests-limit: 5
52 changes: 20 additions & 32 deletions .github/workflows/code-quality.yaml
Original file line number Diff line number Diff line change
@@ -1,42 +1,30 @@
name: Code Quality Checks
on:
push:
branches:
- dev
- main
- release/**
pull_request:
workflow_call:
workflow_dispatch:
# Cancel old runs when a new commit is pushed to the same branch if not on main or dev
concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: ${{ github.ref != 'refs/heads/main' && github.ref != 'refs/heads/dev' }}
inputs:
python_version:
required: true
type: string
pip_deps:
required: true
type: string
defaults:
run:
working-directory: .
jobs:
code-quality:
runs-on: ubuntu-20.04
timeout-minutes: 10
strategy:
matrix:
python_version:
- "3.8"
- "3.9"
- "3.10"
pip_deps:
- "[dev]"
timeout-minutes: 15
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python_version }}
- name: Setup
run: |
set -ex
python -m pip install --upgrade 'pip<23' wheel
python -m pip install --upgrade .${{ matrix.pip_deps }}
- name: Run checks
run: |
pre-commit run --all-files
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: ${{ inputs.python_version }}
- name: Setup
run: |
set -ex
python -m pip install --upgrade 'pip<23' wheel
python -m pip install --upgrade .${{ inputs.pip_deps }}
- name: Run checks
run: |
pre-commit run --all-files
34 changes: 20 additions & 14 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ name: "CodeQL"

on:
push:
branches: [ dev, main ]
branches: [dev, main]
pull_request:
# The branches below must be a subset of the branches above
branches: [ dev, main ]
branches: [dev, main]
schedule:
- cron: '0 9 * * 1' # Every Monday at 09:00 (9:00 AM)
- cron: "0 9 * * 1" # Every Monday at 09:00 (9:00 AM)

jobs:
analyze:
Expand All @@ -32,9 +32,11 @@ jobs:
strategy:
fail-fast: false
matrix:
language: [ 'python' ]
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
# Learn more about CodeQL language support at https://git.io/codeql-language-support
language: ["python"]
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript',
# 'python', 'ruby' ]
# Learn more about CodeQL language support at
# https://git.io/codeql-language-support

steps:
- name: Checkout repository
Expand All @@ -45,24 +47,28 @@ jobs:
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
# If you wish to specify custom queries, you can do so here or in a
# config file.
# By default, queries listed here will override any specified in a
# config file.
# Prefix the list here with "+" to use these queries and those in the
# config file.
# queries: ./path/to/local/query, your-org/your-repo/queries@main

# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
# If this step fails, then you should remove it and run the build manually
# (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v2

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl

# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
# and modify them (or add more) to build your code if your project
# uses a compiled language
# ✏️ If the Autobuild fails above, remove it and uncomment the following
# three lines and modify them (or add more) to build your code if your
# project uses a compiled language

#- run: |
# - run: |
# make bootstrap
# make release

Expand Down
36 changes: 18 additions & 18 deletions .github/workflows/coverage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,23 @@ jobs:
timeout-minutes: 5
runs-on: ubuntu-latest
steps:
- name: Checkout Repo
uses: actions/checkout@v3
- name: Setup
run: |
set -ex
python -m pip install --upgrade 'pip<23' wheel
pip install coverage[toml]==6.5.0
- name: Download artifacts
uses: actions/download-artifact@v3
with:
path: ${{ inputs.download-path }}
- name: Generate coverage report
run: |
set -ex
- name: Checkout Repo
uses: actions/checkout@v3
- name: Setup
run: |
set -ex
python -m pip install --upgrade 'pip<23' wheel
pip install coverage[toml]==6.5.0
- name: Download artifacts
uses: actions/download-artifact@v3
with:
path: ${{ inputs.download-path }}
- name: Generate coverage report
run: |
set -ex
# Flatten the coverage files
ls ${{ inputs.download-path }} | while read x; do mv ${{ inputs.download-path }}/$x/.coverage .coverage.$x; done
# Flatten the coverage files
ls ${{ inputs.download-path }} | while read x; do mv ${{ inputs.download-path }}/$x/.coverage .coverage.$x; done
python -m coverage combine
python -m coverage report
python -m coverage combine
python -m coverage report
Loading

0 comments on commit 03cbf4a

Please sign in to comment.