From 9e1bd7c210d7660975d4804363ac1f9b278d2c72 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Tue, 25 Jun 2024 09:44:48 +0000 Subject: [PATCH 1/9] updated v6.14.0 --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 1b7b928..cdeba0d 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set name = "dartsim" %} -{% set version = "6.13.2" %} +{% set version = "6.14.0" %} package: name: {{ name }} @@ -7,7 +7,7 @@ package: source: - url: https://github.com/dartsim/dart/archive/v{{ version }}.tar.gz - sha256: 02699a8f807276231c80ffc5dbc3f66dc1c3612364340c91bcad63a837c01576 + sha256: f3fdccb2781d6a606c031f11d6b1fdf5278708c6787e3ab9a67385d9a19a60ea patches: - disable_imgui.patch - disable_gui.patch @@ -15,7 +15,7 @@ source: - enable_windows_tests.patch build: - number: 3 + number: 0 run_exports: - {{ pin_subpackage(name, max_pin='x.x') }} From 3ab35331cfdb332a7feb3c39d45f567cec5b2d37 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Tue, 25 Jun 2024 09:45:43 +0000 Subject: [PATCH 2/9] MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.36.2, and conda-forge-pinning 2024.06.25.07.25.29 --- .scripts/build_steps.sh | 7 +++++++ .scripts/run_osx_build.sh | 7 +++++++ .scripts/run_win_build.bat | 5 +++++ 3 files changed, 19 insertions(+) diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 899ba03..a5836e8 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -72,6 +72,13 @@ else --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \ --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" + + ( startgroup "Inspecting artifacts" ) 2> /dev/null + + # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" + + ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 07dff21..ba0c879 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -85,6 +85,13 @@ else --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file ./.ci_support/clobber_${CONFIG}.yaml \ --extra-meta flow_run_id="$flow_run_id" remote_url="$remote_url" sha="$sha" + + ( startgroup "Inspecting artifacts" ) 2> /dev/null + + # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" + + ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index 6d54697..65650bf 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -58,6 +58,11 @@ echo Building recipe conda-build.exe "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% if !errorlevel! neq 0 exit /b !errorlevel! +call :start_group "Inspecting artifacts" +:: inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 +WHERE inspect_artifacts >nul 2>nul && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" +call :end_group + :: Prepare some environment variables for the upload step if /i "%CI%" == "github_actions" ( set "FEEDSTOCK_NAME=%GITHUB_REPOSITORY:*/=%" From 5a7458043102d9a5be4c0078aaed121707b8d005 Mon Sep 17 00:00:00 2001 From: Jeongseok Lee Date: Tue, 25 Jun 2024 22:31:18 -0700 Subject: [PATCH 3/9] Use DART_USE_SYSTEM_IMGUI=ON not to vendor imgui --- recipe/bld.bat | 1 + recipe/build.sh | 1 + recipe/disable_imgui.patch | 21 --------------------- recipe/meta.yaml | 1 - 4 files changed, 2 insertions(+), 22 deletions(-) delete mode 100644 recipe/disable_imgui.patch diff --git a/recipe/bld.bat b/recipe/bld.bat index ef4e3f4..0fbb2e7 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -13,6 +13,7 @@ cmake -G "Ninja" ^ -DASSIMP_AISCENE_CTOR_DTOR_DEFINED:BOOL=ON ^ -DASSIMP_AIMATERIAL_CTOR_DTOR_DEFINED:BOOL=ON ^ -DDART_TREAT_WARNINGS_AS_ERRORS:BOOL=OFF ^ + -DDART_USE_SYSTEM_IMGUI:BOOL=ON ^ %SRC_DIR% if errorlevel 1 exit 1 diff --git a/recipe/build.sh b/recipe/build.sh index 013bbb1..5182891 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -25,6 +25,7 @@ cmake ${CMAKE_ARGS} $SRC_DIR \ -DCMAKE_INSTALL_LIBDIR=lib \ -DDART_VERBOSE:BOOL=ON \ -DDART_TREAT_WARNINGS_AS_ERRORS:BOOL=OFF \ + -DDART_USE_SYSTEM_IMGUI:BOOL=ON \ ${CMAKE_TEST_CMD} make ${NUM_PARALLEL} diff --git a/recipe/disable_imgui.patch b/recipe/disable_imgui.patch deleted file mode 100644 index 7b5c260..0000000 --- a/recipe/disable_imgui.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 4d9052429b3133f08d6ebee6d8af5932bc670a24 Mon Sep 17 00:00:00 2001 -From: Silvio Traversaro -Date: Sun, 10 Oct 2021 11:57:32 +0200 -Subject: [PATCH] Update CMakeLists.txt - ---- - dart/external/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/dart/external/CMakeLists.txt b/dart/external/CMakeLists.txt -index aa2fa0a2121a..0d04e5b43df2 100644 ---- a/dart/external/CMakeLists.txt -+++ b/dart/external/CMakeLists.txt -@@ -1,5 +1,5 @@ - add_subdirectory(convhull_3d) --add_subdirectory(imgui) -+#add_subdirectory(imgui) - add_subdirectory(ikfast) - add_subdirectory(lodepng) - add_subdirectory(odelcpsolver) - diff --git a/recipe/meta.yaml b/recipe/meta.yaml index cdeba0d..ec1d7bc 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -9,7 +9,6 @@ source: - url: https://github.com/dartsim/dart/archive/v{{ version }}.tar.gz sha256: f3fdccb2781d6a606c031f11d6b1fdf5278708c6787e3ab9a67385d9a19a60ea patches: - - disable_imgui.patch - disable_gui.patch - disable_test_Issue1596.patch - enable_windows_tests.patch From 1a32739b041a1442f868f1d6aae7689d17bc5e26 Mon Sep 17 00:00:00 2001 From: Jeongseok Lee Date: Tue, 25 Jun 2024 22:39:45 -0700 Subject: [PATCH 4/9] Update patches --- recipe/disable_test_Issue1596.patch | 22 ++++++---------------- recipe/enable_windows_tests.patch | 13 ------------- recipe/meta.yaml | 1 - 3 files changed, 6 insertions(+), 30 deletions(-) delete mode 100644 recipe/enable_windows_tests.patch diff --git a/recipe/disable_test_Issue1596.patch b/recipe/disable_test_Issue1596.patch index 1b152b6..6cff452 100644 --- a/recipe/disable_test_Issue1596.patch +++ b/recipe/disable_test_Issue1596.patch @@ -1,25 +1,15 @@ -From 2748745b77df297d05aad941ae9c09f4a726143f Mon Sep 17 00:00:00 2001 -From: Silvio Traversaro -Date: Sun, 14 Nov 2021 17:22:57 +0100 -Subject: [PATCH] Disable test_Issue1596 - ---- - unittests/regression/CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/unittests/regression/CMakeLists.txt b/unittests/regression/CMakeLists.txt -index ace85bafc91..6a976f6849c 100644 ---- a/unittests/regression/CMakeLists.txt -+++ b/unittests/regression/CMakeLists.txt +diff --git a/tests/regression/CMakeLists.txt b/tests/regression/CMakeLists.txt +index e0dd73c6a461..86c00b6a04ec 100644 +--- a/tests/regression/CMakeLists.txt ++++ b/tests/regression/CMakeLists.txt @@ -6,8 +6,8 @@ if(TARGET dart-utils) dart_add_test("regression" test_Issue1583) target_link_libraries(test_Issue1583 dart-utils) - dart_add_test("regression" test_Issue1596) - target_link_libraries(test_Issue1596 dart-utils) -+ #dart_add_test("regression" test_Issue1596) -+ #target_link_libraries(test_Issue1596 dart-utils) ++ # dart_add_test("regression" test_Issue1596) ++ # target_link_libraries(test_Issue1596 dart-utils) endif() if(TARGET dart-utils-urdf) - diff --git a/recipe/enable_windows_tests.patch b/recipe/enable_windows_tests.patch deleted file mode 100644 index fbb6bf6..0000000 --- a/recipe/enable_windows_tests.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt -index a495f25550e8b..81dc08f396063 100644 ---- a/unittests/CMakeLists.txt -+++ b/unittests/CMakeLists.txt -@@ -93,7 +93,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}) - # fixed even after further changes are made - # - "unit": low level tests for one or few classes and functions to verify that - # they performs correctly as expected --if(NOT MSVC) -+if(TRUE) - # Disabled due to limitied disk space in CI image - add_subdirectory(integration) - add_subdirectory(regression) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index ec1d7bc..951f90c 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -11,7 +11,6 @@ source: patches: - disable_gui.patch - disable_test_Issue1596.patch - - enable_windows_tests.patch build: number: 0 From dcbcb1a12343efa563a1c9680fd0fd2490235e45 Mon Sep 17 00:00:00 2001 From: Jeongseok Lee Date: Tue, 25 Jun 2024 22:48:15 -0700 Subject: [PATCH 5/9] Disable building dartpy --- recipe/bld.bat | 1 + recipe/build.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/recipe/bld.bat b/recipe/bld.bat index 0fbb2e7..0fb8d85 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -13,6 +13,7 @@ cmake -G "Ninja" ^ -DASSIMP_AISCENE_CTOR_DTOR_DEFINED:BOOL=ON ^ -DASSIMP_AIMATERIAL_CTOR_DTOR_DEFINED:BOOL=ON ^ -DDART_TREAT_WARNINGS_AS_ERRORS:BOOL=OFF ^ + -DDART_BUILD_DARTPY:BOOL=OFF ^ -DDART_USE_SYSTEM_IMGUI:BOOL=ON ^ %SRC_DIR% if errorlevel 1 exit 1 diff --git a/recipe/build.sh b/recipe/build.sh index 5182891..0445449 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -25,6 +25,7 @@ cmake ${CMAKE_ARGS} $SRC_DIR \ -DCMAKE_INSTALL_LIBDIR=lib \ -DDART_VERBOSE:BOOL=ON \ -DDART_TREAT_WARNINGS_AS_ERRORS:BOOL=OFF \ + -DDART_BUILD_DARTPY:BOOL=OFF \ -DDART_USE_SYSTEM_IMGUI:BOOL=ON \ ${CMAKE_TEST_CMD} From 8a6abca0c88cb8f035924a75b913aac660540404 Mon Sep 17 00:00:00 2001 From: Jeongseok Lee Date: Tue, 25 Jun 2024 23:00:28 -0700 Subject: [PATCH 6/9] Update SIMD options --- recipe/bld.bat | 1 + recipe/build.sh | 38 +++++++++++++++++++++++--------------- 2 files changed, 24 insertions(+), 15 deletions(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index 0fb8d85..149120a 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -13,6 +13,7 @@ cmake -G "Ninja" ^ -DASSIMP_AISCENE_CTOR_DTOR_DEFINED:BOOL=ON ^ -DASSIMP_AIMATERIAL_CTOR_DTOR_DEFINED:BOOL=ON ^ -DDART_TREAT_WARNINGS_AS_ERRORS:BOOL=OFF ^ + -DDART_ENABLE_SIMD:BOOL=ON ^ -DDART_BUILD_DARTPY:BOOL=OFF ^ -DDART_USE_SYSTEM_IMGUI:BOOL=ON ^ %SRC_DIR% diff --git a/recipe/build.sh b/recipe/build.sh index 0445449..25707c4 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -11,30 +11,38 @@ else NUM_PARALLEL=-j${CPU_COUNT} fi +# Disable SIMD for linux-ppc64le, linux_aarch64, and any OSX platform; enable for other platforms +if [ "${target_platform}" == "linux-ppc64le" ] || + [ "${target_platform}" == "linux_aarch64" ] || + [[ "${target_platform}" == osx-* ]]; then + DART_ENABLE_SIMD=OFF +else + DART_ENABLE_SIMD=ON +fi if [[ "${target_platform}" == osx-* ]]; then - # See https://conda-forge.org/docs/maintainer/knowledge_base.html#newer-c-features-with-old-sdk - CXXFLAGS="${CXXFLAGS} -D_LIBCPP_DISABLE_AVAILABILITY" + # See https://conda-forge.org/docs/maintainer/knowledge_base.html#newer-c-features-with-old-sdk + CXXFLAGS="${CXXFLAGS} -D_LIBCPP_DISABLE_AVAILABILITY" fi - cmake ${CMAKE_ARGS} $SRC_DIR \ - -DCMAKE_INSTALL_PREFIX=$PREFIX \ - -DCMAKE_PREFIX_PATH=$PREFIX \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_LIBDIR=lib \ - -DDART_VERBOSE:BOOL=ON \ - -DDART_TREAT_WARNINGS_AS_ERRORS:BOOL=OFF \ - -DDART_BUILD_DARTPY:BOOL=OFF \ - -DDART_USE_SYSTEM_IMGUI:BOOL=ON \ - ${CMAKE_TEST_CMD} + -DCMAKE_INSTALL_PREFIX=$PREFIX \ + -DCMAKE_PREFIX_PATH=$PREFIX \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DDART_VERBOSE:BOOL=ON \ + -DDART_TREAT_WARNINGS_AS_ERRORS:BOOL=OFF \ + -DDART_ENABLE_SIMD:BOOL=${DART_ENABLE_SIMD} \ + -DDART_BUILD_DARTPY:BOOL=OFF \ + -DDART_USE_SYSTEM_IMGUI:BOOL=ON \ + ${CMAKE_TEST_CMD} make ${NUM_PARALLEL} make ${NUM_PARALLEL} install if [ ${target_platform} != "linux-ppc64le" ]; then make ${NUM_PARALLEL} tests -if [[ "${CONDA_BUILD_CROSS_COMPILATION:-}" != "1" || "${CROSSCOMPILING_EMULATOR}" != "" ]]; then - ctest --output-on-failure -fi + if [[ "${CONDA_BUILD_CROSS_COMPILATION:-}" != "1" || "${CROSSCOMPILING_EMULATOR}" != "" ]]; then + ctest --output-on-failure + fi fi From 6a9313d29b6c2218ab6b8ccd28c395607976843e Mon Sep 17 00:00:00 2001 From: Jeongseok Lee Date: Tue, 25 Jun 2024 23:09:00 -0700 Subject: [PATCH 7/9] Use [[ ]] consistently --- recipe/build.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/build.sh b/recipe/build.sh index 25707c4..56c8108 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -2,7 +2,7 @@ mkdir build && cd build -if [ ${target_platform} == "linux-ppc64le" ]; then +if [[ ${target_platform} == "linux-ppc64le" ]]; then # Disable tests CMAKE_TEST_CMD=-DBUILD_TESTING:BOOL=OFF NUM_PARALLEL=-j1 @@ -12,8 +12,8 @@ else fi # Disable SIMD for linux-ppc64le, linux_aarch64, and any OSX platform; enable for other platforms -if [ "${target_platform}" == "linux-ppc64le" ] || - [ "${target_platform}" == "linux_aarch64" ] || +if [[ "${target_platform}" == "linux-ppc64le" ]] || + [[ "${target_platform}" == "linux-aarch64" ]] || [[ "${target_platform}" == osx-* ]]; then DART_ENABLE_SIMD=OFF else From 97eb8980ffbc54cbaaf2e20cf0ea69df8e01e74a Mon Sep 17 00:00:00 2001 From: Jeongseok Lee Date: Tue, 25 Jun 2024 23:12:37 -0700 Subject: [PATCH 8/9] Remove unused CMake option --- recipe/bld.bat | 1 - recipe/build.sh | 6 +----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index 149120a..318cdcd 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -9,7 +9,6 @@ cmake -G "Ninja" ^ -DCMAKE_PREFIX_PATH=%LIBRARY_PREFIX% ^ -DDART_MSVC_DEFAULT_OPTIONS=ON ^ -DDART_VERBOSE=ON ^ - -DBUILD_TESTING:BOOL=ON ^ -DASSIMP_AISCENE_CTOR_DTOR_DEFINED:BOOL=ON ^ -DASSIMP_AIMATERIAL_CTOR_DTOR_DEFINED:BOOL=ON ^ -DDART_TREAT_WARNINGS_AS_ERRORS:BOOL=OFF ^ diff --git a/recipe/build.sh b/recipe/build.sh index 56c8108..db0bc1f 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -3,11 +3,8 @@ mkdir build && cd build if [[ ${target_platform} == "linux-ppc64le" ]]; then - # Disable tests - CMAKE_TEST_CMD=-DBUILD_TESTING:BOOL=OFF NUM_PARALLEL=-j1 else - CMAKE_TEST_CMD=-DBUILD_TESTING:BOOL=ON NUM_PARALLEL=-j${CPU_COUNT} fi @@ -34,8 +31,7 @@ cmake ${CMAKE_ARGS} $SRC_DIR \ -DDART_TREAT_WARNINGS_AS_ERRORS:BOOL=OFF \ -DDART_ENABLE_SIMD:BOOL=${DART_ENABLE_SIMD} \ -DDART_BUILD_DARTPY:BOOL=OFF \ - -DDART_USE_SYSTEM_IMGUI:BOOL=ON \ - ${CMAKE_TEST_CMD} + -DDART_USE_SYSTEM_IMGUI:BOOL=ON make ${NUM_PARALLEL} make ${NUM_PARALLEL} install From dcbac4b0db419e41eb7700a8b462c8cb66315550 Mon Sep 17 00:00:00 2001 From: Jeongseok Lee Date: Wed, 26 Jun 2024 06:37:34 -0700 Subject: [PATCH 9/9] Disable building with -march=native --- recipe/bld.bat | 2 +- recipe/build.sh | 11 +---------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index 318cdcd..bc0aef5 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -12,7 +12,7 @@ cmake -G "Ninja" ^ -DASSIMP_AISCENE_CTOR_DTOR_DEFINED:BOOL=ON ^ -DASSIMP_AIMATERIAL_CTOR_DTOR_DEFINED:BOOL=ON ^ -DDART_TREAT_WARNINGS_AS_ERRORS:BOOL=OFF ^ - -DDART_ENABLE_SIMD:BOOL=ON ^ + -DDART_ENABLE_SIMD:BOOL=OFF ^ -DDART_BUILD_DARTPY:BOOL=OFF ^ -DDART_USE_SYSTEM_IMGUI:BOOL=ON ^ %SRC_DIR% diff --git a/recipe/build.sh b/recipe/build.sh index db0bc1f..2e84a9a 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -8,15 +8,6 @@ else NUM_PARALLEL=-j${CPU_COUNT} fi -# Disable SIMD for linux-ppc64le, linux_aarch64, and any OSX platform; enable for other platforms -if [[ "${target_platform}" == "linux-ppc64le" ]] || - [[ "${target_platform}" == "linux-aarch64" ]] || - [[ "${target_platform}" == osx-* ]]; then - DART_ENABLE_SIMD=OFF -else - DART_ENABLE_SIMD=ON -fi - if [[ "${target_platform}" == osx-* ]]; then # See https://conda-forge.org/docs/maintainer/knowledge_base.html#newer-c-features-with-old-sdk CXXFLAGS="${CXXFLAGS} -D_LIBCPP_DISABLE_AVAILABILITY" @@ -29,7 +20,7 @@ cmake ${CMAKE_ARGS} $SRC_DIR \ -DCMAKE_INSTALL_LIBDIR=lib \ -DDART_VERBOSE:BOOL=ON \ -DDART_TREAT_WARNINGS_AS_ERRORS:BOOL=OFF \ - -DDART_ENABLE_SIMD:BOOL=${DART_ENABLE_SIMD} \ + -DDART_ENABLE_SIMD:BOOL=OFF \ -DDART_BUILD_DARTPY:BOOL=OFF \ -DDART_USE_SYSTEM_IMGUI:BOOL=ON