Skip to content

Commit 8e365fe

Browse files
authored
Merge branch 'main' into qwen_batch_fix
2 parents ea2f65d + 8abc7ae commit 8e365fe

File tree

4 files changed

+19
-21
lines changed

4 files changed

+19
-21
lines changed

docs/source/en/api/pipelines/marigold.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ The following is a summary of the recommended checkpoints, all of which produce
7575
| [prs-eth/marigold-depth-v1-1](https://huggingface.co/prs-eth/marigold-depth-v1-1) | Depth | Affine-invariant depth prediction assigns each pixel a value between 0 (near plane) and 1 (far plane), with both planes determined by the model during inference. |
7676
| [prs-eth/marigold-normals-v0-1](https://huggingface.co/prs-eth/marigold-normals-v0-1) | Normals | The surface normals predictions are unit-length 3D vectors in the screen space camera, with values in the range from -1 to 1. |
7777
| [prs-eth/marigold-iid-appearance-v1-1](https://huggingface.co/prs-eth/marigold-iid-appearance-v1-1) | Intrinsics | InteriorVerse decomposition is comprised of Albedo and two BRDF material properties: Roughness and Metallicity. |
78-
| [prs-eth/marigold-iid-lighting-v1-1](https://huggingface.co/prs-eth/marigold-iid-lighting-v1-1) | Intrinsics | HyperSim decomposition of an image &nbsp\\(I\\)&nbsp is comprised of Albedo &nbsp\\(A\\), Diffuse shading &nbsp\\(S\\), and Non-diffuse residual &nbsp\\(R\\): &nbsp\\(I = A*S+R\\). |
78+
| [prs-eth/marigold-iid-lighting-v1-1](https://huggingface.co/prs-eth/marigold-iid-lighting-v1-1) | Intrinsics | HyperSim decomposition of an image $I$ is comprised of Albedo $A$, Diffuse shading $S$, and Non-diffuse residual $R$: $I = A*S+R$. |
7979

8080
> [!TIP]
8181
> Make sure to check out the Schedulers [guide](../../using-diffusers/schedulers) to learn how to explore the tradeoff

src/diffusers/pipelines/marigold/pipeline_marigold_depth.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -86,15 +86,14 @@ class MarigoldDepthOutput(BaseOutput):
8686
8787
Args:
8888
prediction (`np.ndarray`, `torch.Tensor`):
89-
Predicted depth maps with values in the range [0, 1]. The shape is $numimages \times 1 \times height \times
90-
width$ for `torch.Tensor` or $numimages \times height \times width \times 1$ for `np.ndarray`.
89+
Predicted depth maps with values in the range [0, 1]. The shape is `numimages × 1 × height × width` for
90+
`torch.Tensor` or `numimages × height × width × 1` for `np.ndarray`.
9191
uncertainty (`None`, `np.ndarray`, `torch.Tensor`):
92-
Uncertainty maps computed from the ensemble, with values in the range [0, 1]. The shape is $numimages
93-
\times 1 \times height \times width$ for `torch.Tensor` or $numimages \times height \times width \times 1$
94-
for `np.ndarray`.
92+
Uncertainty maps computed from the ensemble, with values in the range [0, 1]. The shape is `numimages × 1 ×
93+
height × width` for `torch.Tensor` or `numimages × height × width × 1` for `np.ndarray`.
9594
latent (`None`, `torch.Tensor`):
9695
Latent features corresponding to the predictions, compatible with the `latents` argument of the pipeline.
97-
The shape is $numimages * numensemble \times 4 \times latentheight \times latentwidth$.
96+
The shape is `numimages * numensemble × 4 × latentheight × latentwidth`.
9897
"""
9998

10099
prediction: Union[np.ndarray, torch.Tensor]

src/diffusers/pipelines/marigold/pipeline_marigold_intrinsics.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -99,17 +99,17 @@ class MarigoldIntrinsicsOutput(BaseOutput):
9999
100100
Args:
101101
prediction (`np.ndarray`, `torch.Tensor`):
102-
Predicted image intrinsics with values in the range [0, 1]. The shape is $(numimages * numtargets) \times 3
103-
\times height \times width$ for `torch.Tensor` or $(numimages * numtargets) \times height \times width
104-
\times 3$ for `np.ndarray`, where `numtargets` corresponds to the number of predicted target modalities of
105-
the intrinsic image decomposition.
102+
Predicted image intrinsics with values in the range [0, 1]. The shape is `(numimages * numtargets) × 3 ×
103+
height × width` for `torch.Tensor` or `(numimages * numtargets) × height × width × 3` for `np.ndarray`,
104+
where `numtargets` corresponds to the number of predicted target modalities of the intrinsic image
105+
decomposition.
106106
uncertainty (`None`, `np.ndarray`, `torch.Tensor`):
107-
Uncertainty maps computed from the ensemble, with values in the range [0, 1]. The shape is $(numimages *
108-
numtargets) \times 3 \times height \times width$ for `torch.Tensor` or $(numimages * numtargets) \times
109-
height \times width \times 3$ for `np.ndarray`.
107+
Uncertainty maps computed from the ensemble, with values in the range [0, 1]. The shape is `(numimages *
108+
numtargets) × 3 × height × width` for `torch.Tensor` or `(numimages * numtargets) × height × width × 3` for
109+
`np.ndarray`.
110110
latent (`None`, `torch.Tensor`):
111111
Latent features corresponding to the predictions, compatible with the `latents` argument of the pipeline.
112-
The shape is $(numimages * numensemble) \times (numtargets * 4) \times latentheight \times latentwidth$.
112+
The shape is `(numimages * numensemble) × (numtargets * 4) × latentheight × latentwidth`.
113113
"""
114114

115115
prediction: Union[np.ndarray, torch.Tensor]

src/diffusers/pipelines/marigold/pipeline_marigold_normals.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,15 +81,14 @@ class MarigoldNormalsOutput(BaseOutput):
8181
8282
Args:
8383
prediction (`np.ndarray`, `torch.Tensor`):
84-
Predicted normals with values in the range [-1, 1]. The shape is $numimages \times 3 \times height \times
85-
width$ for `torch.Tensor` or $numimages \times height \times width \times 3$ for `np.ndarray`.
84+
Predicted normals with values in the range [-1, 1]. The shape is `numimages × 3 × height × width` for
85+
`torch.Tensor` or `numimages × height × width × 3` for `np.ndarray`.
8686
uncertainty (`None`, `np.ndarray`, `torch.Tensor`):
87-
Uncertainty maps computed from the ensemble, with values in the range [0, 1]. The shape is $numimages
88-
\times 1 \times height \times width$ for `torch.Tensor` or $numimages \times height \times width \times 1$
89-
for `np.ndarray`.
87+
Uncertainty maps computed from the ensemble, with values in the range [0, 1]. The shape is `numimages × 1 ×
88+
height × width` for `torch.Tensor` or `numimages × height × width × 1` for `np.ndarray`.
9089
latent (`None`, `torch.Tensor`):
9190
Latent features corresponding to the predictions, compatible with the `latents` argument of the pipeline.
92-
The shape is $numimages * numensemble \times 4 \times latentheight \times latentwidth$.
91+
The shape is `numimages * numensemble × 4 × latentheight × latentwidth`.
9392
"""
9493

9594
prediction: Union[np.ndarray, torch.Tensor]

0 commit comments

Comments
 (0)