Skip to content

Commit

Permalink
test build matrix update (#2)
Browse files Browse the repository at this point in the history
* add validation workflow and manually pushed container
Signed-off-by: vsoch <vsoch@users.noreply.github.com>
  • Loading branch information
vsoch committed Oct 30, 2022
1 parent eea9625 commit 1b7cc51
Show file tree
Hide file tree
Showing 9 changed files with 34 additions and 83 deletions.
43 changes: 0 additions & 43 deletions .github/workflows/build-matrices.yaml

This file was deleted.

16 changes: 1 addition & 15 deletions .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,5 @@ jobs:
steps:
- name: Checkout Repository
uses: actions/checkout@v3

- uses: ruby/setup-ruby@v1
with:
ruby-version: 2.7

- name: Build Site
run: |
cd docs/
bundle install
bundle exec jekyll build
cd -
- name: Validate Data
run: |
pip install -r .github/requirements.txt
python .github/validate.py docs/_site/api/tutorials.json
uses: rse-ops/tutorial-actions/validate@main
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
# RAJAPerf Tutorial

This repository contains RAjAPerf tutorials!
This repository contains RAjAPerf tutorials! You can
look at the [tutorial-actions](https://github.com/rse-ops/tutorial-actions)
to better understand the automation and assets here. Each tutorial is focused
around learning or trying a piece of software, and we will have a tool
that can easily deploy them.

🚧️ **under development** 🚧️

Expand Down
2 changes: 1 addition & 1 deletion docs/_data/tutorials/basic/tutorial.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
title: "RAJAPerf Tutorial (under development)"
container:
name: ghcr.io/rse-ops/rajaperf-tutorial:basic
name: ghcr.io/rse-ops/rajaperf-tutorials:ubuntu-basic
env:
- name: password
optional: true
Expand Down
13 changes: 0 additions & 13 deletions docs/_data/tutorials/radiuss-aws-2022/tutorial.yaml

This file was deleted.

8 changes: 6 additions & 2 deletions tutorials/basic/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
ARG ubuntu_version=22.04
FROM ubuntu:${ubuntu_version}

# docker build -t basic .
# docker build -t ghcr.io/rse-ops/rajaperf-tutorials:ubuntu-basic .
# Note that I never got this working with spack, in any way/shape/form.
# The build also failed as automated in the CI, so I built locally and pushed.
# Is this ideal or perfect? No, but at least we have the container build to
# start with, and someone a lot more patient with spack can try again.

RUN apt-get update
RUN DEBIAN_FRONTEND="noninteractive" apt-get -y install \
Expand Down Expand Up @@ -52,5 +56,5 @@ RUN cd /code && \
# TODO we will want to:
# 1. Figure out a visualization strategy here
# 2. Get it into a notebook / VSCode interface to run and see
# 3. Possibly re-add openmpi install, and possibly install with spack.
# 3. Possibly re-add openmpi install.
WORKDIR /code/build_ubuntu-gcc-caliper-11
20 changes: 20 additions & 0 deletions tutorials/basic/Dockerfile.base
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
FROM ubuntu:22.04

# docker build -t ghcr.io/rse-ops/rajaperf-tutorial-base:latest .

# I tried installing from last release (did not work)
RUN apt-get update && apt-get install -y wget cmake git python3-dev g++ xz-utils gringo python3-pip curl unzip gfortran fort77
RUN git clone https://github.com/spack/spack /opt/spack && \
pip install clingo

# Ensure spack sees fortran compilers (it never detects them)
COPY ./compilers.yaml /root/.spack/linux/compilers.yaml

# We don't use a spack view because they tend to be buggy
RUN . /opt/spack/share/spack/setup-env.sh && \
spack compiler find && spack external find && \
spack mirror add develop https://binaries.spack.io/develop && \
spack buildcache keys --install --trust && \
spack install papi

spack install --no-checksum caliper@2.7.0 adiak@0.2.1 camp py-hatchet
2 changes: 1 addition & 1 deletion tutorials/basic/tutorial.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
title: "RAJAPerf Tutorial (under development)"
container:
name: ghcr.io/rse-ops/rajaperf-tutorial:basic
name: ghcr.io/rse-ops/rajaperf-tutorials:ubuntu-basic
env:
- name: password
optional: true
Expand Down
7 changes: 0 additions & 7 deletions tutorials/basic/uptodate.yaml

This file was deleted.

0 comments on commit 1b7cc51

Please sign in to comment.