Fix dataset parser

deephealthproject · Sep 13, 2021 · 4c1b616 · 4c1b616
1 parent e586821
commit 4c1b616
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/modules/core/src/cpu_hal_imgproc.cpp b/modules/core/src/cpu_hal_imgproc.cpp
@@ -1866,7 +1866,6 @@ void SaltOrPepper(const Image& src, Image& dst, double p, bool per_channel, cons
         case DataType::type: \
             { \
                 TypeInfo_t<DataType::type>* tmp_data = reinterpret_cast<TypeInfo_t<DataType::type>*>(tmp.data_); \
-                OMP_PAR_FOR \
                 for (int i = 0; i < tmp.datasize_ / tmp.elemsize_; ++i) { \
                     if (dist(re) == 0) { \
                         tmp_data[i] = static_cast<TypeInfo_t<DataType::type>>(color()); \
@@ -2077,9 +2076,9 @@ struct NormalizeChannelsStruct
     {
         using srctype = typename TypeInfo<SDT>::basetype;
         Image tmp(src.dims_, src.elemtype_, src.channels_, src.colortype_, src.spacings_, src.dev_);
-        
+
         for (int c = 0; c < src.channels_.size(); ++c) {
-            ConstView<SDT> src_v(src, { 0, 0, c }, {src.dims_[0], src.dims_[1], 1});
+            ConstView<SDT> src_v(src, { 0, 0, c }, { src.dims_[0], src.dims_[1], 1 });
             View<SDT> dst_v(tmp, { 0, 0, c }, { src.dims_[0], src.dims_[1], 1 });
 
             auto tmp_it = dst_v.Begin();
@@ -2102,7 +2101,6 @@ void CpuHal::Normalize(const Image& src, Image& dst, const double& mean, const d
 
 void CpuHal::Normalize(const Image& src, Image& dst, const std::vector<double>& mean, const std::vector<double>& std)
 {
-
     if (src.channels_ != "xyc") {
         ECVL_ERROR_NOT_IMPLEMENTED_WHAT("CpuHal::Normalize with multiple means and stds require xyc channels\n")
     }
@@ -2111,7 +2109,6 @@ void CpuHal::Normalize(const Image& src, Image& dst, const std::vector<double>&
     table(src.elemtype_)(src, dst, mean, std);
 }
 
-
 template <DataType SDT>
 struct CenterCropStruct
 {

diff --git a/modules/dataset/src/dataset_parser.cpp b/modules/dataset/src/dataset_parser.cpp
@@ -224,6 +224,12 @@ void Dataset::Dump(const path& file_path)
         else if (s.label_path_ != nullopt) {
             os << tab + tab + "label: " << s.label_path_.value().generic_string() << endl;
         }
+        if (s.values_ != nullopt) {
+            os << tab + tab + "values: [";
+            for (auto& v : s.values_.value()) {
+                os << s.values_.value()[0] << "]" << endl;
+            }
+        }
     }
 
     if (split_.size() > 0) {