Merge branch 'master' of github.com:google/jax

google · Feb 17, 2019 · f0bd48d · f0bd48d
2 parents 2772375 + 7187c36
commit f0bd48d
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/WORKSPACE b/WORKSPACE
@@ -17,10 +17,10 @@ http_archive(
 #    and update the sha256 with the result.
 http_archive(
    name = "org_tensorflow",
-   sha256 = "1766df7e9326c4e29a935647eabc5a2de52f1878f8248d4714c9cf01c4f75961",
-   strip_prefix = "tensorflow-294858ccb2a5cd44072378afd6d18cc61ab83e76",
+   sha256 = "a19b64d5c7aecb8487302843b27c8fde916dc08df8d9c2fdded20d94e0947c34",
+   strip_prefix = "tensorflow-355cc566efd2d86fe71fa9d755ceabe546d577a7",
    urls = [
-       "https://github.com/tensorflow/tensorflow/archive/294858ccb2a5cd44072378afd6d18cc61ab83e76.tar.gz",
+       "https://github.com/tensorflow/tensorflow/archive/355cc566efd2d86fe71fa9d755ceabe546d577a7.tar.gz",
    ],
 )
 

diff --git a/build/Dockerfile b/build/Dockerfile
@@ -21,11 +21,13 @@ WORKDIR /
 RUN git clone https://github.com/pyenv/pyenv.git /pyenv
 ENV PYENV_ROOT /pyenv
 RUN /pyenv/bin/pyenv install 2.7.15
+RUN /pyenv/bin/pyenv install 3.5.6
 RUN /pyenv/bin/pyenv install 3.6.8
 RUN /pyenv/bin/pyenv install 3.7.2
 
 # We pin numpy to a version < 1.16 to avoid version compatibility issues.
 RUN eval "$(/pyenv/bin/pyenv init -)" && /pyenv/bin/pyenv local 2.7.15 && pip install numpy==1.15.4 scipy cython setuptools wheel
+RUN eval "$(/pyenv/bin/pyenv init -)" && /pyenv/bin/pyenv local 3.5.6 && pip install numpy==1.15.4 scipy cython setuptools wheel
 RUN eval "$(/pyenv/bin/pyenv init -)" && /pyenv/bin/pyenv local 3.6.8 && pip install numpy==1.15.4 scipy cython setuptools wheel
 RUN eval "$(/pyenv/bin/pyenv init -)" && /pyenv/bin/pyenv local 3.7.2 && pip install numpy==1.15.4 scipy cython setuptools wheel
 

diff --git a/build/build_jaxlib_wheels.sh b/build/build_jaxlib_wheels.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -xev
 
-PYTHON_VERSIONS="2.7.15 3.6.8 3.7.2"
+PYTHON_VERSIONS="2.7.15 3.5.6 3.6.8 3.7.2"
 CUDA_VERSIONS="9.0 9.2 10.0"
 CUDA_VARIANTS="cuda" # "cuda-included"
 

diff --git a/build/build_jaxlib_wheels_macos.sh b/build/build_jaxlib_wheels_macos.sh
@@ -40,5 +40,6 @@ build_jax () {
 
 rm -fr build/dist
 build_jax 2.7.15 cp27
+build_jax 3.5.6 cp35
 build_jax 3.6.8 cp36
 build_jax 3.7.2 cp37
diff --git a/build/setup.py b/build/setup.py
@@ -20,7 +20,7 @@
 
 setup(
     name='jaxlib',
-    version='0.1.7',
+    version='0.1.8',
     description='XLA library for JAX',
     author='JAX team',
     author_email='jax-dev@google.com',