Merge pull request #1 from jacobeisenstein/ic2s2-changes

Ic2s2 changes

README.md

@@ -3,26 +3,30 @@ Tutorial on Modeling Language Change
 
 This repository holds notebooks, data, and slides related to tutorials on computational models of language change at [NAACL](https://naacl2019.org/program/tutorials/) and [IC2S2](https://2019.ic2s2.org/tutorials/).
 
-In addition to the data here, two larger data files can be found at bitbucket: https://bitbucket.org/jacobeisenstein/language-change-tutorial-data
+* The data for both the tutorials should be found in the [data](data/) directory. In addition to the data here, two larger data files can be found at bitbucket: https://bitbucket.org/jacobeisenstein/language-change-tutorial-data
+
+* The notebooks for the NAACL tutorial are under [naacl-notebooks](naacl-notebooks/) and the notebooks for the IC2S2 tutorial are under [ic2s2-notebooks](ic2s2-notebooks/)
+
+* [These slides](eisenstein-naacl-slides.pdf) are used for the NAACL tutorial and [these slides](ic2s2-tutorial-slides) are for the IC2S2 tutorial.
 
 # Installation
 
-All notebooks are based on Python 3. To ensure that you have all necessary packages, create a new `conda` environment and then activate it (update conda if it asks you to).
+All notebooks are based on Python 3. To ensure that you have all the necessary packages, create a new `conda` environment and then activate it (update conda if it asks you to).
 
 ```
 pip install --user conda #if necessary
 conda env create -f environment.yml # create the environment. update conda if it complains.
 source activate time_tutorial # activate the environment
 ```
 
-You can then launch the first notebook:
+You can then launch a notebook as follows:
 
 ```
-cd notebooks
+cd ic2s2-notebooks
 jupyter-notebook HappierOnTheWeekend.ipynb
 ```
 
-The fourth notebook requires you to install [pyhawkes](https://github.com/slinderman/pyhawkes). This works on linux via `pip install --user pyhawkes autograd`, but I'm not having consistent success with this on mac. If you have trouble, you may want to clone the repo directly: https://github.com/slinderman/pyhawkes
+The `FollowTheLeader.ipynb` notebook requires you to install [pyhawkes](https://github.com/slinderman/pyhawkes) using `pip install --user pyhawkes autograd` (Linux) or `~/miniconda3/envs/time_tutorial/bin/pip install pyhawkes autograd` (Mac). If you have trouble, you may want to clone the repo directly [here](https://github.com/slinderman/pyhawkes).
 
 # Data
 
@@ -31,3 +35,11 @@ To get the additional data files, run:
 ```
 git clone https://bitbucket.org/jacobeisenstein/language-change-tutorial-data.git
 ```
+
+Alternatively, you can run 
+
+```
+bash download_data.sh
+``` 
+which will download all the data and setup the symbolic links for you.
+

download_data.sh

@@ -0,0 +1,10 @@
+git clone https://bitbucket.org/jacobeisenstein/language-change-tutorial-data.git
+cd language-change-tutorial-data
+# SameDifference.ipynb
+# 250 MB
+tar xvzf same-diff-data.tgz
+cd ../data
+ln -s ../language-change-tutorial-data/same-diff-processed
+# DirtyLaundering.ipynb
+# 110 MB
+ln -s ../language-change-tutorial-data/embeddings-over-time

environment.yml

@@ -3,134 +3,124 @@ channels:
   - conda-forge
   - defaults
 dependencies:
-  - atk=2.25.90
+  - asn1crypto=0.24.0
   - attrs=19.1.0
-  - autograd=1.2
   - backcall=0.1.0
-  - beautifulsoup4=4.7.1
+  - blas=1.1
   - bleach=3.1.0
+  - blinker=1.4
+  - boto=2.49.0
+  - boto3=1.9.168
+  - botocore=1.12.168
+  - bz2file=0.98
   - bzip2=1.0.6
   - ca-certificates=2019.3.9
-  - cairo=1.14.12
   - certifi=2019.3.9
+  - cffi=1.12.3
+  - chardet=3.0.4
+  - cryptography=2.7
   - cycler=0.10.0
-  - cython=0.29.7
-  - dbus=1.13.2
   - decorator=4.4.0
   - defusedxml=0.5.0
+  - docutils=0.14
   - entrypoints=0.3
-  - expat=2.2.5
-  - fontconfig=2.13.1
   - freetype=2.10.0
-  - gdk-pixbuf=2.36.12
-  - gettext=0.19.8.1
-  - glib=2.56.2
-  - gobject-introspection=1.56.1
-  - graphite2=1.3.13
-  - gst-plugins-base=1.14.0
-  - gstreamer=1.14.0
-  - gtk2=2.24.31
-  - harfbuzz=1.9.0
-  - icu=58.2
-  - ipykernel=5.1.0
-  - ipython=7.4.0
+  - gensim=3.4.0
+  - idna=2.8
+  - ipykernel=5.1.1
+  - ipython=7.5.0
   - ipython_genutils=0.2.0
   - ipywidgets=7.4.2
   - jedi=0.13.3
   - jinja2=2.10.1
+  - jmespath=0.9.4
+  - joblib=0.13.2
   - jpeg=9c
   - jsonschema=3.0.1
-  - jupyter=1.0.0
   - jupyter_client=5.2.4
-  - jupyter_console=6.0.0
   - jupyter_core=4.4.0
-  - kiwisolver=1.0.1
+  - kiwisolver=1.1.0
   - libblas=3.8.0
   - libcblas=3.8.0
+  - libcxx=8.0.0
+  - libcxxabi=8.0.0
   - libffi=3.2.1
-  - libiconv=1.15
   - liblapack=3.8.0
-  - libpng=1.6.36
+  - libpng=1.6.37
   - libsodium=1.0.16
   - libtiff=4.0.10
-  - libuuid=2.32.1
-  - libxcb=1.13
-  - libxml2=2.9.8
-  - markdown=2.6.11
+  - llvm-openmp=8.0.0
   - markupsafe=1.1.1
-  - matplotlib=3.0.3
-  - matplotlib-base=3.0.3
+  - matplotlib=3.1.0
+  - matplotlib-base=3.1.0
   - mistune=0.8.4
-  - nbconvert=5.4.1
+  - nb_conda=2.2.1
+  - nb_conda_kernels=2.2.2
+  - nbconvert=5.5.0
   - nbformat=4.4.0
   - ncurses=6.1
+  - nltk=3.2.5
   - notebook=5.7.8
   - numpy=1.16.2
-  - openblas=0.3.5
+  - oauthlib=3.0.1
+  - olefile=0.46
+  - openblas=0.3.3
   - openssl=1.1.1b
   - pandas=0.24.2
   - pandoc=2.7.2
   - pandocfilters=1.4.2
-  - pango=1.40.14
   - parso=0.4.0
   - patsy=0.5.1
-  - pcre=8.43
   - pexpect=4.7.0
   - pickleshare=0.7.5
-  - pip=19.0.3
-  - pixman=0.34.0
+  - pillow=6.0.0
+  - pip=19.1
   - prometheus_client=0.6.0
   - prompt_toolkit=2.0.9
-  - pthread-stubs=0.4
   - ptyprocess=0.6.0
-  - pygments=2.3.1
+  - pycparser=2.19
+  - pygments=2.4.2
+  - pyjwt=1.7.1
+  - pyopenssl=19.0.0
   - pyparsing=2.4.0
-  - pyrsistent=0.14.11
+  - pyrsistent=0.15.2
+  - pysocks=1.7.0
   - python=3.7.3
+  - python-crfsuite=0.9.6
   - python-dateutil=2.8.0
   - pytz=2019.1
   - pyzmq=18.0.1
   - readline=7.0
-  - rise=5.5.0
+  - requests=2.22.0
+  - requests-oauthlib=1.2.0
+  - s3transfer=0.2.1
   - scikit-learn=0.20.3
-  - scipy=1.2.1
+  - scipy=1.2.0
   - seaborn=0.9.0
   - send2trash=1.5.0
-  - setuptools=41.0.0
-  - sip=4.18.1
+  - setuptools=41.0.1
   - six=1.12.0
-  - soupsieve=1.9.1
-  - sqlite=3.26.0
+  - smart_open=1.8.4
+  - sqlite=3.28.0
   - statsmodels=0.9.0
   - terminado=0.8.2
   - testpath=0.4.2
   - tk=8.6.9
   - tornado=6.0.2
-  - tqdm=4.31.1
+  - tqdm=4.32.1
   - traitlets=4.3.2
+  - twython=3.7.0
+  - urllib3=1.24.3
   - wcwidth=0.1.7
   - webencodings=0.5.1
-  - wheel=0.33.1
+  - wheel=0.33.4
   - widgetsnbextension=3.4.2
-  - xorg-kbproto=1.0.7
-  - xorg-libice=1.0.9
-  - xorg-libsm=1.2.3
-  - xorg-libx11=1.6.7
-  - xorg-libxau=1.0.9
-  - xorg-libxdmcp=1.1.3
-  - xorg-libxext=1.3.4
-  - xorg-libxrender=0.9.10
-  - xorg-libxt=1.1.5
-  - xorg-renderproto=0.11.1
-  - xorg-xextproto=7.3.0
-  - xorg-xproto=7.0.31
   - xz=5.2.4
-  - zeromq=4.2.5
+  - zeromq=4.3.1
   - zlib=1.2.11
+  - zstd=1.3.3
   - pip:
     - future==0.17.1
-    - joblib==0.13.2
     - nose==1.3.7
     - pybasicbayes==0.2.2
-prefix: /home/jacobeisenstein/miniconda3/envs/time_tutorial