Package imports (#4)

fix pyproject.toml

examples/Roessler/Roessler.ipynb

@@ -12,16 +12,14 @@
   },
   {
    "cell_type": "code",
-   "outputs": [],
    "source": [
     "import tensorflow as tf\n",
     "import os\n",
     "import numpy as np\n",
-    "import matplotlib.pyplot as plt\n",
-    "from vindy.networks import SindyNetwork\n",
+    "from vindy import SindyNetwork\n",
     "from vindy.libraries import PolynomialLibrary\n",
     "from vindy.layers import SindyLayer, VindyLayer\n",
-    "from vindy.layers.distributions import Gaussian, Laplace\n",
+    "from vindy.distributions import Gaussian, Laplace\n",
     "from vindy.callbacks import (\n",
     "    SaveCoefficientsCallback,\n",
     ")\n",
@@ -30,12 +28,13 @@
    "metadata": {
     "collapsed": false,
     "ExecuteTime": {
-     "end_time": "2024-06-05T11:27:31.838726Z",
-     "start_time": "2024-06-05T11:27:31.835851Z"
+     "end_time": "2024-06-14T08:09:35.713580Z",
+     "start_time": "2024-06-14T08:09:34.465773Z"
     }
    },
    "id": "baff5e0d65382dfe",
-   "execution_count": 46
+   "outputs": [],
+   "execution_count": 2
   },
   {
    "cell_type": "markdown",

pyproject.toml

@@ -1,5 +1,5 @@
 [build-system]
-requires = ["setuptools >= 61.0"]
+requires = ["setuptools >= 61.0", "wheel"]
 build-backend = "setuptools.build_meta"
 
 [project]
@@ -48,8 +48,9 @@ interfaces = [
 ]
 
 [tool.setuptools]
-packages = ["vindy"]
-py-modules = []
+# If there are data files included in your packages that need to be
+# installed, specify them here.
+#package-data = {"sample" = ["*.dat"]}
 
 [project.urls]
 Homepage = "https://github.com/jkneifl/VENI-VINDy-VICI"

vindy/__init__.py

@@ -1 +1 @@
-# from vindy.networks import AutoencoderSindy, VAESindy, SindyNetwork
+from .networks import AutoencoderSindy, VAESindy, SindyNetwork

vindy/layers/distributions/gaussian.py → vindy/distributions/gaussian.py

@@ -1,6 +1,6 @@
 import numpy as np
 import tensorflow as tf
-from vindy.layers.distributions.base_distribution import BaseDistribution
+from .base_distribution import BaseDistribution
 
 
 class Gaussian(BaseDistribution):

vindy/layers/distributions/laplace.py → vindy/distributions/laplace.py

@@ -2,7 +2,7 @@
 import numpy as np
 import tensorflow as tf
 import tensorflow_probability as tfp
-from vindy.layers.distributions.base_distribution import BaseDistribution
+from .base_distribution import BaseDistribution
 
 class Laplace(BaseDistribution):
     """

vindy/layers/__init__.py

@@ -1,2 +1,2 @@
 from .sindy_layer import SindyLayer
-from .vindy_layer import VindyLayer
+from .vindy_layer import VindyLayer

vindy/layers/vindy_layer.py

@@ -3,7 +3,7 @@
 import tensorflow as tf
 import matplotlib.pyplot as plt
 from .sindy_layer import SindyLayer
-from vindy.layers.distributions import Gaussian, BaseDistribution
+from vindy.distributions import Gaussian, BaseDistribution
 
 logging.basicConfig()
 logging.getLogger().setLevel(logging.INFO)

vindy/networks/__init__.py

@@ -1,3 +1,4 @@
+# from . import base_model, sindy_network, autoencoder_sindy, variational_autoencoder_sindy
 from .base_model import BaseModel
 from .sindy_network import SindyNetwork
 from .autoencoder_sindy import AutoencoderSindy

vindy/networks/sindy_network.py

@@ -1,6 +1,6 @@
 import logging
 import tensorflow as tf
-from vindy.networks import BaseModel
+from .base_model import BaseModel
 
 logging.basicConfig()
 logging.getLogger().setLevel(logging.INFO)

vindy/networks/variational_autoencoder_sindy.py

@@ -1,7 +1,7 @@
 import logging
 import tensorflow as tf
 import numpy as np
-from vindy.layers.distributions import Gaussian
+from vindy.distributions import Gaussian
 from .autoencoder_sindy import AutoencoderSindy
 
 logging.basicConfig()