diff --git a/.github/workflows/autobuild-release.yml b/.github/workflows/autobuild-release.yml index a68f8e4..4a90476 100644 --- a/.github/workflows/autobuild-release.yml +++ b/.github/workflows/autobuild-release.yml @@ -5,7 +5,7 @@ on: types: - created push: - branches: [ "master" ] + branches: [ "master", "dev*" ] pull_request: branches: [ "master", "dev*" ] @@ -18,6 +18,10 @@ jobs: packages: write steps: + - name: Extract branch name + shell: bash + run: echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT + id: extract_branch - uses: actions/checkout@v3 - name: Setup Node.js environment uses: actions/setup-node@v3.8.1 @@ -44,8 +48,8 @@ jobs: uses: marvinpinto/action-automatic-releases@latest with: repo_token: ${{ secrets.GITHUB_TOKEN }} - automatic_release_tag: latest + automatic_release_tag: latest-${{ steps.extract_branch.outputs.branch }} prerelease: true - title: "Latest autogenerated build" + title: "Latest autogenerated build (branch ${{ steps.extract_branch.outputs.branch }})" files: | **/build/**/*hict*.jar diff --git a/src/main/java/ru/itmo/ctlab/hict/hict_library/chunkedfile/hdf5/HDF5LibraryInitializer.java b/src/main/java/ru/itmo/ctlab/hict/hict_library/chunkedfile/hdf5/HDF5LibraryInitializer.java index 85aa592..8695155 100644 --- a/src/main/java/ru/itmo/ctlab/hict/hict_library/chunkedfile/hdf5/HDF5LibraryInitializer.java +++ b/src/main/java/ru/itmo/ctlab/hict/hict_library/chunkedfile/hdf5/HDF5LibraryInitializer.java @@ -27,25 +27,45 @@ public class HDF5LibraryInitializer { private static final PathCollectingJNIExtractor jniExtractor = new PathCollectingJNIExtractor(defaultJNIExtractor); static { - libraryNames.put("hdf5", "HDF5"); - libraryNames.put("jhdf5", "jHDF5"); - libraryNames.put("hdf5_tools", "HDF5_tools"); - libraryNames.put("hdf5_java", "HDF5_java"); - libraryNames.put("libh5blosc", "HDF5 BLOSC filter plugin (Linux-style naming)"); - libraryNames.put("h5blosc", "HDF5 BLOSC filter plugin (Windows-style naming)"); + //libraryNames.put("jhdf5", "jHDF5"); + // SiS JHDF5 dependencies: + // libraryNames.put("libnativedata", "NativeData (Linux-style naming)"); + // libraryNames.put("nativedata", "NativeData (Windows-style naming)"); + // libraryNames.put("libunix", "libunix.so (Linux-style naming), not needed on Windows"); + // libraryNames.put("unix", "libunix.so (Windows-style naming), not needed on Windows"); + // Main HDF5 library, rebuilt from sources: +// libraryNames.put("libhdf5", "HDF5 (Linux-style naming)"); +// libraryNames.put("hdf5", "HDF5 (Windows-style naming)"); + // HDF5_java library (from source on Linux, from SiS-modified jni/ folder JHDF5 source on Windows): + // libraryNames.put("libhdf5_java", "HDF5 (Linux-style naming)"); + // libraryNames.put("hdf5_java", "HDF5 (Windows-style naming)"); + // This library might be in dependencies: + // libraryNames.put("hdf5_tools", "HDF5_tools"); + // The most important HDF5 filter plugins for HiCT (bitshuffle and LZF compression): libraryNames.put("libh5bshuf", "HDF5 Shuffle filter plugin (Linux-style naming)"); libraryNames.put("h5bshuf", "HDF5 Shuffle filter plugin (Windows-style naming)"); + libraryNames.put("h5lzf", "HDF5 LZ4 filter plugin (Windows-style naming)"); + libraryNames.put("libh5lzf", "HDF5 LZF filter plugin (Linux-style naming)"); + // SiS-modified jni/ folder source linked to libhdf5.a on Linux, SiS-modified version of hdf5_java.dll on Windows + // libraryNames.put("jhdf5", "jHDF5"); + // Other general compression plugins: libraryNames.put("libh5bz2", "HDF5 BZ2 filter plugin (Linux-style naming)"); libraryNames.put("h5bz2", "HDF5 BZ2 filter plugin (Windows-style naming)"); libraryNames.put("libh5lz4", "HDF5 LZ4 filter plugin (Linux-style naming)"); libraryNames.put("h5lz4", "HDF5 LZ4 filter plugin (Windows-style naming)"); - libraryNames.put("libh5lzf", "HDF5 LZF filter plugin (Linux-style naming)"); - libraryNames.put("h5lzf", "HDF5 LZF filter plugin (Windows-style naming)"); libraryNames.put("libh5zfp", "HDF5 ZFP filter plugin (Linux-style naming)"); libraryNames.put("h5zfp", "HDF5 ZFP filter plugin (Windows-style naming)"); libraryNames.put("libh5zstd", "HDF5 zSTD filter plugin (Linux-style naming)"); libraryNames.put("h5zstd", "HDF5 zSTD filter plugin (Windows-style naming)"); - + // Lossy compression plugins currently not used by HiCT: +// libraryNames.put("libh5blosc", "HDF5 BLOSC filter plugin (Linux-style naming)"); +// libraryNames.put("h5blosc", "HDF5 BLOSC filter plugin (Windows-style naming)"); + /* + libraryNames.put("hdf5", "HDF5 (Windows-style naming)"); + libraryNames.put("h5bshuf", "HDF5 Shuffle filter plugin (Windows-style naming)"); + libraryNames.put("h5lzf", "HDF5 LZF filter plugin (Windows-style naming)"); + libraryNames.put("jhdf5", "jHDF5"); + */ initializeHDF5Library(); } @@ -55,16 +75,63 @@ public static synchronized void initializeHDF5Library() { return; } + NativeLibraryUtil.loadNativeLibrary(jniExtractor, "hdf5", "resources/", "resources/libs/", "resources/libs/natives/", "/resources/", "/resources/libs/", "/resources/libs/natives/"); + log.info("Loaded HDF5"); +// NativeLibraryUtil.loadNativeLibrary(jniExtractor, "jhdf5", "resources/", "resources/libs/", "resources/libs/natives/", "/resources/", "/resources/libs/", "/resources/libs/natives/"); +// log.info("Loaded JHDF5"); + + for (int i = H5.H5PLsize() - 1; i >= 0; --i) { + final String path; + try { + path = H5.H5PLget(i); + } catch (final HDF5LibraryException e) { + log.error("Failed to get plugin path with index " + i); + continue; + } + + try { + H5.H5PLremove(i); + log.info("Removed pre-existing path with index " + i + " that was " + path); + } catch (final HDF5LibraryException e) { + log.error("Failed to remove plugin path with index " + i + " that is " + path); + continue; + } + } + +// for (final var libPath : jniExtractor.getFullPathsCollection()) { +// try { +// log.info("Prepending " + libPath + " to the plugin path registry of H5 library"); +// H5.H5PLprepend(libPath); +// log.info("Appending " + libPath + " to the plugin path registry of H5 library"); +// H5.H5PLappend(libPath); +// } catch (final HDF5LibraryException e) { +// log.error("Failed to append " + libPath + " to the plugin registry", e); +// } +// } + +// for (final var libPath : jniExtractor.getAbsolutePathsCollection()) { +// try { +// log.info("Prepending " + libPath + " to the plugin path registry of H5 library"); +// H5.H5PLprepend(libPath); +// log.info("Appending " + libPath + " to the plugin path registry of H5 library"); +// H5.H5PLappend(libPath); +// } catch (final HDF5LibraryException e) { +// log.error("Failed to append " + libPath + " to the plugin registry", e); +// } +// } + + for (final var e : libraryNames.entrySet()) { final var lib = e.getKey(); final var name = e.getValue(); log.info("Loading " + name + " library"); try { - if (!NativeLibraryUtil.loadNativeLibrary(jniExtractor, lib)) { + if (!NativeLibraryUtil.loadNativeLibrary(jniExtractor, lib, "resources/", "resources/libs/", "resources/libs/natives/", "/resources/", "/resources/libs/", "/resources/libs/natives/")) { log.warn("Failed to load library " + lib + " with custom JNI Extractor, will try fallback method."); NativeLoader.loadLibrary(lib); log.warn("Fallback method succeeded but the library path won't be added to the H5 plugins search registry."); } + log.info("Successfully loaded library " + lib + " using NativeLoader"); } catch (final IOException err) { log.warn("Failed to load native library " + name + " by NativeLoader due to IOException", err); // log.warn("Failed to load native library due to IOException"); @@ -76,6 +143,47 @@ public static synchronized void initializeHDF5Library() { } } +// +// for (int i = H5.H5PLsize() - 1; i >= 0; --i) { +// final String path; +// try { +// path = H5.H5PLget(i); +// } catch (final HDF5LibraryException e) { +// log.error("Failed to get plugin path with index " + i); +// continue; +// } +// +// try { +// H5.H5PLremove(i); +// log.info("Removed pre-existing path with index " + i + " that was " + path); +// } catch (final HDF5LibraryException e) { +// log.error("Failed to remove plugin path with index " + i + " that is " + path); +// continue; +// } +// } +// +// for (final var libPath : jniExtractor.getFullPathsCollection()) { +// try { +// log.info("Prepending " + libPath + " to the plugin path registry of H5 library"); +// H5.H5PLprepend(libPath); +// log.info("Appending " + libPath + " to the plugin path registry of H5 library"); +// H5.H5PLappend(libPath); +// } catch (final HDF5LibraryException e) { +// log.error("Failed to append " + libPath + " to the plugin registry", e); +// } +// } + + for (final var libPath : jniExtractor.getAbsolutePathsCollection()) { + try { + log.info("Prepending " + libPath + " to the plugin path registry of H5 library"); + H5.H5PLprepend(libPath); + log.info("Appending " + libPath + " to the plugin path registry of H5 library"); + H5.H5PLappend(libPath); + } catch (final HDF5LibraryException e) { + log.error("Failed to append " + libPath + " to the plugin registry", e); + } + } + try { H5.loadH5Lib(); log.info("Loaded HDF5 library"); @@ -83,7 +191,6 @@ public static synchronized void initializeHDF5Library() { log.error("Caught an Unsupported Operation Exception while initializing HDF5 Library, if it complains about library version, you can simply ignore that", uoe); } - for (final var libPath : jniExtractor.getAbsolutePathsCollection()) { try { log.info("Prepending " + libPath + " to the plugin path registry of H5 library"); diff --git a/src/main/java/ru/itmo/ctlab/hict/hict_server/dto/symmetric/visualization/SimpleLinearGradientDTO.java b/src/main/java/ru/itmo/ctlab/hict/hict_server/dto/symmetric/visualization/SimpleLinearGradientDTO.java index 436d264..56e5c91 100644 --- a/src/main/java/ru/itmo/ctlab/hict/hict_server/dto/symmetric/visualization/SimpleLinearGradientDTO.java +++ b/src/main/java/ru/itmo/ctlab/hict/hict_server/dto/symmetric/visualization/SimpleLinearGradientDTO.java @@ -9,6 +9,7 @@ import ru.itmo.ctlab.hict.hict_library.visualization.colormap.gradient.SimpleLinearGradient; import java.awt.*; +import java.util.Locale; import java.util.regex.Pattern; @Getter(AccessLevel.PUBLIC) @@ -33,8 +34,8 @@ public SimpleLinearGradientDTO(String startColorHEX, String endColorHEX, double // final String endHEX = String.format("#%02x%02x%02x%02x", cmap.getEndColor().getRed(), cmap.getEndColor().getGreen(), cmap.getEndColor().getBlue(), cmap.getEndColor().getAlpha()); return new SimpleLinearGradientDTO( - String.format("rgba(%d,%d,%d,%f)", cmap.getStartColor().getRed(), cmap.getStartColor().getGreen(), cmap.getStartColor().getBlue(), ((double) cmap.getStartColor().getAlpha() / 255.0d)), - String.format("rgba(%d,%d,%d,%f)", cmap.getEndColor().getRed(), cmap.getEndColor().getGreen(), cmap.getEndColor().getBlue(), ((double) cmap.getEndColor().getAlpha() / 255.0d)), + String.format(Locale.US, "rgba(%d,%d,%d,%f)", cmap.getStartColor().getRed(), cmap.getStartColor().getGreen(), cmap.getStartColor().getBlue(), ((double) cmap.getStartColor().getAlpha() / 255.0d)), + String.format(Locale.US, "rgba(%d,%d,%d,%f)", cmap.getEndColor().getRed(), cmap.getEndColor().getGreen(), cmap.getEndColor().getBlue(), ((double) cmap.getEndColor().getAlpha() / 255.0d)), cmap.getMinSignal(), cmap.getMaxSignal() ); diff --git a/src/main/java/ru/itmo/ctlab/hict/hict_server/handlers/files/FSHandlersHolder.java b/src/main/java/ru/itmo/ctlab/hict/hict_server/handlers/files/FSHandlersHolder.java index 99681ee..a177611 100644 --- a/src/main/java/ru/itmo/ctlab/hict/hict_server/handlers/files/FSHandlersHolder.java +++ b/src/main/java/ru/itmo/ctlab/hict/hict_server/handlers/files/FSHandlersHolder.java @@ -31,7 +31,7 @@ public void addHandlersToRouter(final @NotNull Router router) { final List files; try (final var fileStream = Files.walk(dataDirectory)) { - files = fileStream.filter(Files::isRegularFile).map(dataDirectory::relativize).map(Object::toString).filter(p -> p.endsWith(".hict.hdf5")).collect(Collectors.toList()); + files = fileStream.filter(Files::isRegularFile).map(dataDirectory::relativize).map(Object::toString).collect(Collectors.toList()); } catch (final IOException e) { throw new RuntimeException(e); } diff --git a/src/main/resources/libs/_sis-jhdf5-19.04.1.jar_ b/src/main/resources/libs/_sis-jhdf5-19.04.1.jar_ new file mode 100644 index 0000000..8937eee Binary files /dev/null and b/src/main/resources/libs/_sis-jhdf5-19.04.1.jar_ differ diff --git a/src/main/resources/libs/natives/linux_64/libdynlibadd.so b/src/main/resources/libs/natives/linux_64/libdynlibadd.so new file mode 100755 index 0000000..cdc620b Binary files /dev/null and b/src/main/resources/libs/natives/linux_64/libdynlibadd.so differ diff --git a/src/main/resources/libs/natives/linux_64/libdynlibcopy.so b/src/main/resources/libs/natives/linux_64/libdynlibcopy.so new file mode 100755 index 0000000..d95431a Binary files /dev/null and b/src/main/resources/libs/natives/linux_64/libdynlibcopy.so differ diff --git a/src/main/resources/libs/natives/linux_64/libdynlibdiff.so b/src/main/resources/libs/natives/linux_64/libdynlibdiff.so new file mode 100755 index 0000000..f4f0325 Binary files /dev/null and b/src/main/resources/libs/natives/linux_64/libdynlibdiff.so differ diff --git a/src/main/resources/libs/natives/linux_64/libdynlibdump.so b/src/main/resources/libs/natives/linux_64/libdynlibdump.so new file mode 100755 index 0000000..78ebd52 Binary files /dev/null and b/src/main/resources/libs/natives/linux_64/libdynlibdump.so differ diff --git a/src/main/resources/libs/natives/linux_64/libdynlibls.so b/src/main/resources/libs/natives/linux_64/libdynlibls.so new file mode 100755 index 0000000..8fa129f Binary files /dev/null and b/src/main/resources/libs/natives/linux_64/libdynlibls.so differ diff --git a/src/main/resources/libs/natives/linux_64/libdynlibvers.so b/src/main/resources/libs/natives/linux_64/libdynlibvers.so new file mode 100755 index 0000000..2a3cbb1 Binary files /dev/null and b/src/main/resources/libs/natives/linux_64/libdynlibvers.so differ diff --git a/src/main/resources/libs/natives/linux_64/libfilter_plugin1_dsets.so b/src/main/resources/libs/natives/linux_64/libfilter_plugin1_dsets.so new file mode 100755 index 0000000..06dbad1 Binary files /dev/null and b/src/main/resources/libs/natives/linux_64/libfilter_plugin1_dsets.so differ diff --git a/src/main/resources/libs/natives/linux_64/libfilter_plugin2_dsets.so b/src/main/resources/libs/natives/linux_64/libfilter_plugin2_dsets.so new file mode 100755 index 0000000..3f77801 Binary files /dev/null and b/src/main/resources/libs/natives/linux_64/libfilter_plugin2_dsets.so differ diff --git a/src/main/resources/libs/natives/linux_64/libfilter_plugin3_dsets.so b/src/main/resources/libs/natives/linux_64/libfilter_plugin3_dsets.so new file mode 100755 index 0000000..165d339 Binary files /dev/null and b/src/main/resources/libs/natives/linux_64/libfilter_plugin3_dsets.so differ diff --git a/src/main/resources/libs/natives/linux_64/libfilter_plugin4_groups.so b/src/main/resources/libs/natives/linux_64/libfilter_plugin4_groups.so new file mode 100755 index 0000000..b079edc Binary files /dev/null and b/src/main/resources/libs/natives/linux_64/libfilter_plugin4_groups.so differ diff --git a/src/main/resources/libs/natives/linux_64/libh5blosc.so b/src/main/resources/libs/natives/linux_64/libh5blosc.so new file mode 100644 index 0000000..aa1128b Binary files /dev/null and b/src/main/resources/libs/natives/linux_64/libh5blosc.so differ diff --git a/src/main/resources/libs/natives/linux_64/libh5bshuf.so b/src/main/resources/libs/natives/linux_64/libh5bshuf.so new file mode 100644 index 0000000..9a1d4c9 Binary files /dev/null and b/src/main/resources/libs/natives/linux_64/libh5bshuf.so differ diff --git a/src/main/resources/libs/natives/linux_64/libh5bz2.so b/src/main/resources/libs/natives/linux_64/libh5bz2.so new file mode 100644 index 0000000..0bf7d38 Binary files /dev/null and b/src/main/resources/libs/natives/linux_64/libh5bz2.so differ diff --git a/src/main/resources/libs/natives/linux_64/libh5jpeg.so b/src/main/resources/libs/natives/linux_64/libh5jpeg.so new file mode 100644 index 0000000..2ebbd0d Binary files /dev/null and b/src/main/resources/libs/natives/linux_64/libh5jpeg.so differ diff --git a/src/main/resources/libs/natives/linux_64/libh5lzf.so b/src/main/resources/libs/natives/linux_64/libh5lzf.so new file mode 100644 index 0000000..e0ff778 Binary files /dev/null and b/src/main/resources/libs/natives/linux_64/libh5lzf.so differ diff --git a/src/main/resources/libs/natives/linux_64/libh5zfp.so b/src/main/resources/libs/natives/linux_64/libh5zfp.so new file mode 100644 index 0000000..f0120e4 Binary files /dev/null and b/src/main/resources/libs/natives/linux_64/libh5zfp.so differ diff --git a/src/main/resources/libs/natives/linux_64/libh5zstd.so b/src/main/resources/libs/natives/linux_64/libh5zstd.so new file mode 100644 index 0000000..c511331 Binary files /dev/null and b/src/main/resources/libs/natives/linux_64/libh5zstd.so differ diff --git a/src/main/resources/libs/natives/linux_64/libhdf5.so b/src/main/resources/libs/natives/linux_64/libhdf5.so new file mode 100644 index 0000000..6ebe761 Binary files /dev/null and b/src/main/resources/libs/natives/linux_64/libhdf5.so differ diff --git a/src/main/resources/libs/natives/linux_64/libhdf5_hl.so b/src/main/resources/libs/natives/linux_64/libhdf5_hl.so new file mode 100755 index 0000000..0a5e902 Binary files /dev/null and b/src/main/resources/libs/natives/linux_64/libhdf5_hl.so differ diff --git a/src/main/resources/libs/natives/linux_64/libhdf5_java.so b/src/main/resources/libs/natives/linux_64/libhdf5_java.so new file mode 100644 index 0000000..cd6af4b Binary files /dev/null and b/src/main/resources/libs/natives/linux_64/libhdf5_java.so differ diff --git a/src/main/resources/libs/natives/linux_64/libhdf5_test.so b/src/main/resources/libs/natives/linux_64/libhdf5_test.so new file mode 100755 index 0000000..60f5edd Binary files /dev/null and b/src/main/resources/libs/natives/linux_64/libhdf5_test.so differ diff --git a/src/main/resources/libs/natives/linux_64/libhdf5_tools.so b/src/main/resources/libs/natives/linux_64/libhdf5_tools.so new file mode 100755 index 0000000..f50266a Binary files /dev/null and b/src/main/resources/libs/natives/linux_64/libhdf5_tools.so differ diff --git a/src/main/resources/libs/natives/linux_64/libjhdf5.so b/src/main/resources/libs/natives/linux_64/libjhdf5.so new file mode 100644 index 0000000..39c002a Binary files /dev/null and b/src/main/resources/libs/natives/linux_64/libjhdf5.so differ diff --git a/src/main/resources/libs/natives/linux_64/libnativedata.so b/src/main/resources/libs/natives/linux_64/libnativedata.so new file mode 100644 index 0000000..9ff31e4 Binary files /dev/null and b/src/main/resources/libs/natives/linux_64/libnativedata.so differ diff --git a/src/main/resources/libs/natives/linux_64/libunix.so b/src/main/resources/libs/natives/linux_64/libunix.so new file mode 100644 index 0000000..b940e90 Binary files /dev/null and b/src/main/resources/libs/natives/linux_64/libunix.so differ diff --git a/src/main/resources/libs/natives/windows_64/blosc.dll b/src/main/resources/libs/natives/windows_64/blosc.dll new file mode 100644 index 0000000..7dc6de5 Binary files /dev/null and b/src/main/resources/libs/natives/windows_64/blosc.dll differ diff --git a/src/main/resources/libs/natives/windows_64/dynlibadd.dll b/src/main/resources/libs/natives/windows_64/dynlibadd.dll new file mode 100644 index 0000000..9b9911f Binary files /dev/null and b/src/main/resources/libs/natives/windows_64/dynlibadd.dll differ diff --git a/src/main/resources/libs/natives/windows_64/dynlibcopy.dll b/src/main/resources/libs/natives/windows_64/dynlibcopy.dll new file mode 100644 index 0000000..2265be2 Binary files /dev/null and b/src/main/resources/libs/natives/windows_64/dynlibcopy.dll differ diff --git a/src/main/resources/libs/natives/windows_64/dynlibdiff.dll b/src/main/resources/libs/natives/windows_64/dynlibdiff.dll new file mode 100644 index 0000000..c75187f Binary files /dev/null and b/src/main/resources/libs/natives/windows_64/dynlibdiff.dll differ diff --git a/src/main/resources/libs/natives/windows_64/dynlibdump.dll b/src/main/resources/libs/natives/windows_64/dynlibdump.dll new file mode 100644 index 0000000..1e8cf49 Binary files /dev/null and b/src/main/resources/libs/natives/windows_64/dynlibdump.dll differ diff --git a/src/main/resources/libs/natives/windows_64/dynlibls.dll b/src/main/resources/libs/natives/windows_64/dynlibls.dll new file mode 100644 index 0000000..a0c2e23 Binary files /dev/null and b/src/main/resources/libs/natives/windows_64/dynlibls.dll differ diff --git a/src/main/resources/libs/natives/windows_64/dynlibvers.dll b/src/main/resources/libs/natives/windows_64/dynlibvers.dll new file mode 100644 index 0000000..c976679 Binary files /dev/null and b/src/main/resources/libs/natives/windows_64/dynlibvers.dll differ diff --git a/src/main/resources/libs/natives/windows_64/filter_plugin1_dsets.dll b/src/main/resources/libs/natives/windows_64/filter_plugin1_dsets.dll new file mode 100644 index 0000000..e8cb69f Binary files /dev/null and b/src/main/resources/libs/natives/windows_64/filter_plugin1_dsets.dll differ diff --git a/src/main/resources/libs/natives/windows_64/filter_plugin2_dsets.dll b/src/main/resources/libs/natives/windows_64/filter_plugin2_dsets.dll new file mode 100644 index 0000000..78526d4 Binary files /dev/null and b/src/main/resources/libs/natives/windows_64/filter_plugin2_dsets.dll differ diff --git a/src/main/resources/libs/natives/windows_64/filter_plugin3_dsets.dll b/src/main/resources/libs/natives/windows_64/filter_plugin3_dsets.dll new file mode 100644 index 0000000..2152baa Binary files /dev/null and b/src/main/resources/libs/natives/windows_64/filter_plugin3_dsets.dll differ diff --git a/src/main/resources/libs/natives/windows_64/filter_plugin4_groups.dll b/src/main/resources/libs/natives/windows_64/filter_plugin4_groups.dll new file mode 100644 index 0000000..252f5d2 Binary files /dev/null and b/src/main/resources/libs/natives/windows_64/filter_plugin4_groups.dll differ diff --git a/src/main/resources/libs/natives/windows_64/hdf5.dll b/src/main/resources/libs/natives/windows_64/hdf5.dll new file mode 100644 index 0000000..b10c4cc Binary files /dev/null and b/src/main/resources/libs/natives/windows_64/hdf5.dll differ diff --git a/src/main/resources/libs/natives/windows_64/hdf5_java.dll b/src/main/resources/libs/natives/windows_64/hdf5_java.dll new file mode 100644 index 0000000..b769727 Binary files /dev/null and b/src/main/resources/libs/natives/windows_64/hdf5_java.dll differ diff --git a/src/main/resources/libs/natives/windows_64/hdf5_test.dll b/src/main/resources/libs/natives/windows_64/hdf5_test.dll new file mode 100644 index 0000000..8ea2b7f Binary files /dev/null and b/src/main/resources/libs/natives/windows_64/hdf5_test.dll differ diff --git a/src/main/resources/libs/natives/windows_64/hdf5_tools.dll b/src/main/resources/libs/natives/windows_64/hdf5_tools.dll new file mode 100644 index 0000000..1e2600f Binary files /dev/null and b/src/main/resources/libs/natives/windows_64/hdf5_tools.dll differ diff --git a/src/main/resources/libs/natives/windows_64/jhdf5.dll b/src/main/resources/libs/natives/windows_64/jhdf5.dll new file mode 100644 index 0000000..b769727 Binary files /dev/null and b/src/main/resources/libs/natives/windows_64/jhdf5.dll differ diff --git a/src/main/resources/libs/natives/windows_64/libh5blosc.dll b/src/main/resources/libs/natives/windows_64/libh5blosc.dll new file mode 100644 index 0000000..55ec1dd Binary files /dev/null and b/src/main/resources/libs/natives/windows_64/libh5blosc.dll differ diff --git a/src/main/resources/libs/natives/windows_64/libh5bshuf.dll b/src/main/resources/libs/natives/windows_64/libh5bshuf.dll new file mode 100644 index 0000000..4f8723b Binary files /dev/null and b/src/main/resources/libs/natives/windows_64/libh5bshuf.dll differ diff --git a/src/main/resources/libs/natives/windows_64/libh5bz2.dll b/src/main/resources/libs/natives/windows_64/libh5bz2.dll new file mode 100644 index 0000000..1a2d2f8 Binary files /dev/null and b/src/main/resources/libs/natives/windows_64/libh5bz2.dll differ diff --git a/src/main/resources/libs/natives/windows_64/libh5lz4.dll b/src/main/resources/libs/natives/windows_64/libh5lz4.dll new file mode 100644 index 0000000..ca1a8c3 Binary files /dev/null and b/src/main/resources/libs/natives/windows_64/libh5lz4.dll differ diff --git a/src/main/resources/libs/natives/windows_64/libh5lzf.dll b/src/main/resources/libs/natives/windows_64/libh5lzf.dll new file mode 100644 index 0000000..8458438 Binary files /dev/null and b/src/main/resources/libs/natives/windows_64/libh5lzf.dll differ diff --git a/src/main/resources/libs/natives/windows_64/libh5zfp.dll b/src/main/resources/libs/natives/windows_64/libh5zfp.dll new file mode 100644 index 0000000..7847f79 Binary files /dev/null and b/src/main/resources/libs/natives/windows_64/libh5zfp.dll differ diff --git a/src/main/resources/libs/natives/windows_64/libh5zstd.dll b/src/main/resources/libs/natives/windows_64/libh5zstd.dll new file mode 100644 index 0000000..5c62221 Binary files /dev/null and b/src/main/resources/libs/natives/windows_64/libh5zstd.dll differ diff --git a/src/main/resources/libs/sis-jhdf5-19.04.1.jar b/src/main/resources/libs/sis-jhdf5-19.04.1.jar new file mode 100644 index 0000000..ad2ddc2 Binary files /dev/null and b/src/main/resources/libs/sis-jhdf5-19.04.1.jar differ diff --git a/src/main/resources/natives/linux_64/libdynlibadd.so b/src/main/resources/natives/linux_64/libdynlibadd.so new file mode 100644 index 0000000..cdc620b Binary files /dev/null and b/src/main/resources/natives/linux_64/libdynlibadd.so differ diff --git a/src/main/resources/natives/linux_64/libdynlibcopy.so b/src/main/resources/natives/linux_64/libdynlibcopy.so new file mode 100644 index 0000000..d95431a Binary files /dev/null and b/src/main/resources/natives/linux_64/libdynlibcopy.so differ diff --git a/src/main/resources/natives/linux_64/libdynlibdiff.so b/src/main/resources/natives/linux_64/libdynlibdiff.so new file mode 100644 index 0000000..f4f0325 Binary files /dev/null and b/src/main/resources/natives/linux_64/libdynlibdiff.so differ diff --git a/src/main/resources/natives/linux_64/libdynlibdump.so b/src/main/resources/natives/linux_64/libdynlibdump.so new file mode 100644 index 0000000..78ebd52 Binary files /dev/null and b/src/main/resources/natives/linux_64/libdynlibdump.so differ diff --git a/src/main/resources/natives/linux_64/libdynlibls.so b/src/main/resources/natives/linux_64/libdynlibls.so new file mode 100644 index 0000000..8fa129f Binary files /dev/null and b/src/main/resources/natives/linux_64/libdynlibls.so differ diff --git a/src/main/resources/natives/linux_64/libdynlibvers.so b/src/main/resources/natives/linux_64/libdynlibvers.so new file mode 100644 index 0000000..2a3cbb1 Binary files /dev/null and b/src/main/resources/natives/linux_64/libdynlibvers.so differ diff --git a/src/main/resources/natives/linux_64/libfilter_plugin1_dsets.so b/src/main/resources/natives/linux_64/libfilter_plugin1_dsets.so new file mode 100644 index 0000000..06dbad1 Binary files /dev/null and b/src/main/resources/natives/linux_64/libfilter_plugin1_dsets.so differ diff --git a/src/main/resources/natives/linux_64/libfilter_plugin2_dsets.so b/src/main/resources/natives/linux_64/libfilter_plugin2_dsets.so new file mode 100644 index 0000000..3f77801 Binary files /dev/null and b/src/main/resources/natives/linux_64/libfilter_plugin2_dsets.so differ diff --git a/src/main/resources/natives/linux_64/libfilter_plugin3_dsets.so b/src/main/resources/natives/linux_64/libfilter_plugin3_dsets.so new file mode 100644 index 0000000..165d339 Binary files /dev/null and b/src/main/resources/natives/linux_64/libfilter_plugin3_dsets.so differ diff --git a/src/main/resources/natives/linux_64/libfilter_plugin4_groups.so b/src/main/resources/natives/linux_64/libfilter_plugin4_groups.so new file mode 100644 index 0000000..b079edc Binary files /dev/null and b/src/main/resources/natives/linux_64/libfilter_plugin4_groups.so differ diff --git a/src/main/resources/natives/linux_64/libh5blosc.so b/src/main/resources/natives/linux_64/libh5blosc.so new file mode 100644 index 0000000..aa1128b Binary files /dev/null and b/src/main/resources/natives/linux_64/libh5blosc.so differ diff --git a/src/main/resources/natives/linux_64/libh5bshuf.so b/src/main/resources/natives/linux_64/libh5bshuf.so new file mode 100644 index 0000000..9a1d4c9 Binary files /dev/null and b/src/main/resources/natives/linux_64/libh5bshuf.so differ diff --git a/src/main/resources/natives/linux_64/libh5bz2.so b/src/main/resources/natives/linux_64/libh5bz2.so new file mode 100644 index 0000000..0bf7d38 Binary files /dev/null and b/src/main/resources/natives/linux_64/libh5bz2.so differ diff --git a/src/main/resources/natives/linux_64/libh5jpeg.so b/src/main/resources/natives/linux_64/libh5jpeg.so new file mode 100644 index 0000000..2ebbd0d Binary files /dev/null and b/src/main/resources/natives/linux_64/libh5jpeg.so differ diff --git a/src/main/resources/natives/linux_64/libh5lzf.so b/src/main/resources/natives/linux_64/libh5lzf.so new file mode 100644 index 0000000..e0ff778 Binary files /dev/null and b/src/main/resources/natives/linux_64/libh5lzf.so differ diff --git a/src/main/resources/natives/linux_64/libh5zfp.so b/src/main/resources/natives/linux_64/libh5zfp.so new file mode 100644 index 0000000..f0120e4 Binary files /dev/null and b/src/main/resources/natives/linux_64/libh5zfp.so differ diff --git a/src/main/resources/natives/linux_64/libh5zstd.so b/src/main/resources/natives/linux_64/libh5zstd.so new file mode 100644 index 0000000..c511331 Binary files /dev/null and b/src/main/resources/natives/linux_64/libh5zstd.so differ diff --git a/src/main/resources/natives/linux_64/libhdf5.so b/src/main/resources/natives/linux_64/libhdf5.so new file mode 100644 index 0000000..6ebe761 Binary files /dev/null and b/src/main/resources/natives/linux_64/libhdf5.so differ diff --git a/src/main/resources/natives/linux_64/libhdf5_hl.so b/src/main/resources/natives/linux_64/libhdf5_hl.so new file mode 100644 index 0000000..0a5e902 Binary files /dev/null and b/src/main/resources/natives/linux_64/libhdf5_hl.so differ diff --git a/src/main/resources/natives/linux_64/libhdf5_java.so b/src/main/resources/natives/linux_64/libhdf5_java.so new file mode 100644 index 0000000..cd6af4b Binary files /dev/null and b/src/main/resources/natives/linux_64/libhdf5_java.so differ diff --git a/src/main/resources/natives/linux_64/libhdf5_test.so b/src/main/resources/natives/linux_64/libhdf5_test.so new file mode 100644 index 0000000..60f5edd Binary files /dev/null and b/src/main/resources/natives/linux_64/libhdf5_test.so differ diff --git a/src/main/resources/natives/linux_64/libhdf5_tools.so b/src/main/resources/natives/linux_64/libhdf5_tools.so new file mode 100644 index 0000000..f50266a Binary files /dev/null and b/src/main/resources/natives/linux_64/libhdf5_tools.so differ diff --git a/src/main/resources/natives/linux_64/libjhdf5.so b/src/main/resources/natives/linux_64/libjhdf5.so new file mode 100644 index 0000000..39c002a Binary files /dev/null and b/src/main/resources/natives/linux_64/libjhdf5.so differ diff --git a/src/main/resources/natives/windows_64/blosc.dll b/src/main/resources/natives/windows_64/blosc.dll new file mode 100644 index 0000000..7dc6de5 Binary files /dev/null and b/src/main/resources/natives/windows_64/blosc.dll differ diff --git a/src/main/resources/natives/windows_64/dynlibadd.dll b/src/main/resources/natives/windows_64/dynlibadd.dll new file mode 100644 index 0000000..9b9911f Binary files /dev/null and b/src/main/resources/natives/windows_64/dynlibadd.dll differ diff --git a/src/main/resources/natives/windows_64/dynlibcopy.dll b/src/main/resources/natives/windows_64/dynlibcopy.dll new file mode 100644 index 0000000..2265be2 Binary files /dev/null and b/src/main/resources/natives/windows_64/dynlibcopy.dll differ diff --git a/src/main/resources/natives/windows_64/dynlibdiff.dll b/src/main/resources/natives/windows_64/dynlibdiff.dll new file mode 100644 index 0000000..c75187f Binary files /dev/null and b/src/main/resources/natives/windows_64/dynlibdiff.dll differ diff --git a/src/main/resources/natives/windows_64/dynlibdump.dll b/src/main/resources/natives/windows_64/dynlibdump.dll new file mode 100644 index 0000000..1e8cf49 Binary files /dev/null and b/src/main/resources/natives/windows_64/dynlibdump.dll differ diff --git a/src/main/resources/natives/windows_64/dynlibls.dll b/src/main/resources/natives/windows_64/dynlibls.dll new file mode 100644 index 0000000..a0c2e23 Binary files /dev/null and b/src/main/resources/natives/windows_64/dynlibls.dll differ diff --git a/src/main/resources/natives/windows_64/dynlibvers.dll b/src/main/resources/natives/windows_64/dynlibvers.dll new file mode 100644 index 0000000..c976679 Binary files /dev/null and b/src/main/resources/natives/windows_64/dynlibvers.dll differ diff --git a/src/main/resources/natives/windows_64/filter_plugin1_dsets.dll b/src/main/resources/natives/windows_64/filter_plugin1_dsets.dll new file mode 100644 index 0000000..e8cb69f Binary files /dev/null and b/src/main/resources/natives/windows_64/filter_plugin1_dsets.dll differ diff --git a/src/main/resources/natives/windows_64/filter_plugin2_dsets.dll b/src/main/resources/natives/windows_64/filter_plugin2_dsets.dll new file mode 100644 index 0000000..78526d4 Binary files /dev/null and b/src/main/resources/natives/windows_64/filter_plugin2_dsets.dll differ diff --git a/src/main/resources/natives/windows_64/filter_plugin3_dsets.dll b/src/main/resources/natives/windows_64/filter_plugin3_dsets.dll new file mode 100644 index 0000000..2152baa Binary files /dev/null and b/src/main/resources/natives/windows_64/filter_plugin3_dsets.dll differ diff --git a/src/main/resources/natives/windows_64/filter_plugin4_groups.dll b/src/main/resources/natives/windows_64/filter_plugin4_groups.dll new file mode 100644 index 0000000..252f5d2 Binary files /dev/null and b/src/main/resources/natives/windows_64/filter_plugin4_groups.dll differ diff --git a/src/main/resources/natives/windows_64/hdf5.dll b/src/main/resources/natives/windows_64/hdf5.dll new file mode 100644 index 0000000..b10c4cc Binary files /dev/null and b/src/main/resources/natives/windows_64/hdf5.dll differ diff --git a/src/main/resources/natives/windows_64/hdf5_java.dll b/src/main/resources/natives/windows_64/hdf5_java.dll new file mode 100644 index 0000000..b769727 Binary files /dev/null and b/src/main/resources/natives/windows_64/hdf5_java.dll differ diff --git a/src/main/resources/natives/windows_64/hdf5_test.dll b/src/main/resources/natives/windows_64/hdf5_test.dll new file mode 100644 index 0000000..8ea2b7f Binary files /dev/null and b/src/main/resources/natives/windows_64/hdf5_test.dll differ diff --git a/src/main/resources/natives/windows_64/hdf5_tools.dll b/src/main/resources/natives/windows_64/hdf5_tools.dll new file mode 100644 index 0000000..1e2600f Binary files /dev/null and b/src/main/resources/natives/windows_64/hdf5_tools.dll differ diff --git a/src/main/resources/natives/windows_64/jhdf5.dll b/src/main/resources/natives/windows_64/jhdf5.dll new file mode 100644 index 0000000..b769727 Binary files /dev/null and b/src/main/resources/natives/windows_64/jhdf5.dll differ diff --git a/src/main/resources/natives/windows_64/libh5blosc.dll b/src/main/resources/natives/windows_64/libh5blosc.dll new file mode 100644 index 0000000..55ec1dd Binary files /dev/null and b/src/main/resources/natives/windows_64/libh5blosc.dll differ diff --git a/src/main/resources/natives/windows_64/libh5bshuf.dll b/src/main/resources/natives/windows_64/libh5bshuf.dll new file mode 100644 index 0000000..4f8723b Binary files /dev/null and b/src/main/resources/natives/windows_64/libh5bshuf.dll differ diff --git a/src/main/resources/natives/windows_64/libh5bz2.dll b/src/main/resources/natives/windows_64/libh5bz2.dll new file mode 100644 index 0000000..1a2d2f8 Binary files /dev/null and b/src/main/resources/natives/windows_64/libh5bz2.dll differ diff --git a/src/main/resources/natives/windows_64/libh5lz4.dll b/src/main/resources/natives/windows_64/libh5lz4.dll new file mode 100644 index 0000000..ca1a8c3 Binary files /dev/null and b/src/main/resources/natives/windows_64/libh5lz4.dll differ diff --git a/src/main/resources/natives/windows_64/libh5lzf.dll b/src/main/resources/natives/windows_64/libh5lzf.dll new file mode 100644 index 0000000..8458438 Binary files /dev/null and b/src/main/resources/natives/windows_64/libh5lzf.dll differ diff --git a/src/main/resources/natives/windows_64/libh5zfp.dll b/src/main/resources/natives/windows_64/libh5zfp.dll new file mode 100644 index 0000000..7847f79 Binary files /dev/null and b/src/main/resources/natives/windows_64/libh5zfp.dll differ diff --git a/src/main/resources/natives/windows_64/libh5zstd.dll b/src/main/resources/natives/windows_64/libh5zstd.dll new file mode 100644 index 0000000..5c62221 Binary files /dev/null and b/src/main/resources/natives/windows_64/libh5zstd.dll differ diff --git a/version.txt b/version.txt index 8ca1c96..b0ebca3 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -1.0.29-aed9a29-webui_d454f01 \ No newline at end of file +1.0.34-677dc4a-webui_8060ecf \ No newline at end of file