Fix hdf5 offset compute

Author: koparasy

src/AMSlib/ml/surrogate.cpp

@@ -11,6 +11,7 @@
 #include "AMS.h"
 #include "surrogate.hpp"
 #include "wf/debug.h"
+#include "wf/utils.hpp"
 
 using namespace ams;
 static std::string getDTypeAsString(torch::Dtype dtype)
@@ -247,7 +248,9 @@ std::tuple<torch::Tensor, torch::Tensor> SurrogateModel::evaluate(
   }
 
   auto ITensor = torch::cat(ConvertedInputs, CAxis);
-  std::cout << "Input concatenated tensor is " << ITensor.sizes() << "\n";
+  DBG(Surrogate,
+      "Input concatenated tensor is %s",
+      shapeToString(ITensor).c_str());
 
   auto [OTensor, Predicate] = _evaluate(ITensor, policy, threshold);
   if (InputDevice != torch_device) {

src/AMSlib/wf/hdf5db.cpp

@@ -196,7 +196,9 @@ void hdf5DB::writeDataToDataset(ams::MutableArrayRef<hsize_t> currentShape,
 
   // Prepare the dataset for new data
   ams::SmallVector<hsize_t> newShape(tensor_dims.begin(), tensor_dims.end());
+
   newShape[0] += currentShape[0];  // Update the first dimension
+
   status = H5Dset_extent(dset, newShape.data());
   if (status < 0) {
     throw std::runtime_error("Failed to extend dataset's dimensions.");
@@ -239,7 +241,7 @@ void hdf5DB::writeDataToDataset(ams::MutableArrayRef<hsize_t> currentShape,
   }
 
   // Update currentShape
-  currentShape[0] += newShape[0];
+  currentShape[0] = newShape[0];
 
   // Close HDF5 objects
   H5Sclose(memSpace);
@@ -250,8 +252,8 @@ void hdf5DB::writeDataToDataset(ams::MutableArrayRef<hsize_t> currentShape,
 void hdf5DB::_store(const at::Tensor& inputs, const at::Tensor& outputs)
 {
   DBG(DB,
-      "DB of type %s stores input/output tensors of  shapes(%s, "
-      "%s)",
+      "DB of type %s stores input/output tensors of  shapes %s, "
+      "%s",
       type().c_str(),
       tensorSizeToString(inputs.sizes()).c_str(),
       tensorSizeToString(outputs.sizes()).c_str());
@@ -262,6 +264,11 @@ void hdf5DB::_store(const at::Tensor& inputs, const at::Tensor& outputs)
 
   writeDataToDataset(currentInputShape, HDIset, inputs);
   writeDataToDataset(currentOutputShape, HDOset, outputs);
+  DBG(DB,
+      "DB (file:%s) next elements to be stored at Input:%s Output: %s",
+      fn.c_str(),
+      SmallVectorToString(currentOutputShape).c_str(),
+      SmallVectorToString(currentInputShape).c_str());
 }
 
 
@@ -321,13 +328,7 @@ void hdf5DB::store(ArrayRef<torch::Tensor> Inputs,
   c10::SmallVector<torch::Tensor> ConvertedInputs(Inputs.begin(), Inputs.end());
   c10::SmallVector<torch::Tensor> ConvertedOutputs(Outputs.begin(),
                                                    Outputs.end());
-  for (auto& T : ConvertedInputs) {
-    std::cout << "CI Shape is " << T.sizes() << "\n";
-  }
 
-  for (auto& T : ConvertedOutputs) {
-    std::cout << "CO Shape is " << T.sizes() << "\n";
-  }
   auto inputs =
       torch::cat(ConvertedInputs, Inputs[0].sizes().size() - 1).to(tOptions);
   auto outputs =

src/AMSlib/wf/interface.cpp

@@ -81,11 +81,9 @@ static ams::SmallVector<ams::AMSTensor> torchToAMSTensors(
     auto shapes = ArrayRef(tensor.sizes().begin(), tensor.strides().size());
     auto strides = ArrayRef(tensor.strides().begin(), tensor.strides().size());
     if (dType == AMSDType::AMS_SINGLE) {
-      std::cout << "Setting pointer " << tensor.data_ptr<float>() << "\n";
       ams_tensors.push_back(
           AMSTensor::view(tensor.data_ptr<float>(), shapes, strides, rType));
     } else if (dType == AMSDType::AMS_DOUBLE) {
-      std::cout << "Setting pointer " << tensor.data_ptr<double>() << "\n";
       ams_tensors.push_back(
           AMSTensor::view(tensor.data_ptr<double>(), shapes, strides, rType));
     }
@@ -138,14 +136,5 @@ void callAMS(ams::AMSWorkflow *executor,
   ams::SmallVector<torch::Tensor> tinouts = amsToTorchTensors(inouts);
   ams::SmallVector<torch::Tensor> touts = amsToTorchTensors(outs);
 
-  for (auto &TI : tins)
-    std::cout << "ITensor Shape is " << TI.sizes() << "\n";
-  for (auto &TIO : tinouts)
-    std::cout << "IOTensor Shape is " << TIO.sizes() << "\n";
-
-  for (auto &TO : touts)
-    std::cout << "OTensor Shape is " << TO.sizes() << "\n";
-
-
   executor->evaluate(Physics, tins, tinouts, touts);
 }

src/AMSlib/wf/workflow.hpp

@@ -21,6 +21,7 @@
 #include "macro.h"
 #include "ml/surrogate.hpp"
 #include "resource_manager.hpp"
+#include "utils.hpp"
 #include "wf/basedb.hpp"
 #include "wf/debug.h"
 
@@ -189,9 +190,6 @@ class AMSWorkflow
     }
     for (int i = 0; i < computedDomain.size(); i++) {
       auto indexed_shape = computedDomain[i].sizes();
-      std::cout << "Scattering outputs " << entireDomain[i].sizes() << " CD "
-                << computedDomain[i].sizes() << " Predicate "
-                << Predicate.sizes() << "\n";
       entireDomain[i].index_put_({Predicate},
                                  computedDomain[i].view(indexed_shape));
     }
@@ -208,9 +206,6 @@ class AMSWorkflow
       int ConcatAxisSize = dst.sizes()[dst.dim() - 1];
       torch::Tensor Slice =
           Src.narrow(outerDim, offset, ConcatAxisSize).to(dst.options());
-      std::cout << "Slice Shape is:" << Slice.sizes() << "\n";
-      std::cout << "Dst shape is " << dst.sizes() << "\n";
-      std::cout << "Predicate is " << Predicate.sizes() << "\n";
       dst.index_put_({Predicate}, Slice.index({Predicate}));
       offset += ConcatAxisSize;
     }
@@ -278,12 +273,23 @@ class AMSWorkflow
         InOuts.size(),
         Outs.size());
 
+    std::string msg{"ApplicationInput: [ "};
     for (auto &TI : Ins)
-      std::cout << "ITensor Shape is " << TI.sizes() << "\n";
+      msg += shapeToString(TI) + " ";
+    msg += "]";
+    DBG(Workflow, "%s", msg.c_str());
+
+    msg = "ApplicationInOut: [ ";
     for (auto &TIO : InOuts)
-      std::cout << "IOTensor Shape is " << TIO.sizes() << "\n";
+      msg += shapeToString(TIO) + " ";
+    msg += "]";
+    DBG(Workflow, "%s", msg.c_str());
+
+    msg = "ApplicationOutput: [ ";
     for (auto &TO : Outs)
-      std::cout << "OTensor Shape is " << TO.sizes() << "\n";
+      msg += shapeToString(TO) + " ";
+    msg += "]";
+    DBG(Workflow, "%s", msg.c_str());
 
 
     SmallVector<torch::Tensor> InputTensors(Ins.begin(), Ins.end());
@@ -373,22 +379,11 @@ class AMSWorkflow
       PhysicInOutsBefore.push_back(S.clone());
 
 
-    for (auto &TI : PhysicIns)
-      std::cout << "Before Phy ITensor Shape is " << TI.sizes() << "\n";
-    for (auto &TO : PhysicOuts)
-      std::cout << "Before Phy OTensor Shape is " << TO.sizes() << "\n";
-
-
     // We call the application here
     CALIPER(CALI_MARK_BEGIN("PHYSICS MODULE");)
     callApplication(CallBack, PhysicIns, PhysicInOuts, PhysicOuts);
     CALIPER(CALI_MARK_END("PHYSICS MODULE");)
 
-    for (auto &TI : PhysicIns)
-      std::cout << "After Phy ITensor Shape is " << TI.sizes() << "\n";
-    for (auto &TO : PhysicOuts)
-      std::cout << "After Phy OTensor Shape is " << TO.sizes() << "\n";
-
 
     CALIPER(CALI_MARK_BEGIN("UNPACK");)
     // Copy out the computation results to the original tensors/buffers