From abc49c325c63340f51c1cd7f06eb0f260788cef9 Mon Sep 17 00:00:00 2001 From: Hannes Vogt Date: Fri, 22 Mar 2019 15:04:39 +0100 Subject: [PATCH] remove deprecated funtions --- .../gridtools/communication/halo_exchange.hpp | 54 ------------------- .../communication/high_level/descriptors.hpp | 16 ------ .../high_level/descriptors_dt.hpp | 9 ---- .../high_level/descriptors_dt_whole.hpp | 9 ---- .../high_level/descriptors_manual_gpu.hpp | 9 ---- .../stencil_composition/grid_base.hpp | 17 ------ .../icosahedral_grids/grid.hpp | 13 ----- .../structured_grids/grid.hpp | 8 --- .../gridtools/storage/common/storage_info.hpp | 15 ------ include/gridtools/storage/data_store.hpp | 15 ------ 10 files changed, 165 deletions(-) diff --git a/include/gridtools/communication/halo_exchange.hpp b/include/gridtools/communication/halo_exchange.hpp index 6ed6c1e69f..dc059421f4 100644 --- a/include/gridtools/communication/halo_exchange.hpp +++ b/include/gridtools/communication/halo_exchange.hpp @@ -302,60 +302,6 @@ namespace gridtools { explicit halo_exchange_dynamic_ut(typename grid_type::period_type const &c, MPI_Comm const &comm) : hd(c.template permute(), comm) {} - /** constructor that takes the periodicity (mathich the \link - boollist_concept \endlink concept, and the MPI CART - communicator in DIMS (specified as template argument to the - pattern) dimensions of the processing grid. the periodicity is - specified in the order chosen by the programmer for the data, - as in the rest of the application. It is up tp the - construnctor implementation to translate it into the right - order depending on the gridtools::layout_map passed to the class. - - Examples: - 1) hd(period_type(true, true, false), MPI_COMM_WORLD, array{0,0,0}); - Supposing this this is executed in 8 processors, the communicator used by the pattern is a 2x2x2; - - 2) hd(period_type(true, true, false), MPI_COMM_WORLD, array{4,0,0}); - Supposing this this is executed in 8 processors, the communicator used by the pattern is a 4x2x1; - - 2) hd(period_type(true, true, false), MPI_COMM_WORLD, array{4,1,0}); - Supposing this this is executed in 8 processors, the communicator used by the pattern is a 4x1x2; - End of examples. - - \tparam ValueType Value type of the GridTools array of dimensions (deduced) - \tparam Size Size of the GridTools array of dimensions (deduced) - \param[in] c Periodicity specification as in \link boollist_concept \endlink - \param[in] comm MPI CART communicator with dimension DIMS (specified as template argument to the pattern). - \param[in] dims Array of dimensions of the ocmputing grid. Array must provide operator[] up to 3 elements. - The behavior is like MPI_Dims_create. - */ - template - GT_DEPRECATED( - "halo_exchange_dynamic_ut(period, MPI_Comm, dims) is deprecated, since it creates an additional " - "communicator that is not freed. Use the constructor without dims and pass to it a Cartesian communicator") - explicit halo_exchange_dynamic_ut( - typename grid_type::period_type const &c, MPI_Comm const &comm, array &&dims) - : hd(c.template permute(), _impl::_make_comm(comm, dims)) {} - - /** - Same signature of halo_exchange_dynamic_ut [this] constructor but takes the dims array as reference, in case - the output of the MPI_Cart_create is needed. - - \tparam ValueType Value type of the GridTools array of dimensions (deduced) - \tparam Size Size of the GridTools array of dimensions (deduced) - \param[in] c Periodicity specification as in \link boollist_concept \endlink - \param[in] comm MPI CART communicator with dimension DIMS (specified as template argument to the pattern). - \param[in] dims Array of dimensions of the ocmputing grid. Array must provide operator[] up to 3 elements. - The behavior is like MPI_Dims_create. - */ - template - GT_DEPRECATED("halo_exchange_dynamic_ut(period, MPI_Comm, dims) is deprecated, since it creates an " - "additional communicator that is not freed. Use the constructor without dims and pass to it " - "a Cartesian communicator") - explicit halo_exchange_dynamic_ut( - typename grid_type::period_type const &c, MPI_Comm const &comm, array &dims) - : hd(c.template permute(), _impl::_make_comm(comm, dims)) {} - /** Function to rerturn the L3 level pattern used inside the pattern itself. \return The pattern al level 3 used to exchange data diff --git a/include/gridtools/communication/high_level/descriptors.hpp b/include/gridtools/communication/high_level/descriptors.hpp index fe0f01f430..0d8f78abbf 100644 --- a/include/gridtools/communication/high_level/descriptors.hpp +++ b/include/gridtools/communication/high_level/descriptors.hpp @@ -447,13 +447,6 @@ namespace gridtools { return S; } - /** - Function to setup internal data structures for data exchange and preparing eventual underlying layers - - The use of this function is deprecated - */ - void allocate_buffers() { setup(); } - /** Function to setup internal data structures for data exchange and preparing eventual underlying layers */ @@ -572,15 +565,6 @@ namespace gridtools { : halo(), base_type::m_haloexch(g), send_buffer{nullptr}, recv_buffer{nullptr}, send_size{0}, recv_size{0} { } - /** - Function to setup internal data structures for data exchange and preparing eventual underlying layers - - The use of this function is deprecated - - \param max_fields_n Maximum number of data fields that will be passed to the communication functions - */ - void allocate_buffers(int max_fields_n) { setup(max_fields_n); } - /** Function to setup internal data structures for data exchange and preparing eventual underlying layers diff --git a/include/gridtools/communication/high_level/descriptors_dt.hpp b/include/gridtools/communication/high_level/descriptors_dt.hpp index 095bfbc2b1..a423bfcfe8 100644 --- a/include/gridtools/communication/high_level/descriptors_dt.hpp +++ b/include/gridtools/communication/high_level/descriptors_dt.hpp @@ -361,15 +361,6 @@ namespace gridtools { */ explicit hndlr_dynamic_ut(grid_type const &g) : halo(), base_type(g) {} - /** - Function to setup internal data structures for data exchange and preparing eventual underlying layers - - The use of this function is deprecated - - \param max_fields_n Maximum number of data fields that will be passed to the communication functions - */ - void allocate_buffers(int max_fields_n) { setup(max_fields_n); } - /** Function to setup internal data structures for data exchange and preparing eventual underlying layers diff --git a/include/gridtools/communication/high_level/descriptors_dt_whole.hpp b/include/gridtools/communication/high_level/descriptors_dt_whole.hpp index 9cb051130f..36f160c30e 100644 --- a/include/gridtools/communication/high_level/descriptors_dt_whole.hpp +++ b/include/gridtools/communication/high_level/descriptors_dt_whole.hpp @@ -130,15 +130,6 @@ namespace gridtools { counts[i] = 1; } - /** - Function to setup internal data structures for data exchange and preparing eventual underlying layers - - The use of this function is deprecated - - \param max_fields_n Maximum number of data fields that will be passed to the communication functions - */ - void allocate_buffers(int max_fields_n) { setup(max_fields_n); } - /** Function to setup internal data structures for data exchange and preparing eventual underlying layers diff --git a/include/gridtools/communication/high_level/descriptors_manual_gpu.hpp b/include/gridtools/communication/high_level/descriptors_manual_gpu.hpp index 57af8ebd68..0d20a67fe4 100644 --- a/include/gridtools/communication/high_level/descriptors_manual_gpu.hpp +++ b/include/gridtools/communication/high_level/descriptors_manual_gpu.hpp @@ -166,15 +166,6 @@ namespace gridtools { GT_CUDA_CHECK(cudaFree(halo_d_r)); } - /** - Function to setup internal data structures for data exchange and preparing eventual underlying layers - - The use of this function is deprecated - - \param max_fields_n Maximum number of data fields that will be passed to the communication functions - */ - void allocate_buffers(int max_fields_n) { setup(max_fields_n); } - /** Function to setup internal data structures for data exchange and preparing eventual underlying layers diff --git a/include/gridtools/stencil_composition/grid_base.hpp b/include/gridtools/stencil_composition/grid_base.hpp index 667a36339e..70413490ff 100644 --- a/include/gridtools/stencil_composition/grid_base.hpp +++ b/include/gridtools/stencil_composition/grid_base.hpp @@ -31,13 +31,6 @@ namespace gridtools { } } // namespace _impl - // TODO should be removed once we removed all ctor(array) calls - namespace enumtype_axis { - enum coordinate_argument { minus, plus, begin, end, length }; - } // namespace enumtype_axis - - using namespace enumtype_axis; - template struct grid_base { GT_STATIC_ASSERT((is_interval::value), GT_INTERNAL_ERROR); @@ -52,11 +45,6 @@ namespace gridtools { halo_descriptor m_direction_j; public: - GT_DEPRECATED("This constructor does not initialize the vertical axis, use the constructor with 3 " - "arguments. (deprecated after 1.05.02)") - GT_FUNCTION explicit grid_base(halo_descriptor const &direction_i, halo_descriptor const &direction_j) - : m_direction_i(direction_i), m_direction_j(direction_j) {} - /** * @brief standard ctor * @param direction_i halo_descriptor in i direction @@ -69,11 +57,6 @@ namespace gridtools { const array &value_list) : m_direction_i(direction_i), m_direction_j(direction_j), value_list(value_list) {} - GT_DEPRECATED("Use constructor with halo_descriptors (deprecated after 1.05.02)") - GT_FUNCTION explicit grid_base(uint_t *i, uint_t *j /*, uint_t* k*/) - : m_direction_i(i[minus], i[plus], i[begin], i[end], i[length]), - m_direction_j(j[minus], j[plus], j[begin], j[end], j[length]) {} - GT_FUNCTION uint_t i_low_bound() const { return m_direction_i.begin(); } diff --git a/include/gridtools/stencil_composition/icosahedral_grids/grid.hpp b/include/gridtools/stencil_composition/icosahedral_grids/grid.hpp index ddc51420f7..0dfcd61677 100644 --- a/include/gridtools/stencil_composition/icosahedral_grids/grid.hpp +++ b/include/gridtools/stencil_composition/icosahedral_grids/grid.hpp @@ -24,19 +24,6 @@ namespace gridtools { GridTopology m_grid_topology; public: - GT_DEPRECATED("Use constructor with halo_descriptors (deprecated after 1.05.02)") - GT_FUNCTION - explicit grid(GridTopology const &grid_topology, const array &i, const array &j) - : grid_base(halo_descriptor(i[minus], i[plus], i[begin], i[end], i[length]), - halo_descriptor(j[minus], j[plus], j[begin], j[end], j[length])), - m_grid_topology(grid_topology) {} - - GT_DEPRECATED("This constructor does not initialize the vertical axis, use the constructor with 4 " - "arguments. (deprecated after 1.05.02)") - GT_FUNCTION explicit grid( - GridTopology const &grid_topology, halo_descriptor const &direction_i, halo_descriptor const &direction_j) - : grid_base(direction_i, direction_j), m_grid_topology(grid_topology) {} - GT_FUNCTION explicit grid(GridTopology const &grid_topology, halo_descriptor const &direction_i, diff --git a/include/gridtools/stencil_composition/structured_grids/grid.hpp b/include/gridtools/stencil_composition/structured_grids/grid.hpp index 60de7103fa..cb56f01e02 100644 --- a/include/gridtools/stencil_composition/structured_grids/grid.hpp +++ b/include/gridtools/stencil_composition/structured_grids/grid.hpp @@ -16,19 +16,11 @@ namespace gridtools { struct grid : grid_base { using base_type = grid_base; - GT_DEPRECATED("This constructor does not initialize the vertical axis, use the constructor with 3 " - "arguments. (deprecated after 1.05.02)") - GT_FUNCTION explicit grid(halo_descriptor const &direction_i, halo_descriptor const &direction_j) - : base_type(direction_i, direction_j) {} - GT_FUNCTION explicit grid(halo_descriptor const &direction_i, halo_descriptor const &direction_j, const decltype(base_type::value_list) &value_list) : base_type(direction_i, direction_j, value_list) {} - - GT_DEPRECATED("Use constructor with halo_descriptors (deprecated after 1.05.02)") - GT_FUNCTION explicit grid(uint_t *i, uint_t *j) : base_type(i, j) {} }; template diff --git a/include/gridtools/storage/common/storage_info.hpp b/include/gridtools/storage/common/storage_info.hpp index 7a7c337307..7b3810a7c8 100644 --- a/include/gridtools/storage/common/storage_info.hpp +++ b/include/gridtools/storage/common/storage_info.hpp @@ -221,12 +221,6 @@ namespace gridtools { */ GT_FUNCTION constexpr const array &total_lengths() const { return m_total_lengths; } - /** - * @brief deprecated, see total_lengths() - */ - GT_DEPRECATED("dims() is deprecated, use total_lengths() (deprecated after 1.07.00)") - GT_FUNCTION constexpr const array &dims() const { return total_lengths(); } - /* * @brief Returns the length of a dimension including the halo points (the outer region) * @@ -239,15 +233,6 @@ namespace gridtools { return m_total_lengths[Dim]; } - /** - * @brief deprecated: see total_length() - */ - template - GT_DEPRECATED("dim() is deprecated, use total_length() (deprecated after 1.07.00)") - GT_FUNCTION constexpr uint_t dim() const { - return total_length(); - } - /** * @brief Returns the length of a dimension including the halo points (the outer region) and padding. * diff --git a/include/gridtools/storage/data_store.hpp b/include/gridtools/storage/data_store.hpp index 56d07c3d44..f5f443bff4 100644 --- a/include/gridtools/storage/data_store.hpp +++ b/include/gridtools/storage/data_store.hpp @@ -263,15 +263,6 @@ namespace gridtools { return m_shared_storage_info->template total_length(); } - /** - * @brief deprecated, see total_length() - */ - template - GT_DEPRECATED("dim() is deprecated, use total_lengths() (deprecated after 1.07.00)") - int dim() const { - return total_length(); - } - /** * @brief member function to retrieve the total size (dimensions, halos, padding). * @return total size @@ -307,12 +298,6 @@ namespace gridtools { return m_shared_storage_info->total_lengths(); } - /** - * @brief deprecated, see total_lengths() - */ - GT_DEPRECATED("dims() is deprecated, use total_lengths() (deprecated after 1.07.00)") - auto dims() const -> decltype(total_lengths()) { return total_lengths(); } - /** * @brief forward strides() from storage_info */