Merge pull request #79 from rctn/harrison/whiten

Whitening Update
rctn · Dec 2, 2024 · 08068b8 · 08068b8
2 parents 60f3342 + 97ec9fe
commit 08068b8
Show file tree

Hide file tree

Showing 13 changed files with 1,634 additions and 372 deletions.
diff --git a/examples/Data_Whitening.ipynb b/examples/Data_Whitening.ipynb
diff --git a/examples/inference_natural_images.ipynb b/examples/inference_natural_images.ipynb
diff --git a/examples/ista_example.ipynb b/examples/ista_example.ipynb
@@ -2,7 +2,7 @@
  "cells": [
   {
    "cell_type": "code",
-   "execution_count": 1,
+   "execution_count": null,
    "id": "218ed8be",
    "metadata": {},
    "outputs": [],
@@ -16,7 +16,7 @@
     "\n",
     "from sparsecoding import inference\n",
     "from sparsecoding import models\n",
-    "from sparsecoding.data.transforms.patch import sample_random_patches\n",
+    "from sparsecoding.transforms import sample_random_patches\n",
     "from sparsecoding.visualization import plot_dictionary\n",
     "from sparsecoding.visualization import plot_patches"
    ]

diff --git a/examples/sparse_coding.ipynb b/examples/sparse_coding.ipynb
@@ -2,7 +2,7 @@
  "cells": [
   {
    "cell_type": "code",
-   "execution_count": 1,
+   "execution_count": null,
    "id": "218ed8be",
    "metadata": {},
    "outputs": [],
@@ -15,7 +15,7 @@
     "import numpy as np\n",
     "from scipy.io import loadmat\n",
     "\n",
-    "from sparsecoding.data.transforms.patch import sample_random_patches\n",
+    "from sparsecoding.transforms import sample_random_patches\n",
     "from sparsecoding import inference\n",
     "\n",
     "from sparsecoding import models\n",

diff --git a/sparsecoding/datasets.py b/sparsecoding/datasets.py
@@ -1,7 +1,7 @@
 import torch
 import os
 from scipy.io import loadmat
-from sparsecoding.transforms.patch import patchify
+from sparsecoding.transforms import patchify
 from torch.utils.data import Dataset
 
 from sparsecoding.priors import Prior

diff --git a/sparsecoding/transforms/__init__.py b/sparsecoding/transforms/__init__.py
@@ -0,0 +1,7 @@
+from .whiten import whiten, compute_whitening_stats
+from .images import whiten_images, compute_image_whitening_stats, WhiteningTransform, \
+                    quilt, patchify, sample_random_patches
+
+__all__ = ['quilt', 'patchify', 'sample_random_patches', 'whiten',
+           'compute_whitening_stats', 'compute_image_whitening_stats',
+           'WhiteningTransform', 'whiten_images']