Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rename hwloc_topology to hwloc_topology_info #2551

Merged
merged 1 commit into from Mar 23, 2017
Merged

Rename hwloc_topology to hwloc_topology_info #2551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 11 additions & 9 deletions ...ntime/threads/policies/hwloc_topology.hpp → .../threads/policies/hwloc_topology_info.hpp
View file
Open in desktop
@@ -1,14 +1,14 @@
////////////////////////////////////////////////////////////////////////////////
// Copyright (c) 2007-2015 Hartmut Kaiser
// Copyright (c) 2007-2017 Hartmut Kaiser
// Copyright (c) 2008-2009 Chirag Dekate, Anshul Tandon
// Copyright (c) 2012-2013 Thomas Heller
//
// Distributed under the Boost Software License, Version 1.0. (See accompanying
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
////////////////////////////////////////////////////////////////////////////////

#ifndef HPX_RUNTIME_THREADS_POLICIES_HWLOC_TOPOLOGY_HPP
#define HPX_RUNTIME_THREADS_POLICIES_HWLOC_TOPOLOGY_HPP
#ifndef HPX_RUNTIME_THREADS_POLICIES_HWLOC_TOPOLOGY_INFO_HPP
#define HPX_RUNTIME_THREADS_POLICIES_HWLOC_TOPOLOGY_INFO_HPP

#include <hpx/config.hpp>

Expand All @@ -29,17 +29,17 @@
#include <vector>

#if defined(HPX_NATIVE_MIC) && HWLOC_API_VERSION < 0x00010600
#error On Intel Xeon/Phi coprosessors HPX cannot be use with a HWLOC version earlier than V1.6.
#error On Intel Xeon/Phi coprocessors HPX cannot be use with a HWLOC version earlier than V1.6.
#endif

#include <hpx/config/warnings_prefix.hpp>

namespace hpx { namespace threads
{
struct HPX_EXPORT hwloc_topology : topology
struct HPX_EXPORT hwloc_topology_info : topology
{
hwloc_topology();
~hwloc_topology();
hwloc_topology_info();
~hwloc_topology_info();

std::size_t get_socket_number(
std::size_t num_thread
Expand Down Expand Up @@ -263,9 +263,11 @@ namespace hpx { namespace threads
};

///////////////////////////////////////////////////////////////////////////
inline hwloc_topology& create_topology()
inline hwloc_topology_info& create_topology()
{
util::static_<hwloc_topology, hwloc_topology::hwloc_topology_tag> topo;
util::static_<
hwloc_topology_info, hwloc_topology_info::hwloc_topology_tag
> topo;
return topo.get();
}
}}
Expand Down
2 changes: 1 addition & 1 deletion hpx/runtime/threads/policies/topology.hpp
View file
Open in desktop
Expand Up @@ -7,7 +7,7 @@
#define HPX_THREADS_POLICIES_TOPOLGY_NOV_25_2012_1036AM

#if defined(HPX_HAVE_HWLOC)
# include <hpx/runtime/threads/policies/hwloc_topology.hpp>
# include <hpx/runtime/threads/policies/hwloc_topology_info.hpp>
#else
# include <hpx/runtime/threads/policies/noop_topology.hpp>
#endif
Expand Down