minor fix for compiling with Apple-clang

include/libpressio_ext/cpp/dtype.h

@@ -40,14 +40,15 @@ constexpr pressio_dtype pressio_size_type() {
  */
 template <class T>
 constexpr pressio_dtype pressio_dtype_from_type() {
-  static_assert(impl::is_one_of<T,double, float, bool, int8_t, int16_t, int32_t, int64_t, uint8_t, uint16_t, uint32_t, uint64_t, size_t, char, unsigned char>::value, 
+  static_assert(impl::is_one_of<T,double, float, bool, int8_t, int16_t, int32_t, int64_t, uint8_t, uint16_t, uint32_t, uint64_t, long, size_t, char, unsigned char>::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, long>::value ? pressio_size_type() :
       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 :

src/plugins/compressors/external.cc

@@ -1,6 +1,7 @@
 #include <tuple>
 #include <regex>
 #include <chrono>
+#include <sstream>
 #include "std_compat/memory.h"
 #include "libpressio_ext/cpp/compressor.h"
 #include "libpressio_ext/cpp/data.h"

src/plugins/compressors/mgard-1.3_plugin.cc

@@ -271,7 +271,8 @@ Reference [6] covers the design and implementation on GPU heterogeneous systems.
       size_t compressed_size;
       bool pre_allocated = output->has_data();
       auto const& dims = input->normalized_dims();
-      mgard_x::compress(dims.size(), to_mgard_type(input->dtype()), dims, tolerance, s,
+      std::vector<mgard_x::SIZE> dims_(dims.begin(), dims.end());
+      mgard_x::compress(dims.size(), to_mgard_type(input->dtype()), dims_, tolerance, s,
                       bound_type, input->data(),
                       output_data, compressed_size, config, pre_allocated);
 

src/plugins/compressors/sz3.cc

@@ -226,9 +226,11 @@ class sz3_compressor_plugin : public libpressio_compressor_plugin {
   {
     cleanup restore_threads;
     if(config.openmp) {
+#if LIBPRESSIO_HAS_OPENMP
         int32_t old_threads = omp_get_num_threads();
         omp_set_num_threads(static_cast<int32_t>(nthreads));
         restore_threads = [old_threads]{ omp_set_num_threads(old_threads);};
+#endif
     }
 
     auto reg_dims = input->normalized_dims();
@@ -246,9 +248,11 @@ class sz3_compressor_plugin : public libpressio_compressor_plugin {
   {
     cleanup restore_threads;
     if(config.openmp) {
+#if LIBPRESSIO_HAS_OPENMP
         int32_t old_threads = omp_get_num_threads();
         omp_set_num_threads(static_cast<int32_t>(nthreads));
         restore_threads = [old_threads]{ omp_set_num_threads(old_threads);};
+#endif
     }
 
     std::vector<size_t> output_dims = output->normalized_dims();

src/plugins/compressors/sz_common.cc

@@ -4,7 +4,7 @@
 #include <sstream>
 #include <cstdlib>
 
-#include <sz/sz.h>
+#include <sz.h>
 
 #include "libpressio_ext/cpp/data.h"
 #include "libpressio_ext/cpp/compressor.h"

src/plugins/compressors/sz_common.h

@@ -8,7 +8,7 @@
 #include <std_compat/shared_mutex.h>
 #include <std_compat/mutex.h>
 #include <pressio_dtype.h>
-#include <sz/sz.h>
+#include <sz.h>
 
 #define PRESSIO_SZ_VERSION_GREATEREQ(major, minor, build, revision) \
    (SZ_VER_MAJOR > major || \

src/plugins/compressors/sz_plugin.cc

@@ -4,7 +4,7 @@
 #include <sstream>
 #include <cstdlib>
 
-#include <sz/sz.h>
+#include <sz.h>
 #if HAVE_WRITESTATS
 #include <sz/sz_stats.h>
 #endif

src/plugins/compressors/sz_threadsafe_plugin.cc

@@ -4,7 +4,7 @@
 #include <sstream>
 #include <cstdlib>
 
-#include <sz/sz.h>
+#include <sz.h>
 
 #include "libpressio_ext/cpp/data.h"
 #include "libpressio_ext/cpp/compressor.h"

tools/swig/pypressio.h

@@ -118,23 +118,28 @@ struct pressio_option* option_new_strings(std::vector<std::string> const& string
 }
 
 struct pressio_data* data_new_empty(const pressio_dtype dtype, std::vector<uint64_t> dimensions) {
-  return new pressio_data(pressio_data::empty(dtype, dimensions));
+  std::vector<size_t> dimensions_(dimensions.cbegin(), dimensions.cend());
+  return new pressio_data(pressio_data::empty(dtype, dimensions_));
 }
 struct pressio_data* data_new_nonowning(const pressio_dtype dtype, void* data, std::vector<uint64_t> dimensions) {
-  return new pressio_data(pressio_data::nonowning(dtype, data, dimensions));
+  std::vector<size_t> dimensions_(dimensions.cbegin(), dimensions.cend());
+  return new pressio_data(pressio_data::nonowning(dtype, data, dimensions_));
 }
 struct pressio_data* data_new_copy(const enum pressio_dtype dtype, void* src, std::vector<uint64_t>  dimensions) {
-  return new pressio_data(pressio_data::copy(dtype, src, dimensions));
+  std::vector<size_t> dimensions_(dimensions.cbegin(), dimensions.cend());
+  return new pressio_data(pressio_data::copy(dtype, src, dimensions_));
 }
 struct pressio_data* data_new_owning(const pressio_dtype dtype, std::vector<uint64_t> dimensions) {
-  return new pressio_data(pressio_data::owning(dtype, dimensions));
+  std::vector<size_t> dimensions_(dimensions.cbegin(), dimensions.cend());
+  return new pressio_data(pressio_data::owning(dtype, dimensions_));
 }
 struct pressio_data* data_new_move(const pressio_dtype dtype,
     void* data,
     std::vector<uint64_t> dimensions,
     pressio_data_delete_fn deleter,
     void* metadata) {
-  return new pressio_data(pressio_data::move(dtype, data, dimensions, deleter, metadata));
+  std::vector<size_t> dimensions_(dimensions.cbegin(), dimensions.cend());
+  return new pressio_data(pressio_data::move(dtype, data, dimensions_, deleter, metadata));
 }
 
 pressio_metrics* new_metrics(struct pressio* library, std::vector<std::string> metrics) {