diff --git a/ci_build/outer_launch_tests.sh b/ci_build/outer_launch_tests.sh index ace0a31..b939e59 100755 --- a/ci_build/outer_launch_tests.sh +++ b/ci_build/outer_launch_tests.sh @@ -8,5 +8,6 @@ STACK_RESOLVER=${STACK_RESOLVER:-lts-6.2} IMAGE_NAME=tensorflow/haskell/ci_build:$STACK_RESOLVER git submodule update +docker pull tensorflow/tensorflow:nightly-devel docker build --build-arg STACK_RESOLVER=$STACK_RESOLVER -t $IMAGE_NAME -f ci_build/Dockerfile . docker run $IMAGE_NAME stack build --resolver=$STACK_RESOLVER --pedantic --test diff --git a/tensorflow-proto/tensorflow-proto.cabal b/tensorflow-proto/tensorflow-proto.cabal index 2cb3a69..a7ad83b 100644 --- a/tensorflow-proto/tensorflow-proto.cabal +++ b/tensorflow-proto/tensorflow-proto.cabal @@ -12,6 +12,7 @@ build-type: Custom cabal-version: >=1.22 extra-source-files: ../third_party/tensorflow/tensorflow/core/framework/*.proto , ../third_party/tensorflow/tensorflow/core/protobuf/config.proto + , ../third_party/tensorflow/tensorflow/core/protobuf/debug.proto library exposed-modules: Proto.Tensorflow.Core.Framework.AttrValue @@ -29,6 +30,7 @@ library , Proto.Tensorflow.Core.Framework.StepStats , Proto.Tensorflow.Core.Framework.TensorDescription , Proto.Tensorflow.Core.Framework.Versions + , Proto.Tensorflow.Core.Protobuf.Debug build-depends: proto-lens == 0.1.* , proto-lens-protoc == 0.1.* , base >= 4.7 && < 5 diff --git a/third_party/tensorflow b/third_party/tensorflow index 3d41cf7..2e22f1b 160000 --- a/third_party/tensorflow +++ b/third_party/tensorflow @@ -1 +1 @@ -Subproject commit 3d41cf77d624aeee0482f92121a9300b29db2809 +Subproject commit 2e22f1b20fdfa77b1332c518617391dc32359c5b