From 190b4cf3d271c2cd20561dd8d0e54387532c012a Mon Sep 17 00:00:00 2001 From: atalman Date: Wed, 15 Nov 2023 08:08:10 -0800 Subject: [PATCH 1/3] test --- .github/workflows/validate-linux-binaries.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/validate-linux-binaries.yml b/.github/workflows/validate-linux-binaries.yml index 92a12a15e..0bb5e3ce7 100644 --- a/.github/workflows/validate-linux-binaries.yml +++ b/.github/workflows/validate-linux-binaries.yml @@ -50,7 +50,7 @@ jobs: needs: generate-linux-matrix uses: pytorch/test-infra/.github/workflows/generate_release_matrix.yml@main with: - version: ${{ fromJson(needs.generate-linux-matrix.outputs.matrix).stable_version }} + version: "2.1.1" linux: needs: [generate-linux-matrix, generate-release-matrix] From 67d3deaff7df603bba1c194b3d52ce219c7acb3e Mon Sep 17 00:00:00 2001 From: atalman Date: Thu, 16 Nov 2023 06:36:27 -0800 Subject: [PATCH 2/3] test --- test/smoke_test/smoke_test.py | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/test/smoke_test/smoke_test.py b/test/smoke_test/smoke_test.py index 3d1b6af64..5e0d0ace7 100644 --- a/test/smoke_test/smoke_test.py +++ b/test/smoke_test/smoke_test.py @@ -52,6 +52,20 @@ def forward(self, x): output = self.fc1(x) return output +def load_json_from_basedir(filename: str): + try: + if os.path.exists(BASE_DIR / filename): + with open(BASE_DIR / filename) as fptr: + return json.load(fptr) + else: + return None + except FileNotFoundError as exc: + raise ImportError(f"File {filename} not found error: {exc.strerror}") from exc + except json.JSONDecodeError as exc: + raise ImportError(f"Invalid JSON {filename}") from exc + +def read_release_matrix(): + return load_json_from_basedir("release_matrix.json") def check_version(package: str) -> None: # only makes sense to check nightly package where dates are known @@ -62,6 +76,16 @@ def check_version(package: str) -> None: raise RuntimeError( f"Torch version mismatch, expected {stable_version} for channel {channel}. But its {torch.__version__}" ) + release_version = read_release_matrix() + if package == "all": + for module in MODULES: + imported_module = importlib.import_module(module["name"]) + module_version = imported_module.__version__ + if not module_version.startswith(release_version[module["name"]]): + raise RuntimeError( + f"{module['name']} version mismatch, expected {release_version[module['name']]} for channel {channel}. But its {module_version}" + ) + else: print(f"Skip version check for channel {channel} as stable version is None") From 03be6394cd91b00ec9128fc61ce9ecc0a3405636 Mon Sep 17 00:00:00 2001 From: atalman Date: Thu, 16 Nov 2023 06:48:17 -0800 Subject: [PATCH 3/3] test --- test/smoke_test/smoke_test.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/test/smoke_test/smoke_test.py b/test/smoke_test/smoke_test.py index 5e0d0ace7..c0bb9230f 100644 --- a/test/smoke_test/smoke_test.py +++ b/test/smoke_test/smoke_test.py @@ -3,6 +3,7 @@ import sys import argparse import torch +import json import importlib import subprocess import torch._dynamo @@ -15,6 +16,7 @@ stable_version = os.getenv("MATRIX_STABLE_VERSION") package_type = os.getenv("MATRIX_PACKAGE_TYPE") target_os = os.getenv("TARGET_OS") +BASE_DIR = Path(__file__).parent.parent is_cuda_system = gpu_arch_type == "cuda" NIGHTLY_ALLOWED_DELTA = 3 @@ -54,11 +56,8 @@ def forward(self, x): def load_json_from_basedir(filename: str): try: - if os.path.exists(BASE_DIR / filename): - with open(BASE_DIR / filename) as fptr: - return json.load(fptr) - else: - return None + with open(BASE_DIR / filename) as fptr: + return json.load(fptr) except FileNotFoundError as exc: raise ImportError(f"File {filename} not found error: {exc.strerror}") from exc except json.JSONDecodeError as exc: