Merge branch 'fzc-V0.7.8-dev' into 'V0.7.8-das'

fix：修改opengl相关测试用例

See merge request !1

pytorch3d/csrc/pulsar/include/camera.device.h

@@ -20,6 +20,13 @@ IHD CamGradInfo::CamGradInfo() {
   pixel_dir_x = make_float3(0.f, 0.f, 0.f);
   pixel_dir_y = make_float3(0.f, 0.f, 0.f);
 }
+
+IHD CamGradInfo::CamGradInfo(float val) {
+  cam_pos = make_float3(val, val, val);
+  pixel_0_0_center = make_float3(val, val, val);
+  pixel_dir_x = make_float3(val, val, val);
+  pixel_dir_y = make_float3(val, val, val);
+}
 } // namespace pulsar
 
 #endif

pytorch3d/csrc/pulsar/include/camera.h

@@ -64,6 +64,7 @@ inline bool operator==(const CamInfo& a, const CamInfo& b) {
 
 struct CamGradInfo {
   HOST DEVICE CamGradInfo();
+  HOST DEVICE CamGradInfo(float val);
   float3 cam_pos;
   float3 pixel_0_0_center;
   float3 pixel_dir_x;
@@ -72,6 +73,8 @@ struct CamGradInfo {
 
 // TODO: remove once https://github.com/NVlabs/cub/issues/172 is resolved.
 struct IntWrapper {
+  HOST DEVICE IntWrapper(){}
+  HOST DEVICE explicit IntWrapper(int ival):val{0}{}  
   int val;
 };
 

pytorch3d/renderer/__init__.py

@@ -80,8 +80,8 @@ from .points import (
 )
 
 # Pulsar is not enabled on amd.
-if not torch.version.hip:
-    from .points import PulsarPointsRenderer
+# if not torch.version.hip:
+from .points import PulsarPointsRenderer
 
 from .splatter_blend import SplatterBlender
 from .utils import (

pytorch3d/renderer/points/__init__.py

@@ -11,8 +11,8 @@ import torch
 from .compositor import AlphaCompositor, NormWeightedCompositor
 
 # Pulsar not enabled on amd.
-if not torch.version.hip:
-    from .pulsar.unified import PulsarPointsRenderer
+# if not torch.version.hip:
+from .pulsar.unified import PulsarPointsRenderer
 
 from .rasterize_points import rasterize_points
 from .rasterizer import PointsRasterizationSettings, PointsRasterizer