Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Manually migrate to vtk 9.3.0 #75

Merged
merged 10 commits into from
Aug 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .azure-pipelines/azure-pipelines-win.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions .ci_support/linux_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ numpy:
- '1.26'
- '1.22'
- '1.22'
pcl:
- 1.14.1
pin_run_as_build:
python:
min_pin: x.x
Expand All @@ -58,6 +60,8 @@ spdlog:
- '1.14'
target_platform:
- linux-64
vtk_base:
- 9.3.0
zip_keys:
- - c_compiler_version
- cxx_compiler_version
Expand Down
4 changes: 4 additions & 0 deletions .ci_support/linux_aarch64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ numpy:
- '1.26'
- '1.22'
- '1.22'
pcl:
- 1.14.1
pin_run_as_build:
python:
min_pin: x.x
Expand All @@ -62,6 +64,8 @@ spdlog:
- '1.14'
target_platform:
- linux-aarch64
vtk_base:
- 9.3.0
zip_keys:
- - c_compiler_version
- cxx_compiler_version
Expand Down
4 changes: 4 additions & 0 deletions .ci_support/osx_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ numpy:
- '1.26'
- '1.22'
- '1.22'
pcl:
- 1.14.1
pin_run_as_build:
python:
min_pin: x.x
Expand All @@ -60,6 +62,8 @@ spdlog:
- '1.14'
target_platform:
- osx-64
vtk_base:
- 9.3.0
zip_keys:
- - c_compiler_version
- cxx_compiler_version
Expand Down
4 changes: 4 additions & 0 deletions .ci_support/osx_arm64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ numpy:
- '1.26'
- '1.22'
- '1.22'
pcl:
- 1.14.1
pin_run_as_build:
python:
min_pin: x.x
Expand All @@ -60,6 +62,8 @@ spdlog:
- '1.14'
target_platform:
- osx-arm64
vtk_base:
- 9.3.0
zip_keys:
- - c_compiler_version
- cxx_compiler_version
Expand Down
4 changes: 4 additions & 0 deletions .ci_support/win_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ numpy:
- '1.26'
- '1.22'
- '1.22'
pcl:
- 1.14.1
pin_run_as_build:
python:
min_pin: x.x
Expand All @@ -48,6 +50,8 @@ spdlog:
- '1.14'
target_platform:
- win-64
vtk_base:
- 9.3.0
zip_keys:
- - python
- numpy
2 changes: 1 addition & 1 deletion .scripts/run_osx_build.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions build-locally.py

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions recipe/build_cxx.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@ if [[ "${CONDA_BUILD_CROSS_COMPILATION}" == "1" ]]; then
export CMAKE_ARGS="${CMAKE_ARGS} -DYARPIDL_thrift_LOCATION=$BUILD_PREFIX/bin/yarpidl_thrift -DYARPIDL_rosmsg_LOCATION=$BUILD_PREFIX/bin/yarpidl_rosmsg"
fi

# Workaround for https://github.com/conda-forge/qt-main-feedstock/issues/273
if [[ "$build_platform" != "$target_platform" ]]; then
export QT_HOST_PATH="$BUILD_PREFIX"
fi

rm -rf build
mkdir -p build

Expand Down
5 changes: 5 additions & 0 deletions recipe/build_py.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@ fi

CXXFLAGS="${CXXFLAGS} -DPYBIND11_DETAILED_ERROR_MESSAGES"

# Workaround for https://github.com/conda-forge/qt-main-feedstock/issues/273
if [[ "$build_platform" != "$target_platform" ]]; then
export QT_HOST_PATH="$BUILD_PREFIX"
fi

cd ${SRC_DIR}/bindings

rm -rf build
Expand Down
4 changes: 4 additions & 0 deletions recipe/conda_build_config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Workaround for https://github.com/conda-forge/conda-forge-pinning-feedstock/issues/6306
# Remove once vtk-base is pinned
vtk_base:
- "9.3.0"
15 changes: 11 additions & 4 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ source:
patches:

build:
number: 14
number: 15

outputs:
# {{ namecxx }}
Expand All @@ -41,6 +41,8 @@ outputs:
- {{ cdt('libxext') }} # [linux]
# YARP idl tools are used in this recipe
- libyarp # [build_platform != target_platform]
# PCL requires Qt's tools
- qt6-main # [build_platform != target_platform and not ppc64le]
host:
- eigen
- idyntree
Expand All @@ -60,14 +62,16 @@ outputs:
- casadi
- qhull
- libopencv
- pcl 1.14.0
- pcl
- onnxruntime-cpp
# transitive public dependency of pcl
- vtk-base
- liblie-group-controllers
- libunicycle-footstep-planner
- librealsense # [not win]
- xorg-libxfixes # [linux]
# Workaround for https://github.com/conda-forge/pcl-feedstock/pull/68
- vtk-base * qt* # [not win]
run:
# manif and eigen are mentioned in the headers so needed when building
# against libbipedal-locomotion-framework
Expand All @@ -76,7 +80,6 @@ outputs:
- liblie-group-controllers
- tomlplusplus


test:
commands:
- test -f ${PREFIX}/include/BipedalLocomotion/System/Advanceable.h # [unix]
Expand Down Expand Up @@ -114,6 +117,8 @@ outputs:
- {{ cdt('libxdamage') }} # [linux]
- {{ cdt('libxxf86vm') }} # [linux]
- {{ cdt('libxext') }} # [linux]
# PCL requires Qt's tools
- qt6-main # [build_platform != target_platform and not ppc64le]
host:
- {{ pin_subpackage(namecxx, exact=True) }}
- python
Expand All @@ -134,13 +139,15 @@ outputs:
- casadi
- libboost-devel
- pugixml
- pcl 1.14.0
- pcl
- xorg-libxfixes # [linux]
- icub-models # Requested just for tests
- scipy # Requested just for tests
- pytest # Requested just for tests
- manifpy # Requested just for tests
- numpy
# Workaround for https://github.com/conda-forge/pcl-feedstock/pull/68
- vtk-base * qt* # [not win]
run:
- {{ pin_subpackage(namecxx, exact=True) }}
- python
Expand Down