Skip to content

Commit

Permalink
Change master to main
Browse files Browse the repository at this point in the history
  • Loading branch information
KareemMAX authored Aug 14, 2023
1 parent 6325994 commit 2a129a6
Show file tree
Hide file tree
Showing 7 changed files with 48 additions and 47 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@ name: Update docs
on:
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/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
74 changes: 37 additions & 37 deletions README.rst

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions ivy_vision_demos/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ cd ~/ivy_vision/ivy_vision_demos
At the end of the demo, a video nerf_video.mp4 is created of renderings from unseen camera poses around a sphere.

<p align="center">
<img width="50%" style="display: block;" src='https://github.com/unifyai/unifyai.github.io/blob/master/img/externally_linked/ivy_vision/nerf_demo.gif?raw=true'>
<img width="50%" style="display: block;" src='https://github.com/unifyai/unifyai.github.io/blob/main/img/externally_linked/ivy_vision/nerf_demo.gif?raw=true'>
</p>

### Co-ordinates to Voxel Grid
Expand All @@ -100,7 +100,7 @@ cd ~/ivy_vision/ivy_vision_demos
Example output from the simulator, and Open3D renderings, are given below:

<p align="center">
<img width="75%" style="display: block;" src='https://github.com/unifyai/unifyai.github.io/blob/master/img/externally_linked/ivy_vision/voxel_grid_demo.gif?raw=true'>
<img width="75%" style="display: block;" src='https://github.com/unifyai/unifyai.github.io/blob/main/img/externally_linked/ivy_vision/voxel_grid_demo.gif?raw=true'>
</p>

### Point Rendering
Expand All @@ -116,7 +116,7 @@ cd ~/ivy_vision/ivy_vision_demos
Example output from the simulator, and the forward warp point renderings, are given below:

<p align="center">
<img width="75%" style="display: block;" src='https://github.com/unifyai/unifyai.github.io/blob/master/img/externally_linked/ivy_vision/point_render_demo.gif?raw=true'>
<img width="75%" style="display: block;" src='https://github.com/unifyai/unifyai.github.io/blob/main/img/externally_linked/ivy_vision/point_render_demo.gif?raw=true'>
</p>

## Get Involved
Expand Down
2 changes: 1 addition & 1 deletion merge_with_upstream.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
git checkout "$1"
git remote add upstream https://github.com/unifyai/vision.git || true
git fetch upstream
git merge upstream/master --no-edit
git merge upstream/main --no-edit
git push
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def _replace_logos_html(txt):
backends_chunk = chunks[2]
bc = backends_chunk.split("\n\n")
img_str = (
".. image:: https://github.com/unifyai/unifyai.github.io/blob/master/img/externally_linked/logos/supported/frameworks.png?raw=true\n" # noqa
".. image:: https://github.com/unifyai/unifyai.github.io/blob/main/img/externally_linked/logos/supported/frameworks.png?raw=true\n" # noqa
" :width: 100%"
)
backends_chunk = "\n\n".join(bc[0:1] + [img_str] + bc[2:])
Expand All @@ -39,7 +39,7 @@ def _replace_logos_html(txt):
libraries_chunk = chunks[3]
lc = libraries_chunk.split("\n\n")
img_str = (
".. image:: https://github.com/unifyai/unifyai.github.io/blob/master/img/externally_linked/ivy_libraries.png?raw=true\n" # noqa
".. image:: https://github.com/unifyai/unifyai.github.io/blob/main/img/externally_linked/ivy_libraries.png?raw=true\n" # noqa
" :width: 100%"
)
libraries_chunk = "\n\n".join(lc[0:1] + [img_str] + lc[2:])
Expand Down

0 comments on commit 2a129a6

Please sign in to comment.