Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Sympy integration via ufunc dispatch, expanded numpy integration #60

Merged
merged 8 commits into from
Feb 21, 2024
Merged

Sympy integration via ufunc dispatch, expanded numpy integration #60

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
de02058
sympy integration via ufunc dispatch
timkpaine Feb 10, 2024
6b4f6e1
Update operator dispatch to include numpy variants.
timkpaine Feb 20, 2024
6c10981
Add more C++ implementations for new standard functions
timkpaine Feb 20, 2024
d016451
Breakout math functions into csp.math, tweak edge ufunc dispatch to u…
timkpaine Feb 20, 2024
4bc1cf4
Incorporate feedback, add missing __pos__ method, add __pos__, __neg_…
timkpaine Feb 20, 2024
1a7de83
Separate math into own C++ files
timkpaine Feb 20, 2024
2f75ee9
Fix bug in pandas extension integration for few other operators
timkpaine Feb 20, 2024
fce9b5a
Incorporate feedback to make modulus align with usage of other binary…
timkpaine Feb 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cpp/csp/cppnodes/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
add_library(baselibimpl STATIC baselibimpl.cpp)
target_link_libraries(baselibimpl csp_core csp_engine)
target_link_libraries(baselibimpl csp_core csp_engine m)
timkpaine marked this conversation as resolved.
Show resolved Hide resolved

add_library(basketlibimpl STATIC basketlibimpl.cpp)
target_link_libraries(basketlibimpl baselibimpl csp_core csp_engine)
Expand Down
81 changes: 68 additions & 13 deletions cpp/csp/cppnodes/baselibimpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -580,18 +580,18 @@ Math operations

// Unary operation

template<typename T, T (*Func)(T)>
template<typename ArgT, typename OutT, OutT (*Func)(ArgT)>
DECLARE_CPPNODE( _unary_op )
{
TS_INPUT( T, x );
TS_OUTPUT( T );
TS_INPUT( ArgT, x );
TS_OUTPUT( OutT );

//Expanded out INIT_CPPNODE without create call...
CSP csp;
const char * name() const override { return "_unary_op"; }

public:
_STATIC_CREATE_METHOD( SINGLE_ARG( _unary_op<T, Func> ) );
_STATIC_CREATE_METHOD( SINGLE_ARG( _unary_op<ArgT, OutT, Func> ) );
_unary_op( csp::Engine * engine, const csp::CppNode::NodeDef & nodedef ) : csp::CppNode( engine, nodedef )
{}

Expand All @@ -601,18 +601,73 @@ DECLARE_CPPNODE( _unary_op )
}
};

inline double _exp( double x ){ return std::exp(x ); }
inline double _ln( double x ){ return std::log( x ); }
inline double _abs( double x ){ return std::abs( x ); }
template<typename T> inline T _abs( T x ){ return std::abs( x ); }
template<typename T> inline double _ln( T x ){ return std::log( x ); }
template<typename T> inline double _log2( T x ){ return std::log2( x ); }
template<typename T> inline double _log10( T x ){ return std::log10( x ); }
template<typename T> inline double _exp( T x ){ return std::exp( x ); }
template<typename T> inline double _exp2( T x ){ return std::exp2( x ); }
template<typename T> inline double _sqrt( T x ){ return std::sqrt( x ); }
template<typename T> inline double _erf( T x ){ return std::erf( x ); }
template<typename T> inline double _sin( T x ){ return std::sin( x ); }
template<typename T> inline double _cos( T x ){ return std::cos( x ); }
template<typename T> inline double _tan( T x ){ return std::tan( x ); }
template<typename T> inline double _asin( T x ){ return std::asin( x ); }
template<typename T> inline double _acos( T x ){ return std::acos( x ); }
template<typename T> inline double _atan( T x ){ return std::atan( x ); }
template<typename T> inline double _sinh( T x ){ return std::sinh( x ); }
template<typename T> inline double _cosh( T x ){ return std::cosh( x ); }
template<typename T> inline double _tanh( T x ){ return std::tanh( x ); }
template<typename T> inline double _asinh( T x ){ return std::asinh( x ); }
template<typename T> inline double _acosh( T x ){ return std::acosh( x ); }
template<typename T> inline double _atanh( T x ){ return std::atanh( x ); }

inline bool _not_( bool x ){ return !x; }
inline int64_t _bitwise_not(int64_t x) { return ~x; }

#define EXPORT_UNARY_OP( Type, Name ) EXPORT_TEMPLATE_CPPNODE( Name, SINGLE_ARG( _unary_op<Type, _##Name> ) )
EXPORT_UNARY_OP( double, ln );
EXPORT_UNARY_OP( double, exp );
EXPORT_UNARY_OP( double, abs );
EXPORT_UNARY_OP( bool, not_ );
EXPORT_UNARY_OP( int64_t, bitwise_not );
#define EXPORT_UNARY_OP( Name, ArgType, OutType, Func ) EXPORT_TEMPLATE_CPPNODE( Name, SINGLE_ARG( _unary_op<ArgType, OutType, _##Func> ) )
EXPORT_UNARY_OP( abs_f, double, double, abs );
EXPORT_UNARY_OP( abs_i, int64_t, int64_t, abs );
EXPORT_UNARY_OP( ln_f, double, double, ln );
EXPORT_UNARY_OP( ln_i, int64_t, double, ln );
EXPORT_UNARY_OP( log2_f, double, double, log2 );
EXPORT_UNARY_OP( log2_i, int64_t, double, log2 );
EXPORT_UNARY_OP( log10_f, double, double, log10 );
EXPORT_UNARY_OP( log10_i, int64_t, double, log10 );
EXPORT_UNARY_OP( exp_f, double, double, exp );
EXPORT_UNARY_OP( exp_i, int64_t, double, exp );
EXPORT_UNARY_OP( exp2_f, double, double, exp2 );
EXPORT_UNARY_OP( exp2_i, int64_t, double, exp2 );
EXPORT_UNARY_OP( sqrt_f, double, double, sqrt );
EXPORT_UNARY_OP( sqrt_i, int64_t, double, sqrt );
EXPORT_UNARY_OP( erf_f, double, double, erf );
EXPORT_UNARY_OP( erf_i, int64_t, double, erf );
EXPORT_UNARY_OP( sin_f, double, double, sin );
EXPORT_UNARY_OP( sin_i, int64_t, double, sin );
EXPORT_UNARY_OP( cos_f, double, double, cos );
EXPORT_UNARY_OP( cos_i, int64_t, double, cos );
EXPORT_UNARY_OP( tan_f, double, double, tan );
EXPORT_UNARY_OP( tan_i, int64_t, double, tan );
EXPORT_UNARY_OP( asin_f, double, double, asin );
EXPORT_UNARY_OP( asin_i, int64_t, double, asin );
EXPORT_UNARY_OP( acos_f, double, double, acos );
EXPORT_UNARY_OP( acos_i, int64_t, double, acos );
EXPORT_UNARY_OP( atan_f, double, double, atan );
EXPORT_UNARY_OP( atan_i, int64_t, double, atan );
EXPORT_UNARY_OP( sinh_f, double, double, sinh );
EXPORT_UNARY_OP( sinh_i, int64_t, double, sinh );
EXPORT_UNARY_OP( cosh_f, double, double, cosh );
EXPORT_UNARY_OP( cosh_i, int64_t, double, cosh );
EXPORT_UNARY_OP( tanh_f, double, double, tanh );
EXPORT_UNARY_OP( tanh_i, int64_t, double, tanh );
EXPORT_UNARY_OP( asinh_f, double, double, asinh );
EXPORT_UNARY_OP( asinh_i, int64_t, double, asinh );
EXPORT_UNARY_OP( acosh_f, double, double, acosh );
EXPORT_UNARY_OP( acosh_i, int64_t, double, acosh );
EXPORT_UNARY_OP( atanh_f, double, double, atanh );
EXPORT_UNARY_OP( atanh_i, int64_t, double, atanh );
EXPORT_UNARY_OP( not_, bool, bool, not_ );
EXPORT_UNARY_OP( bitwise_not, int64_t, int64_t, bitwise_not );
#undef EXPORT_UNARY_OP

// Binary operation
Expand Down
45 changes: 42 additions & 3 deletions cpp/csp/python/cspbaselibimpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,9 +361,48 @@ REGISTER_CPPNODE( csp::cppnodes, max_f );
REGISTER_CPPNODE( csp::cppnodes, max_i );
REGISTER_CPPNODE( csp::cppnodes, min_f );
REGISTER_CPPNODE( csp::cppnodes, min_i );
REGISTER_CPPNODE( csp::cppnodes, ln );
REGISTER_CPPNODE( csp::cppnodes, exp );
REGISTER_CPPNODE( csp::cppnodes, abs );
REGISTER_CPPNODE( csp::cppnodes, abs_f );
REGISTER_CPPNODE( csp::cppnodes, abs_i );
REGISTER_CPPNODE( csp::cppnodes, ln_f );
REGISTER_CPPNODE( csp::cppnodes, ln_i );
REGISTER_CPPNODE( csp::cppnodes, log2_f );
REGISTER_CPPNODE( csp::cppnodes, log2_i );
REGISTER_CPPNODE( csp::cppnodes, log10_f );
REGISTER_CPPNODE( csp::cppnodes, log10_i );
REGISTER_CPPNODE( csp::cppnodes, exp_f );
REGISTER_CPPNODE( csp::cppnodes, exp_i );
REGISTER_CPPNODE( csp::cppnodes, exp2_f );
REGISTER_CPPNODE( csp::cppnodes, exp2_i );
REGISTER_CPPNODE( csp::cppnodes, sqrt_f );
REGISTER_CPPNODE( csp::cppnodes, sqrt_i );
REGISTER_CPPNODE( csp::cppnodes, erf_f );
REGISTER_CPPNODE( csp::cppnodes, erf_i );
REGISTER_CPPNODE( csp::cppnodes, sin_f );
REGISTER_CPPNODE( csp::cppnodes, sin_i );
REGISTER_CPPNODE( csp::cppnodes, cos_f );
REGISTER_CPPNODE( csp::cppnodes, cos_i );
REGISTER_CPPNODE( csp::cppnodes, tan_f );
REGISTER_CPPNODE( csp::cppnodes, tan_i );
REGISTER_CPPNODE( csp::cppnodes, asin_f );
REGISTER_CPPNODE( csp::cppnodes, asin_i );
REGISTER_CPPNODE( csp::cppnodes, acos_f );
REGISTER_CPPNODE( csp::cppnodes, acos_i );
REGISTER_CPPNODE( csp::cppnodes, atan_f );
REGISTER_CPPNODE( csp::cppnodes, atan_i );
REGISTER_CPPNODE( csp::cppnodes, sinh_f );
REGISTER_CPPNODE( csp::cppnodes, sinh_i );
REGISTER_CPPNODE( csp::cppnodes, cosh_f );
REGISTER_CPPNODE( csp::cppnodes, cosh_i );
REGISTER_CPPNODE( csp::cppnodes, tanh_f );
REGISTER_CPPNODE( csp::cppnodes, tanh_i );
REGISTER_CPPNODE( csp::cppnodes, asinh_f );
REGISTER_CPPNODE( csp::cppnodes, asinh_i );
REGISTER_CPPNODE( csp::cppnodes, acosh_f );
REGISTER_CPPNODE( csp::cppnodes, acosh_i );
REGISTER_CPPNODE( csp::cppnodes, atanh_f );
REGISTER_CPPNODE( csp::cppnodes, atanh_i );


REGISTER_CPPNODE( csp::cppnodes, bitwise_not );

// Comparisons
Expand Down
Loading
Loading