Merge pull request #752 from os-fpga/pass_partitioner_options_in_Setu…

…pVPR pass partitioner options in SetupVPR.cpp
os-fpga · Jul 10, 2024 · 37df416 · 37df416
2 parents 2c6da93 + 5b61c6d
commit 37df416
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/include/base_fix/PATCHED/SetupVPR.cpp b/include/base_fix/PATCHED/SetupVPR.cpp
@@ -611,10 +611,13 @@ void SetupPackerOpts(const t_options& Options,
     PackerOpts->packer_algorithm = PACK_GREEDY; /* DEFAULT */
 
     PackerOpts->device_layout = Options.device_layout;
+    PackerOpts->top_mod = Options.top_mod;
 
     PackerOpts->timing_update_type = Options.timing_update_type;
     PackerOpts->pack_num_moves = Options.pack_num_moves;
     PackerOpts->pack_move_type = Options.pack_move_type;
+    PackerOpts->use_partitioning_in_pack = Options.use_partitioning_in_pack;
+    PackerOpts->number_of_molecules_in_partition = Options.number_of_molecules_in_partition;
 }
 
 static void SetupNetlistOpts(const t_options& Options, t_netlist_opts& NetlistOpts) {

diff --git a/include/packer_fix/cluster_util.cpp b/include/packer_fix/cluster_util.cpp
@@ -2911,7 +2911,7 @@ t_pack_molecule* get_highest_gain_seed_molecule(int& seed_index, const std::vect
                     }
                 }
             }
-            VTR_ASSERT(best != nullptr);
+            //VTR_ASSERT(best != nullptr);
             return best;
         }
     }

diff --git a/planning/src/main.cpp b/planning/src/main.cpp
@@ -1,4 +1,4 @@
-static const char* _pln_VERSION_STR = "pln0244";
+static const char* _pln_VERSION_STR = "pln0245";
 
 #include "RS/rsEnv.h"
 #include "util/pln_log.h"