Reduced Size of SDFG Folder

dace/codegen/codeobject.py

@@ -1,5 +1,6 @@
 # Copyright 2019-2021 ETH Zurich and the DaCe authors. All rights reserved.
 import re
+import dace
 from dace import sourcemap
 from dace.properties import (Property, DictProperty, SetProperty, make_properties)
 
@@ -45,9 +46,15 @@ def __init__(self,
         self.linkable = linkable
         self.environments = environments or set()
 
-        if language == 'cpp' and title == 'Frame' and sdfg:
-            sourcemap.create_maps(sdfg, code, self.target.target_name)
+        # NOTE: In an earlier version, the source maps were generated here. However,
+        #   this had the side effect that the build folder was generated containing
+        #   the source maps, i.e. the `map/` subfolder. However, no code was actually
+        #   dumped to disc. Another effect is that the generation of code would actually
+        #   overwrite the source map, thus it was moved to `generate_program_folder()`.
 
     @property
     def clean_code(self):
         return re.sub(r'[ \t]*////__(DACE:|CODEGEN;)[^\n]*', '', self.code)
+
+    def create_source_map(self, sdfg: 'dace.SDFG') -> None:
+        sourcemap.create_maps(sdfg, self.code, self.target.target_name)

dace/codegen/compiled_sdfg.py

@@ -27,17 +27,26 @@ class ReloadableDLL(object):
     bypasses Python's dynamic library reloading issues.
     """
 
-    def __init__(self, library_filename, program_name):
-        """
-        Creates a new reloadable shared object.
+    def __init__(self, library_filename, **kwargs):
+        """Creates a new reloadable shared object.
+
+        The path to the library must be given. The path of the stub library is inferred
+        from it. This means it is expected that it is located in the same folder,
+        see `_get_stub_library_path()` for more information.
 
         :param library_filename: Path to library file.
-        :param program_name: Name of the DaCe program (for use in finding
-                             the stub library loader).
+        :param libstub_path: Optional path to the stub library.
         """
-        self._stub_filename = os.path.join(os.path.dirname(os.path.realpath(library_filename)),
-                                           f'libdacestub_{program_name}.{Config.get("compiler", "library_extension")}')
-        self._library_filename = os.path.realpath(library_filename)
+        from dace.codegen.compiler import _get_stub_library_path
+
+        self._library_filename = str(pathlib.Path(library_filename).resolve())
+
+        if "libstub_path" in kwargs:
+            self._stub_filename = str(pathlib.Path(kwargs.pop("libstub_path")).resolve())
+        else:
+            self._stub_filename = str(_get_stub_library_path(self._library_filename))
+        assert len(kwargs) == 0
+
         self._stub = None
         self._lib = None
 
@@ -478,12 +487,14 @@ def safe_call(self, *args, **kwargs):
 
         # Pickle the SDFG and arguments
         with tempfile.NamedTemporaryFile(mode='wb', delete=False) as f:
-            pickle.dump({
-                'library_path': self._lib._library_filename,
-                "sdfg": self.sdfg,
-                'args': args,
-                'kwargs': kwargs
-            }, f)
+            pickle.dump(
+                {
+                    'library_path': self._lib._library_filename,
+                    'stublibrary_path': self._lib._stub_filename,
+                    "sdfg": self.sdfg,
+                    'args': args,
+                    'kwargs': kwargs
+                }, f)
             temp_path = f.name
 
         # Call the SDFG in a separate process
@@ -498,9 +509,10 @@ def safe_call(self, *args, **kwargs):
 with open(r"{temp_path}", "rb") as f:
     data = pickle.load(f)
 library_path = data['library_path']
+libstub_path = data['stublibrary_path']
 sdfg = data['sdfg']
 
-lib = csd.ReloadableDLL(library_path, sdfg.name)
+lib = csd.ReloadableDLL(library_filename=library_path, libstub_path=libstub_path)
 obj = csd.CompiledSDFG(sdfg, lib, sdfg.arg_names)
 obj(*data['args'], **data['kwargs'])