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.

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

develop JNI export references and java updates #467

Merged
merged 118 commits into from
Mar 12, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
118 commits
Select commit Hold shift + click to select a range
23e0df3
OESS-98 convert plugin option to FetchContent, add tests
byrnHDF Dec 10, 2020
84293f5
Fixes for pkcfg files because of plugin option
byrnHDF Dec 11, 2020
544bd61
OESS-98 fix tools test for plugins
byrnHDF Dec 15, 2020
ffb182f
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Jan 8, 2021
2561b6b
Keep doxygen comments under 100 chars long - format hint
byrnHDF Jan 8, 2021
1c73615
Whitespace
byrnHDF Jan 8, 2021
b71a853
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Jan 11, 2021
b68973c
HDFFV-11144 - Reclassify CMake messages
byrnHDF Jan 11, 2021
f64497d
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Jan 13, 2021
c854ffe
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Jan 14, 2021
0f90d26
HDFFV-11099/11100 added help text
byrnHDF Jan 14, 2021
20757d6
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Jan 15, 2021
d161733
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Jan 20, 2021
f03b095
Reworked switch statement to compare string instead
byrnHDF Jan 22, 2021
bd52065
Fix typo
byrnHDF Jan 22, 2021
238c060
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Jan 25, 2021
f12b2ae
Update CDash mode
byrnHDF Jan 26, 2021
673aac8
Correct name of threadsafe
byrnHDF Jan 26, 2021
97df6db
Correct option name
byrnHDF Jan 26, 2021
e48f758
Undo accidental commit
byrnHDF Jan 26, 2021
2f364d8
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Jan 27, 2021
f42f02b
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Jan 27, 2021
5b48b33
Note LLVM 10 to 11 format default changes
byrnHDF Jan 27, 2021
9927372
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Jan 28, 2021
ad61d57
Update format plugin
byrnHDF Jan 28, 2021
613bc7a
Undo clang-format version 11 changes
byrnHDF Jan 28, 2021
0114098
One more correction
byrnHDF Jan 28, 2021
a685efa
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Jan 29, 2021
78f25ac
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Feb 1, 2021
1899ba6
Update supported platforms
byrnHDF Feb 2, 2021
28d6d63
Revert whitespace changes
byrnHDF Feb 2, 2021
f1a0239
Correct whitespace
byrnHDF Feb 2, 2021
b656722
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Feb 3, 2021
1c9eaf4
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Feb 4, 2021
f85f7da
Changes from PR#3
byrnHDF Feb 4, 2021
464d08e
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Feb 5, 2021
34ad32c
HDFFV-11213 added option to control gcc10 warnings diagnostics
byrnHDF Feb 5, 2021
d6db05b
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into
byrnHDF Feb 8, 2021
264caff
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Feb 9, 2021
9b42150
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Feb 10, 2021
4569d39
HDFFV-11212 Use the new references correctly in JNI utility and tests
byrnHDF Feb 11, 2021
4a2865c
format source
byrnHDF Feb 11, 2021
1a2dc75
Fix typo
byrnHDF Feb 11, 2021
23679fa
Add new test file
byrnHDF Feb 11, 2021
232426b
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Feb 16, 2021
020a40c
HDFFV-11212 - update test and remove unused arg
byrnHDF Feb 16, 2021
2352972
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Feb 17, 2021
5806658
Minor non-space formatting changes
byrnHDF Feb 18, 2021
83b619f
Use H5I_INVALID_ID instead of "-1"
byrnHDF Feb 19, 2021
fbf97be
source formatting
byrnHDF Feb 19, 2021
ea94075
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Feb 19, 2021
797a6c2
add missing testfile, update jni function
byrnHDF Feb 19, 2021
32d6ee9
Undo commit of debug code
byrnHDF Feb 19, 2021
71c4557
remove mislocated file
byrnHDF Feb 19, 2021
2c6df43
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Feb 19, 2021
66d54a9
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Feb 19, 2021
08c7738
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Feb 19, 2021
46c620f
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Feb 22, 2021
a4132c8
Fix h5repack test for handling of fapls and id close
byrnHDF Feb 22, 2021
498d7ec
Update h5diff test files usage text
byrnHDF Feb 22, 2021
82ff537
HDFFV-11212 add new ref tests for JNI export dataset
byrnHDF Feb 22, 2021
7e81307
src format update
byrnHDF Feb 22, 2021
4bda56f
Remove blank line typo
byrnHDF Feb 22, 2021
25884a6
src format typo
byrnHDF Feb 22, 2021
07d8cf2
long double requires %Lg
byrnHDF Feb 22, 2021
8735c2a
Another long double foramt specifer S.B. %Lg
byrnHDF Feb 22, 2021
140aca0
issue with t128bit test
byrnHDF Feb 22, 2021
c790f17
Windows issue with h5dump and type.
byrnHDF Feb 22, 2021
eb3f7cc
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Feb 23, 2021
76d4fba
Fix review issues
byrnHDF Feb 23, 2021
7b96c23
refactor function nesting and fix error checks
byrnHDF Feb 23, 2021
90bb747
format fixes
byrnHDF Feb 23, 2021
321b926
Remove untested functions and javadoc quiet comments
byrnHDF Feb 23, 2021
2d40134
Restore TRY block.
byrnHDF Feb 24, 2021
b8cda57
Change string append errors to memory exception
byrnHDF Feb 24, 2021
ec3c879
revert to H5_JNI_FATAL_ERROR - support functions need work
byrnHDF Feb 24, 2021
0a56190
Add assertion error for h5util functions
byrnHDF Feb 24, 2021
282ac70
remove duplicate function
byrnHDF Feb 24, 2021
9eae4f5
format fix
byrnHDF Feb 24, 2021
a3d7f13
Revert HD function error handling
byrnHDF Feb 24, 2021
3ea3719
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Feb 25, 2021
2a71393
Update copyright comments
byrnHDF Feb 25, 2021
68d7443
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Feb 25, 2021
dab6971
GH #386 java folder copyright corrections
byrnHDF Feb 26, 2021
bfa3508
Whitespace
byrnHDF Feb 26, 2021
b42646f
GH #359 implement and fix tools 1.6 API usage
byrnHDF Feb 26, 2021
f10a3a1
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Feb 26, 2021
6d17d6f
remove excessive comments
byrnHDF Feb 26, 2021
a9bd5ba
Flip inits to correct ifdef section
byrnHDF Feb 26, 2021
7037609
rework ifdef to be simpler
byrnHDF Feb 26, 2021
9e7b3d7
format issue
byrnHDF Feb 26, 2021
d76e848
Reformat ifdef inits
byrnHDF Feb 26, 2021
49e5203
remove static attribute
byrnHDF Feb 26, 2021
53a1528
format compliance
byrnHDF Feb 26, 2021
bb01c7b
Update names
byrnHDF Feb 28, 2021
70a7b81
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Mar 1, 2021
97ed2a4
Revert because logic relies on float not being int
byrnHDF Mar 1, 2021
f19f7d6
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Mar 1, 2021
2998e91
Changes noticed from creating merge of #412
byrnHDF Mar 2, 2021
5b6e1af
Double underscore change
byrnHDF Mar 2, 2021
e478961
Correct compiler version variable used
byrnHDF Mar 3, 2021
f00ce36
Remove header guard underscores
byrnHDF Mar 3, 2021
24db13a
Whitespace cleanup
byrnHDF Mar 3, 2021
1309524
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Mar 4, 2021
0b04714
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Mar 5, 2021
e460b2b
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Mar 5, 2021
c7115cd
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Mar 8, 2021
746ab82
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Mar 10, 2021
d429b3f
Split format source and commit changes on repo push
byrnHDF Mar 10, 2021
9029a70
remove pre-split setting
byrnHDF Mar 10, 2021
04284c1
Change windows TS to use older VS.
byrnHDF Mar 10, 2021
33f8693
correct window os name
byrnHDF Mar 10, 2021
723aa6d
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Mar 10, 2021
49f92f0
HDFFV-11212 JNI export util and Javadoc
byrnHDF Mar 11, 2021
b6d4127
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Mar 11, 2021
e555eb6
Suggested review changes
byrnHDF Mar 11, 2021
720c393
Another change found
byrnHDF Mar 11, 2021
c3bd691
Committing clang-format changes
github-actions[bot] Mar 11, 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
27 changes: 24 additions & 3 deletions java/src/hdf/hdf5lib/H5.java
Original file line number Diff line number Diff line change
Expand Up @@ -512,8 +512,8 @@ public synchronized static native int H5set_free_list_limits(int reg_global_lim,
*
* @param file_export_name
* The file name to export data into.
* @param file_name
* The name of the HDF5 file containing the dataset.
* @param file_id
* The identifier of the HDF5 file containing the dataset.
* @param object_path
* The full path of the dataset to be exported.
* @param binary_order
Expand All @@ -525,9 +525,30 @@ public synchronized static native int H5set_free_list_limits(int reg_global_lim,
* @exception HDF5LibraryException
* - Error from the HDF-5 Library.
**/
public synchronized static native void H5export_dataset(String file_export_name, String file_name,
public synchronized static native void H5export_dataset(String file_export_name, long file_id,
String object_path, int binary_order) throws HDF5LibraryException;

/**
* H5export_attribute is a utility function to save data in a file.
*
* @param file_export_name
* The file name to export data into.
* @param dataset_id
* The identifier of the dataset containing the attribute.
* @param attribute_name
* The attribute to be exported.
* @param binary_order
* 99 - export data as text.
* 1 - export data as binary Native Order.
* 2 - export data as binary Little Endian.
* 3 - export data as binary Big Endian.
*
* @exception HDF5LibraryException
* - Error from the HDF-5 Library.
**/
public synchronized static native void H5export_attribute(String file_export_name, long dataset_id,
String attribute_name, int binary_order) throws HDF5LibraryException;

/**
* H5is_library_threadsafe Checks to see if the library was built with thread-safety enabled.
*
Expand Down
10 changes: 5 additions & 5 deletions java/src/hdf/hdf5lib/HDF5Constants.java
Original file line number Diff line number Diff line change
Expand Up @@ -55,15 +55,15 @@ public class HDF5Constants {
public static final int H5_INDEX_CRT_ORDER = H5_INDEX_CRT_ORDER();
/** indices on links, number of indices defined */
public static final int H5_INDEX_N = H5_INDEX_N();
/** */
/** Common iteration orders, Unknown order */
public static final int H5_ITER_UNKNOWN = H5_ITER_UNKNOWN();
/** */
/** Common iteration orders, Increasing order */
public static final int H5_ITER_INC = H5_ITER_INC();
/** */
/** Common iteration orders, Decreasing order */
public static final int H5_ITER_DEC = H5_ITER_DEC();
/** */
/** Common iteration orders, No particular order, whatever is fastest */
public static final int H5_ITER_NATIVE = H5_ITER_NATIVE();
/** */
/** Common iteration orders, Number of iteration orders */
public static final int H5_ITER_N = H5_ITER_N();
/** */
public static final int H5AC_CURR_CACHE_CONFIG_VERSION = H5AC_CURR_CACHE_CONFIG_VERSION();
Expand Down
24 changes: 18 additions & 6 deletions java/src/hdf/hdf5lib/HDF5GroupInfo.java
Original file line number Diff line number Diff line change
Expand Up @@ -90,32 +90,44 @@ public void reset() {
linklen = 0;
}

/** fileno accessors */
/** fileno accessors
* @return the file number if successful
*/
public long[] getFileno() {
return fileno;
}

/** accessors */
/** accessors
* @return the object number if successful
*/
public long[] getObjno() {
return objno;
}

/** accessors */
/** accessors
* @return type of group if successful
*/
public int getType() {
return type;
}

/** accessors */
/** accessors
* @return the number of links in the group if successful
*/
public int getNlink() {
return nlink;
}

/** accessors */
/** accessors
* @return the modified time value if successful
*/
public long getMtime() {
return mtime;
}

/** accessors */
/** accessors
* @return a length of link name if successful
*/
public int getLinklen() {
return linklen;
}
Expand Down
10 changes: 4 additions & 6 deletions java/src/hdf/hdf5lib/HDFArray.java
Original file line number Diff line number Diff line change
Expand Up @@ -827,12 +827,10 @@ public ArrayDescriptor(Object anArray) throws HDF5Exception
else if (NT == 'S') {
NTsize = 2;
}
else if ((NT == 'I')
|| (NT == 'F')) {
else if ((NT == 'I') || (NT == 'F')) {
NTsize = 4;
}
else if ((NT == 'J')
|| (NT == 'D')) {
else if ((NT == 'J') || (NT == 'D')) {
NTsize = 8;
}
else if (css.startsWith("Ljava.lang.Byte")) {
Expand Down Expand Up @@ -925,8 +923,8 @@ public void dumpInfo()
System.out.println("Type: " + theType);
System.out.println("Class: " + theClass);
System.out.println("NT: " + NT + " NTsize: " + NTsize);
System.out
.println("Array has " + dims + " dimensions (" + totalSize + " bytes, " + totalElements + " elements)");
System.out.println("Array has " + dims + " dimensions (" + totalSize
+ " bytes, " + totalElements + " elements)");
int i;
for (i = 0; i <= dims; i++) {
Class tc = objs[i].getClass();
Expand Down
6 changes: 3 additions & 3 deletions java/src/hdf/hdf5lib/structs/H5_ih_info_t.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
*/
public class H5_ih_info_t implements Serializable {
private static final long serialVersionUID = -142238015615462707L;
/** */
public long index_size; /* btree and/or list */
/** */
/** btree and/or list size of index */
public long index_size;
/** btree and/or list size of hp */
public long heap_size;

H5_ih_info_t (long index_size, long heap_size)
Expand Down
Loading