fix import bug on torch 1.9.0

actnn/actnn/_utils/collate.py

@@ -7,7 +7,8 @@
 
 import torch
 import re
-from torch._six import container_abcs, string_classes, int_classes
+from torch._six import string_classes
+import collections.abc as container_abcs
 
 np_str_obj_array_pattern = re.compile(r'[SaUO]')
 
@@ -66,7 +67,7 @@ def default_collate(batch):
             return torch.as_tensor(batch)
     elif isinstance(elem, float):
         return torch.tensor(batch, dtype=torch.float64)
-    elif isinstance(elem, int_classes):
+    elif isinstance(elem, int):
         return torch.tensor(batch)
     elif isinstance(elem, string_classes):
         return batch

actnn/actnn/_utils/pin_memory.py

@@ -6,7 +6,9 @@
 """
 
 import torch
-from torch._six import queue, container_abcs, string_classes
+from torch._six import string_classes
+import queue
+import collections.abc as container_abcs
 from . import MP_STATUS_CHECK_INTERVAL
 from torch._utils import ExceptionWrapper
 

actnn/actnn/_utils/worker.py

@@ -8,7 +8,7 @@
 import random
 import os
 from collections import namedtuple
-from torch._six import queue
+import queue
 from torch._utils import ExceptionWrapper
 from . import signal_handling, MP_STATUS_CHECK_INTERVAL, IS_WINDOWS
 

actnn/actnn/dataloader.py

@@ -13,7 +13,8 @@
 import torch
 import torch.multiprocessing as multiprocessing
 from torch._utils import ExceptionWrapper
-from torch._six import queue, string_classes
+import queue
+from torch._six import string_classes
 
 from torch.utils.data import IterableDataset, Sampler, SequentialSampler, RandomSampler, BatchSampler
 from . import _utils