moved around files

RhysAlfShaw · Feb 16, 2024 · 0aa0ef9 · 0aa0ef9
1 parent 9a29e87
commit 0aa0ef9
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 10 deletions.
diff --git 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
diff --git 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
@@ -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
diff --git a/DRUID/src/utils/utils.py → DRUID/src/utils.py b/DRUID/src/utils/utils.py → DRUID/src/utils.py
diff --git a/DRUID/src/utils/__init__.py b/DRUID/src/utils/__init__.py
diff --git 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'],
 )