frozenleaves/pytorch
1
0
Fork 0
mirror of https://github.com/pytorch/pytorch.git synced 2025-10-20 21:14:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert D33970688: [pkg] add generic ZipFile Reader/Writer

Browse Source 
Test Plan: revert-hammer

Differential Revision:
D33970688 (c2c260bfc3)

Original commit changeset: 8a524867e62a

Original Phabricator Diff: D33970688 (c2c260bfc3)

fbshipit-source-id: 18b4aa4e221b86a498fc434c1b453356fc47cfbf
(cherry picked from commit a295c2b58d3d9cfacfc9d11d36fd80aabd97675c)
This commit is contained in:
Natalia Gimelshein
2022-04-05 22:46:00 -07:00
committed by PyTorch MergeBot
parent 20266f054b
commit 00e2c14b78
24 changed files with 1882 additions and 2514 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
test/package/test_misc.py
View File

@ -8,19 +8,9 @@ from pathlib import Path
from textwrap import dedent
from unittest import skipIf
from torch.package import (
PackageExporter,
PackageImporter,
is_from_package,
PackagingError,
)
from torch.package.package_exporter_no_torch import (
PackageExporter as PackageExporterNoTorch,
)
from torch.package.package_importer_no_torch import (
PackageImporter as PackageImporterNoTorch,
)
from torch.testing._internal.common_utils import run_tests, IS_FBCODE, IS_SANDCASTLE
from torch.package import PackageExporter, PackageImporter, is_from_package
from torch.package.package_exporter import PackagingError
from torch.testing._internal.common_utils import IS_FBCODE, IS_SANDCASTLE, run_tests
try:
from .common import PackageTestCase
@ -32,11 +22,6 @@ except ImportError:
class TestMisc(PackageTestCase):
"""Tests for one-off or random functionality. Try not to add to this!"""
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
self.PackageImporter = PackageImporter
self.PackageExporter = PackageExporter
def test_file_structure(self):
"""
Tests package's Directory structure representation of a zip file. Ensures
@ -86,7 +71,7 @@ class TestMisc(PackageTestCase):
"""
)
with self.PackageExporter(buffer) as he:
with PackageExporter(buffer) as he:
import module_a
import package_a
import package_a.subpackage
@ -99,7 +84,7 @@ class TestMisc(PackageTestCase):
he.save_text("main", "main", "my string")
buffer.seek(0)
hi = self.PackageImporter(buffer)
hi = PackageImporter(buffer)
file_structure = hi.file_structure()
# remove first line from testing because WINDOW/iOS/Unix treat the buffer differently
@ -154,7 +139,7 @@ class TestMisc(PackageTestCase):
Test Directory's has_file() method.
"""
buffer = BytesIO()
with self.PackageExporter(buffer) as he:
with PackageExporter(buffer) as he:
import package_a.subpackage
he.intern("**")
@ -163,7 +148,7 @@ class TestMisc(PackageTestCase):
buffer.seek(0)
importer = self.PackageImporter(buffer)
importer = PackageImporter(buffer)
file_structure = importer.file_structure()
self.assertTrue(file_structure.has_file("package_a/subpackage.py"))
self.assertFalse(file_structure.has_file("package_a/subpackage"))
@ -173,7 +158,7 @@ class TestMisc(PackageTestCase):
Test content list API for PackageExporter's contained modules.
"""
with self.PackageExporter(BytesIO()) as he:
with PackageExporter(BytesIO()) as he:
import package_b
he.extern("package_b.subpackage_1")
@ -189,7 +174,7 @@ class TestMisc(PackageTestCase):
self.assertEqual(he.get_rdeps("package_b.subpackage_2"), ["package_b"])
with self.assertRaises(PackagingError) as e:
with self.PackageExporter(BytesIO()) as he:
with PackageExporter(BytesIO()) as he:
import package_b
he.deny("package_b")
@ -203,12 +188,12 @@ class TestMisc(PackageTestCase):
buffer = BytesIO()
obj = package_a.subpackage.PackageASubpackageObject()
with self.PackageExporter(buffer) as pe:
with PackageExporter(buffer) as pe:
pe.intern("**")
pe.save_pickle("obj", "obj.pkl", obj)
buffer.seek(0)
pi = self.PackageImporter(buffer)
pi = PackageImporter(buffer)
mod = pi.import_module("package_a.subpackage")
loaded_obj = pi.load_pickle("obj", "obj.pkl")
@ -225,12 +210,12 @@ class TestMisc(PackageTestCase):
buffer = BytesIO()
obj = package_a.subpackage.PackageASubpackageObject()
with self.PackageExporter(buffer) as pe:
with PackageExporter(buffer) as pe:
pe.intern("**")
pe.save_pickle("obj", "obj.pkl", obj)
buffer.seek(0)
pi = self.PackageImporter(buffer)
pi = PackageImporter(buffer)
packaged_class = pi.import_module(
"package_a.subpackage"
).PackageASubpackageObject
@ -249,12 +234,12 @@ class TestMisc(PackageTestCase):
buffer = BytesIO()
obj = package_a.subpackage.PackageASubpackageObject()
with self.PackageExporter(buffer) as pe:
with PackageExporter(buffer) as pe:
pe.intern("**")
pe.save_pickle("obj", "obj.pkl", obj)
buffer.seek(0)
pi = self.PackageImporter(buffer)
pi = PackageImporter(buffer)
mod = pi.import_module("package_a.subpackage")
self.assertTrue(hasattr(mod, "__torch_package__"))
@ -268,12 +253,12 @@ class TestMisc(PackageTestCase):
buffer = BytesIO()
with self.PackageExporter(buffer) as pe:
with PackageExporter(buffer) as pe:
pe.intern("**")
pe.save_module(mod.__name__)
buffer.seek(0)
pi = self.PackageImporter(buffer)
pi = PackageImporter(buffer)
imported_mod = pi.import_module(mod.__name__)
self.assertTrue(imported_mod.is_from_package())
self.assertFalse(mod.is_from_package())
@ -289,22 +274,15 @@ class TestMisc(PackageTestCase):
buffer = BytesIO()
mod = package_a.std_sys_module_hacks.Module()
with self.PackageExporter(buffer) as pe:
with PackageExporter(buffer) as pe:
pe.intern("**")
pe.save_pickle("obj", "obj.pkl", mod)
buffer.seek(0)
pi = self.PackageImporter(buffer)
pi = PackageImporter(buffer)
mod = pi.load_pickle("obj", "obj.pkl")
mod()
class TestMiscNoTorch(TestMisc):
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
self.PackageImporter = PackageImporterNoTorch
self.PackageExporter = PackageExporterNoTorch
if __name__ == "__main__":
run_tests()