Undo c10=>std optional rename

Summary: Undoes the pytorch3d changes in D57294278 because they break builds for for PyTorch<2.1 .

Reviewed By: MichaelRamamonjisoa

Differential Revision: D57379779

fbshipit-source-id: 47a12511abcec4c3f4e2f62eff5ba99deb2fab4c
This commit is contained in:
Jeremy Reizenstein 2024-06-17 07:09:30 -07:00 committed by Facebook GitHub Bot
parent 717493cb79
commit b66d17a324
2 changed files with 12 additions and 12 deletions

View File

@ -213,8 +213,8 @@ std::tuple<size_t, size_t, bool, torch::Tensor> Renderer::arg_check(
const float& gamma,
const float& max_depth,
float& min_depth,
const std::optional<torch::Tensor>& bg_col,
const std::optional<torch::Tensor>& opacity,
const c10::optional<torch::Tensor>& bg_col,
const c10::optional<torch::Tensor>& opacity,
const float& percent_allowed_difference,
const uint& max_n_hits,
const uint& mode) {
@ -668,8 +668,8 @@ std::tuple<torch::Tensor, torch::Tensor> Renderer::forward(
const float& gamma,
const float& max_depth,
float min_depth,
const std::optional<torch::Tensor>& bg_col,
const std::optional<torch::Tensor>& opacity,
const c10::optional<torch::Tensor>& bg_col,
const c10::optional<torch::Tensor>& opacity,
const float& percent_allowed_difference,
const uint& max_n_hits,
const uint& mode) {
@ -912,8 +912,8 @@ Renderer::backward(
const float& gamma,
const float& max_depth,
float min_depth,
const std::optional<torch::Tensor>& bg_col,
const std::optional<torch::Tensor>& opacity,
const c10::optional<torch::Tensor>& bg_col,
const c10::optional<torch::Tensor>& opacity,
const float& percent_allowed_difference,
const uint& max_n_hits,
const uint& mode,

View File

@ -44,8 +44,8 @@ struct Renderer {
const float& gamma,
const float& max_depth,
float min_depth,
const std::optional<torch::Tensor>& bg_col,
const std::optional<torch::Tensor>& opacity,
const c10::optional<torch::Tensor>& bg_col,
const c10::optional<torch::Tensor>& opacity,
const float& percent_allowed_difference,
const uint& max_n_hits,
const uint& mode);
@ -75,8 +75,8 @@ struct Renderer {
const float& gamma,
const float& max_depth,
float min_depth,
const std::optional<torch::Tensor>& bg_col,
const std::optional<torch::Tensor>& opacity,
const c10::optional<torch::Tensor>& bg_col,
const c10::optional<torch::Tensor>& opacity,
const float& percent_allowed_difference,
const uint& max_n_hits,
const uint& mode,
@ -115,8 +115,8 @@ struct Renderer {
const float& gamma,
const float& max_depth,
float& min_depth,
const std::optional<torch::Tensor>& bg_col,
const std::optional<torch::Tensor>& opacity,
const c10::optional<torch::Tensor>& bg_col,
const c10::optional<torch::Tensor>& opacity,
const float& percent_allowed_difference,
const uint& max_n_hits,
const uint& mode);