mirror of
https://github.com/boostorg/python.git
synced 2026-01-19 16:32:16 +00:00
Fix for missing export symbols in shared library of boost::python::numpy
This commit is contained in:
committed by
Stefan Seefeld
parent
0224f54ae0
commit
bd7b8ecba5
@@ -137,6 +137,8 @@ rule lib_boost_numpy ( is-py3 ? )
|
||||
numpy/scalars.cpp
|
||||
numpy/ufunc.cpp
|
||||
: # requirements
|
||||
<link>static:<define>BOOST_NUMPY_STATIC_LIB
|
||||
<define>BOOST_NUMPY_SOURCE
|
||||
[ cond [ python.numpy ] : <library>/python//python_for_extensions ]
|
||||
[ unless [ python.numpy ] : <build>no ]
|
||||
<include>$(numpy-include)
|
||||
@@ -150,6 +152,7 @@ rule lib_boost_numpy ( is-py3 ? )
|
||||
: # default build
|
||||
<link>shared
|
||||
: # usage requirements
|
||||
<link>static:<define>BOOST_NUMPY_STATIC_LIB
|
||||
<python-debugging>on:<define>BOOST_DEBUG_PYTHON
|
||||
;
|
||||
}
|
||||
|
||||
@@ -13,6 +13,7 @@
|
||||
#include <boost/python/numpy/matrix.hpp>
|
||||
#include <boost/python/numpy/ufunc.hpp>
|
||||
#include <boost/python/numpy/invoke_matching.hpp>
|
||||
#include <boost/python/numpy/config.hpp>
|
||||
|
||||
namespace boost { namespace python { namespace numpy {
|
||||
|
||||
@@ -26,7 +27,7 @@ namespace boost { namespace python { namespace numpy {
|
||||
* and "import_ufunc()", and then calls
|
||||
* dtype::register_scalar_converters().
|
||||
*/
|
||||
void initialize(bool register_scalar_converters=true);
|
||||
BOOST_NUMPY_DECL void initialize(bool register_scalar_converters=true);
|
||||
|
||||
}}} // namespace boost::python::numpy
|
||||
|
||||
|
||||
78
include/boost/python/numpy/config.hpp
Normal file
78
include/boost/python/numpy/config.hpp
Normal file
@@ -0,0 +1,78 @@
|
||||
// (C) Copyright Samuli-Petrus Korhonen 2017.
|
||||
// Distributed under the Boost Software License, Version 1.0. (See
|
||||
// accompanying file LICENSE_1_0.txt or copy at
|
||||
// http://www.boost.org/LICENSE_1_0.txt)
|
||||
//
|
||||
// The author gratefully acknowleges the support of NMR Solutions, Inc., in
|
||||
// producing this work.
|
||||
|
||||
// Revision History:
|
||||
// 15 Feb 17 Initial version
|
||||
|
||||
#ifndef CONFIG_NUMPY20170215_H_
|
||||
# define CONFIG_NUMPY20170215_H_
|
||||
|
||||
# include <boost/config.hpp>
|
||||
|
||||
/*****************************************************************************
|
||||
*
|
||||
* Set up dll import/export options:
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
// backwards compatibility:
|
||||
#ifdef BOOST_NUMPY_STATIC_LIB
|
||||
# define BOOST_NUMPY_STATIC_LINK
|
||||
# elif !defined(BOOST_NUMPY_DYNAMIC_LIB)
|
||||
# define BOOST_NUMPY_DYNAMIC_LIB
|
||||
#endif
|
||||
|
||||
#if defined(BOOST_NUMPY_DYNAMIC_LIB)
|
||||
# if defined(BOOST_SYMBOL_EXPORT)
|
||||
# if defined(BOOST_NUMPY_SOURCE)
|
||||
# define BOOST_NUMPY_DECL BOOST_SYMBOL_EXPORT
|
||||
# define BOOST_NUMPY_DECL_FORWARD BOOST_SYMBOL_FORWARD_EXPORT
|
||||
# define BOOST_NUMPY_DECL_EXCEPTION BOOST_EXCEPTION_EXPORT
|
||||
# define BOOST_NUMPY_BUILD_DLL
|
||||
# else
|
||||
# define BOOST_NUMPY_DECL BOOST_SYMBOL_IMPORT
|
||||
# define BOOST_NUMPY_DECL_FORWARD BOOST_SYMBOL_FORWARD_IMPORT
|
||||
# define BOOST_NUMPY_DECL_EXCEPTION BOOST_EXCEPTION_IMPORT
|
||||
# endif
|
||||
# endif
|
||||
|
||||
#endif
|
||||
|
||||
#ifndef BOOST_NUMPY_DECL
|
||||
# define BOOST_NUMPY_DECL
|
||||
#endif
|
||||
|
||||
#ifndef BOOST_NUMPY_DECL_FORWARD
|
||||
# define BOOST_NUMPY_DECL_FORWARD
|
||||
#endif
|
||||
|
||||
#ifndef BOOST_NUMPY_DECL_EXCEPTION
|
||||
# define BOOST_NUMPY_DECL_EXCEPTION
|
||||
#endif
|
||||
|
||||
// enable automatic library variant selection ------------------------------//
|
||||
|
||||
#if !defined(BOOST_NUMPY_SOURCE) && !defined(BOOST_ALL_NO_LIB) && !defined(BOOST_NUMPY_NO_LIB)
|
||||
//
|
||||
// Set the name of our library, this will get undef'ed by auto_link.hpp
|
||||
// once it's done with it:
|
||||
//
|
||||
#define BOOST_LIB_NAME boost_numpy
|
||||
//
|
||||
// If we're importing code from a dll, then tell auto_link.hpp about it:
|
||||
//
|
||||
#ifdef BOOST_NUMPY_DYNAMIC_LIB
|
||||
# define BOOST_DYN_LINK
|
||||
#endif
|
||||
//
|
||||
// And include the header that does the work:
|
||||
//
|
||||
#include <boost/config/auto_link.hpp>
|
||||
#endif // auto-linking disabled
|
||||
|
||||
#endif // CONFIG_NUMPY20170215_H_
|
||||
@@ -14,6 +14,7 @@
|
||||
|
||||
#include <boost/python.hpp>
|
||||
#include <boost/python/numpy/numpy_object_mgr_traits.hpp>
|
||||
#include <boost/python/numpy/config.hpp>
|
||||
|
||||
#include <boost/mpl/for_each.hpp>
|
||||
#include <boost/type_traits/add_pointer.hpp>
|
||||
@@ -25,7 +26,7 @@ namespace boost { namespace python { namespace numpy {
|
||||
*
|
||||
* @todo This could have a lot more interesting accessors.
|
||||
*/
|
||||
class dtype : public object {
|
||||
class BOOST_NUMPY_DECL dtype : public object {
|
||||
static python::detail::new_reference convert(object::object_cref arg, bool align);
|
||||
public:
|
||||
|
||||
|
||||
@@ -14,6 +14,8 @@
|
||||
#include <boost/python.hpp>
|
||||
#include <boost/python/numpy/numpy_object_mgr_traits.hpp>
|
||||
#include <boost/python/numpy/ndarray.hpp>
|
||||
#include <boost/python/numpy/config.hpp>
|
||||
|
||||
|
||||
namespace boost { namespace python { namespace numpy {
|
||||
|
||||
@@ -27,7 +29,7 @@ namespace boost { namespace python { namespace numpy {
|
||||
* bad things happen when Python shuts down. I think this solution is safe, but I'd
|
||||
* love to get that confirmed.
|
||||
*/
|
||||
class matrix : public ndarray
|
||||
class BOOST_NUMPY_DECL matrix : public ndarray
|
||||
{
|
||||
static object construct(object_cref obj, dtype const & dt, bool copy);
|
||||
static object construct(object_cref obj, bool copy);
|
||||
@@ -59,7 +61,7 @@ public:
|
||||
* return a numpy.matrix instead.
|
||||
*/
|
||||
template <typename Base = default_call_policies>
|
||||
struct as_matrix : Base
|
||||
struct BOOST_NUMPY_DECL as_matrix : Base
|
||||
{
|
||||
static PyObject * postcall(PyObject *, PyObject * result)
|
||||
{
|
||||
|
||||
@@ -16,6 +16,8 @@
|
||||
#include <boost/type_traits/is_integral.hpp>
|
||||
#include <boost/python/numpy/numpy_object_mgr_traits.hpp>
|
||||
#include <boost/python/numpy/dtype.hpp>
|
||||
#include <boost/python/numpy/config.hpp>
|
||||
|
||||
#include <vector>
|
||||
|
||||
namespace boost { namespace python { namespace numpy {
|
||||
@@ -26,7 +28,8 @@ namespace boost { namespace python { namespace numpy {
|
||||
* @todo This could have a lot more functionality (like boost::python::numeric::array).
|
||||
* Right now all that exists is what was needed to move raw data between C++ and Python.
|
||||
*/
|
||||
class ndarray : public object
|
||||
|
||||
class BOOST_NUMPY_DECL ndarray : public object
|
||||
{
|
||||
|
||||
/**
|
||||
|
||||
@@ -15,6 +15,7 @@
|
||||
#include <boost/python/numpy/numpy_object_mgr_traits.hpp>
|
||||
#include <boost/python/numpy/dtype.hpp>
|
||||
#include <boost/python/numpy/ndarray.hpp>
|
||||
#include <boost/python/numpy/config.hpp>
|
||||
|
||||
namespace boost { namespace python { namespace numpy {
|
||||
|
||||
@@ -34,7 +35,7 @@ namespace boost { namespace python { namespace numpy {
|
||||
* It's more dangerous than most object managers, however - maybe it actually belongs in
|
||||
* a detail namespace?
|
||||
*/
|
||||
class multi_iter : public object
|
||||
class BOOST_NUMPY_DECL multi_iter : public object
|
||||
{
|
||||
public:
|
||||
|
||||
|
||||
Reference in New Issue
Block a user