From 3330852ea691abddba4c817fa9c4da09974a9ae4 Mon Sep 17 00:00:00 2001 From: Vertexwahn Date: Fri, 5 Apr 2024 21:17:00 +0200 Subject: [PATCH 01/12] Add fix for c-blosc2 --- modules/c-blosc2/2.12.0.bcr.2/MODULE.bazel | 10 + .../2.12.0.bcr.2/patches/add_build_file.patch | 559 ++++++++++++++++++ .../patches/add_module_dot_bazel.patch | 13 + modules/c-blosc2/2.12.0.bcr.2/presubmit.yml | 13 + modules/c-blosc2/2.12.0.bcr.2/source.json | 10 + modules/c-blosc2/metadata.json | 3 +- 6 files changed, 607 insertions(+), 1 deletion(-) create mode 100644 modules/c-blosc2/2.12.0.bcr.2/MODULE.bazel create mode 100644 modules/c-blosc2/2.12.0.bcr.2/patches/add_build_file.patch create mode 100644 modules/c-blosc2/2.12.0.bcr.2/patches/add_module_dot_bazel.patch create mode 100644 modules/c-blosc2/2.12.0.bcr.2/presubmit.yml create mode 100644 modules/c-blosc2/2.12.0.bcr.2/source.json diff --git a/modules/c-blosc2/2.12.0.bcr.2/MODULE.bazel b/modules/c-blosc2/2.12.0.bcr.2/MODULE.bazel new file mode 100644 index 00000000000..2aee3153a40 --- /dev/null +++ b/modules/c-blosc2/2.12.0.bcr.2/MODULE.bazel @@ -0,0 +1,10 @@ +module( + name = "c-blosc2", + version = "2.12.0.bcr.2", + compatibility_level = 1, +) + +bazel_dep(name = "lz4", version = "1.9.4") +bazel_dep(name = "platforms", version = "0.0.9") +bazel_dep(name = "zlib-ng", version = "2.0.7") +bazel_dep(name = "zstd", version = "1.5.5.bcr.2") diff --git a/modules/c-blosc2/2.12.0.bcr.2/patches/add_build_file.patch b/modules/c-blosc2/2.12.0.bcr.2/patches/add_build_file.patch new file mode 100644 index 00000000000..84f7ca23295 --- /dev/null +++ b/modules/c-blosc2/2.12.0.bcr.2/patches/add_build_file.patch @@ -0,0 +1,559 @@ +--- /dev/null ++++ BUILD.bazel +@@ -0,0 +1,556 @@ ++cc_library( ++ name = "c-blosc2", ++ srcs = [ ++ "blosc/b2nd.c", ++ "blosc/b2nd-private.h", ++ "blosc/b2nd_utils.c", ++ "blosc/bitshuffle-avx2.c", ++ "blosc/bitshuffle-avx2.h", ++ "blosc/bitshuffle-generic.c", ++ "blosc/bitshuffle-generic.h", ++ "blosc/bitshuffle-sse2.c", ++ "blosc/bitshuffle-sse2.h", ++ "blosc/blosc-private.h", ++ "blosc/blosc2.c", ++ "blosc/blosc2-stdio.c", ++ "blosc/blosclz.c", ++ "blosc/blosclz.h", ++ "blosc/delta.c", ++ "blosc/directories.c", ++ "blosc/fastcopy.c", ++ "blosc/frame.c", ++ "blosc/frame.h", ++ "blosc/schunk.c", ++ "blosc/schunk-private.h", ++ "blosc/sframe.c", ++ "blosc/sframe.h", ++ "blosc/shuffle.c", ++ "blosc/shuffle.h", ++ "blosc/shuffle-avx2.c", ++ "blosc/shuffle-avx2.h", ++ "blosc/shuffle-generic.c", ++ "blosc/shuffle-generic.h", ++ "blosc/shuffle-sse2.c", ++ "blosc/shuffle-sse2.h", ++ "blosc/stune.c", ++ "blosc/timestamp.c", ++ "blosc/trunc-prec.c", ++ "plugins/codecs/codecs-registry.c", ++ "plugins/codecs/ndlz/ndlz.c", ++ "plugins/codecs/ndlz/ndlz.h", ++ "plugins/codecs/ndlz/ndlz-private.h", ++ "plugins/codecs/ndlz/ndlz4x4.c", ++ "plugins/codecs/ndlz/ndlz4x4.h", ++ "plugins/codecs/ndlz/ndlz8x8.c", ++ "plugins/codecs/ndlz/ndlz8x8.h", ++ "plugins/codecs/ndlz/xxhash.c", ++ "plugins/codecs/ndlz/xxhash.h", ++ "plugins/codecs/zfp/blosc2-zfp.c", ++ "plugins/codecs/zfp/src/bitstream.c", ++ "plugins/codecs/zfp/src/block1.h", ++ "plugins/codecs/zfp/src/block2.h", ++ "plugins/codecs/zfp/src/block3.h", ++ "plugins/codecs/zfp/src/block4.h", ++ "plugins/codecs/zfp/src/decode1d.c", ++ "plugins/codecs/zfp/src/decode1f.c", ++ "plugins/codecs/zfp/src/decode1i.c", ++ "plugins/codecs/zfp/src/decode1l.c", ++ "plugins/codecs/zfp/src/decode2d.c", ++ "plugins/codecs/zfp/src/decode2f.c", ++ "plugins/codecs/zfp/src/decode2i.c", ++ "plugins/codecs/zfp/src/decode2l.c", ++ "plugins/codecs/zfp/src/decode3d.c", ++ "plugins/codecs/zfp/src/decode3f.c", ++ "plugins/codecs/zfp/src/decode3i.c", ++ "plugins/codecs/zfp/src/decode3l.c", ++ "plugins/codecs/zfp/src/decode4d.c", ++ "plugins/codecs/zfp/src/decode4f.c", ++ "plugins/codecs/zfp/src/decode4i.c", ++ "plugins/codecs/zfp/src/decode4l.c", ++ "plugins/codecs/zfp/src/encode1d.c", ++ "plugins/codecs/zfp/src/encode1f.c", ++ "plugins/codecs/zfp/src/encode1i.c", ++ "plugins/codecs/zfp/src/encode1l.c", ++ "plugins/codecs/zfp/src/encode2d.c", ++ "plugins/codecs/zfp/src/encode2f.c", ++ "plugins/codecs/zfp/src/encode2i.c", ++ "plugins/codecs/zfp/src/encode2l.c", ++ "plugins/codecs/zfp/src/encode3d.c", ++ "plugins/codecs/zfp/src/encode3f.c", ++ "plugins/codecs/zfp/src/encode3i.c", ++ "plugins/codecs/zfp/src/encode3l.c", ++ "plugins/codecs/zfp/src/encode4d.c", ++ "plugins/codecs/zfp/src/encode4f.c", ++ "plugins/codecs/zfp/src/encode4i.c", ++ "plugins/codecs/zfp/src/encode4l.c", ++ "plugins/codecs/zfp/src/inline/inline.h", ++ "plugins/codecs/zfp/src/template/template.h", ++ "plugins/codecs/zfp/src/traitsd.h", ++ "plugins/codecs/zfp/src/traitsf.h", ++ "plugins/codecs/zfp/src/traitsi.h", ++ "plugins/codecs/zfp/src/traitsl.h", ++ "plugins/codecs/zfp/src/zfp.c", ++ "plugins/codecs/zfp/zfp-private.h", ++ "plugins/filters/bytedelta/bytedelta.c", ++ "plugins/filters/bytedelta/bytedelta.h", ++ "plugins/filters/filters-registry.c", ++ "plugins/filters/ndcell/ndcell.c", ++ "plugins/filters/ndcell/ndcell.h", ++ "plugins/filters/ndmean/ndmean.c", ++ "plugins/filters/ndmean/ndmean.h", ++ "plugins/plugin_utils.c", ++ "plugins/plugin_utils.h", ++ "plugins/tuners/tuners-registry.c", ++ ], ++ hdrs = [ ++ "blosc/context.h", ++ "blosc/delta.h", ++ "blosc/fastcopy.h", ++ "blosc/stune.h", ++ "blosc/trunc-prec.h", ++ "internal-complibs/lz4-1.9.4/lz4.c", ++ "plugins/codecs/zfp/blosc2-zfp.h", ++ "plugins/codecs/zfp/include", ++ ] + glob([ ++ "include/**/*.h", ++ ]), ++ copts = select({ ++ "@platforms//os:linux": [ ++ "-msse4.1", ++ ], ++ "//conditions:default": [ ++ ], ++ }), ++ defines = [ ++ "HAVE_PLUGINS", ++ "HAVE_ZSTD", ++ ], ++ includes = [ ++ "blosc", ++ "include", ++ "internal-complibs/lz4-1.9.4", ++ "internal-complibs/zlib-ng-2.0.7", ++ "plugins/codecs", ++ "plugins/codecs/ndlz", ++ "plugins/codecs/zfp/include", ++ "plugins/codecs/zfp/src", ++ ], ++ textual_hdrs = [ ++ "plugins/codecs/zfp/src/inline/bitstream.c", ++ "plugins/codecs/zfp/src/share/omp.c", ++ "plugins/codecs/zfp/src/share/parallel.c", ++ "plugins/codecs/zfp/src/template/codec.c", ++ "plugins/codecs/zfp/src/template/codec.h", ++ "plugins/codecs/zfp/src/template/codec1.c", ++ "plugins/codecs/zfp/src/template/codec2.c", ++ "plugins/codecs/zfp/src/template/codec3.c", ++ "plugins/codecs/zfp/src/template/codec4.c", ++ "plugins/codecs/zfp/src/template/codecf.c", ++ "plugins/codecs/zfp/src/template/compress.c", ++ "plugins/codecs/zfp/src/template/decode.c", ++ "plugins/codecs/zfp/src/template/decode1.c", ++ "plugins/codecs/zfp/src/template/decode2.c", ++ "plugins/codecs/zfp/src/template/decode3.c", ++ "plugins/codecs/zfp/src/template/decode4.c", ++ "plugins/codecs/zfp/src/template/decodef.c", ++ "plugins/codecs/zfp/src/template/decodei.c", ++ "plugins/codecs/zfp/src/template/decompress.c", ++ "plugins/codecs/zfp/src/template/encode.c", ++ "plugins/codecs/zfp/src/template/encode2.c", ++ "plugins/codecs/zfp/src/template/encode3.c", ++ "plugins/codecs/zfp/src/template/encode4.c", ++ "plugins/codecs/zfp/src/template/encode1.c", ++ "plugins/codecs/zfp/src/template/encodef.c", ++ "plugins/codecs/zfp/src/template/encodei.c", ++ "plugins/codecs/zfp/src/template/revencode.c", ++ "plugins/codecs/zfp/src/template/revencode2.c", ++ "plugins/codecs/zfp/src/template/revencode3.c", ++ "plugins/codecs/zfp/src/template/revencode4.c", ++ "plugins/codecs/zfp/src/template/revencode1.c", ++ "plugins/codecs/zfp/src/template/revencodef.c", ++ "plugins/codecs/zfp/src/template/ompcompress.c", ++ "plugins/codecs/zfp/src/template/revcodecf.c", ++ "plugins/codecs/zfp/src/template/revdecode.c", ++ "plugins/codecs/zfp/src/template/revdecode1.c", ++ "plugins/codecs/zfp/src/template/revdecode2.c", ++ "plugins/codecs/zfp/src/template/revdecode3.c", ++ "plugins/codecs/zfp/src/template/revdecode4.c", ++ "plugins/codecs/zfp/src/template/revdecodef.c", ++ ], ++ visibility = ["//visibility:public"], ++ deps = [ ++ "@lz4//:lz4_hc", ++ "@zlib-ng//:zlib-ng", ++ "@zstd", ++ ], ++) ++ ++cc_test( ++ name = "test_ndlz", ++ srcs = [ ++ "plugins/codecs/ndlz/test_ndlz.c", ++ "tests/test_common.h", ++ ], ++ deps = [":c-blosc2"], ++) ++ ++cc_test( ++ name = "test_b2nd_append", ++ srcs = [ ++ "tests/b2nd/cutest.h", ++ "tests/b2nd/test_b2nd_append.c", ++ "tests/b2nd/test_common.h", ++ ], ++ deps = [":c-blosc2"], ++) ++ ++cc_test( ++ name = "test_b2nd_copy_buffer", ++ srcs = [ ++ "tests/b2nd/cutest.h", ++ "tests/b2nd/test_b2nd_copy_buffer.c", ++ "tests/b2nd/test_common.h", ++ ], ++ deps = [":c-blosc2"], ++) ++ ++cc_test( ++ name = "test_b2nd_copy", ++ srcs = [ ++ "tests/b2nd/cutest.h", ++ "tests/b2nd/test_b2nd_copy.c", ++ "tests/b2nd/test_common.h", ++ ], ++ deps = [":c-blosc2"], ++) ++ ++cc_test( ++ name = "test_b2nd_delete", ++ srcs = [ ++ "tests/b2nd/cutest.h", ++ "tests/b2nd/test_b2nd_delete.c", ++ "tests/b2nd/test_common.h", ++ ], ++ deps = [":c-blosc2"], ++) ++ ++cc_test( ++ name = "test_b2nd_full", ++ srcs = [ ++ "tests/b2nd/cutest.h", ++ "tests/b2nd/test_b2nd_full.c", ++ "tests/b2nd/test_common.h", ++ ], ++ deps = [":c-blosc2"], ++) ++ ++cc_test( ++ name = "test_b2nd_get_slice", ++ srcs = [ ++ "tests/b2nd/cutest.h", ++ "tests/b2nd/test_b2nd_get_slice.c", ++ "tests/b2nd/test_common.h", ++ ], ++ deps = [":c-blosc2"], ++) ++ ++cc_test( ++ name = "test_b2nd_get_slice_buffer", ++ srcs = [ ++ "tests/b2nd/cutest.h", ++ "tests/b2nd/test_b2nd_get_slice_buffer.c", ++ "tests/b2nd/test_common.h", ++ ], ++ deps = [":c-blosc2"], ++) ++ ++cc_test( ++ name = "test_b2nd_insert", ++ srcs = [ ++ "tests/b2nd/cutest.h", ++ "tests/b2nd/test_b2nd_insert.c", ++ "tests/b2nd/test_common.h", ++ ], ++ deps = [":c-blosc2"], ++) ++ ++cc_test( ++ name = "test_b2nd_metalayers", ++ srcs = [ ++ "tests/b2nd/cutest.h", ++ "tests/b2nd/test_b2nd_metalayers.c", ++ "tests/b2nd/test_common.h", ++ ], ++ deps = [":c-blosc2"], ++) ++ ++cc_test( ++ name = "test_b2nd_open_offset", ++ srcs = [ ++ "tests/b2nd/cutest.h", ++ "tests/b2nd/test_b2nd_open_offset.c", ++ "tests/b2nd/test_common.h", ++ ], ++ deps = [":c-blosc2"], ++) ++ ++cc_test( ++ name = "test_b2nd_persistency", ++ srcs = [ ++ "tests/b2nd/cutest.h", ++ "tests/b2nd/test_b2nd_persistency.c", ++ "tests/b2nd/test_common.h", ++ ], ++ deps = [":c-blosc2"], ++) ++ ++cc_test( ++ name = "test_b2nd_resize", ++ srcs = [ ++ "tests/b2nd/cutest.h", ++ "tests/b2nd/test_b2nd_resize.c", ++ "tests/b2nd/test_common.h", ++ ], ++ deps = [":c-blosc2"], ++) ++ ++cc_test( ++ name = "test_b2nd_roundtrip", ++ srcs = [ ++ "tests/b2nd/cutest.h", ++ "tests/b2nd/test_b2nd_roundtrip.c", ++ "tests/b2nd/test_common.h", ++ ], ++ deps = [":c-blosc2"], ++) ++ ++cc_test( ++ name = "test_b2nd_save", ++ srcs = [ ++ "tests/b2nd/cutest.h", ++ "tests/b2nd/test_b2nd_save.c", ++ "tests/b2nd/test_common.h", ++ ], ++ deps = [":c-blosc2"], ++) ++ ++cc_test( ++ name = "test_b2nd_serialize", ++ srcs = [ ++ "tests/b2nd/cutest.h", ++ "tests/b2nd/test_b2nd_serialize.c", ++ "tests/b2nd/test_common.h", ++ ], ++ deps = [":c-blosc2"], ++) ++ ++cc_test( ++ name = "test_bitshuffle_leftovers", ++ srcs = [ ++ "tests/test_bitshuffle_leftovers.c", ++ "tests/test_common.h", ++ ], ++ deps = [":c-blosc2"], ++) ++ ++cc_test( ++ name = "test_delete_chunk", ++ srcs = [ ++ "tests/test_common.h", ++ "tests/test_delete_chunk.c", ++ ], ++ deps = [":c-blosc2"], ++) ++ ++cc_test( ++ name = "test_delta_schunk", ++ srcs = [ ++ "tests/test_common.h", ++ "tests/test_delta_schunk.c", ++ ], ++ deps = [":c-blosc2"], ++) ++ ++cc_test( ++ name = "test_delta", ++ srcs = [ ++ "tests/test_common.h", ++ "tests/test_delta.c", ++ ], ++ deps = [":c-blosc2"], ++) ++ ++#cc_test( ++# name = "test_noinit", ++# srcs = [ ++# "tests/test_common.h", ++# "tests/test_noinit.c", ++# ], ++# deps = [":c-blosc2"], ++#) ++ ++#cc_test( ++# name = "test_nolock", ++# srcs = [ ++# "tests/test_common.h", ++# "tests/test_nolock.c", ++# ], ++# deps = [":c-blosc2"], ++#) ++ ++cc_test( ++ name = "test_nthreads", ++ srcs = [ ++ "tests/test_common.h", ++ "tests/test_nthreads.c", ++ ], ++ deps = [":c-blosc2"], ++) ++ ++cc_test( ++ name = "test_postfilter", ++ srcs = [ ++ "tests/test_common.h", ++ "tests/test_postfilter.c", ++ ], ++ deps = [":c-blosc2"], ++) ++ ++cc_test( ++ name = "test_prefilter", ++ srcs = [ ++ "tests/test_common.h", ++ "tests/test_prefilter.c", ++ ], ++ deps = [":c-blosc2"], ++) ++ ++cc_test( ++ name = "test_reorder_offsets", ++ srcs = [ ++ "tests/test_common.h", ++ "tests/test_reorder_offsets.c", ++ ], ++ deps = [":c-blosc2"], ++) ++ ++cc_test( ++ name = "test_schunk_frame", ++ srcs = [ ++ "tests/test_common.h", ++ "tests/test_schunk_frame.c", ++ ], ++ deps = [":c-blosc2"], ++) ++ ++cc_test( ++ name = "test_schunk_header", ++ srcs = [ ++ "tests/test_common.h", ++ "tests/test_schunk_header.c", ++ ], ++ deps = [":c-blosc2"], ++) ++ ++cc_test( ++ name = "test_schunk", ++ srcs = [ ++ "tests/test_common.h", ++ "tests/test_schunk.c", ++ ], ++ deps = [":c-blosc2"], ++) ++ ++cc_test( ++ name = "test_set_slice_buffer", ++ srcs = [ ++ "tests/test_common.h", ++ "tests/test_set_slice_buffer.c", ++ ], ++ deps = [":c-blosc2"], ++) ++ ++cc_test( ++ name = "test_sframe_lazychunk", ++ srcs = [ ++ "tests/test_common.h", ++ "tests/test_sframe_lazychunk.c", ++ ], ++ deps = [":c-blosc2"], ++) ++ ++cc_test( ++ name = "test_sframe", ++ srcs = [ ++ "tests/test_common.h", ++ "tests/test_sframe.c", ++ ], ++ deps = [":c-blosc2"], ++) ++ ++#cc_test( ++# name = "test_shuffle_roundtrip_sse2", ++# srcs = [ ++# "tests/cutest.h", ++# "tests/test_common.h", ++# "tests/test_shuffle_roundtrip_sse2.c", ++# ], ++# data = ["tests/test_shuffle_roundtrip_sse2.csv"], ++# deps = [":c-blosc2"], ++#) ++ ++cc_test( ++ name = "test_small_chunks", ++ srcs = [ ++ "tests/cutest.h", ++ "tests/test_common.h", ++ "tests/test_small_chunks.c", ++ ], ++ deps = [":c-blosc2"], ++) ++ ++cc_test( ++ name = "test_udio", ++ srcs = [ ++ "tests/cutest.h", ++ "tests/test_common.h", ++ "tests/test_udio.c", ++ ], ++ deps = [":c-blosc2"], ++) ++ ++cc_test( ++ name = "test_update_chunk", ++ srcs = [ ++ "tests/test_common.h", ++ "tests/test_update_chunk.c", ++ ], ++ deps = [":c-blosc2"], ++) ++ ++cc_test( ++ name = "test_urcodecs", ++ srcs = [ ++ "tests/cutest.h", ++ "tests/test_urcodecs.c", ++ ], ++ deps = [":c-blosc2"], ++) ++ ++cc_test( ++ name = "test_urfilters", ++ srcs = [ ++ "tests/cutest.h", ++ "tests/test_urfilters.c", ++ ], ++ deps = [":c-blosc2"], ++) ++ ++cc_test( ++ name = "test_zero_runlen", ++ srcs = [ ++ "tests/cutest.h", ++ "tests/test_zero_runlen.c", ++ ], ++ deps = [":c-blosc2"], ++) diff --git a/modules/c-blosc2/2.12.0.bcr.2/patches/add_module_dot_bazel.patch b/modules/c-blosc2/2.12.0.bcr.2/patches/add_module_dot_bazel.patch new file mode 100644 index 00000000000..a8931eb7c0a --- /dev/null +++ b/modules/c-blosc2/2.12.0.bcr.2/patches/add_module_dot_bazel.patch @@ -0,0 +1,13 @@ +--- MODULE.bazel ++++ MODULE.bazel +@@ -0,0 +1,10 @@ ++module( ++ name = "c-blosc2", ++ version = "2.12.0.bcr.2", ++ compatibility_level = 1, ++) ++ ++bazel_dep(name = "lz4", version = "1.9.4") ++bazel_dep(name = "platforms", version = "0.0.9") ++bazel_dep(name = "zlib-ng", version = "2.0.7") ++bazel_dep(name = "zstd", version = "1.5.5.bcr.2") diff --git a/modules/c-blosc2/2.12.0.bcr.2/presubmit.yml b/modules/c-blosc2/2.12.0.bcr.2/presubmit.yml new file mode 100644 index 00000000000..d512df466ff --- /dev/null +++ b/modules/c-blosc2/2.12.0.bcr.2/presubmit.yml @@ -0,0 +1,13 @@ +matrix: + platform: + - ubuntu2004 + - macos + - windows + bazel: [6.x, 7.x] +tasks: + verify_targets: + name: Verify build targets + platform: ${{ platform }} + bazel: ${{ bazel }} + build_targets: + - '@c-blosc2//:c-blosc2' diff --git a/modules/c-blosc2/2.12.0.bcr.2/source.json b/modules/c-blosc2/2.12.0.bcr.2/source.json new file mode 100644 index 00000000000..1bda0e584ac --- /dev/null +++ b/modules/c-blosc2/2.12.0.bcr.2/source.json @@ -0,0 +1,10 @@ +{ + "integrity": "sha256-uPoHqwYnwZ+2UuCKWtoZfrCTm3Xpfi+3a77hRertxuk=", + "patch_strip": 0, + "patches": { + "add_build_file.patch": "sha256-PTaH5OllNorenDRvaON38L1DkYKPeIs9aupI40qs85c=", + "add_module_dot_bazel.patch": "sha256-Xf1v8vz+RtK9epDzNuxAOqGaZHYWzt3wwjM3K/ifl3w=" + }, + "strip_prefix": "c-blosc2-2.12.0", + "url": "https://github.com/Blosc/c-blosc2/archive/refs/tags/v2.12.0.tar.gz" +} diff --git a/modules/c-blosc2/metadata.json b/modules/c-blosc2/metadata.json index fdcd369127e..87df6a31d2b 100644 --- a/modules/c-blosc2/metadata.json +++ b/modules/c-blosc2/metadata.json @@ -12,7 +12,8 @@ ], "versions": [ "2.12.0", - "2.12.0.bcr.1" + "2.12.0.bcr.1", + "2.12.0.bcr.2" ], "yanked_versions": {} } From 933e79d21ddd41a44971d4a5c3bb36b1c38b6eff Mon Sep 17 00:00:00 2001 From: Vertexwahn Date: Fri, 5 Apr 2024 21:17:59 +0200 Subject: [PATCH 02/12] Fix hashes --- modules/c-blosc2/2.12.0.bcr.2/source.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/c-blosc2/2.12.0.bcr.2/source.json b/modules/c-blosc2/2.12.0.bcr.2/source.json index 1bda0e584ac..5f272848258 100644 --- a/modules/c-blosc2/2.12.0.bcr.2/source.json +++ b/modules/c-blosc2/2.12.0.bcr.2/source.json @@ -2,8 +2,8 @@ "integrity": "sha256-uPoHqwYnwZ+2UuCKWtoZfrCTm3Xpfi+3a77hRertxuk=", "patch_strip": 0, "patches": { - "add_build_file.patch": "sha256-PTaH5OllNorenDRvaON38L1DkYKPeIs9aupI40qs85c=", - "add_module_dot_bazel.patch": "sha256-Xf1v8vz+RtK9epDzNuxAOqGaZHYWzt3wwjM3K/ifl3w=" + "add_build_file.patch": "sha256-ApFWf7hkxRBBiunc6HYr4b32eWx9W6NCr2yTzmvyskQ=", + "add_module_dot_bazel.patch": "sha256-VNkw69fLlVPfUQ+PXBI2U3EJTH3gIsr9p7lldJUbw6g=" }, "strip_prefix": "c-blosc2-2.12.0", "url": "https://github.com/Blosc/c-blosc2/archive/refs/tags/v2.12.0.tar.gz" From 22d1601a816d748a0264282343abaa85d5350398 Mon Sep 17 00:00:00 2001 From: Vertexwahn Date: Fri, 5 Apr 2024 21:21:38 +0200 Subject: [PATCH 03/12] Add run of tests --- modules/c-blosc2/2.12.0.bcr.2/presubmit.yml | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/modules/c-blosc2/2.12.0.bcr.2/presubmit.yml b/modules/c-blosc2/2.12.0.bcr.2/presubmit.yml index d512df466ff..1b4582a05ea 100644 --- a/modules/c-blosc2/2.12.0.bcr.2/presubmit.yml +++ b/modules/c-blosc2/2.12.0.bcr.2/presubmit.yml @@ -1,13 +1,23 @@ matrix: platform: - - ubuntu2004 - - macos - - windows - bazel: [6.x, 7.x] + - debian10 + - debian11 + - macos + - macos_arm64 + - ubuntu2004 + - ubuntu2204 + - windows + bazel: [6.x, 7.x, rolling] tasks: verify_targets: name: Verify build targets platform: ${{ platform }} bazel: ${{ bazel }} build_targets: - - '@c-blosc2//:c-blosc2' + - "@c-blosc2//:c-blosc2" + run_tests: + name: Run tests + platform: ${{ platform }} + bazel: ${{ bazel }} + test_targets: + - "//..." From 2bd491daf24399f8216d55047e51c1e141bf08b0 Mon Sep 17 00:00:00 2001 From: Vertexwahn Date: Fri, 12 Apr 2024 20:42:46 +0200 Subject: [PATCH 04/12] Switch to bcr_test_module --- modules/c-blosc2/2.12.0.bcr.2/presubmit.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/c-blosc2/2.12.0.bcr.2/presubmit.yml b/modules/c-blosc2/2.12.0.bcr.2/presubmit.yml index 1b4582a05ea..48a09d8d3b3 100644 --- a/modules/c-blosc2/2.12.0.bcr.2/presubmit.yml +++ b/modules/c-blosc2/2.12.0.bcr.2/presubmit.yml @@ -15,7 +15,8 @@ tasks: bazel: ${{ bazel }} build_targets: - "@c-blosc2//:c-blosc2" - run_tests: + bcr_test_module: + module_path: "." name: Run tests platform: ${{ platform }} bazel: ${{ bazel }} From 14c4df8a133a441f60c97b0c702ad5bdf9704055 Mon Sep 17 00:00:00 2001 From: Vertexwahn Date: Fri, 12 Apr 2024 20:47:41 +0200 Subject: [PATCH 05/12] Fix CI --- modules/c-blosc2/2.12.0.bcr.2/presubmit.yml | 50 +++++++++++---------- 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/modules/c-blosc2/2.12.0.bcr.2/presubmit.yml b/modules/c-blosc2/2.12.0.bcr.2/presubmit.yml index 48a09d8d3b3..086917249d5 100644 --- a/modules/c-blosc2/2.12.0.bcr.2/presubmit.yml +++ b/modules/c-blosc2/2.12.0.bcr.2/presubmit.yml @@ -1,24 +1,26 @@ -matrix: - platform: - - debian10 - - debian11 - - macos - - macos_arm64 - - ubuntu2004 - - ubuntu2204 - - windows - bazel: [6.x, 7.x, rolling] -tasks: - verify_targets: - name: Verify build targets - platform: ${{ platform }} - bazel: ${{ bazel }} - build_targets: - - "@c-blosc2//:c-blosc2" - bcr_test_module: - module_path: "." - name: Run tests - platform: ${{ platform }} - bazel: ${{ bazel }} - test_targets: - - "//..." +bcr_test_module: + module_path: "." + matrix: + platform: + - debian10 + - debian11 + - macos + - macos_arm64 + - ubuntu2004 + - ubuntu2204 + - windows + bazel: [6.x, 7.x, rolling] + tasks: + verify_targets: + name: Verify build targets + platform: ${{ platform }} + bazel: ${{ bazel }} + build_targets: + - "@c-blosc2//:c-blosc2" + bcr_test_module: + module_path: "." + name: Run tests + platform: ${{ platform }} + bazel: ${{ bazel }} + test_targets: + - "//..." From 0898219a9556b2576954dfe9effda316c5149c49 Mon Sep 17 00:00:00 2001 From: Vertexwahn Date: Fri, 12 Apr 2024 21:11:30 +0200 Subject: [PATCH 06/12] Add ldl for Debian and Ubuntu 20.04 --- modules/c-blosc2/2.12.0.bcr.2/presubmit.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/c-blosc2/2.12.0.bcr.2/presubmit.yml b/modules/c-blosc2/2.12.0.bcr.2/presubmit.yml index 086917249d5..0f9723a994b 100644 --- a/modules/c-blosc2/2.12.0.bcr.2/presubmit.yml +++ b/modules/c-blosc2/2.12.0.bcr.2/presubmit.yml @@ -21,6 +21,8 @@ bcr_test_module: module_path: "." name: Run tests platform: ${{ platform }} + build_flags: + - '--linkopt=-ldl' bazel: ${{ bazel }} test_targets: - "//..." From f44d6638665f681ecf0032799b5fc848407cd41d Mon Sep 17 00:00:00 2001 From: Vertexwahn Date: Fri, 12 Apr 2024 21:33:33 +0200 Subject: [PATCH 07/12] Switch to test flags --- modules/c-blosc2/2.12.0.bcr.2/presubmit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/c-blosc2/2.12.0.bcr.2/presubmit.yml b/modules/c-blosc2/2.12.0.bcr.2/presubmit.yml index 0f9723a994b..06abdb2df0b 100644 --- a/modules/c-blosc2/2.12.0.bcr.2/presubmit.yml +++ b/modules/c-blosc2/2.12.0.bcr.2/presubmit.yml @@ -21,7 +21,7 @@ bcr_test_module: module_path: "." name: Run tests platform: ${{ platform }} - build_flags: + test_flags: - '--linkopt=-ldl' bazel: ${{ bazel }} test_targets: From 4159ab23fbb4aa96b5901c6ae7ea72efd19dabb8 Mon Sep 17 00:00:00 2001 From: Vertexwahn Date: Fri, 12 Apr 2024 21:49:10 +0200 Subject: [PATCH 08/12] Bump zstd to 1.5.6 --- modules/c-blosc2/2.12.0.bcr.2/MODULE.bazel | 2 +- .../c-blosc2/2.12.0.bcr.2/patches/add_module_dot_bazel.patch | 2 +- modules/c-blosc2/2.12.0.bcr.2/source.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/c-blosc2/2.12.0.bcr.2/MODULE.bazel b/modules/c-blosc2/2.12.0.bcr.2/MODULE.bazel index 2aee3153a40..b03b2313973 100644 --- a/modules/c-blosc2/2.12.0.bcr.2/MODULE.bazel +++ b/modules/c-blosc2/2.12.0.bcr.2/MODULE.bazel @@ -7,4 +7,4 @@ module( bazel_dep(name = "lz4", version = "1.9.4") bazel_dep(name = "platforms", version = "0.0.9") bazel_dep(name = "zlib-ng", version = "2.0.7") -bazel_dep(name = "zstd", version = "1.5.5.bcr.2") +bazel_dep(name = "zstd", version = "1.5.6") diff --git a/modules/c-blosc2/2.12.0.bcr.2/patches/add_module_dot_bazel.patch b/modules/c-blosc2/2.12.0.bcr.2/patches/add_module_dot_bazel.patch index a8931eb7c0a..41c4b0d29fb 100644 --- a/modules/c-blosc2/2.12.0.bcr.2/patches/add_module_dot_bazel.patch +++ b/modules/c-blosc2/2.12.0.bcr.2/patches/add_module_dot_bazel.patch @@ -10,4 +10,4 @@ +bazel_dep(name = "lz4", version = "1.9.4") +bazel_dep(name = "platforms", version = "0.0.9") +bazel_dep(name = "zlib-ng", version = "2.0.7") -+bazel_dep(name = "zstd", version = "1.5.5.bcr.2") ++bazel_dep(name = "zstd", version = "1.5.6") diff --git a/modules/c-blosc2/2.12.0.bcr.2/source.json b/modules/c-blosc2/2.12.0.bcr.2/source.json index 5f272848258..ce7164f3398 100644 --- a/modules/c-blosc2/2.12.0.bcr.2/source.json +++ b/modules/c-blosc2/2.12.0.bcr.2/source.json @@ -3,7 +3,7 @@ "patch_strip": 0, "patches": { "add_build_file.patch": "sha256-ApFWf7hkxRBBiunc6HYr4b32eWx9W6NCr2yTzmvyskQ=", - "add_module_dot_bazel.patch": "sha256-VNkw69fLlVPfUQ+PXBI2U3EJTH3gIsr9p7lldJUbw6g=" + "add_module_dot_bazel.patch": "sha256-IgBeSUvBEQr3x+ilBAUWY3Ujn9fnJxjt6wWdV0gxrXc=" }, "strip_prefix": "c-blosc2-2.12.0", "url": "https://github.com/Blosc/c-blosc2/archive/refs/tags/v2.12.0.tar.gz" From 42d8f1202ca1a29604b726f112611af541839566 Mon Sep 17 00:00:00 2001 From: Vertexwahn Date: Mon, 15 Apr 2024 22:50:32 +0200 Subject: [PATCH 09/12] Refactor presubmit --- modules/c-blosc2/2.12.0.bcr.2/presubmit.yml | 54 ++++++++++----------- 1 file changed, 26 insertions(+), 28 deletions(-) diff --git a/modules/c-blosc2/2.12.0.bcr.2/presubmit.yml b/modules/c-blosc2/2.12.0.bcr.2/presubmit.yml index 06abdb2df0b..e56f738a093 100644 --- a/modules/c-blosc2/2.12.0.bcr.2/presubmit.yml +++ b/modules/c-blosc2/2.12.0.bcr.2/presubmit.yml @@ -1,28 +1,26 @@ -bcr_test_module: - module_path: "." - matrix: - platform: - - debian10 - - debian11 - - macos - - macos_arm64 - - ubuntu2004 - - ubuntu2204 - - windows - bazel: [6.x, 7.x, rolling] - tasks: - verify_targets: - name: Verify build targets - platform: ${{ platform }} - bazel: ${{ bazel }} - build_targets: - - "@c-blosc2//:c-blosc2" - bcr_test_module: - module_path: "." - name: Run tests - platform: ${{ platform }} - test_flags: - - '--linkopt=-ldl' - bazel: ${{ bazel }} - test_targets: - - "//..." +matrix: + platform: + - debian10 + - debian11 + - macos + - macos_arm64 + - ubuntu2004 + - ubuntu2204 + - windows + bazel: [6.x, 7.x, rolling] +tasks: + verify_targets: + name: Verify build targets + platform: ${{ platform }} + bazel: ${{ bazel }} + build_targets: + - "@c-blosc2//:c-blosc2" + bcr_test_module: + module_path: "." + name: Run tests + platform: ${{ platform }} + test_flags: + - "--linkopt=-ldl" + bazel: ${{ bazel }} + test_targets: + - "//..." From fcbfe7b3bf705757fceef565961a7ea5add1d5c7 Mon Sep 17 00:00:00 2001 From: Vertexwahn Date: Mon, 15 Apr 2024 22:59:32 +0200 Subject: [PATCH 10/12] Another try --- modules/c-blosc2/2.12.0.bcr.2/presubmit.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/c-blosc2/2.12.0.bcr.2/presubmit.yml b/modules/c-blosc2/2.12.0.bcr.2/presubmit.yml index e56f738a093..494c447187b 100644 --- a/modules/c-blosc2/2.12.0.bcr.2/presubmit.yml +++ b/modules/c-blosc2/2.12.0.bcr.2/presubmit.yml @@ -15,12 +15,12 @@ tasks: bazel: ${{ bazel }} build_targets: - "@c-blosc2//:c-blosc2" - bcr_test_module: - module_path: "." + run_test: + #module_path: "." name: Run tests platform: ${{ platform }} test_flags: - "--linkopt=-ldl" bazel: ${{ bazel }} test_targets: - - "//..." + - "@c-blosc2//..." From 50c43fad96a20a226a9a165722a01a74a17d938d Mon Sep 17 00:00:00 2001 From: Vertexwahn Date: Mon, 15 Apr 2024 23:03:50 +0200 Subject: [PATCH 11/12] Cleanup --- modules/c-blosc2/2.12.0.bcr.2/presubmit.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/c-blosc2/2.12.0.bcr.2/presubmit.yml b/modules/c-blosc2/2.12.0.bcr.2/presubmit.yml index 494c447187b..bb9f596f603 100644 --- a/modules/c-blosc2/2.12.0.bcr.2/presubmit.yml +++ b/modules/c-blosc2/2.12.0.bcr.2/presubmit.yml @@ -16,7 +16,6 @@ tasks: build_targets: - "@c-blosc2//:c-blosc2" run_test: - #module_path: "." name: Run tests platform: ${{ platform }} test_flags: From a5e396d8538a0c7e3f36094101f84d011da17e46 Mon Sep 17 00:00:00 2001 From: Vertexwahn Date: Mon, 15 Apr 2024 23:05:10 +0200 Subject: [PATCH 12/12] Further cleanup --- modules/c-blosc2/2.12.0.bcr.2/presubmit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/c-blosc2/2.12.0.bcr.2/presubmit.yml b/modules/c-blosc2/2.12.0.bcr.2/presubmit.yml index bb9f596f603..c9cd9260bc3 100644 --- a/modules/c-blosc2/2.12.0.bcr.2/presubmit.yml +++ b/modules/c-blosc2/2.12.0.bcr.2/presubmit.yml @@ -18,8 +18,8 @@ tasks: run_test: name: Run tests platform: ${{ platform }} + bazel: ${{ bazel }} test_flags: - "--linkopt=-ldl" - bazel: ${{ bazel }} test_targets: - "@c-blosc2//..."