Skip to content

[bugfix] remove redundant code #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zen-xingle wants to merge 2 commits into
base: main
Choose a base branch
from
Open

[bugfix] remove redundant code #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
34a3b7c
[bugfix] remove redundant code
zen-xingle Aug 25, 2023
d529368
Merge branch 'main' of https://github.com/zen-xingle/FidelityFusion
zen-xingle Aug 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion mffusion/demo/dmfal_demo.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ def dmfal_test(dataset, exp_config):
# predict
predict_y = dmfal_model.predict(eval_inputs)
predict_y = data_norm_manager.denormalize_output(predict_y, -1)
# plot_result(eval_outputs[-1], predict_y, source_shape)
plot_result(eval_outputs[-1], predict_y, source_shape)

from mffusion.utils.performance_evaluator import performance_evaluator
eval_result = performance_evaluator(eval_outputs[-1], predict_y, ['rmse', 'r2'])
Expand Down
2 changes: 1 addition & 1 deletion mffusion/demo/fides_demo.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ def gp_model_block_test(dataset, exp_config):
predict_y = fides_block.predict([eval_inputs[0], predict_y_mean])
predict_y_mean = predict_y[0]

# plot_result(eval_outputs[len(train_outputs)-1], predict_y_mean, source_shape)
plot_result(eval_outputs[len(train_outputs)-1], predict_y_mean, source_shape)

from mffusion.utils.performance_evaluator import performance_evaluator
eval_result = performance_evaluator(eval_outputs[len(train_outputs)-1], predict_y_mean, ['rmse', 'r2'])
Expand Down
2 changes: 1 addition & 1 deletion mffusion/demo/gar_demo.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ def gp_model_block_test(_num, exp_config):
print('\n')
gp_model_block.eval()
predict_y = gp_model_block.predict(eval_inputs)
# plot_result(eval_outputs[0], predict_y, source_shape)
plot_result(eval_outputs[0], predict_y, source_shape)

from mffusion.utils.performance_evaluator import performance_evaluator
eval_result = performance_evaluator(eval_outputs[0], predict_y[0].mean, ['rmse', 'r2'])
Expand Down
6 changes: 3 additions & 3 deletions mffusion/demo/ifc_gpt_2d_demo.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,14 +122,14 @@ def ifc_gpt_2d_test(dataset, exp_config):
# mae_list_te = ifc_model.eval_mae(Xte_list, yte_list, t_list_te, t_list_tr)

pred_dict = ifc_model.eval_pred(Xte_list, t_list_te, t_list_tr)
# plot_result(eval_outputs[-1], predict_y, source_shape)


from utils.performance_evaluator import performance_evaluator
from mffusion.utils.performance_evaluator import performance_evaluator
src_eval_output = data_norm_manager.denormalize_output(eval_outputs[-1], -1)
pred_output = pred_dict[ifc_dataset.fid_list_tr[-1]]
pred_output = data_norm_manager.denormalize_output(torch.tensor(pred_output).reshape_as(eval_outputs[-1]), -1)

# plot_result(eval_outputs[-1], pred_output, source_shape)
eval_result = performance_evaluator(src_eval_output, pred_output, ['rmse', 'r2'])
eval_result['time'] = time.time()-start_time
eval_result['train_sample_num'] = train_inputs[0].shape[0]
Expand All @@ -138,7 +138,7 @@ def ifc_gpt_2d_test(dataset, exp_config):

scheduler.step(adjust_rmse)

#
# plot_result(eval_outputs[-1], pred_output, source_shape)

optimizer.zero_grad()
loss.backward()
Expand Down
6 changes: 2 additions & 4 deletions mffusion/demo/ifc_ode_2d_demo.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,10 +126,8 @@ def ifc_gpt_2d_test(dataset, exp_config):
# mae_list_te = ifc_model.eval_mae(Xte_list, yte_list, t_list_te, t_list_tr)

pred_dict = ifc_model.eval_pred(Xte_list, t_list_te)
# plot_result(eval_outputs[-1], predict_y, source_shape)


from utils.performance_evaluator import performance_evaluator
from mffusion.utils.performance_evaluator import performance_evaluator
src_eval_output = data_norm_manager.denormalize_output(eval_outputs[-1], -1)
pred_output = pred_dict[ifc_dataset.fid_list_tr[-1]]
pred_output = data_norm_manager.denormalize_output(torch.tensor(pred_output).reshape_as(eval_outputs[-1]), -1)
Expand All @@ -141,7 +139,7 @@ def ifc_gpt_2d_test(dataset, exp_config):

scheduler.step(adjust_rmse)

#
# plot_result(eval_outputs[-1], pred_output, source_shape)

optimizer.zero_grad()
loss.backward()
Expand Down
1 change: 0 additions & 1 deletion mffusion/modules/gp_module/hogp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
from mffusion.utils import *
from mffusion.modules.kernel import kernel_utils
from mffusion.utils.data_utils import data_register
from mffusion.utils.mlgp_hook import set_function_as_module_to_catch_error
from mffusion.modules.gp_module.basic_gp_model import BASE_GP_MODEL


Expand Down