Release v0.2.1

This release contains fixes for compiler warnings and removes the usage of the custom FindCUDA CMake package.

.travis.yml

@@ -12,6 +12,7 @@ matrix:
          packages:
            - g++-4.9
      env: COMPILER=g++-4.9
+         - WARN="-DRAJA_ENABLE_WARNINGS=On"
    - compiler: gcc-5
      addons:
        apt:
@@ -20,6 +21,7 @@ matrix:
          packages:
            - g++-5
      env: COMPILER=g++-5
+         - WARN="-DRAJA_ENABLE_WARNINGS=On"
    - compiler: gcc-6
      addons:
        apt:
@@ -28,6 +30,7 @@ matrix:
          packages:
            - g++-6
      env: COMPILER=g++-6
+         - WARN=""
    - compiler: clang-3.6
      addons:
        apt:
@@ -38,6 +41,7 @@ matrix:
      env: 
          - COMPILER=$HOME/llvm/clang+llvm-3.6.0-x86_64-linux-gnu/bin/clang++
          - DOWNLOAD=http://llvm.org/releases/3.6.0/clang+llvm-3.6.0-x86_64-linux-gnu-ubuntu-14.04.tar.xz
+         - WARN=""
    - compiler: clang-3.7
      addons:
        apt:
@@ -48,6 +52,7 @@ matrix:
      env: 
          - COMPILER=$HOME/llvm/clang+llvm-3.7.0-x86_64-linux-gnu-ubuntu-14.04/bin/clang++
          - DOWNLOAD=http://llvm.org/releases/3.7.0/clang+llvm-3.7.0-x86_64-linux-gnu-ubuntu-14.04.tar.xz
+         - WARN=""
    - compiler: clang-3.8
      addons:
        apt:
@@ -59,15 +64,18 @@ matrix:
          - COMPILER=$HOME/llvm/clang+llvm-3.8.0-x86_64-linux-gnu-ubuntu-14.04/bin/clang++
          - LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$HOME/llvm/clang+llvm-3.8.0-x86_64-linux-gnu-ubuntu-14.04/lib
          - DOWNLOAD=http://llvm.org/releases/3.8.0/clang+llvm-3.8.0-x86_64-linux-gnu-ubuntu-14.04.tar.xz
+         - WARN=""
 cache:
     directories:
         - $HOME/llvm
 before_install:
   - sudo apt-get update -qq
   - if [[ -n "$DOWNLOAD" ]] ; then if [[ ! -e "$COMPILER" ]] ; then cd $HOME; curl -o tarball.tar.xz $DOWNLOAD && cd $HOME/llvm && tar xf $HOME/tarball.tar.xz ; fi ; fi
+  - CMAKE_URL="https://cmake.org/files/v3.7/cmake-3.7.0-rc2-Linux-x86_64.tar.gz"
+  - cd $HOME && curl -o cmake-tarball.tar.gz ${CMAKE_URL} && mkdir -p $HOME/cmake && cd $HOME/cmake && tar xf $HOME/cmake-tarball.tar.gz --strip-components=1 && export PATH=${PWD}/bin:${PATH}
 script:
   - cd $TRAVIS_BUILD_DIR
   - mkdir travis-build && cd travis-build
-  - cmake ../ -DCMAKE_CXX_COMPILER="$COMPILER"
+  - cmake -DCMAKE_CXX_COMPILER="$COMPILER" $WARN ../
   - make -j
   - make test # currently does nothing, this is how testing should be done

CMakeLists.txt

@@ -9,7 +9,7 @@
 #
 # This file is part of RAJA.
 #
-# For additional details, please also read raja/README-license.txt.
+# For additional details, please also read RAJA/LICENSE.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -40,7 +40,7 @@
 #
 ###############################################################################
 
-cmake_minimum_required (VERSION 3.0)
+cmake_minimum_required (VERSION 3.3)
 
 project(RAJA LANGUAGES CXX C)
 
@@ -49,7 +49,7 @@ set(CMAKE_CXX_STANDARD 14) # note, will decay automatically
 # Set version number
 set(RAJA_VERSION_MAJOR 0)
 set(RAJA_VERSION_MINOR 2)
-set(RAJA_VERSION_PATCHLEVEL 0)
+set(RAJA_VERSION_PATCHLEVEL 1)
 
 set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/modules" ${CMAKE_MODULE_PATH})
 
@@ -60,6 +60,7 @@ option(RAJA_ENABLE_CILK "Build Cilk support" Off)
 option(RAJA_ENABLE_TESTS "Build tests" On)
 option(RAJA_ENABLE_EXAMPLES "Build simple examples" On)
 option(RAJA_ENABLE_NESTED "Enable nested loop support" Off)
+option(RAJA_ENABLE_WARNINGS "Enable warnings as errors for CI" Off)
 
 set(TEST_DRIVER "" CACHE STRING "driver used to wrap test commands")
 

LICENSE

@@ -1,6 +1,6 @@
 *******************************************************************************
 
-RAJA: ................................, version 0.1.0
+RAJA: ................................, version 0.2.1
 
 Copyright (c) 2016, Lawrence Livermore National Security, LLC. 
 Produced at the Lawrence Livermore National Laboratory.
@@ -22,6 +22,7 @@ Jason Burmark (burmark1@llnl.gov)
 Holger Jones (jones19@llnl.gov)
 Will Killian (killian4@llnl.gov)
 Adam Kunen (kunen1@llnl.gov)
+Olga Pearce (pearce8@llnl.gov)
 David Poliakoff (poliakoff1@llnl.gov)
 Tom Scogland (scogland1@llnl.gov)
 

README.md

@@ -1,4 +1,4 @@
-RAJA v0.2.0
+RAJA v0.2.1
 ============
 
 [![Build Status](https://travis-ci.org/LLNL/RAJA.svg?branch=develop)](https://travis-ci.org/LLNL/RAJA)
@@ -116,6 +116,7 @@ Contributors include:
   * Holger Jones (jones19@llnl.gov)
   * Will Killian (killian4@llnl.gov)
   * Adam Kunen (kunen1@llnl.gov)
+  * Olga Pearce (pearce8@llnl.gov)
   * David Poliakoff (poliakoff1@llnl.gov)
   * Tom Scogland (scogland1@llnl.gov)
 

cmake/SetupCompilers.cmake

@@ -46,6 +46,10 @@ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3" CACHE STRING "")
 set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -O3" CACHE STRING "")
 set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0" CACHE STRING "")
 
+if (RAJA_ENABLE_WARNINGS)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror")
+endif ()
+
 if (CMAKE_CXX_COMPILER_ID MATCHES Clang)
   set(RAJA_COMPILER "RAJA_COMPILER_CLANG")
 elseif (CMAKE_CXX_COMPILER_ID MATCHES GNU)
@@ -65,11 +69,11 @@ endif()
 
 if (RAJA_ENABLE_CUDA)
   if(CMAKE_BUILD_TYPE MATCHES Release)
-    set(RAJA_NVCC_FLAGS -O2; -restrict; -arch compute_35; -std c++11; --expt-extended-lambda; -x cu; -ccbin; ${CMAKE_CXX_COMPILER})
+    set(RAJA_NVCC_FLAGS -O2; -restrict; -arch compute_35; -std c++11; --expt-extended-lambda; -ccbin; ${CMAKE_CXX_COMPILER})
   elseif(CMAKE_BUILD_TYPE MATCHES RelWithDebInfo)
-    set(RAJA_NVCC_FLAGS -g; -G; -O2; -restrict; -arch compute_35; -std c++11; --expt-extended-lambda; -x cu; -ccbin ${CMAKE_CXX_COMPILER})
+    set(RAJA_NVCC_FLAGS -g; -G; -O2; -restrict; -arch compute_35; -std c++11; --expt-extended-lambda; -ccbin ${CMAKE_CXX_COMPILER})
   elseif(CMAKE_BUILD_TYPE MATCHES Debug)
-    set(RAJA_NVCC_FLAGS -g; -G; -O0; -restrict; -arch compute_35; -std c++11; --expt-extended-lambda; -x cu; -ccbin ${CMAKE_CXX_COMPILER})
+    set(RAJA_NVCC_FLAGS -g; -G; -O0; -restrict; -arch compute_35; -std c++11; --expt-extended-lambda; -ccbin ${CMAKE_CXX_COMPILER})
   endif()
 endif()