diff options
m--------- | PMC | 0 | ||||
-rw-r--r-- | include/gras/tags.i | 2 | ||||
-rw-r--r-- | python/gras/GRAS_Block.i | 1 | ||||
-rw-r--r-- | python/gras/GRAS_SBuffer.i | 6 | ||||
-rw-r--r-- | python/gras/__init__.py | 1 |
5 files changed, 9 insertions, 1 deletions
diff --git a/PMC b/PMC -Subproject e852910380fc76eddf360782edd4de6d1c3feb0 +Subproject bd2ee19161fc4e5dbe802858c7b8abe6ee3e83e diff --git a/include/gras/tags.i b/include/gras/tags.i index ae85bea..79a750b 100644 --- a/include/gras/tags.i +++ b/include/gras/tags.i @@ -9,7 +9,7 @@ %include <gras/gras.hpp> %include <gras/tags.hpp> -%include <PMC/PMC.i> +%import <PMC/PMC.i> //////////////////////////////////////////////////////////////////////// // Turn TagIter into a python iterable object diff --git a/python/gras/GRAS_Block.i b/python/gras/GRAS_Block.i index 5093f10..cf23b2a 100644 --- a/python/gras/GRAS_Block.i +++ b/python/gras/GRAS_Block.i @@ -186,6 +186,7 @@ struct BlockPython : Block import numpy import traceback from GRAS_Utils import pointer_to_ndarray +from PMC import * def sig_to_dtype_sig(sig): if sig is None: sig = () diff --git a/python/gras/GRAS_SBuffer.i b/python/gras/GRAS_SBuffer.i index a26e3b0..248bcc1 100644 --- a/python/gras/GRAS_SBuffer.i +++ b/python/gras/GRAS_SBuffer.i @@ -2,12 +2,18 @@ %include <gras/sbuffer.i> +%{ +#include <PMC/PMC.hpp> +%} + %include <PMC/PMC.i> DECL_PMC_SWIG_TYPE(gras::SBuffer, swig_sbuffer) %pythoncode %{ +from PMC import * + RegisterPy2PMC( is_py = lambda x: isinstance(x, SBuffer), py2pmc = swig_sbuffer_to_pmc, diff --git a/python/gras/__init__.py b/python/gras/__init__.py index dac4f03..82dcb40 100644 --- a/python/gras/__init__.py +++ b/python/gras/__init__.py @@ -1,5 +1,6 @@ # Copyright (C) by Josh Blum. See LICENSE.txt for licensing information. +from PMC import * from GRAS_Block import Block, Tag, IOSignature from GRAS_HierBlock import HierBlock, TopBlock from GRAS_ThreadPool import ThreadPoolConfig, ThreadPool |