Skip to content

Commit 3863dce

Browse files
committed
Merge branch 'main' into am/click-cli
2 parents 4598dcc + 9b617e6 commit 3863dce

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+1795
-403
lines changed

.github/workflows/ci.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
uses: actions/setup-python@v5
1919

2020
- name: Install dependencies
21-
run: pip install '.[dev]'
21+
run: pip install '.[dev,docs]'
2222

2323
- name: Run ruff linter
2424
run: ruff check
@@ -42,6 +42,14 @@ jobs:
4242
4343
taplo fmt --check --diff
4444
45+
- name: Build documentation
46+
run: |
47+
set -eE
48+
set -o pipefail
49+
50+
cd doc
51+
make html
52+
4553
test:
4654
name: Run pytest
4755

.github/workflows/docs.yml

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
name: Build and Deploy Documentation
2+
3+
on:
4+
push:
5+
branches: [ main ]
6+
workflow_dispatch: # Allow manual triggering
7+
8+
# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
9+
# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
10+
concurrency:
11+
group: "pages"
12+
cancel-in-progress: false
13+
14+
jobs:
15+
build:
16+
runs-on: ubuntu-latest
17+
steps:
18+
- name: Checkout
19+
uses: actions/checkout@v4
20+
21+
- name: Install uv
22+
uses: astral-sh/setup-uv@v5
23+
with:
24+
enable-cache: true
25+
26+
- name: Set up environment
27+
run: |
28+
set -eE
29+
set -o pipefail
30+
31+
uv sync --extra docs
32+
33+
- name: Build documentation
34+
run: |
35+
set -eE
36+
set -o pipefail
37+
38+
source .venv/bin/activate
39+
cd doc
40+
make html
41+
42+
- name: Add .nojekyll file
43+
run: touch doc/_build/html/.nojekyll
44+
45+
- name: Upload artifact
46+
uses: actions/upload-pages-artifact@v3
47+
with:
48+
path: ./doc/_build/html
49+
50+
deploy:
51+
name: Deploy to GitHub Pages
52+
needs: build
53+
54+
permissions:
55+
pages: write
56+
id-token: write
57+
58+
environment:
59+
name: github-pages
60+
url: ${{ steps.deployment.outputs.page_url }}
61+
62+
runs-on: ubuntu-latest
63+
steps:
64+
- name: Deploy to GitHub Pages
65+
id: deployment
66+
uses: actions/deploy-pages@v4

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ share/python-wheels/
2121
*.egg-info/
2222
.installed.cfg
2323
*.egg
24+
doc/_build
2425

2526
# PyInstaller
2627
# Usually these files are written by a python script from a template

README.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ These schemas enable CloudAI to be flexible and compatible with different system
5454
|SlurmContainer|||||
5555
|MegatronRun (experimental)|||||
5656

57+
For more detailed information, please refer to the [official documentation](https://nvidia.github.io/cloudai/workloads/index.html).
58+
5759
## Details
5860
### Set Up Access to the Private NGC Registry
5961
First, ensure you have access to the Docker repository. Follow the following steps:
@@ -149,11 +151,11 @@ cloudai verify-configs conf/common/system/example_slurm_cluster.toml
149151
cloudai verify-configs --tests-dir conf/release/spcx/l40s/test conf/release/spcx/l40s/test_scenario
150152
```
151153

154+
## Additional Documentation
155+
For more detailed instructions and guidance, including advanced usage and troubleshooting, please refer to the [official documentation](https://nvidia.github.io/cloudai/).
156+
152157
## Contribution
153158
Please feel free to contribute to the CloudAI project and share your insights. Your contributions are highly appreciated.
154159

155160
## License
156161
This project is licensed under Apache 2.0. See the LICENSE file for detailed information.
157-
158-
## Additional Documentation
159-
For more detailed instructions and guidance, including advanced usage and troubleshooting, please refer to the [USER_GUIDE.md](./USER_GUIDE.md)

conf/common/test/llama2_70b.toml

Lines changed: 0 additions & 47 deletions
This file was deleted.

conf/common/test_scenario/nemo_launcher.toml

Lines changed: 0 additions & 38 deletions
This file was deleted.

conf/common/test_scenario/nemo_launcher_with_noise.toml

Lines changed: 0 additions & 32 deletions
This file was deleted.

doc/Makefile

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# Minimal makefile for Sphinx documentation
2+
3+
SPHINXOPTS ?=
4+
SPHINXBUILD ?= sphinx-build
5+
SOURCEDIR = .
6+
BUILDDIR = _build
7+
8+
help:
9+
@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
10+
11+
.PHONY: help Makefile
12+
13+
%: Makefile
14+
@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)

0 commit comments

Comments
 (0)