Skip to content

Commit

Permalink
remove jet refiner
Browse files Browse the repository at this point in the history
  • Loading branch information
N-Maas committed Jul 27, 2023
1 parent b36a656 commit 40a0933
Show file tree
Hide file tree
Showing 12 changed files with 0 additions and 1,041 deletions.
12 changes: 0 additions & 12 deletions mt-kahypar/partition/coarsening/multilevel_uncoarsener.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -217,18 +217,6 @@ namespace mt_kahypar {
improvement_found = false;
const HyperedgeWeight metric_before = _best_metrics.quality;

if ( _jet && _context.refinement.jet.algorithm != JetAlgorithm::do_nothing ) {
_timer.start_timer("initialize_jet_refiner", "Initialize JET Refiner");
_jet->initialize(phg);
_timer.stop_timer("initialize_jet_refiner");

_timer.start_timer("jet", "JET");
if ( _jet->refine(phg, dummy, _current_metrics, time_limit) ) {
improvement_found |= checkForImprovement();
}
_timer.stop_timer("jet");
}

if ( _label_propagation && _context.refinement.label_propagation.algorithm != LabelPropagationAlgorithm::do_nothing ) {
_timer.start_timer("initialize_lp_refiner", "Initialize LP Refiner");
_label_propagation->initialize(phg);
Expand Down
1 change: 0 additions & 1 deletion mt-kahypar/partition/coarsening/multilevel_uncoarsener.h
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,6 @@ class MultilevelUncoarsener : public IUncoarsener<TypeTraits>,
using Base::_uncoarseningData;
using Base::_gain_cache;
using Base::_label_propagation;
using Base::_jet;
using Base::_fm;
using Base::_flows;
using Base::_rebalancer;
Expand Down
6 changes: 0 additions & 6 deletions mt-kahypar/partition/coarsening/nlevel_uncoarsener.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -379,12 +379,6 @@ namespace mt_kahypar {
improvement_found = false;
const HyperedgeWeight metric_before = _current_metrics.quality;

if ( _jet && _context.refinement.jet.algorithm != JetAlgorithm::do_nothing ) {
_timer.start_timer("jet", "JET");
improvement_found |= _jet->refine(phg, {}, _current_metrics, time_limit);
_timer.stop_timer("jet");
}

if ( _fm && _context.refinement.fm.algorithm != FMAlgorithm::do_nothing ) {
_timer.start_timer("fm", "FM");
improvement_found |= _fm->refine(phg, {}, _current_metrics, time_limit);
Expand Down
1 change: 0 additions & 1 deletion mt-kahypar/partition/coarsening/nlevel_uncoarsener.h
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,6 @@ class NLevelUncoarsener : public IUncoarsener<TypeTraits>,
using Base::_uncoarseningData;
using Base::_gain_cache;
using Base::_label_propagation;
using Base::_jet;
using Base::_fm;
using Base::_flows;
using Base::_rebalancer;
Expand Down
2 changes: 0 additions & 2 deletions mt-kahypar/partition/coarsening/uncoarsener_base.h
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ class UncoarsenerBase {
_uncoarseningData(uncoarseningData),
_gain_cache(gain_cache_t {nullptr, GainPolicy::none}),
_label_propagation(nullptr),
_jet(nullptr),
_fm(nullptr),
_flows(nullptr),
_rebalancer(nullptr) {}
Expand All @@ -82,7 +81,6 @@ class UncoarsenerBase {
UncoarseningData<TypeTraits>& _uncoarseningData;
gain_cache_t _gain_cache;
std::unique_ptr<IRefiner> _label_propagation;
std::unique_ptr<IRefiner> _jet;
std::unique_ptr<IRefiner> _fm;
std::unique_ptr<IRefiner> _flows;
std::unique_ptr<IRebalancer> _rebalancer;
Expand Down
10 changes: 0 additions & 10 deletions mt-kahypar/partition/factories.h
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
#include "mt-kahypar/partition/refinement/i_refiner.h"
#include "mt-kahypar/partition/refinement/flows/i_flow_refiner.h"
#include "mt-kahypar/partition/refinement/label_propagation/label_propagation_refiner.h"
#include "mt-kahypar/partition/refinement/jet/jet_refiner.h"
#include "mt-kahypar/partition/refinement/deterministic/deterministic_label_propagation.h"
#include "mt-kahypar/partition/refinement/fm/fm_commons.h"
#include "mt-kahypar/partition/refinement/fm/multitry_kway_fm.h"
Expand Down Expand Up @@ -98,15 +97,6 @@ using DeterministicLabelPropagationDispatcher = kahypar::meta::StaticMultiDispat
IRefiner,
kahypar::meta::Typelist<TypeTraitsList>>;

using JetFactory = kahypar::meta::Factory<JetAlgorithm,
IRefiner* (*)(HypernodeID, HyperedgeID, const Context&, gain_cache_t, IRebalancer&)>;

using PrecomputedJetDispatcher = kahypar::meta::StaticMultiDispatchFactory<
JetRefiner,
IRefiner,
kahypar::meta::Typelist<TypeTraitsList, GainTypes>>;
using GreedyJetDispatcher = PrecomputedJetDispatcher;

using FMFactory = kahypar::meta::Factory<FMAlgorithm,
IRefiner* (*)(HypernodeID, HyperedgeID, const Context&, gain_cache_t, IRebalancer&)>;

Expand Down
1 change: 0 additions & 1 deletion mt-kahypar/partition/refinement/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ set(RefinementSources
fm/global_rollback.cpp
fm/sequential_twoway_fm_refiner.cpp
label_propagation/label_propagation_refiner.cpp
jet/jet_refiner.cpp
rebalancing/rebalancer.cpp
rebalancing/jet_rebalancer.cpp
rebalancing/rebalancer_v2.cpp
Expand Down
Loading

0 comments on commit 40a0933

Please sign in to comment.