Skip to content

Commit

Permalink
update perf
Browse files Browse the repository at this point in the history
  • Loading branch information
@vict0rsch
vict0rsch committed Dec 7, 2019
1 parent e1b1ce6 commit 1894308
Show file tree
Hide file tree
Showing 22 changed files with 107 additions and 37 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ bower_components
.DS_Store
**/.DS_Store
yarn.lock
.vscode/
4 changes: 2 additions & 2 deletions css/grayscale.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -630,8 +630,8 @@
}

.authors-section {
background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #394a5c), color-stop(75%, rgba(12, 31, 55, 0.9)), to(#0c1f37)), url("https://get.pxhere.com/photo/sky-bicycle-cycling-vehicle-cycle-sport-mountain-bike-mountainous-landforms-mountain-range-mountain-mountain-biking-recreation-alps-mode-of-transport-road-downhill-mountain-biking-mountain-pass-sports-equipment-tree-spoke-road-bicycle-bicycle-pedal-freeride-road-cycling-hill-hill-station-cloud-bicycle-wheel-ridge-thoroughfare-adventure-tourism-trail-mountain-bike-racing-bicycle-frame-holiday-hybrid-bicycle-wheel-valley-cross-country-cycling-1576559.png");
background: linear-gradient(to bottom, #394a5c 0, rgba(12, 31, 55, 0.9) 75%, #0c1f37 100%), url("https://get.pxhere.com/photo/sky-bicycle-cycling-vehicle-cycle-sport-mountain-bike-mountainous-landforms-mountain-range-mountain-mountain-biking-recreation-alps-mode-of-transport-road-downhill-mountain-biking-mountain-pass-sports-equipment-tree-spoke-road-bicycle-bicycle-pedal-freeride-road-cycling-hill-hill-station-cloud-bicycle-wheel-ridge-thoroughfare-adventure-tourism-trail-mountain-bike-racing-bicycle-frame-holiday-hybrid-bicycle-wheel-valley-cross-country-cycling-1576559.png");
background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #394a5c), color-stop(75%, rgba(12, 31, 55, 0.9)), to(#0c1f37)), url("https://raw.githubusercontent.com/mlco2/impact/master/img/bicycle-pic.png");
background: linear-gradient(to bottom, #394a5c 0, rgba(12, 31, 55, 0.9) 75%, #0c1f37 100%), url("https://raw.githubusercontent.com/mlco2/impact/master/img/bicycle-pic.png");
background-position: center;
background-repeat: no-repeat;
background-attachment: scroll;
Expand Down
2 changes: 1 addition & 1 deletion css/grayscale.min.css
View file

Large diffs are not rendered by default.

Binary file added favicon.ico
View file
Binary file not shown.
10 changes: 7 additions & 3 deletions html/_about.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@ <h4 class="text-white mb-4" style="width:100%">Read our paper</h4>
</div>
<div class="col-md-6 col-sm-12 about-content-img">
<a href="https://arxiv.org/abs/1910.09700" target="_blank" rel="noopener noreferrer">
<img src=".../img/measuring-im.png" alt="paper outline">
<img class="lozad"
src="https://raw.githubusercontent.com/mlco2/impact/master/img/measuring-im.png"
alt="paper outline">
</a>
</div>
</div>
Expand All @@ -48,7 +50,9 @@ <h4 class="text-white mb-4" style="width:100%">Look at the Data</h4>
<div class="col-md-6 col-sm-12 about-content-img">
<a href="https://github.com/mlco2/impact/tree/master/data" title="Go see the data on Github"
target="_blank" rel="noopener noreferrer">
<img src=".../img/data.png" alt="data presentation">
<img class="lozad"
src="https://raw.githubusercontent.com/mlco2/impact/master/img/data.png"
alt="data presentation">
</a>
</div>
<div class="col-12" style="margin-top: 3rem">
Expand Down Expand Up @@ -76,4 +80,4 @@ <h4 class="text-white mb-4" style="width:100%">Look at the Data</h4>
</div>
</div>
</div>
</section>
</section>
12 changes: 8 additions & 4 deletions html/_authors.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ <h4 class="text-white mb-4" style="width:100%">Alexandre Lacoste</h4>
learning where he developed bridges between PAC-Bayes and Bayes theories.</p>
</div>
<div class="col-md-3 col-sm-12 authors-content-img">
<img src=".../img/alex.png" alt="alexandre lacoste">
<img class="lozad" src="https://raw.githubusercontent.com/mlco2/impact/master/img/alex.png"
alt="alexandre lacoste">
</div>
</div>
</div>
Expand All @@ -38,7 +39,8 @@ <h4 class="text-white mb-4" style="width:100%">Alexandra (Sasha) Luccioni</h4>
</div>
<div class="col-md-3 col-sm-12 authors-content-img">
<a href="https://sashaluccioni.com/" target="_blank" rel="noopener noreferrer">
<img src="https://sashaluccioni.files.wordpress.com/2019/07/img_20190307_091449_436.jpg"
<img class="lozad"
src="https://sashaluccioni.files.wordpress.com/2019/07/img_20190307_091449_436.jpg"
alt="sasha luccioni">
</a>
</div>
Expand All @@ -55,12 +57,14 @@ <h4 class="text-white mb-4" style="width:100%">Victor Schmidt</h4>
help the public better understand them. Prior to his PhD, Victor worked as a <a
href="https://entrepreneur-interet-general.etalab.gouv.fr/defis/2018/hopkins.html"
rel="noopener noreferrer">Public
Interest Entrepreneur</a> in France. He obtained his engineering dregree from Ecole
Interest Entrepreneur</a> in France. He obtained his engineering degree from Ecole
polytechnique and an MSc. in Machine Learning from UCL.</p>
</div>
<div class="col-md-3 col-sm-12 authors-content-img">
<a href="https://vict0rs.ch" target="_blank" rel="noopener noreferrer">
<img src=".../img/victor.jpeg" alt="victor schmidt">
<img class="lozad"
src="https://raw.githubusercontent.com/mlco2/impact/master/img/victor.jpeg"
alt="victor schmidt">
</a>
</div>
</div>
Expand Down
12 changes: 12 additions & 0 deletions html/_head.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,18 @@

<!-- Custom styles for this template -->
<link href="css/grayscale.min.css" rel="stylesheet">
<link rel="apple-touch-icon" sizes="180x180"
href="https://raw.githubusercontent.com/mlco2/impact/master/img/apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="48x48"
href="https://raw.githubusercontent.com/mlco2/impact/master/img/favicon.ico">
<link rel="icon" type="image/png" sizes="32x32"
href="https://raw.githubusercontent.com/mlco2/impact/master/img/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16"
href="https://raw.githubusercontent.com/mlco2/impact/master/img/favicon-16x16.png">
<link rel="manifest" href="/site.webmanifest">

<script src="https://cdn.jsdelivr.net/npm/lozad/dist/lozad.min.js"></script>


</head>

Expand Down
5 changes: 2 additions & 3 deletions html/_learn.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -214,8 +214,7 @@ <h4 class="text-white" class="summary-header">Featured Maps</h4>
Here are a few maps from Our World In Data which illustrate the complexity of carbon
emissions mitigations. For a complete analysis, visit <a
href="https://ourworldindata.org/co2-and-other-greenhouse-gas-emissions"
target="_blank"
rel="noopener noreferrer">their webstie</a>
target="_blank" rel="noopener noreferrer">their webstie</a>
</p>

<br>
Expand All @@ -231,7 +230,7 @@ <h4 class="text-white" class="summary-header">Featured Maps</h4>

<br>
<br>
<img style="width: 100%;"
<img class="lozad" style="width: 100%;"
src="https://ourworldindata.org/uploads/2018/04/Greenhouse-gas-emission-scenarios-01.png"
alt="greenhouse gas scenarios">
</div>
Expand Down
Binary file added img/android-chrome-192x192.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/android-chrome-512x512.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/apple-touch-icon.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/bicycle-pic.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/favicon-16x16.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/favicon-32x32.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/favicon.ico
View file
Binary file not shown.
38 changes: 28 additions & 10 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,18 @@

<!-- Custom styles for this template -->
<link href="css/grayscale.min.css" rel="stylesheet">
<link rel="apple-touch-icon" sizes="180x180"
href="https://raw.githubusercontent.com/mlco2/impact/master/img/apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="48x48"
href="https://raw.githubusercontent.com/mlco2/impact/master/img/favicon.ico">
<link rel="icon" type="image/png" sizes="32x32"
href="https://raw.githubusercontent.com/mlco2/impact/master/img/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16"
href="https://raw.githubusercontent.com/mlco2/impact/master/img/favicon-16x16.png">
<link rel="manifest" href="/site.webmanifest">

<script src="https://cdn.jsdelivr.net/npm/lozad/dist/lozad.min.js"></script>


</head>

Expand Down Expand Up @@ -410,8 +422,7 @@ <h4 class="text-white" class="summary-header">Featured Maps</h4>
Here are a few maps from Our World In Data which illustrate the complexity of carbon
emissions mitigations. For a complete analysis, visit <a
href="https://ourworldindata.org/co2-and-other-greenhouse-gas-emissions"
target="_blank"
rel="noopener noreferrer">their webstie</a>
target="_blank" rel="noopener noreferrer">their webstie</a>
</p>

<br>
Expand All @@ -427,7 +438,7 @@ <h4 class="text-white" class="summary-header">Featured Maps</h4>

<br>
<br>
<img style="width: 100%;"
<img class="lozad" style="width: 100%;"
src="https://ourworldindata.org/uploads/2018/04/Greenhouse-gas-emission-scenarios-01.png"
alt="greenhouse gas scenarios">
</div>
Expand Down Expand Up @@ -606,7 +617,9 @@ <h4 class="text-white mb-4" style="width:100%">Read our paper</h4>
</div>
<div class="col-md-6 col-sm-12 about-content-img">
<a href="https://arxiv.org/abs/1910.09700" target="_blank" rel="noopener noreferrer">
<img src=".../img/measuring-im.png" alt="paper outline">
<img class="lozad"
src="https://raw.githubusercontent.com/mlco2/impact/master/img/measuring-im.png"
alt="paper outline">
</a>
</div>
</div>
Expand All @@ -623,7 +636,9 @@ <h4 class="text-white mb-4" style="width:100%">Look at the Data</h4>
<div class="col-md-6 col-sm-12 about-content-img">
<a href="https://github.com/mlco2/impact/tree/master/data" title="Go see the data on Github"
target="_blank" rel="noopener noreferrer">
<img src=".../img/data.png" alt="data presentation">
<img class="lozad"
src="https://raw.githubusercontent.com/mlco2/impact/master/img/data.png"
alt="data presentation">
</a>
</div>
<div class="col-12" style="margin-top: 3rem">
Expand Down Expand Up @@ -652,7 +667,6 @@ <h4 class="text-white mb-4" style="width:100%">Look at the Data</h4>
</div>
</div>
</section>

<!-- Authors Section -->
<section class="authors-section bg-light" id="authors">
<div class="container">
Expand All @@ -674,7 +688,8 @@ <h4 class="text-white mb-4" style="width:100%">Alexandre Lacoste</h4>
learning where he developed bridges between PAC-Bayes and Bayes theories.</p>
</div>
<div class="col-md-3 col-sm-12 authors-content-img">
<img src=".../img/alex.png" alt="alexandre lacoste">
<img class="lozad" src="https://raw.githubusercontent.com/mlco2/impact/master/img/alex.png"
alt="alexandre lacoste">
</div>
</div>
</div>
Expand All @@ -693,7 +708,8 @@ <h4 class="text-white mb-4" style="width:100%">Alexandra (Sasha) Luccioni</h4>
</div>
<div class="col-md-3 col-sm-12 authors-content-img">
<a href="https://sashaluccioni.com/" target="_blank" rel="noopener noreferrer">
<img src="https://sashaluccioni.files.wordpress.com/2019/07/img_20190307_091449_436.jpg"
<img class="lozad"
src="https://sashaluccioni.files.wordpress.com/2019/07/img_20190307_091449_436.jpg"
alt="sasha luccioni">
</a>
</div>
Expand All @@ -710,12 +726,14 @@ <h4 class="text-white mb-4" style="width:100%">Victor Schmidt</h4>
help the public better understand them. Prior to his PhD, Victor worked as a <a
href="https://entrepreneur-interet-general.etalab.gouv.fr/defis/2018/hopkins.html"
rel="noopener noreferrer">Public
Interest Entrepreneur</a> in France. He obtained his engineering dregree from Ecole
Interest Entrepreneur</a> in France. He obtained his engineering degree from Ecole
polytechnique and an MSc. in Machine Learning from UCL.</p>
</div>
<div class="col-md-3 col-sm-12 authors-content-img">
<a href="https://vict0rs.ch" target="_blank" rel="noopener noreferrer">
<img src=".../img/victor.jpeg" alt="victor schmidt">
<img class="lozad"
src="https://raw.githubusercontent.com/mlco2/impact/master/img/victor.jpeg"
alt="victor schmidt">
</a>
</div>
</div>
Expand Down
6 changes: 3 additions & 3 deletions js/data.js
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

var dev_base_data_url = '/data/';
var prod_base_data_url = '/impact/data/';
var dev_base_data_url = 'https://raw.githubusercontent.com/mlco2/impact/master/data/';
var prod_base_data_url = 'https://raw.githubusercontent.com/mlco2/impact/master/data/';
var serveFrom = "dev"

const parseProvidersData = data => {
Expand Down Expand Up @@ -119,4 +119,4 @@ async function getData() {
providers: parseProvidersData($.csv.toObjects(proResults)),
gpus: parseGPUData($.csv.toObjects(gpuResults)),
}
}
}
Loading

0 comments on commit 1894308

Please sign in to comment.