Browse Source

python: put everything into a single module if magnum is built statically.

That makes it much easier to handle in that case (because that's the
whole point of static builds) and also nicely circumvents any issues
with duplicated global data when a static lib would be linked to
multiple dynamic libraries.
pull/2/head
Vladimír Vondruš 7 years ago
parent
commit
d050145e51
  1. 7
      doc/python/pages/building.rst
  2. 2
      src/python/CMakeLists.txt
  3. 38
      src/python/corrade/CMakeLists.txt
  4. 20
      src/python/corrade/__init__.py
  5. 2
      src/python/corrade/bootstrap.h
  6. 10
      src/python/corrade/containers.cpp
  7. 40
      src/python/corrade/corrade.cpp
  8. 248
      src/python/magnum/CMakeLists.txt
  9. 28
      src/python/magnum/__init__.py
  10. 15
      src/python/magnum/bootstrap.h
  11. 6
      src/python/magnum/gl.cpp
  12. 68
      src/python/magnum/magnum.cpp
  13. 10
      src/python/magnum/meshtools.cpp
  14. 79
      src/python/magnum/platform/CMakeLists.txt
  15. 3
      src/python/magnum/platform/__init__.py
  16. 10
      src/python/magnum/platform/egl.cpp
  17. 10
      src/python/magnum/platform/glfw.cpp
  18. 10
      src/python/magnum/platform/glx.cpp
  19. 10
      src/python/magnum/platform/sdl2.cpp
  20. 10
      src/python/magnum/primitives.cpp
  21. 10
      src/python/magnum/scenegraph.cpp
  22. 14
      src/python/magnum/shaders.cpp
  23. 39
      src/python/magnum/staticconfigure.h.cmake
  24. 10
      src/python/magnum/trade.cpp
  25. 17
      src/python/setup.py.cmake

7
doc/python/pages/building.rst

@ -131,6 +131,13 @@ containing location of all built libraries for use with Python setuptools:
cd build/src/python/magnum cd build/src/python/magnum
python setup.py install # or python3, sudo might be needed python setup.py install # or python3, sudo might be needed
`Static build`_
---------------
In case Corrade or Magnum is built with :dox:`CORRADE_BUILD_STATIC` /
:dox:`MAGNUM_BUILD_STATIC`, the corresponding bindings are compiled into a
single dynamic module instead of one module per Corrade/Magnum library.
`Running unit tests`_ `Running unit tests`_
--------------------- ---------------------

2
src/python/CMakeLists.txt

@ -40,6 +40,8 @@ add_subdirectory(magnum)
# CMake 3.12, so I need to do two passes, first replacing variables using # CMake 3.12, so I need to do two passes, first replacing variables using
# configure_file() and then replacing generator expressions with file(GENERATE) # configure_file() and then replacing generator expressions with file(GENERATE)
foreach(target foreach(target
corrade
corrade_containers
magnum_gl magnum_gl
magnum_meshtools magnum_meshtools
magnum_primitives magnum_primitives

38
src/python/corrade/CMakeLists.txt

@ -26,15 +26,35 @@
set(corrade_containers_SRCS set(corrade_containers_SRCS
containers.cpp) containers.cpp)
pybind11_add_module(corrade_containers ${corrade_containers_SRCS}) # If Corrade is not built as static, compile the sub-libraries as separate
target_include_directories(corrade_containers PRIVATE ${PROJECT_SOURCE_DIR}/src/python) # modules
target_link_libraries(corrade_containers PRIVATE if(NOT CORRADE_BUILD_STATIC)
Corrade::Containers pybind11_add_module(corrade_containers ${corrade_containers_SRCS})
Corrade::Utility) target_include_directories(corrade_containers PRIVATE ${PROJECT_SOURCE_DIR}/src/python)
set_target_properties(corrade_containers PROPERTIES target_link_libraries(corrade_containers PRIVATE
FOLDER "python/corrade" Corrade::Containers
OUTPUT_NAME "containers" Corrade::Utility)
LIBRARY_OUTPUT_DIRECTORY ${output_dir}/corrade) set_target_properties(corrade_containers PROPERTIES
FOLDER "python/corrade"
OUTPUT_NAME "containers"
LIBRARY_OUTPUT_DIRECTORY ${output_dir}/corrade)
# Otherwise put it all into one library so it's easier to install (which is the
# point of static builds). It also nicely avoids problems with multiply-defined
# global data.
else()
set(corrade_SRCS
corrade.cpp
${corrade_containers_SRCS})
pybind11_add_module(corrade ${corrade_SRCS})
target_include_directories(corrade PRIVATE ${PROJECT_SOURCE_DIR}/src/python)
target_link_libraries(corrade PRIVATE Corrade::Utility ${corrade_LIBS})
set_target_properties(corrade PROPERTIES
FOLDER "python"
OUTPUT_NAME "_corrade"
LIBRARY_OUTPUT_DIRECTORY ${output_dir})
endif()
file(GENERATE OUTPUT ${output_dir}/corrade/__init__.py file(GENERATE OUTPUT ${output_dir}/corrade/__init__.py
INPUT ${CMAKE_CURRENT_SOURCE_DIR}/__init__.py) INPUT ${CMAKE_CURRENT_SOURCE_DIR}/__init__.py)

20
src/python/corrade/__init__.py

@ -24,3 +24,23 @@
# #
"""Root Corrade module""" """Root Corrade module"""
import sys
# In case Corrade is built statically, the whole core project is put into
# _corrade. If corrade is built dynamically, there's no core library at the
# moment.
try:
from _corrade import *
# The following feels extremely hackish, but without that it wouldn't be
# possible to do `import corrade.containers`, which is weird
# (`from corrade import containers` works, tho, for whatever reason)
for i in ['containers']:
if i in globals(): sys.modules['corrade.' + i] = globals()[i]
except ImportError:
pass
# Prevent all submodules being pulled in when saying `from corrade import *` --
# this is consistent with behavior in magnum
__all__ = []

2
src/python/corrade/bootstrap.h

@ -33,6 +33,8 @@ namespace corrade {
using namespace Corrade; using namespace Corrade;
namespace py = pybind11; namespace py = pybind11;
void containers(py::module& m);
} }
#endif #endif

10
src/python/corrade/containers.cpp

@ -32,7 +32,9 @@
#include "corrade/PyArrayView.h" #include "corrade/PyArrayView.h"
#include "corrade/PybindExtras.h" #include "corrade/PybindExtras.h"
namespace corrade { namespace { namespace corrade {
namespace {
struct Slice { struct Slice {
std::size_t start; std::size_t start;
@ -401,6 +403,8 @@ template<class T> void mutableStridedArrayView3D(py::class_<PyStridedArrayView<3
}, "Set a value at given position"); }, "Set a value at given position");
} }
}
void containers(py::module& m) { void containers(py::module& m) {
m.doc() = "Corrade containers module"; m.doc() = "Corrade containers module";
@ -445,8 +449,10 @@ void containers(py::module& m) {
mutableStridedArrayView3D(mutableStridedArrayView3D_); mutableStridedArrayView3D(mutableStridedArrayView3D_);
} }
}} }
#ifndef CORRADE_BUILD_STATIC
PYBIND11_MODULE(containers, m) { PYBIND11_MODULE(containers, m) {
corrade::containers(m); corrade::containers(m);
} }
#endif

40
src/python/corrade/corrade.cpp

@ -0,0 +1,40 @@
/*
This file is part of Magnum.
Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019
Vladimír Vondruš <mosra@centrum.cz>
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, subject to the following conditions:
The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software.
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.
*/
#include <pybind11/pybind11.h>
#include <Corrade/configure.h>
#include "corrade/bootstrap.h"
#ifndef CORRADE_BUILD_STATIC
#error this file should be compiled only in the static build
#endif
namespace py = pybind11;
PYBIND11_MODULE(_corrade, m) {
py::module containers = m.def_submodule("containers");
corrade::containers(containers);
}

248
src/python/magnum/CMakeLists.txt

@ -24,7 +24,18 @@
# #
# *Not* REQUIRED # *Not* REQUIRED
find_package(Magnum COMPONENTS GL Shaders SceneGraph MeshTools Primitives Trade) find_package(Magnum COMPONENTS
GL
MeshTools
Primitives
SceneGraph
Shaders
Trade
GlfwApplication
Sdl2Application
WindowlessEglApplication
WindowlessGlxApplication)
set(magnum_SRCS set(magnum_SRCS
magnum.cpp magnum.cpp
@ -34,96 +45,163 @@ set(magnum_SRCS
math.vectorfloat.cpp math.vectorfloat.cpp
math.vectorintegral.cpp) math.vectorintegral.cpp)
# Extra libraries to link to. Populated only in case of MAGNUM_BUILD_STATIC.
set(magnum_LIBS )
set(magnum_gl_SRCS
gl.cpp)
set(magnum_meshtools_SRCS
meshtools.cpp)
set(magnum_primitives_SRCS
primitives.cpp)
set(magnum_scenegraph_SRCS
scenegraph.cpp
scenegraph.matrix.cpp
scenegraph.trs.cpp)
set(magnum_shaders_SRCS
shaders.cpp)
set(magnum_trade_SRCS
trade.cpp)
# If Magnum is not built as static, compile the sub-libraries as separate
# modules
if(NOT MAGNUM_BUILD_STATIC)
if(Magnum_GL_FOUND)
pybind11_add_module(magnum_gl ${magnum_gl_SRCS})
target_include_directories(magnum_gl PRIVATE ${PROJECT_SOURCE_DIR}/src/python)
target_link_libraries(magnum_gl PRIVATE Magnum::GL)
set_target_properties(magnum_gl PROPERTIES
FOLDER "python"
OUTPUT_NAME "gl"
LIBRARY_OUTPUT_DIRECTORY ${output_dir}/magnum)
endif()
if(Magnum_MeshTools_FOUND)
pybind11_add_module(magnum_meshtools ${magnum_meshtools_SRCS})
target_include_directories(magnum_meshtools PRIVATE ${PROJECT_SOURCE_DIR}/src/python)
target_link_libraries(magnum_meshtools PRIVATE Magnum::MeshTools)
set_target_properties(magnum_meshtools PROPERTIES
FOLDER "python"
OUTPUT_NAME "meshtools"
LIBRARY_OUTPUT_DIRECTORY ${output_dir}/magnum)
endif()
if(Magnum_Primitives_FOUND)
pybind11_add_module(magnum_primitives ${magnum_primitives_SRCS})
target_include_directories(magnum_primitives PRIVATE ${PROJECT_SOURCE_DIR}/src/python)
target_link_libraries(magnum_primitives PRIVATE Magnum::Primitives)
set_target_properties(magnum_primitives PROPERTIES
FOLDER "python"
OUTPUT_NAME "primitives"
LIBRARY_OUTPUT_DIRECTORY ${output_dir}/magnum)
endif()
if(Magnum_SceneGraph_FOUND)
pybind11_add_module(magnum_scenegraph ${magnum_scenegraph_SRCS})
target_include_directories(magnum_scenegraph PRIVATE
${PROJECT_SOURCE_DIR}/src
${PROJECT_SOURCE_DIR}/src/python)
target_link_libraries(magnum_scenegraph PRIVATE Magnum::SceneGraph)
set_target_properties(magnum_scenegraph PROPERTIES
FOLDER "python"
OUTPUT_NAME "scenegraph"
LIBRARY_OUTPUT_DIRECTORY ${output_dir}/magnum)
endif()
if(Magnum_Shaders_FOUND)
pybind11_add_module(magnum_shaders ${magnum_shaders_SRCS})
target_include_directories(magnum_shaders PRIVATE ${PROJECT_SOURCE_DIR}/src/python)
target_link_libraries(magnum_shaders PRIVATE Magnum::Shaders)
set_target_properties(magnum_shaders PROPERTIES
FOLDER "python"
OUTPUT_NAME "shaders"
LIBRARY_OUTPUT_DIRECTORY ${output_dir}/magnum)
endif()
if(Magnum_Trade_FOUND)
pybind11_add_module(magnum_trade ${magnum_trade_SRCS})
target_include_directories(magnum_trade PRIVATE ${PROJECT_SOURCE_DIR}/src/python)
target_link_libraries(magnum_trade PRIVATE Magnum::Trade)
set_target_properties(magnum_trade PROPERTIES
FOLDER "python"
OUTPUT_NAME "trade"
LIBRARY_OUTPUT_DIRECTORY ${output_dir}/magnum)
endif()
# Otherwise put it all into the core library so it's easier to install (which
# is the point of static builds). It also nicely avoids problems with
# multiply-defined global data.
else()
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/staticconfigure.h.cmake
${CMAKE_CURRENT_BINARY_DIR}/staticconfigure.h)
if(Magnum_GL_FOUND)
list(APPEND magnum_SRCS ${magnum_gl_SRCS})
list(APPEND magnum_LIBS Magnum::GL)
endif()
if(Magnum_MeshTools_FOUND)
list(APPEND magnum_SRCS ${magnum_meshtools_SRCS})
list(APPEND magnum_LIBS Magnum::MeshTools)
endif()
if(Magnum_Primitives_FOUND)
list(APPEND magnum_SRCS ${magnum_primitives_SRCS})
list(APPEND magnum_LIBS Magnum::Primitives)
endif()
if(Magnum_SceneGraph_FOUND)
list(APPEND magnum_SRCS ${magnum_scenegraph_SRCS})
list(APPEND magnum_LIBS Magnum::SceneGraph)
endif()
if(Magnum_Shaders_FOUND)
list(APPEND magnum_SRCS ${magnum_shaders_SRCS})
list(APPEND magnum_LIBS Magnum::Shaders)
endif()
if(Magnum_Trade_FOUND)
list(APPEND magnum_SRCS ${magnum_trade_SRCS})
list(APPEND magnum_LIBS Magnum::Trade)
endif()
if(Magnum_GlfwApplication_FOUND)
list(APPEND magnum_SRCS platform/glfw.cpp)
list(APPEND magnum_LIBS Magnum::GlfwApplication)
endif()
if(Magnum_Sdl2Application_FOUND)
list(APPEND magnum_SRCS platform/sdl2.cpp)
list(APPEND magnum_LIBS Magnum::Sdl2Application)
endif()
if(Magnum_WindowlessEglApplication_FOUND)
list(APPEND magnum_SRCS platform/egl.cpp)
list(APPEND magnum_LIBS Magnum::WindowlessEglApplication)
endif()
if(Magnum_WindowlessGlxApplication_FOUND)
list(APPEND magnum_SRCS platform/glx.cpp)
list(APPEND magnum_LIBS Magnum::WindowlessGlxApplication)
endif()
endif()
pybind11_add_module(magnum ${magnum_SRCS}) pybind11_add_module(magnum ${magnum_SRCS})
target_include_directories(magnum PRIVATE ${PROJECT_SOURCE_DIR}/src/python) target_include_directories(magnum PRIVATE
target_link_libraries(magnum PRIVATE Magnum::Magnum) ${PROJECT_SOURCE_DIR}/src # SceneGraph/Python.h for static build
${PROJECT_SOURCE_DIR}/src/python
${PROJECT_BINARY_DIR}/src/python) # for static build
target_link_libraries(magnum PRIVATE Magnum::Magnum ${magnum_LIBS})
set_target_properties(magnum PROPERTIES set_target_properties(magnum PROPERTIES
FOLDER "python" FOLDER "python"
OUTPUT_NAME "_magnum" OUTPUT_NAME "_magnum"
LIBRARY_OUTPUT_DIRECTORY ${output_dir}) LIBRARY_OUTPUT_DIRECTORY ${output_dir})
if(Magnum_GL_FOUND)
set(magnum_gl_SRCS
gl.cpp)
pybind11_add_module(magnum_gl ${magnum_gl_SRCS})
target_include_directories(magnum_gl PRIVATE ${PROJECT_SOURCE_DIR}/src/python)
target_link_libraries(magnum_gl PRIVATE Magnum::GL)
set_target_properties(magnum_gl PROPERTIES
FOLDER "python"
OUTPUT_NAME "gl"
LIBRARY_OUTPUT_DIRECTORY ${output_dir}/magnum)
endif()
if(Magnum_MeshTools_FOUND)
set(magnum_meshtools_SRCS
meshtools.cpp)
pybind11_add_module(magnum_meshtools ${magnum_meshtools_SRCS})
target_include_directories(magnum_meshtools PRIVATE ${PROJECT_SOURCE_DIR}/src/python)
target_link_libraries(magnum_meshtools PRIVATE Magnum::MeshTools)
set_target_properties(magnum_meshtools PROPERTIES
FOLDER "python"
OUTPUT_NAME "meshtools"
LIBRARY_OUTPUT_DIRECTORY ${output_dir}/magnum)
endif()
if(Magnum_Primitives_FOUND)
set(magnum_primitives_SRCS
primitives.cpp)
pybind11_add_module(magnum_primitives ${magnum_primitives_SRCS})
target_include_directories(magnum_primitives PRIVATE ${PROJECT_SOURCE_DIR}/src/python)
target_link_libraries(magnum_primitives PRIVATE Magnum::Primitives)
set_target_properties(magnum_primitives PROPERTIES
FOLDER "python"
OUTPUT_NAME "primitives"
LIBRARY_OUTPUT_DIRECTORY ${output_dir}/magnum)
endif()
if(Magnum_SceneGraph_FOUND)
set(magnum_scenegraph_SRCS
scenegraph.cpp
scenegraph.matrix.cpp
scenegraph.trs.cpp)
pybind11_add_module(magnum_scenegraph ${magnum_scenegraph_SRCS})
target_include_directories(magnum_scenegraph PRIVATE
${PROJECT_SOURCE_DIR}/src
${PROJECT_SOURCE_DIR}/src/python)
target_link_libraries(magnum_scenegraph PRIVATE Magnum::SceneGraph)
set_target_properties(magnum_scenegraph PROPERTIES
FOLDER "python"
OUTPUT_NAME "scenegraph"
LIBRARY_OUTPUT_DIRECTORY ${output_dir}/magnum)
endif()
if(Magnum_Shaders_FOUND)
set(magnum_shaders_SRCS
shaders.cpp)
pybind11_add_module(magnum_shaders ${magnum_shaders_SRCS})
target_include_directories(magnum_shaders PRIVATE ${PROJECT_SOURCE_DIR}/src/python)
target_link_libraries(magnum_shaders PRIVATE Magnum::Shaders)
set_target_properties(magnum_shaders PROPERTIES
FOLDER "python"
OUTPUT_NAME "shaders"
LIBRARY_OUTPUT_DIRECTORY ${output_dir}/magnum)
endif()
if(Magnum_Trade_FOUND)
set(magnum_trade_SRCS
trade.cpp)
pybind11_add_module(magnum_trade ${magnum_trade_SRCS})
target_include_directories(magnum_trade PRIVATE ${PROJECT_SOURCE_DIR}/src/python)
target_link_libraries(magnum_trade PRIVATE Magnum::Trade)
set_target_properties(magnum_trade PROPERTIES
FOLDER "python"
OUTPUT_NAME "trade"
LIBRARY_OUTPUT_DIRECTORY ${output_dir}/magnum)
endif()
file(GENERATE OUTPUT ${output_dir}/magnum/__init__.py file(GENERATE OUTPUT ${output_dir}/magnum/__init__.py
INPUT ${CMAKE_CURRENT_SOURCE_DIR}/__init__.py) INPUT ${CMAKE_CURRENT_SOURCE_DIR}/__init__.py)

28
src/python/magnum/__init__.py

@ -33,6 +33,34 @@ from _magnum import *
import sys import sys
sys.modules['magnum.math'] = math sys.modules['magnum.math'] = math
# In case Magnum is built statically, the whole core project is put into
# _magnum. Then we need to do the same as above but for all modules.
for i in ['gl', 'meshtools', 'platform', 'primitives', 'scenegraph', 'shaders', 'trade']:
if i in globals(): sys.modules['magnum.' + i] = globals()[i]
# Platform has subpackages
if 'platform' in globals():
for i in ['glfw', 'sdl2', 'egl', 'glx']:
if hasattr(platform, i): sys.modules['magnum.platform.' + i] = getattr(platform, i)
# Bring one application implementation directly into the platform module.
# The same logic is duplicated in platform/__init__.py.
if hasattr(platform, 'sdl2'):
platform.Application = platform.sdl2.Application
elif hasattr(platform, 'glfw'):
platform.Application = platform.glfw.Application
# Same for windowless apps
if hasattr(platform, 'glx'):
platform.WindowlessApplication = platform.glx.WindowlessApplication
elif hasattr(platform, 'egl'):
platform.WindowlessApplication = platform.egl.WindowlessApplication
# Scenegraph has subpackages
if 'scenegraph' in globals():
for i in ['matrix', 'trs']:
sys.modules['magnum.scenegraph.' + i] = getattr(scenegraph, i)
__all__ = [ __all__ = [
'Deg', 'Rad', 'Deg', 'Rad',

15
src/python/magnum/bootstrap.h

@ -39,6 +39,21 @@ void mathVectorIntegral(py::module& root, py::module& m);
void mathMatrixFloat(py::module& root); void mathMatrixFloat(py::module& root);
void mathMatrixDouble(py::module& root); void mathMatrixDouble(py::module& root);
void gl(py::module& m);
void meshtools(py::module& m);
void primitives(py::module& m);
void scenegraph(py::module& m);
void shaders(py::module& m);
void trade(py::module& m);
namespace platform {
void glfw(py::module& m);
void sdl2(py::module& m);
void egl(py::module& m);
void glx(py::module& m);
}
} }
#endif #endif

6
src/python/magnum/gl.cpp

@ -39,7 +39,7 @@
#include "magnum/NonDestructible.h" #include "magnum/NonDestructible.h"
#include "magnum/PyMesh.h" #include "magnum/PyMesh.h"
namespace magnum { namespace { namespace magnum {
void gl(py::module& m) { void gl(py::module& m) {
m.doc() = "OpenGL wrapping layer"; m.doc() = "OpenGL wrapping layer";
@ -302,8 +302,10 @@ void gl(py::module& m) {
} }
} }
}} }
#ifndef MAGNUM_BUILD_STATIC
PYBIND11_MODULE(gl, m) { PYBIND11_MODULE(gl, m) {
magnum::gl(m); magnum::gl(m);
} }
#endif

68
src/python/magnum/magnum.cpp

@ -28,6 +28,10 @@
#include "magnum/bootstrap.h" #include "magnum/bootstrap.h"
#ifdef MAGNUM_BUILD_STATIC
#include "magnum/staticconfigure.h"
#endif
namespace py = pybind11; namespace py = pybind11;
namespace magnum { namespace { namespace magnum { namespace {
@ -57,4 +61,68 @@ PYBIND11_MODULE(_magnum, m) {
py::module math = m.def_submodule("math"); py::module math = m.def_submodule("math");
magnum::math(m, math); magnum::math(m, math);
/* In case Magnum is a bunch of static libraries, put everything into a
single shared lib to make it easier to install (which is the point of
static builds) and avoid issues with multiply-defined global symbols.
These need to be defined in the order they depend on. */
#ifdef MAGNUM_BUILD_STATIC
#ifdef Magnum_GL_FOUND
py::module gl = m.def_submodule("gl");
magnum::gl(gl);
#endif
#ifdef Magnum_SceneGraph_FOUND
py::module scenegraph = m.def_submodule("scenegraph");
magnum::scenegraph(scenegraph);
#endif
#ifdef Magnum_Trade_FOUND
py::module trade = m.def_submodule("trade");
magnum::trade(trade);
#endif
#ifdef Magnum_MeshTools_FOUND
/* Depends on trade and gl */
py::module meshtools = m.def_submodule("meshtools");
magnum::meshtools(meshtools);
#endif
#ifdef Magnum_Primitives_FOUND
/* Depends on trade */
py::module primitives = m.def_submodule("primitives");
magnum::primitives(primitives);
#endif
#ifdef Magnum_Shaders_FOUND
/* Depends on gl */
py::module shaders = m.def_submodule("shaders");
magnum::shaders(shaders);
#endif
/* Keep the doc in sync with platform/__init__.py */
py::module platform = m.def_submodule("platform");
platform.doc() = "Platform-specific application and context creation";
#ifdef Magnum_GlfwApplication_FOUND
py::module glfw = platform.def_submodule("glfw");
magnum::platform::glfw(glfw);
#endif
#ifdef Magnum_Sdl2Application_FOUND
py::module sdl2 = platform.def_submodule("sdl2");
magnum::platform::sdl2(sdl2);
#endif
#ifdef Magnum_WindowlessEglApplication_FOUND
py::module egl = platform.def_submodule("egl");
magnum::platform::egl(egl);
#endif
#ifdef Magnum_WindowlessGlxApplication_FOUND
py::module glx = platform.def_submodule("glx");
magnum::platform::glx(glx);
#endif
#endif
} }

10
src/python/magnum/meshtools.cpp

@ -32,13 +32,17 @@
#include "magnum/bootstrap.h" #include "magnum/bootstrap.h"
#include "magnum/PyMesh.h" #include "magnum/PyMesh.h"
namespace magnum { namespace { namespace magnum {
void meshtools(py::module& m) { void meshtools(py::module& m) {
m.doc() = "Mesh tools"; m.doc() = "Mesh tools";
#ifndef MAGNUM_BUILD_STATIC
/* These are a part of the same module in the static build, no need to
import (also can't import because there it's _magnum.*) */
py::module::import("magnum.gl"); py::module::import("magnum.gl");
py::module::import("magnum.trade"); py::module::import("magnum.trade");
#endif
m m
.def("compile", [](const Trade::MeshData2D& data) { .def("compile", [](const Trade::MeshData2D& data) {
@ -49,8 +53,10 @@ void meshtools(py::module& m) {
}, "Compile 3D mesh data"); }, "Compile 3D mesh data");
} }
}} }
#ifndef MAGNUM_BUILD_STATIC
PYBIND11_MODULE(meshtools, m) { PYBIND11_MODULE(meshtools, m) {
magnum::meshtools(m); magnum::meshtools(m);
} }
#endif

79
src/python/magnum/platform/CMakeLists.txt

@ -23,51 +23,46 @@
# DEALINGS IN THE SOFTWARE. # DEALINGS IN THE SOFTWARE.
# #
# *Not* REQUIRED if(NOT MAGNUM_BUILD_STATIC)
find_package(Magnum COMPONENTS if(Magnum_GlfwApplication_FOUND)
GlfwApplication pybind11_add_module(magnum_platform_glfw glfw.cpp)
Sdl2Application target_link_libraries(magnum_platform_glfw PRIVATE Magnum::GlfwApplication)
WindowlessEglApplication target_include_directories(magnum_platform_glfw PRIVATE ${CMAKE_SOURCE_DIR}/src/python)
WindowlessGlxApplication) set_target_properties(magnum_platform_glfw PROPERTIES
FOLDER "python/platform"
OUTPUT_NAME "glfw"
LIBRARY_OUTPUT_DIRECTORY ${output_dir}/magnum/platform)
endif()
if(Magnum_GlfwApplication_FOUND) if(Magnum_Sdl2Application_FOUND)
pybind11_add_module(magnum_platform_glfw glfw.cpp) pybind11_add_module(magnum_platform_sdl2 sdl2.cpp)
target_link_libraries(magnum_platform_glfw PRIVATE Magnum::GlfwApplication) target_link_libraries(magnum_platform_sdl2 PRIVATE Magnum::Sdl2Application)
target_include_directories(magnum_platform_glfw PRIVATE ${CMAKE_SOURCE_DIR}/src/python) target_include_directories(magnum_platform_sdl2 PRIVATE ${CMAKE_SOURCE_DIR}/src/python)
set_target_properties(magnum_platform_glfw PROPERTIES set_target_properties(magnum_platform_sdl2 PROPERTIES
FOLDER "python/platform" FOLDER "python/platform"
OUTPUT_NAME "glfw" OUTPUT_NAME "sdl2"
LIBRARY_OUTPUT_DIRECTORY ${output_dir}/magnum/platform) LIBRARY_OUTPUT_DIRECTORY ${output_dir}/magnum/platform)
endif() endif()
if(Magnum_Sdl2Application_FOUND)
pybind11_add_module(magnum_platform_sdl2 sdl2.cpp)
target_link_libraries(magnum_platform_sdl2 PRIVATE Magnum::Sdl2Application)
target_include_directories(magnum_platform_sdl2 PRIVATE ${CMAKE_SOURCE_DIR}/src/python)
set_target_properties(magnum_platform_sdl2 PROPERTIES
FOLDER "python/platform"
OUTPUT_NAME "sdl2"
LIBRARY_OUTPUT_DIRECTORY ${output_dir}/magnum/platform)
endif()
if(Magnum_WindowlessEglApplication_FOUND) if(Magnum_WindowlessEglApplication_FOUND)
pybind11_add_module(magnum_platform_egl egl.cpp) pybind11_add_module(magnum_platform_egl egl.cpp)
target_link_libraries(magnum_platform_egl PRIVATE Magnum::WindowlessEglApplication) target_link_libraries(magnum_platform_egl PRIVATE Magnum::WindowlessEglApplication)
target_include_directories(magnum_platform_egl PRIVATE ${PROJECT_SOURCE_DIR}/src/python) target_include_directories(magnum_platform_egl PRIVATE ${PROJECT_SOURCE_DIR}/src/python)
set_target_properties(magnum_platform_egl PROPERTIES set_target_properties(magnum_platform_egl PROPERTIES
FOLDER "python/platform" FOLDER "python/platform"
OUTPUT_NAME "egl" OUTPUT_NAME "egl"
LIBRARY_OUTPUT_DIRECTORY ${output_dir}/magnum/platform) LIBRARY_OUTPUT_DIRECTORY ${output_dir}/magnum/platform)
endif() endif()
if(Magnum_WindowlessGlxApplication_FOUND) if(Magnum_WindowlessGlxApplication_FOUND)
pybind11_add_module(magnum_platform_glx glx.cpp) pybind11_add_module(magnum_platform_glx glx.cpp)
target_link_libraries(magnum_platform_glx PRIVATE Magnum::WindowlessGlxApplication) target_link_libraries(magnum_platform_glx PRIVATE Magnum::WindowlessGlxApplication)
target_include_directories(magnum_platform_glx PRIVATE ${PROJECT_SOURCE_DIR}/src/python) target_include_directories(magnum_platform_glx PRIVATE ${PROJECT_SOURCE_DIR}/src/python)
set_target_properties(magnum_platform_glx PROPERTIES set_target_properties(magnum_platform_glx PROPERTIES
FOLDER "python/platform" FOLDER "python/platform"
OUTPUT_NAME "glx" OUTPUT_NAME "glx"
LIBRARY_OUTPUT_DIRECTORY ${output_dir}/magnum/platform) LIBRARY_OUTPUT_DIRECTORY ${output_dir}/magnum/platform)
endif()
endif() endif()
file(GENERATE OUTPUT ${output_dir}/magnum/platform/__init__.py file(GENERATE OUTPUT ${output_dir}/magnum/platform/__init__.py

3
src/python/magnum/platform/__init__.py

@ -25,6 +25,9 @@
"""Platform-specific application and context creation""" """Platform-specific application and context creation"""
# This logic is repeated in magnum's main __init__.py for static builds as
# there magnum.platform is a submodule inside the native _magnum module.
try: try:
from .glx import WindowlessApplication from .glx import WindowlessApplication
except ImportError: # pragma: no cover except ImportError: # pragma: no cover

10
src/python/magnum/platform/egl.cpp

@ -29,9 +29,11 @@
#include "magnum/bootstrap.h" #include "magnum/bootstrap.h"
#include "magnum/platform/windowlessapplication.h" #include "magnum/platform/windowlessapplication.h"
namespace magnum { namespace platform { namespace { namespace magnum { namespace platform {
int argc = 0; namespace {
int argc = 0;
}
void egl(py::module& m) { void egl(py::module& m) {
m.doc() = "EGL-based platform integration"; m.doc() = "EGL-based platform integration";
@ -53,8 +55,10 @@ void egl(py::module& m) {
windowlessapplication(windowlessEglApplication); windowlessapplication(windowlessEglApplication);
} }
}}} }}
#ifndef MAGNUM_BUILD_STATIC
PYBIND11_MODULE(egl, m) { PYBIND11_MODULE(egl, m) {
magnum::platform::egl(m); magnum::platform::egl(m);
} }
#endif

10
src/python/magnum/platform/glfw.cpp

@ -29,9 +29,11 @@
#include "magnum/bootstrap.h" #include "magnum/bootstrap.h"
#include "magnum/platform/application.h" #include "magnum/platform/application.h"
namespace magnum { namespace platform { namespace { namespace magnum { namespace platform {
int argc = 0; namespace {
int argc = 0;
}
void glfw(py::module& m) { void glfw(py::module& m) {
m.doc() = "GLFW-based platform integration"; m.doc() = "GLFW-based platform integration";
@ -105,8 +107,10 @@ void glfw(py::module& m) {
mouseMoveEvent(mouseMoveEvent_); mouseMoveEvent(mouseMoveEvent_);
} }
}}} }}
#ifndef MAGNUM_BUILD_STATIC
PYBIND11_MODULE(glfw, m) { PYBIND11_MODULE(glfw, m) {
magnum::platform::glfw(m); magnum::platform::glfw(m);
} }
#endif

10
src/python/magnum/platform/glx.cpp

@ -29,9 +29,11 @@
#include "magnum/bootstrap.h" #include "magnum/bootstrap.h"
#include "magnum/platform/windowlessapplication.h" #include "magnum/platform/windowlessapplication.h"
namespace magnum { namespace platform { namespace { namespace magnum { namespace platform {
int argc = 0; namespace {
int argc = 0;
}
void glx(py::module& m) { void glx(py::module& m) {
m.doc() = "GLX-based platform integration"; m.doc() = "GLX-based platform integration";
@ -53,8 +55,10 @@ void glx(py::module& m) {
windowlessapplication(windowlessGlxApplication); windowlessapplication(windowlessGlxApplication);
} }
}}} }}
#ifndef MAGNUM_BUILD_STATIC
PYBIND11_MODULE(glx, m) { PYBIND11_MODULE(glx, m) {
magnum::platform::glx(m); magnum::platform::glx(m);
} }
#endif

10
src/python/magnum/platform/sdl2.cpp

@ -29,9 +29,11 @@
#include "magnum/bootstrap.h" #include "magnum/bootstrap.h"
#include "magnum/platform/application.h" #include "magnum/platform/application.h"
namespace magnum { namespace platform { namespace { namespace magnum { namespace platform {
int argc = 0; namespace {
int argc = 0;
}
void sdl2(py::module& m) { void sdl2(py::module& m) {
m.doc() = "SDL2-based platform integration"; m.doc() = "SDL2-based platform integration";
@ -113,8 +115,10 @@ void sdl2(py::module& m) {
mouseMoveEvent(mouseMoveEvent_); mouseMoveEvent(mouseMoveEvent_);
} }
}}} }}
#ifndef MAGNUM_BUILD_STATIC
PYBIND11_MODULE(sdl2, m) { PYBIND11_MODULE(sdl2, m) {
magnum::platform::sdl2(m); magnum::platform::sdl2(m);
} }
#endif

10
src/python/magnum/primitives.cpp

@ -31,12 +31,16 @@
#include "magnum/bootstrap.h" #include "magnum/bootstrap.h"
namespace magnum { namespace { namespace magnum {
void primitives(py::module& m) { void primitives(py::module& m) {
m.doc() = "Primitive library"; m.doc() = "Primitive library";
#ifndef MAGNUM_BUILD_STATIC
/* These are a part of the same module in the static build, no need to
import (also can't import because there it's _magnum.*) */
py::module::import("magnum.trade"); py::module::import("magnum.trade");
#endif
py::enum_<Primitives::SquareTextureCoords>{m, "SquareTextureCoords", "Whether to generate square texture coordinates"} py::enum_<Primitives::SquareTextureCoords>{m, "SquareTextureCoords", "Whether to generate square texture coordinates"}
.value("DONT_GENERATE", Primitives::SquareTextureCoords::DontGenerate) .value("DONT_GENERATE", Primitives::SquareTextureCoords::DontGenerate)
@ -51,8 +55,10 @@ void primitives(py::module& m) {
.def("square_wireframe", Primitives::squareWireframe, "Wireframe 2D square"); .def("square_wireframe", Primitives::squareWireframe, "Wireframe 2D square");
} }
}} }
#ifndef MAGNUM_BUILD_STATIC
PYBIND11_MODULE(primitives, m) { PYBIND11_MODULE(primitives, m) {
magnum::primitives(m); magnum::primitives(m);
} }
#endif

10
src/python/magnum/scenegraph.cpp

@ -30,7 +30,9 @@
#include "magnum/scenegraph.h" #include "magnum/scenegraph.h"
namespace magnum { namespace { namespace magnum {
namespace {
template<UnsignedInt dimensions, class T> struct PyDrawable: SceneGraph::PyFeature<SceneGraph::Drawable<dimensions, T>> { template<UnsignedInt dimensions, class T> struct PyDrawable: SceneGraph::PyFeature<SceneGraph::Drawable<dimensions, T>> {
explicit PyDrawable(SceneGraph::AbstractObject<dimensions, T>& object, SceneGraph::DrawableGroup<dimensions, T>* drawables): SceneGraph::PyFeature<SceneGraph::Drawable<dimensions, T>>{object, drawables} {} explicit PyDrawable(SceneGraph::AbstractObject<dimensions, T>& object, SceneGraph::DrawableGroup<dimensions, T>* drawables): SceneGraph::PyFeature<SceneGraph::Drawable<dimensions, T>>{object, drawables} {}
@ -120,6 +122,8 @@ template<UnsignedInt dimensions, class T> void camera(py::class_<SceneGraph::Cam
"Draw"); "Draw");
} }
}
void scenegraph(py::module& m) { void scenegraph(py::module& m) {
m.doc() = "Scene graph library"; m.doc() = "Scene graph library";
@ -167,8 +171,10 @@ void scenegraph(py::module& m) {
magnum::scenegraphTrs(m); magnum::scenegraphTrs(m);
} }
}} }
#ifndef MAGNUM_BUILD_STATIC
PYBIND11_MODULE(scenegraph, m) { PYBIND11_MODULE(scenegraph, m) {
magnum::scenegraph(m); magnum::scenegraph(m);
} }
#endif

14
src/python/magnum/shaders.cpp

@ -33,7 +33,9 @@
#include "magnum/bootstrap.h" #include "magnum/bootstrap.h"
#include "magnum/NonDestructible.h" #include "magnum/NonDestructible.h"
namespace magnum { namespace { namespace magnum {
namespace {
template<UnsignedInt dimensions> void vertexColor(NonDestructibleBase<Shaders::VertexColor<dimensions>, GL::AbstractShaderProgram>& c) { template<UnsignedInt dimensions> void vertexColor(NonDestructibleBase<Shaders::VertexColor<dimensions>, GL::AbstractShaderProgram>& c) {
/* Attributes */ /* Attributes */
@ -60,10 +62,16 @@ template<UnsignedInt dimensions> void vertexColor(NonDestructibleBase<Shaders::V
"Transformation and projection matrix"); "Transformation and projection matrix");
} }
}
void shaders(py::module& m) { void shaders(py::module& m) {
m.doc() = "Builtin shaders"; m.doc() = "Builtin shaders";
#ifndef MAGNUM_BUILD_STATIC
/* These are a part of the same module in the static build, no need to
import (also can't import because there it's _magnum.*) */
py::module::import("magnum.gl"); py::module::import("magnum.gl");
#endif
/* 2D/3D vertex color shader */ /* 2D/3D vertex color shader */
{ {
@ -151,8 +159,10 @@ void shaders(py::module& m) {
} }
} }
}} }
#ifndef MAGNUM_BUILD_STATIC
PYBIND11_MODULE(shaders, m) { PYBIND11_MODULE(shaders, m) {
magnum::shaders(m); magnum::shaders(m);
} }
#endif

39
src/python/magnum/staticconfigure.h.cmake

@ -0,0 +1,39 @@
/*
This file is part of Magnum.
Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019
Vladimír Vondruš <mosra@centrum.cz>
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, subject to the following conditions:
The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software.
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.
*/
/* Named magnum/staticconfigure.h to avoid it colliding with Magnum/configure.h
on case-insensitive filesystems */
#cmakedefine Magnum_GL_FOUND
#cmakedefine Magnum_MeshTools_FOUND
#cmakedefine Magnum_Primitives_FOUND
#cmakedefine Magnum_SceneGraph_FOUND
#cmakedefine Magnum_Shaders_FOUND
#cmakedefine Magnum_Trade_FOUND
#cmakedefine Magnum_GlfwApplication_FOUND
#cmakedefine Magnum_Sdl2Application_FOUND
#cmakedefine Magnum_WindowlessEglApplication_FOUND
#cmakedefine Magnum_WindowlessGlxApplication_FOUND

10
src/python/magnum/trade.cpp

@ -29,7 +29,9 @@
#include "magnum/bootstrap.h" #include "magnum/bootstrap.h"
namespace magnum { namespace { namespace magnum {
namespace {
template<class T> void meshData(py::class_<T>& c) { template<class T> void meshData(py::class_<T>& c) {
c c
@ -37,6 +39,8 @@ template<class T> void meshData(py::class_<T>& c) {
.def("is_indexed", &T::isIndexed, "Whether the mesh is indexed"); .def("is_indexed", &T::isIndexed, "Whether the mesh is indexed");
} }
}
void trade(py::module& m) { void trade(py::module& m) {
m.doc() = "Data format exchange"; m.doc() = "Data format exchange";
@ -46,8 +50,10 @@ void trade(py::module& m) {
meshData(meshData3D); meshData(meshData3D);
} }
}} }
#ifndef MAGNUM_BUILD_STATIC
PYBIND11_MODULE(trade, m) { PYBIND11_MODULE(trade, m) {
magnum::trade(m); magnum::trade(m);
} }
#endif

17
src/python/setup.py.cmake

@ -30,8 +30,11 @@ from setuptools import setup, Extension, find_packages
from setuptools.command.build_ext import build_ext from setuptools.command.build_ext import build_ext
extension_paths = { extension_paths = {
# Filled in by cmake # Filled in by cmake. This works for both static and dynamic builds -- in
'corrade.containers': '$<TARGET_FILE:corrade_containers>', # case a library is built statically, only the underscored name will be
# present.
'_corrade': '${corrade_file}',
'corrade.containers': '${corrade_containers_file}',
'_magnum': '$<TARGET_FILE:magnum>', '_magnum': '$<TARGET_FILE:magnum>',
'magnum.gl': '${magnum_gl_file}', 'magnum.gl': '${magnum_gl_file}',
'magnum.meshtools': '${magnum_meshtools_file}', 'magnum.meshtools': '${magnum_meshtools_file}',
@ -45,6 +48,14 @@ extension_paths = {
'magnum.trade': '${magnum_trade_file}', 'magnum.trade': '${magnum_trade_file}',
} }
packages = ['corrade', 'magnum']
# On dynamic builds, platform is a package with an __init__.py and submodules.
# On static builds, it's a submodule of magnum with everything present
# statically.
if '${MAGNUM_BUILD_STATIC}' != 'ON':
packages += ['magnum.platform']
class TheExtensionIsAlreadyBuiltWhyThisHasToBeSoDamnComplicated(build_ext): class TheExtensionIsAlreadyBuiltWhyThisHasToBeSoDamnComplicated(build_ext):
def run(self): def run(self):
for ext in self.extensions: for ext in self.extensions:
@ -52,7 +63,7 @@ class TheExtensionIsAlreadyBuiltWhyThisHasToBeSoDamnComplicated(build_ext):
setup( setup(
name='magnum', name='magnum',
packages=['corrade', 'magnum', 'magnum.platform'], packages=packages,
ext_modules=[Extension(name, sources=[]) for name, path in extension_paths.items() if path], ext_modules=[Extension(name, sources=[]) for name, path in extension_paths.items() if path],
cmdclass = { cmdclass = {
'build_ext': TheExtensionIsAlreadyBuiltWhyThisHasToBeSoDamnComplicated 'build_ext': TheExtensionIsAlreadyBuiltWhyThisHasToBeSoDamnComplicated

Loading…
Cancel
Save