diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 09851e6f7b9ac151a6ad81834290c33fe8374bb9..cf87c2d7b5fb1999430747d43851b7f1af01b8c7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,8 +7,8 @@ test_a: stage: test script: - echo "Installing dependencies" - - pip install -r ./source/requirements.txt - - pip install -e ./source/ + - pip install -r ./deepof/requirements.txt + - pip install -e deepof/ - echo "Dependencies installed" - echo "Testing all functions in deepof.utils" - pytest diff --git a/source/__init__.py b/deepof/__init__.py similarity index 100% rename from source/__init__.py rename to deepof/__init__.py diff --git a/source/hypermodels.py b/deepof/hypermodels.py similarity index 99% rename from source/hypermodels.py rename to deepof/hypermodels.py index 73f5b5b5d60c3080e51451c79b96feb44360f6ac..7621095034839dc875c5dcda167f6e66b90b1f0e 100644 --- a/source/hypermodels.py +++ b/deepof/hypermodels.py @@ -12,7 +12,7 @@ from tensorflow.keras.layers import Dense, Dropout, LSTM from tensorflow.keras.layers import RepeatVector, Reshape, TimeDistributed from tensorflow.keras.losses import Huber from tensorflow.keras.optimizers import Adam -from source.model_utils import * +from deepof.model_utils import * import tensorflow as tf import tensorflow_probability as tfp diff --git a/source/model_utils.py b/deepof/model_utils.py similarity index 100% rename from source/model_utils.py rename to deepof/model_utils.py diff --git a/source/models.py b/deepof/models.py similarity index 99% rename from source/models.py rename to deepof/models.py index 5f860bce4aac3fb6b351e2e1edbd26704a3f9dc2..bee22e91ac08ed316bdd4b60b9ad9f4df6ba87a4 100644 --- a/source/models.py +++ b/deepof/models.py @@ -11,7 +11,7 @@ from tensorflow.keras.layers import Dense, Dropout, LSTM from tensorflow.keras.layers import RepeatVector, Reshape, TimeDistributed from tensorflow.keras.losses import Huber from tensorflow.keras.optimizers import Nadam -from source.model_utils import * +from deepof.model_utils import * import tensorflow as tf import tensorflow_probability as tfp diff --git a/source/preprocess.py b/deepof/preprocess.py similarity index 99% rename from source/preprocess.py rename to deepof/preprocess.py index 5d9ed78864d4dddfaca45640f85bc5151fb7bead..c45391c4c52e26b0cc6a5deac9d76100fdd1b2ff 100644 --- a/source/preprocess.py +++ b/deepof/preprocess.py @@ -11,7 +11,7 @@ import os import warnings import networkx as nx -from source.utils import * +from deepof.utils import * class project: diff --git a/source/requirements.txt b/deepof/requirements.txt similarity index 100% rename from source/requirements.txt rename to deepof/requirements.txt diff --git a/source/setup.py b/deepof/setup.py similarity index 100% rename from source/setup.py rename to deepof/setup.py diff --git a/source/utils.py b/deepof/utils.py similarity index 100% rename from source/utils.py rename to deepof/utils.py diff --git a/examples/hyperparameter_tuning.py b/examples/hyperparameter_tuning.py index 7015772f0386fa3a4ad8f82fd09c257d06c5b402..072725fcb06a84f69f43d748119fb938a399301f 100644 --- a/examples/hyperparameter_tuning.py +++ b/examples/hyperparameter_tuning.py @@ -1,8 +1,8 @@ # @author lucasmiranda42 from datetime import datetime -from source.preprocess import * -from source.hypermodels import * +from deepof.preprocess import * +from deepof.hypermodels import * from kerastuner import BayesianOptimization from tensorflow import keras import argparse diff --git a/examples/model_training.py b/examples/model_training.py index 0e537a27ef6479fe0296fc54a629a3ac1c02c267..2622b6d63bc40ff101b9ba47381f2bc2dafc99f1 100644 --- a/examples/model_training.py +++ b/examples/model_training.py @@ -1,8 +1,8 @@ # @author lucasmiranda42 from datetime import datetime -from source.preprocess import * -from source.models import * +from deepof.preprocess import * +from deepof.models import * from tensorflow import keras import argparse import os, pickle diff --git a/examples/predict_video.py b/examples/predict_video.py index 7e1a3e36c07ecd6f2763b6b829c65ec19642aa76..5eacd1e9875ce7a78a42606c963df5471d7026e9 100644 --- a/examples/predict_video.py +++ b/examples/predict_video.py @@ -5,8 +5,8 @@ import sys sys.path.insert(1, "../") -from source.preprocess import * -from source.models import * +from deepof.preprocess import * +from deepof.models import * import argparse import cv2 import os, pickle diff --git a/examples/visualizations/train_viz_data_generator.py b/examples/visualizations/train_viz_data_generator.py index 7000e8a76810140d30fde12f6b24c25abfa76df5..05b296986ade6555510f0fbace9c56e726c22101 100644 --- a/examples/visualizations/train_viz_data_generator.py +++ b/examples/visualizations/train_viz_data_generator.py @@ -10,8 +10,8 @@ from datetime import datetime from sklearn.discriminant_analysis import LinearDiscriminantAnalysis from sklearn.manifold import TSNE from sklearn.metrics import mean_absolute_error -from source.preprocess import * -from source.models import * +from deepof.preprocess import * +from deepof.models import * from tqdm import tqdm import argparse import numpy as np