Remove GT_LEGACY mode (#47)

cpp_bindgen v1.1.0 will be the release to work with GT 2.0 (which doesn't come with a packaged cpp_bindgen). Therefore we remove the legacy mode.

Author: havogt

CMakeLists.txt

@@ -12,10 +12,6 @@ mark_as_advanced(CMAKE_EXPORT_NO_PACKAGE_REGISTRY)
 set(REQUIRED_BOOST_VERSION 1.58)
 find_package(Boost ${REQUIRED_BOOST_VERSION} REQUIRED)
 
-if(NOT CPP_BINDGEN_GT_LEGACY)
-    set(CPP_BINDGEN_GT_LEGACY OFF)
-endif()
-
 # if used via FetchContent/add_subdirectory() we need to make the add_bindings_library() available here
 include(${CMAKE_CURRENT_LIST_DIR}/cmake/bindings.cmake)
 

cmake/cpp_bindgen.cmake.in

@@ -41,9 +41,6 @@ add_library(cpp_bindgen_interface INTERFACE)
 target_include_directories(cpp_bindgen_interface INTERFACE $<BUILD_INTERFACE:${__CPP_BINDGEN_INCLUDE_DIR}> $<INSTALL_INTERFACE:include>)
 target_compile_features(cpp_bindgen_interface INTERFACE cxx_std_11)
 target_compile_definitions(cpp_bindgen_interface INTERFACE BOOST_PP_VARIADICS=1)
-if(CPP_BINDGEN_GT_LEGACY)
-    target_compile_definitions(cpp_bindgen_interface INTERFACE CPP_BINDGEN_GT_LEGACY)
-endif()
 
 add_library(cpp_bindgen_generator STATIC ${__CPP_BINDGEN_SOURCE_DIR}/cpp_bindgen/generator.cpp)
 # PUBLIC to make export.hpp available in the sources passed to add_bindings_library()

include/cpp_bindgen/array_descriptor.h

@@ -22,18 +22,6 @@ enum bindgen_fortran_array_kind {
     bindgen_fk_Double,
     bindgen_fk_LongDouble,
     bindgen_fk_SignedChar,
-
-#ifdef CPP_BINDGEN_GT_LEGACY // remove once GT is at v2.0
-    gt_fk_Bool = bindgen_fk_Bool,
-    gt_fk_Int = bindgen_fk_Int,
-    gt_fk_Short = bindgen_fk_Int,
-    gt_fk_Long = bindgen_fk_Long,
-    gt_fk_LongLong = bindgen_fk_LongLong,
-    gt_fk_Float = bindgen_fk_Float,
-    gt_fk_Double = bindgen_fk_Double,
-    gt_fk_LongDouble = bindgen_fk_LongDouble,
-    gt_fk_SignedChar = bindgen_fk_SignedChar
-#endif
 };
 typedef enum bindgen_fortran_array_kind bindgen_fortran_array_kind;
 
@@ -46,7 +34,3 @@ struct bindgen_fortran_array_descriptor {
     // TODO: add support for strides, bounds end type bindgen_fortran_array_descriptor
 };
 typedef struct bindgen_fortran_array_descriptor bindgen_fortran_array_descriptor;
-
-#ifdef CPP_BINDGEN_GT_LEGACY // remove once GT is at v2.0
-typedef struct bindgen_fortran_array_descriptor gt_fortran_array_descriptor;
-#endif

include/cpp_bindgen/export_gt_legacy.hpp

@@ -100,28 +100,9 @@ namespace cpp_bindgen {
             return descriptor;
         }
 
-#ifdef CPP_BINDGEN_GT_LEGACY // remove once GT is at v2.0
-        template <class T>
-        enable_if_t<(T::gt_view_rank::value > 0) && std::is_arithmetic<typename T::gt_view_element_type>::value &&
-                        (T::gt_is_acc_present::value == T::gt_is_acc_present::value),
-            bindgen_fortran_array_descriptor>
-        get_fortran_view_meta(T *) {
-            bindgen_fortran_array_descriptor descriptor;
-            descriptor.type = fortran_array_element_kind<typename T::gt_view_element_type>::value;
-            descriptor.rank = T::gt_view_rank::value;
-            descriptor.is_acc_present = T::gt_is_acc_present::value;
-
-            return descriptor;
-        }
-#endif
         template <class T>
         using bindgen_fortran_array_view_t = decltype(
             bindgen_make_fortran_array_view(std::declval<bindgen_fortran_array_descriptor *>(), std::declval<T *>()));
-#ifdef CPP_BINDGEN_GT_LEGACY // remove once GT is at v2.0
-        template <class T>
-        using gt_fortran_array_view_t =
-            decltype(gt_make_fortran_array_view(std::declval<gt_fortran_array_descriptor *>(), std::declval<T *>()));
-#endif
 
     } // namespace get_fortran_view_meta_impl
     using get_fortran_view_meta_impl::get_fortran_view_meta;
@@ -184,15 +165,6 @@ namespace cpp_bindgen {
                 T>::value>> //
         > : std::true_type {};
 
-#ifdef CPP_BINDGEN_GT_LEGACY // remove once GT is at v2.0
-    template <class T>
-    struct is_fortran_array_convertible<T,
-        void_t<get_fortran_view_meta_impl::gt_fortran_array_view_t<T>,
-            enable_if_t<std::is_same<get_fortran_view_meta_impl::gt_fortran_array_view_t<T>,
-                T>::value>> //
-        > : std::true_type {};
-#endif
-
     /**
      * @brief A type is fortran_array_bindable if it is fortran_array_convertible
      *
@@ -248,23 +220,4 @@ namespace cpp_bindgen {
         return bindgen_make_fortran_array_view(descriptor, (T *){nullptr});
     }
 
-#ifdef CPP_BINDGEN_GT_LEGACY // remove once GT is at v2.0
-    template <class T>
-    enable_if_t<std::is_same<get_fortran_view_meta_impl::gt_fortran_array_view_t<T>, T>::value,
-        get_fortran_view_meta_impl::gt_fortran_array_view_t<T>>
-    make_fortran_array_view(bindgen_fortran_array_descriptor *descriptor) {
-        return gt_make_fortran_array_view(descriptor, (T *){nullptr});
-    }
-#endif
 } // namespace cpp_bindgen
-
-#ifdef CPP_BINDGEN_GT_LEGACY // remove once GT is at v2.0
-namespace gridtools {
-    namespace c_bindings {
-        using cpp_bindgen::fortran_array_element_kind;
-        using cpp_bindgen::is_fortran_array_bindable;
-        using cpp_bindgen::is_fortran_array_view_inspectable;
-        using cpp_bindgen::is_fortran_array_wrappable;
-    } // namespace c_bindings
-} // namespace gridtools
-#endif

include/cpp_bindgen/fortran_array_view.hpp

@@ -14,17 +14,10 @@ struct bindgen_handle;
 #ifdef __cplusplus
 
 extern "C" void bindgen_release(bindgen_handle const *);
-#ifdef CPP_BINDGEN_GT_LEGACY // remove once GT is at v2.0
-extern "C" void gt_release(bindgen_handle const *);
-#endif
 
 #else
 
 typedef struct bindgen_handle bindgen_handle;
 void bindgen_release(bindgen_handle *);
-#ifdef CPP_BINDGEN_GT_LEGACY // remove once GT is at v2.0
-typedef struct bindgen_handle gt_handle;
-void gt_release(bindgen_handle *);
-#endif
 
 #endif

include/cpp_bindgen/handle.h

@@ -68,12 +68,3 @@ mkdir -p build && cd build
 cmake ..
 nice make -j8
 ./driver
-
-# test gt legacy mode (don't run it on kesch because CUDA 8 is not supported in legacy mode)
-if [[ "$HOST" != kesch* ]]; then
-    cd ${cwd}
-    mkdir -p build_legacy && cd build_legacy
-    cmake .. -DCMAKE_INSTALL_PREFIX=${cwd}/install -DCPP_BINDGEN_GT_LEGACY=ON
-    nice make -j8 install
-    $RUN_PREFIX ctest .
-fi

jenkins/build.sh

@@ -12,7 +12,3 @@
 #include <cpp_bindgen/handle_impl.hpp>
 
 void bindgen_release(bindgen_handle const *obj) { delete obj; }
-
-#ifdef CPP_BINDGEN_GT_LEGACY // remove once GT is at v2.0
-void gt_release(bindgen_handle const *obj) { bindgen_release(obj); }
-#endif

src/cpp_bindgen/handle.cpp

@@ -15,16 +15,3 @@ subroutine bindgen_release(h) bind(c)
         end
     end interface
 end
-
-! remove once GT is at v2.0
-#ifdef CPP_BINDGEN_GT_LEGACY
-module gt_handle
-    implicit none
-    interface
-        subroutine gt_release(h) bind(c, name="bindgen_release")
-            use iso_c_binding
-            type(c_ptr), value :: h
-        end
-    end interface
-end
-#endif

src/cpp_bindgen/handle.f90

@@ -6,8 +6,4 @@ add_subdirectory(simple)
 
 if(CMAKE_Fortran_COMPILER_LOADED)
     add_subdirectory(array)
-
-    if(CPP_BINDGEN_GT_LEGACY)
-        add_subdirectory(array_gt_legacy)
-    endif()
 endif()