Remove dependence from submodules.

CMakeLists.txt

@@ -28,11 +28,7 @@ function(add_if_exists name)
 endfunction()
 
 set(BASIC_LA_PATH ${CMAKE_CURRENT_SOURCE_DIR}/basic_la)
-set(GKLIB_PATH ${CMAKE_CURRENT_SOURCE_DIR}/GKlib)
-set(METIS_INCLUDE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/METIS/include)
-set(METIS_COPTIONS "${METIS_COPTIONS} -DIDXTYPEWIDTH=64")
-set(METIS_COPTIONS "${METIS_COPTIONS} -DREALTYPEWIDTH=64")
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${METIS_COPTIONS}")
+set(METIS_INCLUDE_PATH ~/local/include)
 
 add_if_exists(basic_la)
 add_if_exists(qr_decomposition)

matrix_powers_mv/CMakeLists.txt

@@ -3,4 +3,5 @@ target_include_directories(test_matrix_powers_mv PRIVATE ${BASIC_LA_PATH})
 target_link_libraries(test_matrix_powers_mv PRIVATE BASIC_LA)
 
 target_include_directories(test_matrix_powers_mv PRIVATE ${METIS_INCLUDE_PATH})
-target_link_libraries(test_matrix_powers_mv PRIVATE metis)
+target_link_libraries(test_matrix_powers_mv PRIVATE ~/local/lib/libmetis.so)
+target_link_libraries(test_matrix_powers_mv PRIVATE /home/e.podlesov/local/lib/libGKlib.a)

matrix_powers_mv/matrix_powers_mv.cpp

@@ -1,6 +1,33 @@
 #include "matrix_powers_mv.h"
 
-void MatrixPowersMV(const SparseMatrix<double>& /* sp_matrix */, const Vector<double>& /* x */, const Vector<Vector<double>*>& /* res */) {
-    return;
+#include <metis.h>
+
+int ReorderMatrix(const SparseMatrix<double>& sp_matrix) {
+    SparseMatrix<double> a_no_diag;
+    sp_matrix.RemoveDiag(a_no_diag);
+    idx_t* perm = new idx_t[a_no_diag.row_cnt_];
+    idx_t* iperm = new idx_t[a_no_diag.row_cnt_];
+    idx_t options[METIS_NOPTIONS];
+    METIS_SetDefaultOptions(options);
+    options[METIS_OPTION_NUMBERING] = 0;
+    int result;
+    {
+        // int METIS_NodeND(idx_t *nvtxs, idx_t *xadj, idx_t *adjncy, idx_t *vwgt,
+        //   idx_t *options, idx_t *perm, idx_t *iperm);
+
+        result = METIS_NodeND(
+            &a_no_diag.row_cnt_
+            , a_no_diag.i_a_
+            , a_no_diag.j_a_
+            , nullptr
+            , options
+            , perm
+            , iperm
+        );
+    }
+    if ()
 }
 
+void MatrixPowersMV(const SparseMatrix<double>& /* sp_matrix */, const Vector<double>& /* x */, const Vector<Vector<double>*>& /* res */) {
+    return;
+}

matrix_powers_mv/matrix_powers_mv.h

@@ -6,4 +6,5 @@
 #define IDXTYPEWIDTH 64
 #define REALTYPEWIDTH 64
 
+int ReorderMatrix(const SparseMatrix<double>& sp_matrix);
 void MatrixPowersMV(const SparseMatrix<double>& sp_matrix, const Vector<double>& x, const Vector<Vector<double>*>& res);

matrix_powers_mv/test.cpp

@@ -4,7 +4,6 @@
 #include <fstream>
 #include <sstream>
 #include <iostream>
-#include <metis.h>
 
 #include <catch2/catch_test_macros.hpp>
 #include <catch2/generators/catch_generators_all.hpp>
@@ -22,30 +21,8 @@ static void Test(const uint32_t n) {
         fstream >> a;
         fstream.close();
         REQUIRE(a.data_);
-
-        a.RemoveDiag(a_no_diag);
     }
 
-    idx_t* perm = new idx_t[a_no_diag.row_cnt_];
-    idx_t* iperm = new idx_t[a_no_diag.row_cnt_];
-    idx_t options[METIS_NOPTIONS];
-    METIS_SetDefaultOptions(options);
-    options[METIS_OPTION_NUMBERING] = 0;
-    int result;
-    {
-        // int METIS_NodeND(idx_t *nvtxs, idx_t *xadj, idx_t *adjncy, idx_t *vwgt,
-        //   idx_t *options, idx_t *perm, idx_t *iperm);
-
-        result = METIS_NodeND(
-            &a_no_diag.row_cnt_
-            , a_no_diag.i_a_
-            , a_no_diag.j_a_
-            , nullptr
-            , options
-            , perm
-            , iperm
-        );
-    }
     REQUIRE(result == METIS_OK);
 }