Skip to content

Commit c581efe

Browse files
authored
Python 3.10 (#554)
* TF, Pytorch version updates Custom PyTorch not needed any more with PyTorch 1.12 TB plugin troubleshooting docs * torch._six updates for Torch 1.12
1 parent 267ec3c commit c581efe

File tree

5 files changed

+30
-20
lines changed

5 files changed

+30
-20
lines changed

docs/tensorboard.md

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ order.
252252

253253
Now you can visualize the data in TensorBoard as before. The web interface
254254
allows showing and hiding points with different classes, changing their colors,
255-
and exploring predictions and intermediate network features. Scalar network
255+
and exploring predictions and intermediate network features. Scalar network
256256
features can be visualized with custom user editable colormaps, and 3D features
257257
can be visualized as RGB colors. Here is a video showing the different ways in
258258
which semantic segmentation summary data can be visualized in TensorBoard.
@@ -376,3 +376,14 @@ for step in range(len(val_split)): # one pointcloud per step
376376
step,
377377
label_to_names=dset.get_label_to_names())
378378
```
379+
380+
Troubleshooting
381+
---------------
382+
383+
If you cannot interact with the 3D model, or use controls in the WebRTC widget,
384+
make sure that Allow Autoplay is enabled for the Tensorboard web site and reload.
385+
386+
<img src=https://user-images.githubusercontent.com/41028320/180485249-5233b65e-11b1-44ff-bfc4-35f390ef51f2.png
387+
title="Allow Autoplay for correct behavior."
388+
alt="Allow Autoplay for correct behavior."
389+
style="width:80%;display:block;margin:auto"></img>

ml3d/torch/dataloaders/default_batcher.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import torch
22
import re
3-
from torch._six import container_abcs, string_classes, int_classes
3+
import collections.abc
4+
from torch._six import string_classes
45

56
np_str_obj_array_pattern = re.compile(r'[SaUO]')
67

@@ -17,11 +18,11 @@ def default_convert(data):
1718
and np_str_obj_array_pattern.search(data.dtype.str) is not None:
1819
return data
1920
return torch.as_tensor(data)
20-
elif isinstance(data, container_abcs.Mapping):
21+
elif isinstance(data, collections.abc.Mapping):
2122
return {key: default_convert(data[key]) for key in data}
2223
elif isinstance(data, tuple) and hasattr(data, '_fields'): # namedtuple
2324
return elem_type(*(default_convert(d) for d in data))
24-
elif isinstance(data, container_abcs.Sequence) and not isinstance(
25+
elif isinstance(data, collections.abc.Sequence) and not isinstance(
2526
data, string_classes):
2627
return [default_convert(d) for d in data]
2728
else:
@@ -59,15 +60,15 @@ def default_collate(batch):
5960
return torch.as_tensor(batch)
6061
elif isinstance(elem, float):
6162
return torch.tensor(batch, dtype=torch.float64)
62-
elif isinstance(elem, int_classes):
63+
elif isinstance(elem, int):
6364
return torch.tensor(batch)
6465
elif isinstance(elem, string_classes):
6566
return batch
66-
elif isinstance(elem, container_abcs.Mapping):
67+
elif isinstance(elem, collections.abc.Mapping):
6768
return {key: default_collate([d[key] for d in batch]) for key in elem}
6869
elif isinstance(elem, tuple) and hasattr(elem, '_fields'): # namedtuple
6970
return elem_type(*(default_collate(samples) for samples in zip(*batch)))
70-
elif isinstance(elem, container_abcs.Sequence):
71+
elif isinstance(elem, collections.abc.Sequence):
7172
# check to make sure that the elements in batch have consistent size
7273
it = iter(batch)
7374
elem_size = len(next(it))

requirements-tensorflow.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
tensorflow~=2.5.2
1+
tensorflow~=2.8.2

requirements-torch-cuda.txt

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
https://open3d-downloads.b-cdn.net/torch-1.8.2-cp36-cp36m-linux_x86_64.whl ; python_version == '3.6'
2-
https://open3d-downloads.b-cdn.net/torch-1.8.2-cp37-cp37m-linux_x86_64.whl ; python_version == '3.7'
3-
https://open3d-downloads.b-cdn.net/torch-1.8.2-cp38-cp38-linux_x86_64.whl ; python_version == '3.8'
4-
https://open3d-downloads.b-cdn.net/torch-1.8.2-cp39-cp39-linux_x86_64.whl ; python_version == '3.9'
5-
-f https://download.pytorch.org/whl/lts/1.8/torch_lts.html
6-
torchvision==0.9.2+cu111
7-
tensorboard
1+
-f https://download.pytorch.org/whl/torch/
2+
torch==1.12.0+cu116
3+
-f https://download.pytorch.org/whl/torchvision/
4+
torchvision==0.13.0+cu116
5+
tensorboard~=2.8.0

requirements-torch.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
-f https://download.pytorch.org/whl/lts/1.8/torch_lts.html
2-
torch==1.8.2+cpu ; sys_platform != 'darwin'
3-
torchvision==0.9.2+cpu ; sys_platform != 'darwin'
4-
torch==1.8.1 ; sys_platform == 'darwin'
5-
torchvision==0.9.1 ; sys_platform == 'darwin'
1+
--extra-index-url https://download.pytorch.org/whl/torch/
2+
torch==1.12.0+cpu ; sys_platform != 'darwin'
3+
torchvision==0.13.0+cpu ; sys_platform != 'darwin'
4+
torch==1.12.0 ; sys_platform == 'darwin'
5+
torchvision==0.13.0 ; sys_platform == 'darwin'
66
tensorboard

0 commit comments

Comments
 (0)