From c4d6197e9b3b385a94fde8bd88dbfb2ab5e9fac4 Mon Sep 17 00:00:00 2001 From: straile Date: Mon, 4 Nov 2024 15:56:09 +0100 Subject: [PATCH] fix: merge issues --- src/Chemistry/WorkerFunctions.cpp | 7 ------- src/poet.hpp.in | 9 --------- 2 files changed, 16 deletions(-) diff --git a/src/Chemistry/WorkerFunctions.cpp b/src/Chemistry/WorkerFunctions.cpp index 186812f93..9a7729243 100644 --- a/src/Chemistry/WorkerFunctions.cpp +++ b/src/Chemistry/WorkerFunctions.cpp @@ -170,10 +170,7 @@ void poet::ChemistryModule::WorkerDoWork(MPI_Status &probe_status, } } -<<<<<<< HEAD -======= // std::cout << this->comm_rank << ":" << counter++ << std::endl; ->>>>>>> segfault_find_reason if (dht_enabled || interp_enabled) { dht->prepareKeys(s_curr_wp.input, dt); } @@ -190,10 +187,6 @@ void poet::ChemistryModule::WorkerDoWork(MPI_Status &probe_status, interp->tryInterpolation(s_curr_wp); } -<<<<<<< HEAD -======= - ->>>>>>> segfault_find_reason phreeqc_time_start = MPI_Wtime(); WorkerRunWorkPackage(s_curr_wp, current_sim_time, dt); diff --git a/src/poet.hpp.in b/src/poet.hpp.in index 35cb1b4da..9d343dccf 100644 --- a/src/poet.hpp.in +++ b/src/poet.hpp.in @@ -71,21 +71,12 @@ struct RuntimeParameters { /*AI surriogate configuration*/ bool use_ai_surrogate = false; // Can be set with command line flag ---ai-surrogate -<<<<<<< HEAD bool disable_training = false; // Can be set in the R input script bool use_clustering = false; // Can be set in the R input script bool use_Keras_predictions = false; // Can be set in the R input script bool train_only_invalid = false; // Can be set in the R input script int batch_size = 2560; // default value determined in test on the UP Turing cluster int training_epochs = 20;; // Can be set in the R input script -======= - bool disable_training; // Can be set in the R input script - bool use_k_means_clustering; // Can be set in the R input script - bool use_Keras_predictions; // Can be set in the R input script - bool train_only_invalid; // Can be set in the R input script - int batch_size; // Can be set in the R input script - int training_epochs; // Can be set in the R input script ->>>>>>> segfault_find_reason int training_data_size; // Can be set in the R input script std::string save_model_path = ""; // Can be set in the R input script std::string cuda_src_dir = CUDA_SRC_DIR; // From CMake