Skip to content

Commit

Permalink
Updated main branch
Browse files Browse the repository at this point in the history
  • Loading branch information
ulises-jeremias committed May 27, 2023
1 parent 0a2a273 commit fa043f0
Show file tree
Hide file tree
Showing 12 changed files with 41 additions and 41 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ RUN /bin/bash /tmp/library-scripts/vsl-clone-and-build.sh "${DEV_IMG}" "${VSL_VE
##################################################################################################
# #
# The code below is copied from: #
# https://github.com/microsoft/vscode-remote-try-go/blob/master/.devcontainer/Dockerfile #
# https://github.com/microsoft/vscode-remote-try-go/blob/main/.devcontainer/Dockerfile #
# And modifies to use v lang instead #
# #
##################################################################################################
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ on:

push:
branches:
- master
- main

pull_request:
branches:
- master
- main

jobs:
shellcheck:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Deploy Documentation
on:
push:
branches:
- master
- main

jobs:
deploy-docs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:

push:
branches:
- master
- main

jobs:
docker:
Expand Down
10 changes: 5 additions & 5 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,18 +31,18 @@ accordingly in the steps below.)
branch `fix_alabala` ... just do again `git push pullrequest` when you have more
commits.

9. If there are merge conflicts, or a branch lags too much behind VSL's master,
9. If there are merge conflicts, or a branch lags too much behind VSL's main,
you can do the following:

1. `git pull --rebase origin master` # solve conflicts and do
1. `git pull --rebase origin main` # solve conflicts and do
`git rebase --continue`
2. `git push pullrequest -f` # this will overwrite your current remote branch
with the updated version of your changes.

The point of doing the above steps, is to never directly push to the main VSL
repository, _only to your own fork_. Since your local `master` branch tracks the
main VSL repository's master, then `git checkout master`, as well as
`git pull --rebase origin master` will continue to work as expected
repository, _only to your own fork_. Since your local `main` branch tracks the
main VSL repository's main, then `git checkout main`, as well as
`git pull --rebase origin main` will continue to work as expected
(these are actually used by `v up`) and git can always do it cleanly.

Git is very flexible, so there are other ways to accomplish the same thing.
Expand Down
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
<img
style="width: 200px"
width="200"
src="https://raw.githubusercontent.com/vlang/vsl/master/static/vsl-logo.png?sanitize=true"
src="https://raw.githubusercontent.com/vlang/vsl/main/static/vsl-logo.png?sanitize=true"
>
</p>
<h1>The V Scientific Library</h1>

[vlang.io](https://vlang.io) |
[Docs](https://vlang.github.io/vsl) |
[Changelog](#) |
[Contributing](https://github.com/vlang/vsl/blob/master/CONTRIBUTING.md)
[Contributing](https://github.com/vlang/vsl/blob/main/CONTRIBUTING.md)

</div>
<div align="center">
Expand All @@ -28,8 +28,8 @@ VSL is a V library to develop Artificial Intelligence and High-Performance Scien

| | | | |
| :-----------------------------------------------------------------------------------------: | :-----------------------------------------------------------------------------------: | :-------------------------------------------------------------------: | :--------------------------------------------------------------------------: |
| ![sierpinski_triangle](https://raw.githubusercontent.com/vlang/vsl/master/vcl/static/sierpinski_triangle.png) | ![mandelbrot_blue_red_black](https://raw.githubusercontent.com/vlang/vsl/master/vcl/static/mandelbrot_blue_red_black.png) | ![julia](https://raw.githubusercontent.com/vlang/vsl/master/vcl/static/julia.png) | ![mandelbrot_basic](https://raw.githubusercontent.com/vlang/vsl/master/vcl/static/mandelbrot_basic.png) |
| ![mandelbrot_pseudo_random_colors](https://raw.githubusercontent.com/vlang/vsl/master/vcl/static/mandelbrot_pseudo_random_colors.png) | ![sierpinski_triangle2](https://raw.githubusercontent.com/vlang/vsl/master/vcl/static/sierpinski_triangle2.png) | ![julia_set](https://raw.githubusercontent.com/vlang/vsl/master/vcl/static/julia_set.png) | ![julia_basic](https://raw.githubusercontent.com/vlang/vsl/master/vcl/static/julia_basic.png) |
| ![sierpinski_triangle](https://raw.githubusercontent.com/vlang/vsl/main/vcl/static/sierpinski_triangle.png) | ![mandelbrot_blue_red_black](https://raw.githubusercontent.com/vlang/vsl/main/vcl/static/mandelbrot_blue_red_black.png) | ![julia](https://raw.githubusercontent.com/vlang/vsl/main/vcl/static/julia.png) | ![mandelbrot_basic](https://raw.githubusercontent.com/vlang/vsl/main/vcl/static/mandelbrot_basic.png) |
| ![mandelbrot_pseudo_random_colors](https://raw.githubusercontent.com/vlang/vsl/main/vcl/static/mandelbrot_pseudo_random_colors.png) | ![sierpinski_triangle2](https://raw.githubusercontent.com/vlang/vsl/main/vcl/static/sierpinski_triangle2.png) | ![julia_set](https://raw.githubusercontent.com/vlang/vsl/main/vcl/static/julia_set.png) | ![julia_basic](https://raw.githubusercontent.com/vlang/vsl/main/vcl/static/julia_basic.png) |

## Docs

Expand Down Expand Up @@ -73,14 +73,14 @@ Windows, Linux, and macOS out of the box.

Done. And your system will remain "clean".

![](https://raw.githubusercontent.com/vlang/vsl/master/static/vscode-open-in-container.gif)
![](https://raw.githubusercontent.com/vlang/vsl/main/static/vscode-open-in-container.gif)

Our [Docker Image](https://hub.docker.com/repository/docker/ulisesjeremias/vsl)
also contains V and the V Tools for working with VS Code (or not).
Below is a video showing the convenience of
VS Code + the V tools + VSL.

![](https://raw.githubusercontent.com/vlang/vsl/master/static/container.gif)
![](https://raw.githubusercontent.com/vlang/vsl/main/static/container.gif)

## Install VSL locally

Expand Down Expand Up @@ -120,8 +120,8 @@ Made with [contributors-img](https://contrib.rocks).
[licensebadge]: https://img.shields.io/badge/License-MIT-blue.svg
[ModulesBadge]: https://img.shields.io/badge/modules-reference-027d9c?logo=v&logoColor=white&logoWidth=10

[awesomevurl]: https://github.com/vlang/awesome-v/blob/master/README.md#scientific-computing
[awesomevurl]: https://github.com/vlang/awesome-v/blob/main/README.md#scientific-computing
[workflowurl]: https://github.com/vlang/vsl/actions/workflows/ci.yml
[deploydocsurl]: https://github.com/vlang/vsl/actions/workflows/deploy-docs.yml
[licenseurl]: https://github.com/vlang/vsl/blob/master/LICENSE
[licenseurl]: https://github.com/vlang/vsl/blob/main/LICENSE
[ModulesUrl]: https://vlang.github.io/vsl/
2 changes: 1 addition & 1 deletion docker/common-debian.sh
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ fi
if [ "${INSTALL_ZSH}" = "true" ] && [ ! -d "/root/.oh-my-zsh" ] && [ "${ZSH_ALREADY_INSTALLED}" != "true" ]; then
apt-get-update-if-needed
apt-get install -y zsh
curl -fsSLo- https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh | bash 2>&1
curl -fsSLo- https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/main/tools/install.sh | bash 2>&1
echo "export PATH=\$PATH:\$HOME/.local/bin" >> /root/.zshrc
if [ "${USERNAME}" != "root" ]; then
cp -fR /root/.oh-my-zsh /home/$USERNAME
Expand Down
2 changes: 1 addition & 1 deletion docker/vsl-clone-and-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ fi

BRANCH="v${VSL_VERSION}"
if [ "${VSL_VERSION}" = "latest" ]; then
BRANCH="master"
BRANCH="main"
fi

git clone -b $BRANCH --single-branch --depth 1 https://github.com/vlang/vsl.git /opt/vlang/v/vlib/vsl
2 changes: 1 addition & 1 deletion ml/nlp/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ This submodule offers tools for Natural Language Processing.

## Examples

[Here](https://github.com/vlang/vsl/tree/master/examples) you can see a
[Here](https://github.com/vlang/vsl/tree/main/examples) you can see a
full set of examples.
24 changes: 12 additions & 12 deletions plot/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ for a better understanding.

### Bar plot

[bar plot example](https://github.com/vlang/vsl/blob/master/examples/plot_bar)
[bar plot example](https://github.com/vlang/vsl/blob/main/examples/plot_bar)

> Output
Expand All @@ -48,14 +48,14 @@ for a better understanding.
<img
style="width: 50%"
width="80%"
src="https://raw.githubusercontent.com/vlang/vsl/master/plot/static/bar.png?sanitize=true"
src="https://raw.githubusercontent.com/vlang/vsl/main/plot/static/bar.png?sanitize=true"
>
</p>
</div>

### Heatmap plot

[heatmap plot example](https://github.com/vlang/vsl/blob/master/examples/plot_heatmap)
[heatmap plot example](https://github.com/vlang/vsl/blob/main/examples/plot_heatmap)

> Output
Expand All @@ -64,14 +64,14 @@ for a better understanding.
<img
style="width: 50%"
width="80%"
src="https://raw.githubusercontent.com/vlang/vsl/master/plot/static/heatmap.png?sanitize=true"
src="https://raw.githubusercontent.com/vlang/vsl/main/plot/static/heatmap.png?sanitize=true"
>
</p>
</div>

### Histogram plot

[histogram plot example](https://github.com/vlang/vsl/blob/master/examples/plot_histogram)
[histogram plot example](https://github.com/vlang/vsl/blob/main/examples/plot_histogram)

> Output
Expand All @@ -80,14 +80,14 @@ for a better understanding.
<img
style="width: 50%"
width="80%"
src="https://raw.githubusercontent.com/vlang/vsl/master/plot/static/histogram.png?sanitize=true"
src="https://raw.githubusercontent.com/vlang/vsl/main/plot/static/histogram.png?sanitize=true"
>
</p>
</div>

### Pie plot

[pie plot example](https://github.com/vlang/vsl/blob/master/examples/plot_pie)
[pie plot example](https://github.com/vlang/vsl/blob/main/examples/plot_pie)

> Output
Expand All @@ -96,14 +96,14 @@ for a better understanding.
<img
style="width: 50%"
width="80%"
src="https://raw.githubusercontent.com/vlang/vsl/master/plot/static/pie.png?sanitize=true"
src="https://raw.githubusercontent.com/vlang/vsl/main/plot/static/pie.png?sanitize=true"
>
</p>
</div>

### Scatter plot

[scatter plot example](https://github.com/vlang/vsl/blob/master/examples/plot_scatter)
[scatter plot example](https://github.com/vlang/vsl/blob/main/examples/plot_scatter)

> Output
Expand All @@ -112,14 +112,14 @@ for a better understanding.
<img
style="width: 50%"
width="80%"
src="https://raw.githubusercontent.com/vlang/vsl/master/plot/static/scatter.png?sanitize=true"
src="https://raw.githubusercontent.com/vlang/vsl/main/plot/static/scatter.png?sanitize=true"
>
</p>
</div>

### Scatter 3D plot

[scatter3d plot example](https://github.com/vlang/vsl/blob/master/examples/plot_scatter3d)
[scatter3d plot example](https://github.com/vlang/vsl/blob/main/examples/plot_scatter3d)

> Output
Expand All @@ -128,7 +128,7 @@ for a better understanding.
<img
style="width: 50%"
width="80%"
src="https://raw.githubusercontent.com/vlang/vsl/master/plot/static/scatter3d.png?sanitize=true"
src="https://raw.githubusercontent.com/vlang/vsl/main/plot/static/scatter3d.png?sanitize=true"
>
</p>
</div>
12 changes: 6 additions & 6 deletions static/DOCS.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,24 @@
<img
style="width: 200px"
width="200"
src="https://raw.githubusercontent.com/vlang/vsl/master/static/vsl-logo.png?sanitize=true"
src="https://raw.githubusercontent.com/vlang/vsl/main/static/vsl-logo.png?sanitize=true"
>
</p>
<h1>The V Scientific Library</h1>

[vlang.io](https://vlang.io) |
[Docs](https://vlang.github.io/vsl) |
[Changelog](#) |
[Contributing](https://github.com/vlang/vsl/blob/master/CONTRIBUTING.md)
[Contributing](https://github.com/vlang/vsl/blob/main/CONTRIBUTING.md)

</div>

VSL is a V library to develop Artificial Intelligence and High-Performance Scientific Computations.

| | | | |
| :-----------------------------------------------------------------------------------------: | :-----------------------------------------------------------------------------------: | :-------------------------------------------------------------------: | :--------------------------------------------------------------------------: |
| ![sierpinski_triangle](https://raw.githubusercontent.com/vlang/vsl/master/vcl/static/sierpinski_triangle.png) | ![mandelbrot_blue_red_black](https://raw.githubusercontent.com/vlang/vsl/master/vcl/static/mandelbrot_blue_red_black.png) | ![julia](https://raw.githubusercontent.com/vlang/vsl/master/vcl/static/julia.png) | ![mandelbrot_basic](https://raw.githubusercontent.com/vlang/vsl/master/vcl/static/mandelbrot_basic.png) |
| ![mandelbrot_pseudo_random_colors](https://raw.githubusercontent.com/vlang/vsl/master/vcl/static/mandelbrot_pseudo_random_colors.png) | ![sierpinski_triangle2](https://raw.githubusercontent.com/vlang/vsl/master/vcl/static/sierpinski_triangle2.png) | ![julia_set](https://raw.githubusercontent.com/vlang/vsl/master/vcl/static/julia_set.png) | ![julia_basic](https://raw.githubusercontent.com/vlang/vsl/master/vcl/static/julia_basic.png) |
| ![sierpinski_triangle](https://raw.githubusercontent.com/vlang/vsl/main/vcl/static/sierpinski_triangle.png) | ![mandelbrot_blue_red_black](https://raw.githubusercontent.com/vlang/vsl/main/vcl/static/mandelbrot_blue_red_black.png) | ![julia](https://raw.githubusercontent.com/vlang/vsl/main/vcl/static/julia.png) | ![mandelbrot_basic](https://raw.githubusercontent.com/vlang/vsl/main/vcl/static/mandelbrot_basic.png) |
| ![mandelbrot_pseudo_random_colors](https://raw.githubusercontent.com/vlang/vsl/main/vcl/static/mandelbrot_pseudo_random_colors.png) | ![sierpinski_triangle2](https://raw.githubusercontent.com/vlang/vsl/main/vcl/static/sierpinski_triangle2.png) | ![julia_set](https://raw.githubusercontent.com/vlang/vsl/main/vcl/static/julia_set.png) | ![julia_basic](https://raw.githubusercontent.com/vlang/vsl/main/vcl/static/julia_basic.png) |

## Docs

Expand Down Expand Up @@ -64,14 +64,14 @@ Windows, Linux, and macOS out of the box.

Done. And your system will remain "clean".

![](https://raw.githubusercontent.com/vlang/vsl/master/static/vscode-open-in-container.gif)
![](https://raw.githubusercontent.com/vlang/vsl/main/static/vscode-open-in-container.gif)

Our [Docker Image](https://hub.docker.com/repository/docker/ulisesjeremias/vsl)
also contains V and the V Tools for working with VS Code (or not).
Below is a video showing the convenience of
VS Code + the V tools + VSL.

![](https://raw.githubusercontent.com/vlang/vsl/master/static/container.gif)
![](https://raw.githubusercontent.com/vlang/vsl/main/static/container.gif)

## Install VSL locally

Expand Down
4 changes: 2 additions & 2 deletions vcl/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ with some sugar abstraction, V's concurency and channels.

| | | | |
| :-----------------------------------------------------------------------------------------: | :-----------------------------------------------------------------------------------: | :-------------------------------------------------------------------: | :--------------------------------------------------------------------------: |
| ![sierpinski_triangle](https://raw.githubusercontent.com/vlang/vsl/master/vcl/static/sierpinski_triangle.png) | ![mandelbrot_blue_red_black](https://raw.githubusercontent.com/vlang/vsl/master/vcl/static/mandelbrot_blue_red_black.png) | ![julia](https://raw.githubusercontent.com/vlang/vsl/master/vcl/static/julia.png) | ![mandelbrot_basic](https://raw.githubusercontent.com/vlang/vsl/master/vcl/static/mandelbrot_basic.png) |
| ![mandelbrot_pseudo_random_colors](https://raw.githubusercontent.com/vlang/vsl/master/vcl/static/mandelbrot_pseudo_random_colors.png) | ![sierpinski_triangle2](https://raw.githubusercontent.com/vlang/vsl/master/vcl/static/sierpinski_triangle2.png) | ![julia_set](https://raw.githubusercontent.com/vlang/vsl/master/vcl/static/julia_set.png) | ![julia_basic](https://raw.githubusercontent.com/vlang/vsl/master/vcl/static/julia_basic.png) |
| ![sierpinski_triangle](https://raw.githubusercontent.com/vlang/vsl/main/vcl/static/sierpinski_triangle.png) | ![mandelbrot_blue_red_black](https://raw.githubusercontent.com/vlang/vsl/main/vcl/static/mandelbrot_blue_red_black.png) | ![julia](https://raw.githubusercontent.com/vlang/vsl/main/vcl/static/julia.png) | ![mandelbrot_basic](https://raw.githubusercontent.com/vlang/vsl/main/vcl/static/mandelbrot_basic.png) |
| ![mandelbrot_pseudo_random_colors](https://raw.githubusercontent.com/vlang/vsl/main/vcl/static/mandelbrot_pseudo_random_colors.png) | ![sierpinski_triangle2](https://raw.githubusercontent.com/vlang/vsl/main/vcl/static/sierpinski_triangle2.png) | ![julia_set](https://raw.githubusercontent.com/vlang/vsl/main/vcl/static/julia_set.png) | ![julia_basic](https://raw.githubusercontent.com/vlang/vsl/main/vcl/static/julia_basic.png) |

## Using custom OpenCL headers

Expand Down

0 comments on commit fa043f0

Please sign in to comment.