Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Compile on windows #74

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Compile on windows #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6ebf89f
Address the visual studio compiler error C2580 by removing one of the…
sq-rrussell Sep 22, 2021
dbafc90
Address the following compiler error on Visual Studio 2019 builds.
sq-rrussell Sep 22, 2021
48e2c2e
Microsoft compiler does not support <stdlib.h> aligned_alloc(); inste…
sq-rrussell Sep 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions h5cpp/H5Sall.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,9 @@ namespace h5{ namespace impl {
array() : rank(0){};
array( array&& arg ) = default;
array( array& arg ) = default;
#if !defined(_WIN32) && !defined(_WIN64)
array(const array& arg) = default;
#endif
array& operator=( array&& arg ) = default;
array& operator=( array& arg ) = default;
template<class C>
Expand Down
4 changes: 4 additions & 0 deletions h5cpp/H5Zall.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,11 @@ namespace h5 { namespace impl { namespace filter {
return size;
}
inline size_t gzip( void* dst, const void* src, size_t size, unsigned flags, size_t n, const unsigned params[]){
#if defined(_WIN32) || defined(_WIN64)
uLongf nbytes = (uLongf)size;
#else
size_t nbytes = size;
#endif
compress2( (unsigned char*)dst, &nbytes, (const unsigned char*)src, size, params[0]);
return nbytes;
}
Expand Down
45 changes: 37 additions & 8 deletions h5cpp/H5Zpipeline.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,16 @@
#ifndef H5CPP_PIPELINE_HPP
#define H5CPP_PIPELINE_HPP


#if defined(_WIN32) || defined(_WIN64)
#include <malloc.h>
#define aligned_alloc(x,y) _aligned_malloc(y,x)
#define aligned_free(x) _aligned_free(x)
#else
#define aligned_free(x) free(x)
#endif


namespace h5 {
int get_chunk_dims( const h5::dcpl_t& dcpl, h5::chunk_t& chunk_dims );
}
Expand All @@ -16,8 +26,24 @@ namespace h5{ namespace impl {

template <class Derived>
struct pipeline_t {
pipeline_t(){};
~pipeline_t(){};
pipeline_t()
{
this->ptr0 = NULL;
this->ptr1 = NULL;
};
~pipeline_t()
{
if (this->ptr0)
{
aligned_free(this->ptr0);
this->ptr0 = NULL;
}
if (this->ptr1)
{
aligned_free(this->ptr1);
this->ptr1 = NULL;
}
};
pipeline_t& operator=( pipeline_t&& rhs ) {
if (this == &rhs) return *this;

Expand All @@ -26,8 +52,8 @@ namespace h5{ namespace impl {
this->tail = rhs.tail; rhs.tail = 0;
this->rank = rhs.rank; rhs.rank = 0;

this->ptr0 = std::move(rhs.ptr0);
this->ptr1 = std::move(rhs.ptr1);
this->ptr0 = rhs.ptr0; rhs.ptr0 = NULL;
this->ptr1 = rhs.ptr1; rhs.ptr1 = NULL;
memcpy(filter, rhs.filter, sizeof(filter));

memcpy(cd_values, rhs.cd_values, sizeof(cd_values));
Expand Down Expand Up @@ -71,7 +97,9 @@ namespace h5{ namespace impl {
void push( filter::call_t filter );
void pop();

std::unique_ptr<char> ptr0, ptr1; // will call std::free on dtor
char* ptr0;
char* ptr1;

filter::call_t filter[H5CPP_MAX_FILTER];
hsize_t n,
C[H5CPP_MAX_RANK], D[H5CPP_MAX_RANK],
Expand Down Expand Up @@ -155,10 +183,11 @@ inline void h5::impl::pipeline_t<Derived>::set_cache( const h5::dcpl_t& dcpl, si
filter::get_callback( H5Pget_filter2( dcpl, i, &flags[i], &cd_size[i], cd_values[i], 0, nullptr, &filter_config )));
}

ptr0 = std::move( std::unique_ptr<char>{ (char*)aligned_alloc( H5CPP_MEM_ALIGNMENT, block_size )} );
ptr1 = std::move( std::unique_ptr<char>{ (char*)aligned_alloc( H5CPP_MEM_ALIGNMENT, block_size )} );
ptr0 = (char*)aligned_alloc( H5CPP_MEM_ALIGNMENT, block_size );
ptr1 = (char*)aligned_alloc( H5CPP_MEM_ALIGNMENT, block_size );

// get an alias to smart ptr
if( (chunk0 = ptr0.get()) == NULL || (chunk1 = ptr1.get()) == NULL )
if( (chunk0 = ptr0) == NULL || (chunk1 = ptr1) == NULL )
throw h5::error::io::dataset::open( H5CPP_ERROR_MSG("CTOR: couldn't allocate memory for caching chunks, invalid/check size?"));
}

Expand Down