Skip to content

Commit

Permalink
* Upgrade presets for HDF5 1.10.3
Browse files Browse the repository at this point in the history
  • Loading branch information
saudet committed Aug 23, 2018
1 parent d0898e5 commit d6dc945
Show file tree
Hide file tree
Showing 11 changed files with 285 additions and 115 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* Define `std::vector<tensorflow::OpDef>` type to `OpDefVector` for TensorFlow
* Link HDF5 with zlib on Windows also ([issue deeplearning4j/deeplearning4j#6017](https://github.com/deeplearning4j/deeplearning4j/issues/6017))
* Enable MKL-DNN for TensorFlow
* Upgrade presets for FFmpeg 4.0.2, MKL-DNN 0.16, ARPACK-NG 3.6.2, Tesseract 4.0.0-beta.4, cuDNN 7.2, MXNet 1.2.1, TensorFlow 1.10.0, and their dependencies
* Upgrade presets for FFmpeg 4.0.2, HDF5 1.10.3, MKL-DNN 0.16, ARPACK-NG 3.6.2, Tesseract 4.0.0-beta.4, cuDNN 7.2, MXNet 1.2.1, TensorFlow 1.10.0, and their dependencies
* Fix loading issue with `opencv_cudaobjdetect` and `opencv_cudaoptflow` on Windows ([issue #592](https://github.com/bytedeco/javacpp-presets/issues/592))

### July 17, 2018 version 1.4.2
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ Each child module in turn relies by default on the included [`cppbuild.sh` scrip
* ARToolKitPlus 2.3.1 https://launchpad.net/artoolkitplus
* Chilitags https://github.com/chili-epfl/chilitags
* flandmark 1.07 http://cmp.felk.cvut.cz/~uricamic/flandmark/#download
* HDF5 1.10.2 https://support.hdfgroup.org/HDF5/
* HDF5 1.10.3 https://support.hdfgroup.org/HDF5/
* MKL 2018.3 https://software.intel.com/intel-mkl
* MKL-DNN 0.16 https://github.com/intel/mkl-dnn
* OpenBLAS 0.3.0 http://www.openblas.net/
Expand Down
2 changes: 1 addition & 1 deletion caffe/platform/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<dependency>
<groupId>org.bytedeco.javacpp-presets</groupId>
<artifactId>hdf5-platform</artifactId>
<version>1.10.2-${project.parent.version}</version>
<version>1.10.3-${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.bytedeco.javacpp-presets</groupId>
Expand Down
6 changes: 3 additions & 3 deletions caffe/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<dependency>
<groupId>org.bytedeco.javacpp-presets</groupId>
<artifactId>hdf5</artifactId>
<version>1.10.2-${project.parent.version}</version>
<version>1.10.3-${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.bytedeco.javacpp-presets</groupId>
Expand Down Expand Up @@ -56,7 +56,7 @@
<dependency>
<groupId>org.bytedeco.javacpp-presets</groupId>
<artifactId>hdf5</artifactId>
<version>1.10.2-${project.parent.version}</version>
<version>1.10.3-${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.bytedeco.javacpp-presets</groupId>
Expand All @@ -72,7 +72,7 @@
<dependency>
<groupId>org.bytedeco.javacpp-presets</groupId>
<artifactId>hdf5</artifactId>
<version>1.10.2-${project.parent.version}</version>
<version>1.10.3-${project.parent.version}</version>
<classifier>${javacpp.platform}</classifier>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions hdf5/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Introduction
------------
This directory contains the JavaCPP Presets module for:

* HDF5 1.10.2 https://support.hdfgroup.org/HDF5/
* HDF5 1.10.3 https://support.hdfgroup.org/HDF5/

Please refer to the parent README.md file for more detailed information about the JavaCPP Presets.

Expand Down Expand Up @@ -42,7 +42,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic
<dependency>
<groupId>org.bytedeco.javacpp-presets</groupId>
<artifactId>hdf5-platform</artifactId>
<version>1.10.2-1.4.2</version>
<version>1.10.3-1.4.2</version>
</dependency>
</dependencies>
</project>
Expand Down
4 changes: 2 additions & 2 deletions hdf5/cppbuild.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ if [[ -z "$PLATFORM" ]]; then
fi

ZLIB=zlib-1.2.11
HDF5_VERSION=1.10.2
HDF5_VERSION=1.10.3
download "http://zlib.net/$ZLIB.tar.gz" $ZLIB.tar.gz
download "https://www.hdfgroup.org/package/source-bzip2-2/?wpdmdl=11811" hdf5-$HDF5_VERSION.tar.bz2
download "https://www.hdfgroup.org/package/source-bzip/?wpdmdl=12594" hdf5-$HDF5_VERSION.tar.bz2

mkdir -p $PLATFORM
cd $PLATFORM
Expand Down
2 changes: 1 addition & 1 deletion hdf5/platform/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<groupId>org.bytedeco.javacpp-presets</groupId>
<artifactId>hdf5-platform</artifactId>
<version>1.10.2-${project.parent.version}</version>
<version>1.10.3-${project.parent.version}</version>
<name>JavaCPP Presets Platform for HDF5</name>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion hdf5/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<groupId>org.bytedeco.javacpp-presets</groupId>
<artifactId>hdf5</artifactId>
<version>1.10.2-${project.parent.version}</version>
<version>1.10.3-${project.parent.version}</version>
<name>JavaCPP Presets for HDF5</name>

<properties>
Expand Down
372 changes: 271 additions & 101 deletions hdf5/src/main/java/org/bytedeco/javacpp/hdf5.java

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion hdf5/src/main/java/org/bytedeco/javacpp/presets/hdf5.java
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"H5LTpublic.h", "H5IMpublic.h", "H5TBpublic.h", "H5PTpublic.h", "H5LDpublic.h", "H5PacketTable.h",

"H5Cpp.h", "H5Include.h", "H5Exception.h", "H5IdComponent.h", "H5DataSpace.h", "H5PropList.h", "H5AbstractDs.h", "H5Attribute.h",
"H5OcreatProp.h", "H5DcreatProp.h", "H5LaccProp.h", "H5LcreatProp.h", "H5Location.h", "H5Object.h", "H5CommonFG.h", "H5DataType.h", "H5DxferProp.h",
"H5OcreatProp.h", "H5DcreatProp.h", "H5LaccProp.h", "H5DaccProp.h", "H5LcreatProp.h", "H5Location.h", "H5Object.h", "H5CommonFG.h", "H5DataType.h", "H5DxferProp.h",
"H5FaccProp.h", "H5FcreatProp.h", "H5AtomType.h", "H5PredType.h", "H5EnumType.h", "H5IntType.h", "H5FloatType.h", "H5StrType.h", "H5CompType.h",
"H5ArrayType.h", "H5VarLenType.h", "H5DataSet.h", "H5Group.h", "H5File.h", "H5Library.h"},
link = {"hdf5@.101", "hdf5_cpp@.102", "hdf5_hl@.100", "hdf5_hl_cpp@.100"}, resource = {"include", "lib"}),
Expand Down
2 changes: 1 addition & 1 deletion platform/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@
<dependency>
<groupId>org.bytedeco.javacpp-presets</groupId>
<artifactId>hdf5-platform</artifactId>
<version>1.10.2-${project.version}</version>
<version>1.10.3-${project.version}</version>
</dependency>
<dependency>
<groupId>org.bytedeco.javacpp-presets</groupId>
Expand Down

0 comments on commit d6dc945

Please sign in to comment.