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 recipes for Enhanced Compatibility #910

Merged
merged 5 commits into from
Nov 9, 2021

Conversation

ajschmidt8
Copy link
Member

@ajschmidt8 ajschmidt8 commented Nov 5, 2021

This PR tweaks the changes from #893 and #909 so that rmm produces two packages (has_cma and no_cma) instead of librmm.

@ajschmidt8 ajschmidt8 added bug Something isn't working non-breaking Non-breaking change labels Nov 5, 2021
Copy link
Member

@jakirkham jakirkham left a comment

Choose a reason for hiding this comment

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

Variables specified in conda_build_config.yaml (like cudaMallocAsync) can be used as environment variables, which may simplify things here

conda/recipes/rmm/build.sh Show resolved Hide resolved
conda/recipes/rmm/meta.yaml Outdated Show resolved Hide resolved
conda/recipes/rmm/meta.yaml Outdated Show resolved Hide resolved
@ajschmidt8
Copy link
Member Author

Variables specified in conda_build_config.yaml (like cudaMallocAsync) can be used as environment variables, which may simplify things here

Thanks @jakirkham! Testing your suggestions locally real quick and then I will commit them.

@ajschmidt8 ajschmidt8 marked this pull request as ready for review November 8, 2021 15:45
@ajschmidt8 ajschmidt8 requested a review from a team as a code owner November 8, 2021 15:45
@ajschmidt8 ajschmidt8 marked this pull request as draft November 8, 2021 16:27
@ajschmidt8
Copy link
Member Author

Requires more changes. Switching to draft to prevent accidental merges until then.

@ajschmidt8
Copy link
Member Author

rerun tests

@ajschmidt8 ajschmidt8 marked this pull request as ready for review November 8, 2021 18:47
@@ -14,7 +14,7 @@ source:

build:
number: {{ GIT_DESCRIBE_NUMBER }}
string: cuda_{{ cuda_major }}_py{{ py_version }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }}
string: cuda{{ cuda_major }}_py{{ py_version }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }}_{{ cudaMallocAsync }}
Copy link
Member

Choose a reason for hiding this comment

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

Is the cudaMallocAsync bit still needed here given the changes above and the fact it is implicit based on CUDA version?

Copy link
Member Author

Choose a reason for hiding this comment

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

We have some logic below that depends on this extra metadata in the build string. If you know a way we can work around that, then we could remove the extra {{ cudaMallocAsync }} bit here.

rmm/ci/gpu/build.sh

Lines 116 to 123 in 76ae622

CONDA_FILE=`find $WORKSPACE/ci/artifacts/rmm/cpu/conda-bld/ -name "librmm*no_cma*.tar.bz2"`
if [[ "$CUDA_MAJOR_VER" -ge 11 ]] && [[ "$CUDA_MINOR_VER" -ge 2 ]]; then
CONDA_FILE=`find $WORKSPACE/ci/artifacts/rmm/cpu/conda-bld/ -name "librmm*has_cma*.tar.bz2"`
fi
CONDA_FILE=`basename "$CONDA_FILE" .tar.bz2` #get filename without extension
CONDA_FILE=${CONDA_FILE//-/=} #convert to conda install
gpuci_logger "Installing $CONDA_FILE"
gpuci_mamba_retry install -c $WORKSPACE/ci/artifacts/rmm/cpu/conda-bld/ "$CONDA_FILE"

@ajschmidt8
Copy link
Member Author

@gpucibot merge

@rapids-bot rapids-bot bot merged commit 8802114 into rapidsai:branch-21.12 Nov 9, 2021
@ajschmidt8 ajschmidt8 deleted the update-recipes branch November 9, 2021 17:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working conda gpuCI non-breaking Non-breaking change
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants