Merge pull request #3 from CCInc/master

add pre-commit/gitignore

Author: clee-ai

.gitignore

@@ -0,0 +1,142 @@
+# tp3d specific
+outputs/
+data/
+
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+cover/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+.pybuilder/
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+#   For a library or package, you might want to ignore these files since the code is
+#   intended to run in multiple environments; otherwise, check them in:
+# .python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# pytype static type analyzer
+.pytype/
+
+# Cython debug symbols
+cython_debug/

.pre-commit-config.yaml

@@ -0,0 +1,51 @@
+exclude: 'benchmark|conf|data|docs|outputs'
+
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v1.2.3
+    hooks:
+      - id: trailing-whitespace
+      - id: end-of-file-fixer
+      - id: check-added-large-files
+        args: [--maxkb=15000]
+      - id: check-yaml
+
+  - repo: https://github.com/ambv/black
+    rev: stable
+    hooks:
+      - id: black
+        language_version: python
+
+  - repo: https://github.com/humitos/mirrors-autoflake.git
+    rev: v1.3
+    hooks:
+      - id: autoflake
+        args:
+          [
+            '--in-place',
+            '--remove-unused-variable',
+            '--ignore-init-module-imports',
+            '--imports=torch,torch_geometric,torch_scatter,torch_cluster,numpy,sklearn,scipy,torch_sparse,torch_points_kernels',
+          ]
+  - repo: https://github.com/kynan/nbstripout
+    rev: master
+    hooks:
+      - id: nbstripout
+        files: '.ipynb'
+
+  # - repo: local
+  #   hooks:
+  #     - id: requirements.txt
+  #       name: Generate requirements.txt
+  #       entry: poetry export
+  #       args:
+  #         [
+  #           '-f',
+  #           'requirements.txt',
+  #           '-o',
+  #           'requirements.txt',
+  #           '--without-hashes',
+  #         ]
+  #       pass_filenames: false
+  #       language: system
+  #       files: 'poetry.lock'

pyproject.toml

@@ -0,0 +1,2 @@
+[tool.black]
+line-length = 120

torch_points3d/core/instantiator.py

@@ -15,7 +15,6 @@
 
 
 class Instantiator:
-
     def model(self, *args, **kwargs):
         raise NotImplementedError("Child class must implement method")
 
@@ -39,13 +38,12 @@ def instantiate(self, *args, **kwargs):
 
 
 class HydraInstantiator(Instantiator):
-
     def model(
         self,
         cfg: DictConfig,
         model_data_kwargs: Optional[DictConfig] = None,
         tokenizer: Optional[DictConfig] = None,
-        pipeline_kwargs: Optional[DictConfig] = None
+        pipeline_kwargs: Optional[DictConfig] = None,
     ) -> "TaskTransformer":
         if model_data_kwargs is None:
             model_data_kwargs = {}
@@ -100,4 +98,4 @@ def trainer(self, cfg: DictConfig, **kwargs) -> pl.Trainer:
         return self.instantiate(cfg, **kwargs)
 
     def instantiate(self, *args, **kwargs):
-        return hydra.utils.instantiate(*args, **kwargs)
+        return hydra.utils.instantiate(*args, **kwargs)

torch_points3d/trainer.py

@@ -20,7 +20,7 @@ def instantiate_trainer(self):
 
     def instantiate_dataset_and_model(self):
         dataset: BaseDataset = instantiate_dataset(self._cfg.data)
-        model: BaseModel = instantiate_model(copy.deepcopy(cfg), dataset) 
+        model: BaseModel = instantiate_model(copy.deepcopy(cfg), dataset)
         model.instantiate_optimizers(cfg) # we will change it and instantiate the optimizers separately
         model.set_pretrained_weights()
         dataset.create_dataloaders(
@@ -34,10 +34,9 @@ def instantiate_dataset_and_model(self):
 
     def train(self):
 
-        
+
         # model.tracker_options = cfg.get("tracker_options", {})
         # model.trackers = data_module.trackers
         model, data_module = self.instantiate_dataset_and_model()
         trainer = self.instantiate_trainer()
         trainer.fit(model, data_module)
-

train.py

@@ -3,7 +3,9 @@
 from omegaconf import OmegaConf
 from torch_points3d.trainer import LitTrainer
 
-OmegaConf.register_new_resolver("get_filename", lambda x: x.split('/')[-1])
+OmegaConf.register_new_resolver("get_filename", lambda x: x.split("/")[-1])
+
+
 @hydra.main(config_path="conf", config_name="config")
 def main(cfg):
     OmegaConf.set_struct(cfg, False)  # This allows getattr and hasattr methods to function correctly
@@ -13,5 +15,6 @@ def main(cfg):
     trainer = LitTrainer(cfg)
     trainer.train()
 
+
 if __name__ == "__main__":
     main()