Commit Graph

24 Commits

Author SHA1 Message Date
Geoffrey Irving
197230147c Ignore tools/git/gen and fix a bash error in python_config.sh (#5405)
* Ignore tools/git/gen

* Avoid bash error in python_config.sh

Without this change, I get

    Please specify the location of python. [Default is /usr/bin/python]:
    Do you wish to build TensorFlow with Google Cloud Platform support? [y/N]
    No Google Cloud Platform support will be enabled for TensorFlow
    Do you wish to build TensorFlow with Hadoop File System support? [y/N]
    No Hadoop File System support will be enabled for TensorFlow
    ./util/python/python_config.sh: line 124: [: : integer expression expected
    Found possible Python library paths:
      /usr/local/lib/python2.7/dist-packages
      /usr/lib/python2.7/dist-packages
      /usr/local/buildtools/current/sitecustomize
    Please input the desired Python library path to use.  Default is [/usr/local/lib/python2.7/dist-packages]

The problem is that -eq is valid only for integers on both sides.
2016-11-04 15:47:59 -07:00
Andreas Eberle
b4798133ad Add environment variable USE_DEFAULT_PYTHON_LIB_PATH to python_config.sh to configure usage of default python library path without user interaction. (#5397) 2016-11-04 13:23:34 -07:00
Victor Villas
c6398454f0 fix echo PYTHON_LIB_PATH variable 2016-10-24 10:05:31 -02:00
Victor Villas
ae369780ef option to config python lib path from env var 2016-10-22 10:31:55 -02:00
Yun Peng
0a0cb099dc Convert PYTHON_BIN_PATH to Windows path style on Windows 2016-10-19 09:06:49 +02:00
Yun Peng
0dda3d7d56 Fixed and improved ./configure on Windows (#4874)
* Fixed and improved ./configure on Windows

1. Make the script work with path containing spaces
2. On Windows, disable bazel clean --expunge(it's broken)
3. Create junctions instead of copying python lib, include, numpy folders
4. fixed symlink creation in gen_git_source.py with python3

* Fixed typo and opt out GCP, HDFS, CUDA on Windows

* Fix python path split on OSX
2016-10-12 16:46:09 +01:00
Liang-Chi Hsieh
ae7de269bc Fix python bath. 2016-10-03 03:28:23 +00:00
Yun Peng
629c799660 Fixed ./configure on Windows (#4449)
* Fixed ./configure on Windows

Basically, symlink doesn't work on Windows

* Fixed shebang of gen_git_source.py

* gen_git_source.py: Replace os.popen with subprocess.check_output

os.popen doesn't work with Bazel properly on Windows, due to this error:
    RuntimeError: Cannot locate a COMSPEC environment variable to use as the shell
2016-09-19 16:07:46 -07:00
Josh Bleecher Snyder
11d3d1ac31 Fix type error in python_config.sh
In the getsitepackages code path,
library_paths is a list.
Make the distutils code path a list as well.
Remove extraneous whitespace while we're here.

Without this, running ./configure:

$ ./configure 
Please specify the location of python. [Default is /Users/josh/.virtualenvs/tf/bin/python]: 
Do you wish to build TensorFlow with Google Cloud Platform support? [y/N] n
No Google Cloud Platform support will be enabled for TensorFlow
Traceback (most recent call last):
  File "<stdin>", line 18, in <module>
TypeError: can only concatenate list (not "str") to list
Found possible Python library paths:
Please input the desired Python library path to use.  Default is []


ln: util/python/python_lib: Invalid argument
2016-09-08 11:02:32 -07:00
Olivia Nordquist
308e34fbd1 fixes #3933 virtualenv using python 2.6 site
Change: 131069999
2016-08-23 10:34:01 -07:00
Benoit Steiner
8b3d8c8b5e Merge changes from github.
Change: 130451359
2016-08-16 15:17:08 -07:00
A. Unique TensorFlower
5c29a24fd6 Fix the tensorflow && tensorflow_serving breakage on bazel ci:
http://ci.bazel.io/job/TensorFlow/BAZEL_VERSION=HEAD,PLATFORM_NAME=linux-x86_64/365/console
Change: 130097501
2016-08-12 07:32:39 -07:00
Olivia Nordquist
4959a12910 fixes github issue #2703 by asking user for a specific python path from a list of possible known locations
Change: 129778433
2016-08-09 12:31:47 -07:00
A. Unique TensorFlower
122cdce33e Update copyright for 3p/tf.
Change: 123901292
2016-06-02 13:41:12 -07:00
Vijay Vasudevan
8cc567bf97 Merge changes from github.
Change: 123342870
2016-05-26 12:18:27 -07:00
Geoffrey Irving
4c85a08666 Rollforward of "Merge changes from github."
Change: 117375570
2016-03-16 16:21:58 -07:00
Vijay Vasudevan
9a4878cc17 Rollback of: "Merge changes from github."
Change: 117304114
2016-03-16 16:20:04 -07:00
Martin Wicke
3ae663ccc5 Merge changes from github.
Change: 117301677
2016-03-16 16:19:29 -07:00
Eugene Brevdo
56f1d64998 Fix dependencies bugs
Change: 116925769
2016-03-11 11:41:23 -08:00
Martin Wicke
59f1eba5fb Merge changes from GitHub, clean up linter errors, fix dependencies test.
Change: 114064632
2016-02-07 12:51:05 -08:00
Vijay Vasudevan
019c679140 TensorFlow: upstream changes to git.
Change 109910602
	TensorFlow: rename packages to their final whl names for linux.

Base CL: 109910643
2015-12-10 10:15:38 -08:00
Vijay Vasudevan
eb5e56e479 TensorFlow: Upstream changes to git.
Change 109344341
	Teach ./configure about Python 3 (and other minor Python 3 issues)

	./configure now writes bazel.rc based on a bazel.rc.template, which gives us a
	place to tell bazel which version of Python we were using.

	Also fix a few tests whose Python 3 support had degraded.

	The only thing left before we have Python 3 support is

	  https://github.com/google/protobuf/pull/1023
Change 109343002
	Update ops.pbtxt to reflect 109321497.
Change 109342838
	Do memory deallocation outside the critical section in gpu_event_mgr.cc.
Change 109334210
	PTB LSTM example: use slicing instead of splitting the inputs.
Change 109332238
	Cleanup TensorBoard local development environment
Change 109331051
	Use __all__ in __init__.py to restrict exported modules

	Specifically, __all__ is now anything that (1) doesn't begin with an underscore
	and (2) isn't a non-whitelisted module.

	This fixes one tiny piece of b/25561952.  Specifically, the following no longer
	exist: tf.np, tf.math_ops, and tf.variables.  tf.ops and tf.tensor_util still
	exist but shouldn't; that will have to wait for a later CL.
Change 109327154
	tf.tuple allow Tensors to be passed in as control_inputs like tf.control_dependencies.
Change 109324239
	Make tf.control_dependencies(None) clear the control dependencies.
	Use that to prevent ops created for Variables to inherit the current
	control dependencies.

	This fixes issues when using ExponentialMovingAverages with control
	dependencies.
Change 109323719
	Added support for boolean tf.scatter_update.

Base CL: 109348398
2015-12-03 14:39:42 -08:00
Vijay Vasudevan
a4806a3fba TensorFlow: upstream changes to git.
Change 109321497
	Move all images to images directory to make docs versioning easier
	- adjust all paths in the docs to point to the new locations
	- remove some now redundant section-order tags added for the old website
Change 109317807
	Added a kernel op to compute the eigendecomposition of a self-adjoint matrix.

	Added a new kernel op called self_adjoint_eig (and a batch_self_adjoint_eig) that
	computes the eigendecomposition of a self-adjoint matrix. The return value is
	the concatenation of the eigenvalues as a row vector, and the eigenvectors.
Change 109310773
	Change `_read32()` in the MNIST input example to return an int.

	Currently we return a 1-D numpy array with 1 element. Numpy has
	recently deprecated the ability to treat this as a scalar, and as a
	result this tutorial fails. The fix returns the 0th element of the
	array instead.
Change 109301269
	Re-arrange TensorBoard demo files.
Change 109273589
	add ci_build for ci.tensorflow.org
Change 109260293
	Speed up NodeDef -> OpKernel process by not spending time generating
	an error message for missing "_kernel" attr that will be thrown away.
Change 109257179
	TensorFlow:make event_file_loader_test hermetic by using tempfile
	instead of fixed filenames.  Without this change, running
	event_file_loader_test twice in the same client (locally)
	causes it to fail, because it writes into the same file and appends
	another event, instead of starting from scratch.
Change 109256464
	Minor cleanup in TensorBoard server code
Change 109255382
	Change to reduce critical section times in gpu_event_mgr.h:
	(1) Call stream->ThenRecordEvent outside the EventMgr critical section
	(2) Do memory deallocation outside the critical section

	Speeds up one configuration of ptb_word_lm from 2924 words per
	second (wps) to 3278 wps on my desktop machine with a Titan X.
Change 109254843
	Fix use of uninitialized memory in test.
Change 109250995
	python_config.sh needs a license header

	Otherwise the license test fails.
Change 109249914
	add ci_build for ci.tensorflow.org
Change 109249397
	Fixes reduce_sum (complex) on GPU segfaults.

	Fixes #357

Change 109245652
	add ci_build for ci.tensorflow.org

Base CL: 109321563
2015-12-03 10:26:25 -08:00
Vijay Vasudevan
bf6b536bde TensorFlow: Upstream changes to git.
Change 109240606
	Fix typo
Change 109240358
	Fix bug in Concat's shape inference due to legacy scalar handling.

	The shape function was inadvertently converting outputs of unknown
	shape (rank=None) to vectors of unknown length (rank=1), due to
	inability to distinguish between legacy scalars and vectors, because
	`max(1, None)` is 1.
Change 109237152
	Remove numarray requirement in python_config.
Change 109234003
	Fix typo in elu documentation.
Change 109232946
	Python must now be configured via ./configure script
Change 109232134
	Backported fixes to the tensor comparison operators from the public Eigen repository
Change 109231761
	Test invalid inputs to softmax_cross_entropy_with_logits.
Change 109230218
	Backported fixes to the tensor comparison operators from the public Eigen repository
Change 109229915
	Correct comments in seq2seq to show the right input types for embedding models.
	(Thanks to hugman@github for bringing this up.)
Change 109229118
	Fix resize_images example in documentation and allow resize_images to run on a single image with partially-known shape.
Change 109228940
	Fix demo and node add/remove button spacing
Change 109227909
	Include Elu in the NN docs.
Change 109227059
	Adds variable_op_scope and makes variable_scope always add a name_scope.

	This creates an op scope for variables that makes it easy to create independent
	operations with a default name by making that name unique for the current scope
	and it allows explicit names that are not made unique.

Change 109224492
	Streamline yuv -> rgb conversion to be done in one pass in native code.

	The entire process now takes ~2ms (including the ByteBuffer.get() calls), down from 10+ ms when the arrays were being interleaved in Java prior to conversion.

	Also abstracting common yuv->rgb color conversion into helper method.
Change 109224389
	Add ability to move nodes in and out of auxiliary nodes in graph.
Change 109217177
	Update generated Op docs.
Change 109215030
	Implementation of the ELU activation function: http://arxiv.org/abs/1511.07289
Change 109209848
	When GPUBFCAllocator runs out of memory, also log a summary
	of chunks in use by size.
Change 109206569
	Switched to the public version of the Eigen::sign method since it supports complex numbers.
Change 109199813
	Modify tensorflow.SequenceExample to support multiple-length sequences.

Base CL: 109241553
2015-12-02 15:04:40 -08:00