FIX: relative imports issues

batistagroup · May 22, 2024 · f57fc77 · f57fc77
1 parent e57435c
commit f57fc77
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 7 deletions.
diff --git a/DirectMultiStep/Utils/PostProcess.py b/DirectMultiStep/Utils/PostProcess.py
@@ -20,8 +20,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-from Models.Generation import BeamSearchOutput
-from Utils.PreProcess import (
+from ..Models.Generation import BeamSearchOutput
+from .PreProcess import (
     canonicalize_smiles,
     find_leaves,
     generate_permutations,

diff --git a/DirectMultiStep/Utils/__init__.py b/DirectMultiStep/Utils/__init__.py
diff --git a/DirectMultiStep/__init__.py b/DirectMultiStep/__init__.py
diff --git a/DirectMultiStep/tests/__init__.py b/DirectMultiStep/tests/__init__.py
diff --git a/DirectMultiStep/tests/test_preprocess.py b/DirectMultiStep/tests/test_preprocess.py
@@ -22,9 +22,9 @@
 
 import pytest
 from rdkit import Chem
-from DirectMultiStep.Utils.PreProcess import filter_mol_nodes, max_tree_depth, find_leaves, generate_permutations
-from test_data import *
-from DirectMultiStep.Utils.Dataset import tokenize_smile, tokenize_path_string
+from ..Utils.PreProcess import filter_mol_nodes, max_tree_depth, find_leaves, generate_permutations
+from .test_data import *
+from ..Utils.Dataset import tokenize_smile, tokenize_path_string
 
 test_filtering_and_depth = [
     pytest.param(test1_leaves, 0, id="leaves"),
@@ -125,3 +125,5 @@ def test_generate_permutations_complex_case():
 def test_generate_permutations_parametrized(data, expected):
     assert generate_permutations(data, child_key="c") == expected
 
+if __name__ == "__main__":
+    pytest.main(["-v", "-s", __file__])
diff --git a/DirectMultiStep/train_nosm.py b/DirectMultiStep/train_nosm.py
@@ -27,7 +27,7 @@
 from Models.Training import PLTraining
 from lightning.pytorch.callbacks import ModelCheckpoint
 from lightning.pytorch.callbacks import RichModelSummary
-import helpers
+import DirectMultiStep.helpers as helpers
 
 data_path = Path(__file__).resolve().parent / "Data" / "Processed"
 train_path = Path(__file__).resolve().parent / "Data" / "Training"

diff --git a/DirectMultiStep/train_wsm.py b/DirectMultiStep/train_wsm.py
@@ -27,7 +27,7 @@
 from Models.Training import PLTraining
 from lightning.pytorch.callbacks import ModelCheckpoint
 from lightning.pytorch.callbacks import RichModelSummary
-import helpers
+import DirectMultiStep.helpers as helpers
 
 data_path = Path(__file__).resolve().parent / "Data" / "Processed"
 train_path = Path(__file__).resolve().parent / "Data" / "Training"