Skip to content

Commit

Permalink
Update presets for TensorFlow 0.7.1
Browse files Browse the repository at this point in the history
  • Loading branch information
saudet committed Mar 1, 2016
1 parent 902ff15 commit 8434cfb
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* 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 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))
* Add presets for MXNet and TensorFlow 0.7.1 ([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
* Add missing `StatModel.loadXXX()` methods in the `opencv_ml` module ([issue #109](https://github.com/bytedeco/javacpp-presets/issues/109))
Expand Down
8 changes: 4 additions & 4 deletions tensorflow/cppbuild.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ case $PLATFORM in
;;
esac

PROTOBUF_VERSION=master
TENSORFLOW_VERSION=master
PROTOBUF_VERSION=3.0.0-beta-2
TENSORFLOW_VERSION=0.7.1

download https://github.com/google/protobuf/archive/$PROTOBUF_VERSION.tar.gz protobuf-$PROTOBUF_VERSION.tar.gz
download https://github.com/tensorflow/tensorflow/archive/$TENSORFLOW_VERSION.tar.gz tensorflow-$TENSORFLOW_VERSION.tar.gz
download https://github.com/google/protobuf/archive/v$PROTOBUF_VERSION.tar.gz protobuf-$PROTOBUF_VERSION.tar.gz
download https://github.com/tensorflow/tensorflow/archive/v$TENSORFLOW_VERSION.tar.gz tensorflow-$TENSORFLOW_VERSION.tar.gz

mkdir -p $PLATFORM
cd $PLATFORM
Expand Down
4 changes: 2 additions & 2 deletions tensorflow/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<name>JavaCPP Presets for TensorFlow</name>

<properties>
<tensorflow.version>master</tensorflow.version>
<tensorflow.version>0.7.1</tensorflow.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -45,7 +45,7 @@
<includePath>${basedir}/cppbuild/${javacpp.platform}/tensorflow-${tensorflow.version}/google/protobuf/src/</includePath>
<includePath>${basedir}/cppbuild/${javacpp.platform}/tensorflow-${tensorflow.version}/third_party/eigen3/</includePath>
<includePath>${basedir}/cppbuild/${javacpp.platform}/tensorflow-${tensorflow.version}/bazel-tensorflow-${tensorflow.version}/external/eigen_archive/</includePath>
<includePath>${basedir}/cppbuild/${javacpp.platform}/tensorflow-${tensorflow.version}/bazel-tensorflow-${tensorflow.version}/external/eigen_archive/eigen-eigen-70505a059011/</includePath>
<includePath>${basedir}/cppbuild/${javacpp.platform}/tensorflow-${tensorflow.version}/bazel-tensorflow-${tensorflow.version}/external/eigen_archive/eigen-eigen-c5e90d9e764e/</includePath>
</includePaths>
<linkPaths>
<linkPath>${basedir}/cppbuild/${javacpp.platform}/tensorflow-${tensorflow.version}/bazel-bin/tensorflow/cc/</linkPath>
Expand Down
File renamed without changes.

0 comments on commit 8434cfb

Please sign in to comment.