[ENH] transfer datasets to learning

abl/learning/__init__.py

@@ -1,4 +1,5 @@
 from .abl_model import ABLModel
 from .basic_nn import BasicNN
+from .torch_dataset import *
 
 __all__ = ["ABLModel", "BasicNN"]

abl/learning/basic_nn.py

@@ -8,7 +8,7 @@ import numpy
 import torch
 from torch.utils.data import DataLoader
 
-from ..dataset import ClassificationDataset, PredictionDataset
+from .torch_dataset import ClassificationDataset, PredictionDataset
 from ..utils.logger import print_log
 
 

docs/API/abl.dataset.rst

@@ -1,7 +0,0 @@
-abl.dataset
-==================
-
-.. automodule:: abl.dataset
-   :members:
-   :undoc-members:
-   :show-inheritance:

docs/API/abl.learning.rst

@@ -1,7 +1,23 @@
 abl.learning
 ==================
 
-.. automodule:: abl.learning
+Learning
+--------
+
+.. autoclass:: abl.learning.ABLModel
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+.. autoclass:: abl.learning.BasicNN
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+Torch Dataset
+-------------
+
+.. automodule:: abl.learning.torch_dataset
    :members:
    :undoc-members:
    :show-inheritance:

docs/index.rst

@@ -32,11 +32,10 @@
    :maxdepth: 1
    :caption: API
 
-   API/abl.dataset
+   API/abl.data
    API/abl.learning
    API/abl.reasoning
    API/abl.bridge
-   API/abl.data
    API/abl.utils
 
 .. toctree::

examples/hed/bridge.py

@@ -4,7 +4,7 @@ from collections import defaultdict
 import torch
 
 from abl.bridge import SimpleBridge
-from abl.dataset import RegressionDataset
+from abl.learning.torch_dataset import RegressionDataset
 from abl.data.evaluation import BaseMetric
 from abl.learning import ABLModel, BasicNN
 from abl.reasoning import Reasoner

examples/mnist_add/mnist_add.ipynb

@@ -13,7 +13,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 1,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -42,7 +42,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 2,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -61,7 +61,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 3,
    "metadata": {},
    "outputs": [
     {
@@ -110,7 +110,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 4,
    "metadata": {},
    "outputs": [
     {
@@ -170,7 +170,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 5,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -198,7 +198,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 6,
    "metadata": {},
    "outputs": [
     {
@@ -229,7 +229,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 7,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -245,7 +245,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 8,
    "metadata": {},
    "outputs": [
     {
@@ -295,7 +295,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 9,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -319,7 +319,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 10,
    "metadata": {},
    "outputs": [
     {
@@ -352,7 +352,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 11,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -385,7 +385,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 12,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -404,7 +404,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 13,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -420,7 +420,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 14,
    "metadata": {},
    "outputs": [],
    "source": [