From 2716f8d7e6a109b34b75d4f43fa0ba0dddb080e3 Mon Sep 17 00:00:00 2001 From: Cloud Han Date: Sat, 30 Sep 2023 13:33:55 +0800 Subject: [PATCH] Minor update and retrigger jaxlib-v0.4.11 build --- .github/workflows/ci-build.yml | 18 +++++++++--------- build-jaxlib.ps1 | 11 ++++++----- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index ca0399a..5c06753 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -9,7 +9,7 @@ on: jobs: build-cpu: - runs-on: windows-2019 + runs-on: windows-2022 env: AZURE_STORAGE_CONNECTION_STRING: ${{ secrets.AZURE_STORAGE_CONNECTION_STRING }} BAZEL_PATH: "D:\\bazel.exe" @@ -58,7 +58,7 @@ jobs: - name: py311 build whl and upload run: | cd "$env:GITHUB_WORKSPACE/jax" - ../build-jaxlib.ps1 cpu -bazel_path $env:BAZEL_PATH + ../build-jaxlib.ps1 cpu -bazel_path $env:BAZEL_PATH -vs_version 2022 az storage blob upload-batch --overwrite -d unstable -s "$env:GITHUB_WORKSPACE/jax/bazel-dist" --pattern '*.whl' rm -Recurse -Force "$env:GITHUB_WORKSPACE/jax/bazel-dist" @@ -74,7 +74,7 @@ jobs: - name: py310 build whl and upload run: | cd "$env:GITHUB_WORKSPACE/jax" - ../build-jaxlib.ps1 cpu -bazel_path $env:BAZEL_PATH + ../build-jaxlib.ps1 cpu -bazel_path $env:BAZEL_PATH -vs_version 2022 az storage blob upload-batch --overwrite -d unstable -s "$env:GITHUB_WORKSPACE/jax/bazel-dist" --pattern '*.whl' rm -Recurse -Force "$env:GITHUB_WORKSPACE/jax/bazel-dist" @@ -90,7 +90,7 @@ jobs: - name: py39 build whl and upload run: | cd "$env:GITHUB_WORKSPACE/jax" - ../build-jaxlib.ps1 cpu -bazel_path $env:BAZEL_PATH + ../build-jaxlib.ps1 cpu -bazel_path $env:BAZEL_PATH -vs_version 2022 az storage blob upload-batch --overwrite -d unstable -s "$env:GITHUB_WORKSPACE/jax/bazel-dist" --pattern '*.whl' rm -Recurse -Force "$env:GITHUB_WORKSPACE/jax/bazel-dist" @@ -106,7 +106,7 @@ jobs: - name: py38 build whl and upload run: | cd "$env:GITHUB_WORKSPACE/jax" - ../build-jaxlib.ps1 cpu -bazel_path $env:BAZEL_PATH + ../build-jaxlib.ps1 cpu -bazel_path $env:BAZEL_PATH -vs_version 2022 az storage blob upload-batch --overwrite -d unstable -s "$env:GITHUB_WORKSPACE/jax/bazel-dist" --pattern '*.whl' rm -Recurse -Force "$env:GITHUB_WORKSPACE/jax/bazel-dist" @@ -176,7 +176,7 @@ jobs: - name: py311 build whl and upload run: | cd "$env:GITHUB_WORKSPACE/jax" - ../build-jaxlib.ps1 cuda -bazel_path $env:BAZEL_PATH -cuda_version '${{ matrix.cuda-version }}' -cuda_prefix 'D:/CUDA' -symlink_python + ../build-jaxlib.ps1 cuda -bazel_path $env:BAZEL_PATH -vs_version 2022 -cuda_version '${{ matrix.cuda-version }}' -cuda_prefix 'D:/CUDA' -symlink_python az storage blob upload-batch --overwrite -d unstable -s "$env:GITHUB_WORKSPACE/jax/bazel-dist" --pattern '*.whl' rm -Recurse -Force "$env:GITHUB_WORKSPACE/jax/bazel-dist" @@ -192,7 +192,7 @@ jobs: - name: py310 build whl and upload run: | cd "$env:GITHUB_WORKSPACE/jax" - ../build-jaxlib.ps1 cuda -bazel_path $env:BAZEL_PATH -cuda_version '${{ matrix.cuda-version }}' -cuda_prefix 'D:/CUDA' -symlink_python + ../build-jaxlib.ps1 cuda -bazel_path $env:BAZEL_PATH -vs_version 2022 -cuda_version '${{ matrix.cuda-version }}' -cuda_prefix 'D:/CUDA' -symlink_python az storage blob upload-batch --overwrite -d unstable -s "$env:GITHUB_WORKSPACE/jax/bazel-dist" --pattern '*.whl' rm -Recurse -Force "$env:GITHUB_WORKSPACE/jax/bazel-dist" @@ -208,7 +208,7 @@ jobs: - name: py39 build whl and upload run: | cd "$env:GITHUB_WORKSPACE/jax" - ../build-jaxlib.ps1 cuda -bazel_path $env:BAZEL_PATH -cuda_version '${{ matrix.cuda-version }}' -cuda_prefix 'D:/CUDA' -symlink_python + ../build-jaxlib.ps1 cuda -bazel_path $env:BAZEL_PATH -vs_version 2022 -cuda_version '${{ matrix.cuda-version }}' -cuda_prefix 'D:/CUDA' -symlink_python az storage blob upload-batch --overwrite -d unstable -s "$env:GITHUB_WORKSPACE/jax/bazel-dist" --pattern '*.whl' rm -Recurse -Force "$env:GITHUB_WORKSPACE/jax/bazel-dist" @@ -224,7 +224,7 @@ jobs: - name: py38 build whl and upload run: | cd "$env:GITHUB_WORKSPACE/jax" - ../build-jaxlib.ps1 cuda -bazel_path $env:BAZEL_PATH -cuda_version '${{ matrix.cuda-version }}' -cuda_prefix 'D:/CUDA' -symlink_python + ../build-jaxlib.ps1 cuda -bazel_path $env:BAZEL_PATH -vs_version 2022 -cuda_version '${{ matrix.cuda-version }}' -cuda_prefix 'D:/CUDA' -symlink_python az storage blob upload-batch --overwrite -d unstable -s "$env:GITHUB_WORKSPACE/jax/bazel-dist" --pattern '*.whl' rm -Recurse -Force "$env:GITHUB_WORKSPACE/jax/bazel-dist" diff --git a/build-jaxlib.ps1 b/build-jaxlib.ps1 index 2199d87..079ebae 100644 --- a/build-jaxlib.ps1 +++ b/build-jaxlib.ps1 @@ -54,9 +54,6 @@ switch ($cuda_version) { } } -$cuda_version = [System.Version]$cuda_version -$cudnn_version = [System.Version]$cudnn_version - $cuda_path = "$cuda_prefix/v$cuda_version" $cudnn_path = $cuda_path @@ -174,13 +171,17 @@ try { if ($build_type -eq 'cpu') { mkdir "bazel-dist/cpu" -ErrorAction 0 mv -Force "dist/$name" "bazel-dist/cpu/$name" + Write-Host -ForegroundColor Yellow "Moved dist/$name to bazel-dist/cpu/$name" } elseif ($build_type -eq 'cuda') { - $cuda_dir = "cuda$($cuda_version.Major)$($cuda_version.Minor)" - $cuda_cudnn_tag = "cuda$($cuda_version.Major).cudnn$($cudnn_version.Major)$($cudnn_version.Minor)" + $cuda_ver = [System.Version]$cuda_version + $cudnn_ver = [System.Version]$cudnn_version + $cuda_dir = "cuda$($cuda_ver.Major)$($cuda_ver.Minor)" + $cuda_cudnn_tag = "cuda$($cuda_ver.Major).cudnn$($cudnn_ver.Major)$($cudnn_ver.Minor)" $new_name = $name.Insert($name.IndexOf("-", $name.IndexOf("-") + 1), "+$cuda_cudnn_tag") mkdir "bazel-dist/$cuda_dir" -ErrorAction 0 mv -Force "dist/$name" "bazel-dist/$cuda_dir/$new_name" + Write-Host -ForegroundColor Yellow "Move dist/$name to bazel-dist/$cuda_dir/$new_name" } } finally {