Added extra user customization capabilities to partitioning and optim…

…ization commands
ilyaext · Aug 12, 2019 · a0c20cb · a0c20cb
1 parent 2725fad
commit a0c20cb
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 10 deletions.
diff --git a/core/lsoracle.cpp b/core/lsoracle.cpp
@@ -611,7 +611,6 @@ namespace alice{
             filename.erase(filename.end() - 2, filename.end());
             aig._storage->net_name = filename;
 
-            std::cout << "Verilog file written\n";
           }
 
         }
@@ -1256,7 +1255,7 @@ namespace alice{
                 : command( env, "Classify partitions and perform corresponding optimization on stored AIG network (result is MIG network)" ){
 
             opts.add_option( "--nn_model,-c",nn_model, "Trained neural network model for classification" );
-            opts.add_option( "--out,-o", out_file, "Verilog output" )->required();
+            opts.add_option( "--out,-o", out_file, "Verilog output" );
             add_flag("--brute,-b", "Uses a brute force approach instead of classification");
             add_flag("--aig,-a", "Perform only AIG optimization on all partitions");
             add_flag("--mig,-m", "Perform only MIG optimization on all partitions");
@@ -1407,7 +1406,9 @@ namespace alice{
             std::cout << "Full Optimization: " << duration.count() << "ms\n";
             std::cout << "Finished optimization\n";
             store<mockturtle::mig_network>().extend() = ntk_mig;
-            mockturtle::write_verilog(ntk_mig, out_file);
+
+            if(out_file != "")
+              mockturtle::write_verilog(ntk_mig, out_file);
 
           }
           else{
@@ -2447,4 +2448,4 @@ namespace alice{
 } // namespace alice
 
 /* Main method for the Alice shell (with prefix) */
-ALICE_MAIN( lsoracle )
+ALICE_MAIN( lsoracle )
diff --git a/lib/oracle/include/oracle/commands/partitioning.hpp b/lib/oracle/include/oracle/commands/partitioning.hpp
@@ -25,6 +25,7 @@ namespace alice
         : command( env, "Partitionins current network using k-means hypergraph partitioner" ) {
 
           opts.add_option( "--num,num", num_partitions, "Number of desired partitions" )->required();
+          opts.add_option( "--config_direc,-c", config_direc, "Path to the configuration file for KaHyPar (../../core/test.ini is default)" );
           add_flag("--mig,-m", "Partitions stored MIG network (AIG network is default)");
         }
 
@@ -36,8 +37,15 @@ namespace alice
           if(!store<mockturtle::mig_network>().empty()){
             std::cout << "Partitioning stored MIG network\n";
             auto ntk = store<mockturtle::mig_network>().current();
-            oracle::partition_manager<mockturtle::mig_network> partitions(ntk, num_partitions);
-            store<oracle::partition_manager<mockturtle::mig_network>>().extend() = partitions;
+            if(config_direc != ""){
+              oracle::partition_manager<mockturtle::mig_network> partitions(ntk, num_partitions, config_direc);
+              store<oracle::partition_manager<mockturtle::mig_network>>().extend() = partitions;
+            }
+            else{
+              oracle::partition_manager<mockturtle::mig_network> partitions(ntk, num_partitions);
+              store<oracle::partition_manager<mockturtle::mig_network>>().extend() = partitions;
+            }
+
           }
           else{
             std::cout << "MIG network not stored\n";
@@ -47,8 +55,15 @@ namespace alice
           if(!store<mockturtle::aig_network>().empty()){
             std::cout << "Partitioning stored AIG network\n";
             auto ntk = store<mockturtle::aig_network>().current();
-            oracle::partition_manager<mockturtle::aig_network> partitions(ntk, num_partitions); 
-            store<oracle::partition_manager<mockturtle::aig_network>>().extend() = partitions;
+            if(config_direc != ""){
+              oracle::partition_manager<mockturtle::aig_network> partitions(ntk, num_partitions, config_direc);
+              store<oracle::partition_manager<mockturtle::aig_network>>().extend() = partitions;
+            }
+            else{
+              oracle::partition_manager<mockturtle::aig_network> partitions(ntk, num_partitions);
+              store<oracle::partition_manager<mockturtle::aig_network>>().extend() = partitions;
+            }
+
           }
           else{
             std::cout << "AIG network not stored\n";
@@ -57,6 +72,7 @@ namespace alice
       }
     private:
       int num_partitions{};
+      std::string config_direc = "";
   };
 
   ALICE_ADD_COMMAND(partitioning, "Partitioning");

diff --git a/lib/oracle/include/oracle/partitioning/partition_manager.hpp b/lib/oracle/include/oracle/partitioning/partition_manager.hpp
@@ -144,7 +144,7 @@ namespace oracle
       partitionOutputs = outputs;
     }
 
-    partition_manager( Ntk const& ntk, int part_num ) : Ntk( ntk )
+    partition_manager( Ntk const& ntk, int part_num, std::string config_direc="../../core/" ) : Ntk( ntk )
     {
 
       static_assert( mockturtle::is_network_type_v<Ntk>, "Ntk is not a network type" );
@@ -208,7 +208,8 @@ namespace oracle
         ******************/
         //configures kahypar
         kahypar_context_t* context = kahypar_context_new();
-        kahypar_configure_context_from_file(context, "../../core/test.ini");
+        config_direc = config_direc + "test.ini";
+        kahypar_configure_context_from_file(context, config_direc.c_str());
 
         //set number of hyperedges and vertices. These variables are defined by the hyperG command
         const kahypar_hyperedge_id_t num_hyperedges = kahyp_num_hyperedges;