Remove DawnCompiler (#886)

Technical Description Remove the DawnCompiler class. This requires many tests to change their usage of the optimizer and code generation. Notable changes -write-iir now writes to a file called ${stencilname}.iir instead of ${filename}.%d.iir. This was unfortunately necessary because where it is serialized we do not have access to the filename dawn/scripts/refactor was moved up a directory dawn/scripts/make_pybind11_sources.py now automatically overwrites the dawn4py/_dawn4py.cpp file the inlining pass is not automatically added at the end if using the cuda backend, unless using the gtclang executable. That needs to be done manually now. dawn4py bindings changed Resolves / Enhances Resolves #874, #900. Depends on #877.
MeteoSwiss-APN · Apr 21, 2020 · 09d80e9 · 09d80e9
1 parent 28df1ae
commit 09d80e9
Show file tree

Hide file tree

Showing 130 changed files with 2,085 additions and 3,901 deletions.
diff --git a/dawn/CMakeLists.txt b/dawn/CMakeLists.txt
@@ -26,7 +26,7 @@ unset(__VERSION_LIST)
 project(Dawn
   VERSION ${__DAWN_VERSION}
   HOMEPAGE_URL https://meteoswiss-apn.github.io/dawn/
-  LANGUAGES CXX C
+  LANGUAGES CXX
 )
 unset(__DAWN_VERSION)
 
@@ -176,18 +176,6 @@ endif()
 
 add_subdirectory(src)
 
-# Only build examples if BUILD_EXAMPLES and main project, or DAWN_BUILD_EXAMPLES is on
-if((CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME OR DAWN_BUILD_EXAMPLES) AND BUILD_EXAMPLES)
-  set(${PROJECT_NAME}_EXAMPLES ON)
-else()
-  set(${PROJECT_NAME}_EXAMPLES OFF)
-endif()
-mark_as_advanced(${PROJECT_NAME}_EXAMPLES)
-
-if(${PROJECT_NAME}_EXAMPLES)
-  add_subdirectory(examples)
-endif()
-
 if(${PROJECT_NAME}_TESTING)
   add_subdirectory(test)
 endif()

diff --git a/dawn/cmake/FetchCxxopts.cmake b/dawn/cmake/FetchCxxopts.cmake
@@ -1,3 +1,17 @@
+##===------------------------------------------------------------------------------*- CMake -*-===##
+##                          _
+##                         | |
+##                       __| | __ ___      ___ ___
+##                      / _` |/ _` \ \ /\ / / '_  |
+##                     | (_| | (_| |\ V  V /| | | |
+##                      \__,_|\__,_| \_/\_/ |_| |_| - Compiler Toolchain
+##
+##
+##  This file is distributed under the MIT License (MIT).
+##  See LICENSE.txt for details.
+##
+##===------------------------------------------------------------------------------------------===##
+
 if(NOT TARGET cxxopts::cxxopts)
   if(NOT INCLUDE_CXXOPTS)
     message(STATUS "Fetching cxxopts...")

diff --git a/dawn/cmake/HasUnstructuredDeps.cmake b/dawn/cmake/HasUnstructuredDeps.cmake
@@ -0,0 +1,41 @@
+##===------------------------------------------------------------------------------*- CMake -*-===##
+##                          _
+##                         | |
+##                       __| | __ ___      ___ ___
+##                      / _` |/ _` \ \ /\ / / '_  |
+##                     | (_| | (_| |\ V  V /| | | |
+##                      \__,_|\__,_| \_/\_/ |_| |_| - Compiler Toolchain
+##
+##
+##  This file is distributed under the MIT License (MIT).
+##  See LICENSE.txt for details.
+##
+##===------------------------------------------------------------------------------------------===##
+
+if (NOT DEFINED HAS_UNSTRUCTURED_DEPS)
+
+  set(HAS_UNSTRUCTURED_DEPS OFF CACHE BOOL "True if Dawn has detected necessary dependencies for supporting unstructured grids.")
+  mark_as_advanced(HAS_UNSTRUCTURED_DEPS)
+
+  if(DAWN_REQUIRE_UNSTRUCTURED_TESTING)
+    find_package(eckit REQUIRED)
+    find_package(atlas REQUIRED)
+  else()
+    find_package(eckit QUIET)
+    if(NOT eckit_FOUND)
+      message(STATUS "Could NOT locate eckit.")
+    endif()
+    find_package(atlas QUIET)
+    if(NOT atlas_FOUND)
+      message(STATUS "Could NOT locate atlas.")
+    endif()
+  endif()
+
+  if(atlas_FOUND AND eckit_FOUND)
+    message(STATUS "Found atlas and eckit. Setting HAS_UNSTRUCTURED_DEPS=ON.")
+    set(HAS_UNSTRUCTURED_DEPS ON)
+  else()
+    set(STATUS "Cound not find dependencies for unstructured support.")
+  endif()
+
+endif()
diff --git a/dawn/examples/CMakeLists.txt b/dawn/examples/CMakeLists.txt
diff --git a/dawn/examples/cpp/CMakeLists.txt b/dawn/examples/cpp/CMakeLists.txt
diff --git a/dawn/examples/cpp/SIRToIIR.cpp b/dawn/examples/cpp/SIRToIIR.cpp
diff --git a/dawn/examples/cpp/copystencil.sir b/dawn/examples/cpp/copystencil.sir
diff --git a/dawn/examples/python/copy_stencil.py b/dawn/examples/python/copy_stencil.py
@@ -54,7 +54,9 @@ def main(args: argparse.Namespace):
         ]
     )
 
-    vertical_region_stmt = sir_utils.make_vertical_region_decl_stmt(body_ast, interval, SIR.VerticalRegion.Forward)
+    vertical_region_stmt = sir_utils.make_vertical_region_decl_stmt(
+        body_ast, interval, SIR.VerticalRegion.Forward
+    )
 
     sir = sir_utils.make_sir(
         OUTPUT_FILE,
@@ -63,7 +65,10 @@ def main(args: argparse.Namespace):
             sir_utils.make_stencil(
                 OUTPUT_NAME,
                 sir_utils.make_ast([vertical_region_stmt]),
-                [sir_utils.make_field("in", sir_utils.make_field_dimensions_cartesian()), sir_utils.make_field("out", sir_utils.make_field_dimensions_cartesian())],
+                [
+                    sir_utils.make_field("in", sir_utils.make_field_dimensions_cartesian()),
+                    sir_utils.make_field("out", sir_utils.make_field_dimensions_cartesian()),
+                ],
             )
         ],
     )
@@ -73,7 +78,7 @@ def main(args: argparse.Namespace):
         sir_utils.pprint(sir)
 
     # compile
-    code = dawn4py.compile(sir, backend="cuda")
+    code = dawn4py.compile(sir, backend=dawn4py.CodeGenBackend.CUDA)
 
     # write to file
     print(f"Writing generated code to '{OUTPUT_PATH}'")
@@ -82,8 +87,15 @@ def main(args: argparse.Namespace):
 
 
 if __name__ == "__main__":
-    parser = argparse.ArgumentParser(description="Generate a simple copy-shift stencil using Dawn compiler")
+    parser = argparse.ArgumentParser(
+        description="Generate a simple copy-shift stencil using Dawn compiler"
+    )
     parser.add_argument(
-        "-v", "--verbose", dest="verbose", action="store_true", default=False, help="Print the generated SIR",
+        "-v",
+        "--verbose",
+        dest="verbose",
+        action="store_true",
+        default=False,
+        help="Print the generated SIR",
     )
     main(parser.parse_args())
diff --git a/dawn/examples/python/unstructured_stencil.py b/dawn/examples/python/unstructured_stencil.py
@@ -85,7 +85,7 @@ def main(args: argparse.Namespace):
         sir_utils.pprint(sir)
 
     # compile
-    code = dawn4py.compile(sir, backend="c++-naive-ico")
+    code = dawn4py.compile(sir, backend=dawn4py.CodeGenBackend.CXXNaiveIco)
 
     # write to file
     print(f"Writing generated code to '{OUTPUT_PATH}'")

diff --git a/dawn/examples/tutorial/.gitignore b/dawn/examples/tutorial/.gitignore
@@ -0,0 +1,8 @@
+build/
+dawn-tutorial-venv/
+laplacian_stencil_cxx_naive.cpp
+laplacian_stencil_from_python.cpp
+laplacian_stencil_from_python.sir
+laplacian_stencil_from_toolchain.cpp
+in.vtk
+out.vtk