From db64425a5580a49312e313a6e75e7a296eb93b35 Mon Sep 17 00:00:00 2001
From: David Luevano <55825613+luevano@users.noreply.github.com>
Date: Mon, 23 Dec 2019 12:23:46 -0700
Subject: Restructure code and bug fix

---
 lj_matrix/__main__.py | 31 ++++---------------------------
 1 file changed, 4 insertions(+), 27 deletions(-)

(limited to 'lj_matrix/__main__.py')

diff --git a/lj_matrix/__main__.py b/lj_matrix/__main__.py
index 0b2a7c6f8..8e52031f1 100644
--- a/lj_matrix/__main__.py
+++ b/lj_matrix/__main__.py
@@ -26,8 +26,7 @@ from multiprocessing import Process, Pipe
 import pandas as pd
 from lj_matrix.misc import printc
 from lj_matrix.read_qm7_data import read_qm7_data
-from lj_matrix.c_matrix import c_matrix_multiple
-from lj_matrix.lj_matrix import lj_matrix_multiple
+from lj_matrix.parallel_create_matrices import parallel_create_matrices
 from lj_matrix.do_ml import do_ml
 
 
@@ -40,32 +39,10 @@ def ml():
     init_time = time.perf_counter()
 
     # Data reading.
-    zi_data, molecules, nuclear_charge, energy_pbe0, energy_delta =\
-        read_qm7_data()
+    molecules, nuclear_charge, energy_pbe0, energy_delta = read_qm7_data()
 
     # Matrices calculation.
-    procs = []
-    pipes = []
-
-    # cm_recv, cm_send = Pipe(False)
-    # p1 = Process(target=c_matrix_multiple,
-    #              args=(molecules, nuclear_charge, cm_send))
-    # procs.append(p1)
-    # pipes.append(cm_recv)
-    # p1.start()
-
-    ljm_recv, ljm_send = Pipe(False)
-    p2 = Process(target=lj_matrix_multiple,
-                 args=(molecules, nuclear_charge, ljm_send, 1, 0.25))
-    procs.append(p2)
-    pipes.append(ljm_recv)
-    p2.start()
-
-    # cm_data = pipes[0].recv()
-    ljm_data = pipes[0].recv()
-
-    for proc in procs:
-        proc.join()
+    cm_data, ljm_data = parallel_create_matrices(molecules, nuclear_charge)
 
     # ML calculation.
     procs = []
@@ -234,6 +211,6 @@ def pl():
 
 
 if __name__ == '__main__':
-    # ml()
+    ml()
     # pl()
     print('OK!')
-- 
cgit v1.2.3-54-g00ecf