Hotfix/suffix buffer size (#19)

* Minor robustness fixes

* Bumping version + notes

* Adding scalar tests and fixed a bug

* Adding to the notes

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [2021-02-08 - Version 1.2.1](https://github.com/matajoh/libnpy/releases/tag/v1.2.1)
+
+Improvements:
+- Bug fix for scalar tensor reading
+- Bug fix with memstream buffer size at initialization
+- ".npy" will be added to tensor names in NPZ writing if not already present
+
 ## [2021-01-19 - Version 1.2.0](https://github.com/matajoh/libnpy/releases/tag/v1.2.0)
 
 New Features:

RELEASE_NOTES

@@ -1,6 +1,4 @@
-New Features:
-- Easier indexing (variable argument index method + negative indexes)
-- Easier access to shape
-
 Improvements:
-- Cmake upgraded to "modern" usage, i.e. you use the library by adding `npy::npy` as a link library
+- Bug fix for scalar tensor reading
+- Bug fix with memstream buffer size at initialization
+- ".npy" will be added to tensor names in NPZ writing if not already present

VERSION

@@ -1 +1 @@
-1.2.0
+1.2.1

include/npy/npz.h

@@ -96,7 +96,15 @@ class onpzstream
 
         omemstream output;
         save(output, tensor);
-        this->write_file(filename, std::move(output.buf()));
+
+        std::string suffix = ".npy";
+        std::string name = filename;
+        if(name.size() < 4 || !std::equal(suffix.rbegin(), suffix.rend(), name.rbegin()))
+        {
+            name += ".npy";
+        }
+
+        this->write_file(name, std::move(output.buf()));
     }
 
     /** Write a tensor to the NPZ archive.

src/memstream.cpp

@@ -1,7 +1,7 @@
 #include "npy/core.h"
 
 namespace {
-    const int BUFFER_SIZE = 1;//64 * 1024;
+    const int BUFFER_SIZE = 64 * 1024;
 }
 
 namespace npy
@@ -11,8 +11,9 @@ membuf::membuf() : membuf(BUFFER_SIZE)
     this->seekpos(0);
 }
 
-membuf::membuf(size_t n) : m_buffer(n)
+membuf::membuf(size_t n)
 {
+    m_buffer.reserve(BUFFER_SIZE);
     this->seekpos(0);
 }
 

src/npy.cpp

@@ -37,6 +37,11 @@ void skip_whitespace(std::istream &input)
 
 std::string read_to(std::istream &input, char delim)
 {
+    if(input.peek() == delim)
+    {
+        return "";
+    }
+
     input.get(BUFFER, BUFFER_SIZE, delim);
     auto length = input.gcount();
     assert(length < BUFFER_SIZE);

test/libnpy_tests.h

@@ -163,7 +163,17 @@ std::string npy_stream(npy::endian_t endianness = npy::endian_t::NATIVE)
     npy::tensor<T> tensor = test_tensor<T>({5, 2, 5});
     npy::save(actual_stream, tensor, endianness);
     return actual_stream.str();
-};
+}
+
+template <typename T>
+std::string npy_scalar_stream(npy::endian_t endianness = npy::endian_t::NATIVE)
+{
+    std::ostringstream actual_stream;
+    npy::tensor<T> tensor = test_tensor<T>({});
+    *tensor.data() = static_cast<T>(42);
+    npy::save(actual_stream, tensor, endianness);
+    return actual_stream.str();
+}
 
 template <typename T>
 std::string npy_fortran_stream(npy::endian_t endianness = npy::endian_t::NATIVE)

test/npy_read.cpp

@@ -13,6 +13,7 @@ int test_npy_read()
     test_read<std::uint32_t>(result, "uint32");
     test_read<std::int32_t>(result, "int32");
     test_read<std::int32_t>(result, "int32_big");
+    test_read_scalar<std::int32_t>(result, "int32_scalar");
     test_read<std::uint64_t>(result, "uint64");
     test_read<std::int64_t>(result, "int64");
     test_read<float>(result, "float32");

test/npy_read.h

@@ -18,4 +18,13 @@ void test_read(int &result, const std::string &name, bool fortran_order = false)
     test::assert_equal(expected, actual, result, "npy_read_" + name);
 }
 
+template <typename T>
+void test_read_scalar(int &result, const std::string &name)
+{
+    npy::tensor<T> expected = test::test_tensor<T>({});
+    *expected.data() = static_cast<T>(42);
+    npy::tensor<T> actual = npy::load<T, npy::tensor>(test::asset_path(name + ".npy"));
+    test::assert_equal(expected, actual, result, "npy_read_" + name);
+}
+
 #endif

test/npy_write.cpp

@@ -43,6 +43,10 @@ int test_npy_write()
     actual = test::npy_stream<std::int32_t>(npy::endian_t::BIG);
     test::assert_equal(expected, actual, result, "npy_write_int32_big");
 
+    expected = test::read_asset("int32_scalar.npy");
+    actual = test::npy_scalar_stream<std::int32_t>(npy::endian_t::LITTLE);
+    test::assert_equal(expected, actual, result, "npy_write_int32_scalar");
+
     expected = test::read_asset("uint64.npy");
     actual = test::npy_stream<std::uint64_t>(npy::endian_t::LITTLE);
     test::assert_equal(expected, actual, result, "npy_write_uint64");

test/npz_write.cpp

@@ -28,7 +28,7 @@ void _test(int &result, npy::compression_method_t compression_method)
 
     {
         npy::onpzstream npz(TEMP_NPZ, compression_method, npy::endian_t::LITTLE);
-        npz.write("color.npy", test::test_tensor<std::uint8_t>({5, 5, 3}));
+        npz.write("color", test::test_tensor<std::uint8_t>({5, 5, 3}));
         npz.write("depth.npy", test::test_tensor<float>({5, 5}));
     }