EleutherAI · researcher2 · Jan 28, 2021 · Jan 24, 2021 · Jan 24, 2021 · Jan 24, 2021
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
-.vscode
+.vscode
+public*
diff --git a/.gitmodules b/.gitmodules
@@ -1,8 +0,0 @@
-[submodule "public"]
- path = public
- url = https://github.com/EleutherAI/eleutherai.github.io.git
- branch = master
-[submodule "public-blog"]
- path = public-blog
- url = https://github.com/EleutherAI/eleuther-blog.git
- branch = master

diff --git a/README.md b/README.md
@@ -1,28 +1,17 @@
 # EleutherAI Website 2021
 
-This is the new website for EleutherAI based on Hugo, a static site generator. The content should correspond to existing google sites website but with added blog and other features. Please make sure to familiarize with the basics of working with Hugo before you start using it.
+The EleutherAI is built using [Hugo](https://gohugo.io), a static site generator. We are currently using Netlify for build and hosting.
 
-## Setup
-1. [install hugo](https://gohugo.io/getting-started/installing/)
-2. clone this repository: `git clone https://github.com/EleutherAI/new-website.git; cd new-website`
-3. get git submodules which serve as the generated website in the public folders (/public, /public-blog ...etc): `git submodule update --init`
-4. set the public and public-blog folders to `master` branch: `(cd public; git checkout master)` and `(cd public-blog; git checkout master)`
+While the blog and main site are visually integrated, the blog is currently being served on a separate domain blog.eleuther.ai, so we have a separate config-blog.toml file for this.
 
-## Project Layout
-
-| Directory | Description |
-| -----------: | ----------- |
-| `content` | Underyling content for the main site|
-| `content-blog` | Underyling content for the blog |
-| `static/images` | Images for both sites. |
-| `themes/eai-theme` | We use a single theme for both the main site and the blog. | 
-| `public` | Contains the main site build | 
-| `public-blog` | Build for the blog.| 
-
-## How to display 2 containers that are horizontally aligned?
-
-1. add an empty header markdown with the class `content-block` -> `## ## {class="content-block"}`
-2. after that line, add 2 containers as 2 elements of the list. In CSS it is defined that first list `<ul>` below content-block header will display items horizontally. (only the first one, any other list elements will be displayed as expected)
+## Development Process Overview
+1. [Install Hugo](https://gohugo.io/getting-started/installing/)
+2. Clone this repository.
+3. Create a new branch for your work.
+4. Use the Hugo dev server locally to test your changes.
+5. Commit your branch with changes.
+6. Create a PR to merge your branch into master and discuss on Discord. 
+7. When the branch is merged, a Netlify build will be triggered for both the blog and main site.
 
 ## Dev Environment
 
@@ -40,24 +29,17 @@ To bind on another IP apart from localhost and change the baseURL (ensuring the
 
 If everything is working at this point feel free to start working on the website. Once you are happy with the changes, perform the build as explained below.
 
-## Building And Pushing
-
-We are using submodules for the site builds (public and public-blog) so these need to be built and pushed separately to the underlying template and content changes.
-
-We have created build scripts to make this process easier:
-
-**Main Site:** `./deploy.sh` 
-**Blog:** `./deploy_blog.sh` 
-**Both:** `./run_all.sh` 
-
-Afterwards you can separately push your underlying changes.
-
-***Note: based on your user settings you might not have privileges to do changes in /public folder. In that case you can still do all the previous steps with `sudo` command.***
-
-So it will be `sudo ./deploy.sh`, `sudo git commit `.. etc.
-
-***(before running the script make sure all git submodules are in master branch as otherwise it wont push)***
+## Project Layout
 
+| Directory | Description |
+| -----------: | ----------- |
+| `content` | Underyling content for the main site|
+| `content-blog` | Underyling content for the blog |
+| `static/images` | Images for both sites. |
+| `themes/eai-theme` | We use a single theme for both the main site and the blog. | 
 
 
+## How to display 2 containers that are horizontally aligned?
 
+1. add an empty header markdown with the class `content-block` -> `## ## {class="content-block"}`
+2. after that line, add 2 containers as 2 elements of the list. In CSS it is defined that first list `<ul>` below content-block header will display items horizontally. (only the first one, any other list elements will be displayed as expected)
diff --git a/config-blog.toml b/config-blog.toml
@@ -1,4 +1,4 @@
-baseURL = "https://eleutherai.github.io/eleuther-blog/"
+baseURL = "https://blog.eleuther.ai/"
 languageCode = "en-us"
 title = "Eleuther AI Blog"
 theme = "eai-theme"
@@ -20,7 +20,7 @@ publishDir="public-blog"
  weight = 2
  [[menu.main]]
  name = "Blog"
- url = "https://eleuther.ai/blog/"
+ url = "/"
  weight = 3
  [[menu.main]]
  name = "Publications"

diff --git a/config.toml b/config.toml
@@ -20,7 +20,7 @@ publishDir = "public"
  weight = 2
  [[menu.main]]
  name = "Blog"
- url = "https://eleuther.ai/eleuther-blog/"
+ url = "https://blog.eleuther.ai"
  weight = 3
  [[menu.main]]
  name = "Publications"

diff --git a/content/projects/gpt-neo.md b/content/projects/gpt-neo.md
@@ -5,7 +5,7 @@ project_image: "images/the-pile.png"
 layout: project-page
 ---
 
-##  ## {class="content-block"}
+## {class="content-block"}
 - ![alt](../../images/gpt-neo.png)
 - ## GPT-Neo 
  GPT-Neo is the code name for a series of transformer-based language models loosely styled around the GPT architecture that we plan to train and open source. Our primary goal is to replicate a GPT-3 sized model and open source it to the public, for free.
@@ -15,7 +15,7 @@ layout: project-page
  Our models are built in Tensorflow-mesh, which will allow us to scale up to GPT-3 sizes and beyond using simultaneous model and data parallelism.
 
 
-##  ## {class="content-block"}
+## {class="content-block"}
 - ### Progress:
  - We have the bulk of the model built, GPT-2 size models trained, and several experimental architectures implemented.
 

diff --git a/content/projects/open-web-text2.md b/content/projects/open-web-text2.md
@@ -4,7 +4,7 @@ date: 2019-04-26T20:18:54+03:00
 layout: page
 ---
 
-##  ## {class="content-block"}
+## {class="content-block"}
 - ![alt](../../images/open-web-text2.png)
 - ## OpenWebText2 
  WebText is an internet dataset created by scraping URLs extracted from Reddit submissions with a minimum score of 3 as a proxy for quality. It was collected for training the original GPT-2 and never released to the public, however researchers independently reproduced the pipeline and released the resulting dataset, called [OpenWebTextCorpus (OWT)](https://skylion007.github.io/OpenWebTextCorpus/).
@@ -16,7 +16,7 @@ layout: page
 [Download now](https://the-eye.eu/public/AI/pile_preliminary_components/openwebtext2.jsonl.zst.tar), or you can [read the docs](https://openwebtext2.readthedocs.io)
 
 
-##  ## {class="content-block"}
+## {class="content-block"}
 - ### Comes pre-cleaned and pre-processed:
  - Deduplicated by URL
  - Filtered by minimum combined reddit score 3

diff --git a/deploy.sh b/deploy.sh
diff --git a/deploy_blog.sh b/deploy_blog.sh
diff --git a/netlify.toml b/netlify.toml
@@ -0,0 +1,4 @@
+[context.production.environment]
+HUGO_VERSION = "0.80.0"
+HUGO_ENV = "production"
+HUGO_ENABLEGITINFO = "true"
diff --git a/public b/public
diff --git a/public-blog b/public-blog
diff --git a/run_all.sh b/run_all.sh
diff --git a/themes/eai-theme/layouts/partials/header.html b/themes/eai-theme/layouts/partials/header.html
@@ -13,7 +13,7 @@
  <div class="logo-container left">
  <div class="mobile-button" id="mobileButton"><img src="{{ .Site.BaseURL}}images/mobile-menu-icon.svg" alt="mobile menu icon"></div>
  <h1 class="logo">
- <a href="{{ .Site.BaseURL}}">
+ <a href="https://eleuther.ai/">
  <img src="{{ .Site.BaseURL}}{{ .Site.Params.logo_image_url}}" alt="logo">
  <span class="logo-text">{{ $.Site.Params.logo }}</span>
  </a>