resolve conflict

app.py

@@ -28,7 +28,7 @@ def handler(signum, frame):
     if res == 'y':
         gr.close_all()
         exit(1)
- 
+
 signal.signal(signal.SIGINT, handler)
 
 
@@ -56,7 +56,7 @@ def check_name(model_name='FFHQ512'):
     """Gets model by name."""
     if model_name == 'FFHQ512':
         network_pkl = hf_hub_download(repo_id='thomagram/stylenerf-ffhq-config-basic', filename='ffhq_512.pkl')
-    
+
     # TODO: checkpoint to be updated!
     # elif model_name == 'FFHQ512v2':
     #     network_pkl = "./pretrained/ffhq_512_eg3d.pkl"
@@ -109,10 +109,10 @@ def proc_seed(history, seed):
 def f_synthesis(model_name, model_find, render_option, early, trunc, seed1, seed2, mix1, mix2, yaw, pitch, roll, fov, history):
     history = history or {}
     seeds = []
-    
+
     if model_find != "":
         model_name = model_find
-        
+
     model_name = check_name(model_name)
     if model_name != history.get("model_name", None):
         model, res, imgs = get_model(model_name, render_option)
@@ -139,7 +139,7 @@ def f_synthesis(model_name, model_find, render_option, early, trunc, seed1, seed
             ws  = ws.detach().cpu().numpy()
             img = img[0].permute(1,2,0).detach().cpu().numpy()
 
-            
+
             imgs[idx * res // 2: (1 + idx) * res // 2] = cv2.resize(
                 np.asarray(img).clip(-1, 1) * 0.5 + 0.5,
                 (res//2, res//2), cv2.INTER_AREA)
@@ -151,7 +151,7 @@ def f_synthesis(model_name, model_find, render_option, early, trunc, seed1, seed
         history[f'seed{idx}'] = seed
     history['trunc'] = trunc
     history['model_name'] = model_name
-    
+
     set_random_seed(sum(seeds))
 
     # style mixing (?)
@@ -159,18 +159,18 @@ def f_synthesis(model_name, model_find, render_option, early, trunc, seed1, seed
     ws = ws1.clone()
     ws[:, :8] = ws1[:, :8] * mix1 + ws2[:, :8] * (1 - mix1)
     ws[:, 8:] = ws1[:, 8:] * mix2 + ws2[:, 8:] * (1 - mix2)
-    
+
     # set visualization for other types of inputs.
     if early == 'Normal Map':
         render_option += ',normal,early'
     elif early == 'Gradient Map':
         render_option += ',gradient,early'
-    
+
     start_t = time.time()
     with torch.no_grad():
         cam = get_camera_traj(model, pitch, yaw, fov, model_name=model_name)
         image = model.get_final_output(
-            styles=ws, camera_matrices=cam, 
+            styles=ws, camera_matrices=cam,
             theta=roll * np.pi,
             render_option=render_option)
     end_t = time.time()
@@ -184,7 +184,7 @@ def f_synthesis(model_name, model_find, render_option, early, trunc, seed1, seed
         b = int(imgs.shape[1] / imgs.shape[0] * a)
         print(f'resize {a} {b} {image.shape} {imgs.shape}')
         image = np.concatenate([cv2.resize(imgs, (b, a), cv2.INTER_AREA), image], 1)
-  
+
     print(f'rendering time = {end_t-start_t:.4f}s')
     image = (image * 255).astype('uint8')
     return image, history
@@ -210,4 +210,4 @@ gr.Interface(fn=f_synthesis,
              outputs=["image", "state"],
              layout='unaligned',
              css=css, theme='dark-huggingface',
-             live=True).launch(server_port=port)
+             live=True).launch(enable_queue=True)