change package name to sophus_pybind to avoid confusion with sympy's …

…pysophus
strasdat · Sep 25, 2023 · 1d12c8c · 1d12c8c
1 parent 191178e
commit 1d12c8c
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 12 deletions.
diff --git a/...hub/workflows/build-and-test-pysophus.yml → ...orkflows/build-and-test-sophus-pybind.yml b/...hub/workflows/build-and-test-pysophus.yml → ...orkflows/build-and-test-sophus-pybind.yml
@@ -8,7 +8,7 @@ on:
 
 jobs:
   build:
-    name: Build pysophus on ${{ matrix.os }} / ${{ matrix.cmakeOptions }}
+    name: Build sophus_pybind on ${{ matrix.os }} / ${{ matrix.cmakeOptions }}
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
@@ -46,7 +46,7 @@ jobs:
               exit 1
           fi
 
-      - name: Install pysophus
+      - name: Install sophus_pybind
         shell: bash
         run: |
           # Installing Python and dependencies
@@ -63,6 +63,6 @@ jobs:
           # Build and install Python bindings
           pip3 install .
 
-      - name: Run pysophus tests
+      - name: Run sophus_pybind tests
         shell: bash
-        run: python3 -m pytest pysophus/tests/sophusPybindTests.py
+        run: python3 -m pytest sophus_pybind/tests/sophusPybindTests.py
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -165,8 +165,8 @@ if(BUILD_PYTHON_BINDINGS)
   FetchContent_MakeAvailable(pybind11)
 
   add_subdirectory(${pybind11_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/pybind)
-  pybind11_add_module(pysophus ${CMAKE_CURRENT_SOURCE_DIR}/pysophus/bindings.cpp)
-  target_link_libraries(pysophus PUBLIC sophus)
+  pybind11_add_module(sophus_pybind ${CMAKE_CURRENT_SOURCE_DIR}/sophus_pybind/bindings.cpp)
+  target_link_libraries(sophus_pybind PUBLIC sophus)
 endif(BUILD_PYTHON_BINDINGS)
 
 if(SOPHUS_INSTALL)

diff --git a/pysophus/bindings.cpp b/pysophus/bindings.cpp
diff --git a/setup.py b/setup.py
@@ -132,12 +132,12 @@ def main():
     # The information here can also be placed in setup.cfg - better separation of
     # logic and declaration, and simpler if you include description/version in a file.
     setup(
-        name="pysophus",
+        name="sophus_pybind",
         version="1.22.10",
         description="Sophus python API",
         long_description="Python API for sophus library",
         url="https://github.com/strasdat/sophus",
-        ext_modules=[CMakeExtension("pysophus", sourcedir=ROOT_DIR)],
+        ext_modules=[CMakeExtension("sophus_pybind", sourcedir=ROOT_DIR)],
         author="Cheng Peng, David Caruso",
         cmdclass={"build_ext": CMakeBuild},
         zip_safe=False,

diff --git a/pysophus/SE3PyBind.h → sophus_pybind/SE3PyBind.h b/pysophus/SE3PyBind.h → sophus_pybind/SE3PyBind.h
diff --git a/pysophus/SO3PyBind.h → sophus_pybind/SO3PyBind.h b/pysophus/SO3PyBind.h → sophus_pybind/SO3PyBind.h
diff --git a/pysophus/SophusPyBind.h → sophus_pybind/SophusPyBind.h b/pysophus/SophusPyBind.h → sophus_pybind/SophusPyBind.h
diff --git a/sophus_pybind/bindings.cpp b/sophus_pybind/bindings.cpp
@@ -0,0 +1,3 @@
+#include "SophusPyBind.h"
+
+PYBIND11_MODULE(sophus_pybind, m) { Sophus::exportSophus(m); }
diff --git a/pysophus/tests/sophusPybindTests.py → sophus_pybind/tests/sophusPybindTests.py b/pysophus/tests/sophusPybindTests.py → sophus_pybind/tests/sophusPybindTests.py
@@ -1,7 +1,7 @@
 import unittest
 
 import numpy as np
-from pysophus import interpolate, iterativeMean, SE3, SO3
+from sophus_pybind import interpolate, iterativeMean, SE3, SO3
 
 
 class SophusPybindTest(unittest.TestCase):
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		#include "SophusPyBind.h"

		PYBIND11_MODULE(sophus_pybind, m) { Sophus::exportSophus(m); }