From 32dd533da607d52c41d28f927c7b190b15cafeb4 Mon Sep 17 00:00:00 2001 From: ptaylor Date: Thu, 31 Oct 2024 17:57:16 -0700 Subject: [PATCH] try on cpu4 runners with 4x parallelism --- .github/actions/workflow-build/build-workflow.py | 2 +- .github/actions/workflow-run-job-linux/action.yml | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/actions/workflow-build/build-workflow.py b/.github/actions/workflow-build/build-workflow.py index ba372dadecb..b652857f779 100755 --- a/.github/actions/workflow-build/build-workflow.py +++ b/.github/actions/workflow-build/build-workflow.py @@ -389,7 +389,7 @@ def generate_dispatch_job_runner(matrix_job, job_type): job_info = get_job_type_info(job_type) if not job_info['gpu']: - return f"{runner_os}-{cpu}-cpu8" + return f"{runner_os}-{cpu}-cpu4" gpu = get_gpu(matrix_job['gpu']) suffix = "-testing" if gpu['testing'] else "" diff --git a/.github/actions/workflow-run-job-linux/action.yml b/.github/actions/workflow-run-job-linux/action.yml index 7ddc2804fbe..593ecddbc27 100644 --- a/.github/actions/workflow-run-job-linux/action.yml +++ b/.github/actions/workflow-run-job-linux/action.yml @@ -73,7 +73,7 @@ runs: RUNNER: "${{inputs.runner}}" # Dereferencing the command from an env var instead of a GHA input avoids issues with escaping # semicolons and other special characters (e.g. `-arch "60;70;80"`). - COMMAND: "${{inputs.command}} -v" + COMMAND: "${{inputs.command}}" DIST_TOKEN: "${{inputs.dist-token}}" AWS_ACCESS_KEY_ID: "${{env.AWS_ACCESS_KEY_ID}}" AWS_SESSION_TOKEN: "${{env.AWS_SESSION_TOKEN}}" @@ -173,7 +173,7 @@ runs: chmod 0664 "$RUNNER_TEMP/.config/sccache/config" extra_launch_args+=( - --env "PARALLEL_LEVEL=$((CPUS * 2))" + --env "PARALLEL_LEVEL=$((CPUS * 4))" --env "SCCACHE_NO_CACHE=true" --env "SCCACHE_S3_KEY_PREFIX=cccl-sccache-dist-test" --volume "$(host_path "$RUNNER_TEMP")/.config:/root/.config:ro" @@ -221,10 +221,15 @@ runs: touch "$result_dir/success" + echo "repo: ${{github.workspace}}/${{github.event.repository.name}}" + echo "pwd: $(pwd)" + echo "dirs:" + find . -mindepth 1 -maxdepth 1 -type d + # Finds a matching file in the repo directory and copies it to the results directory. find_and_copy() { filename="$1" - filepath="$(find ${{github.event.repository.name}} -name "${filename}" -print -quit)" + filepath="$(find "${{github.workspace}}/${{github.event.repository.name}}" -name "${filename}" -print -quit)" if [[ -z "$filepath" ]]; then echo "${filename} does not exist in repo directory." return 1