lower memoty usage (linux binaries to follow)

Author: robertsulej

CHANGELOG.rst

@@ -9,6 +9,11 @@ Added
 
 - method to update parallelogram light using center/target 3D points and scalar lengths of u/v sides (missing in v0.8.0)
 
+Changes
+~~~~~~~
+
+- lower memory usage on both host and device
+
 `v0.8.1`_ - 2020-06-14
 ----------------------
 

examples/1_basic_plot_making/1_scatter_plot_3d.py

@@ -76,7 +76,7 @@ def main():
 
     # camera and lighting configured by hand
     optix.update_camera(eye=[5, 0, -8])
-    optix.setup_light("light1", color=15*np.array([0.99, 0.9, 0.7]), radius=2)
+    optix.setup_light("light1", color=10*np.array([0.99, 0.9, 0.7]), radius=2)
 
     print("done")
 

examples/1_basic_plot_making/2_parametric_line_plot_3d.py

@@ -60,9 +60,9 @@ def main():
     # 2 spherical light sources, warm and cool, fit positions with respect to
     # the current camera plane: 45 deg right/left and 25 deg up;
     # do not include lights in geometry, so they do not appear in the image
-    optix.setup_light("light1", color=15*np.array([0.99, 0.9, 0.7]), radius=250, in_geometry=False)
+    optix.setup_light("light1", color=10*np.array([0.99, 0.9, 0.7]), radius=250, in_geometry=False)
     optix.light_fit("light1", horizontal_rot=45, vertical_rot=25, dist_scale=1.1)
-    optix.setup_light("light2", color=20*np.array([0.7, 0.9, 0.99]), radius=200, in_geometry=False)
+    optix.setup_light("light2", color=15*np.array([0.7, 0.9, 0.99]), radius=200, in_geometry=False)
     optix.light_fit("light2", horizontal_rot=-45, vertical_rot=25, dist_scale=1.1)
 
     # accumulate up to 30 frames (override default of 4 frames)

examples/1_basic_plot_making/5_create_basic_mesh.py

@@ -37,15 +37,15 @@ def main():
 
     rt.set_param(min_accumulation_step=2, max_accumulation_frames=100)
     rt.setup_camera("cam1", cam_type="DoF", eye=[1, -6, 4], focal_scale=0.9, fov=25)
-    rt.setup_light("light1", pos=[10, -9, -8], color=[14, 13, 12], radius=4)
+    rt.setup_light("light1", pos=[10, -9, -8], color=[10, 9, 8], radius=4)
     rt.set_ambient([0.2, 0.3, 0.4])
 
     # add mesh geometry to the scene
     rt.set_mesh("m", points, faces, c=colors)
 
     rt.start()
-    print("done")
 
+    print("done")
 
 if __name__ == '__main__':
     main()

examples/1_basic_plot_making/5_generate_mesh_with_pygmsh.py

@@ -48,7 +48,7 @@ def main():
     rt.setup_camera("cam1", cam_type="DoF",
                     eye=[0.5, -3, 2], target=[0, 0, 0.5],
                     focal_scale=0.9, fov=25)
-    rt.setup_light("light1", pos=[15, 0, 10], color=[14, 13, 12], radius=4)
+    rt.setup_light("light1", pos=[15, 0, 10], color=[8, 7, 6], radius=4)
     rt.set_ambient([0.1, 0.15, 0.2])
 
     # add mesh geometry to the scene

examples/1_basic_plot_making/5_load_mesh.py

@@ -27,7 +27,7 @@ def main():
     # camera and light position auto-fit the scene geometry
     optix.setup_camera("cam1")
     d = np.linalg.norm(optix.get_camera_target() - optix.get_camera_eye())
-    optix.setup_light("light1", color=10, radius=0.3 * d)
+    optix.setup_light("light1", color=8, radius=0.3 * d)
 
     optix.start()
     print("done")

examples/1_basic_plot_making/5_parametric_surface.py

@@ -62,14 +62,14 @@ def main():
 
     rt.set_data("plane", geom="Parallelograms",
                 pos=[[-100, -14, -100]], u=[200, 0, 0], v=[0, 0, 200],
-                c=make_color([0.1, 0.2, 0.3], exposure=exposure, gamma=gamma))
+                c=make_color([0.1, 0.2, 0.3], exposure=exposure, gamma=gamma)[0])
 
     rt.setup_camera("cam1", cam_type="DoF",
                     eye=[-50, -7, -15], target=[0, 0, -1], up=[0, 1, 0],
                     aperture_radius=0.4, aperture_fract=0.2,
                     focal_scale=0.92, fov=35)
 
-    rt.setup_light("light1", pos=[-15, 20, 15], color=8, radius=6)
+    rt.setup_light("light1", pos=[-15, 20, 15], color=5, radius=6)
 
     rt.start()
 

examples/1_basic_plot_making/5_surface_plot.py

@@ -46,7 +46,7 @@ def main():
     optix.update_camera("cam1", eye=eye)
 
     d = np.linalg.norm(optix.get_camera_target() - eye)
-    optix.setup_light("light1", color=15, radius=0.3 * d)
+    optix.setup_light("light1", color=10, radius=0.3 * d)
 
     optix.start()
     print("done")

examples/1_basic_plot_making/9_1_save_scene.py

@@ -33,9 +33,9 @@ def main():
 
     # Setup lights and the camera:
 
-    rt.setup_light("light1", light_type="Parallelogram", pos=[-2.5, 2.6, 3], u=[0.8, 0, 0], v=[0, -0.8, 0], color=[6, 5.7, 5.4])
-    rt.setup_light("light2", light_type="Parallelogram", pos=[-0.5, 3.2, 0], u=[0.8, 0, 0], v=[0, 0, 0.8], color=[8, 7.6, 7.2])
-    rt.setup_light("light3", light_type="Parallelogram", pos=[1.5, 2.6, 3], u=[0.8, 0, 0], v=[0, -0.8, 0], color=[6, 5.7, 5.4])
+    rt.setup_light("light1", light_type="Parallelogram", pos=[-2.5, 2.6, 3], u=[0.8, 0, 0], v=[0, -0.8, 0], color=[4, 4.7, 5])
+    rt.setup_light("light2", light_type="Parallelogram", pos=[-0.5, 3.2, 0], u=[0.8, 0, 0], v=[0, 0, 0.8], color=[6, 5.6, 5.2])
+    rt.setup_light("light3", light_type="Parallelogram", pos=[1.5, 2.6, 3], u=[0.8, 0, 0], v=[0, -0.8, 0], color=[4, 4.7, 5])
     rt.setup_camera("cam1", cam_type="DoF", eye=[0, 0.4, 6], target=[0, 1.2, 0], aperture_radius=0.025, fov=35, focal_scale=0.9)
 
     # Make some data:
@@ -48,7 +48,7 @@ def main():
     data = np.stack((x, y, z)).T
 
     # Add object to scene:
-    rt.set_data("balls", pos=data, r=r, c=0.92)
+    rt.set_data("balls", pos=data, r=r, c=0.93)
     # or use another geometry and save it in the second scene file:
     #rt.set_data("cubes", geom="Parallelepipeds", pos=data, r=r, c=0.92)
 

examples/1_basic_plot_making/9_3_load_scene.py

@@ -36,16 +36,16 @@ def main():
     rt.load_scene("strange_object_2.json")
 
     # Apply some modification:
-    if "cubes" in rt.get_geometry_names():
-        rt.update_data("cubes", c=[0.5, 0, 0.1])
+    if "block2" in rt.get_geometry_names():
+        rt.update_data("block2", c=[0.5, 0, 0.1])
 
     input("Press Enter to continue...")
 
     # Manipulate something in the scene saved in the dictionary,
     # and load it back:
 
     if "light2" in d["Lights"]:
-        d["Lights"]["light2"]["Color"] = [12, 6, 2]
+        d["Lights"]["light2"]["Color"] = [10, 5, 1.5]
 
     rt.set_scene(d)