diff --git a/DRUID/main.py b/DRUID/main.py index 77ed0b4..409dce6 100644 --- a/DRUID/main.py +++ b/DRUID/main.py @@ -15,7 +15,7 @@ from .src import homology_new as homology from .src import background from matplotlib import colors -from .src.source import source +from .src import source import numpy as np from skimage import measure from tqdm import tqdm diff --git a/DRUID/src/background/__init__.py b/DRUID/src/background/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/DRUID/src/homology/homology.py b/DRUID/src/homology/homology.py index 2c76951..a8cc616 100644 --- a/DRUID/src/homology/homology.py +++ b/DRUID/src/homology/homology.py @@ -9,7 +9,7 @@ import cripser import numpy as np -from ..utils import utils +from .src import utils import time from functools import partial import pandas diff --git a/DRUID/src/homology_new.py b/DRUID/src/homology_new.py index 6940107..73fe6b6 100644 --- a/DRUID/src/homology_new.py +++ b/DRUID/src/homology_new.py @@ -2,8 +2,8 @@ import cripser import numpy as np -from .utils import utils -from .background import background +from ..src import utils +from ..src import background import time import pandas @@ -257,7 +257,7 @@ def compute_ph_components(img,local_bg,analysis_threshold_val,lifetime_limit, global GPU_Option GPU_Option = GPU - print('Computing PH components...') + print('Computing PH components...ls ') t0_compute_ph = time.time() pd = cripser.computePH(-img,maxdim=0) t1_compute_ph = time.time() diff --git a/DRUID/src/source/__init__.py b/DRUID/src/source/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/DRUID/src/utils/utils.py b/DRUID/src/utils.py similarity index 100% rename from DRUID/src/utils/utils.py rename to DRUID/src/utils.py diff --git a/DRUID/src/utils/__init__.py b/DRUID/src/utils/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/setup.py b/setup.py index 3480821..5771859 100644 --- a/setup.py +++ b/setup.py @@ -13,9 +13,5 @@ install_requires=requiremets, packages=['DRUID', - 'DRUID/src', - 'DRUID/src/background', - 'DRUID/src/homology', - 'DRUID/src/source', - 'DRUID/src/utils'], + 'DRUID/src'], ) \ No newline at end of file