Skip to content

Fix concatenate #662

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

Closed
lshaw8317 wants to merge 7 commits into from
+316 −256
Closed

Fix concatenate #662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0cca84c
Fixing tests
Jun 9, 2025
42a69fc
Change decompress_chunk to get_chunk into cbuffer
Jun 10, 2025
e1c9725
Change line separator to UNIX default
Jun 10, 2025
5ccd9c8
Change line separator to UNIX default
Jun 10, 2025
2e69d07
Format internal_complibs
Jun 11, 2025
fed001f
Uncomment tests
Jun 11, 2025
21ffb7c
Try again with internal_complibs
Jun 11, 2025
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
47 changes: 18 additions & 29 deletions blosc/b2nd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -776,10 +776,6 @@ int get_set_slice(void *buffer, int64_t buffersize, const int64_t *start, const
}

uint8_t *buffer_b = buffer;
const int64_t *buffer_start = start;
const int64_t *buffer_stop = stop;
const int64_t *buffer_shape = shape;

int8_t ndim = array->ndim;

// 0-dim case
Expand Down Expand Up @@ -884,11 +880,11 @@ int get_set_slice(void *buffer, int64_t buffersize, const int64_t *start, const
int64_t update_nchunks = 1;
for (int i = 0; i < ndim; ++i) {
int64_t pos = 0;
while (pos <= buffer_start[i]) {
while (pos <= start[i]) {
pos += array->chunkshape[i];
}
update_start[i] = pos / array->chunkshape[i] - 1;
while (pos < buffer_stop[i]) {
while (pos < stop[i]) {
pos += array->chunkshape[i];
}
update_shape[i] = pos / array->chunkshape[i] - update_start[i];
Expand Down Expand Up @@ -916,7 +912,7 @@ int get_set_slice(void *buffer, int64_t buffersize, const int64_t *start, const
}
bool chunk_empty = false;
for (int i = 0; i < ndim; ++i) {
chunk_empty |= (chunk_stop[i] <= buffer_start[i] || chunk_start[i] >= buffer_stop[i]);
chunk_empty |= (chunk_stop[i] <= start[i] || chunk_start[i] >= stop[i]);
}
if (chunk_empty) {
continue;
Expand All @@ -927,7 +923,7 @@ int get_set_slice(void *buffer, int64_t buffersize, const int64_t *start, const
// Check if all the chunk is going to be updated and avoid the decompression
bool decompress_chunk = false;
for (int i = 0; i < ndim; ++i) {
decompress_chunk |= (chunk_start[i] < buffer_start[i] || chunk_stop[i] > buffer_stop[i]);
decompress_chunk |= (chunk_start[i] < start[i] || chunk_stop[i] > stop[i]);
}

if (decompress_chunk) {
Expand Down Expand Up @@ -1022,8 +1018,8 @@ int get_set_slice(void *buffer, int64_t buffersize, const int64_t *start, const
// compute the start of the slice inside the block
int64_t slice_start[B2ND_MAX_DIM] = {0};
for (int i = 0; i < ndim; ++i) {
if (block_start[i] < buffer_start[i]) {
slice_start[i] = buffer_start[i] - block_start[i];
if (block_start[i] < start[i]) {
slice_start[i] = start[i] - block_start[i];
} else {
slice_start[i] = 0;
}
Expand All @@ -1032,8 +1028,8 @@ int get_set_slice(void *buffer, int64_t buffersize, const int64_t *start, const

int64_t slice_stop[B2ND_MAX_DIM] = {0};
for (int i = 0; i < ndim; ++i) {
if (block_stop[i] > buffer_stop[i]) {
slice_stop[i] = block_shape[i] - (block_stop[i] - buffer_stop[i]);
if (block_stop[i] > stop[i]) {
slice_stop[i] = block_shape[i] - (block_stop[i] - stop[i]);
} else {
slice_stop[i] = block_stop[i] - block_start[i];
}
Expand All @@ -1046,13 +1042,12 @@ int get_set_slice(void *buffer, int64_t buffersize, const int64_t *start, const
}

uint8_t *src = &buffer_b[0];
const int64_t *src_pad_shape = buffer_shape;

int64_t src_start[B2ND_MAX_DIM] = {0};
int64_t src_stop[B2ND_MAX_DIM] = {0};
for (int i = 0; i < ndim; ++i) {
src_start[i] = slice_start[i] - buffer_start[i];
src_stop[i] = slice_stop[i] - buffer_start[i];
src_start[i] = slice_start[i] - start[i];
src_stop[i] = slice_stop[i] - start[i];
}

uint8_t *dst = &data[nblock * array->blocknitems * array->sc->typesize];
Expand All @@ -1070,12 +1065,12 @@ int get_set_slice(void *buffer, int64_t buffersize, const int64_t *start, const

if (set_slice) {
b2nd_copy_buffer2(ndim, array->sc->typesize,
src, src_pad_shape, src_start, src_stop,
src, shape, src_start, src_stop,
dst, dst_pad_shape, dst_start);
} else {
b2nd_copy_buffer2(ndim, array->sc->typesize,
dst, dst_pad_shape, dst_start, dst_stop,
src, src_pad_shape, src_start);
src, shape, src_start);
}
}

Expand Down Expand Up @@ -1390,11 +1385,6 @@ int b2nd_concatenate(b2nd_context_t *ctx, const b2nd_array_t *src1, const b2nd_a
void *buffer = malloc(src2->sc->typesize * src2->extchunknitems);
BLOSC_ERROR_NULL(buffer, BLOSC2_ERROR_MEMORY_ALLOC);
for (int64_t nchunk = 0; nchunk < src2->sc->nchunks; ++nchunk) {
if (blosc2_schunk_decompress_chunk(src2->sc, nchunk, buffer,
src2->sc->typesize * (int32_t)src2->extchunknitems) <= 0) {
BLOSC_TRACE_ERROR("Error decompressing chunk");
goto cleanup;
}
// Get multidimensional chunk position
int64_t nchunk_ndim[B2ND_MAX_DIM] = {0};
int64_t chunkshape[B2ND_MAX_DIM] = {0};
Expand All @@ -1414,21 +1404,20 @@ int b2nd_concatenate(b2nd_context_t *ctx, const b2nd_array_t *src1, const b2nd_a
if (stop[i] > src2->shape[i]) {
stop[i] = src2->shape[i]; // Handle boundary chunks
}

// Apply offset only for concatenation axis
if (i == axis) {
start[i] += src1_shape[i];
stop[i] += src1_shape[i];
}
}
// Load chunk into buffer
BLOSC_ERROR(b2nd_get_slice_cbuffer(src2, start, stop, buffer, chunkshape, src2->sc->chunksize));

// Apply chunk offset only for concatenation axis
start[axis] += src1_shape[axis];
stop[axis] += src1_shape[axis];

// Copy the chunk to the correct position
BLOSC_ERROR(b2nd_set_slice_cbuffer(buffer, chunkshape,
src2->sc->typesize * src2->extchunknitems,
start, stop, *array));
}

cleanup:
free(buffer);

return BLOSC2_ERROR_SUCCESS;
Expand Down
2 changes: 1 addition & 1 deletion blosc/directories.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,12 @@
sprintf(fname, "%s\\%s", dir_path, cfile.name);

ret = remove(fname);
free(fname);
if (ret < 0) {
BLOSC_TRACE_ERROR("Could not remove file %s", fname);
_findclose(file);
return BLOSC2_ERROR_FAILURE;
}
free(fname);
}

rmdir(dir_path);
Expand Down
50 changes: 25 additions & 25 deletions internal-complibs/zstd-1.5.7/dll/example/fullbench-dll.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Express 2012 for Windows Desktop
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fullbench-dll", "fullbench-dll.vcxproj", "{13992FD2-077E-4954-B065-A428198201A9}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Debug|x64 = Debug|x64
Release|Win32 = Release|Win32
Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{13992FD2-077E-4954-B065-A428198201A9}.Debug|Win32.ActiveCfg = Debug|Win32
{13992FD2-077E-4954-B065-A428198201A9}.Debug|Win32.Build.0 = Debug|Win32
{13992FD2-077E-4954-B065-A428198201A9}.Debug|x64.ActiveCfg = Debug|x64
{13992FD2-077E-4954-B065-A428198201A9}.Debug|x64.Build.0 = Debug|x64
{13992FD2-077E-4954-B065-A428198201A9}.Release|Win32.ActiveCfg = Release|Win32
{13992FD2-077E-4954-B065-A428198201A9}.Release|Win32.Build.0 = Release|Win32
{13992FD2-077E-4954-B065-A428198201A9}.Release|x64.ActiveCfg = Release|x64
{13992FD2-077E-4954-B065-A428198201A9}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Express 2012 for Windows Desktop
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fullbench-dll", "fullbench-dll.vcxproj", "{13992FD2-077E-4954-B065-A428198201A9}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Debug|x64 = Debug|x64
Release|Win32 = Release|Win32
Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{13992FD2-077E-4954-B065-A428198201A9}.Debug|Win32.ActiveCfg = Debug|Win32
{13992FD2-077E-4954-B065-A428198201A9}.Debug|Win32.Build.0 = Debug|Win32
{13992FD2-077E-4954-B065-A428198201A9}.Debug|x64.ActiveCfg = Debug|x64
{13992FD2-077E-4954-B065-A428198201A9}.Debug|x64.Build.0 = Debug|x64
{13992FD2-077E-4954-B065-A428198201A9}.Release|Win32.ActiveCfg = Release|Win32
{13992FD2-077E-4954-B065-A428198201A9}.Release|Win32.Build.0 = Release|Win32
{13992FD2-077E-4954-B065-A428198201A9}.Release|x64.ActiveCfg = Release|x64
{13992FD2-077E-4954-B065-A428198201A9}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
Loading
Loading