Merge pull request #45 from BirkhoffG/legacy

Delete legacy TabularDataModule
BirkhoffG · May 28, 2024 · 7f7bdee · 7f7bdee
2 parents 7a56e65 + 5e39cbc
commit 7f7bdee
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 79 deletions.
diff --git a/nbs/01_data.ipynb b/nbs/01_data.ipynb
@@ -795,53 +795,6 @@
     "assert np.allclose(data, dm.xs)"
    ]
   },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "### Legacy\n",
-    "\n",
-    "> Legacy code for DataModule\n",
-    "\n",
-    ":::{.callout-warning}\n",
-    "\n",
-    "Don't use these if you do not have to.\n",
-    "\n",
-    ":::"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "#| export\n",
-    "class TabularDataModuleConfigs(DataModuleConfig):\n",
-    "    \"\"\"!!!Deprecated!!! - Configurator of `TabularDataModule`.\"\"\"\n",
-    "    def __ini__(self, *args, **kwargs):\n",
-    "        super().__init__(*args, **kwargs)\n",
-    "        warnings.warn(\"TabularDataModuleConfigs is deprecated since v0.2, please use DataModuleConfig instead.\", \n",
-    "                      DeprecationWarning)"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "#| export\n",
-    "class TabularDataModule(DataModule):\n",
-    "    \"\"\"!!!Deprecated!!! - DataModule for tabular data.\"\"\"\n",
-    "    def __init__(self, *args, **kwargs):\n",
-    "        super().__init__(*args, **kwargs)\n",
-    "        warnings.warn(\"TabularDataModule is deprecated since v0.2, please use DataModule instead.\", \n",
-    "                      DeprecationWarning)\n",
-    "        \n",
-    "    __ALL__ = []"
-   ]
-  },
   {
    "attachments": {},
    "cell_type": "markdown",

diff --git a/nbs/methods/04_counternet.ipynb b/nbs/methods/04_counternet.ipynb
@@ -157,8 +157,8 @@
    "outputs": [],
    "source": [
     "#| export\n",
-    "class CounterNetTrainingModule(BaseTrainingModule):\n",
-    "    def __init__(self, config: CounterNetConfig | dict):\n",
+    "class CounterNetTrainingModule(BaseTrainingModule):    \n",
+    "    def __init__(self, config: \"CounterNetConfig\" | dict):\n",
     "        self.save_hyperparameters(config.dict())\n",
     "        self.configs = validate_configs(config, CounterNetConfig)\n",
     "        self.net = make_hk_module(\n",

diff --git a/relax/_modidx.py b/relax/_modidx.py
@@ -66,13 +66,6 @@
                                                                                             'relax/data_module.py'),
                                    'relax.data_module.DataModuleInfoMixin.xs': ('data.html#datamoduleinfomixin.xs', 'relax/data_module.py'),
                                    'relax.data_module.DataModuleInfoMixin.ys': ('data.html#datamoduleinfomixin.ys', 'relax/data_module.py'),
-                                   'relax.data_module.TabularDataModule': ('data.html#tabulardatamodule', 'relax/data_module.py'),
-                                   'relax.data_module.TabularDataModule.__init__': ( 'data.html#tabulardatamodule.__init__',
-                                                                                     'relax/data_module.py'),
-                                   'relax.data_module.TabularDataModuleConfigs': ( 'data.html#tabulardatamoduleconfigs',
-                                                                                   'relax/data_module.py'),
-                                   'relax.data_module.TabularDataModuleConfigs.__ini__': ( 'data.html#tabulardatamoduleconfigs.__ini__',
-                                                                                           'relax/data_module.py'),
                                    'relax.data_module._validate_dataname': ('data.html#_validate_dataname', 'relax/data_module.py'),
                                    'relax.data_module.dataframe2features': ('data.html#dataframe2features', 'relax/data_module.py'),
                                    'relax.data_module.dataframe2labels': ('data.html#dataframe2labels', 'relax/data_module.py'),

diff --git a/relax/data_module.py b/relax/data_module.py
@@ -20,7 +20,7 @@
 
 # %% auto 0
 __all__ = ['BaseDataModule', 'DataModuleConfig', 'features2config', 'features2pandas', 'dataframe2features', 'dataframe2labels',
-           'DataModule', 'TabularDataModuleConfigs', 'TabularDataModule', 'download_data_module_files', 'load_data']
+           'DataModule', 'download_data_module_files', 'load_data']
 
 # %% ../nbs/01_data.ipynb 6
 class BaseDataModule(BaseModule):
@@ -409,24 +409,6 @@ def dm_equals(dm1: DataModule, dm2: DataModule):
     )
 
 # %% ../nbs/01_data.ipynb 30
-class TabularDataModuleConfigs(DataModuleConfig):
-    """!!!Deprecated!!! - Configurator of `TabularDataModule`."""
-    def __ini__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        warnings.warn("TabularDataModuleConfigs is deprecated since v0.2, please use DataModuleConfig instead.", 
-                      DeprecationWarning)
-
-# %% ../nbs/01_data.ipynb 31
-class TabularDataModule(DataModule):
-    """!!!Deprecated!!! - DataModule for tabular data."""
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        warnings.warn("TabularDataModule is deprecated since v0.2, please use DataModule instead.", 
-                      DeprecationWarning)
-
-    __ALL__ = []
-
-# %% ../nbs/01_data.ipynb 33
 DEFAULT_DATA = [
     'adult',
     'heloc',
@@ -451,13 +433,13 @@ def __init__(self, *args, **kwargs):
     } for data in DEFAULT_DATA
 }
 
-# %% ../nbs/01_data.ipynb 38
+# %% ../nbs/01_data.ipynb 35
 def _validate_dataname(data_name: str):
     if data_name not in DEFAULT_DATA:
         raise ValueError(f'`data_name` must be one of {DEFAULT_DATA}, '
             f'but got data_name={data_name}.')
 
-# %% ../nbs/01_data.ipynb 39
+# %% ../nbs/01_data.ipynb 36
 def download_data_module_files(
     data_name: str, # The name of data
     data_parent_dir: Path, # The directory to save data.

diff --git a/relax/methods/counternet.py b/relax/methods/counternet.py
@@ -69,8 +69,8 @@ def partition_trainable_params(params: hk.Params, trainable_name: str):
 
 
 # %% ../../nbs/methods/04_counternet.ipynb 8
-class CounterNetTrainingModule(BaseTrainingModule):
-    def __init__(self, config: CounterNetConfig | dict):
+class CounterNetTrainingModule(BaseTrainingModule):    
+    def __init__(self, config: "CounterNetConfig" | dict):
         self.save_hyperparameters(config.dict())
         self.configs = validate_configs(config, CounterNetConfig)
         self.net = make_hk_module(