libpressio version 0.62.0

Bug Fixes

+ Several Bug fixes to support MacOS -- tested on OSX 10.13.6 with XCode 10.0
	+ MacOS has a different value for size_t than Linux; replaced several references
	  to fix this
	+ Older MacOS did not have support for std::equals with four iterators, use a version
	  from std_compat
	+ A few cases of conversion failures in the JSON conversion code
	+ marking a minor release because some of the changes _may_ change ABI

Author: robertu94

CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.13 FATAL_ERROR)
-project(libpressio VERSION "0.61.0" LANGUAGES CXX C)
+project(libpressio VERSION "0.62.0" LANGUAGES CXX C)
 
 #correct was to set a default build type
 # https://blog.kitware.com/cmake-and-the-default-build-type/

COPYRIGHT.txt

@@ -1,6 +1,6 @@
 Copyright © 2021 , UChicago Argonne, LLC
 All Rights Reserved
-[libpressio, Version 0.59.0]
+[libpressio, Version 0.62.0]
 Robert Underwood
 Argonne National Laboratory
 

include/libpressio_ext/cpp/dtype.h

@@ -16,6 +16,18 @@ namespace impl {
   };
 }
 
+constexpr pressio_dtype pressio_size_type() {
+	static_assert(sizeof(size_t) <= 8, "unexpected type");
+	return (
+		(sizeof(size_t) == 8 && std::is_unsigned<size_t>::value) ? pressio_uint64_dtype :
+		(sizeof(size_t) == 8 && !std::is_unsigned<size_t>::value) ? pressio_int64_dtype :
+		(sizeof(size_t) == 4 && std::is_unsigned<size_t>::value) ? pressio_uint32_dtype :
+		(sizeof(size_t) == 4 && !std::is_unsigned<size_t>::value) ? pressio_int32_dtype :
+		(sizeof(size_t) == 2 && std::is_unsigned<size_t>::value) ? pressio_uint16_dtype :
+		(sizeof(size_t) == 2 && !std::is_unsigned<size_t>::value) ? pressio_int16_dtype :
+		pressio_uint64_dtype
+	);
+}
 
 /**
  * Convert types to pressio_dtypes
@@ -25,14 +37,15 @@ namespace impl {
  */
 template <class T>
 constexpr pressio_dtype pressio_dtype_from_type() {
-  static_assert(impl::is_one_of<T,double, float, int8_t, int16_t, int32_t, int64_t, uint8_t, uint16_t, uint32_t, uint64_t>::value, 
+  static_assert(impl::is_one_of<T,double, float, int8_t, int16_t, int32_t, int64_t, uint8_t, uint16_t, uint32_t, uint64_t, size_t>::value, 
       "unexpected type");
   return (std::is_same<T, double>::value ? pressio_double_dtype :
       std::is_same<T, float>::value ? pressio_float_dtype :
       std::is_same<T, int64_t>::value ? pressio_int64_dtype :
       std::is_same<T, int32_t>::value ? pressio_int32_dtype :
       std::is_same<T, int16_t>::value ? pressio_int16_dtype :
       std::is_same<T, int8_t>::value ? pressio_int8_dtype :
+      std::is_same<T, size_t>::value ? pressio_size_type() :
       std::is_same<T, uint64_t>::value ? pressio_uint64_dtype :
       std::is_same<T, uint32_t>::value ? pressio_uint32_dtype :
       std::is_same<T, uint16_t>::value ? pressio_uint16_dtype :

src/plugins/io/csv.cc

@@ -12,6 +12,7 @@
 #include "libpressio_ext/cpp/data.h"
 #include "libpressio_ext/cpp/io.h"
 #include "std_compat/memory.h"
+#include "std_compat/algorithm.h"
 
 namespace {
   struct csv_printer {
@@ -63,7 +64,7 @@ struct csv_io : public libpressio_io_plugin
       sizes[1] = column;
     }
     sizes[0] -= skip_rows;
-    if(data && data->has_data() && std::equal(sizes.begin(), sizes.end(), data->dimensions().begin(), data->dimensions().end()) && data->dtype() == pressio_double_dtype) {
+    if(data && data->has_data() && compat::equal(sizes.begin(), sizes.end(), data->dimensions().begin(), data->dimensions().end()) && data->dtype() == pressio_double_dtype) {
       auto ret = pressio_data_new_empty(pressio_byte_dtype, 0, nullptr);
       *ret = std::move(*data);
       std::copy(builder.begin(), builder.end(), static_cast<double*>(ret->data()));

src/plugins/metrics/region_of_interest.cc

@@ -25,7 +25,7 @@ namespace region_of_interest {
     {
       region_of_interest_metrics m;
       if (start.empty()) {
-        start = std::vector<uint64_t>(input_dims.size());
+        start = std::vector<size_t>(input_dims.size());
       }
       if (end.empty()) {
         end = input_dims;
@@ -35,22 +35,22 @@ namespace region_of_interest {
       const size_t n = compat::transform_reduce(
           std::begin(start), std::end(start),
           std::begin(end),
-          uint64_t{0},
-          [](uint64_t start, uint64_t stop){ return stop-start; },
+          size_t{0},
+          [](size_t start, size_t stop){ return stop-start; },
           compat::plus<>{}
           );
       switch (input_dims.size()) {
         case 1:
-          for (uint64_t i = start[0]; i < end[0]; ++i) {
+          for (size_t i = start[0]; i < end[0]; ++i) {
             input_sum += input_begin[i];
             decomp_sum += decomp_begin[i];
           }
           break;
         case 2:
           {
           auto stride = input_dims[1];
-          for (uint64_t i = start[0]; i < end[0]; ++i) {
-            for (uint64_t j = start[1]; j < end[1]; ++j) {
+          for (size_t i = start[0]; i < end[0]; ++i) {
+            for (size_t j = start[1]; j < end[1]; ++j) {
               auto idx = j + stride * i;
               input_sum += input_begin[idx];
               decomp_sum += decomp_begin[idx];
@@ -62,9 +62,9 @@ namespace region_of_interest {
           {
           const auto stride = input_dims[2];
           const auto stride2 = input_dims[1] * input_dims[2];
-          for (uint64_t i = start[0]; i < end[0]; ++i) {
-            for (uint64_t j = start[1]; j < end[1]; ++j) {
-              for (uint64_t k = start[2]; k < end[2]; ++k) {
+          for (size_t i = start[0]; i < end[0]; ++i) {
+            for (size_t j = start[1]; j < end[1]; ++j) {
+              for (size_t k = start[2]; k < end[2]; ++k) {
                 auto idx =k + j*stride + i*stride2;
                 input_sum += input_begin[idx];
                 decomp_sum += decomp_begin[idx];
@@ -84,7 +84,7 @@ namespace region_of_interest {
     }
 
     std::vector<size_t> const input_dims, decomp_dims;
-    std::vector<uint64_t> start,end;
+    std::vector<size_t> start,end;
   };
 }
 
@@ -101,7 +101,7 @@ class region_of_interest_plugin : public libpressio_metrics_plugin
                       struct pressio_data const* output, int) override
   {
     err_metrics = pressio_data_for_each<region_of_interest::region_of_interest_metrics>( input_data, *output,
-        region_of_interest::compute_metrics{input_data.dimensions(), output->dimensions(), start.to_vector<uint64_t>(), end.to_vector<uint64_t>()});
+        region_of_interest::compute_metrics{input_data.dimensions(), output->dimensions(), start.to_vector<size_t>(), end.to_vector<size_t>()});
   }
 
   struct pressio_options get_metrics_results() const override

src/pressio_options_json.cc

@@ -140,7 +140,7 @@ static void from_json_array(nlohmann::json const& j, pressio_option& option) {
   switch(j_type) {
     case nlohmann::json::value_t::string:
     case nlohmann::json::value_t::binary:
-      option = std::vector<std::string>(j.begin(), j.end());
+      option = j.get<std::vector<std::string>>();
       break;
     case nlohmann::json::value_t::number_integer:
     case nlohmann::json::value_t::number_unsigned:
@@ -212,7 +212,7 @@ void from_json(nlohmann::json const& j, pressio_option& option) {
             option = double(j.at("value"));
             break;
           case pressio_option_charptr_type:
-            option = std::string(j.at("value"));
+            option = j.at("value").get<std::string>();
             break;
           case pressio_option_charptr_array_type:
             option = std::vector<std::string>{j.at("value")};