From 27a9b1b75026832a79bf8c4da5dcc55486816aa0 Mon Sep 17 00:00:00 2001 From: James Betker Date: Thu, 28 Jul 2022 09:48:40 -0600 Subject: [PATCH] rename perplexity->log perplexity --- codes/models/diffusion/gaussian_diffusion.py | 2 +- codes/trainer/eval/music_diffusion_fid.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/codes/models/diffusion/gaussian_diffusion.py b/codes/models/diffusion/gaussian_diffusion.py index ae145143..5ffd0310 100644 --- a/codes/models/diffusion/gaussian_diffusion.py +++ b/codes/models/diffusion/gaussian_diffusion.py @@ -659,7 +659,7 @@ class GaussianDiffusion: img = model_driven_out + guidance_driven_out return img - def p_sample_loop_for_perplexity( + def p_sample_loop_for_log_perplexity( self, model, truth, diff --git a/codes/trainer/eval/music_diffusion_fid.py b/codes/trainer/eval/music_diffusion_fid.py index a7c4e606..9c943a6e 100644 --- a/codes/trainer/eval/music_diffusion_fid.py +++ b/codes/trainer/eval/music_diffusion_fid.py @@ -137,8 +137,8 @@ class MusicDiffusionFid(evaluator.Evaluator): # s = q9.clamp(1, 9999999999) # x = x.clamp(-s, s) / s # return x - perp = self.diffuser.p_sample_loop_for_perplexity(self.model, mel_norm, - model_kwargs = {'truth_mel': mel_norm}) + perp = self.diffuser.p_sample_loop_for_log_perplexity(self.model, mel_norm, + model_kwargs = {'truth_mel': mel_norm}) sampler = self.diffuser.ddim_sample_loop if self.ddim else self.diffuser.p_sample_loop gen_mel = sampler(self.model, mel_norm.shape, model_kwargs={'truth_mel': mel_norm}) @@ -317,7 +317,7 @@ class MusicDiffusionFid(evaluator.Evaluator): self.local_modules[k] = mod.cpu() self.spec_decoder = self.spec_decoder.cpu() - return {"frechet_distance": frechet_distance, "perplexity": perplexity} + return {"frechet_distance": frechet_distance, "log_perplexity": perplexity} if __name__ == '__main__':