Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Position OpenCilk site under Fastcode site #235

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/_includes/partials/footer.njk
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<div class="d-flex mx-4">
<ul class="list-unstyled text-small">
<li><a class="link-secondary" href="/doc/users-guide/install">Install</a></li>
<li><a class="link-secondary" href="/posts/">Blog</a></li>
<li><a class="link-secondary" href="/posts/">News</a></li>

</ul>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/_includes/partials/sidebar-blog.njk
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% set context = 'Fastcode Blog' %}
{% set context = 'OpenCilk news' %}

<div class="sidebar-start-items__item">
<nav class="bd-links" id="bd-docs-nav" aria-label="Section navigation">
Expand Down
2 changes: 1 addition & 1 deletion src/_includes/partials/sidebar-toc.njk
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% set navPages = ['Blog', 'Documentation', 'Community', 'About us', 'Contribute'] %}
{% set navPages = ['News', 'Documentation', 'Community', 'About us', 'Contribute'] %}
{% if eleventyNavigation.key in navPages %}
{% set context = eleventyNavigation.key %}
{% else %}
Expand Down
10 changes: 7 additions & 3 deletions src/about-us.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,11 @@ date: 2022-07-05T16:59:41.487Z
OpenCilk aims to make it easy for developers to write fast and correct multicore code, for researchers to pioneer technologies to do so, and for educators to teach and students to learn software performance engineering.
{% endalert %}

## Leadership
## OpenCilk team

The OpenCilk team is part of [Fastcode](https://fastcode.org), an open-source community dedicated to advancing software performance engineering -- making software run fast or otherwise consume few resources such as time, storage, and energy. [Join us](https://fastcode.org/get-involved/)!

### Leadership

<div class="list-tight">

Expand All @@ -25,7 +29,7 @@ OpenCilk aims to make it easy for developers to write fast and correct multicore
* [Charles E. Leiserson](https://people.csail.mit.edu/cel/) (MIT), Executive Director
</div>

## Contributors
### Contributors

<div class="list-tight">

Expand All @@ -39,7 +43,7 @@ OpenCilk aims to make it easy for developers to write fast and correct multicore
* Brian Wheatman (JHU)
</div>

## Academic board
### Academic board

<div class="list-tight">

Expand Down
6 changes: 2 additions & 4 deletions src/blog.njk
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
---
title: Fastcode Blog
title: OpenCilk news
layout: layouts/page.njk
background: bg-white
sidebar: blog
permalink: /posts/
eleventyNavigation:
key: Blog
key: News
order: 2
parent: Home
---

<p><strong class="codefont">Performance engineering:</strong> making software run fast or otherwise consume few resources, such as time, storage, energy, network bandwidth, etc.</p>

<div class="container py-3" id="featured-3">
<div class="row g-2">

Expand Down
14 changes: 7 additions & 7 deletions src/community.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ eleventyNavigation:
order: 5
---
{% alert "note", "Part of Fastcode" %}
The OpenCilk team is part of Fastcode, an open-source community dedicated to advancing software performance engineering -- making software run fast or otherwise consume few resources such as time, storage, and energy. [Join us](/community/join-us)!
The OpenCilk team is part of [Fastcode](https://fastcode.org), an open-source community dedicated to advancing software performance engineering -- making software run fast or otherwise consume few resources such as time, storage, and energy. [Join us](https://fastcode.org/get-involved/)!
{% endalert %}

## Where can I get help?
Expand All @@ -27,10 +27,10 @@ To report bugs and most feature requests, use GitHub Issues in the appropriate r
To subscribe to announcements and have longer discussions,
use [GitHub Discussions](https://github.com/OpenCilk/opencilk-project/discussions) in the [OpenCilk Project](https://github.com/OpenCilk/opencilk-project) repository.

## Conferences
Below are the academic conferences traditionally most popular with the OpenCilk community. Many of them include tutorial days with sessions on OpenCilk.
{% for conf in conferences %}
- [{{ conf.shortName }}]({{ conf.url }})
{% endfor %}

See also: **[Contribute](/contribute)**.
{% alert "note", "See also" %}
- **[Contribute](/contribute)** for some current opportunities to help with OpenCilk.
- **[Fastcode events](https://fastcode.org/events/)** for a list of conferences and events traditionally most popular with the OpenCilk community. Many of them include tutorial days with sessions on OpenCilk.
{% endalert %}


110 changes: 0 additions & 110 deletions src/community/teach performance.md

This file was deleted.

2 changes: 1 addition & 1 deletion src/contribute.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ eleventyNavigation:
order: 7
---
{% alert "note", "Part of Fastcode" %}
The OpenCilk team is part of Fastcode, an open-source community dedicated to advancing software performance engineering -- making software run fast or otherwise consume few resources such as time, storage, and energy. [Join us](/community/join-us).
The OpenCilk team is part of [Fastcode](https://fastcode.org), an open-source community dedicated to advancing software performance engineering -- making software run fast or otherwise consume few resources such as time, storage, and energy. [Join us](https://fastcode.org/get-involved/)!
{% endalert %}

The OpenCilk project welcomes your expertise and enthusiasm. A few specific opportunities are listed below. If you see anything interesting, or have ideas that we haven't thought of, please [contact us](/contribute/contact/).
Expand Down
4 changes: 0 additions & 4 deletions src/doc/index.njk
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@ eleventyNavigation:
order: 4
---

<p>You can browse the documentation with our <a href="/tags/">curated tags</a>.</p>

<p>See also our <a href="/posts/">Fastcode Blog</a>, which puts it all in context with stories about the latest developments in performance engineering.</p>

<div class="d-flex flex-wrap">
<div class="flex-fill m-2 p-2 rounded" style="background-color: var(--pst-color-surface); border-left: 0.2rem solid var(--yellow); border-top: 0.2rem solid var(--yellow);">
<div class="text-center">
Expand Down
2 changes: 1 addition & 1 deletion src/index.njk
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ features:
</ul>
</div>

<h3 class="my-4">Featured blog posts</h3>
<h3 class="my-4">Featured news</h3>
<div class="container" id="featured-3">
<div class="d-flex row">
{% set postslist = collections.featuredPosts %}
Expand Down
2 changes: 1 addition & 1 deletion src/posts/posts.11tydata.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module.exports = {
eleventyComputed: {
eleventyNavigation: {
key: data => data.title,
parent: 'Blog'
parent: 'News'
},
}
};
9 changes: 9 additions & 0 deletions src/teach_performance_dummy.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
eleventyNavigation:
key: Teach performance
parent: Community
order: 2
url: https://fastcode.org/get-involved/instructors/
---

Dummy install puts "Teach performance" in sidebar as a link to the Fastcode instructor page.