From 78a13afb258b6cd345c496fb69d431a7ae0ae0c1 Mon Sep 17 00:00:00 2001 From: Evan Pratten Date: Sat, 29 May 2021 15:37:38 -0400 Subject: [PATCH] functional python interop --- .vscode/settings.json | 6 +- odm/__main__.py | 9 +- pylibodm/Cargo.toml | 1 + pylibodm/src/lib.rs | 111 ++++++++++++----------- pyproject.toml | 2 + requirements-dev.txt => requirements.txt | 0 scripts/odm.sh | 13 +++ setup.py | 2 +- 8 files changed, 85 insertions(+), 59 deletions(-) create mode 100644 pyproject.toml rename requirements-dev.txt => requirements.txt (100%) create mode 100755 scripts/odm.sh diff --git a/.vscode/settings.json b/.vscode/settings.json index e2c18d1..293289a 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,5 +1,9 @@ { "files.associations": { "ostream": "cpp" - } + }, + "rust-analyzer.diagnostics.disabled": [ + "macro-error", + "unresolved-macro-call", + ] } \ No newline at end of file diff --git a/odm/__main__.py b/odm/__main__.py index f6c0430..9563260 100644 --- a/odm/__main__.py +++ b/odm/__main__.py @@ -1,10 +1,15 @@ import argparse import sys +import logging import os +FORMAT = '%(levelname)s %(name)s %(asctime)-15s %(filename)s:%(lineno)d %(message)s' +logging.basicConfig(format=FORMAT) +logging.getLogger().setLevel(logging.DEBUG) + # Load in libodm -sys.path.append(os.getcwd() + "/target/debug/") -import pylibodm +sys.path.append(os.getcwd() + "/target/debug") +import libpylibodm as pylibodm def main() -> int: # Handle program arguments diff --git a/pylibodm/Cargo.toml b/pylibodm/Cargo.toml index f27b289..0bc4c0f 100644 --- a/pylibodm/Cargo.toml +++ b/pylibodm/Cargo.toml @@ -11,6 +11,7 @@ crate-type = ["cdylib"] [dependencies] libodm = { version = "0.1.0", path = "../libodm"} +pyo3-log = "0.3.1" [dependencies.pyo3] version = "0.13.2" diff --git a/pylibodm/src/lib.rs b/pylibodm/src/lib.rs index fdc5323..ba454a0 100644 --- a/pylibodm/src/lib.rs +++ b/pylibodm/src/lib.rs @@ -2,32 +2,28 @@ use libodm::leapmotion::device::LeapMotionDevice; pub(crate) static mut DEVICE_INSTANCE: Option = None; -mod errors { - use libodm::leapmotion::device::DeviceError; - use pyo3::{exceptions::PyOSError, prelude::*}; +use libodm::leapmotion::device::DeviceError; +use pyo3::{exceptions::PyOSError, prelude::*}; - #[derive(Debug)] - pub struct PyDeviceError(DeviceError); +#[derive(Debug)] +pub struct PyDeviceError(DeviceError); - impl From for PyDeviceError { - fn from(e: DeviceError) -> Self { - Self { 0: e } - } +impl From for PyDeviceError { + fn from(e: DeviceError) -> Self { + Self { 0: e } } +} - impl std::convert::From for PyErr { - fn from(err: PyDeviceError) -> PyErr { - PyOSError::new_err(format!("{:?}", err.0)) - } +impl std::convert::From for PyErr { + fn from(err: PyDeviceError) -> PyErr { + PyOSError::new_err(format!("{:?}", err.0)) } } use std::time::Duration; use libodm::{image::Image, leapmotion::device::DeviceFrame}; -use pyo3::prelude::*; - -use crate::errors::PyDeviceError; +use pyo3::wrap_pyfunction; #[pyclass] struct PyImage { @@ -63,47 +59,52 @@ impl IntoPy for DeviceFrame<'_> { } } -#[pymodule] -pub fn pylibodm(py: Python, m: &PyModule) -> PyResult<()> { - #[pyfn(m, "connect")] - fn connect(timeout_secs: u64) -> Result<(), PyDeviceError> { - // Create a leap device - let device = LeapMotionDevice::create_device(Duration::from_secs(timeout_secs))?; +#[pyfunction] +fn connect(timeout_secs: u64) -> Result<(), PyDeviceError> { + // Create a leap device + let device = LeapMotionDevice::create_device(Duration::from_secs(timeout_secs))?; - // Override the instance - unsafe { - DEVICE_INSTANCE = Some(device); - } - - Ok(()) - } - - #[pyfn(m, "set_cameras_flipped")] - fn set_cameras_flipped(flipped: bool) -> PyResult<()> { - unsafe { - DEVICE_INSTANCE - .as_mut() - .unwrap() - .set_cameras_flipped(flipped); - } - - Ok(()) - } - - #[pyfn(m, "get_cameras_flipped")] - fn get_cameras_flipped() -> PyResult { - Ok(unsafe { DEVICE_INSTANCE.as_ref().unwrap().cameras_flipped() }) - } - - #[pyfn(m, "has_frame")] - fn has_frame() -> PyResult { - Ok(unsafe { DEVICE_INSTANCE.as_mut().unwrap().has_frame() }) - } - - #[pyfn(m, "get_frame")] - fn get_frame(py: Python) -> Result { - Ok(unsafe { DEVICE_INSTANCE.as_mut().unwrap().get_frame()?.into_py(py) }) + // Override the instance + unsafe { + DEVICE_INSTANCE = Some(device); } Ok(()) } + +#[pyfunction] +fn set_cameras_flipped(flipped: bool) { + unsafe { + DEVICE_INSTANCE + .as_mut() + .unwrap() + .set_cameras_flipped(flipped); + } +} + +#[pyfunction] +fn get_cameras_flipped() -> bool { + unsafe { DEVICE_INSTANCE.as_ref().unwrap().cameras_flipped() } +} + +#[pyfunction] +fn has_frame() -> bool { + unsafe { DEVICE_INSTANCE.as_mut().unwrap().has_frame() } +} + +#[pyfunction] +fn get_frame(py: Python) -> Result { + Ok(unsafe { DEVICE_INSTANCE.as_mut().unwrap().get_frame()?.into_py(py) }) +} + +/// Python wrapper for libodm +#[pymodule] +fn libpylibodm(py: Python<'_>, m: &PyModule) -> PyResult<()> { + pyo3_log::init(); + m.add_function(wrap_pyfunction!(get_frame, m)?)?; + m.add_function(wrap_pyfunction!(has_frame, m)?)?; + m.add_function(wrap_pyfunction!(get_cameras_flipped, m)?)?; + m.add_function(wrap_pyfunction!(set_cameras_flipped, m)?)?; + m.add_function(wrap_pyfunction!(connect, m)?)?; + Ok(()) +} diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..bb8f136 --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,2 @@ +[build-system] +requires = ["setuptools>=41.0.0", "wheel", "setuptools_rust>=0.10.2"] \ No newline at end of file diff --git a/requirements-dev.txt b/requirements.txt similarity index 100% rename from requirements-dev.txt rename to requirements.txt diff --git a/scripts/odm.sh b/scripts/odm.sh new file mode 100755 index 0000000..d830667 --- /dev/null +++ b/scripts/odm.sh @@ -0,0 +1,13 @@ +#! /bin/bash +# This is a small wrapper script to handle configuring your library path before executing ODM + +set -e + +echo "Enabling core dumps" +ulimit -c unlimited + +echo "Building deps" +cargo build + +echo "Starting python with new flags" +LD_LIBRARY_PATH="$(pwd)/libodm/dist:$LD_LIBRARY_PATH" python3 odm $@ \ No newline at end of file diff --git a/setup.py b/setup.py index fd2f9a9..7b3faa8 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ from setuptools_rust import RustExtension setup( name="odm", - version="0.1.0", + version="0.1.1", classifiers=[ "Development Status :: 3 - Alpha", "Intended Audience :: Developers",