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

path_manager in obj_io

Browse Source 
Summary: Use PathManager for checking file existence, rather than assuming the path is a local file, in a couple of cases.

Reviewed By: patricklabatut

Differential Revision: D29734621

fbshipit-source-id: e2236a7c2c50ba6916936a4d786abd601205b519
This commit is contained in:
Jeremy Reizenstein 2021-07-19 05:43:07 -07:00 committed by Facebook GitHub Bot
parent 9e8d91ebf9
commit 1872e0249c
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pytorch3d/io/mtl_io.py
View File

@ -398,7 +398,7 @@ TextureImages = Dict[str, torch.Tensor]
def _parse_mtl( def _parse_mtl(
f, path_manager: PathManager, device: Device = "cpu" f: str, path_manager: PathManager, device: Device = "cpu"
) -> Tuple[MaterialProperties, TextureFiles]: ) -> Tuple[MaterialProperties, TextureFiles]:
material_properties = {} material_properties = {}
texture_files = {} texture_files = {}
@ -456,7 +456,7 @@ def _load_texture_images(
if material_name in texture_files: if material_name in texture_files:
# Load the texture image. # Load the texture image.
path = os.path.join(data_dir, texture_files[material_name]) path = os.path.join(data_dir, texture_files[material_name])
if os.path.isfile(path): if path_manager.exists(path):
image = ( image = (
_read_image(path, path_manager=path_manager, format="RGB") / 255.0 _read_image(path, path_manager=path_manager, format="RGB") / 255.0
) )
@ -475,7 +475,7 @@ def _load_texture_images(
def load_mtl( def load_mtl(
f, f: str,
*, *,
material_names: List[str], material_names: List[str],
data_dir: str, data_dir: str,
@ -487,7 +487,7 @@ def load_mtl(
and specular light (Ka, Kd, Ks, Ns). and specular light (Ka, Kd, Ks, Ns).
Args: Args:
f: a file-like object of the material information. f: path to the material information.
material_names: a list of the material names found in the .obj file. material_names: a list of the material names found in the .obj file.
data_dir: the directory where the material texture files are located. data_dir: the directory where the material texture files are located.
device: Device (as str or torch.tensor) on which to return the new tensors. device: Device (as str or torch.tensor) on which to return the new tensors.

6
pytorch3d/io/obj_io.py
View File

@ -499,7 +499,7 @@ def _parse_obj(f, data_dir: str):
def _load_materials( def _load_materials(
material_names: List[str], material_names: List[str],
f, f: Optional[str],
*, *,
data_dir: str, data_dir: str,
load_textures: bool, load_textures: bool,
@ -511,7 +511,7 @@ def _load_materials(
Args: Args:
material_names: a list of the material names found in the .obj file. material_names: a list of the material names found in the .obj file.
f: a file-like object of the material information. f: path to the material information.
data_dir: the directory where the material texture files are located. data_dir: the directory where the material texture files are located.
load_textures: whether textures should be loaded. load_textures: whether textures should be loaded.
device: Device (as str or torch.device) on which to return the new tensors. device: Device (as str or torch.device) on which to return the new tensors.
@ -529,7 +529,7 @@ def _load_materials(
warnings.warn("No mtl file provided") warnings.warn("No mtl file provided")
return None, None return None, None
if not os.path.isfile(f): if not path_manager.exists(f):
warnings.warn(f"Mtl file does not exist: {f}") warnings.warn(f"Mtl file does not exist: {f}")
return None, None return None, None