diff --git a/pytorch3d/csrc/rasterize_meshes/rasterize_meshes.cu b/pytorch3d/csrc/rasterize_meshes/rasterize_meshes.cu index d5c6d091..6e4a3c9e 100644 --- a/pytorch3d/csrc/rasterize_meshes/rasterize_meshes.cu +++ b/pytorch3d/csrc/rasterize_meshes/rasterize_meshes.cu @@ -309,19 +309,19 @@ RasterizeMeshesNaiveCuda( const size_t threads = 64; RasterizeMeshesNaiveCudaKernel<<>>( - face_verts.contiguous().data(), - mesh_to_faces_packed_first_idx.contiguous().data(), - num_faces_per_mesh.contiguous().data(), + face_verts.contiguous().data_ptr(), + mesh_to_faces_packed_first_idx.contiguous().data_ptr(), + num_faces_per_mesh.contiguous().data_ptr(), blur_radius, perspective_correct, N, H, W, K, - face_idxs.contiguous().data(), - zbuf.contiguous().data(), - pix_dists.contiguous().data(), - bary.contiguous().data()); + face_idxs.contiguous().data_ptr(), + zbuf.contiguous().data_ptr(), + pix_dists.contiguous().data_ptr(), + bary.contiguous().data_ptr()); return std::make_tuple(face_idxs, zbuf, bary, pix_dists); } @@ -467,17 +467,17 @@ torch::Tensor RasterizeMeshesBackwardCuda( const size_t threads = 64; RasterizeMeshesBackwardCudaKernel<<>>( - face_verts.contiguous().data(), - pix_to_face.contiguous().data(), + face_verts.contiguous().data_ptr(), + pix_to_face.contiguous().data_ptr(), perspective_correct, N, H, W, K, - grad_zbuf.contiguous().data(), - grad_bary.contiguous().data(), - grad_dists.contiguous().data(), - grad_face_verts.contiguous().data()); + grad_zbuf.contiguous().data_ptr(), + grad_bary.contiguous().data_ptr(), + grad_dists.contiguous().data_ptr(), + grad_face_verts.contiguous().data_ptr()); return grad_face_verts; } @@ -643,9 +643,9 @@ torch::Tensor RasterizeMeshesCoarseCuda( const size_t threads = 512; RasterizeMeshesCoarseCudaKernel<<>>( - face_verts.contiguous().data(), - mesh_to_face_first_idx.contiguous().data(), - num_faces_per_mesh.contiguous().data(), + face_verts.contiguous().data_ptr(), + mesh_to_face_first_idx.contiguous().data_ptr(), + num_faces_per_mesh.contiguous().data_ptr(), blur_radius, N, F, @@ -654,8 +654,8 @@ torch::Tensor RasterizeMeshesCoarseCuda( bin_size, chunk_size, M, - faces_per_bin.contiguous().data(), - bin_faces.contiguous().data()); + faces_per_bin.contiguous().data_ptr(), + bin_faces.contiguous().data_ptr()); return bin_faces; } @@ -793,8 +793,8 @@ RasterizeMeshesFineCuda( const size_t threads = 64; RasterizeMeshesFineCudaKernel<<>>( - face_verts.contiguous().data(), - bin_faces.contiguous().data(), + face_verts.contiguous().data_ptr(), + bin_faces.contiguous().data_ptr(), blur_radius, bin_size, perspective_correct, @@ -804,10 +804,10 @@ RasterizeMeshesFineCuda( H, W, K, - face_idxs.contiguous().data(), - zbuf.contiguous().data(), - pix_dists.contiguous().data(), - bary.contiguous().data()); + face_idxs.contiguous().data_ptr(), + zbuf.contiguous().data_ptr(), + pix_dists.contiguous().data_ptr(), + bary.contiguous().data_ptr()); return std::make_tuple(face_idxs, zbuf, bary, pix_dists); } diff --git a/pytorch3d/csrc/rasterize_points/rasterize_points.cu b/pytorch3d/csrc/rasterize_points/rasterize_points.cu index 07458062..542d0c86 100644 --- a/pytorch3d/csrc/rasterize_points/rasterize_points.cu +++ b/pytorch3d/csrc/rasterize_points/rasterize_points.cu @@ -172,16 +172,16 @@ RasterizePointsNaiveCuda( const size_t blocks = 1024; const size_t threads = 64; RasterizePointsNaiveCudaKernel<<>>( - points.contiguous().data(), - cloud_to_packed_first_idx.contiguous().data(), - num_points_per_cloud.contiguous().data(), + points.contiguous().data_ptr(), + cloud_to_packed_first_idx.contiguous().data_ptr(), + num_points_per_cloud.contiguous().data_ptr(), radius, N, S, K, - point_idxs.contiguous().data(), - zbuf.contiguous().data(), - pix_dists.contiguous().data()); + point_idxs.contiguous().data_ptr(), + zbuf.contiguous().data_ptr(), + pix_dists.contiguous().data_ptr()); return std::make_tuple(point_idxs, zbuf, pix_dists); } @@ -347,9 +347,9 @@ torch::Tensor RasterizePointsCoarseCuda( const size_t blocks = 64; const size_t threads = 512; RasterizePointsCoarseCudaKernel<<>>( - points.contiguous().data(), - cloud_to_packed_first_idx.contiguous().data(), - num_points_per_cloud.contiguous().data(), + points.contiguous().data_ptr(), + cloud_to_packed_first_idx.contiguous().data_ptr(), + num_points_per_cloud.contiguous().data_ptr(), radius, N, P, @@ -357,8 +357,8 @@ torch::Tensor RasterizePointsCoarseCuda( bin_size, chunk_size, M, - points_per_bin.contiguous().data(), - bin_points.contiguous().data()); + points_per_bin.contiguous().data_ptr(), + bin_points.contiguous().data_ptr()); return bin_points; } @@ -464,8 +464,8 @@ std::tuple RasterizePointsFineCuda( const size_t blocks = 1024; const size_t threads = 64; RasterizePointsFineCudaKernel<<>>( - points.contiguous().data(), - bin_points.contiguous().data(), + points.contiguous().data_ptr(), + bin_points.contiguous().data_ptr(), radius, bin_size, N, @@ -473,9 +473,9 @@ std::tuple RasterizePointsFineCuda( M, S, K, - point_idxs.contiguous().data(), - zbuf.contiguous().data(), - pix_dists.contiguous().data()); + point_idxs.contiguous().data_ptr(), + zbuf.contiguous().data_ptr(), + pix_dists.contiguous().data_ptr()); return std::make_tuple(point_idxs, zbuf, pix_dists); } @@ -547,16 +547,16 @@ torch::Tensor RasterizePointsBackwardCuda( const size_t threads = 64; RasterizePointsBackwardCudaKernel<<>>( - points.contiguous().data(), - idxs.contiguous().data(), + points.contiguous().data_ptr(), + idxs.contiguous().data_ptr(), N, P, H, W, K, - grad_zbuf.contiguous().data(), - grad_dists.contiguous().data(), - grad_points.contiguous().data()); + grad_zbuf.contiguous().data_ptr(), + grad_dists.contiguous().data_ptr(), + grad_points.contiguous().data_ptr()); return grad_points; }