2424from six import BytesIO
2525
2626from tensorflow .python .framework import dtypes
27- from tensorflow .python .framework import test_util
27+ from tensorflow .python .framework import ops
2828from tensorflow .python .ops import array_ops
2929from tensorflow .python .ops import parsing_ops
3030from tensorflow .python .platform import test
@@ -43,31 +43,40 @@ def _compress(self, bytes_in, compression_type):
4343 f .write (bytes_in )
4444 return out .getvalue ()
4545
46- @test_util .run_deprecated_v1
46+ def testDecompressShapeInference (self ):
47+ with ops .Graph ().as_default ():
48+ for compression_type in ["ZLIB" , "GZIP" , "" ]:
49+ with self .cached_session ():
50+ in_bytes = array_ops .placeholder (dtypes .string , shape = [2 ])
51+ decompressed = parsing_ops .decode_compressed (
52+ in_bytes , compression_type = compression_type )
53+ self .assertEqual ([2 ], decompressed .get_shape ().as_list ())
54+
4755 def testDecompress (self ):
4856 for compression_type in ["ZLIB" , "GZIP" , "" ]:
4957 with self .cached_session ():
50- in_bytes = array_ops . placeholder ( dtypes . string , shape = [ 2 ])
51- decompressed = parsing_ops . decode_compressed (
52- in_bytes , compression_type = compression_type )
53- self . assertEqual ([ 2 ], decompressed . get_shape (). as_list () )
54-
55- result = decompressed . eval (
56- feed_dict = { in_bytes : [ self ._compress (b"AaAA " , compression_type ),
57- self ._compress ( b"bBbb" , compression_type )]} )
58+
59+ def decode ( in_bytes , compression_type = compression_type ):
60+ return parsing_ops . decode_compressed (
61+ in_bytes , compression_type = compression_type )
62+
63+ in_val = [ self . _compress ( b"AaAA" , compression_type ),
64+ self ._compress (b"bBbb " , compression_type )]
65+ result = self .evaluate ( decode ( in_val ) )
5866 self .assertAllEqual ([b"AaAA" , b"bBbb" ], result )
5967
60- @test_util .run_deprecated_v1
6168 def testDecompressWithRaw (self ):
6269 for compression_type in ["ZLIB" , "GZIP" , "" ]:
6370 with self .cached_session ():
64- in_bytes = array_ops .placeholder (dtypes .string , shape = [None ])
65- decompressed = parsing_ops .decode_compressed (
66- in_bytes , compression_type = compression_type )
67- decode = parsing_ops .decode_raw (decompressed , out_type = dtypes .int16 )
6871
69- result = decode .eval (
70- feed_dict = {in_bytes : [self ._compress (b"AaBC" , compression_type )]})
72+ def decode (in_bytes , compression_type = compression_type ):
73+ decompressed = parsing_ops .decode_compressed (in_bytes ,
74+ compression_type )
75+ return parsing_ops .decode_raw (decompressed , out_type = dtypes .int16 )
76+
77+ result = self .evaluate (
78+ decode ([self ._compress (b"AaBC" , compression_type )]))
79+
7180 self .assertAllEqual (
7281 [[ord ("A" ) + ord ("a" ) * 256 , ord ("B" ) + ord ("C" ) * 256 ]], result )
7382
0 commit comments