Merge pull request #120 from Pennycook/platform-mapper

Replace PlatformMapper with a function

codebasin/__init__.py

@@ -10,7 +10,6 @@
 
 import codebasin.source
 import codebasin.util
-import codebasin.walkers
 
 warnings.warn(
     "Calling codebasin package internals is deprecated. "

codebasin/__main__.py

@@ -12,7 +12,6 @@
 import sys
 
 from codebasin import CodeBase, config, finder, report, util
-from codebasin.walkers.platform_mapper import PlatformMapper
 
 log = logging.getLogger("codebasin")
 version = "1.2.0"
@@ -331,8 +330,7 @@ def _main():
     stdout_handler.setLevel(log_level)
 
     # Count lines for platforms
-    platform_mapper = PlatformMapper(codebase)
-    setmap = platform_mapper.walk(state)
+    setmap = state.get_setmap(codebase)
 
     def report_enabled(name):
         if "all" in args.reports:

codebasin/finder.py

@@ -12,8 +12,9 @@
 
 from tqdm import tqdm
 
-from codebasin import file_parser, platform, preprocessor
+from codebasin import CodeBase, file_parser, platform, preprocessor
 from codebasin.language import FileLanguage
+from codebasin.preprocessor import CodeNode
 from codebasin.walkers.tree_associator import TreeAssociator
 
 log = logging.getLogger(__name__)
@@ -88,6 +89,22 @@ def get_map(self, fn):
             return None
         return self.maps[fn]
 
+    def get_setmap(self, codebase: CodeBase) -> dict[frozenset, int]:
+        """
+        Returns
+        -------
+        dict[frozenset, int]
+            The number of lines associated with each platform set.
+        """
+        setmap = collections.defaultdict(int)
+        for fn in codebase:
+            tree = self.get_tree(fn)
+            association = self.get_map(fn)
+            for node in [n for n in tree.walk() if isinstance(n, CodeNode)]:
+                platform = frozenset(association[node])
+                setmap[platform] += node.num_lines
+        return setmap
+
 
 def find(
     rootdir,

tests/basic_asm/test_basic_asm.py

@@ -6,7 +6,6 @@
 from pathlib import Path
 
 from codebasin import CodeBase, finder
-from codebasin.walkers.platform_mapper import PlatformMapper
 
 
 class TestBasicAsm(unittest.TestCase):
@@ -35,8 +34,7 @@ def test_yaml(self):
             )
         configuration = {"CPU": entries}
         state = finder.find(self.rootdir, codebase, configuration)
-        mapper = PlatformMapper(codebase)
-        setmap = mapper.walk(state)
+        setmap = state.get_setmap(codebase)
         self.assertDictEqual(
             setmap,
             self.expected_setmap,

tests/basic_fortran/test_basic_fortran.py

@@ -6,7 +6,6 @@
 from pathlib import Path
 
 from codebasin import CodeBase, finder
-from codebasin.walkers.platform_mapper import PlatformMapper
 
 
 class TestBasicFortran(unittest.TestCase):
@@ -46,8 +45,7 @@ def test_yaml(self):
             ],
         }
         state = finder.find(self.rootdir, codebase, configuration)
-        mapper = PlatformMapper(codebase)
-        setmap = mapper.walk(state)
+        setmap = state.get_setmap(codebase)
         self.assertDictEqual(
             setmap,
             self.expected_setmap,

tests/build-dir/test_build_dir.py

@@ -8,7 +8,6 @@
 from pathlib import Path
 
 from codebasin import CodeBase, config, finder
-from codebasin.walkers.platform_mapper import PlatformMapper
 
 
 class TestBuildDirectories(unittest.TestCase):
@@ -64,8 +63,7 @@ def test_absolute_paths(self):
         expected_setmap = {frozenset(["one", "two"]): 1}
 
         state = finder.find(self.rootdir, codebase, configuration)
-        mapper = PlatformMapper(codebase)
-        setmap = mapper.walk(state)
+        setmap = state.get_setmap(codebase)
         self.assertDictEqual(setmap, expected_setmap, "Mismatch in setmap")
 
     def test_empty_platform(self):

tests/commented_directive/test_commented_directive.py

@@ -6,7 +6,6 @@
 from pathlib import Path
 
 from codebasin import CodeBase, finder
-from codebasin.walkers.platform_mapper import PlatformMapper
 
 
 class TestCommentedDirective(unittest.TestCase):
@@ -50,8 +49,7 @@ def test_yaml(self):
             ],
         }
         state = finder.find(self.rootdir, codebase, configuration)
-        mapper = PlatformMapper(codebase)
-        setmap = mapper.walk(state)
+        setmap = state.get_setmap(codebase)
 
         node_count = 1
         for fn in state.get_filenames():

tests/define/test_define.py

@@ -6,7 +6,6 @@
 from pathlib import Path
 
 from codebasin import CodeBase, finder
-from codebasin.walkers.platform_mapper import PlatformMapper
 
 
 class TestDefine(unittest.TestCase):
@@ -45,8 +44,7 @@ def test_yaml(self):
             ],
         }
         state = finder.find(self.rootdir, codebase, configuration)
-        mapper = PlatformMapper(codebase)
-        setmap = mapper.walk(state)
+        setmap = state.get_setmap(codebase)
         self.assertDictEqual(
             setmap,
             self.expected_setmap,

tests/disjoint/test_disjoint.py

@@ -6,7 +6,6 @@
 from pathlib import Path
 
 from codebasin import CodeBase, finder
-from codebasin.walkers.platform_mapper import PlatformMapper
 
 
 class TestDisjointCodebase(unittest.TestCase):
@@ -44,8 +43,7 @@ def test_yaml(self):
             ],
         }
         state = finder.find(self.rootdir, codebase, configuration)
-        mapper = PlatformMapper(codebase)
-        setmap = mapper.walk(state)
+        setmap = state.get_setmap(codebase)
         self.assertDictEqual(
             setmap,
             self.expected_setmap,

tests/duplicates/test_duplicates.py

@@ -6,7 +6,6 @@
 from pathlib import Path
 
 from codebasin import CodeBase, finder
-from codebasin.walkers.platform_mapper import PlatformMapper
 
 
 class TestDuplicates(unittest.TestCase):
@@ -48,8 +47,7 @@ def test_duplicates(self):
         expected_setmap = {frozenset(["cpu"]): 1, frozenset(["gpu"]): 1}
 
         state = finder.find(self.rootdir, codebase, configuration)
-        mapper = PlatformMapper(codebase)
-        setmap = mapper.walk(state)
+        setmap = state.get_setmap(codebase)
         self.assertDictEqual(setmap, expected_setmap, "Mismatch in setmap")
 
     def test_symlinks(self):

tests/exclude/test_exclude.py

@@ -6,7 +6,6 @@
 from pathlib import Path
 
 from codebasin import CodeBase, config, finder
-from codebasin.walkers.platform_mapper import PlatformMapper
 
 
 class TestExclude(unittest.TestCase):
@@ -28,8 +27,7 @@ def _get_setmap(self, excludes):
             "test": config.load_database(str(dbpath), str(self.rootdir)),
         }
         state = finder.find(self.rootdir, codebase, configuration)
-        mapper = PlatformMapper(codebase)
-        setmap = mapper.walk(state)
+        setmap = state.get_setmap(codebase)
         return setmap
 
     def test_exclude_nothing(self):

tests/include/test_include.py

@@ -6,7 +6,6 @@
 from pathlib import Path
 
 from codebasin import CodeBase, config, finder
-from codebasin.walkers.platform_mapper import PlatformMapper
 
 
 class TestInclude(unittest.TestCase):
@@ -37,8 +36,7 @@ def test_include(self):
         }
 
         state = finder.find(self.rootdir, codebase, configuration)
-        mapper = PlatformMapper(codebase)
-        setmap = mapper.walk(state)
+        setmap = state.get_setmap(codebase)
         self.assertDictEqual(
             setmap,
             self.expected_setmap,

tests/literals/test_literals.py

@@ -6,7 +6,6 @@
 from pathlib import Path
 
 from codebasin import CodeBase, finder, preprocessor
-from codebasin.walkers.platform_mapper import PlatformMapper
 
 
 class TestLiterals(unittest.TestCase):
@@ -43,8 +42,7 @@ def test_literals(self):
             ],
         }
         state = finder.find(self.rootdir, codebase, configuration)
-        mapper = PlatformMapper(codebase)
-        setmap = mapper.walk(state)
+        setmap = state.get_setmap(codebase)
         self.assertDictEqual(
             setmap,
             self.expected_setmap,

tests/macro_expansion/test_macro_expansion.py

@@ -6,7 +6,6 @@
 from pathlib import Path
 
 from codebasin import CodeBase, finder, platform, preprocessor
-from codebasin.walkers.platform_mapper import PlatformMapper
 
 
 class TestMacroExpansion(unittest.TestCase):
@@ -52,8 +51,7 @@ def test_macro_expansion(self):
             "GPU": gpu_entries,
         }
         state = finder.find(self.rootdir, codebase, configuration)
-        mapper = PlatformMapper(codebase)
-        setmap = mapper.walk(state)
+        setmap = state.get_setmap(codebase)
         self.assertDictEqual(
             setmap,
             self.expected_setmap,

tests/multi_line/test_multi_line.py

@@ -6,7 +6,6 @@
 from pathlib import Path
 
 from codebasin import CodeBase, finder
-from codebasin.walkers.platform_mapper import PlatformMapper
 
 
 class TestMultiLine(unittest.TestCase):
@@ -45,8 +44,7 @@ def test_yaml(self):
             ],
         }
         state = finder.find(self.rootdir, codebase, configuration)
-        mapper = PlatformMapper(codebase)
-        setmap = mapper.walk(state)
+        setmap = state.get_setmap(codebase)
         self.assertDictEqual(
             setmap,
             self.expected_setmap,

tests/nesting/test_nesting.py

@@ -6,7 +6,6 @@
 from pathlib import Path
 
 from codebasin import CodeBase, finder
-from codebasin.walkers.platform_mapper import PlatformMapper
 
 
 class TestNesting(unittest.TestCase):
@@ -46,8 +45,7 @@ def test_yaml(self):
             ],
         }
         state = finder.find(self.rootdir, codebase, configuration)
-        mapper = PlatformMapper(codebase)
-        setmap = mapper.walk(state)
+        setmap = state.get_setmap(codebase)
         self.assertDictEqual(
             setmap,
             self.expected_setmap,

tests/once/test_once.py

@@ -6,7 +6,6 @@
 from pathlib import Path
 
 from codebasin import CodeBase, finder
-from codebasin.walkers.platform_mapper import PlatformMapper
 
 
 class TestOnce(unittest.TestCase):
@@ -45,8 +44,7 @@ def test_yaml(self):
             ],
         }
         state = finder.find(self.rootdir, codebase, configuration)
-        mapper = PlatformMapper(codebase)
-        setmap = mapper.walk(state)
+        setmap = state.get_setmap(codebase)
         self.assertDictEqual(
             setmap,
             self.expected_setmap,

tests/operators/test_operators.py

@@ -6,7 +6,6 @@
 from pathlib import Path
 
 from codebasin import CodeBase, finder, platform, preprocessor
-from codebasin.walkers.platform_mapper import PlatformMapper
 
 
 class TestOperators(unittest.TestCase):
@@ -43,8 +42,7 @@ def test_operators(self):
             ],
         }
         state = finder.find(self.rootdir, codebase, configuration)
-        mapper = PlatformMapper(codebase)
-        setmap = mapper.walk(state)
+        setmap = state.get_setmap(codebase)
         self.assertDictEqual(
             setmap,
             self.expected_setmap,