use templated isl types

CMakeLists.txt

@@ -225,6 +225,7 @@ message(STATUS "Found ATen.so file: ${ATEN_LIBRARIES}")
 ################################################################################
 # use locally generated C++ bindings
 include_directories(AFTER ${PROJECT_SOURCE_DIR}/isl_interface/include)
+include_directories(AFTER ${CMAKE_CURRENT_BINARY_DIR}/isl_interface/include)
 include_directories(AFTER ${PROJECT_SOURCE_DIR}/third-party/islpp/include)
 include_directories(AFTER ${CMAKE_CURRENT_BINARY_DIR}/third-party/islpp/include)
 add_subdirectory(external/isl)
@@ -334,6 +335,34 @@ else()
   message(STATUS "Not building benchmarks, caffe2 or CUDA not available")
 endif()
 
+SET(ISL_CPP_H "${CMAKE_CURRENT_LIST_DIR}/isl_interface/include/isl/cpp.h")
+
+add_executable(generate_template_isl isl_interface/generate_template_isl.cc)
+
+find_program(CLANG_FORMAT_BIN clang-format PATHS ${CLANG_PREFIX}
+  PATH_SUFFIXES bin
+  NO_DEFAULT_PATH)
+
+SET(ISL_TEMPLATE_CPP_DIR
+  "${CMAKE_CURRENT_BINARY_DIR}/isl_interface/include/isl")
+SET(ISL_TEMPLATE_CPP_H "${ISL_TEMPLATE_CPP_DIR}/template_cpp.h")
+add_custom_command(
+  OUTPUT ${ISL_TEMPLATE_CPP_H}
+  DEPENDS ${ISL_CPP_H}
+  DEPENDS generate_template_isl
+  COMMAND mkdir -p ${ISL_TEMPLATE_CPP_DIR}
+  COMMAND generate_template_isl < ${ISL_CPP_H} > ${ISL_TEMPLATE_CPP_H}
+  COMMAND ${CLANG_FORMAT_BIN} -i ${ISL_TEMPLATE_CPP_H}
+)
+
 if (WITH_BINDINGS)
   add_subdirectory(isl_interface)
+
+  # generate_isl_cpp_h is the dependency that should be used
+  # by code that depends on the isl C++ bindings.
+  add_custom_target(generate_isl_cpp_h
+    DEPENDS generate_isl_cpp_h_core ${ISL_TEMPLATE_CPP_H})
+else()
+  add_custom_target(generate_isl_cpp_h
+    DEPENDS ${ISL_TEMPLATE_CPP_H})
 endif()

isl_interface/CMakeLists.txt

@@ -87,7 +87,6 @@ target_link_libraries(extract_isl_interface
 # Dummy library to ensure that C++ bindings depend on contents of header files.
 add_library(isl_all_h_dep STATIC ${ISL_DIR}/all.c)
 
-SET(ISL_CPP_H "${CMAKE_CURRENT_LIST_DIR}/include/isl/cpp.h")
 add_custom_command(
   OUTPUT ${ISL_CPP_H}
   DEPENDS isl_all_h_dep
@@ -107,6 +106,5 @@ add_custom_command(
   COMMAND cat ${ISL_DIR}/cpp/cpp.h.bot >> ${ISL_CPP_H} || exit 1
   DEPENDS extract_isl_interface
 )
-# generate_isl_cpp_h is the dependency that should be used
-# by code that depends on the isl C++ bindings.
-add_custom_target(generate_isl_cpp_h DEPENDS ${ISL_CPP_H})
+
+add_custom_target(generate_isl_cpp_h_core DEPENDS ${ISL_CPP_H})