Skip to content

Commit 0e96cb4

Browse files
Caenorstshumash
andauthored
Mshugrina/minor fixes (#814)
* Minor docs and bug fixes pre-release Signed-off-by: Maria Masha Shugrina <[email protected]> * add little adjustement on doc Signed-off-by: Clement Fuji Tsang <[email protected]> --------- Signed-off-by: Maria Masha Shugrina <[email protected]> Signed-off-by: Clement Fuji Tsang <[email protected]> Co-authored-by: Maria Masha Shugrina <[email protected]>
1 parent 6ce7843 commit 0e96cb4

8 files changed

Lines changed: 44 additions & 2 deletions

File tree

docs/kaolin_ext.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,11 @@ def run_apidoc(_):
7575
"kaolin/physics/utils/scene_forces.py",
7676
"kaolin/render/lighting/sg.py",
7777
"kaolin/render/lighting/sh.py",
78+
"kaolin/render/easy_render/common.py",
79+
"kaolin/render/easy_render/mesh.py",
7880
"kaolin/render/mesh/deftet.py",
7981
"kaolin/render/mesh/dibr.py",
82+
"kaolin/render/mesh/nvdiffrast_context.py",
8083
"kaolin/render/mesh/rasterization.py",
8184
"kaolin/render/mesh/utils.py",
8285
"kaolin/render/spc/raytrace.py",

docs/modules/kaolin.ops.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
kaolin.ops
44
==========
55

6-
Operators are primitive processing functions for batched 3D models (:ref:`meshes<kaolin.ops.mesh>`, :ref:`voxelgrids<kaolin.ops.voxelgrid>` and point clouds).
6+
Operators are primitive processing functions for batched 3D models (:ref:`meshes<kaolin.ops.mesh>`, ::ref:`voxelgrids<kaolin.ops.voxelgrid>` and point clouds).
77

88
Tensor batching operators are in :ref:`kaolin.ops.batch`, conversions of 3D models between different representations are in :ref:`kaolin.ops.conversions`.
99

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
kaolin.render.easy\_render
2+
==========================
3+
4+
Common Utilities
5+
----------------
6+
7+
.. autofunction:: kaolin.render.easy_render.default_camera
8+
.. autofunction:: kaolin.render.easy_render.default_lighting
9+
.. autofunction:: kaolin.render.easy_render.default_material
10+
11+
12+
Easy Rendering of Meshes
13+
------------------------
14+
15+
.. autoclass:: kaolin.render.easy_render.RenderPass
16+
:members:
17+
:undoc-members:
18+
19+
.. autofunction:: kaolin.render.easy_render.render_mesh
20+
21+
22+
Misc Utilities
23+
--------------
24+
.. automodule:: kaolin.render.easy_render
25+
:members:
26+
:member-order: bysource
27+
:undoc-members:
28+
:show-inheritance:
29+
:exclude-members: default_camera, default_lighting, default_material, render_mesh, RenderPass
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
from .common import *
22
from .mesh import *
3+
4+
__all__ = [k for k in locals().keys() if not k.startswith('__')]

kaolin/render/easy_render/common.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
from kaolin.render.lighting import SgLightingParameters, sg_direction_from_azimuth_elevation
2121
from kaolin.render.materials import PBRMaterial
2222

23+
__all__ = ['default_lighting', 'default_camera', 'default_material']
24+
2325

2426
def default_lighting():
2527
""" Returns default lighting, represented as Spherical Gaussians.

kaolin/render/easy_render/mesh.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@
2828
import nvdiffrast.torch
2929

3030

31+
__all__ = ['render_mesh', 'mesh_rasterize_interpolate_cuda', 'mesh_rasterize_interpolate_nvdiffrast',
32+
'texture_sample_materials', 'sg_shade', 'RenderPass']
33+
34+
3135
class RenderPass(str, Enum):
3236
# TODO: add normals relative to camera, mask, anti-aliasing, depth, wireframe
3337
face_idx = "face_idx"

kaolin/render/mesh/nvdiffrast_context.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ def nvdiffrast_is_available():
4242

4343
def nvdiffrast_use_cuda():
4444
""" Configures nvdiffrast back end to use `nvdiffrast.torch.RasterizeCudaContext` by default."""
45+
global _default_context_fn
4546
if nvdiffrast_is_available():
4647
_default_context_fn = nvdiff.RasterizeCudaContext
4748
else:
@@ -50,6 +51,7 @@ def nvdiffrast_use_cuda():
5051

5152
def nvdiffrast_use_opengl():
5253
""" Configures nvdiffrast back end to use `nvdiffrast.torch.RasterizeGLContext` by default."""
54+
global _default_context_fn
5355
if nvdiffrast_is_available():
5456
_default_context_fn = partial(nvdiff.RasterizeGLContext, output_db=False)
5557
else:

tools/linux/run_tests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,8 @@ if [ $BUILD_DOCS -eq "1" ]; then
166166
CMDLINE="python -m sphinx -T -E -W --keep-going -b html -d _build/doctrees -D language=en . _build/html"
167167
export PYTORCH_JIT=0
168168
$CMDLINE >> $DOCS_LOG 2>&1
169-
export PYTORCH_JIT=1
170169
RES=$?
170+
export PYTORCH_JIT=1
171171

172172
cd $KAOLIN_ROOT
173173
DOCS_URL="build_docs/_build/html/index.html"

0 commit comments

Comments
 (0)