casadi 3.7.0__cp39-none-macosx_11_0_arm64.whl → 3.7.2__cp39-none-macosx_11_0_arm64.whl

casadi/cmake/casadi-config-version.cmake

@@ -1,4 +1,4 @@
-set(PACKAGE_VERSION "3.7.0")
+set(PACKAGE_VERSION "3.7.2")
 
 # Check whether the requested PACKAGE_FIND_VERSION is compatible
 if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}")

casadi/cmake/casadi-config.cmake

@@ -4,5 +4,5 @@ get_filename_component(CASADI_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
 include("${CASADI_CMAKE_DIR}/casadi-targets.cmake")
 
 if(OFF AND "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-  target_compile_definitions(casadi INTERFACE _GLIBCXX_USE_CXX11_ABI=0)
+  target_compile_definitions(casadi::casadi INTERFACE _GLIBCXX_USE_CXX11_ABI=0)
 endif()

casadi/include/casadi/casadi.i

@@ -2982,6 +2982,52 @@ namespace casadi{
         return {"serialization": self.serialize()}
   %}
 }
+%extend Matrix<SXElem> {
+  %pythoncode %{
+    def __setstate__(self, state):
+      ctx = _current_unpickle_context()
+      if not ctx:
+        raise Exception("Cannot unpickle SX objects without a casadi context. " +
+          "Use something like:\n"+
+          "with ca.global_unpickle_context(): \n"+
+          "  f_ref = pickle.load(open(filename,'rb'))")
+      ctx.decode(state)
+      self.__init__(ctx.unpack())
+
+    def __getstate__(self):
+      ctx = _current_pickle_context()
+      if not ctx:
+        raise Exception("Cannot pickle SX objects without a casadi context. " +
+          "Use something like:\n"+
+          "with ca.global_pickle_context(): \n"+
+          "  pickle.dump(f,open(filename,'wb'))")
+      ctx.pack(self)
+      return ctx.encode()
+  %}
+}
+%extend MX {
+  %pythoncode %{
+    def __setstate__(self, state):
+      ctx = _current_unpickle_context()
+      if not ctx:
+        raise Exception("Cannot unpickle MX objects without a casadi context. " +
+          "Use something like:\n"+
+          "with ca.global_unpickle_context(): \n"+
+          "  f_ref = pickle.load(open(filename,'rb'))")
+      ctx.decode(state)
+      self.__init__(ctx.unpack())
+
+    def __getstate__(self):
+      ctx = _current_pickle_context()
+      if not ctx:
+        raise Exception("Cannot pickle MX objects without a casadi context. " +
+          "Use something like:\n"+
+          "with ca.global_pickle_context(): \n"+
+          "  pickle.dump(f,open(filename,'wb'))")
+      ctx.pack(self)
+      return ctx.encode()
+  %}
+}
 
 } // namespace casadi
 #endif // SWIGPYTHON
@@ -3176,7 +3222,7 @@ SPARSITY_INTERFACE_FUN(DECL, (FLAG | IS_SX), Matrix<SXElem>)
         if (dim==0) return sum1(x);
         if (dim==1) return sum2(x);
         casadi_error(
-          "Expected sum(A,1), sum(A,2), sum(A,\"all\") got " + casadi::str(dim) + " instead.");
+          "Expected sum(A,0), sum(A,1), sum(A,\"all\") got " + casadi::str(dim) + " instead.");
       }
       DECL M casadi_sum(const M& x) {
         return sum(x);
@@ -4604,6 +4650,39 @@ namespace casadi {
       return f()
   %}
 }
+%pythoncode %{
+
+try:
+  import threading
+  _thread_local = threading.local()
+except:
+  threading_available = True
+  _thread_local = globals()
+
+def _current_pickle_context():
+  return getattr(_thread_local, "casadi_pickle_ctx", None)
+
+def _current_unpickle_context():
+  return getattr(_thread_local, "casadi_unpickle_ctx", None)
+
+class global_pickle_context:
+    def __enter__(self):
+        self.ctx = StringSerializer()
+        _thread_local.casadi_pickle_ctx = self.ctx
+        return self.ctx
+
+    def __exit__(self, *args):
+        _thread_local.casadi_pickle_ctx = None
+      
+class global_unpickle_context:
+    def __enter__(self):
+        self.ctx = StringDeserializer("")
+        _thread_local.casadi_unpickle_ctx = self.ctx
+        return self.ctx
+
+    def __exit__(self, *args):
+        _thread_local.casadi_unpickle_ctx = None  
+%}
 #endif // SWIGPYTHON
 #ifdef SWIGMATLAB
 %extend casadi::DeserializerBase {
@@ -4752,7 +4831,7 @@ opti_metadata_modifiers(casadi::Opti);
       function out = variable(self, varargin)
         st = dbstack('-completenames',1);
         if length(st)>0
-          meta = struct('stacktrace', st(1));
+          meta = struct('stacktrace', {num2cell(st)});
         else
           meta = struct;
         end
@@ -4762,7 +4841,7 @@ opti_metadata_modifiers(casadi::Opti);
       function out = parameter(self, varargin)
         st = dbstack('-completenames',1);
         if length(st)>0
-          meta = struct('stacktrace', st(1));
+          meta = struct('stacktrace', {num2cell(st)});
         else
           meta = struct;
         end
@@ -4776,7 +4855,7 @@ opti_metadata_modifiers(casadi::Opti);
         end
         st = dbstack('-completenames',1);
         if length(st)>0
-          meta = struct('stacktrace', st(1));
+          meta = struct('stacktrace', {num2cell(st)});
         else
           meta = struct;
         end

casadi/include/casadi/config.h

@@ -26,16 +26,16 @@
 
 #define CASADI_MAJOR_VERSION 3
 #define CASADI_MINOR_VERSION 7
-#define CASADI_PATCH_VERSION 0
+#define CASADI_PATCH_VERSION 2
 #define CASADI_IS_RELEASE 1
-#define CASADI_VERSION_STRING "3.7.0"
-#define CASADI_GIT_REVISION "1f5f284959d3c7591033b4ff03947ca7a44b3b11"  // NOLINT(whitespace/line_length)
-#define CASADI_GIT_DESCRIBE "3.6.3-975.1f5f28495"  // NOLINT(whitespace/line_length)
-#define CASADI_FEATURE_LIST "\n * dynamic-loading, Support for import of FMI 3.0 binaries\n * sundials-interface, Interface to the ODE/DAE integrator suite SUNDIALS.\n * csparse-interface, Interface to the sparse direct linear solver CSparse.\n * superscs-interface, Interface to QP solver SUPERSCS.\n * osqp-interface, Interface to QP solver OSQP.\n * tinyxml-interface, Interface to the XML parser TinyXML.\n * qpoases-interface, Interface to the active-set QP solver qpOASES.\n * blocksqp-interface, Interface to the NLP solver blockSQP.\n * cplex-mockup-build, Use mockup CPLEX (BUILD_MOCKUPS_VERSION=master) from downloaded source (BUILD_MOCKUPS_GIT_REPO=https://github.com/casadi/mockups.git).\n * snopt-mockup-build, Use mockup SNOPT (BUILD_MOCKUPS_VERSION=master) from downloaded source (BUILD_MOCKUPS_GIT_REPO=https://github.com/casadi/mockups.git).\n * knitro-mockup-build, Use mockup KNITRO (BUILD_MOCKUPS_VERSION=master) from downloaded source (BUILD_MOCKUPS_GIT_REPO=https://github.com/casadi/mockups.git).\n * gurobi-mockup-build, Use mockup GUROBI (BUILD_MOCKUPS_VERSION=master) from downloaded source (BUILD_MOCKUPS_GIT_REPO=https://github.com/casadi/mockups.git).\n * hsl-mockup-build, Use mockup WORHP (BUILD_MOCKUPS_VERSION=master) from downloaded source (BUILD_MOCKUPS_GIT_REPO=https://github.com/casadi/mockups.git).\n * madnlp-mockup-build, Use mockup MadNLP (BUILD_MOCKUPS_VERSION=master) from downloaded source (BUILD_MOCKUPS_GIT_REPO=https://github.com/casadi/mockups.git).\n * highs-sourcebuild, Build HiGHS (BUILD_HIGHS_VERSION=v1.10.0) from downloaded source (BUILD_HIGHS_GIT_REPO=https://github.com/ERGO-Code/HiGHS).\n * daqp-sourcebuild, Build DAQP (BUILD_DAQP_VERSION=master) from downloaded source (BUILD_DAQP_GIT_REPO=https://github.com/jgillis/daqp.git).\n * proxqp-sourcebuild, Build PROXQP (BUILD_PROXQP_VERSION=v0.3.2) from downloaded source (BUILD_PROXQP_GIT_REPO=https://github.com/Simple-Robotics/proxsuite.git).\n * osqp-sourcebuild, Build OSQP (BUILD_OSQP_VERSION=v0.6.3) from downloaded source (BUILD_OSQP_GIT_REPO=https://github.com/osqp/osqp.git).\n * superscs-sourcebuild, Build SuperSCS (BUILD_SUPERSCS_VERSION=4d2d1bd03ed4cf93e684a880b233760ce34ca69c) from downloaded source (BUILD_SUPERSCS_GIT_REPO=https://github.com/jgillis/scs.git).\n * sleqp-sourcebuild, Build SLEQP (BUILD_SLEQP_VERSION=patch-1) from downloaded source (BUILD_SLEQP_GIT_REPO=https://github.com/jgillis/sleqp.git).\n * bonmin-sourcebuild, Build BONMIN (BUILD_BONMIN_VERSION=releases/1.8.9) from downloaded source (BUILD_BONMIN_GIT_REPO=https://github.com/coin-or/Bonmin.git).\n * ipopt-sourcebuild, Build IPOPT (BUILD_IPOPT_VERSION=3.14.11.mod) from downloaded source (BUILD_IPOPT_GIT_REPO=https://github.com/jgillis/Ipopt-1.git).\n * cbc-sourcebuild, Build CBC (BUILD_CBC_VERSION=releases/2.10.11) from downloaded source.\n * clp-sourcebuild, Build CLP (BUILD_CLP_VERSION=releases/1.17.9) from downloaded source (BUILD_CLP_GIT_REPO=https://github.com/coin-or/Clp.git).\n * mumps-sourcebuild, Build MUMPS (BUILD_MUMPS_TP_VERSION=releases/3.0.2) from downloaded source (BUILD_MUMPS_TP_GIT_REPO=https://github.com/coin-or-tools/ThirdParty-Mumps.git).\n * metis-sourcebuild, Build METIS (BUILD_METIS_TP_VERSION=6997f64) from downloaded source.\n * fatrop-sourcebuild, Build FATROP (BUILD_FATROP_VERSION=v0.0.4.post1) from downloaded source (BUILD_FATROP_GIT_REPO=https://github.com/meco-group/fatrop.git).\n * trlib-sourcebuild, Build TRLIB (BUILD_TRLIB_VERSION=c7632b8b14152e78bc21721a3bd1a2432586b824) from downloaded source (BUILD_TRLIB_GIT_REPO=https://github.com/jgillis/trlib.git).\n * blasfeo-sourcebuild, Build BLASFEO (BUILD_BLASFEO_VERSION=edf92b396adddd9e548b9786f87ad290a0971329) from downloaded source (BUILD_BLASFEO_GIT_REPO=https://github.com/giaf/blasfeo.git).\n * eigen3-sourcebuild, Build Eigen (BUILD_EIGEN3_VERSION=3.4.0) from downloaded source (BUILD_EIGEN3_GIT_REPO=https://gitlab.com/libeigen/eigen.git).\n * simde-sourcebuild, Build Simde (BUILD_SIMDE_VERSION=v0.7.2) from downloaded source.\n * libzip-sourcebuild, Build LIBZIP (BUILD_LIBZIP_VERSION=v1.11.3) from downloaded source (BUILD_LIBZIP_GIT_REPO=https://github.com/nih-at/libzip).\n * zlib-sourcebuild, Build ZLIB (BUILD_ZLIB_VERSION=v1.3.1) from downloaded source (BUILD_ZLIB_GIT_REPO=https://github.com/madler/zlib).\n * cplex-interface, Interface to the QP solver CPLEX.\n * gurobi-interface, Interface to the (mixed-integer) QP solver GUROBI\n * knitro-interface, Interface to the NLP solver KNITRO.\n * madnlp-interface, Interface to the NLP solver MadNLP.\n * snopt-interface, Interface to the NLP solver KNITRO.\n * lapack-interface, Interface to LAPACK.\n * mumps-interface, Interface to MUMPS.\n * coinutils-sourcebuild, Build COINUTILS (BUILD_COINUTILS_VERSION=releases/2.11.10) from downloaded source.\n * osi-sourcebuild, Build OSI (BUILD_OSI_VERSION=releases/0.108.9) from downloaded source.\n * clp-interface, Interface to the LP solver CLP.\n * cgl-sourcebuild, Build CGL (BUILD_CGL_VERSION=releases/0.60.8) from downloaded source.\n * cbc-interface, Interface to the LP solver CBC.\n * ipopt-interface, Interface to the NLP solver Ipopt.\n * bonmin-interface, Interface to the MINLP framework Bonmin.\n * highs-interface, Interface to the MILP / QP solver HiGHS.\n * daqp-interface, Interface to the MILP / QP solver HiGHS.\n * sleqp-interface, Interface to the NLP solver SLEQP.\n * proxqp-interface, Interface to QP solver PROXQP.\n * ampl-interface, Interface to the AMPL solver library.\n * zlib-interface, Interface to the zlib.\n * libzip-interface, Interface to the libzip.\n * ghc-filesystem-interface, Interface to the ghc.\n"  // NOLINT(whitespace/line_length)
+#define CASADI_VERSION_STRING "3.7.2"
+#define CASADI_GIT_REVISION "0e672301aa9046162d311f69421f6375805f4fca"  // NOLINT(whitespace/line_length)
+#define CASADI_GIT_DESCRIBE "3.6.3-1094.0e672301a"  // NOLINT(whitespace/line_length)
+#define CASADI_FEATURE_LIST "\n * dynamic-loading, Support for import of FMI 3.0 binaries\n * sundials-interface, Interface to the ODE/DAE integrator suite SUNDIALS.\n * csparse-interface, Interface to the sparse direct linear solver CSparse.\n * superscs-interface, Interface to QP solver SUPERSCS.\n * osqp-interface, Interface to QP solver OSQP.\n * tinyxml-interface, Interface to the XML parser TinyXML.\n * qpoases-interface, Interface to the active-set QP solver qpOASES.\n * blocksqp-interface, Interface to the NLP solver blockSQP.\n * cplex-mockup-build, Use mockup CPLEX (BUILD_MOCKUPS_VERSION=master) from downloaded source (BUILD_MOCKUPS_GIT_REPO=https://github.com/casadi/mockups.git).\n * snopt-mockup-build, Use mockup SNOPT (BUILD_MOCKUPS_VERSION=master) from downloaded source (BUILD_MOCKUPS_GIT_REPO=https://github.com/casadi/mockups.git).\n * knitro-mockup-build, Use mockup KNITRO (BUILD_MOCKUPS_VERSION=master) from downloaded source (BUILD_MOCKUPS_GIT_REPO=https://github.com/casadi/mockups.git).\n * gurobi-mockup-build, Use mockup GUROBI (BUILD_MOCKUPS_VERSION=master) from downloaded source (BUILD_MOCKUPS_GIT_REPO=https://github.com/casadi/mockups.git).\n * hsl-mockup-build, Use mockup WORHP (BUILD_MOCKUPS_VERSION=master) from downloaded source (BUILD_MOCKUPS_GIT_REPO=https://github.com/casadi/mockups.git).\n * madnlp-mockup-build, Use mockup MadNLP (BUILD_MOCKUPS_VERSION=master) from downloaded source (BUILD_MOCKUPS_GIT_REPO=https://github.com/casadi/mockups.git).\n * highs-sourcebuild, Build HiGHS (BUILD_HIGHS_VERSION=v1.10.0) from downloaded source (BUILD_HIGHS_GIT_REPO=https://github.com/ERGO-Code/HiGHS).\n * daqp-sourcebuild, Build DAQP (BUILD_DAQP_VERSION=master) from downloaded source (BUILD_DAQP_GIT_REPO=https://github.com/jgillis/daqp.git).\n * proxqp-sourcebuild, Build PROXQP (BUILD_PROXQP_VERSION=v0.3.2) from downloaded source (BUILD_PROXQP_GIT_REPO=https://github.com/Simple-Robotics/proxsuite.git).\n * osqp-sourcebuild, Build OSQP (BUILD_OSQP_VERSION=v0.6.3) from downloaded source (BUILD_OSQP_GIT_REPO=https://github.com/osqp/osqp.git).\n * superscs-sourcebuild, Build SuperSCS (BUILD_SUPERSCS_VERSION=4d2d1bd03ed4cf93e684a880b233760ce34ca69c) from downloaded source (BUILD_SUPERSCS_GIT_REPO=https://github.com/jgillis/scs.git).\n * sleqp-sourcebuild, Build SLEQP (BUILD_SLEQP_VERSION=patch-1) from downloaded source (BUILD_SLEQP_GIT_REPO=https://github.com/jgillis/sleqp.git).\n * bonmin-sourcebuild, Build BONMIN (BUILD_BONMIN_VERSION=releases/1.8.9) from downloaded source (BUILD_BONMIN_GIT_REPO=https://github.com/coin-or/Bonmin.git).\n * ipopt-sourcebuild, Build IPOPT (BUILD_IPOPT_VERSION=3.14.11.mod) from downloaded source (BUILD_IPOPT_GIT_REPO=https://github.com/jgillis/Ipopt-1.git).\n * cbc-sourcebuild, Build CBC (BUILD_CBC_VERSION=releases/2.10.11) from downloaded source.\n * clp-sourcebuild, Build CLP (BUILD_CLP_VERSION=releases/1.17.9) from downloaded source (BUILD_CLP_GIT_REPO=https://github.com/coin-or/Clp.git).\n * mumps-sourcebuild, Build MUMPS (BUILD_MUMPS_TP_VERSION=releases/3.0.2) from downloaded source (BUILD_MUMPS_TP_GIT_REPO=https://github.com/coin-or-tools/ThirdParty-Mumps.git).\n * metis-sourcebuild, Build METIS (BUILD_METIS_TP_VERSION=6997f64) from downloaded source.\n * fatrop-sourcebuild, Build FATROP (BUILD_FATROP_VERSION=v0.0.4.post1) from downloaded source (BUILD_FATROP_GIT_REPO=https://github.com/meco-group/fatrop.git).\n * trlib-sourcebuild, Build TRLIB (BUILD_TRLIB_VERSION=c7632b8b14152e78bc21721a3bd1a2432586b824) from downloaded source (BUILD_TRLIB_GIT_REPO=https://github.com/jgillis/trlib.git).\n * blasfeo-sourcebuild, Build BLASFEO (BUILD_BLASFEO_VERSION=14d6e66f0662182a8dd02ddc7ec4738738c6344d) from downloaded source (BUILD_BLASFEO_GIT_REPO=https://github.com/jgillis/blasfeo.git).\n * eigen3-sourcebuild, Build Eigen (BUILD_EIGEN3_VERSION=3.4.0) from downloaded source (BUILD_EIGEN3_GIT_REPO=https://gitlab.com/libeigen/eigen.git).\n * simde-sourcebuild, Build Simde (BUILD_SIMDE_VERSION=v0.7.2) from downloaded source.\n * libzip-sourcebuild, Build LIBZIP (BUILD_LIBZIP_VERSION=v1.11.3) from downloaded source (BUILD_LIBZIP_GIT_REPO=https://github.com/nih-at/libzip).\n * zlib-sourcebuild, Build ZLIB (BUILD_ZLIB_VERSION=v1.3.1) from downloaded source (BUILD_ZLIB_GIT_REPO=https://github.com/madler/zlib).\n * cplex-interface, Interface to the QP solver CPLEX.\n * gurobi-interface, Interface to the (mixed-integer) QP solver GUROBI\n * knitro-interface, Interface to the NLP solver KNITRO.\n * madnlp-interface, Interface to the NLP solver MadNLP.\n * snopt-interface, Interface to the NLP solver KNITRO.\n * lapack-interface, Interface to LAPACK.\n * mumps-interface, Interface to MUMPS.\n * coinutils-sourcebuild, Build COINUTILS (BUILD_COINUTILS_VERSION=releases/2.11.10) from downloaded source.\n * osi-sourcebuild, Build OSI (BUILD_OSI_VERSION=releases/0.108.9) from downloaded source.\n * clp-interface, Interface to the LP solver CLP.\n * cgl-sourcebuild, Build CGL (BUILD_CGL_VERSION=releases/0.60.8) from downloaded source.\n * cbc-interface, Interface to the LP solver CBC.\n * ipopt-interface, Interface to the NLP solver Ipopt.\n * bonmin-interface, Interface to the MINLP framework Bonmin.\n * highs-interface, Interface to the MILP / QP solver HiGHS.\n * daqp-interface, Interface to the MILP / QP solver DAQP.\n * sleqp-interface, Interface to the NLP solver SLEQP.\n * proxqp-interface, Interface to QP solver PROXQP.\n * ampl-interface, Interface to the AMPL solver library.\n * zlib-interface, Interface to the zlib.\n * libzip-interface, Interface to the libzip.\n * ghc-filesystem-interface, Interface to the ghc.\n"  // NOLINT(whitespace/line_length)
 #define CASADI_BUILD_TYPE "Release"  // NOLINT(whitespace/line_length)
 #define CASADI_COMPILER_ID "Clang"  // NOLINT(whitespace/line_length)
 #define CASADI_COMPILER "clang++"  // NOLINT(whitespace/line_length)
-#define CASADI_COMPILER_FLAGS " -pthread    -DUSE_CXX11 -DHAVE_MKSTEMPS -DWITH_DEEPBIND -DCASADI_MAJOR_VERSION=3 -DCASADI_MINOR_VERSION=7 -DCASADI_PATCH_VERSION=0 -DCASADI_IS_RELEASE=1 -DCASADI_VERSION=31 -D_USE_MATH_DEFINES -D_SCL_SECURE_NO_WARNINGS -DWITH_DL -DWITH_DEPRECATED_FEATURES -DCASADI_DEFAULT_COMPILER_PLUGIN=shell -DCASADI_SNPRINTF=snprintf -DCASADI_WITH_THREADSAFE_SYMBOLICS -DCASADI_WITH_THREAD"  // NOLINT(whitespace/line_length)
+#define CASADI_COMPILER_FLAGS " -pthread    -DUSE_CXX11 -DHAVE_MKSTEMPS -DWITH_DEEPBIND -DCASADI_MAJOR_VERSION=3 -DCASADI_MINOR_VERSION=7 -DCASADI_PATCH_VERSION=2 -DCASADI_IS_RELEASE=1 -DCASADI_VERSION=31 -D_USE_MATH_DEFINES -D_SCL_SECURE_NO_WARNINGS -DWITH_DL -DWITH_DEPRECATED_FEATURES -DCASADI_DEFAULT_COMPILER_PLUGIN=shell -DCASADI_SNPRINTF=snprintf -DCASADI_WITH_THREADSAFE_SYMBOLICS -DCASADI_WITH_THREAD"  // NOLINT(whitespace/line_length)
 #define CASADI_MODULES "casadi;casadi_linsol_lapacklu;casadi_linsol_lapackqr;casadi_sundials_common;casadi_integrator_cvodes;casadi_integrator_idas;casadi_rootfinder_kinsol;casadi_nlpsol_sleqp;casadi_nlpsol_ipopt;casadi_nlpsol_madnlp;casadi_nlpsol_bonmin;casadi_conic_qpoases;casadi_nlpsol_knitro;casadi_conic_cplex;casadi_conic_clp;casadi_conic_cbc;casadi_linsol_csparse;casadi_linsol_csparsecholesky;casadi_conic_highs;casadi_conic_daqp;casadi_linsol_ma27;casadi_linsol_mumps;casadi_conic_gurobi;casadi_nlpsol_snopt;casadi_xmlfile_tinyxml;casadi_nlpsol_blocksqp;casadi_conic_fatrop;casadi_nlpsol_fatrop;casadi_conic_superscs;casadi_nlpsol_ampl;casadi_conic_proxqp;casadi_conic_osqp;casadi_archiver_libzip;casadi_filesystem_ghc;casadi_conic_nlpsol;casadi_conic_qrqp;casadi_conic_ipqp;casadi_nlpsol_qrsqp;casadi_importer_shell;casadi_integrator_rk;casadi_integrator_collocation;casadi_interpolant_linear;casadi_interpolant_bspline;casadi_linsol_symbolicqr;casadi_linsol_qr;casadi_linsol_ldl;casadi_linsol_tridiag;casadi_linsol_lsqr;casadi_nlpsol_sqpmethod;casadi_nlpsol_feasiblesqpmethod;casadi_nlpsol_scpgen;casadi_rootfinder_newton;casadi_rootfinder_fast_newton;casadi_rootfinder_nlpsol"  // NOLINT(whitespace/line_length)
 #define CASADI_PLUGINS "Linsol::lapacklu;Linsol::lapackqr;Integrator::cvodes;Integrator::idas;Rootfinder::kinsol;Nlpsol::sleqp;Nlpsol::ipopt;Nlpsol::madnlp;Nlpsol::bonmin;Conic::qpoases;Nlpsol::knitro;Conic::cplex;Conic::clp;Conic::cbc;Linsol::csparse;Linsol::csparsecholesky;Conic::highs;Conic::daqp;Linsol::ma27;Linsol::mumps;Conic::gurobi;Nlpsol::snopt;XmlFile::tinyxml;Nlpsol::blocksqp;Conic::fatrop;Nlpsol::fatrop;Conic::superscs;Nlpsol::ampl;Conic::proxqp;Conic::osqp;Archiver::libzip;Filesystem::ghc;Conic::nlpsol;Conic::qrqp;Conic::ipqp;Nlpsol::qrsqp;Importer::shell;Integrator::rk;Integrator::collocation;Interpolant::linear;Interpolant::bspline;Linsol::symbolicqr;Linsol::qr;Linsol::ldl;Linsol::tridiag;Linsol::lsqr;Nlpsol::sqpmethod;Nlpsol::feasiblesqpmethod;Nlpsol::scpgen;Rootfinder::newton;Rootfinder::fast_newton;Rootfinder::nlpsol"  // NOLINT(whitespace/line_length)
 #define CASADI_INSTALL_PREFIX ""  // NOLINT(whitespace/line_length)

casadi/include/casadi/core/callback.hpp

@@ -168,6 +168,15 @@ namespace casadi {
         \identifier{og} */
     virtual bool uses_output() const;
 
+    /** \brief Customize calls to the function factory
+
+        \identifier{2de} */
+    virtual Function get_factory(const std::string& name,
+        const std::vector<std::string>& s_in,
+        const std::vector<std::string>& s_out,
+        const Function::AuxOut& aux,
+        const Dict& opts) const;
+
     ///@{
     /** \brief Return Jacobian of all input elements with respect to all output elements
 

casadi/include/casadi/core/casadi_misc.hpp

@@ -426,6 +426,20 @@ private:
   CASADI_EXPORT void normalized_setup(std::istream& stream);
   CASADI_EXPORT void normalized_setup(std::ostream& stream);
 
+
+  class CASADI_EXPORT StreamStateGuard {
+  public:
+      explicit StreamStateGuard(std::ostream& os);
+      ~StreamStateGuard();
+
+  private:
+      std::ostream& stream_;
+      std::ios::fmtflags flags_;
+      std::streamsize precision_;
+      std::streamsize width_;
+      std::locale locale_;
+  };
+
   inline void normalized_out(std::ostream& stream, double val) {
     if (val==std::numeric_limits<double>::infinity()) {
       stream << "inf";

casadi/include/casadi/core/code_generator.hpp

@@ -687,7 +687,10 @@ namespace casadi {
       AUX_BLAZING_1D_BOOR_EVAL,
       AUX_BLAZING_2D_BOOR_EVAL,
       AUX_BLAZING_3D_BOOR_EVAL,
-      AUX_PRINTME
+      AUX_PRINTME,
+      AUX_PRINT_SCALAR,
+      AUX_PRINT_VECTOR,
+      AUX_PRINT_CANONICAL
     };
 
     /** \brief Add a built-in auxiliary function
@@ -741,6 +744,21 @@ namespace casadi {
     void print_vector(std::ostream &s, const std::string& name,
                              const std::vector<std::string>& v);
 
+    /** \brief Print canonical representaion of a matrix
+
+        \identifier{2dk} */
+    std::string print_canonical(const Sparsity& sp, const std::string& arg);
+
+    /** \brief Print canonical representaion of a vector
+
+        \identifier{2dl} */
+    std::string print_vector(casadi_int sz, const std::string& arg);
+
+    /** \brief Print canonical representaion of a scalar
+
+        \identifier{2dm} */
+    std::string print_scalar(const std::string& arg);
+
     /** \brief Create a copy operation
 
         \identifier{tt} */
@@ -852,10 +870,10 @@ namespace casadi {
     static std::string casadi_version();
 
     /// Print file header
-    static void file_open(std::ofstream& f, const std::string& name, bool cpp);
+    static void stream_open(std::ostream& f, bool cpp);
 
     /// Print file header
-    static void file_close(std::ofstream& f, bool cpp);
+    static void stream_close(std::ostream& f, bool cpp);
 
     /** \brief Get number of temporary variables needed for all functions
 

casadi/include/casadi/core/dae_builder.hpp

@@ -140,6 +140,21 @@ class CASADI_EXPORT DaeBuilder
       \identifier{5m} */
   std::vector<MX> ydef() const;
 
+  /** \brief Set all output variables
+
+      \identifier{2db} */
+  void set_y(const std::vector<std::string>& name);
+
+  /** \brief Get all rate variables
+
+      \identifier{2dc} */
+  std::vector<std::string> rate() const;
+
+  /** \brief Set rate variables
+
+      \identifier{2dd} */
+  void set_rate(const std::vector<std::string>& name);
+
   /** \brief Free controls
 
       \identifier{5n} */
@@ -217,6 +232,11 @@ class CASADI_EXPORT DaeBuilder
       \identifier{64} */
   bool has_t() const;
 
+  /** \brief Is there a rate output?
+
+      \identifier{2dg} */
+  bool has_rate() const;
+
   /** \brief Differential states
 
       \identifier{65} */

casadi/include/casadi/core/fmu.hpp

@@ -36,6 +36,7 @@ namespace casadi {
 
 // Forward declarations
 class DaeBuilderInternal;
+class FmuFunction;
 struct FmuMemory;
 struct InputStruct;
 
@@ -160,11 +161,21 @@ class CASADI_EXPORT Fmu
     return hess_sparsity(ired(r), ired(c));
   }
 
+  /** \brief Create memory block
+
+      \identifier{2dn} */
+  FmuMemory* alloc_mem(const FmuFunction& f) const;
+
   /** \brief Initalize memory block
 
       \identifier{26x} */
   int init_mem(FmuMemory* m) const;
 
+  /** \brief Free memory block
+
+      \identifier{2dt} */
+  void free_mem(void *mem) const;
+
   // Free FMU instance
   void free_instance(void* instance) const;
 

casadi/include/casadi/core/function.hpp

@@ -463,6 +463,11 @@ namespace casadi {
         \identifier{1w2} */
     void change_option(const std::string& option_name, const GenericType& option_value);
 
+    /** \brief Reset the counter used to name dump files
+
+        \identifier{2dy} */
+    void reset_dump_count();
+
     /** \brief Do the derivative functions need nondifferentiated outputs?
 
         \identifier{1w3} */
@@ -956,6 +961,16 @@ namespace casadi {
       return mx_in(index_in(iname));
     }
     const std::vector<MX> mx_in() const;
+#ifndef SWIG
+    template<typename T>
+    const T sym_in(casadi_int iind) const;
+    template<typename T>
+    const T sym_in(const std::string& iname) const {
+      return sym_in<T>(index_in(iname));
+    }
+    template<typename T>
+    const std::vector<T> sym_in() const;
+#endif // SWIG
     ///@}
 
     ///@{
@@ -1357,6 +1372,14 @@ public:
 
 void CASADI_EXPORT _function_buffer_eval(void* raw);
 
+template<>
+const SX CASADI_EXPORT Function::sym_in(casadi_int iind) const;
+template<>
+const MX CASADI_EXPORT Function::sym_in(casadi_int iind) const;
+template<>
+const std::vector<SX> CASADI_EXPORT Function::sym_in() const;
+template<>
+const std::vector<MX> CASADI_EXPORT Function::sym_in() const;
 
 } // namespace casadi
 

casadi/include/casadi/core/generic_shared.hpp

@@ -30,6 +30,7 @@
 #include "exception.hpp"
 #include <unordered_map>
 #include <vector>
+#include <cstdint>
 #ifdef CASADI_WITH_THREAD
 #ifdef CASADI_WITH_THREAD_MINGW
 #include <mingw.mutex.h>
@@ -38,9 +39,7 @@
 #endif // CASADI_WITH_THREAD_MINGW
 #endif //CASADI_WITH_THREAD
 
-#ifdef CASADI_WITH_THREADSAFE_SYMBOLICS
 #include <memory>
-#endif // CASADI_WITH_THREADSAFE_SYMBOLICS
 
 namespace casadi {
 
@@ -235,7 +234,10 @@ namespace casadi {
 
 #endif // SWIG
 
-
+/**
+ * Key is stored as a regular ref
+ * Value is stored as weakref
+ */
 template<typename K, typename T>
 class CASADI_EXPORT WeakCache {
   public:
@@ -310,7 +312,82 @@ class CASADI_EXPORT WeakCache {
 #endif // CASADI_WITH_THREADSAFE_SYMBOLICS
 };
 
+// gcc-12 is overzealous about use-after-free warnings
+// <12 or >12 works fine
+#pragma GCC diagnostic push
+#if defined(__GNUC__) && !defined(__clang__) && (__GNUC__ == 12)
+#pragma GCC diagnostic ignored "-Wuse-after-free"
+#endif
+
+/**
+ * Key is stored as a weakref
+ * Value is stored as regular ref
+ */
+template<typename K, typename T>
+class CASADI_EXPORT RevWeakCache {
+  public:
+    void tocache(const K& key, const T& f, bool needs_lock=true) {
+#ifdef CASADI_WITH_THREADSAFE_SYMBOLICS
+      // Safe access to cache_
+      casadi::conditional_lock_guard<std::mutex> lock(mtx_, needs_lock);
+#endif // CASADI_WITH_THREADSAFE_SYMBOLICS
+      // Add to cache
+      const void* k = key.get();
+      pre_cache_.insert(std::make_pair(k, key));
+      cache_.insert(std::make_pair(k, f));
+      // Remove a lost reference, if any, to prevent uncontrolled growth
+      for (auto it = pre_cache_.begin(); it!=pre_cache_.end(); ++it) {
+        if (!it->second.alive()) {
+          pre_cache_.erase(it);
+          cache_.erase(it->first);
+          break; // just one dead reference is enough
+        }
+      }
+    }
+    /* \brief Thread-safe unique caching
+    * While an incache/tocache pair in multi-threaded context is safe
+    * it may lead to fresh cache entries being overwritten.
+    *
+    * A mutex lock_guard on the scope of an incache/tocache pair
+    * may lead to deadlocks.
+    *
+    */
+    void tocache_if_missing(const K& key, T& f) {
+#ifdef CASADI_WITH_THREADSAFE_SYMBOLICS
+      // Safe access to cache_
+      std::lock_guard<std::mutex> lock(mtx_);
+#endif // CASADI_WITH_THREADSAFE_SYMBOLICS
+      if (!incache(key, f, false)) {
+        tocache(key, f, false);
+      }
+    }
+    bool incache(const K& key, T& f, bool needs_lock=true) const {
+#ifdef CASADI_WITH_THREADSAFE_SYMBOLICS
+      // Safe access to cache_
+      casadi::conditional_lock_guard<std::mutex> lock(mtx_, needs_lock);
+#endif // CASADI_WITH_THREADSAFE_SYMBOLICS
+      const void* k = key.get();
+      auto it = pre_cache_.find(k);
+      K temp;
+      if (it!=pre_cache_.end() && it->second.shared_if_alive(temp)) {
+        auto it2 = cache_.find(k);
+        f = it2->second;
+        return true;
+      } else {
+        return false;
+      }
+    }
+  private:
+    std::unordered_map<const void*,
+    GenericWeakRef<typename K::base_type, typename K::internal_base_type>
+    > pre_cache_;
+    std::unordered_map<const void*, T> cache_;
+#ifdef CASADI_WITH_THREADSAFE_SYMBOLICS
+    mutable std::mutex mtx_;
+#endif // CASADI_WITH_THREADSAFE_SYMBOLICS
+};
 
+#pragma GCC diagnostic pop
 
 } // namespace casadi
 

casadi/include/casadi/core/generic_shared_impl.hpp

@@ -26,6 +26,10 @@
 #ifndef CASADI_GENERIC_SHARED_IMPL_HPP
 #define CASADI_GENERIC_SHARED_IMPL_HPP
 
+#ifdef WITH_EXTRA_CHECKS
+#include "function.hpp"
+#endif // WITH_EXTRA_CHECKS
+
 namespace casadi {
 
   template<typename Shared, typename Internal>

casadi/include/casadi/core/matrix_decl.hpp

@@ -936,6 +936,10 @@ namespace casadi {
     static void print_vector(std::ostream &stream, const Sparsity& sp, const Scalar* nonzeros,
       bool truncate=true);
 
+    /// Print canonical style
+    static void print_canonical(std::ostream &stream, const Sparsity& sp, const Scalar* nonzeros,
+        bool truncate=true);
+
     /// Print scalar
     static void print_sparse(std::ostream &stream, const Sparsity& sp, const Scalar* nonzeros,
       bool truncate=true);

casadi/include/casadi/core/nlp_builder.hpp

@@ -27,6 +27,7 @@
 #define CASADI_NLP_BUILDER_HPP
 
 #include "mx.hpp"
+#include <memory>
 
 namespace casadi {
 
@@ -112,7 +113,7 @@ namespace casadi {
     // Binary mode
     bool binary_;
     // File stream
-    std::ifstream s_;
+    std::unique_ptr<std::istream> s_ptr_;
     // All variables, including dependent
     std::vector<MX> v_;
     // Number of objectives and constraints

casadi/include/casadi/core/runtime/casadi_finite_diff.hpp

@@ -205,7 +205,7 @@ T1 casadi_smoothing_diff_err(const T1** yk, T1 h, casadi_int n_y, casadi_int i,
   // If sw is 0, no stencil worked
   if (sw == 0) {
     // Cannot be calculated
-    return std::numeric_limits<T1>::quiet_NaN();;
+    return std::numeric_limits<T1>::quiet_NaN();
   } else {
     // Finalize estimate using the sum of weights and the step length
     return ui / sw;

casadi/include/casadi/core/runtime/casadi_print_canonical.hpp

@@ -0,0 +1,55 @@
+//
+//    MIT No Attribution
+//
+//    Copyright (C) 2010-2023 Joel Andersson, Joris Gillis, Moritz Diehl, KU Leuven.
+//
+//    Permission is hereby granted, free of charge, to any person obtaining a copy of this
+//    software and associated documentation files (the "Software"), to deal in the Software
+//    without restriction, including without limitation the rights to use, copy, modify,
+//    merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
+//    permit persons to whom the Software is furnished to do so.
+//
+//    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+//    INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+//    PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+//    HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+//    OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+//    SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+// SYMBOL "print_canonical"
+template<typename T1>
+void casadi_print_canonical(const casadi_int* sp, const T1* x) {
+  // C-REPLACE "printf" "CASADI_PRINTF"
+  // C-REPLACE "static_cast<int>" "(int) "
+  if (x) {
+    casadi_int nrow = sp[0];
+    casadi_int ncol = sp[1];
+    const casadi_int* colind = sp+2;
+    const casadi_int* row = colind + ncol + 1;
+    casadi_int nnz = sp[2+ncol];
+    if (nrow==1 && ncol==1 && nnz==1) {
+      casadi_print_scalar(x[0]);
+    } else {
+      casadi_int i;
+      printf("%dx%d: ", static_cast<int>(nrow), static_cast<int>(ncol));
+      casadi_print_vector(nnz, x);
+      if (nnz!=nrow*ncol) {
+        printf(", colind: [");
+        for (i = 0; i < ncol; ++i) {
+          if (i > 0) printf(", ");
+          printf("%d", static_cast<int>(colind[i]));
+        }
+        printf("], row: [");
+        for (i = 0; i < nnz; ++i) {
+          if (i > 0) printf(", ");
+          printf("%d", static_cast<int>(row[i]));
+        }
+        printf("]");
+      }
+    }
+  } else {
+    printf("NULL");
+  }
+
+}

casadi/include/casadi/core/runtime/casadi_print_scalar.hpp

@@ -0,0 +1,25 @@
+//
+//    MIT No Attribution
+//
+//    Copyright (C) 2010-2023 Joel Andersson, Joris Gillis, Moritz Diehl, KU Leuven.
+//
+//    Permission is hereby granted, free of charge, to any person obtaining a copy of this
+//    software and associated documentation files (the "Software"), to deal in the Software
+//    without restriction, including without limitation the rights to use, copy, modify,
+//    merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
+//    permit persons to whom the Software is furnished to do so.
+//
+//    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+//    INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+//    PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+//    HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+//    OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+//    SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+// SYMBOL "print_scalar"
+template<typename T1>
+void casadi_print_scalar(T1 a) {
+  // C-REPLACE "printf" "CASADI_PRINTF"
+  printf("%.16e", a);
+}