symengine 0.10.0__cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl → 0.14.0__cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl

symengine/lib/symengine.pxd

@@ -4,8 +4,21 @@ from libcpp.map cimport map
 from libcpp.vector cimport vector
 from cpython.ref cimport PyObject
 from libcpp.pair cimport pair
+from libcpp.set cimport set
+from libcpp.unordered_map cimport unordered_map
 
-include "config.pxi"
+cdef extern from "<set>" namespace "std":
+    # Cython's libcpp.set does not support multiset in 0.29.x
+    cdef cppclass multiset[T]:
+        cppclass iterator:
+            T& operator*()
+            iterator operator++() nogil
+            iterator operator--() nogil
+            bint operator==(iterator) nogil
+            bint operator!=(iterator) nogil
+        iterator begin() nogil
+        iterator end() nogil
+        iterator insert(T&) nogil
 
 cdef extern from 'symengine/mp_class.h' namespace "SymEngine":
     ctypedef unsigned long mp_limb_t
@@ -31,94 +44,6 @@ cdef extern from 'symengine/mp_class.h' namespace "SymEngine":
         rational_class(mpq_t)
     const mpq_t get_mpq_t(const rational_class &a)
 
-cdef extern from "<set>" namespace "std":
-# Cython's libcpp.set does not support two template arguments to set.
-# Methods to declare and iterate a set with a custom compare are given here
-    cdef cppclass set[T, U]:
-        cppclass iterator:
-            T& operator*()
-            iterator operator++() nogil
-            iterator operator--() nogil
-            bint operator==(iterator) nogil
-            bint operator!=(iterator) nogil
-        iterator begin() nogil
-        iterator end() nogil
-        iterator insert(T&) nogil
-
-    cdef cppclass multiset[T, U]:
-         cppclass iterator:
-             T& operator*()
-             iterator operator++() nogil
-             iterator operator--() nogil
-             bint operator==(iterator) nogil
-             bint operator!=(iterator) nogil
-         iterator begin() nogil
-         iterator end() nogil
-         iterator insert(T&) nogil
-
-cdef extern from "<unordered_map>" namespace "std" nogil:
-    cdef cppclass unordered_map[T, U]:
-        cppclass iterator:
-            pair[T, U]& operator*()
-            iterator operator++()
-            iterator operator--()
-            bint operator==(iterator)
-            bint operator!=(iterator)
-        cppclass reverse_iterator:
-            pair[T, U]& operator*()
-            iterator operator++()
-            iterator operator--()
-            bint operator==(reverse_iterator)
-            bint operator!=(reverse_iterator)
-        cppclass const_iterator(iterator):
-            pass
-        cppclass const_reverse_iterator(reverse_iterator):
-            pass
-        unordered_map() except +
-        unordered_map(unordered_map&) except +
-        #unordered_map(key_compare&)
-        U& operator[](T&)
-        #unordered_map& operator=(unordered_map&)
-        bint operator==(unordered_map&, unordered_map&)
-        bint operator!=(unordered_map&, unordered_map&)
-        bint operator<(unordered_map&, unordered_map&)
-        bint operator>(unordered_map&, unordered_map&)
-        bint operator<=(unordered_map&, unordered_map&)
-        bint operator>=(unordered_map&, unordered_map&)
-        U& at(T&)
-        iterator begin()
-        const_iterator const_begin "begin"()
-        void clear()
-        size_t count(T&)
-        bint empty()
-        iterator end()
-        const_iterator const_end "end"()
-        pair[iterator, iterator] equal_range(T&)
-        #pair[const_iterator, const_iterator] equal_range(key_type&)
-        void erase(iterator)
-        void erase(iterator, iterator)
-        size_t erase(T&)
-        iterator find(T&)
-        const_iterator const_find "find"(T&)
-        pair[iterator, bint] insert(pair[T, U]) # XXX pair[T,U]&
-        iterator insert(iterator, pair[T, U]) # XXX pair[T,U]&
-        #void insert(input_iterator, input_iterator)
-        #key_compare key_comp()
-        iterator lower_bound(T&)
-        const_iterator const_lower_bound "lower_bound"(T&)
-        size_t max_size()
-        reverse_iterator rbegin()
-        const_reverse_iterator const_rbegin "rbegin"()
-        reverse_iterator rend()
-        const_reverse_iterator const_rend "rend"()
-        size_t size()
-        void swap(unordered_map&)
-        iterator upper_bound(T&)
-        const_iterator const_upper_bound "upper_bound"(T&)
-        #value_compare value_comp()
-        void max_load_factor(float)
-        float max_load_factor()
-
 cdef extern from "<symengine/symengine_rcp.h>" namespace "SymEngine":
     cdef enum ENull:
         null
@@ -136,7 +61,12 @@ cdef extern from "<symengine/symengine_rcp.h>" namespace "SymEngine":
 
 cdef extern from "<symengine/basic.h>" namespace "SymEngine":
     ctypedef Basic const_Basic "const SymEngine::Basic"
-    ctypedef RCP[const Basic] rcp_const_basic "SymEngine::RCP<const SymEngine::Basic>"
+    # RCP[const_Basic] instead of RCP[const Basic] is because of https://github.com/cython/cython/issues/5478
+    ctypedef RCP[const_Basic] rcp_const_basic "SymEngine::RCP<const SymEngine::Basic>"
+    #cdef cppclass rcp_const_basic "SymEngine::RCP<const SymEngine::Basic>":
+    #    Basic& operator*() nogil
+    #    void reset() nogil except +
+    #    pass
     # Cython has broken support for the following:
     # ctypedef map[rcp_const_basic, rcp_const_basic] map_basic_basic
     # So instead we replicate the map features we need here
@@ -178,8 +108,9 @@ cdef extern from "<symengine/basic.h>" namespace "SymEngine":
     ctypedef map[RCP[Integer], unsigned] map_integer_uint "SymEngine::map_integer_uint"
     cdef struct RCPIntegerKeyLess
     cdef struct RCPBasicKeyLess
-    ctypedef set[rcp_const_basic, RCPBasicKeyLess] set_basic "SymEngine::set_basic"
-    ctypedef multiset[rcp_const_basic, RCPBasicKeyLess] multiset_basic "SymEngine::multiset_basic"
+    ctypedef set[rcp_const_basic] set_basic "SymEngine::set_basic"
+    ctypedef multiset[rcp_const_basic] multiset_basic "SymEngine::multiset_basic"
+
     cdef cppclass Basic:
         string __str__() nogil except +
         unsigned int hash() nogil except +
@@ -229,105 +160,17 @@ cdef extern from "<symengine/basic.h>" namespace "SymEngine":
     Ptr[RCP[Basic]] outArg(rcp_const_basic &arg) nogil
     Ptr[RCP[Integer]] outArg_Integer "SymEngine::outArg<SymEngine::RCP<const SymEngine::Integer>>"(RCP[const Integer] &arg) nogil
 
-    bool is_a_Add "SymEngine::is_a<SymEngine::Add>"(const Basic &b) nogil
-    bool is_a_Mul "SymEngine::is_a<SymEngine::Mul>"(const Basic &b) nogil
-    bool is_a_Pow "SymEngine::is_a<SymEngine::Pow>"(const Basic &b) nogil
-    bool is_a_Integer "SymEngine::is_a<SymEngine::Integer>"(const Basic &b) nogil
-    bool is_a_Rational "SymEngine::is_a<SymEngine::Rational>"(const Basic &b) nogil
-    bool is_a_Complex "SymEngine::is_a<SymEngine::Complex>"(const Basic &b) nogil
-    bool is_a_Symbol "SymEngine::is_a<SymEngine::Symbol>"(const Basic &b) nogil
-    bool is_a_Dummy "SymEngine::is_a<SymEngine::Dummy>"(const Basic &b) nogil
-    bool is_a_Constant "SymEngine::is_a<SymEngine::Constant>"(const Basic &b) nogil
-    bool is_a_Infty "SymEngine::is_a<SymEngine::Infty>"(const Basic &b) nogil
-    bool is_a_NaN "SymEngine::is_a<SymEngine::NaN>"(const Basic &b) nogil
-    bool is_a_Sin "SymEngine::is_a<SymEngine::Sin>"(const Basic &b) nogil
-    bool is_a_Cos "SymEngine::is_a<SymEngine::Cos>"(const Basic &b) nogil
-    bool is_a_Tan "SymEngine::is_a<SymEngine::Tan>"(const Basic &b) nogil
-    bool is_a_Cot "SymEngine::is_a<SymEngine::Cot>"(const Basic &b) nogil
-    bool is_a_Csc "SymEngine::is_a<SymEngine::Csc>"(const Basic &b) nogil
-    bool is_a_Sec "SymEngine::is_a<SymEngine::Sec>"(const Basic &b) nogil
-    bool is_a_ASin "SymEngine::is_a<SymEngine::ASin>"(const Basic &b) nogil
-    bool is_a_ACos "SymEngine::is_a<SymEngine::ACos>"(const Basic &b) nogil
-    bool is_a_ATan "SymEngine::is_a<SymEngine::ATan>"(const Basic &b) nogil
-    bool is_a_ACot "SymEngine::is_a<SymEngine::ACot>"(const Basic &b) nogil
-    bool is_a_ACsc "SymEngine::is_a<SymEngine::ACsc>"(const Basic &b) nogil
-    bool is_a_ASec "SymEngine::is_a<SymEngine::ASec>"(const Basic &b) nogil
-    bool is_a_Sinh "SymEngine::is_a<SymEngine::Sinh>"(const Basic &b) nogil
-    bool is_a_Cosh "SymEngine::is_a<SymEngine::Cosh>"(const Basic &b) nogil
-    bool is_a_Tanh "SymEngine::is_a<SymEngine::Tanh>"(const Basic &b) nogil
-    bool is_a_Coth "SymEngine::is_a<SymEngine::Coth>"(const Basic &b) nogil
-    bool is_a_Csch "SymEngine::is_a<SymEngine::Csch>"(const Basic &b) nogil
-    bool is_a_Sech "SymEngine::is_a<SymEngine::Sech>"(const Basic &b) nogil
-    bool is_a_ASinh "SymEngine::is_a<SymEngine::ASinh>"(const Basic &b) nogil
-    bool is_a_ACosh "SymEngine::is_a<SymEngine::ACosh>"(const Basic &b) nogil
-    bool is_a_ATanh "SymEngine::is_a<SymEngine::ATanh>"(const Basic &b) nogil
-    bool is_a_ACoth "SymEngine::is_a<SymEngine::ACoth>"(const Basic &b) nogil
-    bool is_a_ACsch "SymEngine::is_a<SymEngine::ACsch>"(const Basic &b) nogil
-    bool is_a_ASech "SymEngine::is_a<SymEngine::ASech>"(const Basic &b) nogil
-    bool is_a_FunctionSymbol "SymEngine::is_a<SymEngine::FunctionSymbol>"(const Basic &b) nogil
-    bool is_a_Abs "SymEngine::is_a<SymEngine::Abs>"(const Basic &b) nogil
-    bool is_a_Max "SymEngine::is_a<SymEngine::Max>"(const Basic &b) nogil
-    bool is_a_Min "SymEngine::is_a<SymEngine::Min>"(const Basic &b) nogil
-    bool is_a_Gamma "SymEngine::is_a<SymEngine::Gamma>"(const Basic &b) nogil
-    bool is_a_Derivative "SymEngine::is_a<SymEngine::Derivative>"(const Basic &b) nogil
-    bool is_a_Subs "SymEngine::is_a<SymEngine::Subs>"(const Basic &b) nogil
-    bool is_a_PyFunction "SymEngine::is_a<SymEngine::FunctionWrapper>"(const Basic &b) nogil
-    bool is_a_RealDouble "SymEngine::is_a<SymEngine::RealDouble>"(const Basic &b) nogil
-    bool is_a_ComplexDouble "SymEngine::is_a<SymEngine::ComplexDouble>"(const Basic &b) nogil
-    bool is_a_RealMPFR "SymEngine::is_a<SymEngine::RealMPFR>"(const Basic &b) nogil
-    bool is_a_ComplexMPC "SymEngine::is_a<SymEngine::ComplexMPC>"(const Basic &b) nogil
-    bool is_a_Log "SymEngine::is_a<SymEngine::Log>"(const Basic &b) nogil
-    bool is_a_BooleanAtom "SymEngine::is_a<SymEngine::BooleanAtom>"(const Basic &b) nogil
-    bool is_a_Equality "SymEngine::is_a<SymEngine::Equality>"(const Basic &b) nogil
-    bool is_a_Unequality "SymEngine::is_a<SymEngine::Unequality>"(const Basic &b) nogil
-    bool is_a_LessThan "SymEngine::is_a<SymEngine::LessThan>"(const Basic &b) nogil
-    bool is_a_StrictLessThan "SymEngine::is_a<SymEngine::StrictLessThan>"(const Basic &b) nogil
-    bool is_a_PyNumber "SymEngine::is_a<SymEngine::PyNumber>"(const Basic &b) nogil
-    bool is_a_ATan2 "SymEngine::is_a<SymEngine::ATan2>"(const Basic &b) nogil
-    bool is_a_LambertW "SymEngine::is_a<SymEngine::LambertW>"(const Basic &b) nogil
-    bool is_a_Zeta "SymEngine::is_a<SymEngine::Zeta>"(const Basic &b) nogil
-    bool is_a_DirichletEta "SymEngine::is_a<SymEngine::Dirichlet_eta>"(const Basic &b) nogil
-    bool is_a_KroneckerDelta "SymEngine::is_a<SymEngine::KroneckerDelta>"(const Basic &b) nogil
-    bool is_a_LeviCivita "SymEngine::is_a<SymEngine::LeviCivita>"(const Basic &b) nogil
-    bool is_a_Erf "SymEngine::is_a<SymEngine::Erf>"(const Basic &b) nogil
-    bool is_a_Erfc "SymEngine::is_a<SymEngine::Erfc>"(const Basic &b) nogil
-    bool is_a_LowerGamma "SymEngine::is_a<SymEngine::LowerGamma>"(const Basic &b) nogil
-    bool is_a_UpperGamma "SymEngine::is_a<SymEngine::UpperGamma>"(const Basic &b) nogil
-    bool is_a_LogGamma "SymEngine::is_a<SymEngine::LogGamma>"(const Basic &b) nogil
-    bool is_a_Beta "SymEngine::is_a<SymEngine::Beta>"(const Basic &b) nogil
-    bool is_a_PolyGamma "SymEngine::is_a<SymEngine::PolyGamma>"(const Basic &b) nogil
-    bool is_a_PySymbol "SymEngine::is_a_sub<SymEngine::PySymbol>"(const Basic &b) nogil
-    bool is_a_Sign "SymEngine::is_a<SymEngine::Sign>"(const Basic &b) nogil
-    bool is_a_Floor "SymEngine::is_a<SymEngine::Floor>"(const Basic &b) nogil
-    bool is_a_Ceiling "SymEngine::is_a<SymEngine::Ceiling>"(const Basic &b) nogil
-    bool is_a_Conjugate "SymEngine::is_a<SymEngine::Conjugate>"(const Basic &b) nogil
-    bool is_a_Interval "SymEngine::is_a<SymEngine::Interval>"(const Basic &b) nogil
-    bool is_a_EmptySet "SymEngine::is_a<SymEngine::EmptySet>"(const Basic &b) nogil
-    bool is_a_Reals "SymEngine::is_a<SymEngine::Reals>"(const Basic &b) nogil
-    bool is_a_Rationals "SymEngine::is_a<SymEngine::Rationals>"(const Basic &b) nogil
-    bool is_a_Integers "SymEngine::is_a<SymEngine::Integers>"(const Basic &b) nogil
-    bool is_a_UniversalSet "SymEngine::is_a<SymEngine::UniversalSet>"(const Basic &b) nogil
-    bool is_a_FiniteSet "SymEngine::is_a<SymEngine::FiniteSet>"(const Basic &b) nogil
-    bool is_a_Union "SymEngine::is_a<SymEngine::Union>"(const Basic &b) nogil
-    bool is_a_Complement "SymEngine::is_a<SymEngine::Complement>"(const Basic &b) nogil
-    bool is_a_ConditionSet "SymEngine::is_a<SymEngine::ConditionSet>"(const Basic &b) nogil
-    bool is_a_ImageSet "SymEngine::is_a<SymEngine::ImageSet>"(const Basic &b) nogil
-    bool is_a_UnevaluatedExpr "SymEngine::is_a<SymEngine::UnevaluatedExpr>"(const Basic &b) nogil
-    bool is_a_Piecewise "SymEngine::is_a<SymEngine::Piecewise>"(const Basic &b) nogil
-    bool is_a_Contains "SymEngine::is_a<SymEngine::Contains>"(const Basic &b) nogil
-    bool is_a_And "SymEngine::is_a<SymEngine::And>"(const Basic &b) nogil
-    bool is_a_Not "SymEngine::is_a<SymEngine::Not>"(const Basic &b) nogil
-    bool is_a_Or "SymEngine::is_a<SymEngine::Or>"(const Basic &b) nogil
-    bool is_a_Xor "SymEngine::is_a<SymEngine::Xor>"(const Basic &b) nogil
+    bool is_a[T] (const Basic &b) nogil
+    bool is_a_sub[T] (const Basic &b) nogil
     rcp_const_basic expand(rcp_const_basic &o, bool deep) nogil except +
     void as_numer_denom(rcp_const_basic &x, const Ptr[RCP[Basic]] &numer, const Ptr[RCP[Basic]] &denom) nogil
     void as_real_imag(rcp_const_basic &x, const Ptr[RCP[Basic]] &real, const Ptr[RCP[Basic]] &imag) nogil
     void cse(vec_pair &replacements, vec_basic &reduced_exprs, const vec_basic &exprs) nogil except +
 
 cdef extern from "<symengine/subs.h>" namespace "SymEngine":
-    rcp_const_basic msubs (rcp_const_basic &x, const map_basic_basic &x) nogil
-    rcp_const_basic ssubs (rcp_const_basic &x, const map_basic_basic &x) nogil
-    rcp_const_basic xreplace (rcp_const_basic &x, const map_basic_basic &x) nogil
+    rcp_const_basic msubs (rcp_const_basic &x, const map_basic_basic &x) nogil except +
+    rcp_const_basic ssubs (rcp_const_basic &x, const map_basic_basic &x) nogil except +
+    rcp_const_basic xreplace (rcp_const_basic &x, const map_basic_basic &x) nogil except +
 
 cdef extern from "<symengine/derivative.h>" namespace "SymEngine":
     rcp_const_basic diff "SymEngine::sdiff"(rcp_const_basic &arg, rcp_const_basic &x) nogil except +
@@ -443,9 +286,9 @@ cdef extern from "<symengine/nan.h>" namespace "SymEngine":
         pass
 
 cdef extern from "<symengine/add.h>" namespace "SymEngine":
-    cdef rcp_const_basic add(rcp_const_basic &a, rcp_const_basic &b) nogil except+
-    cdef rcp_const_basic sub(rcp_const_basic &a, rcp_const_basic &b) nogil except+
-    cdef rcp_const_basic add(const vec_basic &a) nogil except+
+    cdef rcp_const_basic add(rcp_const_basic &a, rcp_const_basic &b) nogil except +
+    cdef rcp_const_basic sub(rcp_const_basic &a, rcp_const_basic &b) nogil except +
+    cdef rcp_const_basic add(const vec_basic &a) nogil except +
 
     cdef cppclass Add(Basic):
         void as_two_terms(const Ptr[RCP[Basic]] &a, const Ptr[RCP[Basic]] &b)
@@ -453,21 +296,21 @@ cdef extern from "<symengine/add.h>" namespace "SymEngine":
         const umap_basic_num &get_dict()
 
 cdef extern from "<symengine/mul.h>" namespace "SymEngine":
-    cdef rcp_const_basic mul(rcp_const_basic &a, rcp_const_basic &b) nogil except+
-    cdef rcp_const_basic div(rcp_const_basic &a, rcp_const_basic &b) nogil except+
-    cdef rcp_const_basic neg(rcp_const_basic &a) nogil except+
-    cdef rcp_const_basic mul(const vec_basic &a) nogil except+
+    cdef rcp_const_basic mul(rcp_const_basic &a, rcp_const_basic &b) nogil except +
+    cdef rcp_const_basic div(rcp_const_basic &a, rcp_const_basic &b) nogil except +
+    cdef rcp_const_basic neg(rcp_const_basic &a) nogil except +
+    cdef rcp_const_basic mul(const vec_basic &a) nogil except +
 
     cdef cppclass Mul(Basic):
         void as_two_terms(const Ptr[RCP[Basic]] &a, const Ptr[RCP[Basic]] &b)
         RCP[const Number] get_coef()
         const map_basic_basic &get_dict()
-    cdef RCP[const Mul] mul_from_dict "SymEngine::Mul::from_dict"(RCP[const Number] coef, map_basic_basic &&d) nogil
+    cdef RCP[const Mul] mul_from_dict "SymEngine::Mul::from_dict"(RCP[const Number] coef, map_basic_basic &d) nogil
 
 cdef extern from "<symengine/pow.h>" namespace "SymEngine":
-    cdef rcp_const_basic pow(rcp_const_basic &a, rcp_const_basic &b) nogil except+
-    cdef rcp_const_basic sqrt(rcp_const_basic &x) nogil except+
-    cdef rcp_const_basic exp(rcp_const_basic &x) nogil except+
+    cdef rcp_const_basic pow(rcp_const_basic &a, rcp_const_basic &b) nogil except +
+    cdef rcp_const_basic sqrt(rcp_const_basic &x) nogil except +
+    cdef rcp_const_basic exp(rcp_const_basic &x) nogil except +
 
     cdef cppclass Pow(Basic):
         rcp_const_basic get_base() nogil
@@ -491,9 +334,9 @@ cdef extern from "<symengine/basic.h>" namespace "SymEngine":
             void (*dec_ref)(void *), int (*comp)(void *, void *)) nogil
     rcp_const_basic make_rcp_RealDouble "SymEngine::make_rcp<const SymEngine::RealDouble>"(double x) nogil
     rcp_const_basic make_rcp_ComplexDouble "SymEngine::make_rcp<const SymEngine::ComplexDouble>"(double complex x) nogil
-    RCP[const PyModule] make_rcp_PyModule "SymEngine::make_rcp<const SymEngine::PyModule>"(PyObject* (*) (rcp_const_basic x), \
-            rcp_const_basic (*)(PyObject*), RCP[const Number] (*)(PyObject*, long bits),
-            rcp_const_basic (*)(PyObject*, rcp_const_basic)) nogil
+    RCP[const PyModule] make_rcp_PyModule "SymEngine::make_rcp<const SymEngine::PyModule>"(PyObject* (*) (rcp_const_basic x) except +, \
+            rcp_const_basic (*)(PyObject*) except +, RCP[const Number] (*)(PyObject*, long bits) except +,
+            rcp_const_basic (*)(PyObject*, rcp_const_basic) except +) except +
     rcp_const_basic make_rcp_PyNumber "SymEngine::make_rcp<const SymEngine::PyNumber>"(PyObject*, RCP[const PyModule] x) nogil
     RCP[const PyFunctionClass] make_rcp_PyFunctionClass "SymEngine::make_rcp<const SymEngine::PyFunctionClass>"(PyObject* pyobject,
             string name, RCP[const PyModule] pymodule) nogil
@@ -501,58 +344,58 @@ cdef extern from "<symengine/basic.h>" namespace "SymEngine":
             RCP[const PyFunctionClass] pyfunc_class, const PyObject* pyobject) nogil
 
 cdef extern from "<symengine/functions.h>" namespace "SymEngine":
-    cdef rcp_const_basic sin(rcp_const_basic &arg) nogil except+
-    cdef rcp_const_basic cos(rcp_const_basic &arg) nogil except+
-    cdef rcp_const_basic tan(rcp_const_basic &arg) nogil except+
-    cdef rcp_const_basic cot(rcp_const_basic &arg) nogil except+
-    cdef rcp_const_basic csc(rcp_const_basic &arg) nogil except+
-    cdef rcp_const_basic sec(rcp_const_basic &arg) nogil except+
-    cdef rcp_const_basic asin(rcp_const_basic &arg) nogil except+
-    cdef rcp_const_basic acos(rcp_const_basic &arg) nogil except+
-    cdef rcp_const_basic atan(rcp_const_basic &arg) nogil except+
-    cdef rcp_const_basic acot(rcp_const_basic &arg) nogil except+
-    cdef rcp_const_basic acsc(rcp_const_basic &arg) nogil except+
-    cdef rcp_const_basic asec(rcp_const_basic &arg) nogil except+
-    cdef rcp_const_basic sinh(rcp_const_basic &arg) nogil except+
-    cdef rcp_const_basic cosh(rcp_const_basic &arg) nogil except+
-    cdef rcp_const_basic tanh(rcp_const_basic &arg) nogil except+
-    cdef rcp_const_basic coth(rcp_const_basic &arg) nogil except+
-    cdef rcp_const_basic csch(rcp_const_basic &arg) nogil except+
-    cdef rcp_const_basic sech(rcp_const_basic &arg) nogil except+
-    cdef rcp_const_basic asinh(rcp_const_basic &arg) nogil except+
-    cdef rcp_const_basic acosh(rcp_const_basic &arg) nogil except+
-    cdef rcp_const_basic atanh(rcp_const_basic &arg) nogil except+
-    cdef rcp_const_basic acoth(rcp_const_basic &arg) nogil except+
-    cdef rcp_const_basic acsch(rcp_const_basic &arg) nogil except+
-    cdef rcp_const_basic asech(rcp_const_basic &arg) nogil except+
-    cdef rcp_const_basic function_symbol(string name, const vec_basic &arg) nogil except+
-    cdef rcp_const_basic abs(rcp_const_basic &arg) nogil except+
-    cdef rcp_const_basic max(const vec_basic &arg) nogil except+
-    cdef rcp_const_basic min(const vec_basic &arg) nogil except+
-    cdef rcp_const_basic gamma(rcp_const_basic &arg) nogil except+
-    cdef rcp_const_basic atan2(rcp_const_basic &num, rcp_const_basic &den) nogil except+
-    cdef rcp_const_basic lambertw(rcp_const_basic &arg) nogil except+
-    cdef rcp_const_basic zeta(rcp_const_basic &s) nogil except+
-    cdef rcp_const_basic zeta(rcp_const_basic &s, rcp_const_basic &a) nogil except+
-    cdef rcp_const_basic dirichlet_eta(rcp_const_basic &s) nogil except+
-    cdef rcp_const_basic kronecker_delta(rcp_const_basic &i, rcp_const_basic &j) nogil except+
-    cdef rcp_const_basic levi_civita(const vec_basic &arg) nogil except+
-    cdef rcp_const_basic erf(rcp_const_basic &arg) nogil except+
-    cdef rcp_const_basic erfc(rcp_const_basic &arg) nogil except+
-    cdef rcp_const_basic lowergamma(rcp_const_basic &s, rcp_const_basic &x) nogil except+
-    cdef rcp_const_basic uppergamma(rcp_const_basic &s, rcp_const_basic &x) nogil except+
-    cdef rcp_const_basic loggamma(rcp_const_basic &arg) nogil except+
-    cdef rcp_const_basic beta(rcp_const_basic &x, rcp_const_basic &y) nogil except+
-    cdef rcp_const_basic polygamma(rcp_const_basic &n, rcp_const_basic &x) nogil except+
-    cdef rcp_const_basic digamma(rcp_const_basic &x) nogil except+
-    cdef rcp_const_basic trigamma(rcp_const_basic &x) nogil except+
-    cdef rcp_const_basic sign(rcp_const_basic &x) nogil except+
-    cdef rcp_const_basic floor(rcp_const_basic &x) nogil except+
-    cdef rcp_const_basic ceiling(rcp_const_basic &x) nogil except+
-    cdef rcp_const_basic conjugate(rcp_const_basic &x) nogil except+
-    cdef rcp_const_basic log(rcp_const_basic &x) nogil except+
-    cdef rcp_const_basic log(rcp_const_basic &x, rcp_const_basic &y) nogil except+
-    cdef rcp_const_basic unevaluated_expr(rcp_const_basic &x) nogil except+
+    cdef rcp_const_basic sin(rcp_const_basic &arg) nogil except +
+    cdef rcp_const_basic cos(rcp_const_basic &arg) nogil except +
+    cdef rcp_const_basic tan(rcp_const_basic &arg) nogil except +
+    cdef rcp_const_basic cot(rcp_const_basic &arg) nogil except +
+    cdef rcp_const_basic csc(rcp_const_basic &arg) nogil except +
+    cdef rcp_const_basic sec(rcp_const_basic &arg) nogil except +
+    cdef rcp_const_basic asin(rcp_const_basic &arg) nogil except +
+    cdef rcp_const_basic acos(rcp_const_basic &arg) nogil except +
+    cdef rcp_const_basic atan(rcp_const_basic &arg) nogil except +
+    cdef rcp_const_basic acot(rcp_const_basic &arg) nogil except +
+    cdef rcp_const_basic acsc(rcp_const_basic &arg) nogil except +
+    cdef rcp_const_basic asec(rcp_const_basic &arg) nogil except +
+    cdef rcp_const_basic sinh(rcp_const_basic &arg) nogil except +
+    cdef rcp_const_basic cosh(rcp_const_basic &arg) nogil except +
+    cdef rcp_const_basic tanh(rcp_const_basic &arg) nogil except +
+    cdef rcp_const_basic coth(rcp_const_basic &arg) nogil except +
+    cdef rcp_const_basic csch(rcp_const_basic &arg) nogil except +
+    cdef rcp_const_basic sech(rcp_const_basic &arg) nogil except +
+    cdef rcp_const_basic asinh(rcp_const_basic &arg) nogil except +
+    cdef rcp_const_basic acosh(rcp_const_basic &arg) nogil except +
+    cdef rcp_const_basic atanh(rcp_const_basic &arg) nogil except +
+    cdef rcp_const_basic acoth(rcp_const_basic &arg) nogil except +
+    cdef rcp_const_basic acsch(rcp_const_basic &arg) nogil except +
+    cdef rcp_const_basic asech(rcp_const_basic &arg) nogil except +
+    cdef rcp_const_basic function_symbol(string name, const vec_basic &arg) nogil except +
+    cdef rcp_const_basic abs(rcp_const_basic &arg) nogil except +
+    cdef rcp_const_basic max(const vec_basic &arg) nogil except +
+    cdef rcp_const_basic min(const vec_basic &arg) nogil except +
+    cdef rcp_const_basic gamma(rcp_const_basic &arg) nogil except +
+    cdef rcp_const_basic atan2(rcp_const_basic &num, rcp_const_basic &den) nogil except +
+    cdef rcp_const_basic lambertw(rcp_const_basic &arg) nogil except +
+    cdef rcp_const_basic zeta(rcp_const_basic &s) nogil except +
+    cdef rcp_const_basic zeta(rcp_const_basic &s, rcp_const_basic &a) nogil except +
+    cdef rcp_const_basic dirichlet_eta(rcp_const_basic &s) nogil except +
+    cdef rcp_const_basic kronecker_delta(rcp_const_basic &i, rcp_const_basic &j) nogil except +
+    cdef rcp_const_basic levi_civita(const vec_basic &arg) nogil except +
+    cdef rcp_const_basic erf(rcp_const_basic &arg) nogil except +
+    cdef rcp_const_basic erfc(rcp_const_basic &arg) nogil except +
+    cdef rcp_const_basic lowergamma(rcp_const_basic &s, rcp_const_basic &x) nogil except +
+    cdef rcp_const_basic uppergamma(rcp_const_basic &s, rcp_const_basic &x) nogil except +
+    cdef rcp_const_basic loggamma(rcp_const_basic &arg) nogil except +
+    cdef rcp_const_basic beta(rcp_const_basic &x, rcp_const_basic &y) nogil except +
+    cdef rcp_const_basic polygamma(rcp_const_basic &n, rcp_const_basic &x) nogil except +
+    cdef rcp_const_basic digamma(rcp_const_basic &x) nogil except +
+    cdef rcp_const_basic trigamma(rcp_const_basic &x) nogil except +
+    cdef rcp_const_basic sign(rcp_const_basic &x) nogil except +
+    cdef rcp_const_basic floor(rcp_const_basic &x) nogil except +
+    cdef rcp_const_basic ceiling(rcp_const_basic &x) nogil except +
+    cdef rcp_const_basic conjugate(rcp_const_basic &x) nogil except +
+    cdef rcp_const_basic log(rcp_const_basic &x) nogil except +
+    cdef rcp_const_basic log(rcp_const_basic &x, rcp_const_basic &y) nogil except +
+    cdef rcp_const_basic unevaluated_expr(rcp_const_basic &x) nogil except +
 
     cdef cppclass Function(Basic):
         pass
@@ -720,71 +563,68 @@ cdef extern from "<symengine/functions.h>" namespace "SymEngine":
     cdef cppclass Conjugate(OneArgFunction):
         pass
 
+    cdef cppclass UnevaluatedExpr(OneArgFunction):
+        pass
+
     cdef cppclass Log(Function):
         pass
 
-IF HAVE_SYMENGINE_MPFR:
-    cdef extern from "mpfr.h":
-        ctypedef struct __mpfr_struct:
-            pass
-        ctypedef __mpfr_struct mpfr_t[1]
-        ctypedef __mpfr_struct* mpfr_ptr
-        ctypedef const __mpfr_struct* mpfr_srcptr
-        ctypedef long mpfr_prec_t
-        ctypedef enum mpfr_rnd_t:
-            MPFR_RNDN
-            MPFR_RNDZ
-            MPFR_RNDU
-            MPFR_RNDD
-            MPFR_RNDA
-            MPFR_RNDF
-            MPFR_RNDNA
-
-    cdef extern from "<symengine/real_mpfr.h>" namespace "SymEngine":
-        cdef cppclass mpfr_class:
-            mpfr_class() nogil
-            mpfr_class(mpfr_prec_t prec) nogil
-            mpfr_class(string s, mpfr_prec_t prec, unsigned base) nogil
-            mpfr_class(mpfr_t m) nogil
-            mpfr_ptr get_mpfr_t() nogil
-
-        cdef cppclass RealMPFR(Number):
-            RealMPFR(mpfr_class) nogil
-            mpfr_class as_mpfr() nogil
-            mpfr_prec_t get_prec() nogil
-
-        RCP[const RealMPFR] real_mpfr(mpfr_class t) nogil
-ELSE:
-    cdef extern from "<symengine/real_mpfr.h>" namespace "SymEngine":
-        cdef cppclass RealMPFR(Number):
-            pass
-
-IF HAVE_SYMENGINE_MPC:
-    cdef extern from "mpc.h":
-        ctypedef struct __mpc_struct:
-            pass
-        ctypedef __mpc_struct mpc_t[1]
-        ctypedef __mpc_struct* mpc_ptr
-        ctypedef const __mpc_struct* mpc_srcptr
-
-    cdef extern from "<symengine/complex_mpc.h>" namespace "SymEngine":
-        cdef cppclass mpc_class:
-            mpc_class() nogil
-            mpc_class(mpfr_prec_t prec) nogil
-            mpc_class(mpc_t m) nogil
-            mpc_ptr get_mpc_t() nogil
-            mpc_class(string s, mpfr_prec_t prec, unsigned base) nogil
-
-        cdef cppclass ComplexMPC(ComplexBase):
-            ComplexMPC(mpc_class) nogil
-            mpc_class as_mpc() nogil
-            mpfr_prec_t get_prec() nogil
-
-        RCP[const ComplexMPC] complex_mpc(mpc_class t) nogil
-ELSE:
-    cdef extern from "<symengine/complex_mpc.h>" namespace "SymEngine":
-        cdef cppclass ComplexMPC(Number):
-            pass
+cdef extern from "<symengine/real_mpfr.h>":
+    # These come from mpfr.h, but don't include mpfr.h to not break
+    # builds without mpfr
+    ctypedef struct __mpfr_struct:
+        pass
+    ctypedef __mpfr_struct mpfr_t[1]
+    ctypedef __mpfr_struct* mpfr_ptr
+    ctypedef const __mpfr_struct* mpfr_srcptr
+    ctypedef long mpfr_prec_t
+    ctypedef enum mpfr_rnd_t:
+        MPFR_RNDN
+        MPFR_RNDZ
+        MPFR_RNDU
+        MPFR_RNDD
+        MPFR_RNDA
+        MPFR_RNDF
+        MPFR_RNDNA
+
+cdef extern from "<symengine/real_mpfr.h>" namespace "SymEngine":
+    cdef cppclass mpfr_class:
+        mpfr_class() nogil
+        mpfr_class(mpfr_prec_t prec) nogil
+        mpfr_class(string s, mpfr_prec_t prec, unsigned base) nogil
+        mpfr_class(mpfr_t m) nogil
+        mpfr_ptr get_mpfr_t() nogil
+
+    cdef cppclass RealMPFR(Number):
+        RealMPFR(mpfr_class) nogil
+        mpfr_class as_mpfr() nogil
+        mpfr_prec_t get_prec() nogil
+
+    RCP[const RealMPFR] real_mpfr(mpfr_class t) nogil
+
+cdef extern from "<symengine/complex_mpc.h>":
+    # These come from mpc.h, but don't include mpc.h to not break
+    # builds without mpc
+    ctypedef struct __mpc_struct:
+        pass
+    ctypedef __mpc_struct mpc_t[1]
+    ctypedef __mpc_struct* mpc_ptr
+    ctypedef const __mpc_struct* mpc_srcptr
+
+cdef extern from "<symengine/complex_mpc.h>" namespace "SymEngine":
+    cdef cppclass mpc_class:
+        mpc_class() nogil
+        mpc_class(mpfr_prec_t prec) nogil
+        mpc_class(mpc_t m) nogil
+        mpc_ptr get_mpc_t() nogil
+        mpc_class(string s, mpfr_prec_t prec, unsigned base) nogil
+
+    cdef cppclass ComplexMPC(ComplexBase):
+        ComplexMPC(mpc_class) nogil
+        mpc_class as_mpc() nogil
+        mpfr_prec_t get_prec() nogil
+
+    RCP[const ComplexMPC] complex_mpc(mpc_class t) nogil
 
 cdef extern from "<symengine/matrix.h>" namespace "SymEngine":
     cdef cppclass MatrixBase:
@@ -792,7 +632,7 @@ cdef extern from "<symengine/matrix.h>" namespace "SymEngine":
         const unsigned ncols() nogil
         rcp_const_basic get(unsigned i, unsigned j) nogil
         rcp_const_basic set(unsigned i, unsigned j, rcp_const_basic e) nogil
-        string __str__() nogil except+
+        string __str__() nogil except +
         bool eq(const MatrixBase &) nogil
         rcp_const_basic det() nogil
         void inv(MatrixBase &)
@@ -839,7 +679,6 @@ cdef extern from "<symengine/matrix.h>" namespace "SymEngine":
         tribool is_positive_definite() nogil
         tribool is_negative_definite() nogil
 
-    bool is_a_DenseMatrix "SymEngine::is_a<SymEngine::DenseMatrix>"(const MatrixBase &b) nogil
     DenseMatrix* static_cast_DenseMatrix "static_cast<SymEngine::DenseMatrix*>"(const MatrixBase *a)
     void inverse_FFLU "SymEngine::inverse_fraction_free_LU"(const DenseMatrix &A,
         DenseMatrix &B) nogil except +
@@ -930,7 +769,7 @@ cdef extern from "<symengine/prime_sieve.h>" namespace "SymEngine":
         unsigned next_prime() nogil
 
 cdef extern from "<symengine/visitor.h>" namespace "SymEngine":
-    bool has_symbol(const Basic &b, const Symbol &x) nogil except +
+    bool has_symbol(const Basic &b, const Basic &x) nogil except +
     rcp_const_basic coeff(const Basic &b, const Basic &x, const Basic &n) nogil except +
     set_basic free_symbols(const Basic &b) nogil except +
     set_basic free_symbols(const MatrixBase &b) nogil except +
@@ -938,7 +777,7 @@ cdef extern from "<symengine/visitor.h>" namespace "SymEngine":
 
 cdef extern from "<symengine/logic.h>" namespace "SymEngine":
     cdef cppclass Boolean(Basic):
-        RCP[const Boolean] logical_not() nogil except+
+        RCP[const Boolean] logical_not() nogil except +
     cdef cppclass BooleanAtom(Boolean):
         bool get_val() nogil
     cdef cppclass Relational(Boolean):
@@ -966,38 +805,28 @@ cdef extern from "<symengine/logic.h>" namespace "SymEngine":
 
     rcp_const_basic boolTrue
     rcp_const_basic boolFalse
-    bool is_a_Relational(const Basic &b) nogil
-    cdef RCP[const Boolean] Eq(rcp_const_basic &lhs) nogil except+
-    cdef RCP[const Boolean] Eq(rcp_const_basic &lhs, rcp_const_basic &rhs) nogil except+
-    cdef RCP[const Boolean] Ne(rcp_const_basic &lhs, rcp_const_basic &rhs) nogil except+
-    cdef RCP[const Boolean] Ge(rcp_const_basic &lhs, rcp_const_basic &rhs) nogil except+
-    cdef RCP[const Boolean] Gt(rcp_const_basic &lhs, rcp_const_basic &rhs) nogil except+
-    cdef RCP[const Boolean] Le(rcp_const_basic &lhs, rcp_const_basic &rhs) nogil except+
-    cdef RCP[const Boolean] Lt(rcp_const_basic &lhs, rcp_const_basic &rhs) nogil except+
+    cdef RCP[const Boolean] Eq(rcp_const_basic &lhs) nogil except +
+    cdef RCP[const Boolean] Eq(rcp_const_basic &lhs, rcp_const_basic &rhs) nogil except +
+    cdef RCP[const Boolean] Ne(rcp_const_basic &lhs, rcp_const_basic &rhs) nogil except +
+    cdef RCP[const Boolean] Ge(rcp_const_basic &lhs, rcp_const_basic &rhs) nogil except +
+    cdef RCP[const Boolean] Gt(rcp_const_basic &lhs, rcp_const_basic &rhs) nogil except +
+    cdef RCP[const Boolean] Le(rcp_const_basic &lhs, rcp_const_basic &rhs) nogil except +
+    cdef RCP[const Boolean] Lt(rcp_const_basic &lhs, rcp_const_basic &rhs) nogil except +
     ctypedef Boolean const_Boolean "const SymEngine::Boolean"
     ctypedef vector[pair[rcp_const_basic, RCP[const_Boolean]]] PiecewiseVec;
     ctypedef vector[RCP[Boolean]] vec_boolean "SymEngine::vec_boolean"
-    ctypedef set[RCP[Boolean], RCPBasicKeyLess] set_boolean "SymEngine::set_boolean"
-    cdef RCP[const Boolean] logical_and(set_boolean &s) nogil except+
-    cdef RCP[const Boolean] logical_nand(set_boolean &s) nogil except+
-    cdef RCP[const Boolean] logical_or(set_boolean &s) nogil except+
-    cdef RCP[const Boolean] logical_not(RCP[const Boolean] &s) nogil except+
-    cdef RCP[const Boolean] logical_nor(set_boolean &s) nogil except+
-    cdef RCP[const Boolean] logical_xor(vec_boolean &s) nogil except+
-    cdef RCP[const Boolean] logical_xnor(vec_boolean &s) nogil except+
+    ctypedef set[RCP[Boolean]] set_boolean "SymEngine::set_boolean"
+    cdef RCP[const Boolean] logical_and(set_boolean &s) nogil except +
+    cdef RCP[const Boolean] logical_nand(set_boolean &s) nogil except +
+    cdef RCP[const Boolean] logical_or(set_boolean &s) nogil except +
+    cdef RCP[const Boolean] logical_not(RCP[const Boolean] &s) nogil except +
+    cdef RCP[const Boolean] logical_nor(set_boolean &s) nogil except +
+    cdef RCP[const Boolean] logical_xor(vec_boolean &s) nogil except +
+    cdef RCP[const Boolean] logical_xnor(vec_boolean &s) nogil except +
     cdef rcp_const_basic piecewise(PiecewiseVec vec) nogil except +
     cdef RCP[const Boolean] contains(rcp_const_basic &expr,
                                      RCP[const Set] &set) nogil
 
-cdef extern from "<utility>" namespace "std":
-    cdef integer_class std_move_mpz "std::move" (integer_class) nogil
-    IF HAVE_SYMENGINE_MPFR:
-        cdef mpfr_class std_move_mpfr "std::move" (mpfr_class) nogil
-    IF HAVE_SYMENGINE_MPC:
-        cdef mpc_class std_move_mpc "std::move" (mpc_class) nogil
-    cdef map_basic_basic std_move_map_basic_basic "std::move" (map_basic_basic) nogil
-    cdef PiecewiseVec std_move_PiecewiseVec "std::move" (PiecewiseVec) nogil
-
 cdef extern from "<symengine/eval.h>" namespace "SymEngine":
     cdef cppclass EvalfDomain:
         pass
@@ -1045,13 +874,11 @@ cdef extern from "<symengine/series.h>" namespace "SymEngine":
     ctypedef RCP[const SeriesCoeffInterface] rcp_const_seriescoeffinterface "SymEngine::RCP<const SymEngine::SeriesCoeffInterface>"
     rcp_const_seriescoeffinterface series "SymEngine::series"(rcp_const_basic &ex, RCP[const Symbol] &var, unsigned int prec) nogil except +
 
-IF HAVE_SYMENGINE_MPFR:
-    cdef extern from "<symengine/eval_mpfr.h>" namespace "SymEngine":
-        void eval_mpfr(mpfr_t result, const Basic &b, mpfr_rnd_t rnd) nogil except +
+cdef extern from "<symengine/eval_mpfr.h>" namespace "SymEngine":
+    void eval_mpfr(mpfr_t result, const Basic &b, mpfr_rnd_t rnd) nogil except +
 
-IF HAVE_SYMENGINE_MPC:
-    cdef extern from "<symengine/eval_mpc.h>" namespace "SymEngine":
-        void eval_mpc(mpc_t result, const Basic &b, mpfr_rnd_t rnd) nogil except +
+cdef extern from "<symengine/eval_mpc.h>" namespace "SymEngine":
+    void eval_mpc(mpc_t result, const Basic &b, mpfr_rnd_t rnd) nogil except +
 
 cdef extern from "<symengine/parser.h>" namespace "SymEngine":
     rcp_const_basic parse(const string &n) nogil except +
@@ -1084,7 +911,7 @@ cdef extern from "<symengine/sets.h>" namespace "SymEngine":
         pass
     cdef cppclass ImageSet(Set):
         pass
-    ctypedef set[RCP[Set], RCPBasicKeyLess] set_set "SymEngine::set_set"
+    ctypedef set[RCP[Set]] set_set "SymEngine::set_set"
     cdef rcp_const_basic interval(RCP[const Number] &start, RCP[const Number] &end, bool l, bool r) nogil except +
     cdef RCP[const EmptySet] emptyset() nogil except +
     cdef RCP[const Reals] reals() nogil except +