Skip to content

Commit de82c4f

Browse files
author
sschoenholz
authored
Merge pull request #1 from google/master
Update branch to head.
2 parents 6f2d22f + 9191843 commit de82c4f

File tree

231 files changed

+43330
-15770
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

231 files changed

+43330
-15770
lines changed

.github/workflows/build_mac_jaxlib.yml

-34
This file was deleted.

.gitignore

+5
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,8 @@
99
build/
1010
dist/
1111
.mypy_cache/
12+
.pytype/
13+
docs/notebooks/.ipynb_checkpoints/
14+
docs/_autosummary
15+
.idea
16+
.vscode

.readthedocs.yml

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# .readthedocs.yml
2+
# Read the Docs configuration file
3+
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
4+
5+
# Required
6+
version: 2
7+
8+
# Build documentation in the docs/ directory with Sphinx
9+
sphinx:
10+
configuration: docs/conf.py
11+
12+
# Optionally build your docs in additional formats such as PDF and ePub
13+
formats:
14+
- htmlzip
15+
16+
# Optionally set the version of Python and requirements required to build your docs
17+
python:
18+
version: 3.7
19+
install:
20+
- requirements: docs/requirements.txt

.travis.yml

+40-16
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,51 @@
1-
sudo: false
21
notifications:
32
email: false
43
dist: xenial
54
language: python
6-
python:
7-
- "2.7"
8-
- "3.6"
9-
env:
10-
- JAX_ENABLE_X64=0 JAX_NUM_GENERATED_CASES=25
11-
- JAX_ENABLE_X64=1 JAX_NUM_GENERATED_CASES=25
5+
os: linux
6+
jobs:
7+
include:
8+
- python: "3.6"
9+
env: JAX_ONLY_CHECK_TYPES=true
10+
- python: "3.6"
11+
env: JAX_ENABLE_X64=0 JAX_NUM_GENERATED_CASES=25
12+
- python: "3.6"
13+
env: JAX_ENABLE_X64=1 JAX_NUM_GENERATED_CASES=25
14+
- python: "3.7"
15+
env: JAX_ENABLE_X64=1 JAX_ONLY_DOCUMENTATION=true
16+
1217
before_install:
13-
- if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then
14-
wget https://repo.continuum.io/miniconda/Miniconda2-latest-Linux-x86_64.sh -O miniconda.sh;
15-
else
16-
wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
17-
fi
18+
- wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
1819
- bash miniconda.sh -b -p $HOME/miniconda
1920
- export PATH="$HOME/miniconda/bin:$PATH"
20-
- conda update --yes conda
21+
- conda config --set always_yes yes --set changeps1 no --set show_channel_urls yes
22+
- conda config --set channel_priority strict
23+
- conda config --set add_pip_as_python_dependency yes
24+
- conda config --remove channels defaults
2125
- conda config --add channels conda-forge
26+
- conda update -q conda
2227
install:
23-
- conda install --yes python=$TRAVIS_PYTHON_VERSION pip six protobuf>=3.6.0 absl-py opt_einsum numpy scipy pytest-xdist fastcache
24-
- pip install jaxlib
28+
- conda install --yes python=$TRAVIS_PYTHON_VERSION pip absl-py opt_einsum numpy scipy pytest-xdist pytest-benchmark mypy
29+
- if [ "$JAX_ONLY_CHECK_TYPES" = true ]; then
30+
pip install pytype ;
31+
fi
32+
# The jaxlib version should match the minimum jaxlib version in
33+
# jax/lib/__init__.py. This tests JAX PRs against the oldest permitted
34+
# jaxlib.
35+
- pip install jaxlib==0.1.43
2536
- pip install -v .
37+
# The following are needed to test the Colab notebooks and the documentation building
38+
- if [ "$JAX_ONLY_DOCUMENTATION" = true ]; then
39+
conda install --yes -c conda-forge pandoc ipykernel;
40+
conda install --yes sphinx sphinx_rtd_theme nbsphinx sphinx-autodoc-typehints jupyter_client matplotlib;
41+
pip install sklearn;
42+
fi
2643
script:
27-
- pytest -n 1 tests examples -W ignore
44+
- if [ "$JAX_ONLY_DOCUMENTATION" = true ]; then
45+
sphinx-build -b html -D nbsphinx_execute=always docs docs/build/html ;
46+
elif [ "$JAX_ONLY_CHECK_TYPES" = true ]; then
47+
echo "===== Checking with mypy ====" &&
48+
time mypy --config-file=mypy.ini jax ;
49+
else
50+
pytest tests examples -W ignore ;
51+
fi

CHANGELOG.md

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Change Log
2+
3+
See [docs/CHANGELOG.rst](https://jax.readthedocs.io/en/latest/CHANGELOG.html).

0 commit comments

Comments
 (0)