Skip to content

Commit

Permalink
Merge pull request #596 from lmontaut/topic/coal
Browse files Browse the repository at this point in the history
Renamming the library to `Coal`
  • Loading branch information
jorisv authored Nov 20, 2024
2 parents d855ecb + 630f495 commit 4157202
Show file tree
Hide file tree
Showing 417 changed files with 34,763 additions and 34,624 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/conda/environment_macos_linux.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: fcl
name: coal
channels:
- conda-forge
- nodefaults
Expand All @@ -10,7 +10,7 @@ dependencies:
- boost
- eigenpy
- python
- doxygen
- doxygen<1.9.8|>=1.11
- lxml
- pylatexenc
- qhull
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/conda/environment_windows.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: fcl
name: coal
channels:
- conda-forge
- nodefaults
Expand All @@ -10,7 +10,7 @@ dependencies:
- boost
- eigenpy
- python
- doxygen
- doxygen<1.9.8|>=1.11
- lxml
- pylatexenc
- qhull
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/macos-linux-conda.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: Build hpp-fcl for Mac OS X/Linux via Conda
name: Build Coal for Mac OS X/Linux via Conda

on: [push,pull_request]

jobs:
hpp-fcl-conda:
coal-conda:
name: CI on ${{ matrix.os }} with Conda Python ${{ matrix.python-version }} - ${{ matrix.build_type }} ${{ matrix.cxx_options }}
runs-on: ${{ matrix.os }}
env:
Expand Down Expand Up @@ -40,13 +40,13 @@ jobs:

- uses: conda-incubator/setup-miniconda@v3
with:
activate-environment: fcl
activate-environment: coal
auto-update-conda: true
environment-file: .github/workflows/conda/environment_macos_linux.yml
python-version: ${{ matrix.python-version }}
auto-activate-base: false

- name: Build hpp-fcl
- name: Build Coal
shell: bash -el {0}
run: |
conda list
Expand All @@ -65,14 +65,14 @@ jobs:
-DCMAKE_CXX_FLAGS=${{ matrix.cxx_options }} \
-DPYTHON_EXECUTABLE=$(which python3) \
-DGENERATE_PYTHON_STUBS=ON \
-DHPP_FCL_HAS_QHULL=ON \
-DCOAL_HAS_QHULL=ON \
-DBUILD_DOCUMENTATION=ON \
-DINSTALL_DOCUMENTATION=ON
cmake --build . -j2
ctest --output-on-failure
cmake --install .
- name: Uninstall hpp-fcl
- name: Uninstall Coal
shell: bash -el {0}
run: |
cd build
Expand All @@ -83,7 +83,7 @@ jobs:
name: check-macos-linux-conda

needs:
- hpp-fcl-conda
- coal-conda

runs-on: Ubuntu-latest

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/macos-linux-pip.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Build hpp-fcl for Mac OS X/Linux via pip
name: Build Coal for Mac OS X/Linux via pip

on: [push, pull_request]

Expand All @@ -7,7 +7,7 @@ env:
CTEST_PARALLEL_LEVEL: 4

jobs:
hpp-fcl-pip:
coal-pip:
name: "CI on ${{ matrix.os }} / py ${{ matrix.python-version }} with pip"
runs-on: "${{ matrix.os }}-latest"

Expand All @@ -29,6 +29,6 @@ jobs:
- run: python -m pip install -U pip
- run: python -m pip install cmeel-assimp cmeel-octomap cmeel-qhull eigenpy[build]
- run: echo "CMAKE_PREFIX_PATH=$(cmeel cmake)" >> $GITHUB_ENV
- run: cmake -B build -S . -DHPP_FCL_HAS_QHULL=ON
- run: cmake -B build -S . -DCOAL_HAS_QHULL=ON
- run: cmake --build build -j 4
- run: cmake --build build -t test
10 changes: 5 additions & 5 deletions .github/workflows/windows-conda-clang.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Build FCL for Windows (CLANG) via Conda
name: Build Coal for Windows (CLANG) via Conda
on: [push,pull_request]

jobs:
Expand Down Expand Up @@ -33,13 +33,13 @@ jobs:

- uses: conda-incubator/setup-miniconda@v3
with:
activate-environment: fcl
activate-environment: coal
auto-update-conda: true
environment-file: .github/workflows/conda/environment_windows.yml
python-version: "3.10"
auto-activate-base: false

- name: Build FCL
- name: Build Coal
shell: cmd /C CALL {0}
run: |
call "%programfiles(x86)%\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" amd64
Expand All @@ -59,7 +59,7 @@ jobs:
-DGENERATE_PYTHON_STUBS=ON ^
-DPYTHON_SITELIB=%CONDA_PREFIX%\Lib\site-packages ^
-DPYTHON_EXECUTABLE=%CONDA_PREFIX%\python.exe ^
-DHPP_FCL_HAS_QHULL=ON ^
-DCOAL_HAS_QHULL=ON ^
-DBUILD_PYTHON_INTERFACE=ON ^
..
if errorlevel 1 exit 1
Expand All @@ -74,7 +74,7 @@ jobs:
:: Test Python import
cd ..
python -c "import hppfcl"
python -c "import coal"
if errorlevel 1 exit 1
check:
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/windows-conda-v142.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Build FCL for Windows (v142) via Conda
name: Build Coal for Windows (v142) via Conda
on: [push,pull_request]

jobs:
Expand Down Expand Up @@ -32,13 +32,13 @@ jobs:

- uses: conda-incubator/setup-miniconda@v3
with:
activate-environment: fcl
activate-environment: coal
auto-update-conda: true
environment-file: .github/workflows/conda/environment_windows.yml
python-version: "3.10"
auto-activate-base: false

- name: Build FCL
- name: Build Coal
shell: cmd /C CALL {0}
run: |
call "%programfiles(x86)%\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" amd64
Expand All @@ -56,7 +56,7 @@ jobs:
-DGENERATE_PYTHON_STUBS=ON ^
-DPYTHON_SITELIB=%CONDA_PREFIX%\Lib\site-packages ^
-DPYTHON_EXECUTABLE=%CONDA_PREFIX%\python.exe ^
-DHPP_FCL_HAS_QHULL=ON ^
-DCOAL_HAS_QHULL=ON ^
-DBUILD_PYTHON_INTERFACE=ON ^
..
if errorlevel 1 exit 1
Expand All @@ -71,7 +71,7 @@ jobs:
:: Test Python import
cd ..
python -c "import hppfcl"
python -c "import coal"
if errorlevel 1 exit 1
check:
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
## [Unreleased]

### Added
- Renaming the library from `hpp-fcl` to `coal`. Created a `COAL_BACKWARD_COMPATIBILITY_WITH_HPP_FCL` CMake option for retro compatibility. This allows to still do `find_package(hpp-fcl)` and `#include <hpp/fcl/...>` in C++ and it allows to still do `import hppfcl` in python ([#596](https://github.com/humanoid-path-planner/hpp-fcl/pull/596)).
- Added `Transform3f::Random` and `Transform3f::setRandom` ([#584](https://github.com/humanoid-path-planner/hpp-fcl/pull/584))
- New feature: computation of contact surfaces for any pair of primitive shapes (triangle, sphere, ellipsoid, plane, halfspace, cone, capsule, cylinder, convex) ([#574](https://github.com/humanoid-path-planner/hpp-fcl/pull/574)).
- Enhance Broadphase DynamicAABBTree to better handle planes and halfspace ([#570](https://github.com/humanoid-path-planner/hpp-fcl/pull/570))
Expand All @@ -22,8 +23,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Optimize EPA: ignore useless faces in EPA's polytope; warm-start support computation for `Convex`; fix edge-cases witness points computation.
- Add `Serializable` trait to transform, collision data, collision geometries, bounding volumes, bvh models, hfields. Collision problems can now be serialized from C++ and sent to python and vice versa.
- CMake: allow use of installed jrl-cmakemodules ([#564](https://github.com/humanoid-path-planner/hpp-fcl/pull/564))
- CMake: Add compatibility with jrl-cmakemodules workspace ([#610](https://github.com/humanoid-path-planner/hpp-fcl/pull/610))
- Python: add id() support for geometries ([#618](https://github.com/humanoid-path-planner/hpp-fcl/pull/618)).


### Fixed

- Fix Fix serialization unit test when running without Qhull support ([#611](https://github.com/humanoid-path-planner/hpp-fcl/pull/611))
Expand Down
Loading

0 comments on commit 4157202

Please sign in to comment.