v1.1.1

README.md

@@ -114,8 +114,9 @@ int main(int argc, char **argv) {
     // Initialize the arguments with the provided command line arguments
     configurations.InitializeArguments(argc, argv);
     // Initialize the ExaGeoStat Hardware
-    auto hardware = ExaGeoStatHardware(configurations.GetComputation(), configurations.GetCoresNumber(), configurations.GetGPUsNumbers());
-    // Load data by either read from file or create synthetic data.
+    auto hardware = ExaGeoStatHardware(configurations.GetComputation(), configurations.GetCoresNumber(),
+                                       configurations.GetGPUsNumbers(), configurations.GetPGrid(),
+                                       configurations.GetQGrid());    // Load data by either read from file or create synthetic data.
     std::unique_ptr<ExaGeoStatData<double>> data;
     ExaGeoStat<double>::ExaGeoStatLoadData(configurations, data);
     // Modeling module.

USER_MANUAL.md

@@ -245,7 +245,7 @@ for setting your arguments:
 To use any operations, you must initialize the hardware by selecting the number of CPUs and/or GPUs.
 ```c++
 // Initialize an instance of the hardware
-auto hardware = ExaGeoStatHardware(computation, number of cores, number of gpus);
+auto hardware = ExaGeoStatHardware(computation, number of cores, number of gpus, p, q);
 
 // Other code goes here
 

examples/data-loader/CSVLoader.cpp

@@ -44,8 +44,8 @@ int main(int argc, char **argv) {
 
     // Initialize ExaGeoStat Hardware and Kernel.
     auto hardware = ExaGeoStatHardware(configurations.GetComputation(), configurations.GetCoresNumber(),
-                                       configurations.GetGPUsNumbers());
-
+                                       configurations.GetGPUsNumbers(), configurations.GetPGrid(),
+                                       configurations.GetQGrid());
     Kernel<double> *kernel = exageostat::plugins::PluginRegistry<Kernel<double>>::Create(
             configurations.GetKernelName(), configurations.GetTimeSlot());
     int kernel_variables = kernel->GetVariablesNumber();

examples/descriptors/ChameleonDescriptor.cpp

@@ -41,7 +41,8 @@ int main(int argc, char **argv) {
 
     // Initialize Hardware and Data
     auto hardware = ExaGeoStatHardware(configuration.GetComputation(), configuration.GetCoresNumber(),
-                                       configuration.GetGPUsNumbers());
+                                       configuration.GetGPUsNumbers(), configuration.GetPGrid(),
+                                       configuration.GetQGrid());
     unique_ptr<DescriptorData<double>> data = make_unique<DescriptorData<double>>();
     Kernel<double> *kernel = exageostat::plugins::PluginRegistry<Kernel<double>>::Create(
             configuration.GetKernelName(), configuration.GetTimeSlot());
@@ -51,8 +52,8 @@ int main(int argc, char **argv) {
     int config_problem_size = configuration.GetProblemSize();
     int config_full_problem_size = config_problem_size * kernel_variables_number;
     int config_dts = configuration.GetDenseTileSize();
-    int config_p_grid = configuration.GetPGrid();
-    int config_q_grid = configuration.GetQGrid();
+    int config_p_grid = ExaGeoStatHardware::GetPGrid();
+    int config_q_grid = ExaGeoStatHardware::GetQGrid();
     bool config_is_OOC = configuration.GetIsOOC();
 
     // Randomly Initialized Matrix of Data

examples/descriptors/ChameleonToHicmaConverter.cpp

@@ -43,7 +43,9 @@ int main(int argc, char **argv) {
 
     // Initialize Hardware and Data
     auto hardware = ExaGeoStatHardware(configuration.GetComputation(), configuration.GetCoresNumber(),
-                                       configuration.GetGPUsNumbers());
+                                       configuration.GetGPUsNumbers(), configuration.GetPGrid(),
+                                       configuration.GetQGrid());
+
     unique_ptr<DescriptorData<double>> data = make_unique<DescriptorData<double>>();
     Kernel<double> *kernel = exageostat::plugins::PluginRegistry<Kernel<double>>::Create(
             configuration.GetKernelName(), configuration.GetTimeSlot());
@@ -53,8 +55,8 @@ int main(int argc, char **argv) {
     int config_problem_size = configuration.GetProblemSize();
     int config_full_problem_size = config_problem_size * kernel_variables_number;
     int config_dts = configuration.GetDenseTileSize();
-    int config_p_grid = configuration.GetPGrid();
-    int config_q_grid = configuration.GetQGrid();
+    int config_p_grid = ExaGeoStatHardware::GetPGrid();
+    int config_q_grid = ExaGeoStatHardware::GetQGrid();
     bool config_is_OOC = configuration.GetIsOOC();
 
     // Randomly Initialized Matrix of Data

examples/descriptors/HicmaDescriptor.cpp

@@ -49,7 +49,9 @@ int main(int argc, char **argv) {
     }
     // Initialize Hardware and Data
     auto hardware = ExaGeoStatHardware(configuration.GetComputation(), configuration.GetCoresNumber(),
-                                       configuration.GetGPUsNumbers());
+                                       configuration.GetGPUsNumbers(), configuration.GetPGrid(),
+                                       configuration.GetQGrid());
+
     unique_ptr<DescriptorData<double>> data = make_unique<DescriptorData<double>>();
     Kernel<double> *kernel = exageostat::plugins::PluginRegistry<Kernel<double>>::Create(
             configuration.GetKernelName(), configuration.GetTimeSlot());
@@ -59,8 +61,8 @@ int main(int argc, char **argv) {
     int config_problem_size = configuration.GetProblemSize();
     int config_full_problem_size = config_problem_size * kernel_variables_number;
     int config_dts = configuration.GetDenseTileSize();
-    int config_p_grid = configuration.GetPGrid();
-    int config_q_grid = configuration.GetQGrid();
+    int config_p_grid = ExaGeoStatHardware::GetPGrid();
+    int config_q_grid = ExaGeoStatHardware::GetQGrid();
     bool config_is_OOC = configuration.GetIsOOC();
 
     // Randomly Initialized Matrix of Data

examples/end-to-end/DataGeneration.cpp

@@ -32,7 +32,8 @@ int main(int argc, char **argv) {
     configurations.InitializeArguments(argc, argv);
     // Initialize the ExaGeoStat Hardware
     auto hardware = ExaGeoStatHardware(configurations.GetComputation(), configurations.GetCoresNumber(),
-                                       configurations.GetGPUsNumbers());
+                                       configurations.GetGPUsNumbers(), configurations.GetPGrid(),
+                                       configurations.GetQGrid());
     // Load data by either read from file or create synthetic data.
     std::unique_ptr<ExaGeoStatData<double>> data;
     exageostat::api::ExaGeoStat<double>::ExaGeoStatLoadData(configurations, data);

examples/end-to-end/DataGenerationAndModeling.cpp

@@ -33,7 +33,8 @@ int main(int argc, char **argv) {
     configurations.InitializeArguments(argc, argv);
     // Initialize the ExaGeoStat Hardware
     auto hardware = ExaGeoStatHardware(configurations.GetComputation(), configurations.GetCoresNumber(),
-                                       configurations.GetGPUsNumbers());
+                                       configurations.GetGPUsNumbers(), configurations.GetPGrid(),
+                                       configurations.GetQGrid());
     // Load data by either read from file or create synthetic data.
     std::unique_ptr<ExaGeoStatData<double>> data;
     ExaGeoStat<double>::ExaGeoStatLoadData(configurations, data);

examples/end-to-end/DataGenerationAndPrediction.cpp

@@ -33,7 +33,8 @@ int main(int argc, char **argv) {
     configurations.InitializeArguments(argc, argv);
     // Initialize the ExaGeoStat Hardware
     auto hardware = ExaGeoStatHardware(configurations.GetComputation(), configurations.GetCoresNumber(),
-                                       configurations.GetGPUsNumbers());
+                                       configurations.GetGPUsNumbers(), configurations.GetPGrid(),
+                                       configurations.GetQGrid());
     // Load data by either read from file or create synthetic data.
     std::unique_ptr<ExaGeoStatData<double>> data;
     ExaGeoStat<double>::ExaGeoStatLoadData(configurations, data);

examples/end-to-end/DataGenerationModelingAndPrediction.cpp

@@ -33,7 +33,8 @@ int main(int argc, char **argv) {
     configurations.InitializeArguments(argc, argv);
     // Initialize the ExaGeoStat Hardware
     auto hardware = ExaGeoStatHardware(configurations.GetComputation(), configurations.GetCoresNumber(),
-                                       configurations.GetGPUsNumbers());
+                                       configurations.GetGPUsNumbers(), configurations.GetPGrid(),
+                                       configurations.GetQGrid());
     // Load data by either read from file or create synthetic data.
     std::unique_ptr<ExaGeoStatData<double>> data;
     ExaGeoStat<double>::ExaGeoStatLoadData(configurations, data);

examples/end-to-end/DataModeling.cpp

@@ -44,8 +44,8 @@ int main(int argc, char **argv) {
 
     // initialize ExaGeoStat hardware with the selected number of cores and  gpus.
     auto hardware = ExaGeoStatHardware(configurations.GetComputation(), configurations.GetCoresNumber(),
-                                       configurations.GetGPUsNumbers());
-
+                                       configurations.GetGPUsNumbers(), configurations.GetPGrid(),
+                                       configurations.GetQGrid());
     //Data Setup
     std::unique_ptr<ExaGeoStatData<double>> data = std::make_unique<ExaGeoStatData<double>>(
             configurations.GetProblemSize(), configurations.GetDimension());

examples/end-to-end/DataPrediction.cpp

@@ -43,8 +43,8 @@ int main(int argc, char **argv) {
 
     // initialize ExaGeoStat hardware with the selected number of cores and  gpus.
     auto hardware = ExaGeoStatHardware(configurations.GetComputation(), configurations.GetCoresNumber(),
-                                       configurations.GetGPUsNumbers());
-
+                                       configurations.GetGPUsNumbers(), configurations.GetPGrid(),
+                                       configurations.GetQGrid());
     //Data Setup
     std::unique_ptr<ExaGeoStatData<double>> data = std::make_unique<ExaGeoStatData<double>>(
             configurations.GetProblemSize(), configurations.GetDimension());

examples/hardware/ExaGeoStatHardware.cpp

@@ -36,7 +36,6 @@ int main(int argc, char **argv) {
 
     // Initialize Hardware
     auto hardware = ExaGeoStatHardware(configuration.GetComputation(), configuration.GetCoresNumber(),
-                                       configuration.GetGPUsNumbers());
-
+                                       configuration.GetGPUsNumbers(), configuration.GetPGrid(), configuration.GetQGrid());
     return 0;
 }

inst/include/Rcpp-adapters/FunctionsAdapter.hpp

@@ -22,25 +22,6 @@
 
 namespace exageostat::adapters {
 
-    /**
-     * @brief Retrieves locations from ExaGeoStat data.
-     * @details Extracts and returns the locations stored in an ExaGeoStatData object,
-     * @param[in] apData Pointer to ExaGeoStatData object containing the spatial data.
-     * @return vector of locations coordinates.
-     *
-     */
-    std::vector<std::vector<double>> R_GetLocations(ExaGeoStatData<double> *apData);
-
-    /**
-     * @brief Retrieves descriptive Z values from ExaGeoStat data based on type.
-     * @details Extracts and returns Z values from an ExaGeoStatData object, aiding in targeted spatial data analysis and visualization within ExaGeoStat.
-     * @param[in] apData Pointer to ExaGeoStatData object containing the spatial data.
-     * @param[in] aType String specifying the type of descriptor value to retrieve (e.g., "Chameleon", "HiCMA").
-     * @return Numeric vector of descriptive Z values.
-     *
-     */
-    Rcpp::NumericVector R_GetDescZValues(ExaGeoStatData<double> *apData, const std::string &aType);
-
     /**
      * @brief Function to load ExaGeoStat data.
      * @details This function loads data into an ExaGeoStatData object using the provided configuration and computational settings.
@@ -60,7 +41,7 @@ namespace exageostat::adapters {
      * @return A pointer to an ExaGeoStatData object containing the loaded data.
      *
      */
-    ExaGeoStatData<double> *
+    Rcpp::List
     R_ExaGeoStatLoadData(const std::string &aKernelName, const std::vector<double> &aInitialTheta,
                          const std::string &aDistanceMatrix, const int &aProblemSize, const int &aSeed,
                          const int &aDenseTileSize, const int &aLowTileSize, const std::string &aDimension,

inst/include/utilities/Logger.hpp

@@ -31,17 +31,49 @@
 #define DEFAULT_PRECISION 6
 
 /**
- * @def VERBOSE(msg)
- * @brief Verbose macro for logging and debugging mode.
+ * @def VERBOSE_PRECISION
+ * @brief A fixed precision for the verbose mode.
  */
-#define VERBOSE(msg) \
+#define VERBOSE_PRECISION 12
+
+/**
+ * @def VERBOSE_1(msg)
+ * @brief VERBOSE_1 macro for logging outputs in verbose mode, with double taps at the beginning, a fixed precision and a new line at the end.
+ */
+#define VERBOSE_1(msg) \
+    if(exageostat::configurations::Configurations::GetVerbosity() == exageostat::common::Verbose::DETAILED_MODE && \
+      !exageostat::helpers::CommunicatorMPI::GetInstance()->GetRank()) { \
+        std::ostringstream oss; \
+        oss << "\t\t " << std::fixed << std::setprecision(VERBOSE_PRECISION) << msg << std::endl; \
+        std::cout << oss.str(); \
+    }
+
+/**
+ * @def VERBOSE_2(msg, A)
+ * @brief VERBOSE_2 macro for logging outputs in verbose mode, with double taps at the beginning, a fixed precision and without a new line at the end.
+ */
+#define VERBOSE_2(msg, A) \
     if(exageostat::configurations::Configurations::GetVerbosity() == exageostat::common::Verbose::DETAILED_MODE && \
        !exageostat::helpers::CommunicatorMPI::GetInstance()->GetRank()) { \
         std::ostringstream oss; \
-        oss << "\t\t\t " << msg << std::endl; \
+        oss << "\t\t " << std::fixed << std::setprecision(VERBOSE_PRECISION) << msg ; \
         std::cout << oss.str(); \
     }
 
+/**
+ * @def VERBOSE_CONTROL(x, A, B, FUNC, ...)
+ * @brief VERBOSE_CONTROL is The internal macro that simply strips the excess and ends up with the required macro
+ */
+#define VERBOSE_CONTROL(x, A, B, FUNC, ...) FUNC
+
+/**
+ * @def VERBOSE(...)
+ * @brief VERBOSE macro that's called, Used to logging outputs in a verbose mode.
+ */
+#define VERBOSE(...) VERBOSE_CONTROL(,##__VA_ARGS__, \
+                       VERBOSE_2(__VA_ARGS__),         \
+                       VERBOSE_1(__VA_ARGS__),       \
+                                         )
 /**
  * @def LOGGER_1(msg)
  * @brief LOGGER_1 macro for logging outputs with double taps and new line at the end.

man/get_Z_measurement_vector.Rd

@@ -1,4 +1,3 @@
-// TODO: dots
 % Copyright (c) 2017-2024 King Abdullah University of Science and Technology,
 % All rights reserved.
 % ExaGeoStat is a software package, provided by King Abdullah University of Science and Technology (KAUST).

scripts/Benchmarking.sh

@@ -47,13 +47,13 @@ for N in "${desired_N[@]}"; do
       time_prediction=$(echo "$time_prediction" | tr -d '\n' | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
       time_modeling_iteration=$(echo "$command_output" | awk -F "#Average Time Modeling per Iteration: " '{print $2}' | awk -F "," '{print $1}')
       time_modeling_iteration=$(echo "$time_modeling_iteration" | tr -d '\n' | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
-      flops_generation=$(echo "$command_output" | awk -F "#Total Data Generation Gflop/s: " '{print $2}' | awk -F "," '{print $1}')
+      flops_generation=$(echo "$command_output" | awk -F "#Total Data Generation GFlop/s: " '{print $2}' | awk -F "," '{print $1}')
       flops_generation=$(echo "$flops_generation" | tr -d '\n' | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
-      flops_modeling=$(echo "$command_output" | awk -F "#Total MLE Gflop/s: " '{print $2}' | awk -F "," '{print $1}')
+      flops_modeling=$(echo "$command_output" | awk -F "#Total MLE GFlop/s: " '{print $2}' | awk -F "," '{print $1}')
       flops_modeling=$(echo "$flops_modeling" | tr -d '\n' | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
       flops_modeling_iteration=$(echo "$command_output" | awk -F "#Average Flops per Iteration: " '{print $2}' | awk -F "," '{print $1}')
       flops_modeling_iteration=$(echo "$flops_modeling_iteration" | tr -d '\n' | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
-      flops_mspe=$(echo "$command_output" | awk -F "#MSPE Gflop/s: " '{print $2}' | awk -F "," '{print $1}')
+      flops_mspe=$(echo "$command_output" | awk -F "#MSPE GFlop/s: " '{print $2}' | awk -F "," '{print $1}')
       flops_mspe=$(echo "$flops_mspe" | tr -d '\n' | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
 
     echo "$command_output"