run prepare_release.sh

nmichlo · Mar 31, 2022 · 6ed30c8 · 6ed30c8
1 parent 17e18ab
commit 6ed30c8
Show file tree

Hide file tree

Showing 250 changed files with 0 additions and 24,345 deletions.
diff --git a/disent/dataset/sampling/_groundtruth__dist.py b/disent/dataset/sampling/_groundtruth__dist.py
@@ -178,7 +178,6 @@ def main():
         from disent.dataset.data import DSpritesData
         from disent.dataset.data import SmallNorb64Data
         from disent.util.seeds import TempNumpySeed
-        from research.code.dataset.data import XYSquaresMinimalData  # pragma: delete-on-release
         from tqdm import tqdm
 
         repeats = 1000
@@ -206,7 +205,6 @@ def main():
                 Shapes3dData,
                 DSpritesData,
                 SmallNorb64Data,
-                XYSquaresMinimalData,  # pragma: delete-on-release
                 XYObjectData,
                 XYObjectShadedData,
             ]:

diff --git a/disent/dataset/util/stats.py b/disent/dataset/util/stats.py
@@ -87,7 +87,6 @@ def compute_data_mean_std(
     def main(progress=True, num_workers=0, batch_size=256):  # try changing workers to zero on MacOS
         from disent.dataset import data
         from disent.dataset.transform import ToImgTensorF32
-        from research.code.dataset import data as rdat  # pragma: delete-on-release
 
         for data_cls in [
             # groundtruth -- impl
@@ -100,20 +99,6 @@ def main(progress=True, num_workers=0, batch_size=256):  # try changing workers
             # groundtruth -- impl synthetic
             data.XYObjectData,
             data.XYObjectShadedData,
-            rdat.XYBlocksData,          # pragma: delete-on-release
-            rdat.XYSquaresData,         # pragma: delete-on-release
-            rdat.XYSquaresMinimalData,  # pragma: delete-on-release
-            rdat.XColumnsData,          # pragma: delete-on-release
-            # groundtruth -- increasing overlap                        # pragma: delete-on-release
-            (rdat.XYSquaresData, dict(grid_size=8, grid_spacing=8)),   # pragma: delete-on-release
-            (rdat.XYSquaresData, dict(grid_size=8, grid_spacing=7)),   # pragma: delete-on-release
-            (rdat.XYSquaresData, dict(grid_size=8, grid_spacing=6)),   # pragma: delete-on-release
-            (rdat.XYSquaresData, dict(grid_size=8, grid_spacing=5)),   # pragma: delete-on-release
-            (rdat.XYSquaresData, dict(grid_size=8, grid_spacing=4)),   # pragma: delete-on-release
-            (rdat.XYSquaresData, dict(grid_size=8, grid_spacing=3)),   # pragma: delete-on-release
-            (rdat.XYSquaresData, dict(grid_size=8, grid_spacing=2)),   # pragma: delete-on-release
-            (rdat.XYSquaresData, dict(grid_size=8, grid_spacing=1)),   # pragma: delete-on-release
-            (rdat.XYSquaresData, dict(rgb=False)),                     # pragma: delete-on-release
             # large datasets
             (data.Mpi3dData, dict(subset='toy',       in_memory=True)),
             (data.Mpi3dData, dict(subset='realistic', in_memory=True)),

diff --git a/prepare_release.sh b/prepare_release.sh
diff --git a/prepare_release_and_commit.sh b/prepare_release_and_commit.sh
diff --git a/requirements-research-freeze.txt b/requirements-research-freeze.txt
diff --git a/requirements-research.txt b/requirements-research.txt
diff --git a/research/__init__.py b/research/__init__.py
diff --git a/research/code/__init__.py b/research/code/__init__.py