Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Stable Diffusion 1.5 and Stable Diffusion XL Tutorials #82

Merged
merged 86 commits into from
Mar 2, 2024
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
86 commits
Select commit Hold shift + click to select a range
deefc37
initial stable diffusion - work in progress
nnshah1 Feb 26, 2024
d907813
updating with batching enabled
nnshah1 Feb 27, 2024
92b49ea
update client, model
nnshah1 Feb 27, 2024
2140339
updated to create a backend
nnshah1 Feb 27, 2024
141010c
updated for xl and 1.5 seperated configs
nnshah1 Feb 27, 2024
887f086
updated with version info
nnshah1 Feb 27, 2024
3619b76
updating to read steps from file and prevent parallel engine build
Feb 28, 2024
968a0f8
remove multi gpu instance capability - not supported
Feb 28, 2024
41db857
adding client and base deployment
nnshah1 Feb 28, 2024
ee0125b
update docker ignore for onnx directories
Feb 29, 2024
2dd3cbd
update with arg to build models
Feb 29, 2024
1bea74e
updating with basic client
nnshah1 Feb 29, 2024
b4096e6
updated with logging and dynamic batching settings
nnshah1 Feb 29, 2024
a73e57e
updates for making file saving optional and testing client
nnshah1 Feb 29, 2024
f289784
Adding documentation
nnshah1 Feb 29, 2024
4a38b6c
updated
nnshah1 Feb 29, 2024
66e5e2d
updates
nnshah1 Feb 29, 2024
16abc4b
updates
nnshah1 Feb 29, 2024
2588c78
updates
nnshah1 Feb 29, 2024
e60a920
update relative link
nnshah1 Feb 29, 2024
556bd9f
updates
nnshah1 Feb 29, 2024
e898c7b
updated
nnshah1 Feb 29, 2024
66b4c97
removing unused imports
nnshah1 Feb 29, 2024
1c319d6
update with timeout
nnshah1 Feb 29, 2024
d7b2880
fix typo
nnshah1 Feb 29, 2024
1926c2f
fix typo
nnshah1 Feb 29, 2024
f96c073
updates
nnshah1 Feb 29, 2024
516b5e2
Update Popular_Models_Guide/StableDiffusion/docs/model_configuration.md
nnshah1 Feb 29, 2024
3334a46
Update Popular_Models_Guide/StableDiffusion/docs/model_configuration.md
nnshah1 Feb 29, 2024
d277c55
Update Popular_Models_Guide/StableDiffusion/run.sh
nnshah1 Feb 29, 2024
de633d4
Update Popular_Models_Guide/StableDiffusion/README.md
nnshah1 Feb 29, 2024
fc39e0d
remove unused imports
nnshah1 Feb 29, 2024
3f4f37f
Update Popular_Models_Guide/StableDiffusion/README.md
nnshah1 Feb 29, 2024
3969235
Update Popular_Models_Guide/StableDiffusion/README.md
nnshah1 Feb 29, 2024
44cbe6a
Update Popular_Models_Guide/StableDiffusion/README.md
nnshah1 Feb 29, 2024
378d685
Update Popular_Models_Guide/StableDiffusion/README.md
nnshah1 Feb 29, 2024
a1d40d0
Update Popular_Models_Guide/StableDiffusion/README.md
nnshah1 Feb 29, 2024
153e87f
Update Popular_Models_Guide/StableDiffusion/backend/diffusion/model.py
nnshah1 Feb 29, 2024
10b0d1a
Update Popular_Models_Guide/StableDiffusion/client.py
nnshah1 Feb 29, 2024
3055749
Update Popular_Models_Guide/StableDiffusion/run.sh
nnshah1 Feb 29, 2024
160599e
Merge branch 'nnshah1-stable-diffusion' of https://github.com/triton-…
nnshah1 Feb 29, 2024
9c305d6
updated with copyright
nnshah1 Feb 29, 2024
85a2b42
update copyright
nnshah1 Feb 29, 2024
a57e59b
added missing scripts
nnshah1 Mar 1, 2024
6e275a6
Update Popular_Models_Guide/StableDiffusion/README.md
nnshah1 Mar 1, 2024
71c07aa
Update Popular_Models_Guide/StableDiffusion/scripts/build_models.sh
nnshah1 Mar 1, 2024
ec2e1be
Update Popular_Models_Guide/StableDiffusion/backend/diffusion/model.py
nnshah1 Mar 1, 2024
394d97a
Update Popular_Models_Guide/StableDiffusion/client.py
nnshah1 Mar 1, 2024
64a4a61
Update Popular_Models_Guide/StableDiffusion/diffusion-models/stable_d…
nnshah1 Mar 1, 2024
bca243b
fixed indexing in batches
nnshah1 Mar 1, 2024
2e82bd7
Merge branch 'nnshah1-stable-diffusion' of https://github.com/triton-…
nnshah1 Mar 1, 2024
0b2f8dc
updated with branch in anticipation of cherry pick
nnshah1 Mar 1, 2024
7f28092
Update Popular_Models_Guide/StableDiffusion/README.md
nnshah1 Mar 1, 2024
a6da3a1
updated language
nnshah1 Mar 1, 2024
de26e85
updated with new line
nnshah1 Mar 1, 2024
83d6188
clean up of docker ignore
nnshah1 Mar 1, 2024
c069424
update to test url reference
nnshah1 Mar 1, 2024
6cb73b3
updated
nnshah1 Mar 1, 2024
3ca7e13
update with reference test
nnshah1 Mar 1, 2024
3446345
updated
nnshah1 Mar 1, 2024
00c2fc7
Update Popular_Models_Guide/StableDiffusion/diffusion-models/stable_d…
nnshah1 Mar 1, 2024
1323588
remove comments
nnshah1 Mar 1, 2024
f5f110c
Merge branch 'nnshah1-stable-diffusion' of https://github.com/triton-…
nnshah1 Mar 1, 2024
6d5010d
remove client application reference
nnshah1 Mar 1, 2024
8937d77
updated
nnshah1 Mar 1, 2024
332d930
removing scripts replaced by popular model guide
nnshah1 Mar 1, 2024
a1c49a4
updated for latest 24.01
nnshah1 Mar 1, 2024
9e0fb84
updated for 24.01
nnshah1 Mar 1, 2024
20bb6fd
updated with known limitations
nnshah1 Mar 1, 2024
fbb7f22
updated
nnshah1 Mar 1, 2024
01778d4
tweak
nnshah1 Mar 1, 2024
e75d4f9
updated
nnshah1 Mar 1, 2024
35a2ad7
updated
nnshah1 Mar 1, 2024
d0dc0c0
updated with reference to refinder model in example
nnshah1 Mar 1, 2024
d9654ee
Update Triton_Inference_Server_Python_API/README.md
nnshah1 Mar 1, 2024
f3971a3
updated misspelling
nnshah1 Mar 1, 2024
45032d3
Merge branch 'nnshah1-stable-diffusion' of https://github.com/triton-…
nnshah1 Mar 1, 2024
5a8ff84
updated references
nnshah1 Mar 1, 2024
0f9704e
updating links
nnshah1 Mar 1, 2024
d269e37
updating
nnshah1 Mar 1, 2024
8b55dd7
updated
nnshah1 Mar 1, 2024
023fff6
Update README.md
nnshah1 Mar 1, 2024
b8b712b
remove reference to specific release
nnshah1 Mar 1, 2024
2fdbf3b
Merge branch 'nnshah1-stable-diffusion' of https://github.com/triton-…
nnshah1 Mar 1, 2024
9354288
updated to remove reference
nnshah1 Mar 1, 2024
106d948
Update Popular_Models_Guide/StableDiffusion/README.md
nnshah1 Mar 2, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions Popular_Models_Guide/StableDiffusion/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,21 +57,21 @@ support matrix](https://docs.nvidia.com/deeplearning/frameworks/support-matrix/i
## Building the Triton Inference Server Image

The example is designed based on the
`nvcr.io/nvidia/tritonserver:24.01-py3` docker image and [TensorRT OSS v9.2.0](https://github.com/NVIDIA/TensorRT/releases/tag/v9.2.0).
`nvcr.io/nvidia/tritonserver:YY.MM-py3` docker image and [TensorRT OSS v9.2.0](https://github.com/NVIDIA/TensorRT/releases/tag/v9.2.0).

A set of convenience scripts are provided to create a docker image
based on the `nvcr.io/nvidia/tritonserver:24.01-py3` image with the
based on the `nvcr.io/nvidia/tritonserver:YY.MM-py3` image with the
dependencies for the TensorRT Stable Diffusion demo installed.

### Triton Inference Server + TensorRT OSS

#### Clone Repository
```bash
git clone https://github.com/triton-inference-server/tutorials.git -b r24.02 --single-branch
git clone https://github.com/triton-inference-server/tutorials.git --single-branch
rmccorm4 marked this conversation as resolved.
Show resolved Hide resolved
cd tutorials/Popular_Models_Guide/StableDiffusion
```

#### Build `tritonserver:r24.01-diffusion` Image
#### Build Tritonserver Diffusion Docker Image
```bash
./build.sh
```
Expand All @@ -88,7 +88,7 @@ built into a volume mounted directory as a separate step.

## Building and Running Stable Diffusion v 1.5

### Start `tritonserver:r24.01-diffusion` Container
### Start Tritonserver Diffusion Container

The following command starts a container and volume mounts the current
directory as `workspace`.
Expand Down Expand Up @@ -144,7 +144,7 @@ I0229 20:15:52.125050 749 server.cc:676]

## Building and Running Stable Diffusion XL

### Start `tritonserver:r24.01-diffusion` Container
### Start `tritonserver:rYY.MM-diffusion` Container

The following command starts a container and volume mounts the current
directory as `workspace`.
Expand Down Expand Up @@ -201,7 +201,7 @@ I0229 20:22:22.912465 1440 server.cc:676]
We've provided a sample [client](client.py) application to make
sending and receiving requests simpler.

### Start `tritonserver:r24.01-diffusion` Container
### Start Tritonserver Diffusion Container

In a separate terminal from the server start a new container.

Expand Down
4 changes: 2 additions & 2 deletions Triton_Inference_Server_Python_API/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ for response in responses:
## Stable Diffusion

This example is based on the
[Popular_Models_Guide/StableDiffusion](Popular_Models_Guide/StableDiffusion)
[Popular_Models_Guide/StableDiffusion](../Popular_Models_Guide/StableDiffusion)
tutorial.


Expand All @@ -186,7 +186,7 @@ dali fil identity onnxruntime openvino python pytorch repeat square ten
The `diffusion` build includes a `stable_diffustion` pipeline that
takes a text prompt and returns a generated image. For more details on
the models and pipeline please see the
[Popular_Models_Guide/StableDiffusion](Popular_Models_Guide/StableDiffusion)
[Popular_Models_Guide/StableDiffusion](../Popular_Models_Guide/StableDiffusion)
tutorial.

### Start Container
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ deployment based on FastAPI.
## Installation

The stable diffusion pipeline is based on the
[Popular_Models_Guide/StableDiffusion](Popular_Models_Guide/StableDiffusion)
[Popular_Models_Guide/StableDiffusion](../../../Popular_Models_Guide/StableDiffusion)
tutorial.

### Clone Repository
Expand All @@ -50,7 +50,7 @@ git clone https://github.com/triton-inference-server/tutorials.git
cd tutorials/Triton_Inference_Server_Python_API
```

### Build `triton-python-api:r24.01-diffusion` Image and Stable Diffusion Models
### Build `triton-python-api:rYY.MM-diffusion` Image and Stable Diffusion Models

Please note the following command will take many minutes depending on
your hardware configuration and network connection.
Expand Down
Loading