From c6505cf19829d264c37873a123404cc22bac401b Mon Sep 17 00:00:00 2001 From: Justin Chu Date: Wed, 12 Apr 2023 17:30:24 +0000 Subject: [PATCH] Move version_utils to _internal | chore Move version_utils to `_internal` so that it can be used my onnxscript [ghstack-poisoned] --- onnxscript/{tests/common => _internal}/version_utils.py | 0 onnxscript/function_libs/torch_aten/graph_building_test.py | 2 +- .../tests/function_libs/torch_aten/ops_correctness_test.py | 2 +- onnxscript/tests/functions/onnxfns1A_test.py | 3 ++- onnxscript/tests/functions/onnxfns2_test.py | 3 ++- onnxscript/tests/functions/onnxfns_test.py | 3 ++- 6 files changed, 8 insertions(+), 5 deletions(-) rename onnxscript/{tests/common => _internal}/version_utils.py (100%) diff --git a/onnxscript/tests/common/version_utils.py b/onnxscript/_internal/version_utils.py similarity index 100% rename from onnxscript/tests/common/version_utils.py rename to onnxscript/_internal/version_utils.py diff --git a/onnxscript/function_libs/torch_aten/graph_building_test.py b/onnxscript/function_libs/torch_aten/graph_building_test.py index 0257fa3315..60646b8768 100644 --- a/onnxscript/function_libs/torch_aten/graph_building_test.py +++ b/onnxscript/function_libs/torch_aten/graph_building_test.py @@ -10,8 +10,8 @@ import onnxscript.testing from onnxscript import FLOAT, evaluator from onnxscript import opset17 as op +from onnxscript._internal import version_utils from onnxscript.function_libs.torch_aten import graph_building, ops -from onnxscript.tests.common import version_utils @unittest.skipIf(version_utils.torch_older_than("2.0"), "torchscript in 1.13 not supported") diff --git a/onnxscript/tests/function_libs/torch_aten/ops_correctness_test.py b/onnxscript/tests/function_libs/torch_aten/ops_correctness_test.py index 011ba96a43..897a8cdcdb 100644 --- a/onnxscript/tests/function_libs/torch_aten/ops_correctness_test.py +++ b/onnxscript/tests/function_libs/torch_aten/ops_correctness_test.py @@ -58,11 +58,11 @@ import onnxscript import onnxscript.evaluator +from onnxscript._internal import version_utils from onnxscript.function_libs.torch_aten import graph_building from onnxscript.function_libs.torch_aten.ops import core as core_ops from onnxscript.function_libs.torch_aten.ops import nn as nn_ops from onnxscript.function_libs.torch_aten.ops import special as special_ops -from onnxscript.tests.common import version_utils from onnxscript.tests.function_libs.torch_aten import extra_opinfo T = TypeVar("T") diff --git a/onnxscript/tests/functions/onnxfns1A_test.py b/onnxscript/tests/functions/onnxfns1A_test.py index 00148e5632..a9c22aba43 100644 --- a/onnxscript/tests/functions/onnxfns1A_test.py +++ b/onnxscript/tests/functions/onnxfns1A_test.py @@ -3,7 +3,8 @@ import onnx import pytest -from onnxscript.tests.common import onnx_script_test_case, version_utils +from onnxscript._internal import version_utils +from onnxscript.tests.common import onnx_script_test_case from onnxscript.tests.models import onnxfns1A diff --git a/onnxscript/tests/functions/onnxfns2_test.py b/onnxscript/tests/functions/onnxfns2_test.py index db4aa40ea7..55ccaeea17 100644 --- a/onnxscript/tests/functions/onnxfns2_test.py +++ b/onnxscript/tests/functions/onnxfns2_test.py @@ -3,7 +3,8 @@ import onnxruntime import pytest -from onnxscript.tests.common import onnx_script_test_case, version_utils +from onnxscript._internal import version_utils +from onnxscript.tests.common import onnx_script_test_case from onnxscript.tests.models import onnxfns2 diff --git a/onnxscript/tests/functions/onnxfns_test.py b/onnxscript/tests/functions/onnxfns_test.py index fd0c5ff3a8..e0b37fb0f4 100644 --- a/onnxscript/tests/functions/onnxfns_test.py +++ b/onnxscript/tests/functions/onnxfns_test.py @@ -8,7 +8,8 @@ import onnx import pytest -from onnxscript.tests.common import onnx_script_test_case, version_utils +from onnxscript._internal import version_utils +from onnxscript.tests.common import onnx_script_test_case from onnxscript.tests.models import onnxfns1