Working Python module asc_ode + fixed nanoblas linking

.ipynb_checkpoints/CMakeLists-checkpoint.txt

@@ -0,0 +1,31 @@
+cmake_minimum_required(VERSION 3.20)
+project(ASC_ode LANGUAGES CXX)
+
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+include_directories(src nanoblas/src)
+add_subdirectory(nanoblas)
+
+add_executable(test_ode demos/test_ode.cpp)
+target_link_libraries(test_ode PUBLIC nanoblas)
+
+add_executable(demo_autodiff demos/demo_autodiff.cpp)
+target_link_libraries(demo_autodiff PUBLIC nanoblas)
+
+# Python bindings
+find_package(pybind11 REQUIRED CONFIG)
+
+# 🔥 FIX: Also link pybind11 for the C++ executables
+target_link_libraries(test_ode PRIVATE pybind11::pybind11)
+target_link_libraries(demo_autodiff PRIVATE pybind11::pybind11)
+
+pybind11_add_module(asc_ode
+    src/bindings.cpp
+)
+
+target_link_libraries(asc_ode PRIVATE nanoblas)
+
+set_target_properties(asc_ode PROPERTIES
+    LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
+)

CMakeLists.txt

@@ -1,18 +1,31 @@
 cmake_minimum_required(VERSION 3.20)
-project(ASC_ode)
-
-set (CMAKE_CXX_STANDARD 20)
+project(ASC_ode LANGUAGES CXX)
 
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 include_directories(src nanoblas/src)
+add_subdirectory(nanoblas)
+
+add_executable(test_ode demos/test_ode.cpp)
+target_link_libraries(test_ode PUBLIC nanoblas)
+
+add_executable(demo_autodiff demos/demo_autodiff.cpp)
+target_link_libraries(demo_autodiff PUBLIC nanoblas)
 
-add_subdirectory (src)
-add_subdirectory (nanoblas)
+# Python bindings
+find_package(pybind11 REQUIRED CONFIG)
 
+# 🔥 FIX: Also link pybind11 for the C++ executables
+target_link_libraries(test_ode PRIVATE pybind11::pybind11)
+target_link_libraries(demo_autodiff PRIVATE pybind11::pybind11)
 
-add_executable (test_ode demos/test_ode.cpp)
-target_link_libraries (test_ode PUBLIC nanoblas)
+pybind11_add_module(asc_ode
+    src/bindings.cpp
+)
 
-add_executable (demo_autodiff demos/demo_autodiff.cpp)
-target_link_libraries (demo_autodiff PUBLIC nanoblas)
+target_link_libraries(asc_ode PRIVATE nanoblas)
 
+set_target_properties(asc_ode PROPERTIES
+    LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
+)

CrankNicolson.hpp

@@ -0,0 +1,23 @@
+#pragma once
+#include "timestepper.hpp"
+#include "function_algebra.hpp"
+#include "newton.hpp"
+class CrankNicolson : public TimeStepper {
+    std::shared_ptr<NonlinearFunction> eq;
+    std::shared_ptr<Parameter> tau;
+    std::shared_ptr<ConstantFunction> yold, fold;
+    Vector<> ftmp;
+public:
+    CrankNicolson(std::shared_ptr<NonlinearFunction> rhs)
+        : TimeStepper(rhs), tau(std::make_shared<Parameter>(0.0)), ftmp(rhs->dimF()) {
+        yold = std::make_shared<ConstantFunction>(rhs->dimX());
+        fold = std::make_shared<ConstantFunction>(rhs->dimF());
+        auto id = std::make_shared<IdentityFunction>(rhs->dimX());
+        eq = id - yold - 0.5*tau*(fold + rhs);
+    }
+    void doStep(double tau, VectorView<double> y) override {
+        m_rhs->evaluate(y, ftmp); fold->set(ftmp);
+        yold->set(y); tau->set(tau);
+        NewtonSolver(eq, y);
+    }
+};

ImplicitEuler.hpp

@@ -0,0 +1,19 @@
+#pragma once
+#include "timestepper.hpp"
+#include "function_algebra.hpp"
+#include "newton.hpp"
+class ImplicitEuler : public TimeStepper {
+    std::shared_ptr<NonlinearFunction> eq;
+    std::shared_ptr<Parameter> tau;
+    std::shared_ptr<ConstantFunction> yold;
+public:
+    ImplicitEuler(std::shared_ptr<NonlinearFunction> rhs)
+        : TimeStepper(rhs), tau(std::make_shared<Parameter>(0.0)) {
+        yold = std::make_shared<ConstantFunction>(rhs->dimX());
+        auto id = std::make_shared<IdentityFunction>(rhs->dimX());
+        eq = id - yold - tau * rhs;
+    }
+    void doStep(double tau, VectorView<double> y) override {
+        yold->set(y); tau->set(tau); NewtonSolver(eq, y);
+    }
+};

ImprovedEuler.hpp

@@ -0,0 +1,14 @@
+#pragma once
+#include "timestepper.hpp"
+class ImprovedEuler : public TimeStepper {
+    Vector<> k1, k2, tmp;
+public:
+    ImprovedEuler(std::shared_ptr<NonlinearFunction> rhs)
+        : TimeStepper(rhs), k1(rhs->dimF()), k2(rhs->dimF()), tmp(rhs->dimF()) {}
+    void doStep(double tau, VectorView<double> y) override {
+        m_rhs->evaluate(y, k1);
+        tmp = y + tau * k1;
+        m_rhs->evaluate(tmp, k2);
+        y += tau * (0.5 * k1 + 0.5 * k2);
+    }
+};