drop now unused mpiutil

CMakeLists_files.cmake

@@ -99,7 +99,6 @@ list (APPEND MAIN_SOURCE_FILES
   opm/models/io/vtktemperatureparams.cpp
   opm/models/io/restart.cpp
   opm/models/nonlinear/newtonmethodparams.cpp
-  opm/models/parallel/mpiutil.cpp
   opm/models/parallel/tasklets.cpp
   opm/models/parallel/threadmanager.cpp
   opm/models/utils/parametersystem.cpp
@@ -799,7 +798,6 @@ list (APPEND PUBLIC_HEADER_FILES
   opm/models/nonlinear/nullconvergencewriter.hh
   opm/models/parallel/gridcommhandles.hh
   opm/models/parallel/mpibuffer.hh
-  opm/models/parallel/mpiutil.hpp
   opm/models/parallel/tasklets.hpp
   opm/models/parallel/threadedentityiterator.hh
   opm/models/parallel/threadmanager.hpp

opm/models/parallel/mpiutil.cpp

@@ -1,186 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*
-  This file is part of the Open Porous Media project (OPM).
-
-  OPM is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 2 of the License, or
-  (at your option) any later version.
-
-  OPM is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with OPM.  If not, see <http://www.gnu.org/licenses/>.
-
-  Consult the COPYING file in the top-level source directory of this
-  module for the precise wording of the license and the list of
-  copyright holders.
-*/
-#include <config.h>
-#include <opm/models/parallel/mpiutil.hpp>
-
-#include <cassert>
-#include <numeric>
-#include <string>
-#include <vector>
-
-#if HAVE_MPI
-#include <mpi.h>
-#include <dune/common/parallel/mpitraits.hh>
-
-namespace {
-
-template <typename T>
-int packSize()
-{
-    int pack_size;
-    MPI_Pack_size(1, Dune::MPITraits<T>::getType(), MPI_COMM_WORLD, &pack_size);
-    return pack_size;
-}
-
-// --------  Packer --------
-template <typename T>
-struct Packer
-{
-    static int size(const T&)
-    {
-        return packSize<T>();
-    }
-
-    static void pack(const T& content, std::vector<char>& buf, int& offset)
-    {
-        MPI_Pack(&content, 1, Dune::MPITraits<T>::getType(), buf.data(), buf.size(), &offset, MPI_COMM_WORLD);
-    }
-
-    static T unpack(const std::vector<char>& recv_buffer, int& offset)
-    {
-        T content;
-        auto* data = const_cast<char*>(recv_buffer.data());
-        MPI_Unpack(data, recv_buffer.size(), &offset, &content, 1, Dune::MPITraits<T>::getType(), MPI_COMM_WORLD);
-        return content;
-    }
-};
-
-// --------  Packer, string specialization --------
-template <>
-struct Packer<std::string>
-{
-    static int size(const std::string& content)
-    {
-        return packSize<unsigned int>() + content.size()*packSize<char>();
-    }
-
-    static void pack(const std::string& content, std::vector<char>& buf, int& offset)
-    {
-        unsigned int sz = content.size();
-        Packer<unsigned int>::pack(sz, buf, offset);
-        if (sz > 0) {
-            MPI_Pack(const_cast<char*>(content.c_str()), sz, MPI_CHAR,
-                     buf.data(), buf.size(), &offset, MPI_COMM_WORLD);
-        }
-    }
-
-    static std::string unpack(const std::vector<char>& recv_buffer, int& offset)
-    {
-        unsigned int sz = Packer<unsigned int>::unpack(recv_buffer, offset);
-        std::string text;
-        if (sz > 0) {
-            auto* data = const_cast<char*>(recv_buffer.data());
-            std::vector<char> chars(sz);
-            MPI_Unpack(data, recv_buffer.size(), &offset, chars.data(), sz, MPI_CHAR, MPI_COMM_WORLD);
-            text = std::string(chars.data(), sz);
-        }
-        return text;
-    }
-};
-
-// --------  Packer, vector partial specialization --------
-template <typename T>
-struct Packer<std::vector<T>>
-{
-    static int size(const std::string& content)
-    {
-        return std::accumulate(content.begin(), content.end(), packSize<unsigned int>(),
-                               [](const auto acc, const auto elem)
-                               { return acc + Packer<T>::size(elem); });
-    }
-
-    static void pack(const std::vector<T>& content, std::vector<char>& buf, int& offset)
-    {
-        unsigned int sz = content.size();
-        Packer<unsigned int>::pack(sz, buf, offset);
-        for (const T& elem : content) {
-            Packer<T>::pack(elem);
-        }
-    }
-
-    static std::vector<T> unpack(const std::vector<char>& recv_buffer, int& offset)
-    {
-        unsigned int sz = Packer<T>::unpack(recv_buffer, offset);
-        std::vector<T> content;
-        content.reserve(sz);
-        for (unsigned int i = 0; i < sz; ++i) {
-            content.push_back(Packer<T>::unpack(recv_buffer, offset));
-        }
-        return content;
-    }
-};
-
-} // anonymous namespace
-#endif
-
-namespace Opm {
-
-/// From each rank, gather its string (if not empty) into a vector.
-std::vector<std::string> gatherStrings(const std::string& local_string)
-{
-#if HAVE_MPI
-    using StringPacker = Packer<std::string>;
-
-    // Pack local messages.
-    const int message_size = StringPacker::size(local_string);
-    std::vector<char> buffer(message_size);
-    int offset = 0;
-    StringPacker::pack(local_string, buffer, offset);
-    assert(offset == message_size);
-
-    // Get message sizes and create offset/displacement array for gathering.
-    int num_processes = -1;
-    MPI_Comm_size(MPI_COMM_WORLD, &num_processes);
-    std::vector<int> message_sizes(num_processes);
-    MPI_Allgather(&message_size, 1, MPI_INT, message_sizes.data(), 1, MPI_INT, MPI_COMM_WORLD);
-    std::vector<int> displ(num_processes + 1, 0);
-    std::partial_sum(message_sizes.begin(), message_sizes.end(), displ.begin() + 1);
-
-    // Gather.
-    std::vector<char> recv_buffer(displ.back());
-    MPI_Allgatherv(buffer.data(), buffer.size(), MPI_PACKED,
-                   const_cast<char*>(recv_buffer.data()), message_sizes.data(),
-                   displ.data(), MPI_PACKED,
-                   MPI_COMM_WORLD);
-
-    // Unpack and return.
-    std::vector<std::string> ret;
-    for (int process = 0; process < num_processes; ++process) {
-        offset = displ[process];
-        std::string s = StringPacker::unpack(recv_buffer, offset);
-        if (!s.empty()) {
-            ret.push_back(s);
-        }
-        assert(offset == displ[process + 1]);
-    }
-    return ret;
-#else
-    if (local_string.empty()) {
-        return {};
-    } else {
-        return { local_string };
-    }
-#endif
-}
-
-} // namespace Opm

opm/models/parallel/mpiutil.hpp

@@ -1,40 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*
-  This file is part of the Open Porous Media project (OPM).
-
-  OPM is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 2 of the License, or
-  (at your option) any later version.
-
-  OPM is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with OPM.  If not, see <http://www.gnu.org/licenses/>.
-
-  Consult the COPYING file in the top-level source directory of this
-  module for the precise wording of the license and the list of
-  copyright holders.
-*/
-/*!
- * \file
- * \copydoc Opm::MpiBuffer
- */
-#ifndef OPM_MPIUTIL_HPP
-#define OPM_MPIUTIL_HPP
-
-#include <string>
-#include <vector>
-
-namespace Opm {
-
-std::vector<std::string> gatherStrings(const std::string& local_string);
-
-} // namespace Opm
-
-#endif // OPM_MPIUTIL_HPP
-

parallelUnitTests.cmake

@@ -182,17 +182,3 @@ opm_add_test(test_rstconv_parallel
   PROCESSORS
     4
 )
-
-opm_add_test(test_mpiutil
-  DEPENDS "opmsimulators"
-  LIBRARIES opmsimulators
-  CONDITION
-    MPI_FOUND AND Boost_UNIT_TEST_FRAMEWORK_FOUND
-  SOURCES
-    tests/models/test_mpiutil.cpp
-  DRIVER_ARGS
-    -n 4
-    -b ${PROJECT_BINARY_DIR}
-  PROCESSORS
-    4
-)

tests/models/test_mpiutil.cpp

@@ -1,103 +0,0 @@
-/*
-  Copyright 2020 Equinor ASA.
-
-  This file is part of the Open Porous Media project (OPM).
-
-  OPM is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  OPM is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with OPM.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include <config.h>
-
-#include <opm/models/parallel/mpiutil.hpp>
-#include <dune/common/parallel/mpihelper.hh>
-
-#include <cassert>
-
-#if HAVE_MPI
-struct MPIError
-{
-    MPIError(std::string s, int e) : errorstring(std::move(s)), errorcode(e){}
-    std::string errorstring;
-    int errorcode;
-};
-
-void MPI_err_handler(MPI_Comm*, int* err_code, ...)
-{
-    std::vector<char> err_string(MPI_MAX_ERROR_STRING);
-    int err_length;
-    MPI_Error_string(*err_code, err_string.data(), &err_length);
-    std::string s(err_string.data(), err_length);
-    std::cerr << "An MPI Error ocurred:" << std::endl << s << std::endl;
-    throw MPIError(s, *err_code);
-}
-#endif
-
-bool noStrings(int, int)
-{
-    std::string empty;
-    auto res = Opm::gatherStrings(empty);
-    assert(res.empty());
-    return true;
-}
-
-bool oddRankStrings(int size, int rank)
-{
-    std::string what = (rank % 2 == 1) ? "An error on rank " + std::to_string(rank) : std::string();
-    auto res = Opm::gatherStrings(what);
-    assert(int(res.size()) == size/2);
-    for (int i = 0; i < size/2; ++i) {
-        assert(res[i] == "An error on rank " + std::to_string(2*i + 1));
-    }
-    return true;
-}
-
-bool allRankStrings(int size, int rank)
-{
-    std::string what = "An error on rank " + std::to_string(rank);
-    auto res = Opm::gatherStrings(what);
-    assert(int(res.size()) == size);
-    for (int i = 0; i < size; ++i) {
-        assert(res[i] == "An error on rank " + std::to_string(i));
-    }
-    return true;
-}
-
-
-int testMain(int size, int rank)
-{
-    bool ok = noStrings(size, rank);
-    ok = ok && oddRankStrings(size, rank);
-    ok = ok && allRankStrings(size, rank);
-    if (ok) {
-        return EXIT_SUCCESS;
-    } else {
-        return EXIT_FAILURE;
-    }
-}
-
-
-int main(int argc, char** argv)
-{
-    const auto& mpiHelper = Dune::MPIHelper::instance(argc, argv);
-    int mpiSize = mpiHelper.size();
-    int mpiRank = mpiHelper.rank();
-#if HAVE_MPI
-    // register a throwing error handler to allow for
-    // debugging with "catch throw" in gdb
-    MPI_Errhandler handler;
-    MPI_Comm_create_errhandler(MPI_err_handler, &handler);
-    MPI_Comm_set_errhandler(MPI_COMM_WORLD, handler);
-#endif
-    return testMain(mpiSize, mpiRank);
-}