reduced-3dgs 1.9.4__cp312-cp312-win_amd64.whl → 1.9.5__cp312-cp312-win_amd64.whl

reduced_3dgs/pruning/combinations.py

@@ -23,7 +23,7 @@ def PrunerInDensifyTrainerWrapper(
     return SplitCloneDensifierTrainerWrapper(
         lambda model, scene_extent: BasePruner(
             noargs_base_densifier_constructor(model, scene_extent, dataset),
-            dataset,
+            scene_extent, dataset,
             prune_from_iter=prune_from_iter,
             prune_until_iter=prune_until_iter,
             prune_interval=prune_interval,

reduced_3dgs/pruning/trainer.py

@@ -1,7 +1,7 @@
 from typing import Callable, List
 import torch
 from gaussian_splatting import GaussianModel, Camera
-from gaussian_splatting.trainer import AbstractDensifier, DensifierWrapper, DensificationTrainer, NoopDensifier
+from gaussian_splatting.trainer import AbstractDensifier, OpacityPruner, DensificationTrainer, NoopDensifier
 from reduced_3dgs.diff_gaussian_rasterization._C import sphere_ellipsoid_intersection, allocate_minimum_redundancy_value, find_minimum_projected_pixel_size
 from reduced_3dgs.simple_knn._C import distIndex2
 
@@ -79,33 +79,28 @@ def mercy_gaussians(
     return mask
 
 
-class BasePruner(DensifierWrapper):
+class BasePruner(OpacityPruner):
     def __init__(
             self, base_densifier: AbstractDensifier,
+            scene_extent,
             dataset: List[Camera],
-            prune_from_iter=1000,
-            prune_until_iter=15000,
-            prune_interval: int = 100,
+            *args,
             box_size=1.,
             lambda_mercy=1.,
             mercy_minimum=3,
-            mercy_type='redundancy_opacity'):
-        super().__init__(base_densifier)
+            mercy_type='redundancy_opacity',
+            **kwargs):
+        super().__init__(base_densifier, scene_extent, *args, **kwargs)
         self.dataset = dataset
-        self.prune_from_iter = prune_from_iter
-        self.prune_until_iter = prune_until_iter
-        self.prune_interval = prune_interval
         self.box_size = box_size
         self.lambda_mercy = lambda_mercy
         self.mercy_minimum = mercy_minimum
         self.mercy_type = mercy_type
 
-    def densify_and_prune(self, loss, out, camera, step: int):
-        ret = super().densify_and_prune(loss, out, camera, step)
-        if self.prune_from_iter <= step <= self.prune_until_iter and step % self.prune_interval == 0:
-            remove_mask = mercy_gaussians(self.model, self.dataset, self.box_size, self.lambda_mercy, self.mercy_minimum, self.mercy_type)
-            ret = ret._replace(remove_mask=remove_mask if ret.remove_mask is None else torch.logical_or(remove_mask, ret.remove_mask))
-        return ret
+    def prune(self) -> torch.Tensor:
+        remove_mask = mercy_gaussians(self.model, self.dataset, self.box_size, self.lambda_mercy, self.mercy_minimum, self.mercy_type)
+        prune_mask = torch.logical_or(super().prune(), remove_mask)
+        return prune_mask
 
 
 def PruningTrainerWrapper(
@@ -126,7 +121,7 @@ def PruningTrainerWrapper(
         model, scene_extent,
         BasePruner(
             noargs_base_densifier_constructor(model, scene_extent, dataset),
-            dataset,
+            scene_extent, dataset,
             prune_from_iter=prune_from_iter,
             prune_until_iter=prune_until_iter,
             prune_interval=prune_interval,

{reduced_3dgs-1.9.4.dist-info → reduced_3dgs-1.9.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: reduced_3dgs
-Version: 1.9.4
+Version: 1.9.5
 Summary: Refactored code for the paper "Reducing the Memory Footprint of 3D Gaussian Splatting"
 Home-page: https://github.com/yindaheng98/reduced-3dgs
 Author: yindaheng98

{reduced_3dgs-1.9.4.dist-info → reduced_3dgs-1.9.5.dist-info}/RECORD

@@ -2,16 +2,16 @@ reduced_3dgs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reduced_3dgs/combinations.py,sha256=k4ErxpAscCqJMtVXZ29KGQjw2VoZMV0W3V4u3nj0e-Y,9401
 reduced_3dgs/quantize.py,sha256=Y44qHyFdOIqke7NoeqXmyKloS43j-al74ZiNsuZZHbM,2527
 reduced_3dgs/train.py,sha256=jXHdXk05o_ebHjx_VBzcY6fRNn9EdKve6Tf5YC5an0o,9803
-reduced_3dgs/diff_gaussian_rasterization/_C.cp312-win_amd64.pyd,sha256=o_y_FvFjfs_Jqyq9_8SJV5jQKavL9Jk4nqISH9fP-LU,1640448
+reduced_3dgs/diff_gaussian_rasterization/_C.cp312-win_amd64.pyd,sha256=D7ZCIZZAsv4ybmBpLOqxk_ciPlpO5TrxpHMejYYmKmc,1640448
 reduced_3dgs/diff_gaussian_rasterization/__init__.py,sha256=oV6JjTc-50MscX4XHeIWSgLr3l8Y25knBIs-0gRbJr4,7932
 reduced_3dgs/importance/__init__.py,sha256=neJsbY5cLikEGBQGdR4MjwCQ5VWVikT1357DwL0EtWU,289
 reduced_3dgs/importance/combinations.py,sha256=eAdykeTdvRGCHxskjILQnZVaqQVvwC-0wMxdgYMeeDs,2922
 reduced_3dgs/importance/trainer.py,sha256=Sj4ORvoYtFT7z3hifzFZDfhFyqumHraXyk3vMVtk0AU,12661
-reduced_3dgs/importance/diff_gaussian_rasterization/_C.cp312-win_amd64.pyd,sha256=Wi78OzF9IseWM0Hl07MG9ZU40BhShbihFWYqz1hx4tw,1320448
+reduced_3dgs/importance/diff_gaussian_rasterization/_C.cp312-win_amd64.pyd,sha256=CKNzRxNhntqRRGnvMYtFjxzFqVIGcPZ92XMW59o0uBc,1320448
 reduced_3dgs/importance/diff_gaussian_rasterization/__init__.py,sha256=Tix8auyXBb_QFQtXrV3sLE9kdnl5zgHH0BbqcFzDp84,12850
 reduced_3dgs/pruning/__init__.py,sha256=E_YxJ9cDV_B6EJbYUBEcuRYMIht_C72rI1VJUXFCLpM,201
-reduced_3dgs/pruning/combinations.py,sha256=UivTfbSMmaWYVi9E4OF-_AZA-WBWniMiX-wKUftezF8,2331
-reduced_3dgs/pruning/trainer.py,sha256=898m5-7AZFmzQJtyMdQcInOZtDGsAeM3OAplHsm3oSY,6948
+reduced_3dgs/pruning/combinations.py,sha256=QhXt2C7pTXhwzp9hPL9dVdiQzz0cUQpm5qljqytPEsM,2345
+reduced_3dgs/pruning/trainer.py,sha256=JJml-uYfDfUpbsjRNZbIvnUYYslVgFXkhejbkYSo0s4,6542
 reduced_3dgs/quantization/__init__.py,sha256=1z1xMn3yj9u7cR9JizGrI3WSyIES_Tqq6oDquvglSeo,225
 reduced_3dgs/quantization/abc.py,sha256=rsi8HFRwQCltWTYiJ3BpygtQDT7hK6J01jKMOboOY8w,1910
 reduced_3dgs/quantization/exclude_zeros.py,sha256=fKSgjHous4OpdI6mQi9z23if9jnbB79w2jChpxkCJWw,2381
@@ -20,9 +20,9 @@ reduced_3dgs/quantization/wrapper.py,sha256=cyXqfJgo9b3fS7DYXxOk5LmQudvrEhweOebF
 reduced_3dgs/shculling/__init__.py,sha256=nP2BejDCUdCmJNRbg0hfhHREO6jyZXwIcRiw6ttVgqo,149
 reduced_3dgs/shculling/gaussian_model.py,sha256=f8QWaL09vaV9Tcf6Dngjg_Fmk1wTQPAjWhuhI_N02Y8,2877
 reduced_3dgs/shculling/trainer.py,sha256=9hwR77djhZpyf-URhwKHjnLbe0ZAOS-DIw58RzkcHXQ,6369
-reduced_3dgs/simple_knn/_C.cp312-win_amd64.pyd,sha256=lDmfptqx2mPJQW99lXsblwb6LHopGnmC805eukrs59A,1267712
-reduced_3dgs-1.9.4.dist-info/licenses/LICENSE.md,sha256=LQ4_LAqlncGkg_mQy5ykMAFtQDSPB0eKmIEtBut0yjw,4916
-reduced_3dgs-1.9.4.dist-info/METADATA,sha256=AxCPAYi-0sHw1PwzbbNWsK5GL1pdc8VoCnzSYXcjFik,13014
-reduced_3dgs-1.9.4.dist-info/WHEEL,sha256=t5QiC5vd2hOdU0bFY5fyqZIc3wMdCuUPTCilUZToJT4,101
-reduced_3dgs-1.9.4.dist-info/top_level.txt,sha256=PpU5aT3-baSCdqCtTaZknoB32H93UeKCkYDkRCCZMEI,13
-reduced_3dgs-1.9.4.dist-info/RECORD,,
+reduced_3dgs/simple_knn/_C.cp312-win_amd64.pyd,sha256=nW0YFZFsAzZu92nWX3SLB7II3V0ivfkT2O9M0L9PmrM,1267712
+reduced_3dgs-1.9.5.dist-info/licenses/LICENSE.md,sha256=LQ4_LAqlncGkg_mQy5ykMAFtQDSPB0eKmIEtBut0yjw,4916
+reduced_3dgs-1.9.5.dist-info/METADATA,sha256=VkgFVSczzZCk6RpIMZ_fEA18ZVyf6tSc7cEJhLUtixY,13014
+reduced_3dgs-1.9.5.dist-info/WHEEL,sha256=t5QiC5vd2hOdU0bFY5fyqZIc3wMdCuUPTCilUZToJT4,101
+reduced_3dgs-1.9.5.dist-info/top_level.txt,sha256=PpU5aT3-baSCdqCtTaZknoB32H93UeKCkYDkRCCZMEI,13
+reduced_3dgs-1.9.5.dist-info/RECORD,,