@@ -397,23 +397,23 @@ def test__resnet8(self, caplog, request):
397397 )
398398 neutron_map = extract_map_from_logs (caplog )
399399 assert neutron_map == {
400- 0 : (14 , 15 ), # Conv2DStandardV2 (Pad + Conv)
401- 1 : (17 , 18 ), # Conv2DStandardV1 (Pad + Conv)
402- 2 : (20 ,), # Conv2DStandardV1
403- 3 : (21 ,), # Add
404- 4 : (22 ,), # GlobalBiasScale (Relu)
405- 5 : (28 ,), # Conv2DStandardV1
406- 6 : (24 , 25 ), # Conv2DStandardV1 (Pad + Conv)
407- 7 : (27 ,), # Conv2DStandardV1
408- 8 : (29 ,), # Add
409- 9 : (30 ,), # GlobalBiasScale (Relu)
410- 10 : (36 ,), # Conv2DStandardV1
411- 11 : (32 , 33 ), # Conv2DStandardV1 (Pad + Conv)
412- 12 : (35 ,), # Conv2DStandardV1
413- 13 : (37 ,), # Add
414- 14 : (38 ,), # GlobalBiasScale (Relu)
415- 15 : (39 , 40 ), # GlobalAvgPool (Mean + Reshape)
416- 16 : (41 ,), # FullyConnected
400+ 0 : (22 , 23 ), # Conv2DStandardV2 (Pad + Conv)
401+ 1 : (24 , 25 ), # Conv2DStandardV1 (Pad + Conv)
402+ 2 : (26 ,), # Conv2DStandardV1
403+ 3 : (27 ,), # Add
404+ 4 : (28 ,), # GlobalBiasScale (Relu)
405+ 5 : (33 ,), # Conv2DStandardV1
406+ 6 : (29 , 30 , 31 ), # Conv2DStandardV1 (Pad + Conv)
407+ 7 : (32 ,), # Conv2DStandardV1
408+ 8 : (34 ,), # Add
409+ 9 : (35 ,), # GlobalBiasScale (Relu)
410+ 10 : (40 ,), # Conv2DStandardV1
411+ 11 : (36 , 37 , 38 ), # Conv2DStandardV1 (Pad + Conv)
412+ 12 : (39 ,), # Conv2DStandardV1
413+ 13 : (41 ,), # Add
414+ 14 : (42 ,), # GlobalBiasScale (Relu)
415+ 15 : (43 , 44 ), # GlobalAvgPool (Mean + Reshape)
416+ 16 : (45 ,), # FullyConnected
417417 17 : (), # Neutron Dump
418418 }
419419
@@ -434,34 +434,34 @@ def test__resnet8_batch_2(self, caplog, request):
434434 )
435435 neutron_map = extract_map_from_logs (caplog )
436436 assert neutron_map == {
437- 0 : (14 , 15 ), # Conv2DStandardV2 (1/2 batch item)
438- 1 : (14 , 15 ), # Conv2DStandardV2 (2/2 batch item)
439- 2 : (17 , 18 ), # Conv2DStandardV1 (1/2 batch item)
440- 3 : (17 , 18 ), # Conv2DStandardV1 (2/2 batch item)
441- 4 : (20 ,), # Conv2DStandardV1 (1/2 batch item)
442- 5 : (20 ,), # Conv2DStandardV1 (2/2 batch item)
443- 6 : (21 ,), # Add
444- 7 : (22 ,), # GlobalBiasScale (Relu)
445- 8 : (28 ,), # Conv2DStandardV1 (1/2 batch item)
446- 9 : (28 ,), # Conv2DStandardV1 (2/2 batch item)
447- 10 : (24 , 25 ), # Conv2DStandardV1 (1/2 batch item)
448- 11 : (24 , 25 ), # Conv2DStandardV1 (2/2 batch item)
449- 12 : (27 ,), # Conv2DStandardV1 (1/2 batch item)
450- 13 : (27 ,), # Conv2DStandardV1 (2/2 batch item)
451- 14 : (29 ,), # Add
452- 15 : (30 ,), # GlobalBiasScale (Relu)
453- 16 : (36 ,), # Conv2DStandardV1 (1/2 batch item)
454- 17 : (36 ,), # Conv2DStandardV1 (2/2 batch item)
455- 18 : (32 , 33 ), # Conv2DStandardV1 (1/2 batch item)
456- 19 : (32 , 33 ), # Conv2DStandardV1 (2/2 batch item)
457- 20 : (35 ,), # Conv2DStandardV1 (1/2 batch item)
458- 21 : (35 ,), # Conv2DStandardV1 (2/2 batch item)
459- 22 : (37 ,), # Add
460- 23 : (38 ,), # GlobalBiasScale (Relu)
461- 24 : (39 ,), # GlobalAvgPool (1/2 batch item)
462- 25 : (39 ,), # GlobalAvgPool (2/2 batch item)
463- 26 : (41 ,), # Conv2DPointwise (FullyConnected)
464- 27 : (41 ,), # Slice (FullyConnected)
437+ 0 : (22 , 23 ), # Conv2DStandardV2 (1/2 batch item)
438+ 1 : (22 , 23 ), # Conv2DStandardV2 (2/2 batch item)
439+ 2 : (24 , 25 ), # Conv2DStandardV1 (1/2 batch item)
440+ 3 : (24 , 25 ), # Conv2DStandardV1 (2/2 batch item)
441+ 4 : (26 ,), # Conv2DStandardV1 (1/2 batch item)
442+ 5 : (26 ,), # Conv2DStandardV1 (2/2 batch item)
443+ 6 : (27 ,), # Add
444+ 7 : (28 ,), # GlobalBiasScale (Relu)
445+ 8 : (33 ,), # Conv2DStandardV1 (1/2 batch item)
446+ 9 : (33 ,), # Conv2DStandardV1 (2/2 batch item)
447+ 10 : (29 , 30 , 31 ), # Conv2DStandardV1 (1/2 batch item)
448+ 11 : (29 , 30 , 31 ), # Conv2DStandardV1 (2/2 batch item)
449+ 12 : (32 ,), # Conv2DStandardV1 (1/2 batch item)
450+ 13 : (32 ,), # Conv2DStandardV1 (2/2 batch item)
451+ 14 : (34 ,), # Add
452+ 15 : (35 ,), # GlobalBiasScale (Relu)
453+ 16 : (40 ,), # Conv2DStandardV1 (1/2 batch item)
454+ 17 : (40 ,), # Conv2DStandardV1 (2/2 batch item)
455+ 18 : (36 , 37 , 38 ), # Conv2DStandardV1 (1/2 batch item)
456+ 19 : (36 , 37 , 38 ), # Conv2DStandardV1 (2/2 batch item)
457+ 20 : (39 ,), # Conv2DStandardV1 (1/2 batch item)
458+ 21 : (39 ,), # Conv2DStandardV1 (2/2 batch item)
459+ 22 : (41 ,), # Add
460+ 23 : (42 ,), # GlobalBiasScale (Relu)
461+ 24 : (43 ,), # GlobalAvgPool (1/2 batch item)
462+ 25 : (43 ,), # GlobalAvgPool (2/2 batch item)
463+ 26 : (45 ,), # Conv2DPointwise (FullyConnected)
464+ 27 : (45 ,), # Slice (FullyConnected)
465465 28 : (), # Neutron Dump
466466 }
467467 inspector_check (get_test_name (request ))
@@ -483,18 +483,18 @@ def test__ds_cnn(self, caplog, request):
483483 )
484484 neutron_map = extract_map_from_logs (caplog )
485485 assert neutron_map == {
486- 0 : (14 , 15 ), # Pad (Conv + Relu)
487- 1 : (14 , 15 ), # Conv2DStandardV2 (Conv + Relu)
488- 2 : (18 , 19 ), # Conv2DDepthwiseV1 (DepthwiseConv + Relu)
489- 3 : (21 , 22 ), # Conv2DPointwise (Conv + Relu)
490- 4 : (24 , 25 ), # Conv2DDepthwiseV1 (DepthwiseConv + Relu)
491- 5 : (27 , 28 ), # Conv2DDepthwiseV1 (Conv + Relu)
492- 6 : (30 , 31 ), # Conv2DDepthwiseV1 (DepthwiseConv + Relu)
493- 7 : (33 , 34 ), # Conv2DPointwise (Conv + Relu)
494- 8 : (36 , 37 ), # Conv2DDepthwiseV1 (DepthwiseConv + Relu)
495- 9 : (39 , 40 ), # Conv2DPointwise (Conv + Relu)
496- 10 : (42 , ), # Conv2DDepthwiseDense (AvgPool)
497- 11 : (44 ,), # FullyConnected
486+ 0 : (22 , 23 , 24 ), # Pad (Pad + Conv + Relu)
487+ 1 : (22 , 23 , 24 ), # Conv2DStandardV2 (Pad + Conv + Relu)
488+ 2 : (26 , 27 ), # Conv2DDepthwiseV1 (DepthwiseConv + Relu)
489+ 3 : (28 , 29 ), # Conv2DPointwise (Conv + Relu)
490+ 4 : (30 , 31 ), # Conv2DDepthwiseV1 (DepthwiseConv + Relu)
491+ 5 : (32 , 33 ), # Conv2DDepthwiseV1 (Conv + Relu)
492+ 6 : (34 , 35 ), # Conv2DDepthwiseV1 (DepthwiseConv + Relu)
493+ 7 : (36 , 37 ), # Conv2DPointwise (Conv + Relu)
494+ 8 : (38 , 39 ), # Conv2DDepthwiseV1 (DepthwiseConv + Relu)
495+ 9 : (40 , 41 ), # Conv2DPointwise (Conv + Relu)
496+ 10 : (43 , 44 ), # Conv2DDepthwiseDense (AvgPool + Reshape )
497+ 11 : (45 ,), # FullyConnected
498498 12 : (), # Neutron Dump
499499 }
500500
@@ -515,35 +515,35 @@ def test__mobilenet_v1_025(self, caplog, request):
515515 )
516516 neutron_map = extract_map_from_logs (caplog )
517517 assert neutron_map == {
518- 0 : (32 , 33 ), # Conv2DStandardV2 (Conv + Relu)
519- 1 : (35 , 36 ), # Conv2DDepthwiseV1 (DepthwiseConv + Relu)
520- 2 : (38 , 39 ), # Conv2DPointwise (Conv + Relu)
521- 3 : (41 , 42 ), # Conv2DDepthwiseV1 (DepthwiseConv + Relu)
522- 4 : (44 , 45 ), # Conv2DPointwise (Conv + Relu)
523- 5 : (47 , 48 ), # Conv2DDepthwiseV1 (DepthwiseConv + Relu)
524- 6 : (50 , 51 ), # Conv2DPointwise (Conv + Relu)
525- 7 : (53 , 54 ), # Conv2DDepthwiseV1 (DepthwiseConv + Relu)
526- 8 : (56 , 57 ), # Conv2DPointwise (Conv + Relu)
527- 9 : (59 , 60 ), # Conv2DDepthwiseV1 (DepthwiseConv + Relu)
528- 10 : (62 , 63 ), # Conv2DPointwise (Conv + Relu)
529- 11 : (65 , 66 ), # Conv2DDepthwiseV1 (DepthwiseConv + Relu)
530- 12 : (68 , 69 ), # Conv2DPointwise (Conv + Relu)
531- 13 : (71 , 72 ), # Conv2DDepthwiseV1 (DepthwiseConv + Relu)
532- 14 : (74 , 75 ), # Conv2DPointwise (Conv + Relu)
533- 15 : (77 , 78 ), # Conv2DDepthwiseV1 (DepthwiseConv + Relu)
534- 16 : (80 , 81 ), # Conv2DPointwise (Conv + Relu)
535- 17 : (83 , 84 ), # Conv2DDepthwiseV1 (DepthwiseConv + Relu)
536- 18 : (86 , 87 ), # Conv2DPointwise (Conv + Relu)
537- 19 : (89 , 90 ), # Conv2DDepthwiseV1 (DepthwiseConv + Relu)
538- 20 : (92 , 93 ), # Conv2DPointwise (Conv + Relu)
539- 21 : (95 , 96 ), # Conv2DDepthwiseV1 (DepthwiseConv + Relu)
540- 22 : (98 , 99 ), # Conv2DPointwise (Conv + Relu)
541- 23 : (101 , 102 ), # Conv2DDepthwiseDense (DepthwiseConv + Relu)
542- 24 : (104 , 105 ), # Conv2DPointwise (Conv + Relu)
543- 25 : (107 , 108 ), # Conv2DDepthwiseDense (DepthwiseConv + Relu)
544- 26 : (110 , 111 ), # Conv2DPointwise (Conv + Relu)
545- 27 : (112 , 113 ), # GlobalAvgPool (Mean + Reshape)
546- 28 : (114 ,), # FullyConnected
518+ 0 : (58 , 59 , 60 ), # Conv2DStandardV2 (Pad + Conv + Relu)
519+ 1 : (61 , 62 ), # Conv2DDepthwiseV1 (DepthwiseConv + Relu)
520+ 2 : (63 , 64 ), # Conv2DPointwise (Conv + Relu)
521+ 3 : (65 , 66 , 67 ), # Conv2DDepthwiseV1 (Pad + DepthwiseConv + Relu)
522+ 4 : (68 , 69 ), # Conv2DPointwise (Conv + Relu)
523+ 5 : (70 , 71 ), # Conv2DDepthwiseV1 (DepthwiseConv + Relu)
524+ 6 : (72 , 73 ), # Conv2DPointwise (Conv + Relu)
525+ 7 : (74 , 75 , 76 ), # Conv2DDepthwiseV1 (Pad + DepthwiseConv + Relu)
526+ 8 : (77 , 78 ), # Conv2DPointwise (Conv + Relu)
527+ 9 : (79 , 80 ), # Conv2DDepthwiseV1 (DepthwiseConv + Relu)
528+ 10 : (81 , 82 ), # Conv2DPointwise (Conv + Relu)
529+ 11 : (83 , 84 , 85 ), # Conv2DDepthwiseV1 (Pad + DepthwiseConv + Relu)
530+ 12 : (86 , 87 ), # Conv2DPointwise (Conv + Relu)
531+ 13 : (88 , 89 ), # Conv2DDepthwiseV1 (DepthwiseConv + Relu)
532+ 14 : (90 , 91 ), # Conv2DPointwise (Conv + Relu)
533+ 15 : (92 , 93 ), # Conv2DDepthwiseV1 (DepthwiseConv + Relu)
534+ 16 : (94 , 95 ), # Conv2DPointwise (Conv + Relu)
535+ 17 : (96 , 97 ), # Conv2DDepthwiseV1 (DepthwiseConv + Relu)
536+ 18 : (98 , 99 ), # Conv2DPointwise (Conv + Relu)
537+ 19 : (100 , 101 ), # Conv2DDepthwiseV1 (DepthwiseConv + Relu)
538+ 20 : (102 , 103 ), # Conv2DPointwise (Conv + Relu)
539+ 21 : (104 , 105 ), # Conv2DDepthwiseV1 (DepthwiseConv + Relu)
540+ 22 : (106 , 107 ), # Conv2DPointwise (Conv + Relu)
541+ 23 : (108 , 109 , 110 ), # Conv2DDepthwiseDense (Pad + DepthwiseConv + Relu)
542+ 24 : (111 , 112 ), # Conv2DPointwise (Conv + Relu)
543+ 25 : (113 , 114 ), # Conv2DDepthwiseDense (DepthwiseConv + Relu)
544+ 26 : (115 , 116 ), # Conv2DPointwise (Conv + Relu)
545+ 27 : (117 , 118 ), # GlobalAvgPool (Mean + Reshape)
546+ 28 : (119 ,), # FullyConnected
547547 29 : (), # Neutron Dump
548548 }
549549
0 commit comments