fg

Author: StephenNneji

cpp/RAT2/callCppFunction.cpp

@@ -20,7 +20,8 @@
 #include <cmath>
 #include <functional>
 #include <iostream>
-
+#include <pybind11/pybind11.h>
+namespace py = pybind11;
 // Function Definitions
 namespace RAT
 {
@@ -55,7 +56,7 @@ namespace RAT
     if (loop_ub - 1 >= 0) {
       std::copy(&pointer_data[0], &pointer_data[loop_ub], &b_pointer_data[0]);
     }
-    std::cout << "convertString2HandlePtr: " << &b_pointer_data[0] << "  " << std::string(&b_pointer_data[0]) << std::endl; 
+    py::print("convertString2HandlePtr: ",  &b_pointer_data[0], " ", std::string(&b_pointer_data[0]));
     callbackHandle = convertString2HandlePtr<CallbackInterface>(&b_pointer_data
       [0]);
     callback = std::mem_fn(&ClassHandle<CallbackInterface>::ptr)(callbackHandle);
@@ -167,7 +168,7 @@ namespace RAT
     if (loop_ub - 1 >= 0) {
       std::copy(&pointer_data[0], &pointer_data[loop_ub], &b_pointer_data[0]);
     }
-    std::cout << "convertString2HandlePtr: " << &b_pointer_data[0] << "  " << std::string(&b_pointer_data[0]) << std::endl; 
+    py::print("convertString2HandlePtr: ",  &b_pointer_data[0], " ", std::string(&b_pointer_data[0]));  
     callbackHandle = convertString2HandlePtr<CallbackInterface>(&b_pointer_data
       [0]);
     callback = std::mem_fn(&ClassHandle<CallbackInterface>::ptr)(callbackHandle);
@@ -279,7 +280,7 @@ namespace RAT
     if (loop_ub - 1 >= 0) {
       std::copy(&pointer_data[0], &pointer_data[loop_ub], &b_pointer_data[0]);
     }
-    std::cout << "convertString2HandlePtr: " << &b_pointer_data[0] << "  " << std::string(&b_pointer_data[0]) << std::endl; 
+    py::print("convertString2HandlePtr: ",  &b_pointer_data[0], " ", std::string(&b_pointer_data[0])); 
     callbackHandle = convertString2HandlePtr<CallbackInterface>(&b_pointer_data
       [0]);
     callback = std::mem_fn(&ClassHandle<CallbackInterface>::ptr)(callbackHandle);

cpp/rat.cpp

@@ -17,8 +17,8 @@ setup_pybind11(cfg)
 #include "RAT2/RATMain_terminate.h"
 #include "RAT2/RATMain_types.h"
 #include "RAT2/makeSLDProfile.h"
-#include "RAT/dylib.hpp"
-#include "RAT/events/eventManager.h"
+#include "RAT2/dylib.hpp"
+#include "RAT2/events/eventManager.h"
 #include "includes/defines.h"
 #include "includes/functions.h"
 
@@ -582,16 +582,24 @@ bayes_result : Rat.rat_core.OutputBayesResult
 
 py::tuple RATMain(const ProblemDefinition& problem_def, const Control& control)
 {
+    py::print("RATMain: ", 1);
     RAT::b_ProblemDefinition problem_def_struct = createProblemDefinitionStruct(problem_def);
+    py::print("RATMain: ", 2);
     RAT::Controls control_struct = createControlsStruct(control);
     // Output
+    py::print("RATMain: ", 3);
     RAT::Results results;
+    py::print("RATMain: ", 4);
     RAT::BayesResults bayesResults;
     // Call the entry-point
+    py::print("RATMain: ", 5);
     RAT::RATMain(&problem_def_struct, &control_struct, &results, &bayesResults);
     // Copy result to output
+    py::print("RATMain: ", 6);
     auto out_problem_def = problemDefinitionFromStruct(problem_def_struct);
+    py::print("RATMain: ", 7);
     out_problem_def.customFiles = problem_def.customFiles.attr("copy")(); 
+    py::print("RATMain: ", 8);
     return py::make_tuple(out_problem_def, 
                           OutputResultFromStruct(results), 
                           OutputBayesResultsFromStruct(bayesResults));    

setup.py

@@ -14,18 +14,18 @@
 with open("README.md") as f:
     LONG_DESCRIPTION = f.read()
 
-libevent = ("eventManager", {"sources": ["cpp/RAT/events/eventManager.cpp"], "include_dirs": ["cpp/RAT/events/"]})
+libevent = ("eventManager", {"sources": ["cpp/RAT2/events/eventManager.cpp"], "include_dirs": ["cpp/RAT2/events/"]})
 
 
 ext_modules = [
     Extension(
         "ratapi.rat_core",
-        sources=["cpp/rat.cpp", *glob("cpp/RAT/*.c*")],
+        sources=["cpp/rat.cpp", *glob("cpp/RAT2/*.c*")],
         include_dirs=[
             # Path to pybind11 headers
             pybind11.get_include(),
             pybind11.get_include(True),
-            "cpp/RAT/",
+            "cpp/RAT2/",
             "cpp/includes/",
         ],
         language="c++",