From 837f15f6182e4b78874936e32cdc44dd865c1369 Mon Sep 17 00:00:00 2001 From: 9and3 Date: Wed, 9 Apr 2025 10:26:05 +0200 Subject: [PATCH 1/4] DUMMY: first pr commit --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index ec2fac43..a9d09ab6 100644 --- a/README.md +++ b/README.md @@ -13,6 +13,7 @@ DOI

+ ![demo](https://github.com/user-attachments/assets/3c9f353d-7707-4630-aa6d-fe59cbdeae2f) # DiffCheck: CAD-Scan comparison From 0c52efd41926d8821663c3fb6046f31d48692bc7 Mon Sep 17 00:00:00 2001 From: 9and3 Date: Wed, 9 Apr 2025 10:44:11 +0200 Subject: [PATCH 2/4] FIX-WIP: testing new actions versions --- .github/workflows/doc-build.yml | 4 ++-- .github/workflows/py-sanity-check.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/doc-build.yml b/.github/workflows/doc-build.yml index e3ffcbac..807b0ca6 100644 --- a/.github/workflows/doc-build.yml +++ b/.github/workflows/doc-build.yml @@ -26,7 +26,7 @@ jobs: conda env create -f environment.yml - name: Cache conda environment cache - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: C:\Miniconda\envs\diff_check key: ${{ runner.os }}-conda-${{ hashFiles('environment.yml') }} @@ -73,7 +73,7 @@ jobs: python-version: 3.9.1 - name: Restore conda environment cache - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: C:\Miniconda\envs\diff_check key: ${{ runner.os }}-conda-${{ hashFiles('environment.yml') }} diff --git a/.github/workflows/py-sanity-check.yml b/.github/workflows/py-sanity-check.yml index be84bf35..c1d4b3b2 100644 --- a/.github/workflows/py-sanity-check.yml +++ b/.github/workflows/py-sanity-check.yml @@ -19,7 +19,7 @@ jobs: auto-update-conda: true python-version: 3.9.1 - name: Cache conda environment cache - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: C:\Miniconda\envs\diff_check key: ${{ runner.os }}-conda-${{ hashFiles('environment.yml') }} @@ -32,7 +32,7 @@ jobs: conda env create -f environment.yml - name: Cache pre-commit hooks - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: ~/.cache/pre-commit key: ${{ runner.os }}-precommit-${{ hashFiles('.pre-commit-config.yaml') }} From a46256209075dec4435e10231d214f3c0b710cc2 Mon Sep 17 00:00:00 2001 From: 9and3 Date: Wed, 9 Apr 2025 10:46:33 +0200 Subject: [PATCH 3/4] FIX: for #147 --- src/gh/components/DF_cloud_normal_estimator/code.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gh/components/DF_cloud_normal_estimator/code.py b/src/gh/components/DF_cloud_normal_estimator/code.py index fac8533b..2c0ec1b3 100644 --- a/src/gh/components/DF_cloud_normal_estimator/code.py +++ b/src/gh/components/DF_cloud_normal_estimator/code.py @@ -32,4 +32,4 @@ def RunScript(self, o_cloud = df_cvt_bindings.cvt_dfcloud_2_rhcloud(df_cloud) - return o_cloud + return [o_cloud] From ab2e899480ebfe3c1a25d5c83dbb699c7b223034 Mon Sep 17 00:00:00 2001 From: 9and3 Date: Thu, 10 Apr 2025 11:06:29 +0200 Subject: [PATCH 4/4] WIP: testing CI, working lcoal patch cmake ctest --- .github/workflows/test-pass.yml | 2 +- cmake/tests.cmake | 8 ++++---- deps/eigen | 2 +- deps/pybind11 | 2 +- doc/index.rst | 1 + src/gh/diffCheck/diffCheck.egg-info/PKG-INFO | 12 ++++++++++-- src/gh/diffCheck/diffCheck.egg-info/SOURCES.txt | 2 +- test_save.ply | 3 +++ 8 files changed, 22 insertions(+), 10 deletions(-) create mode 100644 test_save.ply diff --git a/.github/workflows/test-pass.yml b/.github/workflows/test-pass.yml index 540df100..ba142368 100644 --- a/.github/workflows/test-pass.yml +++ b/.github/workflows/test-pass.yml @@ -55,4 +55,4 @@ jobs: - name: Run tests with cmake run: | - conda run --name diff_check ctest --test-dir build --output-on-failure -C Release --verbose \ No newline at end of file + conda run --name diff_check ctest --test-dir build --output-on-failure -C Release --verbose diff --git a/cmake/tests.cmake b/cmake/tests.cmake index 8598f729..8ccaa68c 100644 --- a/cmake/tests.cmake +++ b/cmake/tests.cmake @@ -39,22 +39,22 @@ add_custom_command(TARGET ${PYBINDMODULE_NAME} POST_BUILD copy_dlls(${TARGET_PYBIND_TESTS_DIR} ${PYBINDMODULE_NAME}) add_test(NAME PYBIND_PYVER_TEST - COMMAND ${PYTHON_EXECUTABLE} -m pytest ${CMAKE_CURRENT_SOURCE_DIR}/tests/integration_tests/pybinds_tests/test_pybind_pyver.py + COMMAND "pytest" ${CMAKE_CURRENT_SOURCE_DIR}/tests/integration_tests/pybinds_tests/test_pybind_pyver.py WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} ) add_test(NAME PYBIND_DLL_SMOKE_TEST - COMMAND ${PYTHON_EXECUTABLE} -m pytest ${CMAKE_CURRENT_SOURCE_DIR}/tests/integration_tests/pybinds_tests/test_pybind_dll_smoke.py + COMMAND "pytest" ${CMAKE_CURRENT_SOURCE_DIR}/tests/integration_tests/pybinds_tests/test_pybind_dll_smoke.py WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} ) add_test(NAME PYBIND_UNIT_TEST - COMMAND ${PYTHON_EXECUTABLE} -m pytest ${CMAKE_CURRENT_SOURCE_DIR}/tests/integration_tests/pybinds_tests/test_pybind_units.py + COMMAND "pytest" ${CMAKE_CURRENT_SOURCE_DIR}/tests/integration_tests/pybinds_tests/test_pybind_units.py WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} ) # ------------------------------------------------------------------------------ # Run all tests # ------------------------------------------------------------------------------ -# FIXME: the post build has some problems if the tests are failing MSB3073 +# FIXME: the post build has some problems if the tests are failing MSB3073, it means only the python tests are failing. if (RUN_TESTS) add_custom_command( TARGET ${CPP_UNIT_TESTS} POST_BUILD #TODO: <== this should be set to the latest test suite diff --git a/deps/eigen b/deps/eigen index 8b4efc8e..11fd34cc 160000 --- a/deps/eigen +++ b/deps/eigen @@ -1 +1 @@ -Subproject commit 8b4efc8ed8a65415e248d54fbc9afdd964c94f64 +Subproject commit 11fd34cc1c398f2c2311339ed3b008b1114544eb diff --git a/deps/pybind11 b/deps/pybind11 index 0ed20f26..708ce4d9 160000 --- a/deps/pybind11 +++ b/deps/pybind11 @@ -1 +1 @@ -Subproject commit 0ed20f26acee626ac989568ecc6347e159ddbb47 +Subproject commit 708ce4d9c7bf55075608eb3cfcb5fa0dc43e070f diff --git a/doc/index.rst b/doc/index.rst index 64497a82..ed96de68 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -9,6 +9,7 @@ The software is designed to be user-friendly and can be used either via a Grassh The software is developed by the `Laboratory of Timber Construction (IBOIS)`_ and the `Laboratory for Creative Computation (CRCL)`_ at `Polytechnique Fédérale de Lausanne (EPFL)`_. + .. raw:: html
diff --git a/src/gh/diffCheck/diffCheck.egg-info/PKG-INFO b/src/gh/diffCheck/diffCheck.egg-info/PKG-INFO index 864b437b..f88b43ec 100644 --- a/src/gh/diffCheck/diffCheck.egg-info/PKG-INFO +++ b/src/gh/diffCheck/diffCheck.egg-info/PKG-INFO @@ -1,6 +1,6 @@ -Metadata-Version: 2.1 +Metadata-Version: 2.4 Name: diffCheck -Version: 0.0.37 +Version: 1.3.0 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 @@ -11,6 +11,14 @@ Classifier: Programming Language :: Python :: 3.9 Description-Content-Type: text/markdown Requires-Dist: numpy Requires-Dist: pybind11>=2.5.0 +Dynamic: author +Dynamic: author-email +Dynamic: classifier +Dynamic: description +Dynamic: description-content-type +Dynamic: home-page +Dynamic: requires-dist +Dynamic: summary # DiffCheck: CAD-Scan comparison diff --git a/src/gh/diffCheck/diffCheck.egg-info/SOURCES.txt b/src/gh/diffCheck/diffCheck.egg-info/SOURCES.txt index e64d5fc2..8887cb03 100644 --- a/src/gh/diffCheck/diffCheck.egg-info/SOURCES.txt +++ b/src/gh/diffCheck/diffCheck.egg-info/SOURCES.txt @@ -9,7 +9,7 @@ diffCheck/df_joint_detector.py diffCheck/df_transformations.py diffCheck/df_util.py diffCheck/df_visualization.py -diffCheck/diffcheck_bindings.cp39-win_amd64.pyd +diffCheck/diffcheck_bindings.cp312-win_amd64.pyd diffCheck.egg-info/PKG-INFO diffCheck.egg-info/SOURCES.txt diffCheck.egg-info/dependency_links.txt diff --git a/test_save.ply b/test_save.ply new file mode 100644 index 00000000..7147788f --- /dev/null +++ b/test_save.ply @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7e20354a8b0681cc343a87c7a98ff9e5e9400fb558f88f2e21c7fb1fc7e8bb24 +size 376593