423A35C7/pytorch3d
1
0
Fork 0
mirror of https://github.com/facebookresearch/pytorch3d.git synced 2025-08-02 03:42:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

at::optional -> std::optional (#1170)

Browse Source 
Summary: Pull Request resolved: https://github.com/pytorch/ao/pull/1170

Reviewed By: gineshidalgo99

Differential Revision: D64938040

fbshipit-source-id: 57f98b90676ad0164a6975ea50e4414fd85ae6c4
This commit is contained in:
Richard Barnes 2024-10-25 06:37:57 -07:00 committed by Facebook GitHub Bot
parent 58566963d6
commit e13848265d
2 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
pytorch3d/csrc/pulsar/pytorch/renderer.cpp
View File

@ -888,14 +888,14 @@ std::tuple<torch::Tensor, torch::Tensor> Renderer::forward(
}; };
std::tuple< std::tuple<
at::optional<torch::Tensor>, std::optional<torch::Tensor>,
at::optional<torch::Tensor>, std::optional<torch::Tensor>,
at::optional<torch::Tensor>, std::optional<torch::Tensor>,
at::optional<torch::Tensor>, std::optional<torch::Tensor>,
at::optional<torch::Tensor>, std::optional<torch::Tensor>,
at::optional<torch::Tensor>, std::optional<torch::Tensor>,
at::optional<torch::Tensor>, std::optional<torch::Tensor>,
at::optional<torch::Tensor>> std::optional<torch::Tensor>>
Renderer::backward( Renderer::backward(
const torch::Tensor& grad_im, const torch::Tensor& grad_im,
const torch::Tensor& image, const torch::Tensor& image,
@ -922,7 +922,7 @@ Renderer::backward(
const bool& dif_rad, const bool& dif_rad,
const bool& dif_cam, const bool& dif_cam,
const bool& dif_opy, const bool& dif_opy,
const at::optional<std::pair<uint, uint>>& dbg_pos) { const std::optional<std::pair<uint, uint>>& dbg_pos) {
this->ensure_on_device(this->device_tracker.device()); this->ensure_on_device(this->device_tracker.device());
size_t batch_size; size_t batch_size;
size_t n_points; size_t n_points;
@ -1045,14 +1045,14 @@ Renderer::backward(
} }
// Prepare the return value. // Prepare the return value.
std::tuple< std::tuple<
at::optional<torch::Tensor>, std::optional<torch::Tensor>,
at::optional<torch::Tensor>, std::optional<torch::Tensor>,
at::optional<torch::Tensor>, std::optional<torch::Tensor>,
at::optional<torch::Tensor>, std::optional<torch::Tensor>,
at::optional<torch::Tensor>, std::optional<torch::Tensor>,
at::optional<torch::Tensor>, std::optional<torch::Tensor>,
at::optional<torch::Tensor>, std::optional<torch::Tensor>,
at::optional<torch::Tensor>> std::optional<torch::Tensor>>
ret; ret;
if (mode == 1 || (!dif_pos && !dif_col && !dif_rad && !dif_cam && !dif_opy)) { if (mode == 1 || (!dif_pos && !dif_col && !dif_rad && !dif_cam && !dif_opy)) {
return ret; return ret;

18
pytorch3d/csrc/pulsar/pytorch/renderer.h
View File

@ -51,14 +51,14 @@ struct Renderer {
const uint& mode); const uint& mode);
std::tuple< std::tuple<
at::optional<torch::Tensor>, std::optional<torch::Tensor>,
at::optional<torch::Tensor>, std::optional<torch::Tensor>,
at::optional<torch::Tensor>, std::optional<torch::Tensor>,
at::optional<torch::Tensor>, std::optional<torch::Tensor>,
at::optional<torch::Tensor>, std::optional<torch::Tensor>,
at::optional<torch::Tensor>, std::optional<torch::Tensor>,
at::optional<torch::Tensor>, std::optional<torch::Tensor>,
at::optional<torch::Tensor>> std::optional<torch::Tensor>>
backward( backward(
const torch::Tensor& grad_im, const torch::Tensor& grad_im,
const torch::Tensor& image, const torch::Tensor& image,
@ -85,7 +85,7 @@ struct Renderer {
const bool& dif_rad, const bool& dif_rad,
const bool& dif_cam, const bool& dif_cam,
const bool& dif_opy, const bool& dif_opy,
const at::optional<std::pair<uint, uint>>& dbg_pos); const std::optional<std::pair<uint, uint>>& dbg_pos);
// Infrastructure. // Infrastructure.
/** /**