From 4cdaca56b93c471f680f1bc4ee4d813278f7b543 Mon Sep 17 00:00:00 2001 From: Dari Kimanius Date: Sun, 5 Nov 2023 17:30:04 +0100 Subject: [PATCH] Removed forced skip padding for Blush. --- CMakeLists.txt | 6 +++--- src/ml_optimiser.cpp | 7 ------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 606fce049..da7d10017 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -553,9 +553,9 @@ if (FETCH_WEIGHTS) message(STATUS "Successfully downloaded model weights") else() message(WARNING - "Failed to download model weights." - "You could ignore this." - "The downloads will be attempted again when the model weights are required later." + "Failed to download model weights. YOU CAN IGNORE THIS. " + "The downloads will be attempted again when the model weights are required later. " + "\n" "NOTE: You can skip this step by setting -DFETCH_WEIGHTS=OFF" ) endif() diff --git a/src/ml_optimiser.cpp b/src/ml_optimiser.cpp index 395d9e59e..e9cbdf0b3 100644 --- a/src/ml_optimiser.cpp +++ b/src/ml_optimiser.cpp @@ -2375,13 +2375,6 @@ void MlOptimiser::initialiseGeneral(int rank) if (directions_have_changed) mymodel.initialisePdfDirection(sampling.NrDirections()); - // Do this before initialising wsum_model! - if (do_blush && mymodel.padding_factor > 1) - { - mymodel.padding_factor = 1; - if (rank == 0) std::cerr << " Warning! Blush regularisation can only be done without padding the maps for now; setting --pad to 1 ..." << std::endl; - } - // Initialise the wsum_model according to the mymodel wsum_model.initialise(mymodel, sampling.symmetryGroup(), asymmetric_padding, skip_gridding, grad_pseudo_halfsets);