From 8124d07d29c7ad959f684d6ef28038d0dba7a1d9 Mon Sep 17 00:00:00 2001 From: atalman Date: Thu, 16 Nov 2023 10:18:36 -0800 Subject: [PATCH 1/5] tests --- .github/workflows/validate-binaries.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/validate-binaries.yml b/.github/workflows/validate-binaries.yml index 25399cd01..f6f73b012 100644 --- a/.github/workflows/validate-binaries.yml +++ b/.github/workflows/validate-binaries.yml @@ -82,7 +82,7 @@ jobs: ref: ${{ inputs.ref || github.ref }} torchonly: ${{ inputs.torchonly }} version: ${{ inputs.version }} - release-matrix: ${{ fromJson(needs.generate-release-matrix.outputs.matrix) }} + release-matrix: ${{ needs.generate-release-matrix.outputs.matrix }} linux: if: inputs.os == 'linux' || inputs.os == 'all' @@ -93,7 +93,7 @@ jobs: ref: ${{ inputs.ref || github.ref }} torchonly: ${{ inputs.torchonly }} version: ${{ inputs.version }} - release-matrix: ${{ fromJson(needs.generate-release-matrix.outputs.matrix) }} + release-matrix: ${{ needs.generate-release-matrix.outputs.matrix }} linux-aarch64: if: inputs.os == 'linux-aarch64' @@ -104,7 +104,7 @@ jobs: ref: ${{ inputs.ref || github.ref }} torchonly: ${{ inputs.torchonly }} version: ${{ inputs.version }} - release-matrix: ${{ fromJson(needs.generate-release-matrix.outputs.matrix) }} + release-matrix: ${{ needs.generate-release-matrix.outputs.matrix }} mac: if: inputs.os == 'macos' || inputs.os == 'all' needs: generate-release-matrix @@ -114,7 +114,7 @@ jobs: ref: ${{ inputs.ref || github.ref }} torchonly: ${{ inputs.torchonly }} version: ${{ inputs.version }} - release-matrix: ${{ fromJson(needs.generate-rlease-matrix.outputs.matrix) }} + release-matrix: ${{ needs.generate-rlease-matrix.outputs.matrix }} mac-arm64: if: inputs.os == 'macos' || inputs.os == 'all' @@ -125,4 +125,4 @@ jobs: ref: ${{ inputs.ref || github.ref }} torchonly: ${{ inputs.torchonly }} version: ${{ inputs.version }} - release-matrix: ${{ fromJson(needs.generate-release-matrix.outputs.matrix) }} + release-matrix: ${{ needs.generate-release-matrix.outputs.matrix }} From 1c919767587d1b6d45ff424a26d1b413ad35fa79 Mon Sep 17 00:00:00 2001 From: atalman Date: Thu, 16 Nov 2023 10:29:41 -0800 Subject: [PATCH 2/5] test --- .github/workflows/validate-linux-binaries.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/validate-linux-binaries.yml b/.github/workflows/validate-linux-binaries.yml index 8bf2b9c71..dcbfc93a0 100644 --- a/.github/workflows/validate-linux-binaries.yml +++ b/.github/workflows/validate-linux-binaries.yml @@ -88,6 +88,7 @@ jobs: export TARGET_OS="linux" eval "$(conda shell.bash hook)" printf '%s\n' ${{ toJson(inputs.release-matrix) }} > release_matrix.json + cat release_matrix.json # Special case PyPi installation package. And Install of PyPi package via poetry if [[ ${MATRIX_PACKAGE_TYPE} == "manywheel" && ${MATRIX_GPU_ARCH_VERSION} == "12.1" ]]; then From e31b671de58442e821471f891dff4a2ad909331a Mon Sep 17 00:00:00 2001 From: atalman Date: Thu, 16 Nov 2023 10:50:25 -0800 Subject: [PATCH 3/5] test --- test/smoke_test/smoke_test.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/smoke_test/smoke_test.py b/test/smoke_test/smoke_test.py index c34208771..382cb0bdb 100644 --- a/test/smoke_test/smoke_test.py +++ b/test/smoke_test/smoke_test.py @@ -282,11 +282,14 @@ def main() -> None: ) options = parser.parse_args() print(f"torch: {torch.__version__}") + print(f"torch expected: {release_version}") # if release_version is specified, override stable_version coming binary matrix if(release_version): + print(f"reading release_matrix for: {release_version}") release_matrix = read_release_matrix() stable_version = release_matrix["torch"] + print(f"new stable version : {stable_version}") check_version(options.package) smoke_test_conv2d() From f4a5d3a20fb5fbf9436e2743e3ed19e6873510cc Mon Sep 17 00:00:00 2001 From: atalman Date: Thu, 16 Nov 2023 11:11:02 -0800 Subject: [PATCH 4/5] test --- test/smoke_test/smoke_test.py | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/test/smoke_test/smoke_test.py b/test/smoke_test/smoke_test.py index 382cb0bdb..8fa995d76 100644 --- a/test/smoke_test/smoke_test.py +++ b/test/smoke_test/smoke_test.py @@ -19,7 +19,6 @@ package_type = os.getenv("MATRIX_PACKAGE_TYPE") target_os = os.getenv("TARGET_OS") BASE_DIR = Path(__file__).parent.parent.parent -release_matrix = None is_cuda_system = gpu_arch_type == "cuda" NIGHTLY_ALLOWED_DELTA = 3 @@ -41,6 +40,7 @@ }, ] + class Net(nn.Module): def __init__(self): super().__init__() @@ -69,6 +69,12 @@ def read_release_matrix(): return load_json_from_basedir("release_matrix.json") def check_version(package: str) -> None: + + # if release_version is specified, override stable_version coming binary matrix + if(release_version): + release_matrix = read_release_matrix() + stable_version = release_matrix["torch"] + # only makes sense to check nightly package where dates are known if channel == "nightly": check_nightly_binaries_date(package) @@ -282,14 +288,6 @@ def main() -> None: ) options = parser.parse_args() print(f"torch: {torch.__version__}") - print(f"torch expected: {release_version}") - - # if release_version is specified, override stable_version coming binary matrix - if(release_version): - print(f"reading release_matrix for: {release_version}") - release_matrix = read_release_matrix() - stable_version = release_matrix["torch"] - print(f"new stable version : {stable_version}") check_version(options.package) smoke_test_conv2d() From fecc68069c1448943a12fefff610a793a73ec9d1 Mon Sep 17 00:00:00 2001 From: atalman Date: Thu, 16 Nov 2023 12:36:51 -0800 Subject: [PATCH 5/5] test --- test/smoke_test/smoke_test.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/smoke_test/smoke_test.py b/test/smoke_test/smoke_test.py index 8fa995d76..4cb7bac9b 100644 --- a/test/smoke_test/smoke_test.py +++ b/test/smoke_test/smoke_test.py @@ -14,8 +14,6 @@ gpu_arch_ver = os.getenv("MATRIX_GPU_ARCH_VERSION") gpu_arch_type = os.getenv("MATRIX_GPU_ARCH_TYPE") channel = os.getenv("MATRIX_CHANNEL") -stable_version = os.getenv("MATRIX_STABLE_VERSION") -release_version = os.getenv("RELEASE_VERSION") package_type = os.getenv("MATRIX_PACKAGE_TYPE") target_os = os.getenv("TARGET_OS") BASE_DIR = Path(__file__).parent.parent.parent @@ -69,11 +67,13 @@ def read_release_matrix(): return load_json_from_basedir("release_matrix.json") def check_version(package: str) -> None: - - # if release_version is specified, override stable_version coming binary matrix + release_version = os.getenv("RELEASE_VERSION") + # if release_version is specified, use it to validate the packages if(release_version): release_matrix = read_release_matrix() stable_version = release_matrix["torch"] + else: + stable_version = os.getenv("MATRIX_STABLE_VERSION") # only makes sense to check nightly package where dates are known if channel == "nightly":