From b79905ade6f1b8d4b12eb1c799c218ca0b1e1b85 Mon Sep 17 00:00:00 2001 From: Sandeep Datta Date: Wed, 13 Sep 2023 04:57:39 -0700 Subject: [PATCH] Moving to CUDA 12. --- .github/workflows/gh-build.yml | 6 ++- cmake/versions.json | 2 +- conda/conda-build/meta.yaml | 2 +- .../{ => scripts}/build-cunumeric-all | 6 +-- .../{ => scripts}/build-cunumeric-conda | 1 + .../{ => scripts}/build-cunumeric-cpp | 0 .../{ => scripts}/build-cunumeric-wheel | 0 continuous_integration/scripts/entrypoint | 46 +++++++++++++++++++ .../{ => scripts}/test-cunumeric | 0 9 files changed, 56 insertions(+), 7 deletions(-) rename continuous_integration/{ => scripts}/build-cunumeric-all (90%) rename continuous_integration/{ => scripts}/build-cunumeric-conda (98%) rename continuous_integration/{ => scripts}/build-cunumeric-cpp (100%) rename continuous_integration/{ => scripts}/build-cunumeric-wheel (100%) create mode 100755 continuous_integration/scripts/entrypoint rename continuous_integration/{ => scripts}/test-cunumeric (100%) diff --git a/.github/workflows/gh-build.yml b/.github/workflows/gh-build.yml index 809465911..4e0513c19 100644 --- a/.github/workflows/gh-build.yml +++ b/.github/workflows/gh-build.yml @@ -28,7 +28,9 @@ jobs: options: -u root image: "${{ inputs.image }}" env: - CUDA_VERSION: "${{ inputs.CUDA }}" + CUDA_VERSION: "12.0" + CUDA_VERSION_MAJOR: "12" + CUDA_VERSION_MINOR: "0" SCCACHE_REGION: "us-east-2" SCCACHE_BUCKET: "rapids-sccache-devs" SCCACHE_S3_KEY_PREFIX: "legate-cunumeric-dev" @@ -93,7 +95,7 @@ jobs: - name: Build cunumeric run: | - export PATH="/home/coder/cunumeric/continuous_integration:$PATH" + export PATH="/home/coder/cunumeric/continuous_integration/scripts:$PATH" build-cunumeric-all - name: Upload build artifacts diff --git a/cmake/versions.json b/cmake/versions.json index d1ae134ab..7a98894dd 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" : "14cca04834095553e4d88f503dc4cd35e4072212" + "git_tag" : "06b0e4d7fded0b4207fd8b4ba34c330333ee3543" } } } diff --git a/conda/conda-build/meta.yaml b/conda/conda-build/meta.yaml index 81569e3a2..1fa2d37a2 100644 --- a/conda/conda-build/meta.yaml +++ b/conda/conda-build/meta.yaml @@ -10,7 +10,7 @@ ## The placeholder version is strictly for making two-pass conda build process. ## It should not be used for any other purpose, and this is not a default version. {% set placeholder_version = '0.0.0.dev' %} -{% set default_cuda_version = '11.8' %} +{% set default_cuda_version = '12.0' %} {% set cuda_version='.'.join(environ.get('CUDA', default_cuda_version).split('.')[:2]) %} {% set cuda_major=cuda_version.split('.')[0]|int %} {% set py_version=environ.get('CONDA_PY', '') %} diff --git a/continuous_integration/build-cunumeric-all b/continuous_integration/scripts/build-cunumeric-all similarity index 90% rename from continuous_integration/build-cunumeric-all rename to continuous_integration/scripts/build-cunumeric-all index 577d15007..d8b216417 100755 --- a/continuous_integration/build-cunumeric-all +++ b/continuous_integration/scripts/build-cunumeric-all @@ -18,11 +18,11 @@ build_cunumeric_all() { conda info; set -xeuo pipefail; - printf "\n\n\n\n********* BUILDING CUNUMERIC CPP *********" + printf "\n\n\n\n********* BUILDING CUNUMERIC CPP *********\n" build-cunumeric-cpp; - printf "\n\n\n\n********* BUILDING CUNUMERIC WHEEL *********" + printf "\n\n\n\n********* BUILDING CUNUMERIC WHEEL *********\n" build-cunumeric-wheel; - printf "\n\n\n\n********* BUILDING CUNUMERIC CONDA *********" + printf "\n\n\n\n********* BUILDING CUNUMERIC CONDA *********\n" build-cunumeric-conda; } diff --git a/continuous_integration/build-cunumeric-conda b/continuous_integration/scripts/build-cunumeric-conda similarity index 98% rename from continuous_integration/build-cunumeric-conda rename to continuous_integration/scripts/build-cunumeric-conda index 90fe593d0..b1ec8bfb6 100755 --- a/continuous_integration/build-cunumeric-conda +++ b/continuous_integration/scripts/build-cunumeric-conda @@ -9,6 +9,7 @@ build_cunumeric_conda_package() { python_version="$(python3 --version 2>&1 | cut -d' ' -f2 | cut -d'.' -f3 --complement)"; fi + mkdir -p /tmp/conda-build /tmp/out cp -r ~/.artifacts/legate_core /tmp/conda-build/ local conda_build_args=(); diff --git a/continuous_integration/build-cunumeric-cpp b/continuous_integration/scripts/build-cunumeric-cpp similarity index 100% rename from continuous_integration/build-cunumeric-cpp rename to continuous_integration/scripts/build-cunumeric-cpp diff --git a/continuous_integration/build-cunumeric-wheel b/continuous_integration/scripts/build-cunumeric-wheel similarity index 100% rename from continuous_integration/build-cunumeric-wheel rename to continuous_integration/scripts/build-cunumeric-wheel diff --git a/continuous_integration/scripts/entrypoint b/continuous_integration/scripts/entrypoint new file mode 100755 index 000000000..298fc1c7a --- /dev/null +++ b/continuous_integration/scripts/entrypoint @@ -0,0 +1,46 @@ +#!/usr/bin/env bash + +sccache_stop_server_and_show_stats() { + sccache --stop-server || true && sccache --show-stats; +} + +init_devcontainer() { + # disable xtrace and history + local xtrace_enabled=$(echo "${SHELLOPTS:-}" | grep -q 'xtrace'; echo $?); + local history_enabled=$(echo "${SHELLOPTS:-}" | grep -q 'history'; echo $?); + { set +xo history; } 2>/dev/null; + eval "export $(find /run/secrets/ -type f -exec bash -c 'echo ${0/\/run\/secrets\//}=$(<${0})' {} \;)"; + if [ "${history_enabled}" -eq "0" ]; then { set -o history; } 2>/dev/null; fi; + if [ "${xtrace_enabled}" -eq "0" ]; then { set -o xtrace; } 2>/dev/null; fi; + + set -xeo pipefail + + . devcontainer-utils-post-attach-command; + + sleep 10; + . devcontainer-utils-vault-s3-test; + . devcontainer-utils-vault-s3-export 0; +} + +entrypoint() { + set -x + + mkdir -p /home/coder/.cache; + + local secrets_dir=/run/secrets + + if [ -d "$secrets_dir" ] && [ "$(ls -A $secrets_dir)" ]; then + init_devcontainer + else + sccache_stop_server_and_show_stats + fi + + echo AWS_REGION=${AWS_REGION:-} + echo AWS_SESSION_TOKEN=${AWS_SESSION_TOKEN:-} + echo AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID:-} + echo AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY:-} + + exec "$@"; +} + +entrypoint "$@"; diff --git a/continuous_integration/test-cunumeric b/continuous_integration/scripts/test-cunumeric similarity index 100% rename from continuous_integration/test-cunumeric rename to continuous_integration/scripts/test-cunumeric