Skip to content

Commit

Permalink
Merge pull request #104 in UM/umpire from release/0.2.4 to master
Browse files Browse the repository at this point in the history
* commit '4bc7a2ea46d8049853d84c3848b1f89103098f71': (110 commits)
  Update version number and add missing license headers
  Add feature request issue template
  Add bug report issue template
  Add defaulted virtual destructors to classes with virtual functions
  Guard printAll with !defined(NDEBUG)
  Only disable optimization of judy array for clang compiler
  Set Os flag for judy and util, and remove judy include from .hpp files
  Print map contents when a record is not found.
  Add target_compile_options to judy
  Add Gitter badge
  Fix logo URL
  Bump size
  Switch to PNG logo
  Add update logo
  Change logo size
  Add logo to README
  Add Umpire logo
  Add link to documentation
  Correctly install 'mixin' headers
  Update codecov to check simpool coverage
  ...
  • Loading branch information
davidbeckingsale committed Oct 24, 2018
2 parents af15829 + 4bc7a2e commit f774afa
Show file tree
Hide file tree
Showing 90 changed files with 3,668 additions and 410 deletions.
25 changes: 25 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
---
name: Bug report
about: Create a report to help us improve

---

**Describe the bug**

A clear and concise description of what the bug is:

**To Reproduce**

Steps to reproduce the behavior:

**Expected behavior**

A clear and concise description of what you expected to happen:

**Compilers & Libraries (please complete the following information):**
- Compiler & version: [e.g. GCC 4.9.3]:
- CUDA version (if applicable):

**Additional context**

Add any other context about the problem here.
21 changes: 21 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
---
name: Feature request
about: Suggest an idea for this project

---

**Is your feature request related to a problem? Please describe.**

A clear and concise description of what the problem is.

**Describe the solution you'd like**

A clear and concise description of what you want to happen.

**Describe alternatives you've considered**

A clear and concise description of any alternative solutions or features you've considered.

**Additional context**

Add any other context or information about the feature request here.
57 changes: 57 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
services: docker
dist: trusty
language: cpp
env:
global:
- DO_BUILD=yes
- DO_TEST=yes
matrix:
include:
- compiler: gcc5
env:
- COMPILER=g++
- IMG=gcc-5
- CMAKE_EXTRA_FLAGS="-DENABLE_CUDA=Off -DENABLE_COVERAGE=On"
- compiler: gcc6
env:
- COMPILER=g++
- IMG=gcc-6
- CMAKE_EXTRA_FLAGS="-DENABLE_CUDA=Off"
- compiler: gcc7
env:
- COMPILER=g++
- IMG=gcc-7
- CMAKE_EXTRA_FLAGS="-DENABLE_CUDA=Off"
- compiler: gcc8
env:
- COMPILER=g++
- IMG=gcc-8
- CMAKE_EXTRA_FLAGS="-DENABLE_CUDA=Off"
- compiler: clang4
env:
- COMPILER=clang++
- IMG=clang-4
- CMAKE_EXTRA_FLAGS="-DENABLE_CUDA=Off"
- compiler: clang5
env:
- COMPILER=clang++
- IMG=clang-5
- CMAKE_EXTRA_FLAGS="-DENABLE_CUDA=Off"
- compiler: clang6
env:
- COMPILER=clang++
- IMG=clang-6
- CMAKE_EXTRA_FLAGS="-DENABLE_CUDA=Off"
- compiler: nvcc
env:
- COMPILER=g++
- IMG=nvcc-9
- CMAKE_EXTRA_FLAGS="-DENABLE_CUDA=On"
- DO_TEST=no

script:
- docker run --rm --user='root' -v ${TRAVIS_BUILD_DIR}:/home/axom axom/compilers:$IMG chown -R axom /home/axom
- docker run --rm -v ${TRAVIS_BUILD_DIR}:/home/axom -e COMPILER -e DO_BUILD -e DO_TEST -e CMAKE_EXTRA_FLAGS axom/compilers:$IMG ./scripts/travis/build_and_test.sh

after_success:
- if [[ "${CMAKE_EXTRA_FLAGS}" == *"ENABLE_COVERAGE"* ]] ; then bash <(curl -s https://codecov.io/bash) -a "-f" >& /dev/null; fi
13 changes: 11 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,13 @@
# For details, see https://github.com/LLNL/Umpire
# Please also see the LICENSE file for MIT license.
##############################################################################
cmake_minimum_required(VERSION 3.9)

cmake_policy(SET CMP0048 NEW)
cmake_policy(SET CMP0057 NEW)

project(Umpire
LANGUAGES CXX C
VERSION 0.2.3)
VERSION 0.2.4)

set(ENABLE_OPENMP On CACHE Bool "")
set(ENABLE_CUDA On CACHE Bool "")
Expand All @@ -33,6 +32,15 @@ option(ENABLE_SLIC "Build Umpire with SLIC logging" Off)
option(ENABLE_ASSERTS "Build Umpire with assert() enabled" On)
set(ENABLE_GTEST_DEATH_TESTS ${ENABLE_ASSERTS} CACHE Bool "")
option(ENABLE_STATISTICS "Track statistics for allocations and operations" Off)
option(ENABLE_COVERAGE "Enable code coverage (with GCC)" Off)

if (ENABLE_CUDA)
cmake_minimum_required(VERSION 3.9)
else ()
cmake_minimum_required(VERSION 3.8.2)
endif ()

message(STATUS "Using CMake version ${CMAKE_VERSION}")

################################
# BLT
Expand All @@ -58,6 +66,7 @@ if (NOT BLT_LOADED)
endif()


include(cmake/SetupCompilerFlags.cmake)
include(cmake/SetupUmpireThirdParty.cmake)

configure_file(
Expand Down
46 changes: 46 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
# Contributor Covenant Code of Conduct

## Our Pledge

In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.

## Our Standards

Examples of behavior that contributes to creating a positive environment include:

* Using welcoming and inclusive language
* Being respectful of differing viewpoints and experiences
* Gracefully accepting constructive criticism
* Focusing on what is best for the community
* Showing empathy towards other community members

Examples of unacceptable behavior by participants include:

* The use of sexualized language or imagery and unwelcome sexual attention or advances
* Trolling, insulting/derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or electronic address, without explicit permission
* Other conduct which could reasonably be considered inappropriate in a professional setting

## Our Responsibilities

Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.

Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.

## Scope

This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at [email protected]. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.

Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.

## Attribution

This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]

[homepage]: http://contributor-covenant.org
[version]: http://contributor-covenant.org/version/1/4/
8 changes: 6 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
# Umpire v0.2.3
# <img src="https://cdn.rawgit.com/LLNL/Umpire/develop/share/umpire/logo/umpire-logo.png" width="128" valign="middle" alt="Umpire"/> Umpire v0.2.4

[![Build Status](https://travis-ci.com/LLNL/Umpire.svg?branch=develop)](https://travis-ci.com/LLNL/Umpire)
[![Documentation Status](https://readthedocs.org/projects/umpire/badge/?version=develop)](https://umpire.readthedocs.io/en/develop/?badge=develop)
[![codecov](https://codecov.io/gh/LLNL/Umpire/branch/develop/graph/badge.svg)](https://codecov.io/gh/LLNL/Umpire) [![Join the chat at https://gitter.im/LLNL/Umpire](https://badges.gitter.im/LLNL/Umpire.svg)](https://gitter.im/LLNL/Umpire?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

Umpire is a resource management library that allows the discovery, provision,
and management of memory on next-generation architectures.
Expand All @@ -23,7 +27,7 @@ For more advanced configuration you can use standard CMake variables.

# Documentation

Both user and code documentation is available.
Both user and code documentation is available [here](http://umpire.readthedocs.io/).

# Authors

Expand Down
19 changes: 19 additions & 0 deletions cmake/SetupCompilerFlags.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
##############################################################################
# Copyright (c) 2018, Lawrence Livermore National Security, LLC.
# Produced at the Lawrence Livermore National Laboratory
#
# Created by David Beckingsale, [email protected]
# LLNL-CODE-747640
#
# All rights reserved.
#
# This file is part of Umpire.
#
# For details, see https://github.com/LLNL/Umpire
# Please also see the LICENSE file for MIT license.
##############################################################################
if (ENABLE_COVERAGE)
message(INFO "Coverage analysis enabled")
set(CMAKE_CXX_FLAGS "-coverage ${CMAKE_CXX_FLAGS}")
set(CMAKE_EXE_LINKER_FLAGS "-coverage ${CMAKE_EXE_LINKER_FLAGS}")
endif ()
4 changes: 4 additions & 0 deletions codecov.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
ignore:
- "src/umpire/tpl/conduit"
- "src/umpire/tpl/judy"
- "test"
Loading

0 comments on commit f774afa

Please sign in to comment.