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

Update main branch post 24.11 #52

Merged
merged 1 commit into from
Nov 26, 2024
Merged

Update main branch post 24.11 #52

merged 1 commit into from
Nov 26, 2024

Conversation

mc-nv
Copy link
Contributor

@mc-nv mc-nv commented Nov 22, 2024

This PR is subset of changes which need to be carried over to the main branch after the release

* Build Updates for Ubuntu24.04 (#50)

* update cmake version for u24

* temp: override client repo tag

* remove werror

* fix0 - redefinition error

Error -
```
/tmp/build/javacpp-presets/tritonserver/cppbuild/tritonbuild/developer_tools/server/include/triton/developer_tools/server_wrapper.h:413:58: error: redefinition of default argument for 'typename std::enable_if<(! std::is_same<typename std::iterator_traits< <template-parameter-1-1> >::value_type, std::__cxx11::basic_string<char> >::value)>::type* <anonymous>'
  413 |                            std::string>::value>::type* = nullptr>
      |                                                          ^~~~~~~
/tmp/build/javacpp-presets/tritonserver/cppbuild/tritonbuild/developer_tools/server/include/triton/developer_tools/server_wrapper.h:316:41: note: original definition appeared here
  316 |           std::string>::value>::type* = nullptr>
      |                                         ^~~~~~~
make[2]: *** [CMakeFiles/triton-developer_tools-server.dir/build.make:76: CMakeFiles/triton-developer_tools-server.dir/src/server_wrapper.cc.o] Error 1
```

* fix1 - redefinition error

* Revert "temp: override client repo tag"

This reverts commit 9f8ea3d.

* Update server/install_dependencies_and_build.sh

---------

Co-authored-by: Anant Sharma <[email protected]>
@mc-nv mc-nv self-assigned this Nov 22, 2024
@mc-nv mc-nv marked this pull request as ready for review November 26, 2024 00:31
@mc-nv mc-nv merged commit d557591 into main Nov 26, 2024
1 of 3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants