diff --git a/.github/actions/download-artifacts/action.yml b/.github/actions/download-artifacts/action.yml index 640dc143a..0ce934ee8 100644 --- a/.github/actions/download-artifacts/action.yml +++ b/.github/actions/download-artifacts/action.yml @@ -24,7 +24,7 @@ runs: path: .artifacts-dl repo: nv-legate/legate.core commit: ${{ inputs.git_sha }} - workflow_conclusion: success + workflow_conclusion: "" workflow: "ci-gh.yml" name: "legate.core-${{ inputs.device }}-[0-9a-z]{40}" name_is_regexp: true diff --git a/cmake/versions.json b/cmake/versions.json index e19f3932f..b9b4aeb02 100644 --- a/cmake/versions.json +++ b/cmake/versions.json @@ -5,7 +5,7 @@ "git_url" : "https://github.com/nv-legate/legate.core.git", "git_shallow": false, "always_download": false, - "git_tag" : "0f509a007f36609d2b0bd536d8e5c54f2391b444" + "git_tag" : "bcf2b4997744505fdc8a0de52a63b1f2c1e8d023" } } } diff --git a/conda/conda-build/meta.yaml b/conda/conda-build/meta.yaml index 85ea88d74..3ee243f52 100644 --- a/conda/conda-build/meta.yaml +++ b/conda/conda-build/meta.yaml @@ -58,14 +58,14 @@ build: {% if not gpu_enabled_bool %} string: "cuda{{ cuda_major }}_py{{ py_version }}_{{ GIT_DESCRIBE_HASH }}_{{ PKG_BUILDNUM }}_cpu" {% else %} - string: "cuda{{ cuda_major }}_py{{ py_version }}_{{ GIT_DESCRIBE_HASH }}_{{ PKG_BUILDNUM }}" + string: "cuda{{ cuda_major }}_py{{ py_version }}_{{ GIT_DESCRIBE_HASH }}_{{ PKG_BUILDNUM }}_gpu" {% endif %} {% else %} # do not use git hash {% if not gpu_enabled_bool %} string: "cuda{{ cuda_major }}_py{{ py_version }}_{{ PKG_BUILDNUM }}_cpu" {% else %} - string: "cuda{{ cuda_major }}_py{{ py_version }}_{{ PKG_BUILDNUM }}" + string: "cuda{{ cuda_major }}_py{{ py_version }}_{{ PKG_BUILDNUM }}_gpu" {% endif %} {% endif %} script_env: @@ -112,7 +112,7 @@ requirements: {% if not gpu_enabled_bool %} - legate-core ={{ core_version }} =*_cpu {% else %} - - legate-core ={{ core_version }} + - legate-core ={{ core_version }} =*_gpu - cuda-nvcc ={{ cuda_version }} - cuda-cccl ={{ cuda_version }} - cuda-cudart ={{ cuda_version }} @@ -134,7 +134,7 @@ requirements: {% if not gpu_enabled_bool %} - legate-core ={{ core_version }} =*_cpu {% else %} - - legate-core ={{ core_version }} + - legate-core ={{ core_version }} =*_gpu - cuda-cudart >={{ cuda_version }},<{{ cuda_major+1 }} - cuda-version >={{ cuda_version }},<{{ cuda_major+1 }} - cutensor >=1.3 =*_*