Adapt to new SDFG cutouts

.gitignore

@@ -7,9 +7,13 @@ _dacegraphs/
 !.vscode/fuzzyflow.code-workspace
 
 tests/**/dbg/
-tests/cloudsc_sc
-tests/tmp
-tests/icse23_eval
+
+scratchpad/
 
 *.progressfile
 
+.testdata*/
+buildcache/
+.buildcache/
+
+*.dat

.vscode/fuzzyflow.code-workspace

@@ -5,5 +5,6 @@
 		}
 	],
 	"settings": {
+		"dace.general.autoOpenInstrumentationReports": "Never"
 	}
 }

base_test.py

@@ -1,15 +1,15 @@
 import os
-from typing import Dict, List
+from typing import Dict, List, Optional
 from alive_progress import alive_bar
 
-import dace
 from dace.sdfg import SDFG
-from dace.transformation import dataflow, interstate, subgraph
 
 import fuzzyflow as ff
 
 
-def _test_from_basedir(datadir: str, category_name: str):
+def _test_from_basedir(datadir: str, category_name: str,
+                       out_dir: Optional[str] = None,
+                       success_dir: Optional[str] = None,):
     verify_dict = dict()
     testdirs = os.listdir(datadir)
     bartitle = f'Testing {category_name}'
@@ -54,15 +54,18 @@ def _test_from_basedir(datadir: str, category_name: str):
                         )
 
                         verifier = ff.TransformationVerifier(
-                            xform, sdfg, ff.CutoutStrategy.SIMPLE
+                            xform, sdfg, ff.SamplingStrategy.SIMPLE_UNIFORM,
+                            output_dir=out_dir,
+                            success_dir=success_dir
                         )
-                        valid = valid and verifier.verify(
+                        nvalid, _ = verifier.verify(
                             n_samples=100,
                             debug_save_path=os.path.join(
                                 dbg_save_dir, file.split('.')[0]
                             ),
                             enforce_finiteness=True
                         )
+                        valid = valid and nvalid
                         if not valid:
                             offending_file = file
                             break
@@ -90,12 +93,16 @@ def _test_from_basedir(datadir: str, category_name: str):
 
 def test_multistate():
     datadir = './tests/data/multistate'
-    _test_from_basedir(datadir, 'multistate transformations')
+    fdir = './.test_results/failures/multistate/'
+    sdir = './.test_results/successes/multistate/'
+    _test_from_basedir(datadir, 'multistate transformations', fdir, sdir)
 
 
 def test_singlestate():
     datadir = './tests/data/singlestate'
-    _test_from_basedir(datadir, 'singlestate transformations')
+    fdir = './.test_results/failures/singlestate/'
+    sdir = './.test_results/successes/singlestate/'
+    _test_from_basedir(datadir, 'singlestate transformations', fdir, sdir)
 
 def main():
     test_singlestate()

cloudsc_test_all.py

@@ -0,0 +1,73 @@
+import os
+import re
+from dace.sdfg import SDFG
+from dace.transformation.optimizer import SDFGOptimizer
+import traceback
+
+import fuzzyflow as ff
+
+
+IGNORE_LIST = [
+    'ElementWise*',
+    'FPGA*',
+    'MPI*',
+    'ReductionNOperation',
+    'OuterProductOperation',
+    'CopyToDevice',
+    'LoopDetection',
+    'StreamingComposition',
+    'GPUTransformSDFG',
+    'NestSDFG'
+]
+
+prefix = 'run_1'
+
+
+last_pattern = None
+last_graph = None
+exception_nr = 0
+
+def main():
+    ignore_regex = re.compile(
+        '^' + '$|^'.join(IGNORE_LIST).replace('*', '\w*') + '$'
+    )
+
+    sdfg = SDFG.from_file(f'tests/case_studies/cloudsc/gpu_transform_sdfg_failure/cloudscexp2_parallel.sdfg')
+    t_sdfg = sdfg.sdfg_list[1]
+    optimizer = SDFGOptimizer(t_sdfg)
+    pattern_matches = list(optimizer.get_pattern_matches())
+    i = 0
+    print(len(pattern_matches), 'pattern matches found.')
+    for pattern in pattern_matches:
+        if ignore_regex.search(pattern.__class__.__name__):
+            continue
+
+        print('Verifying', pattern.__class__.__name__)
+
+        out_dir = os.path.join(
+            '.testdata_case_studies', 'cloudsc_blanket_testing', prefix,
+            'fails',
+            pattern.__class__.__name__ + '_' + str(i)
+        )
+        success_dir = os.path.join(
+            '.testdata_case_studies', 'cloudsc_blanket_testing', prefix,
+            'successes',
+            pattern.__class__.__name__ + '_' + str(i)
+        )
+        verifier = ff.TransformationVerifier(
+            pattern, t_sdfg, output_dir=out_dir, success_dir=success_dir,
+            build_dir_base_path='/mnt/ramdisk'
+        )
+        valid, dt = verifier.verify(
+            n_samples=100, status=ff.StatusLevel.BAR_ONLY,
+            minimize_input=False, use_alibi_nodes=False,
+            maximum_data_dim=64
+        )
+        print('Valid:', valid, 'Time:', dt)
+        if not valid:
+            print('Instance invalid!')
+
+        i += 1
+
+if __name__ == '__main__':
+    main()

fuzzyflow/__init__.py

@@ -2,7 +2,7 @@
 # This file is part of FuzzyFlow, which is released under the BSD 3-Clause
 # License. For details, see the LICENSE file.
 
-from .verification.verifier import TransformationVerifier
-from .cutout import CutoutStrategy
+from .verification.verifier import TransformationVerifier, StatusLevel
 from .verification.sampling import SamplingStrategy
-from .util import load_transformation_from_file
+from .util import load_transformation_from_file, data_report_get_latest_version
+from .harness_generator import sdfg2cpp