Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
hydra-image-processor
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
OpenSource
hydra-image-processor
Commits
cbcf6595
Commit
cbcf6595
authored
6 years ago
by
Mark Winter
Browse files
Options
Downloads
Patches
Plain Diff
Cleaned up Python converters
parent
b1b8b943
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/c/Python/PyTypes.h
+24
-26
24 additions, 26 deletions
src/c/Python/PyTypes.h
src/c/ScriptCmds/ArgConverter.h
+1
-0
1 addition, 0 deletions
src/c/ScriptCmds/ArgConverter.h
with
25 additions
and
26 deletions
src/c/Python/PyTypes.h
+
24
−
26
View file @
cbcf6595
...
...
@@ -154,26 +154,24 @@ namespace Script
if
(
!
info
.
contiguous
)
throw
ArrayTypeError
(
"Numpy array must be contiguous"
);
void
*
data
=
PyArray_DATA
(
pyArray
);
std
::
size_t
array_size
=
PyArray_SIZE
(
pyArray
);
Script
::
IdType
type
=
Array
::
getType
(
pyArray
);
if
(
type
==
ID_FROM_TYPE
(
bool
)
)
copyConvertArray
<
CopyDir
>
(
outPtr
,
reinterpret_cast
<
bool
*
>
(
data
),
array_size
);
copyConvertArray
<
CopyDir
>
(
outPtr
,
Array
::
getData
<
bool
>
(
pyArray
),
array_size
);
else
if
(
type
==
ID_FROM_TYPE
(
uint8_t
)
)
copyConvertArray
<
CopyDir
>
(
outPtr
,
reinterpret_cast
<
uint8_t
*
>
(
data
),
array_size
);
copyConvertArray
<
CopyDir
>
(
outPtr
,
Array
::
getData
<
uint8_t
>
(
pyArray
),
array_size
);
else
if
(
type
==
ID_FROM_TYPE
(
uint16_t
)
)
copyConvertArray
<
CopyDir
>
(
outPtr
,
reinterpret_cast
<
uint16_t
*
>
(
data
),
array_size
);
copyConvertArray
<
CopyDir
>
(
outPtr
,
Array
::
getData
<
uint16_t
>
(
pyArray
),
array_size
);
else
if
(
type
==
ID_FROM_TYPE
(
int16_t
)
)
copyConvertArray
<
CopyDir
>
(
outPtr
,
reinterpret_cast
<
int16_t
*
>
(
data
),
array_size
);
copyConvertArray
<
CopyDir
>
(
outPtr
,
Array
::
getData
<
int16_t
>
(
pyArray
),
array_size
);
else
if
(
type
==
ID_FROM_TYPE
(
uint32_t
)
)
copyConvertArray
<
CopyDir
>
(
outPtr
,
reinterpret_cast
<
uint32_t
*
>
(
data
),
array_size
);
copyConvertArray
<
CopyDir
>
(
outPtr
,
Array
::
getData
<
uint32_t
>
(
pyArray
),
array_size
);
else
if
(
type
==
ID_FROM_TYPE
(
int32_t
)
)
copyConvertArray
<
CopyDir
>
(
outPtr
,
reinterpret_cast
<
int32_t
*
>
(
data
),
array_size
);
copyConvertArray
<
CopyDir
>
(
outPtr
,
Array
::
getData
<
int32_t
>
(
pyArray
),
array_size
);
else
if
(
type
==
ID_FROM_TYPE
(
float
)
)
copyConvertArray
<
CopyDir
>
(
outPtr
,
reinterpret_cast
<
float
*
>
(
data
),
array_size
);
copyConvertArray
<
CopyDir
>
(
outPtr
,
Array
::
getData
<
float
>
(
pyArray
),
array_size
);
else
if
(
type
==
ID_FROM_TYPE
(
double
)
)
copyConvertArray
<
CopyDir
>
(
outPtr
,
reinterpret_cast
<
double
*
>
(
data
),
array_size
);
copyConvertArray
<
CopyDir
>
(
outPtr
,
Array
::
getData
<
double
>
(
pyArray
),
array_size
);
else
throw
ArrayTypeError
(
"Unsupported numpy array type: %x"
,
type
);
}
...
...
@@ -235,22 +233,22 @@ namespace Script
// Python string conversion
inline
static
std
::
string
toString
(
ObjectType
*
pyObj
)
inline
static
ObjectType
*
fromString
(
const
char
*
str
)
{
if
(
PyStr_Check
(
pyObj
)
)
return
PyStr_AsUTF8
(
pyObj
);
throw
ArgConvertError
(
nullptr
,
"Expected a string argument"
);
return
PyStr_FromString
(
str
);
}
inline
static
Py
Object
*
fromString
(
const
char
*
str
)
inline
static
Object
Type
*
fromString
(
const
std
::
string
&
str
)
{
return
PyStr_F
romString
(
str
);
return
f
romString
(
str
.
c_str
()
);
}
inline
static
PyObject
*
fromString
(
const
std
::
string
&
str
)
inline
static
std
::
string
toString
(
ObjectType
*
pyObj
)
{
return
fromString
(
str
.
c_str
());
if
(
!
PyStr_Check
(
pyObj
)
)
throw
ArgConvertError
(
nullptr
,
"Expected a string argument"
);
return
PyStr_AsUTF8
(
pyObj
);
}
...
...
@@ -259,7 +257,7 @@ namespace Script
template
<
typename
T
,
ENABLE_CHK
(
NUMERIC_MATCH
(
T
))>
inline
static
ObjectType
*
fromVec
(
const
Vec
<
T
>&
vec
)
{
Py
Object
*
outPtr
=
PyTuple_New
(
3
);
Object
Type
*
outPtr
=
PyTuple_New
(
3
);
for
(
int
i
=
0
;
i
<
3
;
++
i
)
PyTuple_SetItem
(
outPtr
,
i
,
fromNumeric
(
vec
.
e
[
i
]));
...
...
@@ -342,13 +340,11 @@ namespace Script
throw
ArrayTypeError
(
"Expected a numpy array"
);
Script
::
DimInfo
info
=
Script
::
getDimInfo
(
pyArray
);
// TODO: Do we need to allow overloads for array checks?
if
(
!
info
.
contiguous
)
throw
ImageConvertError
(
"Only contiguous numpy arrays are supported"
);
Script
::
IdType
type
=
Script
::
Array
::
getType
(
pyArray
);
if
(
Script
::
TypeToIdMap
<
T
>::
typeId
!=
type
)
if
(
ID_FROM_TYPE
(
T
)
!=
type
)
throw
ImageConvertError
(
"Expected numpy array of type: %s"
,
NAME_FROM_TYPE
(
T
));
return
ImageView
<
T
>
(
Script
::
Array
::
getData
<
T
>
(
pyArray
),
Script
::
makeImageDims
(
info
));
...
...
@@ -363,12 +359,14 @@ namespace Script
throw
ArrayTypeError
(
"Expected a numpy array"
);
Script
::
DimInfo
info
=
Script
::
getDimInfo
(
pyArray
);
if
(
!
info
.
contiguous
)
throw
ImageConvertError
(
"Only contiguous numpy arrays are supported"
);
ImageDimensions
inDims
=
Script
::
makeImageDims
(
info
);
ImageOwner
<
T
>
out
(
inDims
);
ImageOwner
<
T
>
out
Im
(
inDims
);
arrayCopy
(
out
.
getPtr
(),
pyArray
);
return
out
;
arrayCopy
(
out
Im
.
getPtr
(),
pyArray
);
return
out
Im
;
}
};
...
...
This diff is collapsed.
Click to expand it.
src/c/ScriptCmds/ArgConverter.h
+
1
−
0
View file @
cbcf6595
...
...
@@ -76,6 +76,7 @@ namespace Script
// Specific composites selector types
using
OutputSel
=
typename
S_Out
<>::
selector
;
using
InOptSel
=
typename
S_InOpt
<>::
selector
;
using
InputSel
=
typename
S_In
<>::
selector
;
using
OptionalSel
=
typename
S_Opt
<>::
selector
;
using
DeferredSel
=
typename
S_Defer
<>::
selector
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment