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

Fix memory_resource compilation in conda build #4939

Merged
merged 2 commits into from
Jul 10, 2023
Merged

Conversation

klecki
Copy link
Contributor

@klecki klecki commented Jul 10, 2023

Category: Bug fix

Description:

Update conda build to use C++17.
DALI assumes C++17 for build env, conda for some reason forced C++14.
Revert the code that conditionally includes memory_resource from experimental
if an older version of standard library is present (as happens in conda env).

Additional information:

Affected modules and functionalities:

Conda build

Key points relevant for the review:

Tests:

  • Existing tests apply
    This impacts the compilation.
  • New tests added
    • Python tests
    • GTests
    • Benchmark
    • Other
  • N/A

Checklist

Documentation

  • Existing documentation applies
  • Documentation updated
    • Docstring
    • Doxygen
    • RST
    • Jupyter
    • Other
  • N/A

DALI team only

Requirements

  • Implements new requirements
  • Affects existing requirements
  • N/A

REQ IDs: N/A

JIRA TASK: N/A

Signed-off-by: Krzysztof Lecki <klecki@nvidia.com>
@dali-automaton
Copy link
Collaborator

CI MESSAGE: [8910943]: BUILD STARTED

@awolant awolant self-assigned this Jul 10, 2023
Signed-off-by: Krzysztof Lecki <klecki@nvidia.com>
@dali-automaton
Copy link
Collaborator

CI MESSAGE: [8910943]: BUILD FAILED

@JanuszL JanuszL self-assigned this Jul 10, 2023
Copy link
Contributor

@JanuszL JanuszL left a comment

Choose a reason for hiding this comment

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

I guess the changesin build.sh are not longer needed.

@dali-automaton
Copy link
Collaborator

CI MESSAGE: [8911520]: BUILD STARTED

@klecki
Copy link
Contributor Author

klecki commented Jul 10, 2023

I guess the changesin build.sh are not longer needed.

They still should reflect how we compile DALI, even if the standard library provided by conda has some modules as experimental.

@klecki klecki changed the title Update conda build to match C++ standard in DALI Fix memory_resource compilation in conda build Jul 10, 2023
@dali-automaton
Copy link
Collaborator

CI MESSAGE: [8911520]: BUILD PASSED

@klecki klecki merged commit 7e88130 into NVIDIA:main Jul 10, 2023
3 checks passed
@klecki klecki deleted the conda-cpp17 branch July 10, 2023 11:59
stiepan pushed a commit that referenced this pull request Jul 10, 2023
Update conda build to use C++17.
DALI assumes C++17 for build env, conda for some reason forced C++14.

Revert the code that conditionally includes memory_resource from experimental
if an older version of standard library is present (as happens in conda env).

Signed-off-by: Krzysztof Lecki <klecki@nvidia.com>
JanuszL pushed a commit to JanuszL/DALI that referenced this pull request Oct 13, 2023
Update conda build to use C++17.
DALI assumes C++17 for build env, conda for some reason forced C++14.

Revert the code that conditionally includes memory_resource from experimental
if an older version of standard library is present (as happens in conda env).

Signed-off-by: Krzysztof Lecki <klecki@nvidia.com>
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.

4 participants