rinong commited on
Commit
6f52ac4
1 Parent(s): 4663a72

Modified s_code generation

Browse files
Files changed (2) hide show
  1. app.py +1 -1
  2. model/sg2_model.py +28 -28
app.py CHANGED
@@ -194,7 +194,7 @@ class ImageEditor(object):
194
  target_latents.append(project_code_by_edit_name(np_source_latent, attribute_name, strength))
195
 
196
  elif edit_choices["edit_type"] == "StyleCLIP":
197
- source_s_dict = generators[0].get_s_code(source_latent, input_is_latent=True)
198
  target_latents.append(project_code_with_styleclip(source_s_dict,
199
  edit_choices["src_text"],
200
  edit_choices["tar_text"],
 
194
  target_latents.append(project_code_by_edit_name(np_source_latent, attribute_name, strength))
195
 
196
  elif edit_choices["edit_type"] == "StyleCLIP":
197
+ source_s_dict = generators[0].get_s_code(source_latent, input_is_latent=True)[0]
198
  target_latents.append(project_code_with_styleclip(source_s_dict,
199
  edit_choices["src_text"],
200
  edit_choices["tar_text"],
model/sg2_model.py CHANGED
@@ -526,36 +526,36 @@ class Generator(nn.Module):
526
  if not input_is_latent:
527
  styles = [self.style(s) for s in styles]
528
 
529
- s_codes = {# const block
530
- self.modulation_layers[0]: self.modulation_layers[0](styles[0]),
531
- self.modulation_layers[1]: self.modulation_layers[1](styles[1]),
532
  # conv layers
533
- self.modulation_layers[2]: self.modulation_layers[2](styles[2]),
534
- self.modulation_layers[3]: self.modulation_layers[3](styles[3]),
535
- self.modulation_layers[5]: self.modulation_layers[5](styles[4]),
536
- self.modulation_layers[6]: self.modulation_layers[6](styles[5]),
537
- self.modulation_layers[8]: self.modulation_layers[8](styles[6]),
538
- self.modulation_layers[9]: self.modulation_layers[9](styles[7]),
539
- self.modulation_layers[11]: self.modulation_layers[11](styles[8]),
540
- self.modulation_layers[12]: self.modulation_layers[12](styles[9]),
541
- self.modulation_layers[14]: self.modulation_layers[14](styles[10]),
542
- self.modulation_layers[15]: self.modulation_layers[15](styles[11]),
543
- self.modulation_layers[17]: self.modulation_layers[17](styles[12]),
544
- self.modulation_layers[18]: self.modulation_layers[18](styles[13]),
545
- self.modulation_layers[20]: self.modulation_layers[20](styles[14]),
546
- self.modulation_layers[21]: self.modulation_layers[21](styles[15]),
547
- self.modulation_layers[23]: self.modulation_layers[23](styles[16]),
548
- self.modulation_layers[24]: self.modulation_layers[24](styles[17]),
549
  # toRGB layers
550
- self.modulation_layers[4]: self.modulation_layers[4](styles[3]),
551
- self.modulation_layers[7]: self.modulation_layers[7](styles[5]),
552
- self.modulation_layers[10]: self.modulation_layers[10](styles[7]),
553
- self.modulation_layers[13]: self.modulation_layers[13](styles[9]),
554
- self.modulation_layers[16]: self.modulation_layers[16](styles[11]),
555
- self.modulation_layers[19]: self.modulation_layers[19](styles[13]),
556
- self.modulation_layers[22]: self.modulation_layers[22](styles[15]),
557
- self.modulation_layers[25]: self.modulation_layers[25](styles[17]),
558
- }
559
 
560
  return s_codes
561
 
 
526
  if not input_is_latent:
527
  styles = [self.style(s) for s in styles]
528
 
529
+ s_codes = [{# const block
530
+ self.modulation_layers[0]: self.modulation_layers[0](style[:, 0]),
531
+ self.modulation_layers[1]: self.modulation_layers[1](style[:, 1]),
532
  # conv layers
533
+ self.modulation_layers[2]: self.modulation_layers[2](style[:, 2]),
534
+ self.modulation_layers[3]: self.modulation_layers[3](style[:, 3]),
535
+ self.modulation_layers[5]: self.modulation_layers[5](style[:, 4]),
536
+ self.modulation_layers[6]: self.modulation_layers[6](style[:, 5]),
537
+ self.modulation_layers[8]: self.modulation_layers[8](style[:, 6]),
538
+ self.modulation_layers[9]: self.modulation_layers[9](style[:, 7]),
539
+ self.modulation_layers[11]: self.modulation_layers[11](style[:, 8]),
540
+ self.modulation_layers[12]: self.modulation_layers[12](style[:, 9]),
541
+ self.modulation_layers[14]: self.modulation_layers[14](style[:, 10]),
542
+ self.modulation_layers[15]: self.modulation_layers[15](style[:, 11]),
543
+ self.modulation_layers[17]: self.modulation_layers[17](style[:, 12]),
544
+ self.modulation_layers[18]: self.modulation_layers[18](style[:, 13]),
545
+ self.modulation_layers[20]: self.modulation_layers[20](style[:, 14]),
546
+ self.modulation_layers[21]: self.modulation_layers[21](style[:, 15]),
547
+ self.modulation_layers[23]: self.modulation_layers[23](style[:, 16]),
548
+ self.modulation_layers[24]: self.modulation_layers[24](style[:, 17]),
549
  # toRGB layers
550
+ self.modulation_layers[4]: self.modulation_layers[4](style[:, 3]),
551
+ self.modulation_layers[7]: self.modulation_layers[7](style[:, 5]),
552
+ self.modulation_layers[10]: self.modulation_layers[10](style[:, 7]),
553
+ self.modulation_layers[13]: self.modulation_layers[13](style[:, 9]),
554
+ self.modulation_layers[16]: self.modulation_layers[16](style[:, 11]),
555
+ self.modulation_layers[19]: self.modulation_layers[19](style[:, 13]),
556
+ self.modulation_layers[22]: self.modulation_layers[22](style[:, 15]),
557
+ self.modulation_layers[25]: self.modulation_layers[25](style[:, 17]),
558
+ } for style in styles]
559
 
560
  return s_codes
561