Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
E
eigenpy
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD 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
Stack Of Tasks
eigenpy
Commits
3a9d5a30
Verified
Commit
3a9d5a30
authored
5 years ago
by
Justin Carpentier
Browse files
Options
Downloads
Patches
Plain Diff
core: rename EigenObjectAllocator into EigenAllocator
parent
a805df9a
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
include/eigenpy/details.hpp
+3
-3
3 additions, 3 deletions
include/eigenpy/details.hpp
include/eigenpy/eigen-allocator.hpp
+3
-3
3 additions, 3 deletions
include/eigenpy/eigen-allocator.hpp
with
6 additions
and
6 deletions
include/eigenpy/details.hpp
+
3
−
3
View file @
3a9d5a30
...
...
@@ -91,8 +91,8 @@ namespace eigenpy
NumpyEquivalentType
<
Scalar
>::
type_code
);
}
//
Allocate memory
Eigen
Object
Allocator
<
MatType
>::
copy
(
mat
,
pyArray
);
//
Copy data
EigenAllocator
<
MatType
>::
copy
(
mat
,
pyArray
);
// Create an instance (either np.array or np.matrix)
return
NumpyType
::
getInstance
().
make
(
pyArray
).
ptr
();
...
...
@@ -271,7 +271,7 @@ namespace eigenpy
void
*
storage
=
reinterpret_cast
<
bp
::
converter
::
rvalue_from_python_storage
<
MatType
>*>
(
reinterpret_cast
<
void
*>
(
memory
))
->
storage
.
bytes
;
Eigen
Object
Allocator
<
MatType
>::
allocate
(
pyArray
,
storage
);
EigenAllocator
<
MatType
>::
allocate
(
pyArray
,
storage
);
memory
->
convertible
=
storage
;
}
...
...
This diff is collapsed.
Click to expand it.
include/eigenpy/eigen-allocator.hpp
+
3
−
3
View file @
3a9d5a30
...
...
@@ -92,7 +92,7 @@ namespace eigenpy
details::cast_matrix_or_array<Scalar,NewScalar>::run(mat,MapNumpy<MatType,NewScalar>::map(pyArray))
template
<
typename
MatType
>
struct
Eigen
Object
Allocator
struct
EigenAllocator
{
typedef
MatType
Type
;
typedef
typename
MatType
::
Scalar
Scalar
;
...
...
@@ -194,7 +194,7 @@ namespace eigenpy
#if EIGEN_VERSION_AT_LEAST(3,2,0)
template
<
typename
MatType
>
struct
Eigen
Object
Allocator
<
eigenpy
::
Ref
<
MatType
>
>
struct
EigenAllocator
<
eigenpy
::
Ref
<
MatType
>
>
{
typedef
eigenpy
::
Ref
<
MatType
>
Type
;
typedef
typename
MatType
::
Scalar
Scalar
;
...
...
@@ -207,7 +207,7 @@ namespace eigenpy
static
void
copy
(
Type
const
&
mat
,
PyArrayObject
*
pyArray
)
{
Eigen
Object
Allocator
<
MatType
>::
copy
(
mat
,
pyArray
);
EigenAllocator
<
MatType
>::
copy
(
mat
,
pyArray
);
}
};
#endif
...
...
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