Merge pull request #769 from CCInc/remove-h5py

Remove dependency on h5py
torch-points3d · Aug 16, 2023 · 97e10a8 · 97e10a8
2 parents 0ea717f + a6e613a
commit 97e10a8
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 22 deletions.
diff --git a/docs/conf.py b/docs/conf.py
@@ -56,7 +56,6 @@
     "pandas",
     "numpy",
     "torchnet",
-    "h5py",
     "plyfile",
     "wandb",
     "numba",

diff --git a/pyproject.toml b/pyproject.toml
@@ -32,7 +32,6 @@ plyfile = "^0.7.2"
 gdown = "^3.12.0"
 types-six = "^0.1.6"
 types-requests = "^0.1.11"
-h5py = "^3.3.0"
 laspy = "^2.0.3"
 
 [tool.poetry.dev-dependencies]

diff --git a/requirements.txt b/requirements.txt
@@ -31,7 +31,6 @@ googledrivedownloader==0.4; python_version >= "3.6"
 gql==0.2.0; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.4.0"
 graphql-core==1.1; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.4.0"
 grpcio==1.40.0; python_version >= "3.6"
-h5py==3.4.0; python_version >= "3.7"
 hydra-core==1.0.7
 idna==3.2; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.6"
 imageio==2.9.0; python_version >= "3.6"

diff --git a/test/test_confusionMatrix.py b/test/test_confusionMatrix.py
@@ -2,10 +2,7 @@
 import sys
 import numpy as np
 import unittest
-import tempfile
-import h5py
 import numpy.testing as npt
-import numpy.matlib
 
 DIR_PATH = os.path.dirname(os.path.realpath(__file__))
 sys.path.insert(0, os.path.join(DIR_PATH, ".."))

diff --git a/test/test_grid_sampling.py b/test/test_grid_sampling.py
@@ -3,9 +3,7 @@
 import numpy as np
 import torch
 import unittest
-import h5py
 import numpy.testing as npt
-import numpy.matlib
 from torch_geometric.data import Data
 
 DIR_PATH = os.path.dirname(os.path.realpath(__file__))

diff --git a/test/test_ind_tracker.py b/test/test_ind_tracker.py
@@ -3,9 +3,7 @@
 import numpy as np
 import torch
 import unittest
-import h5py
 import numpy.testing as npt
-import numpy.matlib
 from torch_geometric.data import Data
 
 DIR_PATH = os.path.dirname(os.path.realpath(__file__))

diff --git a/torch_points3d/datasets/classification/modelnet.py b/torch_points3d/datasets/classification/modelnet.py
@@ -3,9 +3,7 @@
 import shutil
 import torch
 
-from torch_geometric.datasets import ModelNet
-from torch_geometric.data import DataLoader, InMemoryDataset, extract_zip, Data
-import torch_geometric.transforms as T
+from torch_geometric.data import InMemoryDataset, extract_zip, Data
 from torch_geometric.io import read_txt_array
 
 from torch_points3d.datasets.base_dataset import BaseDataset

diff --git a/torch_points3d/datasets/segmentation/s3dis.py b/torch_points3d/datasets/segmentation/s3dis.py
@@ -1,27 +1,19 @@
 import os
 import os.path as osp
-from itertools import repeat, product
 import numpy as np
-import h5py
 import torch
 import random
 import glob
 from plyfile import PlyData, PlyElement
-from torch_geometric.data import InMemoryDataset, Data, extract_zip, Dataset
-from torch_geometric.data.dataset import files_exist
-from torch_geometric.data import DataLoader
+from torch_geometric.data import InMemoryDataset, Data, extract_zip
 from torch_geometric.datasets import S3DIS as S3DIS1x1
-import torch_geometric.transforms as T
 import logging
 from sklearn.neighbors import NearestNeighbors, KDTree
 from tqdm.auto import tqdm as tq
-import csv
 import pandas as pd
-import pickle
 import gdown
 import shutil
 
-from torch_points3d.datasets.samplers import BalancedRandomSampler
 import torch_points3d.core.data_transform as cT
 from torch_points3d.datasets.base_dataset import BaseDataset