Skip to content

Commit

Permalink
Merge branch 'main' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
Sameerk22 authored Aug 29, 2023
2 parents 8011ebf + 43f4291 commit 9fad0da
Show file tree
Hide file tree
Showing 605 changed files with 83,115 additions and 66,621 deletions.
31 changes: 31 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@

<!--
This template will help you to have a meaningful PR, please follow it and do not leave it blank.
-->

# PR Description

<!--
If there is no related issue, please add a short description about your PR.
-->

## Related Issue

<!--
Please use this format to link other issues with their numbers: Close #123
https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword
-->

Close #

## Checklist

- [ ] Did you add a function?
- [ ] Did you add the tests?
- [ ] Did you follow the steps we provided?

### Socials:

<!--
If you have Twitter, please provide it here otherwise just ignore this.
-->
2 changes: 1 addition & 1 deletion .github/workflows/array-api-det-coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@ jobs:
destination-repository-name: 'Mapping'
user-email: rashul.chutani@gmail.com
commit-message: Update Array API Tests Mapping
target-branch: master
target-branch: main
2 changes: 1 addition & 1 deletion .github/workflows/array-api-intelligent-tests-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:

- name: Determine Tests
run: |
git clone -b master https://github.com/unifyai/Mapping.git --depth 1
git clone -b main https://github.com/unifyai/Mapping.git --depth 1
pip install pydriller
cp Mapping/tests.pbz2 ivy/
cd ivy
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/array-api-intelligent-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ on:
workflow_dispatch:
push:
branches:
- 'master'
- 'main'
permissions:
actions: read
jobs:
Expand All @@ -29,7 +29,7 @@ jobs:
env:
SSH_DEPLOY_KEY: ${{ secrets.SSH_DEPLOY_KEY }}
run: |
source ./ivy/clone_mapping.sh master
source ./ivy/clone_mapping.sh main
pip install pydriller pymongo
cp Mapping/tests.pbz2 ivy/
cd ivy
Expand All @@ -39,7 +39,7 @@ jobs:
cd Mapping
git add .
git commit -m "Update Mapping"
git push origin master
git push origin main
continue-on-error: true

- name: Run Tests
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/auto-comment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
Here are some of the important points from our Contributing Guidelines 📝:
1. Feel free to ignore the \`run_tests (1)\`, \`run_tests (2)\`, … jobs, and only look at the \`display_test_results\` job. 👀 It contains the following two sections:
- **Combined Test Results:** This shows the results of all the ivy tests that ran on the PR. ✔️
- **New Failures Introduced:** This lists the tests that are passing on master, but fail on the PR Fork. Please try to make sure that there are no such tests. 💪
- **New Failures Introduced:** This lists the tests that are passing on main, but fail on the PR Fork. Please try to make sure that there are no such tests. 💪
2. The \`lint / Check formatting / check-formatting\` tests check for the formatting of your code. 📜 If it fails, please check the exact error message in the logs and fix the same. ⚠️🔧
3. Finally, the \`test-docstrings / run-docstring-tests\` check for the changes made in docstrings of the functions. This may be skipped, as well. 📚
Happy coding! 🎉👨‍💻`
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/det-test-coverage.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
name: determine-test-coverage
name: Determine Test Coverage
on:
workflow_dispatch:
schedule:
- cron: "30 20 * * 6"

permissions:
actions: read
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/dockerfile-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ name: Build Dockerfile

on:
push:
branches: [ "master" ]
branches: [ "main" ]
pull_request:
types: [labeled, review_requested]
branches: [ "master" ]
branches: [ "main" ]

jobs:

Expand Down
27 changes: 27 additions & 0 deletions .github/workflows/dockerfile-multicuda-push.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: Dockerfile MultiCUDA Push

on:
schedule:
- cron: '0 0 * * *'
workflow_dispatch:

jobs:

build:
runs-on: ubuntu-latest-4-cores

steps:
- name: Checkout 🛎 Ivy
uses: actions/checkout@v3

- name: Login to Docker Hub
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}


- name: Build and push Dockerfile
run: |
docker build --progress=plain --no-cache -t unifyai/multicuda:base_and_requirements -f docker/DockerfileGPUMultiCuda .
docker push unifyai/multicuda:base_and_requirements
20 changes: 0 additions & 20 deletions .github/workflows/dockerfilegpu-image.yml

This file was deleted.

31 changes: 0 additions & 31 deletions .github/workflows/dockerfilegpu-push.yml

This file was deleted.

4 changes: 2 additions & 2 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ on:
workflow_call:
push:
branches:
- master
- main
tags:
- v*
workflow_dispatch:

jobs:
update-docs:
name: Update docs
uses: unifyai/workflows/.github/workflows/docs.yml@master
uses: unifyai/workflows/.github/workflows/docs.yml@main
secrets: inherit
2 changes: 1 addition & 1 deletion .github/workflows/intelligent-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ on:
workflow_dispatch:
push:
branches:
- 'master'
- 'main'
permissions:
actions: read
jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint-bot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ permissions:
jobs:
fix-linting:
name: Fix Linting
uses: unifyai/workflows/.github/workflows/lint-bot.yml@master
uses: unifyai/workflows/.github/workflows/lint-bot.yml@main
secrets: inherit
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ on: [push, pull_request]
jobs:
check-formatting:
name: Check formatting
uses: unifyai/workflows/.github/workflows/lint.yml@master
uses: unifyai/workflows/.github/workflows/lint.yml@main
2 changes: 1 addition & 1 deletion .github/workflows/pr-lint-bot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ permissions:
jobs:
fix-linting:
name: PR Lint Bot
uses: unifyai/workflows/.github/workflows/pr-lint-bot.yml@master
uses: unifyai/workflows/.github/workflows/pr-lint-bot.yml@main
secrets: inherit
8 changes: 6 additions & 2 deletions .github/workflows/pypi.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
name: pypi
on:
push:
workflow_call:
jobs:
upload-if-tagged-commit:
Expand All @@ -19,7 +18,12 @@ jobs:
python3 -m pip install --upgrade build
python3 -m pip install --upgrade twine
- name: Upload to Pypi
- name: Add Tag to Version
run: |
cd ivy
echo "__version__ = '${{ github.ref_name }}'" > ivy/_version.py
- name: Upload to PyPI
if: startsWith(github.ref, 'refs/tags')
env:
PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
jobs:
publish-release-docs:
name: Publish Release Docs
uses: unifyai/workflows/.github/workflows/docs.yml@master
uses: unifyai/workflows/.github/workflows/docs.yml@main
secrets: inherit

deploy:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-ivy-core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -104,14 +104,14 @@ jobs:
continue-on-error: true

- name: Install Mongo Python Client
if: (steps.check_file_changed.outputs.changed == 'True' && github.event_name == 'push' && github.ref == 'refs/heads/master')
if: (steps.check_file_changed.outputs.changed == 'True' && github.event_name == 'push' && github.ref == 'refs/heads/main')
uses: BSFishy/pip-action@v1
with:
packages: |
pymongo[srv]
- name: Update Database
if: (steps.check_file_changed.outputs.changed == 'True' && github.event_name == 'push' && github.ref == 'refs/heads/master')
if: (steps.check_file_changed.outputs.changed == 'True' && github.event_name == 'push' && github.ref == 'refs/heads/main')
env:
MONGODB_PASSWORD: ${{ secrets.MONGODB_PASSWORD }}
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-ivy-experimental-core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,13 +96,13 @@ jobs:
continue-on-error: true

- name: Install Mongo Python Client
if: github.event_name == 'push' && github.ref == 'refs/heads/master' && steps.check_file_changed.outputs.changed == 'True'
if: github.event_name == 'push' && github.ref == 'refs/heads/main' && steps.check_file_changed.outputs.changed == 'True'
uses: BSFishy/pip-action@v1
with:
packages: |
pymongo[srv]
- name: Update Database
if: github.event_name == 'push' && github.ref == 'refs/heads/master' && steps.check_file_changed.outputs.changed == 'True'
if: github.event_name == 'push' && github.ref == 'refs/heads/main' && steps.check_file_changed.outputs.changed == 'True'
env:
MONGODB_PASSWORD: ${{ secrets.MONGODB_PASSWORD }}
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-ivy-experimental-nn.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,13 +94,13 @@ jobs:
continue-on-error: true

- name: Install Mongo Python Client
if: github.event_name == 'push' && github.ref == 'refs/heads/master' && steps.check_file_changed.outputs.changed == 'True'
if: github.event_name == 'push' && github.ref == 'refs/heads/main' && steps.check_file_changed.outputs.changed == 'True'
uses: BSFishy/pip-action@v1
with:
packages: |
pymongo[srv]
- name: Update Database
if: github.event_name == 'push' && github.ref == 'refs/heads/master' && steps.check_file_changed.outputs.changed == 'True'
if: github.event_name == 'push' && github.ref == 'refs/heads/main' && steps.check_file_changed.outputs.changed == 'True'
env:
MONGODB_PASSWORD: ${{ secrets.MONGODB_PASSWORD }}
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-ivy-nn.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,14 +101,14 @@ jobs:
continue-on-error: true

- name: Install Mongo Python Client
if: (steps.check_file_changed.outputs.changed == 'True' && github.event_name == 'push' && github.ref == 'refs/heads/master')
if: (steps.check_file_changed.outputs.changed == 'True' && github.event_name == 'push' && github.ref == 'refs/heads/main')
uses: BSFishy/pip-action@v1
with:
packages: |
pymongo[srv]
- name: Update Database
if: (steps.check_file_changed.outputs.changed == 'True' && github.event_name == 'push' && github.ref == 'refs/heads/master')
if: (steps.check_file_changed.outputs.changed == 'True' && github.event_name == 'push' && github.ref == 'refs/heads/main')
env:
MONGODB_PASSWORD: ${{ secrets.MONGODB_PASSWORD }}
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-ivy-stateful.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,14 +103,14 @@ jobs:
continue-on-error: true

- name: Install Mongo Python Client
if: (steps.check_file_changed.outputs.changed == 'True' && github.event_name == 'push' && github.ref == 'refs/heads/master')
if: (steps.check_file_changed.outputs.changed == 'True' && github.event_name == 'push' && github.ref == 'refs/heads/main')
uses: BSFishy/pip-action@v1
with:
packages: |
pymongo[srv]
- name: Update Database
if: (steps.check_file_changed.outputs.changed == 'True' && github.event_name == 'push' && github.ref == 'refs/heads/master')
if: (steps.check_file_changed.outputs.changed == 'True' && github.event_name == 'push' && github.ref == 'refs/heads/main')
env:
MONGODB_PASSWORD: ${{ secrets.MONGODB_PASSWORD }}
run: |
Expand Down
12 changes: 8 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
repos:
- repo: https://github.com/psf/black
rev: 23.3.0
rev: 23.7.0
hooks:
- id: black
language_version: python3
args:
- "--preview"
- repo: https://github.com/PyCQA/autoflake
rev: v2.1.1
rev: v2.2.0
hooks:
- id: autoflake
- repo: https://github.com/pycqa/flake8
rev: 6.0.0
rev: 6.1.0
hooks:
- id: flake8
exclude: ^.*__init__.py$
- repo: https://github.com/PyCQA/docformatter
rev: v1.6.3
rev: v1.7.5
hooks:
- id: docformatter
- repo: https://github.com/pycqa/pydocstyle
Expand All @@ -25,3 +25,7 @@ repos:
- id: pydocstyle
# Exclude everything in frontends except __init__.py, and func_wrapper.py
exclude: 'ivy/functional/(frontends|backends)/(?!.*/func_wrapper\.py$).*(?!__init__\.py$)'
- repo: https://github.com/unifyai/lint-hook
rev: a90659d806c6d65f20ec41095a2da8e8920cc96f
hooks:
- id: ivy-lint
Loading

0 comments on commit 9fad0da

Please sign in to comment.