Skip to content

Commit

Permalink
rename process mapping gain files to steiner tree gain files
Browse files Browse the repository at this point in the history
  • Loading branch information
kittobi1992 committed Jul 20, 2023
1 parent 05ba550 commit 08fa641
Show file tree
Hide file tree
Showing 48 changed files with 351 additions and 351 deletions.
2 changes: 1 addition & 1 deletion mt-kahypar/application/mt_kahypar.cc.in
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
#include "mt-kahypar/partition/partitioner_facade.h"
#include "mt-kahypar/partition/registries/register_memory_pool.h"
#include "mt-kahypar/partition/conversion.h"
#include "mt-kahypar/partition/process_mapping/target_graph.h"
#include "mt-kahypar/partition/mapping/target_graph.h"
#include "mt-kahypar/utils/cast.h"
#include "mt-kahypar/utils/delete.h"
#include "mt-kahypar/utils/randomize.h"
Expand Down
2 changes: 1 addition & 1 deletion mt-kahypar/io/partitioning_output.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
#include "mt-kahypar/parallel/memory_pool.h"
#include "mt-kahypar/parallel/atomic_wrapper.h"
#include "mt-kahypar/partition/metrics.h"
#include "mt-kahypar/partition/process_mapping/target_graph.h"
#include "mt-kahypar/partition/mapping/target_graph.h"
#include "mt-kahypar/utils/hypergraph_statistics.h"
#include "mt-kahypar/utils/memory_tree.h"
#include "mt-kahypar/utils/timer.h"
Expand Down
2 changes: 1 addition & 1 deletion mt-kahypar/io/sql_plottools_serializer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

#include "mt-kahypar/definitions.h"
#include "mt-kahypar/partition/metrics.h"
#include "mt-kahypar/partition/process_mapping/target_graph.h"
#include "mt-kahypar/partition/mapping/target_graph.h"
#include "mt-kahypar/utils/utilities.h"
#include "mt-kahypar/utils/timer.h"

Expand Down
2 changes: 1 addition & 1 deletion mt-kahypar/partition/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ add_subdirectory(preprocessing/)
add_subdirectory(coarsening)
add_subdirectory(refinement)
add_subdirectory(initial_partitioning)
add_subdirectory(process_mapping)
add_subdirectory(mapping)
add_subdirectory(registries)

set(PartitionSources
Expand Down
4 changes: 2 additions & 2 deletions mt-kahypar/partition/context.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,7 @@ namespace mt_kahypar {
shared_memory.use_localized_random_shuffle = false;
shared_memory.static_balancing_work_packages = 128;

// process_mapping
// mapping
mapping.strategy = OneToOneMappingStrategy::greedy_mapping;
mapping.use_local_search = true;
mapping.use_two_phase_approach = false;
Expand Down Expand Up @@ -673,7 +673,7 @@ namespace mt_kahypar {
shared_memory.use_localized_random_shuffle = false;
shared_memory.static_balancing_work_packages = 128;

// process_mapping
// mapping
mapping.strategy = OneToOneMappingStrategy::greedy_mapping;
mapping.use_local_search = true;
mapping.use_two_phase_approach = false;
Expand Down
4 changes: 2 additions & 2 deletions mt-kahypar/partition/deep_multilevel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -634,15 +634,15 @@ void bipartition_each_block(typename TypeTraits::PartitionedHypergraph& partitio
already_cut, current_k, current_objective, progress_bar_enabled); break;
case GainPolicy::steiner_tree:
bipartition_each_block<TypeTraits>(partitioned_hg, context,
GainCachePtr::cast<ProcessMappingGainCache>(gain_cache), info, rb_tree,
GainCachePtr::cast<SteinerTreeGainCache>(gain_cache), info, rb_tree,
already_cut, current_k, current_objective, progress_bar_enabled); break;
case GainPolicy::cut_for_graphs:
bipartition_each_block<TypeTraits>(partitioned_hg, context,
GainCachePtr::cast<GraphCutGainCache>(gain_cache), info, rb_tree,
already_cut, current_k, current_objective, progress_bar_enabled); break;
case GainPolicy::steiner_tree_for_graphs:
bipartition_each_block<TypeTraits>(partitioned_hg, context,
GainCachePtr::cast<GraphProcessMappingGainCache>(gain_cache), info, rb_tree,
GainCachePtr::cast<GraphSteinerTreeGainCache>(gain_cache), info, rb_tree,
already_cut, current_k, current_objective, progress_bar_enabled); break;
case GainPolicy::none: break;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
set(ProcessMappingSources
set(MappingSources
target_graph.cpp
all_pair_shortest_path.cpp
steiner_tree.cpp
Expand All @@ -9,22 +9,22 @@ set(ProcessMappingSources
)

foreach(modtarget IN LISTS PARTITIONING_SUITE_TARGETS)
target_sources(${modtarget} PRIVATE ${ProcessMappingSources})
target_sources(${modtarget} PRIVATE ${MappingSources})
endforeach()

set(ToolsProcessMappingSources
set(ToolsMappingSources
target_graph.cpp
all_pair_shortest_path.cpp
steiner_tree.cpp
)

foreach(modtarget IN LISTS TOOLS_TARGETS)
target_sources(${modtarget} PRIVATE ${ToolsProcessMappingSources})
target_sources(${modtarget} PRIVATE ${ToolsMappingSources})
endforeach()

set(OneToOneMappingSources
greedy_mapping.cpp
initial_mapping.cpp
kerninghan_lin.cpp
)
target_sources(OneToOneProcessMapping PRIVATE ${OneToOneMappingSources})
target_sources(OneToOneMapping PRIVATE ${OneToOneMappingSources})
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
* SOFTWARE.
******************************************************************************/

#include "mt-kahypar/partition/process_mapping/all_pair_shortest_path.h"
#include "mt-kahypar/partition/mapping/all_pair_shortest_path.h"

namespace mt_kahypar {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@
* SOFTWARE.
******************************************************************************/

#include "mt-kahypar/partition/process_mapping/dual_bipartitioning.h"
#include "mt-kahypar/partition/mapping/dual_bipartitioning.h"

#include "mt-kahypar/definitions.h"
#include "mt-kahypar/partition/metrics.h"
#include "mt-kahypar/partition/process_mapping/kerninghan_lin.h"
#include "mt-kahypar/partition/mapping/kerninghan_lin.h"
#include "mt-kahypar/partition/initial_partitioning/pool_initial_partitioner.h"
#include "mt-kahypar/partition/process_mapping/set_enumerator.h"
#include "mt-kahypar/partition/mapping/set_enumerator.h"
#include "mt-kahypar/utils/utilities.h"

namespace mt_kahypar {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

#include "mt-kahypar/macros.h"
#include "mt-kahypar/datastructures/partitioned_graph.h"
#include "mt-kahypar/partition/process_mapping/target_graph.h"
#include "mt-kahypar/partition/mapping/target_graph.h"
#include "mt-kahypar/partition/context.h"

namespace mt_kahypar {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@
* SOFTWARE.
******************************************************************************/

#include "mt-kahypar/partition/process_mapping/greedy_mapping.h"
#include "mt-kahypar/partition/mapping/greedy_mapping.h"

#include <numeric>
#include <queue>

#include "mt-kahypar/definitions.h"
#include "mt-kahypar/partition/metrics.h"
#include "mt-kahypar/partition/process_mapping/kerninghan_lin.h"
#include "mt-kahypar/partition/mapping/kerninghan_lin.h"
#include "mt-kahypar/datastructures/static_graph.h"
#include "mt-kahypar/datastructures/static_bitset.h"
#include "mt-kahypar/parallel/atomic_wrapper.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

#include "mt-kahypar/macros.h"
#include "mt-kahypar/datastructures/partitioned_graph.h"
#include "mt-kahypar/partition/process_mapping/target_graph.h"
#include "mt-kahypar/partition/mapping/target_graph.h"
#include "mt-kahypar/partition/context.h"

namespace mt_kahypar {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,16 @@
* SOFTWARE.
******************************************************************************/

#include "mt-kahypar/partition/process_mapping/initial_mapping.h"
#include "mt-kahypar/partition/mapping/initial_mapping.h"

#include "tbb/parallel_invoke.h"

#include "mt-kahypar/definitions.h"
#include "mt-kahypar/partition/process_mapping/target_graph.h"
#include "mt-kahypar/partition/mapping/target_graph.h"
#ifndef IGNORE_DUAL_BIPARTITIONING
#include "mt-kahypar/partition/process_mapping/dual_bipartitioning.h"
#include "mt-kahypar/partition/mapping/dual_bipartitioning.h"
#endif
#include "mt-kahypar/partition/process_mapping/greedy_mapping.h"
#include "mt-kahypar/partition/mapping/greedy_mapping.h"
#include "mt-kahypar/partition/metrics.h"
#include "mt-kahypar/parallel/stl/scalable_vector.h"
#include "mt-kahypar/utils/utilities.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@
* SOFTWARE.
******************************************************************************/

#include "mt-kahypar/partition/process_mapping/kerninghan_lin.h"
#include "mt-kahypar/partition/mapping/kerninghan_lin.h"

#include "mt-kahypar/definitions.h"
#include "mt-kahypar/partition/metrics.h"
#include "mt-kahypar/partition/process_mapping/target_graph.h"
#include "mt-kahypar/partition/mapping/target_graph.h"
#include "mt-kahypar/datastructures/static_bitset.h"

namespace mt_kahypar {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
******************************************************************************/

#include "mt-kahypar/datastructures/static_bitset.h"
#include "mt-kahypar/partition/process_mapping/steiner_tree.h"
#include "mt-kahypar/partition/process_mapping/all_pair_shortest_path.h"
#include "mt-kahypar/partition/process_mapping/set_enumerator.h"
#include "mt-kahypar/partition/mapping/steiner_tree.h"
#include "mt-kahypar/partition/mapping/all_pair_shortest_path.h"
#include "mt-kahypar/partition/mapping/set_enumerator.h"

namespace mt_kahypar {

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@
* SOFTWARE.
******************************************************************************/

#include "mt-kahypar/partition/process_mapping/target_graph.h"
#include "mt-kahypar/partition/mapping/target_graph.h"

#include <cmath>
#include <limits>

#include "mt-kahypar/datastructures/static_graph.h"
#include "mt-kahypar/partition/process_mapping/steiner_tree.h"
#include "mt-kahypar/partition/mapping/steiner_tree.h"

namespace mt_kahypar {

Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion mt-kahypar/partition/metrics.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
#include <algorithm>

#include "mt-kahypar/definitions.h"
#include "mt-kahypar/partition/process_mapping/target_graph.h"
#include "mt-kahypar/partition/mapping/target_graph.h"

namespace mt_kahypar::metrics {

Expand Down
4 changes: 2 additions & 2 deletions mt-kahypar/partition/partitioner.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
#include "mt-kahypar/partition/preprocessing/community_detection/parallel_louvain.h"
#include "mt-kahypar/partition/recursive_bipartitioning.h"
#include "mt-kahypar/partition/deep_multilevel.h"
#include "mt-kahypar/partition/process_mapping/target_graph.h"
#include "mt-kahypar/partition/process_mapping/initial_mapping.h"
#include "mt-kahypar/partition/mapping/target_graph.h"
#include "mt-kahypar/partition/mapping/initial_mapping.h"
#include "mt-kahypar/utils/hypergraph_statistics.h"
#include "mt-kahypar/utils/stats.h"
#include "mt-kahypar/utils/timer.h"
Expand Down
2 changes: 1 addition & 1 deletion mt-kahypar/partition/recursive_bipartitioning.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
#include "mt-kahypar/macros.h"
#include "mt-kahypar/partition/multilevel.h"
#include "mt-kahypar/partition/refinement/gains/bipartitioning_policy.h"
#include "mt-kahypar/partition/process_mapping/initial_mapping.h"
#include "mt-kahypar/partition/mapping/initial_mapping.h"

#include "mt-kahypar/parallel/memory_pool.h"
#include "mt-kahypar/utils/randomize.h"
Expand Down
8 changes: 4 additions & 4 deletions mt-kahypar/partition/refinement/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ set(RefinementSources
gains/km1/km1_gain_cache.cpp
gains/cut/cut_gain_cache.cpp
gains/soed/soed_gain_cache.cpp
gains/process_mapping/process_mapping_gain_cache.cpp
gains/process_mapping/process_mapping_flow_network_construction.cpp
gains/process_mapping_for_graphs/process_mapping_gain_cache_for_graphs.cpp
gains/process_mapping_for_graphs/process_mapping_flow_network_construction_for_graphs.cpp
gains/steiner_tree/steiner_tree_gain_cache.cpp
gains/steiner_tree/steiner_tree_flow_network_construction.cpp
gains/steiner_tree_for_graphs/steiner_tree_gain_cache_for_graphs.cpp
gains/steiner_tree_for_graphs/steiner_tree_flow_network_construction_for_graphs.cpp
gains/cut_for_graphs/cut_gain_cache_for_graphs.cpp
fm/sequential_twoway_fm_refiner.cpp
label_propagation/label_propagation_refiner.cpp
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
#include "tbb/parallel_for.h"

#include "mt-kahypar/definitions.h"
#include "mt-kahypar/partition/process_mapping/target_graph.h"
#include "mt-kahypar/partition/mapping/target_graph.h"

namespace mt_kahypar {

Expand Down
32 changes: 16 additions & 16 deletions mt-kahypar/partition/refinement/gains/gain_cache_ptr.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@
#include "mt-kahypar/partition/refinement/gains/km1/km1_gain_cache.h"
#include "mt-kahypar/partition/refinement/gains/cut/cut_gain_cache.h"
#include "mt-kahypar/partition/refinement/gains/soed/soed_gain_cache.h"
#include "mt-kahypar/partition/refinement/gains/process_mapping/process_mapping_gain_cache.h"
#include "mt-kahypar/partition/refinement/gains/steiner_tree/steiner_tree_gain_cache.h"
#include "mt-kahypar/partition/refinement/gains/cut_for_graphs/cut_gain_cache_for_graphs.h"
#include "mt-kahypar/partition/refinement/gains/process_mapping_for_graphs/process_mapping_gain_cache_for_graphs.h"
#include "mt-kahypar/partition/refinement/gains/steiner_tree_for_graphs/steiner_tree_gain_cache_for_graphs.h"
#include "mt-kahypar/macros.h"

namespace mt_kahypar {
Expand All @@ -55,9 +55,9 @@ class GainCachePtr {
case GainPolicy::cut: return constructGainCache<CutGainCache>(context);
case GainPolicy::km1: return constructGainCache<Km1GainCache>(context);
case GainPolicy::soed: return constructGainCache<SoedGainCache>(context);
case GainPolicy::steiner_tree: return constructGainCache<ProcessMappingGainCache>(context);
case GainPolicy::steiner_tree: return constructGainCache<SteinerTreeGainCache>(context);
case GainPolicy::cut_for_graphs: return constructGainCache<GraphCutGainCache>(context);
case GainPolicy::steiner_tree_for_graphs: return constructGainCache<GraphProcessMappingGainCache>(context);
case GainPolicy::steiner_tree_for_graphs: return constructGainCache<GraphSteinerTreeGainCache>(context);
case GainPolicy::none:
ERR("No gain policy set");
}
Expand All @@ -74,11 +74,11 @@ class GainCachePtr {
case GainPolicy::soed:
delete reinterpret_cast<SoedGainCache*>(gain_cache.gain_cache); break;
case GainPolicy::steiner_tree:
delete reinterpret_cast<ProcessMappingGainCache*>(gain_cache.gain_cache); break;
delete reinterpret_cast<SteinerTreeGainCache*>(gain_cache.gain_cache); break;
case GainPolicy::cut_for_graphs:
delete reinterpret_cast<GraphCutGainCache*>(gain_cache.gain_cache); break;
case GainPolicy::steiner_tree_for_graphs:
delete reinterpret_cast<GraphProcessMappingGainCache*>(gain_cache.gain_cache); break;
delete reinterpret_cast<GraphSteinerTreeGainCache*>(gain_cache.gain_cache); break;
case GainPolicy::none: break;
}
}
Expand All @@ -95,11 +95,11 @@ class GainCachePtr {
case GainPolicy::soed:
cast<SoedGainCache>(gain_cache).initializeGainCache(partitioned_hg); break;
case GainPolicy::steiner_tree:
cast<ProcessMappingGainCache>(gain_cache).initializeGainCache(partitioned_hg); break;
cast<SteinerTreeGainCache>(gain_cache).initializeGainCache(partitioned_hg); break;
case GainPolicy::cut_for_graphs:
cast<GraphCutGainCache>(gain_cache).initializeGainCache(partitioned_hg); break;
case GainPolicy::steiner_tree_for_graphs:
cast<GraphProcessMappingGainCache>(gain_cache).initializeGainCache(partitioned_hg); break;
cast<GraphSteinerTreeGainCache>(gain_cache).initializeGainCache(partitioned_hg); break;
case GainPolicy::none: break;
}
}
Expand All @@ -113,11 +113,11 @@ class GainCachePtr {
case GainPolicy::soed:
cast<SoedGainCache>(gain_cache).reset(); break;
case GainPolicy::steiner_tree:
cast<ProcessMappingGainCache>(gain_cache).reset(); break;
cast<SteinerTreeGainCache>(gain_cache).reset(); break;
case GainPolicy::cut_for_graphs:
cast<GraphCutGainCache>(gain_cache).reset(); break;
case GainPolicy::steiner_tree_for_graphs:
cast<GraphProcessMappingGainCache>(gain_cache).reset(); break;
cast<GraphSteinerTreeGainCache>(gain_cache).reset(); break;
case GainPolicy::none: break;
}
}
Expand All @@ -134,11 +134,11 @@ class GainCachePtr {
case GainPolicy::soed:
partitioned_hg.uncontract(batch, cast<SoedGainCache>(gain_cache)); break;
case GainPolicy::steiner_tree:
partitioned_hg.uncontract(batch, cast<ProcessMappingGainCache>(gain_cache)); break;
partitioned_hg.uncontract(batch, cast<SteinerTreeGainCache>(gain_cache)); break;
case GainPolicy::cut_for_graphs:
partitioned_hg.uncontract(batch, cast<GraphCutGainCache>(gain_cache)); break;
case GainPolicy::steiner_tree_for_graphs:
partitioned_hg.uncontract(batch, cast<GraphProcessMappingGainCache>(gain_cache)); break;
partitioned_hg.uncontract(batch, cast<GraphSteinerTreeGainCache>(gain_cache)); break;
case GainPolicy::none: break;
}
}
Expand All @@ -159,13 +159,13 @@ class GainCachePtr {
cast<SoedGainCache>(gain_cache)); break;
case GainPolicy::steiner_tree:
partitioned_hg.restoreSinglePinAndParallelNets(hes_to_restore,
cast<ProcessMappingGainCache>(gain_cache)); break;
cast<SteinerTreeGainCache>(gain_cache)); break;
case GainPolicy::cut_for_graphs:
partitioned_hg.restoreSinglePinAndParallelNets(hes_to_restore,
cast<GraphCutGainCache>(gain_cache)); break;
case GainPolicy::steiner_tree_for_graphs:
partitioned_hg.restoreSinglePinAndParallelNets(hes_to_restore,
cast<GraphProcessMappingGainCache>(gain_cache)); break;
cast<GraphSteinerTreeGainCache>(gain_cache)); break;
case GainPolicy::none: break;
}
}
Expand All @@ -185,13 +185,13 @@ class GainCachePtr {
cast<SoedGainCache>(gain_cache));
case GainPolicy::steiner_tree:
return partitioned_hg.checkTrackedPartitionInformation(
cast<ProcessMappingGainCache>(gain_cache));
cast<SteinerTreeGainCache>(gain_cache));
case GainPolicy::cut_for_graphs:
return partitioned_hg.checkTrackedPartitionInformation(
cast<GraphCutGainCache>(gain_cache));
case GainPolicy::steiner_tree_for_graphs:
return partitioned_hg.checkTrackedPartitionInformation(
cast<GraphProcessMappingGainCache>(gain_cache));
cast<GraphSteinerTreeGainCache>(gain_cache));
case GainPolicy::none: return false;
}
return false;
Expand Down
Loading

0 comments on commit 08fa641

Please sign in to comment.