Skip to content

Commit

Permalink
compilation fixups
Browse files Browse the repository at this point in the history
  • Loading branch information
evaleev committed Aug 4, 2021
1 parent 7c6e354 commit ea65d83
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 14 deletions.
12 changes: 8 additions & 4 deletions src/TiledArray/cuda/um_allocator.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,17 +39,21 @@ namespace TiledArray {
/// CUDA UM allocator, based on boilerplate by Howard Hinnant
/// (https://howardhinnant.github.io/allocator_boilerplate.html)
template <class T>
class cuda_um_allocator_impl : public umpire_allocator<T> {
class cuda_um_allocator_impl : public umpire_allocator_impl<T> {
public:
using base_type = umpire_allocator<T>;
using base_type;
using base_type = umpire_allocator_impl<T>;
using typename base_type::const_pointer;
using typename base_type::const_reference;
using typename base_type::pointer;
using typename base_type::reference;
using typename base_type::value_type;

cuda_um_allocator_impl() noexcept
: base_type(&cudaEnv::instance()->um_dynamic_pool()) {}

template <class U>
cuda_um_allocator_impl(const cuda_um_allocator_impl<U>& rhs) noexcept
: base_type(static_cast<const umpire_allocator<U>&>(rhs)) {}
: base_type(static_cast<const umpire_allocator_impl<U>&>(rhs)) {}

template <typename T1, typename T2>
friend bool operator==(const cuda_um_allocator_impl<T1>& lhs,
Expand Down
10 changes: 0 additions & 10 deletions src/TiledArray/host/env.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,16 +41,6 @@

namespace TiledArray {

namespace detail {

inline std::pair<int, int> mpi_local_rank_size(World& world) {
auto host_comm =
world.mpi.comm().Split_type(SafeMPI::Intracomm::SHARED_SPLIT_TYPE, 0);
return std::make_pair(host_comm.Get_rank(), host_comm.Get_size());
}

} // namespace detail

/**
* hostEnv set up global environment
*
Expand Down

0 comments on commit ea65d83

Please sign in to comment.