Merge branch 'master' into master

Author: henryiii

Diff for: .travis.yml

@@ -3,14 +3,13 @@ branches:
   - master
 language: python
 python:
-- 2.7
+- 3.7
 install:
 - pip install -r requirements.txt
 - git clone https://github.com/diana-hep/pelican-bootstrap3.git
 - git clone --recursive https://github.com/getpelican/pelican-plugins
-- wget http://www.tipue.com/search/tipuesearch.zip
-- unzip tipuesearch.zip
-- cp -r Tipue\ Search\ 7.1/tipuesearch pelican-bootstrap3/static/
+- git clone https://github.com/michael-milette/Tipue-Search
+- cp -r Tipue-Search/tipuesearch pelican-bootstrap3/static/
 notifications:
   email:
     on_success: always
@@ -26,4 +25,14 @@ env:
   - secure: Ulkj49L/h79obgxk1rFT2cVXipwchgWbrXxapKa/YsYa7Ab81JFd32VyD+MZfA5d8kRubQ/lR4iao7dEg0zbNTDRzGOyJ0adStekOVgKWeQE7VAuJM9og4XU0rWz39Oztkx/ewdHfltWNWN80Chg9j8dVirc4GzGm+pb+X6DJExuEUFIu+nR+SoXdl0Hze8a6Ye+HE1yJNONTkIukYpBIjVutzUvYOOY1iqn8Zym+fsM+O6WSC6UCfq3JPWLPUjyVJmSRQdSlq/WXf13x+DOtxc7TErn0WZArvyAdHuNH9cmDGjwDKQ6IrgzG6y4stkcYDkrszX+/9+PZjxxo7drZSSL7BiqppTSEZ9xJdirCehWDO/kA7JweXlq5IvYGj+0/PPusdIumGDvaM/ZOq0hDoBTkqgTTUVrJcaiRmrO8xbfTH1hLC3zQebMcvmwgKRpbMxSlPbJEWTxnWljNGEmncEdrTvU/VpzZ6RD9IR+RiZ87+EyCU2lY2ryU4UIjSbNJxwF5/974SRavDdIz2F6f4lKF8kMgq/1N+a80+v2EIN+LthibpMx0dtnwxtxRsYLf2R9vRaU12z12LdC1MPvZrlMVp6uORqBwalfA+Mhw27gCfPm2ep0DrgmD1XvhujWE/5QKxIVmw3hHkgGHM1+nOWuOfN6GMepf4MCST5TNtA=
 before_install:
 - git submodule update --init --recursive
-after_success: bash deploy.sh
+
+deploy:
+  provider: pages
+  skip_cleanup: true
+  github_token: $GITHUB_TOKEN
+  keep_history: true
+  repo: diana-hep/diana-hep.github.io
+  local_dir: output
+  fqdn: http://diana-hep.org
+  on:
+    branch: master

Diff for: README.md

@@ -8,3 +8,31 @@ Created DIANA-HEP GitHub Organization
 Using [Pelican](http://getpelican.com/) to generate website with fork of [pelican-bootsrap3](https://github.com/diana-hep/pelican-bootstrap3) theme
 
 Using Travis to build website -- [how-to](http://zonca.github.io/2013/09/automatically-build-pelican-and-publish-to-github-pages.html)
+
+
+
+For local testing:
+
+```bash
+# Make a local venv
+python3 -m venv venv
+
+# Activate the venv (redo this if you restart the terminal)
+source venv/bin/activate
+
+# Install the nice requirements
+pip install -r requirements.txt
+
+# Install the hacky requirements (should be submodules, but I digress)
+git clone https://github.com/diana-hep/pelican-bootstrap3.git
+git clone --recursive https://github.com/getpelican/pelican-plugins
+git clone https://github.com/michael-milette/Tipue-Search
+cp -r Tipue-Search/tipuesearch pelican-bootstrap3/static/
+
+# Build and serve
+make html
+make serve
+```
+
+When you are done, run `deactivate` to leave the virtual environment.
+

Diff for: content/pages/fellows.md

@@ -1,7 +1,7 @@
 Title: DIANA Fellows
 date: 2016-12-04 10:09
 slug: fellows.html
-Authors: Kyle Cranmer
+Authors: Kyle Cranmer, Mike Sokoloff 
 Summary: DIANA Fellows
 
 ### DIANA Fellows
@@ -12,6 +12,35 @@ The DIANA Fellows program provides support for 4 graduate students each year to
 
 A DIANA Undergraduate Fellow position is also available each year. The student will work 10-12 weeks during the summer, either developing or using data-intensive tools. The DIANA project will provide a stipend for the summer period and in some cases can provide additional travel/subsistence support if they work away from their home institution. For more information on the DIANA Undergraduate Fellow position contact [[email protected]]([email protected]). 
 
+### <span style="color:rgb(144,12,63)"> **Summer 2021 DIANA Undergraduate Fellowship Opportunities**</span>
+For the summer of 2021, several projects have been proposed and we invite
+applications from undergraduate students at U.S. universities.
+Each of these projects has been designed for a three month period, starting
+in May or June according to the student's academic calendar.
+Participation will be remote.
+The stipend level will be $2000/month.
+Several of these projects are particularly well-suited to Computer Science
+or Computer Engineering students.
+Others are  particularly well-suited to Physics students.
+All students with appropriate experience (as described in the individual project descriptions) are encouraged to apply,
+regardless of nominal major.
+Veterans, women, and members of other traditionally under-represented
+groups are especially encouraged to apply.
+
+
+Applications should be sent to <[email protected]>.
+The subject line should say **DIANA Fellows Application**.
+Please include a cover letter indicating projects of interest,
+dates of availability, and a short summary of who you are and why you are interested.
+Please attach a one or two page CV and unofficial transcripts.
+Applications received by the dates indicated for each project
+will receive full consideration.
+However, applications received subsequently will be considered
+until the positions are filled.
+
+* **Instrumenting and Studying Adam and Other Optimization Algorithms in PyTorch** [project description](/downloads/optimization.pdf)  (March 21, 2021)
+* **Profiling the CUDA back-end for Allen** [project description](/downloads/Allen_profiling.pdf) (March 21, 2021)
+* **Optimizing the AMD back-end for Allen** [project description](/downloads/Allen_AMD.pdf) (March 21, 2021)
 
 ### Current and past DIANA fellows
 

Diff for: content/pages/team.md

@@ -19,8 +19,6 @@ Summary: DIANA Team
   * [James Pivarski](https://github.com/jpivarski) - Princeton University, Department of Physics
 
   * [Henry Schreiner](https://iscinumpy.gitlab.io/) - Princeton University, Princeton Institute for Computational Science and Engineering
-  
-  * [Eduardo Rodrigues](http://cern.ch/eduardo.rodrigues) - University of Cincinnati, Department of Physics
 
   * [Johann Brehmer](https://johannbrehmer.github.io) - New York University, Department of Physics & Center for Data Science
 
@@ -42,6 +40,8 @@ Summary: DIANA Team
 
   * [David Abdurachmanov](https://github.com/davidlt) - CERN/University of Wisconsin - Madison (formerly University of Nebraska-Lincoln)
 
+  * [Eduardo Rodrigues](http://cern.ch/eduardo.rodrigues) - University of Liverpool (formerly University of Cincinnati)
+  
   * [Gilles Louppe](https://glouppe.github.io/) - University of Liege (formerly New York University)
 
   * Chien-Chin Huang - New York University, Computer Science Department (Ph.D. Student)