NotificationsYou must be signed in to change notification settings
Fork2.8k
Star9.5k

Commit9c45a94

authored

[Fix] fix import error raised by ldm (#3338)

1 parent56a40d7 commit9c45a94Copy full SHA for 9c45a94

File tree

2 files changed

+20

-15

lines changed

mmseg/models/backbones
- vpd.py
tools/analysis_tools
- visualization_cam.py

2 files changed

+20

-15

lines changed

`‎mmseg/models/backbones/vpd.py‎`

Lines changed: 14 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,14 +10,19 @@`
`10`	`10`	`importtorch`
`11`	`11`	`importtorch.nnasnn`
`12`	`12`	`importtorch.nn.functionalasF`
`13`		`-fromldm.modules.diffusionmodules.utilimporttimestep_embedding`
`14`		`-fromldm.utilimportinstantiate_from_config`
`15`	`13`	`frommmengine.modelimportBaseModule`
`16`	`14`	`frommmengine.runnerimportCheckpointLoader,load_checkpoint`
`17`	`15`
`18`	`16`	`frommmseg.registryimportMODELS`
`19`	`17`	`frommmseg.utilsimportConfigType,OptConfigType`
`20`	`18`
	`19`	`+try:`
	`20`	`+fromldm.modules.diffusionmodules.utilimporttimestep_embedding`
	`21`	`+fromldm.utilimportinstantiate_from_config`
	`22`	`+has_ldm=True`
	`23`	`+exceptImportError:`
	`24`	`+has_ldm=False`
	`25`	`+`
`21`	`26`
`22`	`27`	`defregister_attention_control(model,controller):`
`23`	`28`	`"""Registers a control function to manage attention within a model.`
`@@ -205,6 +210,10 @@ def __init__(self,`
`205`	`210`	`max_attn_size=None,`
`206`	`211`	`attn_selector='up_cross+down_cross'):`
`207`	`212`	`super().__init__()`
	`213`	`+`
	`214`	`+asserthas_ldm,'To use UNetWrapper, please install required ' \`
	`215`	+'packages via `pip install -r requirements/optional.txt`.'
	`216`	`+`
`208`	`217`	`self.unet=unet`
`209`	`218`	`self.attention_store=AttentionStore(`
`210`	`219`	`base_size=base_size//8,max_size=max_attn_size)`
`@@ -321,6 +330,9 @@ def __init__(self,`
`321`	`330`
`322`	`331`	`super().__init__(init_cfg=init_cfg)`
`323`	`332`
	`333`	`+asserthas_ldm,'To use VPD model, please install required packages' \`
	`334`	+' via `pip install -r requirements/optional.txt`.'
	`335`	`+`
`324`	`336`	`ifpad_shapeisnotNone:`
`325`	`337`	`ifnotisinstance(pad_shape, (list,tuple)):`
`326`	`338`	`pad_shape= (pad_shape,pad_shape)`

`‎tools/analysis_tools/visualization_cam.py‎`

Lines changed: 6 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,12 +9,12 @@`
`9`	`9`	`importnumpyasnp`
`10`	`10`	`importtorch`
`11`	`11`	`importtorch.nn.functionalasF`
	`12`	`+frommmengineimportConfig`
`12`	`13`	`frommmengine.modelimportrevert_sync_batchnorm`
`13`	`14`	`fromPILimportImage`
`14`		`-frompytorch_grad_camimportGradCAM,LayerCAM,XGradCAM,GradCAMPlusPlus,EigenCAM,EigenGradCAM`
	`15`	`+frompytorch_grad_camimportGradCAM`
`15`	`16`	`frompytorch_grad_cam.utils.imageimportpreprocess_image,show_cam_on_image`
`16`	`17`
`17`		`-frommmengineimportConfig`
`18`	`18`	`frommmseg.apisimportinference_model,init_model,show_result_pyplot`
`19`	`19`	`frommmseg.utilsimportregister_all_modules`
`20`	`20`
`@@ -56,21 +56,15 @@ def main():`
`56`	`56`	`default='prediction.png',`
`57`	`57`	`help='Path to output prediction file')`
`58`	`58`	`parser.add_argument(`
`59`		`-'--cam-file',`
`60`		`-default='vis_cam.png',`
`61`		`-help='Path to output cam file')`
	`59`	`+'--cam-file',default='vis_cam.png',help='Path to output cam file')`
`62`	`60`	`parser.add_argument(`
`63`	`61`	`'--target-layers',`
`64`	`62`	`default='backbone.layer4[2]',`
`65`	`63`	`help='Target layers to visualize CAM')`
`66`	`64`	`parser.add_argument(`
`67`		`-'--category-index',`
`68`		`-default='7',`
`69`		`-help='Category to visualize CAM')`
	`65`	`+'--category-index',default='7',help='Category to visualize CAM')`
`70`	`66`	`parser.add_argument(`
`71`		`-'--device',`
`72`		`-default='cuda:0',`
`73`		`-help='Device used for inference')`
	`67`	`+'--device',default='cuda:0',help='Device used for inference')`
`74`	`68`	`args=parser.parse_args()`
`75`	`69`
`76`	`70`	`# build the model from a config file and a checkpoint file`
`@@ -116,8 +110,7 @@ def main():`
`116`	`110`	`# Grad CAM(Class Activation Maps)`
`117`	`111`	`# Can also be LayerCAM, XGradCAM, GradCAMPlusPlus, EigenCAM, EigenGradCAM`
`118`	`112`	`targets= [`
`119`		`-SemanticSegmentationTarget(category,mask_float,`
`120`		`- (height,width))`
	`113`	`+SemanticSegmentationTarget(category,mask_float, (height,width))`
`121`	`114`	`]`
`122`	`115`	`withGradCAM(`
`123`	`116`	`model=model,`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit9c45a94

File tree

2 files changed

2 files changed

`‎mmseg/models/backbones/vpd.py‎`

`‎tools/analysis_tools/visualization_cam.py‎`

0 commit comments