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

Add explicit _gpu build string #954

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions conda/conda-build/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@
{% endif %}

{% if not gpu_enabled_bool %}
{% set cpu_tag='_cpu' %}
{% set dev_tag='_cpu' %}
{% else %}
{% set cpu_tag='' %}
{% set dev_tag='_gpu' %}
{% endif %}

{% if debug_build_bool %}
Expand Down Expand Up @@ -86,7 +86,7 @@ build:
missing_dso_whitelist:
- '*libcuda.so*'

string: "cuda{{ cuda_major }}_py{{ py_version }}{{ git_describe_hash }}_{{ PKG_BUILDNUM }}{{ ucx_tag }}{{ cpu_tag }}{{ debug_tag }}"
string: "cuda{{ cuda_major }}_py{{ py_version }}{{ git_describe_hash }}_{{ PKG_BUILDNUM }}{{ ucx_tag }}{{ dev_tag }}{{ debug_tag }}"

script_env:
- SCCACHE_BUCKET
Expand All @@ -112,7 +112,7 @@ build:
{% if not gpu_enabled_bool %}
- {{ pin_subpackage(name, min_pin="x.x.x", max_pin="x.x.x") }} =*_cpu
{% else %}
- {{ pin_subpackage(name, min_pin="x.x.x", max_pin="x.x.x") }}
- {{ pin_subpackage(name, min_pin="x.x.x", max_pin="x.x.x") }} =*_gpu
{% endif %}
{% if gpu_enabled_bool %}
# prevent nccl from pulling in cudatoolkit
Expand Down
4 changes: 3 additions & 1 deletion continuous_integration/scripts/build-legate
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@ build_legate() {
activate_conda_env;
conda_info;

git config --global --add safe.directory "$REPO_DIR/.git"

case "$BUILD_TYPE" in
ci) build_legate_ci && copy_ci_artifacts;;
release) build_legate_release && copy_release_artifacts;;
Expand All @@ -88,4 +90,4 @@ build_legate() {
esac
}

(build_legate "$@");
(build_legate "$@");
Loading