Fix ongoing breakages in pip builds

1. CL/161014271 added timeseries to tensorflow, but did not add the files to the TensorFlow pip package, resulting in Jenkins test errors: e.g., http://ci.tensorflow.org/job/tensorflow-cl-cpu-python3-pip/9269/console

2. Fix numpy issues related to using float as size args, which is illegal in some recent versions of numpy.

3. The tensorflow/contrib/boosted_trees py_tests are not working in the pip (specifically bazel_pip) builds. Disable them in pip builds for now after filing b/63386583.

PiperOrigin-RevId: 161097246
This commit is contained in:
Shanqing Cai 2017-07-06 10:29:43 -07:00 committed by TensorFlower Gardener
parent d1567d35e7
commit 583497f167
4 changed files with 45 additions and 11 deletions

View File

@ -72,7 +72,10 @@ py_test(
size = "small",
srcs = ["python/kernel_tests/ensemble_optimizer_ops_test.py"],
srcs_version = "PY2AND3",
tags = ["nomac"], # b/63258195
tags = [
"no_pip", # b/63386583
"nomac", # b/63258195
],
deps = [
":ensemble_optimizer_ops_py",
":model_ops_py",
@ -91,7 +94,10 @@ py_test(
size = "small",
srcs = ["python/kernel_tests/model_ops_test.py"],
srcs_version = "PY2AND3",
tags = ["nomac"], # b/63258195
tags = [
"no_pip", # b/63386583
"nomac", # b/63258195
],
deps = [
":ensemble_optimizer_ops_py",
":model_ops_py",
@ -112,7 +118,10 @@ py_test(
size = "small",
srcs = ["python/kernel_tests/prediction_ops_test.py"],
srcs_version = "PY2AND3",
tags = ["nomac"], # b/63258195
tags = [
"no_pip", # b/63386583
"nomac", # b/63258195
],
deps = [
":model_ops_py",
":prediction_ops_py",
@ -131,7 +140,10 @@ py_test(
size = "small",
srcs = ["python/kernel_tests/quantile_ops_test.py"],
srcs_version = "PY2AND3",
tags = ["nomac"], # b/63258195
tags = [
"no_pip", # b/63386583
"nomac", # b/63258195
],
deps = [
":quantile_ops_py",
"//tensorflow/contrib/boosted_trees/proto:quantiles_proto_py",
@ -148,6 +160,9 @@ py_test(
size = "small",
srcs = ["python/kernel_tests/split_handler_ops_test.py"],
srcs_version = "PY2AND3",
tags = [
"no_pip", # b/63386583
],
deps = [
":split_handler_ops_py",
"//tensorflow/contrib/boosted_trees/proto:learner_proto_py",
@ -163,7 +178,10 @@ py_test(
size = "small",
srcs = ["python/kernel_tests/stats_accumulator_ops_test.py"],
srcs_version = "PY2AND3",
tags = ["nomac"], # b/63258195
tags = [
"no_pip", # b/63386583
"nomac", # b/63258195
],
deps = [
":stats_accumulator_ops_py",
"//tensorflow/python:framework_test_lib",
@ -179,7 +197,10 @@ py_test(
size = "small",
srcs = ["python/kernel_tests/training_ops_test.py"],
srcs_version = "PY2AND3",
tags = ["nomac"], # b/63258195
tags = [
"no_pip", # b/63386583
"nomac", # b/63258195
],
deps = [
":model_ops_py",
":training_ops_py",

View File

@ -22,6 +22,18 @@ py_library(
],
)
py_library(
name = "timeseries_pip",
deps = [
":timeseries",
"//tensorflow/contrib/timeseries/examples:known_anomaly",
"//tensorflow/contrib/timeseries/examples:multivariate",
"//tensorflow/contrib/timeseries/examples:predict",
"//tensorflow/contrib/timeseries/python/timeseries:test_utils",
"//tensorflow/contrib/timeseries/python/timeseries/state_space_models:test_utils",
],
)
filegroup(
name = "all_files",
srcs = glob(

View File

@ -66,7 +66,7 @@ class ARModelTest(test.TestCase):
noise_stddev / 3. * np.random.randn(num_samples, 1))
# Add some anomalies to data1
if anomaly_prob > 0.:
num_anomalies = anomaly_prob * num_samples
num_anomalies = int(anomaly_prob * num_samples)
anomaly_values = (anomaly_stddev_scale * noise_stddev / 4 *
np.random.randn(num_anomalies))
indices = np.random.randint(0, num_samples, num_anomalies)

View File

@ -141,18 +141,19 @@ sh_binary(
"//tensorflow/contrib/labeled_tensor:labeled_tensor_pip",
"//tensorflow/contrib/ndlstm:ndlstm",
"//tensorflow/contrib/nn:nn_py",
"//tensorflow/contrib/predictor:predictor_pip",
"//tensorflow/contrib/session_bundle:session_bundle_pip",
"//tensorflow/contrib/signal:signal_py",
"//tensorflow/contrib/slim:slim",
"//tensorflow/contrib/slim/python/slim/data:data_pip",
"//tensorflow/contrib/slim/python/slim/nets:nets_pip",
"//tensorflow/contrib/tpu:tpu_estimator",
"//tensorflow/contrib/tpu:tpu_helper_library",
"//tensorflow/contrib/tpu:tpu_py",
"//tensorflow/contrib/specs:specs",
"//tensorflow/contrib/tensor_forest:init_py",
"//tensorflow/contrib/tensor_forest/hybrid:hybrid_pip",
"//tensorflow/contrib/predictor:predictor_pip",
"//tensorflow/contrib/timeseries:timeseries_pip",
"//tensorflow/contrib/tpu:tpu_estimator",
"//tensorflow/contrib/tpu:tpu_helper_library",
"//tensorflow/contrib/tpu:tpu_py",
"//tensorflow/examples/tutorials/mnist:package",
"//tensorflow/python:distributed_framework_test_lib",
"//tensorflow/python:meta_graph_testdata",