fix some dependencies and includes; misc other stuff

Author: euphoricpoptarts

CMakeLists.txt

@@ -14,11 +14,11 @@ find_package(KokkosKernels REQUIRED)
 add_compile_options(-Wall -Wextra -Wshadow)
 
 # libjet
-add_library(jet STATIC jet.cpp)
+add_library(jet STATIC src/jet.cpp)
 target_sources(jet PUBLIC
   FILE_SET HEADERS
-  FILES jet.h jet_defs.h jet_config.h experiment_data.hpp
-)
+  FILES header/jet.h header/jet_defs.h header/jet_config.h header/experiment_data.hpp)
+include_directories(header)
 
 if(DEFINED METIS_DIR)
 # This is used by the build script
@@ -37,15 +37,17 @@ target_link_libraries(jet PRIVATE GKlib)
 endif()
 
 # jet executables
-add_executable(jet_ex driver.cpp)
+add_executable(jet_ex app/driver.cpp)
 set_property(TARGET jet_ex PROPERTY OUTPUT_NAME jet)
-add_executable(jet4 driver.cpp)
-add_executable(jet2 driver.cpp)
-add_executable(jet_host driver.cpp)
-add_executable(jet_import import_coarse.cpp)
-add_executable(jet_export driver.cpp)
-add_executable(jet_serial driver.cpp)
-add_executable(pstat part_eval.cpp)
+add_executable(jet4 app/driver.cpp)
+add_executable(jet2 app/driver.cpp)
+add_executable(jet_host app/driver.cpp)
+add_executable(jet_import app/import_coarse.cpp)
+add_executable(jet_export app/driver.cpp)
+add_executable(jet_serial app/driver.cpp)
+add_executable(pstat app/part_eval.cpp)
+target_include_directories(jet_import PUBLIC src)
+target_include_directories(pstat PUBLIC src)
 
 # compile definitions to set exe behavior
 target_compile_definitions(jet4 PUBLIC FOUR9)

app/import_coarse.cpp

@@ -44,6 +44,72 @@
 
 using namespace jet_partitioner;
 
+//loads a sequence of coarse graphs and mappings between each graph from binary file
+//used to control for coarsening when experimenting with refinement
+std::list<typename jet_partitioner::contracter<matrix_t>::coarse_level_triple> load_coarse(){
+    using coarse_level_triple = typename jet_partitioner::contracter<matrix_t>::coarse_level_triple;
+    std::list<coarse_level_triple> levels;
+    std::list<coarse_level_triple> error_levels;
+    FILE* cgfp = fopen("coarse_graphs.out", "r");
+    int size = 0;
+    if(fread(&size, sizeof(int), 1, cgfp) != 1) return error_levels;
+    std::cout << "Importing " << size << " coarsened graphs" << std::endl;
+    ordinal_t prev_n = 0;
+    for(int i = 0; i < size; i++){
+        coarse_level_triple level;
+        level.level = i + 1;
+        ordinal_t N = 0;
+        if(fread(&N, sizeof(ordinal_t), 1, cgfp) != 1)  return error_levels;
+        edge_offset_t M = 0;
+        if(fread(&M, sizeof(edge_offset_t), 1, cgfp) != 1) return error_levels;
+        edge_vt rows("rows", N + 1);
+        auto rows_m = Kokkos::create_mirror_view(rows);
+        if(fread(rows_m.data(), sizeof(edge_offset_t), N + 1, cgfp) != static_cast<size_t>(N + 1)) return error_levels;
+        Kokkos::deep_copy(rows, rows_m);
+        vtx_vt entries("entries", M);
+        auto entries_m = Kokkos::create_mirror_view(entries);
+        if(fread(entries_m.data(), sizeof(ordinal_t), M, cgfp) != static_cast<size_t>(M)) return error_levels;
+        Kokkos::deep_copy(entries, entries_m);
+        wgt_vt values("values", M);
+        auto values_m = Kokkos::create_mirror_view(values);
+        if(fread(values_m.data(), sizeof(value_t), M, cgfp) != static_cast<size_t>(M))  return error_levels;
+        Kokkos::deep_copy(values, values_m);
+        graph_t graph(entries, rows);
+        matrix_t g("g", N, values, graph);
+        level.mtx = g;
+        wgt_vt vtx_wgts("vtx wgts", N);
+        auto vtx_wgts_m = Kokkos::create_mirror_view(vtx_wgts);
+        if(fread(vtx_wgts_m.data(), sizeof(value_t), N, cgfp) != static_cast<size_t>(N)) return error_levels;
+        Kokkos::deep_copy(vtx_wgts, vtx_wgts_m);
+        level.vtx_w = vtx_wgts;
+        if(level.level > 1){
+            vtx_vt i_entries("entries", prev_n);
+            auto i_entries_m = Kokkos::create_mirror_view(i_entries);
+            if(fread(i_entries_m.data(), sizeof(ordinal_t), prev_n, cgfp) != static_cast<size_t>(prev_n)) return error_levels;
+            Kokkos::deep_copy(i_entries, i_entries_m);
+            typename jet_partitioner::contracter<matrix_t>::coarse_map i_g;
+            i_g.coarse_vtx = N;
+            i_g.map = i_entries;
+            level.interp_mtx = i_g;
+        }
+        prev_n = N;
+        levels.push_back(level);
+    }
+    fclose(cgfp);
+    return levels;
+}
+
+//reads part from binary file
+part_vt load_coarse_part(ordinal_t n){
+    FILE* cgfp = fopen("coarse_part.out", "r");
+    part_vt part("part", n);
+    auto part_m = Kokkos::create_mirror_view(part);
+    if(fread(part_m.data(), sizeof(part_t), n, cgfp) != static_cast<size_t>(n)) return part;
+    Kokkos::deep_copy(part, part_m);
+    fclose(cgfp);
+    return part;
+}
+
 part_vt partition(value_t& edge_cut,
                     const config_t& config,
                     experiment_data<value_t>& experiment) {

app/io.hpp

@@ -39,10 +39,11 @@
 #pragma once
 #include "jet_defs.h"
 #include "jet_config.h"
-#include "contract.hpp"
 #include <sstream>
 #include <string>
 #include <iostream>
+#include <fstream>
+#include <iomanip>
 
 namespace jet_partitioner {
 
@@ -53,7 +54,7 @@ bool load_config(jet_partitioner::config_t& c, const char* config_f) {
         std::cerr << "FATAL ERROR: Could not open config file " << config_f << std::endl;
         return false;
     }
-    std::string lines[4];
+    std::string lines[5];
     int reads = 0;
     // you might think that reading in four lines from a simple config file could be done like:
     // f >> c.coarsening_alg; 
@@ -63,18 +64,19 @@ bool load_config(jet_partitioner::config_t& c, const char* config_f) {
     // but that doesn't work if there are exactly 3 lines instead of 4 in the config file
     // because if the last line is a float like 3.14, then c.num_iter will contain the 3
     // and the c.max_imb_ratio will contain the .14
-    for(int i = 0; i < 4; i++){
+    for(int i = 0; i < 5; i++){
         if(f >> lines[i]) reads++;
     }
     f.close();
-    if(reads != 4){
+    if(reads < 4){
         std::cerr << "FATAL ERROR: Config file has less than 4 lines" << std::endl;
         return false;
     }
     c.coarsening_alg = std::stoi(lines[0]);
     c.num_parts = std::stoi(lines[1]);
     c.num_iter = std::stoi(lines[2]);
     c.max_imb_ratio = std::stod(lines[3]);
+    if(reads == 5) c.ultra_settings = std::stoi(lines[4]);
     return true;
 }
 
@@ -241,70 +243,4 @@ part_vt load_part(ordinal_t n, const char *fname){
     return part_d;
 }
 
-//loads a sequence of coarse graphs and mappings between each graph from binary file
-//used to control for coarsening when experimenting with refinement
-std::list<typename jet_partitioner::contracter<matrix_t>::coarse_level_triple> load_coarse(){
-    using coarse_level_triple = typename jet_partitioner::contracter<matrix_t>::coarse_level_triple;
-    std::list<coarse_level_triple> levels;
-    std::list<coarse_level_triple> error_levels;
-    FILE* cgfp = fopen("coarse_graphs.out", "r");
-    int size = 0;
-    if(fread(&size, sizeof(int), 1, cgfp) != 1) return error_levels;
-    std::cout << "Importing " << size << " coarsened graphs" << std::endl;
-    ordinal_t prev_n = 0;
-    for(int i = 0; i < size; i++){
-        coarse_level_triple level;
-        level.level = i + 1;
-        ordinal_t N = 0;
-        if(fread(&N, sizeof(ordinal_t), 1, cgfp) != 1)  return error_levels;
-        edge_offset_t M = 0;
-        if(fread(&M, sizeof(edge_offset_t), 1, cgfp) != 1) return error_levels;
-        edge_vt rows("rows", N + 1);
-        auto rows_m = Kokkos::create_mirror_view(rows);
-        if(fread(rows_m.data(), sizeof(edge_offset_t), N + 1, cgfp) != static_cast<size_t>(N + 1)) return error_levels;
-        Kokkos::deep_copy(rows, rows_m);
-        vtx_vt entries("entries", M);
-        auto entries_m = Kokkos::create_mirror_view(entries);
-        if(fread(entries_m.data(), sizeof(ordinal_t), M, cgfp) != static_cast<size_t>(M)) return error_levels;
-        Kokkos::deep_copy(entries, entries_m);
-        wgt_vt values("values", M);
-        auto values_m = Kokkos::create_mirror_view(values);
-        if(fread(values_m.data(), sizeof(value_t), M, cgfp) != static_cast<size_t>(M))  return error_levels;
-        Kokkos::deep_copy(values, values_m);
-        graph_t graph(entries, rows);
-        matrix_t g("g", N, values, graph);
-        level.mtx = g;
-        wgt_vt vtx_wgts("vtx wgts", N);
-        auto vtx_wgts_m = Kokkos::create_mirror_view(vtx_wgts);
-        if(fread(vtx_wgts_m.data(), sizeof(value_t), N, cgfp) != static_cast<size_t>(N)) return error_levels;
-        Kokkos::deep_copy(vtx_wgts, vtx_wgts_m);
-        level.vtx_w = vtx_wgts;
-        if(level.level > 1){
-            vtx_vt i_entries("entries", prev_n);
-            auto i_entries_m = Kokkos::create_mirror_view(i_entries);
-            if(fread(i_entries_m.data(), sizeof(ordinal_t), prev_n, cgfp) != static_cast<size_t>(prev_n)) return error_levels;
-            Kokkos::deep_copy(i_entries, i_entries_m);
-            typename jet_partitioner::contracter<matrix_t>::coarse_map i_g;
-            i_g.coarse_vtx = N;
-            i_g.map = i_entries;
-            level.interp_mtx = i_g;
-        }
-        prev_n = N;
-        levels.push_back(level);
-    }
-    fclose(cgfp);
-    return levels;
-}
-
-//reads part from binary file
-part_vt load_coarse_part(ordinal_t n){
-    FILE* cgfp = fopen("coarse_part.out", "r");
-    part_vt part("part", n);
-    auto part_m = Kokkos::create_mirror_view(part);
-    if(fread(part_m.data(), sizeof(part_t), n, cgfp) != static_cast<size_t>(n)) return part;
-    Kokkos::deep_copy(part, part_m);
-    fclose(cgfp);
-    return part;
-}
-
 };

header/part_eval.cpp app/part_eval.cpp

@@ -40,6 +40,7 @@
 #include <vector>
 #include <stdlib.h>
 #include <iostream>
+#include <iomanip>
 #include <fstream>
 #include <string>
 #include <map>

header/experiment_data.hpp

@@ -38,9 +38,6 @@
 // ************************************************************************
 #pragma once
 #include <type_traits>
-#include <limits>
-#include <iostream>
-#include <iomanip>
 #include <Kokkos_Core.hpp>
 #include "KokkosSparse_CrsMatrix.hpp"
 #include "experiment_data.hpp"

src/part_stat.hpp

@@ -39,13 +39,6 @@
 #include "jet_refiner.hpp"
 #include "contract.hpp"
 #include "jet_config.h"
-#include <limits>
-#include <cstdlib>
-#include <cmath>
-#include <utility>
-#include <numeric>
-#include <iostream>
-#include <iomanip>
 #include <Kokkos_Core.hpp>
 #include "KokkosSparse_CrsMatrix.hpp"
 #include "part_stat.hpp"