Skip to content

Commit

Permalink
Merge pull request #261 from PRUNERS/release-v2.0-beta.2
Browse files Browse the repository at this point in the history
Master: Increment version number to v2.0-beta.2
  • Loading branch information
IanBriggs authored Apr 10, 2019
2 parents 1ef87f7 + 276cedb commit 836bc3c
Show file tree
Hide file tree
Showing 96 changed files with 9,686 additions and 1,351 deletions.
18 changes: 18 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
---
name: 🐛 Bug report
about: Create a report to help us improve 🤔

---

## Bug Report

**Describe the problem**
A clear and concise description of what the bug is.
Include screenshots if applicable.

**Suggested Fix**
Do you have a suggestion for how to resole the issue?

**Alternative approaches:**
A clear and concise description of any alternative solutions or features you've
considered.
19 changes: 19 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
---
name: 🚀 Feature Request
about: I have a suggestion (and may want to implement it 🙂)!

---

## Feature Request

**Describe the new feature:**
A clear and concise description of what your problem is. Ex. I have an issue
when [...]

**Suggested change:**
A clear and concise description of what you want to happen. Add any considered
drawbacks.

**Alternative approaches:**
A clear and concise description of any alternative solutions or features you've
considered.
16 changes: 16 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
Fixes #

**Description:**
Describe what you changed and why.

-
-
-

**Documentation:**
What documentation did you change?
If the change does not require updates to documentation, justify why.

**Tests:**
What automated tests did you change?
If the change does not require updates to tests, justify why.
76 changes: 44 additions & 32 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,39 +80,51 @@
#
# -- LICENSE END --

sudo: required
language: cpp
dist: trusty
# addons:
# apt:
# packages:
# - gcc-5
# - g++-5
os: linux
addons:
apt:
packages: &native_deps
- python3
- python3-pip

env:
global:
- LLVM_VERSION=3.9.0
- LLVM_ARCHIVE_PATH=$HOME/clang+llvm.tar.xz
- export PATH=$HOME/usr/bin:$PATH
- export LD_LIBRARY_PATH=$HOME/usr/lib:$LD_LIBRARY_PATH
matrix:
include:
# Job 1: OpenMPI
- env:
- mpi_type=openmpi
- extra_pip=pyelftools
addons:
apt:
packages:
- *native_deps
- libopenmpi-dev
- openmpi-bin
# Job 2: MPICH
#- env: mpi_type=mpich
# addons:
# apt:
# packages:
# - *native_deps
# - libmpich-dev
# - mpich
# Job 3: No MPI
- env:
- mpi_type=none
- extra_pip=
addons:
apt:
packages:
- *native_deps

install:
#starts in $HOME/build/PRUNERS/FLiT
- cd $HOME/build
# Install LLVM/Clang 3.9
- wget http://llvm.org/releases/$LLVM_VERSION/clang+llvm-$LLVM_VERSION-x86_64-linux-gnu-ubuntu-14.04.tar.xz -O $LLVM_ARCHIVE_PATH
- mkdir $HOME/usr
- tar xf $LLVM_ARCHIVE_PATH -C $HOME/usr --strip-components 1

# script:
- export CLANG_ONLY=True
- cd $HOME/build/PRUNERS/FLiT/src
- make -j 4
before_install: pip3 install --user toml $extra_pip

notifications:
email: false
slack:
rooms:
- pruners:aXHVdiVFtqtMfzNW4IutZNDW
on_success: always
on_failure: always
script: make -j 4 && make check

#notifications:
# email: false
# slack:
# rooms:
# - pruners:aXHVdiVFtqtMfzNW4IutZNDW
# on_success: always
# on_failure: always
9 changes: 5 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PREFIX ?= /usr

#CC := clang++
CC := g++
#CXX ?= clang++
CXX ?= g++
FFLAGS ?=
LIBDIR := lib
SRCDIR := src
Expand Down Expand Up @@ -68,10 +68,10 @@ help:

$(TARGET): $(OBJ)
mkdir -p lib
$(CC) $(CPPFLAGS) -o $@ $^ $(LINKFLAGS)
$(CXX) $(CPPFLAGS) -o $@ $^ $(LINKFLAGS)

$(SRCDIR)/%.o: $(SRCDIR)/%.cpp Makefile
$(CC) $(CPPFLAGS) $(DEPFLAGS) -c $< -o $@
$(CXX) $(CPPFLAGS) $(DEPFLAGS) -c $< -o $@

.PRECIOUS: src/%.d
-include $(SOURCE:%.cpp=%.d)
Expand Down Expand Up @@ -109,6 +109,7 @@ install: $(TARGET)
install -m 0755 $(SCRIPT_DIR)/flit.py $(PREFIX)/share/flit/scripts/
install -m 0755 $(SCRIPT_DIR)/flit_*.py $(PREFIX)/share/flit/scripts/
install -m 0644 $(SCRIPT_DIR)/flitutil.py $(PREFIX)/share/flit/scripts/
install -m 0644 $(SCRIPT_DIR)/flitelf.py $(PREFIX)/share/flit/scripts/
install -m 0644 $(SCRIPT_DIR)/README.md $(PREFIX)/share/flit/scripts/
install -m 0644 $(DOC_DIR)/*.md $(PREFIX)/share/flit/doc/
install -m 0644 $(DATA_DIR)/Makefile.in $(PREFIX)/share/flit/data/
Expand Down
9 changes: 9 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
| branch | status |
|---------|---------|
| master | [![Build Status](https://travis-ci.org/PRUNERS/FLiT.svg?branch=master)](https://travis-ci.org/PRUNERS/FLiT) |
| devel | [![Build Status](https://travis-ci.org/PRUNERS/FLiT.svg?branch=devel)](https://travis-ci.org/PRUNERS/FLiT) |

![PyPI - License](https://img.shields.io/pypi/l/Django.svg)
![PRs welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)

# FLiT

[![FLiT Bird](/images/flit-small.png)](https://github.com/PRUNERS/FLiT "FLiT")
Expand Down Expand Up @@ -51,6 +59,7 @@ It consists of the following components:

Contents:

* [Release Notes](documentation/release-notes.md)
* [Installation](documentation/installation.md)
* [Litmus Tests](documentation/litmus-tests.md)
* [FLiT Command-Line](documentation/flit-command-line.md)
Expand Down
25 changes: 1 addition & 24 deletions benchmarks/polybench/flit-config.toml
Original file line number Diff line number Diff line change
@@ -1,24 +1 @@
# Autogenerated by "flit init"
# flit version v2.0-alpha.3

[database]

type = 'sqlite'
filepath = 'results.sqlite'


[[hosts]]

[hosts.dev_build]

compiler_name = 'g++'
optimization_level = '-O2'
switches = '-funsafe-math-optimizations'


[hosts.ground_truth]

compiler_name = 'g++'
optimization_level = '-O0'
switches = ''

# Use the default values
83 changes: 83 additions & 0 deletions benchmarks/polybench/main.cpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,86 @@
/* -- LICENSE BEGIN --
*
* Copyright (c) 2015-2018, Lawrence Livermore National Security, LLC.
*
* Produced at the Lawrence Livermore National Laboratory
*
* Written by
* Michael Bentley ([email protected]),
* Geof Sawaya ([email protected]),
* and Ian Briggs ([email protected])
* under the direction of
* Ganesh Gopalakrishnan
* and Dong H. Ahn.
*
* LLNL-CODE-743137
*
* All rights reserved.
*
* This file is part of FLiT. For details, see
* https://pruners.github.io/flit
* Please also read
* https://github.com/PRUNERS/FLiT/blob/master/LICENSE
*
* Redistribution and use in source and binary forms, with or
* without modification, are permitted provided that the following
* conditions are met:
*
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the disclaimer below.
*
* - Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the disclaimer
* (as noted below) in the documentation and/or other materials
* provided with the distribution.
*
* - Neither the name of the LLNS/LLNL nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL LAWRENCE LIVERMORE NATIONAL
* SECURITY, LLC, THE U.S. DEPARTMENT OF ENERGY OR CONTRIBUTORS BE
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
* TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
* Additional BSD Notice
*
* 1. This notice is required to be provided under our contract
* with the U.S. Department of Energy (DOE). This work was
* produced at Lawrence Livermore National Laboratory under
* Contract No. DE-AC52-07NA27344 with the DOE.
*
* 2. Neither the United States Government nor Lawrence Livermore
* National Security, LLC nor any of their employees, makes any
* warranty, express or implied, or assumes any liability or
* responsibility for the accuracy, completeness, or usefulness of
* any information, apparatus, product, or process disclosed, or
* represents that its use would not infringe privately-owned
* rights.
*
* 3. Also, reference herein to any specific commercial products,
* process, or services by trade name, trademark, manufacturer or
* otherwise does not necessarily constitute or imply its
* endorsement, recommendation, or favoring by the United States
* Government or Lawrence Livermore National Security, LLC. The
* views and opinions of authors expressed herein do not
* necessarily state or reflect those of the United States
* Government or Lawrence Livermore National Security, LLC, and
* shall not be used for advertising or product endorsement
* purposes.
*
* -- LICENSE END --
*/

#include "flit.h"

int main(int argCount, char* argList[]) {
Expand Down
48 changes: 1 addition & 47 deletions benchmarks/random/flit-config.toml
Original file line number Diff line number Diff line change
@@ -1,50 +1,4 @@
# Autogenerated by "flit init"
# flit version v2.0-alpha.3

[database]

# older versions of flit supported postgres. that has been removed. only
# sqlite is supported at the moment.
type = 'sqlite'

# if relative path, it is relative to the directory containing this
# configuration file.
filepath = 'results.sqlite'

[run]
timing = false

# For now, only one host is supported, all others are ignored
[[hosts]]

name = 'yoga-manjaro'
flit_path = '/home/bentley/git/FLiT/scripts/flitcli/flit.py'
config_dir = '/home/bentley/git/FLiT/scripts/flitcli/config'

# The settings for "make dev"
[hosts.dev_build]
# compiler_name must be found in [[hosts.compilers]] list under name attribute
# but the optimization level and switches do not need to be in the compiler list
compiler_name = 'g++'
optimization_level = '-O2'
switches = '-funsafe-math-optimizations'

# The ground truth compilation to use in analysis, for "make gt"
[hosts.ground_truth]
# compiler_name must be found in [[hosts.compilers]] list under name attribute
# but the optimization level and switches do not need to be in the compiler list
compiler_name = 'g++'
optimization_level = '-O0'
switches = ''

# This host's list of compilers.
# For now, only used for hosts.ground_truth and hosts.dev_build.
# TODO: use this list to generate the Makefile
[[hosts.compilers]]

# binary can be an absolute path, relative path, or binary name (found in
# PATH). If you want to specify a compiler in the same directory as this
# config file, prepend with a "./" (e.g. "./my-compiler")
binary = 'g++'
name = 'g++'

# Use default values for all other options
Loading

0 comments on commit 836bc3c

Please sign in to comment.