Skip to content

Commit

Permalink
Update presets for Caffe rc3
Browse files Browse the repository at this point in the history
  • Loading branch information
saudet committed Mar 1, 2016
1 parent 474ce3e commit 902ff15
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* Work around GSL not loading on Android ([issue bytedeco/javacpp#55](https://github.com/bytedeco/javacpp/issues/55))
* Fix Android builds of FFmpeg, FFTW, GSL, Leptonica, and Tesseract causing errors under Mac OS X ([issue #45](https://github.com/bytedeco/javacpp-presets/issues/45))
* Avoid versioning of FFTW and GSL libraries, preventing them from working on Android ([issue #127](https://github.com/bytedeco/javacpp-presets/issues/127))
* Upgrade presets for OpenCV 3.1.0, FFmpeg 3.0, libdc1394 2.2.4, videoInput, GSL 2.1, cuDNN 4, and Caffe, including the latest versions of their dependencies ([issue bytedeco/javacpp#55](https://github.com/bytedeco/javacpp/issues/55))
* Upgrade presets for OpenCV 3.1.0, FFmpeg 3.0, libdc1394 2.2.4, videoInput, GSL 2.1, cuDNN 4, and Caffe rc3, including the latest versions of their dependencies ([issue bytedeco/javacpp#55](https://github.com/bytedeco/javacpp/issues/55))
* Add presets for MXNet and TensorFlow ([issue #111](https://github.com/bytedeco/javacpp-presets/issues/111))
* Virtualize `opencv_videostab.IFrameSource` to let us implement it in Java ([issue bytedeco/javacv#277](https://github.com/bytedeco/javacv/issues/277))
* Fix MinGW-w64 builds with recent versions of GCC 5.x and potential issue with using "w32threads" for FFmpeg
Expand Down
2 changes: 1 addition & 1 deletion caffe/cppbuild.sh
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ LMDB=0.9.17
BOOST=1_59_0
HDF5=1.8.16
OPENBLAS=0.2.15
CAFFE_VERSION=master
CAFFE_VERSION=rc3

download https://github.com/google/glog/archive/v$GLOG.tar.gz glog-$GLOG.tar.gz
download https://github.com/gflags/gflags/archive/v$GFLAGS.tar.gz gflags-$GFLAGS.tar.gz
Expand Down
2 changes: 1 addition & 1 deletion caffe/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>caffe</artifactId>
<version>master-${project.parent.version}</version>
<version>rc3-${project.parent.version}</version>
<packaging>jar</packaging>
<name>JavaCPP Presets for Caffe</name>

Expand Down

0 comments on commit 902ff15

Please sign in to comment.