WIP: testing new ci with wrap

.github/workflows/win-build.yml

@@ -7,7 +7,6 @@ on:
     branches: ["main"]
 
 
-
 env:
   BUILD_TYPE: Release
   VCPKG_FILE: c:/vcpkg/scripts/buildsystems/vcpkg.cmake
@@ -19,6 +18,12 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - name: Setup conda environment
+        uses: conda-incubator/setup-miniconda@v2
+        with:
+          environment-file: environment.yml
+          activate-environment: diff_check
+
       - name: CMAKE Configure
         run: ${{github.workspace}}/cmake/config.bat
       - name: CMake Build

.vscode/settings.json

@@ -97,6 +97,13 @@
         "*.inc": "cpp",
         "coroutine": "cpp",
         "resumable": "cpp",
-        "*.ipp": "cpp"
+        "*.ipp": "cpp",
+        "cinttypes": "cpp",
+        "codecvt": "cpp",
+        "csetjmp": "cpp",
+        "cwctype": "cpp",
+        "memory_resource": "cpp",
+        "scoped_allocator": "cpp",
+        "strstream": "cpp"
     }
 }

CMakeLists.txt

@@ -128,10 +128,40 @@ target_include_directories(${APP_NAME_EXE}
 # pybind11
 #--------------------------------------------------------------------------
 set(PYBINDMODULE_NAME diffCheckBindings)
+set(PYPI_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/gh/diffCheck/diffCheck)
+set(TARGET_DLL_PYPI_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/gh/diffCheck/diffCheck/dlls)
 
 download_submodule_project(pybind11)
 add_subdirectory(deps/pybind11)
 
+find_package(Python3 COMPONENTS Interpreter Development REQUIRED)
+
+message(STATUS "Python3_EXECUTABLE: ${Python3_EXECUTABLE}")
+message(STATUS "Python3_INCLUDE_DIRS: ${Python3_INCLUDE_DIRS}")
+message(STATUS "Python3_LIBRARIES: ${Python3_LIBRARIES}")
+message(STATUS "Python3_VERSION: ${Python3_VERSION}")
+
+set(PYBIND11_PYTHON_VERSION 3.9.10)
+
 pybind11_add_module(${PYBINDMODULE_NAME} src/diffCheckBindings.cc)
+
 target_link_libraries(${PYBINDMODULE_NAME} PRIVATE ${SHARED_LIB_NAME})
-target_include_directories(${PYBINDMODULE_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/src)
+target_include_directories(${PYBINDMODULE_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/src)
+
+add_custom_command(TARGET ${PYBINDMODULE_NAME} POST_BUILD
+    COMMAND ${CMAKE_COMMAND} -E copy_if_different
+    $<TARGET_FILE:${PYBINDMODULE_NAME}>
+    ${PYPI_DIR}
+    )
+
+add_custom_command(TARGET ${PYBINDMODULE_NAME} POST_BUILD
+    COMMAND ${CMAKE_COMMAND} -E copy_if_different
+    $<TARGET_FILE:${SHARED_LIB_NAME}>
+    ${TARGET_DLL_PYPI_DIR}
+    )
+# TODO: for open3d-dll is working but it should be done in a more elegant way
+add_custom_command(TARGET ${PYBINDMODULE_NAME} POST_BUILD
+    COMMAND ${CMAKE_COMMAND} -E copy_if_different
+    $<TARGET_FILE:Open3D::Open3D>
+    ${TARGET_DLL_PYPI_DIR}
+    )

cmake/activate_conda.bat

@@ -0,0 +1,58 @@
+@echo off
+setlocal
+
+REM ########################################################################
+REM check if conda is available > 
+REM check that diff_check environment is available > 
+REM activate it
+REM ########################################################################
+
+REM Check if conda command is available
+echo Checking if conda command is available...
+where conda >nul 2>nul
+if %ERRORLEVEL% equ 0 (
+    echo Conda command is available.
+    goto :end
+)
+if exist "%USERPROFILE%\Anaconda3" (
+    echo Anaconda3 found in %USERPROFILE%\Anaconda3.
+    goto :end
+)
+if exist "%ProgramData%\Anaconda3" (
+    echo Anaconda3 found in %ProgramData%\Anaconda3.
+    goto :end
+)
+if exist "%ProgramFiles%\Anaconda3" (
+    echo Anaconda3 found in %ProgramFiles%\Anaconda3.
+    goto :end
+)
+echo Anaconda3 not found, you won't be able to build the python wrap for diffcheck. Please install it first.
+exit /b 1
+
+:end
+echo Anaconda3 found.
+
+REM Check if the diff_check environment is available
+call conda env list | findstr /C:"diff_check" >nul 2>nul
+if %ERRORLEVEL% neq 0 (
+    echo diff_check environment not found, creating it now...
+
+    call conda env create -f environment.yml
+    if %ERRORLEVEL% neq 0 (
+        echo Failed to create diff_check environment, please check the environment.yml file.
+        exit /b 1
+    )
+) else (
+    echo diff_check environment is available, updating it now...
+
+    call conda env update --name diff_check --file environment.yml --prune
+    if %ERRORLEVEL% neq 0 (
+        echo Failed to update diff_check environment, please check the environment.yml file.
+        exit /b 1
+    )
+)
+echo diff_check environment is up to date.
+
+REM activate the diff_check environment
+call conda activate diff_check
+echo diff_check environment activated.

cmake/build.bat

@@ -1 +1,8 @@
+@echo off
+setlocal
+
+REM activate the conda diff_check environment otherwise the python wrap won't work
+call cmake/activate_conda.bat
+
+REM build the project in Release mode
 cmake --build build --config Release

cmake/clean_config.bat

@@ -1,2 +1,11 @@
+@echo off
+setlocal
+
+REM activate the conda diff_check environment otherwise the python wrap won't work
+call cmake/activate_conda.bat
+
+REM clean the build directory and reconfigure it
 rmdir /s /q build
+
+REM configure the project
 cmake -S . -B build -G "Visual Studio 16 2019" -A x64

cmake/config.bat

@@ -1 +1,8 @@
-cmake -S . -B build
+@echo off
+setlocal
+
+REM activate the conda diff_check environment otherwise the python wrap won't work
+call cmake/activate_conda.bat
+
+REM configure the project
+cmake -S . -B build -G "Visual Studio 16 2019" -A x64

src/diffCheckBindings.cc

@@ -7,10 +7,13 @@
 
 namespace py = pybind11;
 
+bool test() { return true; }
 
 PYBIND11_MODULE(diffCheckBindings, m) {
     m.doc() = "diffCheck python bindings"; // optional module docstring
 
+    m.def("test", &test, "A function that returns true for testing import");
+
     py::class_<diffCheck::geometry::DFPointCloud>(m, "DFPointCloud")
         .def(py::init<>())
         .def(py::init<std::vector<Eigen::Vector3d>, std::vector<Eigen::Vector3d>, std::vector<Eigen::Vector3d>>())
@@ -20,15 +23,4 @@ PYBIND11_MODULE(diffCheckBindings, m) {
         .def("ComputeBoundingBox", &diffCheck::geometry::DFPointCloud::ComputeBoundingBox)
 
         .def("get_num_points", &diffCheck::geometry::DFPointCloud::GetNumPoints);
-}
-
-
-// #include <pybind11/pybind11.h>
-
-// int add(int i, int j) {
-//     return i + j;
-// }
-
-// PYBIND11_MODULE(diffCheckBindings, m) {
-//     m.def("add", &add, "A function which adds two numbers");
-// }
+}

src/gh/diffCheck/diffCheck.egg-info/PKG-INFO

@@ -1,18 +1,19 @@
 Metadata-Version: 2.1
 Name: diffCheck
-Version: 0.0.3
+Version: 0.0.17
 Summary: DiffCheck is a package to check the differences between two timber structures
 Home-page: https://github.com/diffCheckOrg/diffCheck
 Author: Andrea Settimi, Damien Gilliard, Eleni Skevaki, Marirena Kladeftira, Julien Gamerro, Stefana Parascho, and Yves Weinand
 Author-email: [email protected]
-License: UNKNOWN
-Description: # DiffCheck Grasshopper Plugin
-
-        DiffCheck is a plugin for Rhino/Grasshopper that allows the user to compare a 3D model with its scan. 
-
-        More information to come
-Platform: UNKNOWN
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3.9
 Description-Content-Type: text/markdown
+Requires-Dist: numpy
+Requires-Dist: pybind11>=2.5.0
+
+# DiffCheck Grasshopper Plugin
+
+DiffCheck is a plugin for Rhino/Grasshopper that allows the user to compare a 3D model with its scan. 
+
+More information to come

src/gh/diffCheck/diffCheck.egg-info/SOURCES.txt

@@ -5,9 +5,10 @@ diffCheck/df_geometries.py
 diffCheck/df_joint_detector.py
 diffCheck/df_transformations.py
 diffCheck/df_util.py
-diffCheck/diffCheck_app.py
-diffCheck/test.py
+diffCheck/diffCheckBindings.cp39-win_amd64.pyd
+diffCheck/newmodule.py
 diffCheck.egg-info/PKG-INFO
 diffCheck.egg-info/SOURCES.txt
 diffCheck.egg-info/dependency_links.txt
+diffCheck.egg-info/requires.txt
 diffCheck.egg-info/top_level.txt

src/gh/diffCheck/diffCheck.egg-info/requires.txt

@@ -1 +1,2 @@
 numpy
+pybind11>=2.5.0

src/gh/diffCheck/diffCheck/__init__.py

@@ -1 +1,8 @@
-__version__ = "0.0.9"
+import os
+import sys
+
+__version__ = "0.0.17"
+
+PATH_TO_DLL = "dlls"
+extra_dll_dir = os.path.join(os.path.dirname(__file__), PATH_TO_DLL)
+os.add_dll_directory(extra_dll_dir)

src/gh/diffCheck/diffCheck_app.py

@@ -9,9 +9,27 @@
 import diffCheck
 import diffCheck.df_geometries
 
+# import diffCheck.diffCheckBindings
+
 import sys
-sys.path.append(R"F:\diffCheck\build\Release")
-import diffCheckBindings
+import platform
+print(sys.version)
+print(platform.architecture())
+
+# import sys
+# sys.path.append(R"F:\diffCheck\build\Release")
+# os.add_dll_directory(R"F:\diffCheck\build\Release")
+from diffCheck import diffCheckBindings
+
+print(f"is pyd working: {diffCheckBindings.test()}")
+
+
+df_cloud = diffCheckBindings.DFPointCloud(
+    [[0, 0, 0], [1, 0, 0], [1, 1, 0], [0, 1, 0]],
+    [[0, 0, 0], [1, 0, 0], [1, 1, 0], [0, 1, 0]],
+    [[0, 0, 0], [1, 0, 0], [1, 1, 0], [0, 1, 0]]
+)
+print(df_cloud.get_num_points())
 
 print(diffCheck.__version__)
 

src/gh/diffCheck/setup.py

@@ -1,11 +1,18 @@
 from setuptools import setup, find_packages
+from setuptools import setup, Extension
+from setuptools.command.build_ext import build_ext
+import sys
+import setuptools
+
+
 
 setup(
     name="diffCheck",
-    version="0.0.9",
+    version="0.0.17",
     packages=find_packages(),
     install_requires=[
         "numpy",
+        "pybind11>=2.5.0"
         # other dependencies...
     ],
     description="DiffCheck is a package to check the differences between two timber structures",
@@ -19,4 +26,8 @@
         "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 3.9",
     ],
+    # include_package_data=True,
+    package_data={
+        "diffCheck": ["diffCheck/dlls/*.dll", "*.pyd"]
+        },
 )