reorder conditional for determining VAE type in generate.py

Author: lucidrains

generate.py

@@ -83,13 +83,12 @@ def exists(val):
 
 dalle_params.pop('vae', None) # cleanup later
 
-if vae_params is not None:
+if args.taming:
+    vae = VQGanVAE(args.vqgan_model_path, args.vqgan_config_path)
+elif vae_params is not None:
     vae = DiscreteVAE(**vae_params)
-elif not args.taming:
-    vae = OpenAIDiscreteVAE()
 else:
-    vae = VQGanVAE(args.vqgan_model_path, args.vqgan_config_path)
-
+    vae = OpenAIDiscreteVAE()
 
 dalle = DALLE(vae = vae, **dalle_params).cuda()