Unverified Commit f7dea5be authored by Justin Carpentier's avatar Justin Carpentier Committed by GitHub
Browse files

Merge pull request #1228 from jcarpent/devel

Fix lib Python name for Windows compatibility
parents 97c8f736 37bd32da
......@@ -114,6 +114,8 @@ SET(${PYWRAP}_HEADERS ${${PROJECT_NAME}_PYTHON_HEADERS})
IF(BUILD_PYTHON_INTERFACE)
ADD_LIBRARY(${PYWRAP} SHARED ${${PYWRAP}_SOURCES} ${${PYWRAP}_HEADERS})
ADD_DEPENDENCIES(python ${PYWRAP})
SET_TARGET_PROPERTIES(${PYWRAP} PROPERTIES PREFIX "") # Remove lib prefix for the target
# Do not report:
# -Wconversion as the BOOST_PYTHON_FUNCTION_OVERLOADS implicitly converts.
......
......@@ -21,7 +21,7 @@
namespace bp = boost::python;
using namespace pinocchio::python;
BOOST_PYTHON_MODULE(libpinocchio_pywrap)
BOOST_PYTHON_MODULE(pinocchio_pywrap)
{
bp::docstring_options module_docstring_options(true,true,false);
......
......@@ -3,9 +3,9 @@
#
import numpy
from .libpinocchio_pywrap import *
from .pinocchio_pywrap import *
from .libpinocchio_pywrap import __version__, __raw_version__
from .pinocchio_pywrap import __version__, __raw_version__
from . import utils
from .explog import exp, log
......
#
# Copyright (c) 2018-2019 CNRS INRIA
# Copyright (c) 2018-2020 CNRS INRIA
#
## In this file, are reported some deprecated functions that are still maintained until the next important future releases ##
......@@ -8,7 +8,7 @@ from __future__ import print_function
import warnings as _warnings
from . import libpinocchio_pywrap as pin
from . import pinocchio_pywrap as pin
from .deprecation import deprecated, DeprecatedWarning
# This function is only deprecated when using a specific signature. Therefore, it needs special care
......@@ -67,11 +67,11 @@ forwardDynamics.__doc__ = (
@deprecated("This function has been renamed computeJointJacobian and will be removed in future releases of Pinocchio. Please change for new computeJointJacobian.")
def jointJacobian(model, data, q, jointId):
return pin.computeJointJacobian(model,data,q,jointId)
@deprecated("This function has been renamed computeFrameJacobian and will be removed in future releases of Pinocchio. Please change for new computeFrameJacobian.")
def frameJacobian(model, data, q, frameId):
return pin.computeFrameJacobian(model,data,q,frameId)
def computeCentroidalDynamics(model, data, q, v, a = None):
if a is None:
message = ("This function signature has been renamed and will be removed in future releases of Pinocchio. "
......@@ -124,10 +124,10 @@ def buildGeomFromUrdf(model, filename, *args):
return pin.buildGeomFromUrdf(model,filename,geom_type,package_dir)
else:
return pin.buildGeomFromUrdf(model, filename, *args)
buildGeomFromUrdf.__doc__ = (
pin.buildGeomFromUrdf.__doc__
)
)
@deprecated("This function is now deprecated and will be removed in future releases of Pinocchio. "
"Please change for the new function computePotentialEnergy.")
......
......@@ -7,7 +7,7 @@ import math
import numpy as np
from . import libpinocchio_pywrap as pin
from . import pinocchio_pywrap as pin
def exp(x):
if isinstance(x, pin.Motion):
......
......@@ -2,7 +2,7 @@
# Copyright (c) 2015-2020 CNRS INRIA
#
from . import libpinocchio_pywrap as pin
from . import pinocchio_pywrap as pin
from . import utils
from .deprecation import deprecated
from .shortcuts import buildModelsFromUrdf, createDatas
......
......@@ -4,7 +4,7 @@
import numpy as np
from . import libpinocchio_pywrap as pin
from . import pinocchio_pywrap as pin
from .robot_wrapper import RobotWrapper
......
......@@ -4,7 +4,7 @@
## In this file, some shortcuts are provided ##
from . import libpinocchio_pywrap as pin
from . import pinocchio_pywrap as pin
from . import WITH_HPP_FCL, WITH_HPP_FCL_BINDINGS
nle = pin.nonLinearEffects
......
......@@ -9,8 +9,8 @@ import sys
import numpy as np
import numpy.linalg as npl
from . import libpinocchio_pywrap as pin
from .libpinocchio_pywrap.rpy import matrixToRpy, rpyToMatrix, rotate
from . import pinocchio_pywrap as pin
from .pinocchio_pywrap.rpy import matrixToRpy, rpyToMatrix, rotate
from .deprecation import deprecated
......
from .. import libpinocchio_pywrap as pin
from .. import pinocchio_pywrap as pin
from ..shortcuts import buildModelsFromUrdf, createDatas
import time
......
from .. import libpinocchio_pywrap as pin
from .. import pinocchio_pywrap as pin
from ..shortcuts import buildModelsFromUrdf, createDatas
from ..utils import npToTuple
......
from .. import libpinocchio_pywrap as pin
from .. import pinocchio_pywrap as pin
from ..shortcuts import buildModelsFromUrdf, createDatas
from ..utils import npToTuple
......
import warnings
from .. import libpinocchio_pywrap as pin
from .. import pinocchio_pywrap as pin
from ..utils import npToTuple
from .base_visualizer import BaseVisualizer
......
Subproject commit cbb953a65f33e90ccd575c9ba67cce291774ca18
Subproject commit e715bf761e97dbcd704adecd03c28d8e195e7811
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment