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

[ompl]: upgrade to 1.5.0 #11737

Merged
merged 6 commits into from
Aug 18, 2020
Merged

[ompl]: upgrade to 1.5.0 #11737

merged 6 commits into from
Aug 18, 2020

Conversation

mamoll
Copy link
Contributor

@mamoll mamoll commented Jun 3, 2020

Describe the pull request

  • What does your PR fix?

upgrade OMPL port to latest version

  • Which triplets are supported/not supported? Have you updated the CI baseline?

  • Does your PR follow the maintainer guide?

yes

@NancyLi1013 NancyLi1013 self-assigned this Jun 3, 2020
Copy link
Contributor

@NancyLi1013 NancyLi1013 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you please also bump the version in CONTROL file?

@NancyLi1013 NancyLi1013 added category:port-update The issue is with a library, which is requesting update new revision requires:author-response labels Jun 4, 2020
@mamoll
Copy link
Contributor Author

mamoll commented Jun 4, 2020

Could you please also bump the version in CONTROL file?

Done!

ports/ompl/CONTROL Outdated Show resolved Hide resolved
@NancyLi1013
Copy link
Contributor

The feature app has passed on x86-windows and x64-windows.

But it build failed on x64-windows-static:

Could you please try to look into this?

[195/196] cmd.exe /C "cd . && F:\11737\vcpkg\downloads\tools\cmake-3.17.2-windows\cmake-3.17.2-win32-x86\bin\cmake.exe -E vs_link_exe --intdir=benchmark\CMakeFiles\ompl_benchmark.dir --rc=C:\PROGRA~2\WI3CF2~1\10\bin\100177~1.0\x64\rc.exe --mt=C:\PROGRA~2\WI3CF2~1\10\bin\100177~1.0\x64\mt.exe --manifests  -- C:\PROGRA~2\MICROS~1\2017\ENTERP~1\VC\Tools\MSVC\1416~1.270\bin\Hostx64\x64\link.exe  benchmark\CMakeFiles\ompl_benchmark.dir\CFGBenchmark.cpp.obj benchmark\CMakeFiles\ompl_benchmark.dir\BenchmarkOptions.cpp.obj benchmark\CMakeFiles\ompl_benchmark.dir\BenchmarkTypes.cpp.obj benchmark\CMakeFiles\ompl_benchmark.dir\benchmark.cpp.obj  /out:bin\ompl_benchmark.exe /implib:benchmark\ompl_benchmark.lib /pdb:bin\ompl_benchmark.pdb /version:0.0  /machine:x64 /debug /INCREMENTAL /subsystem:console -LIBPATH:F:\11737\vcpkg\installed\x64-windows-static\lib F:\11737\vcpkg\installed\x64-windows-static\debug\lib\boost_program_options-vc140-mt-gd.lib  F:\11737\vcpkg\installed\x64-windows-static\debug\lib\boost_serialization-vc140-mt-gd.lib  F:\11737\vcpkg\installed\x64-windows-static\debug\lib\boost_filesystem-vc140-mt-gd.lib  F:\11737\vcpkg\installed\x64-windows-static\debug\lib\boost_system-vc140-mt-gd.lib  opengl32.lib  glu32.lib  assimp-vc141-mt.lib  F:\11737\vcpkg\installed\x64-windows-static\debug\lib\fcl.lib  ompl\src\ompl\ompl.lib  src\omplapp\ompl_app_base.lib  F:\11737\vcpkg\installed\x64-windows-static\debug\lib\boost_program_options-vc140-mt-gd.lib  opengl32.lib  glu32.lib  assimp-vc141-mt.lib  F:\11737\vcpkg\installed\x64-windows-static\debug\lib\fcl.lib  F:\11737\vcpkg\installed\x64-windows-static\debug\lib\ccd.lib  F:\11737\vcpkg\installed\x64-windows-static\debug\lib\octomap.lib  F:\11737\vcpkg\installed\x64-windows-static\debug\lib\octomath.lib  ompl\src\ompl\ompl.lib  F:\11737\vcpkg\installed\x64-windows-static\debug\lib\boost_serialization-vc140-mt-gd.lib  F:\11737\vcpkg\installed\x64-windows-static\debug\lib\boost_filesystem-vc140-mt-gd.lib  F:\11737\vcpkg\installed\x64-windows-static\debug\lib\boost_system-vc140-mt-gd.lib  kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib && cd ."
FAILED: bin/ompl_benchmark.exe 
cmd.exe /C "cd . && F:\11737\vcpkg\downloads\tools\cmake-3.17.2-windows\cmake-3.17.2-win32-x86\bin\cmake.exe -E vs_link_exe --intdir=benchmark\CMakeFiles\ompl_benchmark.dir --rc=C:\PROGRA~2\WI3CF2~1\10\bin\100177~1.0\x64\rc.exe --mt=C:\PROGRA~2\WI3CF2~1\10\bin\100177~1.0\x64\mt.exe --manifests  -- C:\PROGRA~2\MICROS~1\2017\ENTERP~1\VC\Tools\MSVC\1416~1.270\bin\Hostx64\x64\link.exe  benchmark\CMakeFiles\ompl_benchmark.dir\CFGBenchmark.cpp.obj benchmark\CMakeFiles\ompl_benchmark.dir\BenchmarkOptions.cpp.obj benchmark\CMakeFiles\ompl_benchmark.dir\BenchmarkTypes.cpp.obj benchmark\CMakeFiles\ompl_benchmark.dir\benchmark.cpp.obj  /out:bin\ompl_benchmark.exe /implib:benchmark\ompl_benchmark.lib /pdb:bin\ompl_benchmark.pdb /version:0.0  /machine:x64 /debug /INCREMENTAL /subsystem:console -LIBPATH:F:\11737\vcpkg\installed\x64-windows-static\lib F:\11737\vcpkg\installed\x64-windows-static\debug\lib\boost_program_options-vc140-mt-gd.lib  F:\11737\vcpkg\installed\x64-windows-static\debug\lib\boost_serialization-vc140-mt-gd.lib  F:\11737\vcpkg\installed\x64-windows-static\debug\lib\boost_filesystem-vc140-mt-gd.lib  F:\11737\vcpkg\installed\x64-windows-static\debug\lib\boost_system-vc140-mt-gd.lib  opengl32.lib  glu32.lib  assimp-vc141-mt.lib  F:\11737\vcpkg\installed\x64-windows-static\debug\lib\fcl.lib  ompl\src\ompl\ompl.lib  src\omplapp\ompl_app_base.lib  F:\11737\vcpkg\installed\x64-windows-static\debug\lib\boost_program_options-vc140-mt-gd.lib  opengl32.lib  glu32.lib  assimp-vc141-mt.lib  F:\11737\vcpkg\installed\x64-windows-static\debug\lib\fcl.lib  F:\11737\vcpkg\installed\x64-windows-static\debug\lib\ccd.lib  F:\11737\vcpkg\installed\x64-windows-static\debug\lib\octomap.lib  F:\11737\vcpkg\installed\x64-windows-static\debug\lib\octomath.lib  ompl\src\ompl\ompl.lib  F:\11737\vcpkg\installed\x64-windows-static\debug\lib\boost_serialization-vc140-mt-gd.lib  F:\11737\vcpkg\installed\x64-windows-static\debug\lib\boost_filesystem-vc140-mt-gd.lib  F:\11737\vcpkg\installed\x64-windows-static\debug\lib\boost_system-vc140-mt-gd.lib  kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib && cd ."
LINK Pass 1: command "C:\PROGRA~2\MICROS~1\2017\ENTERP~1\VC\Tools\MSVC\1416~1.270\bin\Hostx64\x64\link.exe benchmark\CMakeFiles\ompl_benchmark.dir\CFGBenchmark.cpp.obj benchmark\CMakeFiles\ompl_benchmark.dir\BenchmarkOptions.cpp.obj benchmark\CMakeFiles\ompl_benchmark.dir\BenchmarkTypes.cpp.obj benchmark\CMakeFiles\ompl_benchmark.dir\benchmark.cpp.obj /out:bin\ompl_benchmark.exe /implib:benchmark\ompl_benchmark.lib /pdb:bin\ompl_benchmark.pdb /version:0.0 /machine:x64 /debug /INCREMENTAL /subsystem:console -LIBPATH:F:\11737\vcpkg\installed\x64-windows-static\lib F:\11737\vcpkg\installed\x64-windows-static\debug\lib\boost_program_options-vc140-mt-gd.lib F:\11737\vcpkg\installed\x64-windows-static\debug\lib\boost_serialization-vc140-mt-gd.lib F:\11737\vcpkg\installed\x64-windows-static\debug\lib\boost_filesystem-vc140-mt-gd.lib F:\11737\vcpkg\installed\x64-windows-static\debug\lib\boost_system-vc140-mt-gd.lib opengl32.lib glu32.lib assimp-vc141-mt.lib F:\11737\vcpkg\installed\x64-windows-static\debug\lib\fcl.lib ompl\src\ompl\ompl.lib src\omplapp\ompl_app_base.lib F:\11737\vcpkg\installed\x64-windows-static\debug\lib\boost_program_options-vc140-mt-gd.lib opengl32.lib glu32.lib assimp-vc141-mt.lib F:\11737\vcpkg\installed\x64-windows-static\debug\lib\fcl.lib F:\11737\vcpkg\installed\x64-windows-static\debug\lib\ccd.lib F:\11737\vcpkg\installed\x64-windows-static\debug\lib\octomap.lib F:\11737\vcpkg\installed\x64-windows-static\debug\lib\octomath.lib ompl\src\ompl\ompl.lib F:\11737\vcpkg\installed\x64-windows-static\debug\lib\boost_serialization-vc140-mt-gd.lib F:\11737\vcpkg\installed\x64-windows-static\debug\lib\boost_filesystem-vc140-mt-gd.lib F:\11737\vcpkg\installed\x64-windows-static\debug\lib\boost_system-vc140-mt-gd.lib kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib /MANIFEST /MANIFESTFILE:benchmark\CMakeFiles\ompl_benchmark.dir/intermediate.manifest benchmark\CMakeFiles\ompl_benchmark.dir/manifest.res" failed (exit code 1120) with the following output:
Microsoft (R) Incremental Linker Version 14.16.27040.0
Copyright (C) Microsoft Corporation.  All rights reserved.

assimp-vc141-mt.lib(Importer.cpp.obj) : error LNK2038: mismatch detected for '_ITERATOR_DEBUG_LEVEL': value '0' doesn't match value '2' in CFGBenchmark.cpp.obj
assimp-vc141-mt.lib(Importer.cpp.obj) : error LNK2038: mismatch detected for 'RuntimeLibrary': value 'MT_StaticRelease' doesn't match value 'MTd_StaticDebug' in CFGBenchmark.cpp.obj

@mamoll
Copy link
Contributor Author

mamoll commented Jun 5, 2020

This seems to be an issue in the assimp library, not ompl itself. Are there other ports that successfully link against assume?

@NancyLi1013
Copy link
Contributor

Currently, there is only magnum-plugins that depends on assimp in vcpkg. I try to install the feature assimpimporter and it can link successfully.
So you might need to look into this.

@mamoll
Copy link
Contributor Author

mamoll commented Jun 7, 2020

Sorry, I am too unfamiliar with windows dev to tackle this. I can comment out the app feature. Maybe someone else can provide a proper fix and reenable this feature in a separate PR? If that sounds ok, I push another commit for that.

@NancyLi1013
Copy link
Contributor

Hi @mamoll
Seems to be some problem with assimp and we need to fix it first.

@JackBoosY JackBoosY added depends:different-pr This PR or Issue depends on a PR which has been filed and removed requires:author-response labels Jun 10, 2020
@ras0219-msft
Copy link
Contributor

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@NancyLi1013
Copy link
Contributor

@mamoll
Could you please resolve the conflicts?

@NancyLi1013 NancyLi1013 added requires:author-response and removed depends:different-pr This PR or Issue depends on a PR which has been filed labels Aug 4, 2020
@mamoll
Copy link
Contributor Author

mamoll commented Aug 5, 2020

@mamoll
Could you please resolve the conflicts?

Fixed.

ports/ompl/CONTROL Outdated Show resolved Hide resolved
ports/ompl/portfile.cmake Outdated Show resolved Hide resolved
ports/ompl/portfile.cmake Outdated Show resolved Hide resolved
@NancyLi1013
Copy link
Contributor

Please also test the feature and help confirm if it can work fine.

@NancyLi1013
Copy link
Contributor

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@NancyLi1013 NancyLi1013 added the requires:testing Needs tests added before merging label Aug 14, 2020
@NancyLi1013
Copy link
Contributor

NancyLi1013 commented Aug 18, 2020

I test the feature again based on both this PR and master branch. It failed with the same error as before on this PR. For master branch, it failed with anther reason. I will try to rebuild on the same machine with the latest master branch.

I will update the results here after double checking this.

@NancyLi1013 NancyLi1013 added info:reviewed Pull Request changes follow basic guidelines and removed requires:author-response requires:testing Needs tests added before merging labels Aug 18, 2020
@NancyLi1013
Copy link
Contributor

Confirmed. This error is not related with the changes in this PR.

In my opinion, it doesn't block this PR to be merged. Maybe we need to fix this later.
@mamoll thanks for your efforts and patience.

LGTM now.

@BillyONeal BillyONeal merged commit 739209b into microsoft:master Aug 18, 2020
@BillyONeal
Copy link
Member

Thanks for your contribution!

remz1337 pushed a commit to remz1337/vcpkg that referenced this pull request Aug 23, 2020
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:port-update The issue is with a library, which is requesting update new revision info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants