-
Notifications
You must be signed in to change notification settings - Fork 60
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1173 from tier4/feature/arm_support
Feature/arm_build_test
- Loading branch information
Showing
18 changed files
with
557 additions
and
40 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| ARG ROS_DISTRO="humble" | ||
|
|
||
| # cspell: ignore impactaky deno BUILDPLATFORM TARGETARCH | ||
|
|
||
| FROM --platform=${BUILDPLATFORM} impactaky/mc-ubuntu22.04-${TARGETARCH}-host:2.1.0 AS mimic-host | ||
| FROM ros:${ROS_DISTRO} as build-stage | ||
|
|
||
| SHELL ["/bin/bash", "-c"] | ||
| ENV DEBIAN_FRONTEND=noninteractive | ||
| ENV DEBCONF_NOWARNINGS=yes | ||
|
|
||
| COPY --from=mimic-host / /mimic-cross | ||
| RUN /mimic-cross/mimic-cross.deno/setup.sh | ||
|
|
||
| RUN --mount=type=cache,id=apt-cache-arm64,target=/var/cache/apt,sharing=locked \ | ||
| --mount=type=cache,id=apt-lib-arm64,target=/var/lib/apt,sharing=locked \ | ||
| sudo apt-get update && sudo apt-get -y install python3-pip python3-rospkg python3-rosdep software-properties-common ccache | ||
| # cspell: ignore kisak | ||
| RUN --mount=type=cache,id=apt-cache-arm64,target=/var/cache/apt,sharing=locked \ | ||
| --mount=type=cache,id=apt-lib-arm64,target=/var/lib/apt,sharing=locked \ | ||
| add-apt-repository ppa:kisak/kisak-mesa -y | ||
| RUN --mount=type=cache,id=apt-cache-arm64,target=/var/cache/apt,sharing=locked \ | ||
| --mount=type=cache,id=apt-lib-arm64,target=/var/lib/apt,sharing=locked \ | ||
| apt-get update && apt-get install libegl-mesa0 -y | ||
|
|
||
| RUN rm -f /etc/apt/apt.conf.d/docker-clean && \ | ||
| echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache | ||
|
|
||
| WORKDIR /home/ubuntu/Desktop/scenario_simulator_ws/src/scenario_simulator | ||
| COPY . $WORKDIR | ||
|
|
||
| WORKDIR /home/ubuntu/Desktop/scenario_simulator_ws/ | ||
| RUN mkdir -p /home/ubuntu/Desktop/scenario_simulator_ws/src/scenario_simulator/external | ||
| WORKDIR /home/ubuntu/Desktop/scenario_simulator_ws/src/scenario_simulator | ||
| RUN vcs import external < dependency_${ROS_DISTRO}.repos | ||
| WORKDIR /home/ubuntu/Desktop/scenario_simulator_ws/src | ||
| RUN --mount=type=cache,id=apt-cache-arm64,target=/var/cache/apt,sharing=locked \ | ||
| --mount=type=cache,id=apt-lib-arm64,target=/var/lib/apt,sharing=locked \ | ||
| source /opt/ros/${ROS_DISTRO}/setup.bash \ | ||
| && apt-get update \ | ||
| && rosdep install -iy --from-paths . --rosdistro ${ROS_DISTRO} | ||
|
|
||
| WORKDIR /home/ubuntu/Desktop/scenario_simulator_ws | ||
|
|
||
| RUN source /opt/ros/${ROS_DISTRO}/setup.bash && \ | ||
| colcon build --symlink-install \ | ||
| --cmake-args \ | ||
| -DCMAKE_BUILD_TYPE=Release \ | ||
| -DBUILD_CPP_MOCK_SCENARIOS=ON | ||
| COPY ./docker-entrypoint.sh / | ||
| RUN chmod a+x /docker-entrypoint.sh | ||
|
|
||
| ENTRYPOINT ["/docker-entrypoint.sh"] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| group "default" { | ||
| targets = ["humble"] | ||
| } | ||
|
|
||
| target "base_amd64" { | ||
| target = "build-stage" | ||
| dockerfile = "Dockerfile" | ||
| platforms = ["linux/amd64"] | ||
| } | ||
|
|
||
| target "base_arm64" { | ||
| target = "build-stage" | ||
| dockerfile = "Dockerfile.arm64" | ||
| platforms = ["linux/arm64/v8"] | ||
| } | ||
|
|
||
| target "humble" { | ||
| inherits = [base] | ||
| name = "humble_${base}" | ||
| tags = ["ghcr.io/tier4/scenario_simulator_v2:humble"] | ||
| args = {"ROS_DISTRO" : "humble"} | ||
| group = ["humble"] | ||
| matrix = { | ||
| base = ["base_amd64", "base_arm64"] | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| debian | ||
| obj-x86_64-linux-gnu |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,79 @@ | ||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ||
| Changelog for package embree_vendor | ||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ||
|
|
||
| 0.0.9 (2021-07-13) | ||
| ------------------ | ||
|
|
||
| 0.1.0 (2021-07-14) | ||
| ------------------ | ||
| * Merge branch 'master' of https://github.com/OUXT-Polaris/embree_vendor | ||
| * Merge pull request `#4 <https://github.com/OUXT-Polaris/embree_vendor/issues/4>`_ from OUXT-Polaris/feature/onetbb_src | ||
| Feature/onetbb src | ||
| * change build order | ||
| * remove unused action | ||
| * add tbb build command | ||
| * fix version | ||
| * Contributors: Masaya Kataoka | ||
|
|
||
| 0.8.1 (2021-07-13) | ||
| ------------------ | ||
| * add pkg-config to the depends | ||
| * Contributors: Masaya Kataoka | ||
|
|
||
| 0.0.8 (2021-07-12) | ||
| ------------------ | ||
| * fix embree version | ||
| * Contributors: Masaya Kataoka | ||
|
|
||
| 0.0.7 (2021-07-12) | ||
| ------------------ | ||
| * remove test lines | ||
| * Merge pull request `#3 <https://github.com/OUXT-Polaris/embree_vendor/issues/3>`_ from OUXT-Polaris/workflow/galactic | ||
| update CI workflow for galactic | ||
| * update .github/workflows/ROS2-Galactic.yaml | ||
| * Merge pull request `#2 <https://github.com/OUXT-Polaris/embree_vendor/issues/2>`_ from OUXT-Polaris/workflow/foxy | ||
| update CI workflow for foxy | ||
| * update .github/workflows/ROS2-Foxy.yaml | ||
| * update dependency.repos | ||
| * add workflow_dispatch trigger | ||
| * Contributors: Masaya Kataoka, robotx_buildfarm | ||
|
|
||
| 0.0.6 (2021-01-10) | ||
| ------------------ | ||
| * Merge pull request `#1 <https://github.com/OUXT-Polaris/embree_vendor/issues/1>`_ from OUXT-Polaris/feature/add_tbb_to_depends | ||
| update package.xml | ||
| * update package.xml | ||
| * update workflow | ||
| * rename workflow | ||
| * fix workflow | ||
| * add generate foxy dpkg workflow | ||
| * Contributors: Masaya Kataoka | ||
|
|
||
| 0.0.5 (2021-01-04) | ||
| ------------------ | ||
| * update LICENSE | ||
| * add ignore | ||
| * Contributors: Masaya Kataoka | ||
|
|
||
| 0.0.4 (2021-01-03) | ||
| ------------------ | ||
| * update release workflow | ||
| * Contributors: Masaya Kataoka | ||
|
|
||
| 0.0.2 (2021-01-03) | ||
| ------------------ | ||
| * update version | ||
| * update version tag | ||
| * update version | ||
| * add description | ||
| * add Release action | ||
| * fix xml tag | ||
| * add libglfw3-dev to the depends | ||
| * update workflow | ||
| * add README.md | ||
| * Create ROS2-Foxy.yaml | ||
| adding ROS2-Foxy workflow | ||
| * update instal dir | ||
| * enable pass rostest | ||
| * Contributors: Masaya Kataoka |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| cmake_minimum_required(VERSION 3.5) | ||
| project(embree_vendor) | ||
|
|
||
| # Default to C99 | ||
| if(NOT CMAKE_C_STANDARD) | ||
| set(CMAKE_C_STANDARD 99) | ||
| endif() | ||
|
|
||
| # Default to C++14 | ||
| if(NOT CMAKE_CXX_STANDARD) | ||
| set(CMAKE_CXX_STANDARD 14) | ||
| endif() | ||
|
|
||
| if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") | ||
| add_compile_options(-Wall -Wextra -Wpedantic) | ||
| endif() | ||
|
|
||
| # find dependencies | ||
| find_package(ament_cmake REQUIRED) | ||
|
|
||
| macro(build_embree) | ||
|
|
||
| set(cmake_commands) | ||
| set(cmake_configure_args | ||
| -Wno-dev | ||
| -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}_install | ||
| -DEMBREE_ISPC_SUPPORT=OFF) | ||
|
|
||
| include(ExternalProject) | ||
| externalproject_add(embree-ext | ||
| GIT_REPOSITORY https://github.com/embree/embree.git | ||
| GIT_TAG v4.1.0 | ||
| TIMEOUT 6000 | ||
| ${cmake_commands} | ||
| CMAKE_ARGS | ||
| ${cmake_configure_args} | ||
| ) | ||
|
|
||
| # The external project will install to the build folder, but we'll install that on make install. | ||
| install( | ||
| DIRECTORY | ||
| ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}_install/ | ||
| DESTINATION | ||
| ${CMAKE_INSTALL_PREFIX} | ||
| ) | ||
| endmacro() | ||
|
|
||
| build_embree() | ||
|
|
||
| ament_export_include_directories(include) | ||
| ament_export_libraries(embree4) | ||
|
|
||
| ament_package() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| # embree_vendor | ||
|
|
||
| vendor package for ray-tracing library made by Intel. (https://github.com/embree/embree) |
Oops, something went wrong.