Merge branch 'test-travis'

.travis.yml

@@ -20,10 +20,10 @@ matrix:
   include:
   - os: linux
     python: 2.7
-    env: TF_VERSION=1.4.0rc0 TF_TYPE=release
+    env: TF_VERSION=1.4.1 TF_TYPE=release
   - os: linux
     python: 3.5
-    env: TF_VERSION=1.4.0rc0 TF_TYPE=release
+    env: TF_VERSION=1.4.1 TF_TYPE=release
   - os: linux
     python: 2.7
     env: TF_VERSION=1.head TF_TYPE=nightly

setup.py

@@ -27,10 +27,14 @@ setup(
     version=__version__,
     description='Neural Network Toolbox on TensorFlow',
     long_description=long_description,
+
     install_requires=req,
     tests_require=['flake8', 'scikit-image'],
     extras_require={
         'all': ['pillow', 'scipy', 'h5py', 'lmdb>=0.92', 'matplotlib',
                 'scikit-learn', "tornado; python_version < '3.0'"]
     },
+
+    include_package_data=True,
+    package_data={'tensorpack': ['user_ops/Makefile', 'user_ops/*.cc', 'user_ops/*.h']},
 )

tensorpack/user_ops/zmq_recv_op.cc

@@ -71,7 +71,8 @@ class ZMQRecvOp: public AsyncOpKernel {
       TensorShape& shape = tensors[i].shape;
       OP_REQUIRES_OK_ASYNC(ctx, ctx->allocate_output(i, shape, &output), done);
       // reinterpret cast and then memcpy
-      auto ptr = output->bit_casted_shaped<char, 1>({shape.num_elements()}).data();
+      auto ptr = output->bit_casted_shaped<char, 1>(
+          {shape.num_elements() * DataTypeSize(recv_dtype)}).data();
       memcpy(ptr, tensors[i].buf, tensors[i].buf_size);
       ctx->set_output(i, *output);
     }

tests/run-tests.sh

@@ -12,3 +12,5 @@ python -c 'from tensorpack.dataflow.imgaug import transform'
 python -m unittest discover -v
 # python -m tensorpack.models._test
 # segfault for no reason (https://travis-ci.org/ppwwyyxx/tensorpack/jobs/217702985)
+
+# python ../tensorpack/user_ops/test-recv-op.py